moved static libs out of main source tree to reduce git snapshots size

1435 files changed, 7 insertions, 243634 deletions

diff --git a/configure.ac b/configure.ac
index 5f08d2d5..2f15a13b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,23 +34,23 @@ fi
 case "$host" in
   i386-*-* | i486-*-* | i586-*-* | i686-*-* | i86pc-*-*)
     AC_DEFINE(ARCH_X86_32, 1, [architecture is x86])
-    LIB="lib-x86-32"
+    LIB="../deadbeef-deps/lib-x86-32"
     ;;
   x86_64-apple-*)
     AC_DEFINE(ARCH_X86_64_OSX, 1, [architecture is x86_64 for OSX])
-    LIB="lib-x86-64-osx"
+    LIB="../deadbeef-deps/lib-x86-64-osx"
     ;;
   x86_64-*-* | amd64-*-*)
     AC_DEFINE(ARCH_X86_64, 1, [architecture is x86_64])
-    LIB="lib-x86-64"
+    LIB="../deadbeef-deps/lib-x86-64"
     ;;
   powerpc-*-* )
     AC_DEFINE(ARCH_PPC_32, 1, [architecture is ppc32])
-    LIB="lib-ppc-32"
+    LIB="../deadbeef-deps/lib-ppc-32"
     ;;
   powerpc64-*-* )
     AC_DEFINE(ARCH_PPC_64, 1, [architecture is ppc64])
-    LIB="lib-ppc-64"
+    LIB="../deadbeef-deps/lib-ppc-64"
     ;;
   *)
     AC_DEFINE(ARCH_UNKNOWN, 1, [architecture is unknown])
diff --git a/lib-x86-32/ft2.c b/lib-x86-32/ft2.c
deleted file mode 100644
index b0428d08..00000000
--- a/lib-x86-32/ft2.c
+++ /dev/null
@@ -1,823 +0,0 @@
-// pretend that we have freetype2 linked in, for imlib2 
-int FT_Load_Glyph;
-int FT_UInt32;
-int FT_Memory;
-int FT_Alloc_Func;
-int FT_Free_Func;
-int FT_Realloc_Func;
-int FT_MemoryRec_;
-int FT_Stream;
-int FT_StreamDesc_;
-int FT_StreamDesc;
-int FT_Stream_IoFunc;
-int FT_Stream_CloseFunc;
-int FT_StreamRec_;
-int FT_Pos;
-int FT_Vector_;
-int FT_Vector;
-int FT_BBox_;
-int FT_BBox;
-int FT_Bitmap_;
-int FT_Bitmap;
-int FT_Outline_;
-int FT_Outline;
-int FT_Glyph_Format_;
-int FT_Glyph_Format;
-int FT_String;
-int FT_Short;
-int FT_UShort;
-int FT_Int;
-int FT_UInt;
-int FT_Long;
-int FT_Fixed;
-int FT_Generic_Finalizer;
-int FT_Generic_;
-int FT_Generic;
-int FT_ListNode;
-int FT_ListNodeRec_;
-int FT_ListRec_;
-int FT_ListRec;
-int FT_Glyph_Metrics_;
-int FT_Glyph_Metrics;
-int FT_Bitmap_Size_;
-int FT_Bitmap_Size;
-int FT_Library;
-int FT_Driver;
-int FT_Face;
-int FT_Size;
-int FT_GlyphSlot;
-int FT_CharMap;
-int FT_Encoding_;
-int FT_Encoding;
-int FT_CharMapRec_;
-int FT_Face_Internal;
-int FT_FaceRec_;
-int FT_Size_Internal;
-int FT_Size_Metrics_;
-int FT_Size_Metrics;
-int FT_SizeRec_;
-int FT_SubGlyph;
-int FT_Slot_Internal;
-int FT_GlyphSlotRec_;
-int FT_Glyph_Metrics_;
-int FT_Face_Internal;
-int FT_Generic_Finalizer;
-int FT_CharMapRec_;
-int FT_ENCODING_MS_JOHAB;
-int FT_SubGlyphRec_;
-int FT_Generic;
-int FT_Memory;
-int FT_GlyphSlotRec_;
-int FT_StreamRec_;
-int FT_Size_Metrics;
-int FT_Glyph_Format_;
-int FT_ENCODING_WANSUNG;
-int FT_Size_Metrics_;
-int FT_MemoryRec_;
-int FT_Generic_;
-int FT_BBox;
-int FT_ENCODING_APPLE_ROMAN;
-int FT_ListRec;
-int FT_GLYPH_FORMAT_NONE;
-int FT_Outline;
-int FT_Stream_CloseFunc;
-int FT_ENCODING_ADOBE_CUSTOM;
-int FT_Bitmap_Size_;
-int FT_Alloc_Func;
-int FT_ENCODING_UNICODE;
-int FT_ENCODING_MS_SYMBOL;
-int FT_Size;
-int FT_Long;
-int FT_String;
-int FT_GLYPH_FORMAT_COMPOSITE;
-int FT_GlyphSlot;
-int FT_Vector_;
-int FT_Slot_InternalRec_;
-int FT_Free_Func;
-int FT_ENCODING_BIG5;
-int FT_Encoding;
-int FT_Vector;
-int FT_SizeRec_;
-int FT_ENCODING_MS_SJIS;
-int FT_Size_InternalRec_;
-int FT_Driver;
-int FT_ENCODING_MS_GB2312;
-int FT_ENCODING_MS_WANSUNG;
-int FT_Glyph_Format;
-int FT_Pos;
-int FT_Library;
-int FT_Short;
-int FT_ENCODING_ADOBE_LATIN_1;
-int FT_ENCODING_ADOBE_STANDARD;
-int FT_Bitmap_;
-int FT_SubGlyph;
-int FT_Face_InternalRec_;
-int FT_Fixed;
-int FT_GLYPH_FORMAT_BITMAP;
-int FT_StreamDesc;
-int FT_DriverRec_;
-int FT_ENCODING_GB2312;
-int FT_CharMap;
-int FT_Encoding_;
-int FT_ENCODING_JOHAB;
-int FT_ListNodeRec_;
-int FT_GLYPH_FORMAT_OUTLINE;
-int FT_Stream;
-int FT_ENCODING_ADOBE_EXPERT;
-int FT_ENCODING_SJIS;
-int FT_Outline_;
-int FT_ENCODING_MS_BIG5;
-int FT_ListRec_;
-int FT_Int;
-int FT_UShort;
-int FT_ListNode;
-int FT_FaceRec_;
-int FT_Face;
-int FT_Bitmap_Size;
-int FT_ENCODING_NONE;
-int FT_StreamDesc_;
-int FT_Stream_IoFunc;
-int FT_Realloc_Func;
-int FT_Bitmap;
-int FT_GLYPH_FORMAT_PLOTTER;
-int FT_UInt;
-int FT_LibraryRec_;
-int FT_BBox_;
-int FT_UInt32;
-int FT_Slot_Internal;
-int FT_Glyph_Metrics;
-int FT_ENCODING_OLD_LATIN_2;
-int FT_Size_Internal;
-int FT_Memory;
-int FT_Alloc_Func;
-int FT_Free_Func;
-int FT_Realloc_Func;
-int FT_MemoryRec_;
-int FT_Stream;
-int FT_StreamDesc_;
-int FT_StreamDesc;
-int FT_Stream_IoFunc;
-int FT_Stream_CloseFunc;
-int FT_StreamRec_;
-int FT_Pos;
-int FT_Vector_;
-int FT_Vector;
-int FT_BBox_;
-int FT_BBox;
-int FT_Pixel_Mode_;
-int FT_Bitmap_;
-int FT_Bitmap;
-int FT_Outline_;
-int FT_Outline;
-int FT_Glyph_Format_;
-int FT_Glyph_Format;
-int FT_String;
-int FT_Short;
-int FT_UShort;
-int FT_Int;
-int FT_UInt;
-int FT_Long;
-int FT_Fixed;
-int FT_Error;
-int FT_Generic_Finalizer;
-int FT_Generic_;
-int FT_Generic;
-int FT_ListNode;
-int FT_ListNodeRec_;
-int FT_ListRec_;
-int FT_ListRec;
-int FT_Glyph_Metrics_;
-int FT_Glyph_Metrics;
-int FT_Bitmap_Size_;
-int FT_Bitmap_Size;
-int FT_Library;
-int FT_Driver;
-int FT_Face;
-int FT_Size;
-int FT_GlyphSlot;
-int FT_CharMap;
-int FT_Encoding_;
-int FT_Encoding;
-int FT_CharMapRec_;
-int FT_Face_Internal;
-int FT_FaceRec_;
-int FT_Size_Internal;
-int FT_Size_Metrics_;
-int FT_Size_Metrics;
-int FT_SizeRec_;
-int FT_SubGlyph;
-int FT_Slot_Internal;
-int FT_GlyphSlotRec_;
-int FT_Render_Mode_;
-int FT_Kerning_Mode_;
-int FT_Glyph_Class;
-int FT_Glyph;
-int FT_GlyphRec_;
-int FT_GlyphRec;
-int FT_BitmapGlyph;
-int FT_BitmapGlyphRec_;
-int FT_ENCODING_APPLE_ROMAN;
-int FT_Face_Internal;
-int FT_ENCODING_ADOBE_EXPERT;
-int FT_PIXEL_MODE_MAX;
-int FT_RENDER_MODE_LCD;
-int FT_BitmapGlyph;
-int FT_PIXEL_MODE_MONO;
-int FT_StreamRec_;
-int FT_Face_InternalRec_;
-int FT_Glyph_Class_;
-int FT_SubGlyph;
-int FT_DriverRec_;
-int FT_Glyph_Format_;
-int FT_ENCODING_MS_BIG5;
-int FT_ENCODING_NONE;
-int FT_UShort;
-int FT_Generic;
-int FT_Memory;
-int FT_ENCODING_UNICODE;
-int FT_KERNING_DEFAULT;
-int FT_Bitmap;
-int FT_PIXEL_MODE_LCD_V;
-int FT_Vector_;
-int FT_Glyph_Metrics_;
-int FT_RENDER_MODE_MAX;
-int FT_PIXEL_MODE_GRAY;
-int FT_GlyphRec;
-int FT_Generic_Finalizer;
-int FT_ENCODING_JOHAB;
-int FT_ListRec_;
-int FT_Stream;
-int FT_Stream_IoFunc;
-int FT_Int;
-int FT_ListNodeRec_;
-int FT_ListNode;
-int FT_BBox_;
-int FT_PIXEL_MODE_NONE;
-int FT_SizeRec_;
-int FT_ENCODING_ADOBE_STANDARD;
-int FT_Vector;
-int FT_Kerning_Mode_;
-int FT_ENCODING_MS_SYMBOL;
-int FT_RENDER_MODE_LIGHT;
-int FT_Error;
-int FT_PIXEL_MODE_GRAY2;
-int FT_PIXEL_MODE_GRAY4;
-int FT_ListRec;
-int FT_CharMapRec_;
-int FT_Encoding_;
-int FT_Generic_;
-int FT_GlyphRec_;
-int FT_GLYPH_FORMAT_BITMAP;
-int FT_Size;
-int FT_Size_Metrics;
-int FT_String;
-int FT_ENCODING_MS_WANSUNG;
-int FT_Library;
-int FT_Glyph;
-int FT_ENCODING_SJIS;
-int FT_KERNING_UNFITTED;
-int FT_RENDER_MODE_LCD_V;
-int FT_Face;
-int FT_StreamDesc;
-int FT_KERNING_UNSCALED;
-int FT_SubGlyphRec_;
-int FT_Fixed;
-int FT_FaceRec_;
-int FT_LibraryRec_;
-int FT_Size_InternalRec_;
-int FT_Glyph_Format;
-int FT_GLYPH_FORMAT_OUTLINE;
-int FT_ENCODING_MS_GB2312;
-int FT_Bitmap_;
-int FT_Size_Metrics_;
-int FT_ENCODING_ADOBE_CUSTOM;
-int FT_Encoding;
-int FT_ENCODING_MS_JOHAB;
-int FT_Glyph_Metrics;
-int FT_UInt;
-int FT_Bitmap_Size_;
-int FT_GLYPH_FORMAT_COMPOSITE;
-int FT_BBox;
-int FT_CharMap;
-int FT_Short;
-int FT_Size_Internal;
-int FT_MemoryRec_;
-int FT_Pos;
-int FT_ENCODING_BIG5;
-int FT_GLYPH_FORMAT_NONE;
-int FT_Outline_;
-int FT_ENCODING_GB2312;
-int FT_GlyphSlot;
-int FT_ENCODING_ADOBE_LATIN_1;
-int FT_Stream_CloseFunc;
-int FT_ENCODING_WANSUNG;
-int FT_Alloc_Func;
-int FT_Bitmap_Size;
-int FT_RENDER_MODE_MONO;
-int FT_StreamDesc_;
-int FT_GLYPH_FORMAT_PLOTTER;
-int FT_Long;
-int FT_Slot_Internal;
-int FT_Free_Func;
-int FT_PIXEL_MODE_LCD;
-int FT_Slot_InternalRec_;
-int FT_Driver;
-int FT_Render_Mode_;
-int FT_Glyph_Class;
-int FT_ENCODING_OLD_LATIN_2;
-int FT_Outline;
-int FT_BitmapGlyphRec_;
-int FT_RENDER_MODE_NORMAL;
-int FT_ENCODING_MS_SJIS;
-int FT_Pixel_Mode_;
-int FT_GlyphSlotRec_;
-int FT_Realloc_Func;
-int FT_Load_Glyph;
-int FT_Get_Glyph;
-int FT_Glyph_To_Bitmap;
-int FT_Done_Glyph;
-int FT_Get_Char_Index;
-int FT_Get_Kerning;
-int FT_UInt32;
-int FT_Memory;
-int FT_Alloc_Func;
-int FT_Free_Func;
-int FT_Realloc_Func;
-int FT_MemoryRec_;
-int FT_Stream;
-int FT_StreamDesc_;
-int FT_StreamDesc;
-int FT_Stream_IoFunc;
-int FT_Stream_CloseFunc;
-int FT_StreamRec_;
-int FT_Pos;
-int FT_Vector_;
-int FT_Vector;
-int FT_BBox_;
-int FT_BBox;
-int FT_Bitmap_;
-int FT_Bitmap;
-int FT_Outline_;
-int FT_Outline;
-int FT_Glyph_Format_;
-int FT_Glyph_Format;
-int FT_String;
-int FT_Short;
-int FT_UShort;
-int FT_Int;
-int FT_UInt;
-int FT_Long;
-int FT_Fixed;
-int FT_Error;
-int FT_Generic_Finalizer;
-int FT_Generic_;
-int FT_Generic;
-int FT_ListNode;
-int FT_ListNodeRec_;
-int FT_ListRec_;
-int FT_ListRec;
-int FT_Glyph_Metrics_;
-int FT_Glyph_Metrics;
-int FT_Bitmap_Size_;
-int FT_Bitmap_Size;
-int FT_Library;
-int FT_Driver;
-int FT_Face;
-int FT_Size;
-int FT_GlyphSlot;
-int FT_CharMap;
-int FT_Encoding_;
-int FT_Encoding;
-int FT_CharMapRec_;
-int FT_Face_Internal;
-int FT_FaceRec_;
-int FT_Size_Internal;
-int FT_Size_Metrics_;
-int FT_Size_Metrics;
-int FT_SizeRec_;
-int FT_SubGlyph;
-int FT_Slot_Internal;
-int FT_GlyphSlotRec_;
-int FT_Glyph_Class;
-int FT_Glyph;
-int FT_GlyphRec_;
-int FT_GlyphRec;
-int FT_BitmapGlyph;
-int FT_BitmapGlyphRec_;
-int FT_ENCODING_APPLE_ROMAN;
-int FT_Face_Internal;
-int FT_ENCODING_ADOBE_EXPERT;
-int FT_BitmapGlyph;
-int FT_StreamRec_;
-int FT_Face_InternalRec_;
-int FT_Glyph_Class_;
-int FT_Size_InternalRec_;
-int FT_SubGlyph;
-int FT_DriverRec_;
-int FT_Glyph_Format_;
-int FT_ENCODING_MS_BIG5;
-int FT_ENCODING_NONE;
-int FT_UShort;
-int FT_Generic;
-int FT_Memory;
-int FT_ENCODING_UNICODE;
-int FT_Bitmap;
-int FT_Vector_;
-int FT_Glyph_Metrics_;
-int FT_GlyphRec;
-int FT_Generic_Finalizer;
-int FT_ENCODING_JOHAB;
-int FT_LibraryRec_;
-int FT_ListRec_;
-int FT_Stream;
-int FT_Stream_IoFunc;
-int FT_Int;
-int FT_ListNodeRec_;
-int FT_ListNode;
-int FT_BBox_;
-int FT_SizeRec_;
-int FT_ENCODING_ADOBE_STANDARD;
-int FT_Vector;
-int FT_ENCODING_MS_SYMBOL;
-int FT_Error;
-int FT_ListRec;
-int FT_CharMapRec_;
-int FT_Encoding_;
-int FT_Generic_;
-int FT_GlyphRec_;
-int FT_GLYPH_FORMAT_BITMAP;
-int FT_Size;
-int FT_Size_Metrics;
-int FT_String;
-int FT_ENCODING_MS_WANSUNG;
-int FT_Library;
-int FT_Glyph;
-int FT_ENCODING_SJIS;
-int FT_Face;
-int FT_StreamDesc;
-int FT_SubGlyphRec_;
-int FT_Fixed;
-int FT_FaceRec_;
-int FT_Glyph_Format;
-int FT_GLYPH_FORMAT_OUTLINE;
-int FT_ENCODING_MS_GB2312;
-int FT_Bitmap_;
-int FT_Size_Metrics_;
-int FT_ENCODING_ADOBE_CUSTOM;
-int FT_Encoding;
-int FT_ENCODING_MS_JOHAB;
-int FT_UInt32;
-int FT_Glyph_Metrics;
-int FT_UInt;
-int FT_Bitmap_Size_;
-int FT_GLYPH_FORMAT_COMPOSITE;
-int FT_BBox;
-int FT_CharMap;
-int FT_Short;
-int FT_Size_Internal;
-int FT_MemoryRec_;
-int FT_Pos;
-int FT_ENCODING_BIG5;
-int FT_GLYPH_FORMAT_NONE;
-int FT_Outline_;
-int FT_ENCODING_GB2312;
-int FT_GlyphSlot;
-int FT_ENCODING_ADOBE_LATIN_1;
-int FT_Stream_CloseFunc;
-int FT_ENCODING_WANSUNG;
-int FT_Alloc_Func;
-int FT_Bitmap_Size;
-int FT_StreamDesc_;
-int FT_GLYPH_FORMAT_PLOTTER;
-int FT_Long;
-int FT_Slot_Internal;
-int FT_Free_Func;
-int FT_Slot_InternalRec_;
-int FT_Driver;
-int FT_Glyph_Class;
-int FT_ENCODING_OLD_LATIN_2;
-int FT_Outline;
-int FT_BitmapGlyphRec_;
-int FT_ENCODING_MS_SJIS;
-int FT_GlyphSlotRec_;
-int FT_Realloc_Func;
-int FT_Done_Glyph;
-int FT_Done_Face;
-int FT_New_Face;
-int FT_Set_Char_Size;
-int FT_Select_Charmap;
-int FT_Set_Pixel_Sizes;
-int FT_UInt32;
-int FT_Memory;
-int FT_Alloc_Func;
-int FT_Free_Func;
-int FT_Realloc_Func;
-int FT_MemoryRec_;
-int FT_Stream;
-int FT_StreamDesc_;
-int FT_StreamDesc;
-int FT_Stream_IoFunc;
-int FT_Stream_CloseFunc;
-int FT_StreamRec_;
-int FT_Pos;
-int FT_Vector_;
-int FT_Vector;
-int FT_BBox_;
-int FT_BBox;
-int FT_Bitmap_;
-int FT_Bitmap;
-int FT_Outline_;
-int FT_Outline;
-int FT_Glyph_Format_;
-int FT_Glyph_Format;
-int FT_String;
-int FT_Short;
-int FT_UShort;
-int FT_Int;
-int FT_UInt;
-int FT_Long;
-int FT_Fixed;
-int FT_Generic_Finalizer;
-int FT_Generic_;
-int FT_Generic;
-int FT_ListNode;
-int FT_ListNodeRec_;
-int FT_ListRec_;
-int FT_ListRec;
-int FT_Glyph_Metrics_;
-int FT_Glyph_Metrics;
-int FT_Bitmap_Size_;
-int FT_Bitmap_Size;
-int FT_Library;
-int FT_Driver;
-int FT_Face;
-int FT_Size;
-int FT_GlyphSlot;
-int FT_CharMap;
-int FT_Encoding_;
-int FT_Encoding;
-int FT_CharMapRec_;
-int FT_Face_Internal;
-int FT_FaceRec_;
-int FT_Size_Internal;
-int FT_Size_Metrics_;
-int FT_Size_Metrics;
-int FT_SizeRec_;
-int FT_SubGlyph;
-int FT_Slot_Internal;
-int FT_GlyphSlotRec_;
-int FT_ENCODING_APPLE_ROMAN;
-int FT_Face_Internal;
-int FT_ENCODING_ADOBE_EXPERT;
-int FT_StreamRec_;
-int FT_Face_InternalRec_;
-int FT_Size_InternalRec_;
-int FT_SubGlyph;
-int FT_DriverRec_;
-int FT_Glyph_Format_;
-int FT_ENCODING_MS_BIG5;
-int FT_ENCODING_NONE;
-int FT_UShort;
-int FT_Generic;
-int FT_Memory;
-int FT_ENCODING_UNICODE;
-int FT_Bitmap;
-int FT_Vector_;
-int FT_Glyph_Metrics_;
-int FT_Generic_Finalizer;
-int FT_ENCODING_JOHAB;
-int FT_LibraryRec_;
-int FT_ListRec_;
-int FT_Stream;
-int FT_Stream_IoFunc;
-int FT_Int;
-int FT_ListNodeRec_;
-int FT_ListNode;
-int FT_BBox_;
-int FT_SizeRec_;
-int FT_ENCODING_ADOBE_STANDARD;
-int FT_Vector;
-int FT_ENCODING_MS_SYMBOL;
-int FT_ListRec;
-int FT_CharMapRec_;
-int FT_Encoding_;
-int FT_Generic_;
-int FT_GLYPH_FORMAT_BITMAP;
-int FT_Size;
-int FT_Size_Metrics;
-int FT_String;
-int FT_ENCODING_MS_WANSUNG;
-int FT_Library;
-int FT_ENCODING_SJIS;
-int FT_Face;
-int FT_StreamDesc;
-int FT_SubGlyphRec_;
-int FT_Fixed;
-int FT_FaceRec_;
-int FT_Glyph_Format;
-int FT_GLYPH_FORMAT_OUTLINE;
-int FT_ENCODING_MS_GB2312;
-int FT_Bitmap_;
-int FT_Size_Metrics_;
-int FT_ENCODING_ADOBE_CUSTOM;
-int FT_Encoding;
-int FT_ENCODING_MS_JOHAB;
-int FT_UInt32;
-int FT_Glyph_Metrics;
-int FT_UInt;
-int FT_Bitmap_Size_;
-int FT_GLYPH_FORMAT_COMPOSITE;
-int FT_BBox;
-int FT_CharMap;
-int FT_Short;
-int FT_Size_Internal;
-int FT_MemoryRec_;
-int FT_Pos;
-int FT_ENCODING_BIG5;
-int FT_GLYPH_FORMAT_NONE;
-int FT_Outline_;
-int FT_ENCODING_GB2312;
-int FT_GlyphSlot;
-int FT_ENCODING_ADOBE_LATIN_1;
-int FT_Stream_CloseFunc;
-int FT_ENCODING_WANSUNG;
-int FT_Alloc_Func;
-int FT_Bitmap_Size;
-int FT_StreamDesc_;
-int FT_GLYPH_FORMAT_PLOTTER;
-int FT_Long;
-int FT_Slot_Internal;
-int FT_Free_Func;
-int FT_Slot_InternalRec_;
-int FT_Driver;
-int FT_ENCODING_OLD_LATIN_2;
-int FT_Outline;
-int FT_ENCODING_MS_SJIS;
-int FT_GlyphSlotRec_;
-int FT_Realloc_Func;
-int FT_Init_FreeType;
-int FT_Memory;
-int FT_Alloc_Func;
-int FT_Free_Func;
-int FT_Realloc_Func;
-int FT_MemoryRec_;
-int FT_Stream;
-int FT_StreamDesc_;
-int FT_StreamDesc;
-int FT_Stream_IoFunc;
-int FT_Stream_CloseFunc;
-int FT_StreamRec_;
-int FT_Pos;
-int FT_Vector_;
-int FT_Vector;
-int FT_BBox_;
-int FT_BBox;
-int FT_Bitmap_;
-int FT_Bitmap;
-int FT_Outline_;
-int FT_Outline;
-int FT_Glyph_Format_;
-int FT_Glyph_Format;
-int FT_String;
-int FT_Short;
-int FT_UShort;
-int FT_Int;
-int FT_UInt;
-int FT_Long;
-int FT_Fixed;
-int FT_Generic_Finalizer;
-int FT_Generic_;
-int FT_Generic;
-int FT_ListNode;
-int FT_ListNodeRec_;
-int FT_ListRec_;
-int FT_ListRec;
-int FT_Glyph_Metrics_;
-int FT_Glyph_Metrics;
-int FT_Bitmap_Size_;
-int FT_Bitmap_Size;
-int FT_Library;
-int FT_Driver;
-int FT_Face;
-int FT_Size;
-int FT_GlyphSlot;
-int FT_CharMap;
-int FT_Encoding_;
-int FT_Encoding;
-int FT_CharMapRec_;
-int FT_Face_Internal;
-int FT_FaceRec_;
-int FT_Size_Internal;
-int FT_Size_Metrics_;
-int FT_Size_Metrics;
-int FT_SizeRec_;
-int FT_SubGlyph;
-int FT_Slot_Internal;
-int FT_GlyphSlotRec_;
-int FT_Kerning_Mode_;
-int FT_Glyph_Class;
-int FT_Glyph;
-int FT_GlyphRec_;
-int FT_GlyphRec;
-int FT_BitmapGlyph;
-int FT_BitmapGlyphRec_;
-int FT_ENCODING_APPLE_ROMAN;
-int FT_Face_Internal;
-int FT_ENCODING_ADOBE_EXPERT;
-int FT_BitmapGlyph;
-int FT_StreamRec_;
-int FT_Face_InternalRec_;
-int FT_Glyph_Class_;
-int FT_Size_InternalRec_;
-int FT_SubGlyph;
-int FT_DriverRec_;
-int FT_Glyph_Format_;
-int FT_ENCODING_MS_BIG5;
-int FT_ENCODING_NONE;
-int FT_UShort;
-int FT_Generic;
-int FT_Memory;
-int FT_ENCODING_UNICODE;
-int FT_KERNING_DEFAULT;
-int FT_Bitmap;
-int FT_Vector_;
-int FT_Glyph_Metrics_;
-int FT_GlyphRec;
-int FT_Generic_Finalizer;
-int FT_ENCODING_JOHAB;
-int FT_LibraryRec_;
-int FT_ListRec_;
-int FT_Stream;
-int FT_Stream_IoFunc;
-int FT_Int;
-int FT_ListNodeRec_;
-int FT_ListNode;
-int FT_BBox_;
-int FT_SizeRec_;
-int FT_ENCODING_ADOBE_STANDARD;
-int FT_Vector;
-int FT_Kerning_Mode_;
-int FT_ENCODING_MS_SYMBOL;
-int FT_ListRec;
-int FT_CharMapRec_;
-int FT_Encoding_;
-int FT_Generic_;
-int FT_GlyphRec_;
-int FT_GLYPH_FORMAT_BITMAP;
-int FT_Size;
-int FT_Size_Metrics;
-int FT_String;
-int FT_ENCODING_MS_WANSUNG;
-int FT_Library;
-int FT_Glyph;
-int FT_ENCODING_SJIS;
-int FT_KERNING_UNFITTED;
-int FT_KERNING_UNSCALED;
-int FT_Face;
-int FT_StreamDesc;
-int FT_SubGlyphRec_;
-int FT_Fixed;
-int FT_FaceRec_;
-int FT_Glyph_Format;
-int FT_GLYPH_FORMAT_OUTLINE;
-int FT_ENCODING_MS_GB2312;
-int FT_Bitmap_;
-int FT_Size_Metrics_;
-int FT_ENCODING_ADOBE_CUSTOM;
-int FT_Encoding;
-int FT_ENCODING_MS_JOHAB;
-int FT_Glyph_Metrics;
-int FT_UInt;
-int FT_Bitmap_Size_;
-int FT_GLYPH_FORMAT_COMPOSITE;
-int FT_BBox;
-int FT_CharMap;
-int FT_Short;
-int FT_Size_Internal;
-int FT_MemoryRec_;
-int FT_Pos;
-int FT_ENCODING_BIG5;
-int FT_GLYPH_FORMAT_NONE;
-int FT_Outline_;
-int FT_ENCODING_GB2312;
-int FT_GlyphSlot;
-int FT_ENCODING_ADOBE_LATIN_1;
-int FT_Stream_CloseFunc;
-int FT_ENCODING_WANSUNG;
-int FT_Alloc_Func;
-int FT_Bitmap_Size;
-int FT_StreamDesc_;
-int FT_GLYPH_FORMAT_PLOTTER;
-int FT_Long;
-int FT_Slot_Internal;
-int FT_Free_Func;
-int FT_Slot_InternalRec_;
-int FT_Driver;
-int FT_Glyph_Class;
-int FT_ENCODING_OLD_LATIN_2;
-int FT_Outline;
-int FT_BitmapGlyphRec_;
-int FT_ENCODING_MS_SJIS;
-int FT_GlyphSlotRec_;
-int FT_Realloc_Func;
-int FT_Get_Kerning;
diff --git a/lib-x86-32/ft2.o b/lib-x86-32/ft2.o
deleted file mode 100644
index 2ce18485..00000000
--- a/lib-x86-32/ft2.o
+++ /dev/null
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atk-enum-types.h b/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atk-enum-types.h
deleted file mode 100644
index f95e70a6..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atk-enum-types.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-/* Generated data (by glib-mkenums) */
-
-#ifndef __ATK_ENUM_TYPES_H__
-#define __ATK_ENUM_TYPES_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-/* enumerations from "atkhyperlink.h" */
-GType atk_hyperlink_state_flags_get_type (void);
-#define ATK_TYPE_HYPERLINK_STATE_FLAGS (atk_hyperlink_state_flags_get_type())
-/* enumerations from "atkobject.h" */
-GType atk_role_get_type (void);
-#define ATK_TYPE_ROLE (atk_role_get_type())
-GType atk_layer_get_type (void);
-#define ATK_TYPE_LAYER (atk_layer_get_type())
-/* enumerations from "atkrelationtype.h" */
-GType atk_relation_type_get_type (void);
-#define ATK_TYPE_RELATION_TYPE (atk_relation_type_get_type())
-/* enumerations from "atkstate.h" */
-GType atk_state_type_get_type (void);
-#define ATK_TYPE_STATE_TYPE (atk_state_type_get_type())
-/* enumerations from "atktext.h" */
-GType atk_text_attribute_get_type (void);
-#define ATK_TYPE_TEXT_ATTRIBUTE (atk_text_attribute_get_type())
-GType atk_text_boundary_get_type (void);
-#define ATK_TYPE_TEXT_BOUNDARY (atk_text_boundary_get_type())
-GType atk_text_clip_type_get_type (void);
-#define ATK_TYPE_TEXT_CLIP_TYPE (atk_text_clip_type_get_type())
-/* enumerations from "atkutil.h" */
-GType atk_key_event_type_get_type (void);
-#define ATK_TYPE_KEY_EVENT_TYPE (atk_key_event_type_get_type())
-GType atk_coord_type_get_type (void);
-#define ATK_TYPE_COORD_TYPE (atk_coord_type_get_type())
-G_END_DECLS
-
-#endif /* __ATK_ENUM_TYPES_H__ */
-
-/* Generated data ends here */
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atk.h b/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atk.h
deleted file mode 100644
index 04d95390..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atk.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_H__
-#define __ATK_H__
-
-#include <atk/atkobject.h>
-#include <atk/atkaction.h>
-#include <atk/atkcomponent.h>
-#include <atk/atkdocument.h>
-#include <atk/atkeditabletext.h>
-#include <atk/atkgobjectaccessible.h>
-#include <atk/atkhyperlink.h>
-#include <atk/atkhyperlinkimpl.h>
-#include <atk/atkhypertext.h>
-#include <atk/atkimage.h>
-#include <atk/atknoopobject.h>
-#include <atk/atknoopobjectfactory.h>
-#include <atk/atkobjectfactory.h>
-#include <atk/atkregistry.h>
-#include <atk/atkrelation.h>
-#include <atk/atkrelationset.h>
-#include <atk/atkrelationtype.h>
-#include <atk/atkselection.h>
-#include <atk/atkstate.h>
-#include <atk/atkstateset.h>
-#include <atk/atkstreamablecontent.h>
-#include <atk/atktable.h>
-#include <atk/atktext.h>
-#include <atk/atkutil.h>
-#include <atk/atkmisc.h>
-#include <atk/atkvalue.h>
-
-#endif /* __ATK_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkaction.h b/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkaction.h
deleted file mode 100644
index 8dfee9fe..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkaction.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_ACTION_H__
-#define __ATK_ACTION_H__
-
-#include <atk/atkobject.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * The interface AtkAction should be supported by any object that can 
- * perform one or more actions. The interface provides the standard 
- * mechanism for an assistive technology to determine what those actions 
- * are as well as tell the object to perform them. Any object that can 
- * be manipulated should support this interface.
- */
-
-
-#define ATK_TYPE_ACTION                    (atk_action_get_type ())
-#define ATK_IS_ACTION(obj)                 G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_ACTION)
-#define ATK_ACTION(obj)                    G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_ACTION, AtkAction)
-#define ATK_ACTION_GET_IFACE(obj)          (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_ACTION, AtkActionIface))
-
-#ifndef _TYPEDEF_ATK_ACTION_
-#define _TYPEDEF_ATK_ACTION_
-typedef struct _AtkAction AtkAction;
-#endif
-typedef struct _AtkActionIface AtkActionIface;
-
-struct _AtkActionIface
-{
-  GTypeInterface parent;
-
-  gboolean                (*do_action)         (AtkAction         *action,
-                                                gint              i);
-  gint                    (*get_n_actions)     (AtkAction         *action);
-  G_CONST_RETURN gchar*   (*get_description)   (AtkAction         *action,
-                                                gint              i);
-  G_CONST_RETURN gchar*   (*get_name)          (AtkAction         *action,
-                                                gint              i);
-  G_CONST_RETURN gchar*   (*get_keybinding)    (AtkAction         *action,
-                                                gint              i);
-  gboolean                (*set_description)   (AtkAction         *action,
-                                                gint              i,
-                                                const gchar       *desc);
-  G_CONST_RETURN gchar*   (*get_localized_name)(AtkAction         *action,
-						gint              i);
-  AtkFunction             pad2;
-};
-
-GType atk_action_get_type (void);
-
-/*
- * These are the function which would be called by an application with
- * the argument being a AtkObject object cast to (AtkAction).
- *
- * The function will just check that * the corresponding
- * function pointer is not NULL and will call it.
- *
- * The "real" implementation of the function for accessible will be
- * provided in a support library
- */
-
-gboolean   atk_action_do_action                (AtkAction         *action,
-                                            gint              i);
-gint   atk_action_get_n_actions            (AtkAction *action);
-G_CONST_RETURN gchar* atk_action_get_description  (AtkAction         *action,
-                                                   gint              i);
-G_CONST_RETURN gchar* atk_action_get_name         (AtkAction         *action,
-                                                   gint              i);
-G_CONST_RETURN gchar* atk_action_get_keybinding   (AtkAction         *action,
-                                                   gint              i);
-gboolean              atk_action_set_description  (AtkAction         *action,
-                                                   gint              i,
-                                                   const gchar       *desc);
-
-/* NEW in ATK 1.1: */
-
-G_CONST_RETURN gchar* atk_action_get_localized_name (AtkAction       *action,
-						     gint            i);
-
-/*
- * Additional GObject properties exported by AtkAction:
- *    "accessible_action"
- *       (an accessible action, or the list of actions, has changed)
- */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __ATK_ACTION_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkcomponent.h b/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkcomponent.h
deleted file mode 100644
index c72a7283..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkcomponent.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_COMPONENT_H__
-#define __ATK_COMPONENT_H__
-
-#include <atk/atkobject.h>
-#include <atk/atkutil.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * The AtkComponent interface should be supported by any object that is 
- * rendered on the screen. The interface provides the standard mechanism 
- * for an assistive technology to determine and set the graphical
- * representation of an object.
- */
-
-#define ATK_TYPE_COMPONENT                    (atk_component_get_type ())
-#define ATK_IS_COMPONENT(obj)                 G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_COMPONENT)
-#define ATK_COMPONENT(obj)                    G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_COMPONENT, AtkComponent)
-#define ATK_COMPONENT_GET_IFACE(obj)          (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_COMPONENT, AtkComponentIface))
-
-#ifndef _TYPEDEF_ATK_COMPONENT_
-#define _TYPEDEF_ATK_COMPONENT_
-typedef struct _AtkComponent AtkComponent;
-#endif
-typedef struct _AtkComponentIface  AtkComponentIface;
-
-typedef void (*AtkFocusHandler) (AtkObject*, gboolean);
-
-typedef struct _AtkRectangle       AtkRectangle;
-
-struct _AtkRectangle
-{
-  gint x;
-  gint y;
-  gint width;
-  gint height;
-};
-
-GType atk_rectangle_get_type (void);
-
-#define ATK_TYPE_RECTANGLE (atk_rectangle_get_type ())
-struct _AtkComponentIface
-{
-  GTypeInterface parent;
-
-  guint          (* add_focus_handler)  (AtkComponent          *component,
-                                         AtkFocusHandler        handler);
-
-  gboolean       (* contains)           (AtkComponent          *component,
-                                         gint                   x,
-                                         gint                   y,
-                                         AtkCoordType           coord_type);
-
-  AtkObject*    (* ref_accessible_at_point)  (AtkComponent     *component,
-                                         gint                   x,
-                                         gint                   y,
-                                         AtkCoordType           coord_type);
-  void          (* get_extents)         (AtkComponent          *component,
-                                         gint                  *x,
-                                         gint                  *y,
-                                         gint                  *width,
-                                         gint                  *height,
-                                         AtkCoordType          coord_type);
-  void                     (* get_position)     (AtkComponent   *component,
-                                                 gint           *x,
-                                                 gint           *y,
-                                                 AtkCoordType   coord_type);
-  void                     (* get_size)                 (AtkComponent   *component,
-                                                         gint           *width,
-                                                         gint           *height);
-  gboolean                 (* grab_focus)               (AtkComponent   *component);
-  void                     (* remove_focus_handler)      (AtkComponent  *component,
-                                                          guint         handler_id);
-  gboolean                 (* set_extents)      (AtkComponent   *component,
-                                                 gint           x,
-                                                 gint           y,
-                                                 gint           width,
-                                                 gint           height,
-                                                 AtkCoordType   coord_type);
-  gboolean                 (* set_position)     (AtkComponent   *component,
-                                                 gint           x,
-                                                 gint           y,
-                                                 AtkCoordType   coord_type);
-  gboolean                 (* set_size)         (AtkComponent   *component,
-                                                 gint           width,
-                                                 gint           height);
-  	
-  AtkLayer                 (* get_layer)        (AtkComponent   *component);
-  gint                     (* get_mdi_zorder)   (AtkComponent   *component);
-
-  /*
-   * signal handlers
-   */
-  void                     (* bounds_changed)   (AtkComponent   *component,
-                                                 AtkRectangle   *bounds);
-  gdouble                  (* get_alpha)        (AtkComponent   *component);
-};
-
-GType atk_component_get_type (void);
-
-/* convenience functions */
-
-guint                atk_component_add_focus_handler      (AtkComponent    *component,
-                                                           AtkFocusHandler handler);
-gboolean              atk_component_contains               (AtkComponent    *component,
-                                                            gint            x,
-                                                            gint            y,
-                                                            AtkCoordType    coord_type);
-AtkObject*            atk_component_ref_accessible_at_point(AtkComponent    *component,
-                                                            gint            x,
-                                                            gint            y,
-                                                            AtkCoordType    coord_type);
-void                  atk_component_get_extents            (AtkComponent    *component,
-                                                            gint            *x,
-                                                            gint            *y,
-                                                            gint            *width,
-                                                            gint            *height,
-                                                            AtkCoordType    coord_type);
-void                  atk_component_get_position           (AtkComponent    *component,
-                                                            gint            *x,
-                                                            gint            *y,
-                                                            AtkCoordType    coord_type);
-void                  atk_component_get_size               (AtkComponent    *component,
-                                                            gint            *width,
-                                                            gint            *height);
-AtkLayer              atk_component_get_layer              (AtkComponent    *component);
-gint                  atk_component_get_mdi_zorder         (AtkComponent    *component);
-gboolean              atk_component_grab_focus             (AtkComponent    *component);
-void                  atk_component_remove_focus_handler   (AtkComponent    *component,
-                                                            guint           handler_id);
-gboolean              atk_component_set_extents            (AtkComponent    *component,
-                                                            gint            x,
-                                                            gint            y,
-                                                            gint            width,
-                                                            gint            height,
-                                                            AtkCoordType    coord_type);
-gboolean              atk_component_set_position           (AtkComponent    *component,
-                                                            gint            x,
-                                                            gint            y,
-                                                            AtkCoordType    coord_type);
-gboolean              atk_component_set_size               (AtkComponent    *component,
-                                                            gint            width,
-                                                            gint            height);
-gdouble               atk_component_get_alpha              (AtkComponent    *component);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __ATK_COMPONENT_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkdocument.h b/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkdocument.h
deleted file mode 100644
index 202cbef0..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkdocument.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_DOCUMENT_H__
-#define __ATK_DOCUMENT_H__
-
-#include <atk/atkobject.h>
-#include <atk/atkutil.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * The AtkDocument interface should be supported by any object that is a container
- * for 'document content' as opposed to a collection of user interface elements.
- *
- */
-
-#define ATK_TYPE_DOCUMENT                   (atk_document_get_type ())
-#define ATK_IS_DOCUMENT(obj)                G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_DOCUMENT)
-#define ATK_DOCUMENT(obj)                   G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_DOCUMENT, AtkDocument)
-#define ATK_DOCUMENT_GET_IFACE(obj)         (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_DOCUMENT, AtkDocumentIface))
-
-#ifndef _TYPEDEF_ATK_DOCUMENT_
-#define _TYPEDEF_ATK_DOCUMENT_
-typedef struct _AtkDocument AtkDocument;
-#endif
-typedef struct _AtkDocumentIface AtkDocumentIface;
-
-struct _AtkDocumentIface
-{
-  GTypeInterface parent;
-  G_CONST_RETURN gchar* ( *get_document_type) (AtkDocument              *document);
-  gpointer              ( *get_document)      (AtkDocument              *document);
-
-  G_CONST_RETURN gchar* ( *get_document_locale) (AtkDocument              *document);
-  AtkAttributeSet *     ( *get_document_attributes) (AtkDocument        *document);
-  G_CONST_RETURN gchar* ( *get_document_attribute_value) (AtkDocument   *document,
-                                                          const gchar   *attribute_name);
-  gboolean              ( *set_document_attribute) (AtkDocument         *document,
-                                                    const gchar         *attribute_name,
-                                                    const gchar         *attribute_value);
-  
-  AtkFunction pad1;
-  AtkFunction pad2;
-  AtkFunction pad3;
-  AtkFunction pad4;
-};
-
-GType  atk_document_get_type             (void);
-
-G_CONST_RETURN gchar* atk_document_get_document_type (AtkDocument   *document);
-gpointer atk_document_get_document (AtkDocument   *document);
-G_CONST_RETURN gchar* atk_document_get_locale (AtkDocument *document);
-AtkAttributeSet*      atk_document_get_attributes (AtkDocument *document);
-G_CONST_RETURN gchar* atk_document_get_attribute_value (AtkDocument *document, 
-                                                        const gchar *attribute_name);
-gboolean              atk_document_set_attribute_value (AtkDocument *document,
-                                                        const gchar *attribute_name,
-                                                        const gchar *attribute_value);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* __ATK_DOCUMENT_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkeditabletext.h b/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkeditabletext.h
deleted file mode 100644
index 02937ff8..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkeditabletext.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_EDITABLE_TEXT_H__
-#define __ATK_EDITABLE_TEXT_H__
-
-#include <atk/atkobject.h>
-#include <atk/atktext.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * AtkEditableText is used to support access in an "accessibility" context
- * to editing features of editable text widgets.
- */
-
-#define ATK_TYPE_EDITABLE_TEXT                    (atk_editable_text_get_type ())
-#define ATK_IS_EDITABLE_TEXT(obj)                 G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_EDITABLE_TEXT)
-#define ATK_EDITABLE_TEXT(obj)                    G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_EDITABLE_TEXT, AtkEditableText)
-#define ATK_EDITABLE_TEXT_GET_IFACE(obj)          (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_EDITABLE_TEXT, AtkEditableTextIface))
-
-#ifndef _TYPEDEF_ATK_EDITABLE_TEXT_
-#define _TYPEDEF_ATK_EDITABLE_TEXT_
-typedef struct _AtkEditableText AtkEditableText;
-#endif
-typedef struct _AtkEditableTextIface AtkEditableTextIface;
-
-struct _AtkEditableTextIface
-{
-  GTypeInterface parent_interface;
-
-  gboolean (* set_run_attributes) (AtkEditableText  *text,
-                                   AtkAttributeSet  *attrib_set,
-                                   gint		    start_offset,
- 				   gint		    end_offset);
-  void   (* set_text_contents)    (AtkEditableText  *text,
-                                   const gchar      *string);
-  void   (* insert_text)          (AtkEditableText  *text,
-                                   const gchar      *string,
-                                   gint             length,
-                                   gint             *position);
-  void   (* copy_text)            (AtkEditableText  *text,
-                                   gint             start_pos,
-                                   gint             end_pos);
-  void   (* cut_text)             (AtkEditableText  *text,
-                                   gint             start_pos,
-                                   gint             end_pos);
-  void   (* delete_text)          (AtkEditableText  *text,
-                                   gint             start_pos,
-                                   gint             end_pos);
-  void   (* paste_text)           (AtkEditableText  *text,
-                                   gint             position);
-
-  AtkFunction                     pad1;
-  AtkFunction                     pad2;
-};
-GType atk_editable_text_get_type (void);
-
-
-gboolean atk_editable_text_set_run_attributes (AtkEditableText          *text,
-                                               AtkAttributeSet  *attrib_set,
-                                               gint    	        start_offset,
- 					       gint	        end_offset);
-void atk_editable_text_set_text_contents    (AtkEditableText  *text,
-                                             const gchar      *string);
-void atk_editable_text_insert_text          (AtkEditableText  *text,
-                                             const gchar      *string,
-                                             gint             length,
-                                             gint             *position);
-void atk_editable_text_copy_text            (AtkEditableText  *text,
-                                             gint             start_pos,
-                                             gint             end_pos);
-void atk_editable_text_cut_text             (AtkEditableText  *text,
-                                             gint             start_pos,
-                                             gint             end_pos);
-void atk_editable_text_delete_text          (AtkEditableText  *text,
-                                             gint             start_pos,
-                                             gint             end_pos);
-void atk_editable_text_paste_text           (AtkEditableText  *text,
-                                             gint             position);
- 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __ATK_EDITABLE_TEXT_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkgobjectaccessible.h b/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkgobjectaccessible.h
deleted file mode 100644
index adb46cd9..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkgobjectaccessible.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ATK - Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_GOBJECT_ACCESSIBLE_H__
-#define __ATK_GOBJECT_ACCESSIBLE_H__
-
-#include <atk/atk.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * The AtkGObjectAccessible class is provided as a basis for implementing
- * accessibility support for objects which are not GTK+ widgets
- */
-#define ATK_TYPE_GOBJECT_ACCESSIBLE            (atk_gobject_accessible_get_type ())
-#define ATK_GOBJECT_ACCESSIBLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_GOBJECT_ACCESSIBLE, AtkGObjectAccessible))
-#define ATK_GOBJECT_ACCESSIBLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_GOBJECT_ACCESSIBLE, AtkGObjectAccessibleClass))
-#define ATK_IS_GOBJECT_ACCESSIBLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_GOBJECT_ACCESSIBLE))
-#define ATK_IS_GOBJECT_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_GOBJECT_ACCESSIBLE))
-#define ATK_GOBJECT_ACCESSIBLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_GOBJECT_ACCESSIBLE, AtkGObjectAccessibleClass))
-
-typedef struct _AtkGObjectAccessible                AtkGObjectAccessible;
-typedef struct _AtkGObjectAccessibleClass           AtkGObjectAccessibleClass;
-
-struct _AtkGObjectAccessible
-{
-  AtkObject parent;
-};
-
-GType atk_gobject_accessible_get_type (void);
-
-struct _AtkGObjectAccessibleClass
-{
-  AtkObjectClass parent_class;
-
-  AtkFunction pad1;
-  AtkFunction pad2;
-};
-
-AtkObject *atk_gobject_accessible_for_object      (GObject           *obj);
-GObject   *atk_gobject_accessible_get_object      (AtkGObjectAccessible *obj);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __ATK_GOBJECT_ACCESSIBLE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkhyperlink.h b/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkhyperlink.h
deleted file mode 100644
index a5d3716f..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkhyperlink.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_HYPERLINK_H__
-#define __ATK_HYPERLINK_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include <atk/atkaction.h>
-
-/*
- * AtkHyperlink encapsulates a link or set of links in a hypertext document.
- *
- * It implements the AtkAction interface.
- */
-
-/**
- *AtkHyperlinkStateFlags
- *@ATK_HYPERLINK_IS_INLINE: Link is inline
- *
- *Describes the type of link
- **/ 
-typedef enum 
-{
-  ATK_HYPERLINK_IS_INLINE = 1 << 0
-} AtkHyperlinkStateFlags;
-
-#define ATK_TYPE_HYPERLINK                        (atk_hyperlink_get_type ())
-#define ATK_HYPERLINK(obj)                        (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_HYPERLINK, AtkHyperlink))
-#define ATK_HYPERLINK_CLASS(klass)                (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_HYPERLINK, AtkHyperlinkClass))
-#define ATK_IS_HYPERLINK(obj)                     (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_HYPERLINK))
-#define ATK_IS_HYPERLINK_CLASS(klass)             (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_HYPERLINK))
-#define ATK_HYPERLINK_GET_CLASS(obj)              (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_HYPERLINK, AtkHyperlinkClass))
-
-typedef struct _AtkHyperlink                      AtkHyperlink;
-typedef struct _AtkHyperlinkClass                 AtkHyperlinkClass;
-
-struct _AtkHyperlink
-{
-  GObject parent;
-};
-
-struct _AtkHyperlinkClass
-{
-  GObjectClass parent;
-
-  gchar*           (* get_uri)             (AtkHyperlink     *link_,
-                                            gint             i);
-  AtkObject*       (* get_object)          (AtkHyperlink     *link_,
-                                            gint             i);
-  gint             (* get_end_index)       (AtkHyperlink     *link_);
-  gint             (* get_start_index)     (AtkHyperlink     *link_);
-  gboolean         (* is_valid)            (AtkHyperlink     *link_);
-  gint	           (* get_n_anchors)	   (AtkHyperlink     *link_);
-  guint	           (* link_state)	   (AtkHyperlink     *link_);
-  gboolean         (* is_selected_link)    (AtkHyperlink     *link_);
-
-  /* Signals */
-  void             ( *link_activated)      (AtkHyperlink     *link_);
-  AtkFunction      pad1;
-};
-
-GType            atk_hyperlink_get_type             (void);
-
-gchar*           atk_hyperlink_get_uri              (AtkHyperlink     *link_,
-                                                     gint             i);
-
-AtkObject*       atk_hyperlink_get_object           (AtkHyperlink     *link_,
-                                                     gint             i);
-
-gint             atk_hyperlink_get_end_index        (AtkHyperlink     *link_);
-
-gint             atk_hyperlink_get_start_index      (AtkHyperlink     *link_);
-
-gboolean         atk_hyperlink_is_valid             (AtkHyperlink     *link_);
-
-gboolean         atk_hyperlink_is_inline             (AtkHyperlink     *link_);
-
-gint		 atk_hyperlink_get_n_anchors        (AtkHyperlink     *link_);
-gboolean         atk_hyperlink_is_selected_link     (AtkHyperlink     *link_);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __ATK_HYPERLINK_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkhyperlinkimpl.h b/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkhyperlinkimpl.h
deleted file mode 100644
index b08a1d53..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkhyperlinkimpl.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_HYPERLINK_IMPL_H__
-#define __ATK_HYPERLINK_IMPL_H__
-
-#include <atk/atkobject.h>
-#include <atk/atkhyperlink.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * The AtkHyperlinkImpl interface should be supported by objects
- * exposed within the hierarchy as children of an AtkHypertext container
- * which correspond to "links" or embedded content within the text.
- * HTML anchors are not, for instance, normally exposed this way,
- * but embedded images and components which appear inline in the
- * content of a text object are. The AtkHyperlinkIface interface
- * allows a means of determining which children are hyperlinks in this
- * sense of the word, and for obtaining their corresponding AtkHyperlink 
- * object, from which the embedding range, URI, etc. can be obtained.
- *
- * To some extent this interface exists because, for historical 
- * reasons, AtkHyperlink was defined as an object type, not an interface.
- * Thus, in order to interact with AtkObjects via AtkHyperlink semantics,
- * a new interface was required.
- */
-
-#define ATK_TYPE_HYPERLINK_IMPL          (atk_hyperlink_impl_get_type ())
-#define ATK_IS_HYPERLINK_IMPL(obj)       G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_HYPERLINK_IMPL)
-#define ATK_HYPERLINK_IMPL(obj)             G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_HYPERLINK_IMPL, AtkHyperlinkImpl)
-#define ATK_HYPERLINK_IMPL_GET_IFACE(obj)   G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_HYPERLINK_IMPL, AtkHyperlinkImplIface)
-
-#ifndef _TYPEDEF_ATK_HYPERLINK_IMPL_
-#define _TYPEDEF_ATK_HYPERLINK_IMPL__
-typedef struct _AtkHyperlinkImpl AtkHyperlinkImpl;
-#endif
-typedef struct _AtkHyperlinkImplIface AtkHyperlinkImplIface;
-
-struct _AtkHyperlinkImplIface
-{
-  GTypeInterface parent;
-    
-  AtkHyperlink*  (* get_hyperlink) (AtkHyperlinkImpl *impl);
-
-  AtkFunction pad1;
-};
-
-GType            atk_hyperlink_impl_get_type (void);
-
-AtkHyperlink    *atk_hyperlink_impl_get_hyperlink (AtkHyperlinkImpl *obj);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __ATK_HYPERLINK_IMPL_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkhypertext.h b/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkhypertext.h
deleted file mode 100644
index 18464d9f..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkhypertext.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_HYPERTEXT_H__
-#define __ATK_HYPERTEXT_H__
-
-#include <atk/atkobject.h>
-#include <atk/atkhyperlink.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * The AtkHypertext interface provides standard  mechanisms for manipulating 
- * hyperlinks.
- */
-
-#define ATK_TYPE_HYPERTEXT                    (atk_hypertext_get_type ())
-#define ATK_IS_HYPERTEXT(obj)                 G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_HYPERTEXT)
-#define ATK_HYPERTEXT(obj)                    G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_HYPERTEXT, AtkHypertext)
-#define ATK_HYPERTEXT_GET_IFACE(obj)          (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_HYPERTEXT, AtkHypertextIface))
-
-#ifndef _TYPEDEF_ATK_HYPERTEXT_
-#define _TYPEDEF_ATK_HYPERTEXT_
-typedef struct _AtkHypertext AtkHypertext;
-#endif
-typedef struct _AtkHypertextIface AtkHypertextIface;
-
-struct _AtkHypertextIface
-{
-  GTypeInterface parent;
-
-  AtkHyperlink*(* get_link)                 (AtkHypertext       *hypertext,
-                                             gint               link_index);
-  gint         (* get_n_links)              (AtkHypertext       *hypertext);
-  gint         (* get_link_index)           (AtkHypertext       *hypertext,
-                                             gint               char_index);
-
-  /*
-   * signal handlers
-   */
-  void         (* link_selected)            (AtkHypertext       *hypertext,
-                                             gint               link_index);
-
-  AtkFunction pad1;
-  AtkFunction pad2;
-  AtkFunction pad3;
-};
-GType atk_hypertext_get_type (void);
-
-AtkHyperlink* atk_hypertext_get_link       (AtkHypertext *hypertext,
-                                            gint          link_index);
-gint          atk_hypertext_get_n_links    (AtkHypertext *hypertext);
-gint          atk_hypertext_get_link_index (AtkHypertext *hypertext,
-                                            gint          char_index);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __ATK_HYPERTEXT_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkimage.h b/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkimage.h
deleted file mode 100644
index 7e60c818..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkimage.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_IMAGE_H__
-#define __ATK_IMAGE_H__
-
-#include <atk/atkobject.h>
-#include <atk/atkutil.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * The AtkImage interface should be supported by any object that has an 
- * associated image. This interface provides the standard mechanism for 
- * an assistive technology to get descriptive information about images.
- */
-
-#define ATK_TYPE_IMAGE                   (atk_image_get_type ())
-#define ATK_IS_IMAGE(obj)                G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_IMAGE)
-#define ATK_IMAGE(obj)                   G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_IMAGE, AtkImage)
-#define ATK_IMAGE_GET_IFACE(obj)         (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_IMAGE, AtkImageIface))
-
-#ifndef _TYPEDEF_ATK_IMAGE_
-#define _TYPEDEF_ATK_IMAGE_
-typedef struct _AtkImage AtkImage;
-#endif
-typedef struct _AtkImageIface AtkImageIface;
-
-struct _AtkImageIface
-{
-  GTypeInterface parent;
-  void          	( *get_image_position)    (AtkImage		 *image,
-                                                   gint                  *x,
-				                   gint	                 *y,
-    			                           AtkCoordType	         coord_type);
-  G_CONST_RETURN gchar* ( *get_image_description) (AtkImage              *image);
-  void                  ( *get_image_size)        (AtkImage              *image,
-                                                   gint                  *width,
-                                                   gint                  *height);
-  gboolean              ( *set_image_description) (AtkImage              *image,
-                                                   const gchar           *description);
-  G_CONST_RETURN gchar* ( *get_image_locale)      (AtkImage              *image);
-
-  AtkFunction           pad1;
-	
-};
-
-GType  atk_image_get_type             (void);
-
-G_CONST_RETURN gchar* atk_image_get_image_description (AtkImage   *image);
-
-void     atk_image_get_image_size        (AtkImage           *image,
-                                          gint               *width,
-                                          gint               *height);
-
-gboolean atk_image_set_image_description (AtkImage           *image,
-                                          const gchar       *description);
-void     atk_image_get_image_position    (AtkImage	     *image,
-                                          gint               *x,
-					  gint	             *y,
-    					  AtkCoordType	     coord_type);
-
-G_CONST_RETURN gchar* atk_image_get_image_locale (AtkImage   *image);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* __ATK_IMAGE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkmisc.h b/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkmisc.h
deleted file mode 100644
index d750e2d0..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkmisc.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2007 Sun Microsystems 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 __ATK_MISC_H__
-#define __ATK_MISC_H__
-
-#include <glib-object.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define ATK_TYPE_MISC                   (atk_misc_get_type ())
-#define ATK_IS_MISC(obj)                G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_MISC)
-#define ATK_MISC(obj)                   G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_MISC, AtkMisc)
-#define ATK_MISC_CLASS(klass)                   (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_MISC, AtkMiscClass))
-#define ATK_IS_MISC_CLASS(klass)                (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_MISC))
-#define ATK_MISC_GET_CLASS(obj)                 (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_MISC, AtkMiscClass))
-
-
-#ifndef _TYPEDEF_ATK_MISC_
-#define _TYPEDEF_ATK_MISC_
-typedef struct _AtkMisc      AtkMisc;
-typedef struct _AtkMiscClass AtkMiscClass;
-#endif
-
-struct _AtkMisc
-{
-  GObject parent;
-};
-
-/*
- * Singleton instance - only the ATK implementation layer for
- * a given GUI toolkit/application instance should touch this
- * symbol directly.
- */
-extern AtkMisc *atk_misc_instance;
-
-struct _AtkMiscClass
-{
-   GObjectClass parent;
-   void   (* threads_enter)                     (AtkMisc *misc);
-   void   (* threads_leave)                     (AtkMisc *misc);
-   gpointer vfuncs[32]; /* future bincompat */
-};
-GType atk_misc_get_type (void);
-
-/*
- * Wrapper for thread lock, i.e. take the thread mutex for the GUI toolkit, 
- * if one exists.  
- * (This method is implemented by the toolkit ATK implementation layer;
- *  for instance, for GTK+, GAIL implements this via GDK_THREADS_ENTER).
- */
-void     atk_misc_threads_enter  (AtkMisc *misc);
-
-/*
- * Wrapper for thread lock, i.e. release the thread mutex for the GUI toolkit, 
- * if one exists.  
- * (This method is implemented by the toolkit ATK implementation layer;
- *  for instance, for GTK+, GAIL implements this via GDK_THREADS_LEAVE).
- */
-void     atk_misc_threads_leave  (AtkMisc *misc);
-
-/*
- * Obtain (singleton) instance of AtkMisc.
- */
-const AtkMisc *atk_misc_get_instance (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __ATK_MISC_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atknoopobject.h b/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atknoopobject.h
deleted file mode 100644
index 3c4e432a..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atknoopobject.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_NO_OP_OBJECT_H__
-#define __ATK_NO_OP_OBJECT_H__
-
-G_BEGIN_DECLS
-
-#define ATK_TYPE_NO_OP_OBJECT                (atk_no_op_object_get_type ())
-#define ATK_NO_OP_OBJECT(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_NO_OP_OBJECT, AtkNoOpObject))
-#define ATK_NO_OP_OBJECT_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_NO_OP_OBJECT, AtkNoOpObjectClass))
-#define ATK_IS_NO_OP_OBJECT(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_NO_OP_OBJECT))
-#define ATK_IS_NO_OP_OBJECT_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_NO_OP_OBJECT))
-#define ATK_NO_OP_OBJECT_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_NO_OP_OBJECT, AtkNoOpObjectClass))
-
-typedef struct _AtkNoOpObject                   AtkNoOpObject;
-typedef struct _AtkNoOpObjectClass              AtkNoOpObjectClass;
-
-struct _AtkNoOpObject
-{
-  AtkObject     parent;
-};
-
-GType atk_no_op_object_get_type (void);
-
-struct _AtkNoOpObjectClass
-{
-  AtkObjectClass parent_class;
-};
-
-AtkObject *atk_no_op_object_new (GObject  *obj);
-
-G_END_DECLS
-
-#endif /* __ATK_NO_OP_OBJECT_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atknoopobjectfactory.h b/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atknoopobjectfactory.h
deleted file mode 100644
index c3245313..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atknoopobjectfactory.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* ATK - Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_NO_OP_OBJECT_FACTORY_H__
-#define __ATK_NO_OP_OBJECT_FACTORY_H__
-
-#include <atk/atkobjectfactory.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define ATK_TYPE_NO_OP_OBJECT_FACTORY                (atk_no_op_object_factory_get_type ())
-#define ATK_NO_OP_OBJECT_FACTORY(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_NO_OP_OBJECT_FACTORY, AtkNoOpObjectFactory))
-#define ATK_NO_OP_OBJECT_FACTORY_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_NO_OP_OBJECT_FACTORY, AtkNoOpObjectFactoryClass))
-#define ATK_IS_NO_OP_OBJECT_FACTORY(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_NO_OP_OBJECT_FACTORY))
-#define ATK_IS_NO_OP_OBJECT_FACTORY_CLASS(klass)    (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_NO_OP_OBJECT_FACTORY))
-#define ATK_NO_OP_OBJECT_FACTORY_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ( (obj), ATK_TYPE_NO_OP_OBJECT_FACTORY, AtkNoOpObjectFactoryClass))
-
-typedef struct _AtkNoOpObjectFactory                 AtkNoOpObjectFactory;
-typedef struct _AtkNoOpObjectFactoryClass            AtkNoOpObjectFactoryClass;
-
-struct _AtkNoOpObjectFactory
-{
-  AtkObjectFactory parent;
-};
-
-struct _AtkNoOpObjectFactoryClass
-{
-  AtkObjectFactoryClass parent_class;
-};
-
-GType atk_no_op_object_factory_get_type(void);
-
-AtkObjectFactory *atk_no_op_object_factory_new(void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __ATK_NO_OP_OBJECT_FACTORY_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkobject.h b/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkobject.h
deleted file mode 100644
index bb9b55a0..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkobject.h
+++ /dev/null
@@ -1,648 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_OBJECT_H__
-#define __ATK_OBJECT_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include <glib-object.h>
-#include <atk/atkstate.h>
-#include <atk/atkrelationtype.h>
-
-/*
- * AtkObject represents the minimum information all accessible objects
- * return. This information includes accessible name, accessible
- * description, role and state of the object, as well information about
- * its parent and children. It is also possible to obtain more specific
- * accessibility information about a component if it supports one or more
- * of the following interfaces:
- */
-
-
-/**
- *AtkRole:
- *@ATK_ROLE_INVALID: Invalid role
- *@ATK_ROLE_ACCEL_LABEL: A label which represents an accelerator
- *@ATK_ROLE_ALERT: An object which is an alert to the user. Assistive Technologies typically respond to ATK_ROLE_ALERT by reading the entire onscreen contents of containers advertising this role.  Should be used for warning dialogs, etc.
- *@ATK_ROLE_ANIMATION: An object which is an animated image
- *@ATK_ROLE_ARROW: An arrow in one of the four cardinal directions
- *@ATK_ROLE_CALENDAR:  An object that displays a calendar and allows the user to select a date
- *@ATK_ROLE_CANVAS: An object that can be drawn into and is used to trap events
- *@ATK_ROLE_CHECK_BOX: A choice that can be checked or unchecked and provides a separate indicator for the current state
- *@ATK_ROLE_CHECK_MENU_ITEM: A menu item with a check box
- *@ATK_ROLE_COLOR_CHOOSER: A specialized dialog that lets the user choose a color
- *@ATK_ROLE_COLUMN_HEADER: The header for a column of data
- *@ATK_ROLE_COMBO_BOX: A list of choices the user can select from
- *@ATK_ROLE_DATE_EDITOR: An object whose purpose is to allow a user to edit a date
- *@ATK_ROLE_DESKTOP_ICON: An inconifed internal frame within a DESKTOP_PANE
- *@ATK_ROLE_DESKTOP_FRAME: A pane that supports internal frames and iconified versions of those internal frames
- *@ATK_ROLE_DIAL: An object whose purpose is to allow a user to set a value
- *@ATK_ROLE_DIALOG: A top level window with title bar and a border
- *@ATK_ROLE_DIRECTORY_PANE: A pane that allows the user to navigate through and select the contents of a directory
- *@ATK_ROLE_DRAWING_AREA: An object used for drawing custom user interface elements
- *@ATK_ROLE_FILE_CHOOSER: A specialized dialog that lets the user choose a file
- *@ATK_ROLE_FILLER: A object that fills up space in a user interface
- *@ATK_ROLE_FONT_CHOOSER: A specialized dialog that lets the user choose a font
- *@ATK_ROLE_FRAME: A top level window with a title bar, border, menubar, etc.
- *@ATK_ROLE_GLASS_PANE: A pane that is guaranteed to be painted on top of all panes beneath it
- *@ATK_ROLE_HTML_CONTAINER: A document container for HTML, whose children represent the document content
- *@ATK_ROLE_ICON: A small fixed size picture, typically used to decorate components
- *@ATK_ROLE_IMAGE: An object whose primary purpose is to display an image
- *@ATK_ROLE_INTERNAL_FRAME: A frame-like object that is clipped by a desktop pane
- *@ATK_ROLE_LABEL: An object used to present an icon or short string in an interface
- *@ATK_ROLE_LAYERED_PANE: A specialized pane that allows its children to be drawn in layers, providing a form of stacking order
- *@ATK_ROLE_LIST: An object that presents a list of objects to the user and allows the user to select one or more of them 
- *@ATK_ROLE_LIST_ITEM: An object that represents an element of a list 
- *@ATK_ROLE_MENU: An object usually found inside a menu bar that contains a list of actions the user can choose from
- *@ATK_ROLE_MENU_BAR: An object usually drawn at the top of the primary dialog box of an application that contains a list of menus the user can choose from 
- *@ATK_ROLE_MENU_ITEM: An object usually contained in a menu that presents an action the user can choose
- *@ATK_ROLE_OPTION_PANE: A specialized pane whose primary use is inside a DIALOG
- *@ATK_ROLE_PAGE_TAB: An object that is a child of a page tab list
- *@ATK_ROLE_PAGE_TAB_LIST: An object that presents a series of panels (or page tabs), one at a time, through some mechanism provided by the object 
- *@ATK_ROLE_PANEL: A generic container that is often used to group objects
- *@ATK_ROLE_PASSWORD_TEXT: A text object uses for passwords, or other places where the text content is not shown visibly to the user
- *@ATK_ROLE_POPUP_MENU: A temporary window that is usually used to offer the user a list of choices, and then hides when the user selects one of those choices
- *@ATK_ROLE_PROGRESS_BAR: An object used to indicate how much of a task has been completed
- *@ATK_ROLE_PUSH_BUTTON: An object the user can manipulate to tell the application to do something
- *@ATK_ROLE_RADIO_BUTTON: A specialized check box that will cause other radio buttons in the same group to become unchecked when this one is checked
- *@ATK_ROLE_RADIO_MENU_ITEM: A check menu item which belongs to a group. At each instant exactly one of the radio menu items from a group is selected
- *@ATK_ROLE_ROOT_PANE: A specialized pane that has a glass pane and a layered pane as its children
- *@ATK_ROLE_ROW_HEADER: The header for a row of data
- *@ATK_ROLE_SCROLL_BAR: An object usually used to allow a user to incrementally view a large amount of data.
- *@ATK_ROLE_SCROLL_PANE: An object that allows a user to incrementally view a large amount of information
- *@ATK_ROLE_SEPARATOR: An object usually contained in a menu to provide a visible and logical separation of the contents in a menu
- *@ATK_ROLE_SLIDER: An object that allows the user to select from a bounded range
- *@ATK_ROLE_SPLIT_PANE: A specialized panel that presents two other panels at the same time
- *@ATK_ROLE_SPIN_BUTTON: An object used to get an integer or floating point number from the user
- *@ATK_ROLE_STATUSBAR: An object which reports messages of minor importance to the user
- *@ATK_ROLE_TABLE: An object used to represent information in terms of rows and columns
- *@ATK_ROLE_TABLE_CELL: A cell in a table
- *@ATK_ROLE_TABLE_COLUMN_HEADER: The header for a column of a table
- *@ATK_ROLE_TABLE_ROW_HEADER: The header for a row of a table
- *@ATK_ROLE_TEAR_OFF_MENU_ITEM: A menu item used to tear off and reattach its menu
- *@ATK_ROLE_TERMINAL: An object that represents an accessible terminal.  @Since: ATK-0.6
- *@ATK_ROLE_TEXT: An object that presents text to the user
- *@ATK_ROLE_TOGGLE_BUTTON: A specialized push button that can be checked or unchecked, but does not provide a separate indicator for the current state
- *@ATK_ROLE_TOOL_BAR: A bar or palette usually composed of push buttons or toggle buttons
- *@ATK_ROLE_TOOL_TIP: An object that provides information about another object
- *@ATK_ROLE_TREE: An object used to represent hierarchical information to the user
- *@ATK_ROLE_TREE_TABLE: An object capable of expanding and collapsing rows as well as showing multiple columns of data.   @Since: ATK-0.7
- *@ATK_ROLE_UNKNOWN: The object contains some Accessible information, but its role is not known
- *@ATK_ROLE_VIEWPORT: An object usually used in a scroll pane
- *@ATK_ROLE_WINDOW: A top level window with no title or border.
- *@ATK_ROLE_HEADER: An object that serves as a document header. @Since:ATK 1.1.1
- *@ATK_ROLE_FOOTER: An object that serves as a document footer.  @Since: ATK-1.1.1
- *@ATK_ROLE_PARAGRAPH: An object which is contains a paragraph of text content.   @Since: ATK-1.1.1
- *@ATK_ROLE_RULER: An object which describes margins and tab stops, etc. for text objects which it controls (should have CONTROLLER_FOR relation to such).   @Since: ATK-1.1.1
- *@ATK_ROLE_APPLICATION: The object is an application object, which may contain @ATK_ROLE_FRAME objects or other types of accessibles.  The root accessible of any application's ATK hierarchy should have ATK_ROLE_APPLICATION.   @Since: ATK-1.1.4
- *@ATK_ROLE_AUTOCOMPLETE: The object is a dialog or list containing items for insertion into an entry widget, for instance a list of words for completion of a text entry.   @Since: ATK-1.3
- *@ATK_ROLE_EDITBAR: The object is an editable text object in a toolbar.  @Since: ATK-1.5
- *@ATK_ROLE_EMBEDDED: The object is an embedded container within a document or panel.  This role is a grouping "hint" indicating that the contained objects share a context.  @Since: ATK-1.7.2
- *@ATK_ROLE_ENTRY: The object is a component whose textual content may be entered or modified by the user, provided @ATK_STATE_EDITABLE is present.   @Since: ATK-1.11
- *@ATK_ROLE_CHART: The object is a graphical depiction of quantitative data. It may contain multiple subelements whose attributes and/or description may be queried to obtain both the quantitative data and information about how the data is being presented. The LABELLED_BY relation is particularly important in interpreting objects of this type, as is the accessible-description property.  @Since: ATK-1.11
- *@ATK_ROLE_CAPTION: The object contains descriptive information, usually textual, about another user interface element such as a table, chart, or image.  @Since: ATK-1.11
- *@ATK_ROLE_DOCUMENT_FRAME: The object is a visual frame or container which contains a view of document content. Document frames may occur within another Document instance, in which case the second document may be said to be embedded in the containing instance. HTML frames are often ROLE_DOCUMENT_FRAME. Either this object, or a singleton descendant, should implement the Document interface.  @Since: ATK-1.11
- *@ATK_ROLE_HEADING: The object serves as a heading for content which follows it in a document. The 'heading level' of the heading, if availabe, may be obtained by querying the object's attributes.
- *@ATK_ROLE_PAGE: The object is a containing instance which encapsulates a page of information. @ATK_ROLE_PAGE is used in documents and content which support a paginated navigation model.  @Since: ATK-1.11
- *@ATK_ROLE_SECTION: The object is a containing instance of document content which constitutes a particular 'logical' section of the document. The type of content within a section, and the nature of the section division itself, may be obtained by querying the object's attributes. Sections may be nested. @Since: ATK-1.11
- *@ATK_ROLE_REDUNDANT_OBJECT: The object is redundant with another object in the hierarchy, and is exposed for purely technical reasons.  Objects of this role should normally be ignored by clients. @Since: ATK-1.11
- *@ATK_ROLE_FORM: The object is a container for form controls, for instance as part of a 
- * web form or user-input form within a document.  This role is primarily a tag/convenience for 
- * clients when navigating complex documents, it is not expected that ordinary GUI containers will 
- * always have ATK_ROLE_FORM. @Since: ATK-1.12.0
- *@ATK_ROLE_LINK: The object is a hypertext anchor, i.e. a "link" in a
- * hypertext document.  Such objects are distinct from 'inline'
- * content which may also use the Hypertext/Hyperlink interfaces
- * to indicate the range/location within a text object where
- * an inline or embedded object lies.  @Since: ATK-1.12.1
- *@ATK_ROLE_INPUT_METHOD_WINDOW: The object is a window or similar viewport 
- * which is used to allow composition or input of a 'complex character',
- * in other words it is an "input method window." @Since: ATK-1.12.1
- *@ATK_ROLE_LAST_DEFINED: not a valid role, used for finding end of the enumeration
- * 
- * Describes the role of an object
- *
- * These are the built-in enumerated roles that UI components can have in
- * ATK.  Other roles may be added at runtime, so an AtkRole >=
- * ATK_ROLE_LAST_DEFINED is not necessarily an error.
- **/
-typedef enum
-{
-  ATK_ROLE_INVALID = 0, 
-  ATK_ROLE_ACCEL_LABEL,
-  ATK_ROLE_ALERT,
-  ATK_ROLE_ANIMATION,
-  ATK_ROLE_ARROW,
-  ATK_ROLE_CALENDAR,
-  ATK_ROLE_CANVAS,
-  ATK_ROLE_CHECK_BOX,
-  ATK_ROLE_CHECK_MENU_ITEM,
-  ATK_ROLE_COLOR_CHOOSER,
-  ATK_ROLE_COLUMN_HEADER,
-  ATK_ROLE_COMBO_BOX,
-  ATK_ROLE_DATE_EDITOR,
-  ATK_ROLE_DESKTOP_ICON,
-  ATK_ROLE_DESKTOP_FRAME,
-  ATK_ROLE_DIAL,
-  ATK_ROLE_DIALOG,
-  ATK_ROLE_DIRECTORY_PANE,
-  ATK_ROLE_DRAWING_AREA,
-  ATK_ROLE_FILE_CHOOSER,
-  ATK_ROLE_FILLER,
-  ATK_ROLE_FONT_CHOOSER,
-  ATK_ROLE_FRAME,
-  ATK_ROLE_GLASS_PANE,
-  ATK_ROLE_HTML_CONTAINER,
-  ATK_ROLE_ICON,
-  ATK_ROLE_IMAGE,
-  ATK_ROLE_INTERNAL_FRAME,
-  ATK_ROLE_LABEL,
-  ATK_ROLE_LAYERED_PANE,
-  ATK_ROLE_LIST,
-  ATK_ROLE_LIST_ITEM,
-  ATK_ROLE_MENU,
-  ATK_ROLE_MENU_BAR,
-  ATK_ROLE_MENU_ITEM,
-  ATK_ROLE_OPTION_PANE,
-  ATK_ROLE_PAGE_TAB,
-  ATK_ROLE_PAGE_TAB_LIST,
-  ATK_ROLE_PANEL,
-  ATK_ROLE_PASSWORD_TEXT,
-  ATK_ROLE_POPUP_MENU,
-  ATK_ROLE_PROGRESS_BAR,
-  ATK_ROLE_PUSH_BUTTON,
-  ATK_ROLE_RADIO_BUTTON,
-  ATK_ROLE_RADIO_MENU_ITEM,
-  ATK_ROLE_ROOT_PANE,
-  ATK_ROLE_ROW_HEADER,
-  ATK_ROLE_SCROLL_BAR,
-  ATK_ROLE_SCROLL_PANE,
-  ATK_ROLE_SEPARATOR,
-  ATK_ROLE_SLIDER,
-  ATK_ROLE_SPLIT_PANE,
-  ATK_ROLE_SPIN_BUTTON,
-  ATK_ROLE_STATUSBAR,
-  ATK_ROLE_TABLE,
-  ATK_ROLE_TABLE_CELL,
-  ATK_ROLE_TABLE_COLUMN_HEADER,
-  ATK_ROLE_TABLE_ROW_HEADER,
-  ATK_ROLE_TEAR_OFF_MENU_ITEM,
-  ATK_ROLE_TERMINAL,
-  ATK_ROLE_TEXT,
-  ATK_ROLE_TOGGLE_BUTTON,
-  ATK_ROLE_TOOL_BAR,
-  ATK_ROLE_TOOL_TIP,
-  ATK_ROLE_TREE,
-  ATK_ROLE_TREE_TABLE,
-  ATK_ROLE_UNKNOWN,
-  ATK_ROLE_VIEWPORT,
-  ATK_ROLE_WINDOW,
-  ATK_ROLE_HEADER,
-  ATK_ROLE_FOOTER,
-  ATK_ROLE_PARAGRAPH,
-  ATK_ROLE_RULER,
-  ATK_ROLE_APPLICATION,
-  ATK_ROLE_AUTOCOMPLETE,
-  ATK_ROLE_EDITBAR,
-  ATK_ROLE_EMBEDDED,
-  ATK_ROLE_ENTRY,
-  ATK_ROLE_CHART,
-  ATK_ROLE_CAPTION,
-  ATK_ROLE_DOCUMENT_FRAME,
-  ATK_ROLE_HEADING,
-  ATK_ROLE_PAGE,
-  ATK_ROLE_SECTION,
-  ATK_ROLE_REDUNDANT_OBJECT,
-  ATK_ROLE_FORM,
-  ATK_ROLE_LINK,
-  ATK_ROLE_INPUT_METHOD_WINDOW,
-  ATK_ROLE_LAST_DEFINED
-} AtkRole;
-
-AtkRole                  atk_role_register        (const gchar *name);
-
-/**
- *AtkLayer:
- *@ATK_LAYER_INVALID: The object does not have a layer
- *@ATK_LAYER_BACKGROUND: This layer is reserved for the desktop background
- *@ATK_LAYER_CANVAS: This layer is used for Canvas components
- *@ATK_LAYER_WIDGET: This layer is normally used for components
- *@ATK_LAYER_MDI: This layer is used for layered components
- *@ATK_LAYER_POPUP: This layer is used for popup components, such as menus
- *@ATK_LAYER_OVERLAY: This layer is reserved for future use.
- *@ATK_LAYER_WINDOW: This layer is used for toplevel windows.
- *
- * Describes the layer of a component
- *
- * These enumerated "layer values" are used when determining which UI
- * rendering layer a component is drawn into, which can help in making
- * determinations of when components occlude one another.
- **/
-typedef enum
-{
-  ATK_LAYER_INVALID,
-  ATK_LAYER_BACKGROUND,
-  ATK_LAYER_CANVAS,
-  ATK_LAYER_WIDGET,
-  ATK_LAYER_MDI,
-  ATK_LAYER_POPUP,
-  ATK_LAYER_OVERLAY,
-  ATK_LAYER_WINDOW
-} AtkLayer;
-
-/**
- * AtkAttributeSet:
- *
- * This is a singly-linked list (a #GSList) of #AtkAttribute. It is
- * used by atk_text_get_run_attributes(), atk_text_get_default_attributes()
- * and atk_editable_text_set_run_attributes()
- **/
-typedef GSList AtkAttributeSet;
-
-/**
- * AtkAttribute:
- * @name: The attribute name. Call atk_text_attr_get_name()
- * @value: the value of the attribute, represented as a string. 
- * Call atk_text_attr_get_value() for those which are strings.
- * For values which are numbers, the string representation of the number 
- * is in value.
- *
- * A string name/value pair representing a text attribute. 
- **/
-typedef struct _AtkAttribute AtkAttribute;
-
-struct _AtkAttribute {
-  gchar* name;
-  gchar* value;
-};
-
-#define ATK_TYPE_OBJECT                           (atk_object_get_type ())
-#define ATK_OBJECT(obj)                           (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_OBJECT, AtkObject))
-#define ATK_OBJECT_CLASS(klass)                   (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_OBJECT, AtkObjectClass))
-#define ATK_IS_OBJECT(obj)                        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_OBJECT))
-#define ATK_IS_OBJECT_CLASS(klass)                (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_OBJECT))
-#define ATK_OBJECT_GET_CLASS(obj)                 (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_OBJECT, AtkObjectClass))
-
-#define ATK_TYPE_IMPLEMENTOR                      (atk_implementor_get_type ())
-#define ATK_IS_IMPLEMENTOR(obj)                   G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_IMPLEMENTOR)
-#define ATK_IMPLEMENTOR(obj)                      G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_IMPLEMENTOR, AtkImplementor)
-#define ATK_IMPLEMENTOR_GET_IFACE(obj)            (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_IMPLEMENTOR, AtkImplementorIface))
-
-
-typedef struct _AtkImplementor            AtkImplementor; /* dummy typedef */
-typedef struct _AtkImplementorIface       AtkImplementorIface;
-
-
-typedef struct _AtkObject                 AtkObject;
-typedef struct _AtkObjectClass            AtkObjectClass;
-typedef struct _AtkRelationSet            AtkRelationSet;
-typedef struct _AtkStateSet               AtkStateSet;
-
-/**
- * AtkPropertyValues:
- * @property_name: The name of the ATK property which is being presented or which has been changed.
- * @old_value: The old property value, NULL; in some contexts this value is undefined (see note below).
- * @new_value: The new value of the named property.
- *
- * @note: For most properties the old_value field of AtkPropertyValues will
- * not contain a valid value.
- *
- * Currently, the only property for which old_value is used is
- * accessible-state; for instance if there is a focus state the
- * property change handler will be called for the object which lost the focus
- * with the old_value containing an AtkState value corresponding to focused
- * and the property change handler will be called for the object which
- * received the focus with the new_value containing an AtkState value
- * corresponding to focused.
- *
- **/
-struct _AtkPropertyValues
-{
-  const gchar  *property_name;
-  GValue old_value;
-  GValue new_value;
-};
-
-typedef struct _AtkPropertyValues        AtkPropertyValues;
-
-typedef gboolean (*AtkFunction)          (gpointer data); 
-/*
- * For most properties the old_value field of AtkPropertyValues will
- * not contain a valid value.
- *
- * Currently, the only property for which old_value is used is
- * accessible-state; for instance if there is a focus state the
- * property change handler will be called for the object which lost the focus
- * with the old_value containing an AtkState value corresponding to focused
- * and the property change handler will be called for the object which
- * received the focus with the new_value containing an AtkState value
- * corresponding to focused.
- */
-typedef void (*AtkPropertyChangeHandler) (AtkObject*, AtkPropertyValues*);
-
-
-struct _AtkObject
-{
-  GObject parent;
-
-  gchar *description;
-  gchar *name;
-  AtkObject *accessible_parent;
-  AtkRole role;
-  AtkRelationSet *relation_set;
-  AtkLayer layer;
-};
-
-struct _AtkObjectClass
-{
-  GObjectClass parent;
-
-  /*
-   * Gets the accessible name of the object
-   */
-  G_CONST_RETURN gchar*    (* get_name)            (AtkObject                *accessible);
-  /*
-   * Gets the accessible description of the object
-   */
-  G_CONST_RETURN gchar*    (* get_description)     (AtkObject                *accessible);
-  /*
-   * Gets the accessible parent of the object
-   */
-  AtkObject*               (*get_parent)           (AtkObject                *accessible);
-
-  /*
-   * Gets the number of accessible children of the object
-   */
-  gint                    (* get_n_children)       (AtkObject                *accessible);
-  /*
-   * Returns a reference to the specified accessible child of the object.
-   * The accessible children are 0-based so the first accessible child is
-   * at index 0, the second at index 1 and so on.
-   */
-  AtkObject*              (* ref_child)            (AtkObject                *accessible,
-                                                    gint                      i);
-  /*
-   * Gets the 0-based index of this object in its parent; returns -1 if the
-   * object does not have an accessible parent.
-   */
-  gint                    (* get_index_in_parent) (AtkObject                 *accessible);
-  /*
-   * Gets the RelationSet associated with the object
-   */
-  AtkRelationSet*         (* ref_relation_set)    (AtkObject                 *accessible);
-  /*
-   * Gets the role of the object
-   */
-  AtkRole                 (* get_role)            (AtkObject                 *accessible);
-  AtkLayer                (* get_layer)           (AtkObject                 *accessible);
-  gint                    (* get_mdi_zorder)      (AtkObject                 *accessible);
-  /*
-   * Gets the state set of the object
-   */
-  AtkStateSet*            (* ref_state_set)       (AtkObject                 *accessible);
-  /*
-   * Sets the accessible name of the object
-   */
-  void                    (* set_name)            (AtkObject                 *accessible,
-                                                   const gchar               *name);
-  /*
-   * Sets the accessible description of the object
-   */
-  void                    (* set_description)     (AtkObject                 *accessible,
-                                                   const gchar               *description);
-  /*
-   * Sets the accessible parent of the object
-   */
-  void                    (* set_parent)          (AtkObject                 *accessible,
-                                                   AtkObject                 *parent);
-  /*
-   * Sets the accessible role of the object
-   */
-  void                    (* set_role)            (AtkObject                 *accessible,
-                                                   AtkRole                   role);
-  /*
-   * Specifies a function to be called when a property changes value
-   */
-guint                     (* connect_property_change_handler)    (AtkObject
-                 *accessible,
-                                                                  AtkPropertyChangeHandler       *handler);
-  /*
-   * Removes a property change handler which was specified using
-   * connect_property_change_handler
-   */
-void                      (* remove_property_change_handler)     (AtkObject
-                *accessible,
-                                                                  guint
-                handler_id);
-void                      (* initialize)                         (AtkObject                     *accessible,
-                                                                  gpointer                      data);
-  /*
-   * The signal handler which is executed when there is a change in the
-   * children of the object
-   */
-  void                    (* children_changed)    (AtkObject                  *accessible,
-                                                   guint                      change_index,
-                                                   gpointer                   changed_child);
-  /*
-   * The signal handler which is executed  when there is a focus event
-   * for an object.
-   */
-  void                    (* focus_event)         (AtkObject                  *accessible,
-                                                   gboolean                   focus_in);
-  /*
-   * The signal handler which is executed  when there is a property_change 
-   * signal for an object.
-   */
-  void                    (* property_change)     (AtkObject                  *accessible,
-                                                   AtkPropertyValues          *values);
-  /*
-   * The signal handler which is executed  when there is a state_change 
-   * signal for an object.
-   */
-  void                    (* state_change)        (AtkObject                  *accessible,
-                                                   const gchar                *name,
-                                                   gboolean                   state_set);
-  /*
-   * The signal handler which is executed when there is a change in the
-   * visible data for an object
-   */
-  void                    (*visible_data_changed) (AtkObject                  *accessible);
-
-  /*
-   * The signal handler which is executed when there is a change in the
-   * 'active' child or children of the object, for instance when 
-   * interior focus changes in a table or list.  This signal should be emitted
-   * by objects whose state includes ATK_STATE_MANAGES_DESCENDANTS.
-   */
-  void                    (*active_descendant_changed) (AtkObject                  *accessible,
-                                                        gpointer                   *child);
-
-  /*    	
-   * Gets a list of properties applied to this object as a whole, as an #AtkAttributeSet consisting of name-value pairs. 
-   * Since ATK 1.12
-   */
-  AtkAttributeSet* 	  (*get_attributes)            (AtkObject                  *accessible);
-  AtkFunction             pad1;
-  AtkFunction             pad2;
-};
-
-GType            atk_object_get_type   (void);
-
-struct _AtkImplementorIface
-{
-  GTypeInterface parent;
-
-  AtkObject*   (*ref_accessible) (AtkImplementor *implementor);
-};
-GType atk_implementor_get_type (void);
-
-/*
- * This method uses the ref_accessible method in AtkImplementorIface,
- * if the object's class implements AtkImplementorIface.
- * Otherwise it returns %NULL.
- *
- * IMPORTANT:
- * Note also that because this method may return flyweight objects,
- * it increments the returned AtkObject's reference count.
- * Therefore it is the responsibility of the calling
- * program to unreference the object when no longer needed.
- * (c.f. gtk_widget_get_accessible() where this is not the case).
- */
-AtkObject*              atk_implementor_ref_accessible            (AtkImplementor *implementor);
-
-/*
- * Properties directly supported by AtkObject
- */
-
-G_CONST_RETURN gchar*   atk_object_get_name                       (AtkObject *accessible);
-G_CONST_RETURN gchar*   atk_object_get_description                (AtkObject *accessible);
-AtkObject*              atk_object_get_parent                     (AtkObject *accessible);
-gint                    atk_object_get_n_accessible_children      (AtkObject *accessible);
-AtkObject*              atk_object_ref_accessible_child           (AtkObject *accessible,
-                                                                   gint        i);
-AtkRelationSet*         atk_object_ref_relation_set               (AtkObject *accessible);
-AtkRole                 atk_object_get_role                       (AtkObject *accessible);
-AtkLayer                atk_object_get_layer                      (AtkObject *accessible);
-gint                    atk_object_get_mdi_zorder                 (AtkObject *accessible);
-AtkAttributeSet*        atk_object_get_attributes                 (AtkObject *accessible);
-AtkStateSet*            atk_object_ref_state_set                  (AtkObject *accessible);
-gint                    atk_object_get_index_in_parent            (AtkObject *accessible);
-void                    atk_object_set_name                       (AtkObject *accessible,
-                                                                   const gchar *name);
-void                    atk_object_set_description                (AtkObject *accessible,
-                                                                   const gchar *description);
-void                    atk_object_set_parent                     (AtkObject *accessible,
-                                                                   AtkObject *parent);
-void                    atk_object_set_role                       (AtkObject *accessible,
-                                                                   AtkRole   role);
-
-
-guint                atk_object_connect_property_change_handler  (AtkObject                      *accessible,
-                                                                  AtkPropertyChangeHandler       *handler);
-void                 atk_object_remove_property_change_handler   (AtkObject                      *accessible,
-                                                                  guint                          handler_id);
-
-void                 atk_object_notify_state_change              (AtkObject                      *accessible,
-                                                                  AtkState                       state,
-                                                                  gboolean                       value);
-void                 atk_object_initialize                       (AtkObject                     *accessible,
-                                                                  gpointer                      data);
-                                    
-G_CONST_RETURN gchar* atk_role_get_name      (AtkRole         role);
-AtkRole               atk_role_for_name      (const gchar     *name);
-
-
-/* NEW in 1.1: convenience API */
-gboolean              atk_object_add_relationship              (AtkObject      *object,
-								AtkRelationType relationship,
-								AtkObject      *target);
-gboolean              atk_object_remove_relationship           (AtkObject      *object,
-								AtkRelationType relationship,
-								AtkObject      *target);
-G_CONST_RETURN gchar* atk_role_get_localized_name              (AtkRole     role);
-
-/* */
-
-
-/*
- * Note: the properties which are registered with the GType
- *   property registry, for type ATK_TYPE_OBJECT, are as follows:
- *
- *   "accessible-name"
- *   "accessible-description"
- *   "accessible-parent"
- *   "accessible-role"
- *   "accessible-value"
- *   "accessible-component-layer"
- *   "accessible-component-zorder"
- *   "accessible-table-caption"
- *   "accessible-table-column-description"
- *   "accessible-table-column-header"
- *   "accessible-table-row-description"
- *   "accessible-table-row-header"
- *   "accessible-table-summary"
- *   "accessible-model"
- *
- * accessibility property change listeners should use the
- *   normal GObject property interfaces and "property-change"
- *   signal handler semantics to interpret the property change
- *   information relayed from AtkObject.
- *   (AtkObject instances will connect to the "notify"
- *   signal in their host objects, and relay the signals when appropriate).
- */
-
-/* For other signals, see related interfaces
- *
- *    AtkActionIface,
- *    AtkComponentIface,
- *    AtkHypertextIface,
- *    AtkImageIface,
- *    AtkSelectionIface,
- *    AtkTableIface,
- *    AtkTextIface,
- *    AtkValueIface.
- *
- *  The usage model for obtaining these interface instances is:
- *    ATK_<interfacename>_GET_IFACE(GObject *accessible),
- *    where accessible, though specified as a GObject, is
- *    the AtkObject instance being queried.
- *  More usually, the interface will be used via a cast to the
- *    interface's corresponding "type":
- *
- *    AtkText textImpl = ATK_TEXT(accessible);
- *    if (textImpl)
- *      {
- *        cpos = atk_text_get_caret_position(textImpl);
- *      }
- *
- *  If it's known in advance that accessible implements AtkTextIface,
- *    this is shortened to:
- *
- *    cpos = atk_text_get_caret_position (ATK_TEXT (accessible));
- */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __ATK_OBJECT_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkobjectfactory.h b/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkobjectfactory.h
deleted file mode 100644
index fb163adb..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkobjectfactory.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_OBJECT_FACTORY_H__
-#define __ATK_OBJECT_FACTORY_H__
-
-#include <glib-object.h>
-#include <atk/atkobject.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define ATK_TYPE_OBJECT_FACTORY                     (atk_object_factory_get_type ())
-#define ATK_OBJECT_FACTORY(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_OBJECT_FACTORY, AtkObjectFactory))
-#define ATK_OBJECT_FACTORY_CLASS(klass)             (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_OBJECT_FACTORY, AtkObjectFactoryClass))
-#define ATK_IS_OBJECT_FACTORY(obj)                  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_OBJECT_FACTORY))
-#define ATK_IS_OBJECT_FACTORY_CLASS(klass)          (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_OBJECT_FACTORY))
-#define ATK_OBJECT_FACTORY_GET_CLASS(obj)           (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_OBJECT_FACTORY, AtkObjectFactoryClass))
-
-typedef struct _AtkObjectFactory                AtkObjectFactory;
-typedef struct _AtkObjectFactoryClass           AtkObjectFactoryClass;
-
-struct _AtkObjectFactory
-{
-  GObject parent;
-};
-
-struct _AtkObjectFactoryClass
-{
-  GObjectClass parent_class;
-
-  AtkObject* (* create_accessible) (GObject          *obj);
-  void       (* invalidate)        (AtkObjectFactory *factory);
-  GType      (* get_accessible_type)    (void);
-
-  AtkFunction pad1;
-  AtkFunction pad2;
-};
-
-GType atk_object_factory_get_type(void);
-
-AtkObject* atk_object_factory_create_accessible (AtkObjectFactory *factory, GObject *obj);
-void       atk_object_factory_invalidate (AtkObjectFactory *factory);
-GType      atk_object_factory_get_accessible_type (AtkObjectFactory *factory);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __GTK_OBJECT_FACTORY_H__ */
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkregistry.h b/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkregistry.h
deleted file mode 100644
index 3ab0414a..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkregistry.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ATK - Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_REGISTRY_H__
-#define __ATK_REGISTRY_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include <glib-object.h>
-#include "atkobjectfactory.h"
-
-#define ATK_TYPE_REGISTRY                (atk_registry_get_type ())
-#define ATK_REGISTRY(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_REGISTRY, AtkRegistry))
-#define ATK_REGISTRY_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_REGISTRY, AtkRegistryClass))
-#define ATK_IS_REGISTRY(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_REGISTRY))
-#define ATK_IS_REGISTRY_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_REGISTRY))
-#define ATK_REGISTRY_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_REGISTRY, AtkRegistryClass))
-
-struct _AtkRegistry
-{
-  GObject    parent;
-  GHashTable *factory_type_registry;
-  GHashTable *factory_singleton_cache;
-};
-
-struct _AtkRegistryClass
-{
-  GObjectClass    parent_class;
-};
-
-typedef struct _AtkRegistry             AtkRegistry;
-typedef struct _AtkRegistryClass        AtkRegistryClass;
-
-
-GType             atk_registry_get_type         (void);
-void              atk_registry_set_factory_type (AtkRegistry *registry,
-                                                 GType type,
-                                                 GType factory_type);
-GType             atk_registry_get_factory_type (AtkRegistry *registry,
-						 GType type);
-AtkObjectFactory* atk_registry_get_factory      (AtkRegistry *registry,
-                                                 GType type);
-
-AtkRegistry*      atk_get_default_registry      (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __ATK_REGISTRY_H__ */
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkrelation.h b/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkrelation.h
deleted file mode 100644
index 08b0708f..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkrelation.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_RELATION_H__
-#define __ATK_RELATION_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include <glib-object.h>
-#include <atk/atkrelationtype.h>
-
-/*
- * An AtkRelation describes a relation between the object and one or more 
- * other objects. The actual relations that an object has with other objects
- * are defined as an AtkRelationSet, which is a set of AtkRelations. 
- */
-
-#define ATK_TYPE_RELATION                         (atk_relation_get_type ())
-#define ATK_RELATION(obj)                         (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_RELATION, AtkRelation))
-#define ATK_RELATION_CLASS(klass)                 (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_RELATION, AtkRelationClass))
-#define ATK_IS_RELATION(obj)                      (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_RELATION))
-#define ATK_IS_RELATION_CLASS(klass)              (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_RELATION))
-#define ATK_RELATION_GET_CLASS(obj)               (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_RELATION, AtkRelationClass))
-
-typedef struct _AtkRelation            AtkRelation;
-typedef struct _AtkRelationClass       AtkRelationClass;
-
-struct _AtkRelation
-{
-  GObject parent;
-
-  GPtrArray       *target;
-  AtkRelationType relationship;
-};
-
-struct _AtkRelationClass
-{
-  GObjectClass parent;
-};
-
-GType atk_relation_get_type (void);
-
-AtkRelationType       atk_relation_type_register      (const gchar     *name);
-G_CONST_RETURN gchar* atk_relation_type_get_name      (AtkRelationType type);
-AtkRelationType       atk_relation_type_for_name      (const gchar     *name);
-
-/*
- * Create a new relation for the specified key and the specified list
- * of targets.
- */
-AtkRelation*          atk_relation_new                (AtkObject       **targets,
-                                                       gint            n_targets,
-                                                       AtkRelationType relationship);
-/*
- * Returns the type of a relation.
- */
-AtkRelationType       atk_relation_get_relation_type  (AtkRelation     *relation);
-/*
- * Returns the target list of a relation.
- */
-GPtrArray*            atk_relation_get_target         (AtkRelation     *relation);
-void                  atk_relation_add_target         (AtkRelation     *relation,
-                                                       AtkObject       *target);
-                
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __ATK_RELATION_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkrelationset.h b/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkrelationset.h
deleted file mode 100644
index 2225baf9..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkrelationset.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_RELATION_SET_H__
-#define __ATK_RELATION_SET_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include <glib-object.h>
-#include <atk/atkobject.h>
-#include <atk/atkrelation.h>
-
-#define ATK_TYPE_RELATION_SET                     (atk_relation_set_get_type ())
-#define ATK_RELATION_SET(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_RELATION_SET, AtkRelationSet))
-#define ATK_RELATION_SET_CLASS(klass)             (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_RELATION_SET, AtkRelationSetClass))
-#define ATK_IS_RELATION_SET(obj)                  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_RELATION_SET))
-#define ATK_IS_RELATION_SET_CLASS(klass)          (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_RELATION_SET))
-#define ATK_RELATION_SET_GET_CLASS(obj)           (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_RELATION_SET, AtkRelationSetClass))
-
-typedef struct _AtkRelationSetClass       AtkRelationSetClass;
-
-
-struct _AtkRelationSet
-{
-  GObject parent;
-
-  GPtrArray *relations;
-};
-
-struct _AtkRelationSetClass
-{
-  GObjectClass parent;
-
-  AtkFunction pad1;
-  AtkFunction pad2;
-};
-
-GType atk_relation_set_get_type (void);
-
-AtkRelationSet* atk_relation_set_new                  (void);
-gboolean        atk_relation_set_contains             (AtkRelationSet  *set,
-                                                       AtkRelationType relationship);
-void            atk_relation_set_remove               (AtkRelationSet  *set,
-                                                       AtkRelation     *relation);
-void            atk_relation_set_add                  (AtkRelationSet  *set,
-                                                       AtkRelation     *relation);
-gint            atk_relation_set_get_n_relations      (AtkRelationSet  *set);
-AtkRelation*    atk_relation_set_get_relation         (AtkRelationSet  *set,
-                                                       gint            i);
-AtkRelation*    atk_relation_set_get_relation_by_type (AtkRelationSet  *set,
-                                                       AtkRelationType relationship);
-void            atk_relation_set_add_relation_by_type (AtkRelationSet  *set,
-                                                       AtkRelationType relationship,
-                                                       AtkObject       *target);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __ATK_RELATION_SET_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkrelationtype.h b/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkrelationtype.h
deleted file mode 100644
index 665c675c..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkrelationtype.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2002 Sun Microsystems 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 __ATK_RELATION_TYPE_H__
-#define __ATK_RELATION_TYPE_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/**
- *AtkRelationType:
- *@ATK_RELATION_NULL: Not used, represens "no relationship" or an error condition.
- *@ATK_RELATION_CONTROLLED_BY: Indicates an object controlled by one or more target objects.
- *@ATK_RELATION_CONTROLLER_FOR: Indicates an object is an controller for one or more target objects.
- *@ATK_RELATION_LABEL_FOR: Indicates an object is a label for one or more target objects.
- *@ATK_RELATION_LABELLED_BY: Indicates an object is labelled by one or more target objects.
- *@ATK_RELATION_MEMBER_OF: Indicates an object is a member of a group of one or more target objects.
- *@ATK_RELATION_NODE_CHILD_OF: Indicates an object is a cell in a treetable which is displayed because a cell in the same column is expanded and identifies that cell.
- *@ATK_RELATION_FLOWS_TO: Indicates that the object has content that flows logically to another
- *  AtkObject in a sequential way, (for instance text-flow).
- *@ATK_RELATION_FLOWS_FROM: Indicates that the object has content that flows logically from
- *  another AtkObject in a sequential way, (for instance text-flow).
- *@ATK_RELATION_SUBWINDOW_OF: Indicates a subwindow attached to a component but otherwise has no connection in  the UI heirarchy to that component.
- *@ATK_RELATION_EMBEDS: Indicates that the object visually embeds 
- *  another object's content, i.e. this object's content flows around 
- *  another's content.
- *@ATK_RELATION_EMBEDDED_BY: Inverse of %ATK_RELATION_EMBEDS, indicates that
- *  this object's content is visualy embedded in another object.
- *@ATK_RELATION_POPUP_FOR: Indicates that an object is a popup for another object.
- *@ATK_RELATION_PARENT_WINDOW_OF: Indicates that an object is a parent window of another object.
- *@ATK_RELATION_DESCRIBED_BY: Indicates that another object provides descriptive information about this object; more verbose than ATK_RELATION_LABELLED_BY.
- *@ATK_RELATION_DESCRIPTION_FOR: Indicates that an object provides descriptive information about another object; more verbose than ATK_RELATION_LABEL_FOR.
- *@ATK_RELATION_LAST_DEFINED: Not used, this value indicates the end of the enumeration.
- * 
- *Describes the type of the relation
- **/
-typedef enum
-{
-  ATK_RELATION_NULL = 0,
-  ATK_RELATION_CONTROLLED_BY,
-  ATK_RELATION_CONTROLLER_FOR,
-  ATK_RELATION_LABEL_FOR,
-  ATK_RELATION_LABELLED_BY,
-  ATK_RELATION_MEMBER_OF,
-  ATK_RELATION_NODE_CHILD_OF,
-  ATK_RELATION_FLOWS_TO,
-  ATK_RELATION_FLOWS_FROM,
-  ATK_RELATION_SUBWINDOW_OF, 
-  ATK_RELATION_EMBEDS, 
-  ATK_RELATION_EMBEDDED_BY, 
-  ATK_RELATION_POPUP_FOR, 
-  ATK_RELATION_PARENT_WINDOW_OF, 
-  ATK_RELATION_DESCRIBED_BY,
-  ATK_RELATION_DESCRIPTION_FOR,
-  ATK_RELATION_LAST_DEFINED
-} AtkRelationType;
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __ATK_RELATION_TYPE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkselection.h b/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkselection.h
deleted file mode 100644
index 7b16930c..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkselection.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_SELECTION_H__
-#define __ATK_SELECTION_H__
-
-#include <atk/atkobject.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * This AtkSelection interface provides the standard mechanism for an 
- * assistive technology to determine what the current selected children are, 
- * as well as modify the selection set. Any object that has children that 
- * can be selected should support the AtkSelection interface.
- */
-
-#define ATK_TYPE_SELECTION                        (atk_selection_get_type ())
-#define ATK_IS_SELECTION(obj)                     G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_SELECTION)
-#define ATK_SELECTION(obj)                        G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_SELECTION, AtkSelection)
-#define ATK_SELECTION_GET_IFACE(obj)              (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_SELECTION, AtkSelectionIface))
-
-#ifndef _TYPEDEF_ATK_SELECTION_
-#define _TYPEDEF_ATK_SELECTION_
-typedef struct _AtkSelection AtkSelection;
-#endif
-typedef struct _AtkSelectionIface AtkSelectionIface;
-
-struct _AtkSelectionIface
-{
-  GTypeInterface parent;
-
-  gboolean     (* add_selection)        (AtkSelection   *selection,
-                                         gint           i);
-  gboolean     (* clear_selection)      (AtkSelection   *selection);
-  AtkObject*   (* ref_selection)        (AtkSelection   *selection,
-                                         gint           i);
-  gint         (* get_selection_count)  (AtkSelection   *selection);
-  gboolean     (* is_child_selected)    (AtkSelection   *selection,
-                                         gint           i);
-  gboolean     (* remove_selection)     (AtkSelection   *selection,
-                                         gint           i);
-  gboolean     (* select_all_selection) (AtkSelection   *selection);
-
-  /* signal handlers */
-  
-  void         (*selection_changed)     (AtkSelection   *selection);
-
-  AtkFunction  pad1;
-  AtkFunction  pad2;
-};
-
-GType atk_selection_get_type (void);
-
-gboolean     atk_selection_add_selection        (AtkSelection   *selection,
-                                                 gint           i);
-
-gboolean     atk_selection_clear_selection      (AtkSelection   *selection);
-
-AtkObject*   atk_selection_ref_selection        (AtkSelection   *selection,
-                                                 gint           i);
-
-gint         atk_selection_get_selection_count  (AtkSelection   *selection);
-
-gboolean     atk_selection_is_child_selected    (AtkSelection   *selection,
-                                                 gint           i);
-
-gboolean     atk_selection_remove_selection     (AtkSelection   *selection,
-                                                 gint           i);
-
-gboolean     atk_selection_select_all_selection (AtkSelection   *selection);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __ATK_SELECTION_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkstate.h b/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkstate.h
deleted file mode 100644
index 3317346a..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkstate.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_STATE_H__
-#define __ATK_STATE_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include <glib-object.h>
-
-/**
- *AtkStateType:
- *@ATK_STATE_INVALID: Indicates an invalid state - probably an error condition.
- *@ATK_STATE_ACTIVE: Indicates a window is currently the active window, or is an active subelement within a container or table
- *@ATK_STATE_ARMED: Indicates that the object is 'armed', i.e. will be activated by if a pointer button-release event occurs within its bounds.  Buttons often enter this state when a pointer click occurs within their bounds, as a precursor to activation.
- *@ATK_STATE_BUSY:  Indicates the current object is busy, i.e. onscreen representation is in the process of changing, or the object is temporarily unavailable for interaction due to activity already in progress.  This state may be used by implementors of Document to indicate that content loading is underway.  It also may indicate other 'pending' conditions; clients may wish to interrogate this object when the ATK_STATE_BUSY flag is removed.
- *@ATK_STATE_CHECKED: Indicates this object is currently checked, for instance a checkbox is 'non-empty'.
- *@ATK_STATE_DEFUNCT: Indicates that this object no longer has a valid backing widget (for instance, if its peer object has been destroyed)
- *@ATK_STATE_EDITABLE: Indicates the user can change the contents of this object
- *@ATK_STATE_ENABLED: 	Indicates that this object is enabled, i.e. that it currently reflects some application state. Objects that are "greyed out" may lack this state, and may lack the STATE_SENSITIVE if direct user interaction cannot cause them to acquire STATE_ENABLED. See also: ATK_STATE_SENSITIVE
- *@ATK_STATE_EXPANDABLE: Indicates this object allows progressive disclosure of its children
- *@ATK_STATE_EXPANDED: Indicates this object its expanded - see ATK_STATE_EXPANDABLE above
- *@ATK_STATE_FOCUSABLE: Indicates this object can accept keyboard focus, which means all events resulting from typing on the keyboard will normally be passed to it when it has focus
- *@ATK_STATE_FOCUSED: Indicates this object currently has the keyboard focus
- *@ATK_STATE_HORIZONTAL: Indicates the orientation of this object is horizontal; used, for instance, by objects of ATK_ROLE_SCROLL_BAR.  For objects where vertical/horizontal orientation is especially meaningful.
- *@ATK_STATE_ICONIFIED: Indicates this object is minimized and is represented only by an icon
- *@ATK_STATE_MODAL: Indicates something must be done with this object before the user can interact with an object in a different window
- *@ATK_STATE_MULTI_LINE: Indicates this (text) object can contain multiple lines of text
- *@ATK_STATE_MULTISELECTABLE: Indicates this object allows more than one of its children to be selected at the same time, or in the case of text objects, that the object supports non-contiguous text selections.
- *@ATK_STATE_OPAQUE: Indicates this object paints every pixel within its rectangular region.
- *@ATK_STATE_PRESSED: Indicates this object is currently pressed; c.f. ATK_STATE_ARMED
- *@ATK_STATE_RESIZABLE: Indicates the size of this object is not fixed
- *@ATK_STATE_SELECTABLE: Indicates this object is the child of an object that allows its children to be selected and that this child is one of those children that can be selected
- *@ATK_STATE_SELECTED: Indicates this object is the child of an object that allows its children to be selected and that this child is one of those children that has been selected
- *@ATK_STATE_SENSITIVE: Indicates this object is sensitive, e.g. to user interaction. 
- * STATE_SENSITIVE usually accompanies STATE_ENABLED for user-actionable controls,
- * but may be found in the absence of STATE_ENABLED if the current visible state of the 
- * control is "disconnected" from the application state.  In such cases, direct user interaction
- * can often result in the object gaining STATE_SENSITIVE, for instance if a user makes 
- * an explicit selection using an object whose current state is ambiguous or undefined.
- * @see STATE_ENABLED, STATE_INDETERMINATE.
- *@ATK_STATE_SHOWING: Indicates this object, the object's parent, the object's parent's parent, and so on, 
- * are all 'shown' to the end-user, i.e. subject to "exposure" if blocking or obscuring objects do not interpose
- * between this object and the top of the window stack.
- *@ATK_STATE_SINGLE_LINE: Indicates this (text) object can contain only a single line of text
- *@ATK_STATE_STALE: Indicates that the information returned for this object may no longer be
- * synchronized with the application state.  This is implied if the object has STATE_TRANSIENT,
- * and can also occur towards the end of the object peer's lifecycle. It can also be used to indicate that 
- * the index associated with this object has changed since the user accessed the object (in lieu of
- * "index-in-parent-changed" events).
- *@ATK_STATE_TRANSIENT: Indicates this object is transient, i.e. a snapshot which may not emit events when its
- * state changes.  Data from objects with ATK_STATE_TRANSIENT should not be cached, since there may be no
- * notification given when the cached data becomes obsolete.
- *@ATK_STATE_VERTICAL: Indicates the orientation of this object is vertical
- *@ATK_STATE_VISIBLE: Indicates this object is visible, e.g. has been explicitly marked for exposure to the user.
- * @note: STATE_VISIBLE is no guarantee that the object is actually unobscured on the screen, only
- * that it is 'potentially' visible, barring obstruction, being scrolled or clipped out of the 
- * field of view, or having an ancestor container that has not yet made visible.
- * A widget is potentially onscreen if it has both STATE_VISIBLE and STATE_SHOWING.
- * The absence of STATE_VISIBLE and STATE_SHOWING is semantically equivalent to saying 
- * that an object is 'hidden'.  See also STATE_TRUNCATED, which applies if a VISIBLE and SHOWING object
- * lies within a viewport which means that its contents are clipped, e.g. a truncated spreadsheet cell or
- * an image within a scrolling viewport.  Mostly useful for screen-review and magnification algorithms.
- *@ATK_STATE_MANAGES_DESCENDANTS: Indicates that "active-descendant-changed" event
- * is sent when children become 'active' (i.e. are selected or navigated to onscreen).
- * Used to prevent need to enumerate all children in very large containers, like tables.
- * The presence of STATE_MANAGES_DESCENDANTS is an indication to the client.
- * that the children should not, and need not, be enumerated by the client.
- * Objects implementing this state are expected to provide relevant state
- * notifications to listening clients, for instance notifications of visibility
- * changes and activation of their contained child objects, without the client 
- * having previously requested references to those children.
- *@ATK_STATE_INDETERMINATE: Indicates that a check box is in a state other than checked or not checked.
- * This usually means that the boolean value reflected or 
- * controlled by the object does not apply consistently to the entire current context.
- * For example, a checkbox for the "Bold" attribute of text may have STATE_INDETERMINATE
- * if the currently selected text contains a mixture of weight attributes.  
- * In many cases interacting with a STATE_INDETERMINATE object will cause 
- * the context's corresponding boolean attribute to be homogenized, whereupon the object
- * will lose STATE_INDETERMINATE and a corresponding state-changed event will be fired.
- *@ATK_STATE_TRUNCATED: Indicates that an object is truncated, e.g. a text value in a speradsheet cell.
- *@ATK_STATE_REQUIRED: Indicates that explicit user interaction with an object is required by the user interface, e.g. a required field in a "web-form" interface.
- *@ATK_STATE_INVALID_ENTRY: Indicates that the object has encountered an error condition due to failure of input validation. For instance, a form control may acquire this state in response to invalid or malformed user input.
- *@ATK_STATE_SUPPORTS_AUTOCOMPLETION:  Indicates that the object in question implements some form of ¨typeahead¨ or 
- * pre-selection behavior whereby entering the first character of one or more sub-elements
- * causes those elements to scroll into view or become selected.  Subsequent character input
- * may narrow the selection further as long as one or more sub-elements match the string.
- * This state is normally only useful and encountered on objects that implement Selection.
- * In some cases the typeahead behavior may result in full or partial ¨completion¨ of 
- * the data in the input field, in which case these input events may trigger text-changed
- * events from the AtkText interface.  This state supplants @ATK_ROLE_AUTOCOMPLETE.
- *@ATK_STATE_SELECTABLE_TEXT:Indicates that the object in question supports text selection. It should only be exposed on objects which implement the Text interface, in order to distinguish this state from @ATK_STATE_SELECTABLE, which infers that the object in question is a selectable child of an object which implements Selection. While similar, text selection and subelement selection are distinct operations.
- *@ATK_STATE_DEFAULT: Indicates that the object is the "default" active component, i.e. the object which is activated by an end-user press of the "Enter" or "Return" key.  Typically a "close" or "submit" button.
- *@ATK_STATE_ANIMATED: Indicates that the object changes its appearance dynamically as an inherent part of its presentation.  This state may come and go if an object is only temporarily animated on the way to a 'final' onscreen presentation.
- * @note some applications, notably content viewers, may not be able to detect
- * all kinds of animated content.  Therefore the absence of this state should not
- * be taken as definitive evidence that the object's visual representation is
- * static; this state is advisory.
- *@ATK_STATE_VISITED: Indicates that the object (typically a hyperlink) has already been 'activated', and/or its backing data has already been downloaded, rendered, or otherwise "visited".
- *@ATK_STATE_LAST_DEFINED: Not a valid state, used for finding end of enumeration
- *
- *The possible types of states of an object
- **/ 
-typedef enum
-{
-  ATK_STATE_INVALID,
-  ATK_STATE_ACTIVE,
-  ATK_STATE_ARMED,
-  ATK_STATE_BUSY,
-  ATK_STATE_CHECKED,
-  ATK_STATE_DEFUNCT,
-  ATK_STATE_EDITABLE,
-  ATK_STATE_ENABLED,
-  ATK_STATE_EXPANDABLE,
-  ATK_STATE_EXPANDED,
-  ATK_STATE_FOCUSABLE,
-  ATK_STATE_FOCUSED,
-  ATK_STATE_HORIZONTAL,
-  ATK_STATE_ICONIFIED,
-  ATK_STATE_MODAL,
-  ATK_STATE_MULTI_LINE,
-  ATK_STATE_MULTISELECTABLE,
-  ATK_STATE_OPAQUE,
-  ATK_STATE_PRESSED,
-  ATK_STATE_RESIZABLE,
-  ATK_STATE_SELECTABLE,
-  ATK_STATE_SELECTED,
-  ATK_STATE_SENSITIVE,
-  ATK_STATE_SHOWING,
-  ATK_STATE_SINGLE_LINE,
-  ATK_STATE_STALE,
-  ATK_STATE_TRANSIENT,
-  ATK_STATE_VERTICAL,
-  ATK_STATE_VISIBLE,
-  ATK_STATE_MANAGES_DESCENDANTS,
-  ATK_STATE_INDETERMINATE,
-  ATK_STATE_TRUNCATED,
-  ATK_STATE_REQUIRED,
-  ATK_STATE_INVALID_ENTRY,
-  ATK_STATE_SUPPORTS_AUTOCOMPLETION,
-  ATK_STATE_SELECTABLE_TEXT,
-  ATK_STATE_DEFAULT,
-  ATK_STATE_ANIMATED,
-  ATK_STATE_VISITED,
-	
-  ATK_STATE_LAST_DEFINED
-} AtkStateType;
-
-typedef guint64      AtkState;
-
-AtkStateType atk_state_type_register            (const gchar *name);
-
-G_CONST_RETURN gchar* atk_state_type_get_name   (AtkStateType type);
-AtkStateType          atk_state_type_for_name   (const gchar  *name);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __ATK_STATE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkstateset.h b/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkstateset.h
deleted file mode 100644
index 43c3ea3d..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkstateset.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_STATE_SET_H__
-#define __ATK_STATE_SET_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include <glib-object.h>
-#include <atk/atkobject.h>
-#include <atk/atkstate.h>
-
-#define ATK_TYPE_STATE_SET                        (atk_state_set_get_type ())
-#define ATK_STATE_SET(obj)                        (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_STATE_SET, AtkStateSet))
-#define ATK_STATE_SET_CLASS(klass)                (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_STATE_SET, AtkStateSetClass))
-#define ATK_IS_STATE_SET(obj)                     (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_STATE_SET))
-#define ATK_IS_STATE_SET_CLASS(klass)             (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_STATE_SET))
-#define ATK_STATE_SET_GET_CLASS(obj)              (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_STATE_SET, AtkStateSetClass))
-
-typedef struct _AtkStateSetClass       AtkStateSetClass;
-
-
-struct _AtkStateSet
-{
-  GObject parent;
-
-};
-
-struct _AtkStateSetClass
-{
-  GObjectClass parent;
-};
-
-GType atk_state_set_get_type (void);
-
-AtkStateSet*    atk_state_set_new               (void);
-gboolean        atk_state_set_is_empty          (AtkStateSet  *set);
-gboolean        atk_state_set_add_state         (AtkStateSet  *set,
-                                                 AtkStateType type);
-void            atk_state_set_add_states        (AtkStateSet  *set,
-                                                 AtkStateType *types,
-                                                 gint         n_types);
-void            atk_state_set_clear_states      (AtkStateSet  *set);
-gboolean        atk_state_set_contains_state    (AtkStateSet  *set,
-                                                 AtkStateType type);
-gboolean        atk_state_set_contains_states   (AtkStateSet  *set,
-                                                 AtkStateType *types,
-                                                 gint         n_types);
-gboolean        atk_state_set_remove_state      (AtkStateSet  *set,
-                                                 AtkStateType type);
-AtkStateSet*    atk_state_set_and_sets          (AtkStateSet  *set,
-                                                 AtkStateSet  *compare_set);
-AtkStateSet*    atk_state_set_or_sets           (AtkStateSet  *set,
-                                                 AtkStateSet  *compare_set);
-AtkStateSet*    atk_state_set_xor_sets          (AtkStateSet  *set,
-                                                 AtkStateSet  *compare_set);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __ATK_STATE_SET_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkstreamablecontent.h b/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkstreamablecontent.h
deleted file mode 100644
index abdbfa95..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkstreamablecontent.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_STREAMABLE_CONTENT_H__
-#define __ATK_STREAMABLE_CONTENT_H__
-
-#include <atk/atkobject.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define ATK_TYPE_STREAMABLE_CONTENT           (atk_streamable_content_get_type ())
-#define ATK_IS_STREAMABLE_CONTENT(obj)        G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_STREAMABLE_CONTENT)
-#define ATK_STREAMABLE_CONTENT(obj)           G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_STREAMABLE_CONTENT, AtkStreamableContent)
-#define ATK_STREAMABLE_CONTENT_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_STREAMABLE_CONTENT, AtkStreamableContentIface))
-
-#ifndef _TYPEDEF_ATK_STREAMABLE_CONTENT
-#define _TYPEDEF_ATK_STREAMABLE_CONTENT
-typedef struct _AtkStreamableContent AtkStreamableContent;
-#endif
-typedef struct _AtkStreamableContentIface AtkStreamableContentIface;
-
-struct _AtkStreamableContentIface
-{
-  GTypeInterface parent;
-
-  /*
-   * Get the number of mime types supported by this object
-   */
-  gint                      (* get_n_mime_types)  (AtkStreamableContent     *streamable);
-  /*
-   * Gets the specified mime type supported by this object.
-   * The mime types are 0-based so the first mime type is 
-   * at index 0, the second at index 1 and so on.  The mime-type
-   * at index 0 should be considered the "default" data type for the stream.
-   *
-   * This assumes that the strings for the mime types are stored in the
-   * AtkStreamableContent. Alternatively the G_CONST_RETURN could be removed
-   * and the caller would be responsible for calling g_free() on the
-   * returned value.
-   */
-  G_CONST_RETURN gchar*     (* get_mime_type)     (AtkStreamableContent     *streamable,
-                                                   gint                     i);
-  /*
-   * One possible implementation for this method is that it constructs the
-   * content appropriate for the mime type and then creates a temporary
-   * file containing the content, opens the file and then calls
-   * g_io_channel_unix_new_fd().
-   */
-  GIOChannel*               (* get_stream)        (AtkStreamableContent     *streamable,
-                                                   const gchar              *mime_type);
-
-/*
- * Returns a string representing a URI in IETF standard format
- * (see http://www.ietf.org/rfc/rfc2396.txt) from which the object's content
- * may be streamed in the specified mime-type.
- * If mime_type is NULL, the URI for the default (and possibly only) mime-type is
- * returned.
- *
- * returns NULL if the mime-type is not supported, or if no URI can be 
- * constructed.  Note that it is possible for get_uri to return NULL but for
- * get_stream to work nonetheless, since not all GIOChannels connect to URIs.
- */
-    G_CONST_RETURN  gchar*  (* get_uri)           (AtkStreamableContent     *streamable,
-                                                   const gchar              *mime_type);
-
-
-  AtkFunction               pad1;
-  AtkFunction               pad2;
-  AtkFunction               pad3;
-};
-GType                  atk_streamable_content_get_type (void);
-
-gint                   atk_streamable_content_get_n_mime_types (AtkStreamableContent     *streamable);
-                                                       
-G_CONST_RETURN gchar*  atk_streamable_content_get_mime_type    (AtkStreamableContent     *streamable,
-                                                                gint                     i);
-GIOChannel*             atk_streamable_content_get_stream       (AtkStreamableContent     *streamable,
-                                                                 const gchar              *mime_type);
-
-gchar*                  atk_streamable_content_get_uri          (AtkStreamableContent     *streamable,
-                                                                 const gchar              *mime_type);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __ATK_STREAMABLE_CONTENT_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atktable.h b/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atktable.h
deleted file mode 100644
index 790fbb44..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atktable.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_TABLE_H__
-#define __ATK_TABLE_H__
-
-#include <atk/atkobject.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * AtkTable describes a user-interface component that presents data in
- * two-dimensional table format.
- */
-
-
-#define ATK_TYPE_TABLE                    (atk_table_get_type ())
-#define ATK_IS_TABLE(obj)                 G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_TABLE)
-#define ATK_TABLE(obj)                    G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_TABLE, AtkTable)
-#define ATK_TABLE_GET_IFACE(obj)          (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_TABLE, AtkTableIface))
-
-#ifndef _TYPEDEF_ATK_TABLE_
-#define _TYPEDEF_ATK_TABLE_
-typedef struct _AtkTable AtkTable;
-#endif
-typedef struct _AtkTableIface AtkTableIface;
-
-struct _AtkTableIface
-{
-  GTypeInterface parent;
-
-  AtkObject*        (* ref_at)                   (AtkTable      *table,
-                                                  gint          row,
-                                                  gint          column);
-  gint              (* get_index_at)             (AtkTable      *table,
-                                                  gint          row,
-                                                  gint          column);
-  gint              (* get_column_at_index)      (AtkTable      *table,
-                                                  gint          index_);
-  gint              (* get_row_at_index)         (AtkTable      *table,
-                                                  gint          index_);
-  gint              (* get_n_columns)           (AtkTable      *table);
-  gint              (* get_n_rows)               (AtkTable      *table);
-  gint              (* get_column_extent_at)     (AtkTable      *table,
-                                                  gint          row,
-                                                  gint          column);
-  gint              (* get_row_extent_at)        (AtkTable      *table,
-                                                  gint          row,
-                                                  gint          column);
-  AtkObject*
-                    (* get_caption)              (AtkTable      *table);
-  G_CONST_RETURN gchar*
-                    (* get_column_description)   (AtkTable      *table,
-                                                  gint          column);
-  AtkObject*        (* get_column_header)        (AtkTable      *table,
-						  gint		column);
-  G_CONST_RETURN gchar*
-                    (* get_row_description)      (AtkTable      *table,
-                                                  gint          row);
-  AtkObject*        (* get_row_header)           (AtkTable      *table,
-						  gint		row);
-  AtkObject*        (* get_summary)              (AtkTable      *table);
-  void              (* set_caption)              (AtkTable      *table,
-                                                  AtkObject     *caption);
-  void              (* set_column_description)   (AtkTable      *table,
-                                                  gint          column,
-                                                  const gchar   *description);
-  void              (* set_column_header)        (AtkTable      *table,
-                                                  gint          column,
-                                                  AtkObject     *header);
-  void              (* set_row_description)      (AtkTable      *table,
-                                                  gint          row,
-                                                  const gchar   *description);
-  void              (* set_row_header)           (AtkTable      *table,
-                                                  gint          row,
-                                                  AtkObject     *header);
-  void              (* set_summary)              (AtkTable      *table,
-                                                  AtkObject     *accessible);
-  gint              (* get_selected_columns)     (AtkTable      *table,
-                                                  gint          **selected);
-  gint              (* get_selected_rows)        (AtkTable      *table,
-                                                  gint          **selected);
-  gboolean          (* is_column_selected)       (AtkTable      *table,
-                                                  gint          column);
-  gboolean          (* is_row_selected)          (AtkTable      *table,
-                                                  gint          row);
-  gboolean          (* is_selected)              (AtkTable      *table,
-                                                  gint          row,
-                                                  gint          column);
-  gboolean          (* add_row_selection)        (AtkTable      *table,
-                                                  gint          row);
-  gboolean          (* remove_row_selection)     (AtkTable      *table,
-                                                  gint          row);
-  gboolean          (* add_column_selection)     (AtkTable      *table,
-                                                  gint          column);
-  gboolean          (* remove_column_selection)  (AtkTable      *table,
-                                                  gint          column);
-
-  /*
-   * signal handlers
-   */
-  void              (* row_inserted)             (AtkTable      *table,
-                                                  gint          row,
-                                                  gint          num_inserted);
-  void              (* column_inserted)          (AtkTable      *table,
-                                                  gint          column,
-                                                  gint          num_inserted);
-  void              (* row_deleted)              (AtkTable      *table,
-                                                  gint          row,
-                                                  gint          num_deleted);
-  void              (* column_deleted)           (AtkTable      *table,
-                                                  gint          column,
-                                                  gint          num_deleted);
-  void              (* row_reordered)            (AtkTable      *table);
-  void              (* column_reordered)         (AtkTable      *table);
-  void              (* model_changed)            (AtkTable      *table);
-
-  AtkFunction       pad1;
-  AtkFunction       pad2;
-  AtkFunction       pad3;
-  AtkFunction       pad4;
-};
-
-GType atk_table_get_type (void);
-
-AtkObject*        atk_table_ref_at               (AtkTable         *table,
-                                                  gint             row,
-                                                  gint             column);
-gint              atk_table_get_index_at         (AtkTable         *table,
-                                                  gint             row,
-                                                  gint             column);
-gint              atk_table_get_column_at_index  (AtkTable         *table,
-                                                  gint             index_);
-gint              atk_table_get_row_at_index     (AtkTable         *table,
-                                                  gint             index_);
-gint              atk_table_get_n_columns        (AtkTable         *table);
-gint              atk_table_get_n_rows           (AtkTable         *table);
-gint              atk_table_get_column_extent_at (AtkTable         *table,
-                                                  gint             row,
-                                                  gint             column);
-gint              atk_table_get_row_extent_at    (AtkTable         *table,
-                                                  gint             row,
-                                                  gint             column);
-AtkObject*
-                  atk_table_get_caption          (AtkTable         *table);
-G_CONST_RETURN gchar*
-                  atk_table_get_column_description (AtkTable         *table,
-                                                  gint             column);
-AtkObject*        atk_table_get_column_header    (AtkTable         *table,
-						  gint		   column);
-G_CONST_RETURN gchar*
-                  atk_table_get_row_description  (AtkTable         *table,
-                                                  gint             row);
-AtkObject*        atk_table_get_row_header       (AtkTable         *table,
-						  gint		   row);
-AtkObject*        atk_table_get_summary          (AtkTable         *table);
-void              atk_table_set_caption          (AtkTable         *table,
-                                                  AtkObject        *caption);
-void              atk_table_set_column_description 
-                                                 (AtkTable         *table,
-                                                  gint             column,
-                                                  const gchar      *description);
-void              atk_table_set_column_header    (AtkTable         *table,
-                                                  gint             column,
-                                                  AtkObject        *header);
-void              atk_table_set_row_description  (AtkTable         *table,
-                                                  gint             row,
-                                                  const gchar      *description);
-void              atk_table_set_row_header       (AtkTable         *table,
-                                                  gint             row,
-                                                  AtkObject        *header);
-void              atk_table_set_summary          (AtkTable         *table,
-                                                  AtkObject        *accessible);
-gint              atk_table_get_selected_columns (AtkTable         *table,
-                                                  gint             **selected);
-gint              atk_table_get_selected_rows    (AtkTable         *table,
-                                                  gint             **selected);
-gboolean          atk_table_is_column_selected   (AtkTable         *table,
-                                                  gint             column);
-gboolean          atk_table_is_row_selected      (AtkTable         *table,
-                                                  gint             row);
-gboolean          atk_table_is_selected          (AtkTable         *table,
-                                                  gint             row,
-                                                  gint             column);
-gboolean          atk_table_add_row_selection    (AtkTable         *table,
-                                                  gint             row);
-gboolean          atk_table_remove_row_selection (AtkTable         *table,
-                                                  gint             row);
-gboolean          atk_table_add_column_selection (AtkTable         *table,
-                                                  gint             column);
-gboolean          atk_table_remove_column_selection  
-                                                 (AtkTable         *table,
-                                                  gint             column);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __ATK_TABLE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atktext.h b/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atktext.h
deleted file mode 100644
index 191e231f..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atktext.h
+++ /dev/null
@@ -1,367 +0,0 @@
-/* ATK - The Accessibility Toolkit for GTK+
- * Copyright 2001 Sun Microsystems 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 __ATK_TEXT_H__
-#define __ATK_TEXT_H__
-
-#include <glib-object.h>
-#include <atk/atkobject.h>
-#include <atk/atkutil.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/**
- *AtkTextAttribute
- *@ATK_TEXT_ATTR_INVALID: Invalid attribute
- *@ATK_TEXT_ATTR_LEFT_MARGIN: The pixel width of the left margin
- *@ATK_TEXT_ATTR_RIGHT_MARGIN: The pixel width of the right margin
- *@ATK_TEXT_ATTR_INDENT: The number of pixels that the text is indented
- *@ATK_TEXT_ATTR_INVISIBLE: Either "true" or "false" indicating whether text is visible or not
- *@ATK_TEXT_ATTR_EDITABLE: Either "true" or "false" indicating whether text is editable or not
- *@ATK_TEXT_ATTR_PIXELS_ABOVE_LINES: Pixels of blank space to leave above each newline-terminated line. 
- *@ATK_TEXT_ATTR_PIXELS_BELOW_LINES: Pixels of blank space to leave below each newline-terminated line.
- *@ATK_TEXT_ATTR_PIXELS_INSIDE_WRAP: Pixels of blank space to leave between wrapped lines inside the same newline-terminated line (paragraph).
- *@ATK_TEXT_ATTR_BG_FULL_HEIGHT: "true" or "false" whether to make the background color for each character the height of the highest font used on the current line, or the height of the font used for the current character.
- *@ATK_TEXT_ATTR_RISE: Number of pixels that the characters are risen above the baseline
- *@ATK_TEXT_ATTR_UNDERLINE: "none", "single", "double" or "low"
- *@ATK_TEXT_ATTR_STRIKETHROUGH: "true" or "false" whether the text is strikethrough 
- *@ATK_TEXT_ATTR_SIZE: The size of the characters. 
- *@ATK_TEXT_ATTR_SCALE: The scale of the characters. The value is a string representation of a double 
- *@ATK_TEXT_ATTR_WEIGHT: The weight of the characters.
- *@ATK_TEXT_ATTR_LANGUAGE: The language used
- *@ATK_TEXT_ATTR_FAMILY_NAME: The font family name
- *@ATK_TEXT_ATTR_BG_COLOR: The background color. The value is an RGB value of the format "%u,%u,%u"
- *@ATK_TEXT_ATTR_FG_COLOR:The foreground color. The value is an RGB value of the format "%u,%u,%u"
- *@ATK_TEXT_ATTR_BG_STIPPLE: "true" if a #GdkBitmap is set for stippling the background color.
- *@ATK_TEXT_ATTR_FG_STIPPLE: "true" if a #GdkBitmap is set for stippling the foreground color.
- *@ATK_TEXT_ATTR_WRAP_MODE: The wrap mode of the text, if any. Values are "none", "char" or "word" 
- *@ATK_TEXT_ATTR_DIRECTION: The direction of the text, if set. Values are "none", "ltr" or "rtl" 
- *@ATK_TEXT_ATTR_JUSTIFICATION: The justification of the text, if set. Values are "left", "right", "center" or "fill" 
- *@ATK_TEXT_ATTR_STRETCH: The stretch of the text, if set. Values are "ultra_condensed", "extra_condensed", "condensed", "semi_condensed", "normal", "semi_expanded", "expanded", "extra_expanded" or "ultra_expanded"
- *@ATK_TEXT_ATTR_VARIANT: The capitalization variant of the text, if set. Values are "normal" or "small_caps"
- *@ATK_TEXT_ATTR_STYLE: The slant style of the text, if set. Values are "normal", "oblique" or "italic"
- *@ATK_TEXT_ATTR_LAST_DEFINED: not a valid text attribute, used for finding end of enumeration
- *
- * Describes the text attributes supported
- **/
-typedef enum
-{
-  ATK_TEXT_ATTR_INVALID = 0,
-  ATK_TEXT_ATTR_LEFT_MARGIN,
-  ATK_TEXT_ATTR_RIGHT_MARGIN,
-  ATK_TEXT_ATTR_INDENT,
-  ATK_TEXT_ATTR_INVISIBLE,
-  ATK_TEXT_ATTR_EDITABLE,
-  ATK_TEXT_ATTR_PIXELS_ABOVE_LINES,
-  ATK_TEXT_ATTR_PIXELS_BELOW_LINES,
-  ATK_TEXT_ATTR_PIXELS_INSIDE_WRAP,
-  ATK_TEXT_ATTR_BG_FULL_HEIGHT,
-  ATK_TEXT_ATTR_RISE,
-  ATK_TEXT_ATTR_UNDERLINE,
-  ATK_TEXT_ATTR_STRIKETHROUGH,
-  ATK_TEXT_ATTR_SIZE,
-  ATK_TEXT_ATTR_SCALE,
-  ATK_TEXT_ATTR_WEIGHT,
-  ATK_TEXT_ATTR_LANGUAGE,
-  ATK_TEXT_ATTR_FAMILY_NAME,
-  ATK_TEXT_ATTR_BG_COLOR,
-  ATK_TEXT_ATTR_FG_COLOR,
-  ATK_TEXT_ATTR_BG_STIPPLE,
-  ATK_TEXT_ATTR_FG_STIPPLE,
-  ATK_TEXT_ATTR_WRAP_MODE,
-  ATK_TEXT_ATTR_DIRECTION,
-  ATK_TEXT_ATTR_JUSTIFICATION,
-  ATK_TEXT_ATTR_STRETCH,
-  ATK_TEXT_ATTR_VARIANT,
-  ATK_TEXT_ATTR_STYLE,
-  ATK_TEXT_ATTR_LAST_DEFINED
-} AtkTextAttribute;
-
-AtkTextAttribute         atk_text_attribute_register   (const gchar *name);
-
-
-#define ATK_TYPE_TEXT                    (atk_text_get_type ())
-#define ATK_IS_TEXT(obj)                 G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_TEXT)
-#define ATK_TEXT(obj)                    G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_TEXT, AtkText)
-#define ATK_TEXT_GET_IFACE(obj)          (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_TEXT, AtkTextIface))
-
-#ifndef _TYPEDEF_ATK_TEXT_
-#define _TYPEDEF_ATK_TEXT_
-typedef struct _AtkText AtkText;
-#endif
-typedef struct _AtkTextIface AtkTextIface;
-
-/**
- *AtkTextBoundary:
- *@ATK_TEXT_BOUNDARY_CHAR: Boundary is the boundary between characters 
- * (including non-printing characters)
- *@ATK_TEXT_BOUNDARY_WORD_START: Boundary is the start (i.e. first character) of a word. 
- *@ATK_TEXT_BOUNDARY_WORD_END: Boundary is the end (i.e. last character) of a word.
- *@ATK_TEXT_BOUNDARY_SENTENCE_START: Boundary is the first character in a sentence.
- *@ATK_TEXT_BOUNDARY_SENTENCE_END: Boundary is the last (terminal) character in a sentence; 
- * in languages which use "sentence stop" punctuation such as English, the boundary is thus the
- * '.', '?', or similar terminal punctuation character.
- *@ATK_TEXT_BOUNDARY_LINE_START: Boundary is the initial character of the content or a 
- * character immediately following a newline, linefeed, or return character.
- *@ATK_TEXT_BOUNDARY_LINE_END: Boundary is the linefeed, or return character.
- *
- *Text boundary types used for specifying boundaries for regions of text
- **/
-typedef enum {
-  ATK_TEXT_BOUNDARY_CHAR,
-  ATK_TEXT_BOUNDARY_WORD_START,
-  ATK_TEXT_BOUNDARY_WORD_END,
-  ATK_TEXT_BOUNDARY_SENTENCE_START,
-  ATK_TEXT_BOUNDARY_SENTENCE_END,
-  ATK_TEXT_BOUNDARY_LINE_START,
-  ATK_TEXT_BOUNDARY_LINE_END
-} AtkTextBoundary;
-
-/**
- * AtkTextRectangle:
- * @x: The horizontal coordinate of a rectangle
- * @y: The vertical coordinate of a rectangle
- * @width: The width of a rectangle
- * @height: The height of a rectangle
- *
- * A structure used to store a rectangle used by AtkText.
- **/
-
-typedef struct _AtkTextRectangle AtkTextRectangle;
-
-struct _AtkTextRectangle {
-  gint x;
-  gint y;
-  gint width;
-  gint height;
-};
-
-/**
- * AtkTextRange:
- * @bounds: A rectangle giving the bounds of the text range
- * @start_offset: The start offset of a AtkTextRange
- * @end_offset: The end offset of a AtkTextRange
- * @content: The text in the text range
- *
- * A structure used to describe a text range.
- **/
-typedef struct _AtkTextRange AtkTextRange;
-
-struct _AtkTextRange {
-  AtkTextRectangle bounds;
-  gint start_offset;
-  gint end_offset;
-  gchar* content;
-};
-
-/**
- *AtkTextClipType
- *@ATK_TEXT_CLIP_NONE: No clipping to be done
- *@ATK_TEXT_CLIP_MIN: Text clipped by min coordinate is omitted
- *@ATK_TEXT_CLIP_MAX: Text clipped by max coordinate is omitted
- *@ATK_TEXT_CLIP_BOTH: Only text fully within mix/max bound is retained
- *
- *Describes the type of clipping required.
- **/
-typedef enum {
-    ATK_TEXT_CLIP_NONE,
-    ATK_TEXT_CLIP_MIN,
-    ATK_TEXT_CLIP_MAX,
-    ATK_TEXT_CLIP_BOTH
-} AtkTextClipType;
-
-struct _AtkTextIface
-{
-  GTypeInterface parent;
-
-  gchar*         (* get_text)                     (AtkText          *text,
-                                                   gint             start_offset,
-                                                   gint             end_offset);
-  gchar*         (* get_text_after_offset)        (AtkText          *text,
-                                                   gint             offset,
-                                                   AtkTextBoundary  boundary_type,
-						   gint             *start_offset,
-						   gint             *end_offset);
-  gchar*         (* get_text_at_offset)           (AtkText          *text,
-                                                   gint             offset,
-                                                   AtkTextBoundary  boundary_type,
-						   gint             *start_offset,
-						   gint             *end_offset);
-  gunichar       (* get_character_at_offset)      (AtkText          *text,
-                                                   gint             offset);
-  gchar*         (* get_text_before_offset)       (AtkText          *text,
-                                                   gint             offset,
-                                                   AtkTextBoundary  boundary_type,
- 						   gint             *start_offset,
-						   gint             *end_offset);
-  gint           (* get_caret_offset)             (AtkText          *text);
-  AtkAttributeSet* (* get_run_attributes)         (AtkText	    *text,
-						   gint	  	    offset,
-						   gint             *start_offset,
-						   gint	 	    *end_offset);
-  AtkAttributeSet* (* get_default_attributes)     (AtkText	    *text);
-  void           (* get_character_extents)        (AtkText          *text,
-                                                   gint             offset,
-                                                   gint             *x,
-                                                   gint             *y,
-                                                   gint             *width,
-                                                   gint             *height,
-                                                   AtkCoordType	    coords);
-  gint           (* get_character_count)          (AtkText          *text);
-  gint           (* get_offset_at_point)          (AtkText          *text,
-                                                   gint             x,
-                                                   gint             y,
-                                                   AtkCoordType	    coords);
-  gint		 (* get_n_selections)		  (AtkText          *text);
-  gchar*         (* get_selection)	          (AtkText          *text,
-						   gint		    selection_num,
-						   gint		    *start_offset,
-						   gint		    *end_offset);
-  gboolean       (* add_selection)		  (AtkText          *text,
-						   gint		    start_offset,
-						   gint		    end_offset);
-  gboolean       (* remove_selection)		  (AtkText          *text,
-						   gint             selection_num);
-  gboolean       (* set_selection)		  (AtkText          *text,
-						   gint		    selection_num,
-						   gint		    start_offset,
-						   gint		    end_offset);
-  gboolean       (* set_caret_offset)             (AtkText          *text,
-                                                   gint             offset);
-
-  /*
-   * signal handlers
-   */
-  void		 (* text_changed)                 (AtkText          *text,
-                                                   gint             position,
-                                                   gint             length);
-  void           (* text_caret_moved)             (AtkText          *text,
-                                                   gint             location);
-  void           (* text_selection_changed)       (AtkText          *text);
-
-  void           (* text_attributes_changed)      (AtkText          *text);
-
-
-  void           (* get_range_extents)            (AtkText          *text,
-                                                   gint             start_offset,
-                                                   gint             end_offset,
-                                                   AtkCoordType     coord_type,
-                                                   AtkTextRectangle *rect);
-
-  AtkTextRange** (* get_bounded_ranges)           (AtkText          *text,
-                                                   AtkTextRectangle *rect,
-                                                   AtkCoordType     coord_type,
-                                                   AtkTextClipType  x_clip_type,
-                                                   AtkTextClipType  y_clip_type);
- 
-
-  AtkFunction    pad4;
-};
-
-GType            atk_text_get_type (void);
-
-
-/*
- * Additional AtkObject properties used by AtkText:
- *    "accessible_text" (accessible text has changed)
- *    "accessible_caret" (accessible text cursor position changed:
- *                         editable text only)
- */
-
-gchar*        atk_text_get_text                           (AtkText          *text,
-                                                           gint             start_offset,
-                                                           gint             end_offset);
-gunichar      atk_text_get_character_at_offset            (AtkText          *text,
-                                                           gint             offset);
-gchar*        atk_text_get_text_after_offset              (AtkText          *text,
-                                                           gint             offset,
-                                                           AtkTextBoundary  boundary_type,
-							   gint             *start_offset,
-							   gint	            *end_offset);
-gchar*        atk_text_get_text_at_offset                 (AtkText          *text,
-                                                           gint             offset,
-                                                           AtkTextBoundary  boundary_type,
-							   gint             *start_offset,
-							   gint             *end_offset);
-gchar*        atk_text_get_text_before_offset             (AtkText          *text,
-                                                           gint             offset,
-                                                           AtkTextBoundary  boundary_type,
-							   gint             *start_offset,
-							   gint	            *end_offset);
-gint          atk_text_get_caret_offset                   (AtkText          *text);
-void          atk_text_get_character_extents              (AtkText          *text,
-                                                           gint             offset,
-                                                           gint             *x,
-                                                           gint             *y,
-                                                           gint             *width,
-                                                           gint             *height,
-                                                           AtkCoordType	    coords);
-AtkAttributeSet* atk_text_get_run_attributes              (AtkText	    *text,
-						           gint	  	    offset,
-						           gint             *start_offset,
-						           gint	 	    *end_offset);
-AtkAttributeSet* atk_text_get_default_attributes          (AtkText	    *text);
-gint          atk_text_get_character_count                (AtkText          *text);
-gint          atk_text_get_offset_at_point                (AtkText          *text,
-                                                           gint             x,
-                                                           gint             y,
-                                                           AtkCoordType	    coords);
-gint          atk_text_get_n_selections			  (AtkText          *text);
-gchar*        atk_text_get_selection			  (AtkText          *text,
-							   gint		    selection_num,
-							   gint             *start_offset,
-							   gint             *end_offset);
-gboolean      atk_text_add_selection                      (AtkText          *text,
-							   gint             start_offset,
-							   gint             end_offset);
-gboolean      atk_text_remove_selection                   (AtkText          *text,
-							   gint		    selection_num);
-gboolean      atk_text_set_selection                      (AtkText          *text,
-							   gint		    selection_num,
-							   gint             start_offset,
-							   gint             end_offset);
-gboolean      atk_text_set_caret_offset                   (AtkText          *text,
-                                                           gint             offset);
-void          atk_text_get_range_extents                  (AtkText          *text,
-
-                                                           gint             start_offset,
-                                                           gint             end_offset,
-                                                           AtkCoordType     coord_type,
-                                                           AtkTextRectangle *rect);
-AtkTextRange**  atk_text_get_bounded_ranges               (AtkText          *text,
-                                                           AtkTextRectangle *rect,
-                                                           AtkCoordType     coord_type,
-                                                           AtkTextClipType  x_clip_type,
-                                                           AtkTextClipType  y_clip_type);
-void          atk_text_free_ranges                        (AtkTextRange     **ranges);
-void 	      atk_attribute_set_free                      (AtkAttributeSet  *attrib_set);
-G_CONST_RETURN gchar*  atk_text_attribute_get_name        (AtkTextAttribute attr);
-AtkTextAttribute       atk_text_attribute_for_name        (const gchar      *name);
-G_CONST_RETURN gchar*  atk_text_attribute_get_value       (AtkTextAttribute attr,
-                                                           gint             index_);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __ATK_TEXT_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkutil.h b/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkutil.h
deleted file mode 100644
index e96eb649..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkutil.h
+++ /dev/null
@@ -1,315 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_UTIL_H__
-#define __ATK_UTIL_H__
-
-#include <atk/atkobject.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define ATK_TYPE_UTIL                   (atk_util_get_type ())
-#define ATK_IS_UTIL(obj)                G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_UTIL)
-#define ATK_UTIL(obj)                   G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_UTIL, AtkUtil)
-#define ATK_UTIL_CLASS(klass)                   (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_UTIL, AtkUtilClass))
-#define ATK_IS_UTIL_CLASS(klass)                (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_UTIL))
-#define ATK_UTIL_GET_CLASS(obj)                 (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_UTIL, AtkUtilClass))
-
-
-#ifndef _TYPEDEF_ATK_UTIL_
-#define _TYPEDEF_ATK_UTIL_
-typedef struct _AtkUtil      AtkUtil;
-typedef struct _AtkUtilClass AtkUtilClass;
-typedef struct _AtkKeyEventStruct AtkKeyEventStruct;
-#endif
-
-/**
- * AtkEventListener: 
- * @obj: An #AtkObject instance for whom the callback will be called when
- * the specified event (e.g. 'focus:') takes place.
- *
- * A function which is called when an object emits a matching event,
- * as used in #atk_add_focus_tracker.
- * Currently the only events for which object-specific handlers are
- * supported are events of type "focus:".  Most clients of ATK will prefer to 
- * attach signal handlers for the various ATK signals instead.
- *
- * @see: atk_add_focus_tracker.
- **/
-typedef void  (*AtkEventListener) (AtkObject* obj);
-/**
- * AtkEventListenerInit:
- *
- * An #AtkEventListenerInit function is a special function that is
- * called in order to initialize the per-object event registration system
- * used by #AtkEventListener, if any preparation is required.  
- *
- * @see: atk_focus_tracker_init.
- **/
-typedef void  (*AtkEventListenerInit) (void);
-/**
- * AtkKeySnoopFunc:
- * @event: an AtkKeyEventStruct containing information about the key event for which
- * notification is being given.
- * @func_data: a block of data which will be passed to the event listener, on notification.
- *
- * An #AtkKeySnoopFunc is a type of callback which is called whenever a key event occurs, 
- * if registered via atk_add_key_event_listener.  It allows for pre-emptive 
- * interception of key events via the return code as described below.
- *
- * Returns: TRUE (nonzero) if the event emission should be stopped and the event 
- * discarded without being passed to the normal GUI recipient; FALSE (zero) if the 
- * event dispatch to the client application should proceed as normal.
- *
- * @see: atk_add_key_event_listener.
- **/
-typedef gint  (*AtkKeySnoopFunc)  (AtkKeyEventStruct *event,
-				   gpointer func_data);
-
-/**
- * AtkKeyEventStruct:
- * @type: An AtkKeyEventType, generally one of ATK_KEY_EVENT_PRESS or ATK_KEY_EVENT_RELEASE
- * @state: A bitmask representing the state of the modifier keys immediately after the event takes place.   
- * The meaning of the bits is currently defined to match the bitmask used by GDK in
- * GdkEventType.state, see 
- * http://developer.gnome.org/doc/API/2.0/gdk/gdk-Event-Structures.html#GdkEventKey
- * @keyval: A guint representing a keysym value corresponding to those used by GDK and X11: see
- * /usr/X11/include/keysymdef.h.
- * @length: The length of member #string.
- * @string: A string containing one of the following: either a string approximating the text that would 
- * result from this keypress, if the key is a control or graphic character, or a symbolic name for this keypress.
- * Alphanumeric and printable keys will have the symbolic key name in this string member, for instance "A". "0", 
- * "semicolon", "aacute".  Keypad keys have the prefix "KP".
- * @keycode: The raw hardware code that generated the key event.  This field is raraly useful.
- * @timestamp: A timestamp in milliseconds indicating when the event occurred.  
- * These timestamps are relative to a starting point which should be considered arbitrary, 
- * and only used to compare the dispatch times of events to one another.
- *
- * Encapsulates information about a key event.
- **/
-struct _AtkKeyEventStruct {
-  gint type;
-  guint state;
-  guint keyval;
-  gint length;
-  gchar *string;
-  guint16 keycode;
-  guint32 timestamp;	
-};
-
-/**
- *AtkKeyEventType:
- *@ATK_KEY_EVENT_PRESS: specifies a key press event
- *@ATK_KEY_EVENT_RELEASE: specifies a key release event
- *@ATK_KEY_EVENT_LAST_DEFINED: Not a valid value; specifies end of enumeration
- *
- *Specifies the type of a keyboard evemt.
- **/
-typedef enum
-{
-  ATK_KEY_EVENT_PRESS,
-  ATK_KEY_EVENT_RELEASE,
-  ATK_KEY_EVENT_LAST_DEFINED
-} AtkKeyEventType;
-
-struct _AtkUtil
-{
-  GObject parent;
-};
-
-struct _AtkUtilClass
-{
-   GObjectClass parent;
-   guint        (* add_global_event_listener)    (GSignalEmissionHook listener,
-						  const gchar        *event_type);
-   void         (* remove_global_event_listener) (guint               listener_id);
-   guint	(* add_key_event_listener) 	 (AtkKeySnoopFunc     listener,
-						  gpointer data);
-   void         (* remove_key_event_listener)    (guint               listener_id);
-   AtkObject*   (* get_root)                     (void);
-   G_CONST_RETURN gchar* (* get_toolkit_name)    (void);
-   G_CONST_RETURN gchar* (* get_toolkit_version) (void);
-};
-GType atk_util_get_type (void);
-
-/**
- *AtkCoordType:
- *@ATK_XY_SCREEN: specifies xy coordinates relative to the screen
- *@ATK_XY_WINDOW: specifies xy coordinates relative to the widget's 
- * top-level window
- *
- *Specifies how xy coordinates are to be interpreted. Used by functions such
- *as atk_component_get_position() and atk_text_get_character_extents() 
- **/
-typedef enum {
-  ATK_XY_SCREEN,
-  ATK_XY_WINDOW
-}AtkCoordType;
-
-/*
- * Adds the specified function to the list of functions to be called
- * when an object receives focus.
- */
-guint    atk_add_focus_tracker     (AtkEventListener      focus_tracker);
-
-/*
- * Removes the specified focus tracker from the list of function
- * to be called when any object receives focus
- */
-void     atk_remove_focus_tracker  (guint                tracker_id);
-
-/*
- * atk_focus_tracker_init:
- * @init: An #AtkEventListenerInit function to be called
- * prior to any focus-tracking requests.
- *
- * Specifies the function to be called for focus tracker initialization.
- * removal. This function should be called by an implementation of the
- * ATK interface if any specific work needs to be done to enable
- * focus tracking.
- */
-void     atk_focus_tracker_init    (AtkEventListenerInit  init);
-
-/*
- * Cause the focus tracker functions which have been specified to be
- * executed for the object.
- */
-void     atk_focus_tracker_notify  (AtkObject            *object);
-
-/*
- * Adds the specified function to the list of functions to be called
- * when an event of type event_type occurs.
- */
-guint	atk_add_global_event_listener (GSignalEmissionHook listener,
-				       const gchar        *event_type);
-
-/*
- * Removes the specified event listener
- */
-void	atk_remove_global_event_listener (guint listener_id);
-
-/*
- * Adds the specified function to the list of functions to be called
- * when an keyboard event occurs.
- */
-guint	atk_add_key_event_listener (AtkKeySnoopFunc listener, gpointer data);
-
-/*
- * Removes the specified event listener
- */
-void	atk_remove_key_event_listener (guint listener_id);
-
-/*
- * Returns the root accessible container for the current application.
- */
-AtkObject* atk_get_root(void);
-
-AtkObject* atk_get_focus_object (void);
-
-/*
- * Returns name string for the GUI toolkit.
- */
-G_CONST_RETURN gchar *atk_get_toolkit_name (void);
-
-/*
- * Returns version string for the GUI toolkit.
- */
-G_CONST_RETURN gchar *atk_get_toolkit_version (void);
-
-/*
- * Gets the current version of ATK
- */
-G_CONST_RETURN gchar *atk_get_version (void);
-
-/* --- GType boilerplate --- */
-/* convenience macros for atk type implementations, which for a type GtkGadgetAccessible will:
- * - prototype: static void     gtk_gadget_accessible_class_init (GtkGadgetClass *klass);
- * - prototype: static void     gtk_gadget_accessible_init       (GtkGadget      *self);
- * - define:    static gpointer gtk_gadget_accessible_parent_class = NULL;
- *   gtk_gadget_accessible_parent_class is initialized prior to calling gtk_gadget_class_init()
- * - implement: GType           gtk_gadget_accessible_get_type (void) { ... }
- * - support custom code in gtk_gadget_accessible_get_type() after the type is registered.
- *
- * macro arguments: TypeName, type_name, TYPE_PARENT, CODE
- * example: ATK_DEFINE_TYPE_WITH_CODE (GtkGadgetAccessible, gtk_gadget_accessible, GTK_TYPE_GADGET,
- *                                     G_IMPLEMENT_INTERFACE (ATK_TYPE_TABLE, gtk_gadget_accessible_table_iface_init))
- */
-
-#define ATK_DEFINE_TYPE(TN, t_n, T_P)			       ATK_DEFINE_TYPE_EXTENDED (TN, t_n, T_P, 0, {})
-#define ATK_DEFINE_TYPE_WITH_CODE(TN, t_n, T_P, _C_)	      _ATK_DEFINE_TYPE_EXTENDED_BEGIN (TN, t_n, T_P, 0) {_C_;} _ATK_DEFINE_TYPE_EXTENDED_END()
-#define ATK_DEFINE_ABSTRACT_TYPE(TN, t_n, T_P)		       ATK_DEFINE_TYPE_EXTENDED (TN, t_n, T_P, G_TYPE_FLAG_ABSTRACT, {})
-#define ATK_DEFINE_ABSTRACT_TYPE_WITH_CODE(TN, t_n, T_P, _C_) _ATK_DEFINE_TYPE_EXTENDED_BEGIN (TN, t_n, T_P, G_TYPE_FLAG_ABSTRACT) {_C_;} _ATK_DEFINE_TYPE_EXTENDED_END()
-#define ATK_DEFINE_TYPE_EXTENDED(TN, t_n, T_P, _f_, _C_)      _ATK_DEFINE_TYPE_EXTENDED_BEGIN (TN, t_n, T_P, _f_) {_C_;} _ATK_DEFINE_TYPE_EXTENDED_END()
-
-#define _ATK_DEFINE_TYPE_EXTENDED_BEGIN(TypeName, type_name, TYPE, 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 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); \
-} \
-\
-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))  \
-    { \
-      AtkObjectFactory *factory; \
-      GType derived_type; \
-      GTypeQuery query; \
-      GType derived_atk_type; \
-      GType g_define_type_id; \
-\
-      /* Figure out the size of the class and instance we are deriving from */ \
-      derived_type = g_type_parent (TYPE); \
-      factory = atk_registry_get_factory (atk_get_default_registry (), \
-                                          derived_type); \
-      derived_atk_type = atk_object_factory_get_accessible_type (factory); \
-      g_type_query (derived_atk_type, &query); \
-\
-      g_define_type_id = \
-        g_type_register_static_simple (derived_atk_type, \
-                                       g_intern_static_string (#TypeName), \
-                                       query.class_size, \
-                                       (GClassInitFunc) type_name##_class_intern_init, \
-                                       query.instance_size, \
-                                       (GInstanceInitFunc) type_name##_init, \
-                                       (GTypeFlags) flags); \
-      { /* custom code follows */
-#define _ATK_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() */
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __ATK_UTIL_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkvalue.h b/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkvalue.h
deleted file mode 100644
index f66c0152..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/atk-1.0/atk/atkvalue.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_VALUE_H__
-#define __ATK_VALUE_H__
-
-#include <atk/atkobject.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * The AtkValue interface should be supported by any object that 
- * supports a numerical value (e.g., a scroll bar). This interface 
- * provides the standard mechanism for an assistive technology to 
- * determine and set the numerical value as well as get the minimum 
- * and maximum values.
- */
-
-#define ATK_TYPE_VALUE                    (atk_value_get_type ())
-#define ATK_IS_VALUE(obj)                 G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_VALUE)
-#define ATK_VALUE(obj)                    G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_VALUE, AtkValue)
-#define ATK_VALUE_GET_IFACE(obj)          (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_VALUE, AtkValueIface))
-
-#ifndef _TYPEDEF_ATK_VALUE_
-#define _TYPEDEF_ATK_VALUE__
-typedef struct _AtkValue AtkValue;
-#endif
-typedef struct _AtkValueIface AtkValueIface;
-
-struct _AtkValueIface
-{
-  GTypeInterface parent;
-
-  void     (* get_current_value) (AtkValue     *obj,
-                                  GValue       *value);
-  void     (* get_maximum_value) (AtkValue     *obj,
-                                  GValue       *value);
-  void     (* get_minimum_value) (AtkValue     *obj,
-                                  GValue       *value);
-  gboolean (* set_current_value) (AtkValue     *obj,
-                                  const GValue *value);
-  void     (* get_minimum_increment) (AtkValue   *obj,
-				      GValue     *value);
-  AtkFunction pad1;
-};
-
-GType            atk_value_get_type (void);
-
-void      atk_value_get_current_value (AtkValue     *obj,
-                                       GValue       *value);
-
-
-void     atk_value_get_maximum_value  (AtkValue     *obj,
-                                       GValue       *value);
-
-void     atk_value_get_minimum_value  (AtkValue     *obj,
-                                       GValue       *value);
-
-gboolean atk_value_set_current_value  (AtkValue     *obj,
-                                       const GValue *value);
-
-void     atk_value_get_minimum_increment  (AtkValue     *obj,
-					   GValue       *value);
-
-/*
- * Additional GObject properties exported by GaccessibleValue:
- *    "accessible_value"
- *       (the accessible value has changed)
- */
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __ATK_VALUE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/cairo/cairo-deprecated.h b/lib-x86-32/gtk-2.12.12/usr/include/cairo/cairo-deprecated.h
deleted file mode 100644
index c73d2b78..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/cairo/cairo-deprecated.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/* cairo - a vector graphics library with display and print output
- *
- * Copyright © 2006 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it either under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation
- * (the "LGPL") or, at your option, under the terms of the Mozilla
- * Public License Version 1.1 (the "MPL"). If you do not alter this
- * notice, a recipient may use your version of this file under either
- * the MPL or the LGPL.
- *
- * You should have received a copy of the LGPL along with this library
- * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- * You should have received a copy of the MPL along with this library
- * in the file COPYING-MPL-1.1
- *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
- * OF ANY KIND, either express or implied. See the LGPL or the MPL for
- * the specific language governing rights and limitations.
- *
- * The Original Code is the cairo graphics library.
- *
- * The Initial Developer of the Original Code is Red Hat, Inc.
- *
- * Contributor(s):
- *	Carl D. Worth <cworth@cworth.org>
- */
-
-#ifndef CAIRO_DEPRECATED_H
-#define CAIRO_DEPRECATED_H
-
-/* The %CAIRO_FORMAT_RGB16_565 value was added in cairo 1.2.0 as part
- * of fixing cairo's xlib backend to work with X servers advertising a
- * 16-bit, 565 visual. But as it turned out, adding this format to
- * #cairo_format_t was not necessary, and was a mistake, (cairo's xlib
- * backend can work fine with 16-bit visuals in the same way it works
- * with BGR visuals without any BGR formats in
- * #cairo_format_t).
- *
- * Additionally, the support for the RGB16_565 format was never
- * completely implemented. So while this format value is currently
- * deprecated, it may eventually acquire complete support in the future.
- */
-#define CAIRO_FORMAT_RGB16_565 4
-
-#define CAIRO_FONT_TYPE_ATSUI CAIRO_FONT_TYPE_QUARTZ
-
-#ifndef _CAIROINT_H_
-
-/* Obsolete functions. These definitions exist to coerce the compiler
- * into providing a little bit of guidance with its error
- * messages. The idea is to help users port their old code without
- * having to dig through lots of documentation.
- *
- * The first set of REPLACED_BY functions is for functions whose names
- * have just been changed. So fixing these up is mechanical, (and
- * automated by means of the cairo/util/cairo-api-update script.
- *
- * The second set of DEPRECATED_BY functions is for functions where
- * the replacement is used in a different way, (ie. different
- * arguments, multiple functions instead of one, etc). Fixing these up
- * will require a bit more work on the user's part, (and hopefully we
- * can get cairo-api-update to find these and print some guiding
- * information).
- */
-#define cairo_current_font_extents   cairo_current_font_extents_REPLACED_BY_cairo_font_extents
-#define cairo_get_font_extents       cairo_get_font_extents_REPLACED_BY_cairo_font_extents
-#define cairo_current_operator       cairo_current_operator_REPLACED_BY_cairo_get_operator
-#define cairo_current_tolerance	     cairo_current_tolerance_REPLACED_BY_cairo_get_tolerance
-#define cairo_current_point	     cairo_current_point_REPLACED_BY_cairo_get_current_point
-#define cairo_current_fill_rule	     cairo_current_fill_rule_REPLACED_BY_cairo_get_fill_rule
-#define cairo_current_line_width     cairo_current_line_width_REPLACED_BY_cairo_get_line_width
-#define cairo_current_line_cap       cairo_current_line_cap_REPLACED_BY_cairo_get_line_cap
-#define cairo_current_line_join      cairo_current_line_join_REPLACED_BY_cairo_get_line_join
-#define cairo_current_miter_limit    cairo_current_miter_limit_REPLACED_BY_cairo_get_miter_limit
-#define cairo_current_matrix         cairo_current_matrix_REPLACED_BY_cairo_get_matrix
-#define cairo_current_target_surface cairo_current_target_surface_REPLACED_BY_cairo_get_target
-#define cairo_get_status             cairo_get_status_REPLACED_BY_cairo_status
-#define cairo_concat_matrix		 cairo_concat_matrix_REPLACED_BY_cairo_transform
-#define cairo_scale_font                 cairo_scale_font_REPLACED_BY_cairo_set_font_size
-#define cairo_select_font                cairo_select_font_REPLACED_BY_cairo_select_font_face
-#define cairo_transform_font             cairo_transform_font_REPLACED_BY_cairo_set_font_matrix
-#define cairo_transform_point		 cairo_transform_point_REPLACED_BY_cairo_user_to_device
-#define cairo_transform_distance	 cairo_transform_distance_REPLACED_BY_cairo_user_to_device_distance
-#define cairo_inverse_transform_point	 cairo_inverse_transform_point_REPLACED_BY_cairo_device_to_user
-#define cairo_inverse_transform_distance cairo_inverse_transform_distance_REPLACED_BY_cairo_device_to_user_distance
-#define cairo_init_clip			 cairo_init_clip_REPLACED_BY_cairo_reset_clip
-#define cairo_surface_create_for_image	 cairo_surface_create_for_image_REPLACED_BY_cairo_image_surface_create_for_data
-#define cairo_default_matrix		 cairo_default_matrix_REPLACED_BY_cairo_identity_matrix
-#define cairo_matrix_set_affine		 cairo_matrix_set_affine_REPLACED_BY_cairo_matrix_init
-#define cairo_matrix_set_identity	 cairo_matrix_set_identity_REPLACED_BY_cairo_matrix_init_identity
-#define cairo_pattern_add_color_stop	 cairo_pattern_add_color_stop_REPLACED_BY_cairo_pattern_add_color_stop_rgba
-#define cairo_set_rgb_color		 cairo_set_rgb_color_REPLACED_BY_cairo_set_source_rgb
-#define cairo_set_pattern		 cairo_set_pattern_REPLACED_BY_cairo_set_source
-#define cairo_xlib_surface_create_for_pixmap_with_visual	cairo_xlib_surface_create_for_pixmap_with_visual_REPLACED_BY_cairo_xlib_surface_create
-#define cairo_xlib_surface_create_for_window_with_visual	cairo_xlib_surface_create_for_window_with_visual_REPLACED_BY_cairo_xlib_surface_create
-#define cairo_xcb_surface_create_for_pixmap_with_visual	cairo_xcb_surface_create_for_pixmap_with_visual_REPLACED_BY_cairo_xcb_surface_create
-#define cairo_xcb_surface_create_for_window_with_visual	cairo_xcb_surface_create_for_window_with_visual_REPLACED_BY_cairo_xcb_surface_create
-#define cairo_ps_surface_set_dpi	cairo_ps_surface_set_dpi_REPLACED_BY_cairo_surface_set_fallback_resolution
-#define cairo_pdf_surface_set_dpi	cairo_pdf_surface_set_dpi_REPLACED_BY_cairo_surface_set_fallback_resolution
-#define cairo_svg_surface_set_dpi	cairo_svg_surface_set_dpi_REPLACED_BY_cairo_surface_set_fallback_resolution
-#define cairo_atsui_font_face_create_for_atsu_font_id  cairo_atsui_font_face_create_for_atsu_font_id_REPLACED_BY_cairo_quartz_font_face_create_for_atsu_font_id
-
-#define cairo_current_path	     cairo_current_path_DEPRECATED_BY_cairo_copy_path
-#define cairo_current_path_flat	     cairo_current_path_flat_DEPRECATED_BY_cairo_copy_path_flat
-#define cairo_get_path		     cairo_get_path_DEPRECATED_BY_cairo_copy_path
-#define cairo_get_path_flat	     cairo_get_path_flat_DEPRECATED_BY_cairo_get_path_flat
-#define cairo_set_alpha		     cairo_set_alpha_DEPRECATED_BY_cairo_set_source_rgba_OR_cairo_paint_with_alpha
-#define cairo_show_surface	     cairo_show_surface_DEPRECATED_BY_cairo_set_source_surface_AND_cairo_paint
-#define cairo_copy		     cairo_copy_DEPRECATED_BY_cairo_create_AND_MANY_INDIVIDUAL_FUNCTIONS
-#define cairo_surface_set_repeat	cairo_surface_set_repeat_DEPRECATED_BY_cairo_pattern_set_extend
-#define cairo_surface_set_matrix	cairo_surface_set_matrix_DEPRECATED_BY_cairo_pattern_set_matrix
-#define cairo_surface_get_matrix	cairo_surface_get_matrix_DEPRECATED_BY_cairo_pattern_get_matrix
-#define cairo_surface_set_filter	cairo_surface_set_filter_DEPRECATED_BY_cairo_pattern_set_filter
-#define cairo_surface_get_filter	cairo_surface_get_filter_DEPRECATED_BY_cairo_pattern_get_filter
-#define cairo_matrix_create		cairo_matrix_create_DEPRECATED_BY_cairo_matrix_t
-#define cairo_matrix_destroy		cairo_matrix_destroy_DEPRECATED_BY_cairo_matrix_t
-#define cairo_matrix_copy		cairo_matrix_copy_DEPRECATED_BY_cairo_matrix_t
-#define cairo_matrix_get_affine		cairo_matrix_get_affine_DEPRECATED_BY_cairo_matrix_t
-#define cairo_set_target_surface	cairo_set_target_surface_DEPRECATED_BY_cairo_create
-#define cairo_set_target_glitz		cairo_set_target_glitz_DEPRECATED_BY_cairo_glitz_surface_create
-#define cairo_set_target_image		cairo_set_target_image_DEPRECATED_BY_cairo_image_surface_create_for_data
-#define cairo_set_target_pdf		cairo_set_target_pdf_DEPRECATED_BY_cairo_pdf_surface_create
-#define cairo_set_target_png		cairo_set_target_png_DEPRECATED_BY_cairo_surface_write_to_png
-#define cairo_set_target_ps		cairo_set_target_ps_DEPRECATED_BY_cairo_ps_surface_create
-#define cairo_set_target_quartz		cairo_set_target_quartz_DEPRECATED_BY_cairo_quartz_surface_create
-#define cairo_set_target_win32		cairo_set_target_win32_DEPRECATED_BY_cairo_win32_surface_create
-#define cairo_set_target_xcb		cairo_set_target_xcb_DEPRECATED_BY_cairo_xcb_surface_create
-#define cairo_set_target_drawable	cairo_set_target_drawable_DEPRECATED_BY_cairo_xlib_surface_create
-#define cairo_get_status_string		cairo_get_status_string_DEPRECATED_BY_cairo_status_AND_cairo_status_to_string
-#define cairo_status_string		cairo_status_string_DEPRECATED_BY_cairo_status_AND_cairo_status_to_string
-
-#endif
-
-#endif /* CAIRO_DEPRECATED_H */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/cairo/cairo-directfb.h b/lib-x86-32/gtk-2.12.12/usr/include/cairo/cairo-directfb.h
deleted file mode 100644
index 21005e1f..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/cairo/cairo-directfb.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* cairo - a vector graphics library with display and print output
- *
- * Copyright © 2003 University of Southern California
- *
- * This library is free software; you can redistribute it and/or
- * modify it either under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation
- * (the "LGPL") or, at your option, under the terms of the Mozilla
- * Public License Version 1.1 (the "MPL"). If you do not alter this
- * notice, a recipient may use your version of this file under either
- * the MPL or the LGPL.
- *
- * You should have received a copy of the LGPL along with this library
- * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- * You should have received a copy of the MPL along with this library
- * in the file COPYING-MPL-1.1
- *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
- * OF ANY KIND, either express or implied. See the LGPL or the MPL for
- * the specific language governing rights and limitations.
- *
- * The Original Code is the cairo graphics library.
- *
- * The Initial Developer of the Original Code is University of Southern
- * California.
- *
- * Contributor(s):
- *	Carl D. Worth <cworth@isi.edu>
- */
-
-/*
- * Environment variables affecting the backend:
- *
- *  %CAIRO_DIRECTFB_NO_ACCEL (boolean)
- *      if found, disables acceleration at all
- *
- *  %CAIRO_DIRECTFB_ARGB_FONT (boolean)
- *      if found, enables using ARGB fonts instead of A8
- */
-
-#ifndef CAIRO_DIRECTFB_H
-#define CAIRO_DIRECTFB_H
-
-#include <cairo.h>
-
-#ifdef  CAIRO_HAS_DIRECTFB_SURFACE
-
-#include <directfb.h>
-
-CAIRO_BEGIN_DECLS
-
-cairo_public cairo_surface_t *
-cairo_directfb_surface_create (IDirectFB *dfb, IDirectFBSurface *surface);
-
-CAIRO_END_DECLS
-
-#else  /*CAIRO_HAS_DIRECTFB_SURFACE*/
-# error Cairo was not compiled with support for the directfb backend
-#endif /*CAIRO_HAS_DIRECTFB_SURFACE*/
-
-#endif /*CAIRO_DIRECTFB_H*/
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/cairo/cairo-features.h b/lib-x86-32/gtk-2.12.12/usr/include/cairo/cairo-features.h
deleted file mode 100644
index 7bf2ab8b..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/cairo/cairo-features.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Generated by configure.  Do not edit */
-#ifndef CAIRO_FEATURES_H
-#define CAIRO_FEATURES_H
-
-#ifdef  __cplusplus
-# define CAIRO_BEGIN_DECLS  extern "C" {
-# define CAIRO_END_DECLS    }
-#else
-# define CAIRO_BEGIN_DECLS
-# define CAIRO_END_DECLS
-#endif
-
-#ifndef cairo_public
-# define cairo_public
-#endif
-
-#define CAIRO_VERSION_MAJOR 1
-#define CAIRO_VERSION_MINOR 6
-#define CAIRO_VERSION_MICRO 4
-
-#define CAIRO_VERSION_STRING "1.6.4"
-
-#define CAIRO_HAS_SVG_SURFACE 1
-#define CAIRO_HAS_PDF_SURFACE 1
-#define CAIRO_HAS_PS_SURFACE 1
-#define CAIRO_HAS_FT_FONT 1
-#define CAIRO_HAS_DIRECTFB_SURFACE 1
-#define CAIRO_HAS_PNG_FUNCTIONS 1
-#define CAIRO_HAS_XCB_SURFACE 1
-#define CAIRO_HAS_XLIB_XRENDER_SURFACE 1
-#define CAIRO_HAS_XLIB_SURFACE 1
-
-/*#undef CAIRO_HAS_WIN32_FONT */
-/*#undef CAIRO_HAS_WIN32_SURFACE */
-/*#undef CAIRO_HAS_QUARTZ_FONT */
-/*#undef CAIRO_HAS_QUARTZ_SURFACE */
-
-#endif
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/cairo/cairo-ft.h b/lib-x86-32/gtk-2.12.12/usr/include/cairo/cairo-ft.h
deleted file mode 100644
index b59435fe..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/cairo/cairo-ft.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* cairo - a vector graphics library with display and print output
- *
- * Copyright © 2005 Red Hat, Inc
- *
- * This library is free software; you can redistribute it and/or
- * modify it either under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation
- * (the "LGPL") or, at your option, under the terms of the Mozilla
- * Public License Version 1.1 (the "MPL"). If you do not alter this
- * notice, a recipient may use your version of this file under either
- * the MPL or the LGPL.
- *
- * You should have received a copy of the LGPL along with this library
- * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- * You should have received a copy of the MPL along with this library
- * in the file COPYING-MPL-1.1
- *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
- * OF ANY KIND, either express or implied. See the LGPL or the MPL for
- * the specific language governing rights and limitations.
- *
- * The Original Code is the cairo graphics library.
- *
- * The Initial Developer of the Original Code is Red Hat, Inc.
- *
- * Contributor(s):
- *      Graydon Hoare <graydon@redhat.com>
- *	Owen Taylor <otaylor@redhat.com>
- */
-
-#ifndef CAIRO_FT_H
-#define CAIRO_FT_H
-
-#include <cairo.h>
-
-#if CAIRO_HAS_FT_FONT
-
-/* Fontconfig/Freetype platform-specific font interface */
-
-#include <fontconfig/fontconfig.h>
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-CAIRO_BEGIN_DECLS
-
-cairo_public cairo_font_face_t *
-cairo_ft_font_face_create_for_pattern (FcPattern *pattern);
-
-cairo_public void
-cairo_ft_font_options_substitute (const cairo_font_options_t *options,
-				  FcPattern                  *pattern);
-
-cairo_public cairo_font_face_t *
-cairo_ft_font_face_create_for_ft_face (FT_Face         face,
-				       int             load_flags);
-
-cairo_public FT_Face
-cairo_ft_scaled_font_lock_face (cairo_scaled_font_t *scaled_font);
-
-cairo_public void
-cairo_ft_scaled_font_unlock_face (cairo_scaled_font_t *scaled_font);
-
-CAIRO_END_DECLS
-
-#else  /* CAIRO_HAS_FT_FONT */
-# error Cairo was not compiled with support for the freetype font backend
-#endif /* CAIRO_HAS_FT_FONT */
-
-#endif /* CAIRO_FT_H */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/cairo/cairo-pdf.h b/lib-x86-32/gtk-2.12.12/usr/include/cairo/cairo-pdf.h
deleted file mode 100644
index 52a89740..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/cairo/cairo-pdf.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* cairo - a vector graphics library with display and print output
- *
- * Copyright © 2002 University of Southern California
- *
- * This library is free software; you can redistribute it and/or
- * modify it either under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation
- * (the "LGPL") or, at your option, under the terms of the Mozilla
- * Public License Version 1.1 (the "MPL"). If you do not alter this
- * notice, a recipient may use your version of this file under either
- * the MPL or the LGPL.
- *
- * You should have received a copy of the LGPL along with this library
- * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- * You should have received a copy of the MPL along with this library
- * in the file COPYING-MPL-1.1
- *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
- * OF ANY KIND, either express or implied. See the LGPL or the MPL for
- * the specific language governing rights and limitations.
- *
- * The Original Code is the cairo graphics library.
- *
- * The Initial Developer of the Original Code is University of Southern
- * California.
- *
- * Contributor(s):
- *	Carl D. Worth <cworth@cworth.org>
- */
-
-#ifndef CAIRO_PDF_H
-#define CAIRO_PDF_H
-
-#include <cairo.h>
-
-#if CAIRO_HAS_PDF_SURFACE
-
-CAIRO_BEGIN_DECLS
-
-cairo_public cairo_surface_t *
-cairo_pdf_surface_create (const char		*filename,
-			  double		 width_in_points,
-			  double		 height_in_points);
-
-cairo_public cairo_surface_t *
-cairo_pdf_surface_create_for_stream (cairo_write_func_t	write_func,
-				     void	       *closure,
-				     double		width_in_points,
-				     double		height_in_points);
-
-cairo_public void
-cairo_pdf_surface_set_size (cairo_surface_t	*surface,
-			    double		 width_in_points,
-			    double		 height_in_points);
-
-CAIRO_END_DECLS
-
-#else  /* CAIRO_HAS_PDF_SURFACE */
-# error Cairo was not compiled with support for the pdf backend
-#endif /* CAIRO_HAS_PDF_SURFACE */
-
-#endif /* CAIRO_PDF_H */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/cairo/cairo-ps.h b/lib-x86-32/gtk-2.12.12/usr/include/cairo/cairo-ps.h
deleted file mode 100644
index 720b1b76..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/cairo/cairo-ps.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* cairo - a vector graphics library with display and print output
- *
- * Copyright © 2002 University of Southern California
- *
- * This library is free software; you can redistribute it and/or
- * modify it either under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation
- * (the "LGPL") or, at your option, under the terms of the Mozilla
- * Public License Version 1.1 (the "MPL"). If you do not alter this
- * notice, a recipient may use your version of this file under either
- * the MPL or the LGPL.
- *
- * You should have received a copy of the LGPL along with this library
- * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- * You should have received a copy of the MPL along with this library
- * in the file COPYING-MPL-1.1
- *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
- * OF ANY KIND, either express or implied. See the LGPL or the MPL for
- * the specific language governing rights and limitations.
- *
- * The Original Code is the cairo graphics library.
- *
- * The Initial Developer of the Original Code is University of Southern
- * California.
- *
- * Contributor(s):
- *	Carl D. Worth <cworth@cworth.org>
- */
-
-#ifndef CAIRO_PS_H
-#define CAIRO_PS_H
-
-#include <cairo.h>
-
-#if CAIRO_HAS_PS_SURFACE
-
-#include <stdio.h>
-
-CAIRO_BEGIN_DECLS
-
-/* PS-surface functions */
-
-/**
- * cairo_ps_level_t:
- * @CAIRO_PS_LEVEL_2: The language level 2 of the PostScript specification.
- * @CAIRO_PS_LEVEL_3: The language level 3 of the PostScript specification.
- *
- * #cairo_ps_level_t is used to describe the language level of the
- * PostScript Language Reference that a generated PostScript file will
- * conform to.
- */
-typedef enum _cairo_ps_level {
-    CAIRO_PS_LEVEL_2,
-    CAIRO_PS_LEVEL_3
-} cairo_ps_level_t;
-
-cairo_public cairo_surface_t *
-cairo_ps_surface_create (const char		*filename,
-			 double			 width_in_points,
-			 double			 height_in_points);
-
-cairo_public cairo_surface_t *
-cairo_ps_surface_create_for_stream (cairo_write_func_t	write_func,
-				    void	       *closure,
-				    double		width_in_points,
-				    double		height_in_points);
-
-cairo_public void
-cairo_ps_surface_restrict_to_level (cairo_surface_t    *surface,
-                                    cairo_ps_level_t    level);
-
-cairo_public void
-cairo_ps_get_levels (cairo_ps_level_t const  **levels,
-                     int                      *num_levels);
-
-cairo_public const char *
-cairo_ps_level_to_string (cairo_ps_level_t level);
-
-cairo_public void
-cairo_ps_surface_set_eps (cairo_surface_t	*surface,
-			  cairo_bool_t           eps);
-
-cairo_public cairo_bool_t
-cairo_ps_surface_get_eps (cairo_surface_t	*surface);
-
-cairo_public void
-cairo_ps_surface_set_size (cairo_surface_t	*surface,
-			   double		 width_in_points,
-			   double		 height_in_points);
-
-cairo_public void
-cairo_ps_surface_dsc_comment (cairo_surface_t	*surface,
-			      const char	*comment);
-
-cairo_public void
-cairo_ps_surface_dsc_begin_setup (cairo_surface_t *surface);
-
-cairo_public void
-cairo_ps_surface_dsc_begin_page_setup (cairo_surface_t *surface);
-
-CAIRO_END_DECLS
-
-#else  /* CAIRO_HAS_PS_SURFACE */
-# error Cairo was not compiled with support for the ps backend
-#endif /* CAIRO_HAS_PS_SURFACE */
-
-#endif /* CAIRO_PS_H */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/cairo/cairo-svg.h b/lib-x86-32/gtk-2.12.12/usr/include/cairo/cairo-svg.h
deleted file mode 100644
index 5d18c643..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/cairo/cairo-svg.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* cairo - a vector graphics library with display and print output
- *
- * cairo-svg.h
- *
- * Copyright © 2005 Emmanuel Pacaud <emmanuel.pacaud@univ-poitiers.fr>
- *
- * This library is free software; you can redistribute it and/or
- * modify it either under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation
- * (the "LGPL") or, at your option, under the terms of the Mozilla
- * Public License Version 1.1 (the "MPL"). If you do not alter this
- * notice, a recipient may use your version of this file under either
- * the MPL or the LGPL.
- *
- * You should have received a copy of the LGPL along with this library
- * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- * You should have received a copy of the MPL along with this library
- * in the file COPYING-MPL-1.1
- *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
- * OF ANY KIND, either express or implied. See the LGPL or the MPL for
- * the specific language governing rights and limitations.
- *
- */
-
-#ifndef CAIRO_SVG_H
-#define CAIRO_SVG_H
-
-#include <cairo.h>
-
-#if CAIRO_HAS_SVG_SURFACE
-
-CAIRO_BEGIN_DECLS
-
-/**
- * cairo_svg_version_t:
- * @CAIRO_SVG_VERSION_1_1: The version 1.1 of the SVG specification.
- * @CAIRO_SVG_VERSION_1_2: The version 1.2 of the SVG specification.
- *
- * #cairo_svg_version_t is used to describe the version number of the SVG
- * specification that a generated SVG file will conform to.
- */
-typedef enum _cairo_svg_version {
-    CAIRO_SVG_VERSION_1_1,
-    CAIRO_SVG_VERSION_1_2
-} cairo_svg_version_t;
-
-cairo_public cairo_surface_t *
-cairo_svg_surface_create (const char   *filename,
-			  double	width_in_points,
-			  double	height_in_points);
-
-cairo_public cairo_surface_t *
-cairo_svg_surface_create_for_stream (cairo_write_func_t	write_func,
-				     void	       *closure,
-				     double		width_in_points,
-				     double		height_in_points);
-
-cairo_public void
-cairo_svg_surface_restrict_to_version (cairo_surface_t 		*surface,
-				       cairo_svg_version_t  	 version);
-
-cairo_public void
-cairo_svg_get_versions (cairo_svg_version_t const	**versions,
-                        int                      	 *num_versions);
-
-cairo_public const char *
-cairo_svg_version_to_string (cairo_svg_version_t version);
-
-CAIRO_END_DECLS
-
-#else  /* CAIRO_HAS_SVG_SURFACE */
-# error Cairo was not compiled with support for the svg backend
-#endif /* CAIRO_HAS_SVG_SURFACE */
-
-#endif /* CAIRO_SVG_H */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/cairo/cairo-xcb-xrender.h b/lib-x86-32/gtk-2.12.12/usr/include/cairo/cairo-xcb-xrender.h
deleted file mode 100644
index 9df68567..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/cairo/cairo-xcb-xrender.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* cairo - a vector graphics library with display and print output
- *
- * Copyright © 2002 University of Southern California
- *
- * This library is free software; you can redistribute it and/or
- * modify it either under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation
- * (the "LGPL") or, at your option, under the terms of the Mozilla
- * Public License Version 1.1 (the "MPL"). If you do not alter this
- * notice, a recipient may use your version of this file under either
- * the MPL or the LGPL.
- *
- * You should have received a copy of the LGPL along with this library
- * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- * You should have received a copy of the MPL along with this library
- * in the file COPYING-MPL-1.1
- *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
- * OF ANY KIND, either express or implied. See the LGPL or the MPL for
- * the specific language governing rights and limitations.
- *
- * The Original Code is the cairo graphics library.
- *
- * The Initial Developer of the Original Code is University of Southern
- * California.
- *
- * Contributor(s):
- *	Carl D. Worth <cworth@cworth.org>
- */
-
-#ifndef CAIRO_XCB_XRENDER_H
-#define CAIRO_XCB_XRENDER_H
-
-#include <cairo.h>
-
-#if CAIRO_HAS_XCB_SURFACE
-
-#include <xcb/xcb.h>
-#include <xcb/render.h>
-
-CAIRO_BEGIN_DECLS
-
-cairo_public cairo_surface_t *
-cairo_xcb_surface_create_with_xrender_format (xcb_connection_t	    *c,
-					      xcb_drawable_t	     drawable,
-					      xcb_screen_t		    *screen,
-					      xcb_render_pictforminfo_t *format,
-					      int		     width,
-					      int		     height);
-
-CAIRO_END_DECLS
-
-#else  /* CAIRO_HAS_XCB_SURFACE */
-# error Cairo was not compiled with support for the xcb backend
-#endif /* CAIRO_HAS_XCB_SURFACE */
-
-#endif /* CAIRO_XCB_XRENDER_H */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/cairo/cairo-xcb.h b/lib-x86-32/gtk-2.12.12/usr/include/cairo/cairo-xcb.h
deleted file mode 100644
index e180bb6a..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/cairo/cairo-xcb.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* cairo - a vector graphics library with display and print output
- *
- * Copyright © 2002 University of Southern California
- *
- * This library is free software; you can redistribute it and/or
- * modify it either under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation
- * (the "LGPL") or, at your option, under the terms of the Mozilla
- * Public License Version 1.1 (the "MPL"). If you do not alter this
- * notice, a recipient may use your version of this file under either
- * the MPL or the LGPL.
- *
- * You should have received a copy of the LGPL along with this library
- * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- * You should have received a copy of the MPL along with this library
- * in the file COPYING-MPL-1.1
- *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
- * OF ANY KIND, either express or implied. See the LGPL or the MPL for
- * the specific language governing rights and limitations.
- *
- * The Original Code is the cairo graphics library.
- *
- * The Initial Developer of the Original Code is University of Southern
- * California.
- *
- * Contributor(s):
- *	Carl D. Worth <cworth@cworth.org>
- */
-
-#ifndef CAIRO_XCB_H
-#define CAIRO_XCB_H
-
-#include <cairo.h>
-
-#if CAIRO_HAS_XCB_SURFACE
-
-#include <xcb/xcb.h>
-
-CAIRO_BEGIN_DECLS
-
-cairo_public cairo_surface_t *
-cairo_xcb_surface_create (xcb_connection_t *c,
-			  xcb_drawable_t	 drawable,
-			  xcb_visualtype_t *visual,
-			  int		 width,
-			  int		 height);
-
-cairo_public cairo_surface_t *
-cairo_xcb_surface_create_for_bitmap (xcb_connection_t *c,
-				     xcb_pixmap_t	    bitmap,
-				     xcb_screen_t	   *screen,
-				     int	    width,
-				     int	    height);
-
-cairo_public void
-cairo_xcb_surface_set_size (cairo_surface_t *surface,
-			    int		     width,
-			    int		     height);
-
-CAIRO_END_DECLS
-
-#else  /* CAIRO_HAS_XCB_SURFACE */
-# error Cairo was not compiled with support for the xcb backend
-#endif /* CAIRO_HAS_XCB_SURFACE */
-
-#endif /* CAIRO_XCB_H */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/cairo/cairo-xlib-xrender.h b/lib-x86-32/gtk-2.12.12/usr/include/cairo/cairo-xlib-xrender.h
deleted file mode 100644
index 6dd584fc..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/cairo/cairo-xlib-xrender.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* cairo - a vector graphics library with display and print output
- *
- * Copyright © 2002 University of Southern California
- *
- * This library is free software; you can redistribute it and/or
- * modify it either under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation
- * (the "LGPL") or, at your option, under the terms of the Mozilla
- * Public License Version 1.1 (the "MPL"). If you do not alter this
- * notice, a recipient may use your version of this file under either
- * the MPL or the LGPL.
- *
- * You should have received a copy of the LGPL along with this library
- * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- * You should have received a copy of the MPL along with this library
- * in the file COPYING-MPL-1.1
- *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
- * OF ANY KIND, either express or implied. See the LGPL or the MPL for
- * the specific language governing rights and limitations.
- *
- * The Original Code is the cairo graphics library.
- *
- * The Initial Developer of the Original Code is University of Southern
- * California.
- *
- * Contributor(s):
- *	Carl D. Worth <cworth@cworth.org>
- */
-
-#ifndef CAIRO_XLIB_XRENDER_H
-#define CAIRO_XLIB_XRENDER_H
-
-#include <cairo.h>
-
-#if CAIRO_HAS_XLIB_XRENDER_SURFACE
-
-#include <X11/Xlib.h>
-#include <X11/extensions/Xrender.h>
-
-CAIRO_BEGIN_DECLS
-
-cairo_public cairo_surface_t *
-cairo_xlib_surface_create_with_xrender_format (Display		 *dpy,
-                                               Drawable		  drawable,
-					       Screen		 *screen,
-                                               XRenderPictFormat *format,
-                                               int		  width,
-                                               int		  height);
-
-cairo_public XRenderPictFormat *
-cairo_xlib_surface_get_xrender_format (cairo_surface_t *surface);
-
-CAIRO_END_DECLS
-
-#else  /* CAIRO_HAS_XLIB_XRENDER_SURFACE */
-# error Cairo was not compiled with support for the xlib XRender backend
-#endif /* CAIRO_HAS_XLIB_XRENDER_SURFACE */
-
-#endif /* CAIRO_XLIB_XRENDER_H */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/cairo/cairo-xlib.h b/lib-x86-32/gtk-2.12.12/usr/include/cairo/cairo-xlib.h
deleted file mode 100644
index ad92b39e..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/cairo/cairo-xlib.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* cairo - a vector graphics library with display and print output
- *
- * Copyright © 2002 University of Southern California
- *
- * This library is free software; you can redistribute it and/or
- * modify it either under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation
- * (the "LGPL") or, at your option, under the terms of the Mozilla
- * Public License Version 1.1 (the "MPL"). If you do not alter this
- * notice, a recipient may use your version of this file under either
- * the MPL or the LGPL.
- *
- * You should have received a copy of the LGPL along with this library
- * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- * You should have received a copy of the MPL along with this library
- * in the file COPYING-MPL-1.1
- *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
- * OF ANY KIND, either express or implied. See the LGPL or the MPL for
- * the specific language governing rights and limitations.
- *
- * The Original Code is the cairo graphics library.
- *
- * The Initial Developer of the Original Code is University of Southern
- * California.
- *
- * Contributor(s):
- *	Carl D. Worth <cworth@cworth.org>
- */
-
-#ifndef CAIRO_XLIB_H
-#define CAIRO_XLIB_H
-
-#include <cairo.h>
-
-#if CAIRO_HAS_XLIB_SURFACE
-
-#include <X11/Xlib.h>
-
-CAIRO_BEGIN_DECLS
-
-cairo_public cairo_surface_t *
-cairo_xlib_surface_create (Display     *dpy,
-			   Drawable	drawable,
-			   Visual      *visual,
-			   int		width,
-			   int		height);
-
-cairo_public cairo_surface_t *
-cairo_xlib_surface_create_for_bitmap (Display  *dpy,
-				      Pixmap	bitmap,
-				      Screen	*screen,
-				      int	width,
-				      int	height);
-
-cairo_public void
-cairo_xlib_surface_set_size (cairo_surface_t *surface,
-			     int              width,
-			     int              height);
-
-cairo_public void
-cairo_xlib_surface_set_drawable (cairo_surface_t *surface,
-				 Drawable	  drawable,
-				 int              width,
-				 int              height);
-
-cairo_public Display *
-cairo_xlib_surface_get_display (cairo_surface_t *surface);
-
-cairo_public Drawable
-cairo_xlib_surface_get_drawable (cairo_surface_t *surface);
-
-cairo_public Screen *
-cairo_xlib_surface_get_screen (cairo_surface_t *surface);
-
-cairo_public Visual *
-cairo_xlib_surface_get_visual (cairo_surface_t *surface);
-
-cairo_public int
-cairo_xlib_surface_get_depth (cairo_surface_t *surface);
-
-cairo_public int
-cairo_xlib_surface_get_width (cairo_surface_t *surface);
-
-cairo_public int
-cairo_xlib_surface_get_height (cairo_surface_t *surface);
-
-CAIRO_END_DECLS
-
-#else  /* CAIRO_HAS_XLIB_SURFACE */
-# error Cairo was not compiled with support for the xlib backend
-#endif /* CAIRO_HAS_XLIB_SURFACE */
-
-#endif /* CAIRO_XLIB_H */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/cairo/cairo.h b/lib-x86-32/gtk-2.12.12/usr/include/cairo/cairo.h
deleted file mode 100644
index 4a3a773d..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/cairo/cairo.h
+++ /dev/null
@@ -1,1945 +0,0 @@
-/* cairo - a vector graphics library with display and print output
- *
- * Copyright © 2002 University of Southern California
- * Copyright © 2005 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it either under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation
- * (the "LGPL") or, at your option, under the terms of the Mozilla
- * Public License Version 1.1 (the "MPL"). If you do not alter this
- * notice, a recipient may use your version of this file under either
- * the MPL or the LGPL.
- *
- * You should have received a copy of the LGPL along with this library
- * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- * You should have received a copy of the MPL along with this library
- * in the file COPYING-MPL-1.1
- *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
- * OF ANY KIND, either express or implied. See the LGPL or the MPL for
- * the specific language governing rights and limitations.
- *
- * The Original Code is the cairo graphics library.
- *
- * The Initial Developer of the Original Code is University of Southern
- * California.
- *
- * Contributor(s):
- *	Carl D. Worth <cworth@cworth.org>
- */
-
-#ifndef CAIRO_H
-#define CAIRO_H
-
-#include <cairo-features.h>
-#include <cairo-deprecated.h>
-
-CAIRO_BEGIN_DECLS
-
-#define CAIRO_VERSION_ENCODE(major, minor, micro) (     \
-	  ((major) * 10000)                             \
-	+ ((minor) *   100)                             \
-	+ ((micro) *     1))
-
-#define CAIRO_VERSION CAIRO_VERSION_ENCODE(     \
-	CAIRO_VERSION_MAJOR,                    \
-	CAIRO_VERSION_MINOR,                    \
-	CAIRO_VERSION_MICRO)
-
-cairo_public int
-cairo_version (void);
-
-cairo_public const char*
-cairo_version_string (void);
-
-/**
- * cairo_bool_t:
- *
- * #cairo_bool_t is used for boolean values. Returns of type
- * #cairo_bool_t will always be either 0 or 1, but testing against
- * these values explicitly is not encouraged; just use the
- * value as a boolean condition.
- *
- * <informalexample><programlisting>
- *  if (cairo_in_stroke (cr, x, y)) {
- *      /<!-- -->* do something *<!-- -->/
- *  }
- * </programlisting></informalexample>
- **/
-typedef int cairo_bool_t;
-
-/**
- * cairo_t:
- *
- * A #cairo_t contains the current state of the rendering device,
- * including coordinates of yet to be drawn shapes.
- *
- * Cairo contexts, as #cairo_t objects are named, are central to
- * cairo and all drawing with cairo is always done to a #cairo_t
- * object.
- *
- * Memory management of #cairo_t is done with
- * cairo_reference() and cairo_destroy().
- **/
-typedef struct _cairo cairo_t;
-
-/**
- * cairo_surface_t:
- *
- * A #cairo_surface_t represents an image, either as the destination
- * of a drawing operation or as source when drawing onto another
- * surface.  To draw to a #cairo_surface_t, create a cairo context
- * with the surface as the target, using cairo_create().
- *
- * There are different subtypes of #cairo_surface_t for
- * different drawing backends; for example, cairo_image_surface_create()
- * creates a bitmap image in memory.
- * The type of a surface can be queried with cairo_surface_get_type().
- *
- * Memory management of #cairo_surface_t is done with
- * cairo_surface_reference() and cairo_surface_destroy().
- **/
-typedef struct _cairo_surface cairo_surface_t;
-
-/**
- * cairo_matrix_t:
- * @xx: xx component of the affine transformation
- * @yx: yx component of the affine transformation
- * @xy: xy component of the affine transformation
- * @yy: yy component of the affine transformation
- * @x0: X translation component of the affine transformation
- * @y0: Y translation component of the affine transformation
- *
- * A #cairo_matrix_t holds an affine transformation, such as a scale,
- * rotation, shear, or a combination of those. The transformation of
- * a point (x, y) is given by:
- * <programlisting>
- *     x_new = xx * x + xy * y + x0;
- *     y_new = yx * x + yy * y + y0;
- * </programlisting>
- **/
-typedef struct _cairo_matrix {
-    double xx; double yx;
-    double xy; double yy;
-    double x0; double y0;
-} cairo_matrix_t;
-
-/**
- * cairo_pattern_t:
- *
- * A #cairo_pattern_t represents a source when drawing onto a
- * surface. There are different subtypes of #cairo_pattern_t,
- * for different types of sources; for example,
- * cairo_pattern_create_rgb() creates a pattern for a solid
- * opaque color.
- *
- * Other than various cairo_pattern_create_<emphasis>type</emphasis>()
- * functions, some of the pattern types can be implicitly created
- * using various cairo_set_source_<emphasis>type</emphasis>() functions;
- * for example cairo_set_source_rgb().
- *
- * The type of a pattern can be queried with cairo_pattern_get_type().
- *
- * Memory management of #cairo_pattern_t is done with
- * cairo_pattern_reference() and cairo_pattern_destroy().
- **/
-typedef struct _cairo_pattern cairo_pattern_t;
-
-/**
- * cairo_destroy_func_t:
- * @data: The data element being destroyed.
- *
- * #cairo_destroy_func_t the type of function which is called when a
- * data element is destroyed. It is passed the pointer to the data
- * element and should free any memory and resources allocated for it.
- **/
-typedef void (*cairo_destroy_func_t) (void *data);
-
-/**
- * cairo_user_data_key_t:
- * @unused: not used; ignore.
- *
- * #cairo_user_data_key_t is used for attaching user data to cairo
- * data structures.  The actual contents of the struct is never used,
- * and there is no need to initialize the object; only the unique
- * address of a #cairo_data_key_t object is used.  Typically, you
- * would just use the address of a static #cairo_data_key_t object.
- **/
-typedef struct _cairo_user_data_key {
-    int unused;
-} cairo_user_data_key_t;
-
-/**
- * cairo_status_t:
- * @CAIRO_STATUS_SUCCESS: no error has occurred
- * @CAIRO_STATUS_NO_MEMORY: out of memory
- * @CAIRO_STATUS_INVALID_RESTORE: cairo_restore() called without matching cairo_save()
- * @CAIRO_STATUS_INVALID_POP_GROUP: no saved group to pop
- * @CAIRO_STATUS_NO_CURRENT_POINT: no current point defined
- * @CAIRO_STATUS_INVALID_MATRIX: invalid matrix (not invertible)
- * @CAIRO_STATUS_INVALID_STATUS: invalid value for an input #cairo_status_t
- * @CAIRO_STATUS_NULL_POINTER: %NULL pointer
- * @CAIRO_STATUS_INVALID_STRING: input string not valid UTF-8
- * @CAIRO_STATUS_INVALID_PATH_DATA: input path data not valid
- * @CAIRO_STATUS_READ_ERROR: error while reading from input stream
- * @CAIRO_STATUS_WRITE_ERROR: error while writing to output stream
- * @CAIRO_STATUS_SURFACE_FINISHED: target surface has been finished
- * @CAIRO_STATUS_SURFACE_TYPE_MISMATCH: the surface type is not appropriate for the operation
- * @CAIRO_STATUS_PATTERN_TYPE_MISMATCH: the pattern type is not appropriate for the operation
- * @CAIRO_STATUS_INVALID_CONTENT: invalid value for an input #cairo_content_t
- * @CAIRO_STATUS_INVALID_FORMAT: invalid value for an input #cairo_format_t
- * @CAIRO_STATUS_INVALID_VISUAL: invalid value for an input Visual*
- * @CAIRO_STATUS_FILE_NOT_FOUND: file not found
- * @CAIRO_STATUS_INVALID_DASH: invalid value for a dash setting
- * @CAIRO_STATUS_INVALID_DSC_COMMENT: invalid value for a DSC comment (Since 1.2)
- * @CAIRO_STATUS_INVALID_INDEX: invalid index passed to getter (Since 1.4)
- * @CAIRO_STATUS_CLIP_NOT_REPRESENTABLE: clip region not representable in desired format (Since 1.4)
- * @CAIRO_STATUS_TEMP_FILE_ERROR: error creating or writing to a temporary file (Since 1.6)
- * @CAIRO_STATUS_INVALID_STRIDE: invalid value for stride (Since 1.6)
- *
- * #cairo_status_t is used to indicate errors that can occur when
- * using Cairo. In some cases it is returned directly by functions.
- * but when using #cairo_t, the last error, if any, is stored in
- * the context and can be retrieved with cairo_status().
- *
- * New entries may be added in future versions.  Use cairo_status_to_string()
- * to get a human-readable representation of an error message.
- **/
-typedef enum _cairo_status {
-    CAIRO_STATUS_SUCCESS = 0,
-    CAIRO_STATUS_NO_MEMORY,
-    CAIRO_STATUS_INVALID_RESTORE,
-    CAIRO_STATUS_INVALID_POP_GROUP,
-    CAIRO_STATUS_NO_CURRENT_POINT,
-    CAIRO_STATUS_INVALID_MATRIX,
-    CAIRO_STATUS_INVALID_STATUS,
-    CAIRO_STATUS_NULL_POINTER,
-    CAIRO_STATUS_INVALID_STRING,
-    CAIRO_STATUS_INVALID_PATH_DATA,
-    CAIRO_STATUS_READ_ERROR,
-    CAIRO_STATUS_WRITE_ERROR,
-    CAIRO_STATUS_SURFACE_FINISHED,
-    CAIRO_STATUS_SURFACE_TYPE_MISMATCH,
-    CAIRO_STATUS_PATTERN_TYPE_MISMATCH,
-    CAIRO_STATUS_INVALID_CONTENT,
-    CAIRO_STATUS_INVALID_FORMAT,
-    CAIRO_STATUS_INVALID_VISUAL,
-    CAIRO_STATUS_FILE_NOT_FOUND,
-    CAIRO_STATUS_INVALID_DASH,
-    CAIRO_STATUS_INVALID_DSC_COMMENT,
-    CAIRO_STATUS_INVALID_INDEX,
-    CAIRO_STATUS_CLIP_NOT_REPRESENTABLE,
-    CAIRO_STATUS_TEMP_FILE_ERROR,
-    CAIRO_STATUS_INVALID_STRIDE
-    /* after adding a new error: update CAIRO_STATUS_LAST_STATUS in cairoint.h */
-} cairo_status_t;
-
-/**
- * cairo_content_t:
- * @CAIRO_CONTENT_COLOR: The surface will hold color content only.
- * @CAIRO_CONTENT_ALPHA: The surface will hold alpha content only.
- * @CAIRO_CONTENT_COLOR_ALPHA: The surface will hold color and alpha content.
- *
- * #cairo_content_t is used to describe the content that a surface will
- * contain, whether color information, alpha information (translucence
- * vs. opacity), or both.
- *
- * Note: The large values here are designed to keep #cairo_content_t
- * values distinct from #cairo_format_t values so that the
- * implementation can detect the error if users confuse the two types.
- **/
-typedef enum _cairo_content {
-    CAIRO_CONTENT_COLOR		= 0x1000,
-    CAIRO_CONTENT_ALPHA		= 0x2000,
-    CAIRO_CONTENT_COLOR_ALPHA	= 0x3000
-} cairo_content_t;
-
-/**
- * cairo_write_func_t:
- * @closure: the output closure
- * @data: the buffer containing the data to write
- * @length: the amount of data to write
- *
- * #cairo_write_func_t is the type of function which is called when a
- * backend needs to write data to an output stream.  It is passed the
- * closure which was specified by the user at the time the write
- * function was registered, the data to write and the length of the
- * data in bytes.  The write function should return
- * CAIRO_STATUS_SUCCESS if all the data was successfully written,
- * CAIRO_STATUS_WRITE_ERROR otherwise.
- *
- * Returns: the status code of the write operation
- **/
-typedef cairo_status_t (*cairo_write_func_t) (void		  *closure,
-					      const unsigned char *data,
-					      unsigned int	   length);
-
-/**
- * cairo_read_func_t:
- * @closure: the input closure
- * @data: the buffer into which to read the data
- * @length: the amount of data to read
- *
- * #cairo_read_func_t is the type of function which is called when a
- * backend needs to read data from an input stream.  It is passed the
- * closure which was specified by the user at the time the read
- * function was registered, the buffer to read the data into and the
- * length of the data in bytes.  The read function should return
- * CAIRO_STATUS_SUCCESS if all the data was successfully read,
- * CAIRO_STATUS_READ_ERROR otherwise.
- *
- * Returns: the status code of the read operation
- **/
-typedef cairo_status_t (*cairo_read_func_t) (void		*closure,
-					     unsigned char	*data,
-					     unsigned int	length);
-
-/* Functions for manipulating state objects */
-cairo_public cairo_t *
-cairo_create (cairo_surface_t *target);
-
-cairo_public cairo_t *
-cairo_reference (cairo_t *cr);
-
-cairo_public void
-cairo_destroy (cairo_t *cr);
-
-cairo_public unsigned int
-cairo_get_reference_count (cairo_t *cr);
-
-cairo_public void *
-cairo_get_user_data (cairo_t			 *cr,
-		     const cairo_user_data_key_t *key);
-
-cairo_public cairo_status_t
-cairo_set_user_data (cairo_t			 *cr,
-		     const cairo_user_data_key_t *key,
-		     void			 *user_data,
-		     cairo_destroy_func_t	  destroy);
-
-cairo_public void
-cairo_save (cairo_t *cr);
-
-cairo_public void
-cairo_restore (cairo_t *cr);
-
-cairo_public void
-cairo_push_group (cairo_t *cr);
-
-cairo_public void
-cairo_push_group_with_content (cairo_t *cr, cairo_content_t content);
-
-cairo_public cairo_pattern_t *
-cairo_pop_group (cairo_t *cr);
-
-cairo_public void
-cairo_pop_group_to_source (cairo_t *cr);
-
-/* Modify state */
-
-/**
- * cairo_operator_t:
- * @CAIRO_OPERATOR_CLEAR: clear destination layer (bounded)
- * @CAIRO_OPERATOR_SOURCE: replace destination layer (bounded)
- * @CAIRO_OPERATOR_OVER: draw source layer on top of destination layer
- * (bounded)
- * @CAIRO_OPERATOR_IN: draw source where there was destination content
- * (unbounded)
- * @CAIRO_OPERATOR_OUT: draw source where there was no destination
- * content (unbounded)
- * @CAIRO_OPERATOR_ATOP: draw source on top of destination content and
- * only there
- * @CAIRO_OPERATOR_DEST: ignore the source
- * @CAIRO_OPERATOR_DEST_OVER: draw destination on top of source
- * @CAIRO_OPERATOR_DEST_IN: leave destination only where there was
- * source content (unbounded)
- * @CAIRO_OPERATOR_DEST_OUT: leave destination only where there was no
- * source content
- * @CAIRO_OPERATOR_DEST_ATOP: leave destination on top of source content
- * and only there (unbounded)
- * @CAIRO_OPERATOR_XOR: source and destination are shown where there is only
- * one of them
- * @CAIRO_OPERATOR_ADD: source and destination layers are accumulated
- * @CAIRO_OPERATOR_SATURATE: like over, but assuming source and dest are
- * disjoint geometries
- *
- * #cairo_operator_t is used to set the compositing operator for all cairo
- * drawing operations.
- *
- * The default operator is %CAIRO_OPERATOR_OVER.
- *
- * The operators marked as <firstterm>unbounded</firstterm> modify their
- * destination even outside of the mask layer (that is, their effect is not
- * bound by the mask layer).  However, their effect can still be limited by
- * way of clipping.
- *
- * To keep things simple, the operator descriptions here
- * document the behavior for when both source and destination are either fully
- * transparent or fully opaque.  The actual implementation works for
- * translucent layers too.
- * For a more detailed explanation of the effects of each operator, including
- * the mathematical definitions, see
- * <ulink url="http://cairographics.org/operators/">http://cairographics.org/operators/</ulink>.
- **/
-typedef enum _cairo_operator {
-    CAIRO_OPERATOR_CLEAR,
-
-    CAIRO_OPERATOR_SOURCE,
-    CAIRO_OPERATOR_OVER,
-    CAIRO_OPERATOR_IN,
-    CAIRO_OPERATOR_OUT,
-    CAIRO_OPERATOR_ATOP,
-
-    CAIRO_OPERATOR_DEST,
-    CAIRO_OPERATOR_DEST_OVER,
-    CAIRO_OPERATOR_DEST_IN,
-    CAIRO_OPERATOR_DEST_OUT,
-    CAIRO_OPERATOR_DEST_ATOP,
-
-    CAIRO_OPERATOR_XOR,
-    CAIRO_OPERATOR_ADD,
-    CAIRO_OPERATOR_SATURATE
-} cairo_operator_t;
-
-cairo_public void
-cairo_set_operator (cairo_t *cr, cairo_operator_t op);
-
-cairo_public void
-cairo_set_source (cairo_t *cr, cairo_pattern_t *source);
-
-cairo_public void
-cairo_set_source_rgb (cairo_t *cr, double red, double green, double blue);
-
-cairo_public void
-cairo_set_source_rgba (cairo_t *cr,
-		       double red, double green, double blue,
-		       double alpha);
-
-cairo_public void
-cairo_set_source_surface (cairo_t	  *cr,
-			  cairo_surface_t *surface,
-			  double	   x,
-			  double	   y);
-
-cairo_public void
-cairo_set_tolerance (cairo_t *cr, double tolerance);
-
-/**
- * cairo_antialias_t:
- * @CAIRO_ANTIALIAS_DEFAULT: Use the default antialiasing for
- *   the subsystem and target device
- * @CAIRO_ANTIALIAS_NONE: Use a bilevel alpha mask
- * @CAIRO_ANTIALIAS_GRAY: Perform single-color antialiasing (using
- *  shades of gray for black text on a white background, for example).
- * @CAIRO_ANTIALIAS_SUBPIXEL: Perform antialiasing by taking
- *  advantage of the order of subpixel elements on devices
- *  such as LCD panels
- *
- * Specifies the type of antialiasing to do when rendering text or shapes.
- **/
-typedef enum _cairo_antialias {
-    CAIRO_ANTIALIAS_DEFAULT,
-    CAIRO_ANTIALIAS_NONE,
-    CAIRO_ANTIALIAS_GRAY,
-    CAIRO_ANTIALIAS_SUBPIXEL
-} cairo_antialias_t;
-
-cairo_public void
-cairo_set_antialias (cairo_t *cr, cairo_antialias_t antialias);
-
-/**
- * cairo_fill_rule_t:
- * @CAIRO_FILL_RULE_WINDING: If the path crosses the ray from
- * left-to-right, counts +1. If the path crosses the ray
- * from right to left, counts -1. (Left and right are determined
- * from the perspective of looking along the ray from the starting
- * point.) If the total count is non-zero, the point will be filled.
- * @CAIRO_FILL_RULE_EVEN_ODD: Counts the total number of
- * intersections, without regard to the orientation of the contour. If
- * the total number of intersections is odd, the point will be
- * filled.
- *
- * #cairo_fill_rule_t is used to select how paths are filled. For both
- * fill rules, whether or not a point is included in the fill is
- * determined by taking a ray from that point to infinity and looking
- * at intersections with the path. The ray can be in any direction,
- * as long as it doesn't pass through the end point of a segment
- * or have a tricky intersection such as intersecting tangent to the path.
- * (Note that filling is not actually implemented in this way. This
- * is just a description of the rule that is applied.)
- *
- * The default fill rule is %CAIRO_FILL_RULE_WINDING.
- *
- * New entries may be added in future versions.
- **/
-typedef enum _cairo_fill_rule {
-    CAIRO_FILL_RULE_WINDING,
-    CAIRO_FILL_RULE_EVEN_ODD
-} cairo_fill_rule_t;
-
-cairo_public void
-cairo_set_fill_rule (cairo_t *cr, cairo_fill_rule_t fill_rule);
-
-cairo_public void
-cairo_set_line_width (cairo_t *cr, double width);
-
-/**
- * cairo_line_cap_t:
- * @CAIRO_LINE_CAP_BUTT: start(stop) the line exactly at the start(end) point
- * @CAIRO_LINE_CAP_ROUND: use a round ending, the center of the circle is the end point
- * @CAIRO_LINE_CAP_SQUARE: use squared ending, the center of the square is the end point
- *
- * Specifies how to render the endpoints of the path when stroking.
- *
- * The default line cap style is %CAIRO_LINE_CAP_BUTT.
- **/
-typedef enum _cairo_line_cap {
-    CAIRO_LINE_CAP_BUTT,
-    CAIRO_LINE_CAP_ROUND,
-    CAIRO_LINE_CAP_SQUARE
-} cairo_line_cap_t;
-
-cairo_public void
-cairo_set_line_cap (cairo_t *cr, cairo_line_cap_t line_cap);
-
-/**
- * cairo_line_join_t:
- * @CAIRO_LINE_JOIN_MITER: use a sharp (angled) corner, see
- * cairo_set_miter_limit()
- * @CAIRO_LINE_JOIN_ROUND: use a rounded join, the center of the circle is the
- * joint point
- * @CAIRO_LINE_JOIN_BEVEL: use a cut-off join, the join is cut off at half
- * the line width from the joint point
- *
- * Specifies how to render the junction of two lines when stroking.
- *
- * The default line join style is %CAIRO_LINE_JOIN_MITER.
- **/
-typedef enum _cairo_line_join {
-    CAIRO_LINE_JOIN_MITER,
-    CAIRO_LINE_JOIN_ROUND,
-    CAIRO_LINE_JOIN_BEVEL
-} cairo_line_join_t;
-
-cairo_public void
-cairo_set_line_join (cairo_t *cr, cairo_line_join_t line_join);
-
-cairo_public void
-cairo_set_dash (cairo_t      *cr,
-		const double *dashes,
-		int	      num_dashes,
-		double	      offset);
-
-cairo_public void
-cairo_set_miter_limit (cairo_t *cr, double limit);
-
-cairo_public void
-cairo_translate (cairo_t *cr, double tx, double ty);
-
-cairo_public void
-cairo_scale (cairo_t *cr, double sx, double sy);
-
-cairo_public void
-cairo_rotate (cairo_t *cr, double angle);
-
-cairo_public void
-cairo_transform (cairo_t	      *cr,
-		 const cairo_matrix_t *matrix);
-
-cairo_public void
-cairo_set_matrix (cairo_t	       *cr,
-		  const cairo_matrix_t *matrix);
-
-cairo_public void
-cairo_identity_matrix (cairo_t *cr);
-
-cairo_public void
-cairo_user_to_device (cairo_t *cr, double *x, double *y);
-
-cairo_public void
-cairo_user_to_device_distance (cairo_t *cr, double *dx, double *dy);
-
-cairo_public void
-cairo_device_to_user (cairo_t *cr, double *x, double *y);
-
-cairo_public void
-cairo_device_to_user_distance (cairo_t *cr, double *dx, double *dy);
-
-/* Path creation functions */
-cairo_public void
-cairo_new_path (cairo_t *cr);
-
-cairo_public void
-cairo_move_to (cairo_t *cr, double x, double y);
-
-cairo_public void
-cairo_new_sub_path (cairo_t *cr);
-
-cairo_public void
-cairo_line_to (cairo_t *cr, double x, double y);
-
-cairo_public void
-cairo_curve_to (cairo_t *cr,
-		double x1, double y1,
-		double x2, double y2,
-		double x3, double y3);
-
-cairo_public void
-cairo_arc (cairo_t *cr,
-	   double xc, double yc,
-	   double radius,
-	   double angle1, double angle2);
-
-cairo_public void
-cairo_arc_negative (cairo_t *cr,
-		    double xc, double yc,
-		    double radius,
-		    double angle1, double angle2);
-
-/* XXX: NYI
-cairo_public void
-cairo_arc_to (cairo_t *cr,
-	      double x1, double y1,
-	      double x2, double y2,
-	      double radius);
-*/
-
-cairo_public void
-cairo_rel_move_to (cairo_t *cr, double dx, double dy);
-
-cairo_public void
-cairo_rel_line_to (cairo_t *cr, double dx, double dy);
-
-cairo_public void
-cairo_rel_curve_to (cairo_t *cr,
-		    double dx1, double dy1,
-		    double dx2, double dy2,
-		    double dx3, double dy3);
-
-cairo_public void
-cairo_rectangle (cairo_t *cr,
-		 double x, double y,
-		 double width, double height);
-
-/* XXX: NYI
-cairo_public void
-cairo_stroke_to_path (cairo_t *cr);
-*/
-
-cairo_public void
-cairo_close_path (cairo_t *cr);
-
-cairo_public void
-cairo_path_extents (cairo_t *cr,
-		    double *x1, double *y1,
-		    double *x2, double *y2);
-
-/* Painting functions */
-cairo_public void
-cairo_paint (cairo_t *cr);
-
-cairo_public void
-cairo_paint_with_alpha (cairo_t *cr,
-			double   alpha);
-
-cairo_public void
-cairo_mask (cairo_t         *cr,
-	    cairo_pattern_t *pattern);
-
-cairo_public void
-cairo_mask_surface (cairo_t         *cr,
-		    cairo_surface_t *surface,
-		    double           surface_x,
-		    double           surface_y);
-
-cairo_public void
-cairo_stroke (cairo_t *cr);
-
-cairo_public void
-cairo_stroke_preserve (cairo_t *cr);
-
-cairo_public void
-cairo_fill (cairo_t *cr);
-
-cairo_public void
-cairo_fill_preserve (cairo_t *cr);
-
-cairo_public void
-cairo_copy_page (cairo_t *cr);
-
-cairo_public void
-cairo_show_page (cairo_t *cr);
-
-/* Insideness testing */
-cairo_public cairo_bool_t
-cairo_in_stroke (cairo_t *cr, double x, double y);
-
-cairo_public cairo_bool_t
-cairo_in_fill (cairo_t *cr, double x, double y);
-
-/* Rectangular extents */
-cairo_public void
-cairo_stroke_extents (cairo_t *cr,
-		      double *x1, double *y1,
-		      double *x2, double *y2);
-
-cairo_public void
-cairo_fill_extents (cairo_t *cr,
-		    double *x1, double *y1,
-		    double *x2, double *y2);
-
-/* Clipping */
-cairo_public void
-cairo_reset_clip (cairo_t *cr);
-
-cairo_public void
-cairo_clip (cairo_t *cr);
-
-cairo_public void
-cairo_clip_preserve (cairo_t *cr);
-
-cairo_public void
-cairo_clip_extents (cairo_t *cr,
-		    double *x1, double *y1,
-		    double *x2, double *y2);
-
-/**
- * cairo_rectangle_t:
- * @x: X coordinate of the left side of the rectangle
- * @y: Y coordinate of the the top side of the rectangle
- * @width: width of the rectangle
- * @height: height of the rectangle
- *
- * A data structure for holding a rectangle.
- *
- * Since: 1.4
- **/
-typedef struct _cairo_rectangle {
-    double x, y, width, height;
-} cairo_rectangle_t;
-
-/**
- * cairo_rectangle_list_t:
- * @status: Error status of the rectangle list
- * @rectangles: Array containing the rectangles
- * @num_rectangles: Number of rectangles in this list
- * 
- * A data structure for holding a dynamically allocated
- * array of rectangles.
- *
- * Since: 1.4
- **/
-typedef struct _cairo_rectangle_list {
-    cairo_status_t     status;
-    cairo_rectangle_t *rectangles;
-    int                num_rectangles;
-} cairo_rectangle_list_t;
-
-cairo_public cairo_rectangle_list_t *
-cairo_copy_clip_rectangle_list (cairo_t *cr);
-
-cairo_public void
-cairo_rectangle_list_destroy (cairo_rectangle_list_t *rectangle_list);
-
-/* Font/Text functions */
-
-/**
- * cairo_scaled_font_t:
- *
- * A #cairo_scaled_font_t is a font scaled to a particular size and device
- * resolution. A #cairo_scaled_font_t is most useful for low-level font
- * usage where a library or application wants to cache a reference
- * to a scaled font to speed up the computation of metrics.
- *
- * There are various types of scaled fonts, depending on the
- * <firstterm>font backend</firstterm> they use. The type of a
- * scaled font can be queried using cairo_scaled_font_get_type().
- *
- * Memory management of #cairo_scaled_font_t is done with
- * cairo_scaled_font_reference() and cairo_scaled_font_destroy().
- **/
-typedef struct _cairo_scaled_font cairo_scaled_font_t;
-
-/**
- * cairo_font_face_t:
- *
- * A #cairo_font_face_t specifies all aspects of a font other
- * than the size or font matrix (a font matrix is used to distort
- * a font by sheering it or scaling it unequally in the two
- * directions) . A font face can be set on a #cairo_t by using
- * cairo_set_font_face(); the size and font matrix are set with
- * cairo_set_font_size() and cairo_set_font_matrix().
- *
- * There are various types of font faces, depending on the
- * <firstterm>font backend</firstterm> they use. The type of a
- * font face can be queried using cairo_font_face_get_type().
- *
- * Memory management of #cairo_font_face_t is done with
- * cairo_font_face_reference() and cairo_font_face_destroy().
- **/
-typedef struct _cairo_font_face cairo_font_face_t;
-
-/**
- * cairo_glyph_t:
- * @index: glyph index in the font. The exact interpretation of the
- *      glyph index depends on the font technology being used.
- * @x: the offset in the X direction between the origin used for
- *     drawing or measuring the string and the origin of this glyph.
- * @y: the offset in the Y direction between the origin used for
- *     drawing or measuring the string and the origin of this glyph.
- *
- * The #cairo_glyph_t structure holds information about a single glyph
- * when drawing or measuring text. A font is (in simple terms) a
- * collection of shapes used to draw text. A glyph is one of these
- * shapes. There can be multiple glyphs for a single character
- * (alternates to be used in different contexts, for example), or a
- * glyph can be a <firstterm>ligature</firstterm> of multiple
- * characters. Cairo doesn't expose any way of converting input text
- * into glyphs, so in order to use the Cairo interfaces that take
- * arrays of glyphs, you must directly access the appropriate
- * underlying font system.
- *
- * Note that the offsets given by @x and @y are not cumulative. When
- * drawing or measuring text, each glyph is individually positioned
- * with respect to the overall origin
- **/
-typedef struct {
-  unsigned long        index;
-  double               x;
-  double               y;
-} cairo_glyph_t;
-
-/**
- * cairo_text_extents_t:
- * @x_bearing: the horizontal distance from the origin to the
- *   leftmost part of the glyphs as drawn. Positive if the
- *   glyphs lie entirely to the right of the origin.
- * @y_bearing: the vertical distance from the origin to the
- *   topmost part of the glyphs as drawn. Positive only if the
- *   glyphs lie completely below the origin; will usually be
- *   negative.
- * @width: width of the glyphs as drawn
- * @height: height of the glyphs as drawn
- * @x_advance:distance to advance in the X direction
- *    after drawing these glyphs
- * @y_advance: distance to advance in the Y direction
- *   after drawing these glyphs. Will typically be zero except
- *   for vertical text layout as found in East-Asian languages.
- *
- * The #cairo_text_extents_t structure stores the extents of a single
- * glyph or a string of glyphs in user-space coordinates. Because text
- * extents are in user-space coordinates, they are mostly, but not
- * entirely, independent of the current transformation matrix. If you call
- * <literal>cairo_scale(cr, 2.0, 2.0)</literal>, text will
- * be drawn twice as big, but the reported text extents will not be
- * doubled. They will change slightly due to hinting (so you can't
- * assume that metrics are independent of the transformation matrix),
- * but otherwise will remain unchanged.
- **/
-typedef struct {
-    double x_bearing;
-    double y_bearing;
-    double width;
-    double height;
-    double x_advance;
-    double y_advance;
-} cairo_text_extents_t;
-
-/**
- * cairo_font_extents_t:
- * @ascent: the distance that the font extends above the baseline.
- *          Note that this is not always exactly equal to the maximum
- *          of the extents of all the glyphs in the font, but rather
- *          is picked to express the font designer's intent as to
- *          how the font should align with elements above it.
- * @descent: the distance that the font extends below the baseline.
- *           This value is positive for typical fonts that include
- *           portions below the baseline. Note that this is not always
- *           exactly equal to the maximum of the extents of all the
- *           glyphs in the font, but rather is picked to express the
- *           font designer's intent as to how the the font should
- *           align with elements below it.
- * @height: the recommended vertical distance between baselines when
- *          setting consecutive lines of text with the font. This
- *          is greater than @ascent+@descent by a
- *          quantity known as the <firstterm>line spacing</firstterm>
- *          or <firstterm>external leading</firstterm>. When space
- *          is at a premium, most fonts can be set with only
- *          a distance of @ascent+@descent between lines.
- * @max_x_advance: the maximum distance in the X direction that
- *         the the origin is advanced for any glyph in the font.
- * @max_y_advance: the maximum distance in the Y direction that
- *         the the origin is advanced for any glyph in the font.
- *         this will be zero for normal fonts used for horizontal
- *         writing. (The scripts of East Asia are sometimes written
- *         vertically.)
- *
- * The #cairo_font_extents_t structure stores metric information for
- * a font. Values are given in the current user-space coordinate
- * system.
- *
- * Because font metrics are in user-space coordinates, they are
- * mostly, but not entirely, independent of the current transformation
- * matrix. If you call <literal>cairo_scale(cr, 2.0, 2.0)</literal>,
- * text will be drawn twice as big, but the reported text extents will
- * not be doubled. They will change slightly due to hinting (so you
- * can't assume that metrics are independent of the transformation
- * matrix), but otherwise will remain unchanged.
- **/
-typedef struct {
-    double ascent;
-    double descent;
-    double height;
-    double max_x_advance;
-    double max_y_advance;
-} cairo_font_extents_t;
-
-/**
- * cairo_font_slant_t:
- * @CAIRO_FONT_SLANT_NORMAL: Upright font style
- * @CAIRO_FONT_SLANT_ITALIC: Italic font style
- * @CAIRO_FONT_SLANT_OBLIQUE: Oblique font style
- *
- * Specifies variants of a font face based on their slant.
- **/
-typedef enum _cairo_font_slant {
-  CAIRO_FONT_SLANT_NORMAL,
-  CAIRO_FONT_SLANT_ITALIC,
-  CAIRO_FONT_SLANT_OBLIQUE
-} cairo_font_slant_t;
-
-/**
- * cairo_font_weight_t:
- * @CAIRO_FONT_WEIGHT_NORMAL: Normal font weight
- * @CAIRO_FONT_WEIGHT_BOLD: Bold font weight
- *
- * Specifies variants of a font face based on their weight.
- **/
-typedef enum _cairo_font_weight {
-  CAIRO_FONT_WEIGHT_NORMAL,
-  CAIRO_FONT_WEIGHT_BOLD
-} cairo_font_weight_t;
-
-/**
- * cairo_subpixel_order_t:
- * @CAIRO_SUBPIXEL_ORDER_DEFAULT: Use the default subpixel order for
- *   for the target device
- * @CAIRO_SUBPIXEL_ORDER_RGB: Subpixel elements are arranged horizontally
- *   with red at the left
- * @CAIRO_SUBPIXEL_ORDER_BGR:  Subpixel elements are arranged horizontally
- *   with blue at the left
- * @CAIRO_SUBPIXEL_ORDER_VRGB: Subpixel elements are arranged vertically
- *   with red at the top
- * @CAIRO_SUBPIXEL_ORDER_VBGR: Subpixel elements are arranged vertically
- *   with blue at the top
- *
- * The subpixel order specifies the order of color elements within
- * each pixel on the display device when rendering with an
- * antialiasing mode of %CAIRO_ANTIALIAS_SUBPIXEL.
- **/
-typedef enum _cairo_subpixel_order {
-    CAIRO_SUBPIXEL_ORDER_DEFAULT,
-    CAIRO_SUBPIXEL_ORDER_RGB,
-    CAIRO_SUBPIXEL_ORDER_BGR,
-    CAIRO_SUBPIXEL_ORDER_VRGB,
-    CAIRO_SUBPIXEL_ORDER_VBGR
-} cairo_subpixel_order_t;
-
-/**
- * cairo_hint_style_t:
- * @CAIRO_HINT_STYLE_DEFAULT: Use the default hint style for
- *   font backend and target device
- * @CAIRO_HINT_STYLE_NONE: Do not hint outlines
- * @CAIRO_HINT_STYLE_SLIGHT: Hint outlines slightly to improve
- *   contrast while retaining good fidelity to the original
- *   shapes.
- * @CAIRO_HINT_STYLE_MEDIUM: Hint outlines with medium strength
- *   giving a compromise between fidelity to the original shapes
- *   and contrast
- * @CAIRO_HINT_STYLE_FULL: Hint outlines to maximize contrast
- *
- * Specifies the type of hinting to do on font outlines. Hinting
- * is the process of fitting outlines to the pixel grid in order
- * to improve the appearance of the result. Since hinting outlines
- * involves distorting them, it also reduces the faithfulness
- * to the original outline shapes. Not all of the outline hinting
- * styles are supported by all font backends.
- *
- * New entries may be added in future versions.
- **/
-typedef enum _cairo_hint_style {
-    CAIRO_HINT_STYLE_DEFAULT,
-    CAIRO_HINT_STYLE_NONE,
-    CAIRO_HINT_STYLE_SLIGHT,
-    CAIRO_HINT_STYLE_MEDIUM,
-    CAIRO_HINT_STYLE_FULL
-} cairo_hint_style_t;
-
-/**
- * cairo_hint_metrics_t:
- * @CAIRO_HINT_METRICS_DEFAULT: Hint metrics in the default
- *  manner for the font backend and target device
- * @CAIRO_HINT_METRICS_OFF: Do not hint font metrics
- * @CAIRO_HINT_METRICS_ON: Hint font metrics
- *
- * Specifies whether to hint font metrics; hinting font metrics
- * means quantizing them so that they are integer values in
- * device space. Doing this improves the consistency of
- * letter and line spacing, however it also means that text
- * will be laid out differently at different zoom factors.
- **/
-typedef enum _cairo_hint_metrics {
-    CAIRO_HINT_METRICS_DEFAULT,
-    CAIRO_HINT_METRICS_OFF,
-    CAIRO_HINT_METRICS_ON
-} cairo_hint_metrics_t;
-
-/**
- * cairo_font_options_t:
- *
- * An opaque structure holding all options that are used when
- * rendering fonts.
- *
- * Individual features of a #cairo_font_options_t can be set or
- * accessed using functions named
- * cairo_font_options_set_<emphasis>feature_name</emphasis> and
- * cairo_font_options_get_<emphasis>feature_name</emphasis>, like
- * cairo_font_options_set_antialias() and
- * cairo_font_options_get_antialias().
- *
- * New features may be added to a #cairo_font_options_t in the
- * future.  For this reason, cairo_font_options_copy(),
- * cairo_font_options_equal(), cairo_font_options_merge(), and
- * cairo_font_options_hash() should be used to copy, check
- * for equality, merge, or compute a hash value of
- * #cairo_font_options_t objects.
- **/
-typedef struct _cairo_font_options cairo_font_options_t;
-
-cairo_public cairo_font_options_t *
-cairo_font_options_create (void);
-
-cairo_public cairo_font_options_t *
-cairo_font_options_copy (const cairo_font_options_t *original);
-
-cairo_public void
-cairo_font_options_destroy (cairo_font_options_t *options);
-
-cairo_public cairo_status_t
-cairo_font_options_status (cairo_font_options_t *options);
-
-cairo_public void
-cairo_font_options_merge (cairo_font_options_t       *options,
-			  const cairo_font_options_t *other);
-cairo_public cairo_bool_t
-cairo_font_options_equal (const cairo_font_options_t *options,
-			  const cairo_font_options_t *other);
-
-cairo_public unsigned long
-cairo_font_options_hash (const cairo_font_options_t *options);
-
-cairo_public void
-cairo_font_options_set_antialias (cairo_font_options_t *options,
-				  cairo_antialias_t     antialias);
-cairo_public cairo_antialias_t
-cairo_font_options_get_antialias (const cairo_font_options_t *options);
-
-cairo_public void
-cairo_font_options_set_subpixel_order (cairo_font_options_t   *options,
-				       cairo_subpixel_order_t  subpixel_order);
-cairo_public cairo_subpixel_order_t
-cairo_font_options_get_subpixel_order (const cairo_font_options_t *options);
-
-cairo_public void
-cairo_font_options_set_hint_style (cairo_font_options_t *options,
-				   cairo_hint_style_t     hint_style);
-cairo_public cairo_hint_style_t
-cairo_font_options_get_hint_style (const cairo_font_options_t *options);
-
-cairo_public void
-cairo_font_options_set_hint_metrics (cairo_font_options_t *options,
-				     cairo_hint_metrics_t  hint_metrics);
-cairo_public cairo_hint_metrics_t
-cairo_font_options_get_hint_metrics (const cairo_font_options_t *options);
-
-/* This interface is for dealing with text as text, not caring about the
-   font object inside the the cairo_t. */
-
-cairo_public void
-cairo_select_font_face (cairo_t              *cr,
-			const char           *family,
-			cairo_font_slant_t   slant,
-			cairo_font_weight_t  weight);
-
-cairo_public void
-cairo_set_font_size (cairo_t *cr, double size);
-
-cairo_public void
-cairo_set_font_matrix (cairo_t		    *cr,
-		       const cairo_matrix_t *matrix);
-
-cairo_public void
-cairo_get_font_matrix (cairo_t *cr,
-		       cairo_matrix_t *matrix);
-
-cairo_public void
-cairo_set_font_options (cairo_t                    *cr,
-			const cairo_font_options_t *options);
-
-cairo_public void
-cairo_get_font_options (cairo_t              *cr,
-			cairo_font_options_t *options);
-
-cairo_public void
-cairo_set_font_face (cairo_t *cr, cairo_font_face_t *font_face);
-
-cairo_public cairo_font_face_t *
-cairo_get_font_face (cairo_t *cr);
-
-cairo_public void
-cairo_set_scaled_font (cairo_t                   *cr,
-		       const cairo_scaled_font_t *scaled_font);
-
-cairo_public cairo_scaled_font_t *
-cairo_get_scaled_font (cairo_t *cr);
-
-cairo_public void
-cairo_show_text (cairo_t *cr, const char *utf8);
-
-cairo_public void
-cairo_show_glyphs (cairo_t *cr, const cairo_glyph_t *glyphs, int num_glyphs);
-
-cairo_public void
-cairo_text_path  (cairo_t *cr, const char *utf8);
-
-cairo_public void
-cairo_glyph_path (cairo_t *cr, const cairo_glyph_t *glyphs, int num_glyphs);
-
-cairo_public void
-cairo_text_extents (cairo_t              *cr,
-		    const char    	 *utf8,
-		    cairo_text_extents_t *extents);
-
-cairo_public void
-cairo_glyph_extents (cairo_t               *cr,
-		     const cairo_glyph_t   *glyphs,
-		     int                   num_glyphs,
-		     cairo_text_extents_t  *extents);
-
-cairo_public void
-cairo_font_extents (cairo_t              *cr,
-		    cairo_font_extents_t *extents);
-
-/* Generic identifier for a font style */
-
-cairo_public cairo_font_face_t *
-cairo_font_face_reference (cairo_font_face_t *font_face);
-
-cairo_public void
-cairo_font_face_destroy (cairo_font_face_t *font_face);
-
-cairo_public unsigned int
-cairo_font_face_get_reference_count (cairo_font_face_t *font_face);
-
-cairo_public cairo_status_t
-cairo_font_face_status (cairo_font_face_t *font_face);
-
-/**
- * cairo_font_type_t:
- * @CAIRO_FONT_TYPE_TOY: The font was created using cairo's toy font api
- * @CAIRO_FONT_TYPE_FT: The font is of type FreeType
- * @CAIRO_FONT_TYPE_WIN32: The font is of type Win32
- * @CAIRO_FONT_TYPE_QUARTZ: The font is of type Quartz (Since: 1.6)
- *
- * #cairo_font_type_t is used to describe the type of a given font
- * face or scaled font. The font types are also known as "font
- * backends" within cairo.
- *
- * The type of a font face is determined by the function used to
- * create it, which will generally be of the form
- * cairo_<emphasis>type</emphasis>_font_face_create. The font face type can be queried
- * with cairo_font_face_get_type()
- *
- * The various #cairo_font_face_t functions can be used with a font face
- * of any type.
- *
- * The type of a scaled font is determined by the type of the font
- * face passed to cairo_scaled_font_create(). The scaled font type can
- * be queried with cairo_scaled_font_get_type()
- *
- * The various #cairo_scaled_font_t functions can be used with scaled
- * fonts of any type, but some font backends also provide
- * type-specific functions that must only be called with a scaled font
- * of the appropriate type. These functions have names that begin with
- * cairo_<emphasis>type</emphasis>_scaled_font such as cairo_ft_scaled_font_lock_face().
- *
- * The behavior of calling a type-specific function with a scaled font
- * of the wrong type is undefined.
- *
- * New entries may be added in future versions.
- *
- * Since: 1.2
- **/
-typedef enum _cairo_font_type {
-    CAIRO_FONT_TYPE_TOY,
-    CAIRO_FONT_TYPE_FT,
-    CAIRO_FONT_TYPE_WIN32,
-    CAIRO_FONT_TYPE_QUARTZ
-} cairo_font_type_t;
-
-cairo_public cairo_font_type_t
-cairo_font_face_get_type (cairo_font_face_t *font_face);
-
-cairo_public void *
-cairo_font_face_get_user_data (cairo_font_face_t	   *font_face,
-			       const cairo_user_data_key_t *key);
-
-cairo_public cairo_status_t
-cairo_font_face_set_user_data (cairo_font_face_t	   *font_face,
-			       const cairo_user_data_key_t *key,
-			       void			   *user_data,
-			       cairo_destroy_func_t	    destroy);
-
-/* Portable interface to general font features. */
-
-cairo_public cairo_scaled_font_t *
-cairo_scaled_font_create (cairo_font_face_t          *font_face,
-			  const cairo_matrix_t       *font_matrix,
-			  const cairo_matrix_t       *ctm,
-			  const cairo_font_options_t *options);
-
-cairo_public cairo_scaled_font_t *
-cairo_scaled_font_reference (cairo_scaled_font_t *scaled_font);
-
-cairo_public void
-cairo_scaled_font_destroy (cairo_scaled_font_t *scaled_font);
-
-cairo_public unsigned int
-cairo_scaled_font_get_reference_count (cairo_scaled_font_t *scaled_font);
-
-cairo_public cairo_status_t
-cairo_scaled_font_status (cairo_scaled_font_t *scaled_font);
-
-cairo_public cairo_font_type_t
-cairo_scaled_font_get_type (cairo_scaled_font_t *scaled_font);
-
-cairo_public void *
-cairo_scaled_font_get_user_data (cairo_scaled_font_t         *scaled_font,
-				 const cairo_user_data_key_t *key);
-
-cairo_public cairo_status_t
-cairo_scaled_font_set_user_data (cairo_scaled_font_t         *scaled_font,
-				 const cairo_user_data_key_t *key,
-				 void                        *user_data,
-				 cairo_destroy_func_t	      destroy);
-
-cairo_public void
-cairo_scaled_font_extents (cairo_scaled_font_t  *scaled_font,
-			   cairo_font_extents_t *extents);
-
-cairo_public void
-cairo_scaled_font_text_extents (cairo_scaled_font_t  *scaled_font,
-				const char  	     *utf8,
-				cairo_text_extents_t *extents);
-
-cairo_public void
-cairo_scaled_font_glyph_extents (cairo_scaled_font_t   *scaled_font,
-				 const cairo_glyph_t   *glyphs,
-				 int                   num_glyphs,
-				 cairo_text_extents_t  *extents);
-
-cairo_public cairo_font_face_t *
-cairo_scaled_font_get_font_face (cairo_scaled_font_t *scaled_font);
-
-cairo_public void
-cairo_scaled_font_get_font_matrix (cairo_scaled_font_t	*scaled_font,
-				   cairo_matrix_t	*font_matrix);
-
-cairo_public void
-cairo_scaled_font_get_ctm (cairo_scaled_font_t	*scaled_font,
-			   cairo_matrix_t	*ctm);
-
-cairo_public void
-cairo_scaled_font_get_font_options (cairo_scaled_font_t		*scaled_font,
-				    cairo_font_options_t	*options);
-
-/* Query functions */
-
-cairo_public cairo_operator_t
-cairo_get_operator (cairo_t *cr);
-
-cairo_public cairo_pattern_t *
-cairo_get_source (cairo_t *cr);
-
-cairo_public double
-cairo_get_tolerance (cairo_t *cr);
-
-cairo_public cairo_antialias_t
-cairo_get_antialias (cairo_t *cr);
-
-cairo_public cairo_bool_t
-cairo_has_current_point (cairo_t *cr);
-
-cairo_public void
-cairo_get_current_point (cairo_t *cr, double *x, double *y);
-
-cairo_public cairo_fill_rule_t
-cairo_get_fill_rule (cairo_t *cr);
-
-cairo_public double
-cairo_get_line_width (cairo_t *cr);
-
-cairo_public cairo_line_cap_t
-cairo_get_line_cap (cairo_t *cr);
-
-cairo_public cairo_line_join_t
-cairo_get_line_join (cairo_t *cr);
-
-cairo_public double
-cairo_get_miter_limit (cairo_t *cr);
-
-cairo_public int
-cairo_get_dash_count (cairo_t *cr);
-
-cairo_public void
-cairo_get_dash (cairo_t *cr, double *dashes, double *offset);
-
-cairo_public void
-cairo_get_matrix (cairo_t *cr, cairo_matrix_t *matrix);
-
-cairo_public cairo_surface_t *
-cairo_get_target (cairo_t *cr);
-
-cairo_public cairo_surface_t *
-cairo_get_group_target (cairo_t *cr);
-
-/**
- * cairo_path_data_type_t:
- * @CAIRO_PATH_MOVE_TO: A move-to operation
- * @CAIRO_PATH_LINE_TO: A line-to operation
- * @CAIRO_PATH_CURVE_TO: A curve-to operation
- * @CAIRO_PATH_CLOSE_PATH: A close-path operation
- *
- * #cairo_path_data_t is used to describe the type of one portion
- * of a path when represented as a #cairo_path_t.
- * See #cairo_path_data_t for details.
- **/
-typedef enum _cairo_path_data_type {
-    CAIRO_PATH_MOVE_TO,
-    CAIRO_PATH_LINE_TO,
-    CAIRO_PATH_CURVE_TO,
-    CAIRO_PATH_CLOSE_PATH
-} cairo_path_data_type_t;
-
-/**
- * cairo_path_data_t:
- *
- * #cairo_path_data_t is used to represent the path data inside a
- * #cairo_path_t.
- *
- * The data structure is designed to try to balance the demands of
- * efficiency and ease-of-use. A path is represented as an array of
- * #cairo_path_data_t, which is a union of headers and points.
- *
- * Each portion of the path is represented by one or more elements in
- * the array, (one header followed by 0 or more points). The length
- * value of the header is the number of array elements for the current
- * portion including the header, (ie. length == 1 + # of points), and
- * where the number of points for each element type is as follows:
- *
- * <programlisting>
- *     %CAIRO_PATH_MOVE_TO:     1 point
- *     %CAIRO_PATH_LINE_TO:     1 point
- *     %CAIRO_PATH_CURVE_TO:    3 points
- *     %CAIRO_PATH_CLOSE_PATH:  0 points
- * </programlisting>
- *
- * The semantics and ordering of the coordinate values are consistent
- * with cairo_move_to(), cairo_line_to(), cairo_curve_to(), and
- * cairo_close_path().
- *
- * Here is sample code for iterating through a #cairo_path_t:
- *
- * <informalexample><programlisting>
- *      int i;
- *      #cairo_path_t *path;
- *      #cairo_path_data_t *data;
- * &nbsp;
- *      path = cairo_copy_path (cr);
- * &nbsp;
- *      for (i=0; i < path->num_data; i += path->data[i].header.length) {
- *          data = &amp;path->data[i];
- *          switch (data->header.type) {
- *          case %CAIRO_PATH_MOVE_TO:
- *              do_move_to_things (data[1].point.x, data[1].point.y);
- *              break;
- *          case %CAIRO_PATH_LINE_TO:
- *              do_line_to_things (data[1].point.x, data[1].point.y);
- *              break;
- *          case %CAIRO_PATH_CURVE_TO:
- *              do_curve_to_things (data[1].point.x, data[1].point.y,
- *                                  data[2].point.x, data[2].point.y,
- *                                  data[3].point.x, data[3].point.y);
- *              break;
- *          case %CAIRO_PATH_CLOSE_PATH:
- *              do_close_path_things ();
- *              break;
- *          }
- *      }
- *      cairo_path_destroy (path);
- * </programlisting></informalexample>
- *
- * As of cairo 1.4, cairo does not mind if there are more elements in
- * a portion of the path than needed.  Such elements can be used by
- * users of the cairo API to hold extra values in the path data
- * structure.  For this reason, it is recommended that applications
- * always use <literal>data->header.length</literal> to
- * iterate over the path data, instead of hardcoding the number of
- * elements for each element type.
- **/
-typedef union _cairo_path_data_t cairo_path_data_t;
-union _cairo_path_data_t {
-    struct {
-	cairo_path_data_type_t type;
-	int length;
-    } header;
-    struct {
-	double x, y;
-    } point;
-};
-
-/**
- * cairo_path_t:
- * @status: the current error status
- * @data: the elements in the path
- * @num_data: the number of elements in the data array
- *
- * A data structure for holding a path. This data structure serves as
- * the return value for cairo_copy_path() and
- * cairo_copy_path_flat() as well the input value for
- * cairo_append_path().
- *
- * See #cairo_path_data_t for hints on how to iterate over the
- * actual data within the path.
- *
- * The num_data member gives the number of elements in the data
- * array. This number is larger than the number of independent path
- * portions (defined in #cairo_path_data_type_t), since the data
- * includes both headers and coordinates for each portion.
- **/
-typedef struct cairo_path {
-    cairo_status_t status;
-    cairo_path_data_t *data;
-    int num_data;
-} cairo_path_t;
-
-cairo_public cairo_path_t *
-cairo_copy_path (cairo_t *cr);
-
-cairo_public cairo_path_t *
-cairo_copy_path_flat (cairo_t *cr);
-
-cairo_public void
-cairo_append_path (cairo_t		*cr,
-		   const cairo_path_t	*path);
-
-cairo_public void
-cairo_path_destroy (cairo_path_t *path);
-
-/* Error status queries */
-
-cairo_public cairo_status_t
-cairo_status (cairo_t *cr);
-
-cairo_public const char *
-cairo_status_to_string (cairo_status_t status);
-
-/* Surface manipulation */
-
-cairo_public cairo_surface_t *
-cairo_surface_create_similar (cairo_surface_t  *other,
-			      cairo_content_t	content,
-			      int		width,
-			      int		height);
-
-cairo_public cairo_surface_t *
-cairo_surface_reference (cairo_surface_t *surface);
-
-cairo_public void
-cairo_surface_finish (cairo_surface_t *surface);
-
-cairo_public void
-cairo_surface_destroy (cairo_surface_t *surface);
-
-cairo_public unsigned int
-cairo_surface_get_reference_count (cairo_surface_t *surface);
-
-cairo_public cairo_status_t
-cairo_surface_status (cairo_surface_t *surface);
-
-/**
- * cairo_surface_type_t:
- * @CAIRO_SURFACE_TYPE_IMAGE: The surface is of type image
- * @CAIRO_SURFACE_TYPE_PDF: The surface is of type pdf
- * @CAIRO_SURFACE_TYPE_PS: The surface is of type ps
- * @CAIRO_SURFACE_TYPE_XLIB: The surface is of type xlib
- * @CAIRO_SURFACE_TYPE_XCB: The surface is of type xcb
- * @CAIRO_SURFACE_TYPE_GLITZ: The surface is of type glitz
- * @CAIRO_SURFACE_TYPE_QUARTZ: The surface is of type quartz
- * @CAIRO_SURFACE_TYPE_WIN32: The surface is of type win32
- * @CAIRO_SURFACE_TYPE_BEOS: The surface is of type beos
- * @CAIRO_SURFACE_TYPE_DIRECTFB: The surface is of type directfb
- * @CAIRO_SURFACE_TYPE_SVG: The surface is of type svg
- * @CAIRO_SURFACE_TYPE_OS2: The surface is of type os2
- * @CAIRO_SURFACE_TYPE_WIN32_PRINTING: The surface is a win32 printing surface
- * @CAIRO_SURFACE_TYPE_QUARTZ_IMAGE: The surface is of type quartz_image
- *
- * #cairo_surface_type_t is used to describe the type of a given
- * surface. The surface types are also known as "backends" or "surface
- * backends" within cairo.
- *
- * The type of a surface is determined by the function used to create
- * it, which will generally be of the form cairo_<emphasis>type</emphasis>_surface_create(),
- * (though see cairo_surface_create_similar() as well).
- *
- * The surface type can be queried with cairo_surface_get_type()
- *
- * The various #cairo_surface_t functions can be used with surfaces of
- * any type, but some backends also provide type-specific functions
- * that must only be called with a surface of the appropriate
- * type. These functions have names that begin with
- * cairo_<emphasis>type</emphasis>_surface such as cairo_image_surface_get_width().
- *
- * The behavior of calling a type-specific function with a surface of
- * the wrong type is undefined.
- *
- * New entries may be added in future versions.
- *
- * Since: 1.2
- **/
-typedef enum _cairo_surface_type {
-    CAIRO_SURFACE_TYPE_IMAGE,
-    CAIRO_SURFACE_TYPE_PDF,
-    CAIRO_SURFACE_TYPE_PS,
-    CAIRO_SURFACE_TYPE_XLIB,
-    CAIRO_SURFACE_TYPE_XCB,
-    CAIRO_SURFACE_TYPE_GLITZ,
-    CAIRO_SURFACE_TYPE_QUARTZ,
-    CAIRO_SURFACE_TYPE_WIN32,
-    CAIRO_SURFACE_TYPE_BEOS,
-    CAIRO_SURFACE_TYPE_DIRECTFB,
-    CAIRO_SURFACE_TYPE_SVG,
-    CAIRO_SURFACE_TYPE_OS2,
-    CAIRO_SURFACE_TYPE_WIN32_PRINTING,
-    CAIRO_SURFACE_TYPE_QUARTZ_IMAGE
-} cairo_surface_type_t;
-
-cairo_public cairo_surface_type_t
-cairo_surface_get_type (cairo_surface_t *surface);
-
-cairo_public cairo_content_t
-cairo_surface_get_content (cairo_surface_t *surface);
-
-#if CAIRO_HAS_PNG_FUNCTIONS
-
-cairo_public cairo_status_t
-cairo_surface_write_to_png (cairo_surface_t	*surface,
-			    const char		*filename);
-
-cairo_public cairo_status_t
-cairo_surface_write_to_png_stream (cairo_surface_t	*surface,
-				   cairo_write_func_t	write_func,
-				   void			*closure);
-
-#endif
-
-cairo_public void *
-cairo_surface_get_user_data (cairo_surface_t		 *surface,
-			     const cairo_user_data_key_t *key);
-
-cairo_public cairo_status_t
-cairo_surface_set_user_data (cairo_surface_t		 *surface,
-			     const cairo_user_data_key_t *key,
-			     void			 *user_data,
-			     cairo_destroy_func_t	 destroy);
-
-cairo_public void
-cairo_surface_get_font_options (cairo_surface_t      *surface,
-				cairo_font_options_t *options);
-
-cairo_public void
-cairo_surface_flush (cairo_surface_t *surface);
-
-cairo_public void
-cairo_surface_mark_dirty (cairo_surface_t *surface);
-
-cairo_public void
-cairo_surface_mark_dirty_rectangle (cairo_surface_t *surface,
-				    int              x,
-				    int              y,
-				    int              width,
-				    int              height);
-
-cairo_public void
-cairo_surface_set_device_offset (cairo_surface_t *surface,
-				 double           x_offset,
-				 double           y_offset);
-
-cairo_public void
-cairo_surface_get_device_offset (cairo_surface_t *surface,
-				 double          *x_offset,
-				 double          *y_offset);
-
-cairo_public void
-cairo_surface_set_fallback_resolution (cairo_surface_t	*surface,
-				       double		 x_pixels_per_inch,
-				       double		 y_pixels_per_inch);
-
-cairo_public void
-cairo_surface_copy_page (cairo_surface_t *surface);
-
-cairo_public void
-cairo_surface_show_page (cairo_surface_t *surface);
-
-/* Image-surface functions */
-
-/**
- * cairo_format_t:
- * @CAIRO_FORMAT_ARGB32: each pixel is a 32-bit quantity, with
- *   alpha in the upper 8 bits, then red, then green, then blue.
- *   The 32-bit quantities are stored native-endian. Pre-multiplied
- *   alpha is used. (That is, 50% transparent red is 0x80800000,
- *   not 0x80ff0000.)
- * @CAIRO_FORMAT_RGB24: each pixel is a 32-bit quantity, with
- *   the upper 8 bits unused. Red, Green, and Blue are stored
- *   in the remaining 24 bits in that order.
- * @CAIRO_FORMAT_A8: each pixel is a 8-bit quantity holding
- *   an alpha value.
- * @CAIRO_FORMAT_A1: each pixel is a 1-bit quantity holding
- *   an alpha value. Pixels are packed together into 32-bit
- *   quantities. The ordering of the bits matches the
- *   endianess of the platform. On a big-endian machine, the
- *   first pixel is in the uppermost bit, on a little-endian
- *   machine the first pixel is in the least-significant bit.
- * @CAIRO_FORMAT_RGB16_565: This format value is deprecated. It has
- *   never been properly implemented in cairo and should not be used
- *   by applications. (since 1.2)
- *
- * #cairo_format_t is used to identify the memory format of
- * image data.
- *
- * New entries may be added in future versions.
- **/
-typedef enum _cairo_format {
-    CAIRO_FORMAT_ARGB32,
-    CAIRO_FORMAT_RGB24,
-    CAIRO_FORMAT_A8,
-    CAIRO_FORMAT_A1
-    /* The value of 4 is reserved by a deprecated enum value.
-     * The next format added must have an explicit value of 5.
-    CAIRO_FORMAT_RGB16_565 = 4,
-    */
-} cairo_format_t;
-
-cairo_public cairo_surface_t *
-cairo_image_surface_create (cairo_format_t	format,
-			    int			width,
-			    int			height);
-
-cairo_public int
-cairo_format_stride_for_width (cairo_format_t	format,
-			       int		width);
-
-cairo_public cairo_surface_t *
-cairo_image_surface_create_for_data (unsigned char	       *data,
-				     cairo_format_t		format,
-				     int			width,
-				     int			height,
-				     int			stride);
-
-cairo_public unsigned char *
-cairo_image_surface_get_data (cairo_surface_t *surface);
-
-cairo_public cairo_format_t
-cairo_image_surface_get_format (cairo_surface_t *surface);
-
-cairo_public int
-cairo_image_surface_get_width (cairo_surface_t *surface);
-
-cairo_public int
-cairo_image_surface_get_height (cairo_surface_t *surface);
-
-cairo_public int
-cairo_image_surface_get_stride (cairo_surface_t *surface);
-
-#if CAIRO_HAS_PNG_FUNCTIONS
-
-cairo_public cairo_surface_t *
-cairo_image_surface_create_from_png (const char	*filename);
-
-cairo_public cairo_surface_t *
-cairo_image_surface_create_from_png_stream (cairo_read_func_t	read_func,
-					    void		*closure);
-
-#endif
-
-/* Pattern creation functions */
-
-cairo_public cairo_pattern_t *
-cairo_pattern_create_rgb (double red, double green, double blue);
-
-cairo_public cairo_pattern_t *
-cairo_pattern_create_rgba (double red, double green, double blue,
-			   double alpha);
-
-cairo_public cairo_pattern_t *
-cairo_pattern_create_for_surface (cairo_surface_t *surface);
-
-cairo_public cairo_pattern_t *
-cairo_pattern_create_linear (double x0, double y0,
-			     double x1, double y1);
-
-cairo_public cairo_pattern_t *
-cairo_pattern_create_radial (double cx0, double cy0, double radius0,
-			     double cx1, double cy1, double radius1);
-
-cairo_public cairo_pattern_t *
-cairo_pattern_reference (cairo_pattern_t *pattern);
-
-cairo_public void
-cairo_pattern_destroy (cairo_pattern_t *pattern);
-
-cairo_public unsigned int
-cairo_pattern_get_reference_count (cairo_pattern_t *pattern);
-
-cairo_public cairo_status_t
-cairo_pattern_status (cairo_pattern_t *pattern);
-
-cairo_public void *
-cairo_pattern_get_user_data (cairo_pattern_t		 *pattern,
-			     const cairo_user_data_key_t *key);
-
-cairo_public cairo_status_t
-cairo_pattern_set_user_data (cairo_pattern_t		 *pattern,
-			     const cairo_user_data_key_t *key,
-			     void			 *user_data,
-			     cairo_destroy_func_t	  destroy);
-
-/**
- * cairo_pattern_type_t:
- * @CAIRO_PATTERN_TYPE_SOLID: The pattern is a solid (uniform)
- * color. It may be opaque or translucent.
- * @CAIRO_PATTERN_TYPE_SURFACE: The pattern is a based on a surface (an image).
- * @CAIRO_PATTERN_TYPE_LINEAR: The pattern is a linear gradient.
- * @CAIRO_PATTERN_TYPE_RADIAL: The pattern is a radial gradient.
- *
- * #cairo_pattern_type_t is used to describe the type of a given pattern.
- *
- * The type of a pattern is determined by the function used to create
- * it. The cairo_pattern_create_rgb() and cairo_pattern_create_rgba()
- * functions create SOLID patterns. The remaining
- * cairo_pattern_create functions map to pattern types in obvious
- * ways.
- *
- * The pattern type can be queried with cairo_pattern_get_type()
- *
- * Most #cairo_pattern_t functions can be called with a pattern of any
- * type, (though trying to change the extend or filter for a solid
- * pattern will have no effect). A notable exception is
- * cairo_pattern_add_color_stop_rgb() and
- * cairo_pattern_add_color_stop_rgba() which must only be called with
- * gradient patterns (either LINEAR or RADIAL). Otherwise the pattern
- * will be shutdown and put into an error state.
- *
- * New entries may be added in future versions.
- *
- * Since: 1.2
- **/
-typedef enum _cairo_pattern_type {
-    CAIRO_PATTERN_TYPE_SOLID,
-    CAIRO_PATTERN_TYPE_SURFACE,
-    CAIRO_PATTERN_TYPE_LINEAR,
-    CAIRO_PATTERN_TYPE_RADIAL
-} cairo_pattern_type_t;
-
-cairo_public cairo_pattern_type_t
-cairo_pattern_get_type (cairo_pattern_t *pattern);
-
-cairo_public void
-cairo_pattern_add_color_stop_rgb (cairo_pattern_t *pattern,
-				  double offset,
-				  double red, double green, double blue);
-
-cairo_public void
-cairo_pattern_add_color_stop_rgba (cairo_pattern_t *pattern,
-				   double offset,
-				   double red, double green, double blue,
-				   double alpha);
-
-cairo_public void
-cairo_pattern_set_matrix (cairo_pattern_t      *pattern,
-			  const cairo_matrix_t *matrix);
-
-cairo_public void
-cairo_pattern_get_matrix (cairo_pattern_t *pattern,
-			  cairo_matrix_t  *matrix);
-
-/**
- * cairo_extend_t:
- * @CAIRO_EXTEND_NONE: pixels outside of the source pattern
- *   are fully transparent
- * @CAIRO_EXTEND_REPEAT: the pattern is tiled by repeating
- * @CAIRO_EXTEND_REFLECT: the pattern is tiled by reflecting
- *   at the edges (Implemented for surface patterns since 1.6)
- * @CAIRO_EXTEND_PAD: pixels outside of the pattern copy
- *   the closest pixel from the source (Since 1.2; but only
- *   implemented for surface patterns since 1.6)
- *
- * #cairo_extend_t is used to describe how pattern color/alpha will be
- * determined for areas "outside" the pattern's natural area, (for
- * example, outside the surface bounds or outside the gradient
- * geometry).
- *
- * The default extend mode is %CAIRO_EXTEND_NONE for surface patterns
- * and %CAIRO_EXTEND_PAD for gradient patterns.
- *
- * New entries may be added in future versions.
- **/
-typedef enum _cairo_extend {
-    CAIRO_EXTEND_NONE,
-    CAIRO_EXTEND_REPEAT,
-    CAIRO_EXTEND_REFLECT,
-    CAIRO_EXTEND_PAD
-} cairo_extend_t;
-
-cairo_public void
-cairo_pattern_set_extend (cairo_pattern_t *pattern, cairo_extend_t extend);
-
-cairo_public cairo_extend_t
-cairo_pattern_get_extend (cairo_pattern_t *pattern);
-
-/**
- * cairo_filter_t:
- * @CAIRO_FILTER_FAST: A high-performance filter, with quality similar
- *     to %CAIRO_FILTER_NEAREST
- * @CAIRO_FILTER_GOOD: A reasonable-performance filter, with quality
- *     similar to %CAIRO_FILTER_BILINEAR
- * @CAIRO_FILTER_BEST: The highest-quality available, performance may
- *     not be suitable for interactive use.
- * @CAIRO_FILTER_NEAREST: Nearest-neighbor filtering
- * @CAIRO_FILTER_BILINEAR: Linear interpolation in two dimensions
- * @CAIRO_FILTER_GAUSSIAN: This filter value is currently
- *     unimplemented, and should not be used in current code.
- *
- * #cairo_filter_t is used to indicate what filtering should be
- * applied when reading pixel values from patterns. See
- * cairo_pattern_set_source() for indicating the desired filter to be
- * used with a particular pattern.
- */
-typedef enum _cairo_filter {
-    CAIRO_FILTER_FAST,
-    CAIRO_FILTER_GOOD,
-    CAIRO_FILTER_BEST,
-    CAIRO_FILTER_NEAREST,
-    CAIRO_FILTER_BILINEAR,
-    CAIRO_FILTER_GAUSSIAN
-} cairo_filter_t;
-
-cairo_public void
-cairo_pattern_set_filter (cairo_pattern_t *pattern, cairo_filter_t filter);
-
-cairo_public cairo_filter_t
-cairo_pattern_get_filter (cairo_pattern_t *pattern);
-
-cairo_public cairo_status_t
-cairo_pattern_get_rgba (cairo_pattern_t *pattern,
-			double *red, double *green,
-			double *blue, double *alpha);
-
-cairo_public cairo_status_t
-cairo_pattern_get_surface (cairo_pattern_t *pattern,
-			   cairo_surface_t **surface);
-
-
-cairo_public cairo_status_t
-cairo_pattern_get_color_stop_rgba (cairo_pattern_t *pattern,
-				   int index, double *offset,
-				   double *red, double *green,
-				   double *blue, double *alpha);
-
-cairo_public cairo_status_t
-cairo_pattern_get_color_stop_count (cairo_pattern_t *pattern,
-				    int *count);
-
-cairo_public cairo_status_t
-cairo_pattern_get_linear_points (cairo_pattern_t *pattern,
-				 double *x0, double *y0,
-				 double *x1, double *y1);
-
-cairo_public cairo_status_t
-cairo_pattern_get_radial_circles (cairo_pattern_t *pattern,
-				  double *x0, double *y0, double *r0,
-				  double *x1, double *y1, double *r1);
-
-/* Matrix functions */
-
-cairo_public void
-cairo_matrix_init (cairo_matrix_t *matrix,
-		   double  xx, double  yx,
-		   double  xy, double  yy,
-		   double  x0, double  y0);
-
-cairo_public void
-cairo_matrix_init_identity (cairo_matrix_t *matrix);
-
-cairo_public void
-cairo_matrix_init_translate (cairo_matrix_t *matrix,
-			     double tx, double ty);
-
-cairo_public void
-cairo_matrix_init_scale (cairo_matrix_t *matrix,
-			 double sx, double sy);
-
-cairo_public void
-cairo_matrix_init_rotate (cairo_matrix_t *matrix,
-			  double radians);
-
-cairo_public void
-cairo_matrix_translate (cairo_matrix_t *matrix, double tx, double ty);
-
-cairo_public void
-cairo_matrix_scale (cairo_matrix_t *matrix, double sx, double sy);
-
-cairo_public void
-cairo_matrix_rotate (cairo_matrix_t *matrix, double radians);
-
-cairo_public cairo_status_t
-cairo_matrix_invert (cairo_matrix_t *matrix);
-
-cairo_public void
-cairo_matrix_multiply (cairo_matrix_t	    *result,
-		       const cairo_matrix_t *a,
-		       const cairo_matrix_t *b);
-
-cairo_public void
-cairo_matrix_transform_distance (const cairo_matrix_t *matrix,
-				 double *dx, double *dy);
-
-cairo_public void
-cairo_matrix_transform_point (const cairo_matrix_t *matrix,
-			      double *x, double *y);
-
-/* Functions to be used while debugging (not intended for use in production code) */
-cairo_public void
-cairo_debug_reset_static_data (void);
-
-CAIRO_END_DECLS
-
-#endif /* CAIRO_H */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gio-unix-2.0/gio/gdesktopappinfo.h b/lib-x86-32/gtk-2.12.12/usr/include/gio-unix-2.0/gio/gdesktopappinfo.h
deleted file mode 100644
index ea13a42a..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gio-unix-2.0/gio/gdesktopappinfo.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: 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;
-};
-
-
-GType g_desktop_app_info_get_type (void) G_GNUC_CONST;
-  
-GDesktopAppInfo *g_desktop_app_info_new_from_filename (const char      *filename);
-GDesktopAppInfo *g_desktop_app_info_new               (const char      *desktop_id);
-gboolean         g_desktop_app_info_get_is_hidden     (GDesktopAppInfo *info);
-
-void             g_desktop_app_info_set_desktop_env   (const char *desktop_env);
-
-
-#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="gio-extension-points">Extending GIO</link>.
- */
-#define G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME "gio-desktop-app-info-lookup"
-
-/**
- * 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);
-};
-
-GType     g_desktop_app_info_lookup_get_type (void) G_GNUC_CONST;
-GAppInfo *g_desktop_app_info_lookup_get_default_for_uri_scheme (GDesktopAppInfoLookup *lookup,
-								const char  *uri_scheme);
-
-G_END_DECLS
-
-
-#endif /* __G_DESKTOP_APP_INFO_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gio-unix-2.0/gio/gunixinputstream.h b/lib-x86-32/gtk-2.12.12/usr/include/gio-unix-2.0/gio/gunixinputstream.h
deleted file mode 100644
index 7bb7cd96..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gio-unix-2.0/gio/gunixinputstream.h
+++ /dev/null
@@ -1,74 +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);
-};
-
-GType g_unix_input_stream_get_type (void) G_GNUC_CONST;
-
-GInputStream *g_unix_input_stream_new (int fd,
-				       gboolean close_fd_at_close);
-
-G_END_DECLS
-
-#endif /* __G_UNIX_INPUT_STREAM_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gio-unix-2.0/gio/gunixmounts.h b/lib-x86-32/gtk-2.12.12/usr/include/gio-unix-2.0/gio/gunixmounts.h
deleted file mode 100644
index 6147f122..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gio-unix-2.0/gio/gunixmounts.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_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))
-
-void           g_unix_mount_free                    (GUnixMountEntry    *mount_entry);
-void           g_unix_mount_point_free              (GUnixMountPoint    *mount_point);
-gint           g_unix_mount_compare                 (GUnixMountEntry    *mount1,
-						     GUnixMountEntry    *mount2);
-const char *   g_unix_mount_get_mount_path          (GUnixMountEntry    *mount_entry);
-const char *   g_unix_mount_get_device_path         (GUnixMountEntry    *mount_entry);
-const char *   g_unix_mount_get_fs_type             (GUnixMountEntry    *mount_entry);
-gboolean       g_unix_mount_is_readonly             (GUnixMountEntry    *mount_entry);
-gboolean       g_unix_mount_is_system_internal      (GUnixMountEntry    *mount_entry);
-gboolean       g_unix_mount_guess_can_eject         (GUnixMountEntry    *mount_entry);
-gboolean       g_unix_mount_guess_should_display    (GUnixMountEntry    *mount_entry);
-char *         g_unix_mount_guess_name              (GUnixMountEntry    *mount_entry);
-GIcon *        g_unix_mount_guess_icon              (GUnixMountEntry    *mount_entry);
-
-gint           g_unix_mount_point_compare           (GUnixMountPoint    *mount1,
-						     GUnixMountPoint    *mount2);
-const char *   g_unix_mount_point_get_mount_path    (GUnixMountPoint    *mount_point);
-const char *   g_unix_mount_point_get_device_path   (GUnixMountPoint    *mount_point);
-const char *   g_unix_mount_point_get_fs_type       (GUnixMountPoint    *mount_point);
-gboolean       g_unix_mount_point_is_readonly       (GUnixMountPoint    *mount_point);
-gboolean       g_unix_mount_point_is_user_mountable (GUnixMountPoint    *mount_point);
-gboolean       g_unix_mount_point_is_loopback       (GUnixMountPoint    *mount_point);
-gboolean       g_unix_mount_point_guess_can_eject   (GUnixMountPoint    *mount_point);
-char *         g_unix_mount_point_guess_name        (GUnixMountPoint    *mount_point);
-GIcon *        g_unix_mount_point_guess_icon        (GUnixMountPoint    *mount_point);
-
-GList *        g_unix_mount_points_get              (guint64            *time_read);
-GList *        g_unix_mounts_get                    (guint64            *time_read);
-GUnixMountEntry *g_unix_mount_at                    (const char         *mount_path,
-						     guint64            *time_read);
-gboolean       g_unix_mounts_changed_since          (guint64             time);
-gboolean       g_unix_mount_points_changed_since    (guint64             time);
-
-GType              g_unix_mount_monitor_get_type (void) G_GNUC_CONST;
-GUnixMountMonitor *g_unix_mount_monitor_new      (void);
-
-gboolean g_unix_is_mount_path_system_internal (const char *mount_path);
-
-G_END_DECLS
-
-#endif /* __G_UNIX_MOUNTS_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gio-unix-2.0/gio/gunixoutputstream.h b/lib-x86-32/gtk-2.12.12/usr/include/gio-unix-2.0/gio/gunixoutputstream.h
deleted file mode 100644
index bfcf614d..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gio-unix-2.0/gio/gunixoutputstream.h
+++ /dev/null
@@ -1,74 +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);
-};
-
-GType g_unix_output_stream_get_type (void) G_GNUC_CONST;
-
-GOutputStream *g_unix_output_stream_new (int fd,
-					 gboolean close_fd_at_close);
-
-G_END_DECLS
-
-#endif /* __G_UNIX_OUTPUT_STREAM_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gappinfo.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gappinfo.h
deleted file mode 100644
index d0fddf75..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gappinfo.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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_APP_INFO_H__
-#define __G_APP_INFO_H__
-
-#include <glib-object.h>
-#include <gio/gicon.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))
-
-/**
- * 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.
- * 
- * 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 >*/
-} GAppInfoCreateFlags;
-
-typedef struct _GAppLaunchContext        GAppLaunchContext;
-typedef struct _GAppLaunchContextClass   GAppLaunchContextClass;
-typedef struct _GAppLaunchContextPrivate GAppLaunchContextPrivate;
-
-/**
- * GAppInfo:
- * 
- * Information about an installed application and methods to launch
- * it (with file arguments).
- */
-typedef struct _GAppInfo         GAppInfo; /* Dummy typedef */
-
-/**
- * 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 execuable 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 extention.
- * @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.
- * 
- * 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                   *filenames,
-					     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);
-};
-
-GType g_app_info_get_type (void) G_GNUC_CONST;
-GType g_app_launch_context_get_type (void) G_GNUC_CONST;
-
-GAppInfo *  g_app_info_create_from_commandline      (const char           *commandline,
-						     const char           *application_name,
-						     GAppInfoCreateFlags   flags,
-						     GError              **error);
-GAppInfo *  g_app_info_dup                          (GAppInfo             *appinfo);
-gboolean    g_app_info_equal                        (GAppInfo             *appinfo1,
-						     GAppInfo             *appinfo2);
-const char *g_app_info_get_id                       (GAppInfo             *appinfo);
-const char *g_app_info_get_name                     (GAppInfo             *appinfo);
-const char *g_app_info_get_description              (GAppInfo             *appinfo);
-const char *g_app_info_get_executable               (GAppInfo             *appinfo);
-GIcon *     g_app_info_get_icon                     (GAppInfo             *appinfo);
-gboolean    g_app_info_launch                       (GAppInfo             *appinfo,
-						     GList                *files,
-						     GAppLaunchContext    *launch_context,
-						     GError              **error);
-gboolean    g_app_info_supports_uris                (GAppInfo             *appinfo);
-gboolean    g_app_info_supports_files               (GAppInfo             *appinfo);
-gboolean    g_app_info_launch_uris                  (GAppInfo             *appinfo,
-						     GList                *uris,
-						     GAppLaunchContext    *launch_context,
-						     GError              **error);
-gboolean    g_app_info_should_show                  (GAppInfo             *appinfo);
-
-gboolean    g_app_info_set_as_default_for_type      (GAppInfo             *appinfo,
-						     const char           *content_type,
-						     GError              **error);
-gboolean    g_app_info_set_as_default_for_extension (GAppInfo             *appinfo,
-						     const char           *extension,
-						     GError              **error);
-gboolean    g_app_info_add_supports_type            (GAppInfo             *appinfo,
-						     const char           *content_type,
-						     GError              **error);
-gboolean    g_app_info_can_remove_supports_type     (GAppInfo             *appinfo);
-gboolean    g_app_info_remove_supports_type         (GAppInfo             *appinfo,
-						     const char           *content_type,
-						     GError              **error);
-
-GList *   g_app_info_get_all                     (void);
-GList *   g_app_info_get_all_for_type            (const char  *content_type);
-GAppInfo *g_app_info_get_default_for_type        (const char  *content_type,
-						  gboolean     must_support_uris);
-GAppInfo *g_app_info_get_default_for_uri_scheme  (const char  *uri_scheme);
-
-gboolean  g_app_info_launch_default_for_uri      (const char              *uri,
-					          GAppLaunchContext       *launch_context,
-					          GError                 **error);
-
-/**
- * GAppLaunchContext:
- * @parent_instance: The parent instance.
- * 
- * 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);
-
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-GAppLaunchContext *g_app_launch_context_new                   (void);
-char *             g_app_launch_context_get_display           (GAppLaunchContext *context,
-							       GAppInfo          *info,
-							       GList             *files);
-char *             g_app_launch_context_get_startup_notify_id (GAppLaunchContext *context,
-							       GAppInfo          *info,
-							       GList             *files);
-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/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gasyncresult.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gasyncresult.h
deleted file mode 100644
index 640d6111..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gasyncresult.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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_ASYNC_RESULT_H__
-#define __G_ASYNC_RESULT_H__
-
-#include <glib-object.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 _GAsyncResult         GAsyncResult; /* Dummy typedef */
-typedef struct _GAsyncResultIface    GAsyncResultIface;
-
-/**
- * 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);
-
-/**
- * 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.
- *
- * Interface definition for #GAsyncResult.
- **/
-struct _GAsyncResultIface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-
-  gpointer   (*get_user_data)      (GAsyncResult                *async_result);
-  GObject *  (*get_source_object)  (GAsyncResult                *async_result);
-};
-
-GType g_async_result_get_type (void) G_GNUC_CONST;
-
-gpointer g_async_result_get_user_data     (GAsyncResult *res);
-GObject *g_async_result_get_source_object (GAsyncResult *res);
-
-G_END_DECLS
-
-#endif /* __G_ASYNC_RESULT_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gbufferedinputstream.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gbufferedinputstream.h
deleted file mode 100644
index 3eea4f9b..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gbufferedinputstream.h
+++ /dev/null
@@ -1,126 +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> 
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_BUFFERED_INPUT_STREAM_H__
-#define __G_BUFFERED_INPUT_STREAM_H__
-
-#include <glib-object.h>
-#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 _GBufferedInputStream         GBufferedInputStream;
-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);
-};
-
-
-GType         g_buffered_input_stream_get_type        (void) G_GNUC_CONST;
-GInputStream* g_buffered_input_stream_new             (GInputStream          *base_stream);
-GInputStream* g_buffered_input_stream_new_sized       (GInputStream          *base_stream,
-						       gsize                  size);
-
-gsize         g_buffered_input_stream_get_buffer_size (GBufferedInputStream  *stream);
-void          g_buffered_input_stream_set_buffer_size (GBufferedInputStream  *stream,
-						       gsize                  size);
-gsize         g_buffered_input_stream_get_available   (GBufferedInputStream  *stream);
-gsize         g_buffered_input_stream_peek            (GBufferedInputStream  *stream,
-						       void                  *buffer,
-						       gsize                  offset,
-						       gsize                  count);
-const void*   g_buffered_input_stream_peek_buffer     (GBufferedInputStream  *stream,
-						       gsize                 *count);
-
-gssize        g_buffered_input_stream_fill            (GBufferedInputStream  *stream,
-						       gssize                 count,
-						       GCancellable          *cancellable,
-						       GError               **error);
-void          g_buffered_input_stream_fill_async      (GBufferedInputStream  *stream,
-						       gssize                 count,
-						       int                    io_priority,
-						       GCancellable          *cancellable,
-						       GAsyncReadyCallback    callback,
-						       gpointer               user_data);
-gssize        g_buffered_input_stream_fill_finish     (GBufferedInputStream  *stream,
-						       GAsyncResult          *result,
-						       GError               **error);
-
-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/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gbufferedoutputstream.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gbufferedoutputstream.h
deleted file mode 100644
index 5adce9e1..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gbufferedoutputstream.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: Christian Kellner <gicmo@gnome.org> 
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_BUFFERED_OUTPUT_STREAM_H__
-#define __G_BUFFERED_OUTPUT_STREAM_H__
-
-#include <glib-object.h>
-#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:
- * @parent_class: The parent class.
- * 
- * An implementation of #GFilterOutputStream with a sized buffer.
- **/
-typedef struct _GBufferedOutputStream         GBufferedOutputStream;
-typedef struct _GBufferedOutputStreamClass    GBufferedOutputStreamClass;
-typedef struct _GBufferedOutputStreamPrivate  GBufferedOutputStreamPrivate;
-
-struct _GBufferedOutputStream
-{
-  GFilterOutputStream parent_instance;
-
-  /*< protected >*/
-  GBufferedOutputStreamPrivate *priv;
-};
-
-struct _GBufferedOutputStreamClass
-{
- 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);
-};
-
-
-GType           g_buffered_output_stream_get_type  (void) G_GNUC_CONST;
-GOutputStream* g_buffered_output_stream_new             (GOutputStream         *base_stream);
-GOutputStream* g_buffered_output_stream_new_sized       (GOutputStream         *base_stream,
-							 gsize                  size);
-gsize          g_buffered_output_stream_get_buffer_size (GBufferedOutputStream *stream);
-void           g_buffered_output_stream_set_buffer_size (GBufferedOutputStream *stream,
-							 gsize                  size);
-gboolean       g_buffered_output_stream_get_auto_grow   (GBufferedOutputStream *stream);
-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/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gcancellable.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gcancellable.h
deleted file mode 100644
index 7c890be9..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gcancellable.h
+++ /dev/null
@@ -1,84 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_CANCELLABLE_H__
-#define __G_CANCELLABLE_H__
-
-#include <glib-object.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 _GCancellable        GCancellable;
-typedef struct _GCancellableClass   GCancellableClass;
-
-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);
-};
-
-GType g_cancellable_get_type (void) G_GNUC_CONST;
-
-GCancellable *g_cancellable_new          (void);
-
-/* These are only safe to call inside a cancellable op */
-gboolean      g_cancellable_is_cancelled           (GCancellable  *cancellable);
-gboolean      g_cancellable_set_error_if_cancelled (GCancellable  *cancellable,
-						    GError       **error);
-int           g_cancellable_get_fd                 (GCancellable  *cancellable);
-GCancellable *g_cancellable_get_current            (void);
-void          g_cancellable_push_current           (GCancellable  *cancellable);
-void          g_cancellable_pop_current            (GCancellable  *cancellable);
-void          g_cancellable_reset                  (GCancellable  *cancellable);
-
-
-/* This is safe to call from another thread */
-void          g_cancellable_cancel       (GCancellable  *cancellable);
-
-G_END_DECLS
-
-#endif /* __G_CANCELLABLE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gcontenttype.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gcontenttype.h
deleted file mode 100644
index 9dcbf149..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gcontenttype.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: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_CONTENT_TYPE_H__
-#define __G_CONTENT_TYPE_H__
-
-#include <glib.h>
-#include <gio/gicon.h>
-
-G_BEGIN_DECLS
-
-gboolean g_content_type_equals            (const char   *type1,
-					   const char   *type2);
-gboolean g_content_type_is_a              (const char   *type,
-					   const char   *supertype);
-gboolean g_content_type_is_unknown        (const char   *type);
-char *   g_content_type_get_description   (const char   *type);
-char *   g_content_type_get_mime_type     (const char   *type);
-GIcon *  g_content_type_get_icon          (const char   *type);
-gboolean g_content_type_can_be_executable (const char   *type);
-
-char *   g_content_type_guess             (const char   *filename,
-					   const guchar *data,
-					   gsize         data_size,
-					   gboolean     *result_uncertain );
-
-GList *  g_content_types_get_registered   (void);
-
-G_END_DECLS
-
-#endif /* __G_CONTENT_TYPE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gdatainputstream.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gdatainputstream.h
deleted file mode 100644
index 0ecd14f5..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gdatainputstream.h
+++ /dev/null
@@ -1,147 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_DATA_INPUT_STREAM_H__
-#define __G_DATA_INPUT_STREAM_H__
-
-#include <glib-object.h>
-#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:
- * @parent: a #GBufferedInputStream.
- *
- * An implementation of #GBufferedInputStream that allows for high-level 
- * data manipulation of arbitrary data (including binary operations).
- **/
-typedef struct _GDataInputStream         GDataInputStream;
-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);
-};
-
-/**
- * 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;
-
-GType          g_data_input_stream_get_type   (void) G_GNUC_CONST;
-GDataInputStream*  g_data_input_stream_new        (GInputStream *base_stream);
-
-void                   g_data_input_stream_set_byte_order   (GDataInputStream        *stream,
-							     GDataStreamByteOrder     order);
-GDataStreamByteOrder   g_data_input_stream_get_byte_order   (GDataInputStream        *stream);
-void                   g_data_input_stream_set_newline_type (GDataInputStream        *stream,
-							     GDataStreamNewlineType   type);
-GDataStreamNewlineType g_data_input_stream_get_newline_type (GDataInputStream        *stream);
-guchar                 g_data_input_stream_read_byte        (GDataInputStream        *stream,
-							     GCancellable            *cancellable,
-							     GError                 **error);
-gint16                 g_data_input_stream_read_int16       (GDataInputStream        *stream,
-							     GCancellable            *cancellable,
-							     GError                 **error);
-guint16                g_data_input_stream_read_uint16      (GDataInputStream        *stream,
-							     GCancellable            *cancellable,
-							     GError                 **error);
-gint32                 g_data_input_stream_read_int32       (GDataInputStream        *stream,
-							     GCancellable            *cancellable,
-							     GError                 **error);
-guint32                g_data_input_stream_read_uint32      (GDataInputStream        *stream,
-							     GCancellable            *cancellable,
-							     GError                 **error);
-gint64                 g_data_input_stream_read_int64       (GDataInputStream        *stream,
-							     GCancellable            *cancellable,
-							     GError                 **error);
-guint64                g_data_input_stream_read_uint64      (GDataInputStream        *stream,
-							     GCancellable            *cancellable,
-							     GError                 **error);
-char *                 g_data_input_stream_read_line        (GDataInputStream        *stream,
-							     gsize                   *length,
-							     GCancellable            *cancellable,
-							     GError                 **error);
-char *                 g_data_input_stream_read_until       (GDataInputStream        *stream,
-							     const gchar             *stop_chars,
-							     gsize                   *length,
-							     GCancellable            *cancellable,
-							     GError                 **error);
-
-G_END_DECLS
-
-#endif /* __G_DATA_INPUT_STREAM_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gdataoutputstream.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gdataoutputstream.h
deleted file mode 100644
index 7a4e4055..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gdataoutputstream.h
+++ /dev/null
@@ -1,117 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_DATA_OUTPUT_STREAM_H__
-#define __G_DATA_OUTPUT_STREAM_H__
-
-#include <glib-object.h>
-#include <gio/gfilteroutputstream.h>
-#include <gio/gdatainputstream.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:
- * @parent_instance: a #GBufferedOutputStream.
- *
- * 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);
-};
-
-
-GType          g_data_output_stream_get_type   (void) G_GNUC_CONST;
-GDataOutputStream*  g_data_output_stream_new        (GOutputStream *base_stream);
-
-void                 g_data_output_stream_set_byte_order (GDataOutputStream     *stream,
-							  GDataStreamByteOrder   order);
-GDataStreamByteOrder g_data_output_stream_get_byte_order (GDataOutputStream     *stream);
-
-gboolean             g_data_output_stream_put_byte       (GDataOutputStream     *stream,
-							  guchar                 data,
-							  GCancellable          *cancellable,
-							  GError               **error);
-gboolean             g_data_output_stream_put_int16      (GDataOutputStream     *stream,
-							  gint16                 data,
-							  GCancellable          *cancellable,
-							  GError               **error);
-gboolean             g_data_output_stream_put_uint16     (GDataOutputStream     *stream,
-							  guint16                data,
-							  GCancellable          *cancellable,
-							  GError               **error);
-gboolean             g_data_output_stream_put_int32      (GDataOutputStream     *stream,
-							  gint32                 data,
-							  GCancellable          *cancellable,
-							  GError               **error);
-gboolean             g_data_output_stream_put_uint32     (GDataOutputStream     *stream,
-							  guint32                data,
-							  GCancellable          *cancellable,
-							  GError               **error);
-gboolean             g_data_output_stream_put_int64      (GDataOutputStream     *stream,
-							  gint64                 data,
-							  GCancellable          *cancellable,
-							  GError               **error);
-gboolean             g_data_output_stream_put_uint64     (GDataOutputStream     *stream,
-							  guint64                data,
-							  GCancellable          *cancellable,
-							  GError               **error);
-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/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gdrive.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gdrive.h
deleted file mode 100644
index 26671b91..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gdrive.h
+++ /dev/null
@@ -1,144 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_DRIVE_H__
-#define __G_DRIVE_H__
-
-#include <glib-object.h>
-#include <gio/gmount.h>
-#include <gio/gvolume.h>
-#include <gio/gmountoperation.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.
- *
- * 
- * 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);
-};
-
-GType g_drive_get_type                    (void) G_GNUC_CONST;
-
-char *   g_drive_get_name                 (GDrive               *drive);
-GIcon *  g_drive_get_icon                 (GDrive               *drive);
-gboolean g_drive_has_volumes              (GDrive               *drive);
-GList *  g_drive_get_volumes              (GDrive               *drive);
-gboolean g_drive_is_media_removable       (GDrive               *drive);
-gboolean g_drive_has_media                (GDrive               *drive);
-gboolean g_drive_is_media_check_automatic (GDrive               *drive);
-gboolean g_drive_can_poll_for_media       (GDrive               *drive);
-gboolean g_drive_can_eject                (GDrive               *drive);
-void     g_drive_eject                    (GDrive               *drive,
-					   GMountUnmountFlags    flags,
-                                           GCancellable         *cancellable,
-                                           GAsyncReadyCallback   callback,
-                                           gpointer              user_data);
-gboolean g_drive_eject_finish             (GDrive               *drive,
-                                           GAsyncResult         *result,
-                                           GError              **error);
-void     g_drive_poll_for_media           (GDrive               *drive,
-                                           GCancellable         *cancellable,
-                                           GAsyncReadyCallback   callback,
-                                           gpointer              user_data);
-gboolean g_drive_poll_for_media_finish    (GDrive               *drive,
-                                           GAsyncResult         *result,
-                                           GError              **error);
-char *   g_drive_get_identifier           (GDrive              *drive,
-					   const char          *kind);
-char **  g_drive_enumerate_identifiers    (GDrive              *drive);
-
-G_END_DECLS
-
-#endif /* __G_DRIVE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gfile.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gfile.h
deleted file mode 100644
index a67b72eb..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gfile.h
+++ /dev/null
@@ -1,929 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILE_H__
-#define __G_FILE_H__
-
-#include <glib-object.h>
-#include <gio/gfileinfo.h>
-#include <gio/gfileenumerator.h>
-#include <gio/gfileinputstream.h>
-#include <gio/gfileoutputstream.h>
-#include <gio/gmountoperation.h>
-#include <gio/gappinfo.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))
-
-/**
- * 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.
- * 
- * Flags used when an operation may create a file.
- */
-typedef enum  {
-  G_FILE_CREATE_NONE = 0,
-  G_FILE_CREATE_PRIVATE = (1<<0)
-} GFileCreateFlags;
-
-
-/**
- * GMountMountFlags:
- * @G_MOUNT_MOUNT_NONE: No flags set.
- * 
- * Flags used when mounting a mount.
- */
-typedef enum  {
-  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;
-
-/**
- * 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.
- *
- * 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)
-} GFileCopyFlags;
-
-/**
- * GFileMonitorFlags:
- * @G_FILE_MONITOR_NONE: No flags set.
- * @G_FILE_MONITOR_WATCH_MOUNTS: Watch for mount events. 
- *
- * Flags used to set what a #GFileMonitor will watch for. 
- */
-typedef enum  {
-  G_FILE_MONITOR_NONE = 0,
-  G_FILE_MONITOR_WATCH_MOUNTS = (1<<0)
-} GFileMonitorFlags;
-
-/**
- * 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 _GFileIface    		GFileIface;
-typedef struct _GFileMonitor            GFileMonitor;
-
-/**
- * GMount:
- * 
- * A handle to an object implementing the #GMountIface interface.
- **/
-typedef struct _GMount         GMount; /* Dummy typedef */
-
-/**
- * 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_read_partial_contents(), 
- * 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);
-
-/**
- * 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.
- * 
- * 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) (void);
-  void                (*_delete_file_finish) (void);
-  
-  gboolean            (*trash)              (GFile                *file,
-					     GCancellable         *cancellable,
-					     GError              **error);
-  void                (*_trash_async) (void);
-  void                (*_trash_finish) (void);
-  
-  gboolean            (*make_directory)     (GFile                *file,
-					     GCancellable         *cancellable,
-					     GError              **error);
-  void                (*_make_directory_async) (void);
-  void                (*_make_directory_finish) (void);
-  
-  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);
-
-};
-
-GType g_file_get_type (void) G_GNUC_CONST;
-
-GFile *                 g_file_new_for_path               (const char                 *path);
-GFile *                 g_file_new_for_uri                (const char                 *uri);
-GFile *                 g_file_new_for_commandline_arg    (const char                 *arg);
-GFile *                 g_file_parse_name                 (const char                 *parse_name);
-GFile *                 g_file_dup                        (GFile                      *file);
-guint                   g_file_hash                       (gconstpointer               file);
-gboolean                g_file_equal                      (GFile                      *file1,
-							   GFile                      *file2);
-char *                  g_file_get_basename               (GFile                      *file);
-char *                  g_file_get_path                   (GFile                      *file);
-char *                  g_file_get_uri                    (GFile                      *file);
-char *                  g_file_get_parse_name             (GFile                      *file);
-GFile *                 g_file_get_parent                 (GFile                      *file);
-GFile *                 g_file_get_child                  (GFile                      *file,
-							   const char                 *name);
-GFile *                 g_file_get_child_for_display_name (GFile                      *file,
-							   const char                 *display_name,
-							   GError                    **error);
-gboolean                g_file_has_prefix                 (GFile                      *file,
-							   GFile                      *prefix);
-char *                  g_file_get_relative_path          (GFile                      *parent,
-							   GFile                      *descendant);
-GFile *                 g_file_resolve_relative_path      (GFile                      *file,
-							   const char                 *relative_path);
-gboolean                g_file_is_native                  (GFile                      *file);
-gboolean                g_file_has_uri_scheme             (GFile                      *file,
-							   const char                 *uri_scheme);
-char *                  g_file_get_uri_scheme             (GFile                      *file);
-GFileInputStream *      g_file_read                       (GFile                      *file,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-void                    g_file_read_async                 (GFile                      *file,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFileInputStream *      g_file_read_finish                (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-GFileOutputStream *     g_file_append_to                  (GFile                      *file,
-							   GFileCreateFlags             flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-GFileOutputStream *     g_file_create                     (GFile                      *file,
-							   GFileCreateFlags             flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-GFileOutputStream *     g_file_replace                    (GFile                      *file,
-							   const char                 *etag,
-							   gboolean                    make_backup,
-							   GFileCreateFlags            flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-void                    g_file_append_to_async            (GFile                      *file,
-							   GFileCreateFlags            flags,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFileOutputStream *     g_file_append_to_finish           (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-void                    g_file_create_async               (GFile                      *file,
-							   GFileCreateFlags            flags,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFileOutputStream *     g_file_create_finish              (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-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);
-GFileOutputStream *     g_file_replace_finish             (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-gboolean                g_file_query_exists               (GFile                      *file,
-							   GCancellable               *cancellable);
-GFileInfo *             g_file_query_info                 (GFile                      *file,
-							   const char                 *attributes,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-void                    g_file_query_info_async           (GFile                      *file,
-							   const char                 *attributes,
-							   GFileQueryInfoFlags         flags,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFileInfo *             g_file_query_info_finish          (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-GFileInfo *             g_file_query_filesystem_info      (GFile                      *file,
-							   const char                 *attributes,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-void                    g_file_query_filesystem_info_async (GFile                      *file,
-							   const char                 *attributes,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFileInfo *             g_file_query_filesystem_info_finish (GFile                      *file,
-                                                           GAsyncResult               *res,
-							   GError                    **error);
-GMount *                g_file_find_enclosing_mount       (GFile                      *file,
-                                                           GCancellable               *cancellable,
-                                                           GError                    **error);
-void                    g_file_find_enclosing_mount_async (GFile                      *file,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GMount *                g_file_find_enclosing_mount_finish (GFile                     *file,
-							    GAsyncResult              *res,
-							    GError                   **error);
-GFileEnumerator *       g_file_enumerate_children         (GFile                      *file,
-							   const char                 *attributes,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-void                    g_file_enumerate_children_async   (GFile                      *file,
-							   const char                 *attributes,
-							   GFileQueryInfoFlags         flags,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFileEnumerator *       g_file_enumerate_children_finish  (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-GFile *                 g_file_set_display_name           (GFile                      *file,
-							   const char                 *display_name,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-void                    g_file_set_display_name_async     (GFile                      *file,
-							   const char                 *display_name,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFile *                 g_file_set_display_name_finish    (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-gboolean                g_file_delete                     (GFile                      *file,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-gboolean                g_file_trash                      (GFile                      *file,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-gboolean                g_file_copy                       (GFile                      *source,
-							   GFile                      *destination,
-							   GFileCopyFlags              flags,
-							   GCancellable               *cancellable,
-							   GFileProgressCallback       progress_callback,
-							   gpointer                    progress_callback_data,
-							   GError                    **error);
-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);
-gboolean                g_file_copy_finish                (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-gboolean                g_file_move                       (GFile                      *source,
-							   GFile                      *destination,
-							   GFileCopyFlags              flags,
-							   GCancellable               *cancellable,
-							   GFileProgressCallback       progress_callback,
-							   gpointer                    progress_callback_data,
-							   GError                    **error);
-gboolean                g_file_make_directory             (GFile                      *file,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-gboolean                g_file_make_symbolic_link         (GFile                      *file,
-							   const char                 *symlink_value,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-GFileAttributeInfoList *g_file_query_settable_attributes  (GFile                      *file,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-GFileAttributeInfoList *g_file_query_writable_namespaces  (GFile                      *file,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-gboolean                g_file_set_attribute              (GFile                      *file,
-							   const char                 *attribute,
-							   GFileAttributeType          type,
-							   gpointer                    value_p,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-gboolean                g_file_set_attributes_from_info   (GFile                      *file,
-							   GFileInfo                  *info,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-void                    g_file_set_attributes_async       (GFile                      *file,
-							   GFileInfo                  *info,
-							   GFileQueryInfoFlags         flags,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-gboolean                g_file_set_attributes_finish      (GFile                      *file,
-							   GAsyncResult               *result,
-							   GFileInfo                 **info,
-							   GError                    **error);
-gboolean                g_file_set_attribute_string       (GFile                      *file,
-							   const char                 *attribute,
-							   const char                 *value,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-gboolean                g_file_set_attribute_byte_string  (GFile                      *file,
-							   const char                 *attribute,
-							   const char                 *value,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-gboolean                g_file_set_attribute_uint32       (GFile                      *file,
-							   const char                 *attribute,
-							   guint32                     value,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-gboolean                g_file_set_attribute_int32        (GFile                      *file,
-							   const char                 *attribute,
-							   gint32                      value,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-gboolean                g_file_set_attribute_uint64       (GFile                      *file,
-							   const char                 *attribute,
-							   guint64                     value,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-gboolean                g_file_set_attribute_int64        (GFile                      *file,
-							   const char                 *attribute,
-							   gint64                      value,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-void                    g_file_mount_enclosing_volume     (GFile                      *location,
-							   GMountMountFlags            flags,
-							   GMountOperation            *mount_operation,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-gboolean                g_file_mount_enclosing_volume_finish (GFile                      *location,
-							   GAsyncResult               *result,
-							   GError                    **error);
-void                    g_file_mount_mountable            (GFile                      *file,
-							   GMountMountFlags            flags,
-							   GMountOperation            *mount_operation,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFile *                 g_file_mount_mountable_finish     (GFile                      *file,
-							   GAsyncResult               *result,
-							   GError                    **error);
-void                    g_file_unmount_mountable          (GFile                      *file,
-							   GMountUnmountFlags          flags,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-gboolean                g_file_unmount_mountable_finish   (GFile                      *file,
-							   GAsyncResult               *result,
-							   GError                    **error);
-void                    g_file_eject_mountable            (GFile                      *file,
-							   GMountUnmountFlags          flags,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-gboolean                g_file_eject_mountable_finish     (GFile                      *file,
-							   GAsyncResult               *result,
-							   GError                    **error);
-
-gboolean                g_file_copy_attributes            (GFile                      *source,
-							   GFile                      *destination,
-							   GFileCopyFlags              flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-
-
-GFileMonitor*           g_file_monitor_directory          (GFile                  *file,
-							   GFileMonitorFlags       flags,
-							   GCancellable           *cancellable,
-							   GError                **error);
-GFileMonitor*           g_file_monitor_file               (GFile                  *file,
-							   GFileMonitorFlags       flags,
-							   GCancellable           *cancellable,
-							   GError                **error);
-
-
-/* Utilities */
-
-GAppInfo *g_file_query_default_handler       (GFile                  *file,
-					      GCancellable           *cancellable,
-					      GError                **error);
-gboolean g_file_load_contents                (GFile                  *file,
-					      GCancellable           *cancellable,
-					      char                  **contents,
-					      gsize                  *length,
-					      char                  **etag_out,
-					      GError                **error);
-void     g_file_load_contents_async          (GFile                  *file,
-					      GCancellable           *cancellable,
-					      GAsyncReadyCallback     callback,
-					      gpointer                user_data);
-gboolean g_file_load_contents_finish         (GFile                  *file,
-					      GAsyncResult           *res,
-					      char                  **contents,
-					      gsize                  *length,
-					      char                  **etag_out,
-					      GError                **error);
-void     g_file_load_partial_contents_async  (GFile                  *file,
-					      GCancellable           *cancellable,
-					      GFileReadMoreCallback   read_more_callback,
-					      GAsyncReadyCallback     callback,
-					      gpointer                user_data);
-gboolean g_file_load_partial_contents_finish (GFile                  *file,
-					      GAsyncResult           *res,
-					      char                  **contents,
-					      gsize                  *length,
-					      char                  **etag_out,
-					      GError                **error);
-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);
-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);
-gboolean g_file_replace_contents_finish      (GFile                  *file,
-					      GAsyncResult           *res,
-					      char                  **new_etag,
-					      GError                **error);
-
-G_END_DECLS
-
-#endif /* __G_FILE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gfileattribute.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gfileattribute.h
deleted file mode 100644
index 758fe9b6..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gfileattribute.h
+++ /dev/null
@@ -1,129 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILE_ATTRIBUTE_H__
-#define __G_FILE_ATTRIBUTE_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/**
- * 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.
- * 
- * 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
-} 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;
-
-/**
- * GFileAttributeInfo:
- * @name: the name of the attribute.
- * @type: the #GFileAttributeType type of the attribute.
- * @flags: a set of #GFileAttributeInfoFlags.
- * 
- * Information about a specific attribute. 
- **/
-typedef struct {
-  char *name;
-  GFileAttributeType type;
-  GFileAttributeInfoFlags flags;
-} GFileAttributeInfo;
-
-/**
- * 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.
- **/
-typedef struct {
-  GFileAttributeInfo *infos;
-  int n_infos;
-} GFileAttributeInfoList;
-
-GFileAttributeInfoList *  g_file_attribute_info_list_new    (void);
-GFileAttributeInfoList *  g_file_attribute_info_list_ref    (GFileAttributeInfoList *list);
-void                      g_file_attribute_info_list_unref  (GFileAttributeInfoList *list);
-GFileAttributeInfoList *  g_file_attribute_info_list_dup    (GFileAttributeInfoList *list);
-const GFileAttributeInfo *g_file_attribute_info_list_lookup (GFileAttributeInfoList *list,
-							     const char             *name);
-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/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gfileenumerator.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gfileenumerator.h
deleted file mode 100644
index 11d04fc4..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gfileenumerator.h
+++ /dev/null
@@ -1,139 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILE_ENUMERATOR_H__
-#define __G_FILE_ENUMERATOR_H__
-
-#include <glib-object.h>
-#include <gio/gioerror.h>
-#include <gio/gcancellable.h>
-#include <gio/gfileinfo.h>
-#include <gio/gasyncresult.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:
- * @parent_instance: The parent class.
- * 
- * A per matched file iterator.
- **/
-typedef struct _GFileEnumerator         GFileEnumerator;
-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                   *res,
-				   GError                        **error);
-  void       (*close_async)       (GFileEnumerator                *enumerator,
-				   int                             io_priority,
-				   GCancellable                   *cancellable,
-				   GAsyncReadyCallback             callback,
-				   gpointer                        user_data);
-  gboolean   (*close_finish)      (GFileEnumerator                *enumerator,
-				   GAsyncResult                   *res,
-				   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);
-};
-
-GType g_file_enumerator_get_type (void) G_GNUC_CONST;
-
-GFileInfo *g_file_enumerator_next_file         (GFileEnumerator      *enumerator,
-						GCancellable         *cancellable,
-						GError              **error);
-gboolean   g_file_enumerator_close             (GFileEnumerator      *enumerator,
-						GCancellable         *cancellable,
-						GError              **error);
-void       g_file_enumerator_next_files_async  (GFileEnumerator      *enumerator,
-						int                   num_files,
-						int                   io_priority,
-						GCancellable         *cancellable,
-						GAsyncReadyCallback   callback,
-						gpointer              user_data);
-GList *    g_file_enumerator_next_files_finish (GFileEnumerator      *enumerator,
-						GAsyncResult         *result,
-						GError              **error);
-void       g_file_enumerator_close_async       (GFileEnumerator      *enumerator,
-						int                   io_priority,
-						GCancellable         *cancellable,
-						GAsyncReadyCallback   callback,
-						gpointer              user_data);
-gboolean   g_file_enumerator_close_finish      (GFileEnumerator      *enumerator,
-						GAsyncResult         *result,
-						GError              **error);
-gboolean   g_file_enumerator_is_closed         (GFileEnumerator      *enumerator);
-gboolean   g_file_enumerator_has_pending       (GFileEnumerator      *enumerator);
-void       g_file_enumerator_set_pending       (GFileEnumerator      *enumerator,
-						gboolean              pending);
-
-G_END_DECLS
-
-#endif /* __G_FILE_ENUMERATOR_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gfileicon.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gfileicon.h
deleted file mode 100644
index 18d73d0d..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gfileicon.h
+++ /dev/null
@@ -1,58 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILE_ICON_H__
-#define __G_FILE_ICON_H__
-
-#include <gio/gloadableicon.h>
-#include <gio/gfile.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 _GFileIcon        GFileIcon;
-typedef struct _GFileIconClass   GFileIconClass;
-
-GType g_file_icon_get_type (void) G_GNUC_CONST;
-  
-GIcon *g_file_icon_new (GFile *file);
-
-GFile *g_file_icon_get_file (GFileIcon *icon);
-
-G_END_DECLS
-
-#endif /* __G_FILE_ICON_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gfileinfo.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gfileinfo.h
deleted file mode 100644
index 93d74a35..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gfileinfo.h
+++ /dev/null
@@ -1,868 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILE_INFO_H__
-#define __G_FILE_INFO_H__
-
-#include <glib-object.h>
-#include <glib/gfileutils.h>
-#include <gio/gfileattribute.h>
-#include <gio/gicon.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 _GFileInfo        GFileInfo;
-typedef struct _GFileInfoClass   GFileInfoClass;
-
-/**
- * GFileAttributeMatcher:
- * 
- * Determines if a string matches a file attribute.
- **/
-typedef struct _GFileAttributeMatcher GFileAttributeMatcher;
-
-/**
- * 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;
-
-/* 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 availible its 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_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_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_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 */
-
-/* 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 */
-
-/* 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_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 */
-
-GType g_file_info_get_type (void) G_GNUC_CONST;
-
-GFileInfo *        g_file_info_new                       (void);
-GFileInfo *        g_file_info_dup                       (GFileInfo  *other);
-void               g_file_info_copy_into                 (GFileInfo  *src_info,
-							  GFileInfo  *dest_info);
-gboolean           g_file_info_has_attribute             (GFileInfo  *info,
-							  const char *attribute);
-char **            g_file_info_list_attributes           (GFileInfo  *info,
-							  const char *name_space);
-gboolean           g_file_info_get_attribute_data        (GFileInfo  *info,
-							  const char *attribute,
-							  GFileAttributeType *type,
-							  gpointer   *value_pp,
-							  GFileAttributeStatus *status);
-GFileAttributeType g_file_info_get_attribute_type        (GFileInfo  *info,
-							  const char *attribute);
-void               g_file_info_remove_attribute          (GFileInfo  *info,
-							  const char *attribute);
-GFileAttributeStatus g_file_info_get_attribute_status    (GFileInfo  *info,
-							  const char *attribute);
-char *             g_file_info_get_attribute_as_string   (GFileInfo  *info,
-							  const char *attribute);
-const char *       g_file_info_get_attribute_string      (GFileInfo  *info,
-							  const char *attribute);
-const char *       g_file_info_get_attribute_byte_string (GFileInfo  *info,
-							  const char *attribute);
-gboolean           g_file_info_get_attribute_boolean     (GFileInfo  *info,
-							  const char *attribute);
-guint32            g_file_info_get_attribute_uint32      (GFileInfo  *info,
-							  const char *attribute);
-gint32             g_file_info_get_attribute_int32       (GFileInfo  *info,
-							  const char *attribute);
-guint64            g_file_info_get_attribute_uint64      (GFileInfo  *info,
-							  const char *attribute);
-gint64             g_file_info_get_attribute_int64       (GFileInfo  *info,
-							  const char *attribute);
-GObject *          g_file_info_get_attribute_object      (GFileInfo  *info,
-							  const char *attribute);
-
-void               g_file_info_set_attribute             (GFileInfo  *info,
-							  const char *attribute,
-							  GFileAttributeType type,
-							  gpointer    value_p);
-void               g_file_info_set_attribute_string      (GFileInfo  *info,
-							  const char *attribute,
-							  const char *attr_value);
-void               g_file_info_set_attribute_byte_string (GFileInfo  *info,
-							  const char *attribute,
-							  const char *attr_value);
-void               g_file_info_set_attribute_boolean     (GFileInfo  *info,
-							  const char *attribute,
-							  gboolean    attr_value);
-void               g_file_info_set_attribute_uint32      (GFileInfo  *info,
-							  const char *attribute,
-							  guint32     attr_value);
-void               g_file_info_set_attribute_int32       (GFileInfo  *info,
-							  const char *attribute,
-							  gint32      attr_value);
-void               g_file_info_set_attribute_uint64      (GFileInfo  *info,
-							  const char *attribute,
-							  guint64     attr_value);
-void               g_file_info_set_attribute_int64       (GFileInfo  *info,
-							  const char *attribute,
-							  gint64      attr_value);
-void               g_file_info_set_attribute_object      (GFileInfo  *info,
-							  const char *attribute,
-							  GObject    *attr_value);
-
-void               g_file_info_clear_status              (GFileInfo  *info);
-
-/* Helper getters: */
-GFileType         g_file_info_get_file_type          (GFileInfo         *info);
-gboolean          g_file_info_get_is_hidden          (GFileInfo         *info);
-gboolean          g_file_info_get_is_backup          (GFileInfo         *info);
-gboolean          g_file_info_get_is_symlink         (GFileInfo         *info);
-const char *      g_file_info_get_name               (GFileInfo         *info);
-const char *      g_file_info_get_display_name       (GFileInfo         *info);
-const char *      g_file_info_get_edit_name          (GFileInfo         *info);
-GIcon *           g_file_info_get_icon               (GFileInfo         *info);
-const char *      g_file_info_get_content_type       (GFileInfo         *info);
-goffset           g_file_info_get_size               (GFileInfo         *info);
-void              g_file_info_get_modification_time  (GFileInfo         *info,
-						      GTimeVal          *result);
-const char *      g_file_info_get_symlink_target     (GFileInfo         *info);
-const char *      g_file_info_get_etag               (GFileInfo         *info);
-gint32            g_file_info_get_sort_order         (GFileInfo         *info);
-
-void              g_file_info_set_attribute_mask     (GFileInfo         *info,
-						      GFileAttributeMatcher *mask);
-void              g_file_info_unset_attribute_mask   (GFileInfo         *info);
-
-/* Helper setters: */
-void              g_file_info_set_file_type          (GFileInfo         *info,
-						      GFileType          type);
-void              g_file_info_set_is_hidden          (GFileInfo         *info,
-						      gboolean           is_hidden);
-void              g_file_info_set_is_symlink         (GFileInfo         *info,
-						      gboolean           is_symlink);
-void              g_file_info_set_name               (GFileInfo         *info,
-						      const char        *name);
-void              g_file_info_set_display_name       (GFileInfo         *info,
-						      const char        *display_name);
-void              g_file_info_set_edit_name          (GFileInfo         *info,
-						      const char        *edit_name);
-void              g_file_info_set_icon               (GFileInfo         *info,
-						      GIcon             *icon);
-void              g_file_info_set_content_type       (GFileInfo         *info,
-						      const char        *content_type);
-void              g_file_info_set_size               (GFileInfo         *info,
-						      goffset            size);
-void              g_file_info_set_modification_time  (GFileInfo         *info,
-						      GTimeVal          *mtime);
-void              g_file_info_set_symlink_target     (GFileInfo         *info,
-						      const char        *symlink_target);
-void              g_file_info_set_sort_order         (GFileInfo         *info,
-						      gint32             sort_order);
-
-GFileAttributeMatcher *g_file_attribute_matcher_new            (const char            *attributes);
-GFileAttributeMatcher *g_file_attribute_matcher_ref            (GFileAttributeMatcher *matcher);
-void                   g_file_attribute_matcher_unref          (GFileAttributeMatcher *matcher);
-gboolean               g_file_attribute_matcher_matches        (GFileAttributeMatcher *matcher,
-								const char            *attribute);
-gboolean               g_file_attribute_matcher_matches_only   (GFileAttributeMatcher *matcher,
-								const char            *attribute);
-gboolean               g_file_attribute_matcher_enumerate_namespace (GFileAttributeMatcher *matcher,
-								     const char            *ns);
-const char *           g_file_attribute_matcher_enumerate_next (GFileAttributeMatcher *matcher);
-
-G_END_DECLS
-
-
-#endif /* __G_FILE_INFO_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gfileinputstream.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gfileinputstream.h
deleted file mode 100644
index 1abc46eb..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gfileinputstream.h
+++ /dev/null
@@ -1,114 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILE_INPUT_STREAM_H__
-#define __G_FILE_INPUT_STREAM_H__
-
-#include <gio/ginputstream.h>
-#include <gio/gfileinfo.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 _GFileInputStream         GFileInputStream;
-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,
-			       char                 *attributes,
-			       GCancellable         *cancellable,
-			       GError              **error);
-  void       (*query_info_async)  (GFileInputStream     *stream,
-				   char                 *attributes,
-				   int                   io_priority,
-				   GCancellable         *cancellable,
-				   GAsyncReadyCallback   callback,
-				   gpointer              user_data);
-  GFileInfo *(*query_info_finish) (GFileInputStream     *stream,
-				   GAsyncResult         *res,
-				   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);
-};
-
-GType g_file_input_stream_get_type (void) G_GNUC_CONST;
-
-GFileInfo *g_file_input_stream_query_info        (GFileInputStream     *stream,
-						  char                 *attributes,
-						  GCancellable         *cancellable,
-						  GError              **error);
-void       g_file_input_stream_query_info_async  (GFileInputStream     *stream,
-						  char                 *attributes,
-						  int                   io_priority,
-						  GCancellable         *cancellable,
-						  GAsyncReadyCallback   callback,
-						  gpointer              user_data);
-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/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gfilemonitor.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gfilemonitor.h
deleted file mode 100644
index dfc3e26d..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gfilemonitor.h
+++ /dev/null
@@ -1,118 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILE_MONITOR_H__
-#define __G_FILE_MONITOR_H__
-
-#include <glib-object.h>
-#include <gio/gfile.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))
-
-/**
- * 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.
- * 
- * 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
-} GFileMonitorEvent;
-
-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);
-};
-
-GType g_file_monitor_get_type (void) G_GNUC_CONST;
-
-gboolean g_file_monitor_cancel         (GFileMonitor *monitor);
-gboolean g_file_monitor_is_cancelled   (GFileMonitor *monitor);
-void     g_file_monitor_set_rate_limit (GFileMonitor *monitor,
-					int           limit_msecs);
-
-
-/* For implementations */
-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/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gfilenamecompleter.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gfilenamecompleter.h
deleted file mode 100644
index c7fd3835..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gfilenamecompleter.h
+++ /dev/null
@@ -1,76 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILENAME_COMPLETER_H__
-#define __G_FILENAME_COMPLETER_H__
-
-#include <glib-object.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 _GFilenameCompleter GFilenameCompleter;
-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);
-};
-
-GType g_filename_completer_get_type (void) G_GNUC_CONST;
-
-GFilenameCompleter *g_filename_completer_new                   (void);
-
-char *              g_filename_completer_get_completion_suffix (GFilenameCompleter *completer,
-								const char *initial_text);
-char **             g_filename_completer_get_completions       (GFilenameCompleter *completer,
-								const char *initial_text);
-void                g_filename_completer_set_dirs_only         (GFilenameCompleter *completer,
-								gboolean dirs_only);
-
-G_END_DECLS
-
-#endif /* __G_FILENAME_COMPLETER_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gfileoutputstream.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gfileoutputstream.h
deleted file mode 100644
index aebb3c24..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gfileoutputstream.h
+++ /dev/null
@@ -1,121 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILE_OUTPUT_STREAM_H__
-#define __G_FILE_OUTPUT_STREAM_H__
-
-#include <gio/goutputstream.h>
-#include <gio/gfileinfo.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 _GFileOutputStream         GFileOutputStream;
-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,
-			       char                 *attributes,
-			       GCancellable         *cancellable,
-			       GError              **error);
-  void       (*query_info_async)  (GFileOutputStream     *stream,
-				   char                 *attributes,
-				   int                   io_priority,
-				   GCancellable         *cancellable,
-				   GAsyncReadyCallback   callback,
-				   gpointer              user_data);
-  GFileInfo *(*query_info_finish) (GFileOutputStream     *stream,
-				   GAsyncResult         *res,
-				   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);
-};
-
-GType g_file_output_stream_get_type (void) G_GNUC_CONST;
-
-
-GFileInfo *g_file_output_stream_query_info (GFileOutputStream  *stream,
-					    char               *attributes,
-					    GCancellable       *cancellable,
-					    GError            **error);
-void       g_file_output_stream_query_info_async  (GFileOutputStream     *stream,
-						   char                 *attributes,
-						   int                   io_priority,
-						   GCancellable         *cancellable,
-						   GAsyncReadyCallback   callback,
-						   gpointer              user_data);
-GFileInfo *g_file_output_stream_query_info_finish (GFileOutputStream     *stream,
-						   GAsyncResult         *result,
-						   GError              **error);
-char *     g_file_output_stream_get_etag      (GFileOutputStream  *stream);
-
-G_END_DECLS
-
-#endif /* __G_FILE_FILE_OUTPUT_STREAM_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gfilterinputstream.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gfilterinputstream.h
deleted file mode 100644
index ee6d9152..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gfilterinputstream.h
+++ /dev/null
@@ -1,75 +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> 
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILTER_INPUT_STREAM_H__
-#define __G_FILTER_INPUT_STREAM_H__
-
-#include <glib-object.h>
-#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 _GFilterInputStream         GFilterInputStream;
-typedef struct _GFilterInputStreamClass    GFilterInputStreamClass;
-typedef struct _GFilterInputStreamPrivate  GFilterInputStreamPrivate;
-
-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);
-};
-
-
-GType          g_filter_input_stream_get_type  (void) G_GNUC_CONST;
-GInputStream  *g_filter_input_stream_get_base_stream (GFilterInputStream *stream);
-G_END_DECLS
-
-#endif /* __G_FILTER_INPUT_STREAM_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gfilteroutputstream.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gfilteroutputstream.h
deleted file mode 100644
index ba2d968e..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gfilteroutputstream.h
+++ /dev/null
@@ -1,75 +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> 
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILTER_OUTPUT_STREAM_H__
-#define __G_FILTER_OUTPUT_STREAM_H__
-
-#include <glib-object.h>
-#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 _GFilterOutputStream         GFilterOutputStream;
-typedef struct _GFilterOutputStreamClass    GFilterOutputStreamClass;
-typedef struct _GFilterOutputStreamPrivate  GFilterOutputStreamPrivate;
-
-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);
-};
-
-
-GType           g_filter_output_stream_get_type  (void) G_GNUC_CONST;
-GOutputStream  *g_filter_output_stream_get_base_stream (GFilterOutputStream *stream);
-G_END_DECLS
-
-#endif /* __G_FILTER_OUTPUT_STREAM_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gicon.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gicon.h
deleted file mode 100644
index dd028899..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gicon.h
+++ /dev/null
@@ -1,76 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_ICON_H__
-#define __G_ICON_H__
-
-#include <glib-object.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 _GIcon         		GIcon; /* Dummy typedef */
-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.
- *
- * 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);
-};
-
-GType g_icon_get_type (void) G_GNUC_CONST;
-
-guint    g_icon_hash  (gconstpointer  icon);
-gboolean g_icon_equal (GIcon         *icon1,
-		       GIcon         *icon2);
-
-G_END_DECLS
-
-#endif /* __G_ICON_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/ginputstream.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/ginputstream.h
deleted file mode 100644
index 3759fec7..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/ginputstream.h
+++ /dev/null
@@ -1,176 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_INPUT_STREAM_H__
-#define __G_INPUT_STREAM_H__
-
-#include <glib-object.h>
-#include <gio/gioerror.h>
-#include <gio/gcancellable.h>
-#include <gio/gasyncresult.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 _GInputStream         GInputStream;
-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);
-};
-
-GType g_input_stream_get_type (void) G_GNUC_CONST;
-
-gssize   g_input_stream_read          (GInputStream          *stream,
-				       void                  *buffer,
-				       gsize                  count,
-				       GCancellable          *cancellable,
-				       GError               **error);
-gboolean g_input_stream_read_all      (GInputStream          *stream,
-				       void                  *buffer,
-				       gsize                  count,
-				       gsize                 *bytes_read,
-				       GCancellable          *cancellable,
-				       GError               **error);
-gssize   g_input_stream_skip          (GInputStream          *stream,
-				       gsize                  count,
-				       GCancellable          *cancellable,
-				       GError               **error);
-gboolean g_input_stream_close         (GInputStream          *stream,
-				       GCancellable          *cancellable,
-				       GError               **error);
-void     g_input_stream_read_async    (GInputStream          *stream,
-				       void                  *buffer,
-				       gsize                  count,
-				       int                    io_priority,
-				       GCancellable          *cancellable,
-				       GAsyncReadyCallback    callback,
-				       gpointer               user_data);
-gssize   g_input_stream_read_finish   (GInputStream          *stream,
-				       GAsyncResult          *result,
-				       GError               **error);
-void     g_input_stream_skip_async    (GInputStream          *stream,
-				       gsize                  count,
-				       int                    io_priority,
-				       GCancellable          *cancellable,
-				       GAsyncReadyCallback    callback,
-				       gpointer               user_data);
-gssize   g_input_stream_skip_finish   (GInputStream          *stream,
-				       GAsyncResult          *result,
-				       GError               **error);
-void     g_input_stream_close_async   (GInputStream          *stream,
-				       int                    io_priority,
-				       GCancellable          *cancellable,
-				       GAsyncReadyCallback    callback,
-				       gpointer               user_data);
-gboolean g_input_stream_close_finish  (GInputStream          *stream,
-				       GAsyncResult          *result,
-				       GError               **error);
-
-/* For implementations: */
-
-gboolean g_input_stream_is_closed     (GInputStream          *stream);
-gboolean g_input_stream_has_pending   (GInputStream          *stream);
-gboolean g_input_stream_set_pending   (GInputStream          *stream,
-				       GError               **error);
-void     g_input_stream_clear_pending (GInputStream          *stream);
-
-G_END_DECLS
-
-#endif /* __G_INPUT_STREAM_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gio.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gio.h
deleted file mode 100644
index a81e17fe..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gio.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_H__
-#define __G_IO_H__
-
-#define __GIO_GIO_H_INSIDE__
-
-#include <gio/gvfs.h>
-#include <gio/gfile.h>
-#include <gio/gvolumemonitor.h>
-#include <gio/gcontenttype.h>
-#include <gio/gappinfo.h>
-#include <gio/gicon.h>
-#include <gio/gfileicon.h>
-#include <gio/gloadableicon.h>
-#include <gio/gthemedicon.h>
-#include <gio/gseekable.h>
-#include <gio/gfilemonitor.h>
-#include <gio/gbufferedinputstream.h>
-#include <gio/gbufferedoutputstream.h>
-#include <gio/gdatainputstream.h>
-#include <gio/gdataoutputstream.h>
-#include <gio/gfilenamecompleter.h>
-#include <gio/gfilterinputstream.h>
-#include <gio/gfilteroutputstream.h>
-#include <gio/giomodule.h>
-#include <gio/gioscheduler.h>
-#include <gio/gmemoryinputstream.h>
-#include <gio/gmemoryoutputstream.h>
-#include <gio/gsimpleasyncresult.h>
-#include <gio/gioenumtypes.h>
-#include <gio/gnativevolumemonitor.h>
-
-#undef __GIO_GIO_H_INSIDE__
-
-#endif /* __G_IO_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gioenumtypes.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gioenumtypes.h
deleted file mode 100644
index ef64328f..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gioenumtypes.h
+++ /dev/null
@@ -1,73 +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 "gappinfo.h" */
-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 ())
-
-/* enumerations from "gdatainputstream.h" */
-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 ())
-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 ())
-
-/* enumerations from "gfile.h" */
-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 ())
-GType g_file_create_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_CREATE_FLAGS (g_file_create_flags_get_type ())
-GType g_mount_mount_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_MOUNT_MOUNT_FLAGS (g_mount_mount_flags_get_type ())
-GType g_mount_unmount_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_MOUNT_UNMOUNT_FLAGS (g_mount_unmount_flags_get_type ())
-GType g_file_copy_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_COPY_FLAGS (g_file_copy_flags_get_type ())
-GType g_file_monitor_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_MONITOR_FLAGS (g_file_monitor_flags_get_type ())
-
-/* enumerations from "gfileattribute.h" */
-GType g_file_attribute_type_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_ATTRIBUTE_TYPE (g_file_attribute_type_get_type ())
-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 ())
-GType g_file_attribute_status_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_ATTRIBUTE_STATUS (g_file_attribute_status_get_type ())
-
-/* enumerations from "gfileinfo.h" */
-GType g_file_type_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_TYPE (g_file_type_get_type ())
-GType g_filesystem_preview_type_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILESYSTEM_PREVIEW_TYPE (g_filesystem_preview_type_get_type ())
-
-/* enumerations from "gfilemonitor.h" */
-GType g_file_monitor_event_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_MONITOR_EVENT (g_file_monitor_event_get_type ())
-
-/* enumerations from "gioerror.h" */
-GType g_io_error_enum_get_type (void) G_GNUC_CONST;
-#define G_TYPE_IO_ERROR_ENUM (g_io_error_enum_get_type ())
-
-/* enumerations from "gmountoperation.h" */
-GType g_ask_password_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_ASK_PASSWORD_FLAGS (g_ask_password_flags_get_type ())
-GType g_password_save_get_type (void) G_GNUC_CONST;
-#define G_TYPE_PASSWORD_SAVE (g_password_save_get_type ())
-GType g_mount_operation_result_get_type (void) G_GNUC_CONST;
-#define G_TYPE_MOUNT_OPERATION_RESULT (g_mount_operation_result_get_type ())
-
-/* enumerations from "goutputstream.h" */
-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 ())
-G_END_DECLS
-
-#endif /* __GIO_ENUM_TYPES_H__ */
-
-/* Generated data ends here */
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gioerror.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gioerror.h
deleted file mode 100644
index 01a1ae29..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gioerror.h
+++ /dev/null
@@ -1,126 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_IO_ERROR_H__
-#define __G_IO_ERROR_H__
-
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-GQuark          g_io_error_quark      (void);
-
-/**
- * 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()
-
-/* 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 error.
- * @G_IO_ERROR_EXISTS: File already exists error.
- * @G_IO_ERROR_IS_DIRECTORY: File is a directory error.
- * @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.
- *
- * 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
-} GIOErrorEnum;
-
-GIOErrorEnum g_io_error_from_errno (gint err_no);
-
-G_END_DECLS
-
-#endif /* __G_IO_ERROR_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/giomodule.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/giomodule.h
deleted file mode 100644
index 2801d773..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/giomodule.h
+++ /dev/null
@@ -1,99 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_IO_MODULE_H__
-#define __G_IO_MODULE_H__
-
-#include <glib-object.h>
-#include <gmodule.h>
-
-G_BEGIN_DECLS
-
-#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 _GIOModule GIOModule;
-typedef struct _GIOModuleClass GIOModuleClass;
-
-typedef struct _GIOExtensionPoint GIOExtensionPoint;
-typedef struct _GIOExtension GIOExtension;
-
-GType      g_io_module_get_type (void) G_GNUC_CONST;
-GIOModule *g_io_module_new      (const gchar *filename);
-
-GList *g_io_modules_load_all_in_directory            (const char *dirname);
-
-GIOExtensionPoint *g_io_extension_point_register              (const char        *name);
-GIOExtensionPoint *g_io_extension_point_lookup                (const char        *name);
-void               g_io_extension_point_set_required_type     (GIOExtensionPoint *extension_point,
-							       GType              type);
-GType              g_io_extension_point_get_required_type     (GIOExtensionPoint *extension_point);
-GList             *g_io_extension_point_get_extensions        (GIOExtensionPoint *extension_point);
-GIOExtension *     g_io_extension_point_get_extension_by_name (GIOExtensionPoint *extension_point,
-							       const char        *name);
-GIOExtension *     g_io_extension_point_implement             (const char        *extension_point_name,
-							       GType              type,
-							       const char        *extension_name,
-							       gint               priority);
-
-GType                   g_io_extension_get_type     (GIOExtension *extension);
-const char *            g_io_extension_get_name     (GIOExtension *extension);
-gint                    g_io_extension_get_priority (GIOExtension *extension);
-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.
- **/
-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.
- **/
-void        g_io_module_unload   (GIOModule   *module);
-
-G_END_DECLS
-
-#endif /* __G_IO_MODULE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gioscheduler.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gioscheduler.h
deleted file mode 100644
index 03c7f94f..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gioscheduler.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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_IO_SCHEDULER_H__
-#define __G_IO_SCHEDULER_H__
-
-#include <glib.h>
-#include <gio/gcancellable.h>
-
-G_BEGIN_DECLS
-
-/**
- * GIOSchedulerJob:
- * 
- * Opaque class for definining and scheduling IO jobs.
- **/
-typedef struct _GIOSchedulerJob GIOSchedulerJob;
-
-/**
- * GIOSchedulerJobFunc:
- * @job: a #GIOSchedulerJob.
- * @cancellable: optional #GCancellable object, %NULL to ignore.
- * @user_data: the data to pass to callback function
- * 
- * I/O Job function. 
- *
- * Note that depending on whether threads are available, the 
- * #GIOScheduler may run jobs in separate threads or in an idle 
- * in the mainloop. 
- *
- * 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);
-
-void     g_io_scheduler_push_job                   (GIOSchedulerJobFunc  job_func,
-						    gpointer             user_data,
-						    GDestroyNotify       notify,
-						    gint                 io_priority,
-						    GCancellable        *cancellable);
-void     g_io_scheduler_cancel_all_jobs            (void);
-gboolean g_io_scheduler_job_send_to_mainloop       (GIOSchedulerJob     *job,
-						    GSourceFunc          func,
-						    gpointer             user_data,
-						    GDestroyNotify       notify);
-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/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gloadableicon.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gloadableicon.h
deleted file mode 100644
index 3973f74d..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_LOADABLE_ICON_H__
-#define __G_LOADABLE_ICON_H__
-
-#include <glib-object.h>
-#include <gio/gicon.h>
-#include <gio/ginputstream.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 _GLoadableIcon         		GLoadableIcon; /* Dummy typedef */
-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);
-};
-
-GType g_loadable_icon_get_type (void) G_GNUC_CONST;
-
-
-GInputStream *g_loadable_icon_load        (GLoadableIcon        *icon,
-					   int                   size,
-					   char                **type,
-					   GCancellable         *cancellable,
-					   GError              **error);
-void          g_loadable_icon_load_async  (GLoadableIcon        *icon,
-					   int                   size,
-					   GCancellable         *cancellable,
-					   GAsyncReadyCallback   callback,
-					   gpointer              user_data);
-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/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gmemoryinputstream.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gmemoryinputstream.h
deleted file mode 100644
index 0e3e43f2..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gmemoryinputstream.h
+++ /dev/null
@@ -1,84 +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> 
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_MEMORY_INPUT_STREAM_H__
-#define __G_MEMORY_INPUT_STREAM_H__
-
-#include <glib-object.h>
-#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 _GMemoryInputStream         GMemoryInputStream;
-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);
-};
-
-
-GType          g_memory_input_stream_get_type  (void) G_GNUC_CONST;
-GInputStream * g_memory_input_stream_new               (void);
-GInputStream * g_memory_input_stream_new_from_data     (const void     *data,
-					  	   	gssize          len,
-						    	GDestroyNotify  destroy);
-void           g_memory_input_stream_add_data          (GMemoryInputStream *stream,
-                                                        const void         *data,
-                                                        gssize              len,
-                                                        GDestroyNotify      destroy);
-
-G_END_DECLS
-
-#endif /* __G_MEMORY_INPUT_STREAM_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gmemoryoutputstream.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gmemoryoutputstream.h
deleted file mode 100644
index 99fd8c2e..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gmemoryoutputstream.h
+++ /dev/null
@@ -1,97 +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> 
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_MEMORY_OUTPUT_STREAM_H__
-#define __G_MEMORY_OUTPUT_STREAM_H__
-
-#include <glib-object.h>
-#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 _GMemoryOutputStream         GMemoryOutputStream;
-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);
-
-GType          g_memory_output_stream_get_type (void) G_GNUC_CONST;
-
-GOutputStream *g_memory_output_stream_new      (gpointer             data,
-                                                gsize                len,
-                                                GReallocFunc         realloc_fn,
-                                                GDestroyNotify       destroy);
-gpointer       g_memory_output_stream_get_data (GMemoryOutputStream *ostream);
-gsize          g_memory_output_stream_get_size (GMemoryOutputStream *ostream);
-
-G_END_DECLS
-
-#endif /* __G_MEMORY_OUTPUT_STREAM_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gmount.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gmount.h
deleted file mode 100644
index c2474d56..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gmount.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>
- *         David Zeuthen <davidz@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_MOUNT_H__
-#define __G_MOUNT_H__
-
-#include <glib-object.h>
-#include <gio/gfile.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))
-
-/* GMount typedef is in gfile.h due to include order issues */
-/**
- * GVolume:
- * 
- * Opaque mountable volume object.
- **/
-typedef struct _GVolume GVolume; /* Dummy typedef */
-
-/**
- * GDrive:
- * 
- * Opaque drive object.
- **/
-typedef struct _GDrive          GDrive; /* Dummy typedef */
-
-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.
- * @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.
- * 
- * 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);
-};
-
-GType g_mount_get_type (void) G_GNUC_CONST;
-
-GFile *            g_mount_get_root             (GMount              *mount);
-char *             g_mount_get_name             (GMount              *mount);
-GIcon *            g_mount_get_icon             (GMount              *mount);
-char *             g_mount_get_uuid             (GMount              *mount);
-GVolume *          g_mount_get_volume           (GMount              *mount);
-GDrive *           g_mount_get_drive            (GMount              *mount);
-gboolean           g_mount_can_unmount          (GMount              *mount);
-gboolean           g_mount_can_eject            (GMount              *mount);
-void               g_mount_unmount              (GMount              *mount,
-						 GMountUnmountFlags   flags,
-                                                 GCancellable        *cancellable,
-                                                 GAsyncReadyCallback  callback,
-                                                 gpointer             user_data);
-gboolean           g_mount_unmount_finish       (GMount              *mount,
-                                                 GAsyncResult        *result,
-                                                 GError             **error);
-void               g_mount_eject                (GMount              *mount,
-						 GMountUnmountFlags   flags,
-                                                 GCancellable        *cancellable,
-                                                 GAsyncReadyCallback  callback,
-                                                 gpointer             user_data);
-gboolean           g_mount_eject_finish         (GMount              *mount,
-                                                 GAsyncResult        *result,
-                                                 GError             **error);
-void               g_mount_remount              (GMount              *mount,
-						 GMountMountFlags     flags,
-						 GMountOperation     *mount_operation,
-                                                 GCancellable        *cancellable,
-                                                 GAsyncReadyCallback  callback,
-                                                 gpointer             user_data);
-gboolean           g_mount_remount_finish       (GMount              *mount,
-                                                 GAsyncResult        *result,
-                                                 GError             **error);
-
-G_END_DECLS
-
-#endif /* __G_MOUNT_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gmountoperation.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gmountoperation.h
deleted file mode 100644
index a220d954..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gmountoperation.h
+++ /dev/null
@@ -1,172 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_MOUNT_OPERATION_H__
-#define __G_MOUNT_OPERATION_H__
-
-#include <sys/stat.h>
-
-#include <glib-object.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 _GMountOperation        GMountOperation;
-typedef struct _GMountOperationClass   GMountOperationClass;
-typedef struct _GMountOperationPrivate GMountOperationPrivate;
-
-struct _GMountOperation
-{
-  GObject parent_instance;
-
-  GMountOperationPrivate *priv;
-};
-
-/**
- * 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.
- **/ 
-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 availible
- * @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;
-
-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);
-  
-  /*< 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);
-  void (*_g_reserved11) (void);
-  void (*_g_reserved12) (void);
-};
-
-GType g_mount_operation_get_type (void) G_GNUC_CONST;
-  
-GMountOperation *  g_mount_operation_new (void);
-
-const char *  g_mount_operation_get_username      (GMountOperation *op);
-void          g_mount_operation_set_username      (GMountOperation *op,
-						   const char      *username);
-const char *  g_mount_operation_get_password      (GMountOperation *op);
-void          g_mount_operation_set_password      (GMountOperation *op,
-						   const char      *password);
-gboolean      g_mount_operation_get_anonymous     (GMountOperation *op);
-void          g_mount_operation_set_anonymous     (GMountOperation *op,
-						   gboolean         anonymous);
-const char *  g_mount_operation_get_domain        (GMountOperation *op);
-void          g_mount_operation_set_domain        (GMountOperation *op,
-						   const char      *domain);
-GPasswordSave g_mount_operation_get_password_save (GMountOperation *op);
-void          g_mount_operation_set_password_save (GMountOperation *op,
-						   GPasswordSave    save);
-int           g_mount_operation_get_choice        (GMountOperation *op);
-void          g_mount_operation_set_choice        (GMountOperation *op,
-						   int              choice);
-void          g_mount_operation_reply             (GMountOperation *op,
-						   GMountOperationResult result);
-
-G_END_DECLS
-
-#endif /* __G_MOUNT_OPERATION_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gnativevolumemonitor.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gnativevolumemonitor.h
deleted file mode 100644
index 3face1b2..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gnativevolumemonitor.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef __G_NATIVE_VOLUME_MONITOR_H__
-#define __G_NATIVE_VOLUME_MONITOR_H__
-
-#include <glib-object.h>
-#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);
-};
-
-GType g_native_volume_monitor_get_type (void) G_GNUC_CONST;
-
-
-G_END_DECLS
-
-#endif /* __G_NATIVE_VOLUME_MONITOR_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/goutputstream.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/goutputstream.h
deleted file mode 100644
index 263e6e6d..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/goutputstream.h
+++ /dev/null
@@ -1,225 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_OUTPUT_STREAM_H__
-#define __G_OUTPUT_STREAM_H__
-
-#include <glib-object.h>
-#include <gio/gioerror.h>
-#include <gio/gasyncresult.h>
-#include <gio/gcancellable.h>
-#include <gio/ginputstream.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))
-
-/**
- * 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;
-
-/**
- * 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 _GOutputStream         GOutputStream;
-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             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);
-};
-
-GType g_output_stream_get_type (void) G_GNUC_CONST;
-  
-gssize   g_output_stream_write         (GOutputStream             *stream,
-					const void                *buffer,
-					gsize                      count,
-					GCancellable              *cancellable,
-					GError                   **error);
-gboolean g_output_stream_write_all     (GOutputStream             *stream,
-					const void                *buffer,
-					gsize                      count,
-					gsize                     *bytes_written,
-					GCancellable              *cancellable,
-					GError                   **error);
-gssize   g_output_stream_splice        (GOutputStream             *stream,
-					GInputStream              *source,
-					GOutputStreamSpliceFlags   flags,
-					GCancellable              *cancellable,
-					GError                   **error);
-gboolean g_output_stream_flush         (GOutputStream             *stream,
-					GCancellable              *cancellable,
-					GError                   **error);
-gboolean g_output_stream_close         (GOutputStream             *stream,
-					GCancellable              *cancellable,
-					GError                   **error);
-void     g_output_stream_write_async   (GOutputStream             *stream,
-					const void                *buffer,
-					gsize                      count,
-					int                        io_priority,
-					GCancellable              *cancellable,
-					GAsyncReadyCallback        callback,
-					gpointer                   user_data);
-gssize   g_output_stream_write_finish  (GOutputStream             *stream,
-					GAsyncResult              *result,
-					GError                   **error);
-void     g_output_stream_splice_async  (GOutputStream             *stream,
-					GInputStream              *source,
-					GOutputStreamSpliceFlags   flags,
-					int                        io_priority,
-					GCancellable              *cancellable,
-					GAsyncReadyCallback        callback,
-					gpointer                   user_data);
-gssize   g_output_stream_splice_finish (GOutputStream             *stream,
-					GAsyncResult              *result,
-					GError                   **error);
-void     g_output_stream_flush_async   (GOutputStream             *stream,
-					int                        io_priority,
-					GCancellable              *cancellable,
-					GAsyncReadyCallback        callback,
-					gpointer                   user_data);
-gboolean g_output_stream_flush_finish  (GOutputStream             *stream,
-					GAsyncResult              *result,
-					GError                   **error);
-void     g_output_stream_close_async   (GOutputStream             *stream,
-					int                        io_priority,
-					GCancellable              *cancellable,
-					GAsyncReadyCallback        callback,
-					gpointer                   user_data);
-gboolean g_output_stream_close_finish  (GOutputStream             *stream,
-					GAsyncResult              *result,
-					GError                   **error);
-
-gboolean g_output_stream_is_closed     (GOutputStream             *stream);
-gboolean g_output_stream_has_pending   (GOutputStream             *stream);
-gboolean g_output_stream_set_pending   (GOutputStream             *stream,
-					GError                   **error);
-void     g_output_stream_clear_pending (GOutputStream             *stream);
-
-
-G_END_DECLS
-
-#endif /* __G_OUTPUT_STREAM_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gseekable.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gseekable.h
deleted file mode 100644
index 78b8998c..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gseekable.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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_SEEKABLE_H__
-#define __G_SEEKABLE_H__
-
-#include <glib-object.h>
-#include <gio/gcancellable.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 _GSeekable        GSeekable;
-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: Chekcs if truncation is suppored 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 */
-};
-
-GType g_seekable_get_type (void) G_GNUC_CONST;
-
-goffset  g_seekable_tell         (GSeekable     *seekable);
-gboolean g_seekable_can_seek     (GSeekable     *seekable);
-gboolean g_seekable_seek         (GSeekable     *seekable,
-				  goffset        offset,
-				  GSeekType      type,
-				  GCancellable  *cancellable,
-				  GError       **error);
-gboolean g_seekable_can_truncate (GSeekable     *seekable);
-gboolean g_seekable_truncate     (GSeekable     *seekable,
-				  goffset        offset,
-				  GCancellable  *cancellable,
-				  GError       **error);
-
-G_END_DECLS
-
-
-#endif /* __G_SEEKABLE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gsimpleasyncresult.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gsimpleasyncresult.h
deleted file mode 100644
index f2f9b36d..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gsimpleasyncresult.h
+++ /dev/null
@@ -1,137 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_SIMPLE_ASYNC_RESULT_H__
-#define __G_SIMPLE_ASYNC_RESULT_H__
-
-#include <gio/gasyncresult.h>
-#include <gio/gcancellable.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 _GSimpleAsyncResult        GSimpleAsyncResult;
-typedef struct _GSimpleAsyncResultClass   GSimpleAsyncResultClass;
-
-/**
- * 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);
-
-
-GType g_simple_async_result_get_type (void) G_GNUC_CONST;
-  
-GSimpleAsyncResult *g_simple_async_result_new              (GObject                 *source_object,
-							    GAsyncReadyCallback      callback,
-							    gpointer                 user_data,
-							    gpointer                 source_tag);
-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);
-GSimpleAsyncResult *g_simple_async_result_new_from_error   (GObject                 *source_object,
-							    GAsyncReadyCallback      callback,
-							    gpointer                 user_data,
-							    GError                  *error);
-
-void                g_simple_async_result_set_op_res_gpointer (GSimpleAsyncResult      *simple,
-                                                               gpointer                 op_res,
-                                                               GDestroyNotify           destroy_op_res);
-gpointer            g_simple_async_result_get_op_res_gpointer (GSimpleAsyncResult      *simple);
-
-void                g_simple_async_result_set_op_res_gssize   (GSimpleAsyncResult      *simple,
-                                                               gssize                   op_res);
-gssize              g_simple_async_result_get_op_res_gssize   (GSimpleAsyncResult      *simple);
-
-void                g_simple_async_result_set_op_res_gboolean (GSimpleAsyncResult      *simple,
-                                                               gboolean                 op_res);
-gboolean            g_simple_async_result_get_op_res_gboolean (GSimpleAsyncResult      *simple);
-
-
-
-gpointer            g_simple_async_result_get_source_tag   (GSimpleAsyncResult      *simple);
-void                g_simple_async_result_set_handle_cancellation (GSimpleAsyncResult      *simple,
-								   gboolean          handle_cancellation);
-void                g_simple_async_result_complete         (GSimpleAsyncResult      *simple);
-void                g_simple_async_result_complete_in_idle (GSimpleAsyncResult      *simple);
-void                g_simple_async_result_run_in_thread    (GSimpleAsyncResult      *simple,
-							    GSimpleAsyncThreadFunc   func,
-							    int                      io_priority,
-							    GCancellable            *cancellable);
-void                g_simple_async_result_set_from_error   (GSimpleAsyncResult      *simple,
-							    GError                  *error);
-gboolean            g_simple_async_result_propagate_error  (GSimpleAsyncResult      *simple,
-							    GError                 **dest);
-void                g_simple_async_result_set_error        (GSimpleAsyncResult      *simple,
-							    GQuark                   domain,
-							    gint                     code,
-							    const char              *format,
-							    ...) G_GNUC_PRINTF (4, 5);
-void                g_simple_async_result_set_error_va     (GSimpleAsyncResult      *simple,
-							    GQuark                   domain,
-							    gint                     code,
-							    const char              *format,
-							    va_list                  args);
-
-void g_simple_async_report_error_in_idle  (GObject *object,
-					   GAsyncReadyCallback callback,
-					   gpointer user_data,
-					   GQuark         domain,
-					   gint           code,
-					   const char    *format,
-					   ...);
-void g_simple_async_report_gerror_in_idle (GObject *object,
-					   GAsyncReadyCallback callback,
-					   gpointer user_data,
-					   GError *error);
-
-G_END_DECLS
-
-
-  
-#endif /* __G_SIMPLE_ASYNC_RESULT_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gthemedicon.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gthemedicon.h
deleted file mode 100644
index 5fb8a6b4..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gthemedicon.h
+++ /dev/null
@@ -1,60 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_THEMED_ICON_H__
-#define __G_THEMED_ICON_H__
-
-#include <gio/gicon.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 _GThemedIcon        GThemedIcon;
-typedef struct _GThemedIconClass   GThemedIconClass;
-
-GType g_themed_icon_get_type (void) G_GNUC_CONST;
-  
-GIcon *g_themed_icon_new (const char *iconname);
-GIcon *g_themed_icon_new_with_default_fallbacks (const char *iconname);
-GIcon *g_themed_icon_new_from_names (char **iconnames, int len);
-void   g_themed_icon_append_name (GThemedIcon *icon, const char *iconname);
-
-const char * const *g_themed_icon_get_names (GThemedIcon *icon);
-
-G_END_DECLS
-
-#endif /* __G_THEMED_ICON_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gvfs.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gvfs.h
deleted file mode 100644
index 9c513468..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gvfs.h
+++ /dev/null
@@ -1,112 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_VFS_H__
-#define __G_VFS_H__
-
-#include <glib-object.h>
-#include <gio/gfile.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="gio-extension-points">Extending GIO</link>.
- */
-#define G_VFS_EXTENSION_POINT_NAME "gio-vfs"
-
-/**
- * GVfs:
- * 
- * Virtual File System object.
- **/
-typedef struct _GVfs         GVfs; /* Dummy typedef */
-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 >*/
-  /* 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);
-  void (*_g_reserved11) (void);
-  void (*_g_reserved12) (void);
-  
-};
-
-GType g_vfs_get_type (void) G_GNUC_CONST;
-
-gboolean              g_vfs_is_active                 (GVfs       *vfs);
-GFile *               g_vfs_get_file_for_path         (GVfs       *vfs,
-				                       const char *path);
-GFile *               g_vfs_get_file_for_uri          (GVfs       *vfs,
-				                       const char *uri);
-const gchar * const * g_vfs_get_supported_uri_schemes (GVfs *vfs);
-
-GFile *               g_vfs_parse_name                (GVfs       *vfs,
-				                       const char *parse_name);
-
-GVfs *                g_vfs_get_default               (void);
-GVfs *                g_vfs_get_local                 (void);
-
-G_END_DECLS
-
-#endif /* __G_VFS_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gvolume.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gvolume.h
deleted file mode 100644
index f1ec0f5f..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gvolume.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>
- *         David Zeuthen <davidz@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_VOLUME_H__
-#define __G_VOLUME_H__
-
-#include <glib-object.h>
-#include <gio/gfile.h>
-#include <gio/gdrive.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"
-
-
-#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.
- * @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.
- * 
- * 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);
-  
-};
-
-GType     g_volume_get_type       (void) G_GNUC_CONST;
-
-char *   g_volume_get_name              (GVolume              *volume);
-GIcon *  g_volume_get_icon              (GVolume              *volume);
-char *   g_volume_get_uuid              (GVolume              *volume);
-GDrive * g_volume_get_drive             (GVolume              *volume);
-GMount * g_volume_get_mount             (GVolume              *volume);
-gboolean g_volume_can_mount             (GVolume              *volume);
-gboolean g_volume_can_eject             (GVolume              *volume);
-gboolean g_volume_should_automount      (GVolume              *volume);
-void     g_volume_mount                 (GVolume              *volume,
-					 GMountMountFlags      flags,
-					 GMountOperation      *mount_operation,
-					 GCancellable         *cancellable,
-					 GAsyncReadyCallback   callback,
-					 gpointer              user_data);
-gboolean g_volume_mount_finish          (GVolume              *volume,
-					 GAsyncResult         *result,
-					 GError              **error);
-void     g_volume_eject                 (GVolume              *volume,
-					 GMountUnmountFlags    flags,
-					 GCancellable         *cancellable,
-					 GAsyncReadyCallback   callback,
-					 gpointer              user_data);
-gboolean g_volume_eject_finish          (GVolume              *volume,
-					 GAsyncResult         *result,
-					 GError              **error);
-char *   g_volume_get_identifier        (GVolume              *volume,
-					 const char           *kind);
-char **  g_volume_enumerate_identifiers (GVolume              *volume);
-
-
-G_END_DECLS
-
-#endif /* __G_VOLUME_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gvolumemonitor.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gvolumemonitor.h
deleted file mode 100644
index 9d32ceab..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gio/gvolumemonitor.h
+++ /dev/null
@@ -1,145 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_VOLUME_MONITOR_H__
-#define __G_VOLUME_MONITOR_H__
-
-#include <glib-object.h>
-#include <gio/gmount.h>
-#include <gio/gvolume.h>
-#include <gio/gdrive.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="gio-extension-points">Extending GIO</link>.
- */
-#define G_VOLUME_MONITOR_EXTENSION_POINT_NAME "gio-volume-monitor"
-
-/**
- * GVolumeMonitor:
- * @parent_instance: The parent instance.
- *
- * A Volume Monitor that watches for volume events.
- **/
-typedef struct _GVolumeMonitor GVolumeMonitor;
-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) */
-  GVolume * (*adopt_orphan_mount)   (GMount          *mount,
-                                     GVolumeMonitor  *volume_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);
-  void (*_g_reserved6) (void);
-  void (*_g_reserved7) (void);
-  void (*_g_reserved8) (void);
-};
-
-GType g_volume_monitor_get_type (void) G_GNUC_CONST;
-
-GVolumeMonitor *g_volume_monitor_get                     (void);
-GList *         g_volume_monitor_get_connected_drives    (GVolumeMonitor  *volume_monitor);
-GList *         g_volume_monitor_get_volumes             (GVolumeMonitor  *volume_monitor);
-GList *         g_volume_monitor_get_mounts              (GVolumeMonitor  *volume_monitor);
-GVolume *       g_volume_monitor_get_volume_for_uuid     (GVolumeMonitor  *volume_monitor,
-                                                          const char      *uuid);
-GMount *        g_volume_monitor_get_mount_for_uuid      (GVolumeMonitor  *volume_monitor,
-                                                          const char      *uuid);
-
-GVolume *       g_volume_monitor_adopt_orphan_mount      (GMount *mount);
-
-G_END_DECLS
-
-#endif /* __G_VOLUME_MONITOR_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib-object.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib-object.h
deleted file mode 100644
index 8687ef1f..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib-object.h
+++ /dev/null
@@ -1,41 +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/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/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib.h
deleted file mode 100644
index 529c831e..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib.h
+++ /dev/null
@@ -1,87 +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__
-
-#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/gbookmarkfile.h>
-#include <glib/gcache.h>
-#include <glib/gchecksum.h>
-#include <glib/gcompletion.h>
-#include <glib/gconvert.h>
-#include <glib/gdataset.h>
-#include <glib/gdate.h>
-#include <glib/gdir.h>
-#include <glib/gerror.h>
-#include <glib/gfileutils.h>
-#include <glib/ghash.h>
-#include <glib/ghook.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/gprimes.h>
-#include <glib/gqsort.h>
-#include <glib/gquark.h>
-#include <glib/gqueue.h>
-#include <glib/grand.h>
-#include <glib/grel.h>
-#include <glib/gregex.h>
-#include <glib/gscanner.h>
-#include <glib/gsequence.h>
-#include <glib/gshell.h>
-#include <glib/gslist.h>
-#include <glib/gspawn.h>
-#include <glib/gstrfuncs.h>
-#include <glib/gstring.h>
-#include <glib/gtestutils.h>
-#include <glib/gthread.h>
-#include <glib/gthreadpool.h>
-#include <glib/gtimer.h>
-#include <glib/gtree.h>
-#include <glib/gtypes.h>
-#include <glib/gunicode.h>
-#include <glib/gurifuncs.h>
-#include <glib/gutils.h>
-#ifdef G_PLATFORM_WIN32
-#include <glib/gwin32.h>
-#endif
-
-#endif /* __G_LIB_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/galloca.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/galloca.h
deleted file mode 100644
index baf80096..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/galloca.h
+++ /dev/null
@@ -1,60 +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__
-
-#include <glib/gtypes.h>
-
-#ifdef  __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 */
-
-#define g_alloca(size)		 alloca (size)
-#define g_newa(struct_type, n_structs)	((struct_type*) g_alloca (sizeof (struct_type) * (gsize) (n_structs)))
-
-
-#endif /* __G_ALLOCA_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/garray.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/garray.h
deleted file mode 100644
index 7858e395..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/garray.h
+++ /dev/null
@@ -1,167 +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__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-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)])
-
-GArray* g_array_new               (gboolean          zero_terminated,
-				   gboolean          clear_,
-				   guint             element_size);
-GArray* g_array_sized_new         (gboolean          zero_terminated,
-				   gboolean          clear_,
-				   guint             element_size,
-				   guint             reserved_size);
-gchar*  g_array_free              (GArray           *array,
-				   gboolean          free_segment);
-GArray* g_array_append_vals       (GArray           *array,
-				   gconstpointer     data,
-				   guint             len);
-GArray* g_array_prepend_vals      (GArray           *array,
-				   gconstpointer     data,
-				   guint             len);
-GArray* g_array_insert_vals       (GArray           *array,
-				   guint             index_,
-				   gconstpointer     data,
-				   guint             len);
-GArray* g_array_set_size          (GArray           *array,
-				   guint             length);
-GArray* g_array_remove_index      (GArray           *array,
-				   guint             index_);
-GArray* g_array_remove_index_fast (GArray           *array,
-				   guint             index_);
-GArray* g_array_remove_range      (GArray           *array,
-				   guint             index_,
-				   guint             length);
-void    g_array_sort              (GArray           *array,
-				   GCompareFunc      compare_func);
-void    g_array_sort_with_data    (GArray           *array,
-				   GCompareDataFunc  compare_func,
-				   gpointer          user_data);
-
-/* 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_]
-GPtrArray* g_ptr_array_new                (void);
-GPtrArray* g_ptr_array_sized_new          (guint             reserved_size);
-gpointer*  g_ptr_array_free               (GPtrArray        *array,
-					   gboolean          free_seg);
-void       g_ptr_array_set_size           (GPtrArray        *array,
-					   gint              length);
-gpointer   g_ptr_array_remove_index       (GPtrArray        *array,
-					   guint             index_);
-gpointer   g_ptr_array_remove_index_fast  (GPtrArray        *array,
-					   guint             index_);
-gboolean   g_ptr_array_remove             (GPtrArray        *array,
-					   gpointer          data);
-gboolean   g_ptr_array_remove_fast        (GPtrArray        *array,
-					   gpointer          data);
-void       g_ptr_array_remove_range       (GPtrArray        *array,
-					   guint             index_,
-					   guint             length);
-void       g_ptr_array_add                (GPtrArray        *array,
-					   gpointer          data);
-void       g_ptr_array_sort               (GPtrArray        *array,
-					   GCompareFunc      compare_func);
-void       g_ptr_array_sort_with_data     (GPtrArray        *array,
-					   GCompareDataFunc  compare_func,
-					   gpointer          user_data);
-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.
- */
-
-GByteArray* g_byte_array_new               (void);
-GByteArray* g_byte_array_sized_new         (guint             reserved_size);
-guint8*     g_byte_array_free              (GByteArray       *array,
-					    gboolean          free_segment);
-GByteArray* g_byte_array_append            (GByteArray       *array,
-					    const guint8     *data,
-					    guint             len);
-GByteArray* g_byte_array_prepend           (GByteArray       *array,
-					    const guint8     *data,
-					    guint             len);
-GByteArray* g_byte_array_set_size          (GByteArray       *array,
-					    guint             length);
-GByteArray* g_byte_array_remove_index      (GByteArray       *array,
-					    guint             index_);
-GByteArray* g_byte_array_remove_index_fast (GByteArray       *array,
-					    guint             index_);
-GByteArray* g_byte_array_remove_range      (GByteArray       *array,
-					    guint             index_,
-					    guint             length);
-void        g_byte_array_sort              (GByteArray       *array,
-					    GCompareFunc      compare_func);
-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/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gasyncqueue.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gasyncqueue.h
deleted file mode 100644
index 7c860e85..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gasyncqueue.h
+++ /dev/null
@@ -1,117 +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__
-
-#include <glib/gthread.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GAsyncQueue GAsyncQueue;
-
-/* Asyncronous Queues, can be used to communicate between threads */
-
-/* Get a new GAsyncQueue with the ref_count 1 */
-GAsyncQueue*  g_async_queue_new                 (void);
-
-GAsyncQueue*  g_async_queue_new_full            (GDestroyNotify item_free_func);
-
-/* Lock and unlock a GAsyncQueue. All functions lock the queue for
- * themselves, but in certain cirumstances you want to hold the lock longer,
- * thus you lock the queue, call the *_unlocked functions and unlock it again.
- */
-void         g_async_queue_lock                 (GAsyncQueue      *queue);
-void         g_async_queue_unlock               (GAsyncQueue      *queue);
-
-/* Ref and unref the GAsyncQueue. */
-GAsyncQueue* g_async_queue_ref                  (GAsyncQueue      *queue);
-void         g_async_queue_unref                (GAsyncQueue      *queue);
-
-#ifndef G_DISABLE_DEPRECATED
-/* You don't have to hold the lock for calling *_ref and *_unref anymore. */
-void         g_async_queue_ref_unlocked         (GAsyncQueue      *queue);
-void         g_async_queue_unref_and_unlock     (GAsyncQueue      *queue);
-#endif /* !G_DISABLE_DEPRECATED */
-
-/* Push data into the async queue. Must not be NULL. */
-void         g_async_queue_push                 (GAsyncQueue      *queue,
-						 gpointer          data);
-void         g_async_queue_push_unlocked        (GAsyncQueue      *queue,
-						 gpointer          data);
-
-void         g_async_queue_push_sorted          (GAsyncQueue      *queue,
-						 gpointer          data,
-						 GCompareDataFunc  func,
-						 gpointer          user_data);
-void         g_async_queue_push_sorted_unlocked (GAsyncQueue      *queue,
-						 gpointer          data,
-						 GCompareDataFunc  func,
-						 gpointer          user_data);
-
-/* Pop data from the async queue. When no data is there, the thread is blocked
- * until data arrives.
- */
-gpointer     g_async_queue_pop                  (GAsyncQueue      *queue);
-gpointer     g_async_queue_pop_unlocked         (GAsyncQueue      *queue);
-
-/* Try to pop data. NULL is returned in case of empty queue. */
-gpointer     g_async_queue_try_pop              (GAsyncQueue      *queue);
-gpointer     g_async_queue_try_pop_unlocked     (GAsyncQueue      *queue);
-
-
-
-/* Wait for data until at maximum until end_time is reached. NULL is returned
- * in case of empty queue. 
- */
-gpointer     g_async_queue_timed_pop            (GAsyncQueue      *queue,
-						 GTimeVal         *end_time);
-gpointer     g_async_queue_timed_pop_unlocked   (GAsyncQueue      *queue,
-						 GTimeVal         *end_time);
-
-/* Return the length of the queue. Negative values mean that threads
- * are waiting, positve values mean that there are entries in the
- * queue. Actually this function returns the length of the queue minus
- * the number of waiting threads, g_async_queue_length == 0 could also
- * mean 'n' entries in the queue and 'n' thread waiting. Such can
- * happen due to locking of the queue or due to scheduling. 
- */
-gint         g_async_queue_length               (GAsyncQueue      *queue);
-gint         g_async_queue_length_unlocked      (GAsyncQueue      *queue);
-void         g_async_queue_sort                 (GAsyncQueue      *queue,
-						 GCompareDataFunc  func,
-						 gpointer          user_data);
-void         g_async_queue_sort_unlocked        (GAsyncQueue      *queue,
-						 GCompareDataFunc  func,
-						 gpointer          user_data);
-
-/* Private API */
-GMutex*      _g_async_queue_get_mutex           (GAsyncQueue      *queue);
-
-G_END_DECLS
-
-#endif /* __G_ASYNCQUEUE_H__ */
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gatomic.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gatomic.h
deleted file mode 100644
index fefe2aff..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gatomic.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * g_atomic_*: atomic operations.
- * Copyright (C) 2003 Sebastian Wilhelmi
- *
- * 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_ATOMIC_H__
-#define __G_ATOMIC_H__
- 
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
- 
-gint     g_atomic_int_exchange_and_add         (volatile gint	  *atomic,
-						gint      	   val);
-void     g_atomic_int_add                      (volatile gint	  *atomic,
-						gint      	   val);
-gboolean g_atomic_int_compare_and_exchange     (volatile gint	  *atomic,
-						gint      	   oldval,
-						gint      	   newval);
-gboolean g_atomic_pointer_compare_and_exchange (volatile gpointer *atomic, 
-						gpointer  	   oldval, 
-						gpointer  	   newval);
-
-gint     g_atomic_int_get                      (volatile gint  	  *atomic);
-void     g_atomic_int_set                      (volatile gint  	  *atomic,
-						gint               newval);
-gpointer g_atomic_pointer_get                  (volatile gpointer *atomic);
-void     g_atomic_pointer_set                  (volatile gpointer *atomic,
-						gpointer           newval);
-
-#ifndef G_ATOMIC_OP_MEMORY_BARRIER_NEEDED
-# define g_atomic_int_get(atomic) 		(*(atomic))
-# define g_atomic_int_set(atomic, newval) 	((void) (*(atomic) = (newval)))
-# define g_atomic_pointer_get(atomic) 		(*(atomic))
-# define g_atomic_pointer_set(atomic, newval)	((void) (*(atomic) = (newval)))
-#endif /* G_ATOMIC_OP_MEMORY_BARRIER_NEEDED */
-
-#define g_atomic_int_inc(atomic) (g_atomic_int_add ((atomic), 1))
-#define g_atomic_int_dec_and_test(atomic)				\
-  (g_atomic_int_exchange_and_add ((atomic), -1) == 1)
-
-G_END_DECLS
- 
-#endif /* __G_ATOMIC_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gbacktrace.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gbacktrace.h
deleted file mode 100644
index 836264ea..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gbacktrace.h
+++ /dev/null
@@ -1,61 +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__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/* Fatal error handlers.
- * g_on_error_query() will prompt the user to either
- * [E]xit, [H]alt, [P]roceed or show [S]tack trace.
- * g_on_error_stack_trace() invokes gdb, which attaches to the current
- * process and shows a stack trace.
- * These function may cause different actions on non-unix platforms.
- * The prg_name arg is required by gdb to find the executable, if it is
- * passed as NULL, g_on_error_query() will try g_get_prgname().
- */
-void g_on_error_query (const gchar *prg_name);
-void g_on_error_stack_trace (const gchar *prg_name);
-
-/* Hacker macro to place breakpoints for selected machines.
- * Actual use is strongly discouraged of course ;)
- */
-#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 (__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/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gbase64.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gbase64.h
deleted file mode 100644
index 6637984e..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gbase64.h
+++ /dev/null
@@ -1,50 +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__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-gsize   g_base64_encode_step  (const guchar *in,
-			       gsize         len,
-			       gboolean      break_lines,
-			       gchar        *out,
-			       gint         *state,
-			       gint         *save);
-gsize   g_base64_encode_close (gboolean      break_lines,
-			       gchar        *out,
-			       gint         *state,
-			       gint         *save);
-gchar*  g_base64_encode       (const guchar *data,
-			       gsize         len) G_GNUC_MALLOC;
-gsize   g_base64_decode_step  (const gchar  *in,
-			       gsize         len,
-			       guchar       *out,
-			       gint         *state,
-			       guint        *save);
-guchar *g_base64_decode       (const gchar  *text,
-			       gsize        *out_len) G_GNUC_MALLOC;
-
-G_END_DECLS
-
-#endif /* __G_BASE64_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gbookmarkfile.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gbookmarkfile.h
deleted file mode 100644
index 2448e4a3..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gbookmarkfile.h
+++ /dev/null
@@ -1,187 +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__
-
-#include <glib/gerror.h>
-#include <time.h>
-
-G_BEGIN_DECLS
-
-/* GError enumeration
- */
-#define G_BOOKMARK_FILE_ERROR	(g_bookmark_file_error_quark ())
-
-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;
-
-GQuark g_bookmark_file_error_quark (void);
-
-/*
- * GBookmarkFile
- */
-typedef struct _GBookmarkFile GBookmarkFile;
-
-GBookmarkFile *g_bookmark_file_new                 (void);
-void           g_bookmark_file_free                (GBookmarkFile  *bookmark);
-
-gboolean       g_bookmark_file_load_from_file      (GBookmarkFile  *bookmark,
-						    const gchar    *filename,
-						    GError        **error);
-gboolean       g_bookmark_file_load_from_data      (GBookmarkFile  *bookmark,
-						    const gchar    *data,
-						    gsize           length,
-						    GError        **error);
-gboolean       g_bookmark_file_load_from_data_dirs (GBookmarkFile  *bookmark,
-						    const gchar    *file,
-						    gchar         **full_path,
-						    GError        **error);
-gchar *        g_bookmark_file_to_data             (GBookmarkFile  *bookmark,
-						    gsize          *length,
-						    GError        **error) G_GNUC_MALLOC;
-gboolean       g_bookmark_file_to_file             (GBookmarkFile  *bookmark,
-						    const gchar    *filename,
-						    GError        **error);
-
-void           g_bookmark_file_set_title           (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *title);
-gchar *        g_bookmark_file_get_title           (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error) G_GNUC_MALLOC;
-void           g_bookmark_file_set_description     (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *description);
-gchar *        g_bookmark_file_get_description     (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error) G_GNUC_MALLOC;
-void           g_bookmark_file_set_mime_type       (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *mime_type);
-gchar *        g_bookmark_file_get_mime_type       (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error) G_GNUC_MALLOC;
-void           g_bookmark_file_set_groups          (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar   **groups,
-						    gsize           length);
-void           g_bookmark_file_add_group           (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *group);
-gboolean       g_bookmark_file_has_group           (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *group,
-						    GError        **error);
-gchar **       g_bookmark_file_get_groups          (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    gsize          *length,
-						    GError        **error) G_GNUC_MALLOC;
-void           g_bookmark_file_add_application     (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *name,
-						    const gchar    *exec);
-gboolean       g_bookmark_file_has_application     (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *name,
-						    GError        **error);
-gchar **       g_bookmark_file_get_applications    (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    gsize          *length,
-						    GError        **error) G_GNUC_MALLOC;
-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);
-gboolean       g_bookmark_file_get_app_info        (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *name,
-						    gchar         **exec,
-						    guint          *count,
-						    time_t         *stamp,
-						    GError        **error);
-void           g_bookmark_file_set_is_private      (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    gboolean        is_private);
-gboolean       g_bookmark_file_get_is_private      (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error);
-void           g_bookmark_file_set_icon            (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *href,
-						    const gchar    *mime_type);
-gboolean       g_bookmark_file_get_icon            (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    gchar         **href,
-						    gchar         **mime_type,
-						    GError        **error);
-void           g_bookmark_file_set_added           (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    time_t          added);
-time_t         g_bookmark_file_get_added           (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error);
-void           g_bookmark_file_set_modified        (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    time_t          modified);
-time_t         g_bookmark_file_get_modified        (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error);
-void           g_bookmark_file_set_visited         (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    time_t          visited);
-time_t         g_bookmark_file_get_visited         (GBookmarkFile  *bookmark,
-						    const gchar    *uri, 
-						    GError        **error);
-gboolean       g_bookmark_file_has_item            (GBookmarkFile  *bookmark,
-						    const gchar    *uri);
-gint           g_bookmark_file_get_size            (GBookmarkFile  *bookmark);
-gchar **       g_bookmark_file_get_uris            (GBookmarkFile  *bookmark,
-						    gsize          *length) G_GNUC_MALLOC;
-gboolean       g_bookmark_file_remove_group        (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *group,
-						    GError        **error);
-gboolean       g_bookmark_file_remove_application  (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *name,
-						    GError        **error);
-gboolean       g_bookmark_file_remove_item         (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error);
-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/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gcache.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gcache.h
deleted file mode 100644
index 93341b87..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gcache.h
+++ /dev/null
@@ -1,68 +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__
-
-#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
- */
-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);
-void     g_cache_destroy       (GCache            *cache);
-gpointer g_cache_insert        (GCache            *cache,
-                                gpointer           key);
-void     g_cache_remove        (GCache            *cache,
-                                gconstpointer      value);
-void     g_cache_key_foreach   (GCache            *cache,
-                                GHFunc             func,
-                                gpointer           user_data);
-#ifndef G_DISABLE_DEPRECATED
-void     g_cache_value_foreach (GCache            *cache,
-                                GHFunc             func,
-                                gpointer           user_data);
-#endif
-
-G_END_DECLS
-
-#endif /* __G_CACHE_H__ */
-
-
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gchecksum.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gchecksum.h
deleted file mode 100644
index 8f7d8082..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gchecksum.h
+++ /dev/null
@@ -1,72 +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__
-
-#include <glib/gtypes.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
- *
- * 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
-} GChecksumType;
-
-typedef struct _GChecksum       GChecksum;
-
-gssize                g_checksum_type_get_length (GChecksumType checksum_type);
-
-GChecksum *           g_checksum_new        (GChecksumType     checksum_type);
-GChecksum *           g_checksum_copy       (const GChecksum  *checksum);
-void                  g_checksum_free       (GChecksum        *checksum);
-void                  g_checksum_update     (GChecksum        *checksum,
-                                             const guchar     *data,
-                                             gssize            length);
-G_CONST_RETURN gchar *g_checksum_get_string (GChecksum        *checksum);
-void                  g_checksum_get_digest (GChecksum        *checksum,
-                                             guint8           *buffer,
-                                             gsize            *digest_len);
-
-gchar *g_compute_checksum_for_data   (GChecksumType  checksum_type,
-                                      const guchar  *data,
-                                      gsize          length);
-gchar *g_compute_checksum_for_string (GChecksumType  checksum_type,
-                                      const gchar   *str,
-                                      gssize         length);
-
-G_END_DECLS
-
-#endif /* __G_CHECKSUM_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gcompletion.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gcompletion.h
deleted file mode 100644
index 8adb2313..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gcompletion.h
+++ /dev/null
@@ -1,74 +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__
-
-#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;
-};
-
-GCompletion* g_completion_new           (GCompletionFunc func);
-void         g_completion_add_items     (GCompletion*    cmp,
-                                         GList*          items);
-void         g_completion_remove_items  (GCompletion*    cmp,
-                                         GList*          items);
-void         g_completion_clear_items   (GCompletion*    cmp);
-GList*       g_completion_complete      (GCompletion*    cmp,
-                                         const gchar*    prefix,
-                                         gchar**         new_prefix);
-GList*       g_completion_complete_utf8 (GCompletion  *cmp,
-                                         const gchar*    prefix,
-                                         gchar**         new_prefix);
-void         g_completion_set_compare   (GCompletion *cmp,
-				         GCompletionStrncmpFunc strncmp_func);
-void         g_completion_free          (GCompletion*    cmp);
-
-G_END_DECLS
-
-#endif /* __G_COMPLETION_H__ */
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gconvert.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gconvert.h
deleted file mode 100644
index 9e6ca650..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gconvert.h
+++ /dev/null
@@ -1,134 +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__
-
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-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;
-
-#define G_CONVERT_ERROR g_convert_error_quark()
-GQuark g_convert_error_quark (void);
-
-/* Thin wrappers around iconv
- */
-typedef struct _GIConv *GIConv;
-
-GIConv g_iconv_open   (const gchar  *to_codeset,
-		       const gchar  *from_codeset);
-gsize  g_iconv        (GIConv        converter,
-		       gchar       **inbuf,
-		       gsize        *inbytes_left,
-		       gchar       **outbuf,
-		       gsize        *outbytes_left);
-gint   g_iconv_close  (GIConv        converter);
-
-
-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;
-gchar* g_convert_with_iconv    (const gchar  *str,
-				gssize        len,
-				GIConv        converter,
-				gsize        *bytes_read,     
-				gsize        *bytes_written,  
-				GError      **error) G_GNUC_MALLOC;
-gchar* g_convert_with_fallback (const gchar  *str,
-				gssize        len,            
-				const gchar  *to_codeset,
-				const gchar  *from_codeset,
-				gchar        *fallback,
-				gsize        *bytes_read,     
-				gsize        *bytes_written,  
-				GError      **error) G_GNUC_MALLOC;
-
-
-/* Convert between libc's idea of strings and UTF-8.
- */
-gchar* g_locale_to_utf8   (const gchar  *opsysstring,
-			   gssize        len,            
-			   gsize        *bytes_read,     
-			   gsize        *bytes_written,  
-			   GError      **error) G_GNUC_MALLOC;
-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.
- */
-#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 
-#endif
-
-gchar* g_filename_to_utf8   (const gchar  *opsysstring,
-			     gssize        len,            
-			     gsize        *bytes_read,     
-			     gsize        *bytes_written,  
-			     GError      **error) G_GNUC_MALLOC;
-gchar* g_filename_from_utf8 (const gchar  *utf8string,
-			     gssize        len,            
-			     gsize        *bytes_read,     
-			     gsize        *bytes_written,  
-			     GError      **error) G_GNUC_MALLOC;
-
-gchar *g_filename_from_uri (const gchar *uri,
-			    gchar      **hostname,
-			    GError     **error) G_GNUC_MALLOC;
-  
-gchar *g_filename_to_uri   (const gchar *filename,
-			    const gchar *hostname,
-			    GError     **error) G_GNUC_MALLOC;
-gchar *g_filename_display_name (const gchar *filename) G_GNUC_MALLOC;
-gboolean g_get_filename_charsets (G_CONST_RETURN gchar ***charsets);
-
-gchar *g_filename_display_basename (const gchar *filename) G_GNUC_MALLOC;
-
-gchar **g_uri_list_extract_uris (const gchar *uri_list) G_GNUC_MALLOC;
-
-G_END_DECLS
-
-#endif /* __G_CONVERT_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gdataset.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gdataset.h
deleted file mode 100644
index 0376cac9..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gdataset.h
+++ /dev/null
@@ -1,122 +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__
-
-#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
- */
-void     g_datalist_init                (GData            **datalist);
-void     g_datalist_clear               (GData            **datalist);
-gpointer g_datalist_id_get_data         (GData            **datalist,
-					 GQuark             key_id);
-void     g_datalist_id_set_data_full    (GData            **datalist,
-					 GQuark             key_id,
-					 gpointer           data,
-					 GDestroyNotify     destroy_func);
-gpointer g_datalist_id_remove_no_notify (GData            **datalist,
-					 GQuark             key_id);
-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
-
-void     g_datalist_set_flags           (GData            **datalist,
-					 guint              flags);
-void     g_datalist_unset_flags         (GData            **datalist,
-					 guint              flags);
-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_get_data(dl, k)            \
-     (g_datalist_id_get_data ((dl), g_quark_try_string (k)))
-#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
- */
-void      g_dataset_destroy             (gconstpointer    dataset_location);
-gpointer  g_dataset_id_get_data         (gconstpointer    dataset_location,
-                                         GQuark           key_id);
-void      g_dataset_id_set_data_full    (gconstpointer    dataset_location,
-                                         GQuark           key_id,
-                                         gpointer         data,
-                                         GDestroyNotify   destroy_func);
-gpointer  g_dataset_id_remove_no_notify (gconstpointer    dataset_location,
-                                         GQuark           key_id);
-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/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gdate.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gdate.h
deleted file mode 100644
index 8ec02afc..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gdate.h
+++ /dev/null
@@ -1,260 +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__
-
-#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.
- */
-GDate*       g_date_new                   (void);
-GDate*       g_date_new_dmy               (GDateDay     day,
-                                           GDateMonth   month,
-                                           GDateYear    year);
-GDate*       g_date_new_julian            (guint32      julian_day);
-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).
- */
-gboolean     g_date_valid                 (const GDate *date);
-gboolean     g_date_valid_day             (GDateDay     day) G_GNUC_CONST;
-gboolean     g_date_valid_month           (GDateMonth month) G_GNUC_CONST;
-gboolean     g_date_valid_year            (GDateYear  year) G_GNUC_CONST;
-gboolean     g_date_valid_weekday         (GDateWeekday weekday) G_GNUC_CONST;
-gboolean     g_date_valid_julian          (guint32 julian_date) G_GNUC_CONST;
-gboolean     g_date_valid_dmy             (GDateDay     day,
-                                           GDateMonth   month,
-                                           GDateYear    year) G_GNUC_CONST;
-
-GDateWeekday g_date_get_weekday           (const GDate *date);
-GDateMonth   g_date_get_month             (const GDate *date);
-GDateYear    g_date_get_year              (const GDate *date);
-GDateDay     g_date_get_day               (const GDate *date);
-guint32      g_date_get_julian            (const GDate *date);
-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
- */
-guint        g_date_get_monday_week_of_year (const GDate *date);
-guint        g_date_get_sunday_week_of_year (const GDate *date);
-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.
- */
-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.
- */
-void         g_date_set_parse             (GDate       *date,
-                                           const gchar *str);
-void         g_date_set_time_t            (GDate       *date,
-					   time_t       timet);
-void         g_date_set_time_val          (GDate       *date,
-					   GTimeVal    *timeval);
-#ifndef G_DISABLE_DEPRECATED
-void         g_date_set_time              (GDate       *date,
-                                           GTime        time_);
-#endif
-void         g_date_set_month             (GDate       *date,
-                                           GDateMonth   month);
-void         g_date_set_day               (GDate       *date,
-                                           GDateDay     day);
-void         g_date_set_year              (GDate       *date,
-                                           GDateYear    year);
-void         g_date_set_dmy               (GDate       *date,
-                                           GDateDay     day,
-                                           GDateMonth   month,
-                                           GDateYear    y);
-void         g_date_set_julian            (GDate       *date,
-                                           guint32      julian_date);
-gboolean     g_date_is_first_of_month     (const GDate *date);
-gboolean     g_date_is_last_of_month      (const GDate *date);
-
-/* To go forward by some number of weeks just go forward weeks*7 days */
-void         g_date_add_days              (GDate       *date,
-                                           guint        n_days);
-void         g_date_subtract_days         (GDate       *date,
-                                           guint        n_days);
-
-/* If you add/sub months while day > 28, the day might change */
-void         g_date_add_months            (GDate       *date,
-                                           guint        n_months);
-void         g_date_subtract_months       (GDate       *date,
-                                           guint        n_months);
-
-/* If it's feb 29, changing years can move you to the 28th */
-void         g_date_add_years             (GDate       *date,
-                                           guint        n_years);
-void         g_date_subtract_years        (GDate       *date,
-                                           guint        n_years);
-gboolean     g_date_is_leap_year          (GDateYear    year) G_GNUC_CONST;
-guint8       g_date_get_days_in_month     (GDateMonth   month,
-                                           GDateYear    year) G_GNUC_CONST;
-guint8       g_date_get_monday_weeks_in_year  (GDateYear    year) G_GNUC_CONST;
-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. */
-gint         g_date_days_between          (const GDate *date1,
-					   const GDate *date2);
-
-/* qsort-friendly (with a cast...) */
-gint         g_date_compare               (const GDate *lhs,
-                                           const GDate *rhs);
-void         g_date_to_struct_tm          (const GDate *date,
-                                           struct tm   *tm);
-
-void         g_date_clamp                 (GDate *date,
-					   const GDate *min_date,
-					   const GDate *max_date);
-
-/* Swap date1 and date2's values if date1 > date2. */
-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.
- */
-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/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gdir.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gdir.h
deleted file mode 100644
index 011174eb..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gdir.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
- *
- * 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__
-
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GDir GDir;
-
-#ifdef G_OS_WIN32
-/* For DLL ABI stability, keep old names for old (non-UTF-8) functionality. */
-#define g_dir_open g_dir_open_utf8
-#define g_dir_read_name g_dir_read_name_utf8
-#endif
-
-GDir    *                g_dir_open           (const gchar  *path,
-					       guint         flags,
-					       GError      **error);
-G_CONST_RETURN gchar    *g_dir_read_name      (GDir         *dir);
-void                     g_dir_rewind         (GDir         *dir);
-void                     g_dir_close          (GDir         *dir);
-
-G_END_DECLS
-
-#endif /* __G_DIR_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gerror.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gerror.h
deleted file mode 100644
index 7fa8ef0f..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gerror.h
+++ /dev/null
@@ -1,84 +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__
-
-#include <glib/gquark.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GError GError;
-
-struct _GError
-{
-  GQuark       domain;
-  gint         code;
-  gchar       *message;
-};
-
-GError*  g_error_new           (GQuark         domain,
-                                gint           code,
-                                const gchar   *format,
-                                ...) G_GNUC_PRINTF (3, 4);
-
-GError*  g_error_new_literal   (GQuark         domain,
-                                gint           code,
-                                const gchar   *message);
-
-void     g_error_free          (GError        *error);
-GError*  g_error_copy          (const GError  *error);
-
-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.
- */
-void     g_set_error           (GError       **err,
-                                GQuark         domain,
-                                gint           code,
-                                const gchar   *format,
-                                ...) G_GNUC_PRINTF (4, 5);
-
-/* if (dest) *dest = src; also has some sanity checks.
- */
-void     g_propagate_error     (GError       **dest,
-				GError        *src);
-
-/* if (err && *err) { g_error_free(*err); *err = NULL; } */
-void     g_clear_error         (GError       **err);
-
-/* if (err) prefix the formatted string to the ->message */
-void     g_prefix_error               (GError       **err,
-                                       const gchar   *format,
-                                       ...) G_GNUC_PRINTF (2, 3);
-
-/* g_propagate_error then g_error_prefix on dest */
-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/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gfileutils.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gfileutils.h
deleted file mode 100644
index 58f2d23a..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gfileutils.h
+++ /dev/null
@@ -1,121 +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__
-
-#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;
-
-GQuark     g_file_error_quark      (void);
-/* So other code can generate a GFileError */
-GFileError g_file_error_from_errno (gint err_no);
-
-#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
-#endif
-
-gboolean g_file_test         (const gchar  *filename,
-                              GFileTest     test);
-gboolean g_file_get_contents (const gchar  *filename,
-                              gchar       **contents,
-                              gsize        *length,    
-                              GError      **error);
-gboolean g_file_set_contents (const gchar *filename,
-			      const gchar *contents,
-			      gssize	     length,
-			      GError	   **error);
-gchar   *g_file_read_link    (const gchar  *filename,
-			      GError      **error);
-
-/* Wrapper / workalike for mkstemp() */
-gint    g_mkstemp            (gchar        *tmpl);
-
-/* Wrapper for g_mkstemp */
-gint    g_file_open_tmp      (const gchar  *tmpl,
-			      gchar       **name_used,
-			      GError      **error);
-
-char *g_format_size_for_display (goffset size);
-
-gchar *g_build_path     (const gchar *separator,
-			 const gchar *first_element,
-			 ...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
-gchar *g_build_pathv    (const gchar  *separator,
-			 gchar       **args) G_GNUC_MALLOC;
-
-gchar *g_build_filename (const gchar *first_element,
-			 ...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
-gchar *g_build_filenamev (gchar      **args) G_GNUC_MALLOC;
-
-int    g_mkdir_with_parents (const gchar *pathname,
-			     int          mode);
-
-G_END_DECLS
-
-#endif /* __G_FILEUTILS_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/ghash.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/ghash.h
deleted file mode 100644
index 17ca7de6..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/ghash.h
+++ /dev/null
@@ -1,142 +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__
-
-#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;
-};
-
-/* Hash tables
- */
-GHashTable* g_hash_table_new		   (GHashFunc	    hash_func,
-					    GEqualFunc	    key_equal_func);
-GHashTable* g_hash_table_new_full      	   (GHashFunc	    hash_func,
-					    GEqualFunc	    key_equal_func,
-					    GDestroyNotify  key_destroy_func,
-					    GDestroyNotify  value_destroy_func);
-void	    g_hash_table_destroy	   (GHashTable	   *hash_table);
-void	    g_hash_table_insert		   (GHashTable	   *hash_table,
-					    gpointer	    key,
-					    gpointer	    value);
-void        g_hash_table_replace           (GHashTable     *hash_table,
-					    gpointer	    key,
-					    gpointer	    value);
-gboolean    g_hash_table_remove		   (GHashTable	   *hash_table,
-					    gconstpointer   key);
-void        g_hash_table_remove_all        (GHashTable     *hash_table);
-gboolean    g_hash_table_steal             (GHashTable     *hash_table,
-					    gconstpointer   key);
-void        g_hash_table_steal_all         (GHashTable     *hash_table);
-gpointer    g_hash_table_lookup		   (GHashTable	   *hash_table,
-					    gconstpointer   key);
-gboolean    g_hash_table_lookup_extended   (GHashTable	   *hash_table,
-					    gconstpointer   lookup_key,
-					    gpointer	   *orig_key,
-					    gpointer	   *value);
-void	    g_hash_table_foreach	   (GHashTable	   *hash_table,
-					    GHFunc	    func,
-					    gpointer	    user_data);
-gpointer    g_hash_table_find	           (GHashTable	   *hash_table,
-					    GHRFunc	    predicate,
-					    gpointer	    user_data);
-guint	    g_hash_table_foreach_remove	   (GHashTable	   *hash_table,
-					    GHRFunc	    func,
-					    gpointer	    user_data);
-guint	    g_hash_table_foreach_steal	   (GHashTable	   *hash_table,
-					    GHRFunc	    func,
-					    gpointer	    user_data);
-guint	    g_hash_table_size		   (GHashTable	   *hash_table);
-GList *     g_hash_table_get_keys          (GHashTable     *hash_table);
-GList *     g_hash_table_get_values        (GHashTable     *hash_table);
-
-void        g_hash_table_iter_init         (GHashTableIter *iter,
-					    GHashTable     *hash_table);
-gboolean    g_hash_table_iter_next         (GHashTableIter *iter,
-					    gpointer       *key,
-					    gpointer       *value);
-GHashTable* g_hash_table_iter_get_hash_table (GHashTableIter *iter);
-void        g_hash_table_iter_remove       (GHashTableIter *iter);
-void        g_hash_table_iter_steal        (GHashTableIter *iter);
-
-/* keeping hash tables alive */
-GHashTable* g_hash_table_ref   		   (GHashTable 	   *hash_table);
-void        g_hash_table_unref             (GHashTable     *hash_table);
-
-#ifndef G_DISABLE_DEPRECATED
-
-/* The following two functions are deprecated and will be removed in
- * the next major release. They do no good. */
-#define g_hash_table_freeze(hash_table) ((void)0)
-#define g_hash_table_thaw(hash_table) ((void)0)
-
-#endif /* G_DISABLE_DEPRECATED */
-
-/* Hash Functions
- */
-gboolean g_str_equal (gconstpointer  v1,
-                      gconstpointer  v2);
-guint    g_str_hash  (gconstpointer  v);
-
-gboolean g_int_equal (gconstpointer  v1,
-                      gconstpointer  v2);
-guint    g_int_hash  (gconstpointer  v);
-
-/* This "hash" function will just return the key's address as an
- * unsigned integer. Useful for hashing on plain addresses or
- * simple integer values.
- * Passing NULL into g_hash_table_new() as GHashFunc has the
- * same effect as passing g_direct_hash().
- */
-guint    g_direct_hash  (gconstpointer  v) G_GNUC_CONST;
-gboolean g_direct_equal (gconstpointer  v1,
-                         gconstpointer  v2) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __G_HASH_H__ */
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/ghook.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/ghook.h
deleted file mode 100644
index cb4f8e1c..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/ghook.h
+++ /dev/null
@@ -1,178 +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__
-
-#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 */
-void	 g_hook_list_init		(GHookList		*hook_list,
-					 guint			 hook_size);
-void	 g_hook_list_clear		(GHookList		*hook_list);
-GHook*	 g_hook_alloc			(GHookList		*hook_list);
-void	 g_hook_free			(GHookList		*hook_list,
-					 GHook			*hook);
-GHook *	 g_hook_ref			(GHookList		*hook_list,
-					 GHook			*hook);
-void	 g_hook_unref			(GHookList		*hook_list,
-					 GHook			*hook);
-gboolean g_hook_destroy			(GHookList		*hook_list,
-					 gulong			 hook_id);
-void	 g_hook_destroy_link		(GHookList		*hook_list,
-					 GHook			*hook);
-void	 g_hook_prepend			(GHookList		*hook_list,
-					 GHook			*hook);
-void	 g_hook_insert_before		(GHookList		*hook_list,
-					 GHook			*sibling,
-					 GHook			*hook);
-void	 g_hook_insert_sorted		(GHookList		*hook_list,
-					 GHook			*hook,
-					 GHookCompareFunc	 func);
-GHook*	 g_hook_get			(GHookList		*hook_list,
-					 gulong			 hook_id);
-GHook*	 g_hook_find			(GHookList		*hook_list,
-					 gboolean		 need_valids,
-					 GHookFindFunc		 func,
-					 gpointer		 data);
-GHook*	 g_hook_find_data		(GHookList		*hook_list,
-					 gboolean		 need_valids,
-					 gpointer		 data);
-GHook*	 g_hook_find_func		(GHookList		*hook_list,
-					 gboolean		 need_valids,
-					 gpointer		 func);
-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 */
-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
- */
-GHook*	 g_hook_next_valid		(GHookList		*hook_list,
-					 GHook			*hook,
-					 gboolean		 may_be_in_call);
-/* GHookCompareFunc implementation to insert hooks sorted by their id */
-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.
- */
-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.
- */
-void	 g_hook_list_invoke_check	(GHookList		*hook_list,
-					 gboolean		 may_recurse);
-/* invoke a marshaller on all valid hooks.
- */
-void	 g_hook_list_marshal		(GHookList		*hook_list,
-					 gboolean		 may_recurse,
-					 GHookMarshaller	 marshaller,
-					 gpointer		 marshal_data);
-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/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gi18n-lib.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gi18n-lib.h
deleted file mode 100644
index 674466e4..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gi18n-lib.h
+++ /dev/null
@@ -1,37 +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/gstrfuncs.h>
-
-#include <libintl.h>
-#include <string.h>
-
-#ifndef GETTEXT_PACKAGE
-#error You must define GETTEXT_PACKAGE before including gi18n-lib.h.
-#endif
-
-#define  _(String) 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)
-
-
-#endif  /* __G_I18N_LIB_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gi18n.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gi18n.h
deleted file mode 100644
index c94e8c13..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gi18n.h
+++ /dev/null
@@ -1,34 +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/gstrfuncs.h>
-#include <libintl.h>
-#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)
-
-
-#endif  /* __G_I18N_H__ */
-
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/giochannel.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/giochannel.h
deleted file mode 100644
index 846c9ba4..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/giochannel.h
+++ /dev/null
@@ -1,354 +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__
-
-#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_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;
-
-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_WRITEABLE = 1 << 3,	/* Read only flag */
-  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);
-};
-
-void        g_io_channel_init   (GIOChannel    *channel);
-GIOChannel *g_io_channel_ref    (GIOChannel    *channel);
-void        g_io_channel_unref  (GIOChannel    *channel);
-
-#ifndef G_DISABLE_DEPRECATED
-GIOError    g_io_channel_read   (GIOChannel    *channel, 
-			         gchar         *buf, 
-			         gsize          count,
-			         gsize         *bytes_read);
-GIOError  g_io_channel_write    (GIOChannel    *channel, 
-			         const gchar   *buf, 
-			         gsize          count,
-			         gsize         *bytes_written);
-GIOError  g_io_channel_seek     (GIOChannel    *channel,
-			         gint64         offset, 
-			         GSeekType      type);
-void      g_io_channel_close    (GIOChannel    *channel);
-#endif /* G_DISABLE_DEPRECATED */
-
-GIOStatus g_io_channel_shutdown (GIOChannel      *channel,
-				 gboolean         flush,
-				 GError         **err);
-guint     g_io_add_watch_full   (GIOChannel      *channel,
-				 gint             priority,
-				 GIOCondition     condition,
-				 GIOFunc          func,
-				 gpointer         user_data,
-				 GDestroyNotify   notify);
-GSource * g_io_create_watch     (GIOChannel      *channel,
-				 GIOCondition     condition);
-guint     g_io_add_watch        (GIOChannel      *channel,
-				 GIOCondition     condition,
-				 GIOFunc          func,
-				 gpointer         user_data);
-
-/* character encoding conversion involved functions.
- */
-
-void                  g_io_channel_set_buffer_size      (GIOChannel   *channel,
-							 gsize         size);
-gsize                 g_io_channel_get_buffer_size      (GIOChannel   *channel);
-GIOCondition          g_io_channel_get_buffer_condition (GIOChannel   *channel);
-GIOStatus             g_io_channel_set_flags            (GIOChannel   *channel,
-							 GIOFlags      flags,
-							 GError      **error);
-GIOFlags              g_io_channel_get_flags            (GIOChannel   *channel);
-void                  g_io_channel_set_line_term        (GIOChannel   *channel,
-							 const gchar  *line_term,
-							 gint          length);
-G_CONST_RETURN gchar* g_io_channel_get_line_term        (GIOChannel   *channel,
-							 gint         *length);
-void		      g_io_channel_set_buffered		(GIOChannel   *channel,
-							 gboolean      buffered);
-gboolean	      g_io_channel_get_buffered		(GIOChannel   *channel);
-GIOStatus             g_io_channel_set_encoding         (GIOChannel   *channel,
-							 const gchar  *encoding,
-							 GError      **error);
-G_CONST_RETURN gchar* g_io_channel_get_encoding         (GIOChannel   *channel);
-void                  g_io_channel_set_close_on_unref	(GIOChannel   *channel,
-							 gboolean      do_close);
-gboolean              g_io_channel_get_close_on_unref	(GIOChannel   *channel);
-
-
-GIOStatus   g_io_channel_flush            (GIOChannel   *channel,
-					   GError      **error);
-GIOStatus   g_io_channel_read_line        (GIOChannel   *channel,
-					   gchar       **str_return,
-					   gsize        *length,
-					   gsize        *terminator_pos,
-					   GError      **error);
-GIOStatus   g_io_channel_read_line_string (GIOChannel   *channel,
-					   GString      *buffer,
-					   gsize        *terminator_pos,
-					   GError      **error);
-GIOStatus   g_io_channel_read_to_end      (GIOChannel   *channel,
-					   gchar       **str_return,
-					   gsize        *length,
-					   GError      **error);
-GIOStatus   g_io_channel_read_chars       (GIOChannel   *channel,
-					   gchar        *buf,
-					   gsize         count,
-					   gsize        *bytes_read,
-					   GError      **error);
-GIOStatus   g_io_channel_read_unichar     (GIOChannel   *channel,
-					   gunichar     *thechar,
-					   GError      **error);
-GIOStatus   g_io_channel_write_chars      (GIOChannel   *channel,
-					   const gchar  *buf,
-					   gssize        count,
-					   gsize        *bytes_written,
-					   GError      **error);
-GIOStatus   g_io_channel_write_unichar    (GIOChannel   *channel,
-					   gunichar      thechar,
-					   GError      **error);
-GIOStatus   g_io_channel_seek_position    (GIOChannel   *channel,
-					   gint64        offset,
-					   GSeekType     type,
-					   GError      **error);
-#ifdef G_OS_WIN32
-#define g_io_channel_new_file g_io_channel_new_file_utf8
-#endif
-
-GIOChannel* g_io_channel_new_file         (const gchar  *filename,
-					   const gchar  *mode,
-					   GError      **error);
-
-/* Error handling */
-
-GQuark          g_io_channel_error_quark      (void);
-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.
- */
-GIOChannel* g_io_channel_unix_new    (int         fd);
-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().
- */
-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.
- */
-gint        g_io_channel_win32_poll   (GPollFD    *fds,
-				       gint        n_fds,
-				       gint        timeout_);
-
-/* Create an IO channel for Windows messages for window handle hwnd. */
-GIOChannel *g_io_channel_win32_new_messages (guint hwnd);
-
-/* 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().
- */
-GIOChannel* g_io_channel_win32_new_fd (gint         fd);
-
-/* Get the C runtime file descriptor of a channel. */
-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.
- */
-GIOChannel *g_io_channel_win32_new_socket (gint socket);
-
-#endif
-
-G_END_DECLS
-
-#endif /* __G_IOCHANNEL_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gkeyfile.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gkeyfile.h
deleted file mode 100644
index e7eadc68..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gkeyfile.h
+++ /dev/null
@@ -1,246 +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__
-
-#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()
-
-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;
-
-GKeyFile *g_key_file_new                    (void);
-void      g_key_file_free                   (GKeyFile             *key_file);
-void      g_key_file_set_list_separator     (GKeyFile             *key_file,
-					     gchar                 separator);
-gboolean  g_key_file_load_from_file         (GKeyFile             *key_file,
-					     const gchar          *file,
-					     GKeyFileFlags         flags,
-					     GError              **error);
-gboolean  g_key_file_load_from_data         (GKeyFile             *key_file,
-					     const gchar          *data,
-					     gsize                 length,
-					     GKeyFileFlags         flags,
-					     GError              **error);
-gboolean g_key_file_load_from_dirs          (GKeyFile             *key_file,
-					     const gchar	  *file,
-					     const gchar	 **search_dirs,
-					     gchar		 **full_path,
-					     GKeyFileFlags         flags,
-					     GError              **error);
-gboolean g_key_file_load_from_data_dirs     (GKeyFile             *key_file,
-					     const gchar          *file,
-					     gchar               **full_path,
-					     GKeyFileFlags         flags,
-					     GError              **error);
-gchar    *g_key_file_to_data                (GKeyFile             *key_file,
-					     gsize                *length,
-					     GError              **error) G_GNUC_MALLOC;
-gchar    *g_key_file_get_start_group        (GKeyFile             *key_file) G_GNUC_MALLOC;
-gchar   **g_key_file_get_groups             (GKeyFile             *key_file,
-					     gsize                *length) G_GNUC_MALLOC;
-gchar   **g_key_file_get_keys               (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     gsize                *length,
-					     GError              **error) G_GNUC_MALLOC;
-gboolean  g_key_file_has_group              (GKeyFile             *key_file,
-					     const gchar          *group_name);
-gboolean  g_key_file_has_key                (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error);
-gchar    *g_key_file_get_value              (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error) G_GNUC_MALLOC;
-void      g_key_file_set_value              (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     const gchar          *value);
-gchar    *g_key_file_get_string             (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error) G_GNUC_MALLOC;
-void      g_key_file_set_string             (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     const gchar          *string);
-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;
-void      g_key_file_set_locale_string      (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     const gchar          *locale,
-					     const gchar          *string);
-gboolean  g_key_file_get_boolean            (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error);
-void      g_key_file_set_boolean            (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gboolean              value);
-gint      g_key_file_get_integer            (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error);
-void      g_key_file_set_integer            (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gint                  value);
-gdouble   g_key_file_get_double             (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-                                             GError              **error);
-void      g_key_file_set_double             (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-                                             gdouble               value);
-gchar   **g_key_file_get_string_list        (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gsize                *length,
-					     GError              **error) G_GNUC_MALLOC;
-void      g_key_file_set_string_list        (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     const gchar * const   list[],
-					     gsize                 length);
-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;
-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);
-gboolean *g_key_file_get_boolean_list       (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gsize                *length,
-					     GError              **error) G_GNUC_MALLOC;
-void      g_key_file_set_boolean_list       (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gboolean              list[],
-					     gsize                 length);
-gint     *g_key_file_get_integer_list       (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gsize                *length,
-					     GError              **error) G_GNUC_MALLOC;
-void      g_key_file_set_double_list        (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-                                             gdouble               list[],
-                                             gsize                 length);
-gdouble  *g_key_file_get_double_list        (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-                                             gsize                *length,
-                                             GError              **error) G_GNUC_MALLOC;
-void      g_key_file_set_integer_list       (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gint                  list[],
-					     gsize                 length);
-gboolean  g_key_file_set_comment            (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-                                             const gchar          *comment,
-                                             GError              **error);
-gchar    *g_key_file_get_comment            (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-                                             GError              **error) G_GNUC_MALLOC;
-
-gboolean  g_key_file_remove_comment         (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-					     GError              **error);
-gboolean  g_key_file_remove_key             (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error);
-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_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/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/glist.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/glist.h
deleted file mode 100644
index 258dcd1e..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/glist.h
+++ /dev/null
@@ -1,116 +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__
-
-#include <glib/gmem.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GList GList;
-
-struct _GList
-{
-  gpointer data;
-  GList *next;
-  GList *prev;
-};
-
-/* Doubly linked lists
- */
-GList*   g_list_alloc                   (void) G_GNUC_WARN_UNUSED_RESULT;
-void     g_list_free                    (GList            *list);
-void     g_list_free_1                  (GList            *list);
-#define  g_list_free1                   g_list_free_1
-GList*   g_list_append                  (GList            *list,
-					 gpointer          data) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_prepend                 (GList            *list,
-					 gpointer          data) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_insert                  (GList            *list,
-					 gpointer          data,
-					 gint              position) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_insert_sorted           (GList            *list,
-					 gpointer          data,
-					 GCompareFunc      func) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_insert_sorted_with_data (GList            *list,
-					 gpointer          data,
-					 GCompareDataFunc  func,
-					 gpointer          user_data) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_insert_before           (GList            *list,
-					 GList            *sibling,
-					 gpointer          data) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_concat                  (GList            *list1,
-					 GList            *list2) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_remove                  (GList            *list,
-					 gconstpointer     data) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_remove_all              (GList            *list,
-					 gconstpointer     data) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_remove_link             (GList            *list,
-					 GList            *llink) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_delete_link             (GList            *list,
-					 GList            *link_) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_reverse                 (GList            *list) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_copy                    (GList            *list) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_nth                     (GList            *list,
-					 guint             n);
-GList*   g_list_nth_prev                (GList            *list,
-					 guint             n);
-GList*   g_list_find                    (GList            *list,
-					 gconstpointer     data);
-GList*   g_list_find_custom             (GList            *list,
-					 gconstpointer     data,
-					 GCompareFunc      func);
-gint     g_list_position                (GList            *list,
-					 GList            *llink);
-gint     g_list_index                   (GList            *list,
-					 gconstpointer     data);
-GList*   g_list_last                    (GList            *list);
-GList*   g_list_first                   (GList            *list);
-guint    g_list_length                  (GList            *list);
-void     g_list_foreach                 (GList            *list,
-					 GFunc             func,
-					 gpointer          user_data);
-GList*   g_list_sort                    (GList            *list,
-					 GCompareFunc      compare_func) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_sort_with_data          (GList            *list,
-					 GCompareDataFunc  compare_func,
-					 gpointer          user_data)  G_GNUC_WARN_UNUSED_RESULT;
-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)
-
-#ifndef G_DISABLE_DEPRECATED
-void     g_list_push_allocator          (gpointer          allocator);
-void     g_list_pop_allocator           (void);
-#endif
-G_END_DECLS
-
-#endif /* __G_LIST_H__ */
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gmacros.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gmacros.h
deleted file mode 100644
index eb6b02c5..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gmacros.h
+++ /dev/null
@@ -1,269 +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__
-
-/* 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__ > 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__ > 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 */
-
-#define G_STRINGIFY(macro_or_string)	G_STRINGIFY_ARG (macro_or_string)
-#define	G_STRINGIFY_ARG(contents)	#contents
-
-/* 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__)
-#  define G_STRFUNC     ((const char*) (__PRETTY_FUNCTION__))
-#elif defined (G_HAVE_ISO_VARARGS)
-#  define G_STRFUNC     ((const char*) (__func__))
-#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.
- */
-#define G_STRUCT_OFFSET(struct_type, member)	\
-    ((glong) ((guint8*) &((struct_type*) 0)->member))
-#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 (adapted from Perl):
- *  G_STMT_START { statements; } G_STMT_END;
- *  can be used as a single statement, as in
- *  if (x) G_STMT_START { ... } G_STMT_END; else ...
- *
- *  When GCC is compiling C code in non-ANSI mode, it will use the
- *  compiler __extension__ to wrap the statements wihin `({' and '})' braces.
- *  When compiling on platforms where configure has defined
- *  HAVE_DOWHILE_MACROS, statements will be wrapped with `do' and `while (0)'.
- *  For any other platforms (SunOS4 is known to have this issue), wrap the
- *  statements with `if (1)' and `else (void) 0'.
- */
-#if !(defined (G_STMT_START) && defined (G_STMT_END))
-# if defined (__GNUC__) && !defined (__STRICT_ANSI__) && !defined (__cplusplus)
-#  define G_STMT_START (void) __extension__ (
-#  define G_STMT_END )
-# else /* !(__GNUC__ && !__STRICT_ANSI__ && !__cplusplus) */
-#  if defined (HAVE_DOWHILE_MACROS)
-#   define G_STMT_START do
-#   define G_STMT_END while (0)
-#  else /* !HAVE_DOWHILE_MACROS */
-#   define G_STMT_START if (1)
-#   define G_STMT_END else (void) 0
-#  endif /* !HAVE_DOWHILE_MACROS */
-# endif /* !(__GNUC__ && !__STRICT_ANSI__ && !__cplusplus) */
-#endif
-
-/* Allow the app programmer to select whether or not return values
- * (usually char*) are const or not.  Don't try using this feature for
- * functions with C++ linkage.
- */
-#ifdef G_DISABLE_CONST_RETURNS
-#define G_CONST_RETURN
-#else
-#define G_CONST_RETURN const
-#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)                   \
- __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
-
-#endif /* __G_MACROS_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gmain.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gmain.h
deleted file mode 100644
index 67250da4..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gmain.h
+++ /dev/null
@@ -1,337 +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__
-
-#include <glib/gslist.h>
-#include <glib/gthread.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GMainContext	        GMainContext;	/* Opaque */
-typedef struct _GMainLoop	        GMainLoop;	/* Opaque */
-typedef struct _GSource	                GSource;
-typedef struct _GSourceCallbackFuncs	GSourceCallbackFuncs;
-typedef struct _GSourceFuncs	        GSourceFuncs;
-
-typedef gboolean (*GSourceFunc)       (gpointer data);
-typedef void     (*GChildWatchFunc)   (GPid     pid,
-				       gint     status,
-				       gpointer data);
-struct _GSource
-{
-  /*< private >*/
-  gpointer callback_data;
-  GSourceCallbackFuncs *callback_funcs;
-
-  GSourceFuncs *source_funcs;
-  guint ref_count;
-
-  GMainContext *context;
-
-  gint priority;
-  guint flags;
-  guint source_id;
-
-  GSList *poll_fds;
-  
-  GSource *prev;
-  GSource *next;
-
-  gpointer reserved1;
-  gpointer reserved2;
-};
-
-struct _GSourceCallbackFuncs
-{
-  void (*ref)   (gpointer     cb_data);
-  void (*unref) (gpointer     cb_data);
-  void (*get)   (gpointer     cb_data,
-		 GSource     *source, 
-		 GSourceFunc *func,
-		 gpointer    *data);
-};
-
-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 */
-
-  /* For use by g_source_set_closure */
-  GSourceFunc     closure_callback;	   
-  GSourceDummyMarshal closure_marshal; /* Really is of type GClosureMarshal */
-};
-
-/* 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.
- *
- *
- * 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
- * Win32. It's really only written for the GIMP's needs so
- * far.
- */
-typedef struct _GPollFD GPollFD;
-typedef gint	(*GPollFunc)	(GPollFD *ufds,
-				 guint	  nfsd,
-				 gint     timeout_);
-
-struct _GPollFD
-{
-#if defined (G_OS_WIN32) && GLIB_SIZEOF_VOID_P == 8
-  gint64	fd;
-#else
-  gint		fd;
-#endif
-  gushort 	events;
-  gushort 	revents;
-};
-
-/* Standard priorities */
-
-#define G_PRIORITY_HIGH            -100
-#define G_PRIORITY_DEFAULT          0
-#define G_PRIORITY_HIGH_IDLE        100
-#define G_PRIORITY_DEFAULT_IDLE     200
-#define G_PRIORITY_LOW	            300
-
-/* GMainContext: */
-
-GMainContext *g_main_context_new       (void);
-GMainContext *g_main_context_ref       (GMainContext *context);
-void          g_main_context_unref     (GMainContext *context);
-GMainContext *g_main_context_default   (void);
-
-gboolean      g_main_context_iteration (GMainContext *context,
-					gboolean      may_block);
-gboolean      g_main_context_pending   (GMainContext *context);
-
-/* For implementation of legacy interfaces
- */
-GSource      *g_main_context_find_source_by_id              (GMainContext *context,
-							     guint         source_id);
-GSource      *g_main_context_find_source_by_user_data       (GMainContext *context,
-							     gpointer      user_data);
-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.
- */
-void     g_main_context_wakeup  (GMainContext *context);
-gboolean g_main_context_acquire (GMainContext *context);
-void     g_main_context_release (GMainContext *context);
-gboolean g_main_context_is_owner (GMainContext *context);
-gboolean g_main_context_wait    (GMainContext *context,
-				 GCond        *cond,
-				 GMutex       *mutex);
-
-gboolean g_main_context_prepare  (GMainContext *context,
-				  gint         *priority);
-gint     g_main_context_query    (GMainContext *context,
-				  gint          max_priority,
-				  gint         *timeout_,
-				  GPollFD      *fds,
-				  gint          n_fds);
-gint     g_main_context_check    (GMainContext *context,
-				  gint          max_priority,
-				  GPollFD      *fds,
-				  gint          n_fds);
-void     g_main_context_dispatch (GMainContext *context);
-
-void     g_main_context_set_poll_func (GMainContext *context,
-				       GPollFunc     func);
-GPollFunc g_main_context_get_poll_func (GMainContext *context);
-
-/* Low level functions for use by source implementations
- */
-void     g_main_context_add_poll    (GMainContext *context,
-				     GPollFD      *fd,
-				     gint          priority);
-void     g_main_context_remove_poll (GMainContext *context,
-				     GPollFD      *fd);
-
-gint     g_main_depth               (void);
-GSource *g_main_current_source      (void);
-
-
-/* GMainLoop: */
-
-GMainLoop *g_main_loop_new        (GMainContext *context,
-			    	   gboolean      is_running);
-void       g_main_loop_run        (GMainLoop    *loop);
-void       g_main_loop_quit       (GMainLoop    *loop);
-GMainLoop *g_main_loop_ref        (GMainLoop    *loop);
-void       g_main_loop_unref      (GMainLoop    *loop);
-gboolean   g_main_loop_is_running (GMainLoop    *loop);
-GMainContext *g_main_loop_get_context (GMainLoop    *loop);
-
-/* GSource: */
-
-GSource *g_source_new             (GSourceFuncs   *source_funcs,
-				   guint           struct_size);
-GSource *g_source_ref             (GSource        *source);
-void     g_source_unref           (GSource        *source);
-
-guint    g_source_attach          (GSource        *source,
-				   GMainContext   *context);
-void     g_source_destroy         (GSource        *source);
-
-void     g_source_set_priority    (GSource        *source,
-				   gint            priority);
-gint     g_source_get_priority    (GSource        *source);
-void     g_source_set_can_recurse (GSource        *source,
-				   gboolean        can_recurse);
-gboolean g_source_get_can_recurse (GSource        *source);
-guint    g_source_get_id          (GSource        *source);
-
-GMainContext *g_source_get_context (GSource       *source);
-
-void     g_source_set_callback    (GSource        *source,
-				   GSourceFunc     func,
-				   gpointer        data,
-				   GDestroyNotify  notify);
-
-void     g_source_set_funcs       (GSource        *source,
-                                   GSourceFuncs   *funcs);
-gboolean g_source_is_destroyed    (GSource        *source);
-
-/* Used to implement g_source_connect_closure and internally*/
-void g_source_set_callback_indirect (GSource              *source,
-				     gpointer              callback_data,
-				     GSourceCallbackFuncs *callback_funcs);
-
-void     g_source_add_poll         (GSource        *source,
-				    GPollFD        *fd);
-void     g_source_remove_poll      (GSource        *source,
-				    GPollFD        *fd);
-
-void     g_source_get_current_time (GSource        *source,
-				    GTimeVal       *timeval);
-
- /* void g_source_connect_closure (GSource        *source,
-                                  GClosure       *closure);
- */
-
-/* Specific source types
- */
-GSource *g_idle_source_new        (void);
-GSource *g_child_watch_source_new (GPid pid);
-GSource *g_timeout_source_new     (guint interval);
-GSource *g_timeout_source_new_seconds (guint interval);
-
-/* Miscellaneous functions
- */
-void g_get_current_time		        (GTimeVal	*result);
-
-/* ============== Compat main loop stuff ================== */
-
-#ifndef G_DISABLE_DEPRECATED
-
-/* Legacy names for GMainLoop functions
- */
-#define 	g_main_new(is_running)	g_main_loop_new (NULL, is_running);
-#define         g_main_run(loop)        g_main_loop_run(loop)
-#define         g_main_quit(loop)       g_main_loop_quit(loop)
-#define         g_main_destroy(loop)    g_main_loop_unref(loop)
-#define         g_main_is_running(loop) g_main_loop_is_running(loop)
-
-/* Functions to manipulate the default main loop
- */
-
-#define	g_main_iteration(may_block) g_main_context_iteration      (NULL, may_block)
-#define g_main_pending()            g_main_context_pending        (NULL)
-
-#define g_main_set_poll_func(func)   g_main_context_set_poll_func (NULL, func)
-
-#endif /* G_DISABLE_DEPRECATED */
-
-/* Source manipulation by ID */
-gboolean g_source_remove                     (guint          tag);
-gboolean g_source_remove_by_user_data        (gpointer       user_data);
-gboolean g_source_remove_by_funcs_user_data  (GSourceFuncs  *funcs,
-					      gpointer       user_data);
-
-/* Idles, child watchers and timeouts */
-guint    g_timeout_add_full         (gint            priority,
-				     guint           interval,
-				     GSourceFunc     function,
-				     gpointer        data,
-				     GDestroyNotify  notify);
-guint    g_timeout_add              (guint           interval,
-				     GSourceFunc     function,
-				     gpointer        data);
-guint    g_timeout_add_seconds_full (gint            priority,
-                                     guint           interval,
-                                     GSourceFunc     function,
-                                     gpointer        data,
-                                     GDestroyNotify  notify);
-guint    g_timeout_add_seconds      (guint           interval,
-				     GSourceFunc     function,
-				     gpointer        data);
-guint    g_child_watch_add_full     (gint            priority,
-				     GPid            pid,
-				     GChildWatchFunc function,
-				     gpointer        data,
-				     GDestroyNotify  notify);
-guint    g_child_watch_add          (GPid            pid,
-				     GChildWatchFunc function,
-				     gpointer        data);
-guint    g_idle_add                 (GSourceFunc     function,
-				     gpointer        data);
-guint    g_idle_add_full            (gint            priority,
-				     GSourceFunc     function,
-				     gpointer        data,
-				     GDestroyNotify  notify);
-gboolean g_idle_remove_by_data      (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;
-
-G_END_DECLS
-
-#endif /* __G_MAIN_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gmappedfile.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gmappedfile.h
deleted file mode 100644
index 123bc6af..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gmappedfile.h
+++ /dev/null
@@ -1,39 +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__
-
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GMappedFile GMappedFile;
-
-GMappedFile *g_mapped_file_new          (const gchar  *filename,
-				         gboolean      writable,
-				         GError      **error) G_GNUC_MALLOC;
-gsize        g_mapped_file_get_length   (GMappedFile  *file);
-gchar       *g_mapped_file_get_contents (GMappedFile  *file);
-void         g_mapped_file_free         (GMappedFile  *file);
-
-G_END_DECLS
-
-#endif /* __G_MAPPED_FILE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gmarkup.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gmarkup.h
deleted file mode 100644
index 340a2181..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gmarkup.h
+++ /dev/null
@@ -1,155 +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__
-
-#include <stdarg.h>
-
-#include <glib/gerror.h>
-#include <glib/gslist.h>
-
-G_BEGIN_DECLS
-
-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;
-
-#define G_MARKUP_ERROR g_markup_error_quark ()
-
-GQuark g_markup_error_quark (void);
-
-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;
-
-typedef struct _GMarkupParseContext GMarkupParseContext;
-typedef struct _GMarkupParser GMarkupParser;
-
-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);
-};
-
-GMarkupParseContext *g_markup_parse_context_new   (const GMarkupParser *parser,
-                                                   GMarkupParseFlags    flags,
-                                                   gpointer             user_data,
-                                                   GDestroyNotify       user_data_dnotify);
-void                 g_markup_parse_context_free  (GMarkupParseContext *context);
-gboolean             g_markup_parse_context_parse (GMarkupParseContext *context,
-                                                   const gchar         *text,
-                                                   gssize               text_len,  
-                                                   GError             **error);
-                                                   
-gboolean             g_markup_parse_context_end_parse (GMarkupParseContext *context,
-                                                       GError             **error);
-G_CONST_RETURN gchar *g_markup_parse_context_get_element (GMarkupParseContext *context);
-G_CONST_RETURN GSList *g_markup_parse_context_get_element_stack (GMarkupParseContext *context);
-
-/* For user-constructed error messages, has no precise semantics */
-void                 g_markup_parse_context_get_position (GMarkupParseContext *context,
-                                                          gint                *line_number,
-                                                          gint                *char_number);
-
-/* useful when saving */
-gchar* g_markup_escape_text (const gchar *text,
-                             gssize       length);  
-
-gchar *g_markup_printf_escaped (const char *format,
-				...) G_GNUC_PRINTF (1, 2);
-gchar *g_markup_vprintf_escaped (const char *format,
-				 va_list     args);
-
-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 */
-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/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gmem.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gmem.h
deleted file mode 100644
index 69a0befc..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gmem.h
+++ /dev/null
@@ -1,148 +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__
-
-#include <glib/gslice.h>
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GMemVTable GMemVTable;
-
-
-#if GLIB_SIZEOF_VOID_P > GLIB_SIZEOF_LONG
-#  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
- */
-gpointer g_malloc         (gsize	 n_bytes) G_GNUC_MALLOC;
-gpointer g_malloc0        (gsize	 n_bytes) G_GNUC_MALLOC;
-gpointer g_realloc        (gpointer	 mem,
-			   gsize	 n_bytes) G_GNUC_WARN_UNUSED_RESULT;
-void	 g_free	          (gpointer	 mem);
-gpointer g_try_malloc     (gsize	 n_bytes) G_GNUC_MALLOC;
-gpointer g_try_malloc0    (gsize	 n_bytes) G_GNUC_MALLOC;
-gpointer g_try_realloc    (gpointer	 mem,
-			   gsize	 n_bytes) G_GNUC_WARN_UNUSED_RESULT;
-
-
-/* Convenience memory allocators
- */
-#define g_new(struct_type, n_structs)		\
-    ((struct_type *) g_malloc (((gsize) sizeof (struct_type)) * ((gsize) (n_structs))))
-#define g_new0(struct_type, n_structs)		\
-    ((struct_type *) g_malloc0 (((gsize) sizeof (struct_type)) * ((gsize) (n_structs))))
-#define g_renew(struct_type, mem, n_structs)	\
-    ((struct_type *) g_realloc ((mem), ((gsize) sizeof (struct_type)) * ((gsize) (n_structs))))
-
-#define g_try_new(struct_type, n_structs)		\
-    ((struct_type *) g_try_malloc (((gsize) sizeof (struct_type)) * ((gsize) (n_structs))))
-#define g_try_new0(struct_type, n_structs)		\
-    ((struct_type *) g_try_malloc0 (((gsize) sizeof (struct_type)) * ((gsize) (n_structs))))
-#define g_try_renew(struct_type, mem, n_structs)	\
-    ((struct_type *) g_try_realloc ((mem), ((gsize) sizeof (struct_type)) * ((gsize) (n_structs))))
-
-
-/* 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);
-};
-void	 g_mem_set_vtable (GMemVTable	*vtable);
-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;
-void	g_mem_profile	(void);
-
-
-/* deprecated memchunks and allocators */
-#if !defined (G_DISABLE_DEPRECATED) || defined (GTK_COMPILATION) || defined (GDK_COMPILATION)
-typedef struct _GAllocator GAllocator;
-typedef struct _GMemChunk  GMemChunk;
-#define g_mem_chunk_create(type, pre_alloc, alloc_type)	( \
-  g_mem_chunk_new (#type " mem chunks (" #pre_alloc ")", \
-		   sizeof (type), \
-		   sizeof (type) * (pre_alloc), \
-		   (alloc_type)) \
-)
-#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_STMT_START { \
-  g_mem_chunk_free ((mem_chunk), (mem)); \
-} G_STMT_END
-#define G_ALLOC_ONLY	  1
-#define G_ALLOC_AND_FREE  2
-GMemChunk* g_mem_chunk_new     (const gchar *name,
-				gint         atom_size,
-				gsize        area_size,
-				gint         type);
-void       g_mem_chunk_destroy (GMemChunk   *mem_chunk);
-gpointer   g_mem_chunk_alloc   (GMemChunk   *mem_chunk);
-gpointer   g_mem_chunk_alloc0  (GMemChunk   *mem_chunk);
-void       g_mem_chunk_free    (GMemChunk   *mem_chunk,
-				gpointer     mem);
-void       g_mem_chunk_clean   (GMemChunk   *mem_chunk);
-void       g_mem_chunk_reset   (GMemChunk   *mem_chunk);
-void       g_mem_chunk_print   (GMemChunk   *mem_chunk);
-void       g_mem_chunk_info    (void);
-void	   g_blow_chunks       (void);
-GAllocator*g_allocator_new     (const gchar  *name,
-				guint         n_preallocs);
-void       g_allocator_free    (GAllocator   *allocator);
-#define	G_ALLOCATOR_LIST       (1)
-#define	G_ALLOCATOR_SLIST      (2)
-#define	G_ALLOCATOR_NODE       (3)
-#endif /* G_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __G_MEM_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gmessages.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gmessages.h
deleted file mode 100644
index eb2ca8f9..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gmessages.h
+++ /dev/null
@@ -1,338 +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__
-
-#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.
- */
-gsize	g_printf_string_upper_bound (const gchar* format,
-				     va_list	  args);
-
-/* 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
- */
-guint           g_log_set_handler       (const gchar    *log_domain,
-                                         GLogLevelFlags  log_levels,
-                                         GLogFunc        log_func,
-                                         gpointer        user_data);
-void            g_log_remove_handler    (const gchar    *log_domain,
-                                         guint           handler_id);
-void            g_log_default_handler   (const gchar    *log_domain,
-                                         GLogLevelFlags  log_level,
-                                         const gchar    *message,
-                                         gpointer        unused_data);
-GLogFunc        g_log_set_default_handler (GLogFunc      log_func,
-					   gpointer      user_data);
-void            g_log                   (const gchar    *log_domain,
-                                         GLogLevelFlags  log_level,
-                                         const gchar    *format,
-                                         ...) G_GNUC_PRINTF (3, 4);
-void            g_logv                  (const gchar    *log_domain,
-                                         GLogLevelFlags  log_level,
-                                         const gchar    *format,
-                                         va_list         args);
-GLogLevelFlags  g_log_set_fatal_mask    (const gchar    *log_domain,
-                                         GLogLevelFlags  fatal_mask);
-GLogLevelFlags  g_log_set_always_fatal  (GLogLevelFlags  fatal_mask);
-
-/* internal */
-G_GNUC_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 */
-void g_return_if_fail_warning (const char *log_domain,
-			       const char *pretty_function,
-			       const char *expression);
-void g_warn_message           (const char     *domain,
-                               const char     *file,
-                               int             line,
-                               const char     *func,
-                               const char     *warnexpr);
-#ifndef G_DISABLE_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;
-#endif /* !G_DISABLE_DEPRECATED */
-
-
-#ifndef G_LOG_DOMAIN
-#define G_LOG_DOMAIN    ((gchar*) 0)
-#endif  /* G_LOG_DOMAIN */
-#ifdef G_HAVE_ISO_VARARGS
-/* for(;;); so that GCC knows that control doesn't go past g_error() */
-#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)
-#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,
-         ...)
-{
-  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__ */
-
-typedef void    (*GPrintFunc)           (const gchar    *string);
-void            g_print                 (const gchar    *format,
-                                         ...) G_GNUC_PRINTF (1, 2);
-GPrintFunc      g_set_print_handler     (GPrintFunc      func);
-void            g_printerr              (const gchar    *format,
-                                         ...) G_GNUC_PRINTF (1, 2);
-GPrintFunc      g_set_printerr_handler  (GPrintFunc      func);
-
-
-/* Provide macros for graceful error handling.
- * The "return" macros will return from the current function.
- * Two different definitions are given for the macros in
- * order to support gcc's __PRETTY_FUNCTION__ capability.
- */
-
-#define g_warn_if_reached()     do { g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, NULL); } while (0)
-#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
-
-#define g_return_if_fail(expr)			G_STMT_START{ (void)0; }G_STMT_END
-#define g_return_val_if_fail(expr,val)		G_STMT_START{ (void)0; }G_STMT_END
-#define g_return_if_reached()			G_STMT_START{ return; }G_STMT_END
-#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/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gnode.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gnode.h
deleted file mode 100644
index e5b7ebc8..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gnode.h
+++ /dev/null
@@ -1,283 +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__
-
-#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)
-
-GNode*	 g_node_new		(gpointer	   data);
-void	 g_node_destroy		(GNode		  *root);
-void	 g_node_unlink		(GNode		  *node);
-GNode*   g_node_copy_deep       (GNode            *node,
-				 GCopyFunc         copy_func,
-				 gpointer          data);
-GNode*   g_node_copy            (GNode            *node);
-GNode*	 g_node_insert		(GNode		  *parent,
-				 gint		   position,
-				 GNode		  *node);
-GNode*	 g_node_insert_before	(GNode		  *parent,
-				 GNode		  *sibling,
-				 GNode		  *node);
-GNode*   g_node_insert_after    (GNode            *parent,
-				 GNode            *sibling,
-				 GNode            *node); 
-GNode*	 g_node_prepend		(GNode		  *parent,
-				 GNode		  *node);
-guint	 g_node_n_nodes		(GNode		  *root,
-				 GTraverseFlags	   flags);
-GNode*	 g_node_get_root	(GNode		  *node);
-gboolean g_node_is_ancestor	(GNode		  *node,
-				 GNode		  *descendant);
-guint	 g_node_depth		(GNode		  *node);
-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_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.
- */
-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.
- */
-guint	 g_node_max_height	 (GNode *root);
-
-void	 g_node_children_foreach (GNode		  *node,
-				  GTraverseFlags   flags,
-				  GNodeForeachFunc func,
-				  gpointer	   data);
-void	 g_node_reverse_children (GNode		  *node);
-guint	 g_node_n_children	 (GNode		  *node);
-GNode*	 g_node_nth_child	 (GNode		  *node,
-				  guint		   n);
-GNode*	 g_node_last_child	 (GNode		  *node);
-GNode*	 g_node_find_child	 (GNode		  *node,
-				  GTraverseFlags   flags,
-				  gpointer	   data);
-gint	 g_node_child_position	 (GNode		  *node,
-				  GNode		  *child);
-gint	 g_node_child_index	 (GNode		  *node,
-				  gpointer	   data);
-
-GNode*	 g_node_first_sibling	 (GNode		  *node);
-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 %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 %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)
-
-#ifndef G_DISABLE_DEPRECATED
-void     g_node_push_allocator  (gpointer          dummy);
-void     g_node_pop_allocator   (void);
-#endif
-G_END_DECLS
-
-#endif /* __G_NODE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/goption.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/goption.h
deleted file mode 100644
index 908e5319..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/goption.h
+++ /dev/null
@@ -1,160 +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__
-
-#include <glib/gerror.h>
-#include <glib/gquark.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GOptionContext GOptionContext;
-typedef struct _GOptionGroup   GOptionGroup;
-typedef struct _GOptionEntry   GOptionEntry;
-
-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;
-
-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;
-
-typedef gboolean (*GOptionArgFunc) (const gchar    *option_name,
-				    const gchar    *value,
-				    gpointer        data,
-				    GError        **error);
-
-typedef gboolean (*GOptionParseFunc) (GOptionContext *context,
-				      GOptionGroup   *group,
-				      gpointer	      data,
-				      GError        **error);
-
-typedef void (*GOptionErrorFunc) (GOptionContext *context,
-				  GOptionGroup   *group,
-				  gpointer        data,
-				  GError        **error);
-
-#define G_OPTION_ERROR (g_option_error_quark ())
-
-typedef enum
-{
-  G_OPTION_ERROR_UNKNOWN_OPTION,
-  G_OPTION_ERROR_BAD_VALUE,
-  G_OPTION_ERROR_FAILED
-} GOptionError;
-
-GQuark g_option_error_quark (void);
-
-
-struct _GOptionEntry
-{
-  const gchar *long_name;
-  gchar        short_name;
-  gint         flags;
-
-  GOptionArg   arg;
-  gpointer     arg_data;
-  
-  const gchar *description;
-  const gchar *arg_description;
-};
-
-#define G_OPTION_REMAINING ""
-
-GOptionContext *g_option_context_new              (const gchar         *parameter_string);
-void            g_option_context_set_summary      (GOptionContext      *context,
-                                                   const gchar         *summary);
-G_CONST_RETURN gchar *g_option_context_get_summary (GOptionContext     *context);
-void            g_option_context_set_description  (GOptionContext      *context,
-                                                   const gchar         *description);
-G_CONST_RETURN gchar *g_option_context_get_description (GOptionContext     *context);
-void            g_option_context_free             (GOptionContext      *context);
-void		g_option_context_set_help_enabled (GOptionContext      *context,
-						   gboolean		help_enabled);
-gboolean	g_option_context_get_help_enabled (GOptionContext      *context);
-void		g_option_context_set_ignore_unknown_options (GOptionContext *context,
-							     gboolean	     ignore_unknown);
-gboolean        g_option_context_get_ignore_unknown_options (GOptionContext *context);
-
-void            g_option_context_add_main_entries (GOptionContext      *context,
-						   const GOptionEntry  *entries,
-						   const gchar         *translation_domain);
-gboolean        g_option_context_parse            (GOptionContext      *context,
-						   gint                *argc,
-						   gchar             ***argv,
-						   GError             **error);
-void            g_option_context_set_translate_func (GOptionContext     *context,
-						     GTranslateFunc      func,
-						     gpointer            data,
-						     GDestroyNotify      destroy_notify);
-void            g_option_context_set_translation_domain (GOptionContext  *context,
-							 const gchar     *domain);
-
-void            g_option_context_add_group      (GOptionContext *context,
-						 GOptionGroup   *group);
-void          g_option_context_set_main_group (GOptionContext *context,
-					       GOptionGroup   *group);
-GOptionGroup *g_option_context_get_main_group (GOptionContext *context);
-gchar        *g_option_context_get_help       (GOptionContext *context,
-                                               gboolean        main_help,
-                                               GOptionGroup   *group);
-
-GOptionGroup *g_option_group_new                    (const gchar        *name,
-						     const gchar        *description,
-						     const gchar        *help_description,
-						     gpointer            user_data,
-						     GDestroyNotify      destroy);
-void	      g_option_group_set_parse_hooks	    (GOptionGroup       *group,
-						     GOptionParseFunc    pre_parse_func,
-						     GOptionParseFunc	 post_parse_func);
-void	      g_option_group_set_error_hook	    (GOptionGroup       *group,
-						     GOptionErrorFunc	 error_func);
-void          g_option_group_free                   (GOptionGroup       *group);
-void          g_option_group_add_entries            (GOptionGroup       *group,
-						     const GOptionEntry *entries);
-void          g_option_group_set_translate_func     (GOptionGroup       *group,
-						     GTranslateFunc      func,
-						     gpointer            data,
-						     GDestroyNotify      destroy_notify);
-void          g_option_group_set_translation_domain (GOptionGroup       *group,
-						     const gchar        *domain);
-
-
-G_END_DECLS
-
-#endif /* __G_OPTION_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gpattern.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gpattern.h
deleted file mode 100644
index 5c896687..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gpattern.h
+++ /dev/null
@@ -1,44 +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__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-
-typedef struct _GPatternSpec    GPatternSpec;
-
-GPatternSpec* g_pattern_spec_new       (const gchar  *pattern);
-void          g_pattern_spec_free      (GPatternSpec *pspec);
-gboolean      g_pattern_spec_equal     (GPatternSpec *pspec1,
-					GPatternSpec *pspec2);
-gboolean      g_pattern_match          (GPatternSpec *pspec,
-					guint         string_length,
-					const gchar  *string,
-					const gchar  *string_reversed);
-gboolean      g_pattern_match_string   (GPatternSpec *pspec,
-					const gchar  *string);
-gboolean      g_pattern_match_simple   (const gchar  *pattern,
-					const gchar  *string);
-
-G_END_DECLS
-
-#endif /* __G_PATTERN_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gprimes.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gprimes.h
deleted file mode 100644
index 0f1740cb..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gprimes.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_PRIMES_H__
-#define __G_PRIMES_H__
-
-#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.
- */
-guint	   g_spaced_primes_closest (guint num) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __G_PRIMES_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gprintf.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gprintf.h
deleted file mode 100644
index aa542b3d..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gprintf.h
+++ /dev/null
@@ -1,54 +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/gtypes.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-G_BEGIN_DECLS
-
-gint                  g_printf    (gchar const *format,
-                                   ...) G_GNUC_PRINTF (1, 2);            
-gint                  g_fprintf   (FILE        *file,
-				   gchar const *format,
-				   ...) G_GNUC_PRINTF (2, 3);
-gint                  g_sprintf   (gchar       *string,
-				   gchar const *format,
-				   ...) G_GNUC_PRINTF (2, 3);
-
-gint                  g_vprintf   (gchar const *format,
-                                   va_list      args);            
-gint                  g_vfprintf  (FILE        *file,
-				   gchar const *format,
-				   va_list      args);
-gint                  g_vsprintf  (gchar       *string,
-				   gchar const *format,
-				   va_list      args);
-gint                  g_vasprintf (gchar      **string,
-				   gchar const *format,
-				   va_list      args);
-
-G_END_DECLS
-
-#endif /* __G_PRINTF_H__ */
-
-
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gqsort.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gqsort.h
deleted file mode 100644
index d0ff46a4..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gqsort.h
+++ /dev/null
@@ -1,44 +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__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-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/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gquark.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gquark.h
deleted file mode 100644
index fc3006ff..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gquark.h
+++ /dev/null
@@ -1,50 +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__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-typedef guint32 GQuark;
-
-/* Quarks (string<->id association)
- */
-GQuark                g_quark_try_string         (const gchar *string);
-GQuark                g_quark_from_static_string (const gchar *string);
-GQuark                g_quark_from_string        (const gchar *string);
-G_CONST_RETURN gchar* g_quark_to_string          (GQuark       quark) G_GNUC_CONST;
-
-G_CONST_RETURN gchar* g_intern_string            (const gchar *string);
-G_CONST_RETURN gchar* g_intern_static_string     (const gchar *string);
-
-
-G_END_DECLS
-
-#endif /* __G_QUARK_H__ */
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gqueue.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gqueue.h
deleted file mode 100644
index c4004514..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gqueue.h
+++ /dev/null
@@ -1,123 +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__
-
-#include <glib/glist.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GQueue		GQueue;
-
-struct _GQueue
-{
-  GList *head;
-  GList *tail;
-  guint  length;
-};
-
-#define G_QUEUE_INIT { NULL, NULL, 0 }
-
-/* Queues
- */
-GQueue*  g_queue_new            (void);
-void     g_queue_free           (GQueue           *queue);
-void     g_queue_init           (GQueue           *queue);
-void     g_queue_clear          (GQueue           *queue);
-gboolean g_queue_is_empty       (GQueue           *queue);
-guint    g_queue_get_length     (GQueue           *queue);
-void     g_queue_reverse        (GQueue           *queue);
-GQueue * g_queue_copy           (GQueue           *queue);
-void     g_queue_foreach        (GQueue           *queue,
-				 GFunc             func,
-				 gpointer          user_data);
-GList *  g_queue_find           (GQueue           *queue,
-				 gconstpointer     data);
-GList *  g_queue_find_custom    (GQueue           *queue,
-				 gconstpointer     data,
-				 GCompareFunc      func);
-void     g_queue_sort           (GQueue           *queue,
-				 GCompareDataFunc  compare_func,
-				 gpointer          user_data);
-
-void     g_queue_push_head      (GQueue           *queue,
-				 gpointer          data);
-void     g_queue_push_tail      (GQueue           *queue,
-				 gpointer          data);
-void     g_queue_push_nth       (GQueue           *queue,
-				 gpointer          data,
-				 gint              n);
-gpointer g_queue_pop_head       (GQueue           *queue);
-gpointer g_queue_pop_tail       (GQueue           *queue);
-gpointer g_queue_pop_nth        (GQueue           *queue,
-				 guint             n);
-gpointer g_queue_peek_head      (GQueue           *queue);
-gpointer g_queue_peek_tail      (GQueue           *queue);
-gpointer g_queue_peek_nth       (GQueue           *queue,
-				 guint             n);
-gint     g_queue_index          (GQueue           *queue,
-				 gconstpointer     data);
-void     g_queue_remove         (GQueue           *queue,
-				 gconstpointer     data);
-void     g_queue_remove_all     (GQueue           *queue,
-				 gconstpointer     data);
-void     g_queue_insert_before  (GQueue           *queue,
-				 GList            *sibling,
-				 gpointer          data);
-void     g_queue_insert_after   (GQueue           *queue,
-				 GList            *sibling,
-				 gpointer          data);
-void     g_queue_insert_sorted  (GQueue           *queue,
-				 gpointer          data,
-				 GCompareDataFunc  func,
-				 gpointer          user_data);
-
-void     g_queue_push_head_link (GQueue           *queue,
-				 GList            *link_);
-void     g_queue_push_tail_link (GQueue           *queue,
-				 GList            *link_);
-void     g_queue_push_nth_link  (GQueue           *queue,
-				 gint              n,
-				 GList            *link_);
-GList*   g_queue_pop_head_link  (GQueue           *queue);
-GList*   g_queue_pop_tail_link  (GQueue           *queue);
-GList*   g_queue_pop_nth_link   (GQueue           *queue,
-				 guint             n);
-GList*   g_queue_peek_head_link (GQueue           *queue);
-GList*   g_queue_peek_tail_link (GQueue           *queue);
-GList*   g_queue_peek_nth_link  (GQueue           *queue,
-				 guint             n);
-gint     g_queue_link_index     (GQueue           *queue,
-				 GList            *link_);
-void     g_queue_unlink         (GQueue           *queue,
-				 GList            *link_);
-void     g_queue_delete_link    (GQueue           *queue,
-				 GList            *link_);
-
-G_END_DECLS
-
-#endif /* __G_QUEUE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/grand.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/grand.h
deleted file mode 100644
index cb6887bc..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/grand.h
+++ /dev/null
@@ -1,87 +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__
-
-#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.keio.ac.jp/~matumoto/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)
- */
-
-GRand*  g_rand_new_with_seed  (guint32  seed);
-GRand*  g_rand_new_with_seed_array (const guint32 *seed,
-				    guint seed_length);
-GRand*  g_rand_new            (void);
-void    g_rand_free           (GRand   *rand_);
-GRand*  g_rand_copy           (GRand   *rand_);
-void    g_rand_set_seed       (GRand   *rand_,
-			       guint32  seed);
-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)
-
-guint32 g_rand_int            (GRand   *rand_);
-gint32  g_rand_int_range      (GRand   *rand_,
-			       gint32   begin,
-			       gint32   end);
-gdouble g_rand_double         (GRand   *rand_);
-gdouble g_rand_double_range   (GRand   *rand_,
-			       gdouble  begin,
-			       gdouble  end);
-void    g_random_set_seed     (guint32  seed);
-
-#define g_random_boolean() ((g_random_int () & (1 << 15)) != 0)
-
-guint32 g_random_int          (void);
-gint32  g_random_int_range    (gint32   begin,
-			       gint32   end);
-gdouble g_random_double       (void);
-gdouble g_random_double_range (gdouble  begin,
-			       gdouble  end);
-
-
-G_END_DECLS
-
-#endif /* __G_RAND_H__ */
-
-
-
-
-
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gregex.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gregex.h
deleted file mode 100644
index c60b447f..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gregex.h
+++ /dev/null
@@ -1,240 +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__
-
-#include <glib/gerror.h>
-#include <glib/gstring.h>
-
-G_BEGIN_DECLS
-
-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
-} GRegexError;
-
-#define G_REGEX_ERROR g_regex_error_quark ()
-
-GQuark g_regex_error_quark (void);
-
-/* 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_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
-} GRegexCompileFlags;
-
-/* 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
-} GRegexMatchFlags;
-
-typedef struct _GRegex		GRegex;
-typedef struct _GMatchInfo	GMatchInfo;
-
-typedef gboolean (*GRegexEvalCallback)		(const GMatchInfo *match_info,
-						 GString          *result,
-						 gpointer          user_data);
-
-
-GRegex		 *g_regex_new			(const gchar         *pattern,
-						 GRegexCompileFlags   compile_options,
-						 GRegexMatchFlags     match_options,
-						 GError             **error);
-GRegex           *g_regex_ref			(GRegex              *regex);
-void		  g_regex_unref			(GRegex              *regex);
-const gchar	 *g_regex_get_pattern		(const GRegex        *regex);
-gint		  g_regex_get_max_backref	(const GRegex        *regex);
-gint		  g_regex_get_capture_count	(const GRegex        *regex);
-gint		  g_regex_get_string_number	(const GRegex        *regex, 
-						 const gchar         *name);
-gchar		 *g_regex_escape_string		(const gchar         *string,
-						 gint                 length);
-
-/* Matching. */
-gboolean	  g_regex_match_simple		(const gchar         *pattern,
-						 const gchar         *string,
-						 GRegexCompileFlags   compile_options,
-						 GRegexMatchFlags     match_options);
-gboolean	  g_regex_match			(const GRegex        *regex,
-						 const gchar         *string,
-						 GRegexMatchFlags     match_options,
-						 GMatchInfo         **match_info);
-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);
-gboolean	  g_regex_match_all		(const GRegex        *regex,
-						 const gchar         *string,
-						 GRegexMatchFlags     match_options,
-						 GMatchInfo         **match_info);
-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. */
-gchar		**g_regex_split_simple		(const gchar         *pattern,
-						 const gchar         *string,
-						 GRegexCompileFlags   compile_options,
-						 GRegexMatchFlags     match_options);
-gchar		**g_regex_split			(const GRegex        *regex,
-						 const gchar         *string,
-						 GRegexMatchFlags     match_options);
-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. */
-gchar		 *g_regex_replace		(const GRegex        *regex,
-						 const gchar         *string,
-						 gssize               string_len,
-						 gint                 start_position,
-						 const gchar         *replacement,
-						 GRegexMatchFlags     match_options,
-						 GError             **error);
-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);
-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);
-gboolean	  g_regex_check_replacement	(const gchar         *replacement,
-						 gboolean            *has_references,
-						 GError             **error);
-
-/* Match info */
-GRegex		 *g_match_info_get_regex	(const GMatchInfo    *match_info);
-const gchar      *g_match_info_get_string       (const GMatchInfo    *match_info);
-
-void		  g_match_info_free		(GMatchInfo          *match_info);
-gboolean	  g_match_info_next		(GMatchInfo          *match_info,
-						 GError             **error);
-gboolean	  g_match_info_matches		(const GMatchInfo    *match_info);
-gint		  g_match_info_get_match_count	(const GMatchInfo    *match_info);
-gboolean	  g_match_info_is_partial_match	(const GMatchInfo    *match_info);
-gchar		 *g_match_info_expand_references(const GMatchInfo    *match_info,
-						 const gchar         *string_to_expand,
-						 GError             **error);
-gchar		 *g_match_info_fetch		(const GMatchInfo    *match_info,
-						 gint                 match_num);
-gboolean	  g_match_info_fetch_pos	(const GMatchInfo    *match_info,
-						 gint                 match_num,
-						 gint                *start_pos,
-						 gint                *end_pos);
-gchar		 *g_match_info_fetch_named	(const GMatchInfo    *match_info,
-						 const gchar         *name);
-gboolean	  g_match_info_fetch_named_pos	(const GMatchInfo    *match_info,
-						 const gchar         *name,
-						 gint                *start_pos,
-						 gint                *end_pos);
-gchar		**g_match_info_fetch_all	(const GMatchInfo    *match_info);
-
-G_END_DECLS
-
-
-#endif  /*  __G_REGEX_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/grel.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/grel.h
deleted file mode 100644
index 275f0549..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/grel.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_REL_H__
-#define __G_REL_H__
-
-#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 ...
- */
-
-GRelation* g_relation_new     (gint         fields);
-void       g_relation_destroy (GRelation   *relation);
-void       g_relation_index   (GRelation   *relation,
-                               gint         field,
-                               GHashFunc    hash_func,
-                               GEqualFunc   key_equal_func);
-void       g_relation_insert  (GRelation   *relation,
-                               ...);
-gint       g_relation_delete  (GRelation   *relation,
-                               gconstpointer  key,
-                               gint         field);
-GTuples*   g_relation_select  (GRelation   *relation,
-                               gconstpointer  key,
-                               gint         field);
-gint       g_relation_count   (GRelation   *relation,
-                               gconstpointer  key,
-                               gint         field);
-gboolean   g_relation_exists  (GRelation   *relation,
-                               ...);
-void       g_relation_print   (GRelation   *relation);
-
-void       g_tuples_destroy   (GTuples     *tuples);
-gpointer   g_tuples_index     (GTuples     *tuples,
-                               gint         index_,
-                               gint         field);
-
-G_END_DECLS
-
-#endif /* __G_REL_H__ */
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gscanner.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gscanner.h
deleted file mode 100644
index a61c0a5b..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gscanner.h
+++ /dev/null
@@ -1,275 +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__
-
-#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,
-  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 */
-  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;
-  
-  /* to be considered private */
-  GHashTable		*symbol_table;
-  gint			input_fd;
-  const gchar		*text;
-  const gchar		*text_end;
-  gchar			*buffer;
-  guint			scope_id;
-  
-  /* handler function for _warn and _error */
-  GScannerMsgFunc	msg_handler;
-};
-
-GScanner*	g_scanner_new			(const GScannerConfig *config_templ);
-void		g_scanner_destroy		(GScanner	*scanner);
-void		g_scanner_input_file		(GScanner	*scanner,
-						 gint		input_fd);
-void		g_scanner_sync_file_offset	(GScanner	*scanner);
-void		g_scanner_input_text		(GScanner	*scanner,
-						 const	gchar	*text,
-						 guint		text_len);
-GTokenType	g_scanner_get_next_token	(GScanner	*scanner);
-GTokenType	g_scanner_peek_next_token	(GScanner	*scanner);
-GTokenType	g_scanner_cur_token		(GScanner	*scanner);
-GTokenValue	g_scanner_cur_value		(GScanner	*scanner);
-guint		g_scanner_cur_line		(GScanner	*scanner);
-guint		g_scanner_cur_position		(GScanner	*scanner);
-gboolean	g_scanner_eof			(GScanner	*scanner);
-guint		g_scanner_set_scope		(GScanner	*scanner,
-						 guint		 scope_id);
-void		g_scanner_scope_add_symbol	(GScanner	*scanner,
-						 guint		 scope_id,
-						 const gchar	*symbol,
-						 gpointer	value);
-void		g_scanner_scope_remove_symbol	(GScanner	*scanner,
-						 guint		 scope_id,
-						 const gchar	*symbol);
-gpointer	g_scanner_scope_lookup_symbol	(GScanner	*scanner,
-						 guint		 scope_id,
-						 const gchar	*symbol);
-void		g_scanner_scope_foreach_symbol	(GScanner	*scanner,
-						 guint		 scope_id,
-						 GHFunc		 func,
-						 gpointer	 user_data);
-gpointer	g_scanner_lookup_symbol		(GScanner	*scanner,
-						 const gchar	*symbol);
-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);
-void		g_scanner_error			(GScanner	*scanner,
-						 const gchar	*format,
-						 ...) G_GNUC_PRINTF (2,3);
-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/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gsequence.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gsequence.h
deleted file mode 100644
index ffac6c62..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gsequence.h
+++ /dev/null
@@ -1,121 +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.
- */
-
-#include <glib/gtypes.h>
-
-#ifndef __G_SEQUENCE_H__
-#define __G_SEQUENCE_H__
-
-typedef struct _GSequence      GSequence;
-typedef struct _GSequenceNode  GSequenceIter;
-
-typedef gint (* GSequenceIterCompareFunc) (GSequenceIter *a,
-                                           GSequenceIter *b,
-                                           gpointer       data);
-
-
-/* GSequence */
-GSequence *    g_sequence_new                (GDestroyNotify            data_destroy);
-void           g_sequence_free               (GSequence                *seq);
-gint           g_sequence_get_length         (GSequence                *seq);
-void           g_sequence_foreach            (GSequence                *seq,
-                                              GFunc                     func,
-                                              gpointer                  user_data);
-void           g_sequence_foreach_range      (GSequenceIter            *begin,
-                                              GSequenceIter            *end,
-                                              GFunc                     func,
-                                              gpointer                  user_data);
-void           g_sequence_sort               (GSequence                *seq,
-                                              GCompareDataFunc          cmp_func,
-                                              gpointer                  cmp_data);
-void           g_sequence_sort_iter          (GSequence                *seq,
-                                              GSequenceIterCompareFunc  cmp_func,
-                                              gpointer                  cmp_data);
-
-
-/* Getting iters */
-GSequenceIter *g_sequence_get_begin_iter     (GSequence                *seq);
-GSequenceIter *g_sequence_get_end_iter       (GSequence                *seq);
-GSequenceIter *g_sequence_get_iter_at_pos    (GSequence                *seq,
-                                              gint                      pos);
-GSequenceIter *g_sequence_append             (GSequence                *seq,
-                                              gpointer                  data);
-GSequenceIter *g_sequence_prepend            (GSequence                *seq,
-                                              gpointer                  data);
-GSequenceIter *g_sequence_insert_before      (GSequenceIter            *iter,
-                                              gpointer                  data);
-void           g_sequence_move               (GSequenceIter            *src,
-                                              GSequenceIter            *dest);
-void           g_sequence_swap               (GSequenceIter            *a,
-                                              GSequenceIter            *b);
-GSequenceIter *g_sequence_insert_sorted      (GSequence                *seq,
-                                              gpointer                  data,
-                                              GCompareDataFunc          cmp_func,
-                                              gpointer                  cmp_data);
-GSequenceIter *g_sequence_insert_sorted_iter (GSequence                *seq,
-                                              gpointer                  data,
-                                              GSequenceIterCompareFunc  iter_cmp,
-                                              gpointer                  cmp_data);
-void           g_sequence_sort_changed       (GSequenceIter            *iter,
-                                              GCompareDataFunc          cmp_func,
-                                              gpointer                  cmp_data);
-void           g_sequence_sort_changed_iter  (GSequenceIter            *iter,
-                                              GSequenceIterCompareFunc  iter_cmp,
-                                              gpointer                  cmp_data);
-void           g_sequence_remove             (GSequenceIter            *iter);
-void           g_sequence_remove_range       (GSequenceIter            *begin,
-                                              GSequenceIter            *end);
-void           g_sequence_move_range         (GSequenceIter            *dest,
-                                              GSequenceIter            *begin,
-                                              GSequenceIter            *end);
-GSequenceIter *g_sequence_search             (GSequence                *seq,
-                                              gpointer                  data,
-                                              GCompareDataFunc          cmp_func,
-                                              gpointer                  cmp_data);
-GSequenceIter *g_sequence_search_iter        (GSequence                *seq,
-                                              gpointer                  data,
-                                              GSequenceIterCompareFunc  iter_cmp,
-                                              gpointer                  cmp_data);
-
-
-/* Dereferencing */
-gpointer       g_sequence_get                (GSequenceIter            *iter);
-void           g_sequence_set                (GSequenceIter            *iter,
-                                              gpointer                  data);
-
-/* Operations on GSequenceIter * */
-gboolean       g_sequence_iter_is_begin      (GSequenceIter            *iter);
-gboolean       g_sequence_iter_is_end        (GSequenceIter            *iter);
-GSequenceIter *g_sequence_iter_next          (GSequenceIter            *iter);
-GSequenceIter *g_sequence_iter_prev          (GSequenceIter            *iter);
-gint           g_sequence_iter_get_position  (GSequenceIter            *iter);
-GSequenceIter *g_sequence_iter_move          (GSequenceIter            *iter,
-                                              gint                      delta);
-GSequence *    g_sequence_iter_get_sequence  (GSequenceIter            *iter);
-
-
-/* Search */
-gint           g_sequence_iter_compare       (GSequenceIter            *a,
-                                              GSequenceIter            *b);
-GSequenceIter *g_sequence_range_get_midpoint (GSequenceIter            *begin,
-                                              GSequenceIter            *end);
-
-
-#endif /* __G_SEQUENCE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gshell.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gshell.h
deleted file mode 100644
index b3f9d914..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gshell.h
+++ /dev/null
@@ -1,53 +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__
-
-#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;
-
-GQuark g_shell_error_quark (void);
-
-gchar*   g_shell_quote      (const gchar   *unquoted_string);
-gchar*   g_shell_unquote    (const gchar   *quoted_string,
-                             GError       **error);
-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/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gslice.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gslice.h
deleted file mode 100644
index 9b46da7e..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gslice.h
+++ /dev/null
@@ -1,85 +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__
-
-#ifndef __G_MEM_H__
-#error Include <glib.h> instead of <gslice.h>
-#endif
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/* slices - fast allocation/release of small memory blocks
- */
-gpointer g_slice_alloc          	(gsize	       block_size) G_GNUC_MALLOC;
-gpointer g_slice_alloc0         	(gsize         block_size) G_GNUC_MALLOC;
-gpointer g_slice_copy                   (gsize         block_size,
-                                         gconstpointer mem_block) G_GNUC_MALLOC;
-void     g_slice_free1          	(gsize         block_size,
-					 gpointer      mem_block);
-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;
-void     g_slice_set_config	   (GSliceConfig ckey, gint64 value);
-gint64   g_slice_get_config	   (GSliceConfig ckey);
-gint64*  g_slice_get_config_state  (GSliceConfig ckey, gint64 address, guint *n_values);
-
-G_END_DECLS
-
-#endif /* __G_SLICE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gslist.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gslist.h
deleted file mode 100644
index 8ef54088..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gslist.h
+++ /dev/null
@@ -1,110 +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__
-
-#include <glib/gmem.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GSList GSList;
-
-struct _GSList
-{
-  gpointer data;
-  GSList *next;
-};
-
-/* Singly linked lists
- */
-GSList*  g_slist_alloc                   (void) G_GNUC_WARN_UNUSED_RESULT;
-void     g_slist_free                    (GSList           *list);
-void     g_slist_free_1                  (GSList           *list);
-#define	 g_slist_free1		         g_slist_free_1
-GSList*  g_slist_append                  (GSList           *list,
-					  gpointer          data) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_prepend                 (GSList           *list,
-					  gpointer          data) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_insert                  (GSList           *list,
-					  gpointer          data,
-					  gint              position) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_insert_sorted           (GSList           *list,
-					  gpointer          data,
-					  GCompareFunc      func) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_insert_sorted_with_data (GSList           *list,
-					  gpointer          data,
-					  GCompareDataFunc  func,
-					  gpointer          user_data) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_insert_before           (GSList           *slist,
-					  GSList           *sibling,
-					  gpointer          data) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_concat                  (GSList           *list1,
-					  GSList           *list2) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_remove                  (GSList           *list,
-					  gconstpointer     data) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_remove_all              (GSList           *list,
-					  gconstpointer     data) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_remove_link             (GSList           *list,
-					  GSList           *link_) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_delete_link             (GSList           *list,
-					  GSList           *link_) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_reverse                 (GSList           *list) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_copy                    (GSList           *list) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_nth                     (GSList           *list,
-					  guint             n);
-GSList*  g_slist_find                    (GSList           *list,
-					  gconstpointer     data);
-GSList*  g_slist_find_custom             (GSList           *list,
-					  gconstpointer     data,
-					  GCompareFunc      func);
-gint     g_slist_position                (GSList           *list,
-					  GSList           *llink);
-gint     g_slist_index                   (GSList           *list,
-					  gconstpointer     data);
-GSList*  g_slist_last                    (GSList           *list);
-guint    g_slist_length                  (GSList           *list);
-void     g_slist_foreach                 (GSList           *list,
-					  GFunc             func,
-					  gpointer          user_data);
-GSList*  g_slist_sort                    (GSList           *list,
-					  GCompareFunc      compare_func) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_sort_with_data          (GSList           *list,
-					  GCompareDataFunc  compare_func,
-					  gpointer          user_data) G_GNUC_WARN_UNUSED_RESULT;
-gpointer g_slist_nth_data                (GSList           *list,
-					  guint             n);
-
-#define  g_slist_next(slist)	         ((slist) ? (((GSList *)(slist))->next) : NULL)
-
-#ifndef G_DISABLE_DEPRECATED
-void     g_slist_push_allocator          (gpointer	   dummy);
-void     g_slist_pop_allocator           (void);
-#endif
-G_END_DECLS
-
-#endif /* __G_SLIST_H__ */
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gspawn.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gspawn.h
deleted file mode 100644
index adb67417..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gspawn.h
+++ /dev/null
@@ -1,138 +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__
-
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-/* I'm not sure I remember our proposed naming convention here. */
-#define G_SPAWN_ERROR g_spawn_error_quark ()
-
-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_2BIG,   /* execv() returned E2BIG */
-  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;
-
-typedef void (* GSpawnChildSetupFunc) (gpointer user_data);
-
-typedef enum
-{
-  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
-} GSpawnFlags;
-
-GQuark g_spawn_error_quark (void);
-
-#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
-#endif
-
-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.
- */
-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.
- */
-
-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);
-
-gboolean g_spawn_command_line_sync  (const gchar          *command_line,
-                                     gchar               **standard_output,
-                                     gchar               **standard_error,
-                                     gint                 *exit_status,
-                                     GError              **error);
-gboolean g_spawn_command_line_async (const gchar          *command_line,
-                                     GError              **error);
-
-void g_spawn_close_pid (GPid pid);
-
-
-G_END_DECLS
-
-#endif /* __G_SPAWN_H__ */
-
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gstdio.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gstdio.h
deleted file mode 100644
index dd9e82ad..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gstdio.h
+++ /dev/null
@@ -1,114 +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(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.
- */
-
-#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
-
-int g_access (const gchar *filename,
-	      int          mode);
-
-int g_chdir  (const gchar *path);
-
-int g_unlink (const gchar *filename);
-
-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, preferrably 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.
- */
-
-int g_access    (const gchar *filename,
-		 int          mode);
-
-int g_chmod     (const gchar *filename,
-		 int          mode);
-
-int g_open      (const gchar *filename,
-                 int          flags,
-                 int          mode);
-
-int g_creat     (const gchar *filename,
-                 int          mode);
-
-int g_rename    (const gchar *oldfilename,
-                 const gchar *newfilename);
-
-int g_mkdir     (const gchar *filename,
-                 int          mode);
-
-int g_chdir     (const gchar *path);
-
-int g_stat      (const gchar *filename,
-                 struct stat *buf);
-
-int g_lstat     (const gchar *filename,
-                 struct stat *buf);
-
-int g_unlink    (const gchar *filename);
-
-int g_remove    (const gchar *filename);
-
-int g_rmdir     (const gchar *filename);
-
-FILE *g_fopen   (const gchar *filename,
-                 const gchar *mode);
-
-FILE *g_freopen (const gchar *filename,
-                 const gchar *mode,
-                 FILE        *stream);
-
-#endif /* G_OS_UNIX */
-
-G_END_DECLS
-
-#endif /* __G_STDIO_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gstrfuncs.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gstrfuncs.h
deleted file mode 100644
index bf35326f..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gstrfuncs.h
+++ /dev/null
@@ -1,252 +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__
-
-#include <stdarg.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)
-
-gchar                 g_ascii_tolower  (gchar        c) G_GNUC_CONST;
-gchar                 g_ascii_toupper  (gchar        c) G_GNUC_CONST;
-
-gint                  g_ascii_digit_value  (gchar    c) G_GNUC_CONST;
-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	"_-|> <."
-gchar*	              g_strdelimit     (gchar	     *string,
-					const gchar  *delimiters,
-					gchar	      new_delimiter);
-gchar*	              g_strcanon       (gchar        *string,
-					const gchar  *valid_chars,
-					gchar         substitutor);
-G_CONST_RETURN gchar* g_strerror       (gint	      errnum) G_GNUC_CONST;
-G_CONST_RETURN gchar* g_strsignal      (gint	      signum) G_GNUC_CONST;
-gchar*	              g_strreverse     (gchar	     *string);
-gsize	              g_strlcpy	       (gchar	     *dest,
-					const gchar  *src,
-					gsize         dest_size);
-gsize	              g_strlcat        (gchar	     *dest,
-					const gchar  *src,
-					gsize         dest_size);
-gchar *               g_strstr_len     (const gchar  *haystack,
-					gssize        haystack_len,
-					const gchar  *needle);
-gchar *               g_strrstr        (const gchar  *haystack,
-					const gchar  *needle);
-gchar *               g_strrstr_len    (const gchar  *haystack,
-					gssize        haystack_len,
-					const gchar  *needle);
-
-gboolean              g_str_has_suffix (const gchar  *str,
-					const gchar  *suffix);
-gboolean              g_str_has_prefix (const gchar  *str,
-					const gchar  *prefix);
-
-/* String to/from double conversion functions */
-
-gdouble	              g_strtod         (const gchar  *nptr,
-					gchar	    **endptr);
-gdouble	              g_ascii_strtod   (const gchar  *nptr,
-					gchar	    **endptr);
-guint64		      g_ascii_strtoull (const gchar *nptr,
-					gchar      **endptr,
-					guint        base);
-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)
-gchar *               g_ascii_dtostr   (gchar        *buffer,
-					gint          buf_len,
-					gdouble       d);
-gchar *               g_ascii_formatd  (gchar        *buffer,
-					gint          buf_len,
-					const gchar  *format,
-					gdouble       d);
-
-/* removes leading spaces */
-gchar*                g_strchug        (gchar        *string);
-/* removes trailing spaces */
-gchar*                g_strchomp       (gchar        *string);
-/* removes leading & trailing spaces */
-#define g_strstrip( string )	g_strchomp (g_strchug (string))
-
-gint                  g_ascii_strcasecmp  (const gchar *s1,
-					   const gchar *s2);
-gint                  g_ascii_strncasecmp (const gchar *s1,
-					   const gchar *s2,
-					   gsize        n);
-gchar*                g_ascii_strdown     (const gchar *str,
-					   gssize       len) G_GNUC_MALLOC;
-gchar*                g_ascii_strup       (const gchar *str,
-					   gssize       len) G_GNUC_MALLOC;
-
-#ifndef G_DISABLE_DEPRECATED
-
-/* The following four functions are deprecated and will be removed in
- * the next major release. They use the locale-specific tolower and
- * toupper, which is almost never the right thing.
- */
-
-gint	              g_strcasecmp     (const gchar *s1,
-					const gchar *s2);
-gint	              g_strncasecmp    (const gchar *s1,
-					const gchar *s2,
-					guint        n);
-gchar*	              g_strdown	       (gchar	     *string);
-gchar*	              g_strup	       (gchar	     *string);
-
-#endif /* G_DISABLE_DEPRECATED */
-
-/* String utility functions that return a newly allocated string which
- * ought to be freed with g_free from the caller at some point.
- */
-gchar*	              g_strdup	       (const gchar *str) G_GNUC_MALLOC;
-gchar*	              g_strdup_printf  (const gchar *format,
-					...) G_GNUC_PRINTF (1, 2) G_GNUC_MALLOC;
-gchar*	              g_strdup_vprintf (const gchar *format,
-					va_list      args) G_GNUC_MALLOC;
-gchar*	              g_strndup	       (const gchar *str,
-					gsize        n) G_GNUC_MALLOC;  
-gchar*	              g_strnfill       (gsize        length,  
-					gchar        fill_char) G_GNUC_MALLOC;
-gchar*	              g_strconcat      (const gchar *string1,
-					...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
-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.
- */
-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.
- */
-gchar*                g_strescape      (const gchar *source,
-					const gchar *exceptions) G_GNUC_MALLOC;
-
-gpointer              g_memdup	       (gconstpointer mem,
-					guint	       byte_size) G_GNUC_MALLOC;
-
-/* 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
- */
-gchar**	              g_strsplit       (const gchar  *string,
-					const gchar  *delimiter,
-					gint          max_tokens) G_GNUC_MALLOC;
-gchar **	      g_strsplit_set   (const gchar *string,
-					const gchar *delimiters,
-					gint         max_tokens) G_GNUC_MALLOC;
-gchar*                g_strjoinv       (const gchar  *separator,
-					gchar       **str_array) G_GNUC_MALLOC;
-void                  g_strfreev       (gchar       **str_array);
-gchar**               g_strdupv        (gchar       **str_array) G_GNUC_MALLOC;
-guint                 g_strv_length    (gchar       **str_array);
-
-gchar*                g_stpcpy         (gchar        *dest,
-                                        const char   *src);
-
-G_CONST_RETURN gchar *g_strip_context  (const gchar *msgid, 
-					const gchar *msgval);
-
-G_CONST_RETURN gchar *g_dpgettext      (const gchar *domain,
-                                        const gchar *msgctxtid,
-                                        gsize        msgidoffset);
-
-G_END_DECLS
-
-#endif /* __G_STRFUNCS_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gstring.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gstring.h
deleted file mode 100644
index 427b56ee..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gstring.h
+++ /dev/null
@@ -1,175 +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__
-
-#include <glib/gtypes.h>
-#include <glib/gunicode.h>
-#include <glib/gutils.h>  /* for G_CAN_INLINE */
-
-G_BEGIN_DECLS
-
-typedef struct _GString		GString;
-typedef struct _GStringChunk	GStringChunk;
-
-struct _GString
-{
-  gchar  *str;
-  gsize len;    
-  gsize allocated_len;
-};
-
-/* String Chunks
- */
-GStringChunk* g_string_chunk_new	   (gsize size);  
-void	      g_string_chunk_free	   (GStringChunk *chunk);
-void	      g_string_chunk_clear	   (GStringChunk *chunk);
-gchar*	      g_string_chunk_insert	   (GStringChunk *chunk,
-					    const gchar	 *string);
-gchar*	      g_string_chunk_insert_len	   (GStringChunk *chunk,
-					    const gchar	 *string,
-					    gssize        len);
-gchar*	      g_string_chunk_insert_const  (GStringChunk *chunk,
-					    const gchar	 *string);
-
-
-/* Strings
- */
-GString*     g_string_new	        (const gchar	 *init);
-GString*     g_string_new_len           (const gchar     *init,
-                                         gssize           len);   
-GString*     g_string_sized_new         (gsize            dfl_size);  
-gchar*	     g_string_free	        (GString	 *string,
-					 gboolean	  free_segment);
-gboolean     g_string_equal             (const GString	 *v,
-					 const GString 	 *v2);
-guint        g_string_hash              (const GString   *str);
-GString*     g_string_assign            (GString	 *string,
-					 const gchar	 *rval);
-GString*     g_string_truncate          (GString	 *string,
-					 gsize		  len);    
-GString*     g_string_set_size          (GString         *string,
-					 gsize            len);
-GString*     g_string_insert_len        (GString         *string,
-                                         gssize           pos,   
-                                         const gchar     *val,
-                                         gssize           len);  
-GString*     g_string_append            (GString	 *string,
-			                 const gchar	 *val);
-GString*     g_string_append_len        (GString	 *string,
-			                 const gchar	 *val,
-                                         gssize           len);  
-GString*     g_string_append_c          (GString	 *string,
-					 gchar		  c);
-GString*     g_string_append_unichar    (GString	 *string,
-					 gunichar	  wc);
-GString*     g_string_prepend           (GString	 *string,
-					 const gchar	 *val);
-GString*     g_string_prepend_c         (GString	 *string,
-					 gchar		  c);
-GString*     g_string_prepend_unichar   (GString	 *string,
-					 gunichar	  wc);
-GString*     g_string_prepend_len       (GString	 *string,
-			                 const gchar	 *val,
-                                         gssize           len);  
-GString*     g_string_insert            (GString	 *string,
-					 gssize		  pos,    
-					 const gchar	 *val);
-GString*     g_string_insert_c          (GString	 *string,
-					 gssize		  pos,    
-					 gchar		  c);
-GString*     g_string_insert_unichar    (GString	 *string,
-					 gssize		  pos,    
-					 gunichar	  wc);
-GString*     g_string_overwrite         (GString	 *string,
-					 gsize		  pos,    
-					 const gchar	 *val);
-GString*     g_string_overwrite_len     (GString	 *string,
-					 gsize		  pos,    
-					 const gchar	 *val,
-					 gssize           len);
-GString*     g_string_erase	        (GString	 *string,
-					 gssize		  pos,
-					 gssize		  len);
-GString*     g_string_ascii_down        (GString	 *string);
-GString*     g_string_ascii_up          (GString	 *string);
-void         g_string_vprintf           (GString	 *string,
-					 const gchar	 *format,
-					 va_list          args);
-void         g_string_printf            (GString	 *string,
-					 const gchar	 *format,
-					 ...) G_GNUC_PRINTF (2, 3);
-void         g_string_append_vprintf    (GString	 *string,
-					 const gchar	 *format,
-					 va_list          args);
-void         g_string_append_printf     (GString	 *string,
-					 const gchar	 *format,
-					 ...) G_GNUC_PRINTF (2, 3);
-GString *    g_string_append_uri_escaped(GString         *string,
-					 const char      *unescaped,
-					 const char      *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 */
-
-
-#ifndef G_DISABLE_DEPRECATED
-
-/* The following two functions are deprecated and will be removed in
- * the next major release. They use the locale-specific tolower and
- * toupper, which is almost never the right thing.
- */
-
-GString*     g_string_down              (GString	 *string);
-GString*     g_string_up                (GString	 *string);
-
-/* These aliases are included for compatibility. */
-#define	g_string_sprintf	g_string_printf
-#define	g_string_sprintfa	g_string_append_printf
-
-#endif /* G_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __G_STRING_H__ */
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gtestutils.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gtestutils.h
deleted file mode 100644
index 7deb2a38..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gtestutils.h
+++ /dev/null
@@ -1,248 +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__
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-typedef struct GTestCase  GTestCase;
-typedef struct GTestSuite GTestSuite;
-
-/* 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)
-#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 (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 */
-
-int     g_strcmp0                       (const char     *str1,
-                                         const char     *str2);
-
-/* report performance results */
-void    g_test_minimized_result         (double          minimized_quantity,
-                                         const char     *format,
-                                         ...) G_GNUC_PRINTF (2, 3);
-void    g_test_maximized_result         (double          maximized_quantity,
-                                         const char     *format,
-                                         ...) G_GNUC_PRINTF (2, 3);
-
-/* initialize testing framework */
-void    g_test_init                     (int            *argc,
-                                         char         ***argv,
-                                         ...);
-/* query testing framework config */
-#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)
-/* run all tests under toplevel suite (path: /) */
-int     g_test_run                      (void);
-/* hook up a test functions under test path */
-void    g_test_add_func                 (const char     *testpath,
-                                         void          (*test_func) (void));
-void    g_test_add_data_func            (const char     *testpath,
-                                         gconstpointer   test_data,
-                                         void          (*test_func) (gconstpointer));
-/* 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 */
-void    g_test_message                  (const char *format,
-                                         ...) G_GNUC_PRINTF (1, 2);
-void    g_test_bug_base                 (const char *uri_pattern);
-void    g_test_bug                      (const char *bug_uri_snippet);
-/* measure test timings */
-void    g_test_timer_start              (void);
-double  g_test_timer_elapsed            (void); /* elapsed seconds */
-double  g_test_timer_last               (void); /* repeat last elapsed() result */
-
-/* automatically g_free or g_object_unref upon teardown */
-void    g_test_queue_free               (gpointer gfree_pointer);
-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)
-
-/* test traps are guards used around forked tests */
-typedef enum {
-  G_TEST_TRAP_SILENCE_STDOUT    = 1 << 7,
-  G_TEST_TRAP_SILENCE_STDERR    = 1 << 8,
-  G_TEST_TRAP_INHERIT_STDIN     = 1 << 9
-} GTestTrapFlags;
-gboolean g_test_trap_fork               (guint64              usec_timeout,
-                                         GTestTrapFlags       test_trap_flags);
-gboolean g_test_trap_has_passed         (void);
-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)))
-gint32   g_test_rand_int                (void);
-gint32   g_test_rand_int_range          (gint32          begin,
-                                         gint32          end);
-double   g_test_rand_double             (void);
-double   g_test_rand_double_range       (double          range_start,
-                                         double          range_end);
-
-/* semi-internal API */
-GTestCase*    g_test_create_case        (const char     *test_name,
-                                         gsize           data_size,
-                                         gconstpointer   test_data,
-                                         void          (*data_setup) (void),
-                                         void          (*data_test) (void),
-                                         void          (*data_teardown) (void));
-GTestSuite*   g_test_create_suite       (const char     *suite_name);
-GTestSuite*   g_test_get_root           (void);
-void          g_test_suite_add          (GTestSuite     *suite,
-                                         GTestCase      *test_case);
-void          g_test_suite_add_suite    (GTestSuite     *suite,
-                                         GTestSuite     *nestedsuite);
-int           g_test_run_suite          (GTestSuite     *suite);
-
-/* internal ABI */
-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);
-void    g_assertion_message             (const char     *domain,
-                                         const char     *file,
-                                         int             line,
-                                         const char     *func,
-                                         const char     *message) G_GNUC_NORETURN;
-void    g_assertion_message_expr        (const char     *domain,
-                                         const char     *file,
-                                         int             line,
-                                         const char     *func,
-                                         const char     *expr) G_GNUC_NORETURN;
-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) G_GNUC_NORETURN;
-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) G_GNUC_NORETURN;
-void    g_test_add_vtable               (const char     *testpath,
-                                         gsize           data_size,
-                                         gconstpointer   test_data,
-                                         void          (*data_setup)    (void),
-                                         void          (*data_test)     (void),
-                                         void          (*data_teardown) (void));
-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 */
-} 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 */
-} 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;
-
-const char*     g_test_log_type_name    (GTestLogType    log_type);
-GTestLogBuffer* g_test_log_buffer_new   (void);
-void            g_test_log_buffer_free  (GTestLogBuffer *tbuffer);
-void            g_test_log_buffer_push  (GTestLogBuffer *tbuffer,
-                                         guint           n_bytes,
-                                         const guint8   *bytes);
-GTestLogMsg*    g_test_log_buffer_pop   (GTestLogBuffer *tbuffer);
-void            g_test_log_msg_free     (GTestLogMsg    *tmsg);
-
-G_END_DECLS
-
-#endif /* __G_TEST_UTILS_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gthread.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gthread.h
deleted file mode 100644
index 032507c2..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gthread.h
+++ /dev/null
@@ -1,396 +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_THREAD_H__
-#define __G_THREAD_H__
-
-#include <glib/gerror.h>
-#include <glib/gtypes.h>
-#include <glib/gutils.h>        /* for G_INLINE_FUNC */
-#include <glib/gatomic.h>       /* for g_atomic_pointer_get */
-
-G_BEGIN_DECLS
-
-/* GLib Thread support
- */
-
-extern GQuark g_thread_error_quark (void);
-#define G_THREAD_ERROR g_thread_error_quark ()
-
-typedef enum
-{
-  G_THREAD_ERROR_AGAIN /* Resource temporarily unavailable */
-} GThreadError;
-
-typedef gpointer (*GThreadFunc) (gpointer data);
-
-typedef enum
-{
-  G_THREAD_PRIORITY_LOW,
-  G_THREAD_PRIORITY_NORMAL,
-  G_THREAD_PRIORITY_HIGH,
-  G_THREAD_PRIORITY_URGENT
-} GThreadPriority;
-
-typedef struct _GThread         GThread;
-struct  _GThread
-{
-  /*< private >*/
-  GThreadFunc func;
-  gpointer data;
-  gboolean joinable;
-  GThreadPriority priority;
-};
-
-typedef struct _GMutex          GMutex;
-typedef struct _GCond           GCond;
-typedef struct _GPrivate        GPrivate;
-typedef struct _GStaticPrivate  GStaticPrivate;
-
-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 gboolean               g_threads_got_initialized;
-
-GLIB_VAR guint64   (*g_thread_gettime) (void);
-
-/* initializes the mutex/cond/private implementation for glib, might
- * only be called once, and must not be called directly or indirectly
- * from another glib-function, e.g. as a callback.
- */
-void    g_thread_init   (GThreadFunctions       *vtable);
-
-/* Errorcheck mutexes. If you define G_ERRORCHECK_MUTEXES, then all
- * mutexes will check for re-locking and re-unlocking */
-
-/* Initialize thread system with errorcheck mutexes. vtable must be
- * NULL. Do not call directly. Use #define G_ERRORCHECK_MUTEXES
- * instead.
- */
-void    g_thread_init_with_errorcheck_mutexes (GThreadFunctions* vtable);
-
-/* A random number to recognize debug calls to g_mutex_... */
-#define G_MUTEX_DEBUG_MAGIC 0xf8e18ad7
-
-#ifdef G_ERRORCHECK_MUTEXES
-#define g_thread_init(vtable) g_thread_init_with_errorcheck_mutexes (vtable)
-#endif
-
-/* internal function for fallback static mutex implementation */
-GMutex* g_static_mutex_get_mutex_impl   (GMutex **mutex);
-
-#define g_static_mutex_get_mutex_impl_shortcut(mutex) \
-  (g_atomic_pointer_get ((gpointer*)(void*)mutex) ? *(mutex) : \
-   g_static_mutex_get_mutex_impl (mutex))
-
-/* shorthands for conditional and unconditional function calls */
-
-#define G_THREAD_UF(op, arglist)					\
-    (*g_thread_functions_for_glib_use . op) arglist
-#define G_THREAD_CF(op, fail, arg)					\
-    (g_thread_supported () ? G_THREAD_UF (op, arg) : (fail))
-#define G_THREAD_ECF(op, fail, mutex, type)				\
-    (g_thread_supported () ? 						\
-      ((type(*)(GMutex*, const gulong, gchar const*))			\
-      (*g_thread_functions_for_glib_use . op))				\
-     (mutex, G_MUTEX_DEBUG_MAGIC, G_STRLOC) : (fail))
-
-#ifndef G_ERRORCHECK_MUTEXES
-# define g_mutex_lock(mutex)						\
-    G_THREAD_CF (mutex_lock,     (void)0, (mutex))
-# define g_mutex_trylock(mutex)						\
-    G_THREAD_CF (mutex_trylock,  TRUE,    (mutex))
-# define g_mutex_unlock(mutex)						\
-    G_THREAD_CF (mutex_unlock,   (void)0, (mutex))
-# define g_mutex_free(mutex)						\
-    G_THREAD_CF (mutex_free,     (void)0, (mutex))
-# define g_cond_wait(cond, mutex)					\
-    G_THREAD_CF (cond_wait,      (void)0, (cond, mutex))
-# define g_cond_timed_wait(cond, mutex, abs_time)			\
-    G_THREAD_CF (cond_timed_wait, TRUE,   (cond, mutex, abs_time))
-#else /* G_ERRORCHECK_MUTEXES */
-# define g_mutex_lock(mutex)						\
-    G_THREAD_ECF (mutex_lock,    (void)0, (mutex), void)
-# define g_mutex_trylock(mutex)						\
-    G_THREAD_ECF (mutex_trylock, TRUE,    (mutex), gboolean)
-# define g_mutex_unlock(mutex)						\
-    G_THREAD_ECF (mutex_unlock,  (void)0, (mutex), void)
-# define g_mutex_free(mutex)						\
-    G_THREAD_ECF (mutex_free,    (void)0, (mutex), void)
-# define g_cond_wait(cond, mutex)					\
-    (g_thread_supported () ? ((void(*)(GCond*, GMutex*, gulong, gchar*))\
-      g_thread_functions_for_glib_use.cond_wait)			\
-        (cond, mutex, G_MUTEX_DEBUG_MAGIC, G_STRLOC) : (void) 0)
-# define g_cond_timed_wait(cond, mutex, abs_time)			\
-    (g_thread_supported () ?						\
-      ((gboolean(*)(GCond*, GMutex*, GTimeVal*, gulong, gchar*))	\
-        g_thread_functions_for_glib_use.cond_timed_wait)		\
-          (cond, mutex, abs_time, G_MUTEX_DEBUG_MAGIC, G_STRLOC) : TRUE)
-#endif /* G_ERRORCHECK_MUTEXES */
-
-#define g_thread_supported()    (g_threads_got_initialized)
-#define g_mutex_new()            G_THREAD_UF (mutex_new,      ())
-#define g_cond_new()             G_THREAD_UF (cond_new,       ())
-#define g_cond_signal(cond)      G_THREAD_CF (cond_signal,    (void)0, (cond))
-#define g_cond_broadcast(cond)   G_THREAD_CF (cond_broadcast, (void)0, (cond))
-#define g_cond_free(cond)        G_THREAD_CF (cond_free,      (void)0, (cond))
-#define g_private_new(destructor) G_THREAD_UF (private_new, (destructor))
-#define g_private_get(private_key) G_THREAD_CF (private_get, \
-                                                ((gpointer)private_key), \
-                                                (private_key))
-#define g_private_set(private_key, value) G_THREAD_CF (private_set, \
-                                                       (void) (private_key = \
-                                                        (GPrivate*) (value)), \
-                                                       (private_key, value))
-#define g_thread_yield()              G_THREAD_CF (thread_yield, (void)0, ())
-
-#define g_thread_create(func, data, joinable, error)			\
-  (g_thread_create_full (func, data, 0, joinable, FALSE, 		\
-                         G_THREAD_PRIORITY_NORMAL, error))
-
-GThread* g_thread_create_full  (GThreadFunc            func,
-                                gpointer               data,
-                                gulong                 stack_size,
-                                gboolean               joinable,
-                                gboolean               bound,
-                                GThreadPriority        priority,
-                                GError               **error);
-GThread* g_thread_self         (void);
-void     g_thread_exit         (gpointer               retval);
-gpointer g_thread_join         (GThread               *thread);
-
-void     g_thread_set_priority (GThread               *thread,
-                                GThreadPriority        priority);
-
-/* GStaticMutexes can be statically initialized with the value
- * G_STATIC_MUTEX_INIT, and then they can directly be used, that is
- * much easier, than having to explicitly allocate the mutex before
- * use
- */
-#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))
-void g_static_mutex_init (GStaticMutex *mutex);
-void g_static_mutex_free (GStaticMutex *mutex);
-
-struct _GStaticPrivate
-{
-  /*< private >*/
-  guint index;
-};
-#define G_STATIC_PRIVATE_INIT { 0 }
-void     g_static_private_init           (GStaticPrivate   *private_key);
-gpointer g_static_private_get            (GStaticPrivate   *private_key);
-void     g_static_private_set            (GStaticPrivate   *private_key,
-					  gpointer          data,
-					  GDestroyNotify    notify);
-void     g_static_private_free           (GStaticPrivate   *private_key);
-
-typedef struct _GStaticRecMutex GStaticRecMutex;
-struct _GStaticRecMutex
-{
-  /*< private >*/
-  GStaticMutex mutex;
-  guint depth;
-  GSystemThread owner;
-};
-
-#define G_STATIC_REC_MUTEX_INIT { G_STATIC_MUTEX_INIT }
-void     g_static_rec_mutex_init        (GStaticRecMutex *mutex);
-void     g_static_rec_mutex_lock        (GStaticRecMutex *mutex);
-gboolean g_static_rec_mutex_trylock     (GStaticRecMutex *mutex);
-void     g_static_rec_mutex_unlock      (GStaticRecMutex *mutex);
-void     g_static_rec_mutex_lock_full   (GStaticRecMutex *mutex,
-                                         guint            depth);
-guint    g_static_rec_mutex_unlock_full (GStaticRecMutex *mutex);
-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 }
-
-void      g_static_rw_lock_init           (GStaticRWLock* lock);
-void      g_static_rw_lock_reader_lock    (GStaticRWLock* lock);
-gboolean  g_static_rw_lock_reader_trylock (GStaticRWLock* lock);
-void      g_static_rw_lock_reader_unlock  (GStaticRWLock* lock);
-void      g_static_rw_lock_writer_lock    (GStaticRWLock* lock);
-gboolean  g_static_rw_lock_writer_trylock (GStaticRWLock* lock);
-void      g_static_rw_lock_writer_unlock  (GStaticRWLock* lock);
-void      g_static_rw_lock_free           (GStaticRWLock* lock);
-
-void	  g_thread_foreach         	  (GFunc    	  thread_func,
-					   gpointer 	  user_data);
-
-typedef enum
-{
-  G_ONCE_STATUS_NOTCALLED,
-  G_ONCE_STATUS_PROGRESS,
-  G_ONCE_STATUS_READY  
-} GOnceStatus;
-
-typedef struct _GOnce GOnce;
-struct _GOnce
-{
-  volatile GOnceStatus status;
-  volatile gpointer retval;
-};
-
-#define G_ONCE_INIT { G_ONCE_STATUS_NOTCALLED, NULL }
-
-gpointer g_once_impl (GOnce *once, GThreadFunc func, gpointer arg);
-
-#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 */
-
-/* initialize-once guards, keyed by value_location */
-G_INLINE_FUNC gboolean  g_once_init_enter       (volatile gsize *value_location);
-gboolean                g_once_init_enter_impl  (volatile gsize *value_location);
-void                    g_once_init_leave       (volatile gsize *value_location,
-                                                 gsize           initialization_value);
-#if defined (G_CAN_INLINE) || defined (__G_THREAD_C__)
-G_INLINE_FUNC gboolean
-g_once_init_enter (volatile gsize *value_location)
-{
-  if G_LIKELY (g_atomic_pointer_get ((void*volatile*) value_location) != NULL)
-    return FALSE;
-  else
-    return g_once_init_enter_impl (value_location);
-}
-#endif /* G_CAN_INLINE || __G_THREAD_C__ */
-
-/* these are some convenience macros that expand to nothing if GLib
- * was configured with --disable-threads. for using StaticMutexes,
- * you define them with G_LOCK_DEFINE_STATIC (name) or G_LOCK_DEFINE (name)
- * if you need to export the mutex. With G_LOCK_EXTERN (name) you can
- * declare such an globally defined lock. name is a unique identifier
- * for the protected varibale or code portion. locking, testing and
- * unlocking of such mutexes can be done with G_LOCK(), G_UNLOCK() and
- * G_TRYLOCK() respectively.
- */
-extern void glib_dummy_decl (void);
-#define G_LOCK_NAME(name)               g__ ## name ## _lock
-#ifdef  G_THREADS_ENABLED
-#  define G_LOCK_DEFINE_STATIC(name)    static G_LOCK_DEFINE (name)
-#  define G_LOCK_DEFINE(name)           \
-    GStaticMutex G_LOCK_NAME (name) = G_STATIC_MUTEX_INIT
-#  define G_LOCK_EXTERN(name)           extern GStaticMutex 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_static_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_static_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_static_mutex_trylock (&G_LOCK_NAME (name)))
-#  else  /* !G_DEBUG_LOCKS */
-#    define G_LOCK(name) g_static_mutex_lock       (&G_LOCK_NAME (name))
-#    define G_UNLOCK(name) g_static_mutex_unlock   (&G_LOCK_NAME (name))
-#    define G_TRYLOCK(name) g_static_mutex_trylock (&G_LOCK_NAME (name))
-#  endif /* !G_DEBUG_LOCKS */
-#else   /* !G_THREADS_ENABLED */
-#  define G_LOCK_DEFINE_STATIC(name)    extern void glib_dummy_decl (void)
-#  define G_LOCK_DEFINE(name)           extern void glib_dummy_decl (void)
-#  define G_LOCK_EXTERN(name)           extern void glib_dummy_decl (void)
-#  define G_LOCK(name)
-#  define G_UNLOCK(name)
-#  define G_TRYLOCK(name)               (TRUE)
-#endif  /* !G_THREADS_ENABLED */
-
-
-G_END_DECLS
-
-#endif /* __G_THREAD_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gthreadpool.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gthreadpool.h
deleted file mode 100644
index 91a02d6a..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gthreadpool.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_THREADPOOL_H__
-#define __G_THREADPOOL_H__
-
-#include <glib/gthread.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GThreadPool     GThreadPool;
-
-/* Thread Pools
- */
-
-/* The real GThreadPool is bigger, so you may only create a thread
- * pool with the constructor function */
-struct _GThreadPool
-{
-  GFunc func;
-  gpointer user_data;
-  gboolean exclusive;
-};
-
-/* Get a thread pool with the function func, at most max_threads may
- * run at a time (max_threads == -1 means no limit), exclusive == TRUE
- * means, that the threads shouldn't be shared and that they will be
- * prestarted (otherwise they are started as needed) user_data is the
- * 2nd argument to the func */
-GThreadPool*    g_thread_pool_new             (GFunc            func,
-                                               gpointer         user_data,
-                                               gint             max_threads,
-                                               gboolean         exclusive,
-                                               GError         **error);
-
-/* Push new data into the thread pool. This task is assigned to a thread later
- * (when the maximal number of threads is reached for that pool) or now
- * (otherwise). If necessary a new thread will be started. The function
- * returns immediatly */
-void            g_thread_pool_push            (GThreadPool     *pool,
-                                               gpointer         data,
-                                               GError         **error);
-
-/* Set the number of threads, which can run concurrently for that pool, -1
- * means no limit. 0 means has the effect, that the pool won't process
- * requests until the limit is set higher again */
-void            g_thread_pool_set_max_threads (GThreadPool     *pool,
-                                               gint             max_threads,
-                                               GError         **error);
-gint            g_thread_pool_get_max_threads (GThreadPool     *pool);
-
-/* Get the number of threads assigned to that pool. This number doesn't
- * necessarily represent the number of working threads in that pool */
-guint           g_thread_pool_get_num_threads (GThreadPool     *pool);
-
-/* Get the number of unprocessed items in the pool */
-guint           g_thread_pool_unprocessed     (GThreadPool     *pool);
-
-/* Free the pool, immediate means, that all unprocessed items in the queue
- * wont be processed, wait means, that the function doesn't return immediatly,
- * but after all threads in the pool are ready processing items. immediate
- * does however not mean, that threads are killed. */
-void            g_thread_pool_free            (GThreadPool     *pool,
-                                               gboolean         immediate,
-                                               gboolean         wait_);
-
-/* Set the maximal number of unused threads before threads will be stopped by
- * GLib, -1 means no limit */
-void            g_thread_pool_set_max_unused_threads (gint      max_threads);
-gint            g_thread_pool_get_max_unused_threads (void);
-guint           g_thread_pool_get_num_unused_threads (void);
-
-/* Stop all currently unused threads, but leave the limit untouched */
-void            g_thread_pool_stop_unused_threads    (void);
-
-/* Set sort function for priority threading */
-void            g_thread_pool_set_sort_function      (GThreadPool      *pool,
-		                                      GCompareDataFunc  func,
-						      gpointer          user_data);
-
-/* Set maximum time a thread can be idle in the pool before it is stopped */
-void            g_thread_pool_set_max_idle_time      (guint             interval);
-guint           g_thread_pool_get_max_idle_time      (void);
-
-G_END_DECLS
-
-#endif /* __G_THREADPOOL_H__ */
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gtimer.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gtimer.h
deleted file mode 100644
index d602ae1b..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gtimer.h
+++ /dev/null
@@ -1,61 +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__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/* Timer
- */
-
-/* microseconds per second */
-typedef struct _GTimer		GTimer;
-
-#define G_USEC_PER_SEC 1000000
-
-GTimer*  g_timer_new	         (void);
-void	 g_timer_destroy         (GTimer      *timer);
-void	 g_timer_start	         (GTimer      *timer);
-void	 g_timer_stop	         (GTimer      *timer);
-void	 g_timer_reset	         (GTimer      *timer);
-void	 g_timer_continue        (GTimer      *timer);
-gdouble  g_timer_elapsed         (GTimer      *timer,
-				  gulong      *microseconds);
-
-void     g_usleep                (gulong       microseconds);
-
-void     g_time_val_add          (GTimeVal    *time_, 
-                                  glong        microseconds);
-gboolean g_time_val_from_iso8601 (const gchar *iso_date,
-				  GTimeVal    *time_);
-gchar*   g_time_val_to_iso8601   (GTimeVal    *time_) G_GNUC_MALLOC;
-
-G_END_DECLS
-
-#endif /* __G_TIMER_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gtree.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gtree.h
deleted file mode 100644
index bab71279..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gtree.h
+++ /dev/null
@@ -1,88 +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__
-
-#include <glib/gnode.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GTree  GTree;
-
-typedef gboolean (*GTraverseFunc) (gpointer  key,
-                                   gpointer  value,
-                                   gpointer  data);
-
-/* Balanced binary trees
- */
-GTree*   g_tree_new             (GCompareFunc      key_compare_func);
-GTree*   g_tree_new_with_data   (GCompareDataFunc  key_compare_func,
-                                 gpointer          key_compare_data);
-GTree*   g_tree_new_full        (GCompareDataFunc  key_compare_func,
-                                 gpointer          key_compare_data,
-                                 GDestroyNotify    key_destroy_func,
-                                 GDestroyNotify    value_destroy_func);
-void     g_tree_destroy         (GTree            *tree);
-void     g_tree_insert          (GTree            *tree,
-                                 gpointer          key,
-                                 gpointer          value);
-void     g_tree_replace         (GTree            *tree,
-                                 gpointer          key,
-                                 gpointer          value);
-gboolean g_tree_remove          (GTree            *tree,
-                                 gconstpointer     key);
-gboolean g_tree_steal           (GTree            *tree,
-                                 gconstpointer     key);
-gpointer g_tree_lookup          (GTree            *tree,
-                                 gconstpointer     key);
-gboolean g_tree_lookup_extended (GTree            *tree,
-                                 gconstpointer     lookup_key,
-                                 gpointer         *orig_key,
-                                 gpointer         *value);
-void     g_tree_foreach         (GTree            *tree,
-                                 GTraverseFunc	   func,
-                                 gpointer	   user_data);
-
-#ifndef G_DISABLE_DEPRECATED
-void     g_tree_traverse        (GTree            *tree,
-                                 GTraverseFunc     traverse_func,
-                                 GTraverseType     traverse_type,
-                                 gpointer          user_data);
-#endif /* G_DISABLE_DEPRECATED */
-
-gpointer g_tree_search          (GTree            *tree,
-                                 GCompareFunc      search_func,
-                                 gconstpointer     user_data);
-gint     g_tree_height          (GTree            *tree);
-gint     g_tree_nnodes          (GTree            *tree);
-
-
-
-G_END_DECLS
-
-#endif /* __G_TREE_H__ */
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gtypes.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gtypes.h
deleted file mode 100644
index eaeabd2a..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gtypes.h
+++ /dev/null
@@ -1,429 +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__
-
-#include <glibconfig.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);
-typedef void            (*GFreeFunc)            (gpointer       data);
-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 defined (__i386__)
-#    define GUINT16_SWAP_LE_BE_IA32(val) \
-       (__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) \
-	  (__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) \
-	  (__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) \
-       (__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))
-#    define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_IA32 (val))
-#    define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_IA32 (val))
-#  elif defined (__ia64__)
-#    define GUINT16_SWAP_LE_BE_IA64(val) \
-       (__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) \
-       (__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) \
-       (__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))
-#    define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_IA64 (val))
-#    define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_IA64 (val))
-#  elif defined (__x86_64__)
-#    define GUINT32_SWAP_LE_BE_X86_64(val) \
-       (__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) \
-       (__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))
-#    define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_X86_64 (val))
-#    define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_X86_64 (val))
-#  else /* generic gcc */
-#    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
-#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))
-
-
-/* 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 extern
-#  endif /* !G_PLATFORM_WIN32 */
-#endif /* GLIB_VAR */
-
-#endif /* __G_TYPES_H__ */
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gunicode.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gunicode.h
deleted file mode 100644
index d27878cb..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gunicode.h
+++ /dev/null
@@ -1,401 +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__
-
-#include <glib/gerror.h>
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-typedef guint32 gunichar;
-typedef guint16 gunichar2;
-
-/* These are the possible character classifications.
- * See http://www.unicode.org/Public/UNIDATA/UCD.html#General_Category_Values
- */
-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_COMBINING_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;
-
-/* These are the possible line break classifications.
- * Note that new types may be added in the future.
- * Implementations may regard unknown values like G_UNICODE_BREAK_UNKNOWN
- * See http://www.unicode.org/unicode/reports/tr14/
- */
-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
-} GUnicodeBreakType;
-
-typedef enum 
-{                         /* ISO 15924 code */
-  G_UNICODE_SCRIPT_INVALID_CODE = -1,
-  G_UNICODE_SCRIPT_COMMON       = 0,   /* Zyyy */
-  G_UNICODE_SCRIPT_INHERITED,          /* 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,             /* 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,
-  G_UNICODE_SCRIPT_LEPCHA,
-  G_UNICODE_SCRIPT_REJANG,
-  G_UNICODE_SCRIPT_SUNDANESE,
-  G_UNICODE_SCRIPT_SAURASHTRA,
-  G_UNICODE_SCRIPT_CHAM,
-  G_UNICODE_SCRIPT_OL_CHIKI,
-  G_UNICODE_SCRIPT_VAI,
-  G_UNICODE_SCRIPT_CARIAN,
-  G_UNICODE_SCRIPT_LYCIAN,
-  G_UNICODE_SCRIPT_LYDIAN
-} GUnicodeScript;
-
-/* Returns TRUE if current locale uses UTF-8 charset.  If CHARSET is
- * not null, sets *CHARSET to the name of the current locale's
- * charset.  This value is statically allocated, and should be copied
- * in case the locale's charset will be changed later using setlocale()
- * or in some other way.
- */
-gboolean g_get_charset (G_CONST_RETURN char **charset);
-
-/* These are all analogs of the <ctype.h> functions.
- */
-gboolean g_unichar_isalnum   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isalpha   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_iscntrl   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isdigit   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isgraph   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_islower   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isprint   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_ispunct   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isspace   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isupper   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isxdigit  (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_istitle   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isdefined (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_iswide    (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_iswide_cjk(gunichar c) G_GNUC_CONST;
-gboolean g_unichar_iszerowidth(gunichar c) G_GNUC_CONST;
-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.  */
-gunichar g_unichar_toupper (gunichar c) G_GNUC_CONST;
-gunichar g_unichar_tolower (gunichar c) G_GNUC_CONST;
-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.  */
-gint g_unichar_digit_value (gunichar c) G_GNUC_CONST;
-
-gint g_unichar_xdigit_value (gunichar c) G_GNUC_CONST;
-
-/* Return the Unicode character type of a given character.  */
-GUnicodeType g_unichar_type (gunichar c) G_GNUC_CONST;
-
-/* Return the line break property for a given character */
-GUnicodeBreakType g_unichar_break_type (gunichar c) G_GNUC_CONST;
-
-/* Returns the combining class for a given character */
-gint g_unichar_combining_class (gunichar uc) G_GNUC_CONST;
-
-
-/* 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.  */
-void g_unicode_canonical_ordering (gunichar *string,
-				   gsize     len);
-
-/* Compute canonical decomposition of a character.  Returns g_malloc()d
-   string of Unicode characters.  RESULT_LEN is set to the resulting
-   length of the string.  */
-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;
-
-#define g_utf8_next_char(p) (char *)((p) + g_utf8_skip[*(const guchar *)(p)])
-
-gunichar g_utf8_get_char           (const gchar  *p) G_GNUC_PURE;
-gunichar g_utf8_get_char_validated (const  gchar *p,
-				    gssize        max_len) G_GNUC_PURE;
-
-gchar*   g_utf8_offset_to_pointer (const gchar *str,
-                                   glong        offset) G_GNUC_PURE;
-glong    g_utf8_pointer_to_offset (const gchar *str,      
-				   const gchar *pos) G_GNUC_PURE;
-gchar*   g_utf8_prev_char         (const gchar *p) G_GNUC_PURE;
-gchar*   g_utf8_find_next_char    (const gchar *p,
-				   const gchar *end) G_GNUC_PURE;
-gchar*   g_utf8_find_prev_char    (const gchar *str,
-				   const gchar *p) G_GNUC_PURE;
-
-glong g_utf8_strlen (const gchar *p,  
-		     gssize       max) G_GNUC_PURE;
-
-/* Copies n characters from src to dest */
-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 */
-gchar* g_utf8_strchr  (const gchar *p,
-		       gssize       len,
-		       gunichar     c);
-gchar* g_utf8_strrchr (const gchar *p,
-		       gssize       len,
-		       gunichar     c);
-gchar* g_utf8_strreverse (const gchar *str,
-			  gssize len);
-
-gunichar2 *g_utf8_to_utf16     (const gchar      *str,
-				glong             len,            
-				glong            *items_read,     
-				glong            *items_written,  
-				GError          **error) G_GNUC_MALLOC;
-gunichar * g_utf8_to_ucs4      (const gchar      *str,
-				glong             len,            
-				glong            *items_read,     
-				glong            *items_written,  
-				GError          **error) G_GNUC_MALLOC;
-gunichar * g_utf8_to_ucs4_fast (const gchar      *str,
-				glong             len,            
-				glong            *items_written) G_GNUC_MALLOC; 
-gunichar * g_utf16_to_ucs4     (const gunichar2  *str,
-				glong             len,            
-				glong            *items_read,     
-				glong            *items_written,  
-				GError          **error) G_GNUC_MALLOC;
-gchar*     g_utf16_to_utf8     (const gunichar2  *str,
-				glong             len,            
-				glong            *items_read,     
-				glong            *items_written,  
-				GError          **error) G_GNUC_MALLOC;
-gunichar2 *g_ucs4_to_utf16     (const gunichar   *str,
-				glong             len,            
-				glong            *items_read,     
-				glong            *items_written,  
-				GError          **error) G_GNUC_MALLOC;
-gchar*     g_ucs4_to_utf8      (const gunichar   *str,
-				glong             len,            
-				glong            *items_read,     
-				glong            *items_written,  
-				GError          **error) G_GNUC_MALLOC;
-
-/* Convert a single character into UTF-8. outbuf must have at
- * least 6 bytes of space. Returns the number of bytes in the
- * result.
- */
-gint      g_unichar_to_utf8 (gunichar    c,
-			     gchar      *outbuf);
-
-/* Validate a UTF8 string, return TRUE if valid, put pointer to
- * first invalid char in **end
- */
-
-gboolean g_utf8_validate (const gchar  *str,
-                          gssize        max_len,  
-                          const gchar **end);
-
-/* Validate a Unicode character */
-gboolean g_unichar_validate (gunichar ch) G_GNUC_CONST;
-
-gchar *g_utf8_strup   (const gchar *str,
-		       gssize       len) G_GNUC_MALLOC;
-gchar *g_utf8_strdown (const gchar *str,
-		       gssize       len) G_GNUC_MALLOC;
-gchar *g_utf8_casefold (const gchar *str,
-			gssize       len) G_GNUC_MALLOC;
-
-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;
-
-gchar *g_utf8_normalize (const gchar   *str,
-			 gssize         len,
-			 GNormalizeMode mode) G_GNUC_MALLOC;
-
-gint   g_utf8_collate     (const gchar *str1,
-			   const gchar *str2) G_GNUC_PURE;
-gchar *g_utf8_collate_key (const gchar *str,
-			   gssize       len) G_GNUC_MALLOC;
-gchar *g_utf8_collate_key_for_filename (const gchar *str,
-			                gssize       len) G_GNUC_MALLOC;
-
-gboolean g_unichar_get_mirror_char (gunichar ch,
-                                    gunichar *mirrored_ch);
-
-GUnicodeScript g_unichar_get_script (gunichar ch) G_GNUC_CONST;
-
-
-/* private */
-
-gchar *_g_utf8_make_valid (const gchar *name);
-
-
-G_END_DECLS
-
-#endif /* __G_UNICODE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gurifuncs.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gurifuncs.h
deleted file mode 100644
index 62f1dd28..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gurifuncs.h
+++ /dev/null
@@ -1,77 +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__
-
-#include <glib.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 ":"
-
-char *   g_uri_unescape_string       (const char *escaped_string,
-				      const char *illegal_characters);
-char *   g_uri_unescape_segment      (const char *escaped_string,
-				      const char *escaped_string_end,
-				      const char *illegal_characters);
-char *   g_uri_parse_scheme          (const char *uri);
-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/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gutils.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gutils.h
deleted file mode 100644
index 7685809f..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gutils.h
+++ /dev/null
@@ -1,477 +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__
-
-#include <glib/gtypes.h>
-#include <stdarg.h>
-
-G_BEGIN_DECLS
-
-#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 */
-
-/* Unix */
-
-#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 */
-
-/* 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
-#  undef  G_CAN_INLINE
-#elif defined (__GNUC__) 
-#  if defined (__GNUC_STDC_INLINE__) || defined (__GNUC_GNU_INLINE__)
-#   define G_INLINE_FUNC extern inline __attribute__ ((__gnu_inline__))
-#  else
-#   define G_INLINE_FUNC extern inline
-#  endif
-#elif defined (G_CAN_INLINE) 
-#  define G_INLINE_FUNC static inline
-#else /* can't inline */
-#  define G_INLINE_FUNC
-#endif /* !G_INLINE_FUNC */
-
-/* Retrive static string info
- */
-#ifdef G_OS_WIN32
-#define g_get_user_name g_get_user_name_utf8
-#define g_get_real_name g_get_real_name_utf8
-#define g_get_home_dir g_get_home_dir_utf8
-#define g_get_tmp_dir g_get_tmp_dir_utf8
-#endif
-
-G_CONST_RETURN gchar* g_get_user_name        (void);
-G_CONST_RETURN gchar* g_get_real_name        (void);
-G_CONST_RETURN gchar* g_get_home_dir         (void);
-G_CONST_RETURN gchar* g_get_tmp_dir          (void);
-G_CONST_RETURN gchar* g_get_host_name	     (void);
-gchar*                g_get_prgname          (void);
-void                  g_set_prgname          (const gchar *prgname);
-G_CONST_RETURN gchar* g_get_application_name (void);
-void                  g_set_application_name (const gchar *application_name);
-
-G_CONST_RETURN gchar*    g_get_user_data_dir      (void);
-G_CONST_RETURN gchar*    g_get_user_config_dir    (void);
-G_CONST_RETURN gchar*    g_get_user_cache_dir     (void);
-G_CONST_RETURN gchar* G_CONST_RETURN * g_get_system_data_dirs   (void);
-
-#ifdef G_OS_WIN32
-G_CONST_RETURN gchar* G_CONST_RETURN * g_win32_get_system_data_dirs_for_module (gconstpointer address);
-#endif
-
-#if defined (G_OS_WIN32) && defined (G_CAN_INLINE) && !defined (__cplusplus)
-static inline G_CONST_RETURN gchar * G_CONST_RETURN *
-g_win32_get_system_data_dirs (void)
-{
-  return g_win32_get_system_data_dirs_for_module ((gconstpointer) &g_win32_get_system_data_dirs);
-}
-#define g_get_system_data_dirs g_win32_get_system_data_dirs
-#endif
-
-G_CONST_RETURN gchar* G_CONST_RETURN * g_get_system_config_dirs (void);
-
-G_CONST_RETURN gchar* G_CONST_RETURN * g_get_language_names (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;
-
-G_CONST_RETURN gchar* g_get_user_special_dir (GUserDirectory directory);
-
-typedef struct _GDebugKey	GDebugKey;
-struct _GDebugKey
-{
-  gchar *key;
-  guint	 value;
-};
-
-/* Miscellaneous utility functions
- */
-guint                 g_parse_debug_string (const gchar     *string,
-					    const GDebugKey *keys,
-					    guint            nkeys);
-
-gint                  g_snprintf           (gchar       *string,
-					    gulong       n,
-					    gchar const *format,
-					    ...) G_GNUC_PRINTF (3, 4);
-gint                  g_vsnprintf          (gchar       *string,
-					    gulong       n,
-					    gchar const *format,
-					    va_list      args);
-
-/* Check if a file name is an absolute path */
-gboolean              g_path_is_absolute   (const gchar *file_name);
-
-/* In case of absolute paths, skip the root part */
-G_CONST_RETURN gchar* g_path_skip_root     (const gchar *file_name);
-
-#ifndef G_DISABLE_DEPRECATED
-
-/* These two functions are deprecated and will be removed in the next
- * major release of GLib. Use g_path_get_dirname/g_path_get_basename
- * instead. Whatch out! The string returned by g_path_get_basename
- * must be g_freed, while the string returned by g_basename must not.*/
-G_CONST_RETURN gchar* g_basename           (const gchar *file_name);
-#define g_dirname g_path_get_dirname
-
-#endif /* G_DISABLE_DEPRECATED */
-
-#ifdef G_OS_WIN32
-#define g_get_current_dir g_get_current_dir_utf8
-#endif
-
-/* The returned strings are newly allocated with g_malloc() */
-gchar*                g_get_current_dir    (void);
-gchar*                g_path_get_basename  (const gchar *file_name) G_GNUC_MALLOC;
-gchar*                g_path_get_dirname   (const gchar *file_name) G_GNUC_MALLOC;
-
-/* Set the pointer at the specified location to NULL */
-void                  g_nullify_pointer    (gpointer    *nullify_location);
-
-/* return the environment string for the variable. The returned memory
- * must not be freed. */
-#ifdef G_OS_WIN32
-#define g_getenv g_getenv_utf8
-#define g_setenv g_setenv_utf8
-#define g_unsetenv g_unsetenv_utf8
-#define g_find_program_in_path g_find_program_in_path_utf8
-#endif
-
-G_CONST_RETURN gchar* g_getenv             (const gchar *variable);
-gboolean              g_setenv             (const gchar *variable,
-					    const gchar *value,
-					    gboolean     overwrite);
-void                  g_unsetenv           (const gchar *variable);
-gchar**               g_listenv            (void);
-
-/* private */
-const gchar*	     _g_getenv_nomalloc	   (const gchar	*variable,
-					    gchar        buffer[1024]);
-
-/* we try to provide a useful equivalent for ATEXIT if it is
- * not defined, but use is actually abandoned. people should
- * use g_atexit() instead.
- */
-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.
- */
-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).
- */
-int atexit (void (*)(void));
-#define g_atexit(func) atexit(func)
-#endif
-
-/* Look for an executable in PATH, following execvp() rules */
-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;
-
-/* Trash Stacks
- * elements need to be >= sizeof (gpointer)
- */
-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);
-
-/* 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 * 8 - 1) ^ __builtin_clzl(number)) + 1 : 1;
-#else
-  register guint n_bits = 0;
-  
-  do
-    {
-      n_bits++;
-      number >>= 1;
-    }
-  while (number);
-  return n_bits;
-#endif
-}
-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_UTILS_C__ */
-
-/* Glib version.
- * we prefix variable declarations so they can
- * properly get exported in windows dlls.
- */
-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;
-
-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
-
-/*
- * This macro will be deprecated in the future. This DllMain() is too
- * complex. It is recommended to have a DLlMain() that just saves the
- * handle to the DLL and then use that handle in normal code 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_PLATFORM_WIN32 */
-
-#endif /* __G_UTILS_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gwin32.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gwin32.h
deleted file mode 100644
index 7b6aa141..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/glib/gwin32.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_WIN32_H__
-#define __G_WIN32_H__
-
-#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:
- */
-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().
- */
-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().
- */
-gchar*          g_win32_error_message (gint error);
-
-#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
-
-gchar*          g_win32_get_package_installation_directory (const gchar *package,
-							    const gchar *dll_name);
-
-gchar*          g_win32_get_package_installation_subdirectory (const gchar *package,
-							       const gchar *dll_name,
-							       const gchar *subdir);
-
-gchar*          g_win32_get_package_installation_directory_of_module (gpointer hmodule);
-
-guint		g_win32_get_windows_version (void);
-
-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 */
-
-#endif /* __G_WIN32_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gmodule.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gmodule.h
deleted file mode 100644
index ae7f8e54..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gmodule.h
+++ /dev/null
@@ -1,101 +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);
-
-#ifdef G_OS_WIN32
-#define g_module_open g_module_open_utf8
-#define g_module_name g_module_name_utf8
-#endif
-
-/* return TRUE if dynamic module loading is supported */
-gboolean	g_module_supported	   (void) G_GNUC_CONST;
-
-/* open a module `file_name' and return handle, which is NULL on error */
-GModule*              g_module_open          (const gchar  *file_name,
-					      GModuleFlags  flags);
-
-/* close a previously opened module, returns TRUE on success */
-gboolean              g_module_close         (GModule      *module);
-
-/* make a module resident so g_module_close on it will be ignored */
-void                  g_module_make_resident (GModule      *module);
-
-/* query the last module error as a string */
-G_CONST_RETURN gchar* g_module_error         (void);
-
-/* retrieve a symbol pointer from `module', returns TRUE on success */
-gboolean              g_module_symbol        (GModule      *module,
-					      const gchar  *symbol_name,
-					      gpointer     *symbol);
-
-/* retrieve the file name from an existing module */
-G_CONST_RETURN 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 accoring 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.
- */
-gchar*                g_module_build_path    (const gchar  *directory,
-					      const gchar  *module_name);
-
-
-G_END_DECLS
-
-#endif /* __GMODULE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gboxed.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gboxed.h
deleted file mode 100644
index 622b1e76..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gboxed.h
+++ /dev/null
@@ -1,89 +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.
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_BOXED_H__
-#define __G_BOXED_H__
-
-#include        <gobject/gtype.h>
-
-G_BEGIN_DECLS
-
-/* --- type macros --- */
-#define G_TYPE_IS_BOXED(type)	   (G_TYPE_FUNDAMENTAL (type) == G_TYPE_BOXED)
-#define G_VALUE_HOLDS_BOXED(value) (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_BOXED))
-
-
-/* --- typedefs --- */
-typedef gpointer (*GBoxedCopyFunc)	(gpointer	 boxed);
-typedef void     (*GBoxedFreeFunc)	(gpointer	 boxed);
-
-
-/* --- prototypes --- */
-gpointer	g_boxed_copy			(GType		 boxed_type,
-						 gconstpointer	 src_boxed);
-void		g_boxed_free			(GType		 boxed_type,
-						 gpointer	 boxed);
-void		g_value_set_boxed		(GValue		*value,
-						 gconstpointer	 v_boxed);
-void		g_value_set_static_boxed	(GValue		*value,
-						 gconstpointer	 v_boxed);
-gpointer	g_value_get_boxed		(const GValue	*value);
-gpointer	g_value_dup_boxed		(const GValue	*value);
-
-
-/* --- convenience --- */
-GType	g_boxed_type_register_static		(const gchar	*name,
-						 GBoxedCopyFunc	 boxed_copy,
-						 GBoxedFreeFunc	 boxed_free);
-
-
-/* --- GLib boxed types --- */
-#define	G_TYPE_CLOSURE		(g_closure_get_type ())
-#define	G_TYPE_VALUE		(g_value_get_type ())
-#define	G_TYPE_VALUE_ARRAY	(g_value_array_get_type ())
-#define	G_TYPE_DATE	        (g_date_get_type ())
-#define	G_TYPE_STRV	        (g_strv_get_type ())
-#define	G_TYPE_GSTRING		(g_gstring_get_type ())
-#define	G_TYPE_HASH_TABLE	(g_hash_table_get_type ())
-#define	G_TYPE_REGEX		(g_regex_get_type ())
-
-
-void    g_value_take_boxed      (GValue		*value,
-				 gconstpointer	 v_boxed);
-#ifndef G_DISABLE_DEPRECATED
-void	g_value_set_boxed_take_ownership	(GValue		*value,
-						 gconstpointer	 v_boxed);
-#endif
-GType	g_closure_get_type	(void)	G_GNUC_CONST;
-GType	g_value_get_type	(void)	G_GNUC_CONST;
-GType	g_value_array_get_type	(void)	G_GNUC_CONST;
-GType	g_date_get_type	        (void)	G_GNUC_CONST;
-GType	g_strv_get_type	        (void)	G_GNUC_CONST;
-GType	g_gstring_get_type      (void)	G_GNUC_CONST;
-GType   g_hash_table_get_type   (void)  G_GNUC_CONST;
-GType   g_regex_get_type        (void)  G_GNUC_CONST;
-
-typedef gchar** GStrv;
-     
-G_END_DECLS
-
-#endif	/* __G_BOXED_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gclosure.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gclosure.h
deleted file mode 100644
index c4b6208b..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gclosure.h
+++ /dev/null
@@ -1,166 +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.
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_CLOSURE_H__
-#define __G_CLOSURE_H__
-
-#include        <gobject/gtype.h>
-
-G_BEGIN_DECLS
-
-/* --- defines --- */
-#define	G_CLOSURE_NEEDS_MARSHAL(closure) (((GClosure*) (closure))->marshal == NULL)
-#define	G_CLOSURE_N_NOTIFIERS(cl)	 ((cl)->meta_marshal + ((cl)->n_guards << 1L) + \
-                                          (cl)->n_fnotifiers + (cl)->n_inotifiers)
-#define	G_CCLOSURE_SWAP_DATA(cclosure)	 (((GClosure*) (cclosure))->derivative_flag)
-#define	G_CALLBACK(f)			 ((GCallback) (f))
-
-
-/* -- typedefs --- */
-typedef struct _GClosure		 GClosure;
-typedef struct _GClosureNotifyData	 GClosureNotifyData;
-typedef void  (*GCallback)              (void);
-typedef void  (*GClosureNotify)		(gpointer	 data,
-					 GClosure	*closure);
-typedef void  (*GClosureMarshal)	(GClosure	*closure,
-					 GValue         *return_value,
-					 guint           n_param_values,
-					 const GValue   *param_values,
-					 gpointer        invocation_hint,
-					 gpointer	 marshal_data);
-typedef struct _GCClosure		 GCClosure;
-
-
-/* --- structures --- */
-struct _GClosureNotifyData
-{
-  gpointer       data;
-  GClosureNotify notify;
-};
-struct _GClosure
-{
-  /*< private >*/
-  volatile      	guint	 ref_count : 15;
-  volatile       	guint	 meta_marshal : 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 --- */
-GClosure* g_cclosure_new			(GCallback	callback_func,
-						 gpointer	user_data,
-						 GClosureNotify destroy_data);
-GClosure* g_cclosure_new_swap			(GCallback	callback_func,
-						 gpointer	user_data,
-						 GClosureNotify destroy_data);
-GClosure* g_signal_type_cclosure_new		(GType          itype,
-						 guint          struct_offset);
-
-
-/* --- prototypes --- */
-GClosure* g_closure_ref				(GClosure	*closure);
-void	  g_closure_sink			(GClosure	*closure);
-void	  g_closure_unref			(GClosure	*closure);
-/* intimidating */
-GClosure* g_closure_new_simple			(guint		 sizeof_closure,
-						 gpointer	 data);
-void	  g_closure_add_finalize_notifier	(GClosure       *closure,
-						 gpointer	 notify_data,
-						 GClosureNotify	 notify_func);
-void	  g_closure_remove_finalize_notifier	(GClosure       *closure,
-						 gpointer	 notify_data,
-						 GClosureNotify	 notify_func);
-void	  g_closure_add_invalidate_notifier	(GClosure       *closure,
-						 gpointer	 notify_data,
-						 GClosureNotify	 notify_func);
-void	  g_closure_remove_invalidate_notifier	(GClosure       *closure,
-						 gpointer	 notify_data,
-						 GClosureNotify	 notify_func);
-void	  g_closure_add_marshal_guards		(GClosure	*closure,
-						 gpointer        pre_marshal_data,
-						 GClosureNotify	 pre_marshal_notify,
-						 gpointer        post_marshal_data,
-						 GClosureNotify	 post_marshal_notify);
-void	  g_closure_set_marshal			(GClosure	*closure,
-						 GClosureMarshal marshal);
-void	  g_closure_set_meta_marshal		(GClosure       *closure,
-						 gpointer	 marshal_data,
-						 GClosureMarshal meta_marshal);
-void	  g_closure_invalidate			(GClosure	*closure);
-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
-*/
-
-G_END_DECLS
-
-#endif /* __G_CLOSURE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/genums.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/genums.h
deleted file mode 100644
index 5d16c53c..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/genums.h
+++ /dev/null
@@ -1,125 +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.
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_ENUMS_H__
-#define __G_ENUMS_H__
-
-#include <gobject/gtype.h>
-
-G_BEGIN_DECLS
-
-/* --- type macros --- */
-#define G_TYPE_IS_ENUM(type)	       (G_TYPE_FUNDAMENTAL (type) == G_TYPE_ENUM)
-#define G_ENUM_CLASS(class)	       (G_TYPE_CHECK_CLASS_CAST ((class), G_TYPE_ENUM, GEnumClass))
-#define G_IS_ENUM_CLASS(class)	       (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_ENUM))
-#define G_ENUM_CLASS_TYPE(class)       (G_TYPE_FROM_CLASS (class))
-#define G_ENUM_CLASS_TYPE_NAME(class)  (g_type_name (G_ENUM_CLASS_TYPE (class)))
-#define G_TYPE_IS_FLAGS(type)	       (G_TYPE_FUNDAMENTAL (type) == G_TYPE_FLAGS)
-#define G_FLAGS_CLASS(class)	       (G_TYPE_CHECK_CLASS_CAST ((class), G_TYPE_FLAGS, GFlagsClass))
-#define G_IS_FLAGS_CLASS(class)        (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_FLAGS))
-#define G_FLAGS_CLASS_TYPE(class)      (G_TYPE_FROM_CLASS (class))
-#define G_FLAGS_CLASS_TYPE_NAME(class) (g_type_name (G_FLAGS_CLASS_TYPE (class)))
-#define G_VALUE_HOLDS_ENUM(value)      (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_ENUM))
-#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;
-struct	_GEnumClass
-{
-  GTypeClass  g_type_class;
-
-  /*< public >*/  
-  gint	      minimum;
-  gint	      maximum;
-  guint	      n_values;
-  GEnumValue *values;
-};
-struct	_GFlagsClass
-{
-  GTypeClass   g_type_class;
-  
-  /*< public >*/  
-  guint	       mask;
-  guint	       n_values;
-  GFlagsValue *values;
-};
-struct _GEnumValue
-{
-  gint	 value;
-  const gchar *value_name;
-  const gchar *value_nick;
-};
-struct _GFlagsValue
-{
-  guint	 value;
-  const gchar *value_name;
-  const gchar *value_nick;
-};
-
-
-/* --- prototypes --- */
-GEnumValue*	g_enum_get_value		(GEnumClass	*enum_class,
-						 gint		 value);
-GEnumValue*	g_enum_get_value_by_name	(GEnumClass	*enum_class,
-						 const gchar	*name);
-GEnumValue*	g_enum_get_value_by_nick	(GEnumClass	*enum_class,
-						 const gchar	*nick);
-GFlagsValue*	g_flags_get_first_value		(GFlagsClass	*flags_class,
-						 guint		 value);
-GFlagsValue*	g_flags_get_value_by_name	(GFlagsClass	*flags_class,
-						 const gchar	*name);
-GFlagsValue*	g_flags_get_value_by_nick	(GFlagsClass	*flags_class,
-						 const gchar	*nick);
-void            g_value_set_enum        	(GValue         *value,
-						 gint            v_enum);
-gint            g_value_get_enum        	(const GValue   *value);
-void            g_value_set_flags       	(GValue         *value,
-						 guint           v_flags);
-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!
- */
-GType	g_enum_register_static	   (const gchar	      *name,
-				    const GEnumValue  *const_static_values);
-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
- */
-void	g_enum_complete_type_info  (GType	       g_enum_type,
-				    GTypeInfo	      *info,
-				    const GEnumValue  *const_values);
-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/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gmarshal.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gmarshal.h
deleted file mode 100644
index 3c24cba1..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gmarshal.h
+++ /dev/null
@@ -1,169 +0,0 @@
-#ifndef __G_MARSHAL_H__
-#define __G_MARSHAL_H__
-
-G_BEGIN_DECLS
-
-/* VOID:VOID (/build/buildd-glib2.0_2.16.6-3-i386-fvJQDr/glib2.0-2.16.6/gobject/gmarshal.list:26) */
-extern 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);
-
-/* VOID:BOOLEAN (/build/buildd-glib2.0_2.16.6-3-i386-fvJQDr/glib2.0-2.16.6/gobject/gmarshal.list:27) */
-extern 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);
-
-/* VOID:CHAR (/build/buildd-glib2.0_2.16.6-3-i386-fvJQDr/glib2.0-2.16.6/gobject/gmarshal.list:28) */
-extern 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);
-
-/* VOID:UCHAR (/build/buildd-glib2.0_2.16.6-3-i386-fvJQDr/glib2.0-2.16.6/gobject/gmarshal.list:29) */
-extern 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);
-
-/* VOID:INT (/build/buildd-glib2.0_2.16.6-3-i386-fvJQDr/glib2.0-2.16.6/gobject/gmarshal.list:30) */
-extern 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);
-
-/* VOID:UINT (/build/buildd-glib2.0_2.16.6-3-i386-fvJQDr/glib2.0-2.16.6/gobject/gmarshal.list:31) */
-extern 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);
-
-/* VOID:LONG (/build/buildd-glib2.0_2.16.6-3-i386-fvJQDr/glib2.0-2.16.6/gobject/gmarshal.list:32) */
-extern 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);
-
-/* VOID:ULONG (/build/buildd-glib2.0_2.16.6-3-i386-fvJQDr/glib2.0-2.16.6/gobject/gmarshal.list:33) */
-extern 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);
-
-/* VOID:ENUM (/build/buildd-glib2.0_2.16.6-3-i386-fvJQDr/glib2.0-2.16.6/gobject/gmarshal.list:34) */
-extern 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);
-
-/* VOID:FLAGS (/build/buildd-glib2.0_2.16.6-3-i386-fvJQDr/glib2.0-2.16.6/gobject/gmarshal.list:35) */
-extern 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);
-
-/* VOID:FLOAT (/build/buildd-glib2.0_2.16.6-3-i386-fvJQDr/glib2.0-2.16.6/gobject/gmarshal.list:36) */
-extern 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);
-
-/* VOID:DOUBLE (/build/buildd-glib2.0_2.16.6-3-i386-fvJQDr/glib2.0-2.16.6/gobject/gmarshal.list:37) */
-extern 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);
-
-/* VOID:STRING (/build/buildd-glib2.0_2.16.6-3-i386-fvJQDr/glib2.0-2.16.6/gobject/gmarshal.list:38) */
-extern 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);
-
-/* VOID:PARAM (/build/buildd-glib2.0_2.16.6-3-i386-fvJQDr/glib2.0-2.16.6/gobject/gmarshal.list:39) */
-extern 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);
-
-/* VOID:BOXED (/build/buildd-glib2.0_2.16.6-3-i386-fvJQDr/glib2.0-2.16.6/gobject/gmarshal.list:40) */
-extern 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);
-
-/* VOID:POINTER (/build/buildd-glib2.0_2.16.6-3-i386-fvJQDr/glib2.0-2.16.6/gobject/gmarshal.list:41) */
-extern 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);
-
-/* VOID:OBJECT (/build/buildd-glib2.0_2.16.6-3-i386-fvJQDr/glib2.0-2.16.6/gobject/gmarshal.list:42) */
-extern 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);
-
-/* VOID:UINT,POINTER (/build/buildd-glib2.0_2.16.6-3-i386-fvJQDr/glib2.0-2.16.6/gobject/gmarshal.list:45) */
-extern 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);
-
-/* BOOL:FLAGS (/build/buildd-glib2.0_2.16.6-3-i386-fvJQDr/glib2.0-2.16.6/gobject/gmarshal.list:46) */
-extern 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);
-#define g_cclosure_marshal_BOOL__FLAGS	g_cclosure_marshal_BOOLEAN__FLAGS
-
-/* STRING:OBJECT,POINTER (/build/buildd-glib2.0_2.16.6-3-i386-fvJQDr/glib2.0-2.16.6/gobject/gmarshal.list:47) */
-extern 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);
-
-G_END_DECLS
-
-#endif /* __G_MARSHAL_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gobject.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gobject.h
deleted file mode 100644
index 4f7ef570..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gobject.h
+++ /dev/null
@@ -1,286 +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.
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_OBJECT_H__
-#define __G_OBJECT_H__
-
-#include        <gobject/gtype.h>
-#include        <gobject/gvalue.h>
-#include        <gobject/gparam.h>
-#include        <gobject/gclosure.h>
-#include        <gobject/gsignal.h>
-
-G_BEGIN_DECLS
-
-/* --- type macros --- */
-#define G_TYPE_IS_OBJECT(type)      (G_TYPE_FUNDAMENTAL (type) == G_TYPE_OBJECT)
-#define G_OBJECT(object)            (G_TYPE_CHECK_INSTANCE_CAST ((object), G_TYPE_OBJECT, GObject))
-#define G_OBJECT_CLASS(class)       (G_TYPE_CHECK_CLASS_CAST ((class), G_TYPE_OBJECT, GObjectClass))
-#define G_IS_OBJECT(object)         (G_TYPE_CHECK_INSTANCE_TYPE ((object), G_TYPE_OBJECT))
-#define G_IS_OBJECT_CLASS(class)    (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_OBJECT))
-#define G_OBJECT_GET_CLASS(object)  (G_TYPE_INSTANCE_GET_CLASS ((object), G_TYPE_OBJECT, GObjectClass))
-#define G_OBJECT_TYPE(object)       (G_TYPE_FROM_INSTANCE (object))
-#define G_OBJECT_TYPE_NAME(object)  (g_type_name (G_OBJECT_TYPE (object)))
-#define G_OBJECT_CLASS_TYPE(class)  (G_TYPE_FROM_CLASS (class))
-#define G_OBJECT_CLASS_NAME(class)  (g_type_name (G_OBJECT_CLASS_TYPE (class)))
-#define G_VALUE_HOLDS_OBJECT(value) (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_OBJECT))
-
-/* --- type macros --- */
-#define G_TYPE_INITIALLY_UNOWNED	      (g_initially_unowned_get_type())
-#define G_INITIALLY_UNOWNED(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), G_TYPE_INITIALLY_UNOWNED, GInitiallyUnowned))
-#define G_INITIALLY_UNOWNED_CLASS(class)      (G_TYPE_CHECK_CLASS_CAST ((class), G_TYPE_INITIALLY_UNOWNED, GInitiallyUnownedClass))
-#define G_IS_INITIALLY_UNOWNED(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), G_TYPE_INITIALLY_UNOWNED))
-#define G_IS_INITIALLY_UNOWNED_CLASS(class)   (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_INITIALLY_UNOWNED))
-#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;
-typedef void (*GObjectGetPropertyFunc)  (GObject      *object,
-                                         guint         property_id,
-                                         GValue       *value,
-                                         GParamSpec   *pspec);
-typedef void (*GObjectSetPropertyFunc)  (GObject      *object,
-                                         guint         property_id,
-                                         const GValue *value,
-                                         GParamSpec   *pspec);
-typedef void (*GObjectFinalizeFunc)     (GObject      *object);
-typedef void (*GWeakNotify)		(gpointer      data,
-					 GObject      *where_the_object_was);
-struct  _GObject
-{
-  GTypeInstance  g_type_instance;
-  
-  /*< private >*/
-  volatile guint ref_count;
-  GData         *qdata;
-};
-struct  _GObjectClass
-{
-  GTypeClass   g_type_class;
-
-  /*< private >*/
-  GSList      *construct_properties;
-
-  /*< public >*/
-  /* seldomly 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);
-  /* seldomly 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 >*/
-  /* padding */
-  gpointer	pdummy[7];
-};
-struct _GObjectConstructParam
-{
-  GParamSpec *pspec;
-  GValue     *value;
-};
-
-
-/* --- prototypes --- */
-GType       g_initially_unowned_get_type      (void);
-void        g_object_class_install_property   (GObjectClass   *oclass,
-					       guint           property_id,
-					       GParamSpec     *pspec);
-GParamSpec* g_object_class_find_property      (GObjectClass   *oclass,
-					       const gchar    *property_name);
-GParamSpec**g_object_class_list_properties    (GObjectClass   *oclass,
-					       guint	      *n_properties);
-void        g_object_class_override_property  (GObjectClass   *oclass,
-					       guint           property_id,
-					       const gchar    *name);
-
-void        g_object_interface_install_property (gpointer     g_iface,
-						 GParamSpec  *pspec);
-GParamSpec* g_object_interface_find_property    (gpointer     g_iface,
-						 const gchar *property_name);
-GParamSpec**g_object_interface_list_properties  (gpointer     g_iface,
-						 guint       *n_properties_p);
-
-gpointer    g_object_new                      (GType           object_type,
-					       const gchar    *first_property_name,
-					       ...);
-gpointer    g_object_newv		      (GType           object_type,
-					       guint	       n_parameters,
-					       GParameter     *parameters);
-GObject*    g_object_new_valist               (GType           object_type,
-					       const gchar    *first_property_name,
-					       va_list         var_args);
-void	    g_object_set                      (gpointer	       object,
-					       const gchar    *first_property_name,
-					       ...) G_GNUC_NULL_TERMINATED;
-void        g_object_get                      (gpointer        object,
-					       const gchar    *first_property_name,
-					       ...) G_GNUC_NULL_TERMINATED;
-gpointer    g_object_connect                  (gpointer	       object,
-					       const gchar    *signal_spec,
-					       ...) G_GNUC_NULL_TERMINATED;
-void	    g_object_disconnect               (gpointer	       object,
-					       const gchar    *signal_spec,
-					       ...) G_GNUC_NULL_TERMINATED;
-void        g_object_set_valist               (GObject        *object,
-					       const gchar    *first_property_name,
-					       va_list         var_args);
-void        g_object_get_valist               (GObject        *object,
-					       const gchar    *first_property_name,
-					       va_list         var_args);
-void        g_object_set_property             (GObject        *object,
-					       const gchar    *property_name,
-					       const GValue   *value);
-void        g_object_get_property             (GObject        *object,
-					       const gchar    *property_name,
-					       GValue         *value);
-void        g_object_freeze_notify            (GObject        *object);
-void        g_object_notify                   (GObject        *object,
-					       const gchar    *property_name);
-void        g_object_thaw_notify              (GObject        *object);
-gboolean    g_object_is_floating    	      (gpointer        object);
-gpointer    g_object_ref_sink       	      (gpointer	       object);
-gpointer    g_object_ref                      (gpointer        object);
-void        g_object_unref                    (gpointer        object);
-void	    g_object_weak_ref		      (GObject	      *object,
-					       GWeakNotify     notify,
-					       gpointer	       data);
-void	    g_object_weak_unref		      (GObject	      *object,
-					       GWeakNotify     notify,
-					       gpointer	       data);
-void        g_object_add_weak_pointer         (GObject        *object, 
-                                               gpointer       *weak_pointer_location);
-void        g_object_remove_weak_pointer      (GObject        *object, 
-                                               gpointer       *weak_pointer_location);
-
-typedef void (*GToggleNotify) (gpointer      data,
-			       GObject      *object,
-			       gboolean      is_last_ref);
-
-void g_object_add_toggle_ref    (GObject       *object,
-				 GToggleNotify  notify,
-				 gpointer       data);
-void g_object_remove_toggle_ref (GObject       *object,
-				 GToggleNotify  notify,
-				 gpointer       data);
-
-gpointer    g_object_get_qdata                (GObject        *object,
-					       GQuark          quark);
-void        g_object_set_qdata                (GObject        *object,
-					       GQuark          quark,
-					       gpointer        data);
-void        g_object_set_qdata_full           (GObject        *object,
-					       GQuark          quark,
-					       gpointer        data,
-					       GDestroyNotify  destroy);
-gpointer    g_object_steal_qdata              (GObject        *object,
-					       GQuark          quark);
-gpointer    g_object_get_data                 (GObject        *object,
-					       const gchar    *key);
-void        g_object_set_data                 (GObject        *object,
-					       const gchar    *key,
-					       gpointer        data);
-void        g_object_set_data_full            (GObject        *object,
-					       const gchar    *key,
-					       gpointer        data,
-					       GDestroyNotify  destroy);
-gpointer    g_object_steal_data               (GObject        *object,
-					       const gchar    *key);
-void        g_object_watch_closure            (GObject        *object,
-					       GClosure       *closure);
-GClosure*   g_cclosure_new_object             (GCallback       callback_func,
-					       GObject	      *object);
-GClosure*   g_cclosure_new_object_swap        (GCallback       callback_func,
-					       GObject	      *object);
-GClosure*   g_closure_new_object              (guint           sizeof_closure,
-					       GObject        *object);
-void        g_value_set_object                (GValue         *value,
-					       gpointer        v_object);
-gpointer    g_value_get_object                (const GValue   *value);
-gpointer    g_value_dup_object                (const GValue   *value);
-gulong	    g_signal_connect_object           (gpointer	       instance,
-					       const gchar    *detailed_signal,
-					       GCallback       c_handler,
-					       gpointer	       gobject,
-					       GConnectFlags   connect_flags);
-
-/*< protected >*/
-void        g_object_force_floating           (GObject        *object);
-void        g_object_run_dispose	      (GObject	      *object);
-
-
-void        g_value_take_object               (GValue         *value,
-					       gpointer        v_object);
-#ifndef G_DISABLE_DEPRECATED
-void        g_value_set_object_take_ownership (GValue         *value,
-					       gpointer        v_object);
-#endif
-
-#if !defined(G_DISABLE_DEPRECATED) || defined(GTK_COMPILATION)
-gsize	    g_object_compat_control	      (gsize	       what,
-					       gpointer	       data);
-#endif
-
-/* --- implementation macros --- */
-#define G_OBJECT_WARN_INVALID_PSPEC(object, pname, property_id, pspec) \
-G_STMT_START { \
-  GObject *_object = (GObject*) (object); \
-  GParamSpec *_pspec = (GParamSpec*) (pspec); \
-  guint _property_id = (property_id); \
-  g_warning ("%s: invalid %s id %u for \"%s\" of type `%s' in `%s'", \
-             G_STRLOC, \
-             (pname), \
-             _property_id, \
-             _pspec->name, \
-             g_type_name (G_PARAM_SPEC_TYPE (_pspec)), \
-             G_OBJECT_TYPE_NAME (_object)); \
-} G_STMT_END
-#define G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec) \
-    G_OBJECT_WARN_INVALID_PSPEC ((object), "property", (property_id), (pspec))
-
-G_END_DECLS
-
-#endif /* __G_OBJECT_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gobjectnotifyqueue.c b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gobjectnotifyqueue.c
deleted file mode 100644
index 60c1c280..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gobjectnotifyqueue.c
+++ /dev/null
@@ -1,169 +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_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;
-  /* currently, this structure abuses the GList allocation chain and thus
-   * must be <= sizeof (GList)
-   */
-};
-
-
-/* --- functions --- */
-static void
-g_object_notify_queue_free (gpointer data)
-{
-  GObjectNotifyQueue *nqueue = data;
-
-  g_slist_free (nqueue->pspecs);
-  g_list_free_1 ((void*) nqueue);
-}
-
-static inline GObjectNotifyQueue*
-g_object_notify_queue_freeze (GObject		   *object,
-			      GObjectNotifyContext *context)
-{
-  GObjectNotifyQueue *nqueue;
-
-  nqueue = g_datalist_id_get_data (&object->qdata, context->quark_notify_queue);
-  if (!nqueue)
-    {
-      nqueue = (void*) g_list_alloc ();
-      memset (nqueue, 0, sizeof (*nqueue));
-      nqueue->context = context;
-      g_datalist_id_set_data_full (&object->qdata, context->quark_notify_queue,
-				   nqueue, g_object_notify_queue_free);
-    }
-
-  g_return_val_if_fail (nqueue->freeze_count < 65535, nqueue);
-  nqueue->freeze_count++;
-
-  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);
-
-  nqueue->freeze_count--;
-  if (nqueue->freeze_count)
-    return;
-  g_return_if_fail (object->ref_count > 0);
-
-  pspecs = nqueue->n_pspecs > 16 ? free_me = g_new (GParamSpec*, nqueue->n_pspecs) : pspecs_mem;
-  /* set first entry to NULL since it's checked unconditionally */
-  pspecs[0] = NULL;
-  for (slist = nqueue->pspecs; slist; slist = slist->next)
-    {
-      GParamSpec *pspec = slist->data;
-      guint i = 0;
-
-      /* dedup, make pspecs in the list unique */
-    redo_dedup_check:
-      if (pspecs[i] == pspec)
-	continue;
-      if (++i < n_pspecs)
-	goto redo_dedup_check;
-
-      pspecs[n_pspecs++] = pspec;
-    }
-  g_datalist_id_set_data (&object->qdata, context->quark_notify_queue, NULL);
-
-  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_slist_free (nqueue->pspecs);
-  nqueue->pspecs = NULL;
-  nqueue->n_pspecs = 0;
-}
-
-static inline void
-g_object_notify_queue_add (GObject            *object,
-			   GObjectNotifyQueue *nqueue,
-			   GParamSpec	      *pspec)
-{
-  if (pspec->flags & G_PARAM_READABLE)
-    {
-      GParamSpec *redirect;
-
-      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 */
-      nqueue->pspecs = g_slist_prepend (nqueue->pspecs, pspec);
-      nqueue->n_pspecs++;
-    }
-}
-
-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/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gparam.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gparam.h
deleted file mode 100644
index 3790712e..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gparam.h
+++ /dev/null
@@ -1,235 +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
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_PARAM_H__
-#define __G_PARAM_H__
-
-#include	<gobject/gvalue.h>
-
-G_BEGIN_DECLS
-
-/* --- standard type macros --- */
-#define G_TYPE_IS_PARAM(type)		(G_TYPE_FUNDAMENTAL (type) == G_TYPE_PARAM)
-#define G_PARAM_SPEC(pspec)		(G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM, GParamSpec))
-#define G_IS_PARAM_SPEC(pspec)		(G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM))
-#define G_PARAM_SPEC_CLASS(pclass)      (G_TYPE_CHECK_CLASS_CAST ((pclass), G_TYPE_PARAM, GParamSpecClass))
-#define G_IS_PARAM_SPEC_CLASS(pclass)   (G_TYPE_CHECK_CLASS_TYPE ((pclass), G_TYPE_PARAM))
-#define G_PARAM_SPEC_GET_CLASS(pspec)	(G_TYPE_INSTANCE_GET_CLASS ((pspec), G_TYPE_PARAM, GParamSpecClass))
-
-
-/* --- convenience macros --- */
-#define G_PARAM_SPEC_TYPE(pspec)	(G_TYPE_FROM_INSTANCE (pspec))
-#define G_PARAM_SPEC_TYPE_NAME(pspec)	(g_type_name (G_PARAM_SPEC_TYPE (pspec)))
-#define	G_PARAM_SPEC_VALUE_TYPE(pspec)	(G_PARAM_SPEC (pspec)->value_type)
-#define G_VALUE_HOLDS_PARAM(value)	(G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_PARAM))
-       
-
-/* --- flags --- */
-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
-} GParamFlags;
-#define	G_PARAM_READWRITE	(G_PARAM_READABLE | G_PARAM_WRITABLE)
-#define	G_PARAM_STATIC_STRINGS (G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)
-#define	G_PARAM_MASK		(0x000000ff)
-/* bits in the range 0xffffff00 are reserved for 3rd party usage */
-#define	G_PARAM_USER_SHIFT	(8)
-
-
-/* --- typedefs & structures --- */
-typedef struct _GParamSpec      GParamSpec;
-typedef struct _GParamSpecClass GParamSpecClass;
-typedef struct _GParameter	GParameter;
-typedef struct _GParamSpecPool  GParamSpecPool;
-struct _GParamSpec
-{
-  GTypeInstance  g_type_instance;
-
-  gchar         *name;
-  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 */
-};
-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];
-};
-struct _GParameter /* auxillary structure for _setv() variants */
-{
-  const gchar *name;
-  GValue       value;
-};
-
-
-/* --- prototypes --- */
-GParamSpec*	g_param_spec_ref		(GParamSpec    *pspec);
-void		g_param_spec_unref		(GParamSpec    *pspec);
-void		g_param_spec_sink		(GParamSpec    *pspec);
-GParamSpec*	g_param_spec_ref_sink   	(GParamSpec    *pspec);
-gpointer        g_param_spec_get_qdata		(GParamSpec    *pspec,
-						 GQuark         quark);
-void            g_param_spec_set_qdata		(GParamSpec    *pspec,
-						 GQuark         quark,
-						 gpointer       data);
-void            g_param_spec_set_qdata_full	(GParamSpec    *pspec,
-						 GQuark         quark,
-						 gpointer       data,
-						 GDestroyNotify destroy);
-gpointer        g_param_spec_steal_qdata	(GParamSpec    *pspec,
-						 GQuark         quark);
-GParamSpec*     g_param_spec_get_redirect_target (GParamSpec   *pspec);
-
-void		g_param_value_set_default	(GParamSpec    *pspec,
-						 GValue	       *value);
-gboolean	g_param_value_defaults		(GParamSpec    *pspec,
-						 GValue	       *value);
-gboolean	g_param_value_validate		(GParamSpec    *pspec,
-						 GValue	       *value);
-gboolean	g_param_value_convert		(GParamSpec    *pspec,
-						 const GValue  *src_value,
-						 GValue	       *dest_value,
-						 gboolean	strict_validation);
-gint		g_param_values_cmp		(GParamSpec    *pspec,
-						 const GValue  *value1,
-						 const GValue  *value2);
-G_CONST_RETURN gchar*	g_param_spec_get_name	(GParamSpec    *pspec);
-G_CONST_RETURN gchar*	g_param_spec_get_nick	(GParamSpec    *pspec);
-G_CONST_RETURN gchar*	g_param_spec_get_blurb	(GParamSpec    *pspec);
-void            g_value_set_param               (GValue	       *value,
-						 GParamSpec    *param);
-GParamSpec*     g_value_get_param               (const GValue  *value);
-GParamSpec*     g_value_dup_param               (const GValue  *value);
-
-
-void           g_value_take_param               (GValue        *value,
-					         GParamSpec    *param);
-#ifndef G_DISABLE_DEPRECATED
-void           g_value_set_param_take_ownership (GValue        *value,
-					         GParamSpec    *param);
-#endif
-
-/* --- convenience functions --- */
-typedef struct _GParamSpecTypeInfo GParamSpecTypeInfo;
-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);
-};
-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 --- */
-gpointer	g_param_spec_internal		(GType	        param_type,
-						 const gchar   *name,
-						 const gchar   *nick,
-						 const gchar   *blurb,
-						 GParamFlags    flags);
-GParamSpecPool* g_param_spec_pool_new		(gboolean	type_prefixing);
-void		g_param_spec_pool_insert	(GParamSpecPool	*pool,
-						 GParamSpec	*pspec,
-						 GType		 owner_type);
-void		g_param_spec_pool_remove	(GParamSpecPool	*pool,
-						 GParamSpec	*pspec);
-GParamSpec*	g_param_spec_pool_lookup	(GParamSpecPool	*pool,
-						 const gchar	*param_name,
-						 GType		 owner_type,
-						 gboolean	 walk_ancestors);
-GList*		g_param_spec_pool_list_owned	(GParamSpecPool	*pool,
-						 GType		 owner_type);
-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/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gparamspecs.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gparamspecs.h
deleted file mode 100644
index b6add1cb..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gparamspecs.h
+++ /dev/null
@@ -1,439 +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
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_PARAMSPECS_H__
-#define __G_PARAMSPECS_H__
-
-#include        <gobject/gvalue.h>
-#include        <gobject/genums.h>
-#include        <gobject/gboxed.h>
-#include        <gobject/gobject.h>
-
-G_BEGIN_DECLS
-
-/* --- type macros --- */
-#define	G_TYPE_PARAM_CHAR		   (g_param_spec_types[0])
-#define G_IS_PARAM_SPEC_CHAR(pspec)        (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_CHAR))
-#define G_PARAM_SPEC_CHAR(pspec)           (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_CHAR, GParamSpecChar))
-#define	G_TYPE_PARAM_UCHAR		   (g_param_spec_types[1])
-#define G_IS_PARAM_SPEC_UCHAR(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_UCHAR))
-#define G_PARAM_SPEC_UCHAR(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_UCHAR, GParamSpecUChar))
-#define	G_TYPE_PARAM_BOOLEAN		   (g_param_spec_types[2])
-#define G_IS_PARAM_SPEC_BOOLEAN(pspec)     (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_BOOLEAN))
-#define G_PARAM_SPEC_BOOLEAN(pspec)        (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_BOOLEAN, GParamSpecBoolean))
-#define	G_TYPE_PARAM_INT		   (g_param_spec_types[3])
-#define G_IS_PARAM_SPEC_INT(pspec)         (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_INT))
-#define G_PARAM_SPEC_INT(pspec)            (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_INT, GParamSpecInt))
-#define	G_TYPE_PARAM_UINT		   (g_param_spec_types[4])
-#define G_IS_PARAM_SPEC_UINT(pspec)        (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_UINT))
-#define G_PARAM_SPEC_UINT(pspec)           (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_UINT, GParamSpecUInt))
-#define	G_TYPE_PARAM_LONG		   (g_param_spec_types[5])
-#define G_IS_PARAM_SPEC_LONG(pspec)        (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_LONG))
-#define G_PARAM_SPEC_LONG(pspec)           (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_LONG, GParamSpecLong))
-#define	G_TYPE_PARAM_ULONG		   (g_param_spec_types[6])
-#define G_IS_PARAM_SPEC_ULONG(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_ULONG))
-#define G_PARAM_SPEC_ULONG(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_ULONG, GParamSpecULong))
-#define	G_TYPE_PARAM_INT64		   (g_param_spec_types[7])
-#define G_IS_PARAM_SPEC_INT64(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_INT64))
-#define G_PARAM_SPEC_INT64(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_INT64, GParamSpecInt64))
-#define	G_TYPE_PARAM_UINT64		   (g_param_spec_types[8])
-#define G_IS_PARAM_SPEC_UINT64(pspec)      (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_UINT64))
-#define G_PARAM_SPEC_UINT64(pspec)         (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_UINT64, GParamSpecUInt64))
-#define	G_TYPE_PARAM_UNICHAR		   (g_param_spec_types[9])
-#define G_PARAM_SPEC_UNICHAR(pspec)        (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_UNICHAR, GParamSpecUnichar))
-#define G_IS_PARAM_SPEC_UNICHAR(pspec)     (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_UNICHAR))
-#define	G_TYPE_PARAM_ENUM		   (g_param_spec_types[10])
-#define G_IS_PARAM_SPEC_ENUM(pspec)        (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_ENUM))
-#define G_PARAM_SPEC_ENUM(pspec)           (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_ENUM, GParamSpecEnum))
-#define	G_TYPE_PARAM_FLAGS		   (g_param_spec_types[11])
-#define G_IS_PARAM_SPEC_FLAGS(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_FLAGS))
-#define G_PARAM_SPEC_FLAGS(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_FLAGS, GParamSpecFlags))
-#define	G_TYPE_PARAM_FLOAT		   (g_param_spec_types[12])
-#define G_IS_PARAM_SPEC_FLOAT(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_FLOAT))
-#define G_PARAM_SPEC_FLOAT(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_FLOAT, GParamSpecFloat))
-#define	G_TYPE_PARAM_DOUBLE		   (g_param_spec_types[13])
-#define G_IS_PARAM_SPEC_DOUBLE(pspec)      (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_DOUBLE))
-#define G_PARAM_SPEC_DOUBLE(pspec)         (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_DOUBLE, GParamSpecDouble))
-#define	G_TYPE_PARAM_STRING		   (g_param_spec_types[14])
-#define G_IS_PARAM_SPEC_STRING(pspec)      (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_STRING))
-#define G_PARAM_SPEC_STRING(pspec)         (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_STRING, GParamSpecString))
-#define	G_TYPE_PARAM_PARAM		   (g_param_spec_types[15])
-#define G_IS_PARAM_SPEC_PARAM(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_PARAM))
-#define G_PARAM_SPEC_PARAM(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_PARAM, GParamSpecParam))
-#define	G_TYPE_PARAM_BOXED		   (g_param_spec_types[16])
-#define G_IS_PARAM_SPEC_BOXED(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_BOXED))
-#define G_PARAM_SPEC_BOXED(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_BOXED, GParamSpecBoxed))
-#define	G_TYPE_PARAM_POINTER		   (g_param_spec_types[17])
-#define G_IS_PARAM_SPEC_POINTER(pspec)     (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_POINTER))
-#define G_PARAM_SPEC_POINTER(pspec)        (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_POINTER, GParamSpecPointer))
-#define	G_TYPE_PARAM_VALUE_ARRAY	   (g_param_spec_types[18])
-#define G_IS_PARAM_SPEC_VALUE_ARRAY(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_VALUE_ARRAY))
-#define G_PARAM_SPEC_VALUE_ARRAY(pspec)    (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_VALUE_ARRAY, GParamSpecValueArray))
-#define	G_TYPE_PARAM_OBJECT		   (g_param_spec_types[19])
-#define G_IS_PARAM_SPEC_OBJECT(pspec)      (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_OBJECT))
-#define G_PARAM_SPEC_OBJECT(pspec)         (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_OBJECT, GParamSpecObject))
-#define	G_TYPE_PARAM_OVERRIDE		   (g_param_spec_types[20])
-#define G_IS_PARAM_SPEC_OVERRIDE(pspec)    (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_OVERRIDE))
-#define G_PARAM_SPEC_OVERRIDE(pspec)       (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_OVERRIDE, GParamSpecOverride))
-#define	G_TYPE_PARAM_GTYPE		   (g_param_spec_types[21])
-#define G_IS_PARAM_SPEC_GTYPE(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_GTYPE))
-#define G_PARAM_SPEC_GTYPE(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_GTYPE, GParamSpecGType))
-
-
-/* --- 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;
-
-struct _GParamSpecChar
-{
-  GParamSpec    parent_instance;
-  
-  gint8         minimum;
-  gint8         maximum;
-  gint8         default_value;
-};
-struct _GParamSpecUChar
-{
-  GParamSpec    parent_instance;
-  
-  guint8        minimum;
-  guint8        maximum;
-  guint8        default_value;
-};
-struct _GParamSpecBoolean
-{
-  GParamSpec    parent_instance;
-  
-  gboolean      default_value;
-};
-struct _GParamSpecInt
-{
-  GParamSpec    parent_instance;
-  
-  gint          minimum;
-  gint          maximum;
-  gint          default_value;
-};
-struct _GParamSpecUInt
-{
-  GParamSpec    parent_instance;
-  
-  guint         minimum;
-  guint         maximum;
-  guint         default_value;
-};
-struct _GParamSpecLong
-{
-  GParamSpec    parent_instance;
-  
-  glong         minimum;
-  glong         maximum;
-  glong         default_value;
-};
-struct _GParamSpecULong
-{
-  GParamSpec    parent_instance;
-  
-  gulong        minimum;
-  gulong        maximum;
-  gulong        default_value;
-};
-struct _GParamSpecInt64
-{
-  GParamSpec    parent_instance;
-  
-  gint64        minimum;
-  gint64        maximum;
-  gint64        default_value;
-};
-struct _GParamSpecUInt64
-{
-  GParamSpec    parent_instance;
-  
-  guint64       minimum;
-  guint64       maximum;
-  guint64       default_value;
-};
-struct _GParamSpecUnichar
-{
-  GParamSpec    parent_instance;
-  
-  gunichar      default_value;
-};
-struct _GParamSpecEnum
-{
-  GParamSpec    parent_instance;
-  
-  GEnumClass   *enum_class;
-  gint          default_value;
-};
-struct _GParamSpecFlags
-{
-  GParamSpec    parent_instance;
-  
-  GFlagsClass  *flags_class;
-  guint         default_value;
-};
-struct _GParamSpecFloat
-{
-  GParamSpec    parent_instance;
-  
-  gfloat        minimum;
-  gfloat        maximum;
-  gfloat        default_value;
-  gfloat        epsilon;
-};
-struct _GParamSpecDouble
-{
-  GParamSpec    parent_instance;
-  
-  gdouble       minimum;
-  gdouble       maximum;
-  gdouble       default_value;
-  gdouble       epsilon;
-};
-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;
-};
-struct _GParamSpecParam
-{
-  GParamSpec    parent_instance;
-};
-struct _GParamSpecBoxed
-{
-  GParamSpec    parent_instance;
-};
-struct _GParamSpecPointer
-{
-  GParamSpec    parent_instance;
-};
-struct _GParamSpecValueArray
-{
-  GParamSpec    parent_instance;
-  GParamSpec   *element_spec;
-  guint		fixed_n_elements;
-};
-struct _GParamSpecObject
-{
-  GParamSpec    parent_instance;
-};
-struct _GParamSpecOverride
-{
-  /*< private >*/
-  GParamSpec    parent_instance;
-  GParamSpec   *overridden;
-};
-struct _GParamSpecGType
-{
-  GParamSpec    parent_instance;
-  GType         is_a_type;
-};
-
-/* --- GParamSpec prototypes --- */
-GParamSpec*	g_param_spec_char	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  gint8		  minimum,
-					  gint8		  maximum,
-					  gint8		  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_uchar	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  guint8	  minimum,
-					  guint8	  maximum,
-					  guint8	  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_boolean	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  gboolean	  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_int	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  gint		  minimum,
-					  gint		  maximum,
-					  gint		  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_uint	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  guint		  minimum,
-					  guint		  maximum,
-					  guint		  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_long	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  glong		  minimum,
-					  glong		  maximum,
-					  glong		  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_ulong	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  gulong	  minimum,
-					  gulong	  maximum,
-					  gulong	  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_int64	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  gint64       	  minimum,
-					  gint64       	  maximum,
-					  gint64       	  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_uint64	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  guint64	  minimum,
-					  guint64	  maximum,
-					  guint64	  default_value,
-					  GParamFlags	  flags);
-GParamSpec*    g_param_spec_unichar      (const gchar    *name,
-				          const gchar    *nick,
-				          const gchar    *blurb,
-				          gunichar	  default_value,
-				          GParamFlags     flags);
-GParamSpec*	g_param_spec_enum	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GType		  enum_type,
-					  gint		  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_flags	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GType		  flags_type,
-					  guint		  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_float	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  gfloat	  minimum,
-					  gfloat	  maximum,
-					  gfloat	  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_double	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  gdouble	  minimum,
-					  gdouble	  maximum,
-					  gdouble	  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_string	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  const gchar	 *default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_param	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GType		  param_type,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_boxed	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GType		  boxed_type,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_pointer	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_value_array (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GParamSpec	 *element_spec,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_object	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GType		  object_type,
-					  GParamFlags	  flags);
-GParamSpec*     g_param_spec_override    (const gchar    *name,
-					  GParamSpec     *overridden);
-GParamSpec*	g_param_spec_gtype	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GType           is_a_type,
-					  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 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/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gsignal.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gsignal.h
deleted file mode 100644
index 61345dcb..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gsignal.h
+++ /dev/null
@@ -1,270 +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.
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_SIGNAL_H__
-#define __G_SIGNAL_H__
-
-#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;
-typedef GClosureMarshal			 GSignalCMarshaller;
-typedef gboolean (*GSignalEmissionHook) (GSignalInvocationHint *ihint,
-					 guint			n_param_values,
-					 const GValue	       *param_values,
-					 gpointer		data);
-typedef gboolean (*GSignalAccumulator)	(GSignalInvocationHint *ihint,
-					 GValue		       *return_accu,
-					 const GValue	       *handler_return,
-					 gpointer               data);
-
-
-/* --- run, match and connect types --- */
-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
-} GSignalFlags;
-#define G_SIGNAL_FLAGS_MASK  0x7f
-typedef enum
-{
-  G_CONNECT_AFTER	= 1 << 0,
-  G_CONNECT_SWAPPED	= 1 << 1
-} GConnectFlags;
-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;
-#define G_SIGNAL_MATCH_MASK  0x3f
-#define	G_SIGNAL_TYPE_STATIC_SCOPE (G_TYPE_FLAG_RESERVED_ID_BIT)
-
-
-/* --- signal information --- */
-struct _GSignalInvocationHint
-{
-  guint		signal_id;
-  GQuark	detail;
-  GSignalFlags	run_type;
-};
-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 --- */
-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);
-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);
-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,
-					     ...);
-void                  g_signal_emitv        (const GValue       *instance_and_params,
-					     guint               signal_id,
-					     GQuark              detail,
-					     GValue             *return_value);
-void                  g_signal_emit_valist  (gpointer            instance,
-					     guint               signal_id,
-					     GQuark              detail,
-					     va_list             var_args);
-void                  g_signal_emit         (gpointer            instance,
-					     guint               signal_id,
-					     GQuark              detail,
-					     ...);
-void                  g_signal_emit_by_name (gpointer            instance,
-					     const gchar        *detailed_signal,
-					     ...);
-guint                 g_signal_lookup       (const gchar        *name,
-					     GType               itype);
-G_CONST_RETURN gchar* g_signal_name         (guint               signal_id);
-void                  g_signal_query        (guint               signal_id,
-					     GSignalQuery       *query);
-guint*                g_signal_list_ids     (GType               itype,
-					     guint              *n_ids);
-gboolean	      g_signal_parse_name   (const gchar	*detailed_signal,
-					     GType		 itype,
-					     guint		*signal_id_p,
-					     GQuark		*detail_p,
-					     gboolean		 force_detail_quark);
-GSignalInvocationHint* g_signal_get_invocation_hint (gpointer    instance);
-
-
-/* --- signal emissions --- */
-void	g_signal_stop_emission		    (gpointer		  instance,
-					     guint		  signal_id,
-					     GQuark		  detail);
-void	g_signal_stop_emission_by_name	    (gpointer		  instance,
-					     const gchar	 *detailed_signal);
-gulong	g_signal_add_emission_hook	    (guint		  signal_id,
-					     GQuark		  detail,
-					     GSignalEmissionHook  hook_func,
-					     gpointer	       	  hook_data,
-					     GDestroyNotify	  data_destroy);
-void	g_signal_remove_emission_hook	    (guint		  signal_id,
-					     gulong		  hook_id);
-
-
-/* --- signal handlers --- */
-gboolean g_signal_has_handler_pending	      (gpointer		  instance,
-					       guint		  signal_id,
-					       GQuark		  detail,
-					       gboolean		  may_be_blocked);
-gulong	 g_signal_connect_closure_by_id	      (gpointer		  instance,
-					       guint		  signal_id,
-					       GQuark		  detail,
-					       GClosure		 *closure,
-					       gboolean		  after);
-gulong	 g_signal_connect_closure	      (gpointer		  instance,
-					       const gchar       *detailed_signal,
-					       GClosure		 *closure,
-					       gboolean		  after);
-gulong	 g_signal_connect_data		      (gpointer		  instance,
-					       const gchar	 *detailed_signal,
-					       GCallback	  c_handler,
-					       gpointer		  data,
-					       GClosureNotify	  destroy_data,
-					       GConnectFlags	  connect_flags);
-void	 g_signal_handler_block		      (gpointer		  instance,
-					       gulong		  handler_id);
-void	 g_signal_handler_unblock	      (gpointer		  instance,
-					       gulong		  handler_id);
-void	 g_signal_handler_disconnect	      (gpointer		  instance,
-					       gulong		  handler_id);
-gboolean g_signal_handler_is_connected	      (gpointer		  instance,
-					       gulong		  handler_id);
-gulong	 g_signal_handler_find		      (gpointer		  instance,
-					       GSignalMatchType	  mask,
-					       guint		  signal_id,
-					       GQuark		  detail,
-					       GClosure		 *closure,
-					       gpointer		  func,
-					       gpointer		  data);
-guint	 g_signal_handlers_block_matched      (gpointer		  instance,
-					       GSignalMatchType	  mask,
-					       guint		  signal_id,
-					       GQuark		  detail,
-					       GClosure		 *closure,
-					       gpointer		  func,
-					       gpointer		  data);
-guint	 g_signal_handlers_unblock_matched    (gpointer		  instance,
-					       GSignalMatchType	  mask,
-					       guint		  signal_id,
-					       GQuark		  detail,
-					       GClosure		 *closure,
-					       gpointer		  func,
-					       gpointer		  data);
-guint	 g_signal_handlers_disconnect_matched (gpointer		  instance,
-					       GSignalMatchType	  mask,
-					       guint		  signal_id,
-					       GQuark		  detail,
-					       GClosure		 *closure,
-					       gpointer		  func,
-					       gpointer		  data);
-
-
-/* --- chaining for language bindings --- */
-void	g_signal_override_class_closure	      (guint		  signal_id,
-					       GType		  instance_type,
-					       GClosure		 *class_closure);
-void	g_signal_chain_from_overridden	      (const GValue      *instance_and_params,
-					       GValue            *return_value);
-
-
-/* --- convenience --- */
-#define g_signal_connect(instance, detailed_signal, c_handler, data) \
-    g_signal_connect_data ((instance), (detailed_signal), (c_handler), (data), NULL, (GConnectFlags) 0)
-#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)
-#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)
-#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))
-#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))
-#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))
-
-
-gboolean g_signal_accumulator_true_handled (GSignalInvocationHint *ihint,
-					    GValue                *return_accu,
-					    const GValue          *handler_return,
-					    gpointer               dummy);
-
-/*< private >*/
-void	 g_signal_handlers_destroy	      (gpointer		  instance);
-void	 _g_signals_destroy		      (GType		  itype);
-
-G_END_DECLS
-
-#endif /* __G_SIGNAL_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gsourceclosure.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gsourceclosure.h
deleted file mode 100644
index e371235a..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gsourceclosure.h
+++ /dev/null
@@ -1,41 +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.
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_SOURCECLOSURE_H__
-#define __G_SOURCECLOSURE_H__
-
-#include <gobject/gclosure.h>
-
-G_BEGIN_DECLS
-
-void g_source_set_closure (GSource  *source,
-			   GClosure *closure);
-
-GType g_io_channel_get_type   (void);
-GType g_io_condition_get_type (void);
-
-#define G_TYPE_IO_CHANNEL (g_io_channel_get_type ())
-#define G_TYPE_IO_CONDITION (g_io_condition_get_type ())
-
-G_END_DECLS
-
-#endif /* __G_SOURCECLOSURE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gtype.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gtype.h
deleted file mode 100644
index 5fa98606..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gtype.h
+++ /dev/null
@@ -1,499 +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.
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_TYPE_H__
-#define __G_TYPE_H__
-
-#include        <glib.h>
-
-G_BEGIN_DECLS
-
-/* Basic Type Macros
- */
-#define G_TYPE_FUNDAMENTAL(type)	(g_type_fundamental (type))
-#define	G_TYPE_FUNDAMENTAL_MAX		(255 << G_TYPE_FUNDAMENTAL_SHIFT)
-
-/* Constant fundamental types,
- * introduced by g_type_init().
- */
-#define G_TYPE_INVALID			G_TYPE_MAKE_FUNDAMENTAL (0)
-#define G_TYPE_NONE			G_TYPE_MAKE_FUNDAMENTAL (1)
-#define G_TYPE_INTERFACE		G_TYPE_MAKE_FUNDAMENTAL (2)
-#define G_TYPE_CHAR			G_TYPE_MAKE_FUNDAMENTAL (3)
-#define G_TYPE_UCHAR			G_TYPE_MAKE_FUNDAMENTAL (4)
-#define G_TYPE_BOOLEAN			G_TYPE_MAKE_FUNDAMENTAL (5)
-#define G_TYPE_INT			G_TYPE_MAKE_FUNDAMENTAL (6)
-#define G_TYPE_UINT			G_TYPE_MAKE_FUNDAMENTAL (7)
-#define G_TYPE_LONG			G_TYPE_MAKE_FUNDAMENTAL (8)
-#define G_TYPE_ULONG			G_TYPE_MAKE_FUNDAMENTAL (9)
-#define G_TYPE_INT64			G_TYPE_MAKE_FUNDAMENTAL (10)
-#define G_TYPE_UINT64			G_TYPE_MAKE_FUNDAMENTAL (11)
-#define G_TYPE_ENUM			G_TYPE_MAKE_FUNDAMENTAL (12)
-#define G_TYPE_FLAGS			G_TYPE_MAKE_FUNDAMENTAL (13)
-#define G_TYPE_FLOAT			G_TYPE_MAKE_FUNDAMENTAL (14)
-#define G_TYPE_DOUBLE			G_TYPE_MAKE_FUNDAMENTAL (15)
-#define G_TYPE_STRING			G_TYPE_MAKE_FUNDAMENTAL (16)
-#define G_TYPE_POINTER			G_TYPE_MAKE_FUNDAMENTAL (17)
-#define G_TYPE_BOXED			G_TYPE_MAKE_FUNDAMENTAL (18)
-#define G_TYPE_PARAM			G_TYPE_MAKE_FUNDAMENTAL (19)
-#define G_TYPE_OBJECT			G_TYPE_MAKE_FUNDAMENTAL (20)
-
-
-/* Reserved fundamental type numbers to create new fundamental
- * type IDs with G_TYPE_MAKE_FUNDAMENTAL().
- * Send email to gtk-devel-list@redhat.com for reservations.
- */
-#define	G_TYPE_FUNDAMENTAL_SHIFT	(2)
-#define	G_TYPE_MAKE_FUNDAMENTAL(x)	((GType) ((x) << G_TYPE_FUNDAMENTAL_SHIFT))
-#define G_TYPE_RESERVED_GLIB_FIRST	(21)
-#define G_TYPE_RESERVED_GLIB_LAST	(31)
-#define G_TYPE_RESERVED_BSE_FIRST	(32)
-#define G_TYPE_RESERVED_BSE_LAST	(48)
-#define G_TYPE_RESERVED_USER_FIRST	(49)
-
-
-/* Type Checking Macros
- */
-#define G_TYPE_IS_FUNDAMENTAL(type)             ((type) <= G_TYPE_FUNDAMENTAL_MAX)
-#define G_TYPE_IS_DERIVED(type)                 ((type) > G_TYPE_FUNDAMENTAL_MAX)
-#define G_TYPE_IS_INTERFACE(type)               (G_TYPE_FUNDAMENTAL (type) == G_TYPE_INTERFACE)
-#define G_TYPE_IS_CLASSED(type)                 (g_type_test_flags ((type), G_TYPE_FLAG_CLASSED))
-#define G_TYPE_IS_INSTANTIATABLE(type)          (g_type_test_flags ((type), G_TYPE_FLAG_INSTANTIATABLE))
-#define G_TYPE_IS_DERIVABLE(type)               (g_type_test_flags ((type), G_TYPE_FLAG_DERIVABLE))
-#define G_TYPE_IS_DEEP_DERIVABLE(type)          (g_type_test_flags ((type), G_TYPE_FLAG_DEEP_DERIVABLE))
-#define G_TYPE_IS_ABSTRACT(type)                (g_type_test_flags ((type), G_TYPE_FLAG_ABSTRACT))
-#define G_TYPE_IS_VALUE_ABSTRACT(type)          (g_type_test_flags ((type), G_TYPE_FLAG_VALUE_ABSTRACT))
-#define G_TYPE_IS_VALUE_TYPE(type)              (g_type_check_is_value_type (type))
-#define G_TYPE_HAS_VALUE_TABLE(type)            (g_type_value_table_peek (type) != NULL)
-
-
-/* Typedefs
- */
-#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
- */
-struct _GTypeClass
-{
-  /*< private >*/
-  GType g_type;
-};
-struct _GTypeInstance
-{
-  /*< private >*/
-  GTypeClass *g_class;
-};
-struct _GTypeInterface
-{
-  /*< private >*/
-  GType g_type;         /* iface type */
-  GType g_instance_type;
-};
-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 >*/
-#define G_TYPE_CHECK_INSTANCE(instance)				(_G_TYPE_CHI ((GTypeInstance*) (instance)))
-#define G_TYPE_CHECK_INSTANCE_CAST(instance, g_type, c_type)    (_G_TYPE_CIC ((instance), (g_type), c_type))
-#define G_TYPE_CHECK_INSTANCE_TYPE(instance, g_type)            (_G_TYPE_CIT ((instance), (g_type)))
-#define G_TYPE_INSTANCE_GET_CLASS(instance, g_type, c_type)     (_G_TYPE_IGC ((instance), (g_type), c_type))
-#define G_TYPE_INSTANCE_GET_INTERFACE(instance, g_type, c_type) (_G_TYPE_IGI ((instance), (g_type), c_type))
-#define G_TYPE_CHECK_CLASS_CAST(g_class, g_type, c_type)        (_G_TYPE_CCC ((g_class), (g_type), c_type))
-#define G_TYPE_CHECK_CLASS_TYPE(g_class, g_type)                (_G_TYPE_CCT ((g_class), (g_type)))
-#define G_TYPE_CHECK_VALUE(value)				(_G_TYPE_CHV ((value)))
-#define G_TYPE_CHECK_VALUE_TYPE(value, g_type)			(_G_TYPE_CVH ((value), (g_type)))
-#define G_TYPE_FROM_INSTANCE(instance)                          (G_TYPE_FROM_CLASS (((GTypeInstance*) (instance))->g_class))
-#define G_TYPE_FROM_CLASS(g_class)                              (((GTypeClass*) (g_class))->g_type)
-#define G_TYPE_FROM_INTERFACE(g_iface)                          (((GTypeInterface*) (g_iface))->g_type)
-
-#define G_TYPE_INSTANCE_GET_PRIVATE(instance, g_type, c_type)   ((c_type*) g_type_instance_get_private ((GTypeInstance*) (instance), (g_type)))
-
-
-/* debug flags for g_type_init_with_debug_flags() */
-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 --- */
-void                  g_type_init                    (void);
-void                  g_type_init_with_debug_flags   (GTypeDebugFlags  debug_flags);
-G_CONST_RETURN gchar* g_type_name                    (GType            type);
-GQuark                g_type_qname                   (GType            type);
-GType                 g_type_from_name               (const gchar     *name);
-GType                 g_type_parent                  (GType            type);
-guint                 g_type_depth                   (GType            type);
-GType                 g_type_next_base               (GType            leaf_type,
-						      GType            root_type);
-gboolean              g_type_is_a                    (GType            type,
-						      GType            is_a_type);
-gpointer              g_type_class_ref               (GType            type);
-gpointer              g_type_class_peek              (GType            type);
-gpointer              g_type_class_peek_static       (GType            type);
-void                  g_type_class_unref             (gpointer         g_class);
-gpointer              g_type_class_peek_parent       (gpointer         g_class);
-gpointer              g_type_interface_peek          (gpointer         instance_class,
-						      GType            iface_type);
-gpointer              g_type_interface_peek_parent   (gpointer         g_iface);
-
-gpointer              g_type_default_interface_ref   (GType            g_type);
-gpointer              g_type_default_interface_peek  (GType            g_type);
-void                  g_type_default_interface_unref (gpointer         g_iface);
-
-/* g_free() the returned arrays */
-GType*                g_type_children                (GType            type,
-						      guint           *n_children);
-GType*                g_type_interfaces              (GType            type,
-						      guint           *n_interfaces);
-
-/* per-type _static_ data */
-void                  g_type_set_qdata               (GType            type,
-						      GQuark           quark,
-						      gpointer         data);
-gpointer              g_type_get_qdata               (GType            type,
-						      GQuark           quark);
-void		      g_type_query		     (GType	       type,
-						      GTypeQuery      *query);
-
-
-/* --- type registration --- */
-typedef void   (*GBaseInitFunc)              (gpointer         g_class);
-typedef void   (*GBaseFinalizeFunc)          (gpointer         g_class);
-typedef void   (*GClassInitFunc)             (gpointer         g_class,
-					      gpointer         class_data);
-typedef void   (*GClassFinalizeFunc)         (gpointer         g_class,
-					      gpointer         class_data);
-typedef void   (*GInstanceInitFunc)          (GTypeInstance   *instance,
-					      gpointer         g_class);
-typedef void   (*GInterfaceInitFunc)         (gpointer         g_iface,
-					      gpointer         iface_data);
-typedef void   (*GInterfaceFinalizeFunc)     (gpointer         g_iface,
-					      gpointer         iface_data);
-typedef gboolean (*GTypeClassCacheFunc)	     (gpointer	       cache_data,
-					      GTypeClass      *g_class);
-typedef void     (*GTypeInterfaceCheckFunc)  (gpointer	       check_data,
-					      gpointer         g_iface);
-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;
-typedef enum    /*< skip >*/
-{
-  G_TYPE_FLAG_ABSTRACT		= (1 << 4),
-  G_TYPE_FLAG_VALUE_ABSTRACT	= (1 << 5)
-} GTypeFlags;
-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;
-};
-struct _GTypeFundamentalInfo
-{
-  GTypeFundamentalFlags  type_flags;
-};
-struct _GInterfaceInfo
-{
-  GInterfaceInitFunc     interface_init;
-  GInterfaceFinalizeFunc interface_finalize;
-  gpointer               interface_data;
-};
-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);
-  gchar	    *collect_format;
-  gchar*   (*collect_value)      (GValue       *value,
-				  guint         n_collect_values,
-				  GTypeCValue  *collect_values,
-				  guint		collect_flags);
-  gchar	    *lcopy_format;
-  gchar*   (*lcopy_value)        (const GValue *value,
-				  guint         n_collect_values,
-				  GTypeCValue  *collect_values,
-				  guint		collect_flags);
-};
-GType g_type_register_static		(GType			     parent_type,
-					 const gchar		    *type_name,
-					 const GTypeInfo	    *info,
-					 GTypeFlags		     flags);
-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);
-  
-GType g_type_register_dynamic		(GType			     parent_type,
-					 const gchar		    *type_name,
-					 GTypePlugin		    *plugin,
-					 GTypeFlags		     flags);
-GType g_type_register_fundamental	(GType			     type_id,
-					 const gchar		    *type_name,
-					 const GTypeInfo	    *info,
-					 const GTypeFundamentalInfo *finfo,
-					 GTypeFlags		     flags);
-void  g_type_add_interface_static	(GType			     instance_type,
-					 GType			     interface_type,
-					 const GInterfaceInfo	    *info);
-void  g_type_add_interface_dynamic	(GType			     instance_type,
-					 GType			     interface_type,
-					 GTypePlugin		    *plugin);
-void  g_type_interface_add_prerequisite (GType			     interface_type,
-					 GType			     prerequisite_type);
-GType*g_type_interface_prerequisites    (GType                       interface_type,
-					 guint                      *n_prerequisites);
-void     g_type_class_add_private       (gpointer                    g_class,
-                                         gsize                       private_size);
-gpointer g_type_instance_get_private    (GTypeInstance              *instance,
-                                         GType                       private_type);
-
-
-/* --- GType boilerplate --- */
-/* convenience macros for type implementations, which for a type GtkGadget will:
- * - prototype: static void     gtk_gadget_class_init (GtkGadgetClass *klass);
- * - prototype: static void     gtk_gadget_init       (GtkGadget      *self);
- * - define:    static gpointer gtk_gadget_parent_class = NULL;
- *   gtk_gadget_parent_class is initialized prior to calling gtk_gadget_class_init()
- * - implement: GType           gtk_gadget_get_type (void) { ... }
- * - support custom code in gtk_gadget_get_type() after the type is registered.
- *
- * macro arguments: TypeName, type_name, TYPE_PARENT, CODE
- * example: G_DEFINE_TYPE_WITH_CODE (GtkGadget, gtk_gadget, GTK_TYPE_WIDGET,
- *                                   g_print ("GtkGadget-id: %lu\n", g_define_type_id));
- */
-#define G_DEFINE_TYPE(TN, t_n, T_P)			    G_DEFINE_TYPE_EXTENDED (TN, t_n, T_P, 0, {})
-#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()
-#define G_DEFINE_ABSTRACT_TYPE(TN, t_n, T_P)		    G_DEFINE_TYPE_EXTENDED (TN, t_n, T_P, G_TYPE_FLAG_ABSTRACT, {})
-#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()
-#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()
-
-/* convenience macro to ease interface addition in the CODE
- * section of G_DEFINE_TYPE_WITH_CODE() (this macro relies on
- * the g_define_type_id present within G_DEFINE_TYPE_WITH_CODE()).
- * usage example:
- * G_DEFINE_TYPE_WITH_CODE (GtkTreeStore, gtk_tree_store, G_TYPE_OBJECT,
- *                          G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_MODEL,
- *                                                 gtk_tree_store_tree_model_init));
- */
-#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); \
-}
-
-#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 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); \
-} \
-\
-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() */
-
-
-/* --- protected (for fundamental type implementations) --- */
-GTypePlugin*	 g_type_get_plugin		(GType		     type);
-GTypePlugin*	 g_type_interface_get_plugin	(GType		     instance_type,
-						 GType               interface_type);
-GType		 g_type_fundamental_next	(void);
-GType		 g_type_fundamental		(GType		     type_id);
-GTypeInstance*   g_type_create_instance         (GType               type);
-void             g_type_free_instance           (GTypeInstance      *instance);
-
-void		 g_type_add_class_cache_func    (gpointer	     cache_data,
-						 GTypeClassCacheFunc cache_func);
-void		 g_type_remove_class_cache_func (gpointer	     cache_data,
-						 GTypeClassCacheFunc cache_func);
-void             g_type_class_unref_uncached    (gpointer            g_class);
-
-void             g_type_add_interface_check     (gpointer	         check_data,
-						 GTypeInterfaceCheckFunc check_func);
-void             g_type_remove_interface_check  (gpointer	         check_data,
-						 GTypeInterfaceCheckFunc check_func);
-
-GTypeValueTable* g_type_value_table_peek        (GType		     type);
-
-
-/*< private >*/
-gboolean	 g_type_check_instance          (GTypeInstance      *instance) G_GNUC_PURE;
-GTypeInstance*   g_type_check_instance_cast     (GTypeInstance      *instance,
-						 GType               iface_type);
-gboolean         g_type_check_instance_is_a	(GTypeInstance      *instance,
-						 GType               iface_type) G_GNUC_PURE;
-GTypeClass*      g_type_check_class_cast        (GTypeClass         *g_class,
-						 GType               is_a_type);
-gboolean         g_type_check_class_is_a        (GTypeClass         *g_class,
-						 GType               is_a_type) G_GNUC_PURE;
-gboolean	 g_type_check_is_value_type     (GType		     type) G_GNUC_CONST;
-gboolean	 g_type_check_value             (GValue		    *value) G_GNUC_PURE;
-gboolean	 g_type_check_value_holds	(GValue		    *value,
-						 GType		     type) G_GNUC_PURE;
-gboolean         g_type_test_flags              (GType               type,
-						 guint               flags) G_GNUC_CONST;
-
-
-/* --- debugging functions --- */
-G_CONST_RETURN gchar* g_type_name_from_instance	(GTypeInstance	*instance);
-G_CONST_RETURN gchar* g_type_name_from_class	(GTypeClass	*g_class);
-
-
-/* --- internal functions --- */
-G_GNUC_INTERNAL void    g_value_c_init          (void); /* sync with gvalue.c */
-G_GNUC_INTERNAL void    g_value_types_init      (void); /* sync with gvaluetypes.c */
-G_GNUC_INTERNAL void    g_enum_types_init       (void); /* sync with genums.c */
-G_GNUC_INTERNAL void    g_param_type_init       (void); /* sync with gparam.c */
-G_GNUC_INTERNAL void    g_boxed_type_init       (void); /* sync with gboxed.c */
-G_GNUC_INTERNAL void    g_object_type_init      (void); /* sync with gobject.c */
-G_GNUC_INTERNAL void    g_param_spec_types_init (void); /* sync with gparamspecs.c */
-G_GNUC_INTERNAL void    g_value_transforms_init (void); /* sync with gvaluetransform.c */
-G_GNUC_INTERNAL void    g_signal_init           (void); /* sync with gsignal.c */
-
-
-/* --- 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 && __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 && __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 && __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__ */
-#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/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gtypemodule.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gtypemodule.h
deleted file mode 100644
index 46858f59..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gtypemodule.h
+++ /dev/null
@@ -1,135 +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.
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_TYPE_MODULE_H__
-#define __G_TYPE_MODULE_H__
-
-#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))
-
-struct _GTypeModule 
-{
-  GObject parent_instance;
-
-  guint use_count;
-  GSList *type_infos;
-  GSList *interface_infos;
-
-  /*< public >*/
-  gchar *name;
-};
-
-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);
-};
-
-#define G_DEFINE_DYNAMIC_TYPE(TN, t_n, T_P)          G_DEFINE_DYNAMIC_TYPE_EXTENDED (TN, t_n, T_P, 0, {})
-#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 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); \
-} \
-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; \
-  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 ; } \
-}
-
-
-GType    g_type_module_get_type       (void) G_GNUC_CONST;
-gboolean g_type_module_use            (GTypeModule          *module);
-void     g_type_module_unuse          (GTypeModule          *module);
-void     g_type_module_set_name       (GTypeModule          *module,
-                                       const gchar          *name);
-GType    g_type_module_register_type  (GTypeModule          *module,
-                                       GType                 parent_type,
-                                       const gchar          *type_name,
-                                       const GTypeInfo      *type_info,
-                                       GTypeFlags            flags);
-void     g_type_module_add_interface  (GTypeModule          *module,
-                                       GType                 instance_type,
-                                       GType                 interface_type,
-                                       const GInterfaceInfo *interface_info);
-GType    g_type_module_register_enum  (GTypeModule          *module,
-                                       const gchar          *name,
-                                       const GEnumValue     *const_static_values);
-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/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gtypeplugin.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gtypeplugin.h
deleted file mode 100644
index a8e9803d..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gtypeplugin.h
+++ /dev/null
@@ -1,79 +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.
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_TYPE_PLUGIN_H__
-#define __G_TYPE_PLUGIN_H__
-
-#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;
-typedef void  (*GTypePluginUse)			  (GTypePlugin     *plugin);
-typedef void  (*GTypePluginUnuse)		  (GTypePlugin     *plugin);
-typedef void  (*GTypePluginCompleteTypeInfo)	  (GTypePlugin     *plugin,
-						   GType            g_type,
-						   GTypeInfo       *info,
-						   GTypeValueTable *value_table);
-typedef void  (*GTypePluginCompleteInterfaceInfo) (GTypePlugin     *plugin,
-						   GType            instance_type,
-						   GType            interface_type,
-						   GInterfaceInfo  *info);
-struct _GTypePluginClass
-{
-  /*< private >*/
-  GTypeInterface		   base_iface;
-  
-  /*< public >*/
-  GTypePluginUse		   use_plugin;
-  GTypePluginUnuse		   unuse_plugin;
-  GTypePluginCompleteTypeInfo	   complete_type_info;
-  GTypePluginCompleteInterfaceInfo complete_interface_info;
-};
-
-
-/* --- prototypes --- */
-GType	g_type_plugin_get_type			(void)	G_GNUC_CONST;
-void	g_type_plugin_use			(GTypePlugin	 *plugin);
-void	g_type_plugin_unuse			(GTypePlugin	 *plugin);
-void	g_type_plugin_complete_type_info	(GTypePlugin     *plugin,
-						 GType            g_type,
-						 GTypeInfo       *info,
-						 GTypeValueTable *value_table);
-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/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gvalue.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gvalue.h
deleted file mode 100644
index b93e1e9d..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gvalue.h
+++ /dev/null
@@ -1,94 +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
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_VALUE_H__
-#define __G_VALUE_H__
-
-#include	<gobject/gtype.h>
-
-G_BEGIN_DECLS
-
-/* --- type macros --- */
-#define	G_TYPE_IS_VALUE(type)		(g_type_check_is_value_type (type))
-#define	G_IS_VALUE(value)		(G_TYPE_CHECK_VALUE (value))
-#define	G_VALUE_TYPE(value)		(((GValue*) (value))->g_type)
-#define	G_VALUE_TYPE_NAME(value)	(g_type_name (G_VALUE_TYPE (value)))
-#define G_VALUE_HOLDS(value,type)	(G_TYPE_CHECK_VALUE_TYPE ((value), (type)))
-
-
-/* --- typedefs & structures --- */
-typedef void (*GValueTransform) (const GValue *src_value,
-				 GValue       *dest_value);
-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 --- */
-GValue*         g_value_init	   	(GValue       *value,
-					 GType         g_type);
-void            g_value_copy    	(const GValue *src_value,
-					 GValue       *dest_value);
-GValue*         g_value_reset   	(GValue       *value);
-void            g_value_unset   	(GValue       *value);
-void		g_value_set_instance	(GValue	      *value,
-					 gpointer      instance);
-
-
-/* --- private --- */
-gboolean	g_value_fits_pointer	(const GValue *value);
-gpointer	g_value_peek_pointer	(const GValue *value);
-
-
-/* --- implementation details --- */
-gboolean g_value_type_compatible	(GType		 src_type,
-					 GType		 dest_type);
-gboolean g_value_type_transformable	(GType           src_type,
-					 GType           dest_type);
-gboolean g_value_transform		(const GValue   *src_value,
-					 GValue         *dest_value);
-void	g_value_register_transform_func	(GType		 src_type,
-					 GType		 dest_type,
-					 GValueTransform transform_func);
-#define G_VALUE_NOCOPY_CONTENTS		(1 << 27)
-
-
-G_END_DECLS
-
-#endif /* __G_VALUE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gvaluearray.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gvaluearray.h
deleted file mode 100644
index d6897148..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gvaluearray.h
+++ /dev/null
@@ -1,70 +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
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_VALUE_ARRAY_H__
-#define __G_VALUE_ARRAY_H__
-
-#include	<gobject/gvalue.h>
-
-
-G_BEGIN_DECLS
-
-
-/* --- typedefs & structs --- */
-typedef struct _GValueArray GValueArray;
-struct _GValueArray
-{
-  guint   n_values;
-  GValue *values;
-
-  /*< private >*/
-  guint   n_prealloced;
-};
-
-
-/* --- prototypes --- */
-GValue*		g_value_array_get_nth	     (GValueArray	*value_array,
-					      guint		 index_);
-GValueArray*	g_value_array_new	     (guint		 n_prealloced);
-void		g_value_array_free	     (GValueArray	*value_array);
-GValueArray*	g_value_array_copy	     (const GValueArray *value_array);
-GValueArray*	g_value_array_prepend	     (GValueArray	*value_array,
-					      const GValue	*value);
-GValueArray*	g_value_array_append	     (GValueArray	*value_array,
-					      const GValue	*value);
-GValueArray*	g_value_array_insert	     (GValueArray	*value_array,
-					      guint		 index_,
-					      const GValue	*value);
-GValueArray*	g_value_array_remove	     (GValueArray	*value_array,
-					      guint		 index_);
-GValueArray*	g_value_array_sort	     (GValueArray	*value_array,
-					      GCompareFunc	 compare_func);
-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/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gvaluecollector.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gvaluecollector.h
deleted file mode 100644
index e9379968..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gvaluecollector.h
+++ /dev/null
@@ -1,160 +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
- */
-#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 actuall values collected
- */
-union _GTypeCValue
-{
-  gint     v_int;
-  glong    v_long;
-  gint64   v_int64;
-  gdouble  v_double;
-  gpointer v_pointer;
-};
-
-
-/* G_VALUE_COLLECT() 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.
- * value is supposed to be initialized according to the value
- * type to be collected.
- * var_args is the va_list variable and may be evaluated multiple times.
- * __error is a gchar** variable that will be modified to hold a g_new()
- * allocated error messages if something fails.
- */
-#define G_VALUE_COLLECT(value, var_args, flags, __error)				\
-G_STMT_START {										\
-  GValue *_value = (value);								\
-  guint _flags = (flags);								\
-  GType _value_type = G_VALUE_TYPE (_value);						\
-  GTypeValueTable *_vtable = g_type_value_table_peek (_value_type);			\
-  gchar *_collect_format = _vtable->collect_format;					\
-  GTypeCValue _cvalues[G_VALUE_COLLECT_FORMAT_MAX_LENGTH] = { { 0, }, };		\
-  guint _n_values = 0;									\
-                                                                                        \
-  if (_vtable->value_free)								\
-    _vtable->value_free (_value);							\
-  _value->g_type = _value_type;		/* value_meminit() from gvalue.c */		\
-  memset (_value->data, 0, sizeof (_value->data));					\
-  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) = _vtable->collect_value (_value,						\
-				       _n_values,					\
-				       _cvalues,					\
-				       _flags);						\
-} G_STMT_END
-
-
-/* G_VALUE_LCOPY() 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);			\
-  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
-
-
-#define	G_VALUE_COLLECT_FORMAT_MAX_LENGTH	(8)
-
-G_END_DECLS
-
-#endif /* __G_VALUE_COLLECTOR_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gvaluetypes.h b/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gvaluetypes.h
deleted file mode 100644
index 2931cdaa..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/glib-2.0/gobject/gvaluetypes.h
+++ /dev/null
@@ -1,120 +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
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_VALUETYPES_H__
-#define __G_VALUETYPES_H__
-
-#include	<gobject/gvalue.h>
-
-G_BEGIN_DECLS
-
-/* --- type macros --- */
-#define G_VALUE_HOLDS_CHAR(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_CHAR))
-#define G_VALUE_HOLDS_UCHAR(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_UCHAR))
-#define G_VALUE_HOLDS_BOOLEAN(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_BOOLEAN))
-#define G_VALUE_HOLDS_INT(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_INT))
-#define G_VALUE_HOLDS_UINT(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_UINT))
-#define G_VALUE_HOLDS_LONG(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_LONG))
-#define G_VALUE_HOLDS_ULONG(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_ULONG))
-#define G_VALUE_HOLDS_INT64(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_INT64))
-#define G_VALUE_HOLDS_UINT64(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_UINT64))
-#define G_VALUE_HOLDS_FLOAT(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_FLOAT))
-#define G_VALUE_HOLDS_DOUBLE(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_DOUBLE))
-#define G_VALUE_HOLDS_STRING(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_STRING))
-#define G_VALUE_HOLDS_POINTER(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_POINTER))
-#define	G_TYPE_GTYPE			 (g_gtype_get_type())
-#define G_VALUE_HOLDS_GTYPE(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_GTYPE))
-
-
-/* --- prototypes --- */
-void		      g_value_set_char		(GValue	      *value,
-						 gchar	       v_char);
-gchar		      g_value_get_char		(const GValue *value);
-void		      g_value_set_uchar		(GValue	      *value,
-						 guchar	       v_uchar);
-guchar		      g_value_get_uchar		(const GValue *value);
-void		      g_value_set_boolean	(GValue	      *value,
-						 gboolean      v_boolean);
-gboolean	      g_value_get_boolean	(const GValue *value);
-void		      g_value_set_int		(GValue	      *value,
-						 gint	       v_int);
-gint		      g_value_get_int		(const GValue *value);
-void		      g_value_set_uint		(GValue	      *value,
-						 guint	       v_uint);
-guint		      g_value_get_uint		(const GValue *value);
-void		      g_value_set_long		(GValue	      *value,
-						 glong	       v_long);
-glong		      g_value_get_long		(const GValue *value);
-void		      g_value_set_ulong		(GValue	      *value,
-						 gulong	       v_ulong);
-gulong		      g_value_get_ulong		(const GValue *value);
-void		      g_value_set_int64		(GValue	      *value,
-						 gint64	       v_int64);
-gint64		      g_value_get_int64		(const GValue *value);
-void		      g_value_set_uint64	(GValue	      *value,
-						 guint64      v_uint64);
-guint64		      g_value_get_uint64	(const GValue *value);
-void		      g_value_set_float		(GValue	      *value,
-						 gfloat	       v_float);
-gfloat		      g_value_get_float		(const GValue *value);
-void		      g_value_set_double	(GValue	      *value,
-						 gdouble       v_double);
-gdouble		      g_value_get_double	(const GValue *value);
-void		      g_value_set_string	(GValue	      *value,
-						 const gchar  *v_string);
-void		      g_value_set_static_string (GValue	      *value,
-						 const gchar  *v_string);
-G_CONST_RETURN gchar* g_value_get_string	(const GValue *value);
-gchar*		      g_value_dup_string	(const GValue *value);
-void		      g_value_set_pointer	(GValue	      *value,
-						 gpointer      v_pointer);
-gpointer	      g_value_get_pointer	(const GValue *value);
-GType		      g_gtype_get_type		(void);
-void		      g_value_set_gtype	        (GValue	      *value,
-						 GType         v_gtype);
-GType	              g_value_get_gtype	        (const GValue *value);
-
-
-/* Convenience for registering new pointer types */
-GType                 g_pointer_type_register_static (const gchar *name);
-
-/* debugging aid, describe value contents as string */
-gchar*                g_strdup_value_contents   (const GValue *value);
-
-
-void g_value_take_string		        (GValue		   *value,
-						 gchar		   *v_string);
-#ifndef G_DISABLE_DEPRECATED
-void g_value_set_string_take_ownership		(GValue		   *value,
-						 gchar		   *v_string);
-#endif
-
-
-/* humpf, need a C representable type name for G_TYPE_STRING */
-typedef gchar* gchararray;
-
-
-G_END_DECLS
-
-#endif /* __G_VALUETYPES_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
deleted file mode 100644
index 04f573e7..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* GdkPixbuf library - Xlib header file
- *
- * Authors: John Harper <john@dcs.warwick.ac.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 GDK_PIXBUF_XLIB_H
-#define GDK_PIXBUF_XLIB_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h>
-#include <X11/Xlib.h>
-
-
-
-/* init */
-
-void gdk_pixbuf_xlib_init (Display *display, int screen_num);
-
-void gdk_pixbuf_xlib_init_with_depth (Display *display, int screen_num,
-				      int prefDepth);
-
-
-
-/* render */
-
-void gdk_pixbuf_xlib_render_threshold_alpha (GdkPixbuf *pixbuf, Pixmap bitmap,
-					     int src_x, int src_y,
-					     int dest_x, int dest_y,
-					     int width, int height,
-					     int alpha_threshold);
-
-void gdk_pixbuf_xlib_render_to_drawable (GdkPixbuf *pixbuf,
-					 Drawable drawable, GC gc,
-					 int src_x, int src_y,
-					 int dest_x, int dest_y,
-					 int width, int height,
-					 XlibRgbDither dither,
-					 int x_dither, int y_dither);
-
-
-void gdk_pixbuf_xlib_render_to_drawable_alpha (GdkPixbuf *pixbuf,
-					       Drawable drawable,
-					       int src_x, int src_y,
-					       int dest_x, int dest_y,
-					       int width, int height,
-					       GdkPixbufAlphaMode alpha_mode,
-					       int alpha_threshold,
-					       XlibRgbDither dither,
-					       int x_dither, int y_dither);
-
-void gdk_pixbuf_xlib_render_pixmap_and_mask (GdkPixbuf *pixbuf,
-					     Pixmap *pixmap_return,
-					     Pixmap *mask_return,
-					     int alpha_threshold);
-
-
-
-/* drawable */
-
-GdkPixbuf *gdk_pixbuf_xlib_get_from_drawable (GdkPixbuf *dest,
-					      Drawable src,
-					      Colormap cmap, Visual *visual,
-					      int src_x, int src_y,
-					      int dest_x, int dest_y,
-					      int width, int height);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* GDK_PIXBUF_XLIB_H */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
deleted file mode 100644
index c94e746f..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "MPL"); you may not use this file except in
- * compliance with the MPL.  You may obtain a copy of the MPL at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the MPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the MPL
- * for the specific language governing rights and limitations under the
- * MPL.
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU Library General Public License (the "LGPL"), in
- * which case the provisions of the LGPL are applicable instead of
- * those above.  If you wish to allow use of your version of this file
- * only under the terms of the LGPL and not to allow others to use
- * your version of this file under the MPL, indicate your decision by
- * deleting the provisions above and replace them with the notice and
- * other provisions required by the LGPL.  If you do not delete the
- * provisions above, a recipient may use your version of this file
- * under either the MPL or the LGPL.
- */
-
-/*
- * This code is derived from GdkRgb.
- * For more information on GdkRgb, see http://www.levien.com/gdkrgb/
- * Raph Levien <raph@acm.org>
- */
-
-/* Ported by Christopher Blizzard to Xlib.  With permission from the
- * original authors of this file, the contents of this file are also
- * redistributable under the terms of the Mozilla Public license.  For
- * information about the Mozilla Public License, please see the
- * license information at http://www.mozilla.org/MPL/
- */
-
-/* This code is copyright the following authors:
- * Raph Levien          <raph@acm.org>
- * Manish Singh         <manish@gtk.org>
- * Tim Janik            <timj@gtk.org>
- * Peter Mattis         <petm@xcf.berkeley.edu>
- * Spencer Kimball      <spencer@xcf.berkeley.edu>
- * Josh MacDonald       <jmacd@xcf.berkeley.edu>
- * Christopher Blizzard <blizzard@redhat.com>
- * Owen Taylor          <otaylor@redhat.com>
- * Shawn T. Amundson    <amundson@gtk.org>
-*/
-
-
-#ifndef __XLIB_RGB_H__
-#define __XLIB_RGB_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-
-#include <glib.h>
-
-typedef struct _XlibRgbCmap XlibRgbCmap;
-
-struct _XlibRgbCmap {
-  unsigned int colors[256];
-  unsigned char lut[256]; /* for 8-bit modes */
-};
-
-void
-xlib_rgb_init (Display *display, Screen *screen);
-void
-xlib_rgb_init_with_depth (Display *display, Screen *screen, int prefDepth);
-
-unsigned long
-xlib_rgb_xpixel_from_rgb (guint32 rgb);
-
-void
-xlib_rgb_gc_set_foreground (GC gc, guint32 rgb);
-
-void
-xlib_rgb_gc_set_background (GC gc, guint32 rgb);
-
-typedef enum
-{
-  XLIB_RGB_DITHER_NONE,
-  XLIB_RGB_DITHER_NORMAL,
-  XLIB_RGB_DITHER_MAX
-} XlibRgbDither;
-
-void
-xlib_draw_rgb_image (Drawable drawable,
-		     GC gc,
-		     int x,
-		     int y,
-		     int width,
-		     int height,
-		     XlibRgbDither dith,
-		     unsigned char *rgb_buf,
-		     int rowstride);
-
-void
-xlib_draw_rgb_image_dithalign (Drawable drawable,
-			       GC gc,
-			       int x,
-			       int y,
-			       int width,
-			       int height,
-			       XlibRgbDither dith,
-			       unsigned char *rgb_buf,
-			       int rowstride,
-			       int xdith,
-			       int ydith);
-
-void
-xlib_draw_rgb_32_image (Drawable drawable,
-			GC gc,
-			int x,
-			int y,
-			int width,
-			int height,
-			XlibRgbDither dith,
-			unsigned char *buf,
-			int rowstride);
-
-void
-xlib_draw_gray_image (Drawable drawable,
-		      GC gc,
-		      int x,
-		      int y,
-		      int width,
-		      int height,
-		      XlibRgbDither dith,
-		      unsigned char *buf,
-		      int rowstride);
-
-XlibRgbCmap *
-xlib_rgb_cmap_new (guint32 *colors, int n_colors);
-
-void
-xlib_rgb_cmap_free (XlibRgbCmap *cmap);
-
-void
-xlib_draw_indexed_image (Drawable drawable,
-                         GC gc,
-                         int x,
-                         int y,
-                         int width,
-                         int height,
-                         XlibRgbDither dith,
-                         unsigned char *buf,
-                         int rowstride,
-                         XlibRgbCmap *cmap);
-
-/* Below are some functions which are primarily useful for debugging
-   and experimentation. */
-Bool
-xlib_rgb_ditherable (void);
-
-void
-xlib_rgb_set_verbose (Bool verbose);
-
-/* experimental colormap stuff */
-void
-xlib_rgb_set_install (Bool install);
-
-void
-xlib_rgb_set_min_colors (int min_colors);
-
-Colormap
-xlib_rgb_get_cmap (void);
-
-Visual *
-xlib_rgb_get_visual (void);
-
-XVisualInfo *
-xlib_rgb_get_visual_info (void);
-
-int
-xlib_rgb_get_depth (void);
-
-Display *
-xlib_rgb_get_display (void);
-
-Screen *
-xlib_rgb_get_screen (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __XLIB_RGB_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h
deleted file mode 100644
index 43347de6..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
-/* GdkPixbuf library - Animation support
- *
- * Copyright (C) 1999 The Free Software Foundation
- *
- * Authors: Mark Crichton <crichton@gimp.org>
- *          Miguel de Icaza <miguel@gnu.org>
- *          Federico Mena-Quintero <federico@gimp.org>
- *          Havoc Pennington <hp@redhat.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 GDK_PIXBUF_ANIMATION_H
-#define GDK_PIXBUF_ANIMATION_H
-
-#include <glib.h>
-#include <glib-object.h>
-#include <gdk-pixbuf/gdk-pixbuf-core.h>
-
-G_BEGIN_DECLS
-
-/* Animation support */
-
-typedef struct _GdkPixbufAnimation GdkPixbufAnimation;
-typedef struct _GdkPixbufAnimationIter GdkPixbufAnimationIter;
-
-#define GDK_TYPE_PIXBUF_ANIMATION              (gdk_pixbuf_animation_get_type ())
-#define GDK_PIXBUF_ANIMATION(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_PIXBUF_ANIMATION, GdkPixbufAnimation))
-#define GDK_IS_PIXBUF_ANIMATION(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_PIXBUF_ANIMATION))
-
-#define GDK_TYPE_PIXBUF_ANIMATION_ITER              (gdk_pixbuf_animation_iter_get_type ())
-#define GDK_PIXBUF_ANIMATION_ITER(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_PIXBUF_ANIMATION_ITER, GdkPixbufAnimationIter))
-#define GDK_IS_PIXBUF_ANIMATION_ITER(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_PIXBUF_ANIMATION_ITER))
-
-GType               gdk_pixbuf_animation_get_type        (void) G_GNUC_CONST;
-
-#ifdef G_OS_WIN32
-#define gdk_pixbuf_animation_new_from_file gdk_pixbuf_animation_new_from_file_utf8
-#endif
-
-GdkPixbufAnimation *gdk_pixbuf_animation_new_from_file   (const char         *filename,
-                                                          GError            **error);
-
-#ifndef GDK_PIXBUF_DISABLE_DEPRECATED
-GdkPixbufAnimation *gdk_pixbuf_animation_ref             (GdkPixbufAnimation *animation);
-void                gdk_pixbuf_animation_unref           (GdkPixbufAnimation *animation);
-#endif
-
-int                 gdk_pixbuf_animation_get_width       (GdkPixbufAnimation *animation);
-int                 gdk_pixbuf_animation_get_height      (GdkPixbufAnimation *animation);
-gboolean            gdk_pixbuf_animation_is_static_image  (GdkPixbufAnimation *animation);
-GdkPixbuf          *gdk_pixbuf_animation_get_static_image (GdkPixbufAnimation *animation);
-
-GdkPixbufAnimationIter *gdk_pixbuf_animation_get_iter                        (GdkPixbufAnimation     *animation,
-                                                                              const GTimeVal         *start_time);
-GType                   gdk_pixbuf_animation_iter_get_type                   (void) G_GNUC_CONST;
-int                     gdk_pixbuf_animation_iter_get_delay_time             (GdkPixbufAnimationIter *iter);
-GdkPixbuf              *gdk_pixbuf_animation_iter_get_pixbuf                 (GdkPixbufAnimationIter *iter);
-gboolean                gdk_pixbuf_animation_iter_on_currently_loading_frame (GdkPixbufAnimationIter *iter);
-gboolean                gdk_pixbuf_animation_iter_advance                    (GdkPixbufAnimationIter *iter,
-                                                                              const GTimeVal         *current_time);
-
-
-#ifdef GDK_PIXBUF_ENABLE_BACKEND
-
-
-
-typedef struct _GdkPixbufAnimationClass GdkPixbufAnimationClass;
-
-#define GDK_PIXBUF_ANIMATION_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_PIXBUF_ANIMATION, GdkPixbufAnimationClass))
-#define GDK_IS_PIXBUF_ANIMATION_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_PIXBUF_ANIMATION))
-#define GDK_PIXBUF_ANIMATION_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_PIXBUF_ANIMATION, GdkPixbufAnimationClass))
-
-/* Private part of the GdkPixbufAnimation structure */
-struct _GdkPixbufAnimation {
-        GObject parent_instance;
-
-};
-
-struct _GdkPixbufAnimationClass {
-        GObjectClass parent_class;
-
-        /*< public >*/
-
-        gboolean                (*is_static_image)  (GdkPixbufAnimation *anim);
-
-        GdkPixbuf*              (*get_static_image) (GdkPixbufAnimation *anim);
-        
-        void                    (*get_size) (GdkPixbufAnimation *anim,
-                                             int                 *width,
-                                             int                 *height);
-        
-        GdkPixbufAnimationIter* (*get_iter) (GdkPixbufAnimation *anim,
-                                             const GTimeVal     *start_time);
-
-};
-
-
-
-typedef struct _GdkPixbufAnimationIterClass GdkPixbufAnimationIterClass;
-
-#define GDK_PIXBUF_ANIMATION_ITER_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_PIXBUF_ANIMATION_ITER, GdkPixbufAnimationIterClass))
-#define GDK_IS_PIXBUF_ANIMATION_ITER_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_PIXBUF_ANIMATION_ITER))
-#define GDK_PIXBUF_ANIMATION_ITER_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_PIXBUF_ANIMATION_ITER, GdkPixbufAnimationIterClass))
-
-struct _GdkPixbufAnimationIter {
-        GObject parent_instance;
-
-};
-
-struct _GdkPixbufAnimationIterClass {
-        GObjectClass parent_class;
-
-        /*< public >*/
-
-        int        (*get_delay_time)   (GdkPixbufAnimationIter *iter);
-
-        GdkPixbuf* (*get_pixbuf)       (GdkPixbufAnimationIter *iter);
-
-        gboolean   (*on_currently_loading_frame) (GdkPixbufAnimationIter *iter);
-
-        gboolean   (*advance)          (GdkPixbufAnimationIter *iter,
-                                        const GTimeVal         *current_time);
-};
-      
-
-GdkPixbufAnimation* gdk_pixbuf_non_anim_new (GdkPixbuf *pixbuf);
-
-#endif /* GDK_PIXBUF_ENABLE_BACKEND */
-
-G_END_DECLS
-
-#endif /* GDK_PIXBUF_ANIMATION_H */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-core.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-core.h
deleted file mode 100644
index 4ae58952..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-core.h
+++ /dev/null
@@ -1,244 +0,0 @@
-/* GdkPixbuf library - GdkPixbuf data structure
- *
- * Copyright (C) 2003 The Free Software Foundation
- *
- * Authors: Mark Crichton <crichton@gimp.org>
- *          Miguel de Icaza <miguel@gnu.org>
- *          Federico Mena-Quintero <federico@gimp.org>
- *          Havoc Pennington <hp@redhat.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 GDK_PIXBUF_CORE_H
-#define GDK_PIXBUF_CORE_H
-
-#include <glib.h>
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/* Alpha compositing mode */
-typedef enum
-{
-        GDK_PIXBUF_ALPHA_BILEVEL,
-        GDK_PIXBUF_ALPHA_FULL
-} GdkPixbufAlphaMode;
-
-/* Color spaces; right now only RGB is supported.
- * Note that these values are encoded in inline pixbufs
- * as ints, so don't reorder them
- */
-typedef enum {
-	GDK_COLORSPACE_RGB
-} GdkColorspace;
-
-/* All of these are opaque structures */
-typedef struct _GdkPixbuf GdkPixbuf;
-
-#define GDK_TYPE_PIXBUF              (gdk_pixbuf_get_type ())
-#define GDK_PIXBUF(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_PIXBUF, GdkPixbuf))
-#define GDK_IS_PIXBUF(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_PIXBUF))
-
-
-/* Handler that must free the pixel array */
-typedef void (* GdkPixbufDestroyNotify) (guchar *pixels, gpointer data);
-
-#define GDK_PIXBUF_ERROR gdk_pixbuf_error_quark ()
-
-typedef enum {
-        /* image data hosed */
-        GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
-        /* no mem to load image */
-        GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
-        /* bad option passed to save routine */
-        GDK_PIXBUF_ERROR_BAD_OPTION,
-        /* unsupported image type (sort of an ENOSYS) */
-        GDK_PIXBUF_ERROR_UNKNOWN_TYPE,
-        /* unsupported operation (load, save) for image type */
-        GDK_PIXBUF_ERROR_UNSUPPORTED_OPERATION,
-        GDK_PIXBUF_ERROR_FAILED
-} GdkPixbufError;
-
-GQuark gdk_pixbuf_error_quark (void);
-
-
-
-GType gdk_pixbuf_get_type (void) G_GNUC_CONST;
-
-/* Reference counting */
-
-#ifndef GDK_PIXBUF_DISABLE_DEPRECATED
-GdkPixbuf *gdk_pixbuf_ref      (GdkPixbuf *pixbuf);
-void       gdk_pixbuf_unref    (GdkPixbuf *pixbuf);
-#endif
-
-/* GdkPixbuf accessors */
-
-GdkColorspace gdk_pixbuf_get_colorspace      (const GdkPixbuf *pixbuf);
-int           gdk_pixbuf_get_n_channels      (const GdkPixbuf *pixbuf);
-gboolean      gdk_pixbuf_get_has_alpha       (const GdkPixbuf *pixbuf);
-int           gdk_pixbuf_get_bits_per_sample (const GdkPixbuf *pixbuf);
-guchar       *gdk_pixbuf_get_pixels          (const GdkPixbuf *pixbuf);
-int           gdk_pixbuf_get_width           (const GdkPixbuf *pixbuf);
-int           gdk_pixbuf_get_height          (const GdkPixbuf *pixbuf);
-int           gdk_pixbuf_get_rowstride       (const GdkPixbuf *pixbuf);
-
-
-
-/* Create a blank pixbuf with an optimal rowstride and a new buffer */
-GdkPixbuf *gdk_pixbuf_new (GdkColorspace colorspace, gboolean has_alpha, int bits_per_sample,
-			   int width, int height);
-
-/* Copy a pixbuf */
-
-GdkPixbuf *gdk_pixbuf_copy (const GdkPixbuf *pixbuf);
-
-/* Create a pixbuf which points to the pixels of another pixbuf */
-GdkPixbuf *gdk_pixbuf_new_subpixbuf (GdkPixbuf *src_pixbuf,
-                                     int        src_x,
-                                     int        src_y,
-                                     int        width,
-                                     int        height);
-
-/* Simple loading */
-
-#ifdef G_OS_WIN32
-/* DLL ABI stability hack. */
-#define gdk_pixbuf_new_from_file gdk_pixbuf_new_from_file_utf8
-#define gdk_pixbuf_new_from_file_at_size gdk_pixbuf_new_from_file_at_size_utf8
-#define gdk_pixbuf_new_from_file_at_scale gdk_pixbuf_new_from_file_at_scale_utf8
-#endif
-
-GdkPixbuf *gdk_pixbuf_new_from_file (const char *filename,
-                                     GError    **error);
-GdkPixbuf *gdk_pixbuf_new_from_file_at_size (const char *filename,
-					     int         width, 
-					     int         height,
-					     GError    **error);
-GdkPixbuf *gdk_pixbuf_new_from_file_at_scale (const char *filename,
-					      int         width, 
-					      int         height,
-					      gboolean    preserve_aspect_ratio,
-					      GError    **error);
-
-GdkPixbuf *gdk_pixbuf_new_from_data (const guchar *data,
-				     GdkColorspace colorspace,
-				     gboolean has_alpha,
-				     int bits_per_sample,
-				     int width, int height,
-				     int rowstride,
-				     GdkPixbufDestroyNotify destroy_fn,
-				     gpointer destroy_fn_data);
-
-GdkPixbuf *gdk_pixbuf_new_from_xpm_data (const char **data);
-GdkPixbuf* gdk_pixbuf_new_from_inline	(gint          data_length,
-					 const guint8 *data,
-					 gboolean      copy_pixels,
-					 GError      **error);
-       
-/* Mutations */
-void       gdk_pixbuf_fill              (GdkPixbuf    *pixbuf,
-                                         guint32       pixel);
-
-/* Saving */
-
-#ifdef G_OS_WIN32
-/* DLL ABI stability hack. */
-#define gdk_pixbuf_save gdk_pixbuf_save_utf8
-#define gdk_pixbuf_savev gdk_pixbuf_savev_utf8
-#endif
-
-gboolean gdk_pixbuf_save           (GdkPixbuf  *pixbuf, 
-                                    const char *filename, 
-                                    const char *type, 
-                                    GError    **error,
-                                    ...) G_GNUC_NULL_TERMINATED;
-
-gboolean gdk_pixbuf_savev          (GdkPixbuf  *pixbuf, 
-                                    const char *filename, 
-                                    const char *type,
-                                    char      **option_keys,
-                                    char      **option_values,
-                                    GError    **error);
-
-/* Saving to a callback function */
-
-typedef gboolean (*GdkPixbufSaveFunc)   (const gchar *buf,
-					 gsize count,
-					 GError **error,
-					 gpointer data);
-
-gboolean gdk_pixbuf_save_to_callback    (GdkPixbuf  *pixbuf,
-					 GdkPixbufSaveFunc save_func,
-					 gpointer user_data,
-					 const char *type, 
-					 GError    **error,
-					 ...) G_GNUC_NULL_TERMINATED;
-
-gboolean gdk_pixbuf_save_to_callbackv   (GdkPixbuf  *pixbuf, 
-					 GdkPixbufSaveFunc save_func,
-					 gpointer user_data,
-					 const char *type,
-					 char      **option_keys,
-					 char      **option_values,
-					 GError    **error);
-
-/* Saving into a newly allocated char array */
-
-gboolean gdk_pixbuf_save_to_buffer      (GdkPixbuf  *pixbuf,
-					 gchar     **buffer,
-					 gsize      *buffer_size,
-					 const char *type, 
-					 GError    **error,
-					 ...) G_GNUC_NULL_TERMINATED;
-
-gboolean gdk_pixbuf_save_to_bufferv     (GdkPixbuf  *pixbuf,
-					 gchar     **buffer,
-					 gsize      *buffer_size,
-					 const char *type, 
-					 char      **option_keys,
-					 char      **option_values,
-					 GError    **error);
-
-/* Adding an alpha channel */
-GdkPixbuf *gdk_pixbuf_add_alpha (const GdkPixbuf *pixbuf, gboolean substitute_color,
-				 guchar r, guchar g, guchar b);
-
-/* Copy an area of a pixbuf onto another one */
-void gdk_pixbuf_copy_area (const GdkPixbuf *src_pixbuf,
-			   int src_x, int src_y,
-			   int width, int height,
-			   GdkPixbuf *dest_pixbuf,
-			   int dest_x, int dest_y);
-
-/* Brighten/darken and optionally make it pixelated-looking */
-void gdk_pixbuf_saturate_and_pixelate (const GdkPixbuf *src,
-                                       GdkPixbuf       *dest,
-                                       gfloat           saturation,
-                                       gboolean         pixelate);
-
-/* Transform an image to agree with its embedded orientation option / tag */
-GdkPixbuf *gdk_pixbuf_apply_embedded_orientation (GdkPixbuf *src);
-
-G_CONST_RETURN gchar * gdk_pixbuf_get_option (GdkPixbuf   *pixbuf,
-                                              const gchar *key);
-
-
-G_END_DECLS
-
-
-#endif /* GDK_PIXBUF_CORE_H */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h
deleted file mode 100644
index f2199cc3..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-/* Generated data (by glib-mkenums) */
-
-#ifndef __GDK_PIXBUF_ENUM_TYPES_H__
-#define __GDK_PIXBUF_ENUM_TYPES_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-/* enumerations from "gdk-pixbuf-core.h" */
-GType gdk_pixbuf_alpha_mode_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_PIXBUF_ALPHA_MODE (gdk_pixbuf_alpha_mode_get_type())
-GType gdk_colorspace_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_COLORSPACE (gdk_colorspace_get_type())
-GType gdk_pixbuf_error_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_PIXBUF_ERROR (gdk_pixbuf_error_get_type())
-/* enumerations from "gdk-pixbuf-transform.h" */
-GType gdk_interp_type_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_INTERP_TYPE (gdk_interp_type_get_type())
-GType gdk_pixbuf_rotation_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_PIXBUF_ROTATION (gdk_pixbuf_rotation_get_type())
-G_END_DECLS
-
-#endif /* __GDK_PIXBUF_ENUM_TYPES_H__ */
-
-/* Generated data ends here */
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h
deleted file mode 100644
index 794ba221..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef GDK_PIXBUF_FEATURES_H
-#define GDK_PIXBUF_FEATURES_H 1
-
-#define GDK_PIXBUF_MAJOR (2)
-#define GDK_PIXBUF_MINOR (12)
-#define GDK_PIXBUF_MICRO (12)
-#define GDK_PIXBUF_VERSION "2.12.12"
-
-/* We prefix variable declarations so they can
- * properly get exported/imported from Windows DLLs.
- */
-#ifndef GDK_PIXBUF_VAR
-#  ifdef G_PLATFORM_WIN32
-#    ifdef GDK_PIXBUF_STATIC_COMPILATION
-#      define GDK_PIXBUF_VAR extern
-#    else /* !GDK_PIXBUF_STATIC_COMPILATION */
-#      ifdef GDK_PIXBUF_COMPILATION
-#        ifdef DLL_EXPORT
-#          define GDK_PIXBUF_VAR __declspec(dllexport)
-#        else /* !DLL_EXPORT */
-#          define GDK_PIXBUF_VAR extern
-#        endif /* !DLL_EXPORT */
-#      else /* !GDK_PIXBUF_COMPILATION */
-#        define GDK_PIXBUF_VAR extern __declspec(dllimport)
-#      endif /* !GDK_PIXBUF_COMPILATION */
-#    endif /* !GDK_PIXBUF_STATIC_COMPILATION */
-#  else /* !G_PLATFORM_WIN32 */
-#    ifndef GDK_PIXBUF_COMPILATION
-#      define GDK_PIXBUF_VAR extern
-#    else
-#      define GDK_PIXBUF_VAR
-#    endif /* !GDK_PIXBUF_COMPILATION */
-#  endif /* !G_PLATFORM_WIN32 */
-#endif /* GDK_PIXBUF_VAR */
-
-GDK_PIXBUF_VAR const guint gdk_pixbuf_major_version;
-GDK_PIXBUF_VAR const guint gdk_pixbuf_minor_version;
-GDK_PIXBUF_VAR const guint gdk_pixbuf_micro_version;
-GDK_PIXBUF_VAR const char *gdk_pixbuf_version;
-
-#endif
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h
deleted file mode 100644
index 3fe9226c..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/* GdkPixbuf library - Io handling.  This is an internal header for 
- * GdkPixbuf. You should never use it unless you are doing development for 
- * GdkPixbuf itself.
- *
- * Copyright (C) 1999 The Free Software Foundation
- *
- * Authors: Mark Crichton <crichton@gimp.org>
- *          Miguel de Icaza <miguel@gnu.org>
- *          Federico Mena-Quintero <federico@gimp.org>
- *          Jonathan Blandford <jrb@redhat.com>
- *          Michael Fulbright <drmike@redhat.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 GDK_PIXBUF_IO_H
-#define GDK_PIXBUF_IO_H
-
-#include <stdio.h>
-#include <glib.h>
-#include <gmodule.h>
-#include <gdk-pixbuf/gdk-pixbuf-core.h>
-#include <gdk-pixbuf/gdk-pixbuf-animation.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GdkPixbufFormat GdkPixbufFormat;
- 
-GSList    *gdk_pixbuf_get_formats            (void);
-gchar     *gdk_pixbuf_format_get_name        (GdkPixbufFormat *format);
-gchar     *gdk_pixbuf_format_get_description (GdkPixbufFormat *format);
-gchar    **gdk_pixbuf_format_get_mime_types  (GdkPixbufFormat *format);
-gchar    **gdk_pixbuf_format_get_extensions  (GdkPixbufFormat *format);
-gboolean   gdk_pixbuf_format_is_writable     (GdkPixbufFormat *format);
-gboolean   gdk_pixbuf_format_is_scalable     (GdkPixbufFormat *format);
-gboolean   gdk_pixbuf_format_is_disabled     (GdkPixbufFormat *format);
-void       gdk_pixbuf_format_set_disabled    (GdkPixbufFormat *format,
-					      gboolean         disabled);
-gchar     *gdk_pixbuf_format_get_license     (GdkPixbufFormat *format);
-
-GdkPixbufFormat *gdk_pixbuf_get_file_info    (const gchar     *filename,
-					      gint            *width, 
-					      gint            *height);
-
-#ifdef GDK_PIXBUF_ENABLE_BACKEND
-
-
-
-typedef void (* GdkPixbufModuleSizeFunc)           (gint *width, 
-						    gint *height, 
-						    gpointer user_data);
-
-typedef void (* GdkPixbufModulePreparedFunc) (GdkPixbuf          *pixbuf,
-					      GdkPixbufAnimation *anim,
-					      gpointer            user_data);
-typedef void (* GdkPixbufModuleUpdatedFunc)  (GdkPixbuf *pixbuf,
-					      int        x,
-					      int        y,
-					      int        width,
-					      int        height,
-					      gpointer   user_data);
-
-typedef struct _GdkPixbufModulePattern GdkPixbufModulePattern;
-struct _GdkPixbufModulePattern {
-	char *prefix;
-	char *mask;
-	int relevance;
-};
-
-typedef struct _GdkPixbufModule GdkPixbufModule;
-struct _GdkPixbufModule {
-	char *module_name;
-	char *module_path;
-	GModule *module;
-	GdkPixbufFormat *info;
-	
-        GdkPixbuf *(* load) (FILE    *f,
-                             GError **error);
-        GdkPixbuf *(* load_xpm_data) (const char **data);
-
-        /* Incremental loading */
-
-        gpointer (* begin_load)     (GdkPixbufModuleSizeFunc size_func,
-                                     GdkPixbufModulePreparedFunc prepare_func,
-                                     GdkPixbufModuleUpdatedFunc update_func,
-                                     gpointer user_data,
-                                     GError **error);
-        gboolean (* stop_load)      (gpointer context,
-                                     GError **error);
-        gboolean (* load_increment) (gpointer      context,
-                                     const guchar *buf,
-                                     guint         size,
-                                     GError      **error);
-
-	/* Animation loading */
-	GdkPixbufAnimation *(* load_animation) (FILE    *f,
-                                                GError **error);
-
-        /* Saving */
-        gboolean (* save) (FILE      *f,
-                           GdkPixbuf *pixbuf,
-                           gchar    **param_keys,
-                           gchar    **param_values,
-                           GError   **error);
-
-        gboolean (*save_to_callback) (GdkPixbufSaveFunc save_func,
-				      gpointer user_data,
-				      GdkPixbuf *pixbuf,
-				      gchar **option_keys,
-				      gchar **option_values,
-				      GError **error);
-  
-  /*< private >*/
-	void (*_reserved1) (void); 
-	void (*_reserved2) (void); 
-	void (*_reserved3) (void); 
-	void (*_reserved4) (void); 
-	void (*_reserved5) (void); 
-
-};
-
-typedef void (* GdkPixbufModuleFillVtableFunc) (GdkPixbufModule *module);
-typedef void (* GdkPixbufModuleFillInfoFunc) (GdkPixbufFormat *info);
-
-/*  key/value pairs that can be attached by the pixbuf loader  */
-
-gboolean gdk_pixbuf_set_option  (GdkPixbuf   *pixbuf,
-                                 const gchar *key,
-                                 const gchar *value);
-
-typedef enum /*< skip >*/
-{
-  GDK_PIXBUF_FORMAT_WRITABLE = 1 << 0,
-  GDK_PIXBUF_FORMAT_SCALABLE = 1 << 1,
-  GDK_PIXBUF_FORMAT_THREADSAFE = 1 << 2
-} GdkPixbufFormatFlags;
-
-struct _GdkPixbufFormat {
-  gchar *name;
-  GdkPixbufModulePattern *signature;
-  gchar *domain;
-  gchar *description;
-  gchar **mime_types;
-  gchar **extensions;
-  guint32 flags;
-  gboolean disabled;
-  gchar *license;
-};
-
-
-#endif /* GDK_PIXBUF_ENABLE_BACKEND */
-
-G_END_DECLS
-
-#endif /* GDK_PIXBUF_IO_H */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h
deleted file mode 100644
index d9b2b7dc..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* GdkPixbuf library - Progressive loader object
- *
- * Copyright (C) 1999 The Free Software Foundation
- *
- * Authors: Mark Crichton <crichton@gimp.org>
- *          Miguel de Icaza <miguel@gnu.org>
- *          Federico Mena-Quintero <federico@gimp.org>
- *          Jonathan Blandford <jrb@redhat.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 GDK_PIXBUF_LOADER_H
-#define GDK_PIXBUF_LOADER_H
-
-#include <glib.h>
-#include <glib-object.h>
-#include <gdk-pixbuf/gdk-pixbuf-core.h>
-#include <gdk-pixbuf/gdk-pixbuf-animation.h>
-#include <gdk-pixbuf/gdk-pixbuf-io.h>
-
-G_BEGIN_DECLS
-
-#define GDK_TYPE_PIXBUF_LOADER		   (gdk_pixbuf_loader_get_type ())
-#define GDK_PIXBUF_LOADER(obj)		   (G_TYPE_CHECK_INSTANCE_CAST ((obj), GDK_TYPE_PIXBUF_LOADER, GdkPixbufLoader))
-#define GDK_PIXBUF_LOADER_CLASS(klass)	   (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_PIXBUF_LOADER, GdkPixbufLoaderClass))
-#define GDK_IS_PIXBUF_LOADER(obj)	   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GDK_TYPE_PIXBUF_LOADER))
-#define GDK_IS_PIXBUF_LOADER_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_PIXBUF_LOADER))
-#define GDK_PIXBUF_LOADER_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_PIXBUF_LOADER, GdkPixbufLoaderClass))
-
-
-typedef struct _GdkPixbufLoader GdkPixbufLoader;
-struct _GdkPixbufLoader
-{
-  GObject parent_instance;
-  
-  /*< private >*/
-  gpointer priv;
-};
-
-typedef struct _GdkPixbufLoaderClass GdkPixbufLoaderClass;
-struct _GdkPixbufLoaderClass
-{
-  GObjectClass parent_class;
-
-  void (*size_prepared)      (GdkPixbufLoader *loader, 
-			      int              width,
-			      int              height);
-
-  void (*area_prepared)      (GdkPixbufLoader *loader);
-
-  /* Last known frame needs a redraw for x, y, width, height */
-  void (*area_updated)       (GdkPixbufLoader *loader,
-                              int              x,
-                              int              y,
-			      int              width,
-			      int              height);
-
-  void (*closed)             (GdkPixbufLoader *loader);
-};
-
-GType                gdk_pixbuf_loader_get_type      (void) G_GNUC_CONST;
-GdkPixbufLoader *    gdk_pixbuf_loader_new           (void);
-GdkPixbufLoader *    gdk_pixbuf_loader_new_with_type (const char *image_type,
-                                                      GError    **error);
-GdkPixbufLoader *    gdk_pixbuf_loader_new_with_mime_type (const char *mime_type,
-							   GError    **error);
-void                 gdk_pixbuf_loader_set_size (GdkPixbufLoader  *loader,
-                                                 int               width,
-						 int               height);
-gboolean             gdk_pixbuf_loader_write         (GdkPixbufLoader *loader,
-						      const guchar    *buf,
-						      gsize            count,
-                                                      GError         **error);
-GdkPixbuf *          gdk_pixbuf_loader_get_pixbuf    (GdkPixbufLoader *loader);
-GdkPixbufAnimation * gdk_pixbuf_loader_get_animation (GdkPixbufLoader *loader);
-gboolean             gdk_pixbuf_loader_close         (GdkPixbufLoader *loader,
-                                                      GError         **error);
-GdkPixbufFormat     *gdk_pixbuf_loader_get_format    (GdkPixbufLoader *loader);
-
-G_END_DECLS
-
-#endif
-
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-marshal.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-marshal.h
deleted file mode 100644
index 64222c2c..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-marshal.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-#ifndef ___gdk_pixbuf_marshal_MARSHAL_H__
-#define ___gdk_pixbuf_marshal_MARSHAL_H__
-
-#include	<glib-object.h>
-
-G_BEGIN_DECLS
-
-/* VOID:VOID (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gdk-pixbuf/gdk-pixbuf-marshal.list:25) */
-#define _gdk_pixbuf_marshal_VOID__VOID	g_cclosure_marshal_VOID__VOID
-
-/* VOID:INT,INT,INT,INT (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gdk-pixbuf/gdk-pixbuf-marshal.list:26) */
-extern void _gdk_pixbuf_marshal_VOID__INT_INT_INT_INT (GClosure     *closure,
-                                                       GValue       *return_value,
-                                                       guint         n_param_values,
-                                                       const GValue *param_values,
-                                                       gpointer      invocation_hint,
-                                                       gpointer      marshal_data);
-
-/* VOID:POINTER (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gdk-pixbuf/gdk-pixbuf-marshal.list:27) */
-#define _gdk_pixbuf_marshal_VOID__POINTER	g_cclosure_marshal_VOID__POINTER
-
-/* VOID:INT,INT (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gdk-pixbuf/gdk-pixbuf-marshal.list:28) */
-extern void _gdk_pixbuf_marshal_VOID__INT_INT (GClosure     *closure,
-                                               GValue       *return_value,
-                                               guint         n_param_values,
-                                               const GValue *param_values,
-                                               gpointer      invocation_hint,
-                                               gpointer      marshal_data);
-
-G_END_DECLS
-
-#endif /* ___gdk_pixbuf_marshal_MARSHAL_H__ */
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h
deleted file mode 100644
index d2624042..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
-/* GdkPixbuf library - Simple frame-based animations
- *
- * Copyright (C) 2004 Dom Lachowicz
- *
- * Authors: Dom Lachowicz <cinamod@hotmail.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 GDK_PIXBUF_SIMPLE_ANIM_H
-#define GDK_PIXBUF_SIMPLE_ANIM_H
-
-#include <gdk-pixbuf/gdk-pixbuf-animation.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GdkPixbufSimpleAnim GdkPixbufSimpleAnim;
-typedef struct _GdkPixbufSimpleAnimClass GdkPixbufSimpleAnimClass;
-
-#define GDK_TYPE_PIXBUF_SIMPLE_ANIM              (gdk_pixbuf_simple_anim_get_type ())
-#define GDK_PIXBUF_SIMPLE_ANIM(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_PIXBUF_SIMPLE_ANIM, GdkPixbufSimpleAnim))
-#define GDK_IS_PIXBUF_SIMPLE_ANIM(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_PIXBUF_SIMPLE_ANIM))
-
-#define GDK_PIXBUF_SIMPLE_ANIM_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_PIXBUF_SIMPLE_ANIM, GdkPixbufSimpleAnimClass))
-#define GDK_IS_PIXBUF_SIMPLE_ANIM_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_PIXBUF_SIMPLE_ANIM))
-#define GDK_PIXBUF_SIMPLE_ANIM_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_PIXBUF_SIMPLE_ANIM, GdkPixbufSimpleAnimClass))
-
-GType gdk_pixbuf_simple_anim_get_type (void) G_GNUC_CONST;
-GType gdk_pixbuf_simple_anim_iter_get_type (void) G_GNUC_CONST;
-
-GdkPixbufSimpleAnim *gdk_pixbuf_simple_anim_new           (gint   width, 
-                                                           gint   height,
-                                                           gfloat rate);
-void                 gdk_pixbuf_simple_anim_add_frame     (GdkPixbufSimpleAnim *animation,
-                                                           GdkPixbuf           *pixbuf);
-
-G_END_DECLS
-
-
-#endif  /* GDK_PIXBUF_SIMPLE_ANIM_H */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-transform.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-transform.h
deleted file mode 100644
index 6a1bb1e5..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-transform.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* GdkPixbuf library - transformations
- *
- * Copyright (C) 2003 The Free Software Foundation
- *
- * Authors: Mark Crichton <crichton@gimp.org>
- *          Miguel de Icaza <miguel@gnu.org>
- *          Federico Mena-Quintero <federico@gimp.org>
- *          Havoc Pennington <hp@redhat.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 GDK_PIXBUF_TRANSFORM_H
-#define GDK_PIXBUF_TRANSFORM_H
-
-#include <glib.h>
-#include <gdk-pixbuf/gdk-pixbuf-core.h>
-
-
-G_BEGIN_DECLS
-
-/* Scaling */
-
-/* Interpolation modes */
-typedef enum {
-	GDK_INTERP_NEAREST,
-	GDK_INTERP_TILES,
-	GDK_INTERP_BILINEAR,
-	GDK_INTERP_HYPER
-} GdkInterpType;
-
-typedef enum {
-	GDK_PIXBUF_ROTATE_NONE             =   0,
-	GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE =  90,
-	GDK_PIXBUF_ROTATE_UPSIDEDOWN       = 180,
-	GDK_PIXBUF_ROTATE_CLOCKWISE        = 270
-} GdkPixbufRotation;
-
-void gdk_pixbuf_scale           (const GdkPixbuf *src,
-				 GdkPixbuf       *dest,
-				 int              dest_x,
-				 int              dest_y,
-				 int              dest_width,
-				 int              dest_height,
-				 double           offset_x,
-				 double           offset_y,
-				 double           scale_x,
-				 double           scale_y,
-				 GdkInterpType    interp_type);
-void gdk_pixbuf_composite       (const GdkPixbuf *src,
-				 GdkPixbuf       *dest,
-				 int              dest_x,
-				 int              dest_y,
-				 int              dest_width,
-				 int              dest_height,
-				 double           offset_x,
-				 double           offset_y,
-				 double           scale_x,
-				 double           scale_y,
-				 GdkInterpType    interp_type,
-				 int              overall_alpha);
-void gdk_pixbuf_composite_color (const GdkPixbuf *src,
-				 GdkPixbuf       *dest,
-				 int              dest_x,
-				 int              dest_y,
-				 int              dest_width,
-				 int              dest_height,
-				 double           offset_x,
-				 double           offset_y,
-				 double           scale_x,
-				 double           scale_y,
-				 GdkInterpType    interp_type,
-				 int              overall_alpha,
-				 int              check_x,
-				 int              check_y,
-				 int              check_size,
-				 guint32          color1,
-				 guint32          color2);
-
-GdkPixbuf *gdk_pixbuf_scale_simple           (const GdkPixbuf *src,
-					      int              dest_width,
-					      int              dest_height,
-					      GdkInterpType    interp_type);
-
-GdkPixbuf *gdk_pixbuf_composite_color_simple (const GdkPixbuf *src,
-					      int              dest_width,
-					      int              dest_height,
-					      GdkInterpType    interp_type,
-					      int              overall_alpha,
-					      int              check_size,
-					      guint32          color1,
-					      guint32          color2);
-
-GdkPixbuf *gdk_pixbuf_rotate_simple          (const GdkPixbuf   *src,
-				              GdkPixbufRotation  angle);
-GdkPixbuf *gdk_pixbuf_flip                   (const GdkPixbuf   *src,
-				              gboolean           horizontal);
-				     
-G_END_DECLS
-
-
-#endif  /* GDK_PIXBUF_TRANSFORM_H */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h
deleted file mode 100644
index 0d77b2bf..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* GdkPixbuf library - Main header file
- *
- * Copyright (C) 1999 The Free Software Foundation
- *
- * Authors: Mark Crichton <crichton@gimp.org>
- *          Miguel de Icaza <miguel@gnu.org>
- *          Federico Mena-Quintero <federico@gimp.org>
- *          Havoc Pennington <hp@redhat.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 GDK_PIXBUF_H
-#define GDK_PIXBUF_H
-
-#include <glib.h>
-#include <gdk-pixbuf/gdk-pixbuf-features.h>
-#include <glib-object.h>
-
-#include <gdk-pixbuf/gdk-pixbuf-core.h>
-#include <gdk-pixbuf/gdk-pixbuf-transform.h>
-#include <gdk-pixbuf/gdk-pixbuf-animation.h>
-#include <gdk-pixbuf/gdk-pixbuf-simple-anim.h>
-#include <gdk-pixbuf/gdk-pixbuf-io.h>
-#include <gdk-pixbuf/gdk-pixbuf-loader.h>
-#include <gdk-pixbuf/gdk-pixbuf-enum-types.h>
-
-
-#endif  /* GDK_PIXBUF_H */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h
deleted file mode 100644
index eb85034b..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/* GdkPixbuf library - GdkPixdata - functions for inlined pixbuf handling
- * Copyright (C) 1999, 2001 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 __GDK_PIXDATA_H__
-#define __GDK_PIXDATA_H__
-
-#include        <gdk-pixbuf/gdk-pixbuf.h>
-
-G_BEGIN_DECLS
-
-/**
- * GDK_PIXBUF_MAGIC_NUMBER:
- *
- * Magic number for #GdkPixdata structures.
- **/
-#define GDK_PIXBUF_MAGIC_NUMBER (0x47646b50)    /* 'GdkP' */
-
-/**
- * GdkPixdataType:
- * @GDK_PIXDATA_COLOR_TYPE_RGB:  each pixel has red, green and blue samples.
- * @GDK_PIXDATA_COLOR_TYPE_RGBA: each pixel has red, green and blue samples 
- *    and an alpha value.
- * @GDK_PIXDATA_COLOR_TYPE_MASK: mask for the colortype flags of the enum.
- * @GDK_PIXDATA_SAMPLE_WIDTH_8: each sample has 8 bits.
- * @GDK_PIXDATA_SAMPLE_WIDTH_MASK: mask for the sample width flags of the enum.
- * @GDK_PIXDATA_ENCODING_RAW: the pixel data is in raw form. 
- * @GDK_PIXDATA_ENCODING_RLE: the pixel data is run-length encoded. Runs may 
- *    be up to 127 bytes long; their length is stored in a single byte 
- *    preceding the pixel data for the run. If a run is constant, its length
- *    byte has the high bit set and the pixel data consists of a single pixel
- *    which must be repeated. 
- * @GDK_PIXDATA_ENCODING_MASK: mask for the encoding flags of the enum.
- *
- * An enumeration containing three sets of flags for a #GdkPixdata struct: 
- * one for the used colorspace, one for the width of the samples and one 
- * for the encoding of the pixel data.  
- **/
-typedef enum
-{
-  /* colorspace + alpha */
-  GDK_PIXDATA_COLOR_TYPE_RGB    = 0x01,
-  GDK_PIXDATA_COLOR_TYPE_RGBA   = 0x02,
-  GDK_PIXDATA_COLOR_TYPE_MASK   = 0xff,
-  /* width, support 8bits only currently */
-  GDK_PIXDATA_SAMPLE_WIDTH_8    = 0x01 << 16,
-  GDK_PIXDATA_SAMPLE_WIDTH_MASK = 0x0f << 16,
-  /* encoding */
-  GDK_PIXDATA_ENCODING_RAW      = 0x01 << 24,
-  GDK_PIXDATA_ENCODING_RLE      = 0x02 << 24,
-  GDK_PIXDATA_ENCODING_MASK     = 0x0f << 24
-} GdkPixdataType;
-
-/**
- * GdkPixdata:
- * @magic: magic number. A valid #GdkPixdata structure must have 
- *    #GDK_PIXBUF_MAGIC_NUMBER here.
- * @length: less than 1 to disable length checks, otherwise 
- *    #GDK_PIXDATA_HEADER_LENGTH + length of @pixel_data. 
- * @pixdata_type: information about colorspace, sample width and 
- *    encoding, in a #GdkPixdataType. 
- * @rowstride: Distance in bytes between rows.
- * @width: Width of the image in pixels.
- * @height: Height of the image in pixels.
- * @pixel_data: @width x @height pixels, encoded according to @pixdata_type
- *   and @rowstride.
- *
- * A #GdkPixdata contains pixbuf information in a form suitable for 
- * serialization and streaming.
- **/
-typedef struct _GdkPixdata GdkPixdata;
-struct _GdkPixdata
-{
-  guint32 magic;        /* GDK_PIXBUF_MAGIC_NUMBER */
-  gint32  length;       /* <1 to disable length checks, otherwise:
-			 * GDK_PIXDATA_HEADER_LENGTH + pixel_data length
-			 */
-  guint32 pixdata_type; /* GdkPixdataType */
-  guint32 rowstride;
-  guint32 width;
-  guint32 height;
-  guint8 *pixel_data;
-};
-
-/**
- * GDK_PIXDATA_HEADER_LENGTH:
- *
- * The length of a #GdkPixdata structure without the @pixel_data pointer.
- **/
-#define	GDK_PIXDATA_HEADER_LENGTH	(4 + 4 + 4 + 4 + 4 + 4)
-
-/* the returned stream is plain htonl of GdkPixdata members + pixel_data */
-guint8*		gdk_pixdata_serialize	(const GdkPixdata	*pixdata,
-					 guint			*stream_length_p);
-gboolean	gdk_pixdata_deserialize	(GdkPixdata		*pixdata,
-					 guint			 stream_length,
-					 const guint8		*stream,
-					 GError		       **error);
-gpointer	gdk_pixdata_from_pixbuf	(GdkPixdata		*pixdata,
-					 const GdkPixbuf	*pixbuf,
-					 gboolean		 use_rle);
-GdkPixbuf*	gdk_pixbuf_from_pixdata	(const GdkPixdata	*pixdata,
-					 gboolean		 copy_pixels,
-					 GError		       **error);
-/** 
- * GdkPixdataDumpType:
- * @GDK_PIXDATA_DUMP_PIXDATA_STREAM: Generate pixbuf data stream (a single 
- *    string containing a serialized #GdkPixdata structure in network byte 
- *    order).
- * @GDK_PIXDATA_DUMP_PIXDATA_STRUCT: Generate #GdkPixdata structure (needs 
- *    the #GdkPixdata structure definition from gdk-pixdata.h).
- * @GDK_PIXDATA_DUMP_MACROS: Generate <function>*_ROWSTRIDE</function>,     
- *    <function>*_WIDTH</function>, <function>*_HEIGHT</function>,
- *    <function>*_BYTES_PER_PIXEL</function> and 
- *    <function>*_RLE_PIXEL_DATA</function> or <function>*_PIXEL_DATA</function>
- *    macro definitions for the image.
- * @GDK_PIXDATA_DUMP_GTYPES: Generate GLib data types instead of 
- *    standard C data types.
- * @GDK_PIXDATA_DUMP_CTYPES: Generate standard C data types instead of 
- *    GLib data types.
- * @GDK_PIXDATA_DUMP_STATIC: Generate static symbols.
- * @GDK_PIXDATA_DUMP_CONST: Generate const symbols.
- * @GDK_PIXDATA_DUMP_RLE_DECODER: Provide a <function>*_RUN_LENGTH_DECODE(image_buf, rle_data, size, bpp)</function> 
- *    macro definition  to  decode  run-length encoded image data.
- *  
- * An enumeration which is used by gdk_pixdata_to_csource() to
- * determine the form of C source to be generated. The three values
- * @GDK_PIXDATA_DUMP_PIXDATA_STREAM, @GDK_PIXDATA_DUMP_PIXDATA_STRUCT
- * and @GDK_PIXDATA_DUMP_MACROS are mutually exclusive, as are
- * @GDK_PIXBUF_DUMP_GTYPES and @GDK_PIXBUF_DUMP_CTYPES. The remaining
- * elements are optional flags that can be freely added. 
- **/
-typedef enum
-{
-  /* type of source to save */
-  GDK_PIXDATA_DUMP_PIXDATA_STREAM	= 0,
-  GDK_PIXDATA_DUMP_PIXDATA_STRUCT	= 1,
-  GDK_PIXDATA_DUMP_MACROS		= 2,
-  /* type of variables to use */
-  GDK_PIXDATA_DUMP_GTYPES		= 0,
-  GDK_PIXDATA_DUMP_CTYPES		= 1 << 8,
-  GDK_PIXDATA_DUMP_STATIC		= 1 << 9,
-  GDK_PIXDATA_DUMP_CONST		= 1 << 10,
-  /* save RLE decoder macro? */
-  GDK_PIXDATA_DUMP_RLE_DECODER		= 1 << 16
-} GdkPixdataDumpType;
-  
-
-GString*	gdk_pixdata_to_csource	(GdkPixdata		*pixdata,
-					 const gchar		*name,
-					 GdkPixdataDumpType	 dump_type);
-
-
-G_END_DECLS
-
-#endif /* __GDK_PIXDATA_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdk.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdk.h
deleted file mode 100644
index d84d304a..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdk.h
+++ /dev/null
@@ -1,230 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_H__
-#define __GDK_H__
-
-#include <gdk/gdkcairo.h>
-#include <gdk/gdkcolor.h>
-#include <gdk/gdkcursor.h>
-#include <gdk/gdkdisplay.h>
-#include <gdk/gdkdnd.h>
-#include <gdk/gdkdrawable.h>
-#include <gdk/gdkenumtypes.h>
-#include <gdk/gdkevents.h>
-#include <gdk/gdkfont.h>
-#include <gdk/gdkgc.h>
-#include <gdk/gdkimage.h>
-#include <gdk/gdkinput.h>
-#include <gdk/gdkkeys.h>
-#include <gdk/gdkdisplaymanager.h>
-#include <gdk/gdkpango.h>
-#include <gdk/gdkpixbuf.h>
-#include <gdk/gdkpixmap.h>
-#include <gdk/gdkproperty.h>
-#include <gdk/gdkregion.h>
-#include <gdk/gdkrgb.h>
-#include <gdk/gdkscreen.h>
-#include <gdk/gdkselection.h>
-#include <gdk/gdkspawn.h>
-#include <gdk/gdktypes.h>
-#include <gdk/gdkvisual.h>
-#include <gdk/gdkwindow.h>
-
-G_BEGIN_DECLS
-
-
-/* Initialization, exit and events
- */
-#define	  GDK_PRIORITY_EVENTS		(G_PRIORITY_DEFAULT)
-void 	  gdk_parse_args	   	(gint	   	*argc,
-					 gchar        ***argv);
-void 	  gdk_init		   	(gint	   	*argc,
-					 gchar        ***argv);
-gboolean  gdk_init_check   	        (gint	   	*argc,
-					 gchar        ***argv);
-void gdk_add_option_entries_libgtk_only (GOptionGroup *group);
-void gdk_pre_parse_libgtk_only          (void);
-
-#ifndef GDK_DISABLE_DEPRECATED
-void  	  gdk_exit		   	(gint	    	 error_code);
-#endif /* GDK_DISABLE_DEPRECATED */
-gchar*	  gdk_set_locale	   	(void);
-
-G_CONST_RETURN char *gdk_get_program_class (void);
-void                 gdk_set_program_class (const char *program_class);
-
-/* Push and pop error handlers for X errors
- */
-void      gdk_error_trap_push           (void);
-gint      gdk_error_trap_pop            (void);
-
-#ifndef GDK_DISABLE_DEPRECATED
-void	  gdk_set_use_xshm		(gboolean	 use_xshm);
-gboolean  gdk_get_use_xshm		(void);
-#endif /* GDK_DISABLE_DEPRECATED */
-
-gchar*	                  gdk_get_display		(void);
-G_CONST_RETURN gchar*	  gdk_get_display_arg_name	(void);
-
-#if !defined (GDK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
-/* Used by gtk_input_add_full () */
-gint gdk_input_add_full	  (gint		     source,
-			   GdkInputCondition condition,
-			   GdkInputFunction  function,
-			   gpointer	     data,
-			   GdkDestroyNotify  destroy);
-#endif /* !GDK_DISABLE_DEPRECATED || GTK_COMPILATION */
-#ifndef GDK_DISABLE_DEPRECATED
-gint gdk_input_add	  (gint		     source,
-			   GdkInputCondition condition,
-			   GdkInputFunction  function,
-			   gpointer	     data);
-void gdk_input_remove	  (gint		     tag);
-#endif /* GDK_DISABLE_DEPRECATED */
-
-GdkGrabStatus gdk_pointer_grab       (GdkWindow    *window,
-				      gboolean      owner_events,
-				      GdkEventMask  event_mask,
-				      GdkWindow    *confine_to,
-				      GdkCursor    *cursor,
-				      guint32       time_);
-GdkGrabStatus gdk_keyboard_grab      (GdkWindow    *window,
-				      gboolean      owner_events,
-				      guint32       time_);
-
-gboolean gdk_pointer_grab_info_libgtk_only (GdkDisplay *display,
-					    GdkWindow **grab_window,
-					    gboolean   *owner_events);
-gboolean gdk_keyboard_grab_info_libgtk_only (GdkDisplay *display,
-					     GdkWindow **grab_window,
-					     gboolean   *owner_events);
-
-#ifndef GDK_MULTIHEAD_SAFE
-void          gdk_pointer_ungrab     (guint32       time_);
-void          gdk_keyboard_ungrab    (guint32       time_);
-gboolean      gdk_pointer_is_grabbed (void);
-
-gint gdk_screen_width  (void) G_GNUC_CONST;
-gint gdk_screen_height (void) G_GNUC_CONST;
-
-gint gdk_screen_width_mm  (void) G_GNUC_CONST;
-gint gdk_screen_height_mm (void) G_GNUC_CONST;
-
-void gdk_beep (void);
-#endif /* GDK_MULTIHEAD_SAFE */
-
-void gdk_flush (void);
-
-#ifndef GDK_MULTIHEAD_SAFE
-void gdk_set_double_click_time             (guint       msec);
-#endif
-
-/* Rectangle utilities
- */
-gboolean gdk_rectangle_intersect (GdkRectangle *src1,
-				  GdkRectangle *src2,
-				  GdkRectangle *dest);
-void     gdk_rectangle_union     (GdkRectangle *src1,
-				  GdkRectangle *src2,
-				  GdkRectangle *dest);
-
-GType gdk_rectangle_get_type (void) G_GNUC_CONST;
-
-#define GDK_TYPE_RECTANGLE (gdk_rectangle_get_type ())
-
-/* Conversion functions between wide char and multibyte strings. 
- */
-#ifndef GDK_DISABLE_DEPRECATED
-gchar     *gdk_wcstombs          (const GdkWChar   *src);
-gint       gdk_mbstowcs          (GdkWChar         *dest,
-				  const gchar      *src,
-				  gint              dest_max);
-#endif
-
-/* Miscellaneous */
-#ifndef GDK_MULTIHEAD_SAFE
-gboolean gdk_event_send_client_message      (GdkEvent       *event,
-					     GdkNativeWindow winid);
-void     gdk_event_send_clientmessage_toall (GdkEvent  *event);
-#endif
-gboolean gdk_event_send_client_message_for_display (GdkDisplay *display,
-						    GdkEvent       *event,
-						    GdkNativeWindow winid);
-
-void gdk_notify_startup_complete (void);
-
-void gdk_notify_startup_complete_with_id (const gchar* startup_id);
-
-/* Threading
- */
-
-#if !defined (GDK_DISABLE_DEPRECATED) || defined (GDK_COMPILATION)
-GDKVAR GMutex *gdk_threads_mutex; /* private */
-#endif
-
-GDKVAR GCallback gdk_threads_lock;
-GDKVAR GCallback gdk_threads_unlock;
-
-void     gdk_threads_enter                (void);
-void     gdk_threads_leave                (void);
-void     gdk_threads_init                 (void);
-void     gdk_threads_set_lock_functions   (GCallback enter_fn,
-					   GCallback leave_fn);
-
-guint    gdk_threads_add_idle_full        (gint           priority,
-		                           GSourceFunc    function,
-		                           gpointer       data,
-		                           GDestroyNotify notify);
-guint    gdk_threads_add_idle             (GSourceFunc    function,
-		                           gpointer       data);
-guint    gdk_threads_add_timeout_full     (gint           priority,
-                                           guint          interval,
-                                           GSourceFunc    function,
-                                           gpointer       data,
-                                           GDestroyNotify notify);
-guint    gdk_threads_add_timeout          (guint          interval,
-                                           GSourceFunc    function,
-                                           gpointer       data);
-
-#ifdef	G_THREADS_ENABLED
-#  define GDK_THREADS_ENTER()	G_STMT_START {	\
-      if (gdk_threads_lock)                 	\
-        (*gdk_threads_lock) ();			\
-   } G_STMT_END
-#  define GDK_THREADS_LEAVE()	G_STMT_START { 	\
-      if (gdk_threads_unlock)                 	\
-        (*gdk_threads_unlock) ();		\
-   } G_STMT_END
-#else	/* !G_THREADS_ENABLED */
-#  define GDK_THREADS_ENTER()
-#  define GDK_THREADS_LEAVE()
-#endif	/* !G_THREADS_ENABLED */
-
-G_END_DECLS
-
-
-#endif /* __GDK_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkalias.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkalias.h
deleted file mode 100644
index a3b907ac..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkalias.h
+++ /dev/null
@@ -1,2524 +0,0 @@
-/* Generated by makegdkalias.pl */
-
-#ifndef DISABLE_VISIBILITY
-
-#include <glib.h>
-
-#ifdef G_HAVE_GNUC_VISIBILITY
-
-#define IN_FILE(x) 1
-#define IN_HEADER defined
-
-#if IN_HEADER(__GDK_EVENTS_H__)
-#if IN_FILE(__GDK_EVENTS_X11_C__)
-extern __typeof (gdk_add_client_message_filter) IA__gdk_add_client_message_filter __attribute((visibility("hidden")));
-#define gdk_add_client_message_filter IA__gdk_add_client_message_filter
-
-extern __typeof (gdk_event_get_graphics_expose) IA__gdk_event_get_graphics_expose __attribute((visibility("hidden")));
-#define gdk_event_get_graphics_expose IA__gdk_event_get_graphics_expose
-
-extern __typeof (gdk_events_pending) IA__gdk_events_pending __attribute((visibility("hidden")));
-#define gdk_events_pending IA__gdk_events_pending
-
-#endif
-#endif
-#if IN_HEADER(__GDK_EVENTS_H__)
-#if IN_FILE(__GDK_EVENTS_C__)
-extern __typeof (gdk_event_copy) IA__gdk_event_copy __attribute((visibility("hidden")));
-#define gdk_event_copy IA__gdk_event_copy
-
-extern __typeof (gdk_event_free) IA__gdk_event_free __attribute((visibility("hidden")));
-#define gdk_event_free IA__gdk_event_free
-
-extern __typeof (gdk_event_get) IA__gdk_event_get __attribute((visibility("hidden")));
-#define gdk_event_get IA__gdk_event_get
-
-extern __typeof (gdk_event_get_axis) IA__gdk_event_get_axis __attribute((visibility("hidden")));
-#define gdk_event_get_axis IA__gdk_event_get_axis
-
-extern __typeof (gdk_event_get_coords) IA__gdk_event_get_coords __attribute((visibility("hidden")));
-#define gdk_event_get_coords IA__gdk_event_get_coords
-
-extern __typeof (gdk_event_get_root_coords) IA__gdk_event_get_root_coords __attribute((visibility("hidden")));
-#define gdk_event_get_root_coords IA__gdk_event_get_root_coords
-
-extern __typeof (gdk_event_get_screen) IA__gdk_event_get_screen __attribute((visibility("hidden")));
-#define gdk_event_get_screen IA__gdk_event_get_screen
-
-extern __typeof (gdk_event_get_state) IA__gdk_event_get_state __attribute((visibility("hidden")));
-#define gdk_event_get_state IA__gdk_event_get_state
-
-extern __typeof (gdk_event_get_time) IA__gdk_event_get_time __attribute((visibility("hidden")));
-#define gdk_event_get_time IA__gdk_event_get_time
-
-extern __typeof (gdk_event_get_type) IA__gdk_event_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_event_get_type IA__gdk_event_get_type
-
-extern __typeof (gdk_event_handler_set) IA__gdk_event_handler_set __attribute((visibility("hidden")));
-#define gdk_event_handler_set IA__gdk_event_handler_set
-
-extern __typeof (gdk_event_new) IA__gdk_event_new __attribute((visibility("hidden")));
-#define gdk_event_new IA__gdk_event_new
-
-extern __typeof (gdk_event_peek) IA__gdk_event_peek __attribute((visibility("hidden")));
-#define gdk_event_peek IA__gdk_event_peek
-
-extern __typeof (gdk_event_put) IA__gdk_event_put __attribute((visibility("hidden")));
-#define gdk_event_put IA__gdk_event_put
-
-extern __typeof (gdk_event_request_motions) IA__gdk_event_request_motions __attribute((visibility("hidden")));
-#define gdk_event_request_motions IA__gdk_event_request_motions
-
-extern __typeof (gdk_event_set_screen) IA__gdk_event_set_screen __attribute((visibility("hidden")));
-#define gdk_event_set_screen IA__gdk_event_set_screen
-
-extern __typeof (gdk_get_show_events) IA__gdk_get_show_events __attribute((visibility("hidden")));
-#define gdk_get_show_events IA__gdk_get_show_events
-
-extern __typeof (gdk_set_show_events) IA__gdk_set_show_events __attribute((visibility("hidden")));
-#define gdk_set_show_events IA__gdk_set_show_events
-
-extern __typeof (gdk_setting_get) IA__gdk_setting_get __attribute((visibility("hidden")));
-#define gdk_setting_get IA__gdk_setting_get
-
-#endif
-#endif
-#if IN_HEADER(__GDK_H__)
-#if IN_FILE(__GDK_MAIN_X11_C__)
-extern __typeof (gdk_error_trap_pop) IA__gdk_error_trap_pop __attribute((visibility("hidden")));
-#define gdk_error_trap_pop IA__gdk_error_trap_pop
-
-extern __typeof (gdk_error_trap_push) IA__gdk_error_trap_push __attribute((visibility("hidden")));
-#define gdk_error_trap_push IA__gdk_error_trap_push
-
-extern __typeof (gdk_get_display) IA__gdk_get_display __attribute((visibility("hidden")));
-#define gdk_get_display IA__gdk_get_display
-
-#ifndef GDK_DISABLE_DEPRECATED
-extern __typeof (gdk_get_use_xshm) IA__gdk_get_use_xshm __attribute((visibility("hidden")));
-#define gdk_get_use_xshm IA__gdk_get_use_xshm
-
-extern __typeof (gdk_set_use_xshm) IA__gdk_set_use_xshm __attribute((visibility("hidden")));
-#define gdk_set_use_xshm IA__gdk_set_use_xshm
-
-#endif
-extern __typeof (gdk_keyboard_grab) IA__gdk_keyboard_grab __attribute((visibility("hidden")));
-#define gdk_keyboard_grab IA__gdk_keyboard_grab
-
-extern __typeof (gdk_keyboard_grab_info_libgtk_only) IA__gdk_keyboard_grab_info_libgtk_only __attribute((visibility("hidden")));
-#define gdk_keyboard_grab_info_libgtk_only IA__gdk_keyboard_grab_info_libgtk_only
-
-extern __typeof (gdk_pointer_grab) IA__gdk_pointer_grab __attribute((visibility("hidden")));
-#define gdk_pointer_grab IA__gdk_pointer_grab
-
-extern __typeof (gdk_pointer_grab_info_libgtk_only) IA__gdk_pointer_grab_info_libgtk_only __attribute((visibility("hidden")));
-#define gdk_pointer_grab_info_libgtk_only IA__gdk_pointer_grab_info_libgtk_only
-
-#endif
-#endif
-#if IN_HEADER(__GDK_H__)
-#if IN_FILE(__GDK_DISPLAY_C__)
-extern __typeof (gdk_beep) IA__gdk_beep __attribute((visibility("hidden")));
-#define gdk_beep IA__gdk_beep
-
-extern __typeof (gdk_set_pointer_hooks) IA__gdk_set_pointer_hooks __attribute((visibility("hidden")));
-#define gdk_set_pointer_hooks IA__gdk_set_pointer_hooks
-
-extern __typeof (gdk_keyboard_ungrab) IA__gdk_keyboard_ungrab __attribute((visibility("hidden")));
-#define gdk_keyboard_ungrab IA__gdk_keyboard_ungrab
-
-extern __typeof (gdk_pointer_is_grabbed) IA__gdk_pointer_is_grabbed __attribute((visibility("hidden")));
-#define gdk_pointer_is_grabbed IA__gdk_pointer_is_grabbed
-
-extern __typeof (gdk_pointer_ungrab) IA__gdk_pointer_ungrab __attribute((visibility("hidden")));
-#define gdk_pointer_ungrab IA__gdk_pointer_ungrab
-
-extern __typeof (gdk_event_send_client_message) IA__gdk_event_send_client_message __attribute((visibility("hidden")));
-#define gdk_event_send_client_message IA__gdk_event_send_client_message
-
-extern __typeof (gdk_event_send_clientmessage_toall) IA__gdk_event_send_clientmessage_toall __attribute((visibility("hidden")));
-#define gdk_event_send_clientmessage_toall IA__gdk_event_send_clientmessage_toall
-
-#endif
-#endif
-#if IN_HEADER(__GDK_H__)
-#if IN_FILE(__GDK_IM_X11_C__)
-#ifndef GDK_DISABLE_DEPRECATED
-extern __typeof (gdk_mbstowcs) IA__gdk_mbstowcs __attribute((visibility("hidden")));
-#define gdk_mbstowcs IA__gdk_mbstowcs
-
-extern __typeof (gdk_wcstombs) IA__gdk_wcstombs __attribute((visibility("hidden")));
-#define gdk_wcstombs IA__gdk_wcstombs
-
-#endif
-extern __typeof (gdk_set_locale) IA__gdk_set_locale __attribute((visibility("hidden")));
-#define gdk_set_locale IA__gdk_set_locale
-
-#endif
-#endif
-#if IN_HEADER(__GDK_H__)
-#if IN_FILE(__GDK_EVENTS_X11_C__)
-extern __typeof (gdk_event_send_client_message_for_display) IA__gdk_event_send_client_message_for_display __attribute((visibility("hidden")));
-#define gdk_event_send_client_message_for_display IA__gdk_event_send_client_message_for_display
-
-extern __typeof (gdk_flush) IA__gdk_flush __attribute((visibility("hidden")));
-#define gdk_flush IA__gdk_flush
-
-#endif
-#endif
-#if IN_HEADER(__GDK_H__)
-#if IN_FILE(__GDK_DISPLAY_X11_C__)
-extern __typeof (gdk_notify_startup_complete) IA__gdk_notify_startup_complete __attribute((visibility("hidden")));
-#define gdk_notify_startup_complete IA__gdk_notify_startup_complete
-
-extern __typeof (gdk_notify_startup_complete_with_id) IA__gdk_notify_startup_complete_with_id __attribute((visibility("hidden")));
-#define gdk_notify_startup_complete_with_id IA__gdk_notify_startup_complete_with_id
-
-#endif
-#endif
-#if IN_HEADER(__GDK_H__)
-#if IN_FILE(__GDK_RECTANGLE_C__)
-extern __typeof (gdk_rectangle_get_type) IA__gdk_rectangle_get_type __attribute((visibility("hidden")));
-#define gdk_rectangle_get_type IA__gdk_rectangle_get_type
-
-extern __typeof (gdk_rectangle_intersect) IA__gdk_rectangle_intersect __attribute((visibility("hidden")));
-#define gdk_rectangle_intersect IA__gdk_rectangle_intersect
-
-extern __typeof (gdk_rectangle_union) IA__gdk_rectangle_union __attribute((visibility("hidden")));
-#define gdk_rectangle_union IA__gdk_rectangle_union
-
-#endif
-#endif
-#if IN_HEADER(__GDK_H__)
-#if IN_FILE(__GDK_EVENTS_C__)
-extern __typeof (gdk_set_double_click_time) IA__gdk_set_double_click_time __attribute((visibility("hidden")));
-#define gdk_set_double_click_time IA__gdk_set_double_click_time
-
-#endif
-#endif
-#if IN_HEADER(__GDK_H__)
-#if IN_FILE(__GDK_C__)
-extern __typeof (gdk_add_option_entries_libgtk_only) IA__gdk_add_option_entries_libgtk_only __attribute((visibility("hidden")));
-#define gdk_add_option_entries_libgtk_only IA__gdk_add_option_entries_libgtk_only
-
-extern __typeof (gdk_get_display_arg_name) IA__gdk_get_display_arg_name __attribute((visibility("hidden")));
-#define gdk_get_display_arg_name IA__gdk_get_display_arg_name
-
-extern __typeof (gdk_get_program_class) IA__gdk_get_program_class __attribute((visibility("hidden")));
-#define gdk_get_program_class IA__gdk_get_program_class
-
-extern __typeof (gdk_init) IA__gdk_init __attribute((visibility("hidden")));
-#define gdk_init IA__gdk_init
-
-extern __typeof (gdk_init_check) IA__gdk_init_check __attribute((visibility("hidden")));
-#define gdk_init_check IA__gdk_init_check
-
-#ifndef GDK_DISABLE_DEPRECATED
-extern __typeof (gdk_exit) IA__gdk_exit __attribute((visibility("hidden")));
-#define gdk_exit IA__gdk_exit
-
-#endif
-extern __typeof (gdk_pre_parse_libgtk_only) IA__gdk_pre_parse_libgtk_only __attribute((visibility("hidden")));
-#define gdk_pre_parse_libgtk_only IA__gdk_pre_parse_libgtk_only
-
-extern __typeof (gdk_parse_args) IA__gdk_parse_args __attribute((visibility("hidden")));
-#define gdk_parse_args IA__gdk_parse_args
-
-extern __typeof (gdk_set_program_class) IA__gdk_set_program_class __attribute((visibility("hidden")));
-#define gdk_set_program_class IA__gdk_set_program_class
-
-extern __typeof (gdk_threads_enter) IA__gdk_threads_enter __attribute((visibility("hidden")));
-#define gdk_threads_enter IA__gdk_threads_enter
-
-extern __typeof (gdk_threads_init) IA__gdk_threads_init __attribute((visibility("hidden")));
-#define gdk_threads_init IA__gdk_threads_init
-
-extern __typeof (gdk_threads_leave) IA__gdk_threads_leave __attribute((visibility("hidden")));
-#define gdk_threads_leave IA__gdk_threads_leave
-
-extern __typeof (gdk_threads_set_lock_functions) IA__gdk_threads_set_lock_functions __attribute((visibility("hidden")));
-#define gdk_threads_set_lock_functions IA__gdk_threads_set_lock_functions
-
-extern __typeof (gdk_threads_add_idle) IA__gdk_threads_add_idle __attribute((visibility("hidden")));
-#define gdk_threads_add_idle IA__gdk_threads_add_idle
-
-extern __typeof (gdk_threads_add_idle_full) IA__gdk_threads_add_idle_full __attribute((visibility("hidden")));
-#define gdk_threads_add_idle_full IA__gdk_threads_add_idle_full
-
-extern __typeof (gdk_threads_add_timeout) IA__gdk_threads_add_timeout __attribute((visibility("hidden")));
-#define gdk_threads_add_timeout IA__gdk_threads_add_timeout
-
-extern __typeof (gdk_threads_add_timeout_full) IA__gdk_threads_add_timeout_full __attribute((visibility("hidden")));
-#define gdk_threads_add_timeout_full IA__gdk_threads_add_timeout_full
-
-#endif
-#endif
-#if IN_HEADER(__GDK_H__)
-#if IN_FILE(__GDK_EVENTS_C__)
-#ifndef GDK_DISABLE_DEPRECATED
-extern __typeof (gdk_input_add) IA__gdk_input_add __attribute((visibility("hidden")));
-#define gdk_input_add IA__gdk_input_add
-
-extern __typeof (gdk_input_remove) IA__gdk_input_remove __attribute((visibility("hidden")));
-#define gdk_input_remove IA__gdk_input_remove
-
-extern __typeof (gdk_input_add_full) IA__gdk_input_add_full __attribute((visibility("hidden")));
-#define gdk_input_add_full IA__gdk_input_add_full
-
-#endif
-#endif
-#endif
-#if IN_HEADER(__GDK_H__)
-#if IN_FILE(__GDK_SCREEN_C__)
-extern __typeof (gdk_screen_width) IA__gdk_screen_width __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_screen_width IA__gdk_screen_width
-
-extern __typeof (gdk_screen_width_mm) IA__gdk_screen_width_mm __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_screen_width_mm IA__gdk_screen_width_mm
-
-extern __typeof (gdk_screen_height) IA__gdk_screen_height __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_screen_height IA__gdk_screen_height
-
-extern __typeof (gdk_screen_height_mm) IA__gdk_screen_height_mm __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_screen_height_mm IA__gdk_screen_height_mm
-
-#endif
-#endif
-#if IN_HEADER(__GDK_PROPERTY_H__)
-#if IN_FILE(__GDK_SELECTION_C__)
-extern __typeof (gdk_string_to_compound_text) IA__gdk_string_to_compound_text __attribute((visibility("hidden")));
-#define gdk_string_to_compound_text IA__gdk_string_to_compound_text
-
-extern __typeof (gdk_text_property_to_text_list) IA__gdk_text_property_to_text_list __attribute((visibility("hidden")));
-#define gdk_text_property_to_text_list IA__gdk_text_property_to_text_list
-
-extern __typeof (gdk_text_property_to_utf8_list) IA__gdk_text_property_to_utf8_list __attribute((visibility("hidden")));
-#define gdk_text_property_to_utf8_list IA__gdk_text_property_to_utf8_list
-
-extern __typeof (gdk_utf8_to_compound_text) IA__gdk_utf8_to_compound_text __attribute((visibility("hidden")));
-#define gdk_utf8_to_compound_text IA__gdk_utf8_to_compound_text
-
-#endif
-#endif
-#if IN_HEADER(__GDK_PROPERTY_H__)
-#if IN_FILE(__GDK_PROPERTY_X11_C__)
-extern __typeof (gdk_atom_intern) IA__gdk_atom_intern __attribute((visibility("hidden")));
-#define gdk_atom_intern IA__gdk_atom_intern
-
-extern __typeof (gdk_atom_intern_static_string) IA__gdk_atom_intern_static_string __attribute((visibility("hidden")));
-#define gdk_atom_intern_static_string IA__gdk_atom_intern_static_string
-
-extern __typeof (gdk_atom_name) IA__gdk_atom_name __attribute((visibility("hidden")));
-#define gdk_atom_name IA__gdk_atom_name
-
-extern __typeof (gdk_property_change) IA__gdk_property_change __attribute((visibility("hidden")));
-#define gdk_property_change IA__gdk_property_change
-
-extern __typeof (gdk_property_delete) IA__gdk_property_delete __attribute((visibility("hidden")));
-#define gdk_property_delete IA__gdk_property_delete
-
-extern __typeof (gdk_property_get) IA__gdk_property_get __attribute((visibility("hidden")));
-#define gdk_property_get IA__gdk_property_get
-
-#endif
-#endif
-#if IN_HEADER(__GDK_PROPERTY_H__)
-#if IN_FILE(__GDK_SELECTION_X11_C__)
-extern __typeof (gdk_free_compound_text) IA__gdk_free_compound_text __attribute((visibility("hidden")));
-#define gdk_free_compound_text IA__gdk_free_compound_text
-
-extern __typeof (gdk_free_text_list) IA__gdk_free_text_list __attribute((visibility("hidden")));
-#define gdk_free_text_list IA__gdk_free_text_list
-
-extern __typeof (gdk_string_to_compound_text_for_display) IA__gdk_string_to_compound_text_for_display __attribute((visibility("hidden")));
-#define gdk_string_to_compound_text_for_display IA__gdk_string_to_compound_text_for_display
-
-extern __typeof (gdk_text_property_to_text_list_for_display) IA__gdk_text_property_to_text_list_for_display __attribute((visibility("hidden")));
-#define gdk_text_property_to_text_list_for_display IA__gdk_text_property_to_text_list_for_display
-
-extern __typeof (gdk_text_property_to_utf8_list_for_display) IA__gdk_text_property_to_utf8_list_for_display __attribute((visibility("hidden")));
-#define gdk_text_property_to_utf8_list_for_display IA__gdk_text_property_to_utf8_list_for_display
-
-extern __typeof (gdk_utf8_to_string_target) IA__gdk_utf8_to_string_target __attribute((visibility("hidden")));
-#define gdk_utf8_to_string_target IA__gdk_utf8_to_string_target
-
-extern __typeof (gdk_utf8_to_compound_text_for_display) IA__gdk_utf8_to_compound_text_for_display __attribute((visibility("hidden")));
-#define gdk_utf8_to_compound_text_for_display IA__gdk_utf8_to_compound_text_for_display
-
-#endif
-#endif
-#if IN_HEADER(__GDK_ENUM_TYPES_H__)
-#if IN_FILE(__GDK_ENUM_TYPES_C__)
-extern __typeof (gdk_rgb_dither_get_type) IA__gdk_rgb_dither_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_rgb_dither_get_type IA__gdk_rgb_dither_get_type
-
-extern __typeof (gdk_drag_protocol_get_type) IA__gdk_drag_protocol_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_drag_protocol_get_type IA__gdk_drag_protocol_get_type
-
-extern __typeof (gdk_input_source_get_type) IA__gdk_input_source_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_input_source_get_type IA__gdk_input_source_get_type
-
-extern __typeof (gdk_input_condition_get_type) IA__gdk_input_condition_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_input_condition_get_type IA__gdk_input_condition_get_type
-
-extern __typeof (gdk_input_mode_get_type) IA__gdk_input_mode_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_input_mode_get_type IA__gdk_input_mode_get_type
-
-extern __typeof (gdk_axis_use_get_type) IA__gdk_axis_use_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_axis_use_get_type IA__gdk_axis_use_get_type
-
-extern __typeof (gdk_byte_order_get_type) IA__gdk_byte_order_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_byte_order_get_type IA__gdk_byte_order_get_type
-
-extern __typeof (gdk_cap_style_get_type) IA__gdk_cap_style_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_cap_style_get_type IA__gdk_cap_style_get_type
-
-extern __typeof (gdk_crossing_mode_get_type) IA__gdk_crossing_mode_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_crossing_mode_get_type IA__gdk_crossing_mode_get_type
-
-extern __typeof (gdk_extension_mode_get_type) IA__gdk_extension_mode_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_extension_mode_get_type IA__gdk_extension_mode_get_type
-
-extern __typeof (gdk_event_mask_get_type) IA__gdk_event_mask_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_event_mask_get_type IA__gdk_event_mask_get_type
-
-extern __typeof (gdk_event_type_get_type) IA__gdk_event_type_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_event_type_get_type IA__gdk_event_type_get_type
-
-extern __typeof (gdk_fill_get_type) IA__gdk_fill_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_fill_get_type IA__gdk_fill_get_type
-
-extern __typeof (gdk_fill_rule_get_type) IA__gdk_fill_rule_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_fill_rule_get_type IA__gdk_fill_rule_get_type
-
-extern __typeof (gdk_filter_return_get_type) IA__gdk_filter_return_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_filter_return_get_type IA__gdk_filter_return_get_type
-
-extern __typeof (gdk_function_get_type) IA__gdk_function_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_function_get_type IA__gdk_function_get_type
-
-extern __typeof (gdk_grab_status_get_type) IA__gdk_grab_status_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_grab_status_get_type IA__gdk_grab_status_get_type
-
-extern __typeof (gdk_gravity_get_type) IA__gdk_gravity_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_gravity_get_type IA__gdk_gravity_get_type
-
-extern __typeof (gdk_join_style_get_type) IA__gdk_join_style_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_join_style_get_type IA__gdk_join_style_get_type
-
-extern __typeof (gdk_line_style_get_type) IA__gdk_line_style_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_line_style_get_type IA__gdk_line_style_get_type
-
-extern __typeof (gdk_modifier_type_get_type) IA__gdk_modifier_type_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_modifier_type_get_type IA__gdk_modifier_type_get_type
-
-extern __typeof (gdk_notify_type_get_type) IA__gdk_notify_type_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_notify_type_get_type IA__gdk_notify_type_get_type
-
-extern __typeof (gdk_overlap_type_get_type) IA__gdk_overlap_type_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_overlap_type_get_type IA__gdk_overlap_type_get_type
-
-extern __typeof (gdk_owner_change_get_type) IA__gdk_owner_change_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_owner_change_get_type IA__gdk_owner_change_get_type
-
-extern __typeof (gdk_property_state_get_type) IA__gdk_property_state_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_property_state_get_type IA__gdk_property_state_get_type
-
-extern __typeof (gdk_prop_mode_get_type) IA__gdk_prop_mode_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_prop_mode_get_type IA__gdk_prop_mode_get_type
-
-extern __typeof (gdk_scroll_direction_get_type) IA__gdk_scroll_direction_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_scroll_direction_get_type IA__gdk_scroll_direction_get_type
-
-extern __typeof (gdk_setting_action_get_type) IA__gdk_setting_action_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_setting_action_get_type IA__gdk_setting_action_get_type
-
-extern __typeof (gdk_status_get_type) IA__gdk_status_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_status_get_type IA__gdk_status_get_type
-
-extern __typeof (gdk_subwindow_mode_get_type) IA__gdk_subwindow_mode_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_subwindow_mode_get_type IA__gdk_subwindow_mode_get_type
-
-extern __typeof (gdk_visibility_state_get_type) IA__gdk_visibility_state_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_visibility_state_get_type IA__gdk_visibility_state_get_type
-
-extern __typeof (gdk_wm_decoration_get_type) IA__gdk_wm_decoration_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_wm_decoration_get_type IA__gdk_wm_decoration_get_type
-
-extern __typeof (gdk_wm_function_get_type) IA__gdk_wm_function_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_wm_function_get_type IA__gdk_wm_function_get_type
-
-extern __typeof (gdk_font_type_get_type) IA__gdk_font_type_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_font_type_get_type IA__gdk_font_type_get_type
-
-extern __typeof (gdk_cursor_type_get_type) IA__gdk_cursor_type_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_cursor_type_get_type IA__gdk_cursor_type_get_type
-
-extern __typeof (gdk_drag_action_get_type) IA__gdk_drag_action_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_drag_action_get_type IA__gdk_drag_action_get_type
-
-extern __typeof (gdk_gc_values_mask_get_type) IA__gdk_gc_values_mask_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_gc_values_mask_get_type IA__gdk_gc_values_mask_get_type
-
-extern __typeof (gdk_window_attributes_type_get_type) IA__gdk_window_attributes_type_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_window_attributes_type_get_type IA__gdk_window_attributes_type_get_type
-
-extern __typeof (gdk_window_class_get_type) IA__gdk_window_class_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_window_class_get_type IA__gdk_window_class_get_type
-
-extern __typeof (gdk_window_edge_get_type) IA__gdk_window_edge_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_window_edge_get_type IA__gdk_window_edge_get_type
-
-extern __typeof (gdk_window_hints_get_type) IA__gdk_window_hints_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_window_hints_get_type IA__gdk_window_hints_get_type
-
-extern __typeof (gdk_window_state_get_type) IA__gdk_window_state_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_window_state_get_type IA__gdk_window_state_get_type
-
-extern __typeof (gdk_window_type_get_type) IA__gdk_window_type_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_window_type_get_type IA__gdk_window_type_get_type
-
-extern __typeof (gdk_window_type_hint_get_type) IA__gdk_window_type_hint_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_window_type_hint_get_type IA__gdk_window_type_hint_get_type
-
-extern __typeof (gdk_image_type_get_type) IA__gdk_image_type_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_image_type_get_type IA__gdk_image_type_get_type
-
-extern __typeof (gdk_visual_type_get_type) IA__gdk_visual_type_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_visual_type_get_type IA__gdk_visual_type_get_type
-
-#endif
-#endif
-#if IN_HEADER(__GDK_PIXMAP_H__)
-#if IN_FILE(__GDK_PIXMAP_X11_C__)
-extern __typeof (gdk_bitmap_create_from_data) IA__gdk_bitmap_create_from_data __attribute((visibility("hidden")));
-#define gdk_bitmap_create_from_data IA__gdk_bitmap_create_from_data
-
-#endif
-#endif
-#if IN_HEADER(__GDK_FONT_H__)
-#if IN_FILE(__GDK_FONT_C__)
-#ifndef GDK_DISABLE_DEPRECATED
-extern __typeof (gdk_font_from_description) IA__gdk_font_from_description __attribute((visibility("hidden")));
-#define gdk_font_from_description IA__gdk_font_from_description
-
-#endif
-extern __typeof (gdk_font_get_type) IA__gdk_font_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_font_get_type IA__gdk_font_get_type
-
-extern __typeof (gdk_font_ref) IA__gdk_font_ref __attribute((visibility("hidden")));
-#define gdk_font_ref IA__gdk_font_ref
-
-extern __typeof (gdk_font_unref) IA__gdk_font_unref __attribute((visibility("hidden")));
-#define gdk_font_unref IA__gdk_font_unref
-
-#ifndef GDK_DISABLE_DEPRECATED
-extern __typeof (gdk_font_load) IA__gdk_font_load __attribute((visibility("hidden")));
-#define gdk_font_load IA__gdk_font_load
-
-extern __typeof (gdk_string_width) IA__gdk_string_width __attribute((visibility("hidden")));
-#define gdk_string_width IA__gdk_string_width
-
-extern __typeof (gdk_char_width) IA__gdk_char_width __attribute((visibility("hidden")));
-#define gdk_char_width IA__gdk_char_width
-
-extern __typeof (gdk_char_width_wc) IA__gdk_char_width_wc __attribute((visibility("hidden")));
-#define gdk_char_width_wc IA__gdk_char_width_wc
-
-extern __typeof (gdk_string_measure) IA__gdk_string_measure __attribute((visibility("hidden")));
-#define gdk_string_measure IA__gdk_string_measure
-
-extern __typeof (gdk_text_measure) IA__gdk_text_measure __attribute((visibility("hidden")));
-#define gdk_text_measure IA__gdk_text_measure
-
-extern __typeof (gdk_char_measure) IA__gdk_char_measure __attribute((visibility("hidden")));
-#define gdk_char_measure IA__gdk_char_measure
-
-extern __typeof (gdk_string_height) IA__gdk_string_height __attribute((visibility("hidden")));
-#define gdk_string_height IA__gdk_string_height
-
-extern __typeof (gdk_text_height) IA__gdk_text_height __attribute((visibility("hidden")));
-#define gdk_text_height IA__gdk_text_height
-
-extern __typeof (gdk_char_height) IA__gdk_char_height __attribute((visibility("hidden")));
-#define gdk_char_height IA__gdk_char_height
-
-extern __typeof (gdk_string_extents) IA__gdk_string_extents __attribute((visibility("hidden")));
-#define gdk_string_extents IA__gdk_string_extents
-
-#endif
-#endif
-#endif
-#if IN_HEADER(__GDK_FONT_H__)
-#if IN_FILE(__GDK_FONT_X11_C__)
-#ifndef GDK_DISABLE_DEPRECATED
-extern __typeof (gdk_text_extents) IA__gdk_text_extents __attribute((visibility("hidden")));
-#define gdk_text_extents IA__gdk_text_extents
-
-extern __typeof (gdk_text_extents_wc) IA__gdk_text_extents_wc __attribute((visibility("hidden")));
-#define gdk_text_extents_wc IA__gdk_text_extents_wc
-
-extern __typeof (gdk_text_width) IA__gdk_text_width __attribute((visibility("hidden")));
-#define gdk_text_width IA__gdk_text_width
-
-extern __typeof (gdk_text_width_wc) IA__gdk_text_width_wc __attribute((visibility("hidden")));
-#define gdk_text_width_wc IA__gdk_text_width_wc
-
-extern __typeof (gdk_font_get_display) IA__gdk_font_get_display __attribute((visibility("hidden")));
-#define gdk_font_get_display IA__gdk_font_get_display
-
-extern __typeof (gdk_fontset_load) IA__gdk_fontset_load __attribute((visibility("hidden")));
-#define gdk_fontset_load IA__gdk_fontset_load
-
-#endif
-extern __typeof (gdk_font_id) IA__gdk_font_id __attribute((visibility("hidden")));
-#define gdk_font_id IA__gdk_font_id
-
-extern __typeof (gdk_font_equal) IA__gdk_font_equal __attribute((visibility("hidden")));
-#define gdk_font_equal IA__gdk_font_equal
-
-extern __typeof (gdk_font_load_for_display) IA__gdk_font_load_for_display __attribute((visibility("hidden")));
-#define gdk_font_load_for_display IA__gdk_font_load_for_display
-
-extern __typeof (gdk_font_from_description_for_display) IA__gdk_font_from_description_for_display __attribute((visibility("hidden")));
-#define gdk_font_from_description_for_display IA__gdk_font_from_description_for_display
-
-extern __typeof (gdk_fontset_load_for_display) IA__gdk_fontset_load_for_display __attribute((visibility("hidden")));
-#define gdk_fontset_load_for_display IA__gdk_fontset_load_for_display
-
-#endif
-#endif
-#if IN_HEADER(__GDK_CAIRO_H__)
-#if IN_FILE(__GDK_CAIRO_C__)
-extern __typeof (gdk_cairo_create) IA__gdk_cairo_create __attribute((visibility("hidden")));
-#define gdk_cairo_create IA__gdk_cairo_create
-
-extern __typeof (gdk_cairo_set_source_color) IA__gdk_cairo_set_source_color __attribute((visibility("hidden")));
-#define gdk_cairo_set_source_color IA__gdk_cairo_set_source_color
-
-extern __typeof (gdk_cairo_set_source_pixbuf) IA__gdk_cairo_set_source_pixbuf __attribute((visibility("hidden")));
-#define gdk_cairo_set_source_pixbuf IA__gdk_cairo_set_source_pixbuf
-
-extern __typeof (gdk_cairo_set_source_pixmap) IA__gdk_cairo_set_source_pixmap __attribute((visibility("hidden")));
-#define gdk_cairo_set_source_pixmap IA__gdk_cairo_set_source_pixmap
-
-extern __typeof (gdk_cairo_rectangle) IA__gdk_cairo_rectangle __attribute((visibility("hidden")));
-#define gdk_cairo_rectangle IA__gdk_cairo_rectangle
-
-extern __typeof (gdk_cairo_region) IA__gdk_cairo_region __attribute((visibility("hidden")));
-#define gdk_cairo_region IA__gdk_cairo_region
-
-#endif
-#endif
-#if IN_HEADER(__GDK_COLOR_H__)
-#if IN_FILE(__GDK_COLOR_C__)
-#ifndef GDK_DISABLE_DEPRECATED
-extern __typeof (gdk_colors_store) IA__gdk_colors_store __attribute((visibility("hidden")));
-#define gdk_colors_store IA__gdk_colors_store
-
-extern __typeof (gdk_color_white) IA__gdk_color_white __attribute((visibility("hidden")));
-#define gdk_color_white IA__gdk_color_white
-
-extern __typeof (gdk_color_black) IA__gdk_color_black __attribute((visibility("hidden")));
-#define gdk_color_black IA__gdk_color_black
-
-extern __typeof (gdk_color_alloc) IA__gdk_color_alloc __attribute((visibility("hidden")));
-#define gdk_color_alloc IA__gdk_color_alloc
-
-#endif
-extern __typeof (gdk_color_copy) IA__gdk_color_copy __attribute((visibility("hidden")));
-#define gdk_color_copy IA__gdk_color_copy
-
-extern __typeof (gdk_color_equal) IA__gdk_color_equal __attribute((visibility("hidden")));
-#define gdk_color_equal IA__gdk_color_equal
-
-extern __typeof (gdk_color_free) IA__gdk_color_free __attribute((visibility("hidden")));
-#define gdk_color_free IA__gdk_color_free
-
-extern __typeof (gdk_color_get_type) IA__gdk_color_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_color_get_type IA__gdk_color_get_type
-
-extern __typeof (gdk_color_hash) IA__gdk_color_hash __attribute((visibility("hidden")));
-#define gdk_color_hash IA__gdk_color_hash
-
-extern __typeof (gdk_colormap_alloc_color) IA__gdk_colormap_alloc_color __attribute((visibility("hidden")));
-#define gdk_colormap_alloc_color IA__gdk_colormap_alloc_color
-
-extern __typeof (gdk_colormap_get_system) IA__gdk_colormap_get_system __attribute((visibility("hidden")));
-#define gdk_colormap_get_system IA__gdk_colormap_get_system
-
-extern __typeof (gdk_colormap_get_visual) IA__gdk_colormap_get_visual __attribute((visibility("hidden")));
-#define gdk_colormap_get_visual IA__gdk_colormap_get_visual
-
-#ifndef GDK_DISABLE_DEPRECATED
-extern __typeof (gdk_colormap_ref) IA__gdk_colormap_ref __attribute((visibility("hidden")));
-#define gdk_colormap_ref IA__gdk_colormap_ref
-
-extern __typeof (gdk_colormap_unref) IA__gdk_colormap_unref __attribute((visibility("hidden")));
-#define gdk_colormap_unref IA__gdk_colormap_unref
-
-#endif
-extern __typeof (gdk_color_parse) IA__gdk_color_parse __attribute((visibility("hidden")));
-#define gdk_color_parse IA__gdk_color_parse
-
-extern __typeof (gdk_color_to_string) IA__gdk_color_to_string __attribute((visibility("hidden")));
-#define gdk_color_to_string IA__gdk_color_to_string
-
-#endif
-#endif
-#if IN_HEADER(__GDK_COLOR_H__)
-#if IN_FILE(__GDK_COLOR_X11_C__)
-extern __typeof (gdk_colormap_new) IA__gdk_colormap_new __attribute((visibility("hidden")));
-#define gdk_colormap_new IA__gdk_colormap_new
-
-extern __typeof (gdk_colormap_get_type) IA__gdk_colormap_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_colormap_get_type IA__gdk_colormap_get_type
-
-#ifndef GDK_DISABLE_DEPRECATED
-extern __typeof (gdk_colormap_change) IA__gdk_colormap_change __attribute((visibility("hidden")));
-#define gdk_colormap_change IA__gdk_colormap_change
-
-extern __typeof (gdk_colors_alloc) IA__gdk_colors_alloc __attribute((visibility("hidden")));
-#define gdk_colors_alloc IA__gdk_colors_alloc
-
-extern __typeof (gdk_colors_free) IA__gdk_colors_free __attribute((visibility("hidden")));
-#define gdk_colors_free IA__gdk_colors_free
-
-extern __typeof (gdk_colormap_get_system_size) IA__gdk_colormap_get_system_size __attribute((visibility("hidden")));
-#define gdk_colormap_get_system_size IA__gdk_colormap_get_system_size
-
-extern __typeof (gdk_color_change) IA__gdk_color_change __attribute((visibility("hidden")));
-#define gdk_color_change IA__gdk_color_change
-
-#endif
-extern __typeof (gdk_colormap_alloc_colors) IA__gdk_colormap_alloc_colors __attribute((visibility("hidden")));
-#define gdk_colormap_alloc_colors IA__gdk_colormap_alloc_colors
-
-extern __typeof (gdk_colormap_free_colors) IA__gdk_colormap_free_colors __attribute((visibility("hidden")));
-#define gdk_colormap_free_colors IA__gdk_colormap_free_colors
-
-extern __typeof (gdk_colormap_query_color) IA__gdk_colormap_query_color __attribute((visibility("hidden")));
-#define gdk_colormap_query_color IA__gdk_colormap_query_color
-
-extern __typeof (gdk_colormap_get_screen) IA__gdk_colormap_get_screen __attribute((visibility("hidden")));
-#define gdk_colormap_get_screen IA__gdk_colormap_get_screen
-
-#endif
-#endif
-#if IN_HEADER(__GDK_CURSOR_H__)
-#if IN_FILE(__GDK_CURSOR_C__)
-extern __typeof (gdk_cursor_get_type) IA__gdk_cursor_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_cursor_get_type IA__gdk_cursor_get_type
-
-extern __typeof (gdk_cursor_new) IA__gdk_cursor_new __attribute((visibility("hidden")));
-#define gdk_cursor_new IA__gdk_cursor_new
-
-extern __typeof (gdk_cursor_ref) IA__gdk_cursor_ref __attribute((visibility("hidden")));
-#define gdk_cursor_ref IA__gdk_cursor_ref
-
-extern __typeof (gdk_cursor_unref) IA__gdk_cursor_unref __attribute((visibility("hidden")));
-#define gdk_cursor_unref IA__gdk_cursor_unref
-
-#endif
-#endif
-#if IN_HEADER(__GDK_CURSOR_H__)
-#if IN_FILE(__GDK_CURSOR_X11_C__)
-extern __typeof (gdk_cursor_get_display) IA__gdk_cursor_get_display __attribute((visibility("hidden")));
-#define gdk_cursor_get_display IA__gdk_cursor_get_display
-
-extern __typeof (gdk_cursor_new_for_display) IA__gdk_cursor_new_for_display __attribute((visibility("hidden")));
-#define gdk_cursor_new_for_display IA__gdk_cursor_new_for_display
-
-extern __typeof (gdk_cursor_new_from_pixbuf) IA__gdk_cursor_new_from_pixbuf __attribute((visibility("hidden")));
-#define gdk_cursor_new_from_pixbuf IA__gdk_cursor_new_from_pixbuf
-
-extern __typeof (gdk_cursor_new_from_pixmap) IA__gdk_cursor_new_from_pixmap __attribute((visibility("hidden")));
-#define gdk_cursor_new_from_pixmap IA__gdk_cursor_new_from_pixmap
-
-extern __typeof (gdk_cursor_new_from_name) IA__gdk_cursor_new_from_name __attribute((visibility("hidden")));
-#define gdk_cursor_new_from_name IA__gdk_cursor_new_from_name
-
-extern __typeof (gdk_cursor_get_image) IA__gdk_cursor_get_image __attribute((visibility("hidden")));
-#define gdk_cursor_get_image IA__gdk_cursor_get_image
-
-#endif
-#endif
-#if IN_HEADER(__GDK_INPUT_H__)
-#if IN_FILE(__GDK_INPUT_C__)
-extern __typeof (gdk_device_free_history) IA__gdk_device_free_history __attribute((visibility("hidden")));
-#define gdk_device_free_history IA__gdk_device_free_history
-
-extern __typeof (gdk_device_get_axis) IA__gdk_device_get_axis __attribute((visibility("hidden")));
-#define gdk_device_get_axis IA__gdk_device_get_axis
-
-extern __typeof (gdk_device_get_history) IA__gdk_device_get_history __attribute((visibility("hidden")));
-#define gdk_device_get_history IA__gdk_device_get_history
-
-extern __typeof (gdk_device_get_type) IA__gdk_device_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_device_get_type IA__gdk_device_get_type
-
-extern __typeof (gdk_device_set_axis_use) IA__gdk_device_set_axis_use __attribute((visibility("hidden")));
-#define gdk_device_set_axis_use IA__gdk_device_set_axis_use
-
-extern __typeof (gdk_device_set_key) IA__gdk_device_set_key __attribute((visibility("hidden")));
-#define gdk_device_set_key IA__gdk_device_set_key
-
-extern __typeof (gdk_device_set_source) IA__gdk_device_set_source __attribute((visibility("hidden")));
-#define gdk_device_set_source IA__gdk_device_set_source
-
-extern __typeof (gdk_devices_list) IA__gdk_devices_list __attribute((visibility("hidden")));
-#define gdk_devices_list IA__gdk_devices_list
-
-extern __typeof (gdk_input_set_extension_events) IA__gdk_input_set_extension_events __attribute((visibility("hidden")));
-#define gdk_input_set_extension_events IA__gdk_input_set_extension_events
-
-#endif
-#endif
-#if IN_HEADER(__GDK_INPUT_H__)
-#if IN_FILE(__GDK_DISPLAY_C__)
-extern __typeof (gdk_device_get_core_pointer) IA__gdk_device_get_core_pointer __attribute((visibility("hidden")));
-#define gdk_device_get_core_pointer IA__gdk_device_get_core_pointer
-
-#endif
-#endif
-#if IN_HEADER(__GDK_INPUT_H__)
-#if IN_FILE(__GDK_INPUT_X11_C__)
-extern __typeof (gdk_device_get_state) IA__gdk_device_get_state __attribute((visibility("hidden")));
-#define gdk_device_get_state IA__gdk_device_get_state
-
-#endif
-#endif
-#if IN_HEADER(__GDK_INPUT_H__)
-#if IN_FILE(__GDK_INPUT_XFREE_C__)
-extern __typeof (gdk_device_set_mode) IA__gdk_device_set_mode __attribute((visibility("hidden")));
-#define gdk_device_set_mode IA__gdk_device_set_mode
-
-#endif
-#endif
-#if IN_HEADER(__GDK_INPUT_H__)
-#if IN_FILE(__GDK_INPUT_NONE_C__)
-extern __typeof (gdk_device_get_state) IA__gdk_device_get_state __attribute((visibility("hidden")));
-#define gdk_device_get_state IA__gdk_device_get_state
-
-extern __typeof (gdk_device_set_mode) IA__gdk_device_set_mode __attribute((visibility("hidden")));
-#define gdk_device_set_mode IA__gdk_device_set_mode
-
-#endif
-#endif
-#if IN_HEADER(__GDK_DISPLAY_H__)
-#if IN_FILE(__GDK_EVENTS_X11_C__)
-extern __typeof (gdk_display_add_client_message_filter) IA__gdk_display_add_client_message_filter __attribute((visibility("hidden")));
-#define gdk_display_add_client_message_filter IA__gdk_display_add_client_message_filter
-
-#endif
-#endif
-#if IN_HEADER(__GDK_DISPLAY_H__)
-#if IN_FILE(__GDK_DISPLAY_C__)
-extern __typeof (gdk_display_close) IA__gdk_display_close __attribute((visibility("hidden")));
-#define gdk_display_close IA__gdk_display_close
-
-extern __typeof (gdk_display_get_core_pointer) IA__gdk_display_get_core_pointer __attribute((visibility("hidden")));
-#define gdk_display_get_core_pointer IA__gdk_display_get_core_pointer
-
-extern __typeof (gdk_display_get_event) IA__gdk_display_get_event __attribute((visibility("hidden")));
-#define gdk_display_get_event IA__gdk_display_get_event
-
-extern __typeof (gdk_display_get_pointer) IA__gdk_display_get_pointer __attribute((visibility("hidden")));
-#define gdk_display_get_pointer IA__gdk_display_get_pointer
-
-extern __typeof (gdk_display_get_type) IA__gdk_display_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_display_get_type IA__gdk_display_get_type
-
-extern __typeof (gdk_display_get_window_at_pointer) IA__gdk_display_get_window_at_pointer __attribute((visibility("hidden")));
-#define gdk_display_get_window_at_pointer IA__gdk_display_get_window_at_pointer
-
-extern __typeof (gdk_display_peek_event) IA__gdk_display_peek_event __attribute((visibility("hidden")));
-#define gdk_display_peek_event IA__gdk_display_peek_event
-
-extern __typeof (gdk_display_put_event) IA__gdk_display_put_event __attribute((visibility("hidden")));
-#define gdk_display_put_event IA__gdk_display_put_event
-
-extern __typeof (gdk_display_set_pointer_hooks) IA__gdk_display_set_pointer_hooks __attribute((visibility("hidden")));
-#define gdk_display_set_pointer_hooks IA__gdk_display_set_pointer_hooks
-
-#endif
-#endif
-#if IN_HEADER(__GDK_DISPLAY_H__)
-#if IN_FILE(__GDK_WINDOW_X11_C__)
-extern __typeof (gdk_display_warp_pointer) IA__gdk_display_warp_pointer __attribute((visibility("hidden")));
-#define gdk_display_warp_pointer IA__gdk_display_warp_pointer
-
-#endif
-#endif
-#if IN_HEADER(__GDK_DISPLAY_H__)
-#if IN_FILE(__GDK_DISPLAY_MANAGER_C__)
-extern __typeof (gdk_display_get_default) IA__gdk_display_get_default __attribute((visibility("hidden")));
-#define gdk_display_get_default IA__gdk_display_get_default
-
-#endif
-#endif
-#if IN_HEADER(__GDK_DISPLAY_H__)
-#if IN_FILE(__GDK_CURSOR_X11_C__)
-extern __typeof (gdk_display_get_default_cursor_size) IA__gdk_display_get_default_cursor_size __attribute((visibility("hidden")));
-#define gdk_display_get_default_cursor_size IA__gdk_display_get_default_cursor_size
-
-extern __typeof (gdk_display_get_maximal_cursor_size) IA__gdk_display_get_maximal_cursor_size __attribute((visibility("hidden")));
-#define gdk_display_get_maximal_cursor_size IA__gdk_display_get_maximal_cursor_size
-
-extern __typeof (gdk_display_supports_cursor_alpha) IA__gdk_display_supports_cursor_alpha __attribute((visibility("hidden")));
-#define gdk_display_supports_cursor_alpha IA__gdk_display_supports_cursor_alpha
-
-extern __typeof (gdk_display_supports_cursor_color) IA__gdk_display_supports_cursor_color __attribute((visibility("hidden")));
-#define gdk_display_supports_cursor_color IA__gdk_display_supports_cursor_color
-
-#endif
-#endif
-#if IN_HEADER(__GDK_DISPLAY_H__)
-#if IN_FILE(__GDK_DISPLAY_X11_C__)
-extern __typeof (gdk_display_beep) IA__gdk_display_beep __attribute((visibility("hidden")));
-#define gdk_display_beep IA__gdk_display_beep
-
-extern __typeof (gdk_display_sync) IA__gdk_display_sync __attribute((visibility("hidden")));
-#define gdk_display_sync IA__gdk_display_sync
-
-extern __typeof (gdk_display_flush) IA__gdk_display_flush __attribute((visibility("hidden")));
-#define gdk_display_flush IA__gdk_display_flush
-
-extern __typeof (gdk_display_get_default_group) IA__gdk_display_get_default_group __attribute((visibility("hidden")));
-#define gdk_display_get_default_group IA__gdk_display_get_default_group
-
-extern __typeof (gdk_display_get_default_screen) IA__gdk_display_get_default_screen __attribute((visibility("hidden")));
-#define gdk_display_get_default_screen IA__gdk_display_get_default_screen
-
-extern __typeof (gdk_display_get_name) IA__gdk_display_get_name __attribute((visibility("hidden")));
-#define gdk_display_get_name IA__gdk_display_get_name
-
-extern __typeof (gdk_display_get_n_screens) IA__gdk_display_get_n_screens __attribute((visibility("hidden")));
-#define gdk_display_get_n_screens IA__gdk_display_get_n_screens
-
-extern __typeof (gdk_display_get_screen) IA__gdk_display_get_screen __attribute((visibility("hidden")));
-#define gdk_display_get_screen IA__gdk_display_get_screen
-
-extern __typeof (gdk_display_pointer_is_grabbed) IA__gdk_display_pointer_is_grabbed __attribute((visibility("hidden")));
-#define gdk_display_pointer_is_grabbed IA__gdk_display_pointer_is_grabbed
-
-extern __typeof (gdk_display_pointer_ungrab) IA__gdk_display_pointer_ungrab __attribute((visibility("hidden")));
-#define gdk_display_pointer_ungrab IA__gdk_display_pointer_ungrab
-
-extern __typeof (gdk_display_keyboard_ungrab) IA__gdk_display_keyboard_ungrab __attribute((visibility("hidden")));
-#define gdk_display_keyboard_ungrab IA__gdk_display_keyboard_ungrab
-
-extern __typeof (gdk_display_open) IA__gdk_display_open __attribute((visibility("hidden")));
-#define gdk_display_open IA__gdk_display_open
-
-extern __typeof (gdk_display_request_selection_notification) IA__gdk_display_request_selection_notification __attribute((visibility("hidden")));
-#define gdk_display_request_selection_notification IA__gdk_display_request_selection_notification
-
-extern __typeof (gdk_display_store_clipboard) IA__gdk_display_store_clipboard __attribute((visibility("hidden")));
-#define gdk_display_store_clipboard IA__gdk_display_store_clipboard
-
-extern __typeof (gdk_display_supports_clipboard_persistence) IA__gdk_display_supports_clipboard_persistence __attribute((visibility("hidden")));
-#define gdk_display_supports_clipboard_persistence IA__gdk_display_supports_clipboard_persistence
-
-extern __typeof (gdk_display_supports_selection_notification) IA__gdk_display_supports_selection_notification __attribute((visibility("hidden")));
-#define gdk_display_supports_selection_notification IA__gdk_display_supports_selection_notification
-
-extern __typeof (gdk_display_supports_shapes) IA__gdk_display_supports_shapes __attribute((visibility("hidden")));
-#define gdk_display_supports_shapes IA__gdk_display_supports_shapes
-
-extern __typeof (gdk_display_supports_input_shapes) IA__gdk_display_supports_input_shapes __attribute((visibility("hidden")));
-#define gdk_display_supports_input_shapes IA__gdk_display_supports_input_shapes
-
-extern __typeof (gdk_display_supports_composite) IA__gdk_display_supports_composite __attribute((visibility("hidden")));
-#define gdk_display_supports_composite IA__gdk_display_supports_composite
-
-#endif
-#endif
-#if IN_HEADER(__GDK_DISPLAY_H__)
-#if IN_FILE(__GDK_INPUT_C__)
-extern __typeof (gdk_display_list_devices) IA__gdk_display_list_devices __attribute((visibility("hidden")));
-#define gdk_display_list_devices IA__gdk_display_list_devices
-
-#endif
-#endif
-#if IN_HEADER(__GDK_DISPLAY_H__)
-#if IN_FILE(__GDK_C__)
-extern __typeof (gdk_display_open_default_libgtk_only) IA__gdk_display_open_default_libgtk_only __attribute((visibility("hidden")));
-#define gdk_display_open_default_libgtk_only IA__gdk_display_open_default_libgtk_only
-
-#endif
-#endif
-#if IN_HEADER(__GDK_DISPLAY_H__)
-#if IN_FILE(__GDK_EVENTS_C__)
-extern __typeof (gdk_display_set_double_click_distance) IA__gdk_display_set_double_click_distance __attribute((visibility("hidden")));
-#define gdk_display_set_double_click_distance IA__gdk_display_set_double_click_distance
-
-extern __typeof (gdk_display_set_double_click_time) IA__gdk_display_set_double_click_time __attribute((visibility("hidden")));
-#define gdk_display_set_double_click_time IA__gdk_display_set_double_click_time
-
-#endif
-#endif
-#if IN_HEADER(__GDK_DISPLAY_MANAGER_H__)
-#if IN_FILE(__GDK_DISPLAY_MANAGER_C__)
-extern __typeof (gdk_display_manager_get) IA__gdk_display_manager_get __attribute((visibility("hidden")));
-#define gdk_display_manager_get IA__gdk_display_manager_get
-
-extern __typeof (gdk_display_manager_get_type) IA__gdk_display_manager_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_display_manager_get_type IA__gdk_display_manager_get_type
-
-extern __typeof (gdk_display_manager_list_displays) IA__gdk_display_manager_list_displays __attribute((visibility("hidden")));
-#define gdk_display_manager_list_displays IA__gdk_display_manager_list_displays
-
-extern __typeof (gdk_display_manager_set_default_display) IA__gdk_display_manager_set_default_display __attribute((visibility("hidden")));
-#define gdk_display_manager_set_default_display IA__gdk_display_manager_set_default_display
-
-extern __typeof (gdk_display_manager_get_default_display) IA__gdk_display_manager_get_default_display __attribute((visibility("hidden")));
-#define gdk_display_manager_get_default_display IA__gdk_display_manager_get_default_display
-
-#endif
-#endif
-#if IN_HEADER(__GDK_DND_H__)
-#if IN_FILE(__GDK_DND_X11_C__)
-extern __typeof (gdk_drag_abort) IA__gdk_drag_abort __attribute((visibility("hidden")));
-#define gdk_drag_abort IA__gdk_drag_abort
-
-extern __typeof (gdk_drag_begin) IA__gdk_drag_begin __attribute((visibility("hidden")));
-#define gdk_drag_begin IA__gdk_drag_begin
-
-extern __typeof (gdk_drag_context_get_type) IA__gdk_drag_context_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_drag_context_get_type IA__gdk_drag_context_get_type
-
-extern __typeof (gdk_drag_context_new) IA__gdk_drag_context_new __attribute((visibility("hidden")));
-#define gdk_drag_context_new IA__gdk_drag_context_new
-
-#ifndef GDK_DISABLE_DEPRECATED
-extern __typeof (gdk_drag_context_ref) IA__gdk_drag_context_ref __attribute((visibility("hidden")));
-#define gdk_drag_context_ref IA__gdk_drag_context_ref
-
-extern __typeof (gdk_drag_context_unref) IA__gdk_drag_context_unref __attribute((visibility("hidden")));
-#define gdk_drag_context_unref IA__gdk_drag_context_unref
-
-#endif
-extern __typeof (gdk_drag_drop) IA__gdk_drag_drop __attribute((visibility("hidden")));
-#define gdk_drag_drop IA__gdk_drag_drop
-
-extern __typeof (gdk_drag_drop_succeeded) IA__gdk_drag_drop_succeeded __attribute((visibility("hidden")));
-#define gdk_drag_drop_succeeded IA__gdk_drag_drop_succeeded
-
-extern __typeof (gdk_drag_find_window_for_screen) IA__gdk_drag_find_window_for_screen __attribute((visibility("hidden")));
-#define gdk_drag_find_window_for_screen IA__gdk_drag_find_window_for_screen
-
-extern __typeof (gdk_drag_get_protocol_for_display) IA__gdk_drag_get_protocol_for_display __attribute((visibility("hidden")));
-#define gdk_drag_get_protocol_for_display IA__gdk_drag_get_protocol_for_display
-
-extern __typeof (gdk_drag_get_selection) IA__gdk_drag_get_selection __attribute((visibility("hidden")));
-#define gdk_drag_get_selection IA__gdk_drag_get_selection
-
-extern __typeof (gdk_drag_motion) IA__gdk_drag_motion __attribute((visibility("hidden")));
-#define gdk_drag_motion IA__gdk_drag_motion
-
-extern __typeof (gdk_drag_status) IA__gdk_drag_status __attribute((visibility("hidden")));
-#define gdk_drag_status IA__gdk_drag_status
-
-extern __typeof (gdk_drop_finish) IA__gdk_drop_finish __attribute((visibility("hidden")));
-#define gdk_drop_finish IA__gdk_drop_finish
-
-extern __typeof (gdk_drop_reply) IA__gdk_drop_reply __attribute((visibility("hidden")));
-#define gdk_drop_reply IA__gdk_drop_reply
-
-#endif
-#endif
-#if IN_HEADER(__GDK_DND_H__)
-#if IN_FILE(__GDK_DND_C__)
-extern __typeof (gdk_drag_find_window) IA__gdk_drag_find_window __attribute((visibility("hidden")));
-#define gdk_drag_find_window IA__gdk_drag_find_window
-
-extern __typeof (gdk_drag_get_protocol) IA__gdk_drag_get_protocol __attribute((visibility("hidden")));
-#define gdk_drag_get_protocol IA__gdk_drag_get_protocol
-
-#endif
-#endif
-#if IN_HEADER(__GDK_DRAWABLE_H__)
-#if IN_FILE(__GDK_DRAW_C__)
-extern __typeof (gdk_drawable_copy_to_image) IA__gdk_drawable_copy_to_image __attribute((visibility("hidden")));
-#define gdk_drawable_copy_to_image IA__gdk_drawable_copy_to_image
-
-extern __typeof (gdk_drawable_get_clip_region) IA__gdk_drawable_get_clip_region __attribute((visibility("hidden")));
-#define gdk_drawable_get_clip_region IA__gdk_drawable_get_clip_region
-
-extern __typeof (gdk_drawable_get_colormap) IA__gdk_drawable_get_colormap __attribute((visibility("hidden")));
-#define gdk_drawable_get_colormap IA__gdk_drawable_get_colormap
-
-#ifndef GDK_DISABLE_DEPRECATED
-extern __typeof (gdk_drawable_get_data) IA__gdk_drawable_get_data __attribute((visibility("hidden")));
-#define gdk_drawable_get_data IA__gdk_drawable_get_data
-
-extern __typeof (gdk_drawable_set_data) IA__gdk_drawable_set_data __attribute((visibility("hidden")));
-#define gdk_drawable_set_data IA__gdk_drawable_set_data
-
-extern __typeof (gdk_drawable_ref) IA__gdk_drawable_ref __attribute((visibility("hidden")));
-#define gdk_drawable_ref IA__gdk_drawable_ref
-
-extern __typeof (gdk_drawable_unref) IA__gdk_drawable_unref __attribute((visibility("hidden")));
-#define gdk_drawable_unref IA__gdk_drawable_unref
-
-extern __typeof (gdk_draw_string) IA__gdk_draw_string __attribute((visibility("hidden")));
-#define gdk_draw_string IA__gdk_draw_string
-
-extern __typeof (gdk_draw_text) IA__gdk_draw_text __attribute((visibility("hidden")));
-#define gdk_draw_text IA__gdk_draw_text
-
-extern __typeof (gdk_draw_text_wc) IA__gdk_draw_text_wc __attribute((visibility("hidden")));
-#define gdk_draw_text_wc IA__gdk_draw_text_wc
-
-#endif
-extern __typeof (gdk_drawable_get_depth) IA__gdk_drawable_get_depth __attribute((visibility("hidden")));
-#define gdk_drawable_get_depth IA__gdk_drawable_get_depth
-
-extern __typeof (gdk_drawable_get_display) IA__gdk_drawable_get_display __attribute((visibility("hidden")));
-#define gdk_drawable_get_display IA__gdk_drawable_get_display
-
-extern __typeof (gdk_drawable_get_image) IA__gdk_drawable_get_image __attribute((visibility("hidden")));
-#define gdk_drawable_get_image IA__gdk_drawable_get_image
-
-extern __typeof (gdk_drawable_get_screen) IA__gdk_drawable_get_screen __attribute((visibility("hidden")));
-#define gdk_drawable_get_screen IA__gdk_drawable_get_screen
-
-extern __typeof (gdk_drawable_get_size) IA__gdk_drawable_get_size __attribute((visibility("hidden")));
-#define gdk_drawable_get_size IA__gdk_drawable_get_size
-
-extern __typeof (gdk_drawable_get_type) IA__gdk_drawable_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_drawable_get_type IA__gdk_drawable_get_type
-
-extern __typeof (gdk_drawable_get_visible_region) IA__gdk_drawable_get_visible_region __attribute((visibility("hidden")));
-#define gdk_drawable_get_visible_region IA__gdk_drawable_get_visible_region
-
-extern __typeof (gdk_drawable_get_visual) IA__gdk_drawable_get_visual __attribute((visibility("hidden")));
-#define gdk_drawable_get_visual IA__gdk_drawable_get_visual
-
-extern __typeof (gdk_drawable_set_colormap) IA__gdk_drawable_set_colormap __attribute((visibility("hidden")));
-#define gdk_drawable_set_colormap IA__gdk_drawable_set_colormap
-
-extern __typeof (gdk_draw_arc) IA__gdk_draw_arc __attribute((visibility("hidden")));
-#define gdk_draw_arc IA__gdk_draw_arc
-
-extern __typeof (gdk_draw_drawable) IA__gdk_draw_drawable __attribute((visibility("hidden")));
-#define gdk_draw_drawable IA__gdk_draw_drawable
-
-extern __typeof (gdk_draw_glyphs) IA__gdk_draw_glyphs __attribute((visibility("hidden")));
-#define gdk_draw_glyphs IA__gdk_draw_glyphs
-
-extern __typeof (gdk_draw_glyphs_transformed) IA__gdk_draw_glyphs_transformed __attribute((visibility("hidden")));
-#define gdk_draw_glyphs_transformed IA__gdk_draw_glyphs_transformed
-
-extern __typeof (gdk_draw_image) IA__gdk_draw_image __attribute((visibility("hidden")));
-#define gdk_draw_image IA__gdk_draw_image
-
-extern __typeof (gdk_draw_line) IA__gdk_draw_line __attribute((visibility("hidden")));
-#define gdk_draw_line IA__gdk_draw_line
-
-extern __typeof (gdk_draw_lines) IA__gdk_draw_lines __attribute((visibility("hidden")));
-#define gdk_draw_lines IA__gdk_draw_lines
-
-extern __typeof (gdk_draw_pixbuf) IA__gdk_draw_pixbuf __attribute((visibility("hidden")));
-#define gdk_draw_pixbuf IA__gdk_draw_pixbuf
-
-extern __typeof (gdk_draw_point) IA__gdk_draw_point __attribute((visibility("hidden")));
-#define gdk_draw_point IA__gdk_draw_point
-
-extern __typeof (gdk_draw_points) IA__gdk_draw_points __attribute((visibility("hidden")));
-#define gdk_draw_points IA__gdk_draw_points
-
-extern __typeof (gdk_draw_polygon) IA__gdk_draw_polygon __attribute((visibility("hidden")));
-#define gdk_draw_polygon IA__gdk_draw_polygon
-
-extern __typeof (gdk_draw_rectangle) IA__gdk_draw_rectangle __attribute((visibility("hidden")));
-#define gdk_draw_rectangle IA__gdk_draw_rectangle
-
-extern __typeof (gdk_draw_segments) IA__gdk_draw_segments __attribute((visibility("hidden")));
-#define gdk_draw_segments IA__gdk_draw_segments
-
-extern __typeof (gdk_draw_trapezoids) IA__gdk_draw_trapezoids __attribute((visibility("hidden")));
-#define gdk_draw_trapezoids IA__gdk_draw_trapezoids
-
-#endif
-#endif
-#if IN_HEADER(__GDK_DRAWABLE_H__)
-#if IN_FILE(__GDK_PANGO_C__)
-extern __typeof (gdk_draw_layout) IA__gdk_draw_layout __attribute((visibility("hidden")));
-#define gdk_draw_layout IA__gdk_draw_layout
-
-extern __typeof (gdk_draw_layout_line) IA__gdk_draw_layout_line __attribute((visibility("hidden")));
-#define gdk_draw_layout_line IA__gdk_draw_layout_line
-
-extern __typeof (gdk_draw_layout_line_with_colors) IA__gdk_draw_layout_line_with_colors __attribute((visibility("hidden")));
-#define gdk_draw_layout_line_with_colors IA__gdk_draw_layout_line_with_colors
-
-extern __typeof (gdk_draw_layout_with_colors) IA__gdk_draw_layout_with_colors __attribute((visibility("hidden")));
-#define gdk_draw_layout_with_colors IA__gdk_draw_layout_with_colors
-
-#endif
-#endif
-#if IN_HEADER(__GDK_GC_H__)
-#if IN_FILE(__GDK_GC_C__)
-extern __typeof (gdk_gc_new) IA__gdk_gc_new __attribute((visibility("hidden")));
-#define gdk_gc_new IA__gdk_gc_new
-
-extern __typeof (gdk_gc_get_type) IA__gdk_gc_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_gc_get_type IA__gdk_gc_get_type
-
-extern __typeof (gdk_gc_new_with_values) IA__gdk_gc_new_with_values __attribute((visibility("hidden")));
-#define gdk_gc_new_with_values IA__gdk_gc_new_with_values
-
-#ifndef GDK_DISABLE_DEPRECATED
-extern __typeof (gdk_gc_ref) IA__gdk_gc_ref __attribute((visibility("hidden")));
-#define gdk_gc_ref IA__gdk_gc_ref
-
-extern __typeof (gdk_gc_unref) IA__gdk_gc_unref __attribute((visibility("hidden")));
-#define gdk_gc_unref IA__gdk_gc_unref
-
-extern __typeof (gdk_gc_set_font) IA__gdk_gc_set_font __attribute((visibility("hidden")));
-#define gdk_gc_set_font IA__gdk_gc_set_font
-
-#endif
-extern __typeof (gdk_gc_get_values) IA__gdk_gc_get_values __attribute((visibility("hidden")));
-#define gdk_gc_get_values IA__gdk_gc_get_values
-
-extern __typeof (gdk_gc_set_values) IA__gdk_gc_set_values __attribute((visibility("hidden")));
-#define gdk_gc_set_values IA__gdk_gc_set_values
-
-extern __typeof (gdk_gc_set_foreground) IA__gdk_gc_set_foreground __attribute((visibility("hidden")));
-#define gdk_gc_set_foreground IA__gdk_gc_set_foreground
-
-extern __typeof (gdk_gc_set_background) IA__gdk_gc_set_background __attribute((visibility("hidden")));
-#define gdk_gc_set_background IA__gdk_gc_set_background
-
-extern __typeof (gdk_gc_set_function) IA__gdk_gc_set_function __attribute((visibility("hidden")));
-#define gdk_gc_set_function IA__gdk_gc_set_function
-
-extern __typeof (gdk_gc_set_fill) IA__gdk_gc_set_fill __attribute((visibility("hidden")));
-#define gdk_gc_set_fill IA__gdk_gc_set_fill
-
-extern __typeof (gdk_gc_set_tile) IA__gdk_gc_set_tile __attribute((visibility("hidden")));
-#define gdk_gc_set_tile IA__gdk_gc_set_tile
-
-extern __typeof (gdk_gc_set_stipple) IA__gdk_gc_set_stipple __attribute((visibility("hidden")));
-#define gdk_gc_set_stipple IA__gdk_gc_set_stipple
-
-extern __typeof (gdk_gc_set_ts_origin) IA__gdk_gc_set_ts_origin __attribute((visibility("hidden")));
-#define gdk_gc_set_ts_origin IA__gdk_gc_set_ts_origin
-
-extern __typeof (gdk_gc_set_clip_origin) IA__gdk_gc_set_clip_origin __attribute((visibility("hidden")));
-#define gdk_gc_set_clip_origin IA__gdk_gc_set_clip_origin
-
-extern __typeof (gdk_gc_set_clip_mask) IA__gdk_gc_set_clip_mask __attribute((visibility("hidden")));
-#define gdk_gc_set_clip_mask IA__gdk_gc_set_clip_mask
-
-extern __typeof (gdk_gc_set_clip_rectangle) IA__gdk_gc_set_clip_rectangle __attribute((visibility("hidden")));
-#define gdk_gc_set_clip_rectangle IA__gdk_gc_set_clip_rectangle
-
-extern __typeof (gdk_gc_set_clip_region) IA__gdk_gc_set_clip_region __attribute((visibility("hidden")));
-#define gdk_gc_set_clip_region IA__gdk_gc_set_clip_region
-
-extern __typeof (gdk_gc_set_subwindow) IA__gdk_gc_set_subwindow __attribute((visibility("hidden")));
-#define gdk_gc_set_subwindow IA__gdk_gc_set_subwindow
-
-extern __typeof (gdk_gc_set_exposures) IA__gdk_gc_set_exposures __attribute((visibility("hidden")));
-#define gdk_gc_set_exposures IA__gdk_gc_set_exposures
-
-extern __typeof (gdk_gc_set_line_attributes) IA__gdk_gc_set_line_attributes __attribute((visibility("hidden")));
-#define gdk_gc_set_line_attributes IA__gdk_gc_set_line_attributes
-
-extern __typeof (gdk_gc_set_dashes) IA__gdk_gc_set_dashes __attribute((visibility("hidden")));
-#define gdk_gc_set_dashes IA__gdk_gc_set_dashes
-
-extern __typeof (gdk_gc_offset) IA__gdk_gc_offset __attribute((visibility("hidden")));
-#define gdk_gc_offset IA__gdk_gc_offset
-
-extern __typeof (gdk_gc_copy) IA__gdk_gc_copy __attribute((visibility("hidden")));
-#define gdk_gc_copy IA__gdk_gc_copy
-
-extern __typeof (gdk_gc_get_colormap) IA__gdk_gc_get_colormap __attribute((visibility("hidden")));
-#define gdk_gc_get_colormap IA__gdk_gc_get_colormap
-
-extern __typeof (gdk_gc_set_colormap) IA__gdk_gc_set_colormap __attribute((visibility("hidden")));
-#define gdk_gc_set_colormap IA__gdk_gc_set_colormap
-
-extern __typeof (gdk_gc_set_rgb_bg_color) IA__gdk_gc_set_rgb_bg_color __attribute((visibility("hidden")));
-#define gdk_gc_set_rgb_bg_color IA__gdk_gc_set_rgb_bg_color
-
-extern __typeof (gdk_gc_set_rgb_fg_color) IA__gdk_gc_set_rgb_fg_color __attribute((visibility("hidden")));
-#define gdk_gc_set_rgb_fg_color IA__gdk_gc_set_rgb_fg_color
-
-#endif
-#endif
-#if IN_HEADER(__GDK_GC_H__)
-#if IN_FILE(__GDK_GC_X11_C__)
-extern __typeof (gdk_gc_get_screen) IA__gdk_gc_get_screen __attribute((visibility("hidden")));
-#define gdk_gc_get_screen IA__gdk_gc_get_screen
-
-#endif
-#endif
-#if IN_HEADER(__GDK_PIXMAP_X11_H__)
-#if IN_FILE(__GDK_PIXMAP_X11_C__)
-#ifdef GDK_WINDOWING_X11
-extern __typeof (gdk_pixmap_impl_x11_get_type) IA__gdk_pixmap_impl_x11_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_pixmap_impl_x11_get_type IA__gdk_pixmap_impl_x11_get_type
-
-#endif
-#endif
-#endif
-#if IN_HEADER(__GDK_WINDOW_X11_H__)
-#if IN_FILE(__GDK_WINDOW_X11_C__)
-#ifdef GDK_WINDOWING_X11
-extern __typeof (gdk_window_impl_x11_get_type) IA__gdk_window_impl_x11_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_window_impl_x11_get_type IA__gdk_window_impl_x11_get_type
-
-#endif
-#endif
-#endif
-#if IN_HEADER(__GDK_WINDOW_H__)
-#if IN_FILE(__GDK_WINDOW_C__)
-extern __typeof (gdk_get_default_root_window) IA__gdk_get_default_root_window __attribute((visibility("hidden")));
-#define gdk_get_default_root_window IA__gdk_get_default_root_window
-
-extern __typeof (gdk_window_add_filter) IA__gdk_window_add_filter __attribute((visibility("hidden")));
-#define gdk_window_add_filter IA__gdk_window_add_filter
-
-extern __typeof (gdk_window_at_pointer) IA__gdk_window_at_pointer __attribute((visibility("hidden")));
-#define gdk_window_at_pointer IA__gdk_window_at_pointer
-
-extern __typeof (gdk_window_begin_paint_rect) IA__gdk_window_begin_paint_rect __attribute((visibility("hidden")));
-#define gdk_window_begin_paint_rect IA__gdk_window_begin_paint_rect
-
-extern __typeof (gdk_window_begin_paint_region) IA__gdk_window_begin_paint_region __attribute((visibility("hidden")));
-#define gdk_window_begin_paint_region IA__gdk_window_begin_paint_region
-
-extern __typeof (gdk_window_clear) IA__gdk_window_clear __attribute((visibility("hidden")));
-#define gdk_window_clear IA__gdk_window_clear
-
-extern __typeof (gdk_window_clear_area) IA__gdk_window_clear_area __attribute((visibility("hidden")));
-#define gdk_window_clear_area IA__gdk_window_clear_area
-
-extern __typeof (gdk_window_clear_area_e) IA__gdk_window_clear_area_e __attribute((visibility("hidden")));
-#define gdk_window_clear_area_e IA__gdk_window_clear_area_e
-
-extern __typeof (gdk_window_constrain_size) IA__gdk_window_constrain_size __attribute((visibility("hidden")));
-#define gdk_window_constrain_size IA__gdk_window_constrain_size
-
-extern __typeof (gdk_window_destroy) IA__gdk_window_destroy __attribute((visibility("hidden")));
-#define gdk_window_destroy IA__gdk_window_destroy
-
-extern __typeof (gdk_window_end_paint) IA__gdk_window_end_paint __attribute((visibility("hidden")));
-#define gdk_window_end_paint IA__gdk_window_end_paint
-
-extern __typeof (gdk_window_foreign_new) IA__gdk_window_foreign_new __attribute((visibility("hidden")));
-#define gdk_window_foreign_new IA__gdk_window_foreign_new
-
-extern __typeof (gdk_window_freeze_toplevel_updates_libgtk_only) IA__gdk_window_freeze_toplevel_updates_libgtk_only __attribute((visibility("hidden")));
-#define gdk_window_freeze_toplevel_updates_libgtk_only IA__gdk_window_freeze_toplevel_updates_libgtk_only
-
-extern __typeof (gdk_window_freeze_updates) IA__gdk_window_freeze_updates __attribute((visibility("hidden")));
-#define gdk_window_freeze_updates IA__gdk_window_freeze_updates
-
-extern __typeof (gdk_window_get_children) IA__gdk_window_get_children __attribute((visibility("hidden")));
-#define gdk_window_get_children IA__gdk_window_get_children
-
-extern __typeof (gdk_window_get_internal_paint_info) IA__gdk_window_get_internal_paint_info __attribute((visibility("hidden")));
-#define gdk_window_get_internal_paint_info IA__gdk_window_get_internal_paint_info
-
-extern __typeof (gdk_window_get_parent) IA__gdk_window_get_parent __attribute((visibility("hidden")));
-#define gdk_window_get_parent IA__gdk_window_get_parent
-
-extern __typeof (gdk_window_get_pointer) IA__gdk_window_get_pointer __attribute((visibility("hidden")));
-#define gdk_window_get_pointer IA__gdk_window_get_pointer
-
-extern __typeof (gdk_window_get_position) IA__gdk_window_get_position __attribute((visibility("hidden")));
-#define gdk_window_get_position IA__gdk_window_get_position
-
-extern __typeof (gdk_window_get_state) IA__gdk_window_get_state __attribute((visibility("hidden")));
-#define gdk_window_get_state IA__gdk_window_get_state
-
-extern __typeof (gdk_window_get_toplevel) IA__gdk_window_get_toplevel __attribute((visibility("hidden")));
-#define gdk_window_get_toplevel IA__gdk_window_get_toplevel
-
-extern __typeof (gdk_window_get_toplevels) IA__gdk_window_get_toplevels __attribute((visibility("hidden")));
-#define gdk_window_get_toplevels IA__gdk_window_get_toplevels
-
-extern __typeof (gdk_window_get_update_area) IA__gdk_window_get_update_area __attribute((visibility("hidden")));
-#define gdk_window_get_update_area IA__gdk_window_get_update_area
-
-extern __typeof (gdk_window_get_user_data) IA__gdk_window_get_user_data __attribute((visibility("hidden")));
-#define gdk_window_get_user_data IA__gdk_window_get_user_data
-
-extern __typeof (gdk_window_get_window_type) IA__gdk_window_get_window_type __attribute((visibility("hidden")));
-#define gdk_window_get_window_type IA__gdk_window_get_window_type
-
-extern __typeof (gdk_window_invalidate_maybe_recurse) IA__gdk_window_invalidate_maybe_recurse __attribute((visibility("hidden")));
-#define gdk_window_invalidate_maybe_recurse IA__gdk_window_invalidate_maybe_recurse
-
-extern __typeof (gdk_window_invalidate_rect) IA__gdk_window_invalidate_rect __attribute((visibility("hidden")));
-#define gdk_window_invalidate_rect IA__gdk_window_invalidate_rect
-
-extern __typeof (gdk_window_invalidate_region) IA__gdk_window_invalidate_region __attribute((visibility("hidden")));
-#define gdk_window_invalidate_region IA__gdk_window_invalidate_region
-
-extern __typeof (gdk_window_is_viewable) IA__gdk_window_is_viewable __attribute((visibility("hidden")));
-#define gdk_window_is_viewable IA__gdk_window_is_viewable
-
-extern __typeof (gdk_window_is_visible) IA__gdk_window_is_visible __attribute((visibility("hidden")));
-#define gdk_window_is_visible IA__gdk_window_is_visible
-
-extern __typeof (gdk_window_object_get_type) IA__gdk_window_object_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_window_object_get_type IA__gdk_window_object_get_type
-
-extern __typeof (gdk_window_peek_children) IA__gdk_window_peek_children __attribute((visibility("hidden")));
-#define gdk_window_peek_children IA__gdk_window_peek_children
-
-extern __typeof (gdk_window_process_all_updates) IA__gdk_window_process_all_updates __attribute((visibility("hidden")));
-#define gdk_window_process_all_updates IA__gdk_window_process_all_updates
-
-extern __typeof (gdk_window_process_updates) IA__gdk_window_process_updates __attribute((visibility("hidden")));
-#define gdk_window_process_updates IA__gdk_window_process_updates
-
-extern __typeof (gdk_window_remove_filter) IA__gdk_window_remove_filter __attribute((visibility("hidden")));
-#define gdk_window_remove_filter IA__gdk_window_remove_filter
-
-extern __typeof (gdk_window_set_debug_updates) IA__gdk_window_set_debug_updates __attribute((visibility("hidden")));
-#define gdk_window_set_debug_updates IA__gdk_window_set_debug_updates
-
-extern __typeof (gdk_window_set_user_data) IA__gdk_window_set_user_data __attribute((visibility("hidden")));
-#define gdk_window_set_user_data IA__gdk_window_set_user_data
-
-extern __typeof (gdk_window_thaw_toplevel_updates_libgtk_only) IA__gdk_window_thaw_toplevel_updates_libgtk_only __attribute((visibility("hidden")));
-#define gdk_window_thaw_toplevel_updates_libgtk_only IA__gdk_window_thaw_toplevel_updates_libgtk_only
-
-extern __typeof (gdk_window_thaw_updates) IA__gdk_window_thaw_updates __attribute((visibility("hidden")));
-#define gdk_window_thaw_updates IA__gdk_window_thaw_updates
-
-extern __typeof (gdk_window_set_composited) IA__gdk_window_set_composited __attribute((visibility("hidden")));
-#define gdk_window_set_composited IA__gdk_window_set_composited
-
-#endif
-#endif
-#if IN_HEADER(__GDK_WINDOW_H__)
-#if IN_FILE(__GDK_DND_X11_C__)
-extern __typeof (gdk_window_register_dnd) IA__gdk_window_register_dnd __attribute((visibility("hidden")));
-#define gdk_window_register_dnd IA__gdk_window_register_dnd
-
-#endif
-#endif
-#if IN_HEADER(__GDK_WINDOW_H__)
-#if IN_FILE(__GDK_GEOMETRY_X11_C__)
-extern __typeof (gdk_window_scroll) IA__gdk_window_scroll __attribute((visibility("hidden")));
-#define gdk_window_scroll IA__gdk_window_scroll
-
-extern __typeof (gdk_window_move_region) IA__gdk_window_move_region __attribute((visibility("hidden")));
-#define gdk_window_move_region IA__gdk_window_move_region
-
-#endif
-#endif
-#if IN_HEADER(__GDK_WINDOW_H__)
-#if IN_FILE(__GDK_WINDOW_X11_C__)
-extern __typeof (gdk_window_new) IA__gdk_window_new __attribute((visibility("hidden")));
-#define gdk_window_new IA__gdk_window_new
-
-extern __typeof (gdk_window_foreign_new_for_display) IA__gdk_window_foreign_new_for_display __attribute((visibility("hidden")));
-#define gdk_window_foreign_new_for_display IA__gdk_window_foreign_new_for_display
-
-extern __typeof (gdk_window_lookup) IA__gdk_window_lookup __attribute((visibility("hidden")));
-#define gdk_window_lookup IA__gdk_window_lookup
-
-extern __typeof (gdk_window_lookup_for_display) IA__gdk_window_lookup_for_display __attribute((visibility("hidden")));
-#define gdk_window_lookup_for_display IA__gdk_window_lookup_for_display
-
-extern __typeof (gdk_window_show_unraised) IA__gdk_window_show_unraised __attribute((visibility("hidden")));
-#define gdk_window_show_unraised IA__gdk_window_show_unraised
-
-extern __typeof (gdk_window_show) IA__gdk_window_show __attribute((visibility("hidden")));
-#define gdk_window_show IA__gdk_window_show
-
-extern __typeof (gdk_window_hide) IA__gdk_window_hide __attribute((visibility("hidden")));
-#define gdk_window_hide IA__gdk_window_hide
-
-extern __typeof (gdk_window_withdraw) IA__gdk_window_withdraw __attribute((visibility("hidden")));
-#define gdk_window_withdraw IA__gdk_window_withdraw
-
-extern __typeof (gdk_window_move) IA__gdk_window_move __attribute((visibility("hidden")));
-#define gdk_window_move IA__gdk_window_move
-
-extern __typeof (gdk_window_resize) IA__gdk_window_resize __attribute((visibility("hidden")));
-#define gdk_window_resize IA__gdk_window_resize
-
-extern __typeof (gdk_window_move_resize) IA__gdk_window_move_resize __attribute((visibility("hidden")));
-#define gdk_window_move_resize IA__gdk_window_move_resize
-
-extern __typeof (gdk_window_reparent) IA__gdk_window_reparent __attribute((visibility("hidden")));
-#define gdk_window_reparent IA__gdk_window_reparent
-
-extern __typeof (gdk_window_raise) IA__gdk_window_raise __attribute((visibility("hidden")));
-#define gdk_window_raise IA__gdk_window_raise
-
-extern __typeof (gdk_window_lower) IA__gdk_window_lower __attribute((visibility("hidden")));
-#define gdk_window_lower IA__gdk_window_lower
-
-extern __typeof (gdk_window_focus) IA__gdk_window_focus __attribute((visibility("hidden")));
-#define gdk_window_focus IA__gdk_window_focus
-
-#ifndef GDK_DISABLE_DEPRECATED
-extern __typeof (gdk_window_set_hints) IA__gdk_window_set_hints __attribute((visibility("hidden")));
-#define gdk_window_set_hints IA__gdk_window_set_hints
-
-extern __typeof (gdk_window_get_deskrelative_origin) IA__gdk_window_get_deskrelative_origin __attribute((visibility("hidden")));
-#define gdk_window_get_deskrelative_origin IA__gdk_window_get_deskrelative_origin
-
-#endif
-extern __typeof (gdk_window_get_type_hint) IA__gdk_window_get_type_hint __attribute((visibility("hidden")));
-#define gdk_window_get_type_hint IA__gdk_window_get_type_hint
-
-extern __typeof (gdk_window_set_type_hint) IA__gdk_window_set_type_hint __attribute((visibility("hidden")));
-#define gdk_window_set_type_hint IA__gdk_window_set_type_hint
-
-extern __typeof (gdk_window_set_modal_hint) IA__gdk_window_set_modal_hint __attribute((visibility("hidden")));
-#define gdk_window_set_modal_hint IA__gdk_window_set_modal_hint
-
-extern __typeof (gdk_window_set_skip_taskbar_hint) IA__gdk_window_set_skip_taskbar_hint __attribute((visibility("hidden")));
-#define gdk_window_set_skip_taskbar_hint IA__gdk_window_set_skip_taskbar_hint
-
-extern __typeof (gdk_window_set_skip_pager_hint) IA__gdk_window_set_skip_pager_hint __attribute((visibility("hidden")));
-#define gdk_window_set_skip_pager_hint IA__gdk_window_set_skip_pager_hint
-
-extern __typeof (gdk_window_set_urgency_hint) IA__gdk_window_set_urgency_hint __attribute((visibility("hidden")));
-#define gdk_window_set_urgency_hint IA__gdk_window_set_urgency_hint
-
-extern __typeof (gdk_window_set_geometry_hints) IA__gdk_window_set_geometry_hints __attribute((visibility("hidden")));
-#define gdk_window_set_geometry_hints IA__gdk_window_set_geometry_hints
-
-extern __typeof (gdk_window_set_title) IA__gdk_window_set_title __attribute((visibility("hidden")));
-#define gdk_window_set_title IA__gdk_window_set_title
-
-extern __typeof (gdk_window_set_role) IA__gdk_window_set_role __attribute((visibility("hidden")));
-#define gdk_window_set_role IA__gdk_window_set_role
-
-extern __typeof (gdk_window_set_startup_id) IA__gdk_window_set_startup_id __attribute((visibility("hidden")));
-#define gdk_window_set_startup_id IA__gdk_window_set_startup_id
-
-extern __typeof (gdk_window_set_transient_for) IA__gdk_window_set_transient_for __attribute((visibility("hidden")));
-#define gdk_window_set_transient_for IA__gdk_window_set_transient_for
-
-extern __typeof (gdk_window_set_background) IA__gdk_window_set_background __attribute((visibility("hidden")));
-#define gdk_window_set_background IA__gdk_window_set_background
-
-extern __typeof (gdk_window_set_back_pixmap) IA__gdk_window_set_back_pixmap __attribute((visibility("hidden")));
-#define gdk_window_set_back_pixmap IA__gdk_window_set_back_pixmap
-
-extern __typeof (gdk_window_set_cursor) IA__gdk_window_set_cursor __attribute((visibility("hidden")));
-#define gdk_window_set_cursor IA__gdk_window_set_cursor
-
-extern __typeof (gdk_window_get_geometry) IA__gdk_window_get_geometry __attribute((visibility("hidden")));
-#define gdk_window_get_geometry IA__gdk_window_get_geometry
-
-extern __typeof (gdk_window_get_origin) IA__gdk_window_get_origin __attribute((visibility("hidden")));
-#define gdk_window_get_origin IA__gdk_window_get_origin
-
-extern __typeof (gdk_window_get_root_origin) IA__gdk_window_get_root_origin __attribute((visibility("hidden")));
-#define gdk_window_get_root_origin IA__gdk_window_get_root_origin
-
-extern __typeof (gdk_window_get_frame_extents) IA__gdk_window_get_frame_extents __attribute((visibility("hidden")));
-#define gdk_window_get_frame_extents IA__gdk_window_get_frame_extents
-
-extern __typeof (gdk_window_get_events) IA__gdk_window_get_events __attribute((visibility("hidden")));
-#define gdk_window_get_events IA__gdk_window_get_events
-
-extern __typeof (gdk_window_set_events) IA__gdk_window_set_events __attribute((visibility("hidden")));
-#define gdk_window_set_events IA__gdk_window_set_events
-
-extern __typeof (gdk_window_shape_combine_mask) IA__gdk_window_shape_combine_mask __attribute((visibility("hidden")));
-#define gdk_window_shape_combine_mask IA__gdk_window_shape_combine_mask
-
-extern __typeof (gdk_window_shape_combine_region) IA__gdk_window_shape_combine_region __attribute((visibility("hidden")));
-#define gdk_window_shape_combine_region IA__gdk_window_shape_combine_region
-
-extern __typeof (gdk_window_input_shape_combine_mask) IA__gdk_window_input_shape_combine_mask __attribute((visibility("hidden")));
-#define gdk_window_input_shape_combine_mask IA__gdk_window_input_shape_combine_mask
-
-extern __typeof (gdk_window_input_shape_combine_region) IA__gdk_window_input_shape_combine_region __attribute((visibility("hidden")));
-#define gdk_window_input_shape_combine_region IA__gdk_window_input_shape_combine_region
-
-extern __typeof (gdk_window_set_override_redirect) IA__gdk_window_set_override_redirect __attribute((visibility("hidden")));
-#define gdk_window_set_override_redirect IA__gdk_window_set_override_redirect
-
-extern __typeof (gdk_window_set_accept_focus) IA__gdk_window_set_accept_focus __attribute((visibility("hidden")));
-#define gdk_window_set_accept_focus IA__gdk_window_set_accept_focus
-
-extern __typeof (gdk_window_set_focus_on_map) IA__gdk_window_set_focus_on_map __attribute((visibility("hidden")));
-#define gdk_window_set_focus_on_map IA__gdk_window_set_focus_on_map
-
-extern __typeof (gdk_window_set_icon_list) IA__gdk_window_set_icon_list __attribute((visibility("hidden")));
-#define gdk_window_set_icon_list IA__gdk_window_set_icon_list
-
-extern __typeof (gdk_window_set_icon) IA__gdk_window_set_icon __attribute((visibility("hidden")));
-#define gdk_window_set_icon IA__gdk_window_set_icon
-
-extern __typeof (gdk_window_set_icon_name) IA__gdk_window_set_icon_name __attribute((visibility("hidden")));
-#define gdk_window_set_icon_name IA__gdk_window_set_icon_name
-
-extern __typeof (gdk_window_beep) IA__gdk_window_beep __attribute((visibility("hidden")));
-#define gdk_window_beep IA__gdk_window_beep
-
-extern __typeof (gdk_window_set_opacity) IA__gdk_window_set_opacity __attribute((visibility("hidden")));
-#define gdk_window_set_opacity IA__gdk_window_set_opacity
-
-extern __typeof (gdk_window_iconify) IA__gdk_window_iconify __attribute((visibility("hidden")));
-#define gdk_window_iconify IA__gdk_window_iconify
-
-extern __typeof (gdk_window_deiconify) IA__gdk_window_deiconify __attribute((visibility("hidden")));
-#define gdk_window_deiconify IA__gdk_window_deiconify
-
-extern __typeof (gdk_window_stick) IA__gdk_window_stick __attribute((visibility("hidden")));
-#define gdk_window_stick IA__gdk_window_stick
-
-extern __typeof (gdk_window_unstick) IA__gdk_window_unstick __attribute((visibility("hidden")));
-#define gdk_window_unstick IA__gdk_window_unstick
-
-extern __typeof (gdk_window_maximize) IA__gdk_window_maximize __attribute((visibility("hidden")));
-#define gdk_window_maximize IA__gdk_window_maximize
-
-extern __typeof (gdk_window_unmaximize) IA__gdk_window_unmaximize __attribute((visibility("hidden")));
-#define gdk_window_unmaximize IA__gdk_window_unmaximize
-
-extern __typeof (gdk_window_fullscreen) IA__gdk_window_fullscreen __attribute((visibility("hidden")));
-#define gdk_window_fullscreen IA__gdk_window_fullscreen
-
-extern __typeof (gdk_window_unfullscreen) IA__gdk_window_unfullscreen __attribute((visibility("hidden")));
-#define gdk_window_unfullscreen IA__gdk_window_unfullscreen
-
-extern __typeof (gdk_window_set_keep_above) IA__gdk_window_set_keep_above __attribute((visibility("hidden")));
-#define gdk_window_set_keep_above IA__gdk_window_set_keep_above
-
-extern __typeof (gdk_window_set_keep_below) IA__gdk_window_set_keep_below __attribute((visibility("hidden")));
-#define gdk_window_set_keep_below IA__gdk_window_set_keep_below
-
-extern __typeof (gdk_window_get_group) IA__gdk_window_get_group __attribute((visibility("hidden")));
-#define gdk_window_get_group IA__gdk_window_get_group
-
-extern __typeof (gdk_window_set_group) IA__gdk_window_set_group __attribute((visibility("hidden")));
-#define gdk_window_set_group IA__gdk_window_set_group
-
-extern __typeof (gdk_window_get_decorations) IA__gdk_window_get_decorations __attribute((visibility("hidden")));
-#define gdk_window_get_decorations IA__gdk_window_get_decorations
-
-extern __typeof (gdk_window_set_decorations) IA__gdk_window_set_decorations __attribute((visibility("hidden")));
-#define gdk_window_set_decorations IA__gdk_window_set_decorations
-
-extern __typeof (gdk_window_set_functions) IA__gdk_window_set_functions __attribute((visibility("hidden")));
-#define gdk_window_set_functions IA__gdk_window_set_functions
-
-extern __typeof (gdk_window_set_child_shapes) IA__gdk_window_set_child_shapes __attribute((visibility("hidden")));
-#define gdk_window_set_child_shapes IA__gdk_window_set_child_shapes
-
-extern __typeof (gdk_window_merge_child_shapes) IA__gdk_window_merge_child_shapes __attribute((visibility("hidden")));
-#define gdk_window_merge_child_shapes IA__gdk_window_merge_child_shapes
-
-extern __typeof (gdk_window_set_child_input_shapes) IA__gdk_window_set_child_input_shapes __attribute((visibility("hidden")));
-#define gdk_window_set_child_input_shapes IA__gdk_window_set_child_input_shapes
-
-extern __typeof (gdk_window_merge_child_input_shapes) IA__gdk_window_merge_child_input_shapes __attribute((visibility("hidden")));
-#define gdk_window_merge_child_input_shapes IA__gdk_window_merge_child_input_shapes
-
-extern __typeof (gdk_window_set_static_gravities) IA__gdk_window_set_static_gravities __attribute((visibility("hidden")));
-#define gdk_window_set_static_gravities IA__gdk_window_set_static_gravities
-
-extern __typeof (gdk_window_begin_move_drag) IA__gdk_window_begin_move_drag __attribute((visibility("hidden")));
-#define gdk_window_begin_move_drag IA__gdk_window_begin_move_drag
-
-extern __typeof (gdk_window_begin_resize_drag) IA__gdk_window_begin_resize_drag __attribute((visibility("hidden")));
-#define gdk_window_begin_resize_drag IA__gdk_window_begin_resize_drag
-
-extern __typeof (gdk_window_enable_synchronized_configure) IA__gdk_window_enable_synchronized_configure __attribute((visibility("hidden")));
-#define gdk_window_enable_synchronized_configure IA__gdk_window_enable_synchronized_configure
-
-extern __typeof (gdk_window_configure_finished) IA__gdk_window_configure_finished __attribute((visibility("hidden")));
-#define gdk_window_configure_finished IA__gdk_window_configure_finished
-
-#endif
-#endif
-#if IN_HEADER(__GDK_IMAGE_H__)
-#if IN_FILE(__GDK_IMAGE_C__)
-#ifndef GDK_DISABLE_DEPRECATED
-extern __typeof (gdk_image_ref) IA__gdk_image_ref __attribute((visibility("hidden")));
-#define gdk_image_ref IA__gdk_image_ref
-
-extern __typeof (gdk_image_unref) IA__gdk_image_unref __attribute((visibility("hidden")));
-#define gdk_image_unref IA__gdk_image_unref
-
-extern __typeof (gdk_image_get) IA__gdk_image_get __attribute((visibility("hidden")));
-#define gdk_image_get IA__gdk_image_get
-
-#endif
-extern __typeof (gdk_image_set_colormap) IA__gdk_image_set_colormap __attribute((visibility("hidden")));
-#define gdk_image_set_colormap IA__gdk_image_set_colormap
-
-extern __typeof (gdk_image_get_colormap) IA__gdk_image_get_colormap __attribute((visibility("hidden")));
-#define gdk_image_get_colormap IA__gdk_image_get_colormap
-
-extern __typeof (gdk_image_new) IA__gdk_image_new __attribute((visibility("hidden")));
-#define gdk_image_new IA__gdk_image_new
-
-#endif
-#endif
-#if IN_HEADER(__GDK_IMAGE_H__)
-#if IN_FILE(__GDK_IMAGE_X11_C__)
-#ifdef GDK_ENABLE_BROKEN
-extern __typeof (gdk_image_new_bitmap) IA__gdk_image_new_bitmap __attribute((visibility("hidden")));
-#define gdk_image_new_bitmap IA__gdk_image_new_bitmap
-
-#endif
-extern __typeof (gdk_image_get_pixel) IA__gdk_image_get_pixel __attribute((visibility("hidden")));
-#define gdk_image_get_pixel IA__gdk_image_get_pixel
-
-extern __typeof (gdk_image_put_pixel) IA__gdk_image_put_pixel __attribute((visibility("hidden")));
-#define gdk_image_put_pixel IA__gdk_image_put_pixel
-
-extern __typeof (gdk_image_get_type) IA__gdk_image_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_image_get_type IA__gdk_image_get_type
-
-#endif
-#endif
-#if IN_HEADER(__GDK_KEYS_H__)
-#if IN_FILE(__GDK_KEYS_C__)
-extern __typeof (gdk_keymap_get_default) IA__gdk_keymap_get_default __attribute((visibility("hidden")));
-#define gdk_keymap_get_default IA__gdk_keymap_get_default
-
-extern __typeof (gdk_keymap_get_type) IA__gdk_keymap_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_keymap_get_type IA__gdk_keymap_get_type
-
-extern __typeof (gdk_keyval_is_lower) IA__gdk_keyval_is_lower __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_keyval_is_lower IA__gdk_keyval_is_lower
-
-extern __typeof (gdk_keyval_is_upper) IA__gdk_keyval_is_upper __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_keyval_is_upper IA__gdk_keyval_is_upper
-
-extern __typeof (gdk_keyval_to_lower) IA__gdk_keyval_to_lower __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_keyval_to_lower IA__gdk_keyval_to_lower
-
-extern __typeof (gdk_keyval_to_upper) IA__gdk_keyval_to_upper __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_keyval_to_upper IA__gdk_keyval_to_upper
-
-#endif
-#endif
-#if IN_HEADER(__GDK_KEYS_H__)
-#if IN_FILE(__GDK_KEYUNI_C__)
-extern __typeof (gdk_keyval_to_unicode) IA__gdk_keyval_to_unicode __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_keyval_to_unicode IA__gdk_keyval_to_unicode
-
-extern __typeof (gdk_unicode_to_keyval) IA__gdk_unicode_to_keyval __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_unicode_to_keyval IA__gdk_unicode_to_keyval
-
-#endif
-#endif
-#if IN_HEADER(__GDK_KEYS_H__)
-#if IN_FILE(__GDK_KEYS_X11_C__)
-extern __typeof (gdk_keymap_get_direction) IA__gdk_keymap_get_direction __attribute((visibility("hidden")));
-#define gdk_keymap_get_direction IA__gdk_keymap_get_direction
-
-extern __typeof (gdk_keymap_get_entries_for_keycode) IA__gdk_keymap_get_entries_for_keycode __attribute((visibility("hidden")));
-#define gdk_keymap_get_entries_for_keycode IA__gdk_keymap_get_entries_for_keycode
-
-extern __typeof (gdk_keymap_get_entries_for_keyval) IA__gdk_keymap_get_entries_for_keyval __attribute((visibility("hidden")));
-#define gdk_keymap_get_entries_for_keyval IA__gdk_keymap_get_entries_for_keyval
-
-extern __typeof (gdk_keymap_get_for_display) IA__gdk_keymap_get_for_display __attribute((visibility("hidden")));
-#define gdk_keymap_get_for_display IA__gdk_keymap_get_for_display
-
-extern __typeof (gdk_keymap_have_bidi_layouts) IA__gdk_keymap_have_bidi_layouts __attribute((visibility("hidden")));
-#define gdk_keymap_have_bidi_layouts IA__gdk_keymap_have_bidi_layouts
-
-extern __typeof (gdk_keymap_lookup_key) IA__gdk_keymap_lookup_key __attribute((visibility("hidden")));
-#define gdk_keymap_lookup_key IA__gdk_keymap_lookup_key
-
-extern __typeof (gdk_keymap_translate_keyboard_state) IA__gdk_keymap_translate_keyboard_state __attribute((visibility("hidden")));
-#define gdk_keymap_translate_keyboard_state IA__gdk_keymap_translate_keyboard_state
-
-extern __typeof (gdk_keyval_convert_case) IA__gdk_keyval_convert_case __attribute((visibility("hidden")));
-#define gdk_keyval_convert_case IA__gdk_keyval_convert_case
-
-extern __typeof (gdk_keyval_from_name) IA__gdk_keyval_from_name __attribute((visibility("hidden")));
-#define gdk_keyval_from_name IA__gdk_keyval_from_name
-
-extern __typeof (gdk_keyval_name) IA__gdk_keyval_name __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_keyval_name IA__gdk_keyval_name
-
-#endif
-#endif
-#if IN_HEADER(__GDK_KEYS_H__)
-#if IN_FILE(__GDK_KEYS_DIRECTFB_C__)
-extern __typeof (gdk_keymap_get_direction) IA__gdk_keymap_get_direction __attribute((visibility("hidden")));
-#define gdk_keymap_get_direction IA__gdk_keymap_get_direction
-
-extern __typeof (gdk_keymap_get_entries_for_keycode) IA__gdk_keymap_get_entries_for_keycode __attribute((visibility("hidden")));
-#define gdk_keymap_get_entries_for_keycode IA__gdk_keymap_get_entries_for_keycode
-
-extern __typeof (gdk_keymap_get_entries_for_keyval) IA__gdk_keymap_get_entries_for_keyval __attribute((visibility("hidden")));
-#define gdk_keymap_get_entries_for_keyval IA__gdk_keymap_get_entries_for_keyval
-
-extern __typeof (gdk_keymap_get_for_display) IA__gdk_keymap_get_for_display __attribute((visibility("hidden")));
-#define gdk_keymap_get_for_display IA__gdk_keymap_get_for_display
-
-extern __typeof (gdk_keymap_lookup_key) IA__gdk_keymap_lookup_key __attribute((visibility("hidden")));
-#define gdk_keymap_lookup_key IA__gdk_keymap_lookup_key
-
-extern __typeof (gdk_keymap_translate_keyboard_state) IA__gdk_keymap_translate_keyboard_state __attribute((visibility("hidden")));
-#define gdk_keymap_translate_keyboard_state IA__gdk_keymap_translate_keyboard_state
-
-extern __typeof (gdk_keyval_from_name) IA__gdk_keyval_from_name __attribute((visibility("hidden")));
-#define gdk_keyval_from_name IA__gdk_keyval_from_name
-
-extern __typeof (gdk_keyval_name) IA__gdk_keyval_name __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_keyval_name IA__gdk_keyval_name
-
-#endif
-#endif
-#if IN_HEADER(__GDK_VISUAL_H__)
-#if IN_FILE(__GDK_VISUAL_C__)
-extern __typeof (gdk_list_visuals) IA__gdk_list_visuals __attribute((visibility("hidden")));
-#define gdk_list_visuals IA__gdk_list_visuals
-
-extern __typeof (gdk_visual_get_system) IA__gdk_visual_get_system __attribute((visibility("hidden")));
-#define gdk_visual_get_system IA__gdk_visual_get_system
-
-#endif
-#endif
-#if IN_HEADER(__GDK_VISUAL_H__)
-#if IN_FILE(__GDK_VISUAL_X11_C__)
-extern __typeof (gdk_query_depths) IA__gdk_query_depths __attribute((visibility("hidden")));
-#define gdk_query_depths IA__gdk_query_depths
-
-extern __typeof (gdk_query_visual_types) IA__gdk_query_visual_types __attribute((visibility("hidden")));
-#define gdk_query_visual_types IA__gdk_query_visual_types
-
-extern __typeof (gdk_visual_get_best) IA__gdk_visual_get_best __attribute((visibility("hidden")));
-#define gdk_visual_get_best IA__gdk_visual_get_best
-
-extern __typeof (gdk_visual_get_best_depth) IA__gdk_visual_get_best_depth __attribute((visibility("hidden")));
-#define gdk_visual_get_best_depth IA__gdk_visual_get_best_depth
-
-extern __typeof (gdk_visual_get_best_type) IA__gdk_visual_get_best_type __attribute((visibility("hidden")));
-#define gdk_visual_get_best_type IA__gdk_visual_get_best_type
-
-extern __typeof (gdk_visual_get_best_with_both) IA__gdk_visual_get_best_with_both __attribute((visibility("hidden")));
-#define gdk_visual_get_best_with_both IA__gdk_visual_get_best_with_both
-
-extern __typeof (gdk_visual_get_best_with_depth) IA__gdk_visual_get_best_with_depth __attribute((visibility("hidden")));
-#define gdk_visual_get_best_with_depth IA__gdk_visual_get_best_with_depth
-
-extern __typeof (gdk_visual_get_best_with_type) IA__gdk_visual_get_best_with_type __attribute((visibility("hidden")));
-#define gdk_visual_get_best_with_type IA__gdk_visual_get_best_with_type
-
-extern __typeof (gdk_visual_get_screen) IA__gdk_visual_get_screen __attribute((visibility("hidden")));
-#define gdk_visual_get_screen IA__gdk_visual_get_screen
-
-extern __typeof (gdk_visual_get_type) IA__gdk_visual_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_visual_get_type IA__gdk_visual_get_type
-
-#endif
-#endif
-#if IN_HEADER(__GDK_X_H__)
-#if IN_FILE(__GDK_EVENTS_X11_C__)
-extern __typeof (gdk_net_wm_supports) IA__gdk_net_wm_supports __attribute((visibility("hidden")));
-#define gdk_net_wm_supports IA__gdk_net_wm_supports
-
-#endif
-#endif
-#if IN_HEADER(__GDK_PANGO_H__)
-#if IN_FILE(__GDK_PANGO_C__)
-extern __typeof (gdk_pango_attr_emboss_color_new) IA__gdk_pango_attr_emboss_color_new __attribute((visibility("hidden")));
-#define gdk_pango_attr_emboss_color_new IA__gdk_pango_attr_emboss_color_new
-
-extern __typeof (gdk_pango_attr_embossed_new) IA__gdk_pango_attr_embossed_new __attribute((visibility("hidden")));
-#define gdk_pango_attr_embossed_new IA__gdk_pango_attr_embossed_new
-
-extern __typeof (gdk_pango_attr_stipple_new) IA__gdk_pango_attr_stipple_new __attribute((visibility("hidden")));
-#define gdk_pango_attr_stipple_new IA__gdk_pango_attr_stipple_new
-
-extern __typeof (gdk_pango_context_get) IA__gdk_pango_context_get __attribute((visibility("hidden")));
-#define gdk_pango_context_get IA__gdk_pango_context_get
-
-extern __typeof (gdk_pango_context_get_for_screen) IA__gdk_pango_context_get_for_screen __attribute((visibility("hidden")));
-#define gdk_pango_context_get_for_screen IA__gdk_pango_context_get_for_screen
-
-#ifndef GDK_DISABLE_DEPRECATED
-extern __typeof (gdk_pango_context_set_colormap) IA__gdk_pango_context_set_colormap __attribute((visibility("hidden")));
-#define gdk_pango_context_set_colormap IA__gdk_pango_context_set_colormap
-
-#endif
-extern __typeof (gdk_pango_layout_get_clip_region) IA__gdk_pango_layout_get_clip_region __attribute((visibility("hidden")));
-#define gdk_pango_layout_get_clip_region IA__gdk_pango_layout_get_clip_region
-
-extern __typeof (gdk_pango_layout_line_get_clip_region) IA__gdk_pango_layout_line_get_clip_region __attribute((visibility("hidden")));
-#define gdk_pango_layout_line_get_clip_region IA__gdk_pango_layout_line_get_clip_region
-
-extern __typeof (gdk_pango_renderer_get_default) IA__gdk_pango_renderer_get_default __attribute((visibility("hidden")));
-#define gdk_pango_renderer_get_default IA__gdk_pango_renderer_get_default
-
-extern __typeof (gdk_pango_renderer_get_type) IA__gdk_pango_renderer_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_pango_renderer_get_type IA__gdk_pango_renderer_get_type
-
-extern __typeof (gdk_pango_renderer_new) IA__gdk_pango_renderer_new __attribute((visibility("hidden")));
-#define gdk_pango_renderer_new IA__gdk_pango_renderer_new
-
-extern __typeof (gdk_pango_renderer_set_drawable) IA__gdk_pango_renderer_set_drawable __attribute((visibility("hidden")));
-#define gdk_pango_renderer_set_drawable IA__gdk_pango_renderer_set_drawable
-
-extern __typeof (gdk_pango_renderer_set_gc) IA__gdk_pango_renderer_set_gc __attribute((visibility("hidden")));
-#define gdk_pango_renderer_set_gc IA__gdk_pango_renderer_set_gc
-
-extern __typeof (gdk_pango_renderer_set_override_color) IA__gdk_pango_renderer_set_override_color __attribute((visibility("hidden")));
-#define gdk_pango_renderer_set_override_color IA__gdk_pango_renderer_set_override_color
-
-extern __typeof (gdk_pango_renderer_set_stipple) IA__gdk_pango_renderer_set_stipple __attribute((visibility("hidden")));
-#define gdk_pango_renderer_set_stipple IA__gdk_pango_renderer_set_stipple
-
-#endif
-#endif
-#if IN_HEADER(__GDK_PIXBUF_H__)
-#if IN_FILE(__GDK_PIXBUF_DRAWABLE_C__)
-extern __typeof (gdk_pixbuf_get_from_drawable) IA__gdk_pixbuf_get_from_drawable __attribute((visibility("hidden")));
-#define gdk_pixbuf_get_from_drawable IA__gdk_pixbuf_get_from_drawable
-
-extern __typeof (gdk_pixbuf_get_from_image) IA__gdk_pixbuf_get_from_image __attribute((visibility("hidden")));
-#define gdk_pixbuf_get_from_image IA__gdk_pixbuf_get_from_image
-
-#endif
-#endif
-#if IN_HEADER(__GDK_PIXBUF_H__)
-#if IN_FILE(__GDK_PIXBUF_RENDER_C__)
-extern __typeof (gdk_pixbuf_render_pixmap_and_mask) IA__gdk_pixbuf_render_pixmap_and_mask __attribute((visibility("hidden")));
-#define gdk_pixbuf_render_pixmap_and_mask IA__gdk_pixbuf_render_pixmap_and_mask
-
-extern __typeof (gdk_pixbuf_render_pixmap_and_mask_for_colormap) IA__gdk_pixbuf_render_pixmap_and_mask_for_colormap __attribute((visibility("hidden")));
-#define gdk_pixbuf_render_pixmap_and_mask_for_colormap IA__gdk_pixbuf_render_pixmap_and_mask_for_colormap
-
-extern __typeof (gdk_pixbuf_render_threshold_alpha) IA__gdk_pixbuf_render_threshold_alpha __attribute((visibility("hidden")));
-#define gdk_pixbuf_render_threshold_alpha IA__gdk_pixbuf_render_threshold_alpha
-
-#ifndef GDK_DISABLE_DEPRECATED
-extern __typeof (gdk_pixbuf_render_to_drawable) IA__gdk_pixbuf_render_to_drawable __attribute((visibility("hidden")));
-#define gdk_pixbuf_render_to_drawable IA__gdk_pixbuf_render_to_drawable
-
-extern __typeof (gdk_pixbuf_render_to_drawable_alpha) IA__gdk_pixbuf_render_to_drawable_alpha __attribute((visibility("hidden")));
-#define gdk_pixbuf_render_to_drawable_alpha IA__gdk_pixbuf_render_to_drawable_alpha
-
-#endif
-#endif
-#endif
-#if IN_HEADER(__GDK_PIXMAP_H__)
-#if IN_FILE(__GDK_PIXMAP_C__)
-extern __typeof (gdk_pixmap_colormap_create_from_xpm) IA__gdk_pixmap_colormap_create_from_xpm __attribute((visibility("hidden")));
-#define gdk_pixmap_colormap_create_from_xpm IA__gdk_pixmap_colormap_create_from_xpm
-
-extern __typeof (gdk_pixmap_create_from_xpm) IA__gdk_pixmap_create_from_xpm __attribute((visibility("hidden")));
-#define gdk_pixmap_create_from_xpm IA__gdk_pixmap_create_from_xpm
-
-extern __typeof (gdk_pixmap_colormap_create_from_xpm_d) IA__gdk_pixmap_colormap_create_from_xpm_d __attribute((visibility("hidden")));
-#define gdk_pixmap_colormap_create_from_xpm_d IA__gdk_pixmap_colormap_create_from_xpm_d
-
-extern __typeof (gdk_pixmap_create_from_xpm_d) IA__gdk_pixmap_create_from_xpm_d __attribute((visibility("hidden")));
-#define gdk_pixmap_create_from_xpm_d IA__gdk_pixmap_create_from_xpm_d
-
-extern __typeof (gdk_pixmap_get_type) IA__gdk_pixmap_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_pixmap_get_type IA__gdk_pixmap_get_type
-
-#endif
-#endif
-#if IN_HEADER(__GDK_PIXMAP_H__)
-#if IN_FILE(__GDK_PIXMAP_X11_C__)
-extern __typeof (gdk_pixmap_create_from_data) IA__gdk_pixmap_create_from_data __attribute((visibility("hidden")));
-#define gdk_pixmap_create_from_data IA__gdk_pixmap_create_from_data
-
-extern __typeof (gdk_pixmap_foreign_new) IA__gdk_pixmap_foreign_new __attribute((visibility("hidden")));
-#define gdk_pixmap_foreign_new IA__gdk_pixmap_foreign_new
-
-extern __typeof (gdk_pixmap_foreign_new_for_display) IA__gdk_pixmap_foreign_new_for_display __attribute((visibility("hidden")));
-#define gdk_pixmap_foreign_new_for_display IA__gdk_pixmap_foreign_new_for_display
-
-extern __typeof (gdk_pixmap_foreign_new_for_screen) IA__gdk_pixmap_foreign_new_for_screen __attribute((visibility("hidden")));
-#define gdk_pixmap_foreign_new_for_screen IA__gdk_pixmap_foreign_new_for_screen
-
-extern __typeof (gdk_pixmap_lookup) IA__gdk_pixmap_lookup __attribute((visibility("hidden")));
-#define gdk_pixmap_lookup IA__gdk_pixmap_lookup
-
-extern __typeof (gdk_pixmap_lookup_for_display) IA__gdk_pixmap_lookup_for_display __attribute((visibility("hidden")));
-#define gdk_pixmap_lookup_for_display IA__gdk_pixmap_lookup_for_display
-
-extern __typeof (gdk_pixmap_new) IA__gdk_pixmap_new __attribute((visibility("hidden")));
-#define gdk_pixmap_new IA__gdk_pixmap_new
-
-#endif
-#endif
-#if IN_HEADER(__GDK_REGION_H__)
-#if IN_FILE(__GDK_REGION_GENERIC_C__)
-extern __typeof (gdk_region_copy) IA__gdk_region_copy __attribute((visibility("hidden")));
-#define gdk_region_copy IA__gdk_region_copy
-
-extern __typeof (gdk_region_destroy) IA__gdk_region_destroy __attribute((visibility("hidden")));
-#define gdk_region_destroy IA__gdk_region_destroy
-
-extern __typeof (gdk_region_empty) IA__gdk_region_empty __attribute((visibility("hidden")));
-#define gdk_region_empty IA__gdk_region_empty
-
-extern __typeof (gdk_region_equal) IA__gdk_region_equal __attribute((visibility("hidden")));
-#define gdk_region_equal IA__gdk_region_equal
-
-extern __typeof (gdk_region_get_clipbox) IA__gdk_region_get_clipbox __attribute((visibility("hidden")));
-#define gdk_region_get_clipbox IA__gdk_region_get_clipbox
-
-extern __typeof (gdk_region_get_rectangles) IA__gdk_region_get_rectangles __attribute((visibility("hidden")));
-#define gdk_region_get_rectangles IA__gdk_region_get_rectangles
-
-extern __typeof (gdk_region_intersect) IA__gdk_region_intersect __attribute((visibility("hidden")));
-#define gdk_region_intersect IA__gdk_region_intersect
-
-extern __typeof (gdk_region_new) IA__gdk_region_new __attribute((visibility("hidden")));
-#define gdk_region_new IA__gdk_region_new
-
-extern __typeof (gdk_region_offset) IA__gdk_region_offset __attribute((visibility("hidden")));
-#define gdk_region_offset IA__gdk_region_offset
-
-extern __typeof (gdk_region_point_in) IA__gdk_region_point_in __attribute((visibility("hidden")));
-#define gdk_region_point_in IA__gdk_region_point_in
-
-extern __typeof (gdk_region_rectangle) IA__gdk_region_rectangle __attribute((visibility("hidden")));
-#define gdk_region_rectangle IA__gdk_region_rectangle
-
-extern __typeof (gdk_region_rect_in) IA__gdk_region_rect_in __attribute((visibility("hidden")));
-#define gdk_region_rect_in IA__gdk_region_rect_in
-
-extern __typeof (gdk_region_shrink) IA__gdk_region_shrink __attribute((visibility("hidden")));
-#define gdk_region_shrink IA__gdk_region_shrink
-
-extern __typeof (gdk_region_spans_intersect_foreach) IA__gdk_region_spans_intersect_foreach __attribute((visibility("hidden")));
-#define gdk_region_spans_intersect_foreach IA__gdk_region_spans_intersect_foreach
-
-extern __typeof (gdk_region_subtract) IA__gdk_region_subtract __attribute((visibility("hidden")));
-#define gdk_region_subtract IA__gdk_region_subtract
-
-extern __typeof (gdk_region_union) IA__gdk_region_union __attribute((visibility("hidden")));
-#define gdk_region_union IA__gdk_region_union
-
-extern __typeof (gdk_region_union_with_rect) IA__gdk_region_union_with_rect __attribute((visibility("hidden")));
-#define gdk_region_union_with_rect IA__gdk_region_union_with_rect
-
-extern __typeof (gdk_region_xor) IA__gdk_region_xor __attribute((visibility("hidden")));
-#define gdk_region_xor IA__gdk_region_xor
-
-#endif
-#endif
-#if IN_HEADER(__GDK_REGION_H__)
-#if IN_FILE(__GDK_POLYREG_GENERIC_C__)
-extern __typeof (gdk_region_polygon) IA__gdk_region_polygon __attribute((visibility("hidden")));
-#define gdk_region_polygon IA__gdk_region_polygon
-
-#endif
-#endif
-#if IN_HEADER(__GDK_RGB_H__)
-#if IN_FILE(__GDK_RGB_C__)
-extern __typeof (gdk_rgb_cmap_free) IA__gdk_rgb_cmap_free __attribute((visibility("hidden")));
-#define gdk_rgb_cmap_free IA__gdk_rgb_cmap_free
-
-extern __typeof (gdk_rgb_cmap_new) IA__gdk_rgb_cmap_new __attribute((visibility("hidden")));
-#define gdk_rgb_cmap_new IA__gdk_rgb_cmap_new
-
-extern __typeof (gdk_rgb_colormap_ditherable) IA__gdk_rgb_colormap_ditherable __attribute((visibility("hidden")));
-#define gdk_rgb_colormap_ditherable IA__gdk_rgb_colormap_ditherable
-
-extern __typeof (gdk_rgb_ditherable) IA__gdk_rgb_ditherable __attribute((visibility("hidden")));
-#define gdk_rgb_ditherable IA__gdk_rgb_ditherable
-
-extern __typeof (gdk_rgb_find_color) IA__gdk_rgb_find_color __attribute((visibility("hidden")));
-#define gdk_rgb_find_color IA__gdk_rgb_find_color
-
-extern __typeof (gdk_rgb_get_colormap) IA__gdk_rgb_get_colormap __attribute((visibility("hidden")));
-#define gdk_rgb_get_colormap IA__gdk_rgb_get_colormap
-
-extern __typeof (gdk_rgb_get_visual) IA__gdk_rgb_get_visual __attribute((visibility("hidden")));
-#define gdk_rgb_get_visual IA__gdk_rgb_get_visual
-
-#ifndef GDK_DISABLE_DEPRECATED
-extern __typeof (gdk_rgb_init) IA__gdk_rgb_init __attribute((visibility("hidden")));
-#define gdk_rgb_init IA__gdk_rgb_init
-
-extern __typeof (gdk_rgb_xpixel_from_rgb) IA__gdk_rgb_xpixel_from_rgb __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_rgb_xpixel_from_rgb IA__gdk_rgb_xpixel_from_rgb
-
-extern __typeof (gdk_rgb_gc_set_background) IA__gdk_rgb_gc_set_background __attribute((visibility("hidden")));
-#define gdk_rgb_gc_set_background IA__gdk_rgb_gc_set_background
-
-extern __typeof (gdk_rgb_gc_set_foreground) IA__gdk_rgb_gc_set_foreground __attribute((visibility("hidden")));
-#define gdk_rgb_gc_set_foreground IA__gdk_rgb_gc_set_foreground
-
-#endif
-extern __typeof (gdk_rgb_set_install) IA__gdk_rgb_set_install __attribute((visibility("hidden")));
-#define gdk_rgb_set_install IA__gdk_rgb_set_install
-
-extern __typeof (gdk_rgb_set_min_colors) IA__gdk_rgb_set_min_colors __attribute((visibility("hidden")));
-#define gdk_rgb_set_min_colors IA__gdk_rgb_set_min_colors
-
-extern __typeof (gdk_rgb_set_verbose) IA__gdk_rgb_set_verbose __attribute((visibility("hidden")));
-#define gdk_rgb_set_verbose IA__gdk_rgb_set_verbose
-
-extern __typeof (gdk_draw_gray_image) IA__gdk_draw_gray_image __attribute((visibility("hidden")));
-#define gdk_draw_gray_image IA__gdk_draw_gray_image
-
-extern __typeof (gdk_draw_indexed_image) IA__gdk_draw_indexed_image __attribute((visibility("hidden")));
-#define gdk_draw_indexed_image IA__gdk_draw_indexed_image
-
-extern __typeof (gdk_draw_rgb_32_image) IA__gdk_draw_rgb_32_image __attribute((visibility("hidden")));
-#define gdk_draw_rgb_32_image IA__gdk_draw_rgb_32_image
-
-extern __typeof (gdk_draw_rgb_32_image_dithalign) IA__gdk_draw_rgb_32_image_dithalign __attribute((visibility("hidden")));
-#define gdk_draw_rgb_32_image_dithalign IA__gdk_draw_rgb_32_image_dithalign
-
-extern __typeof (gdk_draw_rgb_image) IA__gdk_draw_rgb_image __attribute((visibility("hidden")));
-#define gdk_draw_rgb_image IA__gdk_draw_rgb_image
-
-extern __typeof (gdk_draw_rgb_image_dithalign) IA__gdk_draw_rgb_image_dithalign __attribute((visibility("hidden")));
-#define gdk_draw_rgb_image_dithalign IA__gdk_draw_rgb_image_dithalign
-
-#endif
-#endif
-#if IN_HEADER(__GDK_SCREEN_H__)
-#if IN_FILE(__GDK_SCREEN_C__)
-extern __typeof (gdk_screen_get_type) IA__gdk_screen_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_screen_get_type IA__gdk_screen_get_type
-
-extern __typeof (gdk_screen_get_monitor_at_point) IA__gdk_screen_get_monitor_at_point __attribute((visibility("hidden")));
-#define gdk_screen_get_monitor_at_point IA__gdk_screen_get_monitor_at_point
-
-extern __typeof (gdk_screen_get_monitor_at_window) IA__gdk_screen_get_monitor_at_window __attribute((visibility("hidden")));
-#define gdk_screen_get_monitor_at_window IA__gdk_screen_get_monitor_at_window
-
-extern __typeof (gdk_screen_set_font_options) IA__gdk_screen_set_font_options __attribute((visibility("hidden")));
-#define gdk_screen_set_font_options IA__gdk_screen_set_font_options
-
-extern __typeof (gdk_screen_get_font_options) IA__gdk_screen_get_font_options __attribute((visibility("hidden")));
-#define gdk_screen_get_font_options IA__gdk_screen_get_font_options
-
-extern __typeof (gdk_screen_set_resolution) IA__gdk_screen_set_resolution __attribute((visibility("hidden")));
-#define gdk_screen_set_resolution IA__gdk_screen_set_resolution
-
-extern __typeof (gdk_screen_get_resolution) IA__gdk_screen_get_resolution __attribute((visibility("hidden")));
-#define gdk_screen_get_resolution IA__gdk_screen_get_resolution
-
-#endif
-#endif
-#if IN_HEADER(__GDK_SCREEN_H__)
-#if IN_FILE(__GDK_DISPLAY_MANAGER_C__)
-extern __typeof (gdk_screen_get_default) IA__gdk_screen_get_default __attribute((visibility("hidden")));
-#define gdk_screen_get_default IA__gdk_screen_get_default
-
-#endif
-#endif
-#if IN_HEADER(__GDK_SCREEN_H__)
-#if IN_FILE(__GDK_RGB_C__)
-extern __typeof (gdk_screen_get_rgb_colormap) IA__gdk_screen_get_rgb_colormap __attribute((visibility("hidden")));
-#define gdk_screen_get_rgb_colormap IA__gdk_screen_get_rgb_colormap
-
-extern __typeof (gdk_screen_get_rgb_visual) IA__gdk_screen_get_rgb_visual __attribute((visibility("hidden")));
-#define gdk_screen_get_rgb_visual IA__gdk_screen_get_rgb_visual
-
-#endif
-#endif
-#if IN_HEADER(__GDK_SCREEN_H__)
-#if IN_FILE(__GDK_EVENTS_X11_C__)
-extern __typeof (gdk_screen_get_setting) IA__gdk_screen_get_setting __attribute((visibility("hidden")));
-#define gdk_screen_get_setting IA__gdk_screen_get_setting
-
-extern __typeof (gdk_screen_broadcast_client_message) IA__gdk_screen_broadcast_client_message __attribute((visibility("hidden")));
-#define gdk_screen_broadcast_client_message IA__gdk_screen_broadcast_client_message
-
-#endif
-#endif
-#if IN_HEADER(__GDK_SCREEN_H__)
-#if IN_FILE(__GDK_VISUAL_X11_C__)
-extern __typeof (gdk_screen_get_system_visual) IA__gdk_screen_get_system_visual __attribute((visibility("hidden")));
-#define gdk_screen_get_system_visual IA__gdk_screen_get_system_visual
-
-extern __typeof (gdk_screen_list_visuals) IA__gdk_screen_list_visuals __attribute((visibility("hidden")));
-#define gdk_screen_list_visuals IA__gdk_screen_list_visuals
-
-#endif
-#endif
-#if IN_HEADER(__GDK_SCREEN_H__)
-#if IN_FILE(__GDK_WINDOW_C__)
-extern __typeof (gdk_screen_get_toplevel_windows) IA__gdk_screen_get_toplevel_windows __attribute((visibility("hidden")));
-#define gdk_screen_get_toplevel_windows IA__gdk_screen_get_toplevel_windows
-
-#endif
-#endif
-#if IN_HEADER(__GDK_SCREEN_H__)
-#if IN_FILE(__GDK_SCREEN_X11_C__)
-extern __typeof (gdk_screen_get_display) IA__gdk_screen_get_display __attribute((visibility("hidden")));
-#define gdk_screen_get_display IA__gdk_screen_get_display
-
-extern __typeof (gdk_screen_get_width) IA__gdk_screen_get_width __attribute((visibility("hidden")));
-#define gdk_screen_get_width IA__gdk_screen_get_width
-
-extern __typeof (gdk_screen_get_width_mm) IA__gdk_screen_get_width_mm __attribute((visibility("hidden")));
-#define gdk_screen_get_width_mm IA__gdk_screen_get_width_mm
-
-extern __typeof (gdk_screen_get_height) IA__gdk_screen_get_height __attribute((visibility("hidden")));
-#define gdk_screen_get_height IA__gdk_screen_get_height
-
-extern __typeof (gdk_screen_get_height_mm) IA__gdk_screen_get_height_mm __attribute((visibility("hidden")));
-#define gdk_screen_get_height_mm IA__gdk_screen_get_height_mm
-
-extern __typeof (gdk_screen_get_number) IA__gdk_screen_get_number __attribute((visibility("hidden")));
-#define gdk_screen_get_number IA__gdk_screen_get_number
-
-extern __typeof (gdk_screen_get_root_window) IA__gdk_screen_get_root_window __attribute((visibility("hidden")));
-#define gdk_screen_get_root_window IA__gdk_screen_get_root_window
-
-extern __typeof (gdk_screen_get_default_colormap) IA__gdk_screen_get_default_colormap __attribute((visibility("hidden")));
-#define gdk_screen_get_default_colormap IA__gdk_screen_get_default_colormap
-
-extern __typeof (gdk_screen_set_default_colormap) IA__gdk_screen_set_default_colormap __attribute((visibility("hidden")));
-#define gdk_screen_set_default_colormap IA__gdk_screen_set_default_colormap
-
-extern __typeof (gdk_screen_get_n_monitors) IA__gdk_screen_get_n_monitors __attribute((visibility("hidden")));
-#define gdk_screen_get_n_monitors IA__gdk_screen_get_n_monitors
-
-extern __typeof (gdk_screen_get_monitor_geometry) IA__gdk_screen_get_monitor_geometry __attribute((visibility("hidden")));
-#define gdk_screen_get_monitor_geometry IA__gdk_screen_get_monitor_geometry
-
-extern __typeof (gdk_screen_get_rgba_colormap) IA__gdk_screen_get_rgba_colormap __attribute((visibility("hidden")));
-#define gdk_screen_get_rgba_colormap IA__gdk_screen_get_rgba_colormap
-
-extern __typeof (gdk_screen_get_rgba_visual) IA__gdk_screen_get_rgba_visual __attribute((visibility("hidden")));
-#define gdk_screen_get_rgba_visual IA__gdk_screen_get_rgba_visual
-
-extern __typeof (gdk_screen_get_active_window) IA__gdk_screen_get_active_window __attribute((visibility("hidden")));
-#define gdk_screen_get_active_window IA__gdk_screen_get_active_window
-
-extern __typeof (gdk_screen_get_window_stack) IA__gdk_screen_get_window_stack __attribute((visibility("hidden")));
-#define gdk_screen_get_window_stack IA__gdk_screen_get_window_stack
-
-extern __typeof (gdk_screen_is_composited) IA__gdk_screen_is_composited __attribute((visibility("hidden")));
-#define gdk_screen_is_composited IA__gdk_screen_is_composited
-
-extern __typeof (gdk_screen_make_display_name) IA__gdk_screen_make_display_name __attribute((visibility("hidden")));
-#define gdk_screen_make_display_name IA__gdk_screen_make_display_name
-
-#endif
-#endif
-#if IN_HEADER(__GDK_SCREEN_H__)
-#if IN_FILE(__GDK_COLOR_X11_C__)
-extern __typeof (gdk_screen_get_system_colormap) IA__gdk_screen_get_system_colormap __attribute((visibility("hidden")));
-#define gdk_screen_get_system_colormap IA__gdk_screen_get_system_colormap
-
-#endif
-#endif
-#if IN_HEADER(__GDK_SELECTION_H__)
-#if IN_FILE(__GDK_SELECTION_C__)
-extern __typeof (gdk_selection_owner_set) IA__gdk_selection_owner_set __attribute((visibility("hidden")));
-#define gdk_selection_owner_set IA__gdk_selection_owner_set
-
-extern __typeof (gdk_selection_owner_get) IA__gdk_selection_owner_get __attribute((visibility("hidden")));
-#define gdk_selection_owner_get IA__gdk_selection_owner_get
-
-extern __typeof (gdk_selection_send_notify) IA__gdk_selection_send_notify __attribute((visibility("hidden")));
-#define gdk_selection_send_notify IA__gdk_selection_send_notify
-
-#endif
-#endif
-#if IN_HEADER(__GDK_SELECTION_H__)
-#if IN_FILE(__GDK_SELECTION_X11_C__)
-extern __typeof (gdk_selection_convert) IA__gdk_selection_convert __attribute((visibility("hidden")));
-#define gdk_selection_convert IA__gdk_selection_convert
-
-extern __typeof (gdk_selection_owner_get_for_display) IA__gdk_selection_owner_get_for_display __attribute((visibility("hidden")));
-#define gdk_selection_owner_get_for_display IA__gdk_selection_owner_get_for_display
-
-extern __typeof (gdk_selection_owner_set_for_display) IA__gdk_selection_owner_set_for_display __attribute((visibility("hidden")));
-#define gdk_selection_owner_set_for_display IA__gdk_selection_owner_set_for_display
-
-extern __typeof (gdk_selection_property_get) IA__gdk_selection_property_get __attribute((visibility("hidden")));
-#define gdk_selection_property_get IA__gdk_selection_property_get
-
-extern __typeof (gdk_selection_send_notify_for_display) IA__gdk_selection_send_notify_for_display __attribute((visibility("hidden")));
-#define gdk_selection_send_notify_for_display IA__gdk_selection_send_notify_for_display
-
-#endif
-#endif
-#if IN_HEADER(__GDK_WINDOW_H__)
-#if IN_FILE(__GDK_DISPLAY_C__)
-extern __typeof (gdk_set_sm_client_id) IA__gdk_set_sm_client_id __attribute((visibility("hidden")));
-#define gdk_set_sm_client_id IA__gdk_set_sm_client_id
-
-#endif
-#endif
-#if IN_HEADER(__GDK_SPAWN_H__)
-#if IN_FILE(__GDK_SPAWN_X11_C__)
-extern __typeof (gdk_spawn_command_line_on_screen) IA__gdk_spawn_command_line_on_screen __attribute((visibility("hidden")));
-#define gdk_spawn_command_line_on_screen IA__gdk_spawn_command_line_on_screen
-
-extern __typeof (gdk_spawn_on_screen) IA__gdk_spawn_on_screen __attribute((visibility("hidden")));
-#define gdk_spawn_on_screen IA__gdk_spawn_on_screen
-
-extern __typeof (gdk_spawn_on_screen_with_pipes) IA__gdk_spawn_on_screen_with_pipes __attribute((visibility("hidden")));
-#define gdk_spawn_on_screen_with_pipes IA__gdk_spawn_on_screen_with_pipes
-
-#endif
-#endif
-#if IN_HEADER(__GDK_PRIVATE_H__)
-#if IN_FILE(__GDK_EVENTS_C__)
-extern __typeof (gdk_synthesize_window_state) IA__gdk_synthesize_window_state __attribute((visibility("hidden")));
-#define gdk_synthesize_window_state IA__gdk_synthesize_window_state
-
-#endif
-#endif
-#if IN_HEADER(__GDK_PRIVATE_H__)
-#if IN_FILE(__GDK_WINDOW_X11_C__)
-extern __typeof (gdk_window_destroy_notify) IA__gdk_window_destroy_notify __attribute((visibility("hidden")));
-#define gdk_window_destroy_notify IA__gdk_window_destroy_notify
-
-#endif
-#endif
-#ifdef GDK_WINDOWING_WIN32
-#if IN_HEADER(__GDK_WIN32_H__)
-#if IN_FILE(__GDK_WIN32ID_C__)
-extern __typeof (gdk_win32_handle_table_lookup) IA__gdk_win32_handle_table_lookup __attribute((visibility("hidden")));
-#define gdk_win32_handle_table_lookup IA__gdk_win32_handle_table_lookup
-
-#endif
-#endif
-#if IN_HEADER(__GDK_WIN32_H__)
-#if IN_FILE(__GDK_CURSOR_WIN32_C__)
-extern __typeof (gdk_win32_icon_to_pixbuf_libgtk_only) IA__gdk_win32_icon_to_pixbuf_libgtk_only __attribute((visibility("hidden")));
-#define gdk_win32_icon_to_pixbuf_libgtk_only IA__gdk_win32_icon_to_pixbuf_libgtk_only
-
-extern __typeof (gdk_win32_pixbuf_to_hicon_libgtk_only) IA__gdk_win32_pixbuf_to_hicon_libgtk_only __attribute((visibility("hidden")));
-#define gdk_win32_pixbuf_to_hicon_libgtk_only IA__gdk_win32_pixbuf_to_hicon_libgtk_only
-
-#endif
-#endif
-#if IN_HEADER(__GDK_WIN32_H__)
-#if IN_FILE(__GDK_DRAWABLE_WIN32_C__)
-extern __typeof (gdk_win32_drawable_get_handle) IA__gdk_win32_drawable_get_handle __attribute((visibility("hidden")));
-#define gdk_win32_drawable_get_handle IA__gdk_win32_drawable_get_handle
-
-#endif
-#endif
-#if IN_HEADER(__GDK_WIN32_H__)
-#if IN_FILE(__GDK_EVENTS_WIN32_C__)
-extern __typeof (gdk_win32_set_modal_dialog_libgtk_only) IA__gdk_win32_set_modal_dialog_libgtk_only __attribute((visibility("hidden")));
-#define gdk_win32_set_modal_dialog_libgtk_only IA__gdk_win32_set_modal_dialog_libgtk_only
-
-#endif
-#endif
-#if IN_HEADER(__GDK_WIN32_H__)
-#if IN_FILE(__GDK_GC_WIN32_C__)
-extern __typeof (gdk_win32_hdc_get) IA__gdk_win32_hdc_get __attribute((visibility("hidden")));
-#define gdk_win32_hdc_get IA__gdk_win32_hdc_get
-
-extern __typeof (gdk_win32_hdc_release) IA__gdk_win32_hdc_release __attribute((visibility("hidden")));
-#define gdk_win32_hdc_release IA__gdk_win32_hdc_release
-
-#endif
-#endif
-#if IN_HEADER(__GDK_WIN32_H__)
-#if IN_FILE(__GDK_SELECTION_WIN32_C__)
-extern __typeof (gdk_win32_selection_add_targets) IA__gdk_win32_selection_add_targets __attribute((visibility("hidden")));
-#define gdk_win32_selection_add_targets IA__gdk_win32_selection_add_targets
-
-#endif
-#endif
-#endif
-#ifdef GDK_WINDOWING_X11
-#if IN_HEADER(__GDK_X_H__)
-#if IN_FILE(__GDK_PROPERTY_X11_C__)
-extern __typeof (gdk_x11_atom_to_xatom) IA__gdk_x11_atom_to_xatom __attribute((visibility("hidden")));
-#define gdk_x11_atom_to_xatom IA__gdk_x11_atom_to_xatom
-
-extern __typeof (gdk_x11_atom_to_xatom_for_display) IA__gdk_x11_atom_to_xatom_for_display __attribute((visibility("hidden")));
-#define gdk_x11_atom_to_xatom_for_display IA__gdk_x11_atom_to_xatom_for_display
-
-extern __typeof (gdk_x11_get_xatom_by_name) IA__gdk_x11_get_xatom_by_name __attribute((visibility("hidden")));
-#define gdk_x11_get_xatom_by_name IA__gdk_x11_get_xatom_by_name
-
-extern __typeof (gdk_x11_get_xatom_by_name_for_display) IA__gdk_x11_get_xatom_by_name_for_display __attribute((visibility("hidden")));
-#define gdk_x11_get_xatom_by_name_for_display IA__gdk_x11_get_xatom_by_name_for_display
-
-extern __typeof (gdk_x11_get_xatom_name) IA__gdk_x11_get_xatom_name __attribute((visibility("hidden")));
-#define gdk_x11_get_xatom_name IA__gdk_x11_get_xatom_name
-
-extern __typeof (gdk_x11_get_xatom_name_for_display) IA__gdk_x11_get_xatom_name_for_display __attribute((visibility("hidden")));
-#define gdk_x11_get_xatom_name_for_display IA__gdk_x11_get_xatom_name_for_display
-
-extern __typeof (gdk_x11_xatom_to_atom) IA__gdk_x11_xatom_to_atom __attribute((visibility("hidden")));
-#define gdk_x11_xatom_to_atom IA__gdk_x11_xatom_to_atom
-
-extern __typeof (gdk_x11_xatom_to_atom_for_display) IA__gdk_x11_xatom_to_atom_for_display __attribute((visibility("hidden")));
-#define gdk_x11_xatom_to_atom_for_display IA__gdk_x11_xatom_to_atom_for_display
-
-#endif
-#if IN_FILE(__GDK_COLOR_X11_C__)
-extern __typeof (gdk_x11_colormap_foreign_new) IA__gdk_x11_colormap_foreign_new __attribute((visibility("hidden")));
-#define gdk_x11_colormap_foreign_new IA__gdk_x11_colormap_foreign_new
-
-extern __typeof (gdk_x11_colormap_get_xcolormap) IA__gdk_x11_colormap_get_xcolormap __attribute((visibility("hidden")));
-#define gdk_x11_colormap_get_xcolormap IA__gdk_x11_colormap_get_xcolormap
-
-extern __typeof (gdk_x11_colormap_get_xdisplay) IA__gdk_x11_colormap_get_xdisplay __attribute((visibility("hidden")));
-#define gdk_x11_colormap_get_xdisplay IA__gdk_x11_colormap_get_xdisplay
-
-#ifdef GDK_ENABLE_BROKEN
-extern __typeof (gdkx_colormap_get) IA__gdkx_colormap_get __attribute((visibility("hidden")));
-#define gdkx_colormap_get IA__gdkx_colormap_get
-
-#endif
-#endif
-#if IN_FILE(__GDK_CURSOR_X11_C__)
-extern __typeof (gdk_x11_cursor_get_xcursor) IA__gdk_x11_cursor_get_xcursor __attribute((visibility("hidden")));
-#define gdk_x11_cursor_get_xcursor IA__gdk_x11_cursor_get_xcursor
-
-extern __typeof (gdk_x11_cursor_get_xdisplay) IA__gdk_x11_cursor_get_xdisplay __attribute((visibility("hidden")));
-#define gdk_x11_cursor_get_xdisplay IA__gdk_x11_cursor_get_xdisplay
-
-extern __typeof (gdk_x11_display_set_cursor_theme) IA__gdk_x11_display_set_cursor_theme __attribute((visibility("hidden")));
-#define gdk_x11_display_set_cursor_theme IA__gdk_x11_display_set_cursor_theme
-
-#endif
-#if IN_FILE(__GDK_DISPLAY_X11_C__)
-extern __typeof (gdk_x11_display_get_user_time) IA__gdk_x11_display_get_user_time __attribute((visibility("hidden")));
-#define gdk_x11_display_get_user_time IA__gdk_x11_display_get_user_time
-
-extern __typeof (gdk_x11_display_get_xdisplay) IA__gdk_x11_display_get_xdisplay __attribute((visibility("hidden")));
-#define gdk_x11_display_get_xdisplay IA__gdk_x11_display_get_xdisplay
-
-extern __typeof (gdk_x11_display_grab) IA__gdk_x11_display_grab __attribute((visibility("hidden")));
-#define gdk_x11_display_grab IA__gdk_x11_display_grab
-
-extern __typeof (gdk_x11_display_ungrab) IA__gdk_x11_display_ungrab __attribute((visibility("hidden")));
-#define gdk_x11_display_ungrab IA__gdk_x11_display_ungrab
-
-extern __typeof (gdk_x11_lookup_xdisplay) IA__gdk_x11_lookup_xdisplay __attribute((visibility("hidden")));
-#define gdk_x11_lookup_xdisplay IA__gdk_x11_lookup_xdisplay
-
-extern __typeof (gdk_x11_display_broadcast_startup_message) IA__gdk_x11_display_broadcast_startup_message __attribute((visibility("hidden")));
-#define gdk_x11_display_broadcast_startup_message IA__gdk_x11_display_broadcast_startup_message
-
-extern __typeof (gdk_x11_display_get_startup_notification_id) IA__gdk_x11_display_get_startup_notification_id __attribute((visibility("hidden")));
-#define gdk_x11_display_get_startup_notification_id IA__gdk_x11_display_get_startup_notification_id
-
-#endif
-#if IN_FILE(__GDK_DRAWABLE_X11_C__)
-extern __typeof (gdk_x11_drawable_get_xdisplay) IA__gdk_x11_drawable_get_xdisplay __attribute((visibility("hidden")));
-#define gdk_x11_drawable_get_xdisplay IA__gdk_x11_drawable_get_xdisplay
-
-extern __typeof (gdk_x11_drawable_get_xid) IA__gdk_x11_drawable_get_xid __attribute((visibility("hidden")));
-#define gdk_x11_drawable_get_xid IA__gdk_x11_drawable_get_xid
-
-#endif
-#if IN_FILE(__GDK_FONT_X11_C__)
-#ifndef GDK_DISABLE_DEPRECATED
-extern __typeof (gdk_x11_font_get_name) IA__gdk_x11_font_get_name __attribute((visibility("hidden")));
-#define gdk_x11_font_get_name IA__gdk_x11_font_get_name
-
-extern __typeof (gdk_x11_font_get_xdisplay) IA__gdk_x11_font_get_xdisplay __attribute((visibility("hidden")));
-#define gdk_x11_font_get_xdisplay IA__gdk_x11_font_get_xdisplay
-
-#endif
-extern __typeof (gdk_x11_font_get_xfont) IA__gdk_x11_font_get_xfont __attribute((visibility("hidden")));
-#define gdk_x11_font_get_xfont IA__gdk_x11_font_get_xfont
-
-#endif
-#if IN_FILE(__GDK_GC_X11_C__)
-extern __typeof (gdk_x11_gc_get_xdisplay) IA__gdk_x11_gc_get_xdisplay __attribute((visibility("hidden")));
-#define gdk_x11_gc_get_xdisplay IA__gdk_x11_gc_get_xdisplay
-
-extern __typeof (gdk_x11_gc_get_xgc) IA__gdk_x11_gc_get_xgc __attribute((visibility("hidden")));
-#define gdk_x11_gc_get_xgc IA__gdk_x11_gc_get_xgc
-
-#endif
-#if IN_FILE(__GDK_MAIN_X11_C__)
-extern __typeof (gdk_x11_get_default_root_xwindow) IA__gdk_x11_get_default_root_xwindow __attribute((visibility("hidden")));
-#define gdk_x11_get_default_root_xwindow IA__gdk_x11_get_default_root_xwindow
-
-extern __typeof (gdk_x11_get_default_screen) IA__gdk_x11_get_default_screen __attribute((visibility("hidden")));
-#define gdk_x11_get_default_screen IA__gdk_x11_get_default_screen
-
-extern __typeof (gdk_x11_get_default_xdisplay) IA__gdk_x11_get_default_xdisplay __attribute((visibility("hidden")));
-#define gdk_x11_get_default_xdisplay IA__gdk_x11_get_default_xdisplay
-
-extern __typeof (gdk_x11_grab_server) IA__gdk_x11_grab_server __attribute((visibility("hidden")));
-#define gdk_x11_grab_server IA__gdk_x11_grab_server
-
-extern __typeof (gdk_x11_ungrab_server) IA__gdk_x11_ungrab_server __attribute((visibility("hidden")));
-#define gdk_x11_ungrab_server IA__gdk_x11_ungrab_server
-
-#endif
-#if IN_FILE(__GDK_EVENTS_X11_C__)
-extern __typeof (gdk_x11_get_server_time) IA__gdk_x11_get_server_time __attribute((visibility("hidden")));
-#define gdk_x11_get_server_time IA__gdk_x11_get_server_time
-
-extern __typeof (gdk_x11_register_standard_event_type) IA__gdk_x11_register_standard_event_type __attribute((visibility("hidden")));
-#define gdk_x11_register_standard_event_type IA__gdk_x11_register_standard_event_type
-
-extern __typeof (gdk_x11_screen_get_window_manager_name) IA__gdk_x11_screen_get_window_manager_name __attribute((visibility("hidden")));
-#define gdk_x11_screen_get_window_manager_name IA__gdk_x11_screen_get_window_manager_name
-
-extern __typeof (gdk_x11_screen_supports_net_wm_hint) IA__gdk_x11_screen_supports_net_wm_hint __attribute((visibility("hidden")));
-#define gdk_x11_screen_supports_net_wm_hint IA__gdk_x11_screen_supports_net_wm_hint
-
-#endif
-#if IN_FILE(__GDK_IMAGE_X11_C__)
-extern __typeof (gdk_x11_image_get_xdisplay) IA__gdk_x11_image_get_xdisplay __attribute((visibility("hidden")));
-#define gdk_x11_image_get_xdisplay IA__gdk_x11_image_get_xdisplay
-
-extern __typeof (gdk_x11_image_get_ximage) IA__gdk_x11_image_get_ximage __attribute((visibility("hidden")));
-#define gdk_x11_image_get_ximage IA__gdk_x11_image_get_ximage
-
-#endif
-#if IN_FILE(__GDK_SCREEN_X11_C__)
-extern __typeof (gdk_x11_screen_get_screen_number) IA__gdk_x11_screen_get_screen_number __attribute((visibility("hidden")));
-#define gdk_x11_screen_get_screen_number IA__gdk_x11_screen_get_screen_number
-
-extern __typeof (gdk_x11_screen_get_xscreen) IA__gdk_x11_screen_get_xscreen __attribute((visibility("hidden")));
-#define gdk_x11_screen_get_xscreen IA__gdk_x11_screen_get_xscreen
-
-#endif
-#if IN_FILE(__GDK_VISUAL_X11_C__)
-extern __typeof (gdk_x11_screen_lookup_visual) IA__gdk_x11_screen_lookup_visual __attribute((visibility("hidden")));
-#define gdk_x11_screen_lookup_visual IA__gdk_x11_screen_lookup_visual
-
-extern __typeof (gdk_x11_visual_get_xvisual) IA__gdk_x11_visual_get_xvisual __attribute((visibility("hidden")));
-#define gdk_x11_visual_get_xvisual IA__gdk_x11_visual_get_xvisual
-
-extern __typeof (gdkx_visual_get) IA__gdkx_visual_get __attribute((visibility("hidden")));
-#define gdkx_visual_get IA__gdkx_visual_get
-
-#endif
-#if IN_FILE(__GDK_WINDOW_X11_C__)
-extern __typeof (gdk_x11_window_set_user_time) IA__gdk_x11_window_set_user_time __attribute((visibility("hidden")));
-#define gdk_x11_window_set_user_time IA__gdk_x11_window_set_user_time
-
-extern __typeof (gdk_x11_window_move_to_current_desktop) IA__gdk_x11_window_move_to_current_desktop __attribute((visibility("hidden")));
-#define gdk_x11_window_move_to_current_desktop IA__gdk_x11_window_move_to_current_desktop
-
-#endif
-#if IN_FILE(__GDK_XID_C__)
-extern __typeof (gdk_xid_table_lookup) IA__gdk_xid_table_lookup __attribute((visibility("hidden")));
-#define gdk_xid_table_lookup IA__gdk_xid_table_lookup
-
-extern __typeof (gdk_xid_table_lookup_for_display) IA__gdk_xid_table_lookup_for_display __attribute((visibility("hidden")));
-#define gdk_xid_table_lookup_for_display IA__gdk_xid_table_lookup_for_display
-
-#endif
-#endif
-#endif
-#ifdef GDK_WINDOWING_X11
-#endif
-
-#endif /* G_HAVE_GNUC_VISIBILITY */
-#endif /* DISABLE_VISIBILITY */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkcairo.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkcairo.h
deleted file mode 100644
index 8550e6bc..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkcairo.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 2005 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 __GDK_CAIRO_H__
-#define __GDK_CAIRO_H__
-
-#include <gdk/gdkcolor.h>
-#include <gdk/gdkpixbuf.h>
-#include <pango/pangocairo.h>
-
-G_BEGIN_DECLS
-
-cairo_t *gdk_cairo_create (GdkDrawable *drawable);
-
-void gdk_cairo_set_source_color  (cairo_t      *cr,
-				  GdkColor     *color);
-void gdk_cairo_set_source_pixbuf (cairo_t      *cr,
-				  GdkPixbuf    *pixbuf,
-				  double        pixbuf_x,
-				  double        pixbuf_y);
-void gdk_cairo_set_source_pixmap (cairo_t   *cr,
-				  GdkPixmap *pixmap,
-				  double     pixmap_x,
-				  double     pixmap_y);
-
-void gdk_cairo_rectangle (cairo_t      *cr,
-			  GdkRectangle *rectangle);
-void gdk_cairo_region    (cairo_t      *cr,
-			  GdkRegion    *region);
-
-G_END_DECLS
-
-#endif /* __GDK_CAIRO_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkcolor.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkcolor.h
deleted file mode 100644
index 46f4a645..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkcolor.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_COLOR_H__
-#define __GDK_COLOR_H__
-
-#include <cairo.h>
-#include <gdk/gdktypes.h>
-
-G_BEGIN_DECLS
-
-/* The color type.
- *   A color consists of red, green and blue values in the
- *    range 0-65535 and a pixel value. The pixel value is highly
- *    dependent on the depth and colormap which this color will
- *    be used to draw into. Therefore, sharing colors between
- *    colormaps is a bad idea.
- */
-struct _GdkColor
-{
-  guint32 pixel;
-  guint16 red;
-  guint16 green;
-  guint16 blue;
-};
-
-/* The colormap type.
- */
-
-typedef struct _GdkColormapClass GdkColormapClass;
-
-#define GDK_TYPE_COLORMAP              (gdk_colormap_get_type ())
-#define GDK_COLORMAP(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_COLORMAP, GdkColormap))
-#define GDK_COLORMAP_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_COLORMAP, GdkColormapClass))
-#define GDK_IS_COLORMAP(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_COLORMAP))
-#define GDK_IS_COLORMAP_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_COLORMAP))
-#define GDK_COLORMAP_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_COLORMAP, GdkColormapClass))
-
-#define GDK_TYPE_COLOR                 (gdk_color_get_type ())
-
-struct _GdkColormap
-{
-  /*< private >*/
-  GObject parent_instance;
-
-  /*< public >*/
-  gint      size;
-  GdkColor *colors;
-
-  /*< private >*/
-  GdkVisual *visual;
-  
-  gpointer windowing_data;
-};
-
-struct _GdkColormapClass
-{
-  GObjectClass parent_class;
-
-};
-
-GType        gdk_colormap_get_type (void) G_GNUC_CONST;
-
-GdkColormap* gdk_colormap_new	  (GdkVisual   *visual,
-				   gboolean	allocate);
-
-#ifndef GDK_DISABLE_DEPRECATED
-GdkColormap* gdk_colormap_ref	  (GdkColormap *cmap);
-void	     gdk_colormap_unref	  (GdkColormap *cmap);
-#endif 
-
-#ifndef GDK_MULTIHEAD_SAFE
-GdkColormap* gdk_colormap_get_system	        (void);
-#endif
-
-GdkScreen *gdk_colormap_get_screen (GdkColormap *cmap);
-
-#ifndef GDK_DISABLE_DEPRECATED
-gint gdk_colormap_get_system_size  (void);
-#endif
-
-#if !defined (GDK_DISABLE_DEPRECATED) || defined (GDK_COMPILATION)
-/* Used by gdk_colors_store () */
-void gdk_colormap_change (GdkColormap	*colormap,
-			  gint		 ncolors);
-#endif 
-
-gint  gdk_colormap_alloc_colors   (GdkColormap *colormap,
-				   GdkColor    *colors,
-				   gint         ncolors,
-				   gboolean     writeable,
-				   gboolean     best_match,
-				   gboolean    *success);
-gboolean gdk_colormap_alloc_color (GdkColormap *colormap,
-				   GdkColor    *color,
-				   gboolean     writeable,
-				   gboolean     best_match);
-void     gdk_colormap_free_colors (GdkColormap *colormap,
-				   GdkColor    *colors,
-				   gint         ncolors);
-void     gdk_colormap_query_color (GdkColormap *colormap,
-				   gulong       pixel,
-				   GdkColor    *result);
-
-GdkVisual *gdk_colormap_get_visual (GdkColormap *colormap);
-     
-GdkColor *gdk_color_copy      (const GdkColor *color);
-void      gdk_color_free      (GdkColor       *color);
-gboolean  gdk_color_parse     (const gchar    *spec,
-			       GdkColor       *color);
-guint     gdk_color_hash      (const GdkColor *colora);
-gboolean  gdk_color_equal     (const GdkColor *colora,
-			       const GdkColor *colorb);
-gchar *   gdk_color_to_string (const GdkColor *color);
-
-GType     gdk_color_get_type (void) G_GNUC_CONST;
-
-/* The following functions are deprecated */
-#ifndef GDK_DISABLE_DEPRECATED
-void gdk_colors_store	 (GdkColormap	*colormap,
-			  GdkColor	*colors,
-			  gint		 ncolors);
-gint gdk_color_white	 (GdkColormap	*colormap,
-			  GdkColor	*color);
-gint gdk_color_black	 (GdkColormap	*colormap,
-			  GdkColor	*color);
-gint gdk_color_alloc	 (GdkColormap	*colormap,
-			  GdkColor	*color);
-gint gdk_color_change	 (GdkColormap	*colormap,
-			  GdkColor	*color);
-#endif /* GDK_DISABLE_DEPRECATED */
-
-#if !defined (GDK_DISABLE_DEPRECATED) || defined (GDK_COMPILATION)
-/* Used by gdk_rgb_try_colormap () */
-gint gdk_colors_alloc	 (GdkColormap	*colormap,
-			  gboolean	 contiguous,
-			  gulong	*planes,
-			  gint		 nplanes,
-			  gulong	*pixels,
-			  gint		 npixels);
-void gdk_colors_free	 (GdkColormap	*colormap,
-			  gulong	*pixels,
-			  gint		 npixels,
-			  gulong	 planes);
-#endif /* !GDK_DISABLE_DEPRECATED || GDK_COMPILATION */
-
-G_END_DECLS
-
-#endif /* __GDK_COLOR_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkcursor.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkcursor.h
deleted file mode 100644
index 7eaa9cae..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkcursor.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_CURSOR_H__
-#define __GDK_CURSOR_H__
-
-#include <gdk/gdktypes.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-G_BEGIN_DECLS
-
-#define GDK_TYPE_CURSOR (gdk_cursor_get_type ())
-
-/* Cursor types.
- */
-typedef enum
-{
-  GDK_X_CURSOR 		  = 0,
-  GDK_ARROW 		  = 2,
-  GDK_BASED_ARROW_DOWN    = 4,
-  GDK_BASED_ARROW_UP 	  = 6,
-  GDK_BOAT 		  = 8,
-  GDK_BOGOSITY 		  = 10,
-  GDK_BOTTOM_LEFT_CORNER  = 12,
-  GDK_BOTTOM_RIGHT_CORNER = 14,
-  GDK_BOTTOM_SIDE 	  = 16,
-  GDK_BOTTOM_TEE 	  = 18,
-  GDK_BOX_SPIRAL 	  = 20,
-  GDK_CENTER_PTR 	  = 22,
-  GDK_CIRCLE 		  = 24,
-  GDK_CLOCK	 	  = 26,
-  GDK_COFFEE_MUG 	  = 28,
-  GDK_CROSS 		  = 30,
-  GDK_CROSS_REVERSE 	  = 32,
-  GDK_CROSSHAIR 	  = 34,
-  GDK_DIAMOND_CROSS 	  = 36,
-  GDK_DOT 		  = 38,
-  GDK_DOTBOX 		  = 40,
-  GDK_DOUBLE_ARROW 	  = 42,
-  GDK_DRAFT_LARGE 	  = 44,
-  GDK_DRAFT_SMALL 	  = 46,
-  GDK_DRAPED_BOX 	  = 48,
-  GDK_EXCHANGE 		  = 50,
-  GDK_FLEUR 		  = 52,
-  GDK_GOBBLER 		  = 54,
-  GDK_GUMBY 		  = 56,
-  GDK_HAND1 		  = 58,
-  GDK_HAND2 		  = 60,
-  GDK_HEART 		  = 62,
-  GDK_ICON 		  = 64,
-  GDK_IRON_CROSS 	  = 66,
-  GDK_LEFT_PTR 		  = 68,
-  GDK_LEFT_SIDE 	  = 70,
-  GDK_LEFT_TEE 		  = 72,
-  GDK_LEFTBUTTON 	  = 74,
-  GDK_LL_ANGLE 		  = 76,
-  GDK_LR_ANGLE 	 	  = 78,
-  GDK_MAN 		  = 80,
-  GDK_MIDDLEBUTTON 	  = 82,
-  GDK_MOUSE 		  = 84,
-  GDK_PENCIL 		  = 86,
-  GDK_PIRATE 		  = 88,
-  GDK_PLUS 		  = 90,
-  GDK_QUESTION_ARROW 	  = 92,
-  GDK_RIGHT_PTR 	  = 94,
-  GDK_RIGHT_SIDE 	  = 96,
-  GDK_RIGHT_TEE 	  = 98,
-  GDK_RIGHTBUTTON 	  = 100,
-  GDK_RTL_LOGO 		  = 102,
-  GDK_SAILBOAT 		  = 104,
-  GDK_SB_DOWN_ARROW 	  = 106,
-  GDK_SB_H_DOUBLE_ARROW   = 108,
-  GDK_SB_LEFT_ARROW 	  = 110,
-  GDK_SB_RIGHT_ARROW 	  = 112,
-  GDK_SB_UP_ARROW 	  = 114,
-  GDK_SB_V_DOUBLE_ARROW   = 116,
-  GDK_SHUTTLE 		  = 118,
-  GDK_SIZING 		  = 120,
-  GDK_SPIDER		  = 122,
-  GDK_SPRAYCAN 		  = 124,
-  GDK_STAR 		  = 126,
-  GDK_TARGET 		  = 128,
-  GDK_TCROSS 		  = 130,
-  GDK_TOP_LEFT_ARROW 	  = 132,
-  GDK_TOP_LEFT_CORNER 	  = 134,
-  GDK_TOP_RIGHT_CORNER 	  = 136,
-  GDK_TOP_SIDE 		  = 138,
-  GDK_TOP_TEE 		  = 140,
-  GDK_TREK 		  = 142,
-  GDK_UL_ANGLE 		  = 144,
-  GDK_UMBRELLA 		  = 146,
-  GDK_UR_ANGLE 		  = 148,
-  GDK_WATCH 		  = 150,
-  GDK_XTERM 		  = 152,
-  GDK_LAST_CURSOR,
-  GDK_CURSOR_IS_PIXMAP 	= -1
-} GdkCursorType;
-
-struct _GdkCursor
-{
-  GdkCursorType type;
-  /*< private >*/
-  guint ref_count;
-};
-
-/* Cursors
- */
-
-GType      gdk_cursor_get_type           (void) G_GNUC_CONST;
-
-GdkCursor* gdk_cursor_new_for_display	 (GdkDisplay      *display,
-					  GdkCursorType    cursor_type);
-#ifndef GDK_MULTIHEAD_SAFE
-GdkCursor* gdk_cursor_new		 (GdkCursorType	   cursor_type);
-#endif
-GdkCursor* gdk_cursor_new_from_pixmap	 (GdkPixmap	  *source,
-					  GdkPixmap	  *mask,
-					  const GdkColor  *fg,
-					  const GdkColor  *bg,
-					  gint		   x,
-					  gint		   y);
-GdkCursor* gdk_cursor_new_from_pixbuf	 (GdkDisplay      *display,
-					  GdkPixbuf       *pixbuf,
-					  gint             x,
-					  gint             y);
-GdkDisplay* gdk_cursor_get_display	 (GdkCursor	  *cursor);
-GdkCursor*  gdk_cursor_ref               (GdkCursor       *cursor);
-void        gdk_cursor_unref             (GdkCursor       *cursor);
-GdkCursor*  gdk_cursor_new_from_name	 (GdkDisplay      *display,
-					  const gchar     *name);
-GdkPixbuf*  gdk_cursor_get_image         (GdkCursor       *cursor);
-
-#ifndef GDK_DISABLE_DEPRECATED
-#define gdk_cursor_destroy             gdk_cursor_unref
-#endif /* GDK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GDK_CURSOR_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkdisplay.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkdisplay.h
deleted file mode 100644
index b55b3122..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkdisplay.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * gdkdisplay.h
- * 
- * Copyright 2001 Sun Microsystems Inc. 
- *
- * Erwann Chenede <erwann.chenede@sun.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 __GDK_DISPLAY_H__
-#define __GDK_DISPLAY_H__
-
-#include <gdk/gdktypes.h>
-#include <gdk/gdkevents.h>
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GdkDisplayClass GdkDisplayClass;
-typedef struct _GdkDisplayPointerHooks GdkDisplayPointerHooks;
-
-#define GDK_TYPE_DISPLAY              (gdk_display_get_type ())
-#define GDK_DISPLAY_OBJECT(object)    (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DISPLAY, GdkDisplay))
-#define GDK_DISPLAY_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DISPLAY, GdkDisplayClass))
-#define GDK_IS_DISPLAY(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DISPLAY))
-#define GDK_IS_DISPLAY_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_DISPLAY))
-#define GDK_DISPLAY_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_DISPLAY, GdkDisplayClass))
-
-struct _GdkDisplay
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GList *queued_events;
-  GList *queued_tail;
-
-  /* Information for determining if the latest button click
-   * is part of a double-click or triple-click
-   */
-  guint32 button_click_time[2];	/* The last 2 button click times. */
-  GdkWindow *button_window[2];  /* The last 2 windows to receive button presses. */
-  gint button_number[2];        /* The last 2 buttons to be pressed. */
-
-  guint double_click_time;	/* Maximum time between clicks in msecs */
-  GdkDevice *core_pointer;	/* Core pointer device */
-
-  const GdkDisplayPointerHooks *pointer_hooks; /* Current hooks for querying pointer */
-  
-  guint closed : 1;		/* Whether this display has been closed */
-
-  guint double_click_distance;	/* Maximum distance between clicks in pixels */
-  gint button_x[2];             /* The last 2 button click positions. */
-  gint button_y[2];
-};
-
-struct _GdkDisplayClass
-{
-  GObjectClass parent_class;
-  
-  G_CONST_RETURN gchar *     (*get_display_name)   (GdkDisplay *display);
-  gint			     (*get_n_screens)      (GdkDisplay *display);
-  GdkScreen *		     (*get_screen)         (GdkDisplay *display,
-						    gint        screen_num);
-  GdkScreen *		     (*get_default_screen) (GdkDisplay *display);
-
-  
-  /* Signals */
-  void (*closed) (GdkDisplay *display,
-		  gboolean    is_error);
-};
-
-struct _GdkDisplayPointerHooks
-{
-  void (*get_pointer)              (GdkDisplay      *display,
-				    GdkScreen      **screen,
-				    gint            *x,
-				    gint            *y,
-				    GdkModifierType *mask);
-  GdkWindow* (*window_get_pointer) (GdkDisplay      *display,
-				    GdkWindow       *window,
-				    gint            *x,
-				    gint            *y,
-				    GdkModifierType *mask);
-  GdkWindow* (*window_at_pointer)  (GdkDisplay      *display,
-				    gint            *win_x,
-				    gint            *win_y);
-};
-
-GType       gdk_display_get_type (void) G_GNUC_CONST;
-GdkDisplay *gdk_display_open                (const gchar *display_name);
-
-G_CONST_RETURN gchar * gdk_display_get_name (GdkDisplay *display);
-
-gint        gdk_display_get_n_screens      (GdkDisplay  *display);
-GdkScreen * gdk_display_get_screen         (GdkDisplay  *display,
-					    gint         screen_num);
-GdkScreen * gdk_display_get_default_screen (GdkDisplay  *display);
-void        gdk_display_pointer_ungrab     (GdkDisplay  *display,
-					    guint32      time_);
-void        gdk_display_keyboard_ungrab    (GdkDisplay  *display,
-					    guint32      time_);
-gboolean    gdk_display_pointer_is_grabbed (GdkDisplay  *display);
-void        gdk_display_beep               (GdkDisplay  *display);
-void        gdk_display_sync               (GdkDisplay  *display);
-void        gdk_display_flush              (GdkDisplay  *display);
-
-void	    gdk_display_close		   (GdkDisplay  *display);
-
-GList *     gdk_display_list_devices       (GdkDisplay  *display);
-
-GdkEvent* gdk_display_get_event  (GdkDisplay *display);
-GdkEvent* gdk_display_peek_event (GdkDisplay *display);
-void      gdk_display_put_event  (GdkDisplay *display,
-				  GdkEvent   *event);
-
-void gdk_display_add_client_message_filter (GdkDisplay   *display,
-					    GdkAtom       message_type,
-					    GdkFilterFunc func,
-					    gpointer      data);
-
-void gdk_display_set_double_click_time     (GdkDisplay   *display,
-					    guint         msec);
-void gdk_display_set_double_click_distance (GdkDisplay   *display,
-					    guint         distance);
-
-GdkDisplay *gdk_display_get_default (void);
-
-GdkDevice  *gdk_display_get_core_pointer (GdkDisplay *display);
-
-void             gdk_display_get_pointer           (GdkDisplay             *display,
-						    GdkScreen             **screen,
-						    gint                   *x,
-						    gint                   *y,
-						    GdkModifierType        *mask);
-GdkWindow *      gdk_display_get_window_at_pointer (GdkDisplay             *display,
-						    gint                   *win_x,
-						    gint                   *win_y);
-void             gdk_display_warp_pointer          (GdkDisplay             *display,
-						    GdkScreen              *screen,
-						    gint                   x,
-						    gint                   y);
-
-GdkDisplayPointerHooks *gdk_display_set_pointer_hooks (GdkDisplay                   *display,
-						       const GdkDisplayPointerHooks *new_hooks);
-
-GdkDisplay *gdk_display_open_default_libgtk_only (void);
-
-gboolean gdk_display_supports_cursor_alpha     (GdkDisplay    *display);
-gboolean gdk_display_supports_cursor_color     (GdkDisplay    *display);
-guint    gdk_display_get_default_cursor_size   (GdkDisplay    *display);
-void     gdk_display_get_maximal_cursor_size   (GdkDisplay    *display,
-						guint         *width,
-						guint         *height);
-
-GdkWindow *gdk_display_get_default_group       (GdkDisplay *display); 
-
-gboolean gdk_display_supports_selection_notification (GdkDisplay *display);
-gboolean gdk_display_request_selection_notification  (GdkDisplay *display,
-						      GdkAtom     selection);
-
-gboolean gdk_display_supports_clipboard_persistence (GdkDisplay *display);
-void     gdk_display_store_clipboard                (GdkDisplay *display,
-						     GdkWindow  *clipboard_window,
-						     guint32     time_,
-						     GdkAtom    *targets,
-						     gint        n_targets);
-
-gboolean gdk_display_supports_shapes           (GdkDisplay    *display);
-gboolean gdk_display_supports_input_shapes     (GdkDisplay    *display);
-gboolean gdk_display_supports_composite        (GdkDisplay    *display);
-
-G_END_DECLS
-
-#endif	/* __GDK_DISPLAY_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkdisplaymanager.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkdisplaymanager.h
deleted file mode 100644
index 75294417..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkdisplaymanager.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __GDK_DISPLAY_MANAGER_H__
-#define __GDK_DISPLAY_MANAGER_H__
-
-#include <gdk/gdktypes.h>
-#include <gdk/gdkdisplay.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GdkDisplayManager      GdkDisplayManager;
-typedef struct _GdkDisplayManagerClass GdkDisplayManagerClass;
-
-#define GDK_TYPE_DISPLAY_MANAGER              (gdk_display_manager_get_type ())
-#define GDK_DISPLAY_MANAGER(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DISPLAY_MANAGER, GdkDisplayManager))
-#define GDK_DISPLAY_MANAGER_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DISPLAY_MANAGER, GdkDisplayManagerClass))
-#define GDK_IS_DISPLAY_MANAGER(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DISPLAY_MANAGER))
-#define GDK_IS_DISPLAY_MANAGER_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_DISPLAY_MANAGER))
-#define GDK_DISPLAY_MANAGER_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_DISPLAY_MANAGER, GdkDisplayManagerClass))
-
-struct _GdkDisplayManagerClass
-{
-  GObjectClass parent_class;
-
-  void (*display_opened) (GdkDisplayManager *display_manager,
-			  GdkDisplay *display);
-};
-
-GType gdk_display_manager_get_type (void) G_GNUC_CONST;
-
-GdkDisplayManager *gdk_display_manager_get                 (void);
-GdkDisplay *       gdk_display_manager_get_default_display (GdkDisplayManager *display_manager);
-void               gdk_display_manager_set_default_display (GdkDisplayManager *display_manager,
-							    GdkDisplay        *display);
-GSList     *       gdk_display_manager_list_displays       (GdkDisplayManager *display_manager);
-
-G_END_DECLS
-
-#endif /* __GDK_DISPLAY_MANAGER_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkdnd.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkdnd.h
deleted file mode 100644
index 68440532..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkdnd.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-#ifndef __GDK_DND_H__
-#define __GDK_DND_H__
-
-#include <gdk/gdktypes.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GdkDragContext        GdkDragContext;
-
-typedef enum
-{
-  GDK_ACTION_DEFAULT = 1 << 0,
-  GDK_ACTION_COPY    = 1 << 1,
-  GDK_ACTION_MOVE    = 1 << 2,
-  GDK_ACTION_LINK    = 1 << 3,
-  GDK_ACTION_PRIVATE = 1 << 4,
-  GDK_ACTION_ASK     = 1 << 5
-} GdkDragAction;
-
-typedef enum
-{
-  GDK_DRAG_PROTO_MOTIF,
-  GDK_DRAG_PROTO_XDND,
-  GDK_DRAG_PROTO_ROOTWIN,	  /* A root window with nobody claiming
-				   * drags */
-  GDK_DRAG_PROTO_NONE,		  /* Not a valid drag window */
-  GDK_DRAG_PROTO_WIN32_DROPFILES, /* The simple WM_DROPFILES dnd */
-  GDK_DRAG_PROTO_OLE2,		  /* The complex OLE2 dnd (not implemented) */
-  GDK_DRAG_PROTO_LOCAL            /* Intra-app */
-} GdkDragProtocol;
-
-/* Object that holds information about a drag in progress.
- * this is used on both source and destination sides.
- */
-
-typedef struct _GdkDragContextClass GdkDragContextClass;
-
-#define GDK_TYPE_DRAG_CONTEXT              (gdk_drag_context_get_type ())
-#define GDK_DRAG_CONTEXT(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DRAG_CONTEXT, GdkDragContext))
-#define GDK_DRAG_CONTEXT_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DRAG_CONTEXT, GdkDragContextClass))
-#define GDK_IS_DRAG_CONTEXT(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DRAG_CONTEXT))
-#define GDK_IS_DRAG_CONTEXT_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_DRAG_CONTEXT))
-#define GDK_DRAG_CONTEXT_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_DRAG_CONTEXT, GdkDragContextClass))
-
-struct _GdkDragContext {
-  GObject parent_instance;
-
-  /*< public >*/
-  
-  GdkDragProtocol protocol;
-  
-  gboolean is_source;
-  
-  GdkWindow *source_window;
-  GdkWindow *dest_window;
-
-  GList *targets;
-  GdkDragAction actions;
-  GdkDragAction suggested_action;
-  GdkDragAction action; 
-
-  guint32 start_time;
-
-  /*< private >*/
-  
-  gpointer windowing_data;
-};
-
-struct _GdkDragContextClass {
-  GObjectClass parent_class;
-
-  
-};
-
-/* Drag and Drop */
-
-GType            gdk_drag_context_get_type   (void) G_GNUC_CONST;
-GdkDragContext * gdk_drag_context_new        (void);
-
-#ifndef GDK_DISABLE_DEPRECATED
-void             gdk_drag_context_ref        (GdkDragContext *context);
-void             gdk_drag_context_unref      (GdkDragContext *context);
-#endif
-
-/* Destination side */
-
-void             gdk_drag_status        (GdkDragContext   *context,
-				         GdkDragAction     action,
-					 guint32           time_);
-void             gdk_drop_reply         (GdkDragContext   *context,
-					 gboolean          ok,
-					 guint32           time_);
-void             gdk_drop_finish        (GdkDragContext   *context,
-					 gboolean          success,
-					 guint32           time_);
-GdkAtom          gdk_drag_get_selection (GdkDragContext   *context);
-
-/* Source side */
-
-GdkDragContext * gdk_drag_begin      (GdkWindow      *window,
-				      GList          *targets);
-
-guint32 gdk_drag_get_protocol_for_display (GdkDisplay       *display,
-					   guint32           xid,
-					   GdkDragProtocol  *protocol);
-void    gdk_drag_find_window_for_screen   (GdkDragContext   *context,
-					   GdkWindow        *drag_window,
-					   GdkScreen        *screen,
-					   gint              x_root,
-					   gint              y_root,
-					   GdkWindow       **dest_window,
-					   GdkDragProtocol  *protocol);
-
-#ifndef GDK_MULTIHEAD_SAFE
-guint32 gdk_drag_get_protocol (guint32           xid,
-			       GdkDragProtocol  *protocol);
-void    gdk_drag_find_window  (GdkDragContext   *context,
-			       GdkWindow        *drag_window,
-			       gint              x_root,
-			       gint              y_root,
-			       GdkWindow       **dest_window,
-			       GdkDragProtocol  *protocol);
-#endif /* GDK_MULTIHEAD_SAFE */
-
-gboolean        gdk_drag_motion      (GdkDragContext *context,
-				      GdkWindow      *dest_window,
-				      GdkDragProtocol protocol,
-				      gint            x_root, 
-				      gint            y_root,
-				      GdkDragAction   suggested_action,
-				      GdkDragAction   possible_actions,
-				      guint32         time_);
-void            gdk_drag_drop        (GdkDragContext *context,
-				      guint32         time_);
-void            gdk_drag_abort       (GdkDragContext *context,
-				      guint32         time_);
-gboolean        gdk_drag_drop_succeeded (GdkDragContext *context);
-
-G_END_DECLS
-
-#endif /* __GDK_DND_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkdrawable.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkdrawable.h
deleted file mode 100644
index ccaa3644..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkdrawable.h
+++ /dev/null
@@ -1,419 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-#ifndef __GDK_DRAWABLE_H__
-#define __GDK_DRAWABLE_H__
-
-#include <gdk/gdktypes.h>
-#include <gdk/gdkgc.h>
-#include <gdk/gdkrgb.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-#include <cairo.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GdkDrawableClass GdkDrawableClass;
-typedef struct _GdkTrapezoid     GdkTrapezoid;
-
-#define GDK_TYPE_DRAWABLE              (gdk_drawable_get_type ())
-#define GDK_DRAWABLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DRAWABLE, GdkDrawable))
-#define GDK_DRAWABLE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DRAWABLE, GdkDrawableClass))
-#define GDK_IS_DRAWABLE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DRAWABLE))
-#define GDK_IS_DRAWABLE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_DRAWABLE))
-#define GDK_DRAWABLE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_DRAWABLE, GdkDrawableClass))
-
-struct _GdkDrawable
-{
-  GObject parent_instance;
-};
- 
-struct _GdkDrawableClass 
-{
-  GObjectClass parent_class;
-  
-  GdkGC *(*create_gc)    (GdkDrawable    *drawable,
-		          GdkGCValues    *values,
-		          GdkGCValuesMask mask);
-  void (*draw_rectangle) (GdkDrawable  *drawable,
-			  GdkGC	       *gc,
-			  gboolean	filled,
-			  gint		x,
-			  gint		y,
-			  gint		width,
-			  gint		height);
-  void (*draw_arc)       (GdkDrawable  *drawable,
-			  GdkGC	       *gc,
-			  gboolean	filled,
-			  gint		x,
-			  gint		y,
-			  gint		width,
-			  gint		height,
-			  gint		angle1,
-			  gint		angle2);
-  void (*draw_polygon)   (GdkDrawable  *drawable,
-			  GdkGC	       *gc,
-			  gboolean	filled,
-			  GdkPoint     *points,
-			  gint		npoints);
-  void (*draw_text)      (GdkDrawable  *drawable,
-			  GdkFont      *font,
-			  GdkGC	       *gc,
-			  gint		x,
-			  gint		y,
-			  const gchar  *text,
-			  gint		text_length);
-  void (*draw_text_wc)   (GdkDrawable	 *drawable,
-			  GdkFont	 *font,
-			  GdkGC		 *gc,
-			  gint		  x,
-			  gint		  y,
-			  const GdkWChar *text,
-			  gint		  text_length);
-  void (*draw_drawable)  (GdkDrawable  *drawable,
-			  GdkGC	       *gc,
-			  GdkDrawable  *src,
-			  gint		xsrc,
-			  gint		ysrc,
-			  gint		xdest,
-			  gint		ydest,
-			  gint		width,
-			  gint		height);
-  void (*draw_points)	 (GdkDrawable  *drawable,
-			  GdkGC	       *gc,
-			  GdkPoint     *points,
-			  gint		npoints);
-  void (*draw_segments)	 (GdkDrawable  *drawable,
-			  GdkGC	       *gc,
-			  GdkSegment   *segs,
-			  gint		nsegs);
- void (*draw_lines)     (GdkDrawable  *drawable,
-			  GdkGC        *gc,
-			  GdkPoint     *points,
-			  gint          npoints);
-
-  void (*draw_glyphs)    (GdkDrawable      *drawable,
-			  GdkGC	           *gc,
-			  PangoFont        *font,
-			  gint              x,
-			  gint              y,
-			  PangoGlyphString *glyphs);
-
-  void (*draw_image)     (GdkDrawable *drawable,
-                          GdkGC	      *gc,
-                          GdkImage    *image,
-                          gint	       xsrc,
-                          gint	       ysrc,
-                          gint	       xdest,
-                          gint	       ydest,
-                          gint	       width,
-                          gint	       height);
-  
-  gint (*get_depth)      (GdkDrawable  *drawable);
-  void (*get_size)       (GdkDrawable  *drawable,
-                          gint         *width,
-                          gint         *height);
-
-  void (*set_colormap)   (GdkDrawable  *drawable,
-                          GdkColormap  *cmap);
-
-  GdkColormap* (*get_colormap)	(GdkDrawable  *drawable);
-  GdkVisual*   (*get_visual)	(GdkDrawable  *drawable);
-  GdkScreen*   (*get_screen)	(GdkDrawable  *drawable);
-
-  GdkImage*    (*get_image)  (GdkDrawable  *drawable,
-                              gint          x,
-                              gint          y,
-                              gint          width,
-                              gint          height);
-
-  GdkRegion*   (*get_clip_region)    (GdkDrawable  *drawable);
-  GdkRegion*   (*get_visible_region) (GdkDrawable  *drawable);
-
-  GdkDrawable* (*get_composite_drawable) (GdkDrawable *drawable,
-                                          gint         x,
-                                          gint         y,
-                                          gint         width,
-                                          gint         height,
-                                          gint        *composite_x_offset,
-                                          gint        *composite_y_offset);
-
-  void         (*draw_pixbuf) (GdkDrawable *drawable,
-			       GdkGC       *gc,
-			       GdkPixbuf   *pixbuf,
-			       gint         src_x,
-			       gint         src_y,
-			       gint         dest_x,
-			       gint         dest_y,
-			       gint         width,
-			       gint         height,
-			       GdkRgbDither dither,
-			       gint         x_dither,
-			       gint         y_dither);
-  GdkImage*    (*_copy_to_image) (GdkDrawable    *drawable,
-				  GdkImage       *image,
-				  gint            src_x,
-				  gint            src_y,
-				  gint            dest_x,
-				  gint            dest_y,
-				  gint            width,
-				  gint            height);
-  
-  void (*draw_glyphs_transformed) (GdkDrawable      *drawable,
-				   GdkGC	    *gc,
-				   PangoMatrix      *matrix,
-				   PangoFont        *font,
-				   gint              x,
-				   gint              y,
-				   PangoGlyphString *glyphs);
-  void (*draw_trapezoids)         (GdkDrawable      *drawable,
-				   GdkGC	    *gc,
-				   GdkTrapezoid     *trapezoids,
-				   gint              n_trapezoids);
-
-  cairo_surface_t *(*ref_cairo_surface) (GdkDrawable *drawable);
-
-  /* Padding for future expansion */
-  void         (*_gdk_reserved4)  (void);
-  void         (*_gdk_reserved5)  (void);
-  void         (*_gdk_reserved6)  (void);
-  void         (*_gdk_reserved7)  (void);
-  void         (*_gdk_reserved9)  (void);
-  void         (*_gdk_reserved10) (void);
-  void         (*_gdk_reserved11) (void);
-  void         (*_gdk_reserved12) (void);
-  void         (*_gdk_reserved13) (void);
-  void         (*_gdk_reserved14) (void);
-  void         (*_gdk_reserved15) (void);
-  void         (*_gdk_reserved16) (void);
-};
-
-struct _GdkTrapezoid
-{
-  double y1, x11, x21, y2, x12, x22;
-};
-
-GType           gdk_drawable_get_type     (void) G_GNUC_CONST;
-
-/* Manipulation of drawables
- */
-
-#ifndef GDK_DISABLE_DEPRECATED
-void            gdk_drawable_set_data     (GdkDrawable    *drawable,
-					   const gchar    *key,
-					   gpointer	  data,
-					   GDestroyNotify  destroy_func);
-gpointer        gdk_drawable_get_data     (GdkDrawable    *drawable,
-					   const gchar    *key);
-#endif /* GDK_DISABLE_DEPRECATED */
-
-void            gdk_drawable_get_size     (GdkDrawable	  *drawable,
-					   gint	          *width,
-					   gint  	  *height);
-void	        gdk_drawable_set_colormap (GdkDrawable	  *drawable,
-					   GdkColormap	  *colormap);
-GdkColormap*    gdk_drawable_get_colormap (GdkDrawable	  *drawable);
-GdkVisual*      gdk_drawable_get_visual   (GdkDrawable	  *drawable);
-gint            gdk_drawable_get_depth    (GdkDrawable	  *drawable);
-GdkScreen*	gdk_drawable_get_screen   (GdkDrawable    *drawable);
-GdkDisplay*	gdk_drawable_get_display  (GdkDrawable    *drawable);
-
-#ifndef GDK_DISABLE_DEPRECATED
-GdkDrawable*    gdk_drawable_ref          (GdkDrawable    *drawable);
-void            gdk_drawable_unref        (GdkDrawable    *drawable);
-#endif /* GDK_DISABLE_DEPRECATED */
-
-/* Drawing
- */
-void gdk_draw_point     (GdkDrawable      *drawable,
-			 GdkGC            *gc,
-			 gint              x,
-			 gint              y);
-void gdk_draw_line      (GdkDrawable      *drawable,
-			 GdkGC            *gc,
-			 gint              x1_,
-			 gint              y1_,
-			 gint              x2_,
-			 gint              y2_);
-void gdk_draw_rectangle (GdkDrawable      *drawable,
-			 GdkGC            *gc,
-			 gboolean          filled,
-			 gint              x,
-			 gint              y,
-			 gint              width,
-			 gint              height);
-void gdk_draw_arc       (GdkDrawable      *drawable,
-			 GdkGC            *gc,
-			 gboolean          filled,
-			 gint              x,
-			 gint              y,
-			 gint              width,
-			 gint              height,
-			 gint              angle1,
-			 gint              angle2);
-void gdk_draw_polygon   (GdkDrawable      *drawable,
-			 GdkGC            *gc,
-			 gboolean          filled,
-			 GdkPoint         *points,
-			 gint              npoints);
-#if !defined (GDK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
-/* Used by gtk_default_draw_string () */
-void gdk_draw_string    (GdkDrawable      *drawable,
-			 GdkFont          *font,
-			 GdkGC            *gc,
-			 gint              x,
-			 gint              y,
-			 const gchar      *string);
-#endif /* !GDK_DISABLE_DEPRECATED || GTK_COMPILATION */
-#if !defined (GDK_DISABLE_DEPRECATED) || defined (GDK_COMPILATION)
-/* Used by gdk_pixmap_draw_text (), gdk_window_draw_text() */
-void gdk_draw_text      (GdkDrawable      *drawable,
-			 GdkFont          *font,
-			 GdkGC            *gc,
-			 gint              x,
-			 gint              y,
-			 const gchar      *text,
-			 gint              text_length);
-/* Used by gdk_pixmap_draw_text_wc (), gdk_window_draw_text_wc () */
-void gdk_draw_text_wc   (GdkDrawable      *drawable,
-			 GdkFont          *font,
-			 GdkGC            *gc,
-			 gint              x,
-			 gint              y,
-			 const GdkWChar   *text,
-			 gint              text_length);
-#endif /* !GDK_DISABLE_DEPRECATED || GDK_COMPILATION */
-void gdk_draw_drawable  (GdkDrawable      *drawable,
-			 GdkGC            *gc,
-			 GdkDrawable      *src,
-			 gint              xsrc,
-			 gint              ysrc,
-			 gint              xdest,
-			 gint              ydest,
-			 gint              width,
-			 gint              height);
-void gdk_draw_image     (GdkDrawable      *drawable,
-			 GdkGC            *gc,
-			 GdkImage         *image,
-			 gint              xsrc,
-			 gint              ysrc,
-			 gint              xdest,
-			 gint              ydest,
-			 gint              width,
-			 gint              height);
-void gdk_draw_points    (GdkDrawable      *drawable,
-			 GdkGC            *gc,
-			 GdkPoint         *points,
-			 gint              npoints);
-void gdk_draw_segments  (GdkDrawable      *drawable,
-			 GdkGC            *gc,
-			 GdkSegment       *segs,
-			 gint              nsegs);
-void gdk_draw_lines     (GdkDrawable      *drawable,
-			 GdkGC            *gc,
-			 GdkPoint         *points,
-			 gint              npoints);
-void gdk_draw_pixbuf    (GdkDrawable      *drawable,
-			 GdkGC            *gc,
-			 GdkPixbuf        *pixbuf,
-			 gint              src_x,
-			 gint              src_y,
-			 gint              dest_x,
-			 gint              dest_y,
-			 gint              width,
-			 gint              height,
-			 GdkRgbDither      dither,
-			 gint              x_dither,
-			 gint              y_dither);
-
-void gdk_draw_glyphs      (GdkDrawable      *drawable,
-			   GdkGC            *gc,
-			   PangoFont        *font,
-			   gint              x,
-			   gint              y,
-			   PangoGlyphString *glyphs);
-void gdk_draw_layout_line (GdkDrawable      *drawable,
-			   GdkGC            *gc,
-			   gint              x,
-			   gint              y,
-			   PangoLayoutLine  *line);
-void gdk_draw_layout      (GdkDrawable      *drawable,
-			   GdkGC            *gc,
-			   gint              x,
-			   gint              y,
-			   PangoLayout      *layout);
-
-void gdk_draw_layout_line_with_colors (GdkDrawable     *drawable,
-                                       GdkGC           *gc,
-                                       gint             x,
-                                       gint             y,
-                                       PangoLayoutLine *line,
-                                       const GdkColor  *foreground,
-                                       const GdkColor  *background);
-void gdk_draw_layout_with_colors      (GdkDrawable     *drawable,
-                                       GdkGC           *gc,
-                                       gint             x,
-                                       gint             y,
-                                       PangoLayout     *layout,
-                                       const GdkColor  *foreground,
-                                       const GdkColor  *background);
-
-void gdk_draw_glyphs_transformed (GdkDrawable      *drawable,
-				  GdkGC	           *gc,
-				  PangoMatrix      *matrix,
-				  PangoFont        *font,
-				  gint              x,
-				  gint              y,
-				  PangoGlyphString *glyphs);
-void gdk_draw_trapezoids         (GdkDrawable      *drawable,
-				  GdkGC	           *gc,
-				  GdkTrapezoid     *trapezoids,
-				  gint              n_trapezoids);
-
-#ifndef GDK_DISABLE_DEPRECATED
-#define gdk_draw_pixmap                gdk_draw_drawable
-#define gdk_draw_bitmap                gdk_draw_drawable
-#endif /* GDK_DISABLE_DEPRECATED */
-
-GdkImage* gdk_drawable_get_image      (GdkDrawable *drawable,
-                                       gint         x,
-                                       gint         y,
-                                       gint         width,
-                                       gint         height);
-GdkImage *gdk_drawable_copy_to_image (GdkDrawable  *drawable,
-				      GdkImage     *image,
-				      gint          src_x,
-				      gint          src_y,
-				      gint          dest_x,
-				      gint          dest_y,
-				      gint          width,
-				      gint          height);
-
-GdkRegion *gdk_drawable_get_clip_region    (GdkDrawable *drawable);
-GdkRegion *gdk_drawable_get_visible_region (GdkDrawable *drawable);
-
-G_END_DECLS
-
-#endif /* __GDK_DRAWABLE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkenumtypes.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkenumtypes.h
deleted file mode 100644
index 1ffe3dbf..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkenumtypes.h
+++ /dev/null
@@ -1,120 +0,0 @@
-
-/* Generated data (by glib-mkenums) */
-
-#ifndef __GDK_ENUM_TYPES_H__
-#define __GDK_ENUM_TYPES_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-/* enumerations from "gdkcursor.h" */
-GType gdk_cursor_type_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_CURSOR_TYPE (gdk_cursor_type_get_type())
-/* enumerations from "gdkdnd.h" */
-GType gdk_drag_action_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_DRAG_ACTION (gdk_drag_action_get_type())
-GType gdk_drag_protocol_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_DRAG_PROTOCOL (gdk_drag_protocol_get_type())
-/* enumerations from "gdkevents.h" */
-GType gdk_filter_return_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_FILTER_RETURN (gdk_filter_return_get_type())
-GType gdk_event_type_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_EVENT_TYPE (gdk_event_type_get_type())
-GType gdk_event_mask_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_EVENT_MASK (gdk_event_mask_get_type())
-GType gdk_visibility_state_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_VISIBILITY_STATE (gdk_visibility_state_get_type())
-GType gdk_scroll_direction_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_SCROLL_DIRECTION (gdk_scroll_direction_get_type())
-GType gdk_notify_type_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_NOTIFY_TYPE (gdk_notify_type_get_type())
-GType gdk_crossing_mode_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_CROSSING_MODE (gdk_crossing_mode_get_type())
-GType gdk_property_state_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_PROPERTY_STATE (gdk_property_state_get_type())
-GType gdk_window_state_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_WINDOW_STATE (gdk_window_state_get_type())
-GType gdk_setting_action_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_SETTING_ACTION (gdk_setting_action_get_type())
-GType gdk_owner_change_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_OWNER_CHANGE (gdk_owner_change_get_type())
-/* enumerations from "gdkfont.h" */
-GType gdk_font_type_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_FONT_TYPE (gdk_font_type_get_type())
-/* enumerations from "gdkgc.h" */
-GType gdk_cap_style_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_CAP_STYLE (gdk_cap_style_get_type())
-GType gdk_fill_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_FILL (gdk_fill_get_type())
-GType gdk_function_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_FUNCTION (gdk_function_get_type())
-GType gdk_join_style_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_JOIN_STYLE (gdk_join_style_get_type())
-GType gdk_line_style_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_LINE_STYLE (gdk_line_style_get_type())
-GType gdk_subwindow_mode_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_SUBWINDOW_MODE (gdk_subwindow_mode_get_type())
-GType gdk_gc_values_mask_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_GC_VALUES_MASK (gdk_gc_values_mask_get_type())
-/* enumerations from "gdkimage.h" */
-GType gdk_image_type_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_IMAGE_TYPE (gdk_image_type_get_type())
-/* enumerations from "gdkinput.h" */
-GType gdk_extension_mode_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_EXTENSION_MODE (gdk_extension_mode_get_type())
-GType gdk_input_source_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_INPUT_SOURCE (gdk_input_source_get_type())
-GType gdk_input_mode_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_INPUT_MODE (gdk_input_mode_get_type())
-GType gdk_axis_use_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_AXIS_USE (gdk_axis_use_get_type())
-/* enumerations from "gdkproperty.h" */
-GType gdk_prop_mode_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_PROP_MODE (gdk_prop_mode_get_type())
-/* enumerations from "gdkregion.h" */
-GType gdk_fill_rule_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_FILL_RULE (gdk_fill_rule_get_type())
-GType gdk_overlap_type_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_OVERLAP_TYPE (gdk_overlap_type_get_type())
-/* enumerations from "gdkrgb.h" */
-GType gdk_rgb_dither_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_RGB_DITHER (gdk_rgb_dither_get_type())
-/* enumerations from "gdktypes.h" */
-GType gdk_byte_order_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_BYTE_ORDER (gdk_byte_order_get_type())
-GType gdk_modifier_type_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_MODIFIER_TYPE (gdk_modifier_type_get_type())
-GType gdk_input_condition_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_INPUT_CONDITION (gdk_input_condition_get_type())
-GType gdk_status_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_STATUS (gdk_status_get_type())
-GType gdk_grab_status_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_GRAB_STATUS (gdk_grab_status_get_type())
-/* enumerations from "gdkvisual.h" */
-GType gdk_visual_type_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_VISUAL_TYPE (gdk_visual_type_get_type())
-/* enumerations from "gdkwindow.h" */
-GType gdk_window_class_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_WINDOW_CLASS (gdk_window_class_get_type())
-GType gdk_window_type_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_WINDOW_TYPE (gdk_window_type_get_type())
-GType gdk_window_attributes_type_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_WINDOW_ATTRIBUTES_TYPE (gdk_window_attributes_type_get_type())
-GType gdk_window_hints_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_WINDOW_HINTS (gdk_window_hints_get_type())
-GType gdk_window_type_hint_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_WINDOW_TYPE_HINT (gdk_window_type_hint_get_type())
-GType gdk_wm_decoration_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_WM_DECORATION (gdk_wm_decoration_get_type())
-GType gdk_wm_function_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_WM_FUNCTION (gdk_wm_function_get_type())
-GType gdk_gravity_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_GRAVITY (gdk_gravity_get_type())
-GType gdk_window_edge_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_WINDOW_EDGE (gdk_window_edge_get_type())
-G_END_DECLS
-
-#endif /* __GDK_ENUM_TYPES_H__ */
-
-/* Generated data ends here */
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkevents.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkevents.h
deleted file mode 100644
index 5a30e99a..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkevents.h
+++ /dev/null
@@ -1,555 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_EVENTS_H__
-#define __GDK_EVENTS_H__
-
-#include <gdk/gdkcolor.h>
-#include <gdk/gdktypes.h>
-#include <gdk/gdkdnd.h>
-#include <gdk/gdkinput.h>
-
-G_BEGIN_DECLS
-
-#define GDK_TYPE_EVENT          (gdk_event_get_type ())
-
-#define GDK_PRIORITY_EVENTS	(G_PRIORITY_DEFAULT)
-#define GDK_PRIORITY_REDRAW     (G_PRIORITY_HIGH_IDLE + 20)
-
-
-typedef struct _GdkEventAny	    GdkEventAny;
-typedef struct _GdkEventExpose	    GdkEventExpose;
-typedef struct _GdkEventNoExpose    GdkEventNoExpose;
-typedef struct _GdkEventVisibility  GdkEventVisibility;
-typedef struct _GdkEventMotion	    GdkEventMotion;
-typedef struct _GdkEventButton	    GdkEventButton;
-typedef struct _GdkEventScroll      GdkEventScroll;  
-typedef struct _GdkEventKey	    GdkEventKey;
-typedef struct _GdkEventFocus	    GdkEventFocus;
-typedef struct _GdkEventCrossing    GdkEventCrossing;
-typedef struct _GdkEventConfigure   GdkEventConfigure;
-typedef struct _GdkEventProperty    GdkEventProperty;
-typedef struct _GdkEventSelection   GdkEventSelection;
-typedef struct _GdkEventOwnerChange GdkEventOwnerChange;
-typedef struct _GdkEventProximity   GdkEventProximity;
-typedef struct _GdkEventClient	    GdkEventClient;
-typedef struct _GdkEventDND         GdkEventDND;
-typedef struct _GdkEventWindowState GdkEventWindowState;
-typedef struct _GdkEventSetting     GdkEventSetting;
-typedef struct _GdkEventGrabBroken  GdkEventGrabBroken;
-
-typedef union  _GdkEvent	    GdkEvent;
-
-typedef void (*GdkEventFunc) (GdkEvent *event,
-			      gpointer	data);
-
-/* Event filtering */
-
-typedef void GdkXEvent;	  /* Can be cast to window system specific
-			   * even type, XEvent on X11, MSG on Win32.
-			   */
-
-typedef enum {
-  GDK_FILTER_CONTINUE,	  /* Event not handled, continue processesing */
-  GDK_FILTER_TRANSLATE,	  /* Native event translated into a GDK event and
-                             stored in the "event" structure that was
-                             passed in */
-  GDK_FILTER_REMOVE	  /* Terminate processing, removing event */
-} GdkFilterReturn;
-
-typedef GdkFilterReturn (*GdkFilterFunc) (GdkXEvent *xevent,
-					  GdkEvent *event,
-					  gpointer  data);
-
-
-/* Event types.
- *   Nothing: No event occurred.
- *   Delete: A window delete event was sent by the window manager.
- *	     The specified window should be deleted.
- *   Destroy: A window has been destroyed.
- *   Expose: Part of a window has been uncovered.
- *   NoExpose: Same as expose, but no expose event was generated.
- *   VisibilityNotify: A window has become fully/partially/not obscured.
- *   MotionNotify: The mouse has moved.
- *   ButtonPress: A mouse button was pressed.
- *   ButtonRelease: A mouse button was release.
- *   KeyPress: A key was pressed.
- *   KeyRelease: A key was released.
- *   EnterNotify: A window was entered.
- *   LeaveNotify: A window was exited.
- *   FocusChange: The focus window has changed. (The focus window gets
- *		  keyboard events).
- *   Resize: A window has been resized.
- *   Map: A window has been mapped. (It is now visible on the screen).
- *   Unmap: A window has been unmapped. (It is no longer visible on
- *	    the screen).
- *   Scroll: A mouse wheel was scrolled either up or down.
- */
-typedef enum
-{
-  GDK_NOTHING		= -1,
-  GDK_DELETE		= 0,
-  GDK_DESTROY		= 1,
-  GDK_EXPOSE		= 2,
-  GDK_MOTION_NOTIFY	= 3,
-  GDK_BUTTON_PRESS	= 4,
-  GDK_2BUTTON_PRESS	= 5,
-  GDK_3BUTTON_PRESS	= 6,
-  GDK_BUTTON_RELEASE	= 7,
-  GDK_KEY_PRESS		= 8,
-  GDK_KEY_RELEASE	= 9,
-  GDK_ENTER_NOTIFY	= 10,
-  GDK_LEAVE_NOTIFY	= 11,
-  GDK_FOCUS_CHANGE	= 12,
-  GDK_CONFIGURE		= 13,
-  GDK_MAP		= 14,
-  GDK_UNMAP		= 15,
-  GDK_PROPERTY_NOTIFY	= 16,
-  GDK_SELECTION_CLEAR	= 17,
-  GDK_SELECTION_REQUEST = 18,
-  GDK_SELECTION_NOTIFY	= 19,
-  GDK_PROXIMITY_IN	= 20,
-  GDK_PROXIMITY_OUT	= 21,
-  GDK_DRAG_ENTER        = 22,
-  GDK_DRAG_LEAVE        = 23,
-  GDK_DRAG_MOTION       = 24,
-  GDK_DRAG_STATUS       = 25,
-  GDK_DROP_START        = 26,
-  GDK_DROP_FINISHED     = 27,
-  GDK_CLIENT_EVENT	= 28,
-  GDK_VISIBILITY_NOTIFY = 29,
-  GDK_NO_EXPOSE		= 30,
-  GDK_SCROLL            = 31,
-  GDK_WINDOW_STATE      = 32,
-  GDK_SETTING           = 33,
-  GDK_OWNER_CHANGE      = 34,
-  GDK_GRAB_BROKEN       = 35
-} GdkEventType;
-
-/* Event masks. (Used to select what types of events a window
- *  will receive).
- */
-typedef enum
-{
-  GDK_EXPOSURE_MASK		= 1 << 1,
-  GDK_POINTER_MOTION_MASK	= 1 << 2,
-  GDK_POINTER_MOTION_HINT_MASK	= 1 << 3,
-  GDK_BUTTON_MOTION_MASK	= 1 << 4,
-  GDK_BUTTON1_MOTION_MASK	= 1 << 5,
-  GDK_BUTTON2_MOTION_MASK	= 1 << 6,
-  GDK_BUTTON3_MOTION_MASK	= 1 << 7,
-  GDK_BUTTON_PRESS_MASK		= 1 << 8,
-  GDK_BUTTON_RELEASE_MASK	= 1 << 9,
-  GDK_KEY_PRESS_MASK		= 1 << 10,
-  GDK_KEY_RELEASE_MASK		= 1 << 11,
-  GDK_ENTER_NOTIFY_MASK		= 1 << 12,
-  GDK_LEAVE_NOTIFY_MASK		= 1 << 13,
-  GDK_FOCUS_CHANGE_MASK		= 1 << 14,
-  GDK_STRUCTURE_MASK		= 1 << 15,
-  GDK_PROPERTY_CHANGE_MASK	= 1 << 16,
-  GDK_VISIBILITY_NOTIFY_MASK	= 1 << 17,
-  GDK_PROXIMITY_IN_MASK		= 1 << 18,
-  GDK_PROXIMITY_OUT_MASK	= 1 << 19,
-  GDK_SUBSTRUCTURE_MASK		= 1 << 20,
-  GDK_SCROLL_MASK               = 1 << 21,
-  GDK_ALL_EVENTS_MASK		= 0x3FFFFE
-} GdkEventMask;
-
-typedef enum
-{
-  GDK_VISIBILITY_UNOBSCURED,
-  GDK_VISIBILITY_PARTIAL,
-  GDK_VISIBILITY_FULLY_OBSCURED
-} GdkVisibilityState;
-
-typedef enum
-{
-  GDK_SCROLL_UP,
-  GDK_SCROLL_DOWN,
-  GDK_SCROLL_LEFT,
-  GDK_SCROLL_RIGHT
-} GdkScrollDirection;
-
-/* Types of enter/leave notifications.
- *   Ancestor:
- *   Virtual:
- *   Inferior:
- *   Nonlinear:
- *   NonlinearVirtual:
- *   Unknown: An unknown type of enter/leave event occurred.
- */
-typedef enum
-{
-  GDK_NOTIFY_ANCESTOR		= 0,
-  GDK_NOTIFY_VIRTUAL		= 1,
-  GDK_NOTIFY_INFERIOR		= 2,
-  GDK_NOTIFY_NONLINEAR		= 3,
-  GDK_NOTIFY_NONLINEAR_VIRTUAL	= 4,
-  GDK_NOTIFY_UNKNOWN		= 5
-} GdkNotifyType;
-
-/* Enter/leave event modes.
- *   NotifyNormal
- *   NotifyGrab
- *   NotifyUngrab
- */
-typedef enum
-{
-  GDK_CROSSING_NORMAL,
-  GDK_CROSSING_GRAB,
-  GDK_CROSSING_UNGRAB
-} GdkCrossingMode;
-
-typedef enum
-{
-  GDK_PROPERTY_NEW_VALUE,
-  GDK_PROPERTY_DELETE
-} GdkPropertyState;
-
-typedef enum
-{
-  GDK_WINDOW_STATE_WITHDRAWN  = 1 << 0,
-  GDK_WINDOW_STATE_ICONIFIED  = 1 << 1,
-  GDK_WINDOW_STATE_MAXIMIZED  = 1 << 2,
-  GDK_WINDOW_STATE_STICKY     = 1 << 3,
-  GDK_WINDOW_STATE_FULLSCREEN = 1 << 4,
-  GDK_WINDOW_STATE_ABOVE      = 1 << 5,
-  GDK_WINDOW_STATE_BELOW      = 1 << 6
-} GdkWindowState;
-
-typedef enum
-{
-  GDK_SETTING_ACTION_NEW,
-  GDK_SETTING_ACTION_CHANGED,
-  GDK_SETTING_ACTION_DELETED
-} GdkSettingAction;
-
-typedef enum
-{
-  GDK_OWNER_CHANGE_NEW_OWNER,
-  GDK_OWNER_CHANGE_DESTROY,
-  GDK_OWNER_CHANGE_CLOSE
-} GdkOwnerChange;
-
-struct _GdkEventAny
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-};
-
-struct _GdkEventExpose
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  GdkRectangle area;
-  GdkRegion *region;
-  gint count; /* If non-zero, how many more events follow. */
-};
-
-struct _GdkEventNoExpose
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-};
-
-struct _GdkEventVisibility
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  GdkVisibilityState state;
-};
-
-struct _GdkEventMotion
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  guint32 time;
-  gdouble x;
-  gdouble y;
-  gdouble *axes;
-  guint state;
-  gint16 is_hint;
-  GdkDevice *device;
-  gdouble x_root, y_root;
-};
-
-struct _GdkEventButton
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  guint32 time;
-  gdouble x;
-  gdouble y;
-  gdouble *axes;
-  guint state;
-  guint button;
-  GdkDevice *device;
-  gdouble x_root, y_root;
-};
-
-struct _GdkEventScroll
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  guint32 time;
-  gdouble x;
-  gdouble y;
-  guint state;
-  GdkScrollDirection direction;
-  GdkDevice *device;
-  gdouble x_root, y_root;
-};
-
-struct _GdkEventKey
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  guint32 time;
-  guint state;
-  guint keyval;
-  gint length;
-  gchar *string;
-  guint16 hardware_keycode;
-  guint8 group;
-  guint is_modifier : 1;
-};
-
-struct _GdkEventCrossing
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  GdkWindow *subwindow;
-  guint32 time;
-  gdouble x;
-  gdouble y;
-  gdouble x_root;
-  gdouble y_root;
-  GdkCrossingMode mode;
-  GdkNotifyType detail;
-  gboolean focus;
-  guint state;
-};
-
-struct _GdkEventFocus
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  gint16 in;
-};
-
-struct _GdkEventConfigure
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  gint x, y;
-  gint width;
-  gint height;
-};
-
-struct _GdkEventProperty
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  GdkAtom atom;
-  guint32 time;
-  guint state;
-};
-
-struct _GdkEventSelection
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  GdkAtom selection;
-  GdkAtom target;
-  GdkAtom property;
-  guint32 time;
-  GdkNativeWindow requestor;
-};
-
-struct _GdkEventOwnerChange
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  GdkNativeWindow owner;
-  GdkOwnerChange reason;
-  GdkAtom selection;
-  guint32 time;
-  guint32 selection_time;
-};
-
-/* This event type will be used pretty rarely. It only is important
-   for XInput aware programs that are drawing their own cursor */
-
-struct _GdkEventProximity
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  guint32 time;
-  GdkDevice *device;
-};
-
-struct _GdkEventClient
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  GdkAtom message_type;
-  gushort data_format;
-  union {
-    char b[20];
-    short s[10];
-    long l[5];
-  } data;
-};
-
-struct _GdkEventSetting
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  GdkSettingAction action;
-  char *name;
-};
-
-struct _GdkEventWindowState
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  GdkWindowState changed_mask;
-  GdkWindowState new_window_state;
-};
-
-struct _GdkEventGrabBroken {
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  gboolean keyboard;
-  gboolean implicit;
-  GdkWindow *grab_window;
-};
-
-/* Event types for DND */
-
-struct _GdkEventDND {
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  GdkDragContext *context;
-
-  guint32 time;
-  gshort x_root, y_root;
-};
-
-union _GdkEvent
-{
-  GdkEventType		    type;
-  GdkEventAny		    any;
-  GdkEventExpose	    expose;
-  GdkEventNoExpose	    no_expose;
-  GdkEventVisibility	    visibility;
-  GdkEventMotion	    motion;
-  GdkEventButton	    button;
-  GdkEventScroll            scroll;
-  GdkEventKey		    key;
-  GdkEventCrossing	    crossing;
-  GdkEventFocus		    focus_change;
-  GdkEventConfigure	    configure;
-  GdkEventProperty	    property;
-  GdkEventSelection	    selection;
-  GdkEventOwnerChange  	    owner_change;
-  GdkEventProximity	    proximity;
-  GdkEventClient	    client;
-  GdkEventDND               dnd;
-  GdkEventWindowState       window_state;
-  GdkEventSetting           setting;
-  GdkEventGrabBroken        grab_broken;
-};
-
-GType     gdk_event_get_type            (void) G_GNUC_CONST;
-
-gboolean  gdk_events_pending	 	(void);
-GdkEvent* gdk_event_get			(void);
-
-GdkEvent* gdk_event_peek                (void);
-GdkEvent* gdk_event_get_graphics_expose (GdkWindow 	*window);
-void      gdk_event_put	 		(GdkEvent  	*event);
-
-GdkEvent* gdk_event_new                 (GdkEventType    type);
-GdkEvent* gdk_event_copy     		(GdkEvent 	*event);
-void	  gdk_event_free     		(GdkEvent 	*event);
-
-guint32   gdk_event_get_time            (GdkEvent        *event);
-gboolean  gdk_event_get_state           (GdkEvent        *event,
-                                         GdkModifierType *state);
-gboolean  gdk_event_get_coords		(GdkEvent	 *event,
-					 gdouble	 *x_win,
-					 gdouble	 *y_win);
-gboolean  gdk_event_get_root_coords	(GdkEvent	 *event,
-					 gdouble	 *x_root,
-					 gdouble	 *y_root);
-gboolean  gdk_event_get_axis            (GdkEvent        *event,
-                                         GdkAxisUse       axis_use,
-                                         gdouble         *value);
-void      gdk_event_request_motions     (GdkEventMotion  *event);
-void	  gdk_event_handler_set 	(GdkEventFunc    func,
-					 gpointer        data,
-					 GDestroyNotify  notify);
-
-void       gdk_event_set_screen (GdkEvent  *event,
-				 GdkScreen *screen);
-GdkScreen *gdk_event_get_screen (GdkEvent  *event);
-
-void	  gdk_set_show_events		(gboolean	 show_events);
-gboolean  gdk_get_show_events		(void);
-
-#ifndef GDK_MULTIHEAD_SAFE
-void gdk_add_client_message_filter (GdkAtom       message_type,
-				    GdkFilterFunc func,
-				    gpointer      data);
-
-gboolean gdk_setting_get (const gchar *name,
-			  GValue      *value); 
-#endif /* GDK_MULTIHEAD_SAFE */
-
-G_END_DECLS
-
-#endif /* __GDK_EVENTS_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkfont.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkfont.h
deleted file mode 100644
index 18061daa..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkfont.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#if !defined(GDK_DISABLE_DEPRECATED) || defined(GDK_COMPILATION) || defined(GTK_COMPILATION)
-
-#ifndef __GDK_FONT_H__
-#define __GDK_FONT_H__
-
-#include <gdk/gdktypes.h>
-#include <pango/pango-font.h>
-
-G_BEGIN_DECLS
-
-#define GDK_TYPE_FONT gdk_font_get_type ()
-
-/* Types of font.
- *   GDK_FONT_FONT: the font is an XFontStruct.
- *   GDK_FONT_FONTSET: the font is an XFontSet used for I18N.
- */
-typedef enum
-{
-  GDK_FONT_FONT,
-  GDK_FONT_FONTSET
-} GdkFontType;
-
-struct _GdkFont
-{
-  GdkFontType type;
-  gint ascent;
-  gint descent;
-};
-
-GType    gdk_font_get_type  (void) G_GNUC_CONST;
-
-GdkFont* gdk_font_ref	    (GdkFont        *font);
-void	 gdk_font_unref	    (GdkFont        *font);
-gint	 gdk_font_id	    (const GdkFont  *font);
-gboolean gdk_font_equal	    (const GdkFont  *fonta,
-			     const GdkFont  *fontb);
-
-GdkFont *gdk_font_load_for_display             (GdkDisplay           *display,
-						const gchar          *font_name);
-GdkFont *gdk_fontset_load_for_display          (GdkDisplay           *display,
-						const gchar          *fontset_name);
-GdkFont *gdk_font_from_description_for_display (GdkDisplay           *display,
-						PangoFontDescription *font_desc);
-
-#ifndef GDK_DISABLE_DEPRECATED
-
-#ifndef GDK_MULTIHEAD_SAFE
-GdkFont* gdk_font_load             (const gchar          *font_name);
-GdkFont* gdk_fontset_load          (const gchar          *fontset_name);
-GdkFont* gdk_font_from_description (PangoFontDescription *font_desc);
-#endif
-
-gint	 gdk_string_width   (GdkFont        *font,
-			     const gchar    *string);
-gint	 gdk_text_width	    (GdkFont        *font,
-			     const gchar    *text,
-			     gint            text_length);
-gint	 gdk_text_width_wc  (GdkFont        *font,
-			     const GdkWChar *text,
-			     gint            text_length);
-gint	 gdk_char_width	    (GdkFont        *font,
-			     gchar           character);
-gint	 gdk_char_width_wc  (GdkFont        *font,
-			     GdkWChar        character);
-gint	 gdk_string_measure (GdkFont        *font,
-			     const gchar    *string);
-gint	 gdk_text_measure   (GdkFont        *font,
-			     const gchar    *text,
-			     gint            text_length);
-gint	 gdk_char_measure   (GdkFont        *font,
-			     gchar           character);
-gint	 gdk_string_height  (GdkFont        *font,
-			     const gchar    *string);
-gint	 gdk_text_height    (GdkFont        *font,
-			     const gchar    *text,
-			     gint            text_length);
-gint	 gdk_char_height    (GdkFont        *font,
-			     gchar           character);
-
-void     gdk_text_extents   (GdkFont     *font,
-			     const gchar *text,
-			     gint         text_length,
-			     gint        *lbearing,
-			     gint        *rbearing,
-			     gint        *width,
-			     gint        *ascent,
-			     gint        *descent);
-void    gdk_text_extents_wc (GdkFont        *font,
-			     const GdkWChar *text,
-			     gint            text_length,
-			     gint           *lbearing,
-			     gint           *rbearing,
-			     gint           *width,
-			     gint           *ascent,
-			     gint           *descent);
-void     gdk_string_extents (GdkFont     *font,
-			     const gchar *string,
-			     gint        *lbearing,
-			     gint        *rbearing,
-			     gint        *width,
-			     gint        *ascent,
-			     gint        *descent);
-
-GdkDisplay * gdk_font_get_display (GdkFont *font);
-
-#endif /* GDK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GDK_FONT_H__ */
-
-#endif /* !GDK_DISABLE_DEPRECATED || GDK_COMPILATION || GTK_COMPILATION */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkgc.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkgc.h
deleted file mode 100644
index 779735c0..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkgc.h
+++ /dev/null
@@ -1,298 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_GC_H__
-#define __GDK_GC_H__
-
-#include <gdk/gdkcolor.h>
-#include <gdk/gdktypes.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GdkGCValues	      GdkGCValues;
-typedef struct _GdkGCClass	      GdkGCClass;
-
-/* GC cap styles
- *  CapNotLast:
- *  CapButt:
- *  CapRound:
- *  CapProjecting:
- */
-typedef enum
-{
-  GDK_CAP_NOT_LAST,
-  GDK_CAP_BUTT,
-  GDK_CAP_ROUND,
-  GDK_CAP_PROJECTING
-} GdkCapStyle;
-
-/* GC fill types.
- *  Solid:
- *  Tiled:
- *  Stippled:
- *  OpaqueStippled:
- */
-typedef enum
-{
-  GDK_SOLID,
-  GDK_TILED,
-  GDK_STIPPLED,
-  GDK_OPAQUE_STIPPLED
-} GdkFill;
-
-/* GC function types.
- *   Copy: Overwrites destination pixels with the source pixels.
- *   Invert: Inverts the destination pixels.
- *   Xor: Xor's the destination pixels with the source pixels.
- *   Clear: set pixels to 0
- *   And: source AND destination
- *   And Reverse: source AND (NOT destination)
- *   And Invert: (NOT source) AND destination
- *   Noop: destination
- *   Or: source OR destination
- *   Nor: (NOT source) AND (NOT destination)
- *   Equiv: (NOT source) XOR destination
- *   Xor Reverse: source OR (NOT destination)
- *   Copy Inverted: NOT source
- *   Xor Inverted: (NOT source) OR destination
- *   Nand: (NOT source) OR (NOT destination)
- *   Set: set pixels to 1
- */
-typedef enum
-{
-  GDK_COPY,
-  GDK_INVERT,
-  GDK_XOR,
-  GDK_CLEAR,
-  GDK_AND,
-  GDK_AND_REVERSE,
-  GDK_AND_INVERT,
-  GDK_NOOP,
-  GDK_OR,
-  GDK_EQUIV,
-  GDK_OR_REVERSE,
-  GDK_COPY_INVERT,
-  GDK_OR_INVERT,
-  GDK_NAND,
-  GDK_NOR,
-  GDK_SET
-} GdkFunction;
-
-/* GC join styles
- *  JoinMiter:
- *  JoinRound:
- *  JoinBevel:
- */
-typedef enum
-{
-  GDK_JOIN_MITER,
-  GDK_JOIN_ROUND,
-  GDK_JOIN_BEVEL
-} GdkJoinStyle;
-
-/* GC line styles
- *  Solid:
- *  OnOffDash:
- *  DoubleDash:
- */
-typedef enum
-{
-  GDK_LINE_SOLID,
-  GDK_LINE_ON_OFF_DASH,
-  GDK_LINE_DOUBLE_DASH
-} GdkLineStyle;
-
-typedef enum
-{
-  GDK_CLIP_BY_CHILDREN	= 0,
-  GDK_INCLUDE_INFERIORS = 1
-} GdkSubwindowMode;
-
-typedef enum
-{
-  GDK_GC_FOREGROUND    = 1 << 0,
-  GDK_GC_BACKGROUND    = 1 << 1,
-  GDK_GC_FONT	       = 1 << 2,
-  GDK_GC_FUNCTION      = 1 << 3,
-  GDK_GC_FILL	       = 1 << 4,
-  GDK_GC_TILE	       = 1 << 5,
-  GDK_GC_STIPPLE       = 1 << 6,
-  GDK_GC_CLIP_MASK     = 1 << 7,
-  GDK_GC_SUBWINDOW     = 1 << 8,
-  GDK_GC_TS_X_ORIGIN   = 1 << 9,
-  GDK_GC_TS_Y_ORIGIN   = 1 << 10,
-  GDK_GC_CLIP_X_ORIGIN = 1 << 11,
-  GDK_GC_CLIP_Y_ORIGIN = 1 << 12,
-  GDK_GC_EXPOSURES     = 1 << 13,
-  GDK_GC_LINE_WIDTH    = 1 << 14,
-  GDK_GC_LINE_STYLE    = 1 << 15,
-  GDK_GC_CAP_STYLE     = 1 << 16,
-  GDK_GC_JOIN_STYLE    = 1 << 17
-} GdkGCValuesMask;
-
-struct _GdkGCValues
-{
-  GdkColor	    foreground;
-  GdkColor	    background;
-  GdkFont	   *font;
-  GdkFunction	    function;
-  GdkFill	    fill;
-  GdkPixmap	   *tile;
-  GdkPixmap	   *stipple;
-  GdkPixmap	   *clip_mask;
-  GdkSubwindowMode  subwindow_mode;
-  gint		    ts_x_origin;
-  gint		    ts_y_origin;
-  gint		    clip_x_origin;
-  gint		    clip_y_origin;
-  gint		    graphics_exposures;
-  gint		    line_width;
-  GdkLineStyle	    line_style;
-  GdkCapStyle	    cap_style;
-  GdkJoinStyle	    join_style;
-};
-
-#define GDK_TYPE_GC              (gdk_gc_get_type ())
-#define GDK_GC(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_GC, GdkGC))
-#define GDK_GC_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_GC, GdkGCClass))
-#define GDK_IS_GC(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_GC))
-#define GDK_IS_GC_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_GC))
-#define GDK_GC_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_GC, GdkGCClass))
-
-struct _GdkGC
-{
-  GObject parent_instance;
-
-  gint clip_x_origin;
-  gint clip_y_origin;
-  gint ts_x_origin;
-  gint ts_y_origin;
-
-  GdkColormap *colormap;
-};
-
-struct _GdkGCClass 
-{
-  GObjectClass parent_class;
-  
-  void (*get_values)     (GdkGC          *gc,
-			  GdkGCValues    *values);
-  void (*set_values)     (GdkGC          *gc,
-			  GdkGCValues    *values,
-			  GdkGCValuesMask mask);
-  void (*set_dashes)     (GdkGC          *gc,
-			  gint	          dash_offset,
-			  gint8           dash_list[],
-			  gint            n);
-  
-  /* Padding for future expansion */
-  void         (*_gdk_reserved1)  (void);
-  void         (*_gdk_reserved2)  (void);
-  void         (*_gdk_reserved3)  (void);
-  void         (*_gdk_reserved4)  (void);
-};
-
-
-GType  gdk_gc_get_type            (void) G_GNUC_CONST;
-GdkGC *gdk_gc_new		  (GdkDrawable	    *drawable);
-GdkGC *gdk_gc_new_with_values	  (GdkDrawable	    *drawable,
-				   GdkGCValues	    *values,
-				   GdkGCValuesMask   values_mask);
-
-#ifndef GDK_DISABLE_DEPRECATED
-GdkGC *gdk_gc_ref		  (GdkGC	    *gc);
-void   gdk_gc_unref		  (GdkGC	    *gc);
-#endif
-
-void   gdk_gc_get_values	  (GdkGC	    *gc,
-				   GdkGCValues	    *values);
-void   gdk_gc_set_values          (GdkGC           *gc,
-                                   GdkGCValues	   *values,
-                                   GdkGCValuesMask  values_mask);
-void   gdk_gc_set_foreground	  (GdkGC	    *gc,
-				   const GdkColor   *color);
-void   gdk_gc_set_background	  (GdkGC	    *gc,
-				   const GdkColor   *color);
-#ifndef GDK_DISABLE_DEPRECATED
-void   gdk_gc_set_font		  (GdkGC	    *gc,
-				   GdkFont	    *font);
-#endif /* GDK_DISABLE_DEPRECATED */
-void   gdk_gc_set_function	  (GdkGC	    *gc,
-				   GdkFunction	     function);
-void   gdk_gc_set_fill		  (GdkGC	    *gc,
-				   GdkFill	     fill);
-void   gdk_gc_set_tile		  (GdkGC	    *gc,
-				   GdkPixmap	    *tile);
-void   gdk_gc_set_stipple	  (GdkGC	    *gc,
-				   GdkPixmap	    *stipple);
-void   gdk_gc_set_ts_origin	  (GdkGC	    *gc,
-				   gint		     x,
-				   gint		     y);
-void   gdk_gc_set_clip_origin	  (GdkGC	    *gc,
-				   gint		     x,
-				   gint		     y);
-void   gdk_gc_set_clip_mask	  (GdkGC	    *gc,
-				   GdkBitmap	    *mask);
-void   gdk_gc_set_clip_rectangle  (GdkGC	    *gc,
-				   GdkRectangle	    *rectangle);
-void   gdk_gc_set_clip_region	  (GdkGC	    *gc,
-				   GdkRegion	    *region);
-void   gdk_gc_set_subwindow	  (GdkGC	    *gc,
-				   GdkSubwindowMode  mode);
-void   gdk_gc_set_exposures	  (GdkGC	    *gc,
-				   gboolean	     exposures);
-void   gdk_gc_set_line_attributes (GdkGC	    *gc,
-				   gint		     line_width,
-				   GdkLineStyle	     line_style,
-				   GdkCapStyle	     cap_style,
-				   GdkJoinStyle	     join_style);
-void   gdk_gc_set_dashes          (GdkGC            *gc,
-				   gint	             dash_offset,
-				   gint8             dash_list[],
-				   gint              n);
-void   gdk_gc_offset              (GdkGC            *gc,
-				   gint              x_offset,
-				   gint              y_offset);
-void   gdk_gc_copy		  (GdkGC	    *dst_gc,
-				   GdkGC	    *src_gc);
-
-
-void         gdk_gc_set_colormap     (GdkGC          *gc,
-				      GdkColormap    *colormap);
-GdkColormap *gdk_gc_get_colormap     (GdkGC          *gc);
-void         gdk_gc_set_rgb_fg_color (GdkGC          *gc,
-				      const GdkColor *color);
-void         gdk_gc_set_rgb_bg_color (GdkGC          *gc,
-				      const GdkColor *color);
-GdkScreen *  gdk_gc_get_screen	     (GdkGC          *gc);
-
-#ifndef GDK_DISABLE_DEPRECATED
-#define gdk_gc_destroy                 gdk_gc_unref
-#endif /* GDK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GDK_DRAWABLE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdki18n.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdki18n.h
deleted file mode 100644
index 9e70be0b..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdki18n.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_I18N_H__
-#define __GDK_I18N_H__
-
-#ifndef GDK_DISABLE_DEPRECATED
-
-/* GDK uses "glib". (And so does GTK).
- */
-#include <glib.h>
-#include <gdkconfig.h>
-
-/* international string support */
-
-#include <stdlib.h>
-
-#if !defined(GDK_HAVE_BROKEN_WCTYPE) && (defined(GDK_HAVE_WCTYPE_H) || defined(GDK_HAVE_WCHAR_H)) && !defined(X_LOCALE)
-#  ifdef GDK_HAVE_WCTYPE_H
-#    include <wctype.h>
-#  else
-#    ifdef GDK_HAVE_WCHAR_H
-#      include <wchar.h>
-#    endif
-#  endif
-#  define gdk_iswalnum(c) iswalnum(c)
-#  define gdk_iswspace(c) iswspace(c)
-#else
-#  include <ctype.h>
-#  define gdk_iswalnum(c) ((wchar_t)(c) <= 0xFF && isalnum(c))
-#  define gdk_iswspace(c) ((wchar_t)(c) <= 0xFF && isspace(c))
-#endif
-
-#endif /* GDK_DISABLE_DEPRECATED */
-
-#endif /* __GDK_I18N_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkimage.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkimage.h
deleted file mode 100644
index 5b8303be..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkimage.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_IMAGE_H__
-#define __GDK_IMAGE_H__
-
-#include <gdk/gdktypes.h>
-
-G_BEGIN_DECLS
-
-/* Types of images.
- *   Normal: Normal X image type. These are slow as they involve passing
- *	     the entire image through the X connection each time a draw
- *	     request is required. On Win32, a bitmap.
- *   Shared: Shared memory X image type. These are fast as the X server
- *	     and the program actually use the same piece of memory. They
- *	     should be used with care though as there is the possibility
- *	     for both the X server and the program to be reading/writing
- *	     the image simultaneously and producing undesired results.
- *	     On Win32, also a bitmap.
- */
-typedef enum
-{
-  GDK_IMAGE_NORMAL,
-  GDK_IMAGE_SHARED,
-  GDK_IMAGE_FASTEST
-} GdkImageType;
-
-typedef struct _GdkImageClass GdkImageClass;
-
-#define GDK_TYPE_IMAGE              (gdk_image_get_type ())
-#define GDK_IMAGE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_IMAGE, GdkImage))
-#define GDK_IMAGE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_IMAGE, GdkImageClass))
-#define GDK_IS_IMAGE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_IMAGE))
-#define GDK_IS_IMAGE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_IMAGE))
-#define GDK_IMAGE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_IMAGE, GdkImageClass))
-
-struct _GdkImage
-{
-  GObject parent_instance;
-
-  /*< public >*/
-  
-  GdkImageType	type; /* read only. */
-  GdkVisual    *visual;	    /* read only. visual used to create the image */
-  GdkByteOrder	byte_order; /* read only. */
-  gint		width; /* read only. */
-  gint		height; /* read only. */
-  guint16	depth; /* read only. */
-  guint16	bpp;	        /* read only. bytes per pixel */
-  guint16	bpl;	        /* read only. bytes per line */
-  guint16       bits_per_pixel; /* read only. bits per pixel */
-  gpointer	mem;
-
-  GdkColormap  *colormap; /* read only. */
-
-  /*< private >*/
-  gpointer windowing_data; /* read only. */
-};
-
-struct _GdkImageClass
-{
-  GObjectClass parent_class;
-};
-
-GType     gdk_image_get_type   (void) G_GNUC_CONST;
-
-GdkImage*  gdk_image_new       (GdkImageType  type,
-				GdkVisual    *visual,
-				gint	      width,
-				gint	      height);
-
-#ifndef GDK_DISABLE_DEPRECATED
-GdkImage*  gdk_image_get       (GdkDrawable  *drawable,
-				gint	      x,
-				gint	      y,
-				gint	      width,
-				gint	      height);
-
-GdkImage * gdk_image_ref       (GdkImage     *image);
-void       gdk_image_unref     (GdkImage     *image);
-#endif
-
-void	   gdk_image_put_pixel (GdkImage     *image,
-				gint	      x,
-				gint	      y,
-				guint32	      pixel);
-guint32	   gdk_image_get_pixel (GdkImage     *image,
-				gint	      x,
-				gint	      y);
-
-void       gdk_image_set_colormap (GdkImage    *image,
-                                   GdkColormap *colormap);
-GdkColormap* gdk_image_get_colormap (GdkImage    *image);
-
-
-#ifdef GDK_ENABLE_BROKEN
-GdkImage* gdk_image_new_bitmap (GdkVisual     *visual,
-				gpointer      data,
-				gint          width,
-				gint          height);
-#endif /* GDK_ENABLE_BROKEN */
-
-#ifndef GDK_DISABLE_DEPRECATED
-#define gdk_image_destroy              gdk_image_unref
-#endif /* GDK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GDK_IMAGE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkinput.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkinput.h
deleted file mode 100644
index d5fe003d..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkinput.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_INPUT_H__
-#define __GDK_INPUT_H__
-
-#include <gdk/gdktypes.h>
-
-G_BEGIN_DECLS
-
-#define GDK_TYPE_DEVICE              (gdk_device_get_type ())
-#define GDK_DEVICE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DEVICE, GdkDevice))
-#define GDK_DEVICE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DEVICE, GdkDeviceClass))
-#define GDK_IS_DEVICE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DEVICE))
-#define GDK_IS_DEVICE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_DEVICE))
-#define GDK_DEVICE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_DEVICE, GdkDeviceClass))
-
-typedef struct _GdkDeviceKey	    GdkDeviceKey;
-typedef struct _GdkDeviceAxis	    GdkDeviceAxis;
-typedef struct _GdkDevice	    GdkDevice;
-typedef struct _GdkDeviceClass	    GdkDeviceClass;
-typedef struct _GdkTimeCoord	    GdkTimeCoord;
-
-typedef enum
-{
-  GDK_EXTENSION_EVENTS_NONE,
-  GDK_EXTENSION_EVENTS_ALL,
-  GDK_EXTENSION_EVENTS_CURSOR
-} GdkExtensionMode;
-
-typedef enum
-{
-  GDK_SOURCE_MOUSE,
-  GDK_SOURCE_PEN,
-  GDK_SOURCE_ERASER,
-  GDK_SOURCE_CURSOR
-} GdkInputSource;
-
-typedef enum
-{
-  GDK_MODE_DISABLED,
-  GDK_MODE_SCREEN,
-  GDK_MODE_WINDOW
-} GdkInputMode;
-
-typedef enum
-{
-  GDK_AXIS_IGNORE,
-  GDK_AXIS_X,
-  GDK_AXIS_Y,
-  GDK_AXIS_PRESSURE,
-  GDK_AXIS_XTILT,
-  GDK_AXIS_YTILT,
-  GDK_AXIS_WHEEL,
-  GDK_AXIS_LAST
-} GdkAxisUse;
-
-struct _GdkDeviceKey
-{
-  guint keyval;
-  GdkModifierType modifiers;
-};
-
-struct _GdkDeviceAxis
-{
-  GdkAxisUse use;
-  gdouble    min;
-  gdouble    max;
-};
-
-struct _GdkDevice
-{
-  GObject parent_instance;
-  /* All fields are read-only */
-	  
-  gchar *name;
-  GdkInputSource source;
-  GdkInputMode mode;
-  gboolean has_cursor;	     /* TRUE if the X pointer follows device motion */
-	  
-  gint num_axes;
-  GdkDeviceAxis *axes;
-	  
-  gint num_keys;
-  GdkDeviceKey *keys;
-};
-
-/* We don't allocate each coordinate this big, but we use it to
- * be ANSI compliant and avoid accessing past the defined limits.
- */
-#define GDK_MAX_TIMECOORD_AXES 128
-
-struct _GdkTimeCoord
-{
-  guint32 time;
-  gdouble axes[GDK_MAX_TIMECOORD_AXES];
-};
-
-GType          gdk_device_get_type      (void) G_GNUC_CONST;
-
-#ifndef GDK_MULTIHEAD_SAFE
-/* Returns a list of GdkDevice * */	  
-GList *        gdk_devices_list              (void);
-#endif /* GDK_MULTIHEAD_SAFE */
-
-/* Functions to configure a device */
-void           gdk_device_set_source    (GdkDevice      *device,
-					 GdkInputSource  source);
-	  
-gboolean       gdk_device_set_mode      (GdkDevice      *device,
-					 GdkInputMode    mode);
-
-void           gdk_device_set_key       (GdkDevice      *device,
-					 guint           index_,
-					 guint           keyval,
-					 GdkModifierType modifiers);
-
-void     gdk_device_set_axis_use (GdkDevice         *device,
-				  guint              index_,
-				  GdkAxisUse         use);
-void     gdk_device_get_state    (GdkDevice         *device,
-				  GdkWindow         *window,
-				  gdouble           *axes,
-				  GdkModifierType   *mask);
-gboolean gdk_device_get_history  (GdkDevice         *device,
-				  GdkWindow         *window,
-				  guint32            start,
-				  guint32            stop,
-				  GdkTimeCoord    ***events,
-				  gint              *n_events);
-void     gdk_device_free_history (GdkTimeCoord     **events,
-				  gint               n_events);
-gboolean gdk_device_get_axis     (GdkDevice         *device,
-				  gdouble           *axes,
-				  GdkAxisUse         use,
-				  gdouble           *value);
-
-void gdk_input_set_extension_events (GdkWindow        *window,
-				     gint              mask,
-				     GdkExtensionMode  mode);
-
-#ifndef GDK_MULTIHEAD_SAFE
-GdkDevice *gdk_device_get_core_pointer (void);
-#endif
- 
-G_END_DECLS
-
-#endif /* __GDK_INPUT_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkkeys.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkkeys.h
deleted file mode 100644
index fda2997e..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkkeys.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __GDK_KEYS_H__
-#define __GDK_KEYS_H__
-
-#include <gdk/gdktypes.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GdkKeymapKey GdkKeymapKey;
-
-/* GdkKeymapKey is a hardware key that can be mapped to a keyval */
-struct _GdkKeymapKey
-{
-  guint keycode;
-  gint  group;
-  gint  level;
-};
-
-/* A GdkKeymap defines the translation from keyboard state
- * (including a hardware key, a modifier mask, and active keyboard group)
- * to a keyval. This translation has two phases. The first phase is
- * to determine the effective keyboard group and level for the keyboard
- * state; the second phase is to look up the keycode/group/level triplet
- * in the keymap and see what keyval it corresponds to.
- */
-
-typedef struct _GdkKeymap      GdkKeymap;
-typedef struct _GdkKeymapClass GdkKeymapClass;
-
-#define GDK_TYPE_KEYMAP              (gdk_keymap_get_type ())
-#define GDK_KEYMAP(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_KEYMAP, GdkKeymap))
-#define GDK_KEYMAP_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_KEYMAP, GdkKeymapClass))
-#define GDK_IS_KEYMAP(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_KEYMAP))
-#define GDK_IS_KEYMAP_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_KEYMAP))
-#define GDK_KEYMAP_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_KEYMAP, GdkKeymapClass))
-
-struct _GdkKeymap
-{
-  GObject     parent_instance;
-  GdkDisplay *display;
-};
-
-struct _GdkKeymapClass
-{
-  GObjectClass parent_class;
-
-  void (*direction_changed) (GdkKeymap *keymap);
-  void (*keys_changed)      (GdkKeymap *keymap);
-};
-
-GType gdk_keymap_get_type (void) G_GNUC_CONST;
-
-#ifndef GDK_MULTIHEAD_SAFE
-GdkKeymap* gdk_keymap_get_default     (void);
-#endif
-GdkKeymap* gdk_keymap_get_for_display (GdkDisplay *display);
-
-
-guint          gdk_keymap_lookup_key               (GdkKeymap           *keymap,
-						    const GdkKeymapKey  *key);
-gboolean       gdk_keymap_translate_keyboard_state (GdkKeymap           *keymap,
-						    guint                hardware_keycode,
-						    GdkModifierType      state,
-						    gint                 group,
-						    guint               *keyval,
-						    gint                *effective_group,
-						    gint                *level,
-						    GdkModifierType     *consumed_modifiers);
-gboolean       gdk_keymap_get_entries_for_keyval   (GdkKeymap           *keymap,
-						    guint                keyval,
-						    GdkKeymapKey       **keys,
-						    gint                *n_keys);
-gboolean       gdk_keymap_get_entries_for_keycode  (GdkKeymap           *keymap,
-						    guint                hardware_keycode,
-						    GdkKeymapKey       **keys,
-						    guint              **keyvals,
-						    gint                *n_entries);
-PangoDirection gdk_keymap_get_direction            (GdkKeymap           *keymap);
-gboolean       gdk_keymap_have_bidi_layouts        (GdkKeymap           *keymap);
-
-/* Key values
- */
-gchar*   gdk_keyval_name         (guint        keyval) G_GNUC_CONST;
-guint    gdk_keyval_from_name    (const gchar *keyval_name);
-void     gdk_keyval_convert_case (guint        symbol,
-				  guint       *lower,
-				  guint       *upper);
-guint    gdk_keyval_to_upper     (guint        keyval) G_GNUC_CONST;
-guint    gdk_keyval_to_lower     (guint        keyval) G_GNUC_CONST;
-gboolean gdk_keyval_is_upper     (guint        keyval) G_GNUC_CONST;
-gboolean gdk_keyval_is_lower     (guint        keyval) G_GNUC_CONST;
-
-guint32  gdk_keyval_to_unicode   (guint        keyval) G_GNUC_CONST;
-guint    gdk_unicode_to_keyval   (guint32      wc) G_GNUC_CONST;
-
-
-G_END_DECLS
-
-#endif /* __GDK_KEYS_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkkeysyms.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkkeysyms.h
deleted file mode 100644
index e642e72a..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkkeysyms.h
+++ /dev/null
@@ -1,1747 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- * Copyright (C) 2005 GNOME Foundation
- *
- * 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.
- */
-
-/*
- * File auto-generated from script gdkkeysyms-update.pl
- * using the input file
- * http://cvs.freedesktop.org/xorg/xc/include/keysymdef.h
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2001.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __GDK_KEYSYMS_H__
-#define __GDK_KEYSYMS_H__
-
-
-#define GDK_VoidSymbol 0xffffff
-#define GDK_BackSpace 0xff08
-#define GDK_Tab 0xff09
-#define GDK_Linefeed 0xff0a
-#define GDK_Clear 0xff0b
-#define GDK_Return 0xff0d
-#define GDK_Pause 0xff13
-#define GDK_Scroll_Lock 0xff14
-#define GDK_Sys_Req 0xff15
-#define GDK_Escape 0xff1b
-#define GDK_Delete 0xffff
-#define GDK_Multi_key 0xff20
-#define GDK_Codeinput 0xff37
-#define GDK_SingleCandidate 0xff3c
-#define GDK_MultipleCandidate 0xff3d
-#define GDK_PreviousCandidate 0xff3e
-#define GDK_Kanji 0xff21
-#define GDK_Muhenkan 0xff22
-#define GDK_Henkan_Mode 0xff23
-#define GDK_Henkan 0xff23
-#define GDK_Romaji 0xff24
-#define GDK_Hiragana 0xff25
-#define GDK_Katakana 0xff26
-#define GDK_Hiragana_Katakana 0xff27
-#define GDK_Zenkaku 0xff28
-#define GDK_Hankaku 0xff29
-#define GDK_Zenkaku_Hankaku 0xff2a
-#define GDK_Touroku 0xff2b
-#define GDK_Massyo 0xff2c
-#define GDK_Kana_Lock 0xff2d
-#define GDK_Kana_Shift 0xff2e
-#define GDK_Eisu_Shift 0xff2f
-#define GDK_Eisu_toggle 0xff30
-#define GDK_Kanji_Bangou 0xff37
-#define GDK_Zen_Koho 0xff3d
-#define GDK_Mae_Koho 0xff3e
-#define GDK_Home 0xff50
-#define GDK_Left 0xff51
-#define GDK_Up 0xff52
-#define GDK_Right 0xff53
-#define GDK_Down 0xff54
-#define GDK_Prior 0xff55
-#define GDK_Page_Up 0xff55
-#define GDK_Next 0xff56
-#define GDK_Page_Down 0xff56
-#define GDK_End 0xff57
-#define GDK_Begin 0xff58
-#define GDK_Select 0xff60
-#define GDK_Print 0xff61
-#define GDK_Execute 0xff62
-#define GDK_Insert 0xff63
-#define GDK_Undo 0xff65
-#define GDK_Redo 0xff66
-#define GDK_Menu 0xff67
-#define GDK_Find 0xff68
-#define GDK_Cancel 0xff69
-#define GDK_Help 0xff6a
-#define GDK_Break 0xff6b
-#define GDK_Mode_switch 0xff7e
-#define GDK_script_switch 0xff7e
-#define GDK_Num_Lock 0xff7f
-#define GDK_KP_Space 0xff80
-#define GDK_KP_Tab 0xff89
-#define GDK_KP_Enter 0xff8d
-#define GDK_KP_F1 0xff91
-#define GDK_KP_F2 0xff92
-#define GDK_KP_F3 0xff93
-#define GDK_KP_F4 0xff94
-#define GDK_KP_Home 0xff95
-#define GDK_KP_Left 0xff96
-#define GDK_KP_Up 0xff97
-#define GDK_KP_Right 0xff98
-#define GDK_KP_Down 0xff99
-#define GDK_KP_Prior 0xff9a
-#define GDK_KP_Page_Up 0xff9a
-#define GDK_KP_Next 0xff9b
-#define GDK_KP_Page_Down 0xff9b
-#define GDK_KP_End 0xff9c
-#define GDK_KP_Begin 0xff9d
-#define GDK_KP_Insert 0xff9e
-#define GDK_KP_Delete 0xff9f
-#define GDK_KP_Equal 0xffbd
-#define GDK_KP_Multiply 0xffaa
-#define GDK_KP_Add 0xffab
-#define GDK_KP_Separator 0xffac
-#define GDK_KP_Subtract 0xffad
-#define GDK_KP_Decimal 0xffae
-#define GDK_KP_Divide 0xffaf
-#define GDK_KP_0 0xffb0
-#define GDK_KP_1 0xffb1
-#define GDK_KP_2 0xffb2
-#define GDK_KP_3 0xffb3
-#define GDK_KP_4 0xffb4
-#define GDK_KP_5 0xffb5
-#define GDK_KP_6 0xffb6
-#define GDK_KP_7 0xffb7
-#define GDK_KP_8 0xffb8
-#define GDK_KP_9 0xffb9
-#define GDK_F1 0xffbe
-#define GDK_F2 0xffbf
-#define GDK_F3 0xffc0
-#define GDK_F4 0xffc1
-#define GDK_F5 0xffc2
-#define GDK_F6 0xffc3
-#define GDK_F7 0xffc4
-#define GDK_F8 0xffc5
-#define GDK_F9 0xffc6
-#define GDK_F10 0xffc7
-#define GDK_F11 0xffc8
-#define GDK_L1 0xffc8
-#define GDK_F12 0xffc9
-#define GDK_L2 0xffc9
-#define GDK_F13 0xffca
-#define GDK_L3 0xffca
-#define GDK_F14 0xffcb
-#define GDK_L4 0xffcb
-#define GDK_F15 0xffcc
-#define GDK_L5 0xffcc
-#define GDK_F16 0xffcd
-#define GDK_L6 0xffcd
-#define GDK_F17 0xffce
-#define GDK_L7 0xffce
-#define GDK_F18 0xffcf
-#define GDK_L8 0xffcf
-#define GDK_F19 0xffd0
-#define GDK_L9 0xffd0
-#define GDK_F20 0xffd1
-#define GDK_L10 0xffd1
-#define GDK_F21 0xffd2
-#define GDK_R1 0xffd2
-#define GDK_F22 0xffd3
-#define GDK_R2 0xffd3
-#define GDK_F23 0xffd4
-#define GDK_R3 0xffd4
-#define GDK_F24 0xffd5
-#define GDK_R4 0xffd5
-#define GDK_F25 0xffd6
-#define GDK_R5 0xffd6
-#define GDK_F26 0xffd7
-#define GDK_R6 0xffd7
-#define GDK_F27 0xffd8
-#define GDK_R7 0xffd8
-#define GDK_F28 0xffd9
-#define GDK_R8 0xffd9
-#define GDK_F29 0xffda
-#define GDK_R9 0xffda
-#define GDK_F30 0xffdb
-#define GDK_R10 0xffdb
-#define GDK_F31 0xffdc
-#define GDK_R11 0xffdc
-#define GDK_F32 0xffdd
-#define GDK_R12 0xffdd
-#define GDK_F33 0xffde
-#define GDK_R13 0xffde
-#define GDK_F34 0xffdf
-#define GDK_R14 0xffdf
-#define GDK_F35 0xffe0
-#define GDK_R15 0xffe0
-#define GDK_Shift_L 0xffe1
-#define GDK_Shift_R 0xffe2
-#define GDK_Control_L 0xffe3
-#define GDK_Control_R 0xffe4
-#define GDK_Caps_Lock 0xffe5
-#define GDK_Shift_Lock 0xffe6
-#define GDK_Meta_L 0xffe7
-#define GDK_Meta_R 0xffe8
-#define GDK_Alt_L 0xffe9
-#define GDK_Alt_R 0xffea
-#define GDK_Super_L 0xffeb
-#define GDK_Super_R 0xffec
-#define GDK_Hyper_L 0xffed
-#define GDK_Hyper_R 0xffee
-#define GDK_ISO_Lock 0xfe01
-#define GDK_ISO_Level2_Latch 0xfe02
-#define GDK_ISO_Level3_Shift 0xfe03
-#define GDK_ISO_Level3_Latch 0xfe04
-#define GDK_ISO_Level3_Lock 0xfe05
-#define GDK_ISO_Group_Shift 0xff7e
-#define GDK_ISO_Group_Latch 0xfe06
-#define GDK_ISO_Group_Lock 0xfe07
-#define GDK_ISO_Next_Group 0xfe08
-#define GDK_ISO_Next_Group_Lock 0xfe09
-#define GDK_ISO_Prev_Group 0xfe0a
-#define GDK_ISO_Prev_Group_Lock 0xfe0b
-#define GDK_ISO_First_Group 0xfe0c
-#define GDK_ISO_First_Group_Lock 0xfe0d
-#define GDK_ISO_Last_Group 0xfe0e
-#define GDK_ISO_Last_Group_Lock 0xfe0f
-#define GDK_ISO_Left_Tab 0xfe20
-#define GDK_ISO_Move_Line_Up 0xfe21
-#define GDK_ISO_Move_Line_Down 0xfe22
-#define GDK_ISO_Partial_Line_Up 0xfe23
-#define GDK_ISO_Partial_Line_Down 0xfe24
-#define GDK_ISO_Partial_Space_Left 0xfe25
-#define GDK_ISO_Partial_Space_Right 0xfe26
-#define GDK_ISO_Set_Margin_Left 0xfe27
-#define GDK_ISO_Set_Margin_Right 0xfe28
-#define GDK_ISO_Release_Margin_Left 0xfe29
-#define GDK_ISO_Release_Margin_Right 0xfe2a
-#define GDK_ISO_Release_Both_Margins 0xfe2b
-#define GDK_ISO_Fast_Cursor_Left 0xfe2c
-#define GDK_ISO_Fast_Cursor_Right 0xfe2d
-#define GDK_ISO_Fast_Cursor_Up 0xfe2e
-#define GDK_ISO_Fast_Cursor_Down 0xfe2f
-#define GDK_ISO_Continuous_Underline 0xfe30
-#define GDK_ISO_Discontinuous_Underline 0xfe31
-#define GDK_ISO_Emphasize 0xfe32
-#define GDK_ISO_Center_Object 0xfe33
-#define GDK_ISO_Enter 0xfe34
-#define GDK_dead_grave 0xfe50
-#define GDK_dead_acute 0xfe51
-#define GDK_dead_circumflex 0xfe52
-#define GDK_dead_tilde 0xfe53
-#define GDK_dead_macron 0xfe54
-#define GDK_dead_breve 0xfe55
-#define GDK_dead_abovedot 0xfe56
-#define GDK_dead_diaeresis 0xfe57
-#define GDK_dead_abovering 0xfe58
-#define GDK_dead_doubleacute 0xfe59
-#define GDK_dead_caron 0xfe5a
-#define GDK_dead_cedilla 0xfe5b
-#define GDK_dead_ogonek 0xfe5c
-#define GDK_dead_iota 0xfe5d
-#define GDK_dead_voiced_sound 0xfe5e
-#define GDK_dead_semivoiced_sound 0xfe5f
-#define GDK_dead_belowdot 0xfe60
-#define GDK_dead_hook 0xfe61
-#define GDK_dead_horn 0xfe62
-#define GDK_First_Virtual_Screen 0xfed0
-#define GDK_Prev_Virtual_Screen 0xfed1
-#define GDK_Next_Virtual_Screen 0xfed2
-#define GDK_Last_Virtual_Screen 0xfed4
-#define GDK_Terminate_Server 0xfed5
-#define GDK_AccessX_Enable 0xfe70
-#define GDK_AccessX_Feedback_Enable 0xfe71
-#define GDK_RepeatKeys_Enable 0xfe72
-#define GDK_SlowKeys_Enable 0xfe73
-#define GDK_BounceKeys_Enable 0xfe74
-#define GDK_StickyKeys_Enable 0xfe75
-#define GDK_MouseKeys_Enable 0xfe76
-#define GDK_MouseKeys_Accel_Enable 0xfe77
-#define GDK_Overlay1_Enable 0xfe78
-#define GDK_Overlay2_Enable 0xfe79
-#define GDK_AudibleBell_Enable 0xfe7a
-#define GDK_Pointer_Left 0xfee0
-#define GDK_Pointer_Right 0xfee1
-#define GDK_Pointer_Up 0xfee2
-#define GDK_Pointer_Down 0xfee3
-#define GDK_Pointer_UpLeft 0xfee4
-#define GDK_Pointer_UpRight 0xfee5
-#define GDK_Pointer_DownLeft 0xfee6
-#define GDK_Pointer_DownRight 0xfee7
-#define GDK_Pointer_Button_Dflt 0xfee8
-#define GDK_Pointer_Button1 0xfee9
-#define GDK_Pointer_Button2 0xfeea
-#define GDK_Pointer_Button3 0xfeeb
-#define GDK_Pointer_Button4 0xfeec
-#define GDK_Pointer_Button5 0xfeed
-#define GDK_Pointer_DblClick_Dflt 0xfeee
-#define GDK_Pointer_DblClick1 0xfeef
-#define GDK_Pointer_DblClick2 0xfef0
-#define GDK_Pointer_DblClick3 0xfef1
-#define GDK_Pointer_DblClick4 0xfef2
-#define GDK_Pointer_DblClick5 0xfef3
-#define GDK_Pointer_Drag_Dflt 0xfef4
-#define GDK_Pointer_Drag1 0xfef5
-#define GDK_Pointer_Drag2 0xfef6
-#define GDK_Pointer_Drag3 0xfef7
-#define GDK_Pointer_Drag4 0xfef8
-#define GDK_Pointer_Drag5 0xfefd
-#define GDK_Pointer_EnableKeys 0xfef9
-#define GDK_Pointer_Accelerate 0xfefa
-#define GDK_Pointer_DfltBtnNext 0xfefb
-#define GDK_Pointer_DfltBtnPrev 0xfefc
-#define GDK_3270_Duplicate 0xfd01
-#define GDK_3270_FieldMark 0xfd02
-#define GDK_3270_Right2 0xfd03
-#define GDK_3270_Left2 0xfd04
-#define GDK_3270_BackTab 0xfd05
-#define GDK_3270_EraseEOF 0xfd06
-#define GDK_3270_EraseInput 0xfd07
-#define GDK_3270_Reset 0xfd08
-#define GDK_3270_Quit 0xfd09
-#define GDK_3270_PA1 0xfd0a
-#define GDK_3270_PA2 0xfd0b
-#define GDK_3270_PA3 0xfd0c
-#define GDK_3270_Test 0xfd0d
-#define GDK_3270_Attn 0xfd0e
-#define GDK_3270_CursorBlink 0xfd0f
-#define GDK_3270_AltCursor 0xfd10
-#define GDK_3270_KeyClick 0xfd11
-#define GDK_3270_Jump 0xfd12
-#define GDK_3270_Ident 0xfd13
-#define GDK_3270_Rule 0xfd14
-#define GDK_3270_Copy 0xfd15
-#define GDK_3270_Play 0xfd16
-#define GDK_3270_Setup 0xfd17
-#define GDK_3270_Record 0xfd18
-#define GDK_3270_ChangeScreen 0xfd19
-#define GDK_3270_DeleteWord 0xfd1a
-#define GDK_3270_ExSelect 0xfd1b
-#define GDK_3270_CursorSelect 0xfd1c
-#define GDK_3270_PrintScreen 0xfd1d
-#define GDK_3270_Enter 0xfd1e
-#define GDK_space 0x020
-#define GDK_exclam 0x021
-#define GDK_quotedbl 0x022
-#define GDK_numbersign 0x023
-#define GDK_dollar 0x024
-#define GDK_percent 0x025
-#define GDK_ampersand 0x026
-#define GDK_apostrophe 0x027
-#define GDK_quoteright 0x027
-#define GDK_parenleft 0x028
-#define GDK_parenright 0x029
-#define GDK_asterisk 0x02a
-#define GDK_plus 0x02b
-#define GDK_comma 0x02c
-#define GDK_minus 0x02d
-#define GDK_period 0x02e
-#define GDK_slash 0x02f
-#define GDK_0 0x030
-#define GDK_1 0x031
-#define GDK_2 0x032
-#define GDK_3 0x033
-#define GDK_4 0x034
-#define GDK_5 0x035
-#define GDK_6 0x036
-#define GDK_7 0x037
-#define GDK_8 0x038
-#define GDK_9 0x039
-#define GDK_colon 0x03a
-#define GDK_semicolon 0x03b
-#define GDK_less 0x03c
-#define GDK_equal 0x03d
-#define GDK_greater 0x03e
-#define GDK_question 0x03f
-#define GDK_at 0x040
-#define GDK_A 0x041
-#define GDK_B 0x042
-#define GDK_C 0x043
-#define GDK_D 0x044
-#define GDK_E 0x045
-#define GDK_F 0x046
-#define GDK_G 0x047
-#define GDK_H 0x048
-#define GDK_I 0x049
-#define GDK_J 0x04a
-#define GDK_K 0x04b
-#define GDK_L 0x04c
-#define GDK_M 0x04d
-#define GDK_N 0x04e
-#define GDK_O 0x04f
-#define GDK_P 0x050
-#define GDK_Q 0x051
-#define GDK_R 0x052
-#define GDK_S 0x053
-#define GDK_T 0x054
-#define GDK_U 0x055
-#define GDK_V 0x056
-#define GDK_W 0x057
-#define GDK_X 0x058
-#define GDK_Y 0x059
-#define GDK_Z 0x05a
-#define GDK_bracketleft 0x05b
-#define GDK_backslash 0x05c
-#define GDK_bracketright 0x05d
-#define GDK_asciicircum 0x05e
-#define GDK_underscore 0x05f
-#define GDK_grave 0x060
-#define GDK_quoteleft 0x060
-#define GDK_a 0x061
-#define GDK_b 0x062
-#define GDK_c 0x063
-#define GDK_d 0x064
-#define GDK_e 0x065
-#define GDK_f 0x066
-#define GDK_g 0x067
-#define GDK_h 0x068
-#define GDK_i 0x069
-#define GDK_j 0x06a
-#define GDK_k 0x06b
-#define GDK_l 0x06c
-#define GDK_m 0x06d
-#define GDK_n 0x06e
-#define GDK_o 0x06f
-#define GDK_p 0x070
-#define GDK_q 0x071
-#define GDK_r 0x072
-#define GDK_s 0x073
-#define GDK_t 0x074
-#define GDK_u 0x075
-#define GDK_v 0x076
-#define GDK_w 0x077
-#define GDK_x 0x078
-#define GDK_y 0x079
-#define GDK_z 0x07a
-#define GDK_braceleft 0x07b
-#define GDK_bar 0x07c
-#define GDK_braceright 0x07d
-#define GDK_asciitilde 0x07e
-#define GDK_nobreakspace 0x0a0
-#define GDK_exclamdown 0x0a1
-#define GDK_cent 0x0a2
-#define GDK_sterling 0x0a3
-#define GDK_currency 0x0a4
-#define GDK_yen 0x0a5
-#define GDK_brokenbar 0x0a6
-#define GDK_section 0x0a7
-#define GDK_diaeresis 0x0a8
-#define GDK_copyright 0x0a9
-#define GDK_ordfeminine 0x0aa
-#define GDK_guillemotleft 0x0ab
-#define GDK_notsign 0x0ac
-#define GDK_hyphen 0x0ad
-#define GDK_registered 0x0ae
-#define GDK_macron 0x0af
-#define GDK_degree 0x0b0
-#define GDK_plusminus 0x0b1
-#define GDK_twosuperior 0x0b2
-#define GDK_threesuperior 0x0b3
-#define GDK_acute 0x0b4
-#define GDK_mu 0x0b5
-#define GDK_paragraph 0x0b6
-#define GDK_periodcentered 0x0b7
-#define GDK_cedilla 0x0b8
-#define GDK_onesuperior 0x0b9
-#define GDK_masculine 0x0ba
-#define GDK_guillemotright 0x0bb
-#define GDK_onequarter 0x0bc
-#define GDK_onehalf 0x0bd
-#define GDK_threequarters 0x0be
-#define GDK_questiondown 0x0bf
-#define GDK_Agrave 0x0c0
-#define GDK_Aacute 0x0c1
-#define GDK_Acircumflex 0x0c2
-#define GDK_Atilde 0x0c3
-#define GDK_Adiaeresis 0x0c4
-#define GDK_Aring 0x0c5
-#define GDK_AE 0x0c6
-#define GDK_Ccedilla 0x0c7
-#define GDK_Egrave 0x0c8
-#define GDK_Eacute 0x0c9
-#define GDK_Ecircumflex 0x0ca
-#define GDK_Ediaeresis 0x0cb
-#define GDK_Igrave 0x0cc
-#define GDK_Iacute 0x0cd
-#define GDK_Icircumflex 0x0ce
-#define GDK_Idiaeresis 0x0cf
-#define GDK_ETH 0x0d0
-#define GDK_Eth 0x0d0
-#define GDK_Ntilde 0x0d1
-#define GDK_Ograve 0x0d2
-#define GDK_Oacute 0x0d3
-#define GDK_Ocircumflex 0x0d4
-#define GDK_Otilde 0x0d5
-#define GDK_Odiaeresis 0x0d6
-#define GDK_multiply 0x0d7
-#define GDK_Oslash 0x0d8
-#define GDK_Ooblique 0x0d8
-#define GDK_Ugrave 0x0d9
-#define GDK_Uacute 0x0da
-#define GDK_Ucircumflex 0x0db
-#define GDK_Udiaeresis 0x0dc
-#define GDK_Yacute 0x0dd
-#define GDK_THORN 0x0de
-#define GDK_Thorn 0x0de
-#define GDK_ssharp 0x0df
-#define GDK_agrave 0x0e0
-#define GDK_aacute 0x0e1
-#define GDK_acircumflex 0x0e2
-#define GDK_atilde 0x0e3
-#define GDK_adiaeresis 0x0e4
-#define GDK_aring 0x0e5
-#define GDK_ae 0x0e6
-#define GDK_ccedilla 0x0e7
-#define GDK_egrave 0x0e8
-#define GDK_eacute 0x0e9
-#define GDK_ecircumflex 0x0ea
-#define GDK_ediaeresis 0x0eb
-#define GDK_igrave 0x0ec
-#define GDK_iacute 0x0ed
-#define GDK_icircumflex 0x0ee
-#define GDK_idiaeresis 0x0ef
-#define GDK_eth 0x0f0
-#define GDK_ntilde 0x0f1
-#define GDK_ograve 0x0f2
-#define GDK_oacute 0x0f3
-#define GDK_ocircumflex 0x0f4
-#define GDK_otilde 0x0f5
-#define GDK_odiaeresis 0x0f6
-#define GDK_division 0x0f7
-#define GDK_oslash 0x0f8
-#define GDK_ooblique 0x0f8
-#define GDK_ugrave 0x0f9
-#define GDK_uacute 0x0fa
-#define GDK_ucircumflex 0x0fb
-#define GDK_udiaeresis 0x0fc
-#define GDK_yacute 0x0fd
-#define GDK_thorn 0x0fe
-#define GDK_ydiaeresis 0x0ff
-#define GDK_Aogonek 0x1a1
-#define GDK_breve 0x1a2
-#define GDK_Lstroke 0x1a3
-#define GDK_Lcaron 0x1a5
-#define GDK_Sacute 0x1a6
-#define GDK_Scaron 0x1a9
-#define GDK_Scedilla 0x1aa
-#define GDK_Tcaron 0x1ab
-#define GDK_Zacute 0x1ac
-#define GDK_Zcaron 0x1ae
-#define GDK_Zabovedot 0x1af
-#define GDK_aogonek 0x1b1
-#define GDK_ogonek 0x1b2
-#define GDK_lstroke 0x1b3
-#define GDK_lcaron 0x1b5
-#define GDK_sacute 0x1b6
-#define GDK_caron 0x1b7
-#define GDK_scaron 0x1b9
-#define GDK_scedilla 0x1ba
-#define GDK_tcaron 0x1bb
-#define GDK_zacute 0x1bc
-#define GDK_doubleacute 0x1bd
-#define GDK_zcaron 0x1be
-#define GDK_zabovedot 0x1bf
-#define GDK_Racute 0x1c0
-#define GDK_Abreve 0x1c3
-#define GDK_Lacute 0x1c5
-#define GDK_Cacute 0x1c6
-#define GDK_Ccaron 0x1c8
-#define GDK_Eogonek 0x1ca
-#define GDK_Ecaron 0x1cc
-#define GDK_Dcaron 0x1cf
-#define GDK_Dstroke 0x1d0
-#define GDK_Nacute 0x1d1
-#define GDK_Ncaron 0x1d2
-#define GDK_Odoubleacute 0x1d5
-#define GDK_Rcaron 0x1d8
-#define GDK_Uring 0x1d9
-#define GDK_Udoubleacute 0x1db
-#define GDK_Tcedilla 0x1de
-#define GDK_racute 0x1e0
-#define GDK_abreve 0x1e3
-#define GDK_lacute 0x1e5
-#define GDK_cacute 0x1e6
-#define GDK_ccaron 0x1e8
-#define GDK_eogonek 0x1ea
-#define GDK_ecaron 0x1ec
-#define GDK_dcaron 0x1ef
-#define GDK_dstroke 0x1f0
-#define GDK_nacute 0x1f1
-#define GDK_ncaron 0x1f2
-#define GDK_odoubleacute 0x1f5
-#define GDK_udoubleacute 0x1fb
-#define GDK_rcaron 0x1f8
-#define GDK_uring 0x1f9
-#define GDK_tcedilla 0x1fe
-#define GDK_abovedot 0x1ff
-#define GDK_Hstroke 0x2a1
-#define GDK_Hcircumflex 0x2a6
-#define GDK_Iabovedot 0x2a9
-#define GDK_Gbreve 0x2ab
-#define GDK_Jcircumflex 0x2ac
-#define GDK_hstroke 0x2b1
-#define GDK_hcircumflex 0x2b6
-#define GDK_idotless 0x2b9
-#define GDK_gbreve 0x2bb
-#define GDK_jcircumflex 0x2bc
-#define GDK_Cabovedot 0x2c5
-#define GDK_Ccircumflex 0x2c6
-#define GDK_Gabovedot 0x2d5
-#define GDK_Gcircumflex 0x2d8
-#define GDK_Ubreve 0x2dd
-#define GDK_Scircumflex 0x2de
-#define GDK_cabovedot 0x2e5
-#define GDK_ccircumflex 0x2e6
-#define GDK_gabovedot 0x2f5
-#define GDK_gcircumflex 0x2f8
-#define GDK_ubreve 0x2fd
-#define GDK_scircumflex 0x2fe
-#define GDK_kra 0x3a2
-#define GDK_kappa 0x3a2
-#define GDK_Rcedilla 0x3a3
-#define GDK_Itilde 0x3a5
-#define GDK_Lcedilla 0x3a6
-#define GDK_Emacron 0x3aa
-#define GDK_Gcedilla 0x3ab
-#define GDK_Tslash 0x3ac
-#define GDK_rcedilla 0x3b3
-#define GDK_itilde 0x3b5
-#define GDK_lcedilla 0x3b6
-#define GDK_emacron 0x3ba
-#define GDK_gcedilla 0x3bb
-#define GDK_tslash 0x3bc
-#define GDK_ENG 0x3bd
-#define GDK_eng 0x3bf
-#define GDK_Amacron 0x3c0
-#define GDK_Iogonek 0x3c7
-#define GDK_Eabovedot 0x3cc
-#define GDK_Imacron 0x3cf
-#define GDK_Ncedilla 0x3d1
-#define GDK_Omacron 0x3d2
-#define GDK_Kcedilla 0x3d3
-#define GDK_Uogonek 0x3d9
-#define GDK_Utilde 0x3dd
-#define GDK_Umacron 0x3de
-#define GDK_amacron 0x3e0
-#define GDK_iogonek 0x3e7
-#define GDK_eabovedot 0x3ec
-#define GDK_imacron 0x3ef
-#define GDK_ncedilla 0x3f1
-#define GDK_omacron 0x3f2
-#define GDK_kcedilla 0x3f3
-#define GDK_uogonek 0x3f9
-#define GDK_utilde 0x3fd
-#define GDK_umacron 0x3fe
-#define GDK_Babovedot 0x1001e02
-#define GDK_babovedot 0x1001e03
-#define GDK_Dabovedot 0x1001e0a
-#define GDK_Wgrave 0x1001e80
-#define GDK_Wacute 0x1001e82
-#define GDK_dabovedot 0x1001e0b
-#define GDK_Ygrave 0x1001ef2
-#define GDK_Fabovedot 0x1001e1e
-#define GDK_fabovedot 0x1001e1f
-#define GDK_Mabovedot 0x1001e40
-#define GDK_mabovedot 0x1001e41
-#define GDK_Pabovedot 0x1001e56
-#define GDK_wgrave 0x1001e81
-#define GDK_pabovedot 0x1001e57
-#define GDK_wacute 0x1001e83
-#define GDK_Sabovedot 0x1001e60
-#define GDK_ygrave 0x1001ef3
-#define GDK_Wdiaeresis 0x1001e84
-#define GDK_wdiaeresis 0x1001e85
-#define GDK_sabovedot 0x1001e61
-#define GDK_Wcircumflex 0x1000174
-#define GDK_Tabovedot 0x1001e6a
-#define GDK_Ycircumflex 0x1000176
-#define GDK_wcircumflex 0x1000175
-#define GDK_tabovedot 0x1001e6b
-#define GDK_ycircumflex 0x1000177
-#define GDK_OE 0x13bc
-#define GDK_oe 0x13bd
-#define GDK_Ydiaeresis 0x13be
-#define GDK_overline 0x47e
-#define GDK_kana_fullstop 0x4a1
-#define GDK_kana_openingbracket 0x4a2
-#define GDK_kana_closingbracket 0x4a3
-#define GDK_kana_comma 0x4a4
-#define GDK_kana_conjunctive 0x4a5
-#define GDK_kana_middledot 0x4a5
-#define GDK_kana_WO 0x4a6
-#define GDK_kana_a 0x4a7
-#define GDK_kana_i 0x4a8
-#define GDK_kana_u 0x4a9
-#define GDK_kana_e 0x4aa
-#define GDK_kana_o 0x4ab
-#define GDK_kana_ya 0x4ac
-#define GDK_kana_yu 0x4ad
-#define GDK_kana_yo 0x4ae
-#define GDK_kana_tsu 0x4af
-#define GDK_kana_tu 0x4af
-#define GDK_prolongedsound 0x4b0
-#define GDK_kana_A 0x4b1
-#define GDK_kana_I 0x4b2
-#define GDK_kana_U 0x4b3
-#define GDK_kana_E 0x4b4
-#define GDK_kana_O 0x4b5
-#define GDK_kana_KA 0x4b6
-#define GDK_kana_KI 0x4b7
-#define GDK_kana_KU 0x4b8
-#define GDK_kana_KE 0x4b9
-#define GDK_kana_KO 0x4ba
-#define GDK_kana_SA 0x4bb
-#define GDK_kana_SHI 0x4bc
-#define GDK_kana_SU 0x4bd
-#define GDK_kana_SE 0x4be
-#define GDK_kana_SO 0x4bf
-#define GDK_kana_TA 0x4c0
-#define GDK_kana_CHI 0x4c1
-#define GDK_kana_TI 0x4c1
-#define GDK_kana_TSU 0x4c2
-#define GDK_kana_TU 0x4c2
-#define GDK_kana_TE 0x4c3
-#define GDK_kana_TO 0x4c4
-#define GDK_kana_NA 0x4c5
-#define GDK_kana_NI 0x4c6
-#define GDK_kana_NU 0x4c7
-#define GDK_kana_NE 0x4c8
-#define GDK_kana_NO 0x4c9
-#define GDK_kana_HA 0x4ca
-#define GDK_kana_HI 0x4cb
-#define GDK_kana_FU 0x4cc
-#define GDK_kana_HU 0x4cc
-#define GDK_kana_HE 0x4cd
-#define GDK_kana_HO 0x4ce
-#define GDK_kana_MA 0x4cf
-#define GDK_kana_MI 0x4d0
-#define GDK_kana_MU 0x4d1
-#define GDK_kana_ME 0x4d2
-#define GDK_kana_MO 0x4d3
-#define GDK_kana_YA 0x4d4
-#define GDK_kana_YU 0x4d5
-#define GDK_kana_YO 0x4d6
-#define GDK_kana_RA 0x4d7
-#define GDK_kana_RI 0x4d8
-#define GDK_kana_RU 0x4d9
-#define GDK_kana_RE 0x4da
-#define GDK_kana_RO 0x4db
-#define GDK_kana_WA 0x4dc
-#define GDK_kana_N 0x4dd
-#define GDK_voicedsound 0x4de
-#define GDK_semivoicedsound 0x4df
-#define GDK_kana_switch 0xff7e
-#define GDK_Farsi_0 0x10006f0
-#define GDK_Farsi_1 0x10006f1
-#define GDK_Farsi_2 0x10006f2
-#define GDK_Farsi_3 0x10006f3
-#define GDK_Farsi_4 0x10006f4
-#define GDK_Farsi_5 0x10006f5
-#define GDK_Farsi_6 0x10006f6
-#define GDK_Farsi_7 0x10006f7
-#define GDK_Farsi_8 0x10006f8
-#define GDK_Farsi_9 0x10006f9
-#define GDK_Arabic_percent 0x100066a
-#define GDK_Arabic_superscript_alef 0x1000670
-#define GDK_Arabic_tteh 0x1000679
-#define GDK_Arabic_peh 0x100067e
-#define GDK_Arabic_tcheh 0x1000686
-#define GDK_Arabic_ddal 0x1000688
-#define GDK_Arabic_rreh 0x1000691
-#define GDK_Arabic_comma 0x5ac
-#define GDK_Arabic_fullstop 0x10006d4
-#define GDK_Arabic_0 0x1000660
-#define GDK_Arabic_1 0x1000661
-#define GDK_Arabic_2 0x1000662
-#define GDK_Arabic_3 0x1000663
-#define GDK_Arabic_4 0x1000664
-#define GDK_Arabic_5 0x1000665
-#define GDK_Arabic_6 0x1000666
-#define GDK_Arabic_7 0x1000667
-#define GDK_Arabic_8 0x1000668
-#define GDK_Arabic_9 0x1000669
-#define GDK_Arabic_semicolon 0x5bb
-#define GDK_Arabic_question_mark 0x5bf
-#define GDK_Arabic_hamza 0x5c1
-#define GDK_Arabic_maddaonalef 0x5c2
-#define GDK_Arabic_hamzaonalef 0x5c3
-#define GDK_Arabic_hamzaonwaw 0x5c4
-#define GDK_Arabic_hamzaunderalef 0x5c5
-#define GDK_Arabic_hamzaonyeh 0x5c6
-#define GDK_Arabic_alef 0x5c7
-#define GDK_Arabic_beh 0x5c8
-#define GDK_Arabic_tehmarbuta 0x5c9
-#define GDK_Arabic_teh 0x5ca
-#define GDK_Arabic_theh 0x5cb
-#define GDK_Arabic_jeem 0x5cc
-#define GDK_Arabic_hah 0x5cd
-#define GDK_Arabic_khah 0x5ce
-#define GDK_Arabic_dal 0x5cf
-#define GDK_Arabic_thal 0x5d0
-#define GDK_Arabic_ra 0x5d1
-#define GDK_Arabic_zain 0x5d2
-#define GDK_Arabic_seen 0x5d3
-#define GDK_Arabic_sheen 0x5d4
-#define GDK_Arabic_sad 0x5d5
-#define GDK_Arabic_dad 0x5d6
-#define GDK_Arabic_tah 0x5d7
-#define GDK_Arabic_zah 0x5d8
-#define GDK_Arabic_ain 0x5d9
-#define GDK_Arabic_ghain 0x5da
-#define GDK_Arabic_tatweel 0x5e0
-#define GDK_Arabic_feh 0x5e1
-#define GDK_Arabic_qaf 0x5e2
-#define GDK_Arabic_kaf 0x5e3
-#define GDK_Arabic_lam 0x5e4
-#define GDK_Arabic_meem 0x5e5
-#define GDK_Arabic_noon 0x5e6
-#define GDK_Arabic_ha 0x5e7
-#define GDK_Arabic_heh 0x5e7
-#define GDK_Arabic_waw 0x5e8
-#define GDK_Arabic_alefmaksura 0x5e9
-#define GDK_Arabic_yeh 0x5ea
-#define GDK_Arabic_fathatan 0x5eb
-#define GDK_Arabic_dammatan 0x5ec
-#define GDK_Arabic_kasratan 0x5ed
-#define GDK_Arabic_fatha 0x5ee
-#define GDK_Arabic_damma 0x5ef
-#define GDK_Arabic_kasra 0x5f0
-#define GDK_Arabic_shadda 0x5f1
-#define GDK_Arabic_sukun 0x5f2
-#define GDK_Arabic_madda_above 0x1000653
-#define GDK_Arabic_hamza_above 0x1000654
-#define GDK_Arabic_hamza_below 0x1000655
-#define GDK_Arabic_jeh 0x1000698
-#define GDK_Arabic_veh 0x10006a4
-#define GDK_Arabic_keheh 0x10006a9
-#define GDK_Arabic_gaf 0x10006af
-#define GDK_Arabic_noon_ghunna 0x10006ba
-#define GDK_Arabic_heh_doachashmee 0x10006be
-#define GDK_Farsi_yeh 0x10006cc
-#define GDK_Arabic_farsi_yeh 0x10006cc
-#define GDK_Arabic_yeh_baree 0x10006d2
-#define GDK_Arabic_heh_goal 0x10006c1
-#define GDK_Arabic_switch 0xff7e
-#define GDK_Cyrillic_GHE_bar 0x1000492
-#define GDK_Cyrillic_ghe_bar 0x1000493
-#define GDK_Cyrillic_ZHE_descender 0x1000496
-#define GDK_Cyrillic_zhe_descender 0x1000497
-#define GDK_Cyrillic_KA_descender 0x100049a
-#define GDK_Cyrillic_ka_descender 0x100049b
-#define GDK_Cyrillic_KA_vertstroke 0x100049c
-#define GDK_Cyrillic_ka_vertstroke 0x100049d
-#define GDK_Cyrillic_EN_descender 0x10004a2
-#define GDK_Cyrillic_en_descender 0x10004a3
-#define GDK_Cyrillic_U_straight 0x10004ae
-#define GDK_Cyrillic_u_straight 0x10004af
-#define GDK_Cyrillic_U_straight_bar 0x10004b0
-#define GDK_Cyrillic_u_straight_bar 0x10004b1
-#define GDK_Cyrillic_HA_descender 0x10004b2
-#define GDK_Cyrillic_ha_descender 0x10004b3
-#define GDK_Cyrillic_CHE_descender 0x10004b6
-#define GDK_Cyrillic_che_descender 0x10004b7
-#define GDK_Cyrillic_CHE_vertstroke 0x10004b8
-#define GDK_Cyrillic_che_vertstroke 0x10004b9
-#define GDK_Cyrillic_SHHA 0x10004ba
-#define GDK_Cyrillic_shha 0x10004bb
-#define GDK_Cyrillic_SCHWA 0x10004d8
-#define GDK_Cyrillic_schwa 0x10004d9
-#define GDK_Cyrillic_I_macron 0x10004e2
-#define GDK_Cyrillic_i_macron 0x10004e3
-#define GDK_Cyrillic_O_bar 0x10004e8
-#define GDK_Cyrillic_o_bar 0x10004e9
-#define GDK_Cyrillic_U_macron 0x10004ee
-#define GDK_Cyrillic_u_macron 0x10004ef
-#define GDK_Serbian_dje 0x6a1
-#define GDK_Macedonia_gje 0x6a2
-#define GDK_Cyrillic_io 0x6a3
-#define GDK_Ukrainian_ie 0x6a4
-#define GDK_Ukranian_je 0x6a4
-#define GDK_Macedonia_dse 0x6a5
-#define GDK_Ukrainian_i 0x6a6
-#define GDK_Ukranian_i 0x6a6
-#define GDK_Ukrainian_yi 0x6a7
-#define GDK_Ukranian_yi 0x6a7
-#define GDK_Cyrillic_je 0x6a8
-#define GDK_Serbian_je 0x6a8
-#define GDK_Cyrillic_lje 0x6a9
-#define GDK_Serbian_lje 0x6a9
-#define GDK_Cyrillic_nje 0x6aa
-#define GDK_Serbian_nje 0x6aa
-#define GDK_Serbian_tshe 0x6ab
-#define GDK_Macedonia_kje 0x6ac
-#define GDK_Ukrainian_ghe_with_upturn 0x6ad
-#define GDK_Byelorussian_shortu 0x6ae
-#define GDK_Cyrillic_dzhe 0x6af
-#define GDK_Serbian_dze 0x6af
-#define GDK_numerosign 0x6b0
-#define GDK_Serbian_DJE 0x6b1
-#define GDK_Macedonia_GJE 0x6b2
-#define GDK_Cyrillic_IO 0x6b3
-#define GDK_Ukrainian_IE 0x6b4
-#define GDK_Ukranian_JE 0x6b4
-#define GDK_Macedonia_DSE 0x6b5
-#define GDK_Ukrainian_I 0x6b6
-#define GDK_Ukranian_I 0x6b6
-#define GDK_Ukrainian_YI 0x6b7
-#define GDK_Ukranian_YI 0x6b7
-#define GDK_Cyrillic_JE 0x6b8
-#define GDK_Serbian_JE 0x6b8
-#define GDK_Cyrillic_LJE 0x6b9
-#define GDK_Serbian_LJE 0x6b9
-#define GDK_Cyrillic_NJE 0x6ba
-#define GDK_Serbian_NJE 0x6ba
-#define GDK_Serbian_TSHE 0x6bb
-#define GDK_Macedonia_KJE 0x6bc
-#define GDK_Ukrainian_GHE_WITH_UPTURN 0x6bd
-#define GDK_Byelorussian_SHORTU 0x6be
-#define GDK_Cyrillic_DZHE 0x6bf
-#define GDK_Serbian_DZE 0x6bf
-#define GDK_Cyrillic_yu 0x6c0
-#define GDK_Cyrillic_a 0x6c1
-#define GDK_Cyrillic_be 0x6c2
-#define GDK_Cyrillic_tse 0x6c3
-#define GDK_Cyrillic_de 0x6c4
-#define GDK_Cyrillic_ie 0x6c5
-#define GDK_Cyrillic_ef 0x6c6
-#define GDK_Cyrillic_ghe 0x6c7
-#define GDK_Cyrillic_ha 0x6c8
-#define GDK_Cyrillic_i 0x6c9
-#define GDK_Cyrillic_shorti 0x6ca
-#define GDK_Cyrillic_ka 0x6cb
-#define GDK_Cyrillic_el 0x6cc
-#define GDK_Cyrillic_em 0x6cd
-#define GDK_Cyrillic_en 0x6ce
-#define GDK_Cyrillic_o 0x6cf
-#define GDK_Cyrillic_pe 0x6d0
-#define GDK_Cyrillic_ya 0x6d1
-#define GDK_Cyrillic_er 0x6d2
-#define GDK_Cyrillic_es 0x6d3
-#define GDK_Cyrillic_te 0x6d4
-#define GDK_Cyrillic_u 0x6d5
-#define GDK_Cyrillic_zhe 0x6d6
-#define GDK_Cyrillic_ve 0x6d7
-#define GDK_Cyrillic_softsign 0x6d8
-#define GDK_Cyrillic_yeru 0x6d9
-#define GDK_Cyrillic_ze 0x6da
-#define GDK_Cyrillic_sha 0x6db
-#define GDK_Cyrillic_e 0x6dc
-#define GDK_Cyrillic_shcha 0x6dd
-#define GDK_Cyrillic_che 0x6de
-#define GDK_Cyrillic_hardsign 0x6df
-#define GDK_Cyrillic_YU 0x6e0
-#define GDK_Cyrillic_A 0x6e1
-#define GDK_Cyrillic_BE 0x6e2
-#define GDK_Cyrillic_TSE 0x6e3
-#define GDK_Cyrillic_DE 0x6e4
-#define GDK_Cyrillic_IE 0x6e5
-#define GDK_Cyrillic_EF 0x6e6
-#define GDK_Cyrillic_GHE 0x6e7
-#define GDK_Cyrillic_HA 0x6e8
-#define GDK_Cyrillic_I 0x6e9
-#define GDK_Cyrillic_SHORTI 0x6ea
-#define GDK_Cyrillic_KA 0x6eb
-#define GDK_Cyrillic_EL 0x6ec
-#define GDK_Cyrillic_EM 0x6ed
-#define GDK_Cyrillic_EN 0x6ee
-#define GDK_Cyrillic_O 0x6ef
-#define GDK_Cyrillic_PE 0x6f0
-#define GDK_Cyrillic_YA 0x6f1
-#define GDK_Cyrillic_ER 0x6f2
-#define GDK_Cyrillic_ES 0x6f3
-#define GDK_Cyrillic_TE 0x6f4
-#define GDK_Cyrillic_U 0x6f5
-#define GDK_Cyrillic_ZHE 0x6f6
-#define GDK_Cyrillic_VE 0x6f7
-#define GDK_Cyrillic_SOFTSIGN 0x6f8
-#define GDK_Cyrillic_YERU 0x6f9
-#define GDK_Cyrillic_ZE 0x6fa
-#define GDK_Cyrillic_SHA 0x6fb
-#define GDK_Cyrillic_E 0x6fc
-#define GDK_Cyrillic_SHCHA 0x6fd
-#define GDK_Cyrillic_CHE 0x6fe
-#define GDK_Cyrillic_HARDSIGN 0x6ff
-#define GDK_Greek_ALPHAaccent 0x7a1
-#define GDK_Greek_EPSILONaccent 0x7a2
-#define GDK_Greek_ETAaccent 0x7a3
-#define GDK_Greek_IOTAaccent 0x7a4
-#define GDK_Greek_IOTAdieresis 0x7a5
-#define GDK_Greek_IOTAdiaeresis 0x7a5
-#define GDK_Greek_OMICRONaccent 0x7a7
-#define GDK_Greek_UPSILONaccent 0x7a8
-#define GDK_Greek_UPSILONdieresis 0x7a9
-#define GDK_Greek_OMEGAaccent 0x7ab
-#define GDK_Greek_accentdieresis 0x7ae
-#define GDK_Greek_horizbar 0x7af
-#define GDK_Greek_alphaaccent 0x7b1
-#define GDK_Greek_epsilonaccent 0x7b2
-#define GDK_Greek_etaaccent 0x7b3
-#define GDK_Greek_iotaaccent 0x7b4
-#define GDK_Greek_iotadieresis 0x7b5
-#define GDK_Greek_iotaaccentdieresis 0x7b6
-#define GDK_Greek_omicronaccent 0x7b7
-#define GDK_Greek_upsilonaccent 0x7b8
-#define GDK_Greek_upsilondieresis 0x7b9
-#define GDK_Greek_upsilonaccentdieresis 0x7ba
-#define GDK_Greek_omegaaccent 0x7bb
-#define GDK_Greek_ALPHA 0x7c1
-#define GDK_Greek_BETA 0x7c2
-#define GDK_Greek_GAMMA 0x7c3
-#define GDK_Greek_DELTA 0x7c4
-#define GDK_Greek_EPSILON 0x7c5
-#define GDK_Greek_ZETA 0x7c6
-#define GDK_Greek_ETA 0x7c7
-#define GDK_Greek_THETA 0x7c8
-#define GDK_Greek_IOTA 0x7c9
-#define GDK_Greek_KAPPA 0x7ca
-#define GDK_Greek_LAMDA 0x7cb
-#define GDK_Greek_LAMBDA 0x7cb
-#define GDK_Greek_MU 0x7cc
-#define GDK_Greek_NU 0x7cd
-#define GDK_Greek_XI 0x7ce
-#define GDK_Greek_OMICRON 0x7cf
-#define GDK_Greek_PI 0x7d0
-#define GDK_Greek_RHO 0x7d1
-#define GDK_Greek_SIGMA 0x7d2
-#define GDK_Greek_TAU 0x7d4
-#define GDK_Greek_UPSILON 0x7d5
-#define GDK_Greek_PHI 0x7d6
-#define GDK_Greek_CHI 0x7d7
-#define GDK_Greek_PSI 0x7d8
-#define GDK_Greek_OMEGA 0x7d9
-#define GDK_Greek_alpha 0x7e1
-#define GDK_Greek_beta 0x7e2
-#define GDK_Greek_gamma 0x7e3
-#define GDK_Greek_delta 0x7e4
-#define GDK_Greek_epsilon 0x7e5
-#define GDK_Greek_zeta 0x7e6
-#define GDK_Greek_eta 0x7e7
-#define GDK_Greek_theta 0x7e8
-#define GDK_Greek_iota 0x7e9
-#define GDK_Greek_kappa 0x7ea
-#define GDK_Greek_lamda 0x7eb
-#define GDK_Greek_lambda 0x7eb
-#define GDK_Greek_mu 0x7ec
-#define GDK_Greek_nu 0x7ed
-#define GDK_Greek_xi 0x7ee
-#define GDK_Greek_omicron 0x7ef
-#define GDK_Greek_pi 0x7f0
-#define GDK_Greek_rho 0x7f1
-#define GDK_Greek_sigma 0x7f2
-#define GDK_Greek_finalsmallsigma 0x7f3
-#define GDK_Greek_tau 0x7f4
-#define GDK_Greek_upsilon 0x7f5
-#define GDK_Greek_phi 0x7f6
-#define GDK_Greek_chi 0x7f7
-#define GDK_Greek_psi 0x7f8
-#define GDK_Greek_omega 0x7f9
-#define GDK_Greek_switch 0xff7e
-#define GDK_leftradical 0x8a1
-#define GDK_topleftradical 0x8a2
-#define GDK_horizconnector 0x8a3
-#define GDK_topintegral 0x8a4
-#define GDK_botintegral 0x8a5
-#define GDK_vertconnector 0x8a6
-#define GDK_topleftsqbracket 0x8a7
-#define GDK_botleftsqbracket 0x8a8
-#define GDK_toprightsqbracket 0x8a9
-#define GDK_botrightsqbracket 0x8aa
-#define GDK_topleftparens 0x8ab
-#define GDK_botleftparens 0x8ac
-#define GDK_toprightparens 0x8ad
-#define GDK_botrightparens 0x8ae
-#define GDK_leftmiddlecurlybrace 0x8af
-#define GDK_rightmiddlecurlybrace 0x8b0
-#define GDK_topleftsummation 0x8b1
-#define GDK_botleftsummation 0x8b2
-#define GDK_topvertsummationconnector 0x8b3
-#define GDK_botvertsummationconnector 0x8b4
-#define GDK_toprightsummation 0x8b5
-#define GDK_botrightsummation 0x8b6
-#define GDK_rightmiddlesummation 0x8b7
-#define GDK_lessthanequal 0x8bc
-#define GDK_notequal 0x8bd
-#define GDK_greaterthanequal 0x8be
-#define GDK_integral 0x8bf
-#define GDK_therefore 0x8c0
-#define GDK_variation 0x8c1
-#define GDK_infinity 0x8c2
-#define GDK_nabla 0x8c5
-#define GDK_approximate 0x8c8
-#define GDK_similarequal 0x8c9
-#define GDK_ifonlyif 0x8cd
-#define GDK_implies 0x8ce
-#define GDK_identical 0x8cf
-#define GDK_radical 0x8d6
-#define GDK_includedin 0x8da
-#define GDK_includes 0x8db
-#define GDK_intersection 0x8dc
-#define GDK_union 0x8dd
-#define GDK_logicaland 0x8de
-#define GDK_logicalor 0x8df
-#define GDK_partialderivative 0x8ef
-#define GDK_function 0x8f6
-#define GDK_leftarrow 0x8fb
-#define GDK_uparrow 0x8fc
-#define GDK_rightarrow 0x8fd
-#define GDK_downarrow 0x8fe
-#define GDK_blank 0x9df
-#define GDK_soliddiamond 0x9e0
-#define GDK_checkerboard 0x9e1
-#define GDK_ht 0x9e2
-#define GDK_ff 0x9e3
-#define GDK_cr 0x9e4
-#define GDK_lf 0x9e5
-#define GDK_nl 0x9e8
-#define GDK_vt 0x9e9
-#define GDK_lowrightcorner 0x9ea
-#define GDK_uprightcorner 0x9eb
-#define GDK_upleftcorner 0x9ec
-#define GDK_lowleftcorner 0x9ed
-#define GDK_crossinglines 0x9ee
-#define GDK_horizlinescan1 0x9ef
-#define GDK_horizlinescan3 0x9f0
-#define GDK_horizlinescan5 0x9f1
-#define GDK_horizlinescan7 0x9f2
-#define GDK_horizlinescan9 0x9f3
-#define GDK_leftt 0x9f4
-#define GDK_rightt 0x9f5
-#define GDK_bott 0x9f6
-#define GDK_topt 0x9f7
-#define GDK_vertbar 0x9f8
-#define GDK_emspace 0xaa1
-#define GDK_enspace 0xaa2
-#define GDK_em3space 0xaa3
-#define GDK_em4space 0xaa4
-#define GDK_digitspace 0xaa5
-#define GDK_punctspace 0xaa6
-#define GDK_thinspace 0xaa7
-#define GDK_hairspace 0xaa8
-#define GDK_emdash 0xaa9
-#define GDK_endash 0xaaa
-#define GDK_signifblank 0xaac
-#define GDK_ellipsis 0xaae
-#define GDK_doubbaselinedot 0xaaf
-#define GDK_onethird 0xab0
-#define GDK_twothirds 0xab1
-#define GDK_onefifth 0xab2
-#define GDK_twofifths 0xab3
-#define GDK_threefifths 0xab4
-#define GDK_fourfifths 0xab5
-#define GDK_onesixth 0xab6
-#define GDK_fivesixths 0xab7
-#define GDK_careof 0xab8
-#define GDK_figdash 0xabb
-#define GDK_leftanglebracket 0xabc
-#define GDK_decimalpoint 0xabd
-#define GDK_rightanglebracket 0xabe
-#define GDK_marker 0xabf
-#define GDK_oneeighth 0xac3
-#define GDK_threeeighths 0xac4
-#define GDK_fiveeighths 0xac5
-#define GDK_seveneighths 0xac6
-#define GDK_trademark 0xac9
-#define GDK_signaturemark 0xaca
-#define GDK_trademarkincircle 0xacb
-#define GDK_leftopentriangle 0xacc
-#define GDK_rightopentriangle 0xacd
-#define GDK_emopencircle 0xace
-#define GDK_emopenrectangle 0xacf
-#define GDK_leftsinglequotemark 0xad0
-#define GDK_rightsinglequotemark 0xad1
-#define GDK_leftdoublequotemark 0xad2
-#define GDK_rightdoublequotemark 0xad3
-#define GDK_prescription 0xad4
-#define GDK_minutes 0xad6
-#define GDK_seconds 0xad7
-#define GDK_latincross 0xad9
-#define GDK_hexagram 0xada
-#define GDK_filledrectbullet 0xadb
-#define GDK_filledlefttribullet 0xadc
-#define GDK_filledrighttribullet 0xadd
-#define GDK_emfilledcircle 0xade
-#define GDK_emfilledrect 0xadf
-#define GDK_enopencircbullet 0xae0
-#define GDK_enopensquarebullet 0xae1
-#define GDK_openrectbullet 0xae2
-#define GDK_opentribulletup 0xae3
-#define GDK_opentribulletdown 0xae4
-#define GDK_openstar 0xae5
-#define GDK_enfilledcircbullet 0xae6
-#define GDK_enfilledsqbullet 0xae7
-#define GDK_filledtribulletup 0xae8
-#define GDK_filledtribulletdown 0xae9
-#define GDK_leftpointer 0xaea
-#define GDK_rightpointer 0xaeb
-#define GDK_club 0xaec
-#define GDK_diamond 0xaed
-#define GDK_heart 0xaee
-#define GDK_maltesecross 0xaf0
-#define GDK_dagger 0xaf1
-#define GDK_doubledagger 0xaf2
-#define GDK_checkmark 0xaf3
-#define GDK_ballotcross 0xaf4
-#define GDK_musicalsharp 0xaf5
-#define GDK_musicalflat 0xaf6
-#define GDK_malesymbol 0xaf7
-#define GDK_femalesymbol 0xaf8
-#define GDK_telephone 0xaf9
-#define GDK_telephonerecorder 0xafa
-#define GDK_phonographcopyright 0xafb
-#define GDK_caret 0xafc
-#define GDK_singlelowquotemark 0xafd
-#define GDK_doublelowquotemark 0xafe
-#define GDK_cursor 0xaff
-#define GDK_leftcaret 0xba3
-#define GDK_rightcaret 0xba6
-#define GDK_downcaret 0xba8
-#define GDK_upcaret 0xba9
-#define GDK_overbar 0xbc0
-#define GDK_downtack 0xbc2
-#define GDK_upshoe 0xbc3
-#define GDK_downstile 0xbc4
-#define GDK_underbar 0xbc6
-#define GDK_jot 0xbca
-#define GDK_quad 0xbcc
-#define GDK_uptack 0xbce
-#define GDK_circle 0xbcf
-#define GDK_upstile 0xbd3
-#define GDK_downshoe 0xbd6
-#define GDK_rightshoe 0xbd8
-#define GDK_leftshoe 0xbda
-#define GDK_lefttack 0xbdc
-#define GDK_righttack 0xbfc
-#define GDK_hebrew_doublelowline 0xcdf
-#define GDK_hebrew_aleph 0xce0
-#define GDK_hebrew_bet 0xce1
-#define GDK_hebrew_beth 0xce1
-#define GDK_hebrew_gimel 0xce2
-#define GDK_hebrew_gimmel 0xce2
-#define GDK_hebrew_dalet 0xce3
-#define GDK_hebrew_daleth 0xce3
-#define GDK_hebrew_he 0xce4
-#define GDK_hebrew_waw 0xce5
-#define GDK_hebrew_zain 0xce6
-#define GDK_hebrew_zayin 0xce6
-#define GDK_hebrew_chet 0xce7
-#define GDK_hebrew_het 0xce7
-#define GDK_hebrew_tet 0xce8
-#define GDK_hebrew_teth 0xce8
-#define GDK_hebrew_yod 0xce9
-#define GDK_hebrew_finalkaph 0xcea
-#define GDK_hebrew_kaph 0xceb
-#define GDK_hebrew_lamed 0xcec
-#define GDK_hebrew_finalmem 0xced
-#define GDK_hebrew_mem 0xcee
-#define GDK_hebrew_finalnun 0xcef
-#define GDK_hebrew_nun 0xcf0
-#define GDK_hebrew_samech 0xcf1
-#define GDK_hebrew_samekh 0xcf1
-#define GDK_hebrew_ayin 0xcf2
-#define GDK_hebrew_finalpe 0xcf3
-#define GDK_hebrew_pe 0xcf4
-#define GDK_hebrew_finalzade 0xcf5
-#define GDK_hebrew_finalzadi 0xcf5
-#define GDK_hebrew_zade 0xcf6
-#define GDK_hebrew_zadi 0xcf6
-#define GDK_hebrew_qoph 0xcf7
-#define GDK_hebrew_kuf 0xcf7
-#define GDK_hebrew_resh 0xcf8
-#define GDK_hebrew_shin 0xcf9
-#define GDK_hebrew_taw 0xcfa
-#define GDK_hebrew_taf 0xcfa
-#define GDK_Hebrew_switch 0xff7e
-#define GDK_Thai_kokai 0xda1
-#define GDK_Thai_khokhai 0xda2
-#define GDK_Thai_khokhuat 0xda3
-#define GDK_Thai_khokhwai 0xda4
-#define GDK_Thai_khokhon 0xda5
-#define GDK_Thai_khorakhang 0xda6
-#define GDK_Thai_ngongu 0xda7
-#define GDK_Thai_chochan 0xda8
-#define GDK_Thai_choching 0xda9
-#define GDK_Thai_chochang 0xdaa
-#define GDK_Thai_soso 0xdab
-#define GDK_Thai_chochoe 0xdac
-#define GDK_Thai_yoying 0xdad
-#define GDK_Thai_dochada 0xdae
-#define GDK_Thai_topatak 0xdaf
-#define GDK_Thai_thothan 0xdb0
-#define GDK_Thai_thonangmontho 0xdb1
-#define GDK_Thai_thophuthao 0xdb2
-#define GDK_Thai_nonen 0xdb3
-#define GDK_Thai_dodek 0xdb4
-#define GDK_Thai_totao 0xdb5
-#define GDK_Thai_thothung 0xdb6
-#define GDK_Thai_thothahan 0xdb7
-#define GDK_Thai_thothong 0xdb8
-#define GDK_Thai_nonu 0xdb9
-#define GDK_Thai_bobaimai 0xdba
-#define GDK_Thai_popla 0xdbb
-#define GDK_Thai_phophung 0xdbc
-#define GDK_Thai_fofa 0xdbd
-#define GDK_Thai_phophan 0xdbe
-#define GDK_Thai_fofan 0xdbf
-#define GDK_Thai_phosamphao 0xdc0
-#define GDK_Thai_moma 0xdc1
-#define GDK_Thai_yoyak 0xdc2
-#define GDK_Thai_rorua 0xdc3
-#define GDK_Thai_ru 0xdc4
-#define GDK_Thai_loling 0xdc5
-#define GDK_Thai_lu 0xdc6
-#define GDK_Thai_wowaen 0xdc7
-#define GDK_Thai_sosala 0xdc8
-#define GDK_Thai_sorusi 0xdc9
-#define GDK_Thai_sosua 0xdca
-#define GDK_Thai_hohip 0xdcb
-#define GDK_Thai_lochula 0xdcc
-#define GDK_Thai_oang 0xdcd
-#define GDK_Thai_honokhuk 0xdce
-#define GDK_Thai_paiyannoi 0xdcf
-#define GDK_Thai_saraa 0xdd0
-#define GDK_Thai_maihanakat 0xdd1
-#define GDK_Thai_saraaa 0xdd2
-#define GDK_Thai_saraam 0xdd3
-#define GDK_Thai_sarai 0xdd4
-#define GDK_Thai_saraii 0xdd5
-#define GDK_Thai_saraue 0xdd6
-#define GDK_Thai_sarauee 0xdd7
-#define GDK_Thai_sarau 0xdd8
-#define GDK_Thai_sarauu 0xdd9
-#define GDK_Thai_phinthu 0xdda
-#define GDK_Thai_maihanakat_maitho 0xdde
-#define GDK_Thai_baht 0xddf
-#define GDK_Thai_sarae 0xde0
-#define GDK_Thai_saraae 0xde1
-#define GDK_Thai_sarao 0xde2
-#define GDK_Thai_saraaimaimuan 0xde3
-#define GDK_Thai_saraaimaimalai 0xde4
-#define GDK_Thai_lakkhangyao 0xde5
-#define GDK_Thai_maiyamok 0xde6
-#define GDK_Thai_maitaikhu 0xde7
-#define GDK_Thai_maiek 0xde8
-#define GDK_Thai_maitho 0xde9
-#define GDK_Thai_maitri 0xdea
-#define GDK_Thai_maichattawa 0xdeb
-#define GDK_Thai_thanthakhat 0xdec
-#define GDK_Thai_nikhahit 0xded
-#define GDK_Thai_leksun 0xdf0
-#define GDK_Thai_leknung 0xdf1
-#define GDK_Thai_leksong 0xdf2
-#define GDK_Thai_leksam 0xdf3
-#define GDK_Thai_leksi 0xdf4
-#define GDK_Thai_lekha 0xdf5
-#define GDK_Thai_lekhok 0xdf6
-#define GDK_Thai_lekchet 0xdf7
-#define GDK_Thai_lekpaet 0xdf8
-#define GDK_Thai_lekkao 0xdf9
-#define GDK_Hangul 0xff31
-#define GDK_Hangul_Start 0xff32
-#define GDK_Hangul_End 0xff33
-#define GDK_Hangul_Hanja 0xff34
-#define GDK_Hangul_Jamo 0xff35
-#define GDK_Hangul_Romaja 0xff36
-#define GDK_Hangul_Codeinput 0xff37
-#define GDK_Hangul_Jeonja 0xff38
-#define GDK_Hangul_Banja 0xff39
-#define GDK_Hangul_PreHanja 0xff3a
-#define GDK_Hangul_PostHanja 0xff3b
-#define GDK_Hangul_SingleCandidate 0xff3c
-#define GDK_Hangul_MultipleCandidate 0xff3d
-#define GDK_Hangul_PreviousCandidate 0xff3e
-#define GDK_Hangul_Special 0xff3f
-#define GDK_Hangul_switch 0xff7e
-#define GDK_Hangul_Kiyeog 0xea1
-#define GDK_Hangul_SsangKiyeog 0xea2
-#define GDK_Hangul_KiyeogSios 0xea3
-#define GDK_Hangul_Nieun 0xea4
-#define GDK_Hangul_NieunJieuj 0xea5
-#define GDK_Hangul_NieunHieuh 0xea6
-#define GDK_Hangul_Dikeud 0xea7
-#define GDK_Hangul_SsangDikeud 0xea8
-#define GDK_Hangul_Rieul 0xea9
-#define GDK_Hangul_RieulKiyeog 0xeaa
-#define GDK_Hangul_RieulMieum 0xeab
-#define GDK_Hangul_RieulPieub 0xeac
-#define GDK_Hangul_RieulSios 0xead
-#define GDK_Hangul_RieulTieut 0xeae
-#define GDK_Hangul_RieulPhieuf 0xeaf
-#define GDK_Hangul_RieulHieuh 0xeb0
-#define GDK_Hangul_Mieum 0xeb1
-#define GDK_Hangul_Pieub 0xeb2
-#define GDK_Hangul_SsangPieub 0xeb3
-#define GDK_Hangul_PieubSios 0xeb4
-#define GDK_Hangul_Sios 0xeb5
-#define GDK_Hangul_SsangSios 0xeb6
-#define GDK_Hangul_Ieung 0xeb7
-#define GDK_Hangul_Jieuj 0xeb8
-#define GDK_Hangul_SsangJieuj 0xeb9
-#define GDK_Hangul_Cieuc 0xeba
-#define GDK_Hangul_Khieuq 0xebb
-#define GDK_Hangul_Tieut 0xebc
-#define GDK_Hangul_Phieuf 0xebd
-#define GDK_Hangul_Hieuh 0xebe
-#define GDK_Hangul_A 0xebf
-#define GDK_Hangul_AE 0xec0
-#define GDK_Hangul_YA 0xec1
-#define GDK_Hangul_YAE 0xec2
-#define GDK_Hangul_EO 0xec3
-#define GDK_Hangul_E 0xec4
-#define GDK_Hangul_YEO 0xec5
-#define GDK_Hangul_YE 0xec6
-#define GDK_Hangul_O 0xec7
-#define GDK_Hangul_WA 0xec8
-#define GDK_Hangul_WAE 0xec9
-#define GDK_Hangul_OE 0xeca
-#define GDK_Hangul_YO 0xecb
-#define GDK_Hangul_U 0xecc
-#define GDK_Hangul_WEO 0xecd
-#define GDK_Hangul_WE 0xece
-#define GDK_Hangul_WI 0xecf
-#define GDK_Hangul_YU 0xed0
-#define GDK_Hangul_EU 0xed1
-#define GDK_Hangul_YI 0xed2
-#define GDK_Hangul_I 0xed3
-#define GDK_Hangul_J_Kiyeog 0xed4
-#define GDK_Hangul_J_SsangKiyeog 0xed5
-#define GDK_Hangul_J_KiyeogSios 0xed6
-#define GDK_Hangul_J_Nieun 0xed7
-#define GDK_Hangul_J_NieunJieuj 0xed8
-#define GDK_Hangul_J_NieunHieuh 0xed9
-#define GDK_Hangul_J_Dikeud 0xeda
-#define GDK_Hangul_J_Rieul 0xedb
-#define GDK_Hangul_J_RieulKiyeog 0xedc
-#define GDK_Hangul_J_RieulMieum 0xedd
-#define GDK_Hangul_J_RieulPieub 0xede
-#define GDK_Hangul_J_RieulSios 0xedf
-#define GDK_Hangul_J_RieulTieut 0xee0
-#define GDK_Hangul_J_RieulPhieuf 0xee1
-#define GDK_Hangul_J_RieulHieuh 0xee2
-#define GDK_Hangul_J_Mieum 0xee3
-#define GDK_Hangul_J_Pieub 0xee4
-#define GDK_Hangul_J_PieubSios 0xee5
-#define GDK_Hangul_J_Sios 0xee6
-#define GDK_Hangul_J_SsangSios 0xee7
-#define GDK_Hangul_J_Ieung 0xee8
-#define GDK_Hangul_J_Jieuj 0xee9
-#define GDK_Hangul_J_Cieuc 0xeea
-#define GDK_Hangul_J_Khieuq 0xeeb
-#define GDK_Hangul_J_Tieut 0xeec
-#define GDK_Hangul_J_Phieuf 0xeed
-#define GDK_Hangul_J_Hieuh 0xeee
-#define GDK_Hangul_RieulYeorinHieuh 0xeef
-#define GDK_Hangul_SunkyeongeumMieum 0xef0
-#define GDK_Hangul_SunkyeongeumPieub 0xef1
-#define GDK_Hangul_PanSios 0xef2
-#define GDK_Hangul_KkogjiDalrinIeung 0xef3
-#define GDK_Hangul_SunkyeongeumPhieuf 0xef4
-#define GDK_Hangul_YeorinHieuh 0xef5
-#define GDK_Hangul_AraeA 0xef6
-#define GDK_Hangul_AraeAE 0xef7
-#define GDK_Hangul_J_PanSios 0xef8
-#define GDK_Hangul_J_KkogjiDalrinIeung 0xef9
-#define GDK_Hangul_J_YeorinHieuh 0xefa
-#define GDK_Korean_Won 0xeff
-#define GDK_Armenian_ligature_ew 0x1000587
-#define GDK_Armenian_full_stop 0x1000589
-#define GDK_Armenian_verjaket 0x1000589
-#define GDK_Armenian_separation_mark 0x100055d
-#define GDK_Armenian_but 0x100055d
-#define GDK_Armenian_hyphen 0x100058a
-#define GDK_Armenian_yentamna 0x100058a
-#define GDK_Armenian_exclam 0x100055c
-#define GDK_Armenian_amanak 0x100055c
-#define GDK_Armenian_accent 0x100055b
-#define GDK_Armenian_shesht 0x100055b
-#define GDK_Armenian_question 0x100055e
-#define GDK_Armenian_paruyk 0x100055e
-#define GDK_Armenian_AYB 0x1000531
-#define GDK_Armenian_ayb 0x1000561
-#define GDK_Armenian_BEN 0x1000532
-#define GDK_Armenian_ben 0x1000562
-#define GDK_Armenian_GIM 0x1000533
-#define GDK_Armenian_gim 0x1000563
-#define GDK_Armenian_DA 0x1000534
-#define GDK_Armenian_da 0x1000564
-#define GDK_Armenian_YECH 0x1000535
-#define GDK_Armenian_yech 0x1000565
-#define GDK_Armenian_ZA 0x1000536
-#define GDK_Armenian_za 0x1000566
-#define GDK_Armenian_E 0x1000537
-#define GDK_Armenian_e 0x1000567
-#define GDK_Armenian_AT 0x1000538
-#define GDK_Armenian_at 0x1000568
-#define GDK_Armenian_TO 0x1000539
-#define GDK_Armenian_to 0x1000569
-#define GDK_Armenian_ZHE 0x100053a
-#define GDK_Armenian_zhe 0x100056a
-#define GDK_Armenian_INI 0x100053b
-#define GDK_Armenian_ini 0x100056b
-#define GDK_Armenian_LYUN 0x100053c
-#define GDK_Armenian_lyun 0x100056c
-#define GDK_Armenian_KHE 0x100053d
-#define GDK_Armenian_khe 0x100056d
-#define GDK_Armenian_TSA 0x100053e
-#define GDK_Armenian_tsa 0x100056e
-#define GDK_Armenian_KEN 0x100053f
-#define GDK_Armenian_ken 0x100056f
-#define GDK_Armenian_HO 0x1000540
-#define GDK_Armenian_ho 0x1000570
-#define GDK_Armenian_DZA 0x1000541
-#define GDK_Armenian_dza 0x1000571
-#define GDK_Armenian_GHAT 0x1000542
-#define GDK_Armenian_ghat 0x1000572
-#define GDK_Armenian_TCHE 0x1000543
-#define GDK_Armenian_tche 0x1000573
-#define GDK_Armenian_MEN 0x1000544
-#define GDK_Armenian_men 0x1000574
-#define GDK_Armenian_HI 0x1000545
-#define GDK_Armenian_hi 0x1000575
-#define GDK_Armenian_NU 0x1000546
-#define GDK_Armenian_nu 0x1000576
-#define GDK_Armenian_SHA 0x1000547
-#define GDK_Armenian_sha 0x1000577
-#define GDK_Armenian_VO 0x1000548
-#define GDK_Armenian_vo 0x1000578
-#define GDK_Armenian_CHA 0x1000549
-#define GDK_Armenian_cha 0x1000579
-#define GDK_Armenian_PE 0x100054a
-#define GDK_Armenian_pe 0x100057a
-#define GDK_Armenian_JE 0x100054b
-#define GDK_Armenian_je 0x100057b
-#define GDK_Armenian_RA 0x100054c
-#define GDK_Armenian_ra 0x100057c
-#define GDK_Armenian_SE 0x100054d
-#define GDK_Armenian_se 0x100057d
-#define GDK_Armenian_VEV 0x100054e
-#define GDK_Armenian_vev 0x100057e
-#define GDK_Armenian_TYUN 0x100054f
-#define GDK_Armenian_tyun 0x100057f
-#define GDK_Armenian_RE 0x1000550
-#define GDK_Armenian_re 0x1000580
-#define GDK_Armenian_TSO 0x1000551
-#define GDK_Armenian_tso 0x1000581
-#define GDK_Armenian_VYUN 0x1000552
-#define GDK_Armenian_vyun 0x1000582
-#define GDK_Armenian_PYUR 0x1000553
-#define GDK_Armenian_pyur 0x1000583
-#define GDK_Armenian_KE 0x1000554
-#define GDK_Armenian_ke 0x1000584
-#define GDK_Armenian_O 0x1000555
-#define GDK_Armenian_o 0x1000585
-#define GDK_Armenian_FE 0x1000556
-#define GDK_Armenian_fe 0x1000586
-#define GDK_Armenian_apostrophe 0x100055a
-#define GDK_Georgian_an 0x10010d0
-#define GDK_Georgian_ban 0x10010d1
-#define GDK_Georgian_gan 0x10010d2
-#define GDK_Georgian_don 0x10010d3
-#define GDK_Georgian_en 0x10010d4
-#define GDK_Georgian_vin 0x10010d5
-#define GDK_Georgian_zen 0x10010d6
-#define GDK_Georgian_tan 0x10010d7
-#define GDK_Georgian_in 0x10010d8
-#define GDK_Georgian_kan 0x10010d9
-#define GDK_Georgian_las 0x10010da
-#define GDK_Georgian_man 0x10010db
-#define GDK_Georgian_nar 0x10010dc
-#define GDK_Georgian_on 0x10010dd
-#define GDK_Georgian_par 0x10010de
-#define GDK_Georgian_zhar 0x10010df
-#define GDK_Georgian_rae 0x10010e0
-#define GDK_Georgian_san 0x10010e1
-#define GDK_Georgian_tar 0x10010e2
-#define GDK_Georgian_un 0x10010e3
-#define GDK_Georgian_phar 0x10010e4
-#define GDK_Georgian_khar 0x10010e5
-#define GDK_Georgian_ghan 0x10010e6
-#define GDK_Georgian_qar 0x10010e7
-#define GDK_Georgian_shin 0x10010e8
-#define GDK_Georgian_chin 0x10010e9
-#define GDK_Georgian_can 0x10010ea
-#define GDK_Georgian_jil 0x10010eb
-#define GDK_Georgian_cil 0x10010ec
-#define GDK_Georgian_char 0x10010ed
-#define GDK_Georgian_xan 0x10010ee
-#define GDK_Georgian_jhan 0x10010ef
-#define GDK_Georgian_hae 0x10010f0
-#define GDK_Georgian_he 0x10010f1
-#define GDK_Georgian_hie 0x10010f2
-#define GDK_Georgian_we 0x10010f3
-#define GDK_Georgian_har 0x10010f4
-#define GDK_Georgian_hoe 0x10010f5
-#define GDK_Georgian_fi 0x10010f6
-#define GDK_Xabovedot 0x1001e8a
-#define GDK_Ibreve 0x100012c
-#define GDK_Zstroke 0x10001b5
-#define GDK_Gcaron 0x10001e6
-#define GDK_Ocaron 0x10001d1
-#define GDK_Obarred 0x100019f
-#define GDK_xabovedot 0x1001e8b
-#define GDK_ibreve 0x100012d
-#define GDK_zstroke 0x10001b6
-#define GDK_gcaron 0x10001e7
-#define GDK_ocaron 0x10001d2
-#define GDK_obarred 0x1000275
-#define GDK_SCHWA 0x100018f
-#define GDK_schwa 0x1000259
-#define GDK_Lbelowdot 0x1001e36
-#define GDK_lbelowdot 0x1001e37
-#define GDK_Abelowdot 0x1001ea0
-#define GDK_abelowdot 0x1001ea1
-#define GDK_Ahook 0x1001ea2
-#define GDK_ahook 0x1001ea3
-#define GDK_Acircumflexacute 0x1001ea4
-#define GDK_acircumflexacute 0x1001ea5
-#define GDK_Acircumflexgrave 0x1001ea6
-#define GDK_acircumflexgrave 0x1001ea7
-#define GDK_Acircumflexhook 0x1001ea8
-#define GDK_acircumflexhook 0x1001ea9
-#define GDK_Acircumflextilde 0x1001eaa
-#define GDK_acircumflextilde 0x1001eab
-#define GDK_Acircumflexbelowdot 0x1001eac
-#define GDK_acircumflexbelowdot 0x1001ead
-#define GDK_Abreveacute 0x1001eae
-#define GDK_abreveacute 0x1001eaf
-#define GDK_Abrevegrave 0x1001eb0
-#define GDK_abrevegrave 0x1001eb1
-#define GDK_Abrevehook 0x1001eb2
-#define GDK_abrevehook 0x1001eb3
-#define GDK_Abrevetilde 0x1001eb4
-#define GDK_abrevetilde 0x1001eb5
-#define GDK_Abrevebelowdot 0x1001eb6
-#define GDK_abrevebelowdot 0x1001eb7
-#define GDK_Ebelowdot 0x1001eb8
-#define GDK_ebelowdot 0x1001eb9
-#define GDK_Ehook 0x1001eba
-#define GDK_ehook 0x1001ebb
-#define GDK_Etilde 0x1001ebc
-#define GDK_etilde 0x1001ebd
-#define GDK_Ecircumflexacute 0x1001ebe
-#define GDK_ecircumflexacute 0x1001ebf
-#define GDK_Ecircumflexgrave 0x1001ec0
-#define GDK_ecircumflexgrave 0x1001ec1
-#define GDK_Ecircumflexhook 0x1001ec2
-#define GDK_ecircumflexhook 0x1001ec3
-#define GDK_Ecircumflextilde 0x1001ec4
-#define GDK_ecircumflextilde 0x1001ec5
-#define GDK_Ecircumflexbelowdot 0x1001ec6
-#define GDK_ecircumflexbelowdot 0x1001ec7
-#define GDK_Ihook 0x1001ec8
-#define GDK_ihook 0x1001ec9
-#define GDK_Ibelowdot 0x1001eca
-#define GDK_ibelowdot 0x1001ecb
-#define GDK_Obelowdot 0x1001ecc
-#define GDK_obelowdot 0x1001ecd
-#define GDK_Ohook 0x1001ece
-#define GDK_ohook 0x1001ecf
-#define GDK_Ocircumflexacute 0x1001ed0
-#define GDK_ocircumflexacute 0x1001ed1
-#define GDK_Ocircumflexgrave 0x1001ed2
-#define GDK_ocircumflexgrave 0x1001ed3
-#define GDK_Ocircumflexhook 0x1001ed4
-#define GDK_ocircumflexhook 0x1001ed5
-#define GDK_Ocircumflextilde 0x1001ed6
-#define GDK_ocircumflextilde 0x1001ed7
-#define GDK_Ocircumflexbelowdot 0x1001ed8
-#define GDK_ocircumflexbelowdot 0x1001ed9
-#define GDK_Ohornacute 0x1001eda
-#define GDK_ohornacute 0x1001edb
-#define GDK_Ohorngrave 0x1001edc
-#define GDK_ohorngrave 0x1001edd
-#define GDK_Ohornhook 0x1001ede
-#define GDK_ohornhook 0x1001edf
-#define GDK_Ohorntilde 0x1001ee0
-#define GDK_ohorntilde 0x1001ee1
-#define GDK_Ohornbelowdot 0x1001ee2
-#define GDK_ohornbelowdot 0x1001ee3
-#define GDK_Ubelowdot 0x1001ee4
-#define GDK_ubelowdot 0x1001ee5
-#define GDK_Uhook 0x1001ee6
-#define GDK_uhook 0x1001ee7
-#define GDK_Uhornacute 0x1001ee8
-#define GDK_uhornacute 0x1001ee9
-#define GDK_Uhorngrave 0x1001eea
-#define GDK_uhorngrave 0x1001eeb
-#define GDK_Uhornhook 0x1001eec
-#define GDK_uhornhook 0x1001eed
-#define GDK_Uhorntilde 0x1001eee
-#define GDK_uhorntilde 0x1001eef
-#define GDK_Uhornbelowdot 0x1001ef0
-#define GDK_uhornbelowdot 0x1001ef1
-#define GDK_Ybelowdot 0x1001ef4
-#define GDK_ybelowdot 0x1001ef5
-#define GDK_Yhook 0x1001ef6
-#define GDK_yhook 0x1001ef7
-#define GDK_Ytilde 0x1001ef8
-#define GDK_ytilde 0x1001ef9
-#define GDK_Ohorn 0x10001a0
-#define GDK_ohorn 0x10001a1
-#define GDK_Uhorn 0x10001af
-#define GDK_uhorn 0x10001b0
-#define GDK_EcuSign 0x10020a0
-#define GDK_ColonSign 0x10020a1
-#define GDK_CruzeiroSign 0x10020a2
-#define GDK_FFrancSign 0x10020a3
-#define GDK_LiraSign 0x10020a4
-#define GDK_MillSign 0x10020a5
-#define GDK_NairaSign 0x10020a6
-#define GDK_PesetaSign 0x10020a7
-#define GDK_RupeeSign 0x10020a8
-#define GDK_WonSign 0x10020a9
-#define GDK_NewSheqelSign 0x10020aa
-#define GDK_DongSign 0x10020ab
-#define GDK_EuroSign 0x20ac
-#define GDK_zerosuperior 0x1002070
-#define GDK_foursuperior 0x1002074
-#define GDK_fivesuperior 0x1002075
-#define GDK_sixsuperior 0x1002076
-#define GDK_sevensuperior 0x1002077
-#define GDK_eightsuperior 0x1002078
-#define GDK_ninesuperior 0x1002079
-#define GDK_zerosubscript 0x1002080
-#define GDK_onesubscript 0x1002081
-#define GDK_twosubscript 0x1002082
-#define GDK_threesubscript 0x1002083
-#define GDK_foursubscript 0x1002084
-#define GDK_fivesubscript 0x1002085
-#define GDK_sixsubscript 0x1002086
-#define GDK_sevensubscript 0x1002087
-#define GDK_eightsubscript 0x1002088
-#define GDK_ninesubscript 0x1002089
-#define GDK_partdifferential 0x1002202
-#define GDK_emptyset 0x1002205
-#define GDK_elementof 0x1002208
-#define GDK_notelementof 0x1002209
-#define GDK_containsas 0x100220b
-#define GDK_squareroot 0x100221a
-#define GDK_cuberoot 0x100221b
-#define GDK_fourthroot 0x100221c
-#define GDK_dintegral 0x100222c
-#define GDK_tintegral 0x100222d
-#define GDK_because 0x1002235
-#define GDK_approxeq 0x1002248
-#define GDK_notapproxeq 0x1002247
-#define GDK_notidentical 0x1002262
-#define GDK_stricteq 0x1002263
-
-#endif /* __GDK_KEYSYMS_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkpango.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkpango.h
deleted file mode 100644
index b2fef357..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkpango.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 __GDK_PANGO_H__
-#define __GDK_PANGO_H__
-
-#include <gdk/gdktypes.h>
-
-G_BEGIN_DECLS
-
-/* Pango interaction */
-
-typedef struct _GdkPangoRenderer        GdkPangoRenderer;
-typedef struct _GdkPangoRendererClass   GdkPangoRendererClass;
-typedef struct _GdkPangoRendererPrivate GdkPangoRendererPrivate;
-
-#define GDK_TYPE_PANGO_RENDERER            (gdk_pango_renderer_get_type())
-#define GDK_PANGO_RENDERER(object)         (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_PANGO_RENDERER, GdkPangoRenderer))
-#define GDK_IS_PANGO_RENDERER(object)      (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_PANGO_RENDERER))
-#define GDK_PANGO_RENDERER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_PANGO_RENDERER, GdkPangoRendererClass))
-#define GDK_IS_PANGO_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_PANGO_RENDERER))
-#define GDK_PANGO_RENDERER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_PANGO_RENDERER, GdkPangoRendererClass))
-
-/**
- * GdkPangoRenderer:
- *
- * #GdkPangoRenderer is a subclass of #PangoRenderer used for rendering
- * Pango objects into GDK drawables. The default renderer for a particular
- * screen is obtained with gdk_pango_renderer_get_default(); Pango
- * functions like pango_renderer_draw_layout() and
- * pango_renderer_draw_layout_line() are then used to draw objects with
- * the renderer.
- *
- * In most simple cases, applications can just use gdk_draw_layout(), and
- * don't need to directly use #GdkPangoRenderer at all. Using the
- * #GdkPangoRenderer directly is most useful when working with a
- * transformation such as a rotation, because the Pango drawing functions
- * take user space coordinates (coordinates before the transformation)
- * instead of device coordinates.
- *
- * In certain cases it can be useful to subclass #GdkPangoRenderer. Examples
- * of reasons to do this are to add handling of custom attributes by
- * overriding 'prepare_run' or to do custom drawing of embedded objects
- * by overriding 'draw_shape'.
- *
- * Since: 2.6
- **/
-struct _GdkPangoRenderer
-{
-  /*< private >*/
-  PangoRenderer parent_instance;
-
-  GdkPangoRendererPrivate *priv;
-};
-
-/**
- * GdkPangoRendererClass:
- *
- * #GdkPangoRenderer is the class structure for #GdkPangoRenderer.
- *
- * Since: 2.6
- **/
-struct _GdkPangoRendererClass
-{
-  /*< private >*/
-  PangoRendererClass parent_class;
-};
-
-GType gdk_pango_renderer_get_type (void) G_GNUC_CONST;
-
-PangoRenderer *gdk_pango_renderer_new         (GdkScreen *screen);
-PangoRenderer *gdk_pango_renderer_get_default (GdkScreen *screen);
-
-void gdk_pango_renderer_set_drawable       (GdkPangoRenderer *gdk_renderer,
-					    GdkDrawable      *drawable);
-void gdk_pango_renderer_set_gc             (GdkPangoRenderer *gdk_renderer,
-					    GdkGC            *gc);
-void gdk_pango_renderer_set_stipple        (GdkPangoRenderer *gdk_renderer,
-					    PangoRenderPart   part,
-					    GdkBitmap        *stipple);
-void gdk_pango_renderer_set_override_color (GdkPangoRenderer *gdk_renderer,
-					    PangoRenderPart   part,
-					    const GdkColor   *color);
-
-/************************************************************************/
-
-PangoContext *gdk_pango_context_get_for_screen (GdkScreen    *screen);
-#ifndef GDK_MULTIHEAD_SAFE
-PangoContext *gdk_pango_context_get            (void);
-#endif
-#ifndef GDK_DISABLE_DEPRECATED
-void          gdk_pango_context_set_colormap   (PangoContext *context,
-                                                GdkColormap  *colormap);
-#endif 
-
-
-/* Get a clip region to draw only part of a layout or
- * line. index_ranges contains alternating range starts/stops. The
- * region is the region which contains the given ranges, i.e. if you
- * draw with the region as clip, only the given ranges are drawn.
- */
-
-GdkRegion    *gdk_pango_layout_line_get_clip_region (PangoLayoutLine *line,
-                                                     gint             x_origin,
-                                                     gint             y_origin,
-                                                     gint            *index_ranges,
-                                                     gint             n_ranges);
-GdkRegion    *gdk_pango_layout_get_clip_region      (PangoLayout     *layout,
-                                                     gint             x_origin,
-                                                     gint             y_origin,
-                                                     gint            *index_ranges,
-                                                     gint             n_ranges);
-
-
-
-/* Attributes use to render insensitive text in GTK+. */
-
-typedef struct _GdkPangoAttrStipple GdkPangoAttrStipple;
-typedef struct _GdkPangoAttrEmbossed GdkPangoAttrEmbossed;
-typedef struct _GdkPangoAttrEmbossColor GdkPangoAttrEmbossColor;
-
-struct _GdkPangoAttrStipple
-{
-  PangoAttribute attr;
-  GdkBitmap *stipple;
-};
-
-struct _GdkPangoAttrEmbossed
-{
-  PangoAttribute attr;
-  gboolean embossed;
-};
-
-struct _GdkPangoAttrEmbossColor
-{
-  PangoAttribute attr;
-  PangoColor color;
-};
-
-PangoAttribute *gdk_pango_attr_stipple_new  (GdkBitmap *stipple);
-PangoAttribute *gdk_pango_attr_embossed_new (gboolean embossed);
-PangoAttribute *gdk_pango_attr_emboss_color_new (const GdkColor *color);
-
-G_END_DECLS
-
-#endif /* __GDK_FONT_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkpixbuf.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkpixbuf.h
deleted file mode 100644
index 7ec71644..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkpixbuf.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_PIXBUF_H__
-#define __GDK_PIXBUF_H__
-
-#include <cairo.h>
-#include <gdk/gdktypes.h>
-#include <gdk/gdkrgb.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-G_BEGIN_DECLS
-
-/* Rendering to a drawable */
-
-void gdk_pixbuf_render_threshold_alpha   (GdkPixbuf           *pixbuf,
-					  GdkBitmap           *bitmap,
-					  int                  src_x,
-					  int                  src_y,
-					  int                  dest_x,
-					  int                  dest_y,
-					  int                  width,
-					  int                  height,
-					  int                  alpha_threshold);
-#ifndef GDK_DISABLE_DEPRECATED
-void gdk_pixbuf_render_to_drawable       (GdkPixbuf           *pixbuf,
-					  GdkDrawable         *drawable,
-					  GdkGC               *gc,
-					  int                  src_x,
-					  int                  src_y,
-					  int                  dest_x,
-					  int                  dest_y,
-					  int                  width,
-					  int                  height,
-					  GdkRgbDither         dither,
-					  int                  x_dither,
-					  int                  y_dither);
-void gdk_pixbuf_render_to_drawable_alpha (GdkPixbuf           *pixbuf,
-					  GdkDrawable         *drawable,
-					  int                  src_x,
-					  int                  src_y,
-					  int                  dest_x,
-					  int                  dest_y,
-					  int                  width,
-					  int                  height,
-					  GdkPixbufAlphaMode   alpha_mode,
-					  int                  alpha_threshold,
-					  GdkRgbDither         dither,
-					  int                  x_dither,
-					  int                  y_dither);
-#endif /* GDK_DISABLE_DEPRECATED */
-void gdk_pixbuf_render_pixmap_and_mask_for_colormap (GdkPixbuf    *pixbuf,
-						     GdkColormap  *colormap,
-						     GdkPixmap   **pixmap_return,
-						     GdkBitmap   **mask_return,
-						     int           alpha_threshold);
-#ifndef GDK_MULTIHEAD_SAFE
-void gdk_pixbuf_render_pixmap_and_mask              (GdkPixbuf    *pixbuf,
-						     GdkPixmap   **pixmap_return,
-						     GdkBitmap   **mask_return,
-						     int           alpha_threshold);
-#endif
-
-
-/* Fetching a region from a drawable */
-GdkPixbuf *gdk_pixbuf_get_from_drawable (GdkPixbuf   *dest,
-					 GdkDrawable *src,
-					 GdkColormap *cmap,
-					 int          src_x,
-					 int          src_y,
-					 int          dest_x,
-					 int          dest_y,
-					 int          width,
-					 int          height);
-
-GdkPixbuf *gdk_pixbuf_get_from_image    (GdkPixbuf   *dest,
-                                         GdkImage    *src,
-                                         GdkColormap *cmap,
-                                         int          src_x,
-                                         int          src_y,
-                                         int          dest_x,
-                                         int          dest_y,
-                                         int          width,
-                                         int          height);
-
-G_END_DECLS
-
-#endif /* __GDK_PIXBUF_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkpixmap.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkpixmap.h
deleted file mode 100644
index 1f9190b4..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkpixmap.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_PIXMAP_H__
-#define __GDK_PIXMAP_H__
-
-#include <gdk/gdktypes.h>
-#include <gdk/gdkdrawable.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GdkPixmapObject GdkPixmapObject;
-typedef struct _GdkPixmapObjectClass GdkPixmapObjectClass;
-
-#define GDK_TYPE_PIXMAP              (gdk_pixmap_get_type ())
-#define GDK_PIXMAP(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_PIXMAP, GdkPixmap))
-#define GDK_PIXMAP_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_PIXMAP, GdkPixmapObjectClass))
-#define GDK_IS_PIXMAP(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_PIXMAP))
-#define GDK_IS_PIXMAP_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_PIXMAP))
-#define GDK_PIXMAP_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_PIXMAP, GdkPixmapObjectClass))
-#define GDK_PIXMAP_OBJECT(object)    ((GdkPixmapObject *) GDK_PIXMAP (object))
-
-struct _GdkPixmapObject
-{
-  GdkDrawable parent_instance;
-  
-  GdkDrawable *impl;  /* window-system-specific delegate object */
-
-  gint depth;
-};
-
-struct _GdkPixmapObjectClass
-{
-  GdkDrawableClass parent_class;
-
-};
-
-GType      gdk_pixmap_get_type          (void) G_GNUC_CONST;
-
-/* Pixmaps
- */
-GdkPixmap* gdk_pixmap_new		(GdkDrawable *drawable,
-					 gint	      width,
-					 gint	      height,
-					 gint	      depth);
-GdkBitmap* gdk_bitmap_create_from_data	(GdkDrawable *drawable,
-					 const gchar *data,
-					 gint	      width,
-					 gint	      height);
-GdkPixmap* gdk_pixmap_create_from_data	(GdkDrawable    *drawable,
-					 const gchar 	*data,
-					 gint	     	 width,
-					 gint	     	 height,
-					 gint	         depth,
-					 const GdkColor *fg,
-					 const GdkColor *bg);
-
-GdkPixmap* gdk_pixmap_create_from_xpm            (GdkDrawable    *drawable,
-						  GdkBitmap     **mask,
-						  const GdkColor *transparent_color,
-						  const gchar    *filename);
-GdkPixmap* gdk_pixmap_colormap_create_from_xpm   (GdkDrawable    *drawable,
-						  GdkColormap    *colormap,
-						  GdkBitmap     **mask,
-						  const GdkColor *transparent_color,
-						  const gchar    *filename);
-GdkPixmap* gdk_pixmap_create_from_xpm_d          (GdkDrawable    *drawable,
-						  GdkBitmap     **mask,
-						  const GdkColor *transparent_color,
-						  gchar         **data);
-GdkPixmap* gdk_pixmap_colormap_create_from_xpm_d (GdkDrawable    *drawable,
-						  GdkColormap    *colormap,
-						  GdkBitmap     **mask,
-						  const GdkColor *transparent_color,
-						  gchar         **data);
-
-/* Functions to create/lookup pixmaps from their native equivalents
- */
-#ifndef GDK_MULTIHEAD_SAFE
-GdkPixmap*    gdk_pixmap_foreign_new (GdkNativeWindow anid);
-GdkPixmap*    gdk_pixmap_lookup      (GdkNativeWindow anid);
-#endif /* GDK_MULTIHEAD_SAFE */
-
-GdkPixmap*    gdk_pixmap_foreign_new_for_display (GdkDisplay      *display,
-						  GdkNativeWindow  anid);
-GdkPixmap*    gdk_pixmap_lookup_for_display      (GdkDisplay      *display,
-						  GdkNativeWindow  anid);
-GdkPixmap*    gdk_pixmap_foreign_new_for_screen  (GdkScreen       *screen,
-						  GdkNativeWindow  anid,
-						  gint             width,
-                                                  gint             height,
-                                                  gint             depth);
-
-#ifndef GDK_DISABLE_DEPRECATED
-#define gdk_bitmap_ref                 gdk_drawable_ref
-#define gdk_bitmap_unref               gdk_drawable_unref
-#define gdk_pixmap_ref                 gdk_drawable_ref
-#define gdk_pixmap_unref               gdk_drawable_unref
-#endif /* GDK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GDK_PIXMAP_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkprivate.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkprivate.h
deleted file mode 100644
index 29fc346e..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkprivate.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_PRIVATE_H__
-#define __GDK_PRIVATE_H__
-
-#include <gdk/gdktypes.h>
-#include <gdk/gdkevents.h>
-#include <gdk/gdkfont.h>
-#include <gdk/gdkgc.h>
-#include <gdk/gdkimage.h>
-#include <gdk/gdkregion.h>
-#include <gdk/gdkvisual.h>
-#include <gdk/gdkwindow.h>
-#ifdef USE_MEDIALIB
-#include <gdk/gdkmedialib.h>
-#endif
-
-G_BEGIN_DECLS
-
-#define GDK_PARENT_RELATIVE_BG ((GdkPixmap *)1L)
-#define GDK_NO_BG ((GdkPixmap *)2L)
-
-#define GDK_WINDOW_TYPE(d) (((GdkWindowObject*)(GDK_WINDOW (d)))->window_type)
-#define GDK_WINDOW_DESTROYED(d) (((GdkWindowObject*)(GDK_WINDOW (d)))->destroyed)
-
-void gdk_window_destroy_notify	     (GdkWindow *window);
-
-void gdk_synthesize_window_state (GdkWindow     *window,
-                                  GdkWindowState unset_flags,
-                                  GdkWindowState set_flags);
-
-/* Tests whether a pair of x,y may cause overflows when converted to Pango
- * units (multiplied by PANGO_SCALE).  We don't allow the entire range, leave
- * some space for additions afterwards, to be safe...
- */
-#define GDK_PANGO_UNITS_OVERFLOWS(x,y) (G_UNLIKELY ( \
-	(y) >= PANGO_PIXELS (G_MAXINT-PANGO_SCALE)/2 || \
-	(x) >= PANGO_PIXELS (G_MAXINT-PANGO_SCALE)/2 || \
-	(y) <=-PANGO_PIXELS (G_MAXINT-PANGO_SCALE)/2 || \
-	(x) <=-PANGO_PIXELS (G_MAXINT-PANGO_SCALE)/2))
-
-G_END_DECLS
-
-#endif /* __GDK_PRIVATE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkproperty.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkproperty.h
deleted file mode 100644
index 81b6c540..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkproperty.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_PROPERTY_H__
-#define __GDK_PROPERTY_H__
-
-#include <gdk/gdktypes.h>
-
-G_BEGIN_DECLS
-
-typedef enum
-{
-  GDK_PROP_MODE_REPLACE,
-  GDK_PROP_MODE_PREPEND,
-  GDK_PROP_MODE_APPEND
-} GdkPropMode;
-
-GdkAtom gdk_atom_intern (const gchar *atom_name,
-			 gboolean     only_if_exists);
-GdkAtom gdk_atom_intern_static_string (const gchar *atom_name);
-gchar*  gdk_atom_name   (GdkAtom      atom);
-
-gboolean gdk_property_get    (GdkWindow     *window,
-			      GdkAtom        property,
-			      GdkAtom        type,
-			      gulong         offset,
-			      gulong         length,
-			      gint           pdelete,
-			      GdkAtom       *actual_property_type,
-			      gint          *actual_format,
-			      gint          *actual_length,
-			      guchar       **data);
-void     gdk_property_change (GdkWindow     *window,
-			      GdkAtom        property,
-			      GdkAtom        type,
-			      gint           format,
-			      GdkPropMode    mode,
-			      const guchar  *data,
-			      gint           nelements);
-void     gdk_property_delete (GdkWindow     *window,
-			      GdkAtom        property);
-#ifndef GDK_MULTIHEAD_SAFE
-gint gdk_text_property_to_text_list (GdkAtom        encoding,
-				     gint           format,
-				     const guchar  *text,
-				     gint           length,
-				     gchar       ***list);
-gint gdk_text_property_to_utf8_list (GdkAtom        encoding,
-				     gint           format,
-				     const guchar  *text,
-				     gint           length,
-				     gchar       ***list);
-gboolean gdk_utf8_to_compound_text (const gchar *str,
-				    GdkAtom     *encoding,
-				    gint        *format,
-				    guchar     **ctext,
-				    gint        *length);
-gint gdk_string_to_compound_text    (const gchar   *str,
-				     GdkAtom       *encoding,
-				     gint          *format,
-				     guchar       **ctext,
-				     gint          *length);
-#endif
-
-gint gdk_text_property_to_text_list_for_display (GdkDisplay     *display,
-						 GdkAtom         encoding,
-						 gint            format,
-						 const guchar   *text,
-						 gint            length,
-						 gchar        ***list);
-gint gdk_text_property_to_utf8_list_for_display (GdkDisplay     *display,
-						 GdkAtom         encoding,
-						 gint            format,
-						 const guchar   *text,
-						 gint            length,
-						 gchar        ***list);
-  
-gchar   *gdk_utf8_to_string_target   (const gchar *str);
-gint     gdk_string_to_compound_text_for_display (GdkDisplay   *display,
-						  const gchar  *str,
-						  GdkAtom      *encoding,
-						  gint         *format,
-						  guchar      **ctext,
-						  gint         *length);
-gboolean gdk_utf8_to_compound_text_for_display   (GdkDisplay   *display,
-						  const gchar  *str,
-						  GdkAtom      *encoding,
-						  gint         *format,
-						  guchar      **ctext,
-						  gint         *length);
-
-void gdk_free_text_list             (gchar        **list);
-void gdk_free_compound_text         (guchar        *ctext);
-
-G_END_DECLS
-
-#endif /* __GDK_PROPERTY_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkregion.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkregion.h
deleted file mode 100644
index ce31ba03..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkregion.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_REGION_H__
-#define __GDK_REGION_H__
-
-#include <gdk/gdktypes.h>
-
-G_BEGIN_DECLS
-
-/* GC fill rule for polygons
- *  EvenOddRule
- *  WindingRule
- */
-typedef enum
-{
-  GDK_EVEN_ODD_RULE,
-  GDK_WINDING_RULE
-} GdkFillRule;
-
-/* Types of overlapping between a rectangle and a region
- * GDK_OVERLAP_RECTANGLE_IN: rectangle is in region
- * GDK_OVERLAP_RECTANGLE_OUT: rectangle in not in region
- * GDK_OVERLAP_RECTANGLE_PART: rectangle in partially in region
- */
-typedef enum
-{
-  GDK_OVERLAP_RECTANGLE_IN,
-  GDK_OVERLAP_RECTANGLE_OUT,
-  GDK_OVERLAP_RECTANGLE_PART
-} GdkOverlapType;
-
-typedef void (*GdkSpanFunc) (GdkSpan *span,
-			     gpointer data);
-
-GdkRegion *gdk_region_new       (void);
-GdkRegion *gdk_region_polygon   (GdkPoint     *points,
-				 gint          npoints,
-				 GdkFillRule   fill_rule);
-GdkRegion *gdk_region_copy      (GdkRegion    *region);
-GdkRegion *gdk_region_rectangle (GdkRectangle *rectangle);
-void       gdk_region_destroy   (GdkRegion    *region);
-
-void	       gdk_region_get_clipbox    (GdkRegion     *region,
-                                          GdkRectangle  *rectangle);
-void           gdk_region_get_rectangles (GdkRegion     *region,
-                                          GdkRectangle **rectangles,
-                                          gint          *n_rectangles);
-
-gboolean       gdk_region_empty    (GdkRegion    *region);
-gboolean       gdk_region_equal    (GdkRegion    *region1,
-				    GdkRegion    *region2);
-gboolean       gdk_region_point_in (GdkRegion    *region,
-				    int           x,
-				    int           y);
-GdkOverlapType gdk_region_rect_in  (GdkRegion    *region,
-				    GdkRectangle *rectangle);
-
-void gdk_region_offset          (GdkRegion    *region,
-				 gint          dx,
-				 gint          dy);
-void gdk_region_shrink          (GdkRegion    *region,
-				 gint          dx,
-				 gint          dy);
-void gdk_region_union_with_rect (GdkRegion    *region,
-				 GdkRectangle *rect);
-void gdk_region_intersect       (GdkRegion    *source1,
-				 GdkRegion    *source2);
-void gdk_region_union           (GdkRegion    *source1,
-			 	 GdkRegion    *source2);
-void gdk_region_subtract        (GdkRegion    *source1,
-				 GdkRegion    *source2);
-void gdk_region_xor             (GdkRegion    *source1,
-				 GdkRegion    *source2);
-
-void gdk_region_spans_intersect_foreach (GdkRegion   *region,
-					 GdkSpan     *spans,
-					 int          n_spans,
-					 gboolean     sorted,
-					 GdkSpanFunc  function,
-					 gpointer     data);
-
-G_END_DECLS
-
-#endif /* __GDK_REGION_H__ */
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkrgb.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkrgb.h
deleted file mode 100644
index f0633833..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkrgb.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_RGB_H__
-#define __GDK_RGB_H__
-
-#include <gdk/gdktypes.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GdkRgbCmap GdkRgbCmap;
-
-struct _GdkRgbCmap {
-  guint32 colors[256];
-  gint n_colors;
-
-  /*< private >*/
-  GSList *info_list;
-};
-
-#ifndef GDK_DISABLE_DEPRECATED
-void gdk_rgb_init (void);
-
-gulong gdk_rgb_xpixel_from_rgb   (guint32      rgb) G_GNUC_CONST;
-void   gdk_rgb_gc_set_foreground (GdkGC       *gc,
-				  guint32      rgb);
-void   gdk_rgb_gc_set_background (GdkGC       *gc,
-				  guint32      rgb);
-#define gdk_rgb_get_cmap               gdk_rgb_get_colormap
-#endif /* GDK_DISABLE_DEPRECATED */
-
-void   gdk_rgb_find_color        (GdkColormap *colormap,
-				  GdkColor    *color);
-
-typedef enum
-{
-  GDK_RGB_DITHER_NONE,
-  GDK_RGB_DITHER_NORMAL,
-  GDK_RGB_DITHER_MAX
-} GdkRgbDither;
-
-void        gdk_draw_rgb_image              (GdkDrawable  *drawable,
-					     GdkGC        *gc,
-					     gint          x,
-					     gint          y,
-					     gint          width,
-					     gint          height,
-					     GdkRgbDither  dith,
-					     guchar       *rgb_buf,
-					     gint          rowstride);
-void        gdk_draw_rgb_image_dithalign    (GdkDrawable  *drawable,
-					     GdkGC        *gc,
-					     gint          x,
-					     gint          y,
-					     gint          width,
-					     gint          height,
-					     GdkRgbDither  dith,
-					     guchar       *rgb_buf,
-					     gint          rowstride,
-					     gint          xdith,
-					     gint          ydith);
-void        gdk_draw_rgb_32_image           (GdkDrawable  *drawable,
-					     GdkGC        *gc,
-					     gint          x,
-					     gint          y,
-					     gint          width,
-					     gint          height,
-					     GdkRgbDither  dith,
-					     guchar       *buf,
-					     gint          rowstride);
-void        gdk_draw_rgb_32_image_dithalign (GdkDrawable  *drawable,
-					     GdkGC        *gc,
-					     gint          x,
-					     gint          y,
-					     gint          width,
-					     gint          height,
-					     GdkRgbDither  dith,
-					     guchar       *buf,
-					     gint          rowstride,
-					     gint          xdith,
-					     gint          ydith);
-void        gdk_draw_gray_image             (GdkDrawable  *drawable,
-					     GdkGC        *gc,
-					     gint          x,
-					     gint          y,
-					     gint          width,
-					     gint          height,
-					     GdkRgbDither  dith,
-					     guchar       *buf,
-					     gint          rowstride);
-void        gdk_draw_indexed_image          (GdkDrawable  *drawable,
-					     GdkGC        *gc,
-					     gint          x,
-					     gint          y,
-					     gint          width,
-					     gint          height,
-					     GdkRgbDither  dith,
-					     guchar       *buf,
-					     gint          rowstride,
-					     GdkRgbCmap   *cmap);
-GdkRgbCmap *gdk_rgb_cmap_new                (guint32      *colors,
-					     gint          n_colors);
-void        gdk_rgb_cmap_free               (GdkRgbCmap   *cmap);
-
-void     gdk_rgb_set_verbose (gboolean verbose);
-
-/* experimental colormap stuff */
-void gdk_rgb_set_install    (gboolean install);
-void gdk_rgb_set_min_colors (gint     min_colors);
-
-#ifndef GDK_MULTIHEAD_SAFE
-GdkColormap *gdk_rgb_get_colormap (void);
-GdkVisual *  gdk_rgb_get_visual   (void);
-gboolean     gdk_rgb_ditherable   (void);
-gboolean     gdk_rgb_colormap_ditherable (GdkColormap *cmap);
-#endif
-
-G_END_DECLS
-
-
-#endif /* __GDK_RGB_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkscreen.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkscreen.h
deleted file mode 100644
index 7ff92019..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkscreen.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * gdkscreen.h
- * 
- * Copyright 2001 Sun Microsystems Inc. 
- *
- * Erwann Chenede <erwann.chenede@sun.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 __GDK_SCREEN_H__
-#define __GDK_SCREEN_H__
-
-#include <cairo.h>
-#include "gdk/gdktypes.h"
-#include "gdk/gdkdisplay.h"
-
-G_BEGIN_DECLS
-
-typedef struct _GdkScreenClass GdkScreenClass;
-
-#define GDK_TYPE_SCREEN            (gdk_screen_get_type ())
-#define GDK_SCREEN(object)         (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_SCREEN, GdkScreen))
-#define GDK_SCREEN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_SCREEN, GdkScreenClass))
-#define GDK_IS_SCREEN(object)      (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_SCREEN))
-#define GDK_IS_SCREEN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_SCREEN))
-#define GDK_SCREEN_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_SCREEN, GdkScreenClass))
-
-struct _GdkScreen
-{
-  GObject parent_instance;
-
-  guint closed : 1;
-
-  GdkGC *normal_gcs[32];
-  GdkGC *exposure_gcs[32];
-
-  cairo_font_options_t *font_options;
-  double resolution;		/* pixels/points scale factor for fonts */
-};
-
-struct _GdkScreenClass
-{
-  GObjectClass parent_class;
-
-  void (*size_changed) (GdkScreen *screen);
-  void (*composited_changed) (GdkScreen *screen);
-};
-
-GType        gdk_screen_get_type              (void) G_GNUC_CONST;
-GdkColormap *gdk_screen_get_default_colormap  (GdkScreen   *screen);
-void         gdk_screen_set_default_colormap  (GdkScreen   *screen,
-					       GdkColormap *colormap);
-GdkColormap* gdk_screen_get_system_colormap   (GdkScreen   *screen);
-GdkVisual*   gdk_screen_get_system_visual     (GdkScreen   *screen);
-GdkColormap *gdk_screen_get_rgb_colormap      (GdkScreen   *screen);
-GdkVisual *  gdk_screen_get_rgb_visual        (GdkScreen   *screen);
-GdkColormap *gdk_screen_get_rgba_colormap     (GdkScreen   *screen);
-GdkVisual *  gdk_screen_get_rgba_visual       (GdkScreen   *screen);
-gboolean     gdk_screen_is_composited	      (GdkScreen   *screen);
-
-GdkWindow *  gdk_screen_get_root_window       (GdkScreen   *screen);
-GdkDisplay * gdk_screen_get_display           (GdkScreen   *screen);
-gint         gdk_screen_get_number            (GdkScreen   *screen);
-gint         gdk_screen_get_width             (GdkScreen   *screen);
-gint         gdk_screen_get_height            (GdkScreen   *screen);
-gint         gdk_screen_get_width_mm          (GdkScreen   *screen);
-gint         gdk_screen_get_height_mm         (GdkScreen   *screen);
-
-GList *      gdk_screen_list_visuals          (GdkScreen   *screen);
-GList *      gdk_screen_get_toplevel_windows  (GdkScreen   *screen);
-gchar *      gdk_screen_make_display_name     (GdkScreen   *screen);
-
-gint          gdk_screen_get_n_monitors        (GdkScreen *screen);
-void          gdk_screen_get_monitor_geometry  (GdkScreen *screen,
-						gint       monitor_num,
-						GdkRectangle *dest);
-gint          gdk_screen_get_monitor_at_point  (GdkScreen *screen,
-						gint       x,
-						gint       y);
-gint          gdk_screen_get_monitor_at_window (GdkScreen *screen,
-						GdkWindow *window);
-
-void          gdk_screen_broadcast_client_message  (GdkScreen       *screen,
-						    GdkEvent        *event);
-
-GdkScreen *gdk_screen_get_default (void);
-
-gboolean   gdk_screen_get_setting (GdkScreen   *screen,
-				   const gchar *name,
-				   GValue      *value);
-
-void                        gdk_screen_set_font_options (GdkScreen                  *screen,
-							 const cairo_font_options_t *options);
-const cairo_font_options_t *gdk_screen_get_font_options (GdkScreen                  *screen);
-
-void    gdk_screen_set_resolution (GdkScreen *screen,
-				   gdouble    dpi);
-gdouble gdk_screen_get_resolution (GdkScreen *screen);
-
-GdkWindow *gdk_screen_get_active_window (GdkScreen *screen);
-GList     *gdk_screen_get_window_stack  (GdkScreen *screen);
-
-G_END_DECLS
-
-#endif				/* __GDK_SCREEN_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkselection.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkselection.h
deleted file mode 100644
index 1787c8e5..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkselection.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_SELECTION_H__
-#define __GDK_SELECTION_H__
-
-#include <gdk/gdktypes.h>
-
-G_BEGIN_DECLS
-
-/* Predefined atoms relating to selections. In general, one will need to use
- * gdk_intern_atom
- */
-#define GDK_SELECTION_PRIMARY 		_GDK_MAKE_ATOM (1)
-#define GDK_SELECTION_SECONDARY 	_GDK_MAKE_ATOM (2)
-#define GDK_SELECTION_CLIPBOARD 	_GDK_MAKE_ATOM (69)
-#define GDK_TARGET_BITMAP 		_GDK_MAKE_ATOM (5)
-#define GDK_TARGET_COLORMAP 		_GDK_MAKE_ATOM (7)
-#define GDK_TARGET_DRAWABLE 		_GDK_MAKE_ATOM (17)
-#define GDK_TARGET_PIXMAP 		_GDK_MAKE_ATOM (20)
-#define GDK_TARGET_STRING 		_GDK_MAKE_ATOM (31)
-#define GDK_SELECTION_TYPE_ATOM 	_GDK_MAKE_ATOM (4)
-#define GDK_SELECTION_TYPE_BITMAP 	_GDK_MAKE_ATOM (5)
-#define GDK_SELECTION_TYPE_COLORMAP 	_GDK_MAKE_ATOM (7)
-#define GDK_SELECTION_TYPE_DRAWABLE 	_GDK_MAKE_ATOM (17)
-#define GDK_SELECTION_TYPE_INTEGER 	_GDK_MAKE_ATOM (19)
-#define GDK_SELECTION_TYPE_PIXMAP 	_GDK_MAKE_ATOM (20)
-#define GDK_SELECTION_TYPE_WINDOW 	_GDK_MAKE_ATOM (33)
-#define GDK_SELECTION_TYPE_STRING 	_GDK_MAKE_ATOM (31)
-
-#ifndef GDK_DISABLE_DEPRECATED
-
-typedef GdkAtom GdkSelection;
-typedef GdkAtom GdkTarget;
-typedef GdkAtom GdkSelectionType;
-
-#endif /* GDK_DISABLE_DEPRECATED */
-
-/* Selections
- */
-
-#ifndef GDK_MULTIHEAD_SAFE
-gboolean   gdk_selection_owner_set (GdkWindow	 *owner,
-				    GdkAtom	  selection,
-				    guint32	  time_,
-				    gboolean      send_event);
-GdkWindow* gdk_selection_owner_get (GdkAtom	  selection);
-#endif/* GDK_MULTIHEAD_SAFE */
-
-gboolean   gdk_selection_owner_set_for_display (GdkDisplay *display,
-						GdkWindow  *owner,
-						GdkAtom     selection,
-						guint32     time_,
-						gboolean    send_event);
-GdkWindow *gdk_selection_owner_get_for_display (GdkDisplay *display,
-						GdkAtom     selection);
-
-void	   gdk_selection_convert   (GdkWindow	 *requestor,
-				    GdkAtom	  selection,
-				    GdkAtom	  target,
-				    guint32	  time_);
-gboolean   gdk_selection_property_get (GdkWindow  *requestor,
-				       guchar	 **data,
-				       GdkAtom	  *prop_type,
-				       gint	  *prop_format);
-
-#ifndef GDK_MULTIHEAD_SAFE
-void	   gdk_selection_send_notify (guint32	    requestor,
-				      GdkAtom	    selection,
-				      GdkAtom	    target,
-				      GdkAtom	    property,
-				      guint32	    time_);
-#endif /* GDK_MULTIHEAD_SAFE */
-
-void       gdk_selection_send_notify_for_display (GdkDisplay *display,
-						  guint32     requestor,
-						  GdkAtom     selection,
-						  GdkAtom     target,
-						  GdkAtom     property,
-						  guint32     time_);
-
-G_END_DECLS
-
-#endif /* __GDK_SELECTION_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkspawn.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkspawn.h
deleted file mode 100644
index 72901010..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkspawn.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2003 Sun Microsystems 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.
- *
- * Authors: Mark McLoughlin <mark@skynet.ie>
- */
-
-#ifndef __GDK_SPAWN_H__
-#define __GDK_SPAWN_H__
-
-#include <gdk/gdkscreen.h>
-#include <glib/gspawn.h>
-
-G_BEGIN_DECLS
-
-gboolean gdk_spawn_on_screen              (GdkScreen             *screen,
-					   const gchar           *working_directory,
-					   gchar                **argv,
-					   gchar                **envp,
-					   GSpawnFlags            flags,
-					   GSpawnChildSetupFunc   child_setup,
-					   gpointer               user_data,
-					   gint                  *child_pid,
-					   GError               **error);
-
-gboolean gdk_spawn_on_screen_with_pipes   (GdkScreen             *screen,
-					   const gchar           *working_directory,
-					   gchar                **argv,
-					   gchar                **envp,
-					   GSpawnFlags            flags,
-					   GSpawnChildSetupFunc   child_setup,
-					   gpointer               user_data,
-					   gint                  *child_pid,
-					   gint                  *standard_input,
-					   gint                  *standard_output,
-					   gint                  *standard_error,
-					   GError               **error);
-
-gboolean gdk_spawn_command_line_on_screen (GdkScreen             *screen,
-					   const gchar           *command_line,
-					   GError               **error);
-
-G_END_DECLS
-
-#endif /* __GDK_SPAWN_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdktypes.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdktypes.h
deleted file mode 100644
index 648bb40e..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdktypes.h
+++ /dev/null
@@ -1,212 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_TYPES_H__
-#define __GDK_TYPES_H__
-
-/* GDK uses "glib". (And so does GTK).
- */
-#include <glib.h>
-#include <pango/pango.h>
-#include <glib-object.h>
-
-#ifdef G_OS_WIN32
-#  ifdef GDK_COMPILATION
-#    define GDKVAR __declspec(dllexport)
-#  else
-#    define GDKVAR extern __declspec(dllimport)
-#  endif
-#else
-#  define GDKVAR extern
-#endif
-
-/* The system specific file gdkconfig.h contains such configuration
- * settings that are needed not only when compiling GDK (or GTK)
- * itself, but also occasionally when compiling programs that use GDK
- * (or GTK). One such setting is what windowing API backend is in use.
- */
-#include <gdkconfig.h>
-
-/* some common magic values */
-#define GDK_CURRENT_TIME     0L
-#define GDK_PARENT_RELATIVE  1L
-
-
-
-G_BEGIN_DECLS
-
-
-/* Type definitions for the basic structures.
- */
-typedef struct _GdkPoint	      GdkPoint;
-typedef struct _GdkRectangle	      GdkRectangle;
-typedef struct _GdkSegment	      GdkSegment;
-typedef struct _GdkSpan	              GdkSpan;
-
-/*
- * Note that on some platforms the wchar_t type
- * is not the same as GdkWChar. For instance
- * on Win32, wchar_t is unsigned short.
- */
-typedef guint32			    GdkWChar;
-
-typedef struct _GdkAtom            *GdkAtom;
-
-#define GDK_ATOM_TO_POINTER(atom) (atom)
-#define GDK_POINTER_TO_ATOM(ptr)  ((GdkAtom)(ptr))
-
-#define _GDK_MAKE_ATOM(val) ((GdkAtom)GUINT_TO_POINTER(val))
-#define GDK_NONE            _GDK_MAKE_ATOM (0)
-
-#ifdef GDK_NATIVE_WINDOW_POINTER
-typedef gpointer GdkNativeWindow;
-#else
-typedef guint32 GdkNativeWindow;
-#endif
- 
-/* Forward declarations of commonly used types
- */
-typedef struct _GdkColor	      GdkColor;
-typedef struct _GdkColormap	      GdkColormap;
-typedef struct _GdkCursor	      GdkCursor;
-typedef struct _GdkFont		      GdkFont;
-typedef struct _GdkGC                 GdkGC;
-typedef struct _GdkImage              GdkImage;
-typedef struct _GdkRegion             GdkRegion;
-typedef struct _GdkVisual             GdkVisual;
-
-typedef struct _GdkDrawable           GdkDrawable;
-typedef struct _GdkDrawable           GdkBitmap;
-typedef struct _GdkDrawable           GdkPixmap;
-typedef struct _GdkDrawable           GdkWindow;
-typedef struct _GdkDisplay	      GdkDisplay;
-typedef struct _GdkScreen	      GdkScreen;
-
-typedef enum
-{
-  GDK_LSB_FIRST,
-  GDK_MSB_FIRST
-} GdkByteOrder;
-
-/* Types of modifiers.
- */
-typedef enum
-{
-  GDK_SHIFT_MASK    = 1 << 0,
-  GDK_LOCK_MASK	    = 1 << 1,
-  GDK_CONTROL_MASK  = 1 << 2,
-  GDK_MOD1_MASK	    = 1 << 3,
-  GDK_MOD2_MASK	    = 1 << 4,
-  GDK_MOD3_MASK	    = 1 << 5,
-  GDK_MOD4_MASK	    = 1 << 6,
-  GDK_MOD5_MASK	    = 1 << 7,
-  GDK_BUTTON1_MASK  = 1 << 8,
-  GDK_BUTTON2_MASK  = 1 << 9,
-  GDK_BUTTON3_MASK  = 1 << 10,
-  GDK_BUTTON4_MASK  = 1 << 11,
-  GDK_BUTTON5_MASK  = 1 << 12,
-
-  /* The next few modifiers are used by XKB, so we skip to the end.
-   * Bits 15 - 25 are currently unused. Bit 29 is used internally.
-   */
-  
-  GDK_SUPER_MASK    = 1 << 26,
-  GDK_HYPER_MASK    = 1 << 27,
-  GDK_META_MASK     = 1 << 28,
-  
-  GDK_RELEASE_MASK  = 1 << 30,
-
-  GDK_MODIFIER_MASK = 0x5c001fff
-} GdkModifierType;
-
-typedef enum
-{
-  GDK_INPUT_READ       = 1 << 0,
-  GDK_INPUT_WRITE      = 1 << 1,
-  GDK_INPUT_EXCEPTION  = 1 << 2
-} GdkInputCondition;
-
-typedef enum
-{
-  GDK_OK	  = 0,
-  GDK_ERROR	  = -1,
-  GDK_ERROR_PARAM = -2,
-  GDK_ERROR_FILE  = -3,
-  GDK_ERROR_MEM	  = -4
-} GdkStatus;
-
-/* We define specific numeric values for these constants,
- * since old application code may depend on them matching the X values
- * We don't actually depend on the matchup ourselves.
- */
-typedef enum
-{
-  GDK_GRAB_SUCCESS         = 0,
-  GDK_GRAB_ALREADY_GRABBED = 1,
-  GDK_GRAB_INVALID_TIME    = 2,
-  GDK_GRAB_NOT_VIEWABLE    = 3,
-  GDK_GRAB_FROZEN          = 4
-} GdkGrabStatus;
-
-typedef void (*GdkInputFunction) (gpointer	    data,
-				  gint		    source,
-				  GdkInputCondition condition);
-
-typedef void (*GdkDestroyNotify) (gpointer data);
-
-struct _GdkPoint
-{
-  gint x;
-  gint y;
-};
-
-struct _GdkRectangle
-{
-  gint x;
-  gint y;
-  gint width;
-  gint height;
-};
-
-struct _GdkSegment
-{
-  gint x1;
-  gint y1;
-  gint x2;
-  gint y2;
-};
-
-struct _GdkSpan
-{
-  gint x;
-  gint y;
-  gint width;
-};
-
-G_END_DECLS
-
-
-#endif /* __GDK_TYPES_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkvisual.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkvisual.h
deleted file mode 100644
index e49439f4..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkvisual.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_VISUAL_H__
-#define __GDK_VISUAL_H__
-
-#include <gdk/gdktypes.h>
-
-G_BEGIN_DECLS
-
-#define GDK_TYPE_VISUAL              (gdk_visual_get_type ())
-#define GDK_VISUAL(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_VISUAL, GdkVisual))
-#define GDK_VISUAL_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_VISUAL, GdkVisualClass))
-#define GDK_IS_VISUAL(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_VISUAL))
-#define GDK_IS_VISUAL_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_VISUAL))
-#define GDK_VISUAL_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_VISUAL, GdkVisualClass))
-
-typedef struct _GdkVisualClass    GdkVisualClass;
-
-/* Types of visuals.
- *   StaticGray:
- *   Grayscale:
- *   StaticColor:
- *   PseudoColor:
- *   TrueColor:
- *   DirectColor:
- */
-typedef enum
-{
-  GDK_VISUAL_STATIC_GRAY,
-  GDK_VISUAL_GRAYSCALE,
-  GDK_VISUAL_STATIC_COLOR,
-  GDK_VISUAL_PSEUDO_COLOR,
-  GDK_VISUAL_TRUE_COLOR,
-  GDK_VISUAL_DIRECT_COLOR
-} GdkVisualType;
-
-/* The visual type.
- *   "type" is the type of visual this is (PseudoColor, TrueColor, etc).
- *   "depth" is the bit depth of this visual.
- *   "colormap_size" is the size of a colormap for this visual.
- *   "bits_per_rgb" is the number of significant bits per red, green and blue.
- *  The red, green and blue masks, shifts and precisions refer
- *   to value needed to calculate pixel values in TrueColor and DirectColor
- *   visuals. The "mask" is the significant bits within the pixel. The
- *   "shift" is the number of bits left we must shift a primary for it
- *   to be in position (according to the "mask"). "prec" refers to how
- *   much precision the pixel value contains for a particular primary.
- */
-struct _GdkVisual
-{
-  GObject parent_instance;
-  
-  GdkVisualType type;
-  gint depth;
-  GdkByteOrder byte_order;
-  gint colormap_size;
-  gint bits_per_rgb;
-
-  guint32 red_mask;
-  gint red_shift;
-  gint red_prec;
-
-  guint32 green_mask;
-  gint green_shift;
-  gint green_prec;
-
-  guint32 blue_mask;
-  gint blue_shift;
-  gint blue_prec;
-};
-
-GType         gdk_visual_get_type            (void) G_GNUC_CONST;
-
-#ifndef GDK_MULTIHEAD_SAFE
-gint	      gdk_visual_get_best_depth	     (void);
-GdkVisualType gdk_visual_get_best_type	     (void);
-GdkVisual*    gdk_visual_get_system	     (void);
-GdkVisual*    gdk_visual_get_best	     (void);
-GdkVisual*    gdk_visual_get_best_with_depth (gint	     depth);
-GdkVisual*    gdk_visual_get_best_with_type  (GdkVisualType  visual_type);
-GdkVisual*    gdk_visual_get_best_with_both  (gint	     depth,
-					      GdkVisualType  visual_type);
-
-void gdk_query_depths	    (gint	    **depths,
-			     gint	     *count);
-void gdk_query_visual_types (GdkVisualType  **visual_types,
-			     gint	     *count);
-
-GList* gdk_list_visuals (void);
-#endif
-
-GdkScreen *gdk_visual_get_screen (GdkVisual *visual);
-
-#ifndef GDK_DISABLE_DEPRECATED
-#define gdk_visual_ref(v) g_object_ref(v)
-#define gdk_visual_unref(v) g_object_unref(v)
-#endif
-
-G_END_DECLS
-
-#endif /* __GDK_VISUAL_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkwindow.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkwindow.h
deleted file mode 100644
index 3e169c43..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkwindow.h
+++ /dev/null
@@ -1,657 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_WINDOW_H__
-#define __GDK_WINDOW_H__
-
-#include <gdk/gdkdrawable.h>
-#include <gdk/gdktypes.h>
-#include <gdk/gdkevents.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GdkGeometry           GdkGeometry;
-typedef struct _GdkWindowAttr	      GdkWindowAttr;
-typedef struct _GdkPointerHooks	      GdkPointerHooks;
-
-/* Classes of windows.
- *   InputOutput: Almost every window should be of this type. Such windows
- *		  receive events and are also displayed on screen.
- *   InputOnly: Used only in special circumstances when events need to be
- *		stolen from another window or windows. Input only windows
- *		have no visible output, so they are handy for placing over
- *		top of a group of windows in order to grab the events (or
- *		filter the events) from those windows.
- */
-typedef enum
-{
-  GDK_INPUT_OUTPUT,
-  GDK_INPUT_ONLY
-} GdkWindowClass;
-
-/* Types of windows.
- *   Root: There is only 1 root window and it is initialized
- *	   at startup. Creating a window of type GDK_WINDOW_ROOT
- *	   is an error.
- *   Toplevel: Windows which interact with the window manager.
- *   Child: Windows which are children of some other type of window.
- *	    (Any other type of window). Most windows are child windows.
- *   Dialog: A special kind of toplevel window which interacts with
- *	     the window manager slightly differently than a regular
- *	     toplevel window. Dialog windows should be used for any
- *	     transient window.
- *   Foreign: A window that actually belongs to another application
- */
-typedef enum
-{
-  GDK_WINDOW_ROOT,
-  GDK_WINDOW_TOPLEVEL,
-  GDK_WINDOW_CHILD,
-  GDK_WINDOW_DIALOG,
-  GDK_WINDOW_TEMP,
-  GDK_WINDOW_FOREIGN
-} GdkWindowType;
-
-/* Window attribute mask values.
- *   GDK_WA_TITLE: The "title" field is valid.
- *   GDK_WA_X: The "x" field is valid.
- *   GDK_WA_Y: The "y" field is valid.
- *   GDK_WA_CURSOR: The "cursor" field is valid.
- *   GDK_WA_COLORMAP: The "colormap" field is valid.
- *   GDK_WA_VISUAL: The "visual" field is valid.
- */
-typedef enum
-{
-  GDK_WA_TITLE	   = 1 << 1,
-  GDK_WA_X	   = 1 << 2,
-  GDK_WA_Y	   = 1 << 3,
-  GDK_WA_CURSOR	   = 1 << 4,
-  GDK_WA_COLORMAP  = 1 << 5,
-  GDK_WA_VISUAL	   = 1 << 6,
-  GDK_WA_WMCLASS   = 1 << 7,
-  GDK_WA_NOREDIR   = 1 << 8,
-  GDK_WA_TYPE_HINT = 1 << 9
-} GdkWindowAttributesType;
-
-/* Size restriction enumeration.
- */
-typedef enum
-{
-  GDK_HINT_POS	       = 1 << 0,
-  GDK_HINT_MIN_SIZE    = 1 << 1,
-  GDK_HINT_MAX_SIZE    = 1 << 2,
-  GDK_HINT_BASE_SIZE   = 1 << 3,
-  GDK_HINT_ASPECT      = 1 << 4,
-  GDK_HINT_RESIZE_INC  = 1 << 5,
-  GDK_HINT_WIN_GRAVITY = 1 << 6,
-  GDK_HINT_USER_POS    = 1 << 7,
-  GDK_HINT_USER_SIZE   = 1 << 8
-} GdkWindowHints;
-
-
-/* Window type hints.
- * These are hints for the window manager that indicate
- * what type of function the window has. The window manager
- * can use this when determining decoration and behaviour
- * of the window. The hint must be set before mapping the
- * window.
- *
- *   Normal: Normal toplevel window
- *   Dialog: Dialog window
- *   Menu: Window used to implement a menu.
- *   Toolbar: Window used to implement toolbars.
- */
-typedef enum
-{
-  GDK_WINDOW_TYPE_HINT_NORMAL,
-  GDK_WINDOW_TYPE_HINT_DIALOG,
-  GDK_WINDOW_TYPE_HINT_MENU,		/* Torn off menu */
-  GDK_WINDOW_TYPE_HINT_TOOLBAR,
-  GDK_WINDOW_TYPE_HINT_SPLASHSCREEN,
-  GDK_WINDOW_TYPE_HINT_UTILITY,
-  GDK_WINDOW_TYPE_HINT_DOCK,
-  GDK_WINDOW_TYPE_HINT_DESKTOP,
-  GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU,	/* A drop down menu (from a menubar) */
-  GDK_WINDOW_TYPE_HINT_POPUP_MENU,	/* A popup menu (from right-click) */
-  GDK_WINDOW_TYPE_HINT_TOOLTIP,
-  GDK_WINDOW_TYPE_HINT_NOTIFICATION,
-  GDK_WINDOW_TYPE_HINT_COMBO,
-  GDK_WINDOW_TYPE_HINT_DND
-} GdkWindowTypeHint;
-
-/* The next two enumeration values current match the
- * Motif constants. If this is changed, the implementation
- * of gdk_window_set_decorations/gdk_window_set_functions
- * will need to change as well.
- */
-typedef enum
-{
-  GDK_DECOR_ALL		= 1 << 0,
-  GDK_DECOR_BORDER	= 1 << 1,
-  GDK_DECOR_RESIZEH	= 1 << 2,
-  GDK_DECOR_TITLE	= 1 << 3,
-  GDK_DECOR_MENU	= 1 << 4,
-  GDK_DECOR_MINIMIZE	= 1 << 5,
-  GDK_DECOR_MAXIMIZE	= 1 << 6
-} GdkWMDecoration;
-
-typedef enum
-{
-  GDK_FUNC_ALL		= 1 << 0,
-  GDK_FUNC_RESIZE	= 1 << 1,
-  GDK_FUNC_MOVE		= 1 << 2,
-  GDK_FUNC_MINIMIZE	= 1 << 3,
-  GDK_FUNC_MAXIMIZE	= 1 << 4,
-  GDK_FUNC_CLOSE	= 1 << 5
-} GdkWMFunction;
-
-/* Currently, these are the same values numerically as in the
- * X protocol. If you change that, gdkwindow-x11.c/gdk_window_set_geometry_hints()
- * will need fixing.
- */
-typedef enum
-{
-  GDK_GRAVITY_NORTH_WEST = 1,
-  GDK_GRAVITY_NORTH,
-  GDK_GRAVITY_NORTH_EAST,
-  GDK_GRAVITY_WEST,
-  GDK_GRAVITY_CENTER,
-  GDK_GRAVITY_EAST,
-  GDK_GRAVITY_SOUTH_WEST,
-  GDK_GRAVITY_SOUTH,
-  GDK_GRAVITY_SOUTH_EAST,
-  GDK_GRAVITY_STATIC
-} GdkGravity;
-
-
-typedef enum
-{
-  GDK_WINDOW_EDGE_NORTH_WEST,
-  GDK_WINDOW_EDGE_NORTH,
-  GDK_WINDOW_EDGE_NORTH_EAST,
-  GDK_WINDOW_EDGE_WEST,
-  GDK_WINDOW_EDGE_EAST,
-  GDK_WINDOW_EDGE_SOUTH_WEST,
-  GDK_WINDOW_EDGE_SOUTH,
-  GDK_WINDOW_EDGE_SOUTH_EAST  
-} GdkWindowEdge;
-
-struct _GdkWindowAttr
-{
-  gchar *title;
-  gint event_mask;
-  gint x, y;
-  gint width;
-  gint height;
-  GdkWindowClass wclass;
-  GdkVisual *visual;
-  GdkColormap *colormap;
-  GdkWindowType window_type;
-  GdkCursor *cursor;
-  gchar *wmclass_name;
-  gchar *wmclass_class;
-  gboolean override_redirect;
-  GdkWindowTypeHint type_hint;
-};
-
-struct _GdkGeometry
-{
-  gint min_width;
-  gint min_height;
-  gint max_width;
-  gint max_height;
-  gint base_width;
-  gint base_height;
-  gint width_inc;
-  gint height_inc;
-  gdouble min_aspect;
-  gdouble max_aspect;
-  GdkGravity win_gravity;
-};
-
-struct _GdkPointerHooks 
-{
-  GdkWindow* (*get_pointer)       (GdkWindow	   *window,
-			           gint	           *x,
-			           gint   	   *y,
-			           GdkModifierType *mask);
-  GdkWindow* (*window_at_pointer) (GdkScreen       *screen, /* unused */
-                                   gint            *win_x,
-                                   gint            *win_y);
-};
-
-typedef struct _GdkWindowObject GdkWindowObject;
-typedef struct _GdkWindowObjectClass GdkWindowObjectClass;
-
-#define GDK_TYPE_WINDOW              (gdk_window_object_get_type ())
-#define GDK_WINDOW(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_WINDOW, GdkWindow))
-#define GDK_WINDOW_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_WINDOW, GdkWindowObjectClass))
-#define GDK_IS_WINDOW(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_WINDOW))
-#define GDK_IS_WINDOW_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_WINDOW))
-#define GDK_WINDOW_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_WINDOW, GdkWindowObjectClass))
-#define GDK_WINDOW_OBJECT(object)    ((GdkWindowObject *) GDK_WINDOW (object))
-
-struct _GdkWindowObject
-{
-  GdkDrawable parent_instance;
-
-  GdkDrawable *impl; /* window-system-specific delegate object */  
-  
-  GdkWindowObject *parent;
-
-  gpointer user_data;
-
-  gint x;
-  gint y;
-  
-  gint extension_events;
-
-  GList *filters;
-  GList *children;
-
-  GdkColor bg_color;
-  GdkPixmap *bg_pixmap;
-  
-  GSList *paint_stack;
-  
-  GdkRegion *update_area;
-  guint update_freeze_count;
-  
-  guint8 window_type;
-  guint8 depth;
-  guint8 resize_count;
-
-  GdkWindowState state;
-  
-  guint guffaw_gravity : 1;
-  guint input_only : 1;
-  guint modal_hint : 1;
-  guint composited : 1;
-  
-  guint destroyed : 2;
-
-  guint accept_focus : 1;
-  guint focus_on_map : 1;
-  guint shaped : 1;
-  
-  GdkEventMask event_mask;
-
-  guint update_and_descendants_freeze_count;
-};
-
-struct _GdkWindowObjectClass
-{
-  GdkDrawableClass parent_class;
-};
-
-/* Windows
- */
-GType         gdk_window_object_get_type       (void) G_GNUC_CONST;
-GdkWindow*    gdk_window_new                   (GdkWindow     *parent,
-                                                GdkWindowAttr *attributes,
-                                                gint           attributes_mask);
-void          gdk_window_destroy               (GdkWindow     *window);
-GdkWindowType gdk_window_get_window_type       (GdkWindow     *window);
-GdkWindow*    gdk_window_at_pointer            (gint          *win_x,
-                                                gint          *win_y);
-void          gdk_window_show                  (GdkWindow     *window);
-void          gdk_window_hide                  (GdkWindow     *window);
-void          gdk_window_withdraw              (GdkWindow     *window);
-void          gdk_window_show_unraised         (GdkWindow     *window);
-void          gdk_window_move                  (GdkWindow     *window,
-                                                gint           x,
-                                                gint           y);
-void          gdk_window_resize                (GdkWindow     *window,
-                                                gint           width,
-                                                gint           height);
-void          gdk_window_move_resize           (GdkWindow     *window,
-                                                gint           x,
-                                                gint           y,
-                                                gint           width,
-                                                gint           height);
-void          gdk_window_reparent              (GdkWindow     *window,
-                                                GdkWindow     *new_parent,
-                                                gint           x,
-                                                gint           y);
-void          gdk_window_clear                 (GdkWindow     *window);
-void          gdk_window_clear_area            (GdkWindow     *window,
-                                                gint           x,
-                                                gint           y,
-                                                gint           width,
-                                                gint           height);
-void          gdk_window_clear_area_e          (GdkWindow     *window,
-                                                gint           x,
-                                                gint           y,
-                                                gint           width,
-                                                gint           height);
-void          gdk_window_raise                 (GdkWindow     *window);
-void          gdk_window_lower                 (GdkWindow     *window);
-void          gdk_window_focus                 (GdkWindow     *window,
-                                                guint32        timestamp);
-void          gdk_window_set_user_data         (GdkWindow     *window,
-                                                gpointer       user_data);
-void          gdk_window_set_override_redirect (GdkWindow     *window,
-                                                gboolean       override_redirect);
-void          gdk_window_set_accept_focus      (GdkWindow     *window,
-					        gboolean       accept_focus);
-void          gdk_window_set_focus_on_map      (GdkWindow     *window,
-					        gboolean       focus_on_map);
-void          gdk_window_add_filter            (GdkWindow     *window,
-                                                GdkFilterFunc  function,
-                                                gpointer       data);
-void          gdk_window_remove_filter         (GdkWindow     *window,
-                                                GdkFilterFunc  function,
-                                                gpointer       data);
-void          gdk_window_scroll                (GdkWindow *window,
-                                                gint       dx,
-                                                gint       dy);
-void	      gdk_window_move_region           (GdkWindow *window,
-						GdkRegion *region,
-						gint       dx,
-						gint       dy);
-
-/* 
- * This allows for making shaped (partially transparent) windows
- * - cool feature, needed for Drag and Drag for example.
- *  The shape_mask can be the mask
- *  from gdk_pixmap_create_from_xpm.   Stefan Wille
- */
-void gdk_window_shape_combine_mask  (GdkWindow	    *window,
-                                     GdkBitmap	    *mask,
-                                     gint	     x,
-                                     gint	     y);
-void gdk_window_shape_combine_region (GdkWindow	    *window,
-                                      GdkRegion     *shape_region,
-                                      gint	     offset_x,
-                                      gint	     offset_y);
-
-/*
- * This routine allows you to quickly take the shapes of all the child windows
- * of a window and use their shapes as the shape mask for this window - useful
- * for container windows that dont want to look like a big box
- * 
- * - Raster
- */
-void gdk_window_set_child_shapes (GdkWindow *window);
-
-void gdk_window_set_composited   (GdkWindow *window,
-                                  gboolean composited);
-
-/*
- * This routine allows you to merge (ie ADD) child shapes to your
- * own window's shape keeping its current shape and ADDING the child
- * shapes to it.
- * 
- * - Raster
- */
-void gdk_window_merge_child_shapes (GdkWindow *window);
-
-void gdk_window_input_shape_combine_mask   (GdkWindow *window,
-					    GdkBitmap *mask,
-					    gint       x,
-					    gint       y);
-void gdk_window_input_shape_combine_region (GdkWindow *window,
-                                            GdkRegion *shape_region,
-                                            gint       offset_x,
-                                            gint       offset_y);
-void gdk_window_set_child_input_shapes     (GdkWindow *window);
-void gdk_window_merge_child_input_shapes   (GdkWindow *window);
-
-
-/*
- * Check if a window has been shown, and whether all its
- * parents up to a toplevel have been shown, respectively.
- * Note that a window that is_viewable below is not necessarily
- * viewable in the X sense.
- */
-gboolean gdk_window_is_visible     (GdkWindow *window);
-gboolean gdk_window_is_viewable    (GdkWindow *window);
-
-GdkWindowState gdk_window_get_state (GdkWindow *window);
-
-/* Set static bit gravity on the parent, and static
- * window gravity on all children.
- */
-gboolean gdk_window_set_static_gravities (GdkWindow *window,
-					  gboolean   use_static);   
-
-/* Functions to create/lookup windows from their native equivalents */ 
-#ifndef GDK_MULTIHEAD_SAFE
-GdkWindow*    gdk_window_foreign_new (GdkNativeWindow anid);
-GdkWindow*    gdk_window_lookup      (GdkNativeWindow anid);
-#endif
-GdkWindow    *gdk_window_foreign_new_for_display (GdkDisplay      *display,
-						  GdkNativeWindow  anid);
-GdkWindow*    gdk_window_lookup_for_display (GdkDisplay      *display,
-					     GdkNativeWindow  anid);
-
-
-/* GdkWindow */
-
-#ifndef GDK_DISABLE_DEPRECATED
-void	      gdk_window_set_hints	 (GdkWindow	  *window,
-					  gint		   x,
-					  gint		   y,
-					  gint		   min_width,
-					  gint		   min_height,
-					  gint		   max_width,
-					  gint		   max_height,
-					  gint		   flags);
-#endif
-void              gdk_window_set_type_hint (GdkWindow        *window,
-                                            GdkWindowTypeHint hint);
-GdkWindowTypeHint gdk_window_get_type_hint (GdkWindow        *window);
-
-void          gdk_window_set_modal_hint   (GdkWindow       *window,
-                                           gboolean         modal);
-
-void gdk_window_set_skip_taskbar_hint (GdkWindow *window,
-                                       gboolean   skips_taskbar);
-void gdk_window_set_skip_pager_hint   (GdkWindow *window,
-                                       gboolean   skips_pager);
-void gdk_window_set_urgency_hint      (GdkWindow *window,
-				       gboolean   urgent);
-
-void          gdk_window_set_geometry_hints (GdkWindow        *window,
-					     GdkGeometry      *geometry,
-					     GdkWindowHints    geom_mask);
-void          gdk_set_sm_client_id         (const gchar *sm_client_id);
-
-void	      gdk_window_begin_paint_rect   (GdkWindow    *window,
-					     GdkRectangle *rectangle);
-void	      gdk_window_begin_paint_region (GdkWindow    *window,
-					     GdkRegion    *region);
-void	      gdk_window_end_paint          (GdkWindow    *window);
-
-void	      gdk_window_set_title	   (GdkWindow	  *window,
-					    const gchar	  *title);
-void          gdk_window_set_role          (GdkWindow       *window,
-					    const gchar     *role);
-void          gdk_window_set_startup_id    (GdkWindow       *window,
-					    const gchar     *startup_id);					  
-void          gdk_window_set_transient_for (GdkWindow       *window, 
-					    GdkWindow       *parent);
-void	      gdk_window_set_background	 (GdkWindow	  *window,
-					  const GdkColor  *color);
-void	      gdk_window_set_back_pixmap (GdkWindow	  *window,
-					  GdkPixmap	  *pixmap,
-					  gboolean	   parent_relative);
-void	      gdk_window_set_cursor	 (GdkWindow	  *window,
-					  GdkCursor	  *cursor);
-void	      gdk_window_get_user_data	 (GdkWindow	  *window,
-					  gpointer	  *data);
-void	      gdk_window_get_geometry	 (GdkWindow	  *window,
-					  gint		  *x,
-					  gint		  *y,
-					  gint		  *width,
-					  gint		  *height,
-					  gint		  *depth);
-void	      gdk_window_get_position	 (GdkWindow	  *window,
-					  gint		  *x,
-					  gint		  *y);
-gint	      gdk_window_get_origin	 (GdkWindow	  *window,
-					  gint		  *x,
-					  gint		  *y);
-
-#if !defined (GDK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
-/* Used by gtk_handle_box_button_changed () */
-gboolean      gdk_window_get_deskrelative_origin (GdkWindow	  *window,
-					  gint		  *x,
-					  gint		  *y);
-#endif
-
-void	      gdk_window_get_root_origin (GdkWindow	  *window,
-					  gint		  *x,
-					  gint		  *y);
-void          gdk_window_get_frame_extents (GdkWindow     *window,
-                                            GdkRectangle  *rect);
-GdkWindow*    gdk_window_get_pointer	 (GdkWindow	  *window,
-					  gint		  *x,
-					  gint		  *y,
-					  GdkModifierType *mask);
-GdkWindow *   gdk_window_get_parent      (GdkWindow       *window);
-GdkWindow *   gdk_window_get_toplevel    (GdkWindow       *window);
-
-GList *	      gdk_window_get_children	 (GdkWindow	  *window);
-GList *       gdk_window_peek_children   (GdkWindow       *window);
-GdkEventMask  gdk_window_get_events	 (GdkWindow	  *window);
-void	      gdk_window_set_events	 (GdkWindow	  *window,
-					  GdkEventMask	   event_mask);
-
-void          gdk_window_set_icon_list   (GdkWindow       *window,
-					  GList           *pixbufs);
-void	      gdk_window_set_icon	 (GdkWindow	  *window, 
-					  GdkWindow	  *icon_window,
-					  GdkPixmap	  *pixmap,
-					  GdkBitmap	  *mask);
-void	      gdk_window_set_icon_name	 (GdkWindow	  *window, 
-					  const gchar	  *name);
-void	      gdk_window_set_group	 (GdkWindow	  *window, 
-					  GdkWindow	  *leader);
-GdkWindow*    gdk_window_get_group	 (GdkWindow	  *window);
-void	      gdk_window_set_decorations (GdkWindow	  *window,
-					  GdkWMDecoration  decorations);
-gboolean      gdk_window_get_decorations (GdkWindow       *window,
-					  GdkWMDecoration *decorations);
-void	      gdk_window_set_functions	 (GdkWindow	  *window,
-					  GdkWMFunction	   functions);
-#ifndef GDK_MULTIHEAD_SAFE
-GList *       gdk_window_get_toplevels   (void);
-#endif
-
-void          gdk_window_beep            (GdkWindow       *window);
-void          gdk_window_iconify         (GdkWindow       *window);
-void          gdk_window_deiconify       (GdkWindow       *window);
-void          gdk_window_stick           (GdkWindow       *window);
-void          gdk_window_unstick         (GdkWindow       *window);
-void          gdk_window_maximize        (GdkWindow       *window);
-void          gdk_window_unmaximize      (GdkWindow       *window);
-void          gdk_window_fullscreen      (GdkWindow       *window);
-void          gdk_window_unfullscreen    (GdkWindow       *window);
-void          gdk_window_set_keep_above  (GdkWindow       *window,
-                                          gboolean         setting);
-void          gdk_window_set_keep_below  (GdkWindow       *window,
-                                          gboolean         setting);
-void          gdk_window_set_opacity     (GdkWindow       *window,
-                                          gdouble          opacity);
-void          gdk_window_register_dnd    (GdkWindow       *window);
-
-void gdk_window_begin_resize_drag (GdkWindow     *window,
-                                   GdkWindowEdge  edge,
-                                   gint           button,
-                                   gint           root_x,
-                                   gint           root_y,
-                                   guint32        timestamp);
-void gdk_window_begin_move_drag   (GdkWindow     *window,
-                                   gint           button,
-                                   gint           root_x,
-                                   gint           root_y,
-                                   guint32        timestamp);
-
-/* Interface for dirty-region queueing */
-void       gdk_window_invalidate_rect           (GdkWindow    *window,
-					         GdkRectangle *rect,
-					         gboolean      invalidate_children);
-void       gdk_window_invalidate_region         (GdkWindow    *window,
-					         GdkRegion    *region,
-					         gboolean      invalidate_children);
-void       gdk_window_invalidate_maybe_recurse  (GdkWindow *window,
-						 GdkRegion *region,
-						 gboolean (*child_func) (GdkWindow *, gpointer),
-						 gpointer   user_data);
-GdkRegion *gdk_window_get_update_area     (GdkWindow    *window);
-
-void       gdk_window_freeze_updates      (GdkWindow    *window);
-void       gdk_window_thaw_updates        (GdkWindow    *window);
-
-void       gdk_window_freeze_toplevel_updates_libgtk_only (GdkWindow *window);
-void       gdk_window_thaw_toplevel_updates_libgtk_only   (GdkWindow *window);
-
-void       gdk_window_process_all_updates (void);
-void       gdk_window_process_updates     (GdkWindow    *window,
-					   gboolean      update_children);
-
-/* Enable/disable flicker, so you can tell if your code is inefficient. */
-void       gdk_window_set_debug_updates   (gboolean      setting);
-
-void       gdk_window_constrain_size      (GdkGeometry  *geometry,
-                                           guint         flags,
-                                           gint          width,
-                                           gint          height,
-                                           gint         *new_width,
-                                           gint         *new_height);
-
-void gdk_window_get_internal_paint_info (GdkWindow    *window,
-					 GdkDrawable **real_drawable,
-					 gint         *x_offset,
-					 gint         *y_offset);
-
-void gdk_window_enable_synchronized_configure (GdkWindow *window);
-void gdk_window_configure_finished            (GdkWindow *window);
-
-#ifndef GDK_MULTIHEAD_SAFE
-GdkPointerHooks *gdk_set_pointer_hooks (const GdkPointerHooks *new_hooks);   
-#endif /* GDK_MULTIHEAD_SAFE */
-
-GdkWindow *gdk_get_default_root_window (void);
-
-#ifndef GDK_DISABLE_DEPRECATED
-#define GDK_ROOT_PARENT()             (gdk_get_default_root_window ())
-#define gdk_window_get_size            gdk_drawable_get_size
-#define gdk_window_get_type            gdk_window_get_window_type
-#define gdk_window_get_colormap        gdk_drawable_get_colormap
-#define gdk_window_set_colormap        gdk_drawable_set_colormap
-#define gdk_window_get_visual          gdk_drawable_get_visual
-#define gdk_window_ref                 gdk_drawable_ref
-#define gdk_window_unref               gdk_drawable_unref
-
-#define gdk_window_copy_area(drawable,gc,x,y,source_drawable,source_x,source_y,width,height) \
-   gdk_draw_pixmap(drawable,gc,source_drawable,source_x,source_y,x,y,width,height)
-#endif /* GDK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GDK_WINDOW_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkx.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkx.h
deleted file mode 100644
index ec850479..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkx.h
+++ /dev/null
@@ -1,216 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_X_H__
-#define __GDK_X_H__
-
-#include <gdk/gdkprivate.h>
-#include <gdk/gdkcursor.h>
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-
-G_BEGIN_DECLS
-
-#ifndef GDK_MULTIHEAD_SAFE
-extern Display          *gdk_display;
-#endif
-
-Display *gdk_x11_drawable_get_xdisplay    (GdkDrawable *drawable);
-XID      gdk_x11_drawable_get_xid         (GdkDrawable *drawable);
-Display *gdk_x11_image_get_xdisplay       (GdkImage    *image);
-XImage  *gdk_x11_image_get_ximage         (GdkImage    *image);
-Display *gdk_x11_colormap_get_xdisplay    (GdkColormap *colormap);
-Colormap gdk_x11_colormap_get_xcolormap   (GdkColormap *colormap);
-Display *gdk_x11_cursor_get_xdisplay      (GdkCursor   *cursor);
-Cursor   gdk_x11_cursor_get_xcursor       (GdkCursor   *cursor);
-Display *gdk_x11_display_get_xdisplay     (GdkDisplay  *display);
-Visual * gdk_x11_visual_get_xvisual       (GdkVisual   *visual);
-Display *gdk_x11_gc_get_xdisplay          (GdkGC       *gc);
-GC       gdk_x11_gc_get_xgc               (GdkGC       *gc);
-Screen * gdk_x11_screen_get_xscreen       (GdkScreen   *screen);
-int      gdk_x11_screen_get_screen_number (GdkScreen   *screen);
-void     gdk_x11_window_set_user_time     (GdkWindow   *window,
-					   guint32      timestamp);
-void     gdk_x11_window_move_to_current_desktop (GdkWindow   *window);
-
-const char* gdk_x11_screen_get_window_manager_name (GdkScreen *screen);
-
-#ifndef GDK_MULTIHEAD_SAFE
-Window   gdk_x11_get_default_root_xwindow (void);
-Display *gdk_x11_get_default_xdisplay     (void);
-gint     gdk_x11_get_default_screen       (void);
-#endif
-
-#define GDK_COLORMAP_XDISPLAY(cmap)   (gdk_x11_colormap_get_xdisplay (cmap))
-#define GDK_COLORMAP_XCOLORMAP(cmap)  (gdk_x11_colormap_get_xcolormap (cmap))
-#define GDK_CURSOR_XDISPLAY(cursor)   (gdk_x11_cursor_get_xdisplay (cursor))
-#define GDK_CURSOR_XCURSOR(cursor)    (gdk_x11_cursor_get_xcursor (cursor))
-#define GDK_IMAGE_XDISPLAY(image)     (gdk_x11_image_get_xdisplay (image))
-#define GDK_IMAGE_XIMAGE(image)       (gdk_x11_image_get_ximage (image))
-
-#ifndef GDK_MULTIHEAD_SAFE
-#define GDK_DISPLAY()                 gdk_display
-#endif
-
-#ifdef GDK_COMPILATION
-
-#include "gdkprivate-x11.h"
-#include "gdkscreen-x11.h"
-
-#define GDK_DISPLAY_XDISPLAY(display) (GDK_DISPLAY_X11(display)->xdisplay)
-
-#define GDK_WINDOW_XDISPLAY(win)      (GDK_SCREEN_X11 (GDK_WINDOW_SCREEN (win))->xdisplay)
-#define GDK_WINDOW_XID(win)           (GDK_DRAWABLE_IMPL_X11(((GdkWindowObject *)win)->impl)->xid)
-#define GDK_PIXMAP_XDISPLAY(pix)      (GDK_SCREEN_X11 (GDK_PIXMAP_SCREEN (pix))->xdisplay)
-#define GDK_PIXMAP_XID(pix)           (GDK_DRAWABLE_IMPL_X11(((GdkPixmapObject *)pix)->impl)->xid)
-#define GDK_DRAWABLE_XDISPLAY(win)    (GDK_IS_WINDOW (win) ? GDK_WINDOW_XDISPLAY (win) : GDK_PIXMAP_XDISPLAY (win))
-#define GDK_DRAWABLE_XID(win)         (GDK_IS_WINDOW (win) ? GDK_WINDOW_XID (win) : GDK_PIXMAP_XID (win))
-#define GDK_GC_XDISPLAY(gc)           (GDK_SCREEN_XDISPLAY(GDK_GC_X11(gc)->screen))
-#define GDK_GC_XGC(gc)		      (GDK_GC_X11(gc)->xgc)
-#define GDK_SCREEN_XDISPLAY(screen)   (GDK_SCREEN_X11 (screen)->xdisplay)
-#define GDK_SCREEN_XSCREEN(screen)    (GDK_SCREEN_X11 (screen)->xscreen)
-#define GDK_SCREEN_XNUMBER(screen)    (GDK_SCREEN_X11 (screen)->screen_num) 
-#define GDK_VISUAL_XVISUAL(vis)       (((GdkVisualPrivate *) vis)->xvisual)
-#define GDK_GC_GET_XGC(gc)	      (GDK_GC_X11(gc)->dirty_mask ? _gdk_x11_gc_flush (gc) : ((GdkGCX11 *)(gc))->xgc)
-#define GDK_WINDOW_XWINDOW	      GDK_DRAWABLE_XID
-
-#else /* GDK_COMPILATION */
-
-#ifndef GDK_MULTIHEAD_SAFE
-#define GDK_ROOT_WINDOW()             (gdk_x11_get_default_root_xwindow ())
-#endif
-
-#define GDK_DISPLAY_XDISPLAY(display) (gdk_x11_display_get_xdisplay (display))
-
-#define GDK_WINDOW_XDISPLAY(win)      (gdk_x11_drawable_get_xdisplay (((GdkWindowObject *)win)->impl))
-#define GDK_WINDOW_XID(win)           (gdk_x11_drawable_get_xid (win))
-#define GDK_WINDOW_XWINDOW(win)       (gdk_x11_drawable_get_xid (win))
-#define GDK_PIXMAP_XDISPLAY(win)      (gdk_x11_drawable_get_xdisplay (((GdkPixmapObject *)win)->impl))
-#define GDK_PIXMAP_XID(win)           (gdk_x11_drawable_get_xid (win))
-#define GDK_DRAWABLE_XDISPLAY(win)    (gdk_x11_drawable_get_xdisplay (win))
-#define GDK_DRAWABLE_XID(win)         (gdk_x11_drawable_get_xid (win))
-#define GDK_GC_XDISPLAY(gc)           (gdk_x11_gc_get_xdisplay (gc))
-#define GDK_GC_XGC(gc)                (gdk_x11_gc_get_xgc (gc))
-#define GDK_SCREEN_XDISPLAY(screen)   (gdk_x11_display_get_xdisplay (gdk_screen_get_display (screen)))
-#define GDK_SCREEN_XSCREEN(screen)    (gdk_x11_screen_get_xscreen (screen))
-#define GDK_SCREEN_XNUMBER(screen)    (gdk_x11_screen_get_screen_number (screen))
-#define GDK_VISUAL_XVISUAL(visual)    (gdk_x11_visual_get_xvisual (visual))
-
-#endif /* GDK_COMPILATION */
-
-GdkVisual* gdk_x11_screen_lookup_visual (GdkScreen *screen,
-					 VisualID   xvisualid);
-#ifndef GDK_MULTIHEAD_SAFE
-GdkVisual* gdkx_visual_get            (VisualID   xvisualid);
-#endif
-
-#ifdef GDK_ENABLE_BROKEN
-/* XXX: An X Colormap is useless unless we also have the visual. */
-GdkColormap* gdkx_colormap_get (Colormap xcolormap);
-#endif
-
-GdkColormap *gdk_x11_colormap_foreign_new (GdkVisual *visual,
-					   Colormap   xcolormap);
-
-     /* Return the Gdk* for a particular XID */
-gpointer      gdk_xid_table_lookup_for_display (GdkDisplay *display,
-						XID         xid);
-guint32       gdk_x11_get_server_time  (GdkWindow       *window);
-guint32       gdk_x11_display_get_user_time (GdkDisplay *display);
-
-G_CONST_RETURN gchar *gdk_x11_display_get_startup_notification_id (GdkDisplay *display);
-
-void          gdk_x11_display_set_cursor_theme (GdkDisplay  *display,
-						const gchar *theme,
-						const gint   size);
-
-void gdk_x11_display_broadcast_startup_message (GdkDisplay *display,
-						const char *message_type,
-						...) G_GNUC_NULL_TERMINATED;
-
-/* returns TRUE if we support the given WM spec feature */
-gboolean gdk_x11_screen_supports_net_wm_hint (GdkScreen *screen,
-					      GdkAtom    property);
-
-#ifndef GDK_MULTIHEAD_SAFE
-gpointer      gdk_xid_table_lookup   (XID              xid);
-gboolean      gdk_net_wm_supports    (GdkAtom    property);
-void          gdk_x11_grab_server    (void);
-void          gdk_x11_ungrab_server  (void);
-#endif
-
-GdkDisplay   *gdk_x11_lookup_xdisplay (Display *xdisplay);
-
-
-/* Functions to get the X Atom equivalent to the GdkAtom */
-Atom	              gdk_x11_atom_to_xatom_for_display (GdkDisplay  *display,
-							 GdkAtom      atom);
-GdkAtom		      gdk_x11_xatom_to_atom_for_display (GdkDisplay  *display,
-							 Atom	      xatom);
-Atom		      gdk_x11_get_xatom_by_name_for_display (GdkDisplay  *display,
-							     const gchar *atom_name);
-G_CONST_RETURN gchar *gdk_x11_get_xatom_name_for_display (GdkDisplay  *display,
-							  Atom         xatom);
-#ifndef GDK_MULTIHEAD_SAFE
-Atom                  gdk_x11_atom_to_xatom     (GdkAtom      atom);
-GdkAtom               gdk_x11_xatom_to_atom     (Atom         xatom);
-Atom                  gdk_x11_get_xatom_by_name (const gchar *atom_name);
-G_CONST_RETURN gchar *gdk_x11_get_xatom_name    (Atom         xatom);
-#endif
-
-void	    gdk_x11_display_grab	      (GdkDisplay *display);
-void	    gdk_x11_display_ungrab	      (GdkDisplay *display);
-void        gdk_x11_register_standard_event_type (GdkDisplay *display,
-						  gint        event_base,
-						  gint        n_events);
-
-#if !defined(GDK_DISABLE_DEPRECATED) || defined(GDK_COMPILATION)
-
-gpointer             gdk_x11_font_get_xfont    (GdkFont *font);
-#define GDK_FONT_XFONT(font)          (gdk_x11_font_get_xfont (font))
-
-#define gdk_font_lookup_for_display(display, xid) ((GdkFont*) gdk_xid_table_lookup_for_display (display, ((xid)|XID_FONT_BIT)))
-
-#endif /* !GDK_DISABLE_DEPRECATED || GDK_COMPILATION */
-
-#ifndef GDK_DISABLE_DEPRECATED
-
-Display *            gdk_x11_font_get_xdisplay (GdkFont *font);
-G_CONST_RETURN char *gdk_x11_font_get_name     (GdkFont *font);
-
-#define GDK_FONT_XDISPLAY(font)       (gdk_x11_font_get_xdisplay (font))
-
-#ifndef GDK_MULTIHEAD_SAFE
-
-#define gdk_font_lookup(xid)	   ((GdkFont*) gdk_xid_table_lookup (xid))
-
-#endif /* GDK_MULTIHEAD_SAFE */
-#endif /* GDK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GDK_X_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtk.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtk.h
deleted file mode 100644
index bdfaef9b..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtk.h
+++ /dev/null
@@ -1,212 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_H__
-#define __GTK_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkaboutdialog.h>
-#include <gtk/gtkaccelgroup.h>
-#include <gtk/gtkaccellabel.h>
-#include <gtk/gtkaccelmap.h>
-#include <gtk/gtkaccessible.h>
-#include <gtk/gtkaction.h>
-#include <gtk/gtkactiongroup.h>
-#include <gtk/gtkadjustment.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkaspectframe.h>
-#include <gtk/gtkassistant.h>
-#include <gtk/gtkbbox.h>
-#include <gtk/gtkbin.h>
-#include <gtk/gtkbindings.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkbuildable.h>
-#include <gtk/gtkbuilder.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkcalendar.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtkcellrenderer.h>
-#include <gtk/gtkcellrendereraccel.h>
-#include <gtk/gtkcellrenderercombo.h>
-#include <gtk/gtkcellrendererpixbuf.h>
-#include <gtk/gtkcellrendererprogress.h>
-#include <gtk/gtkcellrendererspin.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcellrenderertoggle.h>
-#include <gtk/gtkcellview.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtkclipboard.h>
-#include <gtk/gtkclist.h>
-#include <gtk/gtkcolorbutton.h>
-#include <gtk/gtkcolorsel.h>
-#include <gtk/gtkcolorseldialog.h>
-#include <gtk/gtkcombo.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkcomboboxentry.h>
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtkctree.h>
-#include <gtk/gtkcurve.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkdrawingarea.h>
-#include <gtk/gtkeditable.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkentrycompletion.h>
-#include <gtk/gtkenums.h>
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkexpander.h>
-#include <gtk/gtkfilesel.h>
-#include <gtk/gtkfixed.h>
-#include <gtk/gtkfilechooserbutton.h>
-#include <gtk/gtkfilechooserdialog.h>
-#include <gtk/gtkfilechooserwidget.h>
-#include <gtk/gtkfontbutton.h>
-#include <gtk/gtkfontsel.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkgamma.h>
-#include <gtk/gtkgc.h>
-#include <gtk/gtkhandlebox.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkhpaned.h>
-#include <gtk/gtkhruler.h>
-#include <gtk/gtkhscale.h>
-#include <gtk/gtkhscrollbar.h>
-#include <gtk/gtkhseparator.h>
-#include <gtk/gtkiconfactory.h>
-#include <gtk/gtkicontheme.h>
-#include <gtk/gtkiconview.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkimcontext.h>
-#include <gtk/gtkimcontextsimple.h>
-#include <gtk/gtkimmulticontext.h>
-#include <gtk/gtkinputdialog.h>
-#include <gtk/gtkinvisible.h>
-#include <gtk/gtkitem.h>
-#include <gtk/gtkitemfactory.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtklayout.h>
-#include <gtk/gtklinkbutton.h>
-#include <gtk/gtklist.h>
-#include <gtk/gtklistitem.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenubar.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkmenushell.h>
-#include <gtk/gtkmenutoolbutton.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkmisc.h>
-#include <gtk/gtkmodules.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkobject.h>
-#include <gtk/gtkoldeditable.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkpaned.h>
-#include <gtk/gtkpixmap.h>
-#include <gtk/gtkplug.h>
-#include <gtk/gtkpreview.h>
-#include <gtk/gtkprintoperation.h>
-#include <gtk/gtkprogress.h>
-#include <gtk/gtkprogressbar.h>
-#include <gtk/gtkradioaction.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtkradiomenuitem.h>
-#include <gtk/gtkradiotoolbutton.h>
-#include <gtk/gtkrange.h>
-#include <gtk/gtkrc.h>
-#include <gtk/gtkrecentaction.h>
-#include <gtk/gtkrecentchooser.h>
-#include <gtk/gtkrecentchooserdialog.h>
-#include <gtk/gtkrecentchoosermenu.h>
-#include <gtk/gtkrecentchooserwidget.h>
-#include <gtk/gtkrecentfilter.h>
-#include <gtk/gtkrecentmanager.h>
-#include <gtk/gtkruler.h>
-#include <gtk/gtkscale.h>
-#include <gtk/gtkscalebutton.h>
-#include <gtk/gtkscrollbar.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkselection.h>
-#include <gtk/gtkseparator.h>
-#include <gtk/gtkseparatormenuitem.h>
-#include <gtk/gtkseparatortoolitem.h>
-#include <gtk/gtksettings.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtksizegroup.h>
-#include <gtk/gtksocket.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkstatusbar.h>
-#include <gtk/gtkstatusicon.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkstyle.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtktearoffmenuitem.h>
-#include <gtk/gtktext.h>
-#include <gtk/gtktextbuffer.h>
-#include <gtk/gtktextbufferrichtext.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtktipsquery.h>
-#include <gtk/gtktoggleaction.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtktoggletoolbutton.h>
-#include <gtk/gtktoolbar.h>
-#include <gtk/gtktoolbutton.h>
-#include <gtk/gtktoolitem.h>
-#include <gtk/gtktooltip.h>
-#include <gtk/gtktooltips.h>
-#include <gtk/gtktree.h>
-#include <gtk/gtktreednd.h>
-#include <gtk/gtktreeitem.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreemodelfilter.h>
-#include <gtk/gtktreemodelsort.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreestore.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeviewcolumn.h>
-#include <gtk/gtktypeutils.h>
-#include <gtk/gtkuimanager.h>
-#include <gtk/gtkvbbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkversion.h>
-#include <gtk/gtkviewport.h>
-#include <gtk/gtkvolumebutton.h>
-#include <gtk/gtkvpaned.h>
-#include <gtk/gtkvruler.h>
-#include <gtk/gtkvscale.h>
-#include <gtk/gtkvscrollbar.h>
-#include <gtk/gtkvseparator.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
-
-
-#endif /* __GTK_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaboutdialog.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaboutdialog.h
deleted file mode 100644
index b77e658c..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaboutdialog.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* GTK - The GIMP Toolkit
-
-   Copyright (C) 2001 CodeFactory AB
-   Copyright (C) 2001 Anders Carlsson <andersca@codefactory.se>
-   Copyright (C) 2003, 2004 Matthias Clasen <mclasen@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 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.
-
-   Author: Anders Carlsson <andersca@codefactory.se>
-*/
-
-#ifndef __GTK_ABOUT_DIALOG_H__
-#define __GTK_ABOUT_DIALOG_H__
-
-#include <gtk/gtkdialog.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_ABOUT_DIALOG            (gtk_about_dialog_get_type ())
-#define GTK_ABOUT_DIALOG(object)         (G_TYPE_CHECK_INSTANCE_CAST ((object), GTK_TYPE_ABOUT_DIALOG, GtkAboutDialog))
-#define GTK_ABOUT_DIALOG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ABOUT_DIALOG, GtkAboutDialogClass))
-#define GTK_IS_ABOUT_DIALOG(object)      (G_TYPE_CHECK_INSTANCE_TYPE ((object), GTK_TYPE_ABOUT_DIALOG))
-#define GTK_IS_ABOUT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ABOUT_DIALOG))
-#define GTK_ABOUT_DIALOG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ABOUT_DIALOG, GtkAboutDialogClass))
-
-typedef struct _GtkAboutDialog        GtkAboutDialog;
-typedef struct _GtkAboutDialogClass   GtkAboutDialogClass;
-
-struct _GtkAboutDialog 
-{
-  GtkDialog parent_instance;
-
-  /*< private >*/
-  gpointer private_data;
-};
-
-struct _GtkAboutDialogClass 
-{
-  GtkDialogClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType                  gtk_about_dialog_get_type               (void) G_GNUC_CONST;
-GtkWidget             *gtk_about_dialog_new                    (void);
-void                   gtk_show_about_dialog                   (GtkWindow       *parent,
-								const gchar     *first_property_name,
-								...) G_GNUC_NULL_TERMINATED;
-
-#ifndef GTK_DISABLE_DEPRECATED
-G_CONST_RETURN gchar  *gtk_about_dialog_get_name               (GtkAboutDialog  *about);
-void                   gtk_about_dialog_set_name               (GtkAboutDialog  *about,
-								const gchar     *name);
-#endif /* GTK_DISABLE_DEPRECATED */
-G_CONST_RETURN gchar  *gtk_about_dialog_get_program_name       (GtkAboutDialog  *about);
-void                   gtk_about_dialog_set_program_name       (GtkAboutDialog  *about,
-								const gchar     *name);
-G_CONST_RETURN gchar  *gtk_about_dialog_get_version            (GtkAboutDialog  *about);
-void                   gtk_about_dialog_set_version            (GtkAboutDialog  *about,
-								const gchar     *version);
-G_CONST_RETURN gchar  *gtk_about_dialog_get_copyright          (GtkAboutDialog  *about);
-void                   gtk_about_dialog_set_copyright          (GtkAboutDialog  *about,
-								const gchar     *copyright);
-G_CONST_RETURN gchar  *gtk_about_dialog_get_comments           (GtkAboutDialog  *about);
-void                   gtk_about_dialog_set_comments           (GtkAboutDialog  *about,
-								const gchar     *comments);
-G_CONST_RETURN gchar  *gtk_about_dialog_get_license            (GtkAboutDialog  *about);
-void                   gtk_about_dialog_set_license            (GtkAboutDialog  *about,
-								const gchar     *license);
-
-gboolean               gtk_about_dialog_get_wrap_license       (GtkAboutDialog  *about);
-void                   gtk_about_dialog_set_wrap_license       (GtkAboutDialog  *about,
-                                                                gboolean         wrap_license);
-
-G_CONST_RETURN gchar  *gtk_about_dialog_get_website            (GtkAboutDialog  *about);
-void                   gtk_about_dialog_set_website            (GtkAboutDialog  *about,
-								const gchar     *website);
-G_CONST_RETURN gchar  *gtk_about_dialog_get_website_label      (GtkAboutDialog  *about);
-void                   gtk_about_dialog_set_website_label      (GtkAboutDialog  *about,
-								const gchar     *website_label);
-G_CONST_RETURN gchar* G_CONST_RETURN * gtk_about_dialog_get_authors            (GtkAboutDialog  *about);
-void                   gtk_about_dialog_set_authors            (GtkAboutDialog  *about,
-								const gchar    **authors);
-G_CONST_RETURN gchar* G_CONST_RETURN * gtk_about_dialog_get_documenters        (GtkAboutDialog  *about);
-void                   gtk_about_dialog_set_documenters        (GtkAboutDialog  *about,
-								const gchar    **documenters);
-G_CONST_RETURN gchar* G_CONST_RETURN * gtk_about_dialog_get_artists            (GtkAboutDialog  *about);
-void                   gtk_about_dialog_set_artists            (GtkAboutDialog  *about,
-								const gchar    **artists);
-G_CONST_RETURN gchar  *gtk_about_dialog_get_translator_credits (GtkAboutDialog  *about);
-void                   gtk_about_dialog_set_translator_credits (GtkAboutDialog  *about,
-								const gchar     *translator_credits);
-GdkPixbuf             *gtk_about_dialog_get_logo               (GtkAboutDialog  *about);
-void                   gtk_about_dialog_set_logo               (GtkAboutDialog  *about,
-								GdkPixbuf       *logo);
-G_CONST_RETURN gchar  *gtk_about_dialog_get_logo_icon_name     (GtkAboutDialog  *about);
-void                   gtk_about_dialog_set_logo_icon_name     (GtkAboutDialog  *about,
-								const gchar     *icon_name);
-
-typedef void (* GtkAboutDialogActivateLinkFunc) (GtkAboutDialog *about,
-						 const gchar    *link_,
-						 gpointer        data);
-
-GtkAboutDialogActivateLinkFunc gtk_about_dialog_set_email_hook (GtkAboutDialogActivateLinkFunc func,
-								gpointer                       data,
-								GDestroyNotify                 destroy);
-GtkAboutDialogActivateLinkFunc gtk_about_dialog_set_url_hook   (GtkAboutDialogActivateLinkFunc func,
-								gpointer                       data,
-								GDestroyNotify                 destroy);
-
-G_END_DECLS
-
-#endif /* __GTK_ABOUT_DIALOG_H__ */
-
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaccelgroup.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaccelgroup.h
deleted file mode 100644
index 7e89ddf9..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaccelgroup.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1998, 2001 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_ACCEL_GROUP_H__
-#define __GTK_ACCEL_GROUP_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkenums.h>
-
-G_BEGIN_DECLS
-
-
-/* --- type macros --- */
-#define GTK_TYPE_ACCEL_GROUP              (gtk_accel_group_get_type ())
-#define GTK_ACCEL_GROUP(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GTK_TYPE_ACCEL_GROUP, GtkAccelGroup))
-#define GTK_ACCEL_GROUP_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ACCEL_GROUP, GtkAccelGroupClass))
-#define GTK_IS_ACCEL_GROUP(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GTK_TYPE_ACCEL_GROUP))
-#define GTK_IS_ACCEL_GROUP_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ACCEL_GROUP))
-#define GTK_ACCEL_GROUP_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ACCEL_GROUP, GtkAccelGroupClass))
-
-
-/* --- accel flags --- */
-typedef enum
-{
-  GTK_ACCEL_VISIBLE        = 1 << 0,	/* display in GtkAccelLabel? */
-  GTK_ACCEL_LOCKED         = 1 << 1,	/* is it removable? */
-  GTK_ACCEL_MASK           = 0x07
-} GtkAccelFlags;
-
-
-/* --- typedefs & structures --- */
-typedef struct _GtkAccelGroup	   GtkAccelGroup;
-typedef struct _GtkAccelGroupClass GtkAccelGroupClass;
-typedef struct _GtkAccelKey        GtkAccelKey;
-typedef struct _GtkAccelGroupEntry GtkAccelGroupEntry;
-typedef gboolean (*GtkAccelGroupActivate) (GtkAccelGroup  *accel_group,
-					   GObject        *acceleratable,
-					   guint           keyval,
-					   GdkModifierType modifier);
-
-typedef gboolean (*GtkAccelGroupFindFunc) (GtkAccelKey    *key,
-					   GClosure       *closure,
-					   gpointer        data);
-
-struct _GtkAccelGroup
-{
-  GObject             parent;
-  guint	              lock_count;
-  GdkModifierType     modifier_mask;
-  GSList             *acceleratables;
-  guint		      n_accels;
-  GtkAccelGroupEntry *priv_accels;
-};
-
-struct _GtkAccelGroupClass
-{
-  GObjectClass parent_class;
-
-  void	(*accel_changed)	(GtkAccelGroup	*accel_group,
-				 guint           keyval,
-				 GdkModifierType modifier,
-				 GClosure       *accel_closure);
-  
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-struct _GtkAccelKey
-{
-  guint           accel_key;
-  GdkModifierType accel_mods;
-  guint           accel_flags : 16;
-};
-
-
-/* -- Accelerator Groups --- */
-GType          gtk_accel_group_get_type           (void) G_GNUC_CONST;
-GtkAccelGroup* gtk_accel_group_new	      	  (void);
-void	       gtk_accel_group_lock		  (GtkAccelGroup  *accel_group);
-void	       gtk_accel_group_unlock		  (GtkAccelGroup  *accel_group);
-void	       gtk_accel_group_connect		  (GtkAccelGroup  *accel_group,
-						   guint	   accel_key,
-						   GdkModifierType accel_mods,
-						   GtkAccelFlags   accel_flags,
-						   GClosure	  *closure);
-void           gtk_accel_group_connect_by_path    (GtkAccelGroup  *accel_group,
-						   const gchar	  *accel_path,
-						   GClosure	  *closure);
-gboolean       gtk_accel_group_disconnect	  (GtkAccelGroup  *accel_group,
-						   GClosure	  *closure);
-gboolean       gtk_accel_group_disconnect_key	  (GtkAccelGroup  *accel_group,
-						   guint	   accel_key,
-						   GdkModifierType accel_mods);
-gboolean       gtk_accel_group_activate           (GtkAccelGroup   *accel_group,
-                                                   GQuark	   accel_quark,
-                                                   GObject	  *acceleratable,
-                                                   guint	   accel_key,
-                                                   GdkModifierType accel_mods);
-
-
-/* --- GtkActivatable glue --- */
-void		_gtk_accel_group_attach		(GtkAccelGroup	*accel_group,
-						 GObject	*object);
-void		_gtk_accel_group_detach		(GtkAccelGroup	*accel_group,
-						 GObject	*object);
-gboolean        gtk_accel_groups_activate      	(GObject	*object,
-						 guint		 accel_key,
-						 GdkModifierType accel_mods);
-GSList*	        gtk_accel_groups_from_object    (GObject	*object);
-GtkAccelKey*	gtk_accel_group_find		(GtkAccelGroup	      *accel_group,
-						 GtkAccelGroupFindFunc find_func,
-						 gpointer              data);
-GtkAccelGroup*	gtk_accel_group_from_accel_closure (GClosure    *closure);
-
-
-/* --- Accelerators--- */
-gboolean gtk_accelerator_valid		      (guint	        keyval,
-					       GdkModifierType  modifiers) G_GNUC_CONST;
-void	 gtk_accelerator_parse		      (const gchar     *accelerator,
-					       guint	       *accelerator_key,
-					       GdkModifierType *accelerator_mods);
-gchar*	 gtk_accelerator_name		      (guint	        accelerator_key,
-					       GdkModifierType  accelerator_mods);
-gchar*   gtk_accelerator_get_label            (guint           accelerator_key,
-                                               GdkModifierType accelerator_mods);
-void	 gtk_accelerator_set_default_mod_mask (GdkModifierType  default_mod_mask);
-guint	 gtk_accelerator_get_default_mod_mask (void);
-
-
-/* --- internal --- */
-GtkAccelGroupEntry*	gtk_accel_group_query	(GtkAccelGroup	*accel_group,
-						 guint		 accel_key,
-						 GdkModifierType accel_mods,
-						 guint          *n_entries);
-
-void		     _gtk_accel_group_reconnect (GtkAccelGroup *accel_group,
-						 GQuark         accel_path_quark);
-
-struct _GtkAccelGroupEntry
-{
-  GtkAccelKey  key;
-  GClosure    *closure;
-  GQuark       accel_path_quark;
-};
-
-
-#ifndef GTK_DISABLE_DEPRECATED
-#define	gtk_accel_group_ref	g_object_ref
-#define	gtk_accel_group_unref	g_object_unref
-#endif /* GTK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-
-#endif /* __GTK_ACCEL_GROUP_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaccellabel.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaccellabel.h
deleted file mode 100644
index 4eb842a6..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaccellabel.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * GtkAccelLabel: GtkLabel with accelerator monitoring facilities.
- * 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 GTK+ Team and others 1997-2001.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_ACCEL_LABEL_H__
-#define __GTK_ACCEL_LABEL_H__
-
-
-#include <gtk/gtklabel.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_ACCEL_LABEL		(gtk_accel_label_get_type ())
-#define GTK_ACCEL_LABEL(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ACCEL_LABEL, GtkAccelLabel))
-#define GTK_ACCEL_LABEL_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ACCEL_LABEL, GtkAccelLabelClass))
-#define GTK_IS_ACCEL_LABEL(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ACCEL_LABEL))
-#define GTK_IS_ACCEL_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ACCEL_LABEL))
-#define GTK_ACCEL_LABEL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ACCEL_LABEL, GtkAccelLabelClass))
-
-
-typedef struct _GtkAccelLabel	    GtkAccelLabel;
-typedef struct _GtkAccelLabelClass  GtkAccelLabelClass;
-
-struct _GtkAccelLabel
-{
-  GtkLabel label;
-
-  guint	         gtk_reserved;
-  guint	         accel_padding;
-  GtkWidget     *accel_widget;
-  GClosure	*accel_closure;
-  GtkAccelGroup *accel_group;
-  gchar         *accel_string;
-  guint16        accel_string_width;
-};
-
-struct _GtkAccelLabelClass
-{
-  GtkLabelClass	 parent_class;
-
-  gchar		*signal_quote1;
-  gchar		*signal_quote2;
-  gchar		*mod_name_shift;
-  gchar		*mod_name_control;
-  gchar		*mod_name_alt;
-  gchar		*mod_separator;
-  gchar		*accel_seperator;
-  guint		 latin1_to_char : 1;
-  
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-#ifndef GTK_DISABLE_DEPRECATED
-#define	gtk_accel_label_accelerator_width	gtk_accel_label_get_accel_width
-#endif /* GTK_DISABLE_DEPRECATED */
-
-GType	   gtk_accel_label_get_type	     (void) G_GNUC_CONST;
-GtkWidget* gtk_accel_label_new		     (const gchar   *string);
-GtkWidget* gtk_accel_label_get_accel_widget  (GtkAccelLabel *accel_label);
-guint	   gtk_accel_label_get_accel_width   (GtkAccelLabel *accel_label);
-void	   gtk_accel_label_set_accel_widget  (GtkAccelLabel *accel_label,
-					      GtkWidget	    *accel_widget);
-void	   gtk_accel_label_set_accel_closure (GtkAccelLabel *accel_label,
-					      GClosure	    *accel_closure);
-gboolean   gtk_accel_label_refetch           (GtkAccelLabel *accel_label);
-
-/* private */
-gchar *    _gtk_accel_label_class_get_accelerator_label (GtkAccelLabelClass *klass,
-							 guint               accelerator_key,
-							 GdkModifierType     accelerator_mods);
-
-G_END_DECLS
-
-#endif /* __GTK_ACCEL_LABEL_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaccelmap.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaccelmap.h
deleted file mode 100644
index 932c893a..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaccelmap.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1998, 2001 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 __GTK_ACCEL_MAP_H__
-#define __GTK_ACCEL_MAP_H__
-
-
-#include <gtk/gtkaccelgroup.h>
-
-G_BEGIN_DECLS
-
-/* --- global GtkAccelMap object --- */
-#define GTK_TYPE_ACCEL_MAP                (gtk_accel_map_get_type ())
-#define GTK_ACCEL_MAP(accel_map)	  (G_TYPE_CHECK_INSTANCE_CAST ((accel_map), GTK_TYPE_ACCEL_MAP, GtkAccelMap))
-#define GTK_ACCEL_MAP_CLASS(klass)	  (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ACCEL_MAP, GtkAccelMapClass))
-#define GTK_IS_ACCEL_MAP(accel_map)	  (G_TYPE_CHECK_INSTANCE_TYPE ((accel_map), GTK_TYPE_ACCEL_MAP))
-#define GTK_IS_ACCEL_MAP_CLASS(klass)	  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ACCEL_MAP))
-#define GTK_ACCEL_MAP_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ACCEL_MAP, GtkAccelMapClass))
-
-typedef struct _GtkAccelMap      GtkAccelMap;
-typedef struct _GtkAccelMapClass GtkAccelMapClass;
-
-/* --- notifier --- */
-typedef void (*GtkAccelMapForeach)		(gpointer	 data,
-						 const gchar	*accel_path,
-						 guint           accel_key,
-						 GdkModifierType accel_mods,
-						 gboolean	 changed);
-
-
-/* --- public API --- */
-
-#ifdef G_OS_WIN32
-/* Reserve old names for DLL ABI backward compatibility */
-#define gtk_accel_map_load gtk_accel_map_load_utf8
-#define gtk_accel_map_save gtk_accel_map_save_utf8
-#endif
-
-void	   gtk_accel_map_add_entry	(const gchar		*accel_path,
-					 guint			 accel_key,
-					 GdkModifierType         accel_mods);
-gboolean   gtk_accel_map_lookup_entry	(const gchar		*accel_path,
-					 GtkAccelKey		*key);
-gboolean   gtk_accel_map_change_entry	(const gchar		*accel_path,
-					 guint			 accel_key,
-					 GdkModifierType	 accel_mods,
-					 gboolean		 replace);
-void	   gtk_accel_map_load		(const gchar		*file_name);
-void	   gtk_accel_map_save		(const gchar		*file_name);
-void	   gtk_accel_map_foreach	(gpointer		 data,
-					 GtkAccelMapForeach	 foreach_func);
-void	   gtk_accel_map_load_fd	(gint			 fd);
-void	   gtk_accel_map_load_scanner	(GScanner		*scanner);
-void	   gtk_accel_map_save_fd	(gint			 fd);
-
-void       gtk_accel_map_lock_path      (const gchar            *accel_path);
-void       gtk_accel_map_unlock_path    (const gchar            *accel_path);
-
-/* --- filter functions --- */
-void	gtk_accel_map_add_filter	 (const gchar		*filter_pattern);
-void	gtk_accel_map_foreach_unfiltered (gpointer		 data,
-					  GtkAccelMapForeach	 foreach_func);
-
-/* --- notification --- */
-GType        gtk_accel_map_get_type (void) G_GNUC_CONST;
-GtkAccelMap *gtk_accel_map_get      (void);
-
-
-/* --- internal API --- */
-void		_gtk_accel_map_init		(void);
-
-void            _gtk_accel_map_add_group	 (const gchar   *accel_path,
-						  GtkAccelGroup *accel_group);
-void            _gtk_accel_map_remove_group 	 (const gchar   *accel_path,
-						  GtkAccelGroup *accel_group);
-gboolean	_gtk_accel_path_is_valid	 (const gchar	*accel_path);
-
-
-G_END_DECLS
-
-#endif /* __GTK_ACCEL_MAP_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaccessible.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaccessible.h
deleted file mode 100644
index ca8645be..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaccessible.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright 2001 Sun Microsystems 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 __GTK_ACCESSIBLE_H__
-#define __GTK_ACCESSIBLE_H__
-
-#include <atk/atk.h>
-#include <gtk/gtkwidget.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_ACCESSIBLE                  (gtk_accessible_get_type ())
-#define GTK_ACCESSIBLE(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ACCESSIBLE, GtkAccessible))
-#define GTK_ACCESSIBLE_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ACCESSIBLE, GtkAccessibleClass))
-#define GTK_IS_ACCESSIBLE(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ACCESSIBLE))
-#define GTK_IS_ACCESSIBLE_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ACCESSIBLE))
-#define GTK_ACCESSIBLE_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ACCESSIBLE, GtkAccessibleClass))
-
-typedef struct _GtkAccessible                GtkAccessible;
-typedef struct _GtkAccessibleClass           GtkAccessibleClass;
-
-  /**
-   * This object is a thin wrapper, in the GTK+ namespace, for AtkObject
-   */
-
-struct _GtkAccessible
-{
-  AtkObject parent;
-
-  /*
-   * The GtkWidget whose properties and features are exported via this 
-   * accessible instance.
-   */
-  GtkWidget *widget;
-};
-
-struct _GtkAccessibleClass
-{
-  AtkObjectClass parent_class;
-
-  void (*connect_widget_destroyed)              (GtkAccessible     *accessible);
-  
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType gtk_accessible_get_type (void) G_GNUC_CONST;
-
-void gtk_accessible_connect_widget_destroyed    (GtkAccessible     *accessible);
-
-G_END_DECLS
-
-#endif /* __GTK_ACCESSIBLE_H__ */
-
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaction.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaction.h
deleted file mode 100644
index bb158135..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaction.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * GTK - The GIMP Toolkit
- * Copyright (C) 1998, 1999 Red Hat, Inc.
- * All rights reserved.
- *
- * 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 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.
- */
-
-/*
- * Author: James Henstridge <james@daa.com.au>
- *
- * Modified by the GTK+ Team and others 2003.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-#ifndef __GTK_ACTION_H__
-#define __GTK_ACTION_H__
-
-#include <gtk/gtkwidget.h>
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_ACTION            (gtk_action_get_type ())
-#define GTK_ACTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ACTION, GtkAction))
-#define GTK_ACTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ACTION, GtkActionClass))
-#define GTK_IS_ACTION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ACTION))
-#define GTK_IS_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ACTION))
-#define GTK_ACTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_ACTION, GtkActionClass))
-
-typedef struct _GtkAction      GtkAction;
-typedef struct _GtkActionClass GtkActionClass;
-typedef struct _GtkActionPrivate GtkActionPrivate;
-
-struct _GtkAction
-{
-  GObject object;
-
-  /*< private >*/
-
-  GtkActionPrivate *private_data;
-};
-
-struct _GtkActionClass
-{
-  GObjectClass parent_class;
-
-  /* activation signal */
-  void       (* activate)           (GtkAction    *action);
-
-  GType      menu_item_type;
-  GType      toolbar_item_type;
-
-  /* widget creation routines (not signals) */
-  GtkWidget *(* create_menu_item)   (GtkAction *action);
-  GtkWidget *(* create_tool_item)   (GtkAction *action);
-  void       (* connect_proxy)      (GtkAction *action,
-				     GtkWidget *proxy);
-  void       (* disconnect_proxy)   (GtkAction *action,
-				     GtkWidget *proxy);
-
-  GtkWidget *(* create_menu)        (GtkAction *action);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType        gtk_action_get_type               (void) G_GNUC_CONST;
-GtkAction   *gtk_action_new                    (const gchar *name,
-						const gchar *label,
-						const gchar *tooltip,
-						const gchar *stock_id);
-G_CONST_RETURN gchar* gtk_action_get_name      (GtkAction     *action);
-gboolean     gtk_action_is_sensitive           (GtkAction     *action);
-gboolean     gtk_action_get_sensitive          (GtkAction     *action);
-void         gtk_action_set_sensitive          (GtkAction     *action,
-						gboolean       sensitive);
-gboolean     gtk_action_is_visible             (GtkAction     *action);
-gboolean     gtk_action_get_visible            (GtkAction     *action);
-void         gtk_action_set_visible            (GtkAction     *action,
-						gboolean       visible);
-void         gtk_action_activate               (GtkAction     *action);
-GtkWidget *  gtk_action_create_icon            (GtkAction     *action,
-						GtkIconSize    icon_size);
-GtkWidget *  gtk_action_create_menu_item       (GtkAction     *action);
-GtkWidget *  gtk_action_create_tool_item       (GtkAction     *action);
-GtkWidget *  gtk_action_create_menu            (GtkAction     *action);
-void         gtk_action_connect_proxy          (GtkAction     *action,
-						GtkWidget     *proxy);
-void         gtk_action_disconnect_proxy       (GtkAction     *action,
-						GtkWidget     *proxy);
-GSList *     gtk_action_get_proxies            (GtkAction     *action);
-GtkAction *  gtk_widget_get_action             (GtkWidget     *widget);
-void         gtk_action_connect_accelerator    (GtkAction     *action);
-void         gtk_action_disconnect_accelerator (GtkAction     *action);
-G_CONST_RETURN gchar *gtk_action_get_accel_path (GtkAction     *action);
-GClosure    *gtk_action_get_accel_closure      (GtkAction     *action);
-
-/* protected ... for use by child actions */
-void         gtk_action_block_activate_from    (GtkAction     *action,
-						GtkWidget     *proxy);
-void         gtk_action_unblock_activate_from  (GtkAction     *action,
-						GtkWidget     *proxy);
-void         _gtk_action_emit_activate         (GtkAction     *action);
-
-/* protected ... for use by action groups */
-void         gtk_action_set_accel_path         (GtkAction     *action,
-						const gchar   *accel_path);
-void         gtk_action_set_accel_group        (GtkAction     *action,
-						GtkAccelGroup *accel_group);
-void         _gtk_action_sync_sensitive        (GtkAction     *action);
-void         _gtk_action_sync_visible          (GtkAction     *action);
-void         _gtk_action_sync_menu_visible     (GtkAction     *action,
-						GtkWidget     *proxy,
-						gboolean       empty);
-
-G_END_DECLS
-
-#endif  /* __GTK_ACTION_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkactiongroup.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkactiongroup.h
deleted file mode 100644
index 0f5df594..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkactiongroup.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * GTK - The GIMP Toolkit
- * Copyright (C) 1998, 1999 Red Hat, Inc.
- * All rights reserved.
- *
- * 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 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.
- */
-
-/* 
- * Author: James Henstridge <james@daa.com.au>
- *
- * Modified by the GTK+ Team and others 2003.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-#ifndef __GTK_ACTION_GROUP_H__
-#define __GTK_ACTION_GROUP_H__
-
-#include <gtk/gtkaction.h>
-#include <gtk/gtkitemfactory.h> /* for GtkTranslateFunc */
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_ACTION_GROUP              (gtk_action_group_get_type ())
-#define GTK_ACTION_GROUP(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ACTION_GROUP, GtkActionGroup))
-#define GTK_ACTION_GROUP_CLASS(vtable)     (G_TYPE_CHECK_CLASS_CAST ((vtable), GTK_TYPE_ACTION_GROUP, GtkActionGroupClass))
-#define GTK_IS_ACTION_GROUP(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ACTION_GROUP))
-#define GTK_IS_ACTION_GROUP_CLASS(vtable)  (G_TYPE_CHECK_CLASS_TYPE ((vtable), GTK_TYPE_ACTION_GROUP))
-#define GTK_ACTION_GROUP_GET_CLASS(inst)   (G_TYPE_INSTANCE_GET_CLASS ((inst), GTK_TYPE_ACTION_GROUP, GtkActionGroupClass))
-
-typedef struct _GtkActionGroup        GtkActionGroup;
-typedef struct _GtkActionGroupPrivate GtkActionGroupPrivate;
-typedef struct _GtkActionGroupClass   GtkActionGroupClass;
-typedef struct _GtkActionEntry        GtkActionEntry;
-typedef struct _GtkToggleActionEntry  GtkToggleActionEntry;
-typedef struct _GtkRadioActionEntry   GtkRadioActionEntry;
-
-struct _GtkActionGroup
-{
-  GObject parent;
-
-  /*< private >*/
-
-  GtkActionGroupPrivate *private_data;
-};
-
-struct _GtkActionGroupClass
-{
-  GObjectClass parent_class;
-
-  GtkAction *(* get_action) (GtkActionGroup *action_group,
-                             const gchar    *action_name);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-struct _GtkActionEntry 
-{
-  const gchar     *name;
-  const gchar     *stock_id;
-  const gchar     *label;
-  const gchar     *accelerator;
-  const gchar     *tooltip;
-  GCallback  callback;
-};
-
-struct _GtkToggleActionEntry 
-{
-  const gchar     *name;
-  const gchar     *stock_id;
-  const gchar     *label;
-  const gchar     *accelerator;
-  const gchar     *tooltip;
-  GCallback  callback;
-  gboolean   is_active;
-};
-
-struct _GtkRadioActionEntry 
-{
-  const gchar *name;
-  const gchar *stock_id;
-  const gchar *label;
-  const gchar *accelerator;
-  const gchar *tooltip;
-  gint   value; 
-};
-
-GType           gtk_action_group_get_type                (void) G_GNUC_CONST;
-GtkActionGroup *gtk_action_group_new                     (const gchar                *name);
-G_CONST_RETURN gchar *gtk_action_group_get_name          (GtkActionGroup             *action_group);
-gboolean        gtk_action_group_get_sensitive           (GtkActionGroup             *action_group);
-void            gtk_action_group_set_sensitive           (GtkActionGroup             *action_group,
-							  gboolean                    sensitive);
-gboolean        gtk_action_group_get_visible             (GtkActionGroup             *action_group);
-void            gtk_action_group_set_visible             (GtkActionGroup             *action_group,
-							  gboolean                    visible);
-GtkAction      *gtk_action_group_get_action              (GtkActionGroup             *action_group,
-							  const gchar                *action_name);
-GList          *gtk_action_group_list_actions            (GtkActionGroup             *action_group);
-void            gtk_action_group_add_action              (GtkActionGroup             *action_group,
-							  GtkAction                  *action);
-void            gtk_action_group_add_action_with_accel   (GtkActionGroup             *action_group,
-							  GtkAction                  *action,
-							  const gchar                *accelerator);
-void            gtk_action_group_remove_action           (GtkActionGroup             *action_group,
-							  GtkAction                  *action);
-void            gtk_action_group_add_actions             (GtkActionGroup             *action_group,
-							  const GtkActionEntry       *entries,
-							  guint                       n_entries,
-							  gpointer                    user_data);
-void            gtk_action_group_add_toggle_actions      (GtkActionGroup             *action_group,
-							  const GtkToggleActionEntry *entries,
-							  guint                       n_entries,
-							  gpointer                    user_data);
-void            gtk_action_group_add_radio_actions       (GtkActionGroup             *action_group,
-							  const GtkRadioActionEntry  *entries,
-							  guint                       n_entries,
-							  gint                        value,
-							  GCallback                   on_change,
-							  gpointer                    user_data);
-void            gtk_action_group_add_actions_full        (GtkActionGroup             *action_group,
-							  const GtkActionEntry       *entries,
-							  guint                       n_entries,
-							  gpointer                    user_data,
-							  GDestroyNotify              destroy);
-void            gtk_action_group_add_toggle_actions_full (GtkActionGroup             *action_group,
-							  const GtkToggleActionEntry *entries,
-							  guint                       n_entries,
-							  gpointer                    user_data,
-							  GDestroyNotify              destroy);
-void            gtk_action_group_add_radio_actions_full  (GtkActionGroup             *action_group,
-							  const GtkRadioActionEntry  *entries,
-							  guint                       n_entries,
-							  gint                        value,
-							  GCallback                   on_change,
-							  gpointer                    user_data,
-							  GDestroyNotify              destroy);
-void            gtk_action_group_set_translate_func      (GtkActionGroup             *action_group,
-							  GtkTranslateFunc            func,
-							  gpointer                    data,
-							  GtkDestroyNotify            notify);
-void            gtk_action_group_set_translation_domain  (GtkActionGroup             *action_group,
-							  const gchar                *domain);
-G_CONST_RETURN gchar *gtk_action_group_translate_string  (GtkActionGroup             *action_group,
-  	                                                  const gchar                *string);
-
-/* Protected for use by GtkAction */
-void _gtk_action_group_emit_connect_proxy    (GtkActionGroup *action_group,
-                                              GtkAction      *action,
-                                              GtkWidget      *proxy);
-void _gtk_action_group_emit_disconnect_proxy (GtkActionGroup *action_group,
-                                              GtkAction      *action,
-                                              GtkWidget      *proxy);
-void _gtk_action_group_emit_pre_activate     (GtkActionGroup *action_group,
-                                              GtkAction      *action);
-void _gtk_action_group_emit_post_activate    (GtkActionGroup *action_group,
-                                              GtkAction      *action);
-
-G_END_DECLS
-
-#endif  /* __GTK_ACTION_GROUP_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkadjustment.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkadjustment.h
deleted file mode 100644
index 1fe3e4ae..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkadjustment.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_ADJUSTMENT_H__
-#define __GTK_ADJUSTMENT_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkobject.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_ADJUSTMENT                  (gtk_adjustment_get_type ())
-#define GTK_ADJUSTMENT(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ADJUSTMENT, GtkAdjustment))
-#define GTK_ADJUSTMENT_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ADJUSTMENT, GtkAdjustmentClass))
-#define GTK_IS_ADJUSTMENT(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ADJUSTMENT))
-#define GTK_IS_ADJUSTMENT_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ADJUSTMENT))
-#define GTK_ADJUSTMENT_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ADJUSTMENT, GtkAdjustmentClass))
-
-
-typedef struct _GtkAdjustment	    GtkAdjustment;
-typedef struct _GtkAdjustmentClass  GtkAdjustmentClass;
-
-struct _GtkAdjustment
-{
-  GtkObject parent_instance;
-  
-  gdouble lower;
-  gdouble upper;
-  gdouble value;
-  gdouble step_increment;
-  gdouble page_increment;
-  gdouble page_size;
-};
-
-struct _GtkAdjustmentClass
-{
-  GtkObjectClass parent_class;
-  
-  void (* changed)	 (GtkAdjustment *adjustment);
-  void (* value_changed) (GtkAdjustment *adjustment);
-  
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType	   gtk_adjustment_get_type		(void) G_GNUC_CONST;
-GtkObject* gtk_adjustment_new			(gdouble	  value,
-						 gdouble	  lower,
-						 gdouble	  upper,
-						 gdouble	  step_increment,
-						 gdouble	  page_increment,
-						 gdouble	  page_size);
-void	   gtk_adjustment_changed		(GtkAdjustment	 *adjustment);
-void	   gtk_adjustment_value_changed		(GtkAdjustment	 *adjustment);
-void	   gtk_adjustment_clamp_page		(GtkAdjustment	 *adjustment,
-						 gdouble	  lower,
-						 gdouble	  upper);
-gdouble	   gtk_adjustment_get_value		(GtkAdjustment   *adjustment);
-void	   gtk_adjustment_set_value		(GtkAdjustment	 *adjustment,
-						 gdouble	  value);
-
-G_END_DECLS
-
-#endif /* __GTK_ADJUSTMENT_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkalignment.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkalignment.h
deleted file mode 100644
index df39c541..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkalignment.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_ALIGNMENT_H__
-#define __GTK_ALIGNMENT_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkbin.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_ALIGNMENT                  (gtk_alignment_get_type ())
-#define GTK_ALIGNMENT(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ALIGNMENT, GtkAlignment))
-#define GTK_ALIGNMENT_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ALIGNMENT, GtkAlignmentClass))
-#define GTK_IS_ALIGNMENT(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ALIGNMENT))
-#define GTK_IS_ALIGNMENT_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ALIGNMENT))
-#define GTK_ALIGNMENT_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ALIGNMENT, GtkAlignmentClass))
-
-
-typedef struct _GtkAlignment       GtkAlignment;
-typedef struct _GtkAlignmentClass  GtkAlignmentClass;
-typedef struct _GtkAlignmentPrivate GtkAlignmentPrivate;
-
-struct _GtkAlignment
-{
-  GtkBin bin;
-
-  gfloat xalign;
-  gfloat yalign;
-  gfloat xscale;
-  gfloat yscale;
-};
-
-struct _GtkAlignmentClass
-{
-  GtkBinClass parent_class;
-};
-
-
-GType      gtk_alignment_get_type   (void) G_GNUC_CONST;
-GtkWidget* gtk_alignment_new        (gfloat             xalign,
-				     gfloat             yalign,
-				     gfloat             xscale,
-				     gfloat             yscale);
-void       gtk_alignment_set        (GtkAlignment      *alignment,
-				     gfloat             xalign,
-				     gfloat             yalign,
-				     gfloat             xscale,
-				     gfloat             yscale);
-
-void       gtk_alignment_set_padding (GtkAlignment      *alignment,
-				      guint              padding_top,
-				      guint              padding_bottom,
-				      guint              padding_left,
-				      guint              padding_right);
-
-void       gtk_alignment_get_padding (GtkAlignment      *alignment,
-				      guint             *padding_top,
-				      guint             *padding_bottom,
-				      guint             *padding_left,
-				      guint             *padding_right);
-
-G_END_DECLS
-
-
-#endif /* __GTK_ALIGNMENT_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkarrow.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkarrow.h
deleted file mode 100644
index 7692b771..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkarrow.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2001.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_ARROW_H__
-#define __GTK_ARROW_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkmisc.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_ARROW                  (gtk_arrow_get_type ())
-#define GTK_ARROW(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ARROW, GtkArrow))
-#define GTK_ARROW_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ARROW, GtkArrowClass))
-#define GTK_IS_ARROW(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ARROW))
-#define GTK_IS_ARROW_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ARROW))
-#define GTK_ARROW_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ARROW, GtkArrowClass))
-
-
-typedef struct _GtkArrow       GtkArrow;
-typedef struct _GtkArrowClass  GtkArrowClass;
-
-struct _GtkArrow
-{
-  GtkMisc misc;
-
-  gint16 arrow_type;
-  gint16 shadow_type;
-};
-
-struct _GtkArrowClass
-{
-  GtkMiscClass parent_class;
-};
-
-
-GType      gtk_arrow_get_type   (void) G_GNUC_CONST;
-GtkWidget* gtk_arrow_new        (GtkArrowType   arrow_type,
-				 GtkShadowType  shadow_type);
-void       gtk_arrow_set        (GtkArrow      *arrow,
-				 GtkArrowType   arrow_type,
-				 GtkShadowType  shadow_type);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_ARROW_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaspectframe.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaspectframe.h
deleted file mode 100644
index e85888c6..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaspectframe.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2001.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_ASPECT_FRAME_H__
-#define __GTK_ASPECT_FRAME_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkframe.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_ASPECT_FRAME            (gtk_aspect_frame_get_type ())
-#define GTK_ASPECT_FRAME(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ASPECT_FRAME, GtkAspectFrame))
-#define GTK_ASPECT_FRAME_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ASPECT_FRAME, GtkAspectFrameClass))
-#define GTK_IS_ASPECT_FRAME(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ASPECT_FRAME))
-#define GTK_IS_ASPECT_FRAME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ASPECT_FRAME))
-#define GTK_ASPECT_FRAME_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ASPECT_FRAME, GtkAspectFrameClass))
-
-
-typedef struct _GtkAspectFrame       GtkAspectFrame;
-typedef struct _GtkAspectFrameClass  GtkAspectFrameClass;
-
-struct _GtkAspectFrame
-{
-  GtkFrame frame;
-
-  gfloat xalign;
-  gfloat yalign;
-  gfloat ratio;
-  gboolean obey_child;
-
-  GtkAllocation center_allocation;
-};
-
-struct _GtkAspectFrameClass
-{
-  GtkFrameClass parent_class;
-};
-
-
-GType      gtk_aspect_frame_get_type   (void) G_GNUC_CONST;
-GtkWidget* gtk_aspect_frame_new        (const gchar     *label,
-					gfloat           xalign,
-					gfloat           yalign,
-					gfloat           ratio,
-					gboolean         obey_child);
-void       gtk_aspect_frame_set        (GtkAspectFrame  *aspect_frame,
-					gfloat           xalign,
-					gfloat           yalign,
-					gfloat           ratio,
-					gboolean         obey_child);
-
-
-G_END_DECLS
-
-#endif /* __GTK_ASPECT_FRAME_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkassistant.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkassistant.h
deleted file mode 100644
index cadffd0d..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkassistant.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/* 
- * GTK - The GIMP Toolkit
- * Copyright (C) 1999  Red Hat, Inc.
- * Copyright (C) 2002  Anders Carlsson <andersca@gnu.org>
- * Copyright (C) 2003  Matthias Clasen <mclasen@redhat.com>
- * Copyright (C) 2005  Carlos Garnacho Parro <carlosg@gnome.org>
- *
- * All rights reserved.
- *
- * 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 __GTK_ASSISTANT_H__
-#define __GTK_ASSISTANT_H__
-
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_ASSISTANT         (gtk_assistant_get_type ())
-#define GTK_ASSISTANT(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GTK_TYPE_ASSISTANT, GtkAssistant))
-#define GTK_ASSISTANT_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST    ((c), GTK_TYPE_ASSISTANT, GtkAssistantClass))
-#define GTK_IS_ASSISTANT(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTK_TYPE_ASSISTANT))
-#define GTK_IS_ASSISTANT_CLASS(c)  (G_TYPE_CHECK_CLASS_TYPE    ((c), GTK_TYPE_ASSISTANT))
-#define GTK_ASSISTANT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS  ((o), GTK_TYPE_ASSISTANT, GtkAssistantClass))
-
-typedef enum
-{
-  GTK_ASSISTANT_PAGE_CONTENT,
-  GTK_ASSISTANT_PAGE_INTRO,
-  GTK_ASSISTANT_PAGE_CONFIRM,
-  GTK_ASSISTANT_PAGE_SUMMARY,
-  GTK_ASSISTANT_PAGE_PROGRESS
-} GtkAssistantPageType;
-
-typedef struct _GtkAssistant        GtkAssistant;
-typedef struct _GtkAssistantPrivate GtkAssistantPrivate;
-typedef struct _GtkAssistantClass   GtkAssistantClass;
-
-struct _GtkAssistant
-{
-  GtkWindow  parent;
-
-  GtkWidget *cancel;
-  GtkWidget *forward;
-  GtkWidget *back;
-  GtkWidget *apply;
-  GtkWidget *close;
-  GtkWidget *last;
-
-  /*< private >*/
-  GtkAssistantPrivate *priv;
-};
-
-struct _GtkAssistantClass
-{
-  GtkWindowClass parent_class;
-
-  void (* prepare) (GtkAssistant *assistant, GtkWidget *page);
-  void (* apply)   (GtkAssistant *assistant);
-  void (* close)   (GtkAssistant *assistant);
-  void (* cancel)  (GtkAssistant *assistant);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-  void (*_gtk_reserved5) (void);
-};
-
-typedef gint (*GtkAssistantPageFunc) (gint current_page, gpointer data);
-
-GType                 gtk_assistant_get_type              (void) G_GNUC_CONST;
-GtkWidget            *gtk_assistant_new                   (void);
-gint                  gtk_assistant_get_current_page      (GtkAssistant         *assistant);
-void                  gtk_assistant_set_current_page      (GtkAssistant         *assistant,
-							   gint                  page_num);
-gint                  gtk_assistant_get_n_pages           (GtkAssistant         *assistant);
-GtkWidget            *gtk_assistant_get_nth_page          (GtkAssistant         *assistant,
-							   gint                  page_num);
-gint                  gtk_assistant_prepend_page          (GtkAssistant         *assistant,
-							   GtkWidget            *page);
-gint                  gtk_assistant_append_page           (GtkAssistant         *assistant,
-							   GtkWidget            *page);
-gint                  gtk_assistant_insert_page           (GtkAssistant         *assistant,
-							   GtkWidget            *page,
-							   gint                  position);
-void                  gtk_assistant_set_forward_page_func (GtkAssistant         *assistant,
-							   GtkAssistantPageFunc  page_func,
-							   gpointer              data,
-							   GDestroyNotify        destroy);
-void                  gtk_assistant_set_page_type         (GtkAssistant         *assistant,
-							   GtkWidget            *page,
-							   GtkAssistantPageType  type);
-GtkAssistantPageType  gtk_assistant_get_page_type         (GtkAssistant         *assistant,
-							   GtkWidget            *page);
-void                  gtk_assistant_set_page_title        (GtkAssistant         *assistant,
-							   GtkWidget            *page,
-							   const gchar          *title);
-G_CONST_RETURN gchar *gtk_assistant_get_page_title        (GtkAssistant         *assistant,
-							   GtkWidget            *page);
-void                  gtk_assistant_set_page_header_image (GtkAssistant         *assistant,
-							   GtkWidget            *page,
-							   GdkPixbuf            *pixbuf);
-GdkPixbuf            *gtk_assistant_get_page_header_image (GtkAssistant         *assistant,
-							   GtkWidget            *page);
-void                  gtk_assistant_set_page_side_image   (GtkAssistant         *assistant,
-							   GtkWidget            *page,
-							   GdkPixbuf            *pixbuf);
-GdkPixbuf            *gtk_assistant_get_page_side_image   (GtkAssistant         *assistant,
-							   GtkWidget            *page);
-void                  gtk_assistant_set_page_complete     (GtkAssistant         *assistant,
-							   GtkWidget            *page,
-							   gboolean              complete);
-gboolean              gtk_assistant_get_page_complete     (GtkAssistant         *assistant,
-							   GtkWidget            *page);
-void                  gtk_assistant_add_action_widget     (GtkAssistant         *assistant,
-							   GtkWidget            *child);
-void                  gtk_assistant_remove_action_widget  (GtkAssistant         *assistant,
-							   GtkWidget            *child);
-
-void                  gtk_assistant_update_buttons_state  (GtkAssistant *assistant);
-
-G_END_DECLS
-
-#endif /* __GTK_ASSISTANT_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbbox.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbbox.h
deleted file mode 100644
index 1f69197f..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbbox.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_BUTTON_BOX_H__
-#define __GTK_BUTTON_BOX_H__
-
-#include <gtk/gtkbox.h>
-
-
-G_BEGIN_DECLS  
-
-#define GTK_TYPE_BUTTON_BOX             (gtk_button_box_get_type ())
-#define GTK_BUTTON_BOX(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BUTTON_BOX, GtkButtonBox))
-#define GTK_BUTTON_BOX_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_BUTTON_BOX, GtkButtonBoxClass))
-#define GTK_IS_BUTTON_BOX(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_BUTTON_BOX))
-#define GTK_IS_BUTTON_BOX_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_BUTTON_BOX))
-#define GTK_BUTTON_BOX_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_BUTTON_BOX, GtkButtonBoxClass))
-  
-
-#define GTK_BUTTONBOX_DEFAULT -1
- 
-typedef struct _GtkButtonBox       GtkButtonBox;
-typedef struct _GtkButtonBoxClass  GtkButtonBoxClass;
-
-struct _GtkButtonBox
-{
-  GtkBox box;
-  gint child_min_width;
-  gint child_min_height;
-  gint child_ipad_x;
-  gint child_ipad_y;
-  GtkButtonBoxStyle layout_style;
-};
-
-struct _GtkButtonBoxClass
-{
-  GtkBoxClass parent_class;
-};
-
-
-GType gtk_button_box_get_type (void) G_GNUC_CONST;
-
-GtkButtonBoxStyle gtk_button_box_get_layout          (GtkButtonBox      *widget);
-void              gtk_button_box_set_layout          (GtkButtonBox      *widget,
-						      GtkButtonBoxStyle  layout_style);
-gboolean          gtk_button_box_get_child_secondary (GtkButtonBox      *widget,
-						      GtkWidget         *child);
-void              gtk_button_box_set_child_secondary (GtkButtonBox      *widget,
-						      GtkWidget         *child,
-						      gboolean           is_secondary);
-
-#ifndef GTK_DISABLE_DEPRECATED
-#define gtk_button_box_set_spacing(b,s) gtk_box_set_spacing (GTK_BOX (b), s)
-#define gtk_button_box_get_spacing(b)   gtk_box_get_spacing (GTK_BOX (b))
-
-void gtk_button_box_set_child_size     (GtkButtonBox *widget,
-					gint          min_width,
-					gint          min_height);
-void gtk_button_box_set_child_ipadding (GtkButtonBox *widget,
-					gint          ipad_x,
-					gint          ipad_y);
-void gtk_button_box_get_child_size     (GtkButtonBox *widget,
-					gint         *min_width,
-					gint         *min_height);
-void gtk_button_box_get_child_ipadding (GtkButtonBox *widget,
-					gint         *ipad_x,
-					gint         *ipad_y);
-#endif
-
-/* Internal method - do not use. */
-void _gtk_button_box_child_requisition (GtkWidget *widget,
-					int       *nvis_children,
-					int       *nvis_secondaries,
-					int       *width,
-					int       *height);
-G_END_DECLS
-
-#endif /* __GTK_BUTTON_BOX_H__ */
-
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbin.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbin.h
deleted file mode 100644
index c919c1d9..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbin.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_BIN_H__
-#define __GTK_BIN_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkcontainer.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_BIN                  (gtk_bin_get_type ())
-#define GTK_BIN(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BIN, GtkBin))
-#define GTK_BIN_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_BIN, GtkBinClass))
-#define GTK_IS_BIN(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_BIN))
-#define GTK_IS_BIN_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_BIN))
-#define GTK_BIN_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_BIN, GtkBinClass))
-
-
-typedef struct _GtkBin       GtkBin;
-typedef struct _GtkBinClass  GtkBinClass;
-
-struct _GtkBin
-{
-  GtkContainer container;
-
-  GtkWidget *child;
-};
-
-struct _GtkBinClass
-{
-  GtkContainerClass parent_class;
-};
-
-
-GType      gtk_bin_get_type  (void) G_GNUC_CONST;
-
-GtkWidget *gtk_bin_get_child (GtkBin *bin);
-
-G_END_DECLS
-
-#endif /* __GTK_BIN_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbindings.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbindings.h
deleted file mode 100644
index a3109b29..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbindings.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * GtkBindingSet: Keybinding manager for GtkObjects.
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_BINDINGS_H__
-#define __GTK_BINDINGS_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkobject.h>
-#include <gtk/gtkenums.h>
-
-
-G_BEGIN_DECLS
-
-
-/* Binding sets
- */
-
-typedef struct _GtkBindingSet		GtkBindingSet;
-typedef struct _GtkBindingEntry		GtkBindingEntry;
-typedef struct _GtkBindingSignal	GtkBindingSignal;
-typedef struct _GtkBindingArg		GtkBindingArg;
-
-struct _GtkBindingSet
-{
-  gchar			*set_name;
-  gint			 priority;
-  GSList		*widget_path_pspecs;
-  GSList		*widget_class_pspecs;
-  GSList		*class_branch_pspecs;
-  GtkBindingEntry	*entries;
-  GtkBindingEntry	*current;
-  guint                  parsed : 1; /* From RC content */
-};
-
-struct _GtkBindingEntry
-{
-  /* key portion
-   */
-  guint			 keyval;
-  GdkModifierType	 modifiers;
-  
-  GtkBindingSet		*binding_set;
-  guint			destroyed : 1;
-  guint			in_emission : 1;
-  guint                 marks_unbound : 1;
-  GtkBindingEntry	*set_next;
-  GtkBindingEntry	*hash_next;
-  GtkBindingSignal	*signals;
-};
-
-struct _GtkBindingArg
-{
-  GType		 arg_type;
-  union {
-    glong	 long_data;
-    gdouble	 double_data;
-    gchar	*string_data;
-  } d;
-};
-
-struct _GtkBindingSignal
-{
-  GtkBindingSignal	*next;
-  gchar 		*signal_name;
-  guint			 n_args;
-  GtkBindingArg		*args;
-};
-
-/* Application-level methods */
-
-GtkBindingSet*	gtk_binding_set_new	(const gchar	*set_name);
-GtkBindingSet*	gtk_binding_set_by_class(gpointer	 object_class);
-GtkBindingSet*	gtk_binding_set_find	(const gchar	*set_name);
-gboolean gtk_bindings_activate		(GtkObject	*object,
-					 guint		 keyval,
-					 GdkModifierType modifiers);
-gboolean gtk_bindings_activate_event    (GtkObject      *object,
-					 GdkEventKey    *event);
-gboolean gtk_binding_set_activate	(GtkBindingSet	*binding_set,
-					 guint		 keyval,
-					 GdkModifierType modifiers,
-					 GtkObject	*object);
-
-#ifndef GTK_DISABLE_DEPRECATED
-#define	 gtk_binding_entry_add		gtk_binding_entry_clear
-void	 gtk_binding_entry_clear	(GtkBindingSet	*binding_set,
-					 guint		 keyval,
-					 GdkModifierType modifiers);
-void	 gtk_binding_entry_add_signall	(GtkBindingSet	*binding_set,
-					 guint		 keyval,
-					 GdkModifierType modifiers,
-					 const gchar	*signal_name,
-					 GSList		*binding_args);
-guint	 gtk_binding_parse_binding      (GScanner       *scanner);
-#endif /* GTK_DISABLE_DEPRECATED */
-
-void	 gtk_binding_entry_skip         (GtkBindingSet  *binding_set,
-                                         guint           keyval,
-                                         GdkModifierType modifiers);
-void	 gtk_binding_entry_add_signal   (GtkBindingSet  *binding_set,
-                                         guint           keyval,
-                                         GdkModifierType modifiers,
-                                         const gchar    *signal_name,
-                                         guint           n_args,
-                                         ...);
-void	 gtk_binding_entry_remove	(GtkBindingSet	*binding_set,
-					 guint		 keyval,
-					 GdkModifierType modifiers);
-
-void	 gtk_binding_set_add_path	(GtkBindingSet	*binding_set,
-					 GtkPathType	 path_type,
-					 const gchar	*path_pattern,
-					 GtkPathPriorityType priority);
-
-
-/* Non-public methods */
-
-guint	 _gtk_binding_parse_binding     (GScanner       *scanner);
-void     _gtk_binding_reset_parsed      (void);
-void	 _gtk_binding_entry_add_signall (GtkBindingSet  *binding_set,
-					 guint		 keyval,
-					 GdkModifierType modifiers,
-					 const gchar	*signal_name,
-					 GSList		*binding_args);
-
-/* Creates a signal with a fixed callback instead of a class offset;
- * useful for key binding signals
- */
-guint _gtk_binding_signal_new (const gchar       *signal_name,
-			       GType		  itype,
-			       GSignalFlags	  signal_flags,
-			       GCallback          handler,
-			       GSignalAccumulator accumulator,
-			       gpointer		  accu_data,
-			       GSignalCMarshaller c_marshaller,
-			       GType		  return_type,
-			       guint		  n_params,
-			       ...);
-
-G_END_DECLS
-
-
-#endif /* __GTK_BINDINGS_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbox.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbox.h
deleted file mode 100644
index b4fec749..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbox.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_BOX_H__
-#define __GTK_BOX_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkcontainer.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_BOX            (gtk_box_get_type ())
-#define GTK_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BOX, GtkBox))
-#define GTK_BOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_BOX, GtkBoxClass))
-#define GTK_IS_BOX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_BOX))
-#define GTK_IS_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_BOX))
-#define GTK_BOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_BOX, GtkBoxClass))
-
-
-typedef struct _GtkBox	      GtkBox;
-typedef struct _GtkBoxClass   GtkBoxClass;
-typedef struct _GtkBoxChild   GtkBoxChild;
-
-struct _GtkBox
-{
-  GtkContainer container;
-
-  /*< public >*/
-  GList *children;
-  gint16 spacing;
-  guint homogeneous : 1;
-};
-
-struct _GtkBoxClass
-{
-  GtkContainerClass parent_class;
-};
-
-struct _GtkBoxChild
-{
-  GtkWidget *widget;
-  guint16 padding;
-  guint expand : 1;
-  guint fill : 1;
-  guint pack : 1;
-  guint is_secondary : 1;
-};
-
-
-GType	   gtk_box_get_type	       (void) G_GNUC_CONST;
-void	   gtk_box_pack_start	       (GtkBox	     *box,
-					GtkWidget    *child,
-					gboolean      expand,
-					gboolean      fill,
-					guint	      padding);
-void	   gtk_box_pack_end	       (GtkBox	     *box,
-					GtkWidget    *child,
-					gboolean      expand,
-					gboolean      fill,
-					guint	      padding);
-void	   gtk_box_pack_start_defaults (GtkBox	     *box,
-					GtkWidget    *widget);
-void	   gtk_box_pack_end_defaults   (GtkBox	     *box,
-					GtkWidget    *widget);
-void	   gtk_box_set_homogeneous     (GtkBox	     *box,
-					gboolean      homogeneous);
-gboolean   gtk_box_get_homogeneous     (GtkBox	     *box);
-void	   gtk_box_set_spacing	       (GtkBox	     *box,
-					gint	      spacing);
-gint       gtk_box_get_spacing         (GtkBox       *box);
-void	   gtk_box_reorder_child       (GtkBox	     *box,
-					GtkWidget    *child,
-					gint	      position);
-void	   gtk_box_query_child_packing (GtkBox	     *box,
-					GtkWidget    *child,
-					gboolean     *expand,
-					gboolean     *fill,
-					guint	     *padding,
-					GtkPackType  *pack_type);
-void	   gtk_box_set_child_packing   (GtkBox	     *box,
-					GtkWidget    *child,
-					gboolean      expand,
-					gboolean      fill,
-					guint	      padding,
-					GtkPackType   pack_type);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_BOX_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbuildable.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbuildable.h
deleted file mode 100644
index ee18fe8d..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbuildable.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2006-2007 Async Open Source,
- *                         Johan Dahlin <jdahlin@async.com.br>
- *
- * 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 __GTK_BUILDABLE_H__
-#define __GTK_BUILDABLE_H__
-
-#include <glib.h>
-#include <gtk/gtkbuilder.h>
-#include <gtk/gtktypeutils.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_BUILDABLE            (gtk_buildable_get_type ())
-#define GTK_BUILDABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BUILDABLE, GtkBuildable))
-#define GTK_BUILDABLE_CLASS(obj)      (G_TYPE_CHECK_CLASS_CAST ((obj), GTK_TYPE_BUILDABLE, GtkBuildableIface))
-#define GTK_IS_BUILDABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_BUILDABLE))
-#define GTK_BUILDABLE_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_BUILDABLE, GtkBuildableIface))
-
-typedef struct _GtkBuildable      GtkBuildable; /* Dummy typedef */
-typedef struct _GtkBuildableIface GtkBuildableIface;
-
-struct _GtkBuildableIface
-{
-  GTypeInterface g_iface;
-
-  /* virtual table */
-  void          (* set_name)               (GtkBuildable  *buildable,
-                                            const gchar   *name);
-  const gchar * (* get_name)               (GtkBuildable  *buildable);
-  void          (* add_child)              (GtkBuildable  *buildable,
-					    GtkBuilder    *builder,
-					    GObject       *child,
-					    const gchar   *type);
-  void          (* set_buildable_property) (GtkBuildable  *buildable,
-					    GtkBuilder    *builder,
-					    const gchar   *name,
-					    const GValue  *value);
-  GObject *     (* construct_child)        (GtkBuildable  *buildable,
-					    GtkBuilder    *builder,
-					    const gchar   *name);
-  gboolean      (* custom_tag_start)       (GtkBuildable  *buildable,
-					    GtkBuilder    *builder,
-					    GObject       *child,
-					    const gchar   *tagname,
-					    GMarkupParser *parser,
-					    gpointer      *data);
-  void          (* custom_tag_end)         (GtkBuildable  *buildable,
-					    GtkBuilder    *builder,
-					    GObject       *child,
-					    const gchar   *tagname,
-					    gpointer      *data);
-  void          (* custom_finished)        (GtkBuildable  *buildable,
-					    GtkBuilder    *builder,
-					    GObject       *child,
-					    const gchar   *tagname,
-					    gpointer       data);
-  void          (* parser_finished)        (GtkBuildable  *buildable,
-					    GtkBuilder    *builder);
-
-  GObject *     (* get_internal_child)     (GtkBuildable  *buildable,
-					    GtkBuilder    *builder,
-					    const gchar   *childname);
-};
-
-
-GType     gtk_buildable_get_type               (void) G_GNUC_CONST;
-
-void      gtk_buildable_set_name               (GtkBuildable        *buildable,
-						const gchar         *name);
-const gchar * gtk_buildable_get_name           (GtkBuildable        *buildable);
-void      gtk_buildable_add_child              (GtkBuildable        *buildable,
-						GtkBuilder          *builder,
-						GObject             *child,
-						const gchar         *type);
-void      gtk_buildable_set_buildable_property (GtkBuildable        *buildable,
-						GtkBuilder          *builder,
-						const gchar         *name,
-						const GValue        *value);
-GObject * gtk_buildable_construct_child        (GtkBuildable        *buildable,
-						GtkBuilder          *builder,
-						const gchar         *name);
-gboolean  gtk_buildable_custom_tag_start       (GtkBuildable        *buildable,
-						GtkBuilder          *builder,
-						GObject             *child,
-						const gchar         *tagname,
-						GMarkupParser       *parser,
-						gpointer            *data);
-void      gtk_buildable_custom_tag_end         (GtkBuildable        *buildable,
-						GtkBuilder          *builder,
-						GObject             *child,
-						const gchar         *tagname,
-						gpointer            *data);
-void      gtk_buildable_custom_finished        (GtkBuildable        *buildable,
-						GtkBuilder          *builder,
-						GObject             *child,
-						const gchar         *tagname,
-						gpointer             data);
-void      gtk_buildable_parser_finished        (GtkBuildable        *buildable,
-						GtkBuilder          *builder);
-GObject * gtk_buildable_get_internal_child     (GtkBuildable        *buildable,
-						GtkBuilder          *builder,
-						const gchar         *childname);
-
-G_END_DECLS
-
-#endif /* __GTK_BUILDABLE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbuilder.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbuilder.h
deleted file mode 100644
index 732acaa1..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbuilder.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2006-2007 Async Open Source,
- *                         Johan Dahlin <jdahlin@async.com.br>
- *
- * 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 __GTK_BUILDER_H__
-#define __GTK_BUILDER_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_BUILDER                 (gtk_builder_get_type ())
-#define GTK_BUILDER(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BUILDER, GtkBuilder))
-#define GTK_BUILDER_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_BUILDER, GtkBuilderClass))
-#define GTK_IS_BUILDER(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_BUILDER))
-#define GTK_IS_BUILDER_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_BUILDER))
-#define GTK_BUILDER_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_BUILDER, GtkBuilderClass))
-
-#define GTK_BUILDER_ERROR                (gtk_builder_error_quark ())
-
-typedef struct _GtkBuilder        GtkBuilder;
-typedef struct _GtkBuilderClass   GtkBuilderClass;
-typedef struct _GtkBuilderPrivate GtkBuilderPrivate;
-
-typedef enum
-{
-  GTK_BUILDER_ERROR_INVALID_TYPE_FUNCTION,
-  GTK_BUILDER_ERROR_UNHANDLED_TAG,
-  GTK_BUILDER_ERROR_MISSING_ATTRIBUTE,
-  GTK_BUILDER_ERROR_INVALID_ATTRIBUTE,
-  GTK_BUILDER_ERROR_INVALID_TAG,
-  GTK_BUILDER_ERROR_MISSING_PROPERTY_VALUE,
-  GTK_BUILDER_ERROR_INVALID_VALUE
-} GtkBuilderError;
-
-GQuark gtk_builder_error_quark (void);
-
-struct _GtkBuilder
-{
-  GObject parent_instance;
-
-  GtkBuilderPrivate *priv;
-};
-
-struct _GtkBuilderClass
-{
-  GObjectClass parent_class;
-  
-  GType (* get_type_from_name) (GtkBuilder *builder,
-                                const char *type_name);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-  void (*_gtk_reserved5) (void);
-  void (*_gtk_reserved6) (void);
-  void (*_gtk_reserved7) (void);
-  void (*_gtk_reserved8) (void);
-};
-
-typedef void (*GtkBuilderConnectFunc) (GtkBuilder    *builder,
-				       GObject       *object,
-				       const gchar   *signal_name,
-				       const gchar   *handler_name,
-				       GObject       *connect_object,
-				       GConnectFlags  flags,
-				       gpointer       user_data);
-
-GType        gtk_builder_get_type                (void) G_GNUC_CONST;
-GtkBuilder*  gtk_builder_new                     (void);
-
-guint        gtk_builder_add_from_file           (GtkBuilder    *builder,
-                                                  const gchar   *filename,
-                                                  GError       **error);
-guint        gtk_builder_add_from_string         (GtkBuilder    *builder,
-                                                  const gchar   *buffer,
-                                                  gsize          length,
-                                                  GError       **error);
-GObject*     gtk_builder_get_object              (GtkBuilder    *builder,
-                                                  const gchar   *name);
-GSList*      gtk_builder_get_objects             (GtkBuilder    *builder);
-void         gtk_builder_connect_signals         (GtkBuilder    *builder,
-						  gpointer       user_data);
-void         gtk_builder_connect_signals_full    (GtkBuilder    *builder,
-                                                  GtkBuilderConnectFunc func,
-						  gpointer       user_data);
-void         gtk_builder_set_translation_domain  (GtkBuilder   	*builder,
-                                                  const gchar  	*domain);
-const gchar* gtk_builder_get_translation_domain  (GtkBuilder   	*builder);
-GType        gtk_builder_get_type_from_name      (GtkBuilder   	*builder,
-                                                  const char   	*type_name);
-
-gboolean     gtk_builder_value_from_string       (GtkBuilder    *builder,
-						  GParamSpec   	*pspec,
-                                                  const gchar  	*string,
-                                                  GValue       	*value,
-						  GError       **error);
-gboolean     gtk_builder_value_from_string_type  (GtkBuilder    *builder,
-						  GType        	 type,
-                                                  const gchar  	*string,
-                                                  GValue       	*value,
-						  GError       **error);
-
-#define GTK_BUILDER_WARN_INVALID_CHILD_TYPE(object, type) \
-  g_warning ("'%s' is not a valid child type of '%s'", type, g_type_name (G_OBJECT_TYPE (type)))
-
-G_END_DECLS
-
-#endif /* __GTK_BUILDER_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbutton.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbutton.h
deleted file mode 100644
index c9fe63bc..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbutton.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2001.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_BUTTON_H__
-#define __GTK_BUTTON_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkbin.h>
-#include <gtk/gtkenums.h>
-#include <gtk/gtkimage.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_BUTTON                 (gtk_button_get_type ())
-#define GTK_BUTTON(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BUTTON, GtkButton))
-#define GTK_BUTTON_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_BUTTON, GtkButtonClass))
-#define GTK_IS_BUTTON(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_BUTTON))
-#define GTK_IS_BUTTON_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_BUTTON))
-#define GTK_BUTTON_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_BUTTON, GtkButtonClass))
-
-typedef struct _GtkButton        GtkButton;
-typedef struct _GtkButtonClass   GtkButtonClass;
-
-struct _GtkButton
-{
-  GtkBin bin;
-
-  GdkWindow *event_window;
-
-  gchar *label_text;
-
-  guint activate_timeout;
-
-  guint constructed : 1;
-  guint in_button : 1;
-  guint button_down : 1;
-  guint relief : 2;
-  guint use_underline : 1;
-  guint use_stock : 1;
-  guint depressed : 1;
-  guint depress_on_activate : 1;
-  guint focus_on_click : 1;
-};
-
-struct _GtkButtonClass
-{
-  GtkBinClass        parent_class;
-  
-  void (* pressed)  (GtkButton *button);
-  void (* released) (GtkButton *button);
-  void (* clicked)  (GtkButton *button);
-  void (* enter)    (GtkButton *button);
-  void (* leave)    (GtkButton *button);
-  void (* activate) (GtkButton *button);
-  
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType          gtk_button_get_type          (void) G_GNUC_CONST;
-GtkWidget*     gtk_button_new               (void);
-GtkWidget*     gtk_button_new_with_label    (const gchar    *label);
-GtkWidget*     gtk_button_new_from_stock    (const gchar    *stock_id);
-GtkWidget*     gtk_button_new_with_mnemonic (const gchar    *label);
-void           gtk_button_pressed           (GtkButton      *button);
-void           gtk_button_released          (GtkButton      *button);
-void           gtk_button_clicked           (GtkButton      *button);
-void           gtk_button_enter             (GtkButton      *button);
-void           gtk_button_leave             (GtkButton      *button);
-
-void                  gtk_button_set_relief         (GtkButton      *button,
-						     GtkReliefStyle  newstyle);
-GtkReliefStyle        gtk_button_get_relief         (GtkButton      *button);
-void                  gtk_button_set_label          (GtkButton      *button,
-						     const gchar    *label);
-G_CONST_RETURN gchar *gtk_button_get_label          (GtkButton      *button);
-void                  gtk_button_set_use_underline  (GtkButton      *button,
-						     gboolean        use_underline);
-gboolean              gtk_button_get_use_underline  (GtkButton      *button);
-void                  gtk_button_set_use_stock      (GtkButton      *button,
-						     gboolean        use_stock);
-gboolean              gtk_button_get_use_stock      (GtkButton      *button);
-void                  gtk_button_set_focus_on_click (GtkButton      *button,
-						     gboolean        focus_on_click);
-gboolean              gtk_button_get_focus_on_click (GtkButton      *button);
-void                  gtk_button_set_alignment      (GtkButton      *button,
-						     gfloat          xalign,
-						     gfloat          yalign);
-void                  gtk_button_get_alignment      (GtkButton      *button,
-						     gfloat         *xalign,
-						     gfloat         *yalign);
-void                  gtk_button_set_image          (GtkButton      *button,
-					             GtkWidget      *image);
-GtkWidget*            gtk_button_get_image          (GtkButton      *button);
-void                  gtk_button_set_image_position (GtkButton      *button,
-						     GtkPositionType position);
-GtkPositionType       gtk_button_get_image_position (GtkButton      *button);
-
-void _gtk_button_set_depressed             (GtkButton     *button,
-					    gboolean       depressed);
-void _gtk_button_paint                     (GtkButton     *button,
-					    GdkRectangle  *area,
-					    GtkStateType   state_type,
-					    GtkShadowType  shadow_type,
-					    const gchar   *main_detail,
-					    const gchar   *default_detail);
-
-G_END_DECLS
-
-#endif /* __GTK_BUTTON_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcalendar.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcalendar.h
deleted file mode 100644
index 3115e0ee..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcalendar.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * GTK Calendar Widget
- * Copyright (C) 1998 Cesar Miquel and Shawn T. Amundson
- *
- * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_CALENDAR_H__
-#define __GTK_CALENDAR_H__
-
-#include <gdk/gdk.h>
-#include <gtk/gtkwidget.h>
-
-/* Not needed, retained for compatibility -Yosh */
-#include <gtk/gtksignal.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_CALENDAR                  (gtk_calendar_get_type ())
-#define GTK_CALENDAR(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CALENDAR, GtkCalendar))
-#define GTK_CALENDAR_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CALENDAR, GtkCalendarClass))
-#define GTK_IS_CALENDAR(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CALENDAR))
-#define GTK_IS_CALENDAR_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CALENDAR))
-#define GTK_CALENDAR_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CALENDAR, GtkCalendarClass))
-
-
-typedef struct _GtkCalendar	       GtkCalendar;
-typedef struct _GtkCalendarClass       GtkCalendarClass;
-
-typedef struct _GtkCalendarPrivate     GtkCalendarPrivate;
-
-typedef enum
-{
-  GTK_CALENDAR_SHOW_HEADING		= 1 << 0,
-  GTK_CALENDAR_SHOW_DAY_NAMES		= 1 << 1,
-  GTK_CALENDAR_NO_MONTH_CHANGE		= 1 << 2,
-  GTK_CALENDAR_SHOW_WEEK_NUMBERS	= 1 << 3,
-  GTK_CALENDAR_WEEK_START_MONDAY	= 1 << 4
-} GtkCalendarDisplayOptions;
-
-struct _GtkCalendar
-{
-  GtkWidget widget;
-  
-  GtkStyle  *header_style;
-  GtkStyle  *label_style;
-  
-  gint month;
-  gint year;
-  gint selected_day;
-  
-  gint day_month[6][7];
-  gint day[6][7];
-  
-  gint num_marked_dates;
-  gint marked_date[31];
-  GtkCalendarDisplayOptions  display_flags;
-  GdkColor marked_date_color[31];
-  
-  GdkGC *gc;			/* unused */
-  GdkGC *xor_gc;		/* unused */
-
-  gint focus_row;
-  gint focus_col;
-
-  gint highlight_row;
-  gint highlight_col;
-  
-  GtkCalendarPrivate *priv;
-  gchar grow_space [32];
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-struct _GtkCalendarClass
-{
-  GtkWidgetClass parent_class;
-  
-  /* Signal handlers */
-  void (* month_changed)		(GtkCalendar *calendar);
-  void (* day_selected)			(GtkCalendar *calendar);
-  void (* day_selected_double_click)	(GtkCalendar *calendar);
-  void (* prev_month)			(GtkCalendar *calendar);
-  void (* next_month)			(GtkCalendar *calendar);
-  void (* prev_year)			(GtkCalendar *calendar);
-  void (* next_year)			(GtkCalendar *calendar);
-  
-};
-
-
-GType	   gtk_calendar_get_type	(void) G_GNUC_CONST;
-GtkWidget* gtk_calendar_new		(void);
-
-gboolean   gtk_calendar_select_month	(GtkCalendar *calendar, 
-					 guint	      month,
-					 guint	      year);
-void	   gtk_calendar_select_day	(GtkCalendar *calendar,
-					 guint	      day);
-
-gboolean   gtk_calendar_mark_day	(GtkCalendar *calendar,
-					 guint	      day);
-gboolean   gtk_calendar_unmark_day	(GtkCalendar *calendar,
-					 guint	      day);
-void	   gtk_calendar_clear_marks	(GtkCalendar *calendar);
-
-
-void	   gtk_calendar_set_display_options (GtkCalendar    	      *calendar,
-					     GtkCalendarDisplayOptions flags);
-GtkCalendarDisplayOptions
-           gtk_calendar_get_display_options (GtkCalendar   	      *calendar);
-#ifndef GTK_DISABLE_DEPRECATED
-void	   gtk_calendar_display_options (GtkCalendar		  *calendar,
-					 GtkCalendarDisplayOptions flags);
-#endif
-
-void	   gtk_calendar_get_date	(GtkCalendar *calendar, 
-					 guint	     *year,
-					 guint	     *month,
-					 guint	     *day);
-#ifndef GTK_DISABLE_DEPRECATED
-void	   gtk_calendar_freeze		(GtkCalendar *calendar);
-void	   gtk_calendar_thaw		(GtkCalendar *calendar);
-#endif
-
-G_END_DECLS
-
-#endif /* __GTK_CALENDAR_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcelleditable.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcelleditable.h
deleted file mode 100644
index 10cde8e8..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcelleditable.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* gtkcelleditable.h
- * 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 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 __GTK_CELL_EDITABLE_H__
-#define __GTK_CELL_EDITABLE_H__
-
-#include <gtk/gtkwidget.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_CELL_EDITABLE            (gtk_cell_editable_get_type ())
-#define GTK_CELL_EDITABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_EDITABLE, GtkCellEditable))
-#define GTK_CELL_EDITABLE_CLASS(obj)      (G_TYPE_CHECK_CLASS_CAST ((obj), GTK_TYPE_CELL_EDITABLE, GtkCellEditableIface))
-#define GTK_IS_CELL_EDITABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_EDITABLE))
-#define GTK_CELL_EDITABLE_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_CELL_EDITABLE, GtkCellEditableIface))
-
-typedef struct _GtkCellEditable      GtkCellEditable; /* Dummy typedef */
-typedef struct _GtkCellEditableIface GtkCellEditableIface;
-
-struct _GtkCellEditableIface
-{
-  GTypeInterface g_iface;
-
-  /* signals */
-  void (* editing_done)  (GtkCellEditable *cell_editable);
-  void (* remove_widget) (GtkCellEditable *cell_editable);
-
-  /* virtual table */
-  void (* start_editing) (GtkCellEditable *cell_editable,
-			  GdkEvent        *event);
-};
-
-
-GType gtk_cell_editable_get_type      (void) G_GNUC_CONST;
-
-void  gtk_cell_editable_start_editing (GtkCellEditable *cell_editable,
-				       GdkEvent        *event);
-void  gtk_cell_editable_editing_done  (GtkCellEditable *cell_editable);
-void  gtk_cell_editable_remove_widget (GtkCellEditable *cell_editable);
-
-
-G_END_DECLS
-
-#endif /* __GTK_CELL_EDITABLE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcelllayout.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcelllayout.h
deleted file mode 100644
index 3f03687a..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcelllayout.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* gtkcelllayout.h
- * Copyright (C) 2003  Kristian Rietveld  <kris@gtk.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 __GTK_CELL_LAYOUT_H__
-#define __GTK_CELL_LAYOUT_H__
-
-#include <glib-object.h>
-
-#include <gtk/gtkcellrenderer.h>
-#include <gtk/gtktreeviewcolumn.h>
-#include <gtk/gtkbuildable.h>
-#include <gtk/gtkbuilder.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_CELL_LAYOUT            (gtk_cell_layout_get_type ())
-#define GTK_CELL_LAYOUT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_LAYOUT, GtkCellLayout))
-#define GTK_IS_CELL_LAYOUT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_LAYOUT))
-#define GTK_CELL_LAYOUT_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_CELL_LAYOUT, GtkCellLayoutIface))
-
-typedef struct _GtkCellLayout           GtkCellLayout; /* dummy typedef */
-typedef struct _GtkCellLayoutIface      GtkCellLayoutIface;
-
-/* keep in sync with GtkTreeCellDataFunc */
-typedef void (* GtkCellLayoutDataFunc) (GtkCellLayout   *cell_layout,
-                                        GtkCellRenderer *cell,
-                                        GtkTreeModel    *tree_model,
-                                        GtkTreeIter     *iter,
-                                        gpointer         data);
-
-struct _GtkCellLayoutIface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-  void (* pack_start)         (GtkCellLayout         *cell_layout,
-                               GtkCellRenderer       *cell,
-                               gboolean               expand);
-  void (* pack_end)           (GtkCellLayout         *cell_layout,
-                               GtkCellRenderer       *cell,
-                               gboolean               expand);
-  void (* clear)              (GtkCellLayout         *cell_layout);
-  void (* add_attribute)      (GtkCellLayout         *cell_layout,
-                               GtkCellRenderer       *cell,
-                               const gchar           *attribute,
-                               gint                   column);
-  void (* set_cell_data_func) (GtkCellLayout         *cell_layout,
-                               GtkCellRenderer       *cell,
-                               GtkCellLayoutDataFunc  func,
-                               gpointer               func_data,
-                               GDestroyNotify         destroy);
-  void (* clear_attributes)   (GtkCellLayout         *cell_layout,
-                               GtkCellRenderer       *cell);
-  void (* reorder)            (GtkCellLayout         *cell_layout,
-                               GtkCellRenderer       *cell,
-                               gint                   position);
-  GList* (* get_cells)        (GtkCellLayout         *cell_layout);
-};
-
-GType gtk_cell_layout_get_type           (void) G_GNUC_CONST;
-void  gtk_cell_layout_pack_start         (GtkCellLayout         *cell_layout,
-                                          GtkCellRenderer       *cell,
-                                          gboolean               expand);
-void  gtk_cell_layout_pack_end           (GtkCellLayout         *cell_layout,
-                                          GtkCellRenderer       *cell,
-                                          gboolean               expand);
-GList *gtk_cell_layout_get_cells         (GtkCellLayout         *cell_layout);
-void  gtk_cell_layout_clear              (GtkCellLayout         *cell_layout);
-void  gtk_cell_layout_set_attributes     (GtkCellLayout         *cell_layout,
-                                          GtkCellRenderer       *cell,
-                                          ...) G_GNUC_NULL_TERMINATED;
-void  gtk_cell_layout_add_attribute      (GtkCellLayout         *cell_layout,
-                                          GtkCellRenderer       *cell,
-                                          const gchar           *attribute,
-                                          gint                   column);
-void  gtk_cell_layout_set_cell_data_func (GtkCellLayout         *cell_layout,
-                                          GtkCellRenderer       *cell,
-                                          GtkCellLayoutDataFunc  func,
-                                          gpointer               func_data,
-                                          GDestroyNotify         destroy);
-void  gtk_cell_layout_clear_attributes   (GtkCellLayout         *cell_layout,
-                                          GtkCellRenderer       *cell);
-void  gtk_cell_layout_reorder            (GtkCellLayout         *cell_layout,
-                                          GtkCellRenderer       *cell,
-                                          gint                   position);
-gboolean _gtk_cell_layout_buildable_custom_tag_start (GtkBuildable  *buildable,
-						      GtkBuilder    *builder,
-						      GObject       *child,
-						      const gchar   *tagname,
-						      GMarkupParser *parser,
-						      gpointer      *data);
-void _gtk_cell_layout_buildable_custom_tag_end       (GtkBuildable  *buildable,
-						      GtkBuilder    *builder,
-						      GObject       *child,
-						      const gchar   *tagname,
-						      gpointer      *data);
-void _gtk_cell_layout_buildable_add_child            (GtkBuildable  *buildable,
-						      GtkBuilder    *builder,
-						      GObject       *child,
-						      const gchar   *type);
-
-G_END_DECLS
-
-#endif /* __GTK_CELL_LAYOUT_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrenderer.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrenderer.h
deleted file mode 100644
index 375106ac..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrenderer.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/* gtkcellrenderer.h
- * Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb@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 __GTK_CELL_RENDERER_H__
-#define __GTK_CELL_RENDERER_H__
-
-#include <gtk/gtkobject.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkcelleditable.h>
-
-G_BEGIN_DECLS
-
-typedef enum
-{
-  GTK_CELL_RENDERER_SELECTED    = 1 << 0,
-  GTK_CELL_RENDERER_PRELIT      = 1 << 1,
-  GTK_CELL_RENDERER_INSENSITIVE = 1 << 2,
-  /* this flag means the cell is in the sort column/row */
-  GTK_CELL_RENDERER_SORTED      = 1 << 3,
-  GTK_CELL_RENDERER_FOCUSED     = 1 << 4
-} GtkCellRendererState;
-
-typedef enum
-{
-  GTK_CELL_RENDERER_MODE_INERT,
-  GTK_CELL_RENDERER_MODE_ACTIVATABLE,
-  GTK_CELL_RENDERER_MODE_EDITABLE
-} GtkCellRendererMode;
-
-#define GTK_TYPE_CELL_RENDERER		  (gtk_cell_renderer_get_type ())
-#define GTK_CELL_RENDERER(obj)		  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_RENDERER, GtkCellRenderer))
-#define GTK_CELL_RENDERER_CLASS(klass)	  (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER, GtkCellRendererClass))
-#define GTK_IS_CELL_RENDERER(obj)	  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_RENDERER))
-#define GTK_IS_CELL_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER))
-#define GTK_CELL_RENDERER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER, GtkCellRendererClass))
-
-typedef struct _GtkCellRenderer GtkCellRenderer;
-typedef struct _GtkCellRendererClass GtkCellRendererClass;
-
-struct _GtkCellRenderer
-{
-  GtkObject parent;
-
-  gfloat xalign;
-  gfloat yalign;
-
-  gint width;
-  gint height;
-
-  guint16 xpad;
-  guint16 ypad;
-
-  guint mode : 2;
-  guint visible : 1;
-  guint is_expander : 1;
-  guint is_expanded : 1;
-  guint cell_background_set : 1;
-  guint sensitive : 1;
-  guint editing : 1;
-};
-
-struct _GtkCellRendererClass
-{
-  GtkObjectClass parent_class;
-
-  /* vtable - not signals */
-  void             (* get_size)      (GtkCellRenderer      *cell,
-				      GtkWidget            *widget,
-				      GdkRectangle         *cell_area,
-				      gint                 *x_offset,
-				      gint                 *y_offset,
-				      gint                 *width,
-				      gint                 *height);
-  void             (* render)        (GtkCellRenderer      *cell,
-				      GdkDrawable          *window,
-				      GtkWidget            *widget,
-				      GdkRectangle         *background_area,
-				      GdkRectangle         *cell_area,
-				      GdkRectangle         *expose_area,
-				      GtkCellRendererState  flags);
-  gboolean         (* activate)      (GtkCellRenderer      *cell,
-				      GdkEvent             *event,
-				      GtkWidget            *widget,
-				      const gchar          *path,
-				      GdkRectangle         *background_area,
-				      GdkRectangle         *cell_area,
-				      GtkCellRendererState  flags);
-  GtkCellEditable *(* start_editing) (GtkCellRenderer      *cell,
-				      GdkEvent             *event,
-				      GtkWidget            *widget,
-				      const gchar          *path,
-				      GdkRectangle         *background_area,
-				      GdkRectangle         *cell_area,
-				      GtkCellRendererState  flags);
-
-  /* Signals */
-  void (* editing_canceled) (GtkCellRenderer *cell);
-  void (* editing_started)  (GtkCellRenderer *cell,
-			     GtkCellEditable *editable,
-			     const gchar     *path);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-};
-
-GType            gtk_cell_renderer_get_type       (void) G_GNUC_CONST;
-
-void             gtk_cell_renderer_get_size       (GtkCellRenderer      *cell,
-						   GtkWidget            *widget,
-						   GdkRectangle         *cell_area,
-						   gint                 *x_offset,
-						   gint                 *y_offset,
-						   gint                 *width,
-						   gint                 *height);
-void             gtk_cell_renderer_render         (GtkCellRenderer      *cell,
-						   GdkWindow            *window,
-						   GtkWidget            *widget,
-						   GdkRectangle         *background_area,
-						   GdkRectangle         *cell_area,
-						   GdkRectangle         *expose_area,
-						   GtkCellRendererState  flags);
-gboolean         gtk_cell_renderer_activate       (GtkCellRenderer      *cell,
-						   GdkEvent             *event,
-						   GtkWidget            *widget,
-						   const gchar          *path,
-						   GdkRectangle         *background_area,
-						   GdkRectangle         *cell_area,
-						   GtkCellRendererState  flags);
-GtkCellEditable *gtk_cell_renderer_start_editing  (GtkCellRenderer      *cell,
-						   GdkEvent             *event,
-						   GtkWidget            *widget,
-						   const gchar          *path,
-						   GdkRectangle         *background_area,
-						   GdkRectangle         *cell_area,
-						   GtkCellRendererState  flags);
-void             gtk_cell_renderer_set_fixed_size (GtkCellRenderer      *cell,
-						   gint                  width,
-						   gint                  height);
-void             gtk_cell_renderer_get_fixed_size (GtkCellRenderer      *cell,
-						   gint                 *width,
-						   gint                 *height);
-
-/* For use by cell renderer implementations only */
-#ifndef GTK_DISABLE_DEPRECATED
-void gtk_cell_renderer_editing_canceled (GtkCellRenderer *cell);
-#endif
-void gtk_cell_renderer_stop_editing     (GtkCellRenderer *cell,
-				         gboolean         canceled);
-
-
-G_END_DECLS
-
-#endif /* __GTK_CELL_RENDERER_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrendereraccel.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrendereraccel.h
deleted file mode 100644
index d9fd1d11..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrendereraccel.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* gtkcellrendereraccel.h
- * Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb@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 __GTK_CELL_RENDERER_ACCEL_H__
-#define __GTK_CELL_RENDERER_ACCEL_H__
-
-#include "gtkcellrenderertext.h"
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_CELL_RENDERER_ACCEL		(gtk_cell_renderer_accel_get_type ())
-#define GTK_CELL_RENDERER_ACCEL(obj)		(GTK_CHECK_CAST ((obj), GTK_TYPE_CELL_RENDERER_ACCEL, GtkCellRendererAccel))
-#define GTK_CELL_RENDERER_ACCEL_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_ACCEL, GtkCellRendererAccelClass))
-#define GTK_IS_CELL_RENDERER_ACCEL(obj)		(GTK_CHECK_TYPE ((obj), GTK_TYPE_CELL_RENDERER_ACCEL))
-#define GTK_IS_CELL_RENDERER_ACCEL_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_ACCEL))
-#define GTK_CELL_RENDERER_ACCEL_GET_CLASS(obj)   (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_ACCEL, GtkCellRendererAccelClass))
-
-typedef struct _GtkCellRendererAccel      GtkCellRendererAccel;
-typedef struct _GtkCellRendererAccelClass GtkCellRendererAccelClass;
-
-
-typedef enum
-{
-  GTK_CELL_RENDERER_ACCEL_MODE_GTK,
-  GTK_CELL_RENDERER_ACCEL_MODE_OTHER
-} GtkCellRendererAccelMode;
-
-
-struct _GtkCellRendererAccel
-{
-  GtkCellRendererText parent;
-
-  /*< private >*/
-  guint accel_key;
-  GdkModifierType accel_mods;
-  guint keycode;
-  GtkCellRendererAccelMode accel_mode;
-
-  GtkWidget *edit_widget;
-  GtkWidget *grab_widget;
-  GtkWidget *sizing_label;
-};
-
-struct _GtkCellRendererAccelClass
-{
-  GtkCellRendererTextClass parent_class;
-
-  void (* accel_edited)  (GtkCellRendererAccel *accel,
-		 	  const gchar          *path_string,
-			  guint                 accel_key,
-			  GdkModifierType       accel_mods,
-			  guint                 hardware_keycode);
-
-  void (* accel_cleared) (GtkCellRendererAccel *accel,
-			  const gchar          *path_string);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved0) (void);
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType            gtk_cell_renderer_accel_get_type        (void) G_GNUC_CONST;
-GtkCellRenderer *gtk_cell_renderer_accel_new             (void);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_CELL_RENDERER_ACCEL_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrenderercombo.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrenderercombo.h
deleted file mode 100644
index 2c35d096..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrenderercombo.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* GtkCellRendererCombo
- * Copyright (C) 2004 Lorenzo Gil Sanchez
- *
- * 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 __GTK_CELL_RENDERER_COMBO_H__
-#define __GTK_CELL_RENDERER_COMBO_H__
-
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtkcellrenderertext.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_CELL_RENDERER_COMBO		(gtk_cell_renderer_combo_get_type ())
-#define GTK_CELL_RENDERER_COMBO(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_RENDERER_COMBO, GtkCellRendererCombo))
-#define GTK_CELL_RENDERER_COMBO_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_COMBO, GtkCellRendererComboClass))
-#define GTK_IS_CELL_RENDERER_COMBO(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_RENDERER_COMBO))
-#define GTK_IS_CELL_RENDERER_COMBO_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_COMBO))
-#define GTK_CELL_RENDERER_COMBO_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_COMBO, GtkCellRendererTextClass))
-						 
-typedef struct _GtkCellRendererCombo GtkCellRendererCombo;
-typedef struct _GtkCellRendererComboClass GtkCellRendererComboClass;
-
-struct _GtkCellRendererCombo
-{
-  GtkCellRendererText parent;
-
-  GtkTreeModel *model;
-  gint          text_column;
-  gboolean      has_entry;
-  
-  /*< private >*/
-  guint         focus_out_id;
-};
-
-struct _GtkCellRendererComboClass
-{
-  GtkCellRendererTextClass parent;
-};
-
-GType            gtk_cell_renderer_combo_get_type (void) G_GNUC_CONST;
-GtkCellRenderer *gtk_cell_renderer_combo_new      (void);
-
-G_END_DECLS
-
-#endif
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrendererpixbuf.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrendererpixbuf.h
deleted file mode 100644
index b479c9c7..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrendererpixbuf.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* gtkcellrendererpixbuf.h
- * Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb@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 __GTK_CELL_RENDERER_PIXBUF_H__
-#define __GTK_CELL_RENDERER_PIXBUF_H__
-
-#include <gtk/gtkcellrenderer.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_CELL_RENDERER_PIXBUF			(gtk_cell_renderer_pixbuf_get_type ())
-#define GTK_CELL_RENDERER_PIXBUF(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_RENDERER_PIXBUF, GtkCellRendererPixbuf))
-#define GTK_CELL_RENDERER_PIXBUF_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_PIXBUF, GtkCellRendererPixbufClass))
-#define GTK_IS_CELL_RENDERER_PIXBUF(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_RENDERER_PIXBUF))
-#define GTK_IS_CELL_RENDERER_PIXBUF_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_PIXBUF))
-#define GTK_CELL_RENDERER_PIXBUF_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_PIXBUF, GtkCellRendererPixbufClass))
-
-typedef struct _GtkCellRendererPixbuf GtkCellRendererPixbuf;
-typedef struct _GtkCellRendererPixbufClass GtkCellRendererPixbufClass;
-
-struct _GtkCellRendererPixbuf
-{
-  GtkCellRenderer parent;
-
-  /*< private >*/
-  GdkPixbuf *pixbuf;
-  GdkPixbuf *pixbuf_expander_open;
-  GdkPixbuf *pixbuf_expander_closed;
-};
-
-struct _GtkCellRendererPixbufClass
-{
-  GtkCellRendererClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType            gtk_cell_renderer_pixbuf_get_type (void) G_GNUC_CONST;
-GtkCellRenderer *gtk_cell_renderer_pixbuf_new      (void);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_CELL_RENDERER_PIXBUF_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrendererprogress.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrendererprogress.h
deleted file mode 100644
index 6e84cd0e..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrendererprogress.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* gtkcellrendererprogress.h
- * Copyright (C) 2002 Naba Kumar <kh_naba@users.sourceforge.net>
- * modified by Jörgen Scheibengruber <mfcn@gmx.de>
- *
- * 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.
- */
-/*
- * Modified by the GTK+ Team and others 1997-2004.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_CELL_RENDERER_PROGRESS_H__
-#define __GTK_CELL_RENDERER_PROGRESS_H__
-
-#include <gtk/gtkcellrenderer.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_CELL_RENDERER_PROGRESS (gtk_cell_renderer_progress_get_type ())
-#define GTK_CELL_RENDERER_PROGRESS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_RENDERER_PROGRESS, GtkCellRendererProgress))
-#define GTK_CELL_RENDERER_PROGRESS_CLASS(klass)	  (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_PROGRESS, GtkCellRendererProgressClass))
-#define GTK_IS_CELL_RENDERER_PROGRESS(obj)	  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_RENDERER_PROGRESS))
-#define GTK_IS_CELL_RENDERER_PROGRESS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_PROGRESS))
-#define GTK_CELL_RENDERER_PROGRESS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_PROGRESS, GtkCellRendererProgressClass))
-
-typedef struct _GtkCellRendererProgress         GtkCellRendererProgress;
-typedef struct _GtkCellRendererProgressClass    GtkCellRendererProgressClass;
-typedef struct _GtkCellRendererProgressPrivate  GtkCellRendererProgressPrivate;
-
-struct _GtkCellRendererProgress
-{
-  GtkCellRenderer parent_instance;
-  
-  /*< private >*/
-  GtkCellRendererProgressPrivate *priv;
-};
-
-struct _GtkCellRendererProgressClass
-{
-  GtkCellRendererClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType		 gtk_cell_renderer_progress_get_type (void) G_GNUC_CONST;
-GtkCellRenderer* gtk_cell_renderer_progress_new      (void);
-
-G_END_DECLS
-
-#endif  /* __GTK_CELL_RENDERER_PROGRESS_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrendererspin.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrendererspin.h
deleted file mode 100644
index 35c2bff4..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrendererspin.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* GtkCellRendererSpin
- * Copyright (C) 2004 Lorenzo Gil Sanchez
- *
- * 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 __GTK_CELL_RENDERER_SPIN_H__
-#define __GTK_CELL_RENDERER_SPIN_H__
-
-#include <gtk/gtkcellrenderertext.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_CELL_RENDERER_SPIN		(gtk_cell_renderer_spin_get_type ())
-#define GTK_CELL_RENDERER_SPIN(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_RENDERER_SPIN, GtkCellRendererSpin))
-#define GTK_CELL_RENDERER_SPIN_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_SPIN, GtkCellRendererSpinClass))
-#define GTK_IS_CELL_RENDERER_SPIN(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_RENDERER_SPIN))
-#define GTK_IS_CELL_RENDERER_SPIN_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_SPIN))
-#define GTK_CELL_RENDERER_SPIN_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_SPIN, GtkCellRendererTextClass))
-						 
-typedef struct _GtkCellRendererSpin GtkCellRendererSpin;
-typedef struct _GtkCellRendererSpinClass GtkCellRendererSpinClass;
-typedef struct _GtkCellRendererSpinPrivate GtkCellRendererSpinPrivate;
-
-struct _GtkCellRendererSpin
-{
-  GtkCellRendererText parent;
-};
-
-struct _GtkCellRendererSpinClass
-{
-  GtkCellRendererTextClass parent;
-};
-
-GType            gtk_cell_renderer_spin_get_type (void);
-GtkCellRenderer *gtk_cell_renderer_spin_new      (void);
-
-G_END_DECLS
-
-#endif  /* __GTK_CELL_RENDERER_SPIN_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrenderertext.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrenderertext.h
deleted file mode 100644
index fef52adf..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrenderertext.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* gtkcellrenderertext.h
- * Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb@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 __GTK_CELL_RENDERER_TEXT_H__
-#define __GTK_CELL_RENDERER_TEXT_H__
-
-#include <pango/pango.h>
-#include <gtk/gtkcellrenderer.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_CELL_RENDERER_TEXT		(gtk_cell_renderer_text_get_type ())
-#define GTK_CELL_RENDERER_TEXT(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_RENDERER_TEXT, GtkCellRendererText))
-#define GTK_CELL_RENDERER_TEXT_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_TEXT, GtkCellRendererTextClass))
-#define GTK_IS_CELL_RENDERER_TEXT(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_RENDERER_TEXT))
-#define GTK_IS_CELL_RENDERER_TEXT_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_TEXT))
-#define GTK_CELL_RENDERER_TEXT_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_TEXT, GtkCellRendererTextClass))
-
-typedef struct _GtkCellRendererText      GtkCellRendererText;
-typedef struct _GtkCellRendererTextClass GtkCellRendererTextClass;
-
-struct _GtkCellRendererText
-{
-  GtkCellRenderer parent;
-
-  /*< private >*/
-  gchar *text;
-  PangoFontDescription *font;
-  gdouble font_scale;
-  PangoColor foreground;
-  PangoColor background;
-  
-  PangoAttrList *extra_attrs;
-
-  PangoUnderline underline_style;
-
-  gint rise;
-  gint fixed_height_rows;
-
-  guint strikethrough : 1;
-
-  guint editable  : 1;
-
-  guint scale_set : 1;
-  
-  guint foreground_set : 1;
-  guint background_set : 1;
-  
-  guint underline_set : 1;
-
-  guint rise_set : 1;
-  
-  guint strikethrough_set : 1;
-
-  guint editable_set : 1;
-  guint calc_fixed_height : 1;
-};
-
-struct _GtkCellRendererTextClass
-{
-  GtkCellRendererClass parent_class;
-
-  void (* edited) (GtkCellRendererText *cell_renderer_text,
-		   const gchar         *path,
-		   const gchar         *new_text);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType            gtk_cell_renderer_text_get_type (void) G_GNUC_CONST;
-GtkCellRenderer *gtk_cell_renderer_text_new      (void);
-
-void             gtk_cell_renderer_text_set_fixed_height_from_font (GtkCellRendererText *renderer,
-								    gint                 number_of_rows);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_CELL_RENDERER_TEXT_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrenderertoggle.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrenderertoggle.h
deleted file mode 100644
index 302909bd..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrenderertoggle.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* gtkcellrenderertoggle.h
- * Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb@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 __GTK_CELL_RENDERER_TOGGLE_H__
-#define __GTK_CELL_RENDERER_TOGGLE_H__
-
-#include <gtk/gtkcellrenderer.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_CELL_RENDERER_TOGGLE			(gtk_cell_renderer_toggle_get_type ())
-#define GTK_CELL_RENDERER_TOGGLE(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_RENDERER_TOGGLE, GtkCellRendererToggle))
-#define GTK_CELL_RENDERER_TOGGLE_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_TOGGLE, GtkCellRendererToggleClass))
-#define GTK_IS_CELL_RENDERER_TOGGLE(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_RENDERER_TOGGLE))
-#define GTK_IS_CELL_RENDERER_TOGGLE_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_TOGGLE))
-#define GTK_CELL_RENDERER_TOGGLE_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_TOGGLE, GtkCellRendererToggleClass))
-
-typedef struct _GtkCellRendererToggle GtkCellRendererToggle;
-typedef struct _GtkCellRendererToggleClass GtkCellRendererToggleClass;
-
-struct _GtkCellRendererToggle
-{
-  GtkCellRenderer parent;
-
-  /*< private >*/
-  guint active : 1;
-  guint activatable : 1;
-  guint radio : 1;
-};
-
-struct _GtkCellRendererToggleClass
-{
-  GtkCellRendererClass parent_class;
-
-  void (* toggled) (GtkCellRendererToggle *cell_renderer_toggle,
-		    const gchar                 *path);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType            gtk_cell_renderer_toggle_get_type  (void) G_GNUC_CONST;
-GtkCellRenderer *gtk_cell_renderer_toggle_new       (void);
-
-gboolean         gtk_cell_renderer_toggle_get_radio (GtkCellRendererToggle *toggle);
-void             gtk_cell_renderer_toggle_set_radio (GtkCellRendererToggle *toggle,
-						     gboolean               radio);
-
-gboolean        gtk_cell_renderer_toggle_get_active (GtkCellRendererToggle *toggle);
-void            gtk_cell_renderer_toggle_set_active (GtkCellRendererToggle *toggle,
-                                                     gboolean               setting);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_CELL_RENDERER_TOGGLE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellview.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellview.h
deleted file mode 100644
index 6a79c3ab..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellview.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* gtkcellview.h
- * Copyright (C) 2002, 2003  Kristian Rietveld <kris@gtk.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 __GTK_CELL_VIEW_H__
-#define __GTK_CELL_VIEW_H__
-
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkcellrenderer.h>
-#include <gtk/gtktreemodel.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_CELL_VIEW                (gtk_cell_view_get_type ())
-#define GTK_CELL_VIEW(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_VIEW, GtkCellView))
-#define GTK_CELL_VIEW_CLASS(vtable)       (G_TYPE_CHECK_CLASS_CAST ((vtable), GTK_TYPE_CELL_VIEW, GtkCellViewClass))
-#define GTK_IS_CELL_VIEW(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_VIEW))
-#define GTK_IS_CELL_VIEW_CLASS(vtable)    (G_TYPE_CHECK_CLASS_TYPE ((vtable), GTK_TYPE_CELL_VIEW))
-#define GTK_CELL_VIEW_GET_CLASS(inst)     (G_TYPE_INSTANCE_GET_CLASS ((inst), GTK_TYPE_CELL_VIEW, GtkCellViewClass))
-
-typedef struct _GtkCellView             GtkCellView;
-typedef struct _GtkCellViewClass        GtkCellViewClass;
-typedef struct _GtkCellViewPrivate      GtkCellViewPrivate;
-
-struct _GtkCellView
-{
-  GtkWidget parent_instance;
-
-  /*< private >*/
-  GtkCellViewPrivate *priv;
-};
-
-struct _GtkCellViewClass
-{
-  GtkWidgetClass parent_class;
-};
-
-GType             gtk_cell_view_get_type               (void) G_GNUC_CONST;
-GtkWidget        *gtk_cell_view_new                    (void);
-GtkWidget        *gtk_cell_view_new_with_text          (const gchar     *text);
-GtkWidget        *gtk_cell_view_new_with_markup        (const gchar     *markup);
-GtkWidget        *gtk_cell_view_new_with_pixbuf        (GdkPixbuf       *pixbuf);
-
-void              gtk_cell_view_set_model               (GtkCellView     *cell_view,
-                                                         GtkTreeModel    *model);
-void              gtk_cell_view_set_displayed_row       (GtkCellView     *cell_view,
-                                                         GtkTreePath     *path);
-GtkTreePath      *gtk_cell_view_get_displayed_row       (GtkCellView     *cell_view);
-gboolean          gtk_cell_view_get_size_of_row         (GtkCellView     *cell_view,
-                                                         GtkTreePath     *path,
-                                                         GtkRequisition  *requisition);
-
-void              gtk_cell_view_set_background_color    (GtkCellView     *cell_view,
-                                                         const GdkColor  *color);
-GList            *gtk_cell_view_get_cell_renderers      (GtkCellView     *cell_view);
-
-G_END_DECLS
-
-#endif /* __GTK_CELL_VIEW_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcheckbutton.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcheckbutton.h
deleted file mode 100644
index 106bf546..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcheckbutton.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_CHECK_BUTTON_H__
-#define __GTK_CHECK_BUTTON_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtktogglebutton.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_CHECK_BUTTON                  (gtk_check_button_get_type ())
-#define GTK_CHECK_BUTTON(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CHECK_BUTTON, GtkCheckButton))
-#define GTK_CHECK_BUTTON_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CHECK_BUTTON, GtkCheckButtonClass))
-#define GTK_IS_CHECK_BUTTON(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CHECK_BUTTON))
-#define GTK_IS_CHECK_BUTTON_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CHECK_BUTTON))
-#define GTK_CHECK_BUTTON_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CHECK_BUTTON, GtkCheckButtonClass))
-
-
-typedef struct _GtkCheckButton       GtkCheckButton;
-typedef struct _GtkCheckButtonClass  GtkCheckButtonClass;
-
-struct _GtkCheckButton
-{
-  GtkToggleButton toggle_button;
-};
-
-struct _GtkCheckButtonClass
-{
-  GtkToggleButtonClass parent_class;
-
-  void (* draw_indicator) (GtkCheckButton *check_button,
-			   GdkRectangle   *area);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType      gtk_check_button_get_type       (void) G_GNUC_CONST;
-GtkWidget* gtk_check_button_new               (void);
-GtkWidget* gtk_check_button_new_with_label    (const gchar *label);
-GtkWidget* gtk_check_button_new_with_mnemonic (const gchar *label);
-
-void _gtk_check_button_get_props (GtkCheckButton *check_button,
-				  gint           *indicator_size,
-				  gint           *indicator_spacing);
-
-G_END_DECLS
-
-#endif /* __GTK_CHECK_BUTTON_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcheckmenuitem.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcheckmenuitem.h
deleted file mode 100644
index 6db552fc..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcheckmenuitem.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2001.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_CHECK_MENU_ITEM_H__
-#define __GTK_CHECK_MENU_ITEM_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkmenuitem.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_CHECK_MENU_ITEM            (gtk_check_menu_item_get_type ())
-#define GTK_CHECK_MENU_ITEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CHECK_MENU_ITEM, GtkCheckMenuItem))
-#define GTK_CHECK_MENU_ITEM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CHECK_MENU_ITEM, GtkCheckMenuItemClass))
-#define GTK_IS_CHECK_MENU_ITEM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CHECK_MENU_ITEM))
-#define GTK_IS_CHECK_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CHECK_MENU_ITEM))
-#define GTK_CHECK_MENU_ITEM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CHECK_MENU_ITEM, GtkCheckMenuItemClass))
-
-
-typedef struct _GtkCheckMenuItem       GtkCheckMenuItem;
-typedef struct _GtkCheckMenuItemClass  GtkCheckMenuItemClass;
-
-struct _GtkCheckMenuItem
-{
-  GtkMenuItem menu_item;
-  
-  guint active : 1;
-  guint always_show_toggle : 1;
-  guint inconsistent : 1;
-  guint draw_as_radio : 1;
-};
-
-struct _GtkCheckMenuItemClass
-{
-  GtkMenuItemClass parent_class;
-  
-  void (* toggled)	  (GtkCheckMenuItem *check_menu_item);
-  void (* draw_indicator) (GtkCheckMenuItem *check_menu_item,
-			   GdkRectangle	    *area);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType	   gtk_check_menu_item_get_type	         (void) G_GNUC_CONST;
-
-GtkWidget* gtk_check_menu_item_new               (void);
-GtkWidget* gtk_check_menu_item_new_with_label    (const gchar      *label);
-GtkWidget* gtk_check_menu_item_new_with_mnemonic (const gchar      *label);
-void       gtk_check_menu_item_set_active        (GtkCheckMenuItem *check_menu_item,
-						  gboolean          is_active);
-gboolean   gtk_check_menu_item_get_active        (GtkCheckMenuItem *check_menu_item);
-void       gtk_check_menu_item_toggled           (GtkCheckMenuItem *check_menu_item);
-void       gtk_check_menu_item_set_inconsistent  (GtkCheckMenuItem *check_menu_item,
-						  gboolean          setting);
-gboolean   gtk_check_menu_item_get_inconsistent  (GtkCheckMenuItem *check_menu_item);
-void       gtk_check_menu_item_set_draw_as_radio (GtkCheckMenuItem *check_menu_item,
-						  gboolean          draw_as_radio);
-gboolean   gtk_check_menu_item_get_draw_as_radio (GtkCheckMenuItem *check_menu_item);
-    
-
-#ifndef GTK_DISABLE_DEPRECATED
-void	   gtk_check_menu_item_set_show_toggle (GtkCheckMenuItem *menu_item,
-						gboolean	  always);
-#define	gtk_check_menu_item_set_state		gtk_check_menu_item_set_active
-#endif
-
-G_END_DECLS
-
-#endif /* __GTK_CHECK_MENU_ITEM_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkclipboard.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkclipboard.h
deleted file mode 100644
index 1825cf76..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkclipboard.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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.
- *
- * Global clipboard abstraction. 
- */
-
-#ifndef __GTK_CLIPBOARD_H__
-#define __GTK_CLIPBOARD_H__
-
-#include <gtk/gtkselection.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_CLIPBOARD            (gtk_clipboard_get_type ())
-#define GTK_CLIPBOARD(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CLIPBOARD, GtkClipboard))
-#define GTK_IS_CLIPBOARD(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CLIPBOARD))
-
-typedef void (* GtkClipboardReceivedFunc)         (GtkClipboard     *clipboard,
-					           GtkSelectionData *selection_data,
-					           gpointer          data);
-typedef void (* GtkClipboardTextReceivedFunc)     (GtkClipboard     *clipboard,
-					           const gchar      *text,
-					           gpointer          data);
-typedef void (* GtkClipboardRichTextReceivedFunc) (GtkClipboard     *clipboard,
-                                                   GdkAtom           format,
-					           const guint8     *text,
-                                                   gsize             length,
-					           gpointer          data);
-typedef void (* GtkClipboardImageReceivedFunc)    (GtkClipboard     *clipboard,
-						   GdkPixbuf        *pixbuf,
-						   gpointer          data);
-typedef void (* GtkClipboardTargetsReceivedFunc)  (GtkClipboard     *clipboard,
-					           GdkAtom          *atoms,
-						   gint              n_atoms,
-					           gpointer          data);
-
-/* Should these functions have GtkClipboard *clipboard as the first argument?
- * right now for ClearFunc, you may have trouble determining _which_ clipboard
- * was cleared, if you reuse your ClearFunc for multiple clipboards.
- */
-typedef void (* GtkClipboardGetFunc)          (GtkClipboard     *clipboard,
-					       GtkSelectionData *selection_data,
-					       guint             info,
-					       gpointer          user_data_or_owner);
-typedef void (* GtkClipboardClearFunc)        (GtkClipboard     *clipboard,
-					       gpointer          user_data_or_owner);
-
-GType         gtk_clipboard_get_type (void) G_GNUC_CONST;
-
-GtkClipboard *gtk_clipboard_get_for_display (GdkDisplay   *display,
-					     GdkAtom       selection);
-#ifndef GDK_MULTIHEAD_SAFE
-GtkClipboard *gtk_clipboard_get             (GdkAtom       selection);
-#endif
-
-GdkDisplay   *gtk_clipboard_get_display     (GtkClipboard *clipboard);
-
-
-gboolean gtk_clipboard_set_with_data  (GtkClipboard          *clipboard,
-				       const GtkTargetEntry  *targets,
-				       guint                  n_targets,
-				       GtkClipboardGetFunc    get_func,
-				       GtkClipboardClearFunc  clear_func,
-				       gpointer               user_data);
-gboolean gtk_clipboard_set_with_owner (GtkClipboard          *clipboard,
-				       const GtkTargetEntry  *targets,
-				       guint                  n_targets,
-				       GtkClipboardGetFunc    get_func,
-				       GtkClipboardClearFunc  clear_func,
-				       GObject               *owner);
-GObject *gtk_clipboard_get_owner      (GtkClipboard          *clipboard);
-void     gtk_clipboard_clear          (GtkClipboard          *clipboard);
-void     gtk_clipboard_set_text       (GtkClipboard          *clipboard,
-				       const gchar           *text,
-				       gint                   len);
-void     gtk_clipboard_set_image      (GtkClipboard          *clipboard,
-				       GdkPixbuf             *pixbuf);
-
-void gtk_clipboard_request_contents  (GtkClipboard                     *clipboard,
-                                      GdkAtom                           target,
-                                      GtkClipboardReceivedFunc          callback,
-                                      gpointer                          user_data);
-void gtk_clipboard_request_text      (GtkClipboard                     *clipboard,
-                                      GtkClipboardTextReceivedFunc      callback,
-                                      gpointer                          user_data);
-void gtk_clipboard_request_rich_text (GtkClipboard                     *clipboard,
-                                      GtkTextBuffer                    *buffer,
-                                      GtkClipboardRichTextReceivedFunc  callback,
-                                      gpointer                          user_data);
-void gtk_clipboard_request_image     (GtkClipboard                     *clipboard,
-                                      GtkClipboardImageReceivedFunc     callback,
-                                      gpointer                          user_data);
-void gtk_clipboard_request_targets   (GtkClipboard                     *clipboard,
-                                      GtkClipboardTargetsReceivedFunc   callback,
-                                      gpointer                          user_data);
-
-GtkSelectionData *gtk_clipboard_wait_for_contents  (GtkClipboard  *clipboard,
-                                                    GdkAtom        target);
-gchar *           gtk_clipboard_wait_for_text      (GtkClipboard  *clipboard);
-guint8 *          gtk_clipboard_wait_for_rich_text (GtkClipboard  *clipboard,
-                                                    GtkTextBuffer *buffer,
-                                                    GdkAtom       *format,
-                                                    gsize         *length);
-GdkPixbuf *       gtk_clipboard_wait_for_image     (GtkClipboard  *clipboard);
-gboolean          gtk_clipboard_wait_for_targets   (GtkClipboard  *clipboard,
-                                                    GdkAtom      **targets,
-                                                    gint          *n_targets);
-
-gboolean gtk_clipboard_wait_is_text_available      (GtkClipboard  *clipboard);
-gboolean gtk_clipboard_wait_is_rich_text_available (GtkClipboard  *clipboard,
-                                                    GtkTextBuffer *buffer);
-gboolean gtk_clipboard_wait_is_image_available     (GtkClipboard  *clipboard);
-gboolean gtk_clipboard_wait_is_target_available    (GtkClipboard  *clipboard,
-                                                    GdkAtom        target);
-
-
-void gtk_clipboard_set_can_store (GtkClipboard         *clipboard,
-				  const GtkTargetEntry *targets,
-				  gint                  n_targets);
-
-void gtk_clipboard_store         (GtkClipboard   *clipboard);
-  
-/* private */
-void     _gtk_clipboard_handle_event    (GdkEventOwnerChange *event);
-
-void     _gtk_clipboard_store_all       (void);
-  
-G_END_DECLS
-
-#endif /* __GTK_CLIPBOARD_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkclist.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkclist.h
deleted file mode 100644
index 5375ea1c..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkclist.h
+++ /dev/null
@@ -1,793 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball, Josh MacDonald
- * Copyright (C) 1997-1998 Jay Painter <jpaint@serv.net><jpaint@gimp.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 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-#ifndef __GTK_CLIST_H__
-#define __GTK_CLIST_H__
-
-#include <gdk/gdk.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkhscrollbar.h>
-#include <gtk/gtkvscrollbar.h>
-#include <gtk/gtkenums.h>
-
-
-G_BEGIN_DECLS
-
-
-/* clist flags */
-enum {
-  GTK_CLIST_IN_DRAG             = 1 <<  0,
-  GTK_CLIST_ROW_HEIGHT_SET      = 1 <<  1,
-  GTK_CLIST_SHOW_TITLES         = 1 <<  2,
-  /* Unused */
-  GTK_CLIST_ADD_MODE            = 1 <<  4,
-  GTK_CLIST_AUTO_SORT           = 1 <<  5,
-  GTK_CLIST_AUTO_RESIZE_BLOCKED = 1 <<  6,
-  GTK_CLIST_REORDERABLE         = 1 <<  7,
-  GTK_CLIST_USE_DRAG_ICONS      = 1 <<  8,
-  GTK_CLIST_DRAW_DRAG_LINE      = 1 <<  9,
-  GTK_CLIST_DRAW_DRAG_RECT      = 1 << 10
-}; 
-
-/* cell types */
-typedef enum
-{
-  GTK_CELL_EMPTY,
-  GTK_CELL_TEXT,
-  GTK_CELL_PIXMAP,
-  GTK_CELL_PIXTEXT,
-  GTK_CELL_WIDGET
-} GtkCellType;
-
-typedef enum
-{
-  GTK_CLIST_DRAG_NONE,
-  GTK_CLIST_DRAG_BEFORE,
-  GTK_CLIST_DRAG_INTO,
-  GTK_CLIST_DRAG_AFTER
-} GtkCListDragPos;
-
-typedef enum
-{
-  GTK_BUTTON_IGNORED = 0,
-  GTK_BUTTON_SELECTS = 1 << 0,
-  GTK_BUTTON_DRAGS   = 1 << 1,
-  GTK_BUTTON_EXPANDS = 1 << 2
-} GtkButtonAction;
-
-#define GTK_TYPE_CLIST            (gtk_clist_get_type ())
-#define GTK_CLIST(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_CLIST, GtkCList))
-#define GTK_CLIST_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_CLIST, GtkCListClass))
-#define GTK_IS_CLIST(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_CLIST))
-#define GTK_IS_CLIST_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CLIST))
-#define GTK_CLIST_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CLIST, GtkCListClass))
-
-
-#define GTK_CLIST_FLAGS(clist)             (GTK_CLIST (clist)->flags)
-#define GTK_CLIST_SET_FLAG(clist,flag)     (GTK_CLIST_FLAGS (clist) |= (GTK_ ## flag))
-#define GTK_CLIST_UNSET_FLAG(clist,flag)   (GTK_CLIST_FLAGS (clist) &= ~(GTK_ ## flag))
-
-#define GTK_CLIST_IN_DRAG(clist)           (GTK_CLIST_FLAGS (clist) & GTK_CLIST_IN_DRAG)
-#define GTK_CLIST_ROW_HEIGHT_SET(clist)    (GTK_CLIST_FLAGS (clist) & GTK_CLIST_ROW_HEIGHT_SET)
-#define GTK_CLIST_SHOW_TITLES(clist)       (GTK_CLIST_FLAGS (clist) & GTK_CLIST_SHOW_TITLES)
-#define GTK_CLIST_ADD_MODE(clist)          (GTK_CLIST_FLAGS (clist) & GTK_CLIST_ADD_MODE)
-#define GTK_CLIST_AUTO_SORT(clist)         (GTK_CLIST_FLAGS (clist) & GTK_CLIST_AUTO_SORT)
-#define GTK_CLIST_AUTO_RESIZE_BLOCKED(clist) (GTK_CLIST_FLAGS (clist) & GTK_CLIST_AUTO_RESIZE_BLOCKED)
-#define GTK_CLIST_REORDERABLE(clist)       (GTK_CLIST_FLAGS (clist) & GTK_CLIST_REORDERABLE)
-#define GTK_CLIST_USE_DRAG_ICONS(clist)    (GTK_CLIST_FLAGS (clist) & GTK_CLIST_USE_DRAG_ICONS)
-#define GTK_CLIST_DRAW_DRAG_LINE(clist)    (GTK_CLIST_FLAGS (clist) & GTK_CLIST_DRAW_DRAG_LINE)
-#define GTK_CLIST_DRAW_DRAG_RECT(clist)    (GTK_CLIST_FLAGS (clist) & GTK_CLIST_DRAW_DRAG_RECT)
-
-#define GTK_CLIST_ROW(_glist_) ((GtkCListRow *)((_glist_)->data))
-
-/* pointer casting for cells */
-#define GTK_CELL_TEXT(cell)     (((GtkCellText *) &(cell)))
-#define GTK_CELL_PIXMAP(cell)   (((GtkCellPixmap *) &(cell)))
-#define GTK_CELL_PIXTEXT(cell)  (((GtkCellPixText *) &(cell)))
-#define GTK_CELL_WIDGET(cell)   (((GtkCellWidget *) &(cell)))
-
-typedef struct _GtkCList GtkCList;
-typedef struct _GtkCListClass GtkCListClass;
-typedef struct _GtkCListColumn GtkCListColumn;
-typedef struct _GtkCListRow GtkCListRow;
-
-typedef struct _GtkCell GtkCell;
-typedef struct _GtkCellText GtkCellText;
-typedef struct _GtkCellPixmap GtkCellPixmap;
-typedef struct _GtkCellPixText GtkCellPixText;
-typedef struct _GtkCellWidget GtkCellWidget;
-
-typedef gint (*GtkCListCompareFunc) (GtkCList     *clist,
-				     gconstpointer ptr1,
-				     gconstpointer ptr2);
-
-typedef struct _GtkCListCellInfo GtkCListCellInfo;
-typedef struct _GtkCListDestInfo GtkCListDestInfo;
-
-struct _GtkCListCellInfo
-{
-  gint row;
-  gint column;
-};
-
-struct _GtkCListDestInfo
-{
-  GtkCListCellInfo cell;
-  GtkCListDragPos  insert_pos;
-};
-
-struct _GtkCList
-{
-  GtkContainer container;
-  
-  guint16 flags;
-  
-  gpointer reserved1;
-  gpointer reserved2;
-
-  guint freeze_count;
-  
-  /* allocation rectangle after the conatiner_border_width
-   * and the width of the shadow border */
-  GdkRectangle internal_allocation;
-  
-  /* rows */
-  gint rows;
-  gint row_height;
-  GList *row_list;
-  GList *row_list_end;
-  
-  /* columns */
-  gint columns;
-  GdkRectangle column_title_area;
-  GdkWindow *title_window;
-  
-  /* dynamicly allocated array of column structures */
-  GtkCListColumn *column;
-  
-  /* the scrolling window and its height and width to
-   * make things a little speedier */
-  GdkWindow *clist_window;
-  gint clist_window_width;
-  gint clist_window_height;
-  
-  /* offsets for scrolling */
-  gint hoffset;
-  gint voffset;
-  
-  /* border shadow style */
-  GtkShadowType shadow_type;
-  
-  /* the list's selection mode (gtkenums.h) */
-  GtkSelectionMode selection_mode;
-  
-  /* list of selected rows */
-  GList *selection;
-  GList *selection_end;
-  
-  GList *undo_selection;
-  GList *undo_unselection;
-  gint undo_anchor;
-  
-  /* mouse buttons */
-  guint8 button_actions[5];
-
-  guint8 drag_button;
-
-  /* dnd */
-  GtkCListCellInfo click_cell;
-
-  /* scroll adjustments */
-  GtkAdjustment *hadjustment;
-  GtkAdjustment *vadjustment;
-  
-  /* xor GC for the vertical drag line */
-  GdkGC *xor_gc;
-  
-  /* gc for drawing unselected cells */
-  GdkGC *fg_gc;
-  GdkGC *bg_gc;
-  
-  /* cursor used to indicate dragging */
-  GdkCursor *cursor_drag;
-  
-  /* the current x-pixel location of the xor-drag line */
-  gint x_drag;
-  
-  /* focus handling */
-  gint focus_row;
-
-  gint focus_header_column;
-  
-  /* dragging the selection */
-  gint anchor;
-  GtkStateType anchor_state;
-  gint drag_pos;
-  gint htimer;
-  gint vtimer;
-  
-  GtkSortType sort_type;
-  GtkCListCompareFunc compare;
-  gint sort_column;
-
-  gint drag_highlight_row;
-  GtkCListDragPos drag_highlight_pos;
-};
-
-struct _GtkCListClass
-{
-  GtkContainerClass parent_class;
-  
-  void  (*set_scroll_adjustments) (GtkCList       *clist,
-				   GtkAdjustment  *hadjustment,
-				   GtkAdjustment  *vadjustment);
-  void   (*refresh)             (GtkCList       *clist);
-  void   (*select_row)          (GtkCList       *clist,
-				 gint            row,
-				 gint            column,
-				 GdkEvent       *event);
-  void   (*unselect_row)        (GtkCList       *clist,
-				 gint            row,
-				 gint            column,
-				 GdkEvent       *event);
-  void   (*row_move)            (GtkCList       *clist,
-				 gint            source_row,
-				 gint            dest_row);
-  void   (*click_column)        (GtkCList       *clist,
-				 gint            column);
-  void   (*resize_column)       (GtkCList       *clist,
-				 gint            column,
-                                 gint            width);
-  void   (*toggle_focus_row)    (GtkCList       *clist);
-  void   (*select_all)          (GtkCList       *clist);
-  void   (*unselect_all)        (GtkCList       *clist);
-  void   (*undo_selection)      (GtkCList       *clist);
-  void   (*start_selection)     (GtkCList       *clist);
-  void   (*end_selection)       (GtkCList       *clist);
-  void   (*extend_selection)    (GtkCList       *clist,
-				 GtkScrollType   scroll_type,
-				 gfloat          position,
-				 gboolean        auto_start_selection);
-  void   (*scroll_horizontal)   (GtkCList       *clist,
-				 GtkScrollType   scroll_type,
-				 gfloat          position);
-  void   (*scroll_vertical)     (GtkCList       *clist,
-				 GtkScrollType   scroll_type,
-				 gfloat          position);
-  void   (*toggle_add_mode)     (GtkCList       *clist);
-  void   (*abort_column_resize) (GtkCList       *clist);
-  void   (*resync_selection)    (GtkCList       *clist,
-				 GdkEvent       *event);
-  GList* (*selection_find)      (GtkCList       *clist,
-				 gint            row_number,
-				 GList          *row_list_element);
-  void   (*draw_row)            (GtkCList       *clist,
-				 GdkRectangle   *area,
-				 gint            row,
-				 GtkCListRow    *clist_row);
-  void   (*draw_drag_highlight) (GtkCList        *clist,
-				 GtkCListRow     *target_row,
-				 gint             target_row_number,
-				 GtkCListDragPos  drag_pos);
-  void   (*clear)               (GtkCList       *clist);
-  void   (*fake_unselect_all)   (GtkCList       *clist,
-				 gint            row);
-  void   (*sort_list)           (GtkCList       *clist);
-  gint   (*insert_row)          (GtkCList       *clist,
-				 gint            row,
-				 gchar          *text[]);
-  void   (*remove_row)          (GtkCList       *clist,
-				 gint            row);
-  void   (*set_cell_contents)   (GtkCList       *clist,
-				 GtkCListRow    *clist_row,
-				 gint            column,
-				 GtkCellType     type,
-				 const gchar    *text,
-				 guint8          spacing,
-				 GdkPixmap      *pixmap,
-				 GdkBitmap      *mask);
-  void   (*cell_size_request)   (GtkCList       *clist,
-				 GtkCListRow    *clist_row,
-				 gint            column,
-				 GtkRequisition *requisition);
-
-};
-
-struct _GtkCListColumn
-{
-  gchar *title;
-  GdkRectangle area;
-  
-  GtkWidget *button;
-  GdkWindow *window;
-  
-  gint width;
-  gint min_width;
-  gint max_width;
-  GtkJustification justification;
-  
-  guint visible        : 1;  
-  guint width_set      : 1;
-  guint resizeable     : 1;
-  guint auto_resize    : 1;
-  guint button_passive : 1;
-};
-
-struct _GtkCListRow
-{
-  GtkCell *cell;
-  GtkStateType state;
-  
-  GdkColor foreground;
-  GdkColor background;
-  
-  GtkStyle *style;
-
-  gpointer data;
-  GtkDestroyNotify destroy;
-  
-  guint fg_set     : 1;
-  guint bg_set     : 1;
-  guint selectable : 1;
-};
-
-/* Cell Structures */
-struct _GtkCellText
-{
-  GtkCellType type;
-  
-  gint16 vertical;
-  gint16 horizontal;
-  
-  GtkStyle *style;
-
-  gchar *text;
-};
-
-struct _GtkCellPixmap
-{
-  GtkCellType type;
-  
-  gint16 vertical;
-  gint16 horizontal;
-  
-  GtkStyle *style;
-
-  GdkPixmap *pixmap;
-  GdkBitmap *mask;
-};
-
-struct _GtkCellPixText
-{
-  GtkCellType type;
-  
-  gint16 vertical;
-  gint16 horizontal;
-  
-  GtkStyle *style;
-
-  gchar *text;
-  guint8 spacing;
-  GdkPixmap *pixmap;
-  GdkBitmap *mask;
-};
-
-struct _GtkCellWidget
-{
-  GtkCellType type;
-  
-  gint16 vertical;
-  gint16 horizontal;
-  
-  GtkStyle *style;
-
-  GtkWidget *widget;
-};
-
-struct _GtkCell
-{
-  GtkCellType type;
-  
-  gint16 vertical;
-  gint16 horizontal;
-  
-  GtkStyle *style;
-
-  union {
-    gchar *text;
-    
-    struct {
-      GdkPixmap *pixmap;
-      GdkBitmap *mask;
-    } pm;
-    
-    struct {
-      gchar *text;
-      guint8 spacing;
-      GdkPixmap *pixmap;
-      GdkBitmap *mask;
-    } pt;
-    
-    GtkWidget *widget;
-  } u;
-};
-
-GtkType gtk_clist_get_type (void) G_GNUC_CONST;
-
-/* create a new GtkCList */
-GtkWidget* gtk_clist_new             (gint   columns);
-GtkWidget* gtk_clist_new_with_titles (gint   columns,
-				      gchar *titles[]);
-
-/* set adjustments of clist */
-void gtk_clist_set_hadjustment (GtkCList      *clist,
-				GtkAdjustment *adjustment);
-void gtk_clist_set_vadjustment (GtkCList      *clist,
-				GtkAdjustment *adjustment);
-
-/* get adjustments of clist */
-GtkAdjustment* gtk_clist_get_hadjustment (GtkCList *clist);
-GtkAdjustment* gtk_clist_get_vadjustment (GtkCList *clist);
-
-/* set the border style of the clist */
-void gtk_clist_set_shadow_type (GtkCList      *clist,
-				GtkShadowType  type);
-
-/* set the clist's selection mode */
-void gtk_clist_set_selection_mode (GtkCList         *clist,
-				   GtkSelectionMode  mode);
-
-/* enable clists reorder ability */
-void gtk_clist_set_reorderable (GtkCList *clist,
-				gboolean  reorderable);
-void gtk_clist_set_use_drag_icons (GtkCList *clist,
-				   gboolean  use_icons);
-void gtk_clist_set_button_actions (GtkCList *clist,
-				   guint     button,
-				   guint8    button_actions);
-
-/* freeze all visual updates of the list, and then thaw the list after
- * you have made a number of changes and the updates wil occure in a
- * more efficent mannor than if you made them on a unfrozen list
- */
-void gtk_clist_freeze (GtkCList *clist);
-void gtk_clist_thaw   (GtkCList *clist);
-
-/* show and hide the column title buttons */
-void gtk_clist_column_titles_show (GtkCList *clist);
-void gtk_clist_column_titles_hide (GtkCList *clist);
-
-/* set the column title to be a active title (responds to button presses, 
- * prelights, and grabs keyboard focus), or passive where it acts as just
- * a title
- */
-void gtk_clist_column_title_active   (GtkCList *clist,
-				      gint      column);
-void gtk_clist_column_title_passive  (GtkCList *clist,
-				      gint      column);
-void gtk_clist_column_titles_active  (GtkCList *clist);
-void gtk_clist_column_titles_passive (GtkCList *clist);
-
-/* set the title in the column title button */
-void gtk_clist_set_column_title (GtkCList    *clist,
-				 gint         column,
-				 const gchar *title);
-
-/* returns the title of column. Returns NULL if title is not set */
-gchar * gtk_clist_get_column_title (GtkCList *clist,
-				    gint      column);
-
-/* set a widget instead of a title for the column title button */
-void gtk_clist_set_column_widget (GtkCList  *clist,
-				  gint       column,
-				  GtkWidget *widget);
-
-/* returns the column widget */
-GtkWidget * gtk_clist_get_column_widget (GtkCList *clist,
-					 gint      column);
-
-/* set the justification on a column */
-void gtk_clist_set_column_justification (GtkCList         *clist,
-					 gint              column,
-					 GtkJustification  justification);
-
-/* set visibility of a column */
-void gtk_clist_set_column_visibility (GtkCList *clist,
-				      gint      column,
-				      gboolean  visible);
-
-/* enable/disable column resize operations by mouse */
-void gtk_clist_set_column_resizeable (GtkCList *clist,
-				      gint      column,
-				      gboolean  resizeable);
-
-/* resize column automatically to its optimal width */
-void gtk_clist_set_column_auto_resize (GtkCList *clist,
-				       gint      column,
-				       gboolean  auto_resize);
-
-gint gtk_clist_columns_autosize (GtkCList *clist);
-
-/* return the optimal column width, i.e. maximum of all cell widths */
-gint gtk_clist_optimal_column_width (GtkCList *clist,
-				     gint      column);
-
-/* set the pixel width of a column; this is a necessary step in
- * creating a CList because otherwise the column width is chozen from
- * the width of the column title, which will never be right
- */
-void gtk_clist_set_column_width (GtkCList *clist,
-				 gint      column,
-				 gint      width);
-
-/* set column minimum/maximum width. min/max_width < 0 => no restriction */
-void gtk_clist_set_column_min_width (GtkCList *clist,
-				     gint      column,
-				     gint      min_width);
-void gtk_clist_set_column_max_width (GtkCList *clist,
-				     gint      column,
-				     gint      max_width);
-
-/* change the height of the rows, the default (height=0) is
- * the hight of the current font.
- */
-void gtk_clist_set_row_height (GtkCList *clist,
-			       guint     height);
-
-/* scroll the viewing area of the list to the given column and row;
- * row_align and col_align are between 0-1 representing the location the
- * row should appear on the screnn, 0.0 being top or left, 1.0 being
- * bottom or right; if row or column is -1 then then there is no change
- */
-void gtk_clist_moveto (GtkCList *clist,
-		       gint      row,
-		       gint      column,
-		       gfloat    row_align,
-		       gfloat    col_align);
-
-/* returns whether the row is visible */
-GtkVisibility gtk_clist_row_is_visible (GtkCList *clist,
-					gint      row);
-
-/* returns the cell type */
-GtkCellType gtk_clist_get_cell_type (GtkCList *clist,
-				     gint      row,
-				     gint      column);
-
-/* sets a given cell's text, replacing its current contents */
-void gtk_clist_set_text (GtkCList    *clist,
-			 gint         row,
-			 gint         column,
-			 const gchar *text);
-
-/* for the "get" functions, any of the return pointer can be
- * NULL if you are not interested
- */
-gint gtk_clist_get_text (GtkCList  *clist,
-			 gint       row,
-			 gint       column,
-			 gchar    **text);
-
-/* sets a given cell's pixmap, replacing its current contents */
-void gtk_clist_set_pixmap (GtkCList  *clist,
-			   gint       row,
-			   gint       column,
-			   GdkPixmap *pixmap,
-			   GdkBitmap *mask);
-
-gint gtk_clist_get_pixmap (GtkCList   *clist,
-			   gint        row,
-			   gint        column,
-			   GdkPixmap **pixmap,
-			   GdkBitmap **mask);
-
-/* sets a given cell's pixmap and text, replacing its current contents */
-void gtk_clist_set_pixtext (GtkCList    *clist,
-			    gint         row,
-			    gint         column,
-			    const gchar *text,
-			    guint8       spacing,
-			    GdkPixmap   *pixmap,
-			    GdkBitmap   *mask);
-
-gint gtk_clist_get_pixtext (GtkCList   *clist,
-			    gint        row,
-			    gint        column,
-			    gchar     **text,
-			    guint8     *spacing,
-			    GdkPixmap **pixmap,
-			    GdkBitmap **mask);
-
-/* sets the foreground color of a row, the color must already
- * be allocated
- */
-void gtk_clist_set_foreground (GtkCList       *clist,
-			       gint            row,
-			       const GdkColor *color);
-
-/* sets the background color of a row, the color must already
- * be allocated
- */
-void gtk_clist_set_background (GtkCList       *clist,
-			       gint            row,
-			       const GdkColor *color);
-
-/* set / get cell styles */
-void gtk_clist_set_cell_style (GtkCList *clist,
-			       gint      row,
-			       gint      column,
-			       GtkStyle *style);
-
-GtkStyle *gtk_clist_get_cell_style (GtkCList *clist,
-				    gint      row,
-				    gint      column);
-
-void gtk_clist_set_row_style (GtkCList *clist,
-			      gint      row,
-			      GtkStyle *style);
-
-GtkStyle *gtk_clist_get_row_style (GtkCList *clist,
-				   gint      row);
-
-/* this sets a horizontal and vertical shift for drawing
- * the contents of a cell; it can be positive or negitive;
- * this is particulary useful for indenting items in a column
- */
-void gtk_clist_set_shift (GtkCList *clist,
-			  gint      row,
-			  gint      column,
-			  gint      vertical,
-			  gint      horizontal);
-
-/* set/get selectable flag of a single row */
-void gtk_clist_set_selectable (GtkCList *clist,
-			       gint      row,
-			       gboolean  selectable);
-gboolean gtk_clist_get_selectable (GtkCList *clist,
-				   gint      row);
-
-/* prepend/append returns the index of the row you just added,
- * making it easier to append and modify a row
- */
-gint gtk_clist_prepend (GtkCList    *clist,
-		        gchar       *text[]);
-gint gtk_clist_append  (GtkCList    *clist,
-			gchar       *text[]);
-
-/* inserts a row at index row and returns the row where it was
- * actually inserted (may be different from "row" in auto_sort mode)
- */
-gint gtk_clist_insert (GtkCList    *clist,
-		       gint         row,
-		       gchar       *text[]);
-
-/* removes row at index row */
-void gtk_clist_remove (GtkCList *clist,
-		       gint      row);
-
-/* sets a arbitrary data pointer for a given row */
-void gtk_clist_set_row_data (GtkCList *clist,
-			     gint      row,
-			     gpointer  data);
-
-/* sets a data pointer for a given row with destroy notification */
-void gtk_clist_set_row_data_full (GtkCList         *clist,
-			          gint              row,
-			          gpointer          data,
-				  GtkDestroyNotify  destroy);
-
-/* returns the data set for a row */
-gpointer gtk_clist_get_row_data (GtkCList *clist,
-				 gint      row);
-
-/* givin a data pointer, find the first (and hopefully only!)
- * row that points to that data, or -1 if none do
- */
-gint gtk_clist_find_row_from_data (GtkCList *clist,
-				   gpointer  data);
-
-/* force selection of a row */
-void gtk_clist_select_row (GtkCList *clist,
-			   gint      row,
-			   gint      column);
-
-/* force unselection of a row */
-void gtk_clist_unselect_row (GtkCList *clist,
-			     gint      row,
-			     gint      column);
-
-/* undo the last select/unselect operation */
-void gtk_clist_undo_selection (GtkCList *clist);
-
-/* clear the entire list -- this is much faster than removing
- * each item with gtk_clist_remove
- */
-void gtk_clist_clear (GtkCList *clist);
-
-/* return the row column corresponding to the x and y coordinates,
- * the returned values are only valid if the x and y coordinates
- * are respectively to a window == clist->clist_window
- */
-gint gtk_clist_get_selection_info (GtkCList *clist,
-			     	   gint      x,
-			     	   gint      y,
-			     	   gint     *row,
-			     	   gint     *column);
-
-/* in multiple or extended mode, select all rows */
-void gtk_clist_select_all (GtkCList *clist);
-
-/* in all modes except browse mode, deselect all rows */
-void gtk_clist_unselect_all (GtkCList *clist);
-
-/* swap the position of two rows */
-void gtk_clist_swap_rows (GtkCList *clist,
-			  gint      row1,
-			  gint      row2);
-
-/* move row from source_row position to dest_row position */
-void gtk_clist_row_move (GtkCList *clist,
-			 gint      source_row,
-			 gint      dest_row);
-
-/* sets a compare function different to the default */
-void gtk_clist_set_compare_func (GtkCList            *clist,
-				 GtkCListCompareFunc  cmp_func);
-
-/* the column to sort by */
-void gtk_clist_set_sort_column (GtkCList *clist,
-				gint      column);
-
-/* how to sort : ascending or descending */
-void gtk_clist_set_sort_type (GtkCList    *clist,
-			      GtkSortType  sort_type);
-
-/* sort the list with the current compare function */
-void gtk_clist_sort (GtkCList *clist);
-
-/* Automatically sort upon insertion */
-void gtk_clist_set_auto_sort (GtkCList *clist,
-			      gboolean  auto_sort);
-
-/* Private function for clist, ctree */
-
-PangoLayout *_gtk_clist_create_cell_layout (GtkCList       *clist,
-					    GtkCListRow    *clist_row,
-					    gint            column);
-
-
-G_END_DECLS
-
-
-#endif				/* __GTK_CLIST_H__ */
-
-#endif /* GTK_DISABLE_DEPRECATED */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcolorbutton.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcolorbutton.h
deleted file mode 100644
index b6a00fdf..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcolorbutton.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * GTK - The GIMP Toolkit
- * Copyright (C) 1998, 1999 Red Hat, Inc.
- * All rights reserved.
- *
- * 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 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.
- */
-/* Color picker button for GNOME
- *
- * Author: Federico Mena <federico@nuclecu.unam.mx>
- *
- * Modified by the GTK+ Team and others 2003.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_COLOR_BUTTON_H__
-#define __GTK_COLOR_BUTTON_H__
-
-
-#include <gtk/gtkbutton.h>
-
-G_BEGIN_DECLS
-
-
-/* The GtkColorSelectionButton widget is a simple color picker in a button.  
- * The button displays a sample of the currently selected color.  When 
- * the user clicks on the button, a color selection dialog pops up.  
- * The color picker emits the "color_set" signal when the color is set.
- */
-
-#define GTK_TYPE_COLOR_BUTTON             (gtk_color_button_get_type ())
-#define GTK_COLOR_BUTTON(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COLOR_BUTTON, GtkColorButton))
-#define GTK_COLOR_BUTTON_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_COLOR_BUTTON, GtkColorButtonClass))
-#define GTK_IS_COLOR_BUTTON(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COLOR_BUTTON))
-#define GTK_IS_COLOR_BUTTON_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_COLOR_BUTTON))
-#define GTK_COLOR_BUTTON_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_COLOR_BUTTON, GtkColorButtonClass))
-
-typedef struct _GtkColorButton          GtkColorButton;
-typedef struct _GtkColorButtonClass     GtkColorButtonClass;
-typedef struct _GtkColorButtonPrivate   GtkColorButtonPrivate;
-
-struct _GtkColorButton {
-  GtkButton button;
-
-  /*< private >*/
-
-  GtkColorButtonPrivate *priv;
-};
-
-struct _GtkColorButtonClass {
-  GtkButtonClass parent_class;
-  
-  void (* color_set) (GtkColorButton *cp);
-  
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType      gtk_color_button_get_type       (void) G_GNUC_CONST;
-GtkWidget *gtk_color_button_new            (void);
-GtkWidget *gtk_color_button_new_with_color (const GdkColor *color);
-void       gtk_color_button_set_color      (GtkColorButton *color_button, 
-					    const GdkColor *color);
-void       gtk_color_button_set_alpha      (GtkColorButton *color_button,
-					    guint16         alpha);
-void       gtk_color_button_get_color      (GtkColorButton *color_button, 
-					    GdkColor       *color);
-guint16    gtk_color_button_get_alpha      (GtkColorButton *color_button);
-void       gtk_color_button_set_use_alpha  (GtkColorButton *color_button, 
-					    gboolean        use_alpha);
-gboolean   gtk_color_button_get_use_alpha  (GtkColorButton *color_button);
-void       gtk_color_button_set_title      (GtkColorButton *color_button, 
-					    const gchar    *title);
-G_CONST_RETURN gchar *gtk_color_button_get_title (GtkColorButton *color_button);
-
-
-G_END_DECLS
-
-#endif  /* __GTK_COLOR_BUTTON_H__ */
-
-
-
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcolorsel.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcolorsel.h
deleted file mode 100644
index 8cfc3c93..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcolorsel.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2000 Red Hat, Inc. 
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-#ifndef __GTK_COLOR_SELECTION_H__
-#define __GTK_COLOR_SELECTION_H__
-
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkvbox.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_COLOR_SELECTION			(gtk_color_selection_get_type ())
-#define GTK_COLOR_SELECTION(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COLOR_SELECTION, GtkColorSelection))
-#define GTK_COLOR_SELECTION_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_COLOR_SELECTION, GtkColorSelectionClass))
-#define GTK_IS_COLOR_SELECTION(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COLOR_SELECTION))
-#define GTK_IS_COLOR_SELECTION_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_COLOR_SELECTION))
-#define GTK_COLOR_SELECTION_GET_CLASS(obj)              (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_COLOR_SELECTION, GtkColorSelectionClass))
-
-
-typedef struct _GtkColorSelection       GtkColorSelection;
-typedef struct _GtkColorSelectionClass  GtkColorSelectionClass;
-
-
-typedef void (* GtkColorSelectionChangePaletteFunc) (const GdkColor    *colors,
-                                                     gint               n_colors);
-typedef void (* GtkColorSelectionChangePaletteWithScreenFunc) (GdkScreen         *screen,
-							       const GdkColor    *colors,
-							       gint               n_colors);
-
-struct _GtkColorSelection
-{
-  GtkVBox parent_instance;
-
-  /* < private_data > */
-  gpointer private_data;
-};
-
-struct _GtkColorSelectionClass
-{
-  GtkVBoxClass parent_class;
-
-  void (*color_changed)	(GtkColorSelection *color_selection);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-/* ColorSelection */
-
-GType      gtk_color_selection_get_type                (void) G_GNUC_CONST;
-GtkWidget *gtk_color_selection_new                     (void);
-gboolean   gtk_color_selection_get_has_opacity_control (GtkColorSelection *colorsel);
-void       gtk_color_selection_set_has_opacity_control (GtkColorSelection *colorsel,
-							gboolean           has_opacity);
-gboolean   gtk_color_selection_get_has_palette         (GtkColorSelection *colorsel);
-void       gtk_color_selection_set_has_palette         (GtkColorSelection *colorsel,
-							gboolean           has_palette);
-
-
-void     gtk_color_selection_set_current_color   (GtkColorSelection *colorsel,
-						  const GdkColor    *color);
-void     gtk_color_selection_set_current_alpha   (GtkColorSelection *colorsel,
-						  guint16            alpha);
-void     gtk_color_selection_get_current_color   (GtkColorSelection *colorsel,
-						  GdkColor          *color);
-guint16  gtk_color_selection_get_current_alpha   (GtkColorSelection *colorsel);
-void     gtk_color_selection_set_previous_color  (GtkColorSelection *colorsel,
-						  const GdkColor    *color);
-void     gtk_color_selection_set_previous_alpha  (GtkColorSelection *colorsel,
-						  guint16            alpha);
-void     gtk_color_selection_get_previous_color  (GtkColorSelection *colorsel,
-						  GdkColor          *color);
-guint16  gtk_color_selection_get_previous_alpha  (GtkColorSelection *colorsel);
-
-gboolean gtk_color_selection_is_adjusting        (GtkColorSelection *colorsel);
-
-gboolean gtk_color_selection_palette_from_string (const gchar       *str,
-                                                  GdkColor         **colors,
-                                                  gint              *n_colors);
-gchar*   gtk_color_selection_palette_to_string   (const GdkColor    *colors,
-                                                  gint               n_colors);
-
-#ifndef GTK_DISABLE_DEPRECATED
-#ifndef GDK_MULTIHEAD_SAFE
-GtkColorSelectionChangePaletteFunc           gtk_color_selection_set_change_palette_hook             (GtkColorSelectionChangePaletteFunc           func);
-#endif
-#endif
-
-GtkColorSelectionChangePaletteWithScreenFunc gtk_color_selection_set_change_palette_with_screen_hook (GtkColorSelectionChangePaletteWithScreenFunc func);
-
-#ifndef GTK_DISABLE_DEPRECATED
-/* Deprecated calls: */
-void gtk_color_selection_set_color         (GtkColorSelection *colorsel,
-					    gdouble           *color);
-void gtk_color_selection_get_color         (GtkColorSelection *colorsel,
-					    gdouble           *color);
-void gtk_color_selection_set_update_policy (GtkColorSelection *colorsel,
-					    GtkUpdateType      policy);
-#endif /* GTK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GTK_COLOR_SELECTION_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcolorseldialog.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcolorseldialog.h
deleted file mode 100644
index 7ad02491..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcolorseldialog.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-#ifndef __GTK_COLOR_SELECTION_DIALOG_H__
-#define __GTK_COLOR_SELECTION_DIALOG_H__
-
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkcolorsel.h>
-#include <gtk/gtkvbox.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_COLOR_SELECTION_DIALOG            (gtk_color_selection_dialog_get_type ())
-#define GTK_COLOR_SELECTION_DIALOG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COLOR_SELECTION_DIALOG, GtkColorSelectionDialog))
-#define GTK_COLOR_SELECTION_DIALOG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_COLOR_SELECTION_DIALOG, GtkColorSelectionDialogClass))
-#define GTK_IS_COLOR_SELECTION_DIALOG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COLOR_SELECTION_DIALOG))
-#define GTK_IS_COLOR_SELECTION_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_COLOR_SELECTION_DIALOG))
-#define GTK_COLOR_SELECTION_DIALOG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_COLOR_SELECTION_DIALOG, GtkColorSelectionDialogClass))
-
-
-typedef struct _GtkColorSelectionDialog       GtkColorSelectionDialog;
-typedef struct _GtkColorSelectionDialogClass  GtkColorSelectionDialogClass;
-
-
-struct _GtkColorSelectionDialog
-{
-  GtkDialog parent_instance;
-
-  GtkWidget *colorsel;
-  GtkWidget *ok_button;
-  GtkWidget *cancel_button;
-  GtkWidget *help_button;
-};
-
-struct _GtkColorSelectionDialogClass
-{
-  GtkDialogClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-/* ColorSelectionDialog */ 
-GType      gtk_color_selection_dialog_get_type (void) G_GNUC_CONST;
-GtkWidget* gtk_color_selection_dialog_new      (const gchar *title); 
-
-
-G_END_DECLS
-
-#endif /* __GTK_COLOR_SELECTION_DIALOG_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcombo.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcombo.h
deleted file mode 100644
index 31655af3..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcombo.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* gtkcombo - combo widget for gtk+
- * Copyright 1997 Paolo Molaro
- *
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-#ifndef __GTK_SMART_COMBO_H__
-#define __GTK_SMART_COMBO_H__
-
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkitem.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_COMBO              (gtk_combo_get_type ())
-#define GTK_COMBO(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COMBO, GtkCombo))
-#define GTK_COMBO_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_COMBO, GtkComboClass))
-#define GTK_IS_COMBO(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COMBO))
-#define GTK_IS_COMBO_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_COMBO))
-#define GTK_COMBO_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_COMBO, GtkComboClass))
-
-
-typedef struct _GtkCombo	GtkCombo;
-typedef struct _GtkComboClass	GtkComboClass;
-
-/* you should access only the entry and list fields directly */
-struct _GtkCombo {
-	GtkHBox hbox;
-  
-        /*< public >*/
-	GtkWidget *entry;
-	
-        /*< private >*/
-	GtkWidget *button;
-	GtkWidget *popup;
-	GtkWidget *popwin;
-	
-        /*< public >*/
-	GtkWidget *list;
-
-        /*< private >*/
-	guint entry_change_id;
-	guint list_change_id;	/* unused */
-
-	guint value_in_list:1;
-	guint ok_if_empty:1;
-	guint case_sensitive:1;
-	guint use_arrows:1;
-	guint use_arrows_always:1;
-
-        guint16 current_button;
-	guint activate_id;
-};
-
-struct _GtkComboClass {
-	GtkHBoxClass parent_class;
-
-        /* Padding for future expansion */
-        void (*_gtk_reserved1) (void);
-        void (*_gtk_reserved2) (void);
-        void (*_gtk_reserved3) (void);
-        void (*_gtk_reserved4) (void);
-};
-
-GType      gtk_combo_get_type              (void) G_GNUC_CONST;
-
-GtkWidget* gtk_combo_new                   (void);
-/* the text in the entry must be or not be in the list */
-void       gtk_combo_set_value_in_list     (GtkCombo*    combo, 
-                                            gboolean     val,
-                                            gboolean     ok_if_empty);
-/* set/unset arrows working for changing the value (can be annoying) */
-void       gtk_combo_set_use_arrows        (GtkCombo*    combo, 
-                                            gboolean     val);
-/* up/down arrows change value if current value not in list */
-void       gtk_combo_set_use_arrows_always (GtkCombo*    combo, 
-                                            gboolean     val);
-/* perform case-sensitive compares */
-void       gtk_combo_set_case_sensitive    (GtkCombo*    combo, 
-                                            gboolean     val);
-/* call this function on an item if it isn't a label or you
-   want it to have a different value to be displayed in the entry */
-void       gtk_combo_set_item_string       (GtkCombo*    combo,
-                                            GtkItem*     item,
-                                            const gchar* item_value);
-/* simple interface */
-void       gtk_combo_set_popdown_strings   (GtkCombo*    combo, 
-                                            GList        *strings);
-
-void       gtk_combo_disable_activate      (GtkCombo*    combo);
-
-G_END_DECLS
-
-#endif /* __GTK_SMART_COMBO_H__ */
-
-#endif /* GTK_DISABLE_DEPRECATED */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcombobox.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcombobox.h
deleted file mode 100644
index 6ab2d954..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcombobox.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/* gtkcombobox.h
- * Copyright (C) 2002, 2003  Kristian Rietveld <kris@gtk.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 __GTK_COMBO_BOX_H__
-#define __GTK_COMBO_BOX_H__
-
-#include <gtk/gtkbin.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeview.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_COMBO_BOX             (gtk_combo_box_get_type ())
-#define GTK_COMBO_BOX(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COMBO_BOX, GtkComboBox))
-#define GTK_COMBO_BOX_CLASS(vtable)    (G_TYPE_CHECK_CLASS_CAST ((vtable), GTK_TYPE_COMBO_BOX, GtkComboBoxClass))
-#define GTK_IS_COMBO_BOX(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COMBO_BOX))
-#define GTK_IS_COMBO_BOX_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), GTK_TYPE_COMBO_BOX))
-#define GTK_COMBO_BOX_GET_CLASS(inst)  (G_TYPE_INSTANCE_GET_CLASS ((inst), GTK_TYPE_COMBO_BOX, GtkComboBoxClass))
-
-typedef struct _GtkComboBox        GtkComboBox;
-typedef struct _GtkComboBoxClass   GtkComboBoxClass;
-typedef struct _GtkComboBoxPrivate GtkComboBoxPrivate;
-
-struct _GtkComboBox
-{
-  GtkBin parent_instance;
-
-  /*< private >*/
-  GtkComboBoxPrivate *priv;
-};
-
-struct _GtkComboBoxClass
-{
-  GtkBinClass parent_class;
-
-  /* signals */
-  void     (* changed)          (GtkComboBox *combo_box);
-
-  /* vfuncs */
-  gchar *  (* get_active_text)  (GtkComboBox *combo_box);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved0) (void);
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-};
-
-
-/* construction */
-GType         gtk_combo_box_get_type         (void) G_GNUC_CONST;
-GtkWidget    *gtk_combo_box_new              (void);
-GtkWidget    *gtk_combo_box_new_with_model   (GtkTreeModel    *model);
-
-/* grids */
-gint          gtk_combo_box_get_wrap_width         (GtkComboBox *combo_box);
-void          gtk_combo_box_set_wrap_width         (GtkComboBox *combo_box,
-                                                    gint         width);
-gint          gtk_combo_box_get_row_span_column    (GtkComboBox *combo_box);
-void          gtk_combo_box_set_row_span_column    (GtkComboBox *combo_box,
-                                                    gint         row_span);
-gint          gtk_combo_box_get_column_span_column (GtkComboBox *combo_box);
-void          gtk_combo_box_set_column_span_column (GtkComboBox *combo_box,
-                                                    gint         column_span);
-
-gboolean      gtk_combo_box_get_add_tearoffs       (GtkComboBox *combo_box);
-void          gtk_combo_box_set_add_tearoffs       (GtkComboBox *combo_box,
-						    gboolean     add_tearoffs);
-
-G_CONST_RETURN gchar *gtk_combo_box_get_title      (GtkComboBox *combo_box);
-void                  gtk_combo_box_set_title      (GtkComboBox *combo_box,
-					            const gchar *title);
-
-gboolean      gtk_combo_box_get_focus_on_click     (GtkComboBox *combo);
-void          gtk_combo_box_set_focus_on_click     (GtkComboBox *combo,
-						    gboolean     focus_on_click);
-
-/* get/set active item */
-gint          gtk_combo_box_get_active       (GtkComboBox     *combo_box);
-void          gtk_combo_box_set_active       (GtkComboBox     *combo_box,
-                                              gint             index_);
-gboolean      gtk_combo_box_get_active_iter  (GtkComboBox     *combo_box,
-                                              GtkTreeIter     *iter);
-void          gtk_combo_box_set_active_iter  (GtkComboBox     *combo_box,
-                                              GtkTreeIter     *iter);
-
-/* getters and setters */
-void          gtk_combo_box_set_model        (GtkComboBox     *combo_box,
-                                              GtkTreeModel    *model);
-GtkTreeModel *gtk_combo_box_get_model        (GtkComboBox     *combo_box);
-
-GtkTreeViewRowSeparatorFunc gtk_combo_box_get_row_separator_func (GtkComboBox                *combo_box);
-void                        gtk_combo_box_set_row_separator_func (GtkComboBox                *combo_box,
-								  GtkTreeViewRowSeparatorFunc func,
-								  gpointer                    data,
-								  GtkDestroyNotify            destroy);
-
-/* convenience -- text */
-GtkWidget    *gtk_combo_box_new_text         (void);
-void          gtk_combo_box_append_text      (GtkComboBox     *combo_box,
-                                              const gchar     *text);
-void          gtk_combo_box_insert_text      (GtkComboBox     *combo_box,
-                                              gint             position,
-                                              const gchar     *text);
-void          gtk_combo_box_prepend_text     (GtkComboBox     *combo_box,
-                                              const gchar     *text);
-void          gtk_combo_box_remove_text      (GtkComboBox     *combo_box,
-                                              gint             position);
-gchar        *gtk_combo_box_get_active_text  (GtkComboBox     *combo_box);
-
-/* programmatic control */
-void          gtk_combo_box_popup            (GtkComboBox     *combo_box);
-void          gtk_combo_box_popdown          (GtkComboBox     *combo_box);
-AtkObject*    gtk_combo_box_get_popup_accessible (GtkComboBox *combo_box);
-
-/* private */
-gboolean     _gtk_combo_box_editing_canceled (GtkComboBox     *combo_box);
-
-G_END_DECLS
-
-#endif /* __GTK_COMBO_BOX_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcomboboxentry.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcomboboxentry.h
deleted file mode 100644
index 5fc71d10..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcomboboxentry.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* gtkcomboboxentry.h
- * Copyright (C) 2002, 2003  Kristian Rietveld <kris@gtk.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 __GTK_COMBO_BOX_ENTRY_H__
-#define __GTK_COMBO_BOX_ENTRY_H__
-
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtktreemodel.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_COMBO_BOX_ENTRY             (gtk_combo_box_entry_get_type ())
-#define GTK_COMBO_BOX_ENTRY(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COMBO_BOX_ENTRY, GtkComboBoxEntry))
-#define GTK_COMBO_BOX_ENTRY_CLASS(vtable)    (G_TYPE_CHECK_CLASS_CAST ((vtable), GTK_TYPE_COMBO_BOX_ENTRY, GtkComboBoxEntryClass))
-#define GTK_IS_COMBO_BOX_ENTRY(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COMBO_BOX_ENTRY))
-#define GTK_IS_COMBO_BOX_ENTRY_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), GTK_TYPE_COMBO_BOX_ENTRY))
-#define GTK_COMBO_BOX_ENTRY_GET_CLASS(inst)  (G_TYPE_INSTANCE_GET_CLASS ((inst), GTK_TYPE_COMBO_BOX_ENTRY, GtkComboBoxEntryClass))
-
-typedef struct _GtkComboBoxEntry             GtkComboBoxEntry;
-typedef struct _GtkComboBoxEntryClass        GtkComboBoxEntryClass;
-typedef struct _GtkComboBoxEntryPrivate      GtkComboBoxEntryPrivate;
-
-struct _GtkComboBoxEntry
-{
-  GtkComboBox parent_instance;
-
-  /*< private >*/
-  GtkComboBoxEntryPrivate *priv;
-};
-
-struct _GtkComboBoxEntryClass
-{
-  GtkComboBoxClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved0) (void);
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-};
-
-
-GType       gtk_combo_box_entry_get_type        (void) G_GNUC_CONST;
-GtkWidget  *gtk_combo_box_entry_new             (void);
-GtkWidget  *gtk_combo_box_entry_new_with_model  (GtkTreeModel     *model,
-                                                 gint              text_column);
-
-void        gtk_combo_box_entry_set_text_column (GtkComboBoxEntry *entry_box,
-                                                 gint              text_column);
-gint        gtk_combo_box_entry_get_text_column (GtkComboBoxEntry *entry_box);
-
-/* convenience -- text */
-GtkWidget  *gtk_combo_box_entry_new_text        (void);
-
-
-G_END_DECLS
-
-#endif /* __GTK_COMBO_BOX_ENTRY_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcontainer.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcontainer.h
deleted file mode 100644
index 612fe8bc..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcontainer.h
+++ /dev/null
@@ -1,225 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_CONTAINER_H__
-#define __GTK_CONTAINER_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkenums.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkadjustment.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_CONTAINER              (gtk_container_get_type ())
-#define GTK_CONTAINER(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CONTAINER, GtkContainer))
-#define GTK_CONTAINER_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CONTAINER, GtkContainerClass))
-#define GTK_IS_CONTAINER(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CONTAINER))
-#define GTK_IS_CONTAINER_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CONTAINER))
-#define GTK_CONTAINER_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CONTAINER, GtkContainerClass))
-
-#define GTK_IS_RESIZE_CONTAINER(widget) (GTK_IS_CONTAINER (widget) && ((GtkContainer*) (widget))->resize_mode != GTK_RESIZE_PARENT)
-
-
-typedef struct _GtkContainer	   GtkContainer;
-typedef struct _GtkContainerClass  GtkContainerClass;
-
-struct _GtkContainer
-{
-  GtkWidget widget;
-  
-  GtkWidget *focus_child;
-  
-  guint border_width : 16;
-
-  /*< private >*/
-  guint need_resize : 1;
-  guint resize_mode : 2;
-  guint reallocate_redraws : 1;
-  guint has_focus_chain : 1;
-};
-
-struct _GtkContainerClass
-{
-  GtkWidgetClass parent_class;
-
-  void    (*add)       		(GtkContainer	 *container,
-				 GtkWidget	 *widget);
-  void    (*remove)    		(GtkContainer	 *container,
-				 GtkWidget	 *widget);
-  void    (*check_resize)	(GtkContainer	 *container);
-  void    (*forall)    		(GtkContainer	 *container,
-				 gboolean	  include_internals,
-				 GtkCallback	  callback,
-				 gpointer	  callback_data);
-  void    (*set_focus_child)	(GtkContainer	 *container,
-				 GtkWidget	 *widget);
-  GType   (*child_type)		(GtkContainer	 *container);
-  gchar*  (*composite_name)	(GtkContainer	 *container,
-				 GtkWidget	 *child);
-  void    (*set_child_property) (GtkContainer    *container,
-				 GtkWidget       *child,
-				 guint            property_id,
-				 const GValue    *value,
-				 GParamSpec      *pspec);
-  void    (*get_child_property) (GtkContainer    *container,
-                                 GtkWidget       *child,
-				 guint            property_id,
-				 GValue          *value,
-				 GParamSpec      *pspec);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-/* Application-level methods */
-
-GType   gtk_container_get_type		 (void) G_GNUC_CONST;
-void    gtk_container_set_border_width	 (GtkContainer	   *container,
-					  guint		    border_width);
-guint   gtk_container_get_border_width   (GtkContainer     *container);
-void    gtk_container_add		 (GtkContainer	   *container,
-					  GtkWidget	   *widget);
-void    gtk_container_remove		 (GtkContainer	   *container,
-					  GtkWidget	   *widget);
-
-void    gtk_container_set_resize_mode    (GtkContainer     *container,
-					  GtkResizeMode     resize_mode);
-GtkResizeMode gtk_container_get_resize_mode (GtkContainer     *container);
-
-void    gtk_container_check_resize       (GtkContainer     *container);
-
-void     gtk_container_foreach      (GtkContainer       *container,
-				     GtkCallback         callback,
-				     gpointer            callback_data);
-#ifndef GTK_DISABLE_DEPRECATED
-void     gtk_container_foreach_full (GtkContainer       *container,
-				     GtkCallback         callback,
-				     GtkCallbackMarshal  marshal,
-				     gpointer            callback_data,
-				     GtkDestroyNotify    notify);
-#endif /*  GTK_DISABLE_DEPRECATED */
-GList*   gtk_container_get_children     (GtkContainer       *container);
-
-#ifndef GTK_DISABLE_DEPRECATED
-#define gtk_container_children gtk_container_get_children
-#endif
-
-void     gtk_container_propagate_expose (GtkContainer   *container,
-					 GtkWidget      *child,
-					 GdkEventExpose *event);
-
-void     gtk_container_set_focus_chain  (GtkContainer   *container,
-                                         GList          *focusable_widgets);
-gboolean gtk_container_get_focus_chain  (GtkContainer   *container,
-					 GList         **focusable_widgets);
-void     gtk_container_unset_focus_chain (GtkContainer  *container);
-
-/* Widget-level methods */
-
-void   gtk_container_set_reallocate_redraws (GtkContainer    *container,
-					     gboolean         needs_redraws);
-void   gtk_container_set_focus_child	   (GtkContainer     *container,
-					    GtkWidget	     *child);
-void   gtk_container_set_focus_vadjustment (GtkContainer     *container,
-					    GtkAdjustment    *adjustment);
-GtkAdjustment *gtk_container_get_focus_vadjustment (GtkContainer *container);
-void   gtk_container_set_focus_hadjustment (GtkContainer     *container,
-					    GtkAdjustment    *adjustment);
-GtkAdjustment *gtk_container_get_focus_hadjustment (GtkContainer *container);
-
-void    gtk_container_resize_children      (GtkContainer     *container);
-
-GType   gtk_container_child_type	   (GtkContainer     *container);
-
-
-void         gtk_container_class_install_child_property (GtkContainerClass *cclass,
-							 guint		    property_id,
-							 GParamSpec	   *pspec);
-GParamSpec*  gtk_container_class_find_child_property	(GObjectClass	   *cclass,
-							 const gchar	   *property_name);
-GParamSpec** gtk_container_class_list_child_properties	(GObjectClass	   *cclass,
-							 guint		   *n_properties);
-void         gtk_container_add_with_properties		(GtkContainer	   *container,
-							 GtkWidget	   *widget,
-							 const gchar	   *first_prop_name,
-							 ...) G_GNUC_NULL_TERMINATED;
-void         gtk_container_child_set			(GtkContainer	   *container,
-							 GtkWidget	   *child,
-							 const gchar	   *first_prop_name,
-							 ...) G_GNUC_NULL_TERMINATED;
-void         gtk_container_child_get			(GtkContainer	   *container,
-							 GtkWidget	   *child,
-							 const gchar	   *first_prop_name,
-							 ...) G_GNUC_NULL_TERMINATED;
-void         gtk_container_child_set_valist		(GtkContainer	   *container,
-							 GtkWidget	   *child,
-							 const gchar	   *first_property_name,
-							 va_list	    var_args);
-void         gtk_container_child_get_valist		(GtkContainer	   *container,
-							 GtkWidget	   *child,
-							 const gchar	   *first_property_name,
-							 va_list	    var_args);
-void	     gtk_container_child_set_property		(GtkContainer	   *container,
-							 GtkWidget	   *child,
-							 const gchar	   *property_name,
-							 const GValue	   *value);
-void	     gtk_container_child_get_property		(GtkContainer	   *container,
-							 GtkWidget	   *child,
-							 const gchar	   *property_name,
-							 GValue		   *value);
-
-#define GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID(object, property_id, pspec) \
-    G_OBJECT_WARN_INVALID_PSPEC ((object), "child property id", (property_id), (pspec))
-
-
-void    gtk_container_forall		     (GtkContainer *container,
-					      GtkCallback   callback,
-					      gpointer	    callback_data);
-
-/* Non-public methods */
-void	_gtk_container_queue_resize	     (GtkContainer *container);
-void    _gtk_container_clear_resize_widgets   (GtkContainer *container);
-gchar*	_gtk_container_child_composite_name   (GtkContainer *container,
-					      GtkWidget	   *child);
-void   _gtk_container_dequeue_resize_handler (GtkContainer *container);
-GList *_gtk_container_focus_sort             (GtkContainer     *container,
-					      GList            *children,
-					      GtkDirectionType  direction,
-					      GtkWidget        *old_focus);
-
-#ifndef GTK_DISABLE_DEPRECATED
-#define	gtk_container_border_width		gtk_container_set_border_width
-#endif /* GTK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GTK_CONTAINER_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkctree.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkctree.h
deleted file mode 100644
index a67ee5f9..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkctree.h
+++ /dev/null
@@ -1,445 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball, Josh MacDonald
- * Copyright (C) 1997-1998 Jay Painter <jpaint@serv.net><jpaint@gimp.org>
- *
- * GtkCTree widget for GTK+
- * Copyright (C) 1998 Lars Hamann and Stefan Jeske
- *
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-#ifndef __GTK_CTREE_H__
-#define __GTK_CTREE_H__
-
-#include <gtk/gtkclist.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_CTREE            (gtk_ctree_get_type ())
-#define GTK_CTREE(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_CTREE, GtkCTree))
-#define GTK_CTREE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_CTREE, GtkCTreeClass))
-#define GTK_IS_CTREE(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_CTREE))
-#define GTK_IS_CTREE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CTREE))
-#define GTK_CTREE_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CTREE, GtkCTreeClass))
-
-#define GTK_CTREE_ROW(_node_) ((GtkCTreeRow *)(((GList *)(_node_))->data))
-#define GTK_CTREE_NODE(_node_) ((GtkCTreeNode *)((_node_)))
-#define GTK_CTREE_NODE_NEXT(_nnode_) ((GtkCTreeNode *)(((GList *)(_nnode_))->next))
-#define GTK_CTREE_NODE_PREV(_pnode_) ((GtkCTreeNode *)(((GList *)(_pnode_))->prev))
-#define GTK_CTREE_FUNC(_func_) ((GtkCTreeFunc)(_func_))
-
-#define GTK_TYPE_CTREE_NODE (gtk_ctree_node_get_type ())
-
-typedef enum
-{
-  GTK_CTREE_POS_BEFORE,
-  GTK_CTREE_POS_AS_CHILD,
-  GTK_CTREE_POS_AFTER
-} GtkCTreePos;
-
-typedef enum
-{
-  GTK_CTREE_LINES_NONE,
-  GTK_CTREE_LINES_SOLID,
-  GTK_CTREE_LINES_DOTTED,
-  GTK_CTREE_LINES_TABBED
-} GtkCTreeLineStyle;
-
-typedef enum
-{
-  GTK_CTREE_EXPANDER_NONE,
-  GTK_CTREE_EXPANDER_SQUARE,
-  GTK_CTREE_EXPANDER_TRIANGLE,
-  GTK_CTREE_EXPANDER_CIRCULAR
-} GtkCTreeExpanderStyle;
-
-typedef enum
-{
-  GTK_CTREE_EXPANSION_EXPAND,
-  GTK_CTREE_EXPANSION_EXPAND_RECURSIVE,
-  GTK_CTREE_EXPANSION_COLLAPSE,
-  GTK_CTREE_EXPANSION_COLLAPSE_RECURSIVE,
-  GTK_CTREE_EXPANSION_TOGGLE,
-  GTK_CTREE_EXPANSION_TOGGLE_RECURSIVE
-} GtkCTreeExpansionType;
-
-typedef struct _GtkCTree      GtkCTree;
-typedef struct _GtkCTreeClass GtkCTreeClass;
-typedef struct _GtkCTreeRow   GtkCTreeRow;
-typedef struct _GtkCTreeNode  GtkCTreeNode;
-
-typedef void (*GtkCTreeFunc) (GtkCTree     *ctree,
-			      GtkCTreeNode *node,
-			      gpointer      data);
-
-typedef gboolean (*GtkCTreeGNodeFunc) (GtkCTree     *ctree,
-                                       guint         depth,
-                                       GNode        *gnode,
-				       GtkCTreeNode *cnode,
-                                       gpointer      data);
-
-typedef gboolean (*GtkCTreeCompareDragFunc) (GtkCTree     *ctree,
-                                             GtkCTreeNode *source_node,
-                                             GtkCTreeNode *new_parent,
-                                             GtkCTreeNode *new_sibling);
-
-struct _GtkCTree
-{
-  GtkCList clist;
-  
-  GdkGC *lines_gc;
-  
-  gint tree_indent;
-  gint tree_spacing;
-  gint tree_column;
-
-  guint line_style     : 2;
-  guint expander_style : 2;
-  guint show_stub      : 1;
-
-  GtkCTreeCompareDragFunc drag_compare;
-};
-
-struct _GtkCTreeClass
-{
-  GtkCListClass parent_class;
-  
-  void (*tree_select_row)   (GtkCTree     *ctree,
-			     GtkCTreeNode *row,
-			     gint          column);
-  void (*tree_unselect_row) (GtkCTree     *ctree,
-			     GtkCTreeNode *row,
-			     gint          column);
-  void (*tree_expand)       (GtkCTree     *ctree,
-			     GtkCTreeNode *node);
-  void (*tree_collapse)     (GtkCTree     *ctree,
-			     GtkCTreeNode *node);
-  void (*tree_move)         (GtkCTree     *ctree,
-			     GtkCTreeNode *node,
-			     GtkCTreeNode *new_parent,
-			     GtkCTreeNode *new_sibling);
-  void (*change_focus_row_expansion) (GtkCTree *ctree,
-				      GtkCTreeExpansionType action);
-};
-
-struct _GtkCTreeRow
-{
-  GtkCListRow row;
-  
-  GtkCTreeNode *parent;
-  GtkCTreeNode *sibling;
-  GtkCTreeNode *children;
-  
-  GdkPixmap *pixmap_closed;
-  GdkBitmap *mask_closed;
-  GdkPixmap *pixmap_opened;
-  GdkBitmap *mask_opened;
-  
-  guint16 level;
-  
-  guint is_leaf  : 1;
-  guint expanded : 1;
-};
-
-struct _GtkCTreeNode {
-  GList list;
-};
-
-
-/***********************************************************
- *           Creation, insertion, deletion                 *
- ***********************************************************/
-
-GtkType gtk_ctree_get_type                       (void) G_GNUC_CONST;
-GtkWidget * gtk_ctree_new_with_titles            (gint          columns, 
-						  gint          tree_column,
-						  gchar        *titles[]);
-GtkWidget * gtk_ctree_new                        (gint          columns, 
-						  gint          tree_column);
-GtkCTreeNode * gtk_ctree_insert_node             (GtkCTree     *ctree,
-						  GtkCTreeNode *parent, 
-						  GtkCTreeNode *sibling,
-						  gchar        *text[],
-						  guint8        spacing,
-						  GdkPixmap    *pixmap_closed,
-						  GdkBitmap    *mask_closed,
-						  GdkPixmap    *pixmap_opened,
-						  GdkBitmap    *mask_opened,
-						  gboolean      is_leaf,
-						  gboolean      expanded);
-void gtk_ctree_remove_node                       (GtkCTree     *ctree, 
-						  GtkCTreeNode *node);
-GtkCTreeNode * gtk_ctree_insert_gnode            (GtkCTree          *ctree,
-						  GtkCTreeNode      *parent,
-						  GtkCTreeNode      *sibling,
-						  GNode             *gnode,
-						  GtkCTreeGNodeFunc  func,
-						  gpointer           data);
-GNode * gtk_ctree_export_to_gnode                (GtkCTree          *ctree,
-						  GNode             *parent,
-						  GNode             *sibling,
-						  GtkCTreeNode      *node,
-						  GtkCTreeGNodeFunc  func,
-						  gpointer           data);
-
-/***********************************************************
- *  Generic recursive functions, querying / finding tree   *
- *  information                                            *
- ***********************************************************/
-
-void gtk_ctree_post_recursive                    (GtkCTree     *ctree, 
-						  GtkCTreeNode *node,
-						  GtkCTreeFunc  func,
-						  gpointer      data);
-void gtk_ctree_post_recursive_to_depth           (GtkCTree     *ctree, 
-						  GtkCTreeNode *node,
-						  gint          depth,
-						  GtkCTreeFunc  func,
-						  gpointer      data);
-void gtk_ctree_pre_recursive                     (GtkCTree     *ctree, 
-						  GtkCTreeNode *node,
-						  GtkCTreeFunc  func,
-						  gpointer      data);
-void gtk_ctree_pre_recursive_to_depth            (GtkCTree     *ctree, 
-						  GtkCTreeNode *node,
-						  gint          depth,
-						  GtkCTreeFunc  func,
-						  gpointer      data);
-gboolean gtk_ctree_is_viewable                   (GtkCTree     *ctree, 
-					          GtkCTreeNode *node);
-GtkCTreeNode * gtk_ctree_last                    (GtkCTree     *ctree,
-					          GtkCTreeNode *node);
-GtkCTreeNode * gtk_ctree_find_node_ptr           (GtkCTree     *ctree,
-					          GtkCTreeRow  *ctree_row);
-GtkCTreeNode * gtk_ctree_node_nth                (GtkCTree     *ctree,
-						  guint         row);
-gboolean gtk_ctree_find                          (GtkCTree     *ctree,
-					          GtkCTreeNode *node,
-					          GtkCTreeNode *child);
-gboolean gtk_ctree_is_ancestor                   (GtkCTree     *ctree,
-					          GtkCTreeNode *node,
-					          GtkCTreeNode *child);
-GtkCTreeNode * gtk_ctree_find_by_row_data        (GtkCTree     *ctree,
-					          GtkCTreeNode *node,
-					          gpointer      data);
-/* returns a GList of all GtkCTreeNodes with row->data == data. */
-GList * gtk_ctree_find_all_by_row_data           (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gpointer      data);
-GtkCTreeNode * gtk_ctree_find_by_row_data_custom (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gpointer      data,
-						  GCompareFunc  func);
-/* returns a GList of all GtkCTreeNodes with row->data == data. */
-GList * gtk_ctree_find_all_by_row_data_custom    (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gpointer      data,
-						  GCompareFunc  func);
-gboolean gtk_ctree_is_hot_spot                   (GtkCTree     *ctree,
-					          gint          x,
-					          gint          y);
-
-/***********************************************************
- *   Tree signals : move, expand, collapse, (un)select     *
- ***********************************************************/
-
-void gtk_ctree_move                              (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  GtkCTreeNode *new_parent, 
-						  GtkCTreeNode *new_sibling);
-void gtk_ctree_expand                            (GtkCTree     *ctree,
-						  GtkCTreeNode *node);
-void gtk_ctree_expand_recursive                  (GtkCTree     *ctree,
-						  GtkCTreeNode *node);
-void gtk_ctree_expand_to_depth                   (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gint          depth);
-void gtk_ctree_collapse                          (GtkCTree     *ctree,
-						  GtkCTreeNode *node);
-void gtk_ctree_collapse_recursive                (GtkCTree     *ctree,
-						  GtkCTreeNode *node);
-void gtk_ctree_collapse_to_depth                 (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gint          depth);
-void gtk_ctree_toggle_expansion                  (GtkCTree     *ctree,
-						  GtkCTreeNode *node);
-void gtk_ctree_toggle_expansion_recursive        (GtkCTree     *ctree,
-						  GtkCTreeNode *node);
-void gtk_ctree_select                            (GtkCTree     *ctree, 
-						  GtkCTreeNode *node);
-void gtk_ctree_select_recursive                  (GtkCTree     *ctree, 
-						  GtkCTreeNode *node);
-void gtk_ctree_unselect                          (GtkCTree     *ctree, 
-						  GtkCTreeNode *node);
-void gtk_ctree_unselect_recursive                (GtkCTree     *ctree, 
-						  GtkCTreeNode *node);
-void gtk_ctree_real_select_recursive             (GtkCTree     *ctree, 
-						  GtkCTreeNode *node, 
-						  gint          state);
-
-/***********************************************************
- *           Analogons of GtkCList functions               *
- ***********************************************************/
-
-void gtk_ctree_node_set_text                     (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gint          column,
-						  const gchar  *text);
-void gtk_ctree_node_set_pixmap                   (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gint          column,
-						  GdkPixmap    *pixmap,
-						  GdkBitmap    *mask);
-void gtk_ctree_node_set_pixtext                  (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gint          column,
-						  const gchar  *text,
-						  guint8        spacing,
-						  GdkPixmap    *pixmap,
-						  GdkBitmap    *mask);
-void gtk_ctree_set_node_info                     (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  const gchar  *text,
-						  guint8        spacing,
-						  GdkPixmap    *pixmap_closed,
-						  GdkBitmap    *mask_closed,
-						  GdkPixmap    *pixmap_opened,
-						  GdkBitmap    *mask_opened,
-						  gboolean      is_leaf,
-						  gboolean      expanded);
-void gtk_ctree_node_set_shift                    (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gint          column,
-						  gint          vertical,
-						  gint          horizontal);
-void gtk_ctree_node_set_selectable               (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gboolean      selectable);
-gboolean gtk_ctree_node_get_selectable           (GtkCTree     *ctree,
-						  GtkCTreeNode *node);
-GtkCellType gtk_ctree_node_get_cell_type         (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gint          column);
-gboolean gtk_ctree_node_get_text                 (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gint          column,
-						  gchar       **text);
-gboolean gtk_ctree_node_get_pixmap               (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gint          column,
-						  GdkPixmap   **pixmap,
-						  GdkBitmap   **mask);
-gboolean gtk_ctree_node_get_pixtext              (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gint          column,
-						  gchar       **text,
-						  guint8       *spacing,
-						  GdkPixmap   **pixmap,
-						  GdkBitmap   **mask);
-gboolean gtk_ctree_get_node_info                 (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gchar       **text,
-						  guint8       *spacing,
-						  GdkPixmap   **pixmap_closed,
-						  GdkBitmap   **mask_closed,
-						  GdkPixmap   **pixmap_opened,
-						  GdkBitmap   **mask_opened,
-						  gboolean     *is_leaf,
-						  gboolean     *expanded);
-void gtk_ctree_node_set_row_style                (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  GtkStyle     *style);
-GtkStyle * gtk_ctree_node_get_row_style          (GtkCTree     *ctree,
-						  GtkCTreeNode *node);
-void gtk_ctree_node_set_cell_style               (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gint          column,
-						  GtkStyle     *style);
-GtkStyle * gtk_ctree_node_get_cell_style         (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gint          column);
-void gtk_ctree_node_set_foreground               (GtkCTree       *ctree,
-						  GtkCTreeNode   *node,
-						  const GdkColor *color);
-void gtk_ctree_node_set_background               (GtkCTree       *ctree,
-						  GtkCTreeNode   *node,
-						  const GdkColor *color);
-void gtk_ctree_node_set_row_data                 (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gpointer      data);
-void gtk_ctree_node_set_row_data_full            (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gpointer      data,
-						  GtkDestroyNotify destroy);
-gpointer gtk_ctree_node_get_row_data             (GtkCTree     *ctree,
-						  GtkCTreeNode *node);
-void gtk_ctree_node_moveto                       (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gint          column,
-						  gfloat        row_align,
-						  gfloat        col_align);
-GtkVisibility gtk_ctree_node_is_visible          (GtkCTree     *ctree,
-						  GtkCTreeNode *node);
-
-/***********************************************************
- *             GtkCTree specific functions                 *
- ***********************************************************/
-
-void gtk_ctree_set_indent            (GtkCTree                *ctree, 
-				      gint                     indent);
-void gtk_ctree_set_spacing           (GtkCTree                *ctree, 
-				      gint                     spacing);
-void gtk_ctree_set_show_stub         (GtkCTree                *ctree, 
-				      gboolean                 show_stub);
-void gtk_ctree_set_line_style        (GtkCTree                *ctree, 
-				      GtkCTreeLineStyle        line_style);
-void gtk_ctree_set_expander_style    (GtkCTree                *ctree, 
-				      GtkCTreeExpanderStyle    expander_style);
-void gtk_ctree_set_drag_compare_func (GtkCTree     	      *ctree,
-				      GtkCTreeCompareDragFunc  cmp_func);
-
-/***********************************************************
- *             Tree sorting functions                      *
- ***********************************************************/
-
-void gtk_ctree_sort_node                         (GtkCTree     *ctree, 
-						  GtkCTreeNode *node);
-void gtk_ctree_sort_recursive                    (GtkCTree     *ctree, 
-						  GtkCTreeNode *node);
-
-
-#define gtk_ctree_set_reorderable(t,r)                    gtk_clist_set_reorderable((GtkCList*) (t),(r))
-
-/* GType for the GtkCTreeNode.  This is a boxed type, although it uses
- * no-op's for the copy and free routines.  It is defined in order to
- * provide type information for the signal arguments
- */
-GType   gtk_ctree_node_get_type                  (void) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif				/* __GTK_CTREE_H__ */
-
-#endif /* GTK_DISABLE_DEPRECATED */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcurve.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcurve.h
deleted file mode 100644
index 94c2c59b..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcurve.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-/*
- * NOTE this widget is considered too specialized/little-used for
- * GTK+, and will in the future be moved to some other package.  If
- * your application needs this widget, feel free to use it, as the
- * widget does work and is useful in some applications; it's just not
- * of general interest. However, we are not accepting new features for
- * the widget, and it will eventually move out of the GTK+
- * distribution.
- */
-
-#ifndef __GTK_CURVE_H__
-#define __GTK_CURVE_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkdrawingarea.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_CURVE                  (gtk_curve_get_type ())
-#define GTK_CURVE(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CURVE, GtkCurve))
-#define GTK_CURVE_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CURVE, GtkCurveClass))
-#define GTK_IS_CURVE(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CURVE))
-#define GTK_IS_CURVE_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CURVE))
-#define GTK_CURVE_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CURVE, GtkCurveClass))
-
-
-typedef struct _GtkCurve	GtkCurve;
-typedef struct _GtkCurveClass	GtkCurveClass;
-
-
-struct _GtkCurve
-{
-  GtkDrawingArea graph;
-
-  gint cursor_type;
-  gfloat min_x;
-  gfloat max_x;
-  gfloat min_y;
-  gfloat max_y;
-  GdkPixmap *pixmap;
-  GtkCurveType curve_type;
-  gint height;                  /* (cached) graph height in pixels */
-  gint grab_point;              /* point currently grabbed */
-  gint last;
-
-  /* (cached) curve points: */
-  gint num_points;
-  GdkPoint *point;
-
-  /* control points: */
-  gint num_ctlpoints;           /* number of control points */
-  gfloat (*ctlpoint)[2];        /* array of control points */
-};
-
-struct _GtkCurveClass
-{
-  GtkDrawingAreaClass parent_class;
-
-  void (* curve_type_changed) (GtkCurve *curve);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType		gtk_curve_get_type	(void) G_GNUC_CONST;
-GtkWidget*	gtk_curve_new		(void);
-void		gtk_curve_reset		(GtkCurve *curve);
-void		gtk_curve_set_gamma	(GtkCurve *curve, gfloat gamma_);
-void		gtk_curve_set_range	(GtkCurve *curve,
-					 gfloat min_x, gfloat max_x,
-					 gfloat min_y, gfloat max_y);
-void		gtk_curve_get_vector	(GtkCurve *curve,
-					 int veclen, gfloat vector[]);
-void		gtk_curve_set_vector	(GtkCurve *curve,
-					 int veclen, gfloat vector[]);
-void		gtk_curve_set_curve_type (GtkCurve *curve, GtkCurveType type);
-
-
-G_END_DECLS
-
-#endif /* __GTK_CURVE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkdebug.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkdebug.h
deleted file mode 100644
index 5b148c88..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkdebug.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_DEBUG_H__
-#define __GTK_DEBUG_H__
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-typedef enum {
-  GTK_DEBUG_MISC        = 1 << 0,
-  GTK_DEBUG_PLUGSOCKET  = 1 << 1,
-  GTK_DEBUG_TEXT        = 1 << 2,
-  GTK_DEBUG_TREE        = 1 << 3,
-  GTK_DEBUG_UPDATES     = 1 << 4,
-  GTK_DEBUG_KEYBINDINGS = 1 << 5,
-  GTK_DEBUG_MULTIHEAD   = 1 << 6,
-  GTK_DEBUG_MODULES     = 1 << 7,
-  GTK_DEBUG_GEOMETRY    = 1 << 8,
-  GTK_DEBUG_ICONTHEME   = 1 << 9,
-  GTK_DEBUG_PRINTING	= 1 << 10,
-  GTK_DEBUG_BUILDER	= 1 << 11
-} GtkDebugFlag;
-
-#ifdef G_ENABLE_DEBUG
-
-#define GTK_NOTE(type,action)                G_STMT_START { \
-    if (gtk_debug_flags & GTK_DEBUG_##type)                 \
-       { action; };                          } G_STMT_END
-
-#else /* !G_ENABLE_DEBUG */
-
-#define GTK_NOTE(type, action)
-      
-#endif /* G_ENABLE_DEBUG */
-
-#ifdef G_OS_WIN32
-#  ifdef GTK_COMPILATION
-#    define GTKVAR __declspec(dllexport)
-#  else
-#    define GTKVAR extern __declspec(dllimport)
-#  endif
-#else
-#  define GTKVAR extern
-#endif
-
-GTKVAR guint gtk_debug_flags;
-
-G_END_DECLS
-
-#endif /* __GTK_DEBUG_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkdialog.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkdialog.h
deleted file mode 100644
index 0b6b65c1..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkdialog.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_DIALOG_H__
-#define __GTK_DIALOG_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkwindow.h>
-
-
-G_BEGIN_DECLS
-
-/* Parameters for dialog construction */
-typedef enum
-{
-  GTK_DIALOG_MODAL               = 1 << 0, /* call gtk_window_set_modal (win, TRUE) */
-  GTK_DIALOG_DESTROY_WITH_PARENT = 1 << 1, /* call gtk_window_set_destroy_with_parent () */
-  GTK_DIALOG_NO_SEPARATOR        = 1 << 2  /* no separator bar above buttons */
-} GtkDialogFlags;
-
-/* Convenience enum to use for response_id's.  Positive values are
- * totally user-interpreted. GTK will sometimes return
- * GTK_RESPONSE_NONE if no response_id is available.
- *
- *  Typical usage is:
- *     if (gtk_dialog_run(dialog) == GTK_RESPONSE_ACCEPT)
- *       blah();
- */
-typedef enum
-{
-  /* GTK returns this if a response widget has no response_id,
-   * or if the dialog gets programmatically hidden or destroyed.
-   */
-  GTK_RESPONSE_NONE = -1,
-
-  /* GTK won't return these unless you pass them in
-   * as the response for an action widget. They are
-   * for your convenience.
-   */
-  GTK_RESPONSE_REJECT = -2,
-  GTK_RESPONSE_ACCEPT = -3,
-
-  /* If the dialog is deleted. */
-  GTK_RESPONSE_DELETE_EVENT = -4,
-
-  /* These are returned from GTK dialogs, and you can also use them
-   * yourself if you like.
-   */
-  GTK_RESPONSE_OK     = -5,
-  GTK_RESPONSE_CANCEL = -6,
-  GTK_RESPONSE_CLOSE  = -7,
-  GTK_RESPONSE_YES    = -8,
-  GTK_RESPONSE_NO     = -9,
-  GTK_RESPONSE_APPLY  = -10,
-  GTK_RESPONSE_HELP   = -11
-} GtkResponseType;
-
-
-#define GTK_TYPE_DIALOG                  (gtk_dialog_get_type ())
-#define GTK_DIALOG(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_DIALOG, GtkDialog))
-#define GTK_DIALOG_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_DIALOG, GtkDialogClass))
-#define GTK_IS_DIALOG(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_DIALOG))
-#define GTK_IS_DIALOG_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_DIALOG))
-#define GTK_DIALOG_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_DIALOG, GtkDialogClass))
-
-
-typedef struct _GtkDialog        GtkDialog;
-typedef struct _GtkDialogClass   GtkDialogClass;
-
-struct _GtkDialog
-{
-  GtkWindow window;
-
-  /*< public >*/
-  GtkWidget *vbox;
-  GtkWidget *action_area;
-
-  /*< private >*/
-  GtkWidget *separator;
-};
-
-struct _GtkDialogClass
-{
-  GtkWindowClass parent_class;
-
-  void (* response) (GtkDialog *dialog, gint response_id);
-
-  /* Keybinding signals */
-
-  void (* close)    (GtkDialog *dialog);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType      gtk_dialog_get_type (void) G_GNUC_CONST;
-GtkWidget* gtk_dialog_new      (void);
-
-GtkWidget* gtk_dialog_new_with_buttons (const gchar     *title,
-                                        GtkWindow       *parent,
-                                        GtkDialogFlags   flags,
-                                        const gchar     *first_button_text,
-                                        ...);
-
-void       gtk_dialog_add_action_widget (GtkDialog   *dialog,
-                                         GtkWidget   *child,
-                                         gint         response_id);
-GtkWidget* gtk_dialog_add_button        (GtkDialog   *dialog,
-                                         const gchar *button_text,
-                                         gint         response_id);
-void       gtk_dialog_add_buttons       (GtkDialog   *dialog,
-                                         const gchar *first_button_text,
-                                         ...) G_GNUC_NULL_TERMINATED;
-
-void gtk_dialog_set_response_sensitive (GtkDialog *dialog,
-                                        gint       response_id,
-                                        gboolean   setting);
-void gtk_dialog_set_default_response   (GtkDialog *dialog,
-                                        gint       response_id);
-gint gtk_dialog_get_response_for_widget (GtkDialog *dialog,
-					 GtkWidget *widget);
-
-void     gtk_dialog_set_has_separator (GtkDialog *dialog,
-                                       gboolean   setting);
-gboolean gtk_dialog_get_has_separator (GtkDialog *dialog);
-
-gboolean gtk_alternative_dialog_button_order (GdkScreen *screen);
-void     gtk_dialog_set_alternative_button_order (GtkDialog *dialog,
-						  gint       first_response_id,
-						  ...);
-void     gtk_dialog_set_alternative_button_order_from_array (GtkDialog *dialog,
-                                                             gint       n_params,
-                                                             gint      *new_order);
-
-/* Emit response signal */
-void gtk_dialog_response           (GtkDialog *dialog,
-                                    gint       response_id);
-
-/* Returns response_id */
-gint gtk_dialog_run                (GtkDialog *dialog);
-
-
-/* For private use only */
-void _gtk_dialog_set_ignore_separator (GtkDialog *dialog,
-				       gboolean   ignore_separator);
-
-G_END_DECLS
-
-#endif /* __GTK_DIALOG_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkdnd.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkdnd.h
deleted file mode 100644
index f9119060..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkdnd.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/* -*- Mode: C; c-file-style: "gnu"; tab-width: 8 -*- */
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_DND_H__
-#define __GTK_DND_H__
-
-#include <gdk/gdk.h>
-#include <gtk/gtkenums.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkselection.h>
-
-G_BEGIN_DECLS
-
-typedef enum {
-  GTK_DEST_DEFAULT_MOTION     = 1 << 0, /* respond to "drag_motion" */
-  GTK_DEST_DEFAULT_HIGHLIGHT  = 1 << 1, /* auto-highlight */
-  GTK_DEST_DEFAULT_DROP       = 1 << 2, /* respond to "drag_drop" */
-  GTK_DEST_DEFAULT_ALL        = 0x07
-} GtkDestDefaults;
-
-/* Flags for the GtkTargetEntry on the destination side 
- */
-typedef enum {
-  GTK_TARGET_SAME_APP = 1 << 0,    /*< nick=same-app >*/
-  GTK_TARGET_SAME_WIDGET = 1 << 1, /*< nick=same-widget >*/
-  GTK_TARGET_OTHER_APP = 1 << 2,   /*< nick=other-app >*/
-  GTK_TARGET_OTHER_WIDGET = 1 << 3 /*< nick=other-widget >*/
-} GtkTargetFlags;
-
-/* Destination side */
-
-void gtk_drag_get_data (GtkWidget      *widget,
-			GdkDragContext *context,
-			GdkAtom         target,
-			guint32         time_);
-void gtk_drag_finish   (GdkDragContext *context,
-			gboolean        success,
-			gboolean        del,
-			guint32         time_);
-
-GtkWidget *gtk_drag_get_source_widget (GdkDragContext *context);
-
-void gtk_drag_highlight   (GtkWidget  *widget);
-void gtk_drag_unhighlight (GtkWidget  *widget);
-
-void gtk_drag_dest_set   (GtkWidget            *widget,
-			  GtkDestDefaults       flags,
-  		          const GtkTargetEntry *targets,
-			  gint                  n_targets,
-			  GdkDragAction         actions);
-
-void gtk_drag_dest_set_proxy (GtkWidget      *widget,
-			      GdkWindow      *proxy_window,
-			      GdkDragProtocol protocol,
-			      gboolean        use_coordinates);
-
-void gtk_drag_dest_unset (GtkWidget          *widget);
-
-GdkAtom        gtk_drag_dest_find_target     (GtkWidget      *widget,
-                                              GdkDragContext *context,
-                                              GtkTargetList  *target_list);
-GtkTargetList* gtk_drag_dest_get_target_list (GtkWidget      *widget);
-void           gtk_drag_dest_set_target_list (GtkWidget      *widget,
-                                              GtkTargetList  *target_list);
-void           gtk_drag_dest_add_text_targets  (GtkWidget    *widget);
-void           gtk_drag_dest_add_image_targets (GtkWidget    *widget);
-void           gtk_drag_dest_add_uri_targets   (GtkWidget    *widget);
-
-void           gtk_drag_dest_set_track_motion  (GtkWidget *widget,
-						gboolean   track_motion);
-gboolean       gtk_drag_dest_get_track_motion  (GtkWidget *widget);
-
-/* Source side */
-
-void gtk_drag_source_set  (GtkWidget            *widget,
-			   GdkModifierType       start_button_mask,
-			   const GtkTargetEntry *targets,
-			   gint                  n_targets,
-			   GdkDragAction         actions);
-
-void gtk_drag_source_unset (GtkWidget        *widget);
-
-GtkTargetList* gtk_drag_source_get_target_list (GtkWidget     *widget);
-void           gtk_drag_source_set_target_list (GtkWidget     *widget,
-                                                GtkTargetList *target_list);
-void           gtk_drag_source_add_text_targets  (GtkWidget     *widget);
-void           gtk_drag_source_add_image_targets (GtkWidget    *widget);
-void           gtk_drag_source_add_uri_targets   (GtkWidget    *widget);
-
-void gtk_drag_source_set_icon        (GtkWidget   *widget,
-				      GdkColormap *colormap,
-				      GdkPixmap   *pixmap,
-				      GdkBitmap   *mask);
-void gtk_drag_source_set_icon_pixbuf (GtkWidget   *widget,
-				      GdkPixbuf   *pixbuf);
-void gtk_drag_source_set_icon_stock  (GtkWidget   *widget,
-				      const gchar *stock_id);
-void gtk_drag_source_set_icon_name   (GtkWidget   *widget,
-				      const gchar *icon_name);
-
-/* There probably should be functions for setting the targets
- * as a GtkTargetList
- */
-
-GdkDragContext *gtk_drag_begin (GtkWidget         *widget,
-				GtkTargetList     *targets,
-				GdkDragAction      actions,
-				gint               button,
-				GdkEvent          *event);
-
-/* Set the image being dragged around
- */
-void gtk_drag_set_icon_widget (GdkDragContext *context,
-			       GtkWidget      *widget,
-			       gint            hot_x,
-			       gint            hot_y);
-void gtk_drag_set_icon_pixmap (GdkDragContext *context,
-			       GdkColormap    *colormap,
-			       GdkPixmap      *pixmap,
-			       GdkBitmap      *mask,
-			       gint            hot_x,
-			       gint            hot_y);
-void gtk_drag_set_icon_pixbuf (GdkDragContext *context,
-			       GdkPixbuf      *pixbuf,
-			       gint            hot_x,
-			       gint            hot_y);
-void gtk_drag_set_icon_stock  (GdkDragContext *context,
-			       const gchar    *stock_id,
-			       gint            hot_x,
-			       gint            hot_y);
-void gtk_drag_set_icon_name   (GdkDragContext *context,
-			       const gchar    *icon_name,
-			       gint            hot_x,
-			       gint            hot_y);
-
-void gtk_drag_set_icon_default (GdkDragContext    *context);
-
-gboolean gtk_drag_check_threshold (GtkWidget *widget,
-				   gint       start_x,
-				   gint       start_y,
-				   gint       current_x,
-				   gint       current_y);
-
-/* Internal functions */
-void _gtk_drag_source_handle_event (GtkWidget *widget,
-				    GdkEvent  *event);
-void _gtk_drag_dest_handle_event (GtkWidget *toplevel,
-				  GdkEvent  *event);
-
-#ifndef GTK_DISABLE_DEPRECATED
-void gtk_drag_set_default_icon (GdkColormap   *colormap,
-				GdkPixmap     *pixmap,
-				GdkBitmap     *mask,
-			        gint           hot_x,
-			        gint           hot_y);
-#endif /* !GTK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GTK_DND_H__ */
-
-
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkdrawingarea.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkdrawingarea.h
deleted file mode 100644
index fd445e16..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkdrawingarea.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_DRAWING_AREA_H__
-#define __GTK_DRAWING_AREA_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkwidget.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_DRAWING_AREA            (gtk_drawing_area_get_type ())
-#define GTK_DRAWING_AREA(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_DRAWING_AREA, GtkDrawingArea))
-#define GTK_DRAWING_AREA_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_DRAWING_AREA, GtkDrawingAreaClass))
-#define GTK_IS_DRAWING_AREA(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_DRAWING_AREA))
-#define GTK_IS_DRAWING_AREA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_DRAWING_AREA))
-#define GTK_DRAWING_AREA_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_DRAWING_AREA, GtkDrawingAreaClass))
-
-
-typedef struct _GtkDrawingArea       GtkDrawingArea;
-typedef struct _GtkDrawingAreaClass  GtkDrawingAreaClass;
-
-struct _GtkDrawingArea
-{
-  GtkWidget widget;
-
-  gpointer draw_data;
-};
-
-struct _GtkDrawingAreaClass
-{
-  GtkWidgetClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType      gtk_drawing_area_get_type   (void) G_GNUC_CONST;
-GtkWidget* gtk_drawing_area_new        (void);
-
-#ifndef GTK_DISABLE_DEPRECATED
-void       gtk_drawing_area_size       (GtkDrawingArea      *darea,
-					gint                 width,
-					gint                 height);
-#endif /* GTK_DISABLE_DEPRECATED */
-
-
-G_END_DECLS
-
-#endif /* __GTK_DRAWING_AREA_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkeditable.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkeditable.h
deleted file mode 100644
index 46de8150..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkeditable.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_EDITABLE_H__
-#define __GTK_EDITABLE_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkwidget.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_EDITABLE             (gtk_editable_get_type ())
-#define GTK_EDITABLE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_EDITABLE, GtkEditable))
-#define GTK_EDITABLE_CLASS(vtable)    (G_TYPE_CHECK_CLASS_CAST ((vtable), GTK_TYPE_EDITABLE, GtkEditableClass))
-#define GTK_IS_EDITABLE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_EDITABLE))
-#define GTK_IS_EDITABLE_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), GTK_TYPE_EDITABLE))
-#define GTK_EDITABLE_GET_CLASS(inst)  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GTK_TYPE_EDITABLE, GtkEditableClass))
-
-typedef struct _GtkEditable       GtkEditable;         /* Dummy typedef */
-typedef struct _GtkEditableClass  GtkEditableClass;
-
-struct _GtkEditableClass
-{
-  GTypeInterface		   base_iface;
-  
-  /* signals */
-  void (* insert_text)              (GtkEditable    *editable,
-				     const gchar    *text,
-				     gint            length,
-				     gint           *position);
-  void (* delete_text)              (GtkEditable    *editable,
-				     gint            start_pos,
-				     gint            end_pos);
-  void (* changed)                  (GtkEditable    *editable);
-
-  /* vtable */
-  void (* do_insert_text)           (GtkEditable    *editable,
-				     const gchar    *text,
-				     gint            length,
-				     gint           *position);
-  void (* do_delete_text)           (GtkEditable    *editable,
-				     gint            start_pos,
-				     gint            end_pos);
-
-  gchar* (* get_chars)              (GtkEditable    *editable,
-				     gint            start_pos,
-				     gint            end_pos);
-  void (* set_selection_bounds)     (GtkEditable    *editable,
-				     gint            start_pos,
-				     gint            end_pos);
-  gboolean (* get_selection_bounds) (GtkEditable    *editable,
-				     gint           *start_pos,
-				     gint           *end_pos);
-  void (* set_position)             (GtkEditable    *editable,
-				     gint            position);
-  gint (* get_position)             (GtkEditable    *editable);
-};
-
-GType    gtk_editable_get_type             (void) G_GNUC_CONST;
-void     gtk_editable_select_region        (GtkEditable *editable,
-					    gint         start,
-					    gint         end);
-gboolean gtk_editable_get_selection_bounds (GtkEditable *editable,
-					    gint        *start,
-					    gint        *end);
-void     gtk_editable_insert_text          (GtkEditable *editable,
-					    const gchar *new_text,
-					    gint         new_text_length,
-					    gint        *position);
-void     gtk_editable_delete_text          (GtkEditable *editable,
-					    gint         start_pos,
-					    gint         end_pos);
-gchar*   gtk_editable_get_chars            (GtkEditable *editable,
-					    gint         start_pos,
-					    gint         end_pos);
-void     gtk_editable_cut_clipboard        (GtkEditable *editable);
-void     gtk_editable_copy_clipboard       (GtkEditable *editable);
-void     gtk_editable_paste_clipboard      (GtkEditable *editable);
-void     gtk_editable_delete_selection     (GtkEditable *editable);
-void     gtk_editable_set_position         (GtkEditable *editable,
-					    gint         position);
-gint     gtk_editable_get_position         (GtkEditable *editable);
-void     gtk_editable_set_editable         (GtkEditable *editable,
-					    gboolean     is_editable);
-gboolean gtk_editable_get_editable         (GtkEditable *editable);
-
-G_END_DECLS
-
-#endif /* __GTK_EDITABLE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkentry.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkentry.h
deleted file mode 100644
index 24bf28db..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkentry.h
+++ /dev/null
@@ -1,220 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_ENTRY_H__
-#define __GTK_ENTRY_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkeditable.h>
-#include <gtk/gtkimcontext.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkentrycompletion.h>
-#include <pango/pango.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_ENTRY                  (gtk_entry_get_type ())
-#define GTK_ENTRY(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ENTRY, GtkEntry))
-#define GTK_ENTRY_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ENTRY, GtkEntryClass))
-#define GTK_IS_ENTRY(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ENTRY))
-#define GTK_IS_ENTRY_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ENTRY))
-#define GTK_ENTRY_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ENTRY, GtkEntryClass))
-
-
-typedef struct _GtkEntry       GtkEntry;
-typedef struct _GtkEntryClass  GtkEntryClass;
-
-struct _GtkEntry
-{
-  GtkWidget  widget;
-
-  gchar     *text;
-
-  guint      editable : 1;
-  guint      visible  : 1;
-  guint      overwrite_mode : 1;
-  guint      in_drag : 1;	/* Dragging within the selection */
-
-  guint16 text_length;	/* length in use, in chars */
-  guint16 text_max_length;
-
-  /*< private >*/
-  GdkWindow *text_area;
-  GtkIMContext *im_context;
-  GtkWidget   *popup_menu;
-  
-  gint         current_pos;
-  gint         selection_bound;
-  
-  PangoLayout *cached_layout;
-
-  guint        cache_includes_preedit : 1;
-  guint        need_im_reset          : 1;
-  guint        has_frame              : 1;
-  guint        activates_default      : 1;
-  guint        cursor_visible         : 1;
-  guint        in_click               : 1;	/* Flag so we don't select all when clicking in entry to focus in */
-  guint        is_cell_renderer       : 1;
-  guint        editing_canceled       : 1; /* Only used by GtkCellRendererText */
-  guint        mouse_cursor_obscured  : 1;
-  guint        select_words           : 1;
-  guint        select_lines           : 1;
-  guint        resolved_dir           : 4; /* PangoDirection */
-  guint        truncate_multiline     : 1;
-
-  guint   button;
-  guint   blink_timeout;
-  guint   recompute_idle;
-  gint    scroll_offset;
-  gint    ascent;	/* font ascent, in pango units  */
-  gint    descent;	/* font descent, in pango units  */
-  
-  guint16 text_size;	/* allocated size, in bytes */
-  guint16 n_bytes;	/* length in use, in bytes */
-
-  guint16 preedit_length;	/* length of preedit string, in bytes */
-  guint16 preedit_cursor;	/* offset of cursor within preedit string, in chars */
-
-  gint dnd_position;		/* In chars, -1 == no DND cursor */
-
-  gint drag_start_x;
-  gint drag_start_y;
-  
-  gunichar invisible_char;
-
-  gint width_chars;
-};
-
-struct _GtkEntryClass
-{
-  GtkWidgetClass parent_class;
-
-  /* Hook to customize right-click popup */
-  void (* populate_popup)   (GtkEntry       *entry,
-                             GtkMenu        *menu);
-  
-  /* Action signals
-   */
-  void (* activate)           (GtkEntry       *entry);
-  void (* move_cursor)        (GtkEntry       *entry,
-			       GtkMovementStep step,
-			       gint            count,
-			       gboolean        extend_selection);
-  void (* insert_at_cursor)   (GtkEntry       *entry,
-			       const gchar    *str);
-  void (* delete_from_cursor) (GtkEntry       *entry,
-			       GtkDeleteType   type,
-			       gint            count);
-  void (* backspace)          (GtkEntry       *entry);
-  void (* cut_clipboard)      (GtkEntry       *entry);
-  void (* copy_clipboard)     (GtkEntry       *entry);
-  void (* paste_clipboard)    (GtkEntry       *entry);
-  void (* toggle_overwrite)   (GtkEntry       *entry);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-};
-
-GType      gtk_entry_get_type       		(void) G_GNUC_CONST;
-GtkWidget* gtk_entry_new            		(void);
-void       gtk_entry_set_visibility 		(GtkEntry      *entry,
-						 gboolean       visible);
-gboolean   gtk_entry_get_visibility             (GtkEntry      *entry);
-void       gtk_entry_set_invisible_char         (GtkEntry      *entry,
-                                                 gunichar       ch);
-gunichar   gtk_entry_get_invisible_char         (GtkEntry      *entry);
-void       gtk_entry_set_has_frame              (GtkEntry      *entry,
-                                                 gboolean       setting);
-gboolean   gtk_entry_get_has_frame              (GtkEntry      *entry);
-void       gtk_entry_set_inner_border                (GtkEntry        *entry,
-                                                      const GtkBorder *border);
-G_CONST_RETURN GtkBorder* gtk_entry_get_inner_border (GtkEntry        *entry);
-/* text is truncated if needed */
-void       gtk_entry_set_max_length 		(GtkEntry      *entry,
-						 gint           max);
-gint       gtk_entry_get_max_length             (GtkEntry      *entry);
-void       gtk_entry_set_activates_default      (GtkEntry      *entry,
-                                                 gboolean       setting);
-gboolean   gtk_entry_get_activates_default      (GtkEntry      *entry);
-
-void       gtk_entry_set_width_chars            (GtkEntry      *entry,
-                                                 gint           n_chars);
-gint       gtk_entry_get_width_chars            (GtkEntry      *entry);
-
-/* Somewhat more convenient than the GtkEditable generic functions
- */
-void       gtk_entry_set_text                   (GtkEntry      *entry,
-                                                 const gchar   *text);
-/* returns a reference to the text */
-G_CONST_RETURN gchar* gtk_entry_get_text        (GtkEntry      *entry);
-
-PangoLayout* gtk_entry_get_layout               (GtkEntry      *entry);
-void         gtk_entry_get_layout_offsets       (GtkEntry      *entry,
-                                                 gint          *x,
-                                                 gint          *y);
-void       gtk_entry_set_alignment              (GtkEntry      *entry,
-                                                 gfloat         xalign);
-gfloat     gtk_entry_get_alignment              (GtkEntry      *entry);
-
-void                gtk_entry_set_completion (GtkEntry           *entry,
-                                              GtkEntryCompletion *completion);
-GtkEntryCompletion *gtk_entry_get_completion (GtkEntry           *entry);
-
-gint       gtk_entry_layout_index_to_text_index (GtkEntry      *entry,
-                                                 gint           layout_index);
-gint       gtk_entry_text_index_to_layout_index (GtkEntry      *entry,
-                                                 gint           text_index);
-
-/* For scrolling cursor appropriately 
- */
-void           gtk_entry_set_cursor_hadjustment (GtkEntry      *entry,
-                                                 GtkAdjustment *adjustment);
-GtkAdjustment* gtk_entry_get_cursor_hadjustment (GtkEntry      *entry);
-
-/* Deprecated compatibility functions
- */
-
-#ifndef GTK_DISABLE_DEPRECATED
-GtkWidget* gtk_entry_new_with_max_length	(gint           max);
-void       gtk_entry_append_text    		(GtkEntry      *entry,
-						 const gchar   *text);
-void       gtk_entry_prepend_text   		(GtkEntry      *entry,
-						 const gchar   *text);
-void       gtk_entry_set_position   		(GtkEntry      *entry,
-						 gint           position);
-void       gtk_entry_select_region  		(GtkEntry      *entry,
-						 gint           start,
-						 gint           end);
-void       gtk_entry_set_editable   		(GtkEntry      *entry,
-						 gboolean       editable);
-#endif /* GTK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GTK_ENTRY_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkentrycompletion.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkentrycompletion.h
deleted file mode 100644
index 19cacc85..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkentrycompletion.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/* gtkentrycompletion.h
- * Copyright (C) 2003  Kristian Rietveld  <kris@gtk.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 __GTK_ENTRY_COMPLETION_H__
-#define __GTK_ENTRY_COMPLETION_H__
-
-#include <glib-object.h>
-
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtktreeviewcolumn.h>
-#include <gtk/gtktreemodelfilter.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_ENTRY_COMPLETION            (gtk_entry_completion_get_type ())
-#define GTK_ENTRY_COMPLETION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ENTRY_COMPLETION, GtkEntryCompletion))
-#define GTK_ENTRY_COMPLETION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ENTRY_COMPLETION, GtkEntryCompletionClass))
-#define GTK_IS_ENTRY_COMPLETION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ENTRY_COMPLETION))
-#define GTK_IS_ENTRY_COMPLETION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ENTRY_COMPLETION))
-#define GTK_ENTRY_COMPLETION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ENTRY_COMPLETION, GtkEntryCompletionClass))
-
-typedef struct _GtkEntryCompletion            GtkEntryCompletion;
-typedef struct _GtkEntryCompletionClass       GtkEntryCompletionClass;
-typedef struct _GtkEntryCompletionPrivate     GtkEntryCompletionPrivate;
-
-typedef gboolean (* GtkEntryCompletionMatchFunc) (GtkEntryCompletion *completion,
-                                                  const gchar        *key,
-                                                  GtkTreeIter        *iter,
-                                                  gpointer            user_data);
-
-
-struct _GtkEntryCompletion
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GtkEntryCompletionPrivate *priv;
-};
-
-struct _GtkEntryCompletionClass
-{
-  GObjectClass parent_class;
-
-  gboolean (* match_selected)   (GtkEntryCompletion *completion,
-                                 GtkTreeModel       *model,
-                                 GtkTreeIter        *iter);
-  void     (* action_activated) (GtkEntryCompletion *completion,
-                                 gint                index_);
-  gboolean (* insert_prefix)    (GtkEntryCompletion *completion,
-				 const gchar        *prefix); 
-  gboolean (* cursor_on_match)  (GtkEntryCompletion *completion,
-				 GtkTreeModel       *model,
-				 GtkTreeIter        *iter);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved0) (void);
-  void (*_gtk_reserved1) (void);
-};
-
-/* core */
-GType               gtk_entry_completion_get_type               (void) G_GNUC_CONST;
-GtkEntryCompletion *gtk_entry_completion_new                    (void);
-
-GtkWidget          *gtk_entry_completion_get_entry              (GtkEntryCompletion          *completion);
-
-void                gtk_entry_completion_set_model              (GtkEntryCompletion          *completion,
-                                                                 GtkTreeModel                *model);
-GtkTreeModel       *gtk_entry_completion_get_model              (GtkEntryCompletion          *completion);
-
-void                gtk_entry_completion_set_match_func         (GtkEntryCompletion          *completion,
-                                                                 GtkEntryCompletionMatchFunc  func,
-                                                                 gpointer                     func_data,
-                                                                 GDestroyNotify               func_notify);
-void                gtk_entry_completion_set_minimum_key_length (GtkEntryCompletion          *completion,
-                                                                 gint                         length);
-gint                gtk_entry_completion_get_minimum_key_length (GtkEntryCompletion          *completion);
-void                gtk_entry_completion_complete               (GtkEntryCompletion          *completion);
-void                gtk_entry_completion_insert_prefix          (GtkEntryCompletion          *completion);
-
-void                gtk_entry_completion_insert_action_text     (GtkEntryCompletion          *completion,
-                                                                 gint                         index_,
-                                                                 const gchar                 *text);
-void                gtk_entry_completion_insert_action_markup   (GtkEntryCompletion          *completion,
-                                                                 gint                         index_,
-                                                                 const gchar                 *markup);
-void                gtk_entry_completion_delete_action          (GtkEntryCompletion          *completion,
-                                                                 gint                         index_);
-
-void                gtk_entry_completion_set_inline_completion  (GtkEntryCompletion          *completion,
-                                                                 gboolean                     inline_completion);
-gboolean            gtk_entry_completion_get_inline_completion  (GtkEntryCompletion          *completion);
-void                gtk_entry_completion_set_inline_selection  (GtkEntryCompletion          *completion,
-                                                                 gboolean                     inline_selection);
-gboolean            gtk_entry_completion_get_inline_selection  (GtkEntryCompletion          *completion);
-void                gtk_entry_completion_set_popup_completion   (GtkEntryCompletion          *completion,
-                                                                 gboolean                     popup_completion);
-gboolean            gtk_entry_completion_get_popup_completion   (GtkEntryCompletion          *completion);
-void                gtk_entry_completion_set_popup_set_width    (GtkEntryCompletion          *completion,
-                                                                 gboolean                     popup_set_width);
-gboolean            gtk_entry_completion_get_popup_set_width    (GtkEntryCompletion          *completion);
-void                gtk_entry_completion_set_popup_single_match (GtkEntryCompletion          *completion,
-                                                                 gboolean                     popup_single_match);
-gboolean            gtk_entry_completion_get_popup_single_match (GtkEntryCompletion          *completion);
-
-const gchar         *gtk_entry_completion_get_completion_prefix (GtkEntryCompletion *completion);
-/* convenience */
-void                gtk_entry_completion_set_text_column        (GtkEntryCompletion          *completion,
-                                                                 gint                         column);
-gint                gtk_entry_completion_get_text_column        (GtkEntryCompletion          *completion);
-
-G_END_DECLS
-
-#endif /* __GTK_ENTRY_COMPLETION_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkenums.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkenums.h
deleted file mode 100644
index 6fabacf5..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkenums.h
+++ /dev/null
@@ -1,529 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_ENUMS_H__
-#define __GTK_ENUMS_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/* Anchor types */
-typedef enum
-{
-  GTK_ANCHOR_CENTER,
-  GTK_ANCHOR_NORTH,
-  GTK_ANCHOR_NORTH_WEST,
-  GTK_ANCHOR_NORTH_EAST,
-  GTK_ANCHOR_SOUTH,
-  GTK_ANCHOR_SOUTH_WEST,
-  GTK_ANCHOR_SOUTH_EAST,
-  GTK_ANCHOR_WEST,
-  GTK_ANCHOR_EAST,
-  GTK_ANCHOR_N		= GTK_ANCHOR_NORTH,
-  GTK_ANCHOR_NW		= GTK_ANCHOR_NORTH_WEST,
-  GTK_ANCHOR_NE		= GTK_ANCHOR_NORTH_EAST,
-  GTK_ANCHOR_S		= GTK_ANCHOR_SOUTH,
-  GTK_ANCHOR_SW		= GTK_ANCHOR_SOUTH_WEST,
-  GTK_ANCHOR_SE		= GTK_ANCHOR_SOUTH_EAST,
-  GTK_ANCHOR_W		= GTK_ANCHOR_WEST,
-  GTK_ANCHOR_E		= GTK_ANCHOR_EAST
-} GtkAnchorType;
-
-/* Arrow types */
-typedef enum
-{
-  GTK_ARROW_UP,
-  GTK_ARROW_DOWN,
-  GTK_ARROW_LEFT,
-  GTK_ARROW_RIGHT,
-  GTK_ARROW_NONE
-} GtkArrowType;
-
-/* Attach options (for tables) */
-typedef enum
-{
-  GTK_EXPAND = 1 << 0,
-  GTK_SHRINK = 1 << 1,
-  GTK_FILL   = 1 << 2
-} GtkAttachOptions;
-
-/* Button box styles */
-typedef enum 
-{
-  GTK_BUTTONBOX_DEFAULT_STYLE,
-  GTK_BUTTONBOX_SPREAD,
-  GTK_BUTTONBOX_EDGE,
-  GTK_BUTTONBOX_START,
-  GTK_BUTTONBOX_END,
-  GTK_BUTTONBOX_CENTER
-} GtkButtonBoxStyle;
-
-/* Curve types */
-typedef enum
-{
-  GTK_CURVE_TYPE_LINEAR,       /* linear interpolation */
-  GTK_CURVE_TYPE_SPLINE,       /* spline interpolation */
-  GTK_CURVE_TYPE_FREE          /* free form curve */
-} GtkCurveType;
- 
-typedef enum {
-  GTK_DELETE_CHARS,
-  GTK_DELETE_WORD_ENDS,           /* delete only the portion of the word to the
-                                   * left/right of cursor if we're in the middle
-                                   * of a word */
-  GTK_DELETE_WORDS,
-  GTK_DELETE_DISPLAY_LINES,
-  GTK_DELETE_DISPLAY_LINE_ENDS,
-  GTK_DELETE_PARAGRAPH_ENDS,      /* like C-k in Emacs (or its reverse) */
-  GTK_DELETE_PARAGRAPHS,          /* C-k in pico, kill whole line */
-  GTK_DELETE_WHITESPACE           /* M-\ in Emacs */
-} GtkDeleteType;
-
-/* Focus movement types */
-typedef enum
-{
-  GTK_DIR_TAB_FORWARD,
-  GTK_DIR_TAB_BACKWARD,
-  GTK_DIR_UP,
-  GTK_DIR_DOWN,
-  GTK_DIR_LEFT,
-  GTK_DIR_RIGHT
-} GtkDirectionType;
-
-/* Expander styles */
-typedef enum
-{
-  GTK_EXPANDER_COLLAPSED,
-  GTK_EXPANDER_SEMI_COLLAPSED,
-  GTK_EXPANDER_SEMI_EXPANDED,
-  GTK_EXPANDER_EXPANDED
-} GtkExpanderStyle;
-
-/* Built-in stock icon sizes */
-typedef enum
-{
-  GTK_ICON_SIZE_INVALID,
-  GTK_ICON_SIZE_MENU,
-  GTK_ICON_SIZE_SMALL_TOOLBAR,
-  GTK_ICON_SIZE_LARGE_TOOLBAR,
-  GTK_ICON_SIZE_BUTTON,
-  GTK_ICON_SIZE_DND,
-  GTK_ICON_SIZE_DIALOG
-} GtkIconSize;
-
-/* automatic sensitivity */
-typedef enum
-{
-  GTK_SENSITIVITY_AUTO,
-  GTK_SENSITIVITY_ON,
-  GTK_SENSITIVITY_OFF
-} GtkSensitivityType;
-
-#ifndef GTK_DISABLE_DEPRECATED
-/* side types */
-typedef enum
-{
-  GTK_SIDE_TOP,
-  GTK_SIDE_BOTTOM,
-  GTK_SIDE_LEFT,
-  GTK_SIDE_RIGHT
-} GtkSideType;
-#endif /* GTK_DISABLE_DEPRECATED */
-
-/* Reading directions for text */
-typedef enum
-{
-  GTK_TEXT_DIR_NONE,
-  GTK_TEXT_DIR_LTR,
-  GTK_TEXT_DIR_RTL
-} GtkTextDirection;
-
-/* justification for label and maybe other widgets (text?) */
-typedef enum
-{
-  GTK_JUSTIFY_LEFT,
-  GTK_JUSTIFY_RIGHT,
-  GTK_JUSTIFY_CENTER,
-  GTK_JUSTIFY_FILL
-} GtkJustification;
-
-#ifndef GTK_DISABLE_DEPRECATED
-/* GtkPatternSpec match types */
-typedef enum
-{
-  GTK_MATCH_ALL,       /* "*A?A*" */
-  GTK_MATCH_ALL_TAIL,  /* "*A?AA" */
-  GTK_MATCH_HEAD,      /* "AAAA*" */
-  GTK_MATCH_TAIL,      /* "*AAAA" */
-  GTK_MATCH_EXACT,     /* "AAAAA" */
-  GTK_MATCH_LAST
-} GtkMatchType;
-#endif /* GTK_DISABLE_DEPRECATED */
-
-/* Menu keyboard movement types */
-typedef enum
-{
-  GTK_MENU_DIR_PARENT,
-  GTK_MENU_DIR_CHILD,
-  GTK_MENU_DIR_NEXT,
-  GTK_MENU_DIR_PREV
-} GtkMenuDirectionType;
-
-typedef enum
-{
-  GTK_PIXELS,
-  GTK_INCHES,
-  GTK_CENTIMETERS
-} GtkMetricType;
-
-typedef enum 
-{
-  GTK_MOVEMENT_LOGICAL_POSITIONS, /* move by forw/back graphemes */
-  GTK_MOVEMENT_VISUAL_POSITIONS,  /* move by left/right graphemes */
-  GTK_MOVEMENT_WORDS,             /* move by forward/back words */
-  GTK_MOVEMENT_DISPLAY_LINES,     /* move up/down lines (wrapped lines) */
-  GTK_MOVEMENT_DISPLAY_LINE_ENDS, /* move up/down lines (wrapped lines) */
-  GTK_MOVEMENT_PARAGRAPHS,        /* move up/down paragraphs (newline-ended lines) */
-  GTK_MOVEMENT_PARAGRAPH_ENDS,    /* move to either end of a paragraph */
-  GTK_MOVEMENT_PAGES,	          /* move by pages */
-  GTK_MOVEMENT_BUFFER_ENDS,       /* move to ends of the buffer */
-  GTK_MOVEMENT_HORIZONTAL_PAGES   /* move horizontally by pages */
-} GtkMovementStep;
-
-typedef enum 
-{
-  GTK_SCROLL_STEPS,
-  GTK_SCROLL_PAGES,
-  GTK_SCROLL_ENDS,
-  GTK_SCROLL_HORIZONTAL_STEPS,
-  GTK_SCROLL_HORIZONTAL_PAGES,
-  GTK_SCROLL_HORIZONTAL_ENDS
-} GtkScrollStep;
-
-/* Orientation for toolbars, etc. */
-typedef enum
-{
-  GTK_ORIENTATION_HORIZONTAL,
-  GTK_ORIENTATION_VERTICAL
-} GtkOrientation;
-
-/* Placement type for scrolled window */
-typedef enum
-{
-  GTK_CORNER_TOP_LEFT,
-  GTK_CORNER_BOTTOM_LEFT,
-  GTK_CORNER_TOP_RIGHT,
-  GTK_CORNER_BOTTOM_RIGHT
-} GtkCornerType;
-
-/* Packing types (for boxes) */
-typedef enum
-{
-  GTK_PACK_START,
-  GTK_PACK_END
-} GtkPackType;
-
-/* priorities for path lookups */
-typedef enum
-{
-  GTK_PATH_PRIO_LOWEST      = 0,
-  GTK_PATH_PRIO_GTK	    = 4,
-  GTK_PATH_PRIO_APPLICATION = 8,
-  GTK_PATH_PRIO_THEME       = 10,
-  GTK_PATH_PRIO_RC          = 12,
-  GTK_PATH_PRIO_HIGHEST     = 15
-} GtkPathPriorityType;
-#define GTK_PATH_PRIO_MASK 0x0f
-
-/* widget path types */
-typedef enum
-{
-  GTK_PATH_WIDGET,
-  GTK_PATH_WIDGET_CLASS,
-  GTK_PATH_CLASS
-} GtkPathType;
-
-/* Scrollbar policy types (for scrolled windows) */
-typedef enum
-{
-  GTK_POLICY_ALWAYS,
-  GTK_POLICY_AUTOMATIC,
-  GTK_POLICY_NEVER
-} GtkPolicyType;
-
-typedef enum
-{
-  GTK_POS_LEFT,
-  GTK_POS_RIGHT,
-  GTK_POS_TOP,
-  GTK_POS_BOTTOM
-} GtkPositionType;
-
-#ifndef GTK_DISABLE_DEPRECATED
-typedef enum
-{
-  GTK_PREVIEW_COLOR,
-  GTK_PREVIEW_GRAYSCALE
-} GtkPreviewType;
-#endif /* GTK_DISABLE_DEPRECATED */
-
-/* Style for buttons */
-typedef enum
-{
-  GTK_RELIEF_NORMAL,
-  GTK_RELIEF_HALF,
-  GTK_RELIEF_NONE
-} GtkReliefStyle;
-
-/* Resize type */
-typedef enum
-{
-  GTK_RESIZE_PARENT,		/* Pass resize request to the parent */
-  GTK_RESIZE_QUEUE,		/* Queue resizes on this widget */
-  GTK_RESIZE_IMMEDIATE		/* Perform the resizes now */
-} GtkResizeMode;
-
-#ifndef GTK_DISABLE_DEPRECATED
-/* signal run types */
-typedef enum			/*< flags >*/
-{
-  GTK_RUN_FIRST      = G_SIGNAL_RUN_FIRST,
-  GTK_RUN_LAST       = G_SIGNAL_RUN_LAST,
-  GTK_RUN_BOTH       = (GTK_RUN_FIRST | GTK_RUN_LAST),
-  GTK_RUN_NO_RECURSE = G_SIGNAL_NO_RECURSE,
-  GTK_RUN_ACTION     = G_SIGNAL_ACTION,
-  GTK_RUN_NO_HOOKS   = G_SIGNAL_NO_HOOKS
-} GtkSignalRunType;
-#endif /* GTK_DISABLE_DEPRECATED */
-
-/* scrolling types */
-typedef enum
-{
-  GTK_SCROLL_NONE,
-  GTK_SCROLL_JUMP,
-  GTK_SCROLL_STEP_BACKWARD,
-  GTK_SCROLL_STEP_FORWARD,
-  GTK_SCROLL_PAGE_BACKWARD,
-  GTK_SCROLL_PAGE_FORWARD,
-  GTK_SCROLL_STEP_UP,
-  GTK_SCROLL_STEP_DOWN,
-  GTK_SCROLL_PAGE_UP,
-  GTK_SCROLL_PAGE_DOWN,
-  GTK_SCROLL_STEP_LEFT,
-  GTK_SCROLL_STEP_RIGHT,
-  GTK_SCROLL_PAGE_LEFT,
-  GTK_SCROLL_PAGE_RIGHT,
-  GTK_SCROLL_START,
-  GTK_SCROLL_END
-} GtkScrollType;
-
-/* list selection modes */
-typedef enum
-{
-  GTK_SELECTION_NONE,                             /* Nothing can be selected */
-  GTK_SELECTION_SINGLE,
-  GTK_SELECTION_BROWSE,
-  GTK_SELECTION_MULTIPLE,
-  GTK_SELECTION_EXTENDED = GTK_SELECTION_MULTIPLE /* Deprecated */
-} GtkSelectionMode;
-
-/* Shadow types */
-typedef enum
-{
-  GTK_SHADOW_NONE,
-  GTK_SHADOW_IN,
-  GTK_SHADOW_OUT,
-  GTK_SHADOW_ETCHED_IN,
-  GTK_SHADOW_ETCHED_OUT
-} GtkShadowType;
-
-/* Widget states */
-typedef enum
-{
-  GTK_STATE_NORMAL,
-  GTK_STATE_ACTIVE,
-  GTK_STATE_PRELIGHT,
-  GTK_STATE_SELECTED,
-  GTK_STATE_INSENSITIVE
-} GtkStateType;
-
-#if !defined(GTK_DISABLE_DEPRECATED) || defined (GTK_MENU_INTERNALS)
-/* Directions for submenus */
-typedef enum
-{
-  GTK_DIRECTION_LEFT,
-  GTK_DIRECTION_RIGHT
-} GtkSubmenuDirection;
-
-/* Placement of submenus */
-typedef enum
-{
-  GTK_TOP_BOTTOM,
-  GTK_LEFT_RIGHT
-} GtkSubmenuPlacement;
-#endif /* GTK_DISABLE_DEPRECATED */
-
-/* Style for toolbars */
-typedef enum
-{
-  GTK_TOOLBAR_ICONS,
-  GTK_TOOLBAR_TEXT,
-  GTK_TOOLBAR_BOTH,
-  GTK_TOOLBAR_BOTH_HORIZ
-} GtkToolbarStyle;
-
-/* Data update types (for ranges) */
-typedef enum
-{
-  GTK_UPDATE_CONTINUOUS,
-  GTK_UPDATE_DISCONTINUOUS,
-  GTK_UPDATE_DELAYED
-} GtkUpdateType;
-
-/* Generic visibility flags */
-typedef enum
-{
-  GTK_VISIBILITY_NONE,
-  GTK_VISIBILITY_PARTIAL,
-  GTK_VISIBILITY_FULL
-} GtkVisibility;
-
-/* Window position types */
-typedef enum
-{
-  GTK_WIN_POS_NONE,
-  GTK_WIN_POS_CENTER,
-  GTK_WIN_POS_MOUSE,
-  GTK_WIN_POS_CENTER_ALWAYS,
-  GTK_WIN_POS_CENTER_ON_PARENT
-} GtkWindowPosition;
-
-/* Window types */
-typedef enum
-{
-  GTK_WINDOW_TOPLEVEL,
-  GTK_WINDOW_POPUP
-} GtkWindowType;
-
-/* Text wrap */
-typedef enum
-{
-  GTK_WRAP_NONE,
-  GTK_WRAP_CHAR,
-  GTK_WRAP_WORD,
-  GTK_WRAP_WORD_CHAR
-} GtkWrapMode;
-
-/* How to sort */
-typedef enum
-{
-  GTK_SORT_ASCENDING,
-  GTK_SORT_DESCENDING
-} GtkSortType;
-
-/* Style for gtk input method preedit/status */
-typedef enum
-{
-  GTK_IM_PREEDIT_NOTHING,
-  GTK_IM_PREEDIT_CALLBACK,
-  GTK_IM_PREEDIT_NONE
-} GtkIMPreeditStyle;
-
-typedef enum
-{
-  GTK_IM_STATUS_NOTHING,
-  GTK_IM_STATUS_CALLBACK,
-  GTK_IM_STATUS_NONE
-} GtkIMStatusStyle;
-
-typedef enum
-{
-  GTK_PACK_DIRECTION_LTR,
-  GTK_PACK_DIRECTION_RTL,
-  GTK_PACK_DIRECTION_TTB,
-  GTK_PACK_DIRECTION_BTT
-} GtkPackDirection;
-
-typedef enum {
-  GTK_PRINT_PAGES_ALL,
-  GTK_PRINT_PAGES_CURRENT,
-  GTK_PRINT_PAGES_RANGES
-} GtkPrintPages;
-
-typedef enum {
-  GTK_PAGE_SET_ALL,
-  GTK_PAGE_SET_EVEN,
-  GTK_PAGE_SET_ODD
-} GtkPageSet;
-
-typedef enum {
-  GTK_PAGE_ORIENTATION_PORTRAIT,
-  GTK_PAGE_ORIENTATION_LANDSCAPE,
-  GTK_PAGE_ORIENTATION_REVERSE_PORTRAIT,
-  GTK_PAGE_ORIENTATION_REVERSE_LANDSCAPE
-} GtkPageOrientation;
-
-typedef enum {
-  GTK_PRINT_QUALITY_LOW,
-  GTK_PRINT_QUALITY_NORMAL,
-  GTK_PRINT_QUALITY_HIGH,
-  GTK_PRINT_QUALITY_DRAFT
-} GtkPrintQuality;
-
-typedef enum {
-  GTK_PRINT_DUPLEX_SIMPLEX,
-  GTK_PRINT_DUPLEX_HORIZONTAL,
-  GTK_PRINT_DUPLEX_VERTICAL
-} GtkPrintDuplex;
-
-
-typedef enum {
-  GTK_UNIT_PIXEL,
-  GTK_UNIT_POINTS,
-  GTK_UNIT_INCH,
-  GTK_UNIT_MM
-} GtkUnit;
-
-typedef enum {
-  GTK_TREE_VIEW_GRID_LINES_NONE,
-  GTK_TREE_VIEW_GRID_LINES_HORIZONTAL,
-  GTK_TREE_VIEW_GRID_LINES_VERTICAL,
-  GTK_TREE_VIEW_GRID_LINES_BOTH
-} GtkTreeViewGridLines;
-
-typedef enum {
-  GTK_DRAG_RESULT_SUCCESS,
-  GTK_DRAG_RESULT_NO_TARGET,
-  GTK_DRAG_RESULT_USER_CANCELLED,
-  GTK_DRAG_RESULT_TIMEOUT_EXPIRED,
-  GTK_DRAG_RESULT_GRAB_BROKEN,
-  GTK_DRAG_RESULT_ERROR
-} GtkDragResult;
-
-G_END_DECLS
-
-#endif /* __GTK_ENUMS_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkeventbox.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkeventbox.h
deleted file mode 100644
index 3fba8b4b..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkeventbox.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_EVENT_BOX_H__
-#define __GTK_EVENT_BOX_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkbin.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_EVENT_BOX              (gtk_event_box_get_type ())
-#define GTK_EVENT_BOX(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_EVENT_BOX, GtkEventBox))
-#define GTK_EVENT_BOX_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_EVENT_BOX, GtkEventBoxClass))
-#define GTK_IS_EVENT_BOX(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_EVENT_BOX))
-#define GTK_IS_EVENT_BOX_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_EVENT_BOX))
-#define GTK_EVENT_BOX_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_EVENT_BOX, GtkEventBoxClass))
-
-typedef struct _GtkEventBox	  GtkEventBox;
-typedef struct _GtkEventBoxClass  GtkEventBoxClass;
-
-struct _GtkEventBox
-{
-  GtkBin bin;
-};
-
-struct _GtkEventBoxClass
-{
-  GtkBinClass parent_class;
-};
-
-GType	   gtk_event_box_get_type           (void) G_GNUC_CONST;
-GtkWidget* gtk_event_box_new                (void);
-gboolean   gtk_event_box_get_visible_window (GtkEventBox *event_box);
-void       gtk_event_box_set_visible_window (GtkEventBox *event_box,
-					     gboolean     visible_window);
-gboolean   gtk_event_box_get_above_child    (GtkEventBox *event_box);
-void       gtk_event_box_set_above_child    (GtkEventBox *event_box,
-					     gboolean     above_child);
-
-G_END_DECLS
-
-#endif /* __GTK_EVENT_BOX_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkexpander.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkexpander.h
deleted file mode 100644
index e5bfa454..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkexpander.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* GTK - The GIMP Toolkit
- *
- * Copyright (C) 2003 Sun Microsystems, 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.
- *
- * Authors:
- *	Mark McLoughlin <mark@skynet.ie>
- */
-
-#ifndef __GTK_EXPANDER_H__
-#define __GTK_EXPANDER_H__
-
-#include <gtk/gtkbin.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_EXPANDER            (gtk_expander_get_type ())
-#define GTK_EXPANDER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_EXPANDER, GtkExpander))
-#define GTK_EXPANDER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_EXPANDER, GtkExpanderClass))
-#define GTK_IS_EXPANDER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_EXPANDER))
-#define GTK_IS_EXPANDER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_EXPANDER))
-#define GTK_EXPANDER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_EXPANDER, GtkExpanderClass))
-
-typedef struct _GtkExpander        GtkExpander;
-typedef struct _GtkExpanderClass   GtkExpanderClass;
-typedef struct _GtkExpanderPrivate GtkExpanderPrivate;
-
-struct _GtkExpander
-{
-  GtkBin              bin;
-
-  GtkExpanderPrivate *priv;
-};
-
-struct _GtkExpanderClass
-{
-  GtkBinClass    parent_class;
-
-  /* Key binding signal; to get notification on the expansion
-   * state connect to notify:expanded.
-   */
-  void        (* activate) (GtkExpander *expander);
-};
-
-GType                 gtk_expander_get_type          (void) G_GNUC_CONST;
-
-GtkWidget            *gtk_expander_new               (const gchar *label);
-GtkWidget            *gtk_expander_new_with_mnemonic (const gchar *label);
-
-void                  gtk_expander_set_expanded      (GtkExpander *expander,
-						      gboolean     expanded);
-gboolean              gtk_expander_get_expanded      (GtkExpander *expander);
-
-/* Spacing between the expander/label and the child */
-void                  gtk_expander_set_spacing       (GtkExpander *expander,
-						      gint         spacing);
-gint                  gtk_expander_get_spacing       (GtkExpander *expander);
-
-void                  gtk_expander_set_label         (GtkExpander *expander,
-						      const gchar *label);
-G_CONST_RETURN gchar *gtk_expander_get_label         (GtkExpander *expander);
-
-void                  gtk_expander_set_use_underline (GtkExpander *expander,
-						      gboolean     use_underline);
-gboolean              gtk_expander_get_use_underline (GtkExpander *expander);
-
-void                  gtk_expander_set_use_markup    (GtkExpander *expander,
-						      gboolean    use_markup);
-gboolean              gtk_expander_get_use_markup    (GtkExpander *expander);
-
-void                  gtk_expander_set_label_widget  (GtkExpander *expander,
-						      GtkWidget   *label_widget);
-GtkWidget            *gtk_expander_get_label_widget  (GtkExpander *expander);
-
-G_END_DECLS
-
-#endif /* __GTK_EXPANDER_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilechooser.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilechooser.h
deleted file mode 100644
index 5b233878..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilechooser.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkfilechooser.h: Abstract interface for file selector GUIs
- * Copyright (C) 2003, 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 __GTK_FILE_CHOOSER_H__
-#define __GTK_FILE_CHOOSER_H__
-
-#include "gtkfilefilter.h"
-#include <gtk/gtkwidget.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_FILE_CHOOSER             (gtk_file_chooser_get_type ())
-#define GTK_FILE_CHOOSER(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FILE_CHOOSER, GtkFileChooser))
-#define GTK_IS_FILE_CHOOSER(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FILE_CHOOSER))
-
-typedef struct _GtkFileChooser      GtkFileChooser;
-
-typedef enum
-{
-  GTK_FILE_CHOOSER_ACTION_OPEN,
-  GTK_FILE_CHOOSER_ACTION_SAVE,
-  GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-  GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER
-} GtkFileChooserAction;
-
-typedef enum
-{
-  GTK_FILE_CHOOSER_CONFIRMATION_CONFIRM,
-  GTK_FILE_CHOOSER_CONFIRMATION_ACCEPT_FILENAME,
-  GTK_FILE_CHOOSER_CONFIRMATION_SELECT_AGAIN
-} GtkFileChooserConfirmation;
-
-GType gtk_file_chooser_get_type (void) G_GNUC_CONST;
-
-/* GError enumeration for GtkFileChooser */
-
-#define GTK_FILE_CHOOSER_ERROR (gtk_file_chooser_error_quark ())
-
-typedef enum {
-  GTK_FILE_CHOOSER_ERROR_NONEXISTENT,
-  GTK_FILE_CHOOSER_ERROR_BAD_FILENAME,
-  GTK_FILE_CHOOSER_ERROR_ALREADY_EXISTS
-} GtkFileChooserError;
-
-GQuark gtk_file_chooser_error_quark (void);
-
-/* Configuration
- */
-void                 gtk_file_chooser_set_action          (GtkFileChooser       *chooser,
-							   GtkFileChooserAction  action);
-GtkFileChooserAction gtk_file_chooser_get_action          (GtkFileChooser       *chooser);
-void                 gtk_file_chooser_set_local_only      (GtkFileChooser       *chooser,
-							   gboolean              local_only);
-gboolean             gtk_file_chooser_get_local_only      (GtkFileChooser       *chooser);
-void                 gtk_file_chooser_set_select_multiple (GtkFileChooser       *chooser,
-							   gboolean              select_multiple);
-gboolean             gtk_file_chooser_get_select_multiple (GtkFileChooser       *chooser);
-void                 gtk_file_chooser_set_show_hidden     (GtkFileChooser       *chooser,
-							   gboolean              show_hidden);
-gboolean             gtk_file_chooser_get_show_hidden     (GtkFileChooser       *chooser);
-
-void                 gtk_file_chooser_set_do_overwrite_confirmation (GtkFileChooser *chooser,
-								     gboolean        do_overwrite_confirmation);
-gboolean             gtk_file_chooser_get_do_overwrite_confirmation (GtkFileChooser *chooser);
-
-/* Suggested name for the Save-type actions
- */
-void     gtk_file_chooser_set_current_name   (GtkFileChooser *chooser,
-					      const gchar    *name);
-
-/* Filename manipulation
- */
-#ifdef G_OS_WIN32
-/* Reserve old names for DLL ABI backward compatibility */
-#define gtk_file_chooser_get_filename gtk_file_chooser_get_filename_utf8
-#define gtk_file_chooser_set_filename gtk_file_chooser_set_filename_utf8
-#define gtk_file_chooser_select_filename gtk_file_chooser_select_filename_utf8
-#define gtk_file_chooser_unselect_filename gtk_file_chooser_unselect_filename_utf8
-#define gtk_file_chooser_get_filenames gtk_file_chooser_get_filenames_utf8
-#define gtk_file_chooser_set_current_folder gtk_file_chooser_set_current_folder_utf8
-#define gtk_file_chooser_get_current_folder gtk_file_chooser_get_current_folder_utf8
-#define gtk_file_chooser_get_preview_filename gtk_file_chooser_get_preview_filename_utf8
-#define gtk_file_chooser_add_shortcut_folder gtk_file_chooser_add_shortcut_folder_utf8
-#define gtk_file_chooser_remove_shortcut_folder gtk_file_chooser_remove_shortcut_folder_utf8
-#define gtk_file_chooser_list_shortcut_folders gtk_file_chooser_list_shortcut_folders_utf8
-#endif
-
-gchar *  gtk_file_chooser_get_filename       (GtkFileChooser *chooser);
-gboolean gtk_file_chooser_set_filename       (GtkFileChooser *chooser,
-					      const char     *filename);
-gboolean gtk_file_chooser_select_filename    (GtkFileChooser *chooser,
-					      const char     *filename);
-void     gtk_file_chooser_unselect_filename  (GtkFileChooser *chooser,
-					      const char     *filename);
-void     gtk_file_chooser_select_all         (GtkFileChooser *chooser);
-void     gtk_file_chooser_unselect_all       (GtkFileChooser *chooser);
-GSList * gtk_file_chooser_get_filenames      (GtkFileChooser *chooser);
-gboolean gtk_file_chooser_set_current_folder (GtkFileChooser *chooser,
-					      const gchar    *filename);
-gchar *  gtk_file_chooser_get_current_folder (GtkFileChooser *chooser);
-
-
-/* URI manipulation
- */
-gchar *  gtk_file_chooser_get_uri                (GtkFileChooser *chooser);
-gboolean gtk_file_chooser_set_uri                (GtkFileChooser *chooser,
-						  const char     *uri);
-gboolean gtk_file_chooser_select_uri             (GtkFileChooser *chooser,
-						  const char     *uri);
-void     gtk_file_chooser_unselect_uri           (GtkFileChooser *chooser,
-						  const char     *uri);
-GSList * gtk_file_chooser_get_uris               (GtkFileChooser *chooser);
-gboolean gtk_file_chooser_set_current_folder_uri (GtkFileChooser *chooser,
-						  const gchar    *uri);
-gchar *  gtk_file_chooser_get_current_folder_uri (GtkFileChooser *chooser);
-
-/* Preview widget
- */
-void       gtk_file_chooser_set_preview_widget        (GtkFileChooser *chooser,
-						       GtkWidget      *preview_widget);
-GtkWidget *gtk_file_chooser_get_preview_widget        (GtkFileChooser *chooser);
-void       gtk_file_chooser_set_preview_widget_active (GtkFileChooser *chooser,
-						       gboolean        active);
-gboolean   gtk_file_chooser_get_preview_widget_active (GtkFileChooser *chooser);
-void       gtk_file_chooser_set_use_preview_label     (GtkFileChooser *chooser,
-						       gboolean        use_label);
-gboolean   gtk_file_chooser_get_use_preview_label     (GtkFileChooser *chooser);
-
-char *gtk_file_chooser_get_preview_filename (GtkFileChooser *chooser);
-char *gtk_file_chooser_get_preview_uri      (GtkFileChooser *chooser);
-
-/* Extra widget
- */
-void       gtk_file_chooser_set_extra_widget (GtkFileChooser *chooser,
-					      GtkWidget      *extra_widget);
-GtkWidget *gtk_file_chooser_get_extra_widget (GtkFileChooser *chooser);
-
-/* List of user selectable filters
- */
-void    gtk_file_chooser_add_filter    (GtkFileChooser *chooser,
-					GtkFileFilter  *filter);
-void    gtk_file_chooser_remove_filter (GtkFileChooser *chooser,
-					GtkFileFilter  *filter);
-GSList *gtk_file_chooser_list_filters  (GtkFileChooser *chooser);
-
-/* Current filter
- */
-void           gtk_file_chooser_set_filter (GtkFileChooser *chooser,
-					   GtkFileFilter  *filter);
-GtkFileFilter *gtk_file_chooser_get_filter (GtkFileChooser *chooser);
-
-/* Per-application shortcut folders */
-
-gboolean gtk_file_chooser_add_shortcut_folder    (GtkFileChooser *chooser,
-						  const char     *folder,
-						  GError        **error);
-gboolean gtk_file_chooser_remove_shortcut_folder (GtkFileChooser *chooser,
-						  const char     *folder,
-						  GError        **error);
-GSList *gtk_file_chooser_list_shortcut_folders   (GtkFileChooser *chooser);
-
-gboolean gtk_file_chooser_add_shortcut_folder_uri    (GtkFileChooser *chooser,
-						      const char     *uri,
-						      GError        **error);
-gboolean gtk_file_chooser_remove_shortcut_folder_uri (GtkFileChooser *chooser,
-						      const char     *uri,
-						      GError        **error);
-GSList *gtk_file_chooser_list_shortcut_folder_uris   (GtkFileChooser *chooser);
-
-G_END_DECLS
-
-#endif /* __GTK_FILE_CHOOSER_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilechooserbutton.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilechooserbutton.h
deleted file mode 100644
index 979c4b57..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilechooserbutton.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* GTK+: gtkfilechooserbutton.h
- * 
- * Copyright (c) 2004 James M. Cape <jcape@ignore-your.tv>
- *
- * 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 __GTK_FILE_CHOOSER_BUTTON_H__
-#define __GTK_FILE_CHOOSER_BUTTON_H__
-
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkfilechooser.h>
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_FILE_CHOOSER_BUTTON \
-  (gtk_file_chooser_button_get_type ())
-#define GTK_FILE_CHOOSER_BUTTON(object) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((object), GTK_TYPE_FILE_CHOOSER_BUTTON, GtkFileChooserButton))
-#define GTK_FILE_CHOOSER_BUTTON_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FILE_CHOOSER_BUTTON, GtkFileChooserButtonClass))
-#define GTK_IS_FILE_CHOOSER_BUTTON(object) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((object), GTK_TYPE_FILE_CHOOSER_BUTTON))
-#define GTK_IS_FILE_CHOOSER_BUTTON_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FILE_CHOOSER_BUTTON))
-#define GTK_FILE_CHOOSER_BUTTON_GET_CLASS(object) \
-  (G_TYPE_INSTANCE_GET_CLASS ((object), GTK_TYPE_FILE_CHOOSER_BUTTON, GtkFileChooserButtonClass))
-
-
-typedef struct _GtkFileChooserButton GtkFileChooserButton;
-typedef struct _GtkFileChooserButtonPrivate GtkFileChooserButtonPrivate;
-typedef struct _GtkFileChooserButtonClass GtkFileChooserButtonClass;
-
-struct _GtkFileChooserButton
-{
-  /*< private >*/
-  GtkHBox parent;
-
-  GtkFileChooserButtonPrivate *priv;
-};
-
-struct _GtkFileChooserButtonClass
-{
-  /*< private >*/
-  GtkHBoxClass parent_class;
-
-  void (* file_set) (GtkFileChooserButton *fc);
-
-  void (*__gtk_reserved1);
-  void (*__gtk_reserved2);
-  void (*__gtk_reserved3);
-  void (*__gtk_reserved4);
-  void (*__gtk_reserved5);
-  void (*__gtk_reserved6);
-  void (*__gtk_reserved7);
-};
-
-
-GType                 gtk_file_chooser_button_get_type         (void) G_GNUC_CONST;
-GtkWidget *           gtk_file_chooser_button_new              (const gchar          *title,
-								GtkFileChooserAction  action);
-GtkWidget *           gtk_file_chooser_button_new_with_backend (const gchar          *title,
-								GtkFileChooserAction  action,
-								const gchar          *backend);
-GtkWidget *           gtk_file_chooser_button_new_with_dialog  (GtkWidget            *dialog);
-G_CONST_RETURN gchar *gtk_file_chooser_button_get_title        (GtkFileChooserButton *button);
-void                  gtk_file_chooser_button_set_title        (GtkFileChooserButton *button,
-								const gchar          *title);
-gint                  gtk_file_chooser_button_get_width_chars  (GtkFileChooserButton *button);
-void                  gtk_file_chooser_button_set_width_chars  (GtkFileChooserButton *button,
-								gint                  n_chars);
-gboolean              gtk_file_chooser_button_get_focus_on_click (GtkFileChooserButton *button);
-void                  gtk_file_chooser_button_set_focus_on_click (GtkFileChooserButton *button,
-                                                                  gboolean              focus_on_click);
-
-G_END_DECLS
-
-#endif /* !__GTK_FILE_CHOOSER_BUTTON_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilechooserdialog.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilechooserdialog.h
deleted file mode 100644
index 44cf39c0..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilechooserdialog.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkfilechooserdialog.h: File selector dialog
- * Copyright (C) 2003, 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 __GTK_FILE_CHOOSER_DIALOG_H__
-#define __GTK_FILE_CHOOSER_DIALOG_H__
-
-#include <gtk/gtkdialog.h>
-#include "gtkfilechooser.h"
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_FILE_CHOOSER_DIALOG             (gtk_file_chooser_dialog_get_type ())
-#define GTK_FILE_CHOOSER_DIALOG(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FILE_CHOOSER_DIALOG, GtkFileChooserDialog))
-#define GTK_FILE_CHOOSER_DIALOG_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FILE_CHOOSER_DIALOG, GtkFileChooserDialogClass))
-#define GTK_IS_FILE_CHOOSER_DIALOG(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FILE_CHOOSER_DIALOG))
-#define GTK_IS_FILE_CHOOSER_DIALOG_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FILE_CHOOSER_DIALOG))
-#define GTK_FILE_CHOOSER_DIALOG_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FILE_CHOOSER_DIALOG, GtkFileChooserDialogClass))
-
-typedef struct _GtkFileChooserDialog      GtkFileChooserDialog;
-typedef struct _GtkFileChooserDialogClass GtkFileChooserDialogClass;
-
-typedef struct _GtkFileChooserDialogPrivate GtkFileChooserDialogPrivate;
-
-struct _GtkFileChooserDialogClass
-{
-  GtkDialogClass parent_class;
-};
-
-struct _GtkFileChooserDialog
-{
-  GtkDialog parent_instance;
-
-  GtkFileChooserDialogPrivate *priv;
-};
-
-GType      gtk_file_chooser_dialog_get_type         (void) G_GNUC_CONST;
-GtkWidget *gtk_file_chooser_dialog_new              (const gchar          *title,
-						     GtkWindow            *parent,
-						     GtkFileChooserAction  action,
-						     const gchar          *first_button_text,
-						     ...) G_GNUC_NULL_TERMINATED;
-GtkWidget *gtk_file_chooser_dialog_new_with_backend (const gchar          *title,
-						     GtkWindow            *parent,
-						     GtkFileChooserAction  action,
-						     const gchar          *backend,
-						     const gchar          *first_button_text,
-						     ...) G_GNUC_NULL_TERMINATED;
-
-G_END_DECLS
-
-#endif /* __GTK_FILE_CHOOSER_DIALOG_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilechooserprivate.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilechooserprivate.h
deleted file mode 100644
index 8b2d8534..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilechooserprivate.h
+++ /dev/null
@@ -1,381 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkfilechooserprivate.h: Interface definition for file selector GUIs
- * Copyright (C) 2003, 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 __GTK_FILE_CHOOSER_PRIVATE_H__
-#define __GTK_FILE_CHOOSER_PRIVATE_H__
-
-/* This is a "semi-private" header; it is meant only for
- * alternate GtkFileChooser implementations; no stability guarantees 
- * are made at this point
- */
-#ifndef GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
-#error "gtkfilechooserprivate.h is not supported API for general use"
-#endif
-
-#include "gtkfilechooser.h"
-#include "gtkfilesystem.h"
-#include "gtkfilesystemmodel.h"
-#include "gtkliststore.h"
-#include "gtkrecentmanager.h"
-#include "gtksearchengine.h"
-#include "gtkquery.h"
-#include "gtktooltips.h"
-#include "gtktreemodelsort.h"
-#include "gtktreestore.h"
-#include "gtktreeview.h"
-#include "gtkvbox.h"
-
-G_BEGIN_DECLS
-
-#define GTK_FILE_CHOOSER_GET_IFACE(inst)  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GTK_TYPE_FILE_CHOOSER, GtkFileChooserIface))
-
-typedef struct _GtkFileChooserIface GtkFileChooserIface;
-
-struct _GtkFileChooserIface
-{
-  GTypeInterface base_iface;
-
-  /* Methods
-   */
-  gboolean       (*set_current_folder) 	   (GtkFileChooser    *chooser,
-		 		       	    const GtkFilePath *path,
-					    GError           **error);
-  GtkFilePath *  (*get_current_folder) 	   (GtkFileChooser    *chooser);
-  void           (*set_current_name)   	   (GtkFileChooser    *chooser,
-					    const gchar       *name);
-  gboolean       (*select_path)        	   (GtkFileChooser    *chooser,
-		 		       	    const GtkFilePath *path,
-					    GError           **error);
-  void           (*unselect_path)      	   (GtkFileChooser    *chooser,
-		 		       	    const GtkFilePath *path);
-  void           (*select_all)         	   (GtkFileChooser    *chooser);
-  void           (*unselect_all)       	   (GtkFileChooser    *chooser);
-  GSList *       (*get_paths)          	   (GtkFileChooser    *chooser);
-  GtkFilePath *  (*get_preview_path)   	   (GtkFileChooser    *chooser);
-  GtkFileSystem *(*get_file_system)    	   (GtkFileChooser    *chooser);
-  void           (*add_filter)         	   (GtkFileChooser    *chooser,
-					    GtkFileFilter     *filter);
-  void           (*remove_filter)      	   (GtkFileChooser    *chooser,
-					    GtkFileFilter     *filter);
-  GSList *       (*list_filters)       	   (GtkFileChooser    *chooser);
-  gboolean       (*add_shortcut_folder)    (GtkFileChooser    *chooser,
-					    const GtkFilePath *path,
-					    GError           **error);
-  gboolean       (*remove_shortcut_folder) (GtkFileChooser    *chooser,
-					    const GtkFilePath *path,
-					    GError           **error);
-  GSList *       (*list_shortcut_folders)  (GtkFileChooser    *chooser);
-  
-  /* Signals
-   */
-  void (*current_folder_changed) (GtkFileChooser *chooser);
-  void (*selection_changed)      (GtkFileChooser *chooser);
-  void (*update_preview)         (GtkFileChooser *chooser);
-  void (*file_activated)         (GtkFileChooser *chooser);
-  GtkFileChooserConfirmation (*confirm_overwrite) (GtkFileChooser *chooser);
-};
-
-GtkFileSystem *_gtk_file_chooser_get_file_system         (GtkFileChooser    *chooser);
-gboolean       _gtk_file_chooser_set_current_folder_path (GtkFileChooser    *chooser,
-							  const GtkFilePath *path,
-							  GError           **error);
-GtkFilePath *  _gtk_file_chooser_get_current_folder_path (GtkFileChooser    *chooser);
-gboolean       _gtk_file_chooser_select_path             (GtkFileChooser    *chooser,
-							  const GtkFilePath *path,
-							  GError           **error);
-void           _gtk_file_chooser_unselect_path           (GtkFileChooser    *chooser,
-							  const GtkFilePath *path);
-GSList *       _gtk_file_chooser_get_paths               (GtkFileChooser    *chooser);
-GtkFilePath *  _gtk_file_chooser_get_preview_path        (GtkFileChooser    *chooser);
-gboolean       _gtk_file_chooser_add_shortcut_folder     (GtkFileChooser    *chooser,
-							  const GtkFilePath *path,
-							  GError           **error);
-gboolean       _gtk_file_chooser_remove_shortcut_folder  (GtkFileChooser    *chooser,
-							  const GtkFilePath *path,
-							  GError           **error);
-
-/* GtkFileChooserDialog private */
-
-struct _GtkFileChooserDialogPrivate
-{
-  GtkWidget *widget;
-  
-  char *file_system;
-
-  /* for use with GtkFileChooserEmbed */
-  gboolean response_requested;
-};
-
-
-/* GtkFileChooserWidget private */
-
-struct _GtkFileChooserWidgetPrivate
-{
-  GtkWidget *impl;
-
-  char *file_system;
-};
-
-
-/* GtkFileChooserDefault private */
-
-typedef enum {
-  LOAD_EMPTY,			/* There is no model */
-  LOAD_PRELOAD,			/* Model is loading and a timer is running; model isn't inserted into the tree yet */
-  LOAD_LOADING,			/* Timeout expired, model is inserted into the tree, but not fully loaded yet */
-  LOAD_FINISHED			/* Model is fully loaded and inserted into the tree */
-} LoadState;
-
-typedef enum {
-  RELOAD_EMPTY,			/* No folder has been set */
-  RELOAD_HAS_FOLDER,		/* We have a folder, although it may not be completely loaded yet; no need to reload */
-  RELOAD_WAS_UNMAPPED		/* We had a folder but got unmapped; reload is needed */
-} ReloadState;
-
-typedef enum {
-  LOCATION_MODE_PATH_BAR,
-  LOCATION_MODE_FILENAME_ENTRY
-} LocationMode;
-
-typedef enum {
-  OPERATION_MODE_BROWSE,
-  OPERATION_MODE_SEARCH,
-  OPERATION_MODE_RECENT
-} OperationMode;
-
-struct _GtkFileChooserDefault
-{
-  GtkVBox parent_instance;
-
-  GtkFileChooserAction action;
-
-  GtkFileSystem *file_system;
-
-  /* Save mode widgets */
-  GtkWidget *save_widgets;
-
-  GtkWidget *save_folder_label;
-  GtkWidget *save_folder_combo;
-  GtkWidget *save_expander;
-
-  /* The file browsing widgets */
-  GtkWidget *browse_widgets;
-  GtkWidget *browse_shortcuts_tree_view;
-  GtkWidget *browse_shortcuts_add_button;
-  GtkWidget *browse_shortcuts_remove_button;
-  GtkWidget *browse_shortcuts_popup_menu;
-  GtkWidget *browse_shortcuts_popup_menu_remove_item;
-  GtkWidget *browse_shortcuts_popup_menu_rename_item;
-  GtkWidget *browse_files_tree_view;
-  GtkWidget *browse_files_popup_menu;
-  GtkWidget *browse_files_popup_menu_add_shortcut_item;
-  GtkWidget *browse_files_popup_menu_hidden_files_item;
-  GtkWidget *browse_new_folder_button;
-  GtkWidget *browse_path_bar_hbox;
-  GtkWidget *browse_path_bar;
-
-  GtkFileSystemModel *browse_files_model;
-  char *browse_files_last_selected_name;
-
-  /* OPERATION_MODE_SEARCH */
-  GtkWidget *search_hbox;
-  GtkWidget *search_entry;
-  GtkSearchEngine *search_engine;
-  GtkQuery *search_query;
-  GtkListStore *search_model;
-  GtkTreeModelFilter *search_model_filter;
-  GtkTreeModelSort *search_model_sort;
-
-  /* OPERATION_MODE_RECENT */
-  GtkRecentManager *recent_manager;
-  GtkListStore *recent_model;
-  guint load_recent_id;
-  GtkTreeModelFilter *recent_model_filter;
-  GtkTreeModelSort *recent_model_sort;
-
-  GtkWidget *filter_combo_hbox;
-  GtkWidget *filter_combo;
-  GtkWidget *preview_box;
-  GtkWidget *preview_label;
-  GtkWidget *preview_widget;
-  GtkWidget *extra_align;
-  GtkWidget *extra_widget;
-
-  GtkWidget *location_button;
-  GtkWidget *location_entry_box;
-  GtkWidget *location_label;
-  GtkWidget *location_entry;
-  LocationMode location_mode;
-
-  GtkListStore *shortcuts_model;
-
-  /* Filter for the shortcuts pane.  We filter out the "current folder" row and
-   * the separator that we use for the "Save in folder" combo.
-   */
-  GtkTreeModel *shortcuts_pane_filter_model;
-  
-  /* Filter for the "Save in folder" combo.  We filter out the Search row and
-   * its separator.
-   */
-  GtkTreeModel *shortcuts_combo_filter_model;
-
-  GtkTreeModelSort *sort_model;
-
-  /* Handles */
-  GSList *loading_shortcuts;
-  GSList *reload_icon_handles;
-  GtkFileSystemHandle *file_list_drag_data_received_handle;
-  GtkFileSystemHandle *update_current_folder_handle;
-  GtkFileSystemHandle *show_and_select_paths_handle;
-  GtkFileSystemHandle *should_respond_get_info_handle;
-  GtkFileSystemHandle *file_exists_get_info_handle;
-  GtkFileSystemHandle *update_from_entry_handle;
-  GtkFileSystemHandle *shortcuts_activate_iter_handle;
-  GSList *pending_handles;
-
-  LoadState load_state;
-  ReloadState reload_state;
-  guint load_timeout_id;
-
-  OperationMode operation_mode;
-
-  GSList *pending_select_paths;
-
-  GtkFileFilter *current_filter;
-  GSList *filters;
-
-  GtkTooltips *tooltips;
-
-  int num_volumes;
-  int num_shortcuts;
-  int num_bookmarks;
-
-  gulong volumes_changed_id;
-  gulong bookmarks_changed_id;
-
-  GtkFilePath *current_volume_path;
-  GtkFilePath *current_folder;
-  GtkFilePath *preview_path;
-  char *preview_display_name;
-
-  GtkTreeViewColumn *list_name_column;
-  GtkCellRenderer *list_name_renderer;
-  GtkTreeViewColumn *list_mtime_column;
-
-  GSource *edited_idle;
-  char *edited_new_text;
-
-  gulong settings_signal_id;
-  int icon_size;
-
-  gulong toplevel_set_focus_id;
-  GtkWidget *toplevel_last_focus_widget;
-
-#if 0
-  GdkDragContext *shortcuts_drag_context;
-  GSource *shortcuts_drag_outside_idle;
-#endif
-
-  gint default_width;
-  gint default_height;
-
-  /* Flags */
-
-  guint local_only : 1;
-  guint preview_widget_active : 1;
-  guint use_preview_label : 1;
-  guint select_multiple : 1;
-  guint show_hidden : 1;
-  guint do_overwrite_confirmation : 1;
-  guint list_sort_ascending : 1;
-  guint changing_folder : 1;
-  guint shortcuts_current_folder_active : 1;
-  guint expand_folders : 1;
-  guint has_home : 1;
-  guint has_desktop : 1;
-  guint has_search : 1;
-  guint has_recent : 1;
-
-#if 0
-  guint shortcuts_drag_outside : 1;
-#endif
-};
-
-
-/* GtkFileSystemModel private */
-
-typedef struct _FileModelNode           FileModelNode;
-
-struct _GtkFileSystemModel
-{
-  GObject parent_instance;
-
-  GtkFileSystem  *file_system;
-  GtkFileInfoType types;
-  FileModelNode  *roots;
-  GtkFileFolder  *root_folder;
-  GtkFilePath    *root_path;
-
-  GtkFileSystemModelFilter filter_func;
-  gpointer filter_data;
-
-  GSList *idle_clears;
-  GSource *idle_clear_source;
-
-  gushort max_depth;
-
-  GSList *pending_handles;
-  
-  guint show_hidden : 1;
-  guint show_folders : 1;
-  guint show_files : 1;
-  guint folders_only : 1;
-  guint has_editable : 1;
-};
-
-struct _FileModelNode
-{
-  GtkFilePath *path;
-  FileModelNode *next;
-
-  GtkFileInfo *info;
-  GtkFileFolder *folder;
-  
-  FileModelNode *children;
-  FileModelNode *parent;
-  GtkFileSystemModel *model;
-
-  guint ref_count;
-  guint n_referenced_children;
-
-  gushort depth;
-
-  guint has_dummy : 1;
-  guint is_dummy : 1;
-  guint is_visible : 1;
-  guint loaded : 1;
-  guint idle_clear : 1;
-  guint load_pending : 1;
-};
-
-
-G_END_DECLS
-
-#endif /* __GTK_FILE_CHOOSER_PRIVATE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilechooserutils.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilechooserutils.h
deleted file mode 100644
index 04d6344f..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilechooserutils.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkfilechooserutils.h: Private utility functions useful for
- *                        implementing a GtkFileChooser interface
- * Copyright (C) 2003, 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 __GTK_FILE_CHOOSER_UTILS_H__
-#define __GTK_FILE_CHOOSER_UTILS_H__
-
-/* This is a "semi-private" header; it is meant only for
- * alternate GtkFileChooser implementations; no stability guarantees 
- * are made at this point
- */
-#ifndef GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
-#error "gtkfilechooserutils.h is not supported API for general use"
-#endif
-
-#include "gtkfilechooserprivate.h"
-
-G_BEGIN_DECLS
-
-#define GTK_FILE_CHOOSER_DELEGATE_QUARK	  (_gtk_file_chooser_delegate_get_quark ())
-
-typedef enum {
-  GTK_FILE_CHOOSER_PROP_FIRST                  = 0x1000,
-  GTK_FILE_CHOOSER_PROP_ACTION                 = GTK_FILE_CHOOSER_PROP_FIRST,
-  GTK_FILE_CHOOSER_PROP_FILE_SYSTEM_BACKEND,
-  GTK_FILE_CHOOSER_PROP_FILTER,
-  GTK_FILE_CHOOSER_PROP_LOCAL_ONLY,
-  GTK_FILE_CHOOSER_PROP_PREVIEW_WIDGET, 
-  GTK_FILE_CHOOSER_PROP_PREVIEW_WIDGET_ACTIVE,
-  GTK_FILE_CHOOSER_PROP_USE_PREVIEW_LABEL,
-  GTK_FILE_CHOOSER_PROP_EXTRA_WIDGET,
-  GTK_FILE_CHOOSER_PROP_SELECT_MULTIPLE,
-  GTK_FILE_CHOOSER_PROP_SHOW_HIDDEN,
-  GTK_FILE_CHOOSER_PROP_DO_OVERWRITE_CONFIRMATION,
-  GTK_FILE_CHOOSER_PROP_LAST                   = GTK_FILE_CHOOSER_PROP_DO_OVERWRITE_CONFIRMATION
-} GtkFileChooserProp;
-
-void _gtk_file_chooser_install_properties (GObjectClass *klass);
-#ifdef MAEMO_CHANGES
-void hildon_gtk_file_chooser_install_properties (GObjectClass *klass);
-#endif /* MAEMO_CHANGES */
-
-void _gtk_file_chooser_delegate_iface_init (GtkFileChooserIface *iface);
-void _gtk_file_chooser_set_delegate        (GtkFileChooser *receiver,
-					    GtkFileChooser *delegate);
-
-GQuark _gtk_file_chooser_delegate_get_quark (void) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __GTK_FILE_CHOOSER_UTILS_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilechooserwidget.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilechooserwidget.h
deleted file mode 100644
index 2df7ded1..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilechooserwidget.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkfilechooserwidget.h: Embeddable file selector widget
- * Copyright (C) 2003, 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 __GTK_FILE_CHOOSER_WIDGET_H__
-#define __GTK_FILE_CHOOSER_WIDGET_H__
-
-#include "gtkfilechooser.h"
-#include <gtk/gtkvbox.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_FILE_CHOOSER_WIDGET             (gtk_file_chooser_widget_get_type ())
-#define GTK_FILE_CHOOSER_WIDGET(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FILE_CHOOSER_WIDGET, GtkFileChooserWidget))
-#define GTK_FILE_CHOOSER_WIDGET_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FILE_CHOOSER_WIDGET, GtkFileChooserWidgetClass))
-#define GTK_IS_FILE_CHOOSER_WIDGET(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FILE_CHOOSER_WIDGET))
-#define GTK_IS_FILE_CHOOSER_WIDGET_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FILE_CHOOSER_WIDGET))
-#define GTK_FILE_CHOOSER_WIDGET_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FILE_CHOOSER_WIDGET, GtkFileChooserWidgetClass))
-
-typedef struct _GtkFileChooserWidget      GtkFileChooserWidget;
-typedef struct _GtkFileChooserWidgetClass GtkFileChooserWidgetClass;
-
-typedef struct _GtkFileChooserWidgetPrivate GtkFileChooserWidgetPrivate;
-
-struct _GtkFileChooserWidgetClass
-{
-  GtkVBoxClass parent_class;
-};
-
-struct _GtkFileChooserWidget
-{
-  GtkVBox parent_instance;
-
-  GtkFileChooserWidgetPrivate *priv;
-};
-
-GType      gtk_file_chooser_widget_get_type         (void) G_GNUC_CONST;
-GtkWidget *gtk_file_chooser_widget_new              (GtkFileChooserAction  action);
-GtkWidget *gtk_file_chooser_widget_new_with_backend (GtkFileChooserAction  action,
-						     const gchar          *backend);
-G_END_DECLS
-
-#endif /* __GTK_FILE_CHOOSER_WIDGET_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilefilter.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilefilter.h
deleted file mode 100644
index fd074f87..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilefilter.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkfilefilter.h: Filters for selecting a file subset
- * Copyright (C) 2003, 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 __GTK_FILE_FILTER_H__
-#define __GTK_FILE_FILTER_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_FILE_FILTER              (gtk_file_filter_get_type ())
-#define GTK_FILE_FILTER(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FILE_FILTER, GtkFileFilter))
-#define GTK_IS_FILE_FILTER(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FILE_FILTER))
-
-typedef struct _GtkFileFilter     GtkFileFilter;
-typedef struct _GtkFileFilterInfo GtkFileFilterInfo;
-
-typedef enum {
-  GTK_FILE_FILTER_FILENAME     = 1 << 0,
-  GTK_FILE_FILTER_URI          = 1 << 1,
-  GTK_FILE_FILTER_DISPLAY_NAME = 1 << 2,
-  GTK_FILE_FILTER_MIME_TYPE    = 1 << 3
-} GtkFileFilterFlags;
-
-typedef gboolean (*GtkFileFilterFunc) (const GtkFileFilterInfo *filter_info,
-				       gpointer                 data);
-
-struct _GtkFileFilterInfo
-{
-  GtkFileFilterFlags contains;
-  
-  const gchar *filename;
-  const gchar *uri;
-  const gchar *display_name;
-  const gchar *mime_type;
-};
-
-GType gtk_file_filter_get_type (void) G_GNUC_CONST;
-
-GtkFileFilter *       gtk_file_filter_new      (void);
-void                  gtk_file_filter_set_name (GtkFileFilter *filter,
-						const gchar   *name);
-G_CONST_RETURN gchar *gtk_file_filter_get_name (GtkFileFilter *filter);
-
-void gtk_file_filter_add_mime_type      (GtkFileFilter      *filter,
-					 const gchar        *mime_type);
-void gtk_file_filter_add_pattern        (GtkFileFilter      *filter,
-					 const gchar        *pattern);
-void gtk_file_filter_add_pixbuf_formats (GtkFileFilter      *filter);
-void gtk_file_filter_add_custom         (GtkFileFilter      *filter,
-					 GtkFileFilterFlags  needed,
-					 GtkFileFilterFunc   func,
-					 gpointer            data,
-					 GDestroyNotify      notify);
-
-GtkFileFilterFlags gtk_file_filter_get_needed (GtkFileFilter           *filter);
-gboolean           gtk_file_filter_filter     (GtkFileFilter           *filter,
-					       const GtkFileFilterInfo *filter_info);
-
-G_END_DECLS
-
-#endif /* __GTK_FILE_FILTER_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilesel.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilesel.h
deleted file mode 100644
index 75f65a16..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilesel.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-#ifndef __GTK_FILESEL_H__
-#define __GTK_FILESEL_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkdialog.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_FILE_SELECTION            (gtk_file_selection_get_type ())
-#define GTK_FILE_SELECTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FILE_SELECTION, GtkFileSelection))
-#define GTK_FILE_SELECTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FILE_SELECTION, GtkFileSelectionClass))
-#define GTK_IS_FILE_SELECTION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FILE_SELECTION))
-#define GTK_IS_FILE_SELECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FILE_SELECTION))
-#define GTK_FILE_SELECTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FILE_SELECTION, GtkFileSelectionClass))
-
-
-typedef struct _GtkFileSelection       GtkFileSelection;
-typedef struct _GtkFileSelectionClass  GtkFileSelectionClass;
-
-struct _GtkFileSelection
-{
-  /*< private >*/
-  GtkDialog parent_instance;
-
-  /*< public >*/
-  GtkWidget *dir_list;
-  GtkWidget *file_list;
-  GtkWidget *selection_entry;
-  GtkWidget *selection_text;
-  GtkWidget *main_vbox;
-  GtkWidget *ok_button;
-  GtkWidget *cancel_button;
-  GtkWidget *help_button;
-  GtkWidget *history_pulldown;
-  GtkWidget *history_menu;
-  GList     *history_list;
-  GtkWidget *fileop_dialog;
-  GtkWidget *fileop_entry;
-  gchar     *fileop_file;
-  gpointer   cmpl_state;
-  
-  GtkWidget *fileop_c_dir;
-  GtkWidget *fileop_del_file;
-  GtkWidget *fileop_ren_file;
-  
-  GtkWidget *button_area;
-  GtkWidget *action_area;
-
-  /*< private >*/
-  GPtrArray *selected_names;
-  gchar     *last_selected;
-};
-
-struct _GtkFileSelectionClass
-{
-  GtkDialogClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-#ifdef G_OS_WIN32
-/* Reserve old names for DLL ABI backward compatibility */
-#define gtk_file_selection_get_filename gtk_file_selection_get_filename_utf8
-#define gtk_file_selection_set_filename gtk_file_selection_set_filename_utf8
-#define gtk_file_selection_get_selections gtk_file_selection_get_selections_utf8
-#endif
-
-GType      gtk_file_selection_get_type            (void) G_GNUC_CONST;
-GtkWidget* gtk_file_selection_new                 (const gchar      *title);
-void       gtk_file_selection_set_filename        (GtkFileSelection *filesel,
-						   const gchar      *filename);
-G_CONST_RETURN gchar* gtk_file_selection_get_filename        (GtkFileSelection *filesel);
-
-void	   gtk_file_selection_complete		  (GtkFileSelection *filesel,
-						   const gchar	    *pattern);
-void       gtk_file_selection_show_fileop_buttons (GtkFileSelection *filesel);
-void       gtk_file_selection_hide_fileop_buttons (GtkFileSelection *filesel);
-
-gchar**    gtk_file_selection_get_selections      (GtkFileSelection *filesel);
-
-void       gtk_file_selection_set_select_multiple (GtkFileSelection *filesel,
-						   gboolean          select_multiple);
-gboolean   gtk_file_selection_get_select_multiple (GtkFileSelection *filesel);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_FILESEL_H__ */
-
-#endif /* GTK_DISABLE_DEPRECATED */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilesystem.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilesystem.h
deleted file mode 100644
index 18aa5848..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilesystem.h
+++ /dev/null
@@ -1,448 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkfilesystem.h: Abstract file system interfaces
- * Copyright (C) 2003, 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 __GTK_FILE_SYSTEM_H__
-#define __GTK_FILE_SYSTEM_H__
-
-/* This is a "semi-private" header; it is meant only for
- * alternate GtkFileChooser backend modules; no stability guarantees 
- * are made at this point
- */
-#ifndef GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED
-#error "GtkFileSystem is not supported API for general use"
-#endif
-
-#include <glib-object.h>
-#include <gtk/gtkwidget.h>	/* For icon handling */
-
-G_BEGIN_DECLS
-
-typedef gint64 GtkFileTime;
-
-typedef struct _GtkFileFolder       GtkFileFolder;
-typedef struct _GtkFileFolderIface  GtkFileFolderIface;
-typedef struct _GtkFileInfo         GtkFileInfo;
-typedef struct _GtkFileSystem       GtkFileSystem;
-typedef struct _GtkFileSystemIface  GtkFileSystemIface;
-typedef struct _GtkFileSystemVolume GtkFileSystemVolume;
-
-typedef struct _GtkFilePath        GtkFilePath;
-
-/* Mask of information about a file, for monitoring and
- * gtk_file_system_get_info()
- */
-typedef enum {
-  GTK_FILE_INFO_DISPLAY_NAME      = 1 << 0,
-  GTK_FILE_INFO_IS_FOLDER         = 1 << 1,
-  GTK_FILE_INFO_IS_HIDDEN         = 1 << 2,
-  GTK_FILE_INFO_MIME_TYPE         = 1 << 3,
-  GTK_FILE_INFO_MODIFICATION_TIME = 1 << 4,
-  GTK_FILE_INFO_SIZE              = 1 << 5,
-  GTK_FILE_INFO_ICON              = 1 << 6,
-  GTK_FILE_INFO_ALL               = (1 << 7) - 1
-} GtkFileInfoType;
-
-/* GError enumeration for GtkFileSystem
- */
-
-#define GTK_FILE_SYSTEM_ERROR (gtk_file_system_error_quark ())
-
-typedef enum
-{
-  GTK_FILE_SYSTEM_ERROR_NONEXISTENT,
-  GTK_FILE_SYSTEM_ERROR_NOT_FOLDER,
-  GTK_FILE_SYSTEM_ERROR_INVALID_URI,
-  GTK_FILE_SYSTEM_ERROR_BAD_FILENAME,
-  GTK_FILE_SYSTEM_ERROR_FAILED,
-  GTK_FILE_SYSTEM_ERROR_ALREADY_EXISTS
-} GtkFileSystemError;
-
-GQuark     gtk_file_system_error_quark      (void);
-
-/* Boxed-type for gtk_file_folder_get_info() results
- */
-#define GTK_TYPE_FILE_INFO (gtk_file_info_get_type ())
-
-GType       gtk_file_info_get_type (void) G_GNUC_CONST; 
-
-GtkFileInfo *gtk_file_info_new  (void);
-GtkFileInfo *gtk_file_info_copy (GtkFileInfo *info);
-void         gtk_file_info_free (GtkFileInfo *info);
-
-
-G_CONST_RETURN gchar *gtk_file_info_get_display_name      (const GtkFileInfo *info);
-G_CONST_RETURN gchar *gtk_file_info_get_display_key       (const GtkFileInfo *info);
-void                  gtk_file_info_set_display_name      (GtkFileInfo       *info,
-							   const gchar       *display_name);
-gboolean              gtk_file_info_get_is_folder         (const GtkFileInfo *info);
-void                  gtk_file_info_set_is_folder         (GtkFileInfo       *info,
-							   gboolean           is_folder);
-gboolean              gtk_file_info_get_is_hidden         (const GtkFileInfo *info);
-void                  gtk_file_info_set_is_hidden         (GtkFileInfo       *info,
-							   gboolean           is_hidden);
-G_CONST_RETURN gchar *gtk_file_info_get_mime_type         (const GtkFileInfo *info);
-void                  gtk_file_info_set_mime_type         (GtkFileInfo       *info,
-							   const gchar       *mime_type);
-GtkFileTime           gtk_file_info_get_modification_time (const GtkFileInfo *info);
-void                  gtk_file_info_set_modification_time (GtkFileInfo       *info,
-							   GtkFileTime        modification_time);
-gint64                gtk_file_info_get_size              (const GtkFileInfo *info);
-void                  gtk_file_info_set_size              (GtkFileInfo       *info,
-							   gint64             size);
-
-void                  gtk_file_info_set_icon_name         (GtkFileInfo       *info,
-							   const gchar       *con_name);
-G_CONST_RETURN gchar *gtk_file_info_get_icon_name         (const GtkFileInfo *info);
-GdkPixbuf            *gtk_file_info_render_icon           (const GtkFileInfo *info,
-							   GtkWidget         *widget,
-							   gint               pixel_size,
-							   GError           **error);
-
-/* GtkFileSystemHandle
- */
-
-#define GTK_TYPE_FILE_SYSTEM_HANDLE            (gtk_file_system_handle_get_type ())
-#define GTK_FILE_SYSTEM_HANDLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FILE_SYSTEM_HANDLE, GtkFileSystemHandle))
-#define GTK_IS_FILE_SYSTEM_HANDLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FILE_SYSTEM_HANDLE))
-#define GTK_FILE_SYSTEM_HANDLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FILE_SYSTEM_HANDLE, GtkFileSystemHandleUnixClass))
-#define GTK_IS_FILE_SYSTEM_HANDLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FILE_SYSTEM_HANDLE))
-#define GTK_FILE_SYSTEM_HANDLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FILE_SYSTEM_HANDLE, GtkFileSystemHandleClass))
-
-typedef struct _GtkFileSystemHandle       GtkFileSystemHandle;
-typedef struct _GtkFileSystemHandleClass  GtkFileSystemHandleClass;
-
-struct _GtkFileSystemHandle
-{
-  GObject parent_instance;
-
-  GtkFileSystem *file_system;
-
-  guint cancelled : 1;
-};
-
-struct _GtkFileSystemHandleClass
-{
-  GObjectClass parent_class;
-};
-
-GType gtk_file_system_handle_get_type (void);
-
-/* The base GtkFileSystem interface
- */
-#define GTK_TYPE_FILE_SYSTEM             (gtk_file_system_get_type ())
-#define GTK_FILE_SYSTEM(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FILE_SYSTEM, GtkFileSystem))
-#define GTK_IS_FILE_SYSTEM(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FILE_SYSTEM))
-#define GTK_FILE_SYSTEM_GET_IFACE(inst)  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GTK_TYPE_FILE_SYSTEM, GtkFileSystemIface))
-
-/* Callbacks for the asynchronous GtkFileSystem operations
- */
-
-typedef void (* GtkFileSystemGetInfoCallback) (GtkFileSystemHandle *handle,
-					       const GtkFileInfo   *file_info,
-					       const GError        *error,
-					       gpointer             data);
-typedef void (* GtkFileSystemGetFolderCallback) (GtkFileSystemHandle *handle,
-						 GtkFileFolder       *folder,
-						 const GError        *error,
-						 gpointer             data);
-typedef void (* GtkFileSystemCreateFolderCallback) (GtkFileSystemHandle *handle,
-						    const GtkFilePath   *path,
-						    const GError        *error,
-						    gpointer             data);
-typedef void (* GtkFileSystemVolumeMountCallback) (GtkFileSystemHandle *handle,
-						   GtkFileSystemVolume *volume,
-						   const GError        *error,
-						   gpointer             data);
-
-/*
- */
-
-struct _GtkFileSystemIface
-{
-  GTypeInterface base_iface;
-
-  /* Methods
-   */
-  GSList *              (*list_volumes)        (GtkFileSystem     *file_system);
-  GtkFileSystemVolume * (*get_volume_for_path) (GtkFileSystem     *file_system,
-						const GtkFilePath *path);
-
-  GtkFileSystemHandle * (*get_folder)  (GtkFileSystem                  *file_system,
-					const GtkFilePath              *path,
-					GtkFileInfoType                 types,
-					GtkFileSystemGetFolderCallback  callback,
-					gpointer                        data);
-  GtkFileSystemHandle * (*get_info) (GtkFileSystem                *file_system,
-				     const GtkFilePath            *path,
-				     GtkFileInfoType               types,
-				     GtkFileSystemGetInfoCallback  callback,
-				     gpointer                      data);
-  GtkFileSystemHandle * (*create_folder)  (GtkFileSystem                     *file_system,
-					   const GtkFilePath                 *path,
-					   GtkFileSystemCreateFolderCallback  callback,
-					   gpointer                           data);
-
-  void               (*cancel_operation) (GtkFileSystemHandle *handle);
-
-  /* Volumes
-   */
-  void          (*volume_free)             (GtkFileSystem        *file_system,
-					    GtkFileSystemVolume  *volume);
-  GtkFilePath * (*volume_get_base_path)    (GtkFileSystem        *file_system,
-					    GtkFileSystemVolume  *volume);
-  gboolean      (*volume_get_is_mounted)   (GtkFileSystem        *file_system,
-					    GtkFileSystemVolume  *volume);
-  GtkFileSystemHandle * (*volume_mount)    (GtkFileSystem                    *file_system,
-					    GtkFileSystemVolume              *volume,
-					    GtkFileSystemVolumeMountCallback  callback,
-					    gpointer                          data);
-  char *        (*volume_get_display_name) (GtkFileSystem        *file_system,
-					    GtkFileSystemVolume  *volume);
-  gchar *       (*volume_get_icon_name)    (GtkFileSystem        *file_system,
-					    GtkFileSystemVolume  *volume,
-					    GError              **error);
-
-  /* Path Manipulation
-   */
-  gboolean      (*get_parent)      (GtkFileSystem      *file_system,
-				    const GtkFilePath  *path,
-				    GtkFilePath       **parent,
-				    GError            **error);
-  GtkFilePath * (*make_path)        (GtkFileSystem     *file_system,
-				     const GtkFilePath *base_path,
-				     const gchar       *display_name,
-				     GError           **error);
-  gboolean      (*parse)            (GtkFileSystem     *file_system,
-				     const GtkFilePath *base_path,
-				     const gchar       *str,
-				     GtkFilePath      **folder,
-				     gchar            **file_part,
-				     GError           **error);
-  gchar *      (*path_to_uri)      (GtkFileSystem      *file_system,
-				    const GtkFilePath  *path);
-  gchar *      (*path_to_filename) (GtkFileSystem      *file_system,
-				    const GtkFilePath  *path);
-  GtkFilePath *(*uri_to_path)      (GtkFileSystem      *file_system,
-				    const gchar        *uri);
-  GtkFilePath *(*filename_to_path) (GtkFileSystem      *file_system,
-				    const gchar        *path);
-
-  /* Bookmarks 
-   */
-  gboolean       (*insert_bookmark)        (GtkFileSystem     *file_system,
-					    const GtkFilePath *path,
-					    gint               position,
-					    GError           **error);
-  gboolean       (*remove_bookmark)        (GtkFileSystem     *file_system,
-					    const GtkFilePath *path,
-					    GError           **error);
-  GSList *       (*list_bookmarks)         (GtkFileSystem     *file_system);
-
-  /* Signals 
-   */
-  void (*volumes_changed)   (GtkFileSystem *file_system);
-  void (*bookmarks_changed) (GtkFileSystem *file_system);
-
-  /* Bookmark labels 
-   */
-  gchar *        (*get_bookmark_label)     (GtkFileSystem     *file_system,
-					    const GtkFilePath *path);
-  void           (*set_bookmark_label)     (GtkFileSystem     *file_system,
-					    const GtkFilePath *path,
-					    const gchar       *label);
-};
-
-GType             gtk_file_system_get_type       (void) G_GNUC_CONST;
-
-GSList *          gtk_file_system_list_volumes   (GtkFileSystem     *file_system);
-
-GtkFileSystemVolume *gtk_file_system_get_volume_for_path (GtkFileSystem     *file_system,
-							  const GtkFilePath *path);
-
-void              gtk_file_system_volume_free             (GtkFileSystem        *file_system,
-							   GtkFileSystemVolume  *volume);
-GtkFilePath *     gtk_file_system_volume_get_base_path    (GtkFileSystem        *file_system,
-							   GtkFileSystemVolume  *volume);
-gboolean          gtk_file_system_volume_get_is_mounted   (GtkFileSystem        *file_system,
-							   GtkFileSystemVolume  *volume);
-GtkFileSystemHandle *gtk_file_system_volume_mount         (GtkFileSystem                    *file_system,
-							   GtkFileSystemVolume              *volume,
-							   GtkFileSystemVolumeMountCallback  callback,
-							   gpointer                          data);
-char *            gtk_file_system_volume_get_display_name (GtkFileSystem        *file_system, 
-							   GtkFileSystemVolume  *volume);
-GdkPixbuf *       gtk_file_system_volume_render_icon      (GtkFileSystem        *file_system,
-							   GtkFileSystemVolume  *volume,
-							   GtkWidget            *widget,
-							   gint                  pixel_size,
-							   GError              **error);
-gchar *           gtk_file_system_volume_get_icon_name    (GtkFileSystem        *file_system,
-							   GtkFileSystemVolume  *volume,
-							   GError              **error);
-
-gboolean          gtk_file_system_get_parent     (GtkFileSystem     *file_system,
-						  const GtkFilePath *path,
-						  GtkFilePath      **parent,
-						  GError           **error);
-GtkFileSystemHandle *gtk_file_system_get_folder  (GtkFileSystem                  *file_system,
-						  const GtkFilePath              *path,
-						  GtkFileInfoType                 types,
-						  GtkFileSystemGetFolderCallback  callback,
-						  gpointer                        data);
-GtkFileSystemHandle *gtk_file_system_get_info    (GtkFileSystem                  *file_system,
-						  const GtkFilePath              *path,
-						  GtkFileInfoType                 types,
-						  GtkFileSystemGetInfoCallback    callback,
-						  gpointer                        data);
-GtkFileSystemHandle *gtk_file_system_create_folder (GtkFileSystem                     *file_system,
-						    const GtkFilePath                 *path,
-						    GtkFileSystemCreateFolderCallback  callback,
-						    gpointer                           data);
-void              gtk_file_system_cancel_operation (GtkFileSystemHandle *handle);
-GtkFilePath *     gtk_file_system_make_path      (GtkFileSystem     *file_system,
-						  const GtkFilePath *base_path,
-						  const gchar       *display_name,
-						  GError           **error);
-gboolean          gtk_file_system_parse          (GtkFileSystem     *file_system,
-						  const GtkFilePath *base_path,
-						  const gchar       *str,
-						  GtkFilePath      **folder,
-						  gchar            **file_part,
-						  GError           **error);
-
-gchar *      gtk_file_system_path_to_uri      (GtkFileSystem     *file_system,
-					       const GtkFilePath *path);
-gchar *      gtk_file_system_path_to_filename (GtkFileSystem     *file_system,
-					       const GtkFilePath *path);
-GtkFilePath *gtk_file_system_uri_to_path      (GtkFileSystem     *file_system,
-					       const gchar       *uri);
-GtkFilePath *gtk_file_system_filename_to_path (GtkFileSystem     *file_system,
-					       const gchar       *filename);
-
-gboolean     gtk_file_system_path_is_local    (GtkFileSystem     *filesystem,
-					       const GtkFilePath *path);
-
-gboolean gtk_file_system_insert_bookmark (GtkFileSystem     *file_system,
-					  const GtkFilePath *path,
-					  gint               position,
-					  GError           **error);
-gboolean gtk_file_system_remove_bookmark (GtkFileSystem     *file_system,
-					  const GtkFilePath *path,
-					  GError           **error);
-GSList  *gtk_file_system_list_bookmarks  (GtkFileSystem     *file_system);
-
-gchar   *gtk_file_system_get_bookmark_label (GtkFileSystem     *file_system,
-					     const GtkFilePath *path);
-void     gtk_file_system_set_bookmark_label (GtkFileSystem     *file_system,
-					     const GtkFilePath *path,
-					     const gchar       *label);
-
-/*
- * Detailed information about a particular folder
- */
-#define GTK_TYPE_FILE_FOLDER             (gtk_file_folder_get_type ())
-#define GTK_FILE_FOLDER(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FILE_FOLDER, GtkFileFolder))
-#define GTK_IS_FILE_FOLDER(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FILE_FOLDER))
-#define GTK_FILE_FOLDER_GET_IFACE(inst)  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GTK_TYPE_FILE_FOLDER, GtkFileFolderIface))
-
-struct _GtkFileFolderIface
-{
-  GTypeInterface base_iface;
-
-  /* Methods
-   */
-  GtkFileInfo *      (*get_info)       (GtkFileFolder     *folder,
-					const GtkFilePath *path,
-				        GError           **error);
-  gboolean           (*list_children)  (GtkFileFolder     *folder,
-				        GSList           **children,
-				        GError           **error);
-
-  /* ??? refresh() ??? */
-
-  /* Signals
-   */
-  void (*deleted)       (GtkFileFolder *monitor);
-  void (*files_added)   (GtkFileFolder *monitor,
-			 GSList        *paths);
-  void (*files_changed) (GtkFileFolder *monitor,
-			 GSList        *paths);
-  void (*files_removed) (GtkFileFolder *monitor,
-			 GSList        *paths);
-
-  /* Method / signal */
-  gboolean (*is_finished_loading) (GtkFileFolder *folder);
-  void     (*finished_loading)    (GtkFileFolder *folder);
-};
-
-GType        gtk_file_folder_get_type      (void) G_GNUC_CONST;
-gboolean     gtk_file_folder_list_children (GtkFileFolder      *folder,
-					    GSList            **children,
-					    GError            **error);
-GtkFileInfo *gtk_file_folder_get_info      (GtkFileFolder      *folder,
-					    const GtkFilePath  *path,
-					    GError            **error);
-
-gboolean     gtk_file_folder_is_finished_loading (GtkFileFolder *folder);
-
-
-/* GtkFilePath */
-#define GTK_TYPE_FILE_PATH             (gtk_file_path_get_type ())
-
-GType   gtk_file_path_get_type (void) G_GNUC_CONST;
-#ifdef __GNUC__
-#define gtk_file_path_new_dup(str) \
- ({ const gchar *__s = (str); (GtkFilePath *)g_strdup(__s); })
-#define gtk_file_path_new_steal(str) \
- ({ gchar *__s = (str); (GtkFilePath *)__s; })
-#define gtk_file_path_get_string(path) \
- ({ const GtkFilePath *__p = (path); (const gchar *)__p; })
-#define gtk_file_path_free(path) \
- ({ GtkFilePath *__p = (path); g_free (__p); })
-#else /* __GNUC__ */
-#define gtk_file_path_new_dup(str)     ((GtkFilePath *)g_strdup(str))
-#define gtk_file_path_new_steal(str)   ((GtkFilePath *)(str))
-#define gtk_file_path_get_string(str) ((const gchar *)(str))
-#define gtk_file_path_free(path)       g_free (path)
-#endif/* __GNUC__ */
-
-#define gtk_file_path_copy(path)       gtk_file_path_new_dup (gtk_file_path_get_string(path))
-#ifdef G_OS_WIN32
-int _gtk_file_system_win32_path_compare (const gchar *path1,
-					 const gchar *path2);
-#define gtk_file_path_compare(path1,path2) \
-  _gtk_file_system_win32_path_compare (gtk_file_path_get_string (path1), \
-	                               gtk_file_path_get_string (path2))
-#else
-#define gtk_file_path_compare(path1,path2) strcmp (gtk_file_path_get_string (path1), \
-						   gtk_file_path_get_string (path2))
-#endif
-
-GSList *gtk_file_paths_sort (GSList *paths);
-GSList *gtk_file_paths_copy (GSList *paths);
-void    gtk_file_paths_free (GSList *paths);
-
-/* GtkFileSystem modules support */
-
-GtkFileSystem  *gtk_file_system_create (const char *file_system_name);
-
-G_END_DECLS
-
-#endif /* __GTK_FILE_SYSTEM_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilesystemmodel.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilesystemmodel.h
deleted file mode 100644
index 1bf999ba..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilesystemmodel.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkfilesystemmodel.h: GtkTreeModel wrapping a GtkFileSystem
- * Copyright (C) 2003, 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 __GTK_FILE_SYSTEM_MODEL_H__
-#define __GTK_FILE_SYSTEM_MODEL_H__
-
-#ifndef GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED
-#error "GtkFileSystemModel is not supported API for general use"
-#endif
-
-#include <glib-object.h>
-#include "gtkfilesystem.h"
-#include <gtk/gtktreemodel.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_FILE_SYSTEM_MODEL             (_gtk_file_system_model_get_type ())
-#define GTK_FILE_SYSTEM_MODEL(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FILE_SYSTEM_MODEL, GtkFileSystemModel))
-#define GTK_IS_FILE_SYSTEM_MODEL(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FILE_SYSTEM_MODEL))
-
-typedef struct _GtkFileSystemModel      GtkFileSystemModel;
-
-GType _gtk_file_system_model_get_type (void) G_GNUC_CONST;
-
-typedef enum {
-  GTK_FILE_SYSTEM_MODEL_INFO,
-  GTK_FILE_SYSTEM_MODEL_DISPLAY_NAME,
-  GTK_FILE_SYSTEM_MODEL_N_COLUMNS
-} GtkFileSystemModelColumns;
-
-GtkFileSystemModel *_gtk_file_system_model_new              (GtkFileSystem      *file_system,
-							     const GtkFilePath  *root_path,
-							     gint                max_depth,
-							     GtkFileInfoType     types,
-							     GError            **error);
-const GtkFileInfo * _gtk_file_system_model_get_info         (GtkFileSystemModel *model,
-							     GtkTreeIter        *iter);
-const GtkFilePath * _gtk_file_system_model_get_path          (GtkFileSystemModel *model,
-							     GtkTreeIter        *iter);
-void                _gtk_file_system_model_set_show_hidden  (GtkFileSystemModel *model,
-							     gboolean            show_hidden);
-void                _gtk_file_system_model_set_show_folders (GtkFileSystemModel *model,
-							     gboolean            show_folders);
-void                _gtk_file_system_model_set_show_files   (GtkFileSystemModel *model,
-							     gboolean            show_files);
-
-typedef gboolean (*GtkFileSystemModelFilter) (GtkFileSystemModel *model,
-					      GtkFilePath        *path,
-					      const GtkFileInfo  *info,
-					      gpointer            user_data);
-
-void     _gtk_file_system_model_set_filter (GtkFileSystemModel      *model,
-					    GtkFileSystemModelFilter filter,
-					    gpointer                 user_data);
-
-typedef void (*GtkFileSystemModelPathFunc) (GtkFileSystemModel *model,
-					    GtkTreePath        *path,
-					    GtkTreeIter        *iter,
-					    gpointer            user_data);
-
-void     _gtk_file_system_model_path_do (GtkFileSystemModel        *model,
-					 const GtkFilePath         *path,
-					 GtkFileSystemModelPathFunc func,
-					 gpointer                   user_data);
-
-void _gtk_file_system_model_add_editable    (GtkFileSystemModel *model,
-					     GtkTreeIter        *iter);
-void _gtk_file_system_model_remove_editable (GtkFileSystemModel *model);
-
-G_END_DECLS
-
-#endif /* __GTK_FILE_SYSTEM_MODEL_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfixed.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfixed.h
deleted file mode 100644
index a313568c..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfixed.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_FIXED_H__
-#define __GTK_FIXED_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkcontainer.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_FIXED                  (gtk_fixed_get_type ())
-#define GTK_FIXED(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FIXED, GtkFixed))
-#define GTK_FIXED_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FIXED, GtkFixedClass))
-#define GTK_IS_FIXED(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FIXED))
-#define GTK_IS_FIXED_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FIXED))
-#define GTK_FIXED_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FIXED, GtkFixedClass))
-
-
-typedef struct _GtkFixed        GtkFixed;
-typedef struct _GtkFixedClass   GtkFixedClass;
-typedef struct _GtkFixedChild   GtkFixedChild;
-
-struct _GtkFixed
-{
-  GtkContainer container;
-
-  GList *children;
-};
-
-struct _GtkFixedClass
-{
-  GtkContainerClass parent_class;
-};
-
-struct _GtkFixedChild
-{
-  GtkWidget *widget;
-  gint x;
-  gint y;
-};
-
-
-GType      gtk_fixed_get_type          (void) G_GNUC_CONST;
-GtkWidget* gtk_fixed_new               (void);
-void       gtk_fixed_put               (GtkFixed       *fixed,
-                                        GtkWidget      *widget,
-                                        gint            x,
-                                        gint            y);
-void       gtk_fixed_move              (GtkFixed       *fixed,
-                                        GtkWidget      *widget,
-                                        gint            x,
-                                        gint            y);
-void       gtk_fixed_set_has_window    (GtkFixed       *fixed,
-					gboolean        has_window);
-gboolean   gtk_fixed_get_has_window    (GtkFixed       *fixed);
-
-G_END_DECLS
-
-#endif /* __GTK_FIXED_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfontbutton.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfontbutton.h
deleted file mode 100644
index 8952569b..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfontbutton.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1998 David Abilleira Freijeiro <odaf@nexo.es>
- * All rights reserved
- * Based on gnome-color-picker by Federico Mena <federico@nuclecu.unam.mx>
- * 
- * 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, Cambridge, MA 02139, USA.
- */
-/*
- * Modified by the GTK+ Team and others 2003.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_FONT_BUTTON_H__
-#define __GTK_FONT_BUTTON_H__
-
-#include <gtk/gtkbutton.h>
-
-
-G_BEGIN_DECLS
-
-/* GtkFontButton is a button widget that allow user to select a font.
- */
-
-#define GTK_TYPE_FONT_BUTTON             (gtk_font_button_get_type ())
-#define GTK_FONT_BUTTON(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FONT_BUTTON, GtkFontButton))
-#define GTK_FONT_BUTTON_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FONT_BUTTON, GtkFontButtonClass))
-#define GTK_IS_FONT_BUTTON(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FONT_BUTTON))
-#define GTK_IS_FONT_BUTTON_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FONT_BUTTON))
-#define GTK_FONT_BUTTON_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FONT_BUTTON, GtkFontButtonClass))
-
-typedef struct _GtkFontButton        GtkFontButton;
-typedef struct _GtkFontButtonClass   GtkFontButtonClass;
-typedef struct _GtkFontButtonPrivate GtkFontButtonPrivate;
-
-struct _GtkFontButton {
-  GtkButton button;
-
-  /*< private >*/
-  GtkFontButtonPrivate *priv;
-};
-
-struct _GtkFontButtonClass {
-  GtkButtonClass parent_class;
-
-  /* font_set signal is emitted when font is chosen */
-  void (* font_set) (GtkFontButton *gfp);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType                 gtk_font_button_get_type       (void) G_GNUC_CONST;
-GtkWidget            *gtk_font_button_new            (void);
-GtkWidget            *gtk_font_button_new_with_font  (const gchar   *fontname);
-
-G_CONST_RETURN gchar *gtk_font_button_get_title      (GtkFontButton *font_button);
-void                  gtk_font_button_set_title      (GtkFontButton *font_button,
-                                                      const gchar   *title);
-gboolean              gtk_font_button_get_use_font   (GtkFontButton *font_button);
-void                  gtk_font_button_set_use_font   (GtkFontButton *font_button,
-                                                      gboolean       use_font);
-gboolean              gtk_font_button_get_use_size   (GtkFontButton *font_button);
-void                  gtk_font_button_set_use_size   (GtkFontButton *font_button,
-                                                      gboolean       use_size);
-G_CONST_RETURN gchar* gtk_font_button_get_font_name  (GtkFontButton *font_button);
-gboolean              gtk_font_button_set_font_name  (GtkFontButton *font_button,
-                                                      const gchar   *fontname);
-gboolean              gtk_font_button_get_show_style (GtkFontButton *font_button);
-void                  gtk_font_button_set_show_style (GtkFontButton *font_button,
-                                                      gboolean       show_style);
-gboolean              gtk_font_button_get_show_size  (GtkFontButton *font_button);
-void                  gtk_font_button_set_show_size  (GtkFontButton *font_button,
-                                                      gboolean       show_size);
-
-G_END_DECLS
-
-    
-#endif /* __GTK_FONT_BUTTON_H__ */
-
-
-
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfontsel.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfontsel.h
deleted file mode 100644
index f4133991..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfontsel.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * GtkFontSelection widget for Gtk+, by Damon Chaplin, May 1998.
- * Based on the GnomeFontSelector widget, by Elliot Lee, but major changes.
- * The GnomeFontSelector was derived from app/text_tool.c in the GIMP.
- *
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_FONTSEL_H__
-#define __GTK_FONTSEL_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkvbox.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_FONT_SELECTION              (gtk_font_selection_get_type ())
-#define GTK_FONT_SELECTION(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FONT_SELECTION, GtkFontSelection))
-#define GTK_FONT_SELECTION_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FONT_SELECTION, GtkFontSelectionClass))
-#define GTK_IS_FONT_SELECTION(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FONT_SELECTION))
-#define GTK_IS_FONT_SELECTION_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FONT_SELECTION))
-#define GTK_FONT_SELECTION_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FONT_SELECTION, GtkFontSelectionClass))
-
-
-#define GTK_TYPE_FONT_SELECTION_DIALOG              (gtk_font_selection_dialog_get_type ())
-#define GTK_FONT_SELECTION_DIALOG(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FONT_SELECTION_DIALOG, GtkFontSelectionDialog))
-#define GTK_FONT_SELECTION_DIALOG_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FONT_SELECTION_DIALOG, GtkFontSelectionDialogClass))
-#define GTK_IS_FONT_SELECTION_DIALOG(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FONT_SELECTION_DIALOG))
-#define GTK_IS_FONT_SELECTION_DIALOG_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FONT_SELECTION_DIALOG))
-#define GTK_FONT_SELECTION_DIALOG_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FONT_SELECTION_DIALOG, GtkFontSelectionDialogClass))
-
-
-typedef struct _GtkFontSelection	     GtkFontSelection;
-typedef struct _GtkFontSelectionClass	     GtkFontSelectionClass;
-
-typedef struct _GtkFontSelectionDialog	     GtkFontSelectionDialog;
-typedef struct _GtkFontSelectionDialogClass  GtkFontSelectionDialogClass;
-
-struct _GtkFontSelection
-{
-  GtkVBox parent_instance;
-  
-  GtkWidget *font_entry;
-  GtkWidget *family_list;
-  GtkWidget *font_style_entry;
-  GtkWidget *face_list;
-  GtkWidget *size_entry;
-  GtkWidget *size_list;
-  GtkWidget *pixels_button;
-  GtkWidget *points_button;
-  GtkWidget *filter_button;
-  GtkWidget *preview_entry;
-
-  PangoFontFamily *family;	/* Current family */
-  PangoFontFace *face;		/* Current face */
-  
-  gint size;
-  
-  GdkFont *font;		/* Cache for gdk_font_selection_get_font, so we can preserve
-				 * refcounting behavior
-				 */
-};
-
-struct _GtkFontSelectionClass
-{
-  GtkVBoxClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-struct _GtkFontSelectionDialog
-{
-  GtkDialog parent_instance;
-
-  /*< private >*/
-  GtkWidget *fontsel;
-
-  GtkWidget *main_vbox;
-  GtkWidget *action_area;
-  /*< public >*/
-  GtkWidget *ok_button;
-  GtkWidget *apply_button;
-  GtkWidget *cancel_button;
-
-  /*< private >*/
-
-  /* If the user changes the width of the dialog, we turn auto-shrink off.
-   * (Unused now, autoshrink doesn't mean anything anymore -Yosh)
-   */
-  gint dialog_width;
-  gboolean auto_resize;
-};
-
-struct _GtkFontSelectionDialogClass
-{
-  GtkDialogClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-
-/*****************************************************************************
- * GtkFontSelection functions.
- *   see the comments in the GtkFontSelectionDialog functions.
- *****************************************************************************/
-
-GType	   gtk_font_selection_get_type		(void) G_GNUC_CONST;
-GtkWidget* gtk_font_selection_new		(void);
-gchar*	   gtk_font_selection_get_font_name	(GtkFontSelection *fontsel);
-
-#ifndef GTK_DISABLE_DEPRECATED
-GdkFont*   gtk_font_selection_get_font		(GtkFontSelection *fontsel);
-#endif /* GTK_DISABLE_DEPRECATED */
-
-gboolean              gtk_font_selection_set_font_name    (GtkFontSelection *fontsel,
-							   const gchar      *fontname);
-G_CONST_RETURN gchar* gtk_font_selection_get_preview_text (GtkFontSelection *fontsel);
-void                  gtk_font_selection_set_preview_text (GtkFontSelection *fontsel,
-							   const gchar      *text);
-
-/*****************************************************************************
- * GtkFontSelectionDialog functions.
- *   most of these functions simply call the corresponding function in the
- *   GtkFontSelection.
- *****************************************************************************/
-
-GType	   gtk_font_selection_dialog_get_type	(void) G_GNUC_CONST;
-GtkWidget* gtk_font_selection_dialog_new	(const gchar	  *title);
-
-/* This returns the X Logical Font Description fontname, or NULL if no font
-   is selected. Note that there is a slight possibility that the font might not
-   have been loaded OK. You should call gtk_font_selection_dialog_get_font()
-   to see if it has been loaded OK.
-   You should g_free() the returned font name after you're done with it. */
-gchar*	 gtk_font_selection_dialog_get_font_name    (GtkFontSelectionDialog *fsd);
-
-#ifndef GTK_DISABLE_DEPRECATED
-/* This will return the current GdkFont, or NULL if none is selected or there
-   was a problem loading it. Remember to use gdk_font_ref/unref() if you want
-   to use the font (in a style, for example). */
-GdkFont* gtk_font_selection_dialog_get_font	    (GtkFontSelectionDialog *fsd);
-#endif /* GTK_DISABLE_DEPRECATED */
-
-/* This sets the currently displayed font. It should be a valid X Logical
-   Font Description font name (anything else will be ignored), e.g.
-   "-adobe-courier-bold-o-normal--25-*-*-*-*-*-*-*" 
-   It returns TRUE on success. */
-gboolean gtk_font_selection_dialog_set_font_name    (GtkFontSelectionDialog *fsd,
-						     const gchar	*fontname);
-
-/* This returns the text in the preview entry. You should copy the returned
-   text if you need it. */
-G_CONST_RETURN gchar* gtk_font_selection_dialog_get_preview_text (GtkFontSelectionDialog *fsd);
-
-/* This sets the text in the preview entry. It will be copied by the entry,
-   so there's no need to g_strdup() it first. */
-void	 gtk_font_selection_dialog_set_preview_text (GtkFontSelectionDialog *fsd,
-						     const gchar	    *text);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_FONTSEL_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkframe.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkframe.h
deleted file mode 100644
index 85729d13..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkframe.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_FRAME_H__
-#define __GTK_FRAME_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkbin.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_FRAME                  (gtk_frame_get_type ())
-#define GTK_FRAME(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FRAME, GtkFrame))
-#define GTK_FRAME_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FRAME, GtkFrameClass))
-#define GTK_IS_FRAME(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FRAME))
-#define GTK_IS_FRAME_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FRAME))
-#define GTK_FRAME_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FRAME, GtkFrameClass))
-
-
-typedef struct _GtkFrame       GtkFrame;
-typedef struct _GtkFrameClass  GtkFrameClass;
-
-struct _GtkFrame
-{
-  GtkBin bin;
-
-  GtkWidget *label_widget;
-  gint16 shadow_type;
-  gfloat label_xalign;
-  gfloat label_yalign;
-
-  GtkAllocation child_allocation;
-};
-
-struct _GtkFrameClass
-{
-  GtkBinClass parent_class;
-
-  void (*compute_child_allocation) (GtkFrame *frame, GtkAllocation *allocation);
-};
-
-
-GType      gtk_frame_get_type         (void) G_GNUC_CONST;
-GtkWidget* gtk_frame_new              (const gchar   *label);
-
-void                  gtk_frame_set_label (GtkFrame    *frame,
-					   const gchar *label);
-G_CONST_RETURN gchar *gtk_frame_get_label (GtkFrame    *frame);
-
-void       gtk_frame_set_label_widget (GtkFrame      *frame,
-				       GtkWidget     *label_widget);
-GtkWidget *gtk_frame_get_label_widget (GtkFrame      *frame);
-void       gtk_frame_set_label_align  (GtkFrame      *frame,
-				       gfloat         xalign,
-				       gfloat         yalign);
-void       gtk_frame_get_label_align  (GtkFrame      *frame,
-				       gfloat        *xalign,
-				       gfloat        *yalign);
-void       gtk_frame_set_shadow_type  (GtkFrame      *frame,
-				       GtkShadowType  type);
-GtkShadowType gtk_frame_get_shadow_type (GtkFrame    *frame);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_FRAME_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkgamma.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkgamma.h
deleted file mode 100644
index fa6999b3..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkgamma.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1997 David Mosberger
- *
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-/*
- * NOTE this widget is considered too specialized/little-used for
- * GTK+, and will in the future be moved to some other package.  If
- * your application needs this widget, feel free to use it, as the
- * widget does work and is useful in some applications; it's just not
- * of general interest. However, we are not accepting new features for
- * the widget, and it will eventually move out of the GTK+
- * distribution.
- */
-
-#ifndef __GTK_GAMMA_CURVE_H__
-#define __GTK_GAMMA_CURVE_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkvbox.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_GAMMA_CURVE            (gtk_gamma_curve_get_type ())
-#define GTK_GAMMA_CURVE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_GAMMA_CURVE, GtkGammaCurve))
-#define GTK_GAMMA_CURVE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_GAMMA_CURVE, GtkGammaCurveClass))
-#define GTK_IS_GAMMA_CURVE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_GAMMA_CURVE))
-#define GTK_IS_GAMMA_CURVE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_GAMMA_CURVE))
-#define GTK_GAMMA_CURVE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_GAMMA_CURVE, GtkGammaCurveClass))
-
-typedef struct _GtkGammaCurve		GtkGammaCurve;
-typedef struct _GtkGammaCurveClass	GtkGammaCurveClass;
-
-
-struct _GtkGammaCurve
-{
-  GtkVBox vbox;
-
-  GtkWidget *table;
-  GtkWidget *curve;
-  GtkWidget *button[5];	/* spline, linear, free, gamma, reset */
-
-  gfloat gamma;
-  GtkWidget *gamma_dialog;
-  GtkWidget *gamma_text;
-};
-
-struct _GtkGammaCurveClass
-{
-  GtkVBoxClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType      gtk_gamma_curve_get_type (void) G_GNUC_CONST;
-GtkWidget* gtk_gamma_curve_new      (void);
-
-
-G_END_DECLS
-
-#endif /* __GTK_GAMMA_CURVE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkgc.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkgc.h
deleted file mode 100644
index 38d70a6b..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkgc.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_GC_H__
-#define __GTK_GC_H__
-
-
-#include <gdk/gdk.h>
-
-
-G_BEGIN_DECLS
-
-GdkGC* gtk_gc_get     (gint             depth,
-		       GdkColormap     *colormap,
-		       GdkGCValues     *values,
-		       GdkGCValuesMask  values_mask);
-void   gtk_gc_release (GdkGC           *gc);
-
-
-G_END_DECLS
-
-#endif /* __GTK_GC_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhandlebox.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhandlebox.h
deleted file mode 100644
index c690a04b..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhandlebox.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- * Copyright (C) 1998 Elliot Lee
- *
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-/* The GtkHandleBox is to allow widgets to be dragged in and out of
- * their parents.
- */
-
-
-#ifndef __GTK_HANDLE_BOX_H__
-#define __GTK_HANDLE_BOX_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkbin.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_HANDLE_BOX            (gtk_handle_box_get_type ())
-#define GTK_HANDLE_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HANDLE_BOX, GtkHandleBox))
-#define GTK_HANDLE_BOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_HANDLE_BOX, GtkHandleBoxClass))
-#define GTK_IS_HANDLE_BOX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_HANDLE_BOX))
-#define GTK_IS_HANDLE_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HANDLE_BOX))
-#define GTK_HANDLE_BOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_HANDLE_BOX, GtkHandleBoxClass))
-
-
-typedef struct _GtkHandleBox       GtkHandleBox;
-typedef struct _GtkHandleBoxClass  GtkHandleBoxClass;
-
-struct _GtkHandleBox
-{
-  GtkBin bin;
-
-  GdkWindow      *bin_window;	/* parent window for children */
-  GdkWindow      *float_window;
-  GtkShadowType   shadow_type;
-  guint		  handle_position : 2;
-  guint		  float_window_mapped : 1;
-  guint		  child_detached : 1;
-  guint		  in_drag : 1;
-  guint		  shrink_on_detach : 1;
-
-  signed int      snap_edge : 3; /* -1 == unset */
-  
-  /* Variables used during a drag
-   */
-  gint deskoff_x, deskoff_y; /* Offset between root relative coordinates
-			      * and deskrelative coordinates */
-  GtkAllocation   attach_allocation;
-  GtkAllocation   float_allocation;
-};
-
-struct _GtkHandleBoxClass
-{
-  GtkBinClass parent_class;
-
-  void	(*child_attached)	(GtkHandleBox	*handle_box,
-				 GtkWidget	*child);
-  void	(*child_detached)	(GtkHandleBox	*handle_box,
-				 GtkWidget	*child);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType         gtk_handle_box_get_type             (void) G_GNUC_CONST;
-GtkWidget*    gtk_handle_box_new                  (void);
-void          gtk_handle_box_set_shadow_type      (GtkHandleBox    *handle_box,
-                                                   GtkShadowType    type);
-GtkShadowType gtk_handle_box_get_shadow_type      (GtkHandleBox    *handle_box);
-void          gtk_handle_box_set_handle_position  (GtkHandleBox    *handle_box,
-					           GtkPositionType  position);
-GtkPositionType gtk_handle_box_get_handle_position(GtkHandleBox    *handle_box);
-void          gtk_handle_box_set_snap_edge        (GtkHandleBox    *handle_box,
-						   GtkPositionType  edge);
-GtkPositionType gtk_handle_box_get_snap_edge      (GtkHandleBox    *handle_box);
-
-G_END_DECLS
-
-#endif /* __GTK_HANDLE_BOX_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhbbox.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhbbox.h
deleted file mode 100644
index 7423a754..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhbbox.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_HBUTTON_BOX_H__
-#define __GTK_HBUTTON_BOX_H__
-
-
-#include <gtk/gtkbbox.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_HBUTTON_BOX                  (gtk_hbutton_box_get_type ())
-#define GTK_HBUTTON_BOX(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HBUTTON_BOX, GtkHButtonBox))
-#define GTK_HBUTTON_BOX_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_HBUTTON_BOX, GtkHButtonBoxClass))
-#define GTK_IS_HBUTTON_BOX(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_HBUTTON_BOX))
-#define GTK_IS_HBUTTON_BOX_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HBUTTON_BOX))
-#define GTK_HBUTTON_BOX_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_HBUTTON_BOX, GtkHButtonBoxClass))
-
-
-typedef struct _GtkHButtonBox       GtkHButtonBox;
-typedef struct _GtkHButtonBoxClass  GtkHButtonBoxClass;
-
-struct _GtkHButtonBox
-{
-  GtkButtonBox button_box;
-};
-
-struct _GtkHButtonBoxClass
-{
-  GtkButtonBoxClass parent_class;
-};
-
-
-GType      gtk_hbutton_box_get_type (void) G_GNUC_CONST;
-GtkWidget* gtk_hbutton_box_new      (void);
-
-/* buttons can be added by gtk_container_add() */
-
-#ifndef GTK_DISABLE_DEPRECATED
-gint gtk_hbutton_box_get_spacing_default (void);
-GtkButtonBoxStyle gtk_hbutton_box_get_layout_default (void);
-
-void gtk_hbutton_box_set_spacing_default (gint spacing);
-void gtk_hbutton_box_set_layout_default (GtkButtonBoxStyle layout);
-#endif
-
-G_END_DECLS
-
-#endif /* __GTK_HBUTTON_BOX_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhbox.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhbox.h
deleted file mode 100644
index 5296e21e..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhbox.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_HBOX_H__
-#define __GTK_HBOX_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkbox.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_HBOX            (gtk_hbox_get_type ())
-#define GTK_HBOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HBOX, GtkHBox))
-#define GTK_HBOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_HBOX, GtkHBoxClass))
-#define GTK_IS_HBOX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_HBOX))
-#define GTK_IS_HBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HBOX))
-#define GTK_HBOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_HBOX, GtkHBoxClass))
-
-
-typedef struct _GtkHBox	      GtkHBox;
-typedef struct _GtkHBoxClass  GtkHBoxClass;
-
-struct _GtkHBox
-{
-  GtkBox box;
-};
-
-struct _GtkHBoxClass
-{
-  GtkBoxClass parent_class;
-};
-
-
-GType	   gtk_hbox_get_type (void) G_GNUC_CONST;
-GtkWidget* gtk_hbox_new	     (gboolean homogeneous,
-			      gint spacing);
-
-
-G_END_DECLS
-
-#endif /* __GTK_HBOX_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhpaned.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhpaned.h
deleted file mode 100644
index 2272dfd4..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhpaned.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_HPANED_H__
-#define __GTK_HPANED_H__
-
-#include <gtk/gtkpaned.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_HPANED		   (gtk_hpaned_get_type ())
-#define GTK_HPANED(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HPANED, GtkHPaned))
-#define GTK_HPANED_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_HPANED, GtkHPanedClass))
-#define GTK_IS_HPANED(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_HPANED))
-#define GTK_IS_HPANED_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HPANED))
-#define GTK_HPANED_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_HPANED, GtkHPanedClass))
-
-
-typedef struct _GtkHPaned      GtkHPaned;
-typedef struct _GtkHPanedClass GtkHPanedClass;
-
-struct _GtkHPaned
-{
-  GtkPaned paned;
-};
-
-struct _GtkHPanedClass
-{
-  GtkPanedClass parent_class;
-};
-
-GType      gtk_hpaned_get_type (void) G_GNUC_CONST;
-GtkWidget *gtk_hpaned_new      (void);
-
-G_END_DECLS
-
-#endif /* __GTK_HPANED_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhruler.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhruler.h
deleted file mode 100644
index 375b8086..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhruler.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-/*
- * NOTE this widget is considered too specialized/little-used for
- * GTK+, and will in the future be moved to some other package.  If
- * your application needs this widget, feel free to use it, as the
- * widget does work and is useful in some applications; it's just not
- * of general interest. However, we are not accepting new features for
- * the widget, and it will eventually move out of the GTK+
- * distribution.
- */
-
-#ifndef __GTK_HRULER_H__
-#define __GTK_HRULER_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkruler.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_HRULER	           (gtk_hruler_get_type ())
-#define GTK_HRULER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HRULER, GtkHRuler))
-#define GTK_HRULER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_HRULER, GtkHRulerClass))
-#define GTK_IS_HRULER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_HRULER))
-#define GTK_IS_HRULER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HRULER))
-#define GTK_HRULER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_HRULER, GtkHRulerClass))
-
-
-typedef struct _GtkHRuler       GtkHRuler;
-typedef struct _GtkHRulerClass  GtkHRulerClass;
-
-struct _GtkHRuler
-{
-  GtkRuler ruler;
-};
-
-struct _GtkHRulerClass
-{
-  GtkRulerClass parent_class;
-};
-
-
-GType      gtk_hruler_get_type (void) G_GNUC_CONST;
-GtkWidget* gtk_hruler_new      (void);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_HRULER_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhscale.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhscale.h
deleted file mode 100644
index 6f410907..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhscale.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_HSCALE_H__
-#define __GTK_HSCALE_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkscale.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_HSCALE            (gtk_hscale_get_type ())
-#define GTK_HSCALE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HSCALE, GtkHScale))
-#define GTK_HSCALE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_HSCALE, GtkHScaleClass))
-#define GTK_IS_HSCALE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_HSCALE))
-#define GTK_IS_HSCALE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HSCALE))
-#define GTK_HSCALE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_HSCALE, GtkHScaleClass))
-
-
-typedef struct _GtkHScale       GtkHScale;
-typedef struct _GtkHScaleClass  GtkHScaleClass;
-
-struct _GtkHScale
-{
-  GtkScale scale;
-};
-
-struct _GtkHScaleClass
-{
-  GtkScaleClass parent_class;
-};
-
-
-GType      gtk_hscale_get_type       (void) G_GNUC_CONST;
-GtkWidget* gtk_hscale_new            (GtkAdjustment *adjustment);
-GtkWidget* gtk_hscale_new_with_range (gdouble        min,
-                                      gdouble        max,
-                                      gdouble        step);
-
-
-G_END_DECLS
-
-#endif /* __GTK_HSCALE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhscrollbar.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhscrollbar.h
deleted file mode 100644
index a6f595ba..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhscrollbar.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_HSCROLLBAR_H__
-#define __GTK_HSCROLLBAR_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkscrollbar.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_HSCROLLBAR            (gtk_hscrollbar_get_type ())
-#define GTK_HSCROLLBAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HSCROLLBAR, GtkHScrollbar))
-#define GTK_HSCROLLBAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_HSCROLLBAR, GtkHScrollbarClass))
-#define GTK_IS_HSCROLLBAR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_HSCROLLBAR))
-#define GTK_IS_HSCROLLBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HSCROLLBAR))
-#define GTK_HSCROLLBAR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_HSCROLLBAR, GtkHScrollbarClass))
-
-
-typedef struct _GtkHScrollbar       GtkHScrollbar;
-typedef struct _GtkHScrollbarClass  GtkHScrollbarClass;
-
-struct _GtkHScrollbar
-{
-  GtkScrollbar scrollbar;
-};
-
-struct _GtkHScrollbarClass
-{
-  GtkScrollbarClass parent_class;
-};
-
-
-GType      gtk_hscrollbar_get_type (void) G_GNUC_CONST;
-GtkWidget* gtk_hscrollbar_new      (GtkAdjustment *adjustment);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_HSCROLLBAR_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhseparator.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhseparator.h
deleted file mode 100644
index 008a2fe4..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhseparator.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_HSEPARATOR_H__
-#define __GTK_HSEPARATOR_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkseparator.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_HSEPARATOR                  (gtk_hseparator_get_type ())
-#define GTK_HSEPARATOR(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HSEPARATOR, GtkHSeparator))
-#define GTK_HSEPARATOR_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_HSEPARATOR, GtkHSeparatorClass))
-#define GTK_IS_HSEPARATOR(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_HSEPARATOR))
-#define GTK_IS_HSEPARATOR_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HSEPARATOR))
-#define GTK_HSEPARATOR_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_HSEPARATOR, GtkHSeparatorClass))
-
-
-typedef struct _GtkHSeparator       GtkHSeparator;
-typedef struct _GtkHSeparatorClass  GtkHSeparatorClass;
-
-struct _GtkHSeparator
-{
-  GtkSeparator separator;
-};
-
-struct _GtkHSeparatorClass
-{
-  GtkSeparatorClass parent_class;
-};
-
-
-GType      gtk_hseparator_get_type (void) G_GNUC_CONST;
-GtkWidget* gtk_hseparator_new      (void);
-
-
-G_END_DECLS
-
-#endif /* __GTK_HSEPARATOR_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkiconfactory.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkiconfactory.h
deleted file mode 100644
index 1bcbcb40..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkiconfactory.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_ICON_FACTORY_H__
-#define __GTK_ICON_FACTORY_H__
-
-#include <gdk/gdk.h>
-#include <gtk/gtkrc.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GtkIconFactoryClass GtkIconFactoryClass;
-
-#define GTK_TYPE_ICON_FACTORY              (gtk_icon_factory_get_type ())
-#define GTK_ICON_FACTORY(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GTK_TYPE_ICON_FACTORY, GtkIconFactory))
-#define GTK_ICON_FACTORY_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ICON_FACTORY, GtkIconFactoryClass))
-#define GTK_IS_ICON_FACTORY(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GTK_TYPE_ICON_FACTORY))
-#define GTK_IS_ICON_FACTORY_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ICON_FACTORY))
-#define GTK_ICON_FACTORY_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ICON_FACTORY, GtkIconFactoryClass))
-#define GTK_TYPE_ICON_SET                  (gtk_icon_set_get_type ())
-#define GTK_TYPE_ICON_SOURCE               (gtk_icon_source_get_type ())
-
-struct _GtkIconFactory
-{
-  GObject parent_instance;
-
-  GHashTable *icons;
-};
-
-struct _GtkIconFactoryClass
-{
-  GObjectClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-#ifdef G_OS_WIN32
-/* Reserve old names for DLL ABI backward compatibility */
-#define gtk_icon_source_set_filename gtk_icon_source_set_filename_utf8
-#define gtk_icon_source_get_filename gtk_icon_source_get_filename_utf8
-#endif
-
-GType           gtk_icon_factory_get_type (void) G_GNUC_CONST;
-GtkIconFactory* gtk_icon_factory_new      (void);
-void            gtk_icon_factory_add      (GtkIconFactory *factory,
-                                           const gchar    *stock_id,
-                                           GtkIconSet     *icon_set);
-GtkIconSet*     gtk_icon_factory_lookup   (GtkIconFactory *factory,
-                                           const gchar    *stock_id);
-
-/* Manage the default icon factory stack */
-
-void        gtk_icon_factory_add_default     (GtkIconFactory  *factory);
-void        gtk_icon_factory_remove_default  (GtkIconFactory  *factory);
-GtkIconSet* gtk_icon_factory_lookup_default  (const gchar     *stock_id);
-
-/* Get preferred real size from registered semantic size.  Note that
- * themes SHOULD use this size, but they aren't required to; for size
- * requests and such, you should get the actual pixbuf from the icon
- * set and see what size was rendered.
- *
- * This function is intended for people who are scaling icons,
- * rather than for people who are displaying already-scaled icons.
- * That is, if you are displaying an icon, you should get the
- * size from the rendered pixbuf, not from here.
- */
-
-#ifndef GDK_MULTIHEAD_SAFE
-gboolean gtk_icon_size_lookup              (GtkIconSize  size,
-					    gint        *width,
-					    gint        *height);
-#endif /* GDK_MULTIHEAD_SAFE */
-gboolean gtk_icon_size_lookup_for_settings (GtkSettings *settings,
-					    GtkIconSize  size,
-					    gint        *width,
-					    gint        *height);
-
-GtkIconSize           gtk_icon_size_register       (const gchar *name,
-                                                    gint         width,
-                                                    gint         height);
-void                  gtk_icon_size_register_alias (const gchar *alias,
-                                                    GtkIconSize  target);
-GtkIconSize           gtk_icon_size_from_name      (const gchar *name);
-G_CONST_RETURN gchar* gtk_icon_size_get_name       (GtkIconSize  size);
-
-/* Icon sets */
-
-GType       gtk_icon_set_get_type        (void) G_GNUC_CONST;
-GtkIconSet* gtk_icon_set_new             (void);
-GtkIconSet* gtk_icon_set_new_from_pixbuf (GdkPixbuf       *pixbuf);
-
-GtkIconSet* gtk_icon_set_ref             (GtkIconSet      *icon_set);
-void        gtk_icon_set_unref           (GtkIconSet      *icon_set);
-GtkIconSet* gtk_icon_set_copy            (GtkIconSet      *icon_set);
-
-/* Get one of the icon variants in the set, creating the variant if
- * necessary.
- */
-GdkPixbuf*  gtk_icon_set_render_icon     (GtkIconSet      *icon_set,
-                                          GtkStyle        *style,
-                                          GtkTextDirection direction,
-                                          GtkStateType     state,
-                                          GtkIconSize      size,
-                                          GtkWidget       *widget,
-                                          const char      *detail);
-
-
-void           gtk_icon_set_add_source   (GtkIconSet          *icon_set,
-                                          const GtkIconSource *source);
-
-void           gtk_icon_set_get_sizes    (GtkIconSet          *icon_set,
-                                          GtkIconSize        **sizes,
-                                          gint                *n_sizes);
-
-GType          gtk_icon_source_get_type                 (void) G_GNUC_CONST;
-GtkIconSource* gtk_icon_source_new                      (void);
-GtkIconSource* gtk_icon_source_copy                     (const GtkIconSource *source);
-void           gtk_icon_source_free                     (GtkIconSource       *source);
-
-void           gtk_icon_source_set_filename             (GtkIconSource       *source,
-                                                         const gchar         *filename);
-void           gtk_icon_source_set_icon_name            (GtkIconSource       *source,
-                                                         const gchar         *icon_name);
-void           gtk_icon_source_set_pixbuf               (GtkIconSource       *source,
-                                                         GdkPixbuf           *pixbuf);
-
-G_CONST_RETURN gchar* gtk_icon_source_get_filename  (const GtkIconSource *source);
-G_CONST_RETURN gchar* gtk_icon_source_get_icon_name (const GtkIconSource *source);
-GdkPixbuf*            gtk_icon_source_get_pixbuf    (const GtkIconSource *source);
-
-void             gtk_icon_source_set_direction_wildcarded (GtkIconSource       *source,
-                                                           gboolean             setting);
-void             gtk_icon_source_set_state_wildcarded     (GtkIconSource       *source,
-                                                           gboolean             setting);
-void             gtk_icon_source_set_size_wildcarded      (GtkIconSource       *source,
-                                                           gboolean             setting);
-gboolean         gtk_icon_source_get_size_wildcarded      (const GtkIconSource *source);
-gboolean         gtk_icon_source_get_state_wildcarded     (const GtkIconSource *source);
-gboolean         gtk_icon_source_get_direction_wildcarded (const GtkIconSource *source);
-void             gtk_icon_source_set_direction            (GtkIconSource       *source,
-                                                           GtkTextDirection     direction);
-void             gtk_icon_source_set_state                (GtkIconSource       *source,
-                                                           GtkStateType         state);
-void             gtk_icon_source_set_size                 (GtkIconSource       *source,
-                                                           GtkIconSize          size);
-GtkTextDirection gtk_icon_source_get_direction            (const GtkIconSource *source);
-GtkStateType     gtk_icon_source_get_state                (const GtkIconSource *source);
-GtkIconSize      gtk_icon_source_get_size                 (const GtkIconSource *source);
-
-
-/* ignore this */
-void _gtk_icon_set_invalidate_caches (void);
-GList* _gtk_icon_factory_list_ids (void);
-void _gtk_icon_factory_ensure_default_icons (void);
-
-G_END_DECLS
-
-#endif /* __GTK_ICON_FACTORY_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkicontheme.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkicontheme.h
deleted file mode 100644
index 6b62bc51..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkicontheme.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/* GtkIconTheme - a loader for icon themes
- * gtk-icon-loader.h Copyright (C) 2002, 2003 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 __GTK_ICON_THEME_H__
-#define __GTK_ICON_THEME_H__
-
-#include <glib-object.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk/gdkscreen.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_ICON_INFO              (gtk_icon_info_get_type ())
-
-#define GTK_TYPE_ICON_THEME             (gtk_icon_theme_get_type ())
-#define GTK_ICON_THEME(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ICON_THEME, GtkIconTheme))
-#define GTK_ICON_THEME_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ICON_THEME, GtkIconThemeClass))
-#define GTK_IS_ICON_THEME(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ICON_THEME))
-#define GTK_IS_ICON_THEME_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ICON_THEME))
-#define GTK_ICON_THEME_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ICON_THEME, GtkIconThemeClass))
-
-typedef struct _GtkIconInfo         GtkIconInfo;
-typedef struct _GtkIconTheme        GtkIconTheme;
-typedef struct _GtkIconThemeClass   GtkIconThemeClass;
-typedef struct _GtkIconThemePrivate GtkIconThemePrivate;
-
-struct _GtkIconTheme
-{
-  /*< private >*/
-  GObject parent_instance;
-
-  GtkIconThemePrivate *priv;
-};
-
-struct _GtkIconThemeClass
-{
-  GObjectClass parent_class;
-
-  void (* changed)  (GtkIconTheme *icon_theme);
-};
-
-/**
- * GtkIconLookupFlags:
- * @GTK_ICON_LOOKUP_NO_SVG: Never return SVG icons, even if gdk-pixbuf
- *   supports them. Cannot be used together with %GTK_ICON_LOOKUP_FORCE_SVG.
- * @GTK_ICON_LOOKUP_FORCE_SVG: Return SVG icons, even if gdk-pixbuf
- *   doesn't support them.
- *   Cannot be used together with %GTK_ICON_LOOKUP_NO_SVG.
- * @GTK_ICON_LOOKUP_USE_BUILTIN: When passed to
- *   gtk_icon_theme_lookup_icon() includes builtin icons
- *   as well as files. For a builtin icon, gtk_icon_info_get_filename()
- *   returns %NULL and you need to call gtk_icon_info_get_builtin_pixbuf().
- * @GTK_ICON_LOOKUP_GENERIC_FALLBACK: Try to shorten icon name at '-'
- *   characters before looking at inherited themes. For more general
- *   fallback, see gtk_icon_theme_choose_icon(). Since 2.12.
- * 
- * Used to specify options for gtk_icon_theme_lookup_icon()
- **/
-typedef enum
-{
-  GTK_ICON_LOOKUP_NO_SVG = 1 << 0,
-  GTK_ICON_LOOKUP_FORCE_SVG = 1 << 1,
-  GTK_ICON_LOOKUP_USE_BUILTIN = 1 << 2,
-  GTK_ICON_LOOKUP_GENERIC_FALLBACK = 1 << 3
-} GtkIconLookupFlags;
-
-#define GTK_ICON_THEME_ERROR gtk_icon_theme_error_quark ()
-
-/**
- * GtkIconThemeError:
- * @GTK_ICON_THEME_NOT_FOUND: The icon specified does not exist in the theme
- * @GTK_ICON_THEME_FAILED: An unspecified error occurred.
- * 
- * Error codes for GtkIconTheme operations.
- **/
-typedef enum {
-  GTK_ICON_THEME_NOT_FOUND,
-  GTK_ICON_THEME_FAILED
-} GtkIconThemeError;
-
-GQuark gtk_icon_theme_error_quark (void);
-
-#ifdef G_OS_WIN32
-/* Reserve old name for DLL ABI backward compatibility */
-#define gtk_icon_theme_set_search_path gtk_icon_theme_set_search_path_utf8
-#define gtk_icon_theme_get_search_path gtk_icon_theme_get_search_path_utf8
-#define gtk_icon_theme_append_search_path gtk_icon_theme_append_search_path_utf8
-#define gtk_icon_theme_prepend_search_path gtk_icon_theme_prepend_search_path_utf8
-#define gtk_icon_info_get_filename gtk_icon_info_get_filename_utf8
-#endif
-
-GType         gtk_icon_theme_get_type              (void) G_GNUC_CONST;
-
-GtkIconTheme *gtk_icon_theme_new                   (void);
-GtkIconTheme *gtk_icon_theme_get_default           (void);
-GtkIconTheme *gtk_icon_theme_get_for_screen        (GdkScreen                   *screen);
-void          gtk_icon_theme_set_screen            (GtkIconTheme                *icon_theme,
-						    GdkScreen                   *screen);
-
-void          gtk_icon_theme_set_search_path       (GtkIconTheme                *icon_theme,
-						    const gchar                 *path[],
-						    gint                         n_elements);
-void          gtk_icon_theme_get_search_path       (GtkIconTheme                *icon_theme,
-						    gchar                      **path[],
-						    gint                        *n_elements);
-void          gtk_icon_theme_append_search_path    (GtkIconTheme                *icon_theme,
-						    const gchar                 *path);
-void          gtk_icon_theme_prepend_search_path   (GtkIconTheme                *icon_theme,
-						    const gchar                 *path);
-
-void          gtk_icon_theme_set_custom_theme      (GtkIconTheme                *icon_theme,
-						    const gchar                 *theme_name);
-
-gboolean      gtk_icon_theme_has_icon              (GtkIconTheme                *icon_theme,
-						    const gchar                 *icon_name);
-gint         *gtk_icon_theme_get_icon_sizes        (GtkIconTheme                *icon_theme,
-						    const gchar                 *icon_name);
-GtkIconInfo * gtk_icon_theme_lookup_icon           (GtkIconTheme                *icon_theme,
-						    const gchar                 *icon_name,
-						    gint                         size,
-						    GtkIconLookupFlags           flags);
-GtkIconInfo * gtk_icon_theme_choose_icon           (GtkIconTheme                *icon_theme,
-						    const gchar                 *icon_names[],
-						    gint                         size,
-						    GtkIconLookupFlags           flags);
-GdkPixbuf *   gtk_icon_theme_load_icon             (GtkIconTheme                *icon_theme,
-						    const gchar                 *icon_name,
-						    gint                         size,
-						    GtkIconLookupFlags           flags,
-						    GError                     **error);
-
-GList *       gtk_icon_theme_list_icons            (GtkIconTheme                *icon_theme,
-						    const gchar                 *context);
-GList *       gtk_icon_theme_list_contexts         (GtkIconTheme                *icon_theme);
-char *        gtk_icon_theme_get_example_icon_name (GtkIconTheme                *icon_theme);
-
-gboolean      gtk_icon_theme_rescan_if_needed      (GtkIconTheme                *icon_theme);
-
-void       gtk_icon_theme_add_builtin_icon  (const gchar *icon_name,
-					     gint         size,
-					     GdkPixbuf   *pixbuf);
-
-GType         gtk_icon_info_get_type (void) G_GNUC_CONST;
-GtkIconInfo  *gtk_icon_info_copy     (GtkIconInfo *icon_info);
-void          gtk_icon_info_free     (GtkIconInfo *icon_info);
-
-gint                  gtk_icon_info_get_base_size      (GtkIconInfo *icon_info);
-G_CONST_RETURN gchar *gtk_icon_info_get_filename       (GtkIconInfo *icon_info);
-GdkPixbuf    *        gtk_icon_info_get_builtin_pixbuf (GtkIconInfo *icon_info);
-GdkPixbuf    *        gtk_icon_info_load_icon          (GtkIconInfo *icon_info,
-							GError     **error);
-
-void                  gtk_icon_info_set_raw_coordinates (GtkIconInfo *icon_info,
-							 gboolean     raw_coordinates);
-
-gboolean              gtk_icon_info_get_embedded_rect (GtkIconInfo   *icon_info,
-						       GdkRectangle  *rectangle);
-gboolean              gtk_icon_info_get_attach_points (GtkIconInfo   *icon_info,
-						       GdkPoint     **points,
-						       gint          *n_points);
-G_CONST_RETURN gchar *gtk_icon_info_get_display_name  (GtkIconInfo   *icon_info);
-
-/* Non-public methods */
-void _gtk_icon_theme_check_reload                     (GdkDisplay *display);
-void _gtk_icon_theme_ensure_builtin_cache             (void);
-
-G_END_DECLS
-
-#endif /* __GTK_ICON_THEME_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkiconview.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkiconview.h
deleted file mode 100644
index 66acd5fd..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkiconview.h
+++ /dev/null
@@ -1,227 +0,0 @@
-/* gtkiconview.h
- * Copyright (C) 2002, 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 __GTK_ICON_VIEW_H__
-#define __GTK_ICON_VIEW_H__
-
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtkcellrenderer.h>
-#include <gtk/gtkselection.h>
-#include <gtk/gtktooltip.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_ICON_VIEW		(gtk_icon_view_get_type ())
-#define GTK_ICON_VIEW(obj)		(GTK_CHECK_CAST ((obj), GTK_TYPE_ICON_VIEW, GtkIconView))
-#define GTK_ICON_VIEW_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_ICON_VIEW, GtkIconViewClass))
-#define GTK_IS_ICON_VIEW(obj)		(GTK_CHECK_TYPE ((obj), GTK_TYPE_ICON_VIEW))
-#define GTK_IS_ICON_VIEW_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ICON_VIEW))
-#define GTK_ICON_VIEW_GET_CLASS(obj)    (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_ICON_VIEW, GtkIconViewClass))
-
-typedef struct _GtkIconView           GtkIconView;
-typedef struct _GtkIconViewClass      GtkIconViewClass;
-typedef struct _GtkIconViewPrivate    GtkIconViewPrivate;
-
-typedef void (* GtkIconViewForeachFunc)     (GtkIconView      *icon_view,
-					     GtkTreePath      *path,
-					     gpointer          data);
-
-typedef enum
-{
-  GTK_ICON_VIEW_NO_DROP,
-  GTK_ICON_VIEW_DROP_INTO,
-  GTK_ICON_VIEW_DROP_LEFT,
-  GTK_ICON_VIEW_DROP_RIGHT,
-  GTK_ICON_VIEW_DROP_ABOVE,
-  GTK_ICON_VIEW_DROP_BELOW
-} GtkIconViewDropPosition;
-
-struct _GtkIconView
-{
-  GtkContainer parent;
-
-  GtkIconViewPrivate *priv;
-};
-
-struct _GtkIconViewClass
-{
-  GtkContainerClass parent_class;
-
-  void    (* set_scroll_adjustments) (GtkIconView      *icon_view,
-				      GtkAdjustment    *hadjustment,
-				      GtkAdjustment    *vadjustment);
-  
-  void    (* item_activated)         (GtkIconView      *icon_view,
-				      GtkTreePath      *path);
-  void    (* selection_changed)      (GtkIconView      *icon_view);
-
-  /* Key binding signals */
-  void    (* select_all)             (GtkIconView      *icon_view);
-  void    (* unselect_all)           (GtkIconView      *icon_view);
-  void    (* select_cursor_item)     (GtkIconView      *icon_view);
-  void    (* toggle_cursor_item)     (GtkIconView      *icon_view);
-  gboolean (* move_cursor)           (GtkIconView      *icon_view,
-				      GtkMovementStep   step,
-				      gint              count);
-  gboolean (* activate_cursor_item)  (GtkIconView      *icon_view);
-};
-
-GType          gtk_icon_view_get_type          (void) G_GNUC_CONST;
-GtkWidget *    gtk_icon_view_new               (void);
-GtkWidget *    gtk_icon_view_new_with_model    (GtkTreeModel   *model);
-
-void           gtk_icon_view_set_model         (GtkIconView    *icon_view,
- 					        GtkTreeModel   *model);
-GtkTreeModel * gtk_icon_view_get_model         (GtkIconView    *icon_view);
-void           gtk_icon_view_set_text_column   (GtkIconView    *icon_view,
-	 	 			        gint            column);
-gint           gtk_icon_view_get_text_column   (GtkIconView    *icon_view);
-void           gtk_icon_view_set_markup_column (GtkIconView    *icon_view,
-					        gint            column);
-gint           gtk_icon_view_get_markup_column (GtkIconView    *icon_view);
-void           gtk_icon_view_set_pixbuf_column (GtkIconView    *icon_view,
-					        gint            column);
-gint           gtk_icon_view_get_pixbuf_column (GtkIconView    *icon_view);
-
-void           gtk_icon_view_set_orientation   (GtkIconView    *icon_view,
-	   			                GtkOrientation  orientation);
-GtkOrientation gtk_icon_view_get_orientation   (GtkIconView    *icon_view);
-void           gtk_icon_view_set_columns       (GtkIconView    *icon_view,
-		 			        gint            columns);
-gint           gtk_icon_view_get_columns       (GtkIconView    *icon_view);
-void           gtk_icon_view_set_item_width    (GtkIconView    *icon_view,
-					        gint            item_width);
-gint           gtk_icon_view_get_item_width    (GtkIconView    *icon_view);
-void           gtk_icon_view_set_spacing       (GtkIconView    *icon_view, 
-		 			        gint            spacing);
-gint           gtk_icon_view_get_spacing       (GtkIconView    *icon_view);
-void           gtk_icon_view_set_row_spacing   (GtkIconView    *icon_view, 
-					        gint            row_spacing);
-gint           gtk_icon_view_get_row_spacing   (GtkIconView    *icon_view);
-void           gtk_icon_view_set_column_spacing (GtkIconView    *icon_view, 
-					        gint            column_spacing);
-gint           gtk_icon_view_get_column_spacing (GtkIconView    *icon_view);
-void           gtk_icon_view_set_margin        (GtkIconView    *icon_view, 
-					        gint            margin);
-gint           gtk_icon_view_get_margin        (GtkIconView    *icon_view);
-
-
-GtkTreePath *  gtk_icon_view_get_path_at_pos   (GtkIconView     *icon_view,
-						gint             x,
-						gint             y);
-gboolean       gtk_icon_view_get_item_at_pos   (GtkIconView     *icon_view,
-						gint              x,
-						gint              y,
-						GtkTreePath     **path,
-						GtkCellRenderer **cell);
-gboolean       gtk_icon_view_get_visible_range (GtkIconView      *icon_view,
-						GtkTreePath     **start_path,
-						GtkTreePath     **end_path);
-
-void           gtk_icon_view_selected_foreach   (GtkIconView            *icon_view,
-						 GtkIconViewForeachFunc  func,
-						 gpointer                data);
-void           gtk_icon_view_set_selection_mode (GtkIconView            *icon_view,
-						 GtkSelectionMode        mode);
-GtkSelectionMode gtk_icon_view_get_selection_mode (GtkIconView            *icon_view);
-void             gtk_icon_view_select_path        (GtkIconView            *icon_view,
-						   GtkTreePath            *path);
-void             gtk_icon_view_unselect_path      (GtkIconView            *icon_view,
-						   GtkTreePath            *path);
-gboolean         gtk_icon_view_path_is_selected   (GtkIconView            *icon_view,
-						   GtkTreePath            *path);
-GList           *gtk_icon_view_get_selected_items (GtkIconView            *icon_view);
-void             gtk_icon_view_select_all         (GtkIconView            *icon_view);
-void             gtk_icon_view_unselect_all       (GtkIconView            *icon_view);
-void             gtk_icon_view_item_activated     (GtkIconView            *icon_view,
-						   GtkTreePath            *path);
-void             gtk_icon_view_set_cursor         (GtkIconView            *icon_view,
-						   GtkTreePath            *path,
-						   GtkCellRenderer        *cell,
-						   gboolean                start_editing);
-gboolean         gtk_icon_view_get_cursor         (GtkIconView            *icon_view,
-						   GtkTreePath           **path,
-						   GtkCellRenderer       **cell);
-void             gtk_icon_view_scroll_to_path     (GtkIconView            *icon_view,
-                                                   GtkTreePath            *path,
-						   gboolean                use_align,
-						   gfloat                  row_align,
-                                                   gfloat                  col_align);
-
-/* Drag-and-Drop support */
-void                   gtk_icon_view_enable_model_drag_source (GtkIconView              *icon_view,
-							       GdkModifierType           start_button_mask,
-							       const GtkTargetEntry     *targets,
-							       gint                      n_targets,
-							       GdkDragAction             actions);
-void                   gtk_icon_view_enable_model_drag_dest   (GtkIconView              *icon_view,
-							       const GtkTargetEntry     *targets,
-							       gint                      n_targets,
-							       GdkDragAction             actions);
-void                   gtk_icon_view_unset_model_drag_source  (GtkIconView              *icon_view);
-void                   gtk_icon_view_unset_model_drag_dest    (GtkIconView              *icon_view);
-void                   gtk_icon_view_set_reorderable          (GtkIconView              *icon_view,
-							       gboolean                  reorderable);
-gboolean               gtk_icon_view_get_reorderable          (GtkIconView              *icon_view);
-
-
-/* These are useful to implement your own custom stuff. */
-void                   gtk_icon_view_set_drag_dest_item       (GtkIconView              *icon_view,
-							       GtkTreePath              *path,
-							       GtkIconViewDropPosition   pos);
-void                   gtk_icon_view_get_drag_dest_item       (GtkIconView              *icon_view,
-							       GtkTreePath             **path,
-							       GtkIconViewDropPosition  *pos);
-gboolean               gtk_icon_view_get_dest_item_at_pos     (GtkIconView              *icon_view,
-							       gint                      drag_x,
-							       gint                      drag_y,
-							       GtkTreePath             **path,
-							       GtkIconViewDropPosition  *pos);
-GdkPixmap             *gtk_icon_view_create_drag_icon         (GtkIconView              *icon_view,
-							       GtkTreePath              *path);
-
-void    gtk_icon_view_convert_widget_to_bin_window_coords     (GtkIconView *icon_view,
-                                                               gint         wx,
-                                                               gint         wy,
-                                                               gint        *bx,
-                                                               gint        *by);
-
-
-void    gtk_icon_view_set_tooltip_item                        (GtkIconView     *icon_view,
-                                                               GtkTooltip      *tooltip,
-                                                               GtkTreePath     *path);
-void    gtk_icon_view_set_tooltip_cell                        (GtkIconView     *icon_view,
-                                                               GtkTooltip      *tooltip,
-                                                               GtkTreePath     *path,
-                                                               GtkCellRenderer *cell);
-gboolean gtk_icon_view_get_tooltip_context                    (GtkIconView       *icon_view,
-                                                               gint              *x,
-                                                               gint              *y,
-                                                               gboolean           keyboard_tip,
-                                                               GtkTreeModel     **model,
-                                                               GtkTreePath      **path,
-                                                               GtkTreeIter       *iter);
-void     gtk_icon_view_set_tooltip_column                     (GtkIconView       *icon_view,
-                                                               gint               column);
-gint     gtk_icon_view_get_tooltip_column                     (GtkIconView       *icon_view);
-
-
-G_END_DECLS
-
-#endif /* __GTK_ICON_VIEW_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkimage.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkimage.h
deleted file mode 100644
index e1b061cc..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkimage.h
+++ /dev/null
@@ -1,224 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_IMAGE_H__
-#define __GTK_IMAGE_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkmisc.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_IMAGE                  (gtk_image_get_type ())
-#define GTK_IMAGE(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IMAGE, GtkImage))
-#define GTK_IMAGE_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_IMAGE, GtkImageClass))
-#define GTK_IS_IMAGE(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_IMAGE))
-#define GTK_IS_IMAGE_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IMAGE))
-#define GTK_IMAGE_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_IMAGE, GtkImageClass))
-
-
-typedef struct _GtkImage       GtkImage;
-typedef struct _GtkImageClass  GtkImageClass;
-
-typedef struct _GtkImagePixmapData  GtkImagePixmapData;
-typedef struct _GtkImageImageData   GtkImageImageData;
-typedef struct _GtkImagePixbufData  GtkImagePixbufData;
-typedef struct _GtkImageStockData   GtkImageStockData;
-typedef struct _GtkImageIconSetData GtkImageIconSetData;
-typedef struct _GtkImageAnimationData GtkImageAnimationData;
-typedef struct _GtkImageIconNameData  GtkImageIconNameData;
-
-struct _GtkImagePixmapData
-{
-  GdkPixmap *pixmap;
-};
-
-struct _GtkImageImageData
-{
-  GdkImage *image;
-};
-
-struct _GtkImagePixbufData
-{
-  GdkPixbuf *pixbuf;
-};
-
-struct _GtkImageStockData
-{
-  gchar *stock_id;
-};
-
-struct _GtkImageIconSetData
-{
-  GtkIconSet *icon_set;
-};
-
-struct _GtkImageAnimationData
-{
-  GdkPixbufAnimation *anim;
-  GdkPixbufAnimationIter *iter;
-  guint frame_timeout;
-};
-
-struct _GtkImageIconNameData
-{
-  gchar *icon_name;
-  GdkPixbuf *pixbuf;
-  guint theme_change_id;
-};
-
-typedef enum
-{
-  GTK_IMAGE_EMPTY,
-  GTK_IMAGE_PIXMAP,
-  GTK_IMAGE_IMAGE,
-  GTK_IMAGE_PIXBUF,
-  GTK_IMAGE_STOCK,
-  GTK_IMAGE_ICON_SET,
-  GTK_IMAGE_ANIMATION,
-  GTK_IMAGE_ICON_NAME
-} GtkImageType;
-
-struct _GtkImage
-{
-  GtkMisc misc;
-
-  GtkImageType storage_type;
-  
-  union
-  {
-    GtkImagePixmapData pixmap;
-    GtkImageImageData image;
-    GtkImagePixbufData pixbuf;
-    GtkImageStockData stock;
-    GtkImageIconSetData icon_set;
-    GtkImageAnimationData anim;
-    GtkImageIconNameData name;
-  } data;
-
-  /* Only used with GTK_IMAGE_PIXMAP, GTK_IMAGE_IMAGE */
-  GdkBitmap *mask;
-
-  /* Only used with GTK_IMAGE_STOCK, GTK_IMAGE_ICON_SET, GTK_IMAGE_ICON_NAME */
-  GtkIconSize icon_size;
-};
-
-struct _GtkImageClass
-{
-  GtkMiscClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-#ifdef G_OS_WIN32
-/* Reserve old names for DLL ABI backward compatibility */
-#define gtk_image_new_from_file gtk_image_new_from_file_utf8
-#define gtk_image_set_from_file gtk_image_set_from_file_utf8
-#endif
-
-GType      gtk_image_get_type (void) G_GNUC_CONST;
-
-GtkWidget* gtk_image_new                (void);
-GtkWidget* gtk_image_new_from_pixmap    (GdkPixmap       *pixmap,
-                                         GdkBitmap       *mask);
-GtkWidget* gtk_image_new_from_image     (GdkImage        *image,
-                                         GdkBitmap       *mask);
-GtkWidget* gtk_image_new_from_file      (const gchar     *filename);
-GtkWidget* gtk_image_new_from_pixbuf    (GdkPixbuf       *pixbuf);
-GtkWidget* gtk_image_new_from_stock     (const gchar     *stock_id,
-                                         GtkIconSize      size);
-GtkWidget* gtk_image_new_from_icon_set  (GtkIconSet      *icon_set,
-                                         GtkIconSize      size);
-GtkWidget* gtk_image_new_from_animation (GdkPixbufAnimation *animation);
-GtkWidget* gtk_image_new_from_icon_name (const gchar     *icon_name,
-					 GtkIconSize      size);
-
-void gtk_image_clear              (GtkImage        *image);
-void gtk_image_set_from_pixmap    (GtkImage        *image,
-                                   GdkPixmap       *pixmap,
-                                   GdkBitmap       *mask);
-void gtk_image_set_from_image     (GtkImage        *image,
-                                   GdkImage        *gdk_image,
-                                   GdkBitmap       *mask);
-void gtk_image_set_from_file      (GtkImage        *image,
-                                   const gchar     *filename);
-void gtk_image_set_from_pixbuf    (GtkImage        *image,
-                                   GdkPixbuf       *pixbuf);
-void gtk_image_set_from_stock     (GtkImage        *image,
-                                   const gchar     *stock_id,
-                                   GtkIconSize      size);
-void gtk_image_set_from_icon_set  (GtkImage        *image,
-                                   GtkIconSet      *icon_set,
-                                   GtkIconSize      size);
-void gtk_image_set_from_animation (GtkImage           *image,
-                                   GdkPixbufAnimation *animation);
-void gtk_image_set_from_icon_name (GtkImage        *image,
-				   const gchar     *icon_name,
-				   GtkIconSize      size);
-void gtk_image_set_pixel_size     (GtkImage        *image,
-				   gint             pixel_size);
-
-GtkImageType gtk_image_get_storage_type (GtkImage   *image);
-
-void       gtk_image_get_pixmap   (GtkImage         *image,
-                                   GdkPixmap       **pixmap,
-                                   GdkBitmap       **mask);
-void       gtk_image_get_image    (GtkImage         *image,
-                                   GdkImage        **gdk_image,
-                                   GdkBitmap       **mask);
-GdkPixbuf* gtk_image_get_pixbuf   (GtkImage         *image);
-void       gtk_image_get_stock    (GtkImage         *image,
-                                   gchar           **stock_id,
-                                   GtkIconSize      *size);
-void       gtk_image_get_icon_set (GtkImage         *image,
-                                   GtkIconSet      **icon_set,
-                                   GtkIconSize      *size);
-GdkPixbufAnimation* gtk_image_get_animation (GtkImage *image);
-void       gtk_image_get_icon_name (GtkImage              *image,
-				    G_CONST_RETURN gchar **icon_name,
-				    GtkIconSize           *size);
-gint       gtk_image_get_pixel_size (GtkImage             *image);
-
-#ifndef GTK_DISABLE_DEPRECATED
-/* These three are deprecated */
-
-void       gtk_image_set      (GtkImage   *image,
-			       GdkImage   *val,
-			       GdkBitmap  *mask);
-void       gtk_image_get      (GtkImage   *image,
-			       GdkImage  **val,
-			       GdkBitmap **mask);
-#endif /* GTK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GTK_IMAGE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkimagemenuitem.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkimagemenuitem.h
deleted file mode 100644
index f70df311..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkimagemenuitem.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 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.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_IMAGE_MENU_ITEM_H__
-#define __GTK_IMAGE_MENU_ITEM_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkmenuitem.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_IMAGE_MENU_ITEM            (gtk_image_menu_item_get_type ())
-#define GTK_IMAGE_MENU_ITEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IMAGE_MENU_ITEM, GtkImageMenuItem))
-#define GTK_IMAGE_MENU_ITEM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_IMAGE_MENU_ITEM, GtkImageMenuItemClass))
-#define GTK_IS_IMAGE_MENU_ITEM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_IMAGE_MENU_ITEM))
-#define GTK_IS_IMAGE_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IMAGE_MENU_ITEM))
-#define GTK_IMAGE_MENU_ITEM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_IMAGE_MENU_ITEM, GtkImageMenuItemClass))
-
-
-typedef struct _GtkImageMenuItem       GtkImageMenuItem;
-typedef struct _GtkImageMenuItemClass  GtkImageMenuItemClass;
-
-struct _GtkImageMenuItem
-{
-  GtkMenuItem menu_item;
-
-  /*< private >*/
-  GtkWidget *image;
-};
-
-struct _GtkImageMenuItemClass
-{
-  GtkMenuItemClass parent_class;
-};
-
-
-GType	   gtk_image_menu_item_get_type          (void) G_GNUC_CONST;
-GtkWidget* gtk_image_menu_item_new               (void);
-GtkWidget* gtk_image_menu_item_new_with_label    (const gchar      *label);
-GtkWidget* gtk_image_menu_item_new_with_mnemonic (const gchar      *label);
-GtkWidget* gtk_image_menu_item_new_from_stock    (const gchar      *stock_id,
-                                                  GtkAccelGroup    *accel_group);
-void       gtk_image_menu_item_set_image         (GtkImageMenuItem *image_menu_item,
-                                                  GtkWidget        *image);
-GtkWidget* gtk_image_menu_item_get_image         (GtkImageMenuItem *image_menu_item);
-
-G_END_DECLS
-
-#endif /* __GTK_IMAGE_MENU_ITEM_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkimcontext.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkimcontext.h
deleted file mode 100644
index ae4a7107..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkimcontext.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2000 Red Hat Software
- *
- * 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 __GTK_IM_CONTEXT_H__
-#define __GTK_IM_CONTEXT_H__
-
-#include <gdk/gdk.h>
-#include <gtk/gtkobject.h>
-#include <pango/pango.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_IM_CONTEXT              (gtk_im_context_get_type ())
-#define GTK_IM_CONTEXT(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IM_CONTEXT, GtkIMContext))
-#define GTK_IM_CONTEXT_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_IM_CONTEXT, GtkIMContextClass))
-#define GTK_IS_IM_CONTEXT(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_IM_CONTEXT))
-#define GTK_IS_IM_CONTEXT_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IM_CONTEXT))
-#define GTK_IM_CONTEXT_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_IM_CONTEXT, GtkIMContextClass))
-
-
-typedef struct _GtkIMContext       GtkIMContext;
-typedef struct _GtkIMContextClass  GtkIMContextClass;
-
-struct _GtkIMContext
-{
-  GObject parent_instance;
-};
-
-struct _GtkIMContextClass
-{
-  /* Yes, this should be GObjectClass, be we can't fix it without breaking
-   * binary compatibility - see bug #90935
-   */
-  GtkObjectClass parent_class;
-
-  /* Signals */
-  void     (*preedit_start)        (GtkIMContext *context);
-  void     (*preedit_end)          (GtkIMContext *context);
-  void     (*preedit_changed)      (GtkIMContext *context);
-  void     (*commit)               (GtkIMContext *context, const gchar *str);
-  gboolean (*retrieve_surrounding) (GtkIMContext *context);
-  gboolean (*delete_surrounding)   (GtkIMContext *context,
-				    gint          offset,
-				    gint          n_chars);
-
-  /* Virtual functions */
-  void     (*set_client_window)   (GtkIMContext   *context,
-				   GdkWindow      *window);
-  void     (*get_preedit_string)  (GtkIMContext   *context,
-				   gchar         **str,
-				   PangoAttrList **attrs,
-				   gint           *cursor_pos);
-  gboolean (*filter_keypress)     (GtkIMContext   *context,
-			           GdkEventKey    *event);
-  void     (*focus_in)            (GtkIMContext   *context);
-  void     (*focus_out)           (GtkIMContext   *context);
-  void     (*reset)               (GtkIMContext   *context);
-  void     (*set_cursor_location) (GtkIMContext   *context,
-				   GdkRectangle   *area);
-  void     (*set_use_preedit)     (GtkIMContext   *context,
-				   gboolean        use_preedit);
-  void     (*set_surrounding)     (GtkIMContext   *context,
-				   const gchar    *text,
-				   gint            len,
-				   gint            cursor_index);
-  gboolean (*get_surrounding)     (GtkIMContext   *context,
-				   gchar         **text,
-				   gint           *cursor_index);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-  void (*_gtk_reserved5) (void);
-  void (*_gtk_reserved6) (void);
-};
-
-GType    gtk_im_context_get_type            (void) G_GNUC_CONST;
-
-void     gtk_im_context_set_client_window   (GtkIMContext   *context,
-					     GdkWindow      *window);
-void     gtk_im_context_get_preedit_string  (GtkIMContext   *context,
-					     gchar         **str,
-					     PangoAttrList **attrs,
-					     gint           *cursor_pos);
-gboolean gtk_im_context_filter_keypress     (GtkIMContext   *context,
-					     GdkEventKey    *event);
-void     gtk_im_context_focus_in            (GtkIMContext   *context);
-void     gtk_im_context_focus_out           (GtkIMContext   *context);
-void     gtk_im_context_reset               (GtkIMContext   *context);
-void     gtk_im_context_set_cursor_location (GtkIMContext   *context,
-					     GdkRectangle   *area);
-void     gtk_im_context_set_use_preedit     (GtkIMContext   *context,
-					     gboolean        use_preedit);
-void     gtk_im_context_set_surrounding     (GtkIMContext   *context,
-					     const gchar    *text,
-					     gint            len,
-					     gint            cursor_index);
-gboolean gtk_im_context_get_surrounding     (GtkIMContext   *context,
-					     gchar         **text,
-					     gint           *cursor_index);
-gboolean gtk_im_context_delete_surrounding  (GtkIMContext   *context,
-					     gint            offset,
-					     gint            n_chars);
-
-G_END_DECLS
-
-#endif /* __GTK_IM_CONTEXT_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkimcontextsimple.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkimcontextsimple.h
deleted file mode 100644
index 1378c43d..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkimcontextsimple.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2000 Red Hat Software
- *
- * 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 __GTK_IM_CONTEXT_SIMPLE_H__
-#define __GTK_IM_CONTEXT_SIMPLE_H__
-
-#include <gtk/gtkimcontext.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_IM_CONTEXT_SIMPLE              (gtk_im_context_simple_get_type ())
-#define GTK_IM_CONTEXT_SIMPLE(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IM_CONTEXT_SIMPLE, GtkIMContextSimple))
-#define GTK_IM_CONTEXT_SIMPLE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_IM_CONTEXT_SIMPLE, GtkIMContextSimpleClass))
-#define GTK_IS_IM_CONTEXT_SIMPLE(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_IM_CONTEXT_SIMPLE))
-#define GTK_IS_IM_CONTEXT_SIMPLE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IM_CONTEXT_SIMPLE))
-#define GTK_IM_CONTEXT_SIMPLE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_IM_CONTEXT_SIMPLE, GtkIMContextSimpleClass))
-
-
-typedef struct _GtkIMContextSimple       GtkIMContextSimple;
-typedef struct _GtkIMContextSimpleClass  GtkIMContextSimpleClass;
-
-#define GTK_MAX_COMPOSE_LEN 7
-  
-struct _GtkIMContextSimple
-{
-  GtkIMContext object;
-
-  GSList *tables;
-  
-  guint compose_buffer[GTK_MAX_COMPOSE_LEN + 1];
-  gunichar tentative_match;
-  gint tentative_match_len;
-
-  guint in_hex_sequence : 1;
-  guint modifiers_dropped : 1;
-};
-
-struct _GtkIMContextSimpleClass
-{
-  GtkIMContextClass parent_class;
-};
-
-GType         gtk_im_context_simple_get_type  (void) G_GNUC_CONST;
-GtkIMContext *gtk_im_context_simple_new       (void);
-
-void          gtk_im_context_simple_add_table (GtkIMContextSimple *context_simple,
-					       guint16            *data,
-					       gint                max_seq_len,
-					       gint                n_seqs);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_IM_CONTEXT_SIMPLE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkimmodule.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkimmodule.h
deleted file mode 100644
index a6e3a2d3..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkimmodule.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2000 Red Hat Software
- *
- * 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 __GTK_IM_MODULE_H__
-#define __GTK_IM_MODULE_H__
-
-
-#include <gtk/gtkimcontext.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GtkIMContextInfo GtkIMContextInfo;
-
-struct _GtkIMContextInfo 
-{
-  const gchar *context_id;
-  const gchar *context_name;
-  const gchar *domain;
-  const gchar *domain_dirname;
-  const gchar *default_locales;
-};
-
-/* Functions for use within GTK+
- */
-void           _gtk_im_module_list                   (const GtkIMContextInfo ***contexts,
-						      guint                    *n_contexts);
-GtkIMContext * _gtk_im_module_create                 (const gchar              *context_id);
-const gchar  * _gtk_im_module_get_default_context_id (GdkWindow                *client_window);
-
-/* The following entry points are exported by each input method module
- */
-
-/*
-void          im_module_list   (const GtkIMContextInfo ***contexts,
-				guint                    *n_contexts);
-void          im_module_init   (GtkModule             *module);
-void          im_module_exit   (void);
-GtkIMContext *im_module_create (const gchar             *context_id);
-*/
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_IM_MODULE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkimmulticontext.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkimmulticontext.h
deleted file mode 100644
index aa410f17..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkimmulticontext.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2000 Red Hat Software
- *
- * 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 __GTK_IM_MULTICONTEXT_H__
-#define __GTK_IM_MULTICONTEXT_H__
-
-#include <gtk/gtkimcontext.h>
-#include <gtk/gtkmenushell.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_IM_MULTICONTEXT              (gtk_im_multicontext_get_type ())
-#define GTK_IM_MULTICONTEXT(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IM_MULTICONTEXT, GtkIMMulticontext))
-#define GTK_IM_MULTICONTEXT_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_IM_MULTICONTEXT, GtkIMMulticontextClass))
-#define GTK_IS_IM_MULTICONTEXT(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_IM_MULTICONTEXT))
-#define GTK_IS_IM_MULTICONTEXT_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IM_MULTICONTEXT))
-#define GTK_IM_MULTICONTEXT_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_IM_MULTICONTEXT, GtkIMMulticontextClass))
-
-
-typedef struct _GtkIMMulticontext        GtkIMMulticontext;
-typedef struct _GtkIMMulticontextClass   GtkIMMulticontextClass;
-typedef struct _GtkIMMulticontextPrivate GtkIMMulticontextPrivate;
-
-struct _GtkIMMulticontext
-{
-  GtkIMContext object;
-
-  GtkIMContext *slave;
-
-  GtkIMMulticontextPrivate *priv;
-
-  gchar *context_id;
-};
-
-struct _GtkIMMulticontextClass
-{
-  GtkIMContextClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType         gtk_im_multicontext_get_type (void) G_GNUC_CONST;
-GtkIMContext *gtk_im_multicontext_new      (void);
-
-void          gtk_im_multicontext_append_menuitems (GtkIMMulticontext *context,
-						    GtkMenuShell      *menushell);
-
-G_END_DECLS
-
-#endif /* __GTK_IM_MULTICONTEXT_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkinputdialog.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkinputdialog.h
deleted file mode 100644
index 1a1a6489..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkinputdialog.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-/*
- * NOTE this widget is considered too specialized/little-used for
- * GTK+, and will in the future be moved to some other package.  If
- * your application needs this widget, feel free to use it, as the
- * widget does work and is useful in some applications; it's just not
- * of general interest. However, we are not accepting new features for
- * the widget, and it will eventually move out of the GTK+
- * distribution.
- */
-
-#ifndef __GTK_INPUTDIALOG_H__
-#define __GTK_INPUTDIALOG_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkdialog.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_INPUT_DIALOG              (gtk_input_dialog_get_type ())
-#define GTK_INPUT_DIALOG(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_INPUT_DIALOG, GtkInputDialog))
-#define GTK_INPUT_DIALOG_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_INPUT_DIALOG, GtkInputDialogClass))
-#define GTK_IS_INPUT_DIALOG(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_INPUT_DIALOG))
-#define GTK_IS_INPUT_DIALOG_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_INPUT_DIALOG))
-#define GTK_INPUT_DIALOG_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_INPUT_DIALOG, GtkInputDialogClass))
-
-
-typedef struct _GtkInputDialog       GtkInputDialog;
-typedef struct _GtkInputDialogClass  GtkInputDialogClass;
-
-struct _GtkInputDialog
-{
-  GtkDialog dialog;
-
-  GtkWidget *axis_list;
-  GtkWidget *axis_listbox;
-  GtkWidget *mode_optionmenu;
-
-  GtkWidget *close_button;
-  GtkWidget *save_button;
-  
-  GtkWidget *axis_items[GDK_AXIS_LAST];
-  GdkDevice *current_device;
-
-  GtkWidget *keys_list;
-  GtkWidget *keys_listbox;
-};
-
-struct _GtkInputDialogClass
-{
-  GtkDialogClass parent_class;
-
-  void (* enable_device)               (GtkInputDialog    *inputd,
-					GdkDevice         *device);
-  void (* disable_device)              (GtkInputDialog    *inputd,
-					GdkDevice         *device);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType      gtk_input_dialog_get_type     (void) G_GNUC_CONST;
-GtkWidget* gtk_input_dialog_new          (void);
-
-
-G_END_DECLS
-
-#endif /* __GTK_INPUTDIALOG_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkinvisible.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkinvisible.h
deleted file mode 100644
index ad0ad4c2..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkinvisible.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_INVISIBLE_H__
-#define __GTK_INVISIBLE_H__
-
-#include <gtk/gtkwidget.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_INVISIBLE		(gtk_invisible_get_type ())
-#define GTK_INVISIBLE(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_INVISIBLE, GtkInvisible))
-#define GTK_INVISIBLE_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_INVISIBLE, GtkInvisibleClass))
-#define GTK_IS_INVISIBLE(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_INVISIBLE))
-#define GTK_IS_INVISIBLE_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_INVISIBLE))
-#define GTK_INVISIBLE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_INVISIBLE, GtkInvisibleClass))
-
-
-typedef struct _GtkInvisible	   GtkInvisible;
-typedef struct _GtkInvisibleClass  GtkInvisibleClass;
-
-struct _GtkInvisible
-{
-  GtkWidget widget;
-  gboolean has_user_ref_count;
-  GdkScreen *screen;
-};
-
-struct _GtkInvisibleClass
-{
-  GtkWidgetClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType gtk_invisible_get_type (void) G_GNUC_CONST;
-
-GtkWidget* gtk_invisible_new            (void);
-GtkWidget* gtk_invisible_new_for_screen (GdkScreen *screen);
-void	   gtk_invisible_set_screen	(GtkInvisible *invisible,
-					 GdkScreen    *screen);
-GdkScreen* gtk_invisible_get_screen	(GtkInvisible *invisible);
-
-G_END_DECLS
-
-#endif /* __GTK_INVISIBLE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkitem.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkitem.h
deleted file mode 100644
index 01ca95c1..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkitem.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_ITEM_H__
-#define __GTK_ITEM_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkbin.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_ITEM                  (gtk_item_get_type ())
-#define GTK_ITEM(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ITEM, GtkItem))
-#define GTK_ITEM_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ITEM, GtkItemClass))
-#define GTK_IS_ITEM(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ITEM))
-#define GTK_IS_ITEM_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ITEM))
-#define GTK_ITEM_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ITEM, GtkItemClass))
-
-
-typedef struct _GtkItem       GtkItem;
-typedef struct _GtkItemClass  GtkItemClass;
-
-struct _GtkItem
-{
-  GtkBin bin;
-};
-
-struct _GtkItemClass
-{
-  GtkBinClass parent_class;
-
-  void (* select)   (GtkItem *item);
-  void (* deselect) (GtkItem *item);
-  void (* toggle)   (GtkItem *item);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType gtk_item_get_type (void) G_GNUC_CONST;
-void  gtk_item_select   (GtkItem *item);
-void  gtk_item_deselect (GtkItem *item);
-void  gtk_item_toggle   (GtkItem *item);
-
-G_END_DECLS
-
-#endif /* __GTK_ITEM_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkitemfactory.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkitemfactory.h
deleted file mode 100644
index f0d1e4fc..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkitemfactory.h
+++ /dev/null
@@ -1,240 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * GtkItemFactory: Flexible item factory with automatic rc handling
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_ITEM_FACTORY_H__
-#define	__GTK_ITEM_FACTORY_H__
-
-
-#include <gtk/gtkwidget.h>
-
-G_BEGIN_DECLS
-
-typedef gchar * (*GtkTranslateFunc)	   (const gchar		*path,
-					    gpointer             func_data);
-
-#if !defined (GTK_DISABLE_DEPRECATED)
-
-typedef void	(*GtkPrintFunc)		   (gpointer		 func_data,
-					    const gchar		*str);
-/* We use () here to mean unspecified arguments. This is deprecated
- * as of C99, but we can't change it without breaking compatibility.
- * (Note that if we are included from a C++ program () will mean
- * (void) so an explicit cast will be needed.)
- */
-typedef	void	(*GtkItemFactoryCallback)  ();
-typedef	void	(*GtkItemFactoryCallback1) (gpointer		 callback_data,
-					    guint		 callback_action,
-					    GtkWidget		*widget);
-
-#define GTK_TYPE_ITEM_FACTORY            (gtk_item_factory_get_type ())
-#define GTK_ITEM_FACTORY(object)         (G_TYPE_CHECK_INSTANCE_CAST ((object), GTK_TYPE_ITEM_FACTORY, GtkItemFactory))
-#define GTK_ITEM_FACTORY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ITEM_FACTORY, GtkItemFactoryClass))
-#define GTK_IS_ITEM_FACTORY(object)      (G_TYPE_CHECK_INSTANCE_TYPE ((object), GTK_TYPE_ITEM_FACTORY))
-#define GTK_IS_ITEM_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ITEM_FACTORY))
-#define GTK_ITEM_FACTORY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ITEM_FACTORY, GtkItemFactoryClass))
-
-
-typedef	struct	_GtkItemFactory			GtkItemFactory;
-typedef	struct	_GtkItemFactoryClass		GtkItemFactoryClass;
-typedef	struct	_GtkItemFactoryEntry		GtkItemFactoryEntry;
-typedef	struct	_GtkItemFactoryItem		GtkItemFactoryItem;
-
-struct _GtkItemFactory
-{
-  GtkObject		 object;
-
-  gchar			*path;
-  GtkAccelGroup		*accel_group;
-  GtkWidget		*widget;
-  GSList		*items;
-
-  GtkTranslateFunc       translate_func;
-  gpointer               translate_data;
-  GtkDestroyNotify       translate_notify;   
-};
-
-struct _GtkItemFactoryClass
-{
-  GtkObjectClass	 object_class;
-
-  GHashTable		*item_ht;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-struct _GtkItemFactoryEntry
-{
-  gchar *path;
-  gchar *accelerator;
-
-  GtkItemFactoryCallback callback;
-  guint			 callback_action;
-
-  /* possible values:
-   * NULL		-> "<Item>"
-   * ""			-> "<Item>"
-   * "<Title>"		-> create a title item
-   * "<Item>"		-> create a simple item
-   * "<ImageItem>"	-> create an item holding an image
-   * "<StockItem>"	-> create an item holding a stock image
-   * "<CheckItem>"	-> create a check item
-   * "<ToggleItem>"	-> create a toggle item
-   * "<RadioItem>"	-> create a radio item
-   * <path>		-> path of a radio item to link against
-   * "<Separator>"	-> create a separator
-   * "<Tearoff>"	-> create a tearoff separator
-   * "<Branch>"		-> create an item to hold sub items
-   * "<LastBranch>"	-> create a right justified item to hold sub items
-   */
-  gchar		 *item_type;
-
-  /* Extra data for some item types:
-   *  ImageItem  -> pointer to inlined pixbuf stream
-   *  StockItem  -> name of stock item
-   */
-  gconstpointer extra_data;
-};
-
-struct _GtkItemFactoryItem
-{
-  gchar *path;
-  GSList *widgets;
-};
-
-
-GType		gtk_item_factory_get_type	    (void) G_GNUC_CONST;
-
-/* `container_type' must be of GTK_TYPE_MENU_BAR, GTK_TYPE_MENU,
- * or GTK_TYPE_OPTION_MENU.
- */
-GtkItemFactory*	gtk_item_factory_new	   (GType		 container_type,
-					    const gchar		*path,
-					    GtkAccelGroup       *accel_group);
-void		gtk_item_factory_construct (GtkItemFactory	*ifactory,
-					    GType		 container_type,
-					    const gchar		*path,
-					    GtkAccelGroup       *accel_group);
-     
-/* These functions operate on GtkItemFactoryClass basis.
- */
-void		gtk_item_factory_add_foreign        (GtkWidget	    *accel_widget,
-						     const gchar    *full_path,
-						     GtkAccelGroup  *accel_group,
-						     guint	     keyval,
-						     GdkModifierType modifiers);
-     
-GtkItemFactory*       gtk_item_factory_from_widget      (GtkWidget *widget);
-G_CONST_RETURN gchar* gtk_item_factory_path_from_widget (GtkWidget *widget);
-
-GtkWidget*	gtk_item_factory_get_item	      (GtkItemFactory *ifactory,
-						       const gchar    *path);
-GtkWidget*	gtk_item_factory_get_widget	      (GtkItemFactory *ifactory,
-						       const gchar    *path);
-GtkWidget*	gtk_item_factory_get_widget_by_action (GtkItemFactory *ifactory,
-						       guint	       action);
-GtkWidget*	gtk_item_factory_get_item_by_action   (GtkItemFactory *ifactory,
-						       guint	       action);
-
-void	gtk_item_factory_create_item	(GtkItemFactory		*ifactory,
-					 GtkItemFactoryEntry	*entry,
-					 gpointer		 callback_data,
-					 guint			 callback_type);
-void	gtk_item_factory_create_items	(GtkItemFactory		*ifactory,
-					 guint			 n_entries,
-					 GtkItemFactoryEntry	*entries,
-					 gpointer		 callback_data);
-void	gtk_item_factory_delete_item	(GtkItemFactory		*ifactory,
-					 const gchar		*path);
-void	gtk_item_factory_delete_entry	(GtkItemFactory		*ifactory,
-					 GtkItemFactoryEntry	*entry);
-void	gtk_item_factory_delete_entries	(GtkItemFactory		*ifactory,
-					 guint			 n_entries,
-					 GtkItemFactoryEntry	*entries);
-void	gtk_item_factory_popup		(GtkItemFactory		*ifactory,
-					 guint			 x,
-					 guint			 y,
-					 guint			 mouse_button,
-					 guint32		 time_);
-void	gtk_item_factory_popup_with_data(GtkItemFactory		*ifactory,
-					 gpointer		 popup_data,
-					 GtkDestroyNotify	 destroy,
-					 guint			 x,
-					 guint			 y,
-					 guint			 mouse_button,
-					 guint32		 time_);
-gpointer gtk_item_factory_popup_data	(GtkItemFactory		*ifactory);
-gpointer gtk_item_factory_popup_data_from_widget (GtkWidget	*widget);
-void   gtk_item_factory_set_translate_func (GtkItemFactory      *ifactory,
-					    GtkTranslateFunc     func,
-					    gpointer             data,
-					    GtkDestroyNotify     notify);
-
-/* Compatibility functions for deprecated GtkMenuFactory code
- */
-
-/* Used by gtk_item_factory_create_menu_entries () */
-typedef void (*GtkMenuCallback) (GtkWidget *widget,
-				 gpointer   user_data);
-typedef struct {
-  gchar *path;
-  gchar *accelerator;
-  GtkMenuCallback callback;
-  gpointer callback_data;
-  GtkWidget *widget;
-} GtkMenuEntry;
-
-/* Used by gtk_item_factory_callback_marshal () */
-typedef	void	(*GtkItemFactoryCallback2) (GtkWidget		*widget,
-					    gpointer		 callback_data,
-					    guint		 callback_action);
-
-/* Used by gtk_item_factory_create_items () */
-void	gtk_item_factory_create_items_ac (GtkItemFactory	*ifactory,
-					  guint			 n_entries,
-					  GtkItemFactoryEntry	*entries,
-					  gpointer		 callback_data,
-					  guint			 callback_type);
-
-GtkItemFactory*	gtk_item_factory_from_path   (const gchar       *path);
-void	gtk_item_factory_create_menu_entries (guint		 n_entries,
-					      GtkMenuEntry      *entries);
-void	gtk_item_factories_path_delete	   (const gchar		*ifactory_path,
-					    const gchar		*path);
-
-#endif /* !GTK_DISABLE_DEPRECATED */
-
-
-G_END_DECLS
-
-#endif	/* __GTK_ITEM_FACTORY_H__ */
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtklabel.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtklabel.h
deleted file mode 100644
index 5656ebbf..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtklabel.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_LABEL_H__
-#define __GTK_LABEL_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkmisc.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkmenu.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_LABEL		  (gtk_label_get_type ())
-#define GTK_LABEL(obj)		  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_LABEL, GtkLabel))
-#define GTK_LABEL_CLASS(klass)	  (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_LABEL, GtkLabelClass))
-#define GTK_IS_LABEL(obj)	  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_LABEL))
-#define GTK_IS_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LABEL))
-#define GTK_LABEL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_LABEL, GtkLabelClass))
-       
-
-typedef struct _GtkLabel       GtkLabel;
-typedef struct _GtkLabelClass  GtkLabelClass;
-
-typedef struct _GtkLabelSelectionInfo GtkLabelSelectionInfo;
-
-struct _GtkLabel
-{
-  GtkMisc misc;
-
-  /*< private >*/
-  gchar  *label;
-  guint   jtype            : 2;
-  guint   wrap             : 1;
-  guint   use_underline    : 1;
-  guint   use_markup       : 1;
-  guint   ellipsize        : 3;
-  guint   single_line_mode : 1;
-  guint   have_transform   : 1;
-  guint   in_click         : 1;
-  guint   wrap_mode        : 3;
-  guint   pattern_set      : 1;
-
-  guint   mnemonic_keyval;
-  
-  gchar  *text; 
-  PangoAttrList *attrs;
-  PangoAttrList *effective_attrs;
-  
-  PangoLayout *layout;
-
-  GtkWidget *mnemonic_widget;
-  GtkWindow *mnemonic_window;
-  
-  GtkLabelSelectionInfo *select_info;
-};
-
-struct _GtkLabelClass
-{
-  GtkMiscClass parent_class;
-
-  void (* move_cursor)     (GtkLabel       *label,
-			    GtkMovementStep step,
-			    gint            count,
-			    gboolean        extend_selection);
-  void (* copy_clipboard)  (GtkLabel       *label);
-  
-  /* Hook to customize right-click popup for selectable labels */
-  void (* populate_popup)   (GtkLabel       *label,
-                             GtkMenu        *menu);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType                 gtk_label_get_type          (void) G_GNUC_CONST;
-GtkWidget*            gtk_label_new               (const gchar   *str);
-GtkWidget*            gtk_label_new_with_mnemonic (const gchar   *str);
-void                  gtk_label_set_text          (GtkLabel      *label,
-						   const gchar   *str);
-G_CONST_RETURN gchar* gtk_label_get_text          (GtkLabel      *label);
-void                  gtk_label_set_attributes    (GtkLabel      *label,
-						   PangoAttrList *attrs);
-PangoAttrList        *gtk_label_get_attributes    (GtkLabel      *label);
-void                  gtk_label_set_label         (GtkLabel      *label,
-						   const gchar   *str);
-G_CONST_RETURN gchar *gtk_label_get_label         (GtkLabel      *label);
-void                  gtk_label_set_markup        (GtkLabel      *label,
-						   const gchar   *str);
-void                  gtk_label_set_use_markup    (GtkLabel      *label,
-						   gboolean       setting);
-gboolean              gtk_label_get_use_markup    (GtkLabel      *label);
-void                  gtk_label_set_use_underline (GtkLabel      *label,
-						   gboolean       setting);
-gboolean              gtk_label_get_use_underline (GtkLabel      *label);
-
-void     gtk_label_set_markup_with_mnemonic       (GtkLabel         *label,
-						   const gchar      *str);
-guint    gtk_label_get_mnemonic_keyval            (GtkLabel         *label);
-void     gtk_label_set_mnemonic_widget            (GtkLabel         *label,
-						   GtkWidget        *widget);
-GtkWidget *gtk_label_get_mnemonic_widget          (GtkLabel         *label);
-void     gtk_label_set_text_with_mnemonic         (GtkLabel         *label,
-						   const gchar      *str);
-void     gtk_label_set_justify                    (GtkLabel         *label,
-						   GtkJustification  jtype);
-GtkJustification gtk_label_get_justify            (GtkLabel         *label);
-void     gtk_label_set_ellipsize		  (GtkLabel         *label,
-						   PangoEllipsizeMode mode);
-PangoEllipsizeMode gtk_label_get_ellipsize        (GtkLabel         *label);
-void     gtk_label_set_width_chars		  (GtkLabel         *label,
-						   gint              n_chars);
-gint     gtk_label_get_width_chars                (GtkLabel         *label);
-void     gtk_label_set_max_width_chars    	  (GtkLabel         *label,
-					  	   gint              n_chars);
-gint     gtk_label_get_max_width_chars  	  (GtkLabel         *label);
-void     gtk_label_set_pattern                    (GtkLabel         *label,
-						   const gchar      *pattern);
-void     gtk_label_set_line_wrap                  (GtkLabel         *label,
-						   gboolean          wrap);
-gboolean gtk_label_get_line_wrap                  (GtkLabel         *label);
-void     gtk_label_set_line_wrap_mode             (GtkLabel         *label,
-						   PangoWrapMode     wrap_mode);
-PangoWrapMode gtk_label_get_line_wrap_mode        (GtkLabel         *label);
-void     gtk_label_set_selectable                 (GtkLabel         *label,
-						   gboolean          setting);
-gboolean gtk_label_get_selectable                 (GtkLabel         *label);
-void     gtk_label_set_angle                      (GtkLabel         *label,
-						   gdouble           angle);
-gdouble  gtk_label_get_angle                      (GtkLabel         *label);
-void     gtk_label_select_region                  (GtkLabel         *label,
-						   gint              start_offset,
-						   gint              end_offset);
-gboolean gtk_label_get_selection_bounds           (GtkLabel         *label,
-                                                   gint             *start,
-                                                   gint             *end);
-
-PangoLayout *gtk_label_get_layout         (GtkLabel *label);
-void         gtk_label_get_layout_offsets (GtkLabel *label,
-                                           gint     *x,
-                                           gint     *y);
-
-void         gtk_label_set_single_line_mode  (GtkLabel *label,
-                                              gboolean single_line_mode);
-gboolean     gtk_label_get_single_line_mode  (GtkLabel *label);
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-#define  gtk_label_set           gtk_label_set_text
-void       gtk_label_get           (GtkLabel          *label,
-                                    gchar            **str);
-
-/* Convenience function to set the name and pattern by parsing
- * a string with embedded underscores, and return the appropriate
- * key symbol for the accelerator.
- */
-guint gtk_label_parse_uline            (GtkLabel    *label,
-					const gchar *string);
-
-#endif /* GTK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GTK_LABEL_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtklayout.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtklayout.h
deleted file mode 100644
index ffd8b45d..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtklayout.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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.
- *
- * GtkLayout: Widget for scrolling of arbitrary-sized areas.
- *
- * Copyright Owen Taylor, 1998
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_LAYOUT_H__
-#define __GTK_LAYOUT_H__
-
-#include <gdk/gdk.h>
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtkadjustment.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_LAYOUT            (gtk_layout_get_type ())
-#define GTK_LAYOUT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_LAYOUT, GtkLayout))
-#define GTK_LAYOUT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_LAYOUT, GtkLayoutClass))
-#define GTK_IS_LAYOUT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_LAYOUT))
-#define GTK_IS_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LAYOUT))
-#define GTK_LAYOUT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_LAYOUT, GtkLayoutClass))
-
-
-typedef struct _GtkLayout        GtkLayout;
-typedef struct _GtkLayoutClass   GtkLayoutClass;
-
-struct _GtkLayout
-{
-  GtkContainer container;
-
-  GList *children;
-
-  guint width;
-  guint height;
-
-  GtkAdjustment *hadjustment;
-  GtkAdjustment *vadjustment;
-
-  /*< public >*/
-  GdkWindow *bin_window;
-
-  /*< private >*/
-  GdkVisibilityState visibility;
-  gint scroll_x;
-  gint scroll_y;
-
-  guint freeze_count;
-};
-
-struct _GtkLayoutClass
-{
-  GtkContainerClass parent_class;
-
-  void  (*set_scroll_adjustments)   (GtkLayout	    *layout,
-				     GtkAdjustment  *hadjustment,
-				     GtkAdjustment  *vadjustment);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType          gtk_layout_get_type        (void) G_GNUC_CONST;
-GtkWidget*     gtk_layout_new             (GtkAdjustment *hadjustment,
-				           GtkAdjustment *vadjustment);
-void           gtk_layout_put             (GtkLayout     *layout, 
-		                           GtkWidget     *child_widget, 
-		                           gint           x, 
-		                           gint           y);
-  
-void           gtk_layout_move            (GtkLayout     *layout, 
-		                           GtkWidget     *child_widget, 
-		                           gint           x, 
-		                           gint           y);
-  
-void           gtk_layout_set_size        (GtkLayout     *layout, 
-			                   guint          width,
-			                   guint          height);
-void           gtk_layout_get_size        (GtkLayout     *layout,
-					   guint         *width,
-					   guint         *height);
-
-GtkAdjustment* gtk_layout_get_hadjustment (GtkLayout     *layout);
-GtkAdjustment* gtk_layout_get_vadjustment (GtkLayout     *layout);
-void           gtk_layout_set_hadjustment (GtkLayout     *layout,
-					   GtkAdjustment *adjustment);
-void           gtk_layout_set_vadjustment (GtkLayout     *layout,
-					   GtkAdjustment *adjustment);
-
-
-#ifndef GTK_DISABLE_DEPRECATED
-/* These disable and enable moving and repainting the scrolling window
- * of the GtkLayout, respectively.  If you want to update the layout's
- * offsets but do not want it to repaint itself, you should use these
- * functions.
- *
- * - I don't understand these are supposed to work, so I suspect
- * - they don't now.                    OWT 1/20/98
- */
-void           gtk_layout_freeze          (GtkLayout     *layout);
-void           gtk_layout_thaw            (GtkLayout     *layout);
-#endif /* GTK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GTK_LAYOUT_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtklinkbutton.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtklinkbutton.h
deleted file mode 100644
index 24e79b46..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtklinkbutton.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtklinkbutton.h - an hyperlink-enabled button
- * 
- * Copyright (C) 2005 Emmanuele Bassi <ebassi@gmail.com>
- * All rights reserved.
- *
- * Based on gnome-href code by:
- * 	James Henstridge <james@daa.com.au>
- * 
- * 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, Cambridge, MA 02139, USA.
- */
-
-#ifndef __GTK_LINK_BUTTON_H__
-#define __GTK_LINK_BUTTON_H__
-
-#include <glib.h>
-#include <gtk/gtkbutton.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_LINK_BUTTON		(gtk_link_button_get_type ())
-#define GTK_LINK_BUTTON(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_LINK_BUTTON, GtkLinkButton))
-#define GTK_IS_LINK_BUTTON(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_LINK_BUTTON))
-#define GTK_LINK_BUTTON_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_LINK_BUTTON, GtkLinkButtonClass))
-#define GTK_IS_LINK_BUTTON_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LINK_BUTTON))
-#define GTK_LINK_BUTTON_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_LINK_BUTTON, GtkLinkButtonClass))
-
-typedef struct _GtkLinkButton		GtkLinkButton;
-typedef struct _GtkLinkButtonClass	GtkLinkButtonClass;
-typedef struct _GtkLinkButtonPrivate	GtkLinkButtonPrivate;
-
-typedef void (*GtkLinkButtonUriFunc) (GtkLinkButton *button,
-				      const gchar   *link_,
-				      gpointer       user_data);
-
-struct _GtkLinkButton
-{
-  GtkButton parent_instance;
-  
-  GtkLinkButtonPrivate *priv;
-};
-
-struct _GtkLinkButtonClass
-{
-  GtkButtonClass parent_class;
-  
-  void (*_gtk_padding1) (void);
-  void (*_gtk_padding2) (void);
-  void (*_gtk_padding3) (void);
-  void (*_gtk_padding4) (void);
-};
-
-GType                 gtk_link_button_get_type          (void) G_GNUC_CONST;
-
-GtkWidget *           gtk_link_button_new               (const gchar   *uri);
-GtkWidget *           gtk_link_button_new_with_label    (const gchar   *uri,
-						         const gchar   *label);
-
-G_CONST_RETURN gchar *gtk_link_button_get_uri           (GtkLinkButton *link_button);
-void                  gtk_link_button_set_uri           (GtkLinkButton *link_button,
-						         const gchar   *uri);
-
-GtkLinkButtonUriFunc  gtk_link_button_set_uri_hook      (GtkLinkButtonUriFunc func,
-							 gpointer             data,
-							 GDestroyNotify       destroy);
-
-G_END_DECLS
-
-#endif /* __GTK_LINK_BUTTON_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtklist.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtklist.h
deleted file mode 100644
index 4023f2e7..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtklist.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-#ifndef __GTK_LIST_H__
-#define __GTK_LIST_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkenums.h>
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtklistitem.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_LIST                  (gtk_list_get_type ())
-#define GTK_LIST(obj)                  (GTK_CHECK_CAST ((obj), GTK_TYPE_LIST, GtkList))
-#define GTK_LIST_CLASS(klass)          (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_LIST, GtkListClass))
-#define GTK_IS_LIST(obj)               (GTK_CHECK_TYPE ((obj), GTK_TYPE_LIST))
-#define GTK_IS_LIST_CLASS(klass)       (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LIST))
-#define GTK_LIST_GET_CLASS(obj)        (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_LIST, GtkListClass))
-
-
-typedef struct _GtkList	      GtkList;
-typedef struct _GtkListClass  GtkListClass;
-
-struct _GtkList
-{
-  GtkContainer container;
-
-  GList *children;
-  GList *selection;
-
-  GList *undo_selection;
-  GList *undo_unselection;
-
-  GtkWidget *last_focus_child;
-  GtkWidget *undo_focus_child;
-
-  guint htimer;
-  guint vtimer;
-
-  gint anchor;
-  gint drag_pos;
-  GtkStateType anchor_state;
-
-  guint selection_mode : 2;
-  guint drag_selection:1;
-  guint add_mode:1;
-};
-
-struct _GtkListClass
-{
-  GtkContainerClass parent_class;
-
-  void (* selection_changed) (GtkList	*list);
-  void (* select_child)	     (GtkList	*list,
-			      GtkWidget *child);
-  void (* unselect_child)    (GtkList	*list,
-			      GtkWidget *child);
-};
-
-
-GtkType	   gtk_list_get_type		  (void) G_GNUC_CONST;
-GtkWidget* gtk_list_new			  (void);
-void	   gtk_list_insert_items	  (GtkList	    *list,
-					   GList	    *items,
-					   gint		     position);
-void	   gtk_list_append_items	  (GtkList	    *list,
-					   GList	    *items);
-void	   gtk_list_prepend_items	  (GtkList	    *list,
-					   GList	    *items);
-void	   gtk_list_remove_items	  (GtkList	    *list,
-					   GList	    *items);
-void	   gtk_list_remove_items_no_unref (GtkList	    *list,
-					   GList	    *items);
-void	   gtk_list_clear_items		  (GtkList	    *list,
-					   gint		     start,
-					   gint		     end);
-void	   gtk_list_select_item		  (GtkList	    *list,
-					   gint		     item);
-void	   gtk_list_unselect_item	  (GtkList	    *list,
-					   gint		     item);
-void	   gtk_list_select_child	  (GtkList	    *list,
-					   GtkWidget	    *child);
-void	   gtk_list_unselect_child	  (GtkList	    *list,
-					   GtkWidget	    *child);
-gint	   gtk_list_child_position	  (GtkList	    *list,
-					   GtkWidget	    *child);
-void	   gtk_list_set_selection_mode	  (GtkList	    *list,
-					   GtkSelectionMode  mode);
-
-void       gtk_list_extend_selection      (GtkList          *list,
-					   GtkScrollType     scroll_type,
-					   gfloat            position,
-					   gboolean          auto_start_selection);
-void       gtk_list_start_selection       (GtkList          *list);
-void       gtk_list_end_selection         (GtkList          *list);
-void       gtk_list_select_all            (GtkList          *list);
-void       gtk_list_unselect_all          (GtkList          *list);
-void       gtk_list_scroll_horizontal     (GtkList          *list,
-					   GtkScrollType     scroll_type,
-					   gfloat            position);
-void       gtk_list_scroll_vertical       (GtkList          *list,
-					   GtkScrollType     scroll_type,
-					   gfloat            position);
-void       gtk_list_toggle_add_mode       (GtkList          *list);
-void       gtk_list_toggle_focus_row      (GtkList          *list);
-void       gtk_list_toggle_row            (GtkList          *list,
-					   GtkWidget        *item);
-void       gtk_list_undo_selection        (GtkList          *list);
-void       gtk_list_end_drag_selection    (GtkList          *list);
-
-G_END_DECLS
-
-#endif /* __GTK_LIST_H__ */
-
-#endif /* GTK_DISABLE_DEPRECATED */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtklistitem.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtklistitem.h
deleted file mode 100644
index 9738bce4..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtklistitem.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-#ifndef __GTK_LIST_ITEM_H__
-#define __GTK_LIST_ITEM_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkitem.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_LIST_ITEM              (gtk_list_item_get_type ())
-#define GTK_LIST_ITEM(obj)              (GTK_CHECK_CAST ((obj), GTK_TYPE_LIST_ITEM, GtkListItem))
-#define GTK_LIST_ITEM_CLASS(klass)      (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_LIST_ITEM, GtkListItemClass))
-#define GTK_IS_LIST_ITEM(obj)           (GTK_CHECK_TYPE ((obj), GTK_TYPE_LIST_ITEM))
-#define GTK_IS_LIST_ITEM_CLASS(klass)   (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LIST_ITEM))
-#define GTK_LIST_ITEM_GET_CLASS(obj)    (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_LIST_ITEM, GtkListItemClass))
-
-
-typedef struct _GtkListItem       GtkListItem;
-typedef struct _GtkListItemClass  GtkListItemClass;
-
-struct _GtkListItem
-{
-  GtkItem item;
-};
-
-struct _GtkListItemClass
-{
-  GtkItemClass parent_class;
-
-  void (*toggle_focus_row)  (GtkListItem   *list_item);
-  void (*select_all)        (GtkListItem   *list_item);
-  void (*unselect_all)      (GtkListItem   *list_item);
-  void (*undo_selection)    (GtkListItem   *list_item);
-  void (*start_selection)   (GtkListItem   *list_item);
-  void (*end_selection)     (GtkListItem   *list_item);
-  void (*extend_selection)  (GtkListItem   *list_item,
-			     GtkScrollType  scroll_type,
-			     gfloat         position,
-			     gboolean       auto_start_selection);
-  void (*scroll_horizontal) (GtkListItem   *list_item,
-			     GtkScrollType  scroll_type,
-			     gfloat         position);
-  void (*scroll_vertical)   (GtkListItem   *list_item,
-			     GtkScrollType  scroll_type,
-			     gfloat         position);
-  void (*toggle_add_mode)   (GtkListItem   *list_item);
-};
-
-
-GtkType    gtk_list_item_get_type       (void) G_GNUC_CONST;
-GtkWidget* gtk_list_item_new            (void);
-GtkWidget* gtk_list_item_new_with_label (const gchar      *label);
-void       gtk_list_item_select         (GtkListItem      *list_item);
-void       gtk_list_item_deselect       (GtkListItem      *list_item);
-
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_LIST_ITEM_H__ */
-
-#endif /* GTK_DISABLE_DEPRECATED */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkliststore.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkliststore.h
deleted file mode 100644
index 9aeb81b3..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkliststore.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/* gtkliststore.h
- * Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb@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 __GTK_LIST_STORE_H__
-#define __GTK_LIST_STORE_H__
-
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreesortable.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_LIST_STORE	       (gtk_list_store_get_type ())
-#define GTK_LIST_STORE(obj)	       (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_LIST_STORE, GtkListStore))
-#define GTK_LIST_STORE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_LIST_STORE, GtkListStoreClass))
-#define GTK_IS_LIST_STORE(obj)	       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_LIST_STORE))
-#define GTK_IS_LIST_STORE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LIST_STORE))
-#define GTK_LIST_STORE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_LIST_STORE, GtkListStoreClass))
-
-typedef struct _GtkListStore       GtkListStore;
-typedef struct _GtkListStoreClass  GtkListStoreClass;
-
-struct _GtkListStore
-{
-  GObject parent;
-
-  /*< private >*/
-  gint stamp;
-  gpointer seq;		/* head of the list */
-  gpointer _gtk_reserved1;
-  GList *sort_list;	
-  gint n_columns;
-  gint sort_column_id;
-  GtkSortType order;
-  GType *column_headers;
-  gint length;
-  GtkTreeIterCompareFunc default_sort_func;
-  gpointer default_sort_data;
-  GtkDestroyNotify default_sort_destroy;
-  guint columns_dirty : 1;
-};
-
-struct _GtkListStoreClass
-{
-  GObjectClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType         gtk_list_store_get_type         (void) G_GNUC_CONST;
-GtkListStore *gtk_list_store_new              (gint          n_columns,
-					       ...);
-GtkListStore *gtk_list_store_newv             (gint          n_columns,
-					       GType        *types);
-void          gtk_list_store_set_column_types (GtkListStore *list_store,
-					       gint          n_columns,
-					       GType        *types);
-
-/* NOTE: use gtk_tree_model_get to get values from a GtkListStore */
-
-void          gtk_list_store_set_value        (GtkListStore *list_store,
-					       GtkTreeIter  *iter,
-					       gint          column,
-					       GValue       *value);
-void          gtk_list_store_set              (GtkListStore *list_store,
-					       GtkTreeIter  *iter,
-					       ...);
-void          gtk_list_store_set_valuesv      (GtkListStore *list_store,
-					       GtkTreeIter  *iter,
-					       gint         *columns, 
-					       GValue       *values,
-					       gint          n_values);
-void          gtk_list_store_set_valist       (GtkListStore *list_store,
-					       GtkTreeIter  *iter,
-					       va_list       var_args);
-gboolean      gtk_list_store_remove           (GtkListStore *list_store,
-					       GtkTreeIter  *iter);
-void          gtk_list_store_insert           (GtkListStore *list_store,
-					       GtkTreeIter  *iter,
-					       gint          position);
-void          gtk_list_store_insert_before    (GtkListStore *list_store,
-					       GtkTreeIter  *iter,
-					       GtkTreeIter  *sibling);
-void          gtk_list_store_insert_after     (GtkListStore *list_store,
-					       GtkTreeIter  *iter,
-					       GtkTreeIter  *sibling);
-void          gtk_list_store_insert_with_values  (GtkListStore *list_store,
-						  GtkTreeIter  *iter,
-						  gint          position,
-						  ...);
-void          gtk_list_store_insert_with_valuesv (GtkListStore *list_store,
-						  GtkTreeIter  *iter,
-						  gint          position,
-						  gint         *columns, 
-						  GValue       *values,
-						  gint          n_values);
-void          gtk_list_store_prepend          (GtkListStore *list_store,
-					       GtkTreeIter  *iter);
-void          gtk_list_store_append           (GtkListStore *list_store,
-					       GtkTreeIter  *iter);
-void          gtk_list_store_clear            (GtkListStore *list_store);
-gboolean      gtk_list_store_iter_is_valid    (GtkListStore *list_store,
-                                               GtkTreeIter  *iter);
-void          gtk_list_store_reorder          (GtkListStore *store,
-                                               gint         *new_order);
-void          gtk_list_store_swap             (GtkListStore *store,
-                                               GtkTreeIter  *a,
-                                               GtkTreeIter  *b);
-void          gtk_list_store_move_after       (GtkListStore *store,
-                                               GtkTreeIter  *iter,
-                                               GtkTreeIter  *position);
-void          gtk_list_store_move_before      (GtkListStore *store,
-                                               GtkTreeIter  *iter,
-                                               GtkTreeIter  *position);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_LIST_STORE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmain.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmain.h
deleted file mode 100644
index 15d08cbe..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmain.h
+++ /dev/null
@@ -1,226 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_MAIN_H__
-#define __GTK_MAIN_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkwidget.h>
-#ifdef G_PLATFORM_WIN32
-#include <gtk/gtkbox.h>
-#include <gtk/gtkwindow.h>
-#endif
-
-G_BEGIN_DECLS
-
-/* Priorities for redrawing and resizing
- */
-#define GTK_PRIORITY_RESIZE     (G_PRIORITY_HIGH_IDLE + 10)
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-/* Use GDK_PRIORITY_REDRAW */
-#define GTK_PRIORITY_REDRAW     (G_PRIORITY_HIGH_IDLE + 20)
-
-/* Deprecated. Use G_PRIORITY #define's instead
- */
-#define GTK_PRIORITY_HIGH       G_PRIORITY_HIGH
-#define GTK_PRIORITY_INTERNAL   GTK_PRIORITY_REDRAW
-#define GTK_PRIORITY_DEFAULT	G_PRIORITY_DEFAULT_IDLE
-#define GTK_PRIORITY_LOW	G_PRIORITY_LOW
-
-#endif /* GTK_DISABLE_DEPRECATED */
-
-typedef gint	(*GtkKeySnoopFunc)	    (GtkWidget	  *grab_widget,
-					     GdkEventKey  *event,
-					     gpointer	   func_data);
-
-/* Gtk version.
- */
-#ifdef G_PLATFORM_WIN32
-#ifdef GTK_COMPILATION
-#define GTKMAIN_C_VAR __declspec(dllexport)
-#else
-#define GTKMAIN_C_VAR extern __declspec(dllimport)
-#endif
-#else
-#define GTKMAIN_C_VAR extern
-#endif
-
-GTKMAIN_C_VAR const guint gtk_major_version;
-GTKMAIN_C_VAR const guint gtk_minor_version;
-GTKMAIN_C_VAR const guint gtk_micro_version;
-GTKMAIN_C_VAR const guint gtk_binary_age;
-GTKMAIN_C_VAR const guint gtk_interface_age;
-const gchar* gtk_check_version (guint	required_major,
-			        guint	required_minor,
-			        guint	required_micro);
-
-
-/* Initialization, exit, mainloop and miscellaneous routines
- */
-
-gboolean gtk_parse_args           (int    *argc,
-				   char ***argv);
-
-void     gtk_init                 (int    *argc,
-                                   char ***argv);
-
-gboolean gtk_init_check           (int    *argc,
-                                   char ***argv);
-  
-gboolean gtk_init_with_args       (int            *argc,
-				   char         ***argv,
-				   char           *parameter_string,
-				   GOptionEntry   *entries,
-				   char           *translation_domain,
-				   GError        **error);
-
-GOptionGroup *gtk_get_option_group (gboolean open_default_display);
-  
-#ifdef G_PLATFORM_WIN32
-
-/* Variants that are used to check for correct struct packing
- * when building GTK+-using code.
- */
-void	 gtk_init_abi_check       (int	  *argc,
-				   char	***argv,
-				   int     num_checks,
-				   size_t  sizeof_GtkWindow,
-				   size_t  sizeof_GtkBox);
-gboolean gtk_init_check_abi_check (int	  *argc,
-				   char	***argv,
-				   int     num_checks,
-				   size_t  sizeof_GtkWindow,
-				   size_t  sizeof_GtkBox);
-
-#define gtk_init(argc, argv) gtk_init_abi_check (argc, argv, 2, sizeof (GtkWindow), sizeof (GtkBox))
-#define gtk_init_check(argc, argv) gtk_init_check_abi_check (argc, argv, 2, sizeof (GtkWindow), sizeof (GtkBox))
-
-#endif
-
-#ifndef GTK_DISABLE_DEPRECATED
-void     gtk_exit                 (gint    error_code);
-#endif /* GTK_DISABLE_DEPRECATED */
-
-void           gtk_disable_setlocale    (void);
-gchar *        gtk_set_locale           (void);
-PangoLanguage *gtk_get_default_language (void);
-gboolean       gtk_events_pending       (void);
-
-/* The following is the event func GTK+ registers with GDK
- * we expose it mainly to allow filtering of events between
- * GDK and GTK+.
- */
-void 	   gtk_main_do_event	   (GdkEvent           *event);
-
-void	   gtk_main		   (void);
-guint	   gtk_main_level	   (void);
-void	   gtk_main_quit	   (void);
-gboolean   gtk_main_iteration	   (void);
-/* gtk_main_iteration() calls gtk_main_iteration_do(TRUE) */
-gboolean   gtk_main_iteration_do   (gboolean blocking);
-
-gboolean   gtk_true		   (void) G_GNUC_CONST;
-gboolean   gtk_false		   (void) G_GNUC_CONST;
-
-void	   gtk_grab_add		   (GtkWidget	       *widget);
-GtkWidget* gtk_grab_get_current	   (void);
-void	   gtk_grab_remove	   (GtkWidget	       *widget);
-
-void	   gtk_init_add		   (GtkFunction	       function,
-				    gpointer	       data);
-void	   gtk_quit_add_destroy	   (guint	       main_level,
-				    GtkObject	      *object);
-guint	   gtk_quit_add		   (guint	       main_level,
-				    GtkFunction	       function,
-				    gpointer	       data);
-guint	   gtk_quit_add_full	   (guint	       main_level,
-				    GtkFunction	       function,
-				    GtkCallbackMarshal marshal,
-				    gpointer	       data,
-				    GtkDestroyNotify   destroy);
-void	   gtk_quit_remove	   (guint	       quit_handler_id);
-void	   gtk_quit_remove_by_data (gpointer	       data);
-#ifndef GTK_DISABLE_DEPRECATED
-guint	   gtk_timeout_add	   (guint32	       interval,
-				    GtkFunction	       function,
-				    gpointer	       data);
-guint	   gtk_timeout_add_full	   (guint32	       interval,
-				    GtkFunction	       function,
-				    GtkCallbackMarshal marshal,
-				    gpointer	       data,
-				    GtkDestroyNotify   destroy);
-void	   gtk_timeout_remove	   (guint	       timeout_handler_id);
-
-guint	   gtk_idle_add		   (GtkFunction	       function,
-				    gpointer	       data);
-guint	   gtk_idle_add_priority   (gint	       priority,
-				    GtkFunction	       function,
-				    gpointer	       data);
-guint	   gtk_idle_add_full	   (gint	       priority,
-				    GtkFunction	       function,
-				    GtkCallbackMarshal marshal,
-				    gpointer	       data,
-				    GtkDestroyNotify   destroy);
-void	   gtk_idle_remove	   (guint	       idle_handler_id);
-void	   gtk_idle_remove_by_data (gpointer	       data);
-guint	   gtk_input_add_full	   (gint	       source,
-				    GdkInputCondition  condition,
-				    GdkInputFunction   function,
-				    GtkCallbackMarshal marshal,
-				    gpointer	       data,
-				    GtkDestroyNotify   destroy);
-void	   gtk_input_remove	   (guint	       input_handler_id);
-#endif /* GTK_DISABLE_DEPRECATED */
-
-guint	   gtk_key_snooper_install (GtkKeySnoopFunc snooper,
-				    gpointer	    func_data);
-void	   gtk_key_snooper_remove  (guint	    snooper_handler_id);
-
-GdkEvent*       gtk_get_current_event       (void);
-guint32         gtk_get_current_event_time  (void);
-gboolean        gtk_get_current_event_state (GdkModifierType *state);
-
-GtkWidget* gtk_get_event_widget	   (GdkEvent	   *event);
-
-
-/* Private routines internal to GTK+ 
- */
-void       gtk_propagate_event     (GtkWidget         *widget,
-				    GdkEvent          *event);
-
-gboolean _gtk_boolean_handled_accumulator (GSignalInvocationHint *ihint,
-                                   GValue                *return_accu,
-                                   const GValue          *handler_return,
-                                   gpointer               dummy);
-
-gchar *_gtk_get_lc_ctype (void);
-
-G_END_DECLS
-
-#endif /* __GTK_MAIN_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmarshal.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmarshal.h
deleted file mode 100644
index ef2276b4..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmarshal.h
+++ /dev/null
@@ -1,283 +0,0 @@
-#ifndef GTK_DISABLE_DEPRECATED
-
-#ifndef __gtk_marshal_MARSHAL_H__
-#define __gtk_marshal_MARSHAL_H__
-
-#include	<glib-object.h>
-
-G_BEGIN_DECLS
-
-/* BOOL:NONE (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gtk/gtkmarshal.list:1) */
-extern void gtk_marshal_BOOLEAN__VOID (GClosure     *closure,
-                                       GValue       *return_value,
-                                       guint         n_param_values,
-                                       const GValue *param_values,
-                                       gpointer      invocation_hint,
-                                       gpointer      marshal_data);
-#define gtk_marshal_BOOL__NONE	gtk_marshal_BOOLEAN__VOID
-
-/* BOOL:POINTER (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gtk/gtkmarshal.list:2) */
-extern void gtk_marshal_BOOLEAN__POINTER (GClosure     *closure,
-                                          GValue       *return_value,
-                                          guint         n_param_values,
-                                          const GValue *param_values,
-                                          gpointer      invocation_hint,
-                                          gpointer      marshal_data);
-#define gtk_marshal_BOOL__POINTER	gtk_marshal_BOOLEAN__POINTER
-
-/* BOOL:POINTER,POINTER,INT,INT (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gtk/gtkmarshal.list:3) */
-extern void gtk_marshal_BOOLEAN__POINTER_POINTER_INT_INT (GClosure     *closure,
-                                                          GValue       *return_value,
-                                                          guint         n_param_values,
-                                                          const GValue *param_values,
-                                                          gpointer      invocation_hint,
-                                                          gpointer      marshal_data);
-#define gtk_marshal_BOOL__POINTER_POINTER_INT_INT	gtk_marshal_BOOLEAN__POINTER_POINTER_INT_INT
-
-/* BOOL:POINTER,INT,INT (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gtk/gtkmarshal.list:4) */
-extern void gtk_marshal_BOOLEAN__POINTER_INT_INT (GClosure     *closure,
-                                                  GValue       *return_value,
-                                                  guint         n_param_values,
-                                                  const GValue *param_values,
-                                                  gpointer      invocation_hint,
-                                                  gpointer      marshal_data);
-#define gtk_marshal_BOOL__POINTER_INT_INT	gtk_marshal_BOOLEAN__POINTER_INT_INT
-
-/* BOOL:POINTER,INT,INT,UINT (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gtk/gtkmarshal.list:5) */
-extern void gtk_marshal_BOOLEAN__POINTER_INT_INT_UINT (GClosure     *closure,
-                                                       GValue       *return_value,
-                                                       guint         n_param_values,
-                                                       const GValue *param_values,
-                                                       gpointer      invocation_hint,
-                                                       gpointer      marshal_data);
-#define gtk_marshal_BOOL__POINTER_INT_INT_UINT	gtk_marshal_BOOLEAN__POINTER_INT_INT_UINT
-
-/* BOOL:POINTER,STRING,STRING,POINTER (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gtk/gtkmarshal.list:6) */
-extern void gtk_marshal_BOOLEAN__POINTER_STRING_STRING_POINTER (GClosure     *closure,
-                                                                GValue       *return_value,
-                                                                guint         n_param_values,
-                                                                const GValue *param_values,
-                                                                gpointer      invocation_hint,
-                                                                gpointer      marshal_data);
-#define gtk_marshal_BOOL__POINTER_STRING_STRING_POINTER	gtk_marshal_BOOLEAN__POINTER_STRING_STRING_POINTER
-
-/* ENUM:ENUM (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gtk/gtkmarshal.list:7) */
-extern void gtk_marshal_ENUM__ENUM (GClosure     *closure,
-                                    GValue       *return_value,
-                                    guint         n_param_values,
-                                    const GValue *param_values,
-                                    gpointer      invocation_hint,
-                                    gpointer      marshal_data);
-
-/* INT:POINTER (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gtk/gtkmarshal.list:8) */
-extern void gtk_marshal_INT__POINTER (GClosure     *closure,
-                                      GValue       *return_value,
-                                      guint         n_param_values,
-                                      const GValue *param_values,
-                                      gpointer      invocation_hint,
-                                      gpointer      marshal_data);
-
-/* INT:POINTER,CHAR,CHAR (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gtk/gtkmarshal.list:9) */
-extern void gtk_marshal_INT__POINTER_CHAR_CHAR (GClosure     *closure,
-                                                GValue       *return_value,
-                                                guint         n_param_values,
-                                                const GValue *param_values,
-                                                gpointer      invocation_hint,
-                                                gpointer      marshal_data);
-
-/* NONE:BOOL (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gtk/gtkmarshal.list:10) */
-#define gtk_marshal_VOID__BOOLEAN	g_cclosure_marshal_VOID__BOOLEAN
-#define gtk_marshal_NONE__BOOL	gtk_marshal_VOID__BOOLEAN
-
-/* NONE:BOXED (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gtk/gtkmarshal.list:11) */
-#define gtk_marshal_VOID__BOXED	g_cclosure_marshal_VOID__BOXED
-#define gtk_marshal_NONE__BOXED	gtk_marshal_VOID__BOXED
-
-/* NONE:ENUM (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gtk/gtkmarshal.list:12) */
-#define gtk_marshal_VOID__ENUM	g_cclosure_marshal_VOID__ENUM
-#define gtk_marshal_NONE__ENUM	gtk_marshal_VOID__ENUM
-
-/* NONE:ENUM,FLOAT (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gtk/gtkmarshal.list:13) */
-extern void gtk_marshal_VOID__ENUM_FLOAT (GClosure     *closure,
-                                          GValue       *return_value,
-                                          guint         n_param_values,
-                                          const GValue *param_values,
-                                          gpointer      invocation_hint,
-                                          gpointer      marshal_data);
-#define gtk_marshal_NONE__ENUM_FLOAT	gtk_marshal_VOID__ENUM_FLOAT
-
-/* NONE:ENUM,FLOAT,BOOL (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gtk/gtkmarshal.list:14) */
-extern void gtk_marshal_VOID__ENUM_FLOAT_BOOLEAN (GClosure     *closure,
-                                                  GValue       *return_value,
-                                                  guint         n_param_values,
-                                                  const GValue *param_values,
-                                                  gpointer      invocation_hint,
-                                                  gpointer      marshal_data);
-#define gtk_marshal_NONE__ENUM_FLOAT_BOOL	gtk_marshal_VOID__ENUM_FLOAT_BOOLEAN
-
-/* NONE:INT (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gtk/gtkmarshal.list:15) */
-#define gtk_marshal_VOID__INT	g_cclosure_marshal_VOID__INT
-#define gtk_marshal_NONE__INT	gtk_marshal_VOID__INT
-
-/* NONE:INT,INT (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gtk/gtkmarshal.list:16) */
-extern void gtk_marshal_VOID__INT_INT (GClosure     *closure,
-                                       GValue       *return_value,
-                                       guint         n_param_values,
-                                       const GValue *param_values,
-                                       gpointer      invocation_hint,
-                                       gpointer      marshal_data);
-#define gtk_marshal_NONE__INT_INT	gtk_marshal_VOID__INT_INT
-
-/* NONE:INT,INT,POINTER (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gtk/gtkmarshal.list:17) */
-extern void gtk_marshal_VOID__INT_INT_POINTER (GClosure     *closure,
-                                               GValue       *return_value,
-                                               guint         n_param_values,
-                                               const GValue *param_values,
-                                               gpointer      invocation_hint,
-                                               gpointer      marshal_data);
-#define gtk_marshal_NONE__INT_INT_POINTER	gtk_marshal_VOID__INT_INT_POINTER
-
-/* NONE:NONE (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gtk/gtkmarshal.list:18) */
-#define gtk_marshal_VOID__VOID	g_cclosure_marshal_VOID__VOID
-#define gtk_marshal_NONE__NONE	gtk_marshal_VOID__VOID
-
-/* NONE:OBJECT (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gtk/gtkmarshal.list:19) */
-#define gtk_marshal_VOID__OBJECT	g_cclosure_marshal_VOID__OBJECT
-#define gtk_marshal_NONE__OBJECT	gtk_marshal_VOID__OBJECT
-
-/* NONE:POINTER (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gtk/gtkmarshal.list:20) */
-#define gtk_marshal_VOID__POINTER	g_cclosure_marshal_VOID__POINTER
-#define gtk_marshal_NONE__POINTER	gtk_marshal_VOID__POINTER
-
-/* NONE:POINTER,INT (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gtk/gtkmarshal.list:21) */
-extern void gtk_marshal_VOID__POINTER_INT (GClosure     *closure,
-                                           GValue       *return_value,
-                                           guint         n_param_values,
-                                           const GValue *param_values,
-                                           gpointer      invocation_hint,
-                                           gpointer      marshal_data);
-#define gtk_marshal_NONE__POINTER_INT	gtk_marshal_VOID__POINTER_INT
-
-/* NONE:POINTER,POINTER (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gtk/gtkmarshal.list:22) */
-extern void gtk_marshal_VOID__POINTER_POINTER (GClosure     *closure,
-                                               GValue       *return_value,
-                                               guint         n_param_values,
-                                               const GValue *param_values,
-                                               gpointer      invocation_hint,
-                                               gpointer      marshal_data);
-#define gtk_marshal_NONE__POINTER_POINTER	gtk_marshal_VOID__POINTER_POINTER
-
-/* NONE:POINTER,POINTER,POINTER (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gtk/gtkmarshal.list:23) */
-extern void gtk_marshal_VOID__POINTER_POINTER_POINTER (GClosure     *closure,
-                                                       GValue       *return_value,
-                                                       guint         n_param_values,
-                                                       const GValue *param_values,
-                                                       gpointer      invocation_hint,
-                                                       gpointer      marshal_data);
-#define gtk_marshal_NONE__POINTER_POINTER_POINTER	gtk_marshal_VOID__POINTER_POINTER_POINTER
-
-/* NONE:POINTER,STRING,STRING (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gtk/gtkmarshal.list:24) */
-extern void gtk_marshal_VOID__POINTER_STRING_STRING (GClosure     *closure,
-                                                     GValue       *return_value,
-                                                     guint         n_param_values,
-                                                     const GValue *param_values,
-                                                     gpointer      invocation_hint,
-                                                     gpointer      marshal_data);
-#define gtk_marshal_NONE__POINTER_STRING_STRING	gtk_marshal_VOID__POINTER_STRING_STRING
-
-/* NONE:POINTER,UINT (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gtk/gtkmarshal.list:25) */
-extern void gtk_marshal_VOID__POINTER_UINT (GClosure     *closure,
-                                            GValue       *return_value,
-                                            guint         n_param_values,
-                                            const GValue *param_values,
-                                            gpointer      invocation_hint,
-                                            gpointer      marshal_data);
-#define gtk_marshal_NONE__POINTER_UINT	gtk_marshal_VOID__POINTER_UINT
-
-/* NONE:POINTER,UINT,ENUM (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gtk/gtkmarshal.list:26) */
-extern void gtk_marshal_VOID__POINTER_UINT_ENUM (GClosure     *closure,
-                                                 GValue       *return_value,
-                                                 guint         n_param_values,
-                                                 const GValue *param_values,
-                                                 gpointer      invocation_hint,
-                                                 gpointer      marshal_data);
-#define gtk_marshal_NONE__POINTER_UINT_ENUM	gtk_marshal_VOID__POINTER_UINT_ENUM
-
-/* NONE:POINTER,POINTER,UINT,UINT (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gtk/gtkmarshal.list:27) */
-extern void gtk_marshal_VOID__POINTER_POINTER_UINT_UINT (GClosure     *closure,
-                                                         GValue       *return_value,
-                                                         guint         n_param_values,
-                                                         const GValue *param_values,
-                                                         gpointer      invocation_hint,
-                                                         gpointer      marshal_data);
-#define gtk_marshal_NONE__POINTER_POINTER_UINT_UINT	gtk_marshal_VOID__POINTER_POINTER_UINT_UINT
-
-/* NONE:POINTER,INT,INT,POINTER,UINT,UINT (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gtk/gtkmarshal.list:28) */
-extern void gtk_marshal_VOID__POINTER_INT_INT_POINTER_UINT_UINT (GClosure     *closure,
-                                                                 GValue       *return_value,
-                                                                 guint         n_param_values,
-                                                                 const GValue *param_values,
-                                                                 gpointer      invocation_hint,
-                                                                 gpointer      marshal_data);
-#define gtk_marshal_NONE__POINTER_INT_INT_POINTER_UINT_UINT	gtk_marshal_VOID__POINTER_INT_INT_POINTER_UINT_UINT
-
-/* NONE:POINTER,UINT,UINT (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gtk/gtkmarshal.list:29) */
-extern void gtk_marshal_VOID__POINTER_UINT_UINT (GClosure     *closure,
-                                                 GValue       *return_value,
-                                                 guint         n_param_values,
-                                                 const GValue *param_values,
-                                                 gpointer      invocation_hint,
-                                                 gpointer      marshal_data);
-#define gtk_marshal_NONE__POINTER_UINT_UINT	gtk_marshal_VOID__POINTER_UINT_UINT
-
-/* NONE:POINTER,UINT,UINT (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gtk/gtkmarshal.list:30) */
-
-/* NONE:STRING (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gtk/gtkmarshal.list:31) */
-#define gtk_marshal_VOID__STRING	g_cclosure_marshal_VOID__STRING
-#define gtk_marshal_NONE__STRING	gtk_marshal_VOID__STRING
-
-/* NONE:STRING,INT,POINTER (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gtk/gtkmarshal.list:32) */
-extern void gtk_marshal_VOID__STRING_INT_POINTER (GClosure     *closure,
-                                                  GValue       *return_value,
-                                                  guint         n_param_values,
-                                                  const GValue *param_values,
-                                                  gpointer      invocation_hint,
-                                                  gpointer      marshal_data);
-#define gtk_marshal_NONE__STRING_INT_POINTER	gtk_marshal_VOID__STRING_INT_POINTER
-
-/* NONE:UINT (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gtk/gtkmarshal.list:33) */
-#define gtk_marshal_VOID__UINT	g_cclosure_marshal_VOID__UINT
-#define gtk_marshal_NONE__UINT	gtk_marshal_VOID__UINT
-
-/* NONE:UINT,POINTER,UINT,ENUM,ENUM,POINTER (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gtk/gtkmarshal.list:34) */
-extern void gtk_marshal_VOID__UINT_POINTER_UINT_ENUM_ENUM_POINTER (GClosure     *closure,
-                                                                   GValue       *return_value,
-                                                                   guint         n_param_values,
-                                                                   const GValue *param_values,
-                                                                   gpointer      invocation_hint,
-                                                                   gpointer      marshal_data);
-#define gtk_marshal_NONE__UINT_POINTER_UINT_ENUM_ENUM_POINTER	gtk_marshal_VOID__UINT_POINTER_UINT_ENUM_ENUM_POINTER
-
-/* NONE:UINT,POINTER,UINT,UINT,ENUM (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gtk/gtkmarshal.list:35) */
-extern void gtk_marshal_VOID__UINT_POINTER_UINT_UINT_ENUM (GClosure     *closure,
-                                                           GValue       *return_value,
-                                                           guint         n_param_values,
-                                                           const GValue *param_values,
-                                                           gpointer      invocation_hint,
-                                                           gpointer      marshal_data);
-#define gtk_marshal_NONE__UINT_POINTER_UINT_UINT_ENUM	gtk_marshal_VOID__UINT_POINTER_UINT_UINT_ENUM
-
-/* NONE:UINT,STRING (/build/buildd-gtk+2.0_2.12.12-1~lenny2-i386-2RfKoO/gtk+2.0-2.12.12/gtk/gtkmarshal.list:36) */
-extern void gtk_marshal_VOID__UINT_STRING (GClosure     *closure,
-                                           GValue       *return_value,
-                                           guint         n_param_values,
-                                           const GValue *param_values,
-                                           gpointer      invocation_hint,
-                                           gpointer      marshal_data);
-#define gtk_marshal_NONE__UINT_STRING	gtk_marshal_VOID__UINT_STRING
-
-G_END_DECLS
-
-#endif /* __gtk_marshal_MARSHAL_H__ */
-
-#endif /* GTK_DISABLE_DEPRECATED */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmenu.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmenu.h
deleted file mode 100644
index ba4c8013..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmenu.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_MENU_H__
-#define __GTK_MENU_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkaccelgroup.h>
-#include <gtk/gtkmenushell.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_MENU			(gtk_menu_get_type ())
-#define GTK_MENU(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MENU, GtkMenu))
-#define GTK_MENU_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MENU, GtkMenuClass))
-#define GTK_IS_MENU(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_MENU))
-#define GTK_IS_MENU_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MENU))
-#define GTK_MENU_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MENU, GtkMenuClass))
-
-
-typedef struct _GtkMenu	      GtkMenu;
-typedef struct _GtkMenuClass  GtkMenuClass;
-
-typedef void (*GtkMenuPositionFunc) (GtkMenu   *menu,
-				     gint      *x,
-				     gint      *y,
-				     gboolean  *push_in,
-				     gpointer	user_data);
-typedef void (*GtkMenuDetachFunc)   (GtkWidget *attach_widget,
-				     GtkMenu   *menu);
-
-struct _GtkMenu
-{
-  GtkMenuShell menu_shell;
-  
-  GtkWidget *parent_menu_item;
-  GtkWidget *old_active_menu_item;
-
-  GtkAccelGroup *accel_group;
-  gchar         *accel_path;
-  GtkMenuPositionFunc position_func;
-  gpointer position_func_data;
-
-  guint toggle_size;
-  /* Do _not_ touch these widgets directly. We hide the reference
-   * count from the toplevel to the menu, so it must be restored
-   * before operating on these widgets
-   */
-  GtkWidget *toplevel;
-  
-  GtkWidget *tearoff_window;
-  GtkWidget *tearoff_hbox;
-  GtkWidget *tearoff_scrollbar;
-  GtkAdjustment *tearoff_adjustment;
-
-  GdkWindow *view_window;
-  GdkWindow *bin_window;
-
-  gint scroll_offset;
-  gint saved_scroll_offset;
-  gint scroll_step;
-  guint timeout_id;
-  
-  /* When a submenu of this menu is popped up, motion in this
-   * region is ignored
-   */
-  GdkRegion *navigation_region;
-  guint navigation_timeout;
-
-  guint needs_destruction_ref_count : 1;
-  guint torn_off : 1;
-  /* The tearoff is active when it is torn off and the not-torn-off
-   * menu is not popped up.
-   */
-  guint tearoff_active : 1; 
-
-  guint scroll_fast : 1;
-
-  guint upper_arrow_visible : 1;
-  guint lower_arrow_visible : 1;
-  guint upper_arrow_prelight : 1;
-  guint lower_arrow_prelight : 1;
-};
-
-struct _GtkMenuClass
-{
-  GtkMenuShellClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType	   gtk_menu_get_type		  (void) G_GNUC_CONST;
-GtkWidget* gtk_menu_new			  (void);
-
-/* Display the menu onscreen */
-void	   gtk_menu_popup		  (GtkMenu	       *menu,
-					   GtkWidget	       *parent_menu_shell,
-					   GtkWidget	       *parent_menu_item,
-					   GtkMenuPositionFunc	func,
-					   gpointer		data,
-					   guint		button,
-					   guint32		activate_time);
-
-/* Position the menu according to its position function. Called
- * from gtkmenuitem.c when a menu-item changes its allocation
- */
-void	   gtk_menu_reposition		  (GtkMenu	       *menu);
-
-void	   gtk_menu_popdown		  (GtkMenu	       *menu);
-
-/* Keep track of the last menu item selected. (For the purposes
- * of the option menu
- */
-GtkWidget* gtk_menu_get_active		  (GtkMenu	       *menu);
-void	   gtk_menu_set_active		  (GtkMenu	       *menu,
-					   guint		index_);
-
-/* set/get the accelerator group that holds global accelerators (should
- * be added to the corresponding toplevel with gtk_window_add_accel_group().
- */
-void	       gtk_menu_set_accel_group	  (GtkMenu	       *menu,
-					   GtkAccelGroup       *accel_group);
-GtkAccelGroup* gtk_menu_get_accel_group	  (GtkMenu	       *menu);
-void           gtk_menu_set_accel_path    (GtkMenu             *menu,
-					   const gchar         *accel_path);
-
-/* A reference count is kept for a widget when it is attached to
- * a particular widget. This is typically a menu item; it may also
- * be a widget with a popup menu - for instance, the Notebook widget.
- */
-void	   gtk_menu_attach_to_widget	  (GtkMenu	       *menu,
-					   GtkWidget	       *attach_widget,
-					   GtkMenuDetachFunc	detacher);
-void	   gtk_menu_detach		  (GtkMenu	       *menu);
-
-/* This should be dumped in favor of data set when the menu is popped
- * up - that is currently in the ItemFactory code, but should be
- * in the Menu code.
- */
-GtkWidget* gtk_menu_get_attach_widget	  (GtkMenu	       *menu);
-
-void       gtk_menu_set_tearoff_state     (GtkMenu             *menu,
-					   gboolean             torn_off);
-gboolean   gtk_menu_get_tearoff_state     (GtkMenu             *menu);
-
-/* This sets the window manager title for the window that
- * appears when a menu is torn off
- */
-void       gtk_menu_set_title             (GtkMenu             *menu,
-					   const gchar         *title);
-G_CONST_RETURN gchar *gtk_menu_get_title  (GtkMenu             *menu);
-
-void       gtk_menu_reorder_child         (GtkMenu             *menu,
-                                           GtkWidget           *child,
-                                           gint                position);
-
-void	   gtk_menu_set_screen		  (GtkMenu	       *menu,
-					   GdkScreen	       *screen);
-
-void       gtk_menu_attach                (GtkMenu             *menu,
-                                           GtkWidget           *child,
-                                           guint                left_attach,
-                                           guint                right_attach,
-                                           guint                top_attach,
-                                           guint                bottom_attach);
-
-void       gtk_menu_set_monitor           (GtkMenu             *menu,
-                                           gint                 monitor_num);
-GList*     gtk_menu_get_for_attach_widget (GtkWidget           *widget); 
-
-#ifndef GTK_DISABLE_DEPRECATED
-#define gtk_menu_append(menu,child)	gtk_menu_shell_append  ((GtkMenuShell *)(menu),(child))
-#define gtk_menu_prepend(menu,child)    gtk_menu_shell_prepend ((GtkMenuShell *)(menu),(child))
-#define gtk_menu_insert(menu,child,pos)	gtk_menu_shell_insert ((GtkMenuShell *)(menu),(child),(pos))
-#endif /* GTK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GTK_MENU_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmenubar.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmenubar.h
deleted file mode 100644
index 53fba835..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmenubar.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_MENU_BAR_H__
-#define __GTK_MENU_BAR_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkmenushell.h>
-
-
-G_BEGIN_DECLS
-
-
-#define	GTK_TYPE_MENU_BAR               (gtk_menu_bar_get_type ())
-#define GTK_MENU_BAR(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MENU_BAR, GtkMenuBar))
-#define GTK_MENU_BAR_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MENU_BAR, GtkMenuBarClass))
-#define GTK_IS_MENU_BAR(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_MENU_BAR))
-#define GTK_IS_MENU_BAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MENU_BAR))
-#define GTK_MENU_BAR_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MENU_BAR, GtkMenuBarClass))
-
-typedef struct _GtkMenuBar       GtkMenuBar;
-typedef struct _GtkMenuBarClass  GtkMenuBarClass;
-
-struct _GtkMenuBar
-{
-  GtkMenuShell menu_shell;
-};
-
-struct _GtkMenuBarClass
-{
-  GtkMenuShellClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType      gtk_menu_bar_get_type        (void) G_GNUC_CONST;
-GtkWidget* gtk_menu_bar_new             (void);
-
-GtkPackDirection gtk_menu_bar_get_pack_direction (GtkMenuBar       *menubar);
-void             gtk_menu_bar_set_pack_direction (GtkMenuBar       *menubar,
-						  GtkPackDirection  pack_dir);
-GtkPackDirection gtk_menu_bar_get_child_pack_direction (GtkMenuBar       *menubar);
-void             gtk_menu_bar_set_child_pack_direction (GtkMenuBar       *menubar,
-							GtkPackDirection  child_pack_dir);
-
-#ifndef GTK_DISABLE_DEPRECATED
-#define gtk_menu_bar_append(menu,child)	    gtk_menu_shell_append  ((GtkMenuShell *)(menu),(child))
-#define gtk_menu_bar_prepend(menu,child)    gtk_menu_shell_prepend ((GtkMenuShell *)(menu),(child))
-#define gtk_menu_bar_insert(menu,child,pos) gtk_menu_shell_insert ((GtkMenuShell *)(menu),(child),(pos))
-#endif /* GTK_DISABLE_DEPRECATED */
-
-/* Private functions */
-void _gtk_menu_bar_cycle_focus (GtkMenuBar       *menubar,
-				GtkDirectionType  dir);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_MENU_BAR_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmenuitem.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmenuitem.h
deleted file mode 100644
index 4da800ed..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmenuitem.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_MENU_ITEM_H__
-#define __GTK_MENU_ITEM_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkitem.h>
-
-
-G_BEGIN_DECLS
-
-#define	GTK_TYPE_MENU_ITEM		(gtk_menu_item_get_type ())
-#define GTK_MENU_ITEM(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MENU_ITEM, GtkMenuItem))
-#define GTK_MENU_ITEM_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MENU_ITEM, GtkMenuItemClass))
-#define GTK_IS_MENU_ITEM(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_MENU_ITEM))
-#define GTK_IS_MENU_ITEM_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MENU_ITEM))
-#define GTK_MENU_ITEM_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MENU_ITEM, GtkMenuItemClass))
-
-
-typedef struct _GtkMenuItem	  GtkMenuItem;
-typedef struct _GtkMenuItemClass  GtkMenuItemClass;
-
-struct _GtkMenuItem
-{
-  GtkItem item;
-  
-  GtkWidget *submenu;
-  GdkWindow *event_window;
-  
-  guint16 toggle_size;
-  guint16 accelerator_width;
-  gchar  *accel_path;
-  
-  guint show_submenu_indicator : 1;
-  guint submenu_placement : 1;
-  guint submenu_direction : 1;
-  guint right_justify: 1;
-  guint timer_from_keypress : 1;
-  guint from_menubar : 1;
-  guint timer;
-};
-
-struct _GtkMenuItemClass
-{
-  GtkItemClass parent_class;
-  
-  /* If the following flag is true, then we should always hide
-   * the menu when the MenuItem is activated. Otherwise, the 
-   * it is up to the caller. For instance, when navigating
-   * a menu with the keyboard, <Space> doesn't hide, but
-   * <Return> does.
-   */
-  guint hide_on_activate : 1;
-  
-  void (* activate)             (GtkMenuItem *menu_item);
-  void (* activate_item)        (GtkMenuItem *menu_item);
-  void (* toggle_size_request)  (GtkMenuItem *menu_item,
-				 gint        *requisition);
-  void (* toggle_size_allocate) (GtkMenuItem *menu_item,
-				 gint         allocation);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType	   gtk_menu_item_get_type	      (void) G_GNUC_CONST;
-GtkWidget* gtk_menu_item_new                  (void);
-GtkWidget* gtk_menu_item_new_with_label       (const gchar         *label);
-GtkWidget* gtk_menu_item_new_with_mnemonic    (const gchar         *label);
-void       gtk_menu_item_set_submenu          (GtkMenuItem         *menu_item,
-					       GtkWidget           *submenu);
-GtkWidget* gtk_menu_item_get_submenu          (GtkMenuItem         *menu_item);
-void       gtk_menu_item_select               (GtkMenuItem         *menu_item);
-void       gtk_menu_item_deselect             (GtkMenuItem         *menu_item);
-void       gtk_menu_item_activate             (GtkMenuItem         *menu_item);
-void       gtk_menu_item_toggle_size_request  (GtkMenuItem         *menu_item,
-					       gint                *requisition);
-void       gtk_menu_item_toggle_size_allocate (GtkMenuItem         *menu_item,
-					       gint                 allocation);
-void       gtk_menu_item_set_right_justified  (GtkMenuItem         *menu_item,
-					       gboolean             right_justified);
-gboolean   gtk_menu_item_get_right_justified  (GtkMenuItem         *menu_item);
-void	   gtk_menu_item_set_accel_path	      (GtkMenuItem	   *menu_item,
-					       const gchar	   *accel_path);
-
-/* private */
-void	  _gtk_menu_item_refresh_accel_path   (GtkMenuItem	   *menu_item,
-					       const gchar	   *prefix,
-					       GtkAccelGroup	   *accel_group,
-					       gboolean		    group_changed);
-gboolean  _gtk_menu_item_is_selectable        (GtkWidget           *menu_item);
-void      _gtk_menu_item_popup_submenu        (GtkWidget           *menu_item,
-                                               gboolean             with_delay);
-void      _gtk_menu_item_popdown_submenu      (GtkWidget           *menu_item);
-
-#ifndef GTK_DISABLE_DEPRECATED
-void       gtk_menu_item_remove_submenu       (GtkMenuItem         *menu_item);
-#define gtk_menu_item_right_justify(menu_item) gtk_menu_item_set_right_justified ((menu_item), TRUE)
-#endif /* GTK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GTK_MENU_ITEM_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmenushell.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmenushell.h
deleted file mode 100644
index 2595a74f..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmenushell.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_MENU_SHELL_H__
-#define __GTK_MENU_SHELL_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkcontainer.h>
-
-
-G_BEGIN_DECLS
-
-#define	GTK_TYPE_MENU_SHELL		(gtk_menu_shell_get_type ())
-#define GTK_MENU_SHELL(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MENU_SHELL, GtkMenuShell))
-#define GTK_MENU_SHELL_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MENU_SHELL, GtkMenuShellClass))
-#define GTK_IS_MENU_SHELL(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_MENU_SHELL))
-#define GTK_IS_MENU_SHELL_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MENU_SHELL))
-#define GTK_MENU_SHELL_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MENU_SHELL, GtkMenuShellClass))
-
-
-typedef struct _GtkMenuShell	   GtkMenuShell;
-typedef struct _GtkMenuShellClass  GtkMenuShellClass;
-
-struct _GtkMenuShell
-{
-  GtkContainer container;
-  
-  GList *children;
-  GtkWidget *active_menu_item;
-  GtkWidget *parent_menu_shell;
-  
-  guint button;
-  guint32 activate_time;
-
-  guint active : 1;
-  guint have_grab : 1;
-  guint have_xgrab : 1;
-  guint ignore_leave : 1;	/* unused */
-  guint menu_flag : 1;		/* unused */
-  guint ignore_enter : 1;
-};
-
-struct _GtkMenuShellClass
-{
-  GtkContainerClass parent_class;
-  
-  guint submenu_placement : 1;
-  
-  void (*deactivate)     (GtkMenuShell *menu_shell);
-  void (*selection_done) (GtkMenuShell *menu_shell);
-
-  void (*move_current)     (GtkMenuShell        *menu_shell,
-			    GtkMenuDirectionType direction);
-  void (*activate_current) (GtkMenuShell *menu_shell,
-			    gboolean      force_hide);
-  void (*cancel)           (GtkMenuShell *menu_shell);
-  void (*select_item)      (GtkMenuShell *menu_shell,
-			    GtkWidget    *menu_item);
-  void (*insert)           (GtkMenuShell *menu_shell,
-			    GtkWidget    *child,
-			    gint          position);
-  gint (*get_popup_delay)  (GtkMenuShell *menu_shell);
-  gboolean (*move_selected) (GtkMenuShell *menu_shell,
-			     gint          distance);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-};
-
-
-GType gtk_menu_shell_get_type          (void) G_GNUC_CONST;
-void  gtk_menu_shell_append            (GtkMenuShell *menu_shell,
-					GtkWidget    *child);
-void  gtk_menu_shell_prepend           (GtkMenuShell *menu_shell,
-					GtkWidget    *child);
-void  gtk_menu_shell_insert            (GtkMenuShell *menu_shell,
-					GtkWidget    *child,
-					gint          position);
-void  gtk_menu_shell_deactivate        (GtkMenuShell *menu_shell);
-void  gtk_menu_shell_select_item       (GtkMenuShell *menu_shell,
-					GtkWidget    *menu_item);
-void  gtk_menu_shell_deselect          (GtkMenuShell *menu_shell);
-void  gtk_menu_shell_activate_item     (GtkMenuShell *menu_shell,
-					GtkWidget    *menu_item,
-					gboolean      force_deactivate);
-void  gtk_menu_shell_select_first      (GtkMenuShell *menu_shell,
-					gboolean      search_sensitive);
-void _gtk_menu_shell_select_last       (GtkMenuShell *menu_shell,
-					gboolean      search_sensitive);
-void  _gtk_menu_shell_activate         (GtkMenuShell *menu_shell);
-gint  _gtk_menu_shell_get_popup_delay  (GtkMenuShell *menu_shell);
-void  gtk_menu_shell_cancel            (GtkMenuShell *menu_shell);
-
-void  _gtk_menu_shell_add_mnemonic     (GtkMenuShell *menu_shell,
-                                        guint         keyval,
-                                        GtkWidget    *target);
-void  _gtk_menu_shell_remove_mnemonic  (GtkMenuShell *menu_shell,
-                                        guint         keyval,
-                                        GtkWidget    *target);
-
-gboolean gtk_menu_shell_get_take_focus (GtkMenuShell *menu_shell);
-void     gtk_menu_shell_set_take_focus (GtkMenuShell *menu_shell,
-                                        gboolean      take_focus);
-
-G_END_DECLS
-
-#endif /* __GTK_MENU_SHELL_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmenutoolbutton.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmenutoolbutton.h
deleted file mode 100644
index 4eb860e3..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmenutoolbutton.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* GTK - The GIMP Toolkit
- *
- * Copyright (C) 2003 Ricardo Fernandez Pascual
- * Copyright (C) 2004 Paolo Borelli
- *
- * 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 __GTK_MENU_TOOL_BUTTON_H__
-#define __GTK_MENU_TOOL_BUTTON_H__
-
-#include "gtkmenu.h"
-#include "gtk/gtktoolbutton.h"
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_MENU_TOOL_BUTTON         (gtk_menu_tool_button_get_type ())
-#define GTK_MENU_TOOL_BUTTON(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GTK_TYPE_MENU_TOOL_BUTTON, GtkMenuToolButton))
-#define GTK_MENU_TOOL_BUTTON_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), GTK_TYPE_MENU_TOOL_BUTTON, GtkMenuToolButtonClass))
-#define GTK_IS_MENU_TOOL_BUTTON(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTK_TYPE_MENU_TOOL_BUTTON))
-#define GTK_IS_MENU_TOOL_BUTTON_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), GTK_TYPE_MENU_TOOL_BUTTON))
-#define GTK_MENU_TOOL_BUTTON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GTK_TYPE_MENU_TOOL_BUTTON, GtkMenuToolButtonClass))
-
-typedef struct _GtkMenuToolButtonClass   GtkMenuToolButtonClass;
-typedef struct _GtkMenuToolButton        GtkMenuToolButton;
-typedef struct _GtkMenuToolButtonPrivate GtkMenuToolButtonPrivate;
-
-struct _GtkMenuToolButton
-{
-  GtkToolButton parent;
-
-  /*< private >*/
-  GtkMenuToolButtonPrivate *priv;
-};
-
-struct _GtkMenuToolButtonClass
-{
-  GtkToolButtonClass parent_class;
-
-  void (*show_menu) (GtkMenuToolButton *button);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType         gtk_menu_tool_button_get_type       (void) G_GNUC_CONST;
-GtkToolItem  *gtk_menu_tool_button_new            (GtkWidget   *icon_widget,
-                                                   const gchar *label);
-GtkToolItem  *gtk_menu_tool_button_new_from_stock (const gchar *stock_id);
-
-void          gtk_menu_tool_button_set_menu       (GtkMenuToolButton *button,
-                                                   GtkWidget         *menu);
-GtkWidget    *gtk_menu_tool_button_get_menu       (GtkMenuToolButton *button);
-
-#ifndef GTK_DISABLE_DEPRECATED
-void          gtk_menu_tool_button_set_arrow_tooltip (GtkMenuToolButton *button,
-                                                      GtkTooltips       *tooltips,
-                                                      const gchar       *tip_text,
-                                                      const gchar       *tip_private);
-#endif /* GTK_DISABLE_DEPRECATED */
-
-void          gtk_menu_tool_button_set_arrow_tooltip_text   (GtkMenuToolButton *button,
-							     const gchar       *text);
-void          gtk_menu_tool_button_set_arrow_tooltip_markup (GtkMenuToolButton *button,
-							     const gchar       *markup);
-
-G_END_DECLS
-
-#endif /* __GTK_MENU_TOOL_BUTTON_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmessagedialog.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmessagedialog.h
deleted file mode 100644
index dbf17d2b..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmessagedialog.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 2 -*- */
-/* GTK - The GIMP Toolkit
- * 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.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2003.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_MESSAGE_DIALOG_H__
-#define __GTK_MESSAGE_DIALOG_H__
-
-#include <gtk/gtkdialog.h>
-
-G_BEGIN_DECLS
-
-typedef enum
-{
-  GTK_MESSAGE_INFO,
-  GTK_MESSAGE_WARNING,
-  GTK_MESSAGE_QUESTION,
-  GTK_MESSAGE_ERROR,
-  GTK_MESSAGE_OTHER
-} GtkMessageType;
-
-typedef enum
-{
-  GTK_BUTTONS_NONE,
-  GTK_BUTTONS_OK,
-  GTK_BUTTONS_CLOSE,
-  GTK_BUTTONS_CANCEL,
-  GTK_BUTTONS_YES_NO,
-  GTK_BUTTONS_OK_CANCEL
-} GtkButtonsType;
-
-#define GTK_TYPE_MESSAGE_DIALOG                  (gtk_message_dialog_get_type ())
-#define GTK_MESSAGE_DIALOG(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MESSAGE_DIALOG, GtkMessageDialog))
-#define GTK_MESSAGE_DIALOG_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MESSAGE_DIALOG, GtkMessageDialogClass))
-#define GTK_IS_MESSAGE_DIALOG(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_MESSAGE_DIALOG))
-#define GTK_IS_MESSAGE_DIALOG_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MESSAGE_DIALOG))
-#define GTK_MESSAGE_DIALOG_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MESSAGE_DIALOG, GtkMessageDialogClass))
-
-typedef struct _GtkMessageDialog        GtkMessageDialog;
-typedef struct _GtkMessageDialogClass   GtkMessageDialogClass;
-
-struct _GtkMessageDialog
-{
-  /*< private >*/
-  
-  GtkDialog parent_instance;
-  
-  GtkWidget *image;
-  GtkWidget *label;
-};
-
-struct _GtkMessageDialogClass
-{
-  GtkDialogClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType      gtk_message_dialog_get_type (void) G_GNUC_CONST;
-
-GtkWidget* gtk_message_dialog_new      (GtkWindow      *parent,
-                                        GtkDialogFlags  flags,
-                                        GtkMessageType  type,
-                                        GtkButtonsType  buttons,
-                                        const gchar    *message_format,
-                                        ...) G_GNUC_PRINTF (5, 6);
-
-GtkWidget* gtk_message_dialog_new_with_markup   (GtkWindow      *parent,
-                                                 GtkDialogFlags  flags,
-                                                 GtkMessageType  type,
-                                                 GtkButtonsType  buttons,
-                                                 const gchar    *message_format,
-                                                 ...) G_GNUC_PRINTF (5, 6);
-
-void       gtk_message_dialog_set_image    (GtkMessageDialog *dialog,
-					    GtkWidget        *image);
-
-void       gtk_message_dialog_set_markup  (GtkMessageDialog *message_dialog,
-                                           const gchar      *str);
-
-void       gtk_message_dialog_format_secondary_text (GtkMessageDialog *message_dialog,
-                                                     const gchar      *message_format,
-                                                     ...) G_GNUC_PRINTF (2, 3);
-
-void       gtk_message_dialog_format_secondary_markup (GtkMessageDialog *message_dialog,
-                                                       const gchar      *message_format,
-                                                       ...) G_GNUC_PRINTF (2, 3);
-
-G_END_DECLS
-
-#endif /* __GTK_MESSAGE_DIALOG_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmisc.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmisc.h
deleted file mode 100644
index 3bc638ae..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmisc.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_MISC_H__
-#define __GTK_MISC_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkwidget.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_MISC		       (gtk_misc_get_type ())
-#define GTK_MISC(obj)		       (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MISC, GtkMisc))
-#define GTK_MISC_CLASS(klass)	       (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MISC, GtkMiscClass))
-#define GTK_IS_MISC(obj)	       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_MISC))
-#define GTK_IS_MISC_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MISC))
-#define GTK_MISC_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MISC, GtkMiscClass))
-
-
-typedef struct _GtkMisc	      GtkMisc;
-typedef struct _GtkMiscClass  GtkMiscClass;
-
-struct _GtkMisc
-{
-  GtkWidget widget;
-  
-  gfloat xalign;
-  gfloat yalign;
-  
-  guint16 xpad;
-  guint16 ypad;
-};
-
-struct _GtkMiscClass
-{
-  GtkWidgetClass parent_class;
-};
-
-
-GType   gtk_misc_get_type      (void) G_GNUC_CONST;
-void	gtk_misc_set_alignment (GtkMisc *misc,
-				gfloat	 xalign,
-				gfloat	 yalign);
-void    gtk_misc_get_alignment (GtkMisc *misc,
-				gfloat  *xalign,
-				gfloat  *yalign);
-void	gtk_misc_set_padding   (GtkMisc *misc,
-				gint	 xpad,
-				gint	 ypad);
-void    gtk_misc_get_padding   (GtkMisc *misc,
-				gint    *xpad,
-				gint    *ypad);
-
-
-G_END_DECLS
-
-#endif /* __GTK_MISC_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmodules.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmodules.h
deleted file mode 100644
index bd157f79..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmodules.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright 1998-2002 Tim Janik, Red Hat, Inc., and others.
- * Copyright (C) 2003 Alex Graveley
- *
- * 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 __GTK_MODULES_H__
-#define __GTK_MODULES_H__
-
-#include <gtk/gtksettings.h>
-
-
-G_BEGIN_DECLS
-
-
-/* Functions for use within GTK+
- */
-gchar * _gtk_find_module        (const gchar *name,
-			         const gchar *type);
-gchar **_gtk_get_module_path    (const gchar *type);
-
-void    _gtk_modules_init             (gint         *argc,
-				       gchar      ***argv,
-				       const gchar  *gtk_modules_args);
-void    _gtk_modules_settings_changed (GtkSettings  *settings, 
-				       const gchar  *modules);
-
-typedef void	 (*GtkModuleInitFunc)        (gint	  *argc,
-					      gchar      ***argv);
-typedef void	 (*GtkModuleDisplayInitFunc) (GdkDisplay   *display);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_MODULES_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtknotebook.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtknotebook.h
deleted file mode 100644
index 887704a2..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtknotebook.h
+++ /dev/null
@@ -1,291 +0,0 @@
-/* -*- Mode: C; c-file-style: "gnu"; tab-width: 8 -*- */
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_NOTEBOOK_H__
-#define __GTK_NOTEBOOK_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkcontainer.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_NOTEBOOK                  (gtk_notebook_get_type ())
-#define GTK_NOTEBOOK(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_NOTEBOOK, GtkNotebook))
-#define GTK_NOTEBOOK_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_NOTEBOOK, GtkNotebookClass))
-#define GTK_IS_NOTEBOOK(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_NOTEBOOK))
-#define GTK_IS_NOTEBOOK_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_NOTEBOOK))
-#define GTK_NOTEBOOK_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_NOTEBOOK, GtkNotebookClass))
-
-
-typedef enum
-{
-  GTK_NOTEBOOK_TAB_FIRST,
-  GTK_NOTEBOOK_TAB_LAST
-} GtkNotebookTab;
-
-typedef struct _GtkNotebook       GtkNotebook;
-typedef struct _GtkNotebookClass  GtkNotebookClass;
-typedef struct _GtkNotebookPage   GtkNotebookPage;
-
-struct _GtkNotebook
-{
-  GtkContainer container;
-  
-  GtkNotebookPage *cur_page;
-  GList *children;
-  GList *first_tab;		/* The first tab visible (for scrolling notebooks) */
-  GList *focus_tab;
-  
-  GtkWidget *menu;
-  GdkWindow *event_window;
-  
-  guint32 timer;
-  
-  guint16 tab_hborder;
-  guint16 tab_vborder;
-  
-  guint show_tabs          : 1;
-  guint homogeneous        : 1;
-  guint show_border        : 1;
-  guint tab_pos            : 2;
-  guint scrollable         : 1;
-  guint in_child           : 3;
-  guint click_child        : 3;
-  guint button             : 2;
-  guint need_timer         : 1;
-  guint child_has_focus    : 1;
-  guint have_visible_child : 1;
-  guint focus_out          : 1;	/* Flag used by ::move-focus-out implementation */
-
-  guint has_before_previous : 1;
-  guint has_before_next     : 1;
-  guint has_after_previous  : 1;
-  guint has_after_next      : 1;
-};
-
-struct _GtkNotebookClass
-{
-  GtkContainerClass parent_class;
-  
-  void (* switch_page)       (GtkNotebook     *notebook,
-                              GtkNotebookPage *page,
-			      guint            page_num);
-
-  /* Action signals for keybindings */
-  gboolean (* select_page)     (GtkNotebook       *notebook,
-                                gboolean           move_focus);
-  gboolean (* focus_tab)       (GtkNotebook       *notebook,
-                                GtkNotebookTab     type);
-  gboolean (* change_current_page) (GtkNotebook   *notebook,
-                                gint               offset);
-  void (* move_focus_out)      (GtkNotebook       *notebook,
-				GtkDirectionType   direction);
-  gboolean (* reorder_tab)     (GtkNotebook       *notebook,
-				GtkDirectionType   direction,
-				gboolean           move_to_last);
-
-  /* More vfuncs */
-  gint (* insert_page)         (GtkNotebook       *notebook,
-			        GtkWidget         *child,
-				GtkWidget         *tab_label,
-				GtkWidget         *menu_label,
-				gint               position);
-
-  GtkNotebook * (* create_window) (GtkNotebook       *notebook,
-                                   GtkWidget         *page,
-                                   gint               x,
-                                   gint               y);
-
-  void (*_gtk_reserved1) (void);
-};
-
-typedef GtkNotebook* (*GtkNotebookWindowCreationFunc) (GtkNotebook *source,
-                                                       GtkWidget   *page,
-                                                       gint         x,
-                                                       gint         y,
-                                                       gpointer     data);
-
-/***********************************************************
- *           Creation, insertion, deletion                 *
- ***********************************************************/
-
-GType   gtk_notebook_get_type       (void) G_GNUC_CONST;
-GtkWidget * gtk_notebook_new        (void);
-gint gtk_notebook_append_page       (GtkNotebook *notebook,
-				     GtkWidget   *child,
-				     GtkWidget   *tab_label);
-gint gtk_notebook_append_page_menu  (GtkNotebook *notebook,
-				     GtkWidget   *child,
-				     GtkWidget   *tab_label,
-				     GtkWidget   *menu_label);
-gint gtk_notebook_prepend_page      (GtkNotebook *notebook,
-				     GtkWidget   *child,
-				     GtkWidget   *tab_label);
-gint gtk_notebook_prepend_page_menu (GtkNotebook *notebook,
-				     GtkWidget   *child,
-				     GtkWidget   *tab_label,
-				     GtkWidget   *menu_label);
-gint gtk_notebook_insert_page       (GtkNotebook *notebook,
-				     GtkWidget   *child,
-				     GtkWidget   *tab_label,
-				     gint         position);
-gint gtk_notebook_insert_page_menu  (GtkNotebook *notebook,
-				     GtkWidget   *child,
-				     GtkWidget   *tab_label,
-				     GtkWidget   *menu_label,
-				     gint         position);
-void gtk_notebook_remove_page       (GtkNotebook *notebook,
-				     gint         page_num);
-
-/***********************************************************
- *           Tabs drag and drop                            *
- ***********************************************************/
-
-void gtk_notebook_set_window_creation_hook (GtkNotebookWindowCreationFunc  func,
-					    gpointer                       data,
-                                            GDestroyNotify                 destroy);
-#ifndef GTK_DISABLE_DEPRECATED
-void gtk_notebook_set_group_id             (GtkNotebook *notebook,
-					    gint         group_id);
-gint gtk_notebook_get_group_id             (GtkNotebook *notebook);
-
-#endif /* GTK_DISABLE_DEPRECATED */
-
-void gtk_notebook_set_group                (GtkNotebook *notebook,
-					    gpointer     group);
-gpointer gtk_notebook_get_group            (GtkNotebook *notebook);
-
-
-
-/***********************************************************
- *            query, set current NotebookPage              *
- ***********************************************************/
-
-gint       gtk_notebook_get_current_page (GtkNotebook *notebook);
-GtkWidget* gtk_notebook_get_nth_page     (GtkNotebook *notebook,
-					  gint         page_num);
-gint       gtk_notebook_get_n_pages      (GtkNotebook *notebook);
-gint       gtk_notebook_page_num         (GtkNotebook *notebook,
-					  GtkWidget   *child);
-void       gtk_notebook_set_current_page (GtkNotebook *notebook,
-					  gint         page_num);
-void       gtk_notebook_next_page        (GtkNotebook *notebook);
-void       gtk_notebook_prev_page        (GtkNotebook *notebook);
-
-/***********************************************************
- *            set Notebook, NotebookTab style              *
- ***********************************************************/
-
-void     gtk_notebook_set_show_border      (GtkNotebook     *notebook,
-					    gboolean         show_border);
-gboolean gtk_notebook_get_show_border      (GtkNotebook     *notebook);
-void     gtk_notebook_set_show_tabs        (GtkNotebook     *notebook,
-					    gboolean         show_tabs);
-gboolean gtk_notebook_get_show_tabs        (GtkNotebook     *notebook);
-void     gtk_notebook_set_tab_pos          (GtkNotebook     *notebook,
-				            GtkPositionType  pos);
-GtkPositionType gtk_notebook_get_tab_pos   (GtkNotebook     *notebook);
-
-#ifndef GTK_DISABLE_DEPRECATED
-void     gtk_notebook_set_homogeneous_tabs (GtkNotebook     *notebook,
-					    gboolean         homogeneous);
-void     gtk_notebook_set_tab_border       (GtkNotebook     *notebook,
-					    guint            border_width);
-void     gtk_notebook_set_tab_hborder      (GtkNotebook     *notebook,
-					    guint            tab_hborder);
-void     gtk_notebook_set_tab_vborder      (GtkNotebook     *notebook,
-					    guint            tab_vborder);
-#endif /* GTK_DISABLE_DEPRECATED */
-
-void     gtk_notebook_set_scrollable       (GtkNotebook     *notebook,
-					    gboolean         scrollable);
-gboolean gtk_notebook_get_scrollable       (GtkNotebook     *notebook);
-
-/***********************************************************
- *               enable/disable PopupMenu                  *
- ***********************************************************/
-
-void gtk_notebook_popup_enable  (GtkNotebook *notebook);
-void gtk_notebook_popup_disable (GtkNotebook *notebook);
-
-/***********************************************************
- *             query/set NotebookPage Properties           *
- ***********************************************************/
-
-GtkWidget * gtk_notebook_get_tab_label    (GtkNotebook *notebook,
-					   GtkWidget   *child);
-void gtk_notebook_set_tab_label           (GtkNotebook *notebook,
-					   GtkWidget   *child,
-					   GtkWidget   *tab_label);
-void gtk_notebook_set_tab_label_text      (GtkNotebook *notebook,
-					   GtkWidget   *child,
-					   const gchar *tab_text);
-G_CONST_RETURN gchar *gtk_notebook_get_tab_label_text (GtkNotebook *notebook,
-						       GtkWidget   *child);
-GtkWidget * gtk_notebook_get_menu_label   (GtkNotebook *notebook,
-					   GtkWidget   *child);
-void gtk_notebook_set_menu_label          (GtkNotebook *notebook,
-					   GtkWidget   *child,
-					   GtkWidget   *menu_label);
-void gtk_notebook_set_menu_label_text     (GtkNotebook *notebook,
-					   GtkWidget   *child,
-					   const gchar *menu_text);
-G_CONST_RETURN gchar *gtk_notebook_get_menu_label_text (GtkNotebook *notebook,
-							GtkWidget   *child);
-void gtk_notebook_query_tab_label_packing (GtkNotebook *notebook,
-					   GtkWidget   *child,
-					   gboolean    *expand,
-					   gboolean    *fill,
-					   GtkPackType *pack_type);
-void gtk_notebook_set_tab_label_packing   (GtkNotebook *notebook,
-					   GtkWidget   *child,
-					   gboolean     expand,
-					   gboolean     fill,
-					   GtkPackType  pack_type);
-void gtk_notebook_reorder_child           (GtkNotebook *notebook,
-					   GtkWidget   *child,
-					   gint         position);
-gboolean gtk_notebook_get_tab_reorderable (GtkNotebook *notebook,
-					   GtkWidget   *child);
-void gtk_notebook_set_tab_reorderable     (GtkNotebook *notebook,
-					   GtkWidget   *child,
-					   gboolean     reorderable);
-gboolean gtk_notebook_get_tab_detachable  (GtkNotebook *notebook,
-					   GtkWidget   *child);
-void gtk_notebook_set_tab_detachable      (GtkNotebook *notebook,
-					   GtkWidget   *child,
-					   gboolean     detachable);
-
-#ifndef GTK_DISABLE_DEPRECATED
-#define	gtk_notebook_current_page               gtk_notebook_get_current_page
-#define gtk_notebook_set_page                   gtk_notebook_set_current_page
-#endif /* GTK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GTK_NOTEBOOK_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkobject.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkobject.h
deleted file mode 100644
index 22d4bf4b..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkobject.h
+++ /dev/null
@@ -1,226 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_OBJECT_H__
-#define __GTK_OBJECT_H__
-
-
-#include <gtk/gtkenums.h>
-#include <gtk/gtktypeutils.h>
-#include <gtk/gtkdebug.h>
-
-G_BEGIN_DECLS
-
-/* macros for casting a pointer to a GtkObject or GtkObjectClass pointer,
- * and to test whether `object' and `klass' are of type GTK_TYPE_OBJECT.
- * these are the standard macros for all GtkObject-derived classes.
- */
-#define	GTK_TYPE_OBJECT			(gtk_object_get_type ())
-#define GTK_OBJECT(object)		(GTK_CHECK_CAST ((object), GTK_TYPE_OBJECT, GtkObject))
-#define GTK_OBJECT_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_OBJECT, GtkObjectClass))
-#define GTK_IS_OBJECT(object)		(GTK_CHECK_TYPE ((object), GTK_TYPE_OBJECT))
-#define GTK_IS_OBJECT_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_OBJECT))
-#define	GTK_OBJECT_GET_CLASS(object)	(GTK_CHECK_GET_CLASS ((object), GTK_TYPE_OBJECT, GtkObjectClass))
-
-/* Macros for extracting various fields from GtkObject and GtkObjectClass.
- */
-#define GTK_OBJECT_TYPE(object)		  (G_TYPE_FROM_INSTANCE (object))
-#define GTK_OBJECT_TYPE_NAME(object)	  (g_type_name (GTK_OBJECT_TYPE (object)))
-
-/* GtkObject only uses the first 4 bits of the flags field.
- * Derived objects may use the remaining bits. Though this
- * is a kinda nasty break up, it does make the size of
- * derived objects smaller.
- */
-typedef enum
-{
-  GTK_IN_DESTRUCTION	= 1 << 0, /* Used internally during dispose */
-#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
-  GTK_FLOATING		= 1 << 1,
-#endif
-  GTK_RESERVED_1	= 1 << 2,
-  GTK_RESERVED_2	= 1 << 3
-} GtkObjectFlags;
-
-/* Macros for extracting the object_flags from GtkObject.
- */
-#define GTK_OBJECT_FLAGS(obj)		  (GTK_OBJECT (obj)->flags)
-#ifndef GTK_DISABLE_DEPRECATED
-#define GTK_OBJECT_FLOATING(obj)	  (g_object_is_floating (obj))
-#endif
-
-/* Macros for setting and clearing bits in the object_flags field of GtkObject.
- */
-#define GTK_OBJECT_SET_FLAGS(obj,flag)	  G_STMT_START{ (GTK_OBJECT_FLAGS (obj) |= (flag)); }G_STMT_END
-#define GTK_OBJECT_UNSET_FLAGS(obj,flag)  G_STMT_START{ (GTK_OBJECT_FLAGS (obj) &= ~(flag)); }G_STMT_END
-
-typedef struct _GtkObjectClass	GtkObjectClass;
-
-
-struct _GtkObject
-{
-  GInitiallyUnowned parent_instance;
-  
-  /* 32 bits of flags. GtkObject only uses 4 of these bits and
-   *  GtkWidget uses the rest. This is done because structs are
-   *  aligned on 4 or 8 byte boundaries. If a new bitfield were
-   *  used in GtkWidget much space would be wasted.
-   */
-  guint32 flags;
-};
-
-struct _GtkObjectClass
-{
-  GInitiallyUnownedClass parent_class;
-  
-  /* Non overridable class methods to set and get per class arguments */
-  void (*set_arg) (GtkObject *object,
-		   GtkArg    *arg,
-		   guint      arg_id);
-  void (*get_arg) (GtkObject *object,
-		   GtkArg    *arg,
-		   guint      arg_id);
-  
-  /* Default signal handler for the ::destroy signal, which is
-   *  invoked to request that references to the widget be dropped.
-   *  If an object class overrides destroy() in order to perform class
-   *  specific destruction then it must still invoke its superclass'
-   *  implementation of the method after it is finished with its
-   *  own cleanup. (See gtk_widget_real_destroy() for an example of
-   *  how to do this).
-   */
-  void (*destroy)  (GtkObject *object);
-};
-
-
-
-/* Application-level methods */
-
-GtkType	gtk_object_get_type		(void) G_GNUC_CONST;
-
-#ifndef GTK_DISABLE_DEPRECATED
-void gtk_object_sink	  (GtkObject *object);
-#endif
-void gtk_object_destroy	  (GtkObject *object);
-
-/****************************************************************/
-
-#ifndef GTK_DISABLE_DEPRECATED 
-
-GtkObject*	gtk_object_new		  (GtkType	       type,
-					   const gchar	      *first_property_name,
-					   ...);
-GtkObject*	gtk_object_ref		  (GtkObject	      *object);
-void		gtk_object_unref	  (GtkObject	      *object);
-void gtk_object_weakref	  (GtkObject	    *object,
-			   GtkDestroyNotify  notify,
-			   gpointer	     data);
-void gtk_object_weakunref (GtkObject	    *object,
-			   GtkDestroyNotify  notify,
-			   gpointer	     data);
-
-/* Set 'data' to the "object_data" field of the object. The
- *  data is indexed by the "key". If there is already data
- *  associated with "key" then the new data will replace it.
- *  If 'data' is NULL then this call is equivalent to
- *  'gtk_object_remove_data'.
- *  The gtk_object_set_data_full variant acts just the same,
- *  but takes an additional argument which is a function to
- *  be called when the data is removed.
- *  `gtk_object_remove_data' is equivalent to the above,
- *  where 'data' is NULL
- *  `gtk_object_get_data' gets the data associated with "key".
- */
-void	 gtk_object_set_data	     (GtkObject	     *object,
-				      const gchar    *key,
-				      gpointer	      data);
-void	 gtk_object_set_data_full    (GtkObject	     *object,
-				      const gchar    *key,
-				      gpointer	      data,
-				      GtkDestroyNotify destroy);
-void	 gtk_object_remove_data	     (GtkObject	     *object,
-				      const gchar    *key);
-gpointer gtk_object_get_data	     (GtkObject	     *object,
-				      const gchar    *key);
-void	 gtk_object_remove_no_notify (GtkObject	     *object,
-				      const gchar    *key);
-
-/* Set/get the "user_data" object data field of "object". It should
- *  be noted that these functions are no different than calling
- *  `gtk_object_set_data'/`gtk_object_get_data' with a key of "user_data".
- *  They are merely provided as a convenience.
- */
-void	 gtk_object_set_user_data (GtkObject	*object,
-				   gpointer	 data);
-gpointer gtk_object_get_user_data (GtkObject	*object);
-
-
-/* Object-level methods */
-
-/* Object data method variants that operate on key ids. */
-void gtk_object_set_data_by_id		(GtkObject	 *object,
-					 GQuark		  data_id,
-					 gpointer	  data);
-void gtk_object_set_data_by_id_full	(GtkObject	 *object,
-					 GQuark		  data_id,
-					 gpointer	  data,
-					 GtkDestroyNotify destroy);
-gpointer gtk_object_get_data_by_id	(GtkObject	 *object,
-					 GQuark		  data_id);
-void  gtk_object_remove_data_by_id	(GtkObject	 *object,
-					 GQuark		  data_id);
-void  gtk_object_remove_no_notify_by_id	(GtkObject	 *object,
-					 GQuark		  key_id);
-#define	gtk_object_data_try_key	    g_quark_try_string
-#define	gtk_object_data_force_id    g_quark_from_string
-
-/* GtkArg flag bits for gtk_object_add_arg_type
- */
-typedef enum
-{
-  GTK_ARG_READABLE	 = G_PARAM_READABLE,
-  GTK_ARG_WRITABLE	 = G_PARAM_WRITABLE,
-  GTK_ARG_CONSTRUCT	 = G_PARAM_CONSTRUCT,
-  GTK_ARG_CONSTRUCT_ONLY = G_PARAM_CONSTRUCT_ONLY,
-  GTK_ARG_CHILD_ARG	 = 1 << 4
-} GtkArgFlags;
-#define	GTK_ARG_READWRITE	(GTK_ARG_READABLE | GTK_ARG_WRITABLE)
-void	gtk_object_get		(GtkObject	*object,
-				 const gchar	*first_property_name,
-				 ...) G_GNUC_NULL_TERMINATED;
-void	gtk_object_set		(GtkObject	*object,
-				 const gchar	*first_property_name,
-				 ...) G_GNUC_NULL_TERMINATED;
-void	gtk_object_add_arg_type		(const gchar	*arg_name,
-					 GtkType	 arg_type,
-					 guint		 arg_flags,
-					 guint		 arg_id);
-
-#endif /* GTK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GTK_OBJECT_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkoldeditable.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkoldeditable.h
deleted file mode 100644
index da6d90c3..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkoldeditable.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-#ifndef __GTK_OLD_EDITABLE_H__
-#define __GTK_OLD_EDITABLE_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkeditable.h>
-#include <gtk/gtkwidget.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_OLD_EDITABLE            (gtk_old_editable_get_type ())
-#define GTK_OLD_EDITABLE(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_OLD_EDITABLE, GtkOldEditable))
-#define GTK_OLD_EDITABLE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_OLD_EDITABLE, GtkOldEditableClass))
-#define GTK_IS_OLD_EDITABLE(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_OLD_EDITABLE))
-#define GTK_IS_OLD_EDITABLE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_OLD_EDITABLE))
-#define GTK_OLD_EDITABLE_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_OLD_EDITABLE, GtkOldEditableClass))
-
-
-typedef struct _GtkOldEditable       GtkOldEditable;
-typedef struct _GtkOldEditableClass  GtkOldEditableClass;
-
-typedef void (*GtkTextFunction) (GtkOldEditable  *editable, guint32 time_);
-
-struct _GtkOldEditable
-{
-  GtkWidget widget;
-
-  /*< public >*/
-  guint      current_pos;
-
-  guint      selection_start_pos;
-  guint      selection_end_pos;
-  guint      has_selection : 1;
-
-  /*< private >*/
-  guint      editable : 1;
-  guint      visible : 1;
-  
-  gchar *clipboard_text;
-};
-
-struct _GtkOldEditableClass
-{
-  GtkWidgetClass parent_class;
-  
-  /* Bindings actions */
-  void (* activate)        (GtkOldEditable *editable);
-  void (* set_editable)    (GtkOldEditable *editable,
-			    gboolean	    is_editable);
-  void (* move_cursor)     (GtkOldEditable *editable,
-			    gint            x,
-			    gint            y);
-  void (* move_word)       (GtkOldEditable *editable,
-			    gint            n);
-  void (* move_page)       (GtkOldEditable *editable,
-			    gint            x,
-			    gint            y);
-  void (* move_to_row)     (GtkOldEditable *editable,
-			    gint            row);
-  void (* move_to_column)  (GtkOldEditable *editable,
-			    gint            row);
-  void (* kill_char)       (GtkOldEditable *editable,
-			    gint            direction);
-  void (* kill_word)       (GtkOldEditable *editable,
-			    gint            direction);
-  void (* kill_line)       (GtkOldEditable *editable,
-			    gint            direction);
-  void (* cut_clipboard)   (GtkOldEditable *editable);
-  void (* copy_clipboard)  (GtkOldEditable *editable);
-  void (* paste_clipboard) (GtkOldEditable *editable);
-
-  /* Virtual functions. get_chars is in paricular not a signal because
-   * it returns malloced memory. The others are not signals because
-   * they would not be particularly useful as such. (All changes to
-   * selection and position do not go through these functions)
-   */
-  void (* update_text)  (GtkOldEditable  *editable,
-			 gint             start_pos,
-			 gint             end_pos);
-  gchar* (* get_chars)  (GtkOldEditable  *editable,
-			 gint             start_pos,
-			 gint             end_pos);
-  void (* set_selection)(GtkOldEditable  *editable,
-			 gint             start_pos,
-			 gint             end_pos);
-  void (* set_position) (GtkOldEditable  *editable,
-			 gint             position);
-};
-
-GtkType    gtk_old_editable_get_type        (void) G_GNUC_CONST;
-void       gtk_old_editable_claim_selection (GtkOldEditable *old_editable,
-					     gboolean        claim,
-					     guint32         time_);
-void       gtk_old_editable_changed         (GtkOldEditable *old_editable);
-
-G_END_DECLS
-
-#endif /* __GTK_OLD_EDITABLE_H__ */
-
-#endif /* GTK_DISABLE_DEPRECATED */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkoptionmenu.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkoptionmenu.h
deleted file mode 100644
index 32f6de9f..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkoptionmenu.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-#ifndef __GTK_OPTION_MENU_H__
-#define __GTK_OPTION_MENU_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkbutton.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_OPTION_MENU              (gtk_option_menu_get_type ())
-#define GTK_OPTION_MENU(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_OPTION_MENU, GtkOptionMenu))
-#define GTK_OPTION_MENU_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_OPTION_MENU, GtkOptionMenuClass))
-#define GTK_IS_OPTION_MENU(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_OPTION_MENU))
-#define GTK_IS_OPTION_MENU_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_OPTION_MENU))
-#define GTK_OPTION_MENU_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_OPTION_MENU, GtkOptionMenuClass))
-
-
-typedef struct _GtkOptionMenu       GtkOptionMenu;
-typedef struct _GtkOptionMenuClass  GtkOptionMenuClass;
-
-struct _GtkOptionMenu
-{
-  GtkButton button;
-  
-  GtkWidget *menu;
-  GtkWidget *menu_item;
-  
-  guint16 width;
-  guint16 height;
-};
-
-struct _GtkOptionMenuClass
-{
-  GtkButtonClass parent_class;
-
-  void (*changed) (GtkOptionMenu *option_menu);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType      gtk_option_menu_get_type    (void) G_GNUC_CONST;
-GtkWidget* gtk_option_menu_new         (void);
-GtkWidget* gtk_option_menu_get_menu    (GtkOptionMenu *option_menu);
-void       gtk_option_menu_set_menu    (GtkOptionMenu *option_menu,
-					GtkWidget     *menu);
-void       gtk_option_menu_remove_menu (GtkOptionMenu *option_menu);
-gint       gtk_option_menu_get_history (GtkOptionMenu *option_menu);
-void       gtk_option_menu_set_history (GtkOptionMenu *option_menu,
-					guint          index_);
-
-
-G_END_DECLS
-
-#endif /* __GTK_OPTION_MENU_H__ */
-
-#endif /* GTK_DISABLE_DEPRECATED */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkpagesetup.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkpagesetup.h
deleted file mode 100644
index 6de2ef5f..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkpagesetup.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkpagesetup.h: Page Setup
- * Copyright (C) 2006, 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 __GTK_PAGE_SETUP_H__
-#define __GTK_PAGE_SETUP_H__
-
-#include <glib-object.h>
-#include "gtkenums.h"
-#include "gtkpapersize.h"
-
-G_BEGIN_DECLS
-
-typedef struct _GtkPageSetup GtkPageSetup;
-
-#define GTK_TYPE_PAGE_SETUP    (gtk_page_setup_get_type ())
-#define GTK_PAGE_SETUP(obj)    (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PAGE_SETUP, GtkPageSetup))
-#define GTK_IS_PAGE_SETUP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PAGE_SETUP))
-
-GType              gtk_page_setup_get_type          (void) G_GNUC_CONST;
-GtkPageSetup *     gtk_page_setup_new               (void);
-GtkPageSetup *     gtk_page_setup_copy              (GtkPageSetup       *other);
-GtkPageOrientation gtk_page_setup_get_orientation   (GtkPageSetup       *setup);
-void               gtk_page_setup_set_orientation   (GtkPageSetup       *setup,
-						     GtkPageOrientation  orientation);
-GtkPaperSize *     gtk_page_setup_get_paper_size    (GtkPageSetup       *setup);
-void               gtk_page_setup_set_paper_size    (GtkPageSetup       *setup,
-						     GtkPaperSize       *size);
-gdouble            gtk_page_setup_get_top_margin    (GtkPageSetup       *setup,
-						     GtkUnit             unit);
-void               gtk_page_setup_set_top_margin    (GtkPageSetup       *setup,
-						     gdouble             margin,
-						     GtkUnit             unit);
-gdouble            gtk_page_setup_get_bottom_margin (GtkPageSetup       *setup,
-						     GtkUnit             unit);
-void               gtk_page_setup_set_bottom_margin (GtkPageSetup       *setup,
-						     gdouble             margin,
-						     GtkUnit             unit);
-gdouble            gtk_page_setup_get_left_margin   (GtkPageSetup       *setup,
-						     GtkUnit             unit);
-void               gtk_page_setup_set_left_margin   (GtkPageSetup       *setup,
-						     gdouble             margin,
-						     GtkUnit             unit);
-gdouble            gtk_page_setup_get_right_margin  (GtkPageSetup       *setup,
-						     GtkUnit             unit);
-void               gtk_page_setup_set_right_margin  (GtkPageSetup       *setup,
-						     gdouble             margin,
-						     GtkUnit             unit);
-
-void gtk_page_setup_set_paper_size_and_default_margins (GtkPageSetup    *setup,
-							GtkPaperSize    *size);
-
-/* These take orientation, but not margins into consideration */
-gdouble            gtk_page_setup_get_paper_width   (GtkPageSetup       *setup,
-						     GtkUnit             unit);
-gdouble            gtk_page_setup_get_paper_height  (GtkPageSetup       *setup,
-						     GtkUnit             unit);
-
-
-/* These take orientation, and margins into consideration */
-gdouble            gtk_page_setup_get_page_width    (GtkPageSetup       *setup,
-						     GtkUnit             unit);
-gdouble            gtk_page_setup_get_page_height   (GtkPageSetup       *setup,
-						     GtkUnit             unit);
-
-/* Saving and restoring page setup */
-GtkPageSetup	  *gtk_page_setup_new_from_file	    (const gchar         *file_name,
-						     GError              **error);
-gboolean	   gtk_page_setup_to_file	    (GtkPageSetup        *setup,
-						     const char          *file_name,
-						     GError             **error);
-GtkPageSetup	  *gtk_page_setup_new_from_key_file (GKeyFile            *key_file,
-						     const gchar         *group_name,
-						     GError             **error);
-void		   gtk_page_setup_to_key_file	    (GtkPageSetup        *setup,
-						     GKeyFile            *key_file,
-						     const gchar         *group_name);
-
-G_END_DECLS
-
-#endif /* __GTK_PAGE_SETUP_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkpaned.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkpaned.h
deleted file mode 100644
index 003316ae..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkpaned.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_PANED_H__
-#define __GTK_PANED_H__
-
-#include <gtk/gtkcontainer.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_PANED                  (gtk_paned_get_type ())
-#define GTK_PANED(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PANED, GtkPaned))
-#define GTK_PANED_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PANED, GtkPanedClass))
-#define GTK_IS_PANED(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PANED))
-#define GTK_IS_PANED_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PANED))
-#define GTK_PANED_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PANED, GtkPanedClass))
-
-
-typedef struct _GtkPaned        GtkPaned;
-typedef struct _GtkPanedClass   GtkPanedClass;
-typedef struct _GtkPanedPrivate GtkPanedPrivate;
-	
-struct _GtkPaned
-{
-  GtkContainer container;
-  
-  GtkWidget *child1;
-  GtkWidget *child2;
-  
-  GdkWindow *handle;
-  GdkGC *xor_gc;
-  GdkCursorType cursor_type;
-  
-  /*< private >*/
-  GdkRectangle handle_pos;
-
-  gint child1_size;
-  gint last_allocation;
-  gint min_position;
-  gint max_position;
-
-  guint position_set : 1;
-  guint in_drag : 1;
-  guint child1_shrink : 1;
-  guint child1_resize : 1;
-  guint child2_shrink : 1;
-  guint child2_resize : 1;
-  guint orientation : 1;
-  guint in_recursion : 1;
-  guint handle_prelit : 1;
-
-  GtkWidget *last_child1_focus;
-  GtkWidget *last_child2_focus;
-  GtkPanedPrivate *priv;
-
-  gint drag_pos;
-  gint original_position;
-};
- 
-struct _GtkPanedClass
-{
-  GtkContainerClass parent_class;
-  
-  gboolean (* cycle_child_focus)   (GtkPaned      *paned,
-				    gboolean       reverse); 
-  gboolean (* toggle_handle_focus) (GtkPaned      *paned);
-  gboolean (* move_handle)         (GtkPaned      *paned,
-				    GtkScrollType  scroll);
-  gboolean (* cycle_handle_focus)  (GtkPaned      *paned,
-				    gboolean       reverse);
-  gboolean (* accept_position)     (GtkPaned	  *paned);
-  gboolean (* cancel_position)     (GtkPaned	  *paned);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType   gtk_paned_get_type        (void) G_GNUC_CONST;
-void    gtk_paned_add1            (GtkPaned  *paned,
-				   GtkWidget *child);
-void    gtk_paned_add2            (GtkPaned  *paned,
-				   GtkWidget *child);
-void    gtk_paned_pack1           (GtkPaned  *paned,
-				   GtkWidget *child,
-				   gboolean   resize,
-				   gboolean   shrink);
-void    gtk_paned_pack2           (GtkPaned  *paned,
-				   GtkWidget *child,
-				   gboolean   resize,
-				   gboolean   shrink);
-gint    gtk_paned_get_position    (GtkPaned  *paned);
-void    gtk_paned_set_position    (GtkPaned  *paned,
-				   gint       position);
-
-GtkWidget *gtk_paned_get_child1   (GtkPaned  *paned);
-GtkWidget *gtk_paned_get_child2   (GtkPaned  *paned);
-
-/* Internal function */
-#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
-void    gtk_paned_compute_position (GtkPaned  *paned,
-				    gint       allocation,
-				    gint       child1_req,
-				    gint       child2_req);
-#endif /* !GTK_DISABLE_DEPRECATED || GTK_COMPILATION */
-#ifndef GTK_DISABLE_DEPRECATED
-#define	gtk_paned_gutter_size(p,s)		(void) 0
-#define	gtk_paned_set_gutter_size(p,s)		(void) 0
-#endif /* GTK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GTK_PANED_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkpapersize.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkpapersize.h
deleted file mode 100644
index 65aed126..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkpapersize.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkpapersize.h: Paper Size
- * Copyright (C) 2006, 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 __GTK_PAPER_SIZE_H__
-#define __GTK_PAPER_SIZE_H__
-
-#include <glib-object.h>
-#include "gtkenums.h"
-
-G_BEGIN_DECLS
-
-typedef struct _GtkPaperSize GtkPaperSize;
-
-#define GTK_TYPE_PAPER_SIZE    (gtk_paper_size_get_type ())
-
-/* Common names, from PWG 5101.1-2002 PWG: Standard for Media Standardized Names */
-#define GTK_PAPER_NAME_A3 "iso_a3"
-#define GTK_PAPER_NAME_A4 "iso_a4"
-#define GTK_PAPER_NAME_A5 "iso_a5"
-#define GTK_PAPER_NAME_B5 "iso_b5"
-#define GTK_PAPER_NAME_LETTER "na_letter"
-#define GTK_PAPER_NAME_EXECUTIVE "na_executive"
-#define GTK_PAPER_NAME_LEGAL "na_legal"
-
-GType gtk_paper_size_get_type (void) G_GNUC_CONST;
-
-GtkPaperSize *gtk_paper_size_new          (const gchar  *name);
-GtkPaperSize *gtk_paper_size_new_from_ppd (const gchar  *ppd_name,
-					   const gchar  *ppd_display_name,
-					   gdouble       width,
-					   gdouble       height);
-GtkPaperSize *gtk_paper_size_new_custom   (const gchar  *name,
-					   const gchar  *display_name,
-					   gdouble       width,
-					   gdouble       height,
-					   GtkUnit       unit);
-GtkPaperSize *gtk_paper_size_copy         (GtkPaperSize *other);
-void          gtk_paper_size_free         (GtkPaperSize *size);
-gboolean      gtk_paper_size_is_equal     (GtkPaperSize *size1,
-					   GtkPaperSize *size2);
-
-GList        *gtk_paper_size_get_paper_sizes (gboolean include_custom);
-
-/* The width is always the shortest side, measure in mm */
-G_CONST_RETURN gchar *gtk_paper_size_get_name         (GtkPaperSize *size);
-G_CONST_RETURN gchar *gtk_paper_size_get_display_name (GtkPaperSize *size);
-G_CONST_RETURN gchar *gtk_paper_size_get_ppd_name     (GtkPaperSize *size);
-
-gdouble  gtk_paper_size_get_width        (GtkPaperSize *size, GtkUnit unit);
-gdouble  gtk_paper_size_get_height       (GtkPaperSize *size, GtkUnit unit);
-gboolean gtk_paper_size_is_custom        (GtkPaperSize *size);
-
-/* Only for custom sizes: */
-void    gtk_paper_size_set_size                  (GtkPaperSize *size, 
-                                                  gdouble       width, 
-                                                  gdouble       height, 
-                                                  GtkUnit       unit);
-
-gdouble gtk_paper_size_get_default_top_margin    (GtkPaperSize *size,
-						  GtkUnit       unit);
-gdouble gtk_paper_size_get_default_bottom_margin (GtkPaperSize *size,
-						  GtkUnit       unit);
-gdouble gtk_paper_size_get_default_left_margin   (GtkPaperSize *size,
-						  GtkUnit       unit);
-gdouble gtk_paper_size_get_default_right_margin  (GtkPaperSize *size,
-						  GtkUnit       unit);
-
-G_CONST_RETURN gchar *gtk_paper_size_get_default (void);
-
-GtkPaperSize *gtk_paper_size_new_from_key_file (GKeyFile    *key_file,
-					        const gchar *group_name,
-					        GError     **error);
-void     gtk_paper_size_to_key_file            (GtkPaperSize *size,
-					        GKeyFile     *key_file,
-					        const gchar  *group_name);
-
-G_END_DECLS
-
-#endif /* __GTK_PAPER_SIZE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkpixmap.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkpixmap.h
deleted file mode 100644
index 1bb4f854..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkpixmap.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-#ifndef __GTK_PIXMAP_H__
-#define __GTK_PIXMAP_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkmisc.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_PIXMAP			 (gtk_pixmap_get_type ())
-#define GTK_PIXMAP(obj)			 (GTK_CHECK_CAST ((obj), GTK_TYPE_PIXMAP, GtkPixmap))
-#define GTK_PIXMAP_CLASS(klass)		 (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_PIXMAP, GtkPixmapClass))
-#define GTK_IS_PIXMAP(obj)		 (GTK_CHECK_TYPE ((obj), GTK_TYPE_PIXMAP))
-#define GTK_IS_PIXMAP_CLASS(klass)	 (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PIXMAP))
-#define GTK_PIXMAP_GET_CLASS(obj)        (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_PIXMAP, GtkPixmapClass))
-
-
-typedef struct _GtkPixmap	GtkPixmap;
-typedef struct _GtkPixmapClass	GtkPixmapClass;
-
-struct _GtkPixmap
-{
-  GtkMisc misc;
-  
-  GdkPixmap *pixmap;
-  GdkBitmap *mask;
-
-  GdkPixmap *pixmap_insensitive;
-  guint build_insensitive : 1;
-};
-
-struct _GtkPixmapClass
-{
-  GtkMiscClass parent_class;
-};
-
-
-GtkType	   gtk_pixmap_get_type	 (void) G_GNUC_CONST;
-GtkWidget* gtk_pixmap_new	 (GdkPixmap  *pixmap,
-				  GdkBitmap  *mask);
-void	   gtk_pixmap_set	 (GtkPixmap  *pixmap,
-				  GdkPixmap  *val,
-				  GdkBitmap  *mask);
-void	   gtk_pixmap_get	 (GtkPixmap  *pixmap,
-				  GdkPixmap **val,
-				  GdkBitmap **mask);
-
-void       gtk_pixmap_set_build_insensitive (GtkPixmap *pixmap,
-		                             gboolean   build);
-
-
-G_END_DECLS
-
-#endif /* __GTK_PIXMAP_H__ */
-
-#endif /* GTK_DISABLE_DEPRECATED */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkplug.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkplug.h
deleted file mode 100644
index 87fe6f92..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkplug.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_PLUG_H__
-#define __GTK_PLUG_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtksocket.h>
-#include <gtk/gtkwindow.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_PLUG            (gtk_plug_get_type ())
-#define GTK_PLUG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PLUG, GtkPlug))
-#define GTK_PLUG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PLUG, GtkPlugClass))
-#define GTK_IS_PLUG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PLUG))
-#define GTK_IS_PLUG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PLUG))
-#define GTK_PLUG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PLUG, GtkPlugClass))
-
-
-typedef struct _GtkPlug        GtkPlug;
-typedef struct _GtkPlugClass   GtkPlugClass;
-
-
-struct _GtkPlug
-{
-  GtkWindow window;
-
-  GdkWindow *socket_window;
-  GtkWidget *modality_window;
-  GtkWindowGroup *modality_group;
-  GHashTable *grabbed_keys;
-
-  guint same_app : 1;
-};
-
-struct _GtkPlugClass
-{
-  GtkWindowClass parent_class;
-
-  void (*embedded) (GtkPlug *plug);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType      gtk_plug_get_type  (void) G_GNUC_CONST;
-
-#ifndef GDK_MULTIHEAD_SAFE
-void       gtk_plug_construct (GtkPlug         *plug,
-			       GdkNativeWindow  socket_id);
-GtkWidget* gtk_plug_new       (GdkNativeWindow  socket_id);
-#endif
-
-void       gtk_plug_construct_for_display (GtkPlug         *plug,
-					   GdkDisplay      *display,
-					   GdkNativeWindow  socket_id);
-GtkWidget* gtk_plug_new_for_display       (GdkDisplay      *display,
-					   GdkNativeWindow  socket_id);
-
-GdkNativeWindow gtk_plug_get_id (GtkPlug         *plug);
-
-void _gtk_plug_add_to_socket      (GtkPlug   *plug,
-				   GtkSocket *socket_);
-void _gtk_plug_remove_from_socket (GtkPlug   *plug,
-				   GtkSocket *socket_);
-
-G_END_DECLS
-
-#endif /* __GTK_PLUG_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkpreview.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkpreview.h
deleted file mode 100644
index 515e6d8a..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkpreview.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-#ifndef __GTK_PREVIEW_H__
-#define __GTK_PREVIEW_H__
-
-
-#include <gtk/gtkwidget.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_PREVIEW            (gtk_preview_get_type ())
-#define GTK_PREVIEW(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_PREVIEW, GtkPreview))
-#define GTK_PREVIEW_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_PREVIEW, GtkPreviewClass))
-#define GTK_IS_PREVIEW(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_PREVIEW))
-#define GTK_IS_PREVIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PREVIEW))
-#define GTK_PREVIEW_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_PREVIEW, GtkPreviewClass))
-
-
-typedef struct _GtkPreview       GtkPreview;
-typedef struct _GtkPreviewInfo   GtkPreviewInfo;
-typedef union  _GtkDitherInfo    GtkDitherInfo;
-typedef struct _GtkPreviewClass  GtkPreviewClass;
-
-struct _GtkPreview
-{
-  GtkWidget widget;
-
-  guchar *buffer;
-  guint16 buffer_width;
-  guint16 buffer_height;
-
-  guint16 bpp;
-  guint16 rowstride;
-
-  GdkRgbDither dither;
-
-  guint type : 1;
-  guint expand : 1;
-};
-
-struct _GtkPreviewInfo
-{
-  guchar *lookup;
-
-  gdouble gamma;
-};
-
-union _GtkDitherInfo
-{
-  gushort s[2];
-  guchar c[4];
-};
-
-struct _GtkPreviewClass
-{
-  GtkWidgetClass parent_class;
-
-  GtkPreviewInfo info;
-
-};
-
-
-GtkType         gtk_preview_get_type           (void) G_GNUC_CONST;
-void            gtk_preview_uninit             (void);
-GtkWidget*      gtk_preview_new                (GtkPreviewType   type);
-void            gtk_preview_size               (GtkPreview      *preview,
-						gint             width,
-						gint             height);
-void            gtk_preview_put                (GtkPreview      *preview,
-						GdkWindow       *window,
-						GdkGC           *gc,
-						gint             srcx,
-						gint             srcy,
-						gint             destx,
-						gint             desty,
-						gint             width,
-						gint             height);
-void            gtk_preview_draw_row           (GtkPreview      *preview,
-						guchar          *data,
-						gint             x,
-						gint             y,
-						gint             w);
-void            gtk_preview_set_expand         (GtkPreview      *preview,
-						gboolean         expand);
-
-void            gtk_preview_set_gamma          (double           gamma_);
-void            gtk_preview_set_color_cube     (guint            nred_shades,
-						guint            ngreen_shades,
-						guint            nblue_shades,
-						guint            ngray_shades);
-void            gtk_preview_set_install_cmap   (gint             install_cmap);
-void            gtk_preview_set_reserved       (gint             nreserved);
-void            gtk_preview_set_dither         (GtkPreview      *preview,
-						GdkRgbDither     dither);
-#ifndef GTK_DISABLE_DEPRECATED
-GdkVisual*      gtk_preview_get_visual         (void);
-GdkColormap*    gtk_preview_get_cmap           (void);
-#endif
-GtkPreviewInfo* gtk_preview_get_info           (void);
-
-/* This function reinitializes the preview colormap and visual from
- * the current gamma/color_cube/install_cmap settings. It must only
- * be called if there are no previews or users's of the preview
- * colormap in existence.
- */
-void            gtk_preview_reset              (void);
-
-
-G_END_DECLS
-
-#endif /* __GTK_PREVIEW_H__ */
-
-#endif /* GTK_DISABLE_DEPRECATED */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprintcontext.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprintcontext.h
deleted file mode 100644
index 936cae4f..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprintcontext.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkprintcontext.h: Print Context
- * Copyright (C) 2006, 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 __GTK_PRINT_CONTEXT_H__
-#define __GTK_PRINT_CONTEXT_H__
-
-#include <glib-object.h>
-#include <pango/pango-layout.h>
-#include "gtkenums.h"
-#include "gtkpagesetup.h"
-
-G_BEGIN_DECLS
-
-typedef struct _GtkPrintContext GtkPrintContext;
-
-#define GTK_TYPE_PRINT_CONTEXT    (gtk_print_context_get_type ())
-#define GTK_PRINT_CONTEXT(obj)    (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PRINT_CONTEXT, GtkPrintContext))
-#define GTK_IS_PRINT_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PRINT_CONTEXT))
-
-GType          gtk_print_context_get_type (void) G_GNUC_CONST;
-
-
-/* Rendering */
-cairo_t      *gtk_print_context_get_cairo_context    (GtkPrintContext *context);
-
-GtkPageSetup *gtk_print_context_get_page_setup       (GtkPrintContext *context);
-gdouble       gtk_print_context_get_width            (GtkPrintContext *context);
-gdouble       gtk_print_context_get_height           (GtkPrintContext *context);
-gdouble       gtk_print_context_get_dpi_x            (GtkPrintContext *context);
-gdouble       gtk_print_context_get_dpi_y            (GtkPrintContext *context);
-
-/* Fonts */
-PangoFontMap *gtk_print_context_get_pango_fontmap    (GtkPrintContext *context);
-PangoContext *gtk_print_context_create_pango_context (GtkPrintContext *context);
-PangoLayout  *gtk_print_context_create_pango_layout  (GtkPrintContext *context);
-
-/* Needed for preview implementations */
-void         gtk_print_context_set_cairo_context     (GtkPrintContext *context,
-						      cairo_t         *cr,
-						      double           dpi_x,
-						      double           dpi_y);
-
-G_END_DECLS
-
-#endif /* __GTK_PRINT_CONTEXT_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprintoperation.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprintoperation.h
deleted file mode 100644
index d0d3a386..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprintoperation.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkprintoperation.h: Print Operation
- * Copyright (C) 2006, 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 __GTK_PRINT_OPERATION_H__
-#define __GTK_PRINT_OPERATION_H__
-
-#include <glib-object.h>
-#include <cairo.h>
-#include "gtkmain.h"
-#include "gtkenums.h"
-#include "gtkwindow.h"
-#include "gtkpagesetup.h"
-#include "gtkprintsettings.h"
-#include "gtkprintcontext.h"
-#include "gtkprintoperationpreview.h"
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_PRINT_OPERATION		(gtk_print_operation_get_type ())
-#define GTK_PRINT_OPERATION(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PRINT_OPERATION, GtkPrintOperation))
-#define GTK_PRINT_OPERATION_CLASS(klass)    	(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PRINT_OPERATION, GtkPrintOperationClass))
-#define GTK_IS_PRINT_OPERATION(obj) 		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PRINT_OPERATION))
-#define GTK_IS_PRINT_OPERATION_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PRINT_OPERATION))
-#define GTK_PRINT_OPERATION_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PRINT_OPERATION, GtkPrintOperationClass))
-
-typedef struct _GtkPrintOperationClass   GtkPrintOperationClass;
-typedef struct _GtkPrintOperationPrivate GtkPrintOperationPrivate;
-typedef struct _GtkPrintOperation        GtkPrintOperation;
-
-typedef enum {
-  GTK_PRINT_STATUS_INITIAL,
-  GTK_PRINT_STATUS_PREPARING,
-  GTK_PRINT_STATUS_GENERATING_DATA,
-  GTK_PRINT_STATUS_SENDING_DATA,
-  GTK_PRINT_STATUS_PENDING,
-  GTK_PRINT_STATUS_PENDING_ISSUE,
-  GTK_PRINT_STATUS_PRINTING,
-  GTK_PRINT_STATUS_FINISHED,
-  GTK_PRINT_STATUS_FINISHED_ABORTED
-} GtkPrintStatus;
-
-typedef enum {
-  GTK_PRINT_OPERATION_RESULT_ERROR,
-  GTK_PRINT_OPERATION_RESULT_APPLY,
-  GTK_PRINT_OPERATION_RESULT_CANCEL,
-  GTK_PRINT_OPERATION_RESULT_IN_PROGRESS
-} GtkPrintOperationResult;
-
-typedef enum {
-  GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG,
-  GTK_PRINT_OPERATION_ACTION_PRINT,
-  GTK_PRINT_OPERATION_ACTION_PREVIEW,
-  GTK_PRINT_OPERATION_ACTION_EXPORT
-} GtkPrintOperationAction;
-
-
-struct _GtkPrintOperation
-{
-  GObject parent_instance;
-  
-  GtkPrintOperationPrivate *priv;
-};
-
-struct _GtkPrintOperationClass
-{
-  GObjectClass parent_class;
-  
-  void     (*done)               (GtkPrintOperation *operation,
-				  GtkPrintOperationResult result);
-  void     (*begin_print)        (GtkPrintOperation *operation, 
-				  GtkPrintContext   *context);
-  gboolean (*paginate)           (GtkPrintOperation *operation, 
-				  GtkPrintContext   *context);
-  void     (*request_page_setup) (GtkPrintOperation *operation,
-				  GtkPrintContext   *context,
-				  gint               page_nr,
-				  GtkPageSetup      *setup);
-  void     (*draw_page)          (GtkPrintOperation *operation,
-				  GtkPrintContext   *context,
-				  gint               page_nr);
-  void     (*end_print)          (GtkPrintOperation *operation,
-				  GtkPrintContext   *context);
-  void     (*status_changed)     (GtkPrintOperation *operation);
-
-  GtkWidget *(*create_custom_widget) (GtkPrintOperation *operation);
-  void       (*custom_widget_apply)  (GtkPrintOperation *operation,
-				      GtkWidget *widget);
-
-  
-  gboolean (*preview)	     (GtkPrintOperation        *operation,
-			      GtkPrintOperationPreview *preview, 
-			      GtkPrintContext          *context,
-			      GtkWindow                *parent);  
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-  void (*_gtk_reserved5) (void);
-  void (*_gtk_reserved6) (void);
-  void (*_gtk_reserved7) (void);
-};
-
-#define GTK_PRINT_ERROR gtk_print_error_quark ()
-
-typedef enum
-{
-  GTK_PRINT_ERROR_GENERAL,
-  GTK_PRINT_ERROR_INTERNAL_ERROR,
-  GTK_PRINT_ERROR_NOMEM,
-  GTK_PRINT_ERROR_INVALID_FILE
-} GtkPrintError;
-
-GQuark gtk_print_error_quark (void);
-
-GType                   gtk_print_operation_get_type               (void) G_GNUC_CONST;
-GtkPrintOperation *     gtk_print_operation_new                    (void);
-void                    gtk_print_operation_set_default_page_setup (GtkPrintOperation  *op,
-								    GtkPageSetup       *default_page_setup);
-GtkPageSetup *          gtk_print_operation_get_default_page_setup (GtkPrintOperation  *op);
-void                    gtk_print_operation_set_print_settings     (GtkPrintOperation  *op,
-								    GtkPrintSettings   *print_settings);
-GtkPrintSettings *      gtk_print_operation_get_print_settings     (GtkPrintOperation  *op);
-void                    gtk_print_operation_set_job_name           (GtkPrintOperation  *op,
-								    const gchar        *job_name);
-void                    gtk_print_operation_set_n_pages            (GtkPrintOperation  *op,
-								    gint                n_pages);
-void                    gtk_print_operation_set_current_page       (GtkPrintOperation  *op,
-								    gint                current_page);
-void                    gtk_print_operation_set_use_full_page      (GtkPrintOperation  *op,
-								    gboolean            full_page);
-void                    gtk_print_operation_set_unit               (GtkPrintOperation  *op,
-								    GtkUnit             unit);
-void                    gtk_print_operation_set_export_filename    (GtkPrintOperation  *op,
-								    const gchar        *filename);
-void                    gtk_print_operation_set_track_print_status (GtkPrintOperation  *op,
-								    gboolean            track_status);
-void                    gtk_print_operation_set_show_progress      (GtkPrintOperation  *op,
-								    gboolean            show_progress);
-void                    gtk_print_operation_set_allow_async        (GtkPrintOperation  *op,
-								    gboolean            allow_async);
-void                    gtk_print_operation_set_custom_tab_label   (GtkPrintOperation  *op,
-								    const gchar        *label);
-GtkPrintOperationResult gtk_print_operation_run                    (GtkPrintOperation  *op,
-								    GtkPrintOperationAction action,
-								    GtkWindow          *parent,
-								    GError            **error);
-void                    gtk_print_operation_get_error              (GtkPrintOperation  *op,
-								    GError            **error);
-GtkPrintStatus          gtk_print_operation_get_status             (GtkPrintOperation  *op);
-G_CONST_RETURN gchar *  gtk_print_operation_get_status_string      (GtkPrintOperation  *op);
-gboolean                gtk_print_operation_is_finished            (GtkPrintOperation  *op);
-void                    gtk_print_operation_cancel                 (GtkPrintOperation  *op);
-
-GtkPageSetup           *gtk_print_run_page_setup_dialog            (GtkWindow          *parent,
-								    GtkPageSetup       *page_setup,
-								    GtkPrintSettings   *settings);
-
-typedef void  (* GtkPageSetupDoneFunc) (GtkPageSetup *page_setup, 
-					gpointer      data);
-
-void                    gtk_print_run_page_setup_dialog_async      (GtkWindow            *parent,
-								    GtkPageSetup         *page_setup,
-								    GtkPrintSettings     *settings,
-                                                                    GtkPageSetupDoneFunc  done_cb,
-                                                                    gpointer              data);
-
-G_END_DECLS
-
-#endif /* __GTK_PRINT_OPERATION_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprintoperationpreview.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprintoperationpreview.h
deleted file mode 100644
index d2922bf9..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprintoperationpreview.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkprintoperationpreview.h: Abstract print preview interface
- * Copyright (C) 2006, 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 __GTK_PRINT_OPERATION_PREVIEW_H__
-#define __GTK_PRINT_OPERATION_PREVIEW_H__
-
-#include <glib-object.h>
-#include <cairo.h>
-
-#include "gtkprintcontext.h" 
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_PRINT_OPERATION_PREVIEW                  (gtk_print_operation_preview_get_type ())
-#define GTK_PRINT_OPERATION_PREVIEW(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PRINT_OPERATION_PREVIEW, GtkPrintOperationPreview))
-#define GTK_IS_PRINT_OPERATION_PREVIEW(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PRINT_OPERATION_PREVIEW))
-#define GTK_PRINT_OPERATION_PREVIEW_GET_IFACE(obj)        (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_PRINT_OPERATION_PREVIEW, GtkPrintOperationPreviewIface))
-
-typedef struct _GtkPrintOperationPreview      GtkPrintOperationPreview;      /*dummy typedef */
-typedef struct _GtkPrintOperationPreviewIface GtkPrintOperationPreviewIface;
-
-
-struct _GtkPrintOperationPreviewIface
-{
-  GTypeInterface g_iface;
-
-  /* signals */
-  void              (*ready)          (GtkPrintOperationPreview *preview, 
-				       GtkPrintContext          *context);
-  void              (*got_page_size)  (GtkPrintOperationPreview *preview, 
-				       GtkPrintContext          *context,
-				       GtkPageSetup             *page_setup);
-  
- 
-  /* methods */
-  void              (*render_page)    (GtkPrintOperationPreview *preview,
-				       gint                      page_nr);
-  gboolean          (*is_selected)    (GtkPrintOperationPreview *preview,
-				       gint                      page_nr);
-  void              (*end_preview)    (GtkPrintOperationPreview *preview);
-  
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-  void (*_gtk_reserved5) (void);
-  void (*_gtk_reserved6) (void);
-  void (*_gtk_reserved7) (void);
-};
-
-GType   gtk_print_operation_preview_get_type       (void) G_GNUC_CONST;
-
-void     gtk_print_operation_preview_render_page (GtkPrintOperationPreview *preview,
-						  gint                      page_nr);
-void     gtk_print_operation_preview_end_preview (GtkPrintOperationPreview *preview);
-gboolean gtk_print_operation_preview_is_selected (GtkPrintOperationPreview *preview,
-						  gint                      page_nr);
-
-G_END_DECLS
-
-#endif /* __GTK_PRINT_OPERATION_PREVIEW_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprintsettings.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprintsettings.h
deleted file mode 100644
index 0e731187..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprintsettings.h
+++ /dev/null
@@ -1,208 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkprintsettings.h: Print Settings
- * Copyright (C) 2006, 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 __GTK_PRINT_SETTINGS_H__
-#define __GTK_PRINT_SETTINGS_H__
-
-#include <glib-object.h>
-#include "gtkpapersize.h"
-
-G_BEGIN_DECLS
-
-typedef struct _GtkPrintSettings GtkPrintSettings;
-
-#define GTK_TYPE_PRINT_SETTINGS    (gtk_print_settings_get_type ())
-#define GTK_PRINT_SETTINGS(obj)    (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PRINT_SETTINGS, GtkPrintSettings))
-#define GTK_IS_PRINT_SETTINGS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PRINT_SETTINGS))
-
-typedef void  (*GtkPrintSettingsFunc)  (const gchar *key,
-					const gchar *value,
-					gpointer     user_data);
-
-typedef struct _GtkPageRange GtkPageRange;
-struct _GtkPageRange
-{
-  gint start;
-  gint end;
-};
-
-GType             gtk_print_settings_get_type (void) G_GNUC_CONST;
-GtkPrintSettings *gtk_print_settings_new      (void);
-
-GtkPrintSettings *gtk_print_settings_copy                    (GtkPrintSettings     *other);
-
-GtkPrintSettings *gtk_print_settings_new_from_file           (const gchar          *file_name,
-							      GError              **error);
-gboolean          gtk_print_settings_to_file                 (GtkPrintSettings     *settings,
-							      const gchar          *file_name,
-							      GError              **error);
-GtkPrintSettings *gtk_print_settings_new_from_key_file       (GKeyFile             *key_file,
-							      const gchar          *group_name,
-							      GError              **error);
-void              gtk_print_settings_to_key_file             (GtkPrintSettings     *settings,
-							      GKeyFile             *key_file,
-							      const gchar          *group_name);
-gboolean          gtk_print_settings_has_key                 (GtkPrintSettings     *settings,
-							      const gchar          *key);
-G_CONST_RETURN gchar *gtk_print_settings_get                (GtkPrintSettings     *settings,
-							      const gchar          *key);
-void              gtk_print_settings_set                     (GtkPrintSettings     *settings,
-							      const gchar          *key,
-							      const gchar          *value);
-void              gtk_print_settings_unset                   (GtkPrintSettings     *settings,
-							      const gchar          *key);
-void              gtk_print_settings_foreach                 (GtkPrintSettings     *settings,
-							      GtkPrintSettingsFunc  func,
-							      gpointer              user_data);
-gboolean          gtk_print_settings_get_bool                (GtkPrintSettings     *settings,
-							      const gchar          *key);
-void              gtk_print_settings_set_bool                (GtkPrintSettings     *settings,
-							      const gchar          *key,
-							      gboolean              value);
-gdouble           gtk_print_settings_get_double              (GtkPrintSettings     *settings,
-							      const gchar          *key);
-gdouble           gtk_print_settings_get_double_with_default (GtkPrintSettings     *settings,
-							      const gchar          *key,
-							      gdouble               def);
-void              gtk_print_settings_set_double              (GtkPrintSettings     *settings,
-							      const gchar          *key,
-							      gdouble               value);
-gdouble           gtk_print_settings_get_length              (GtkPrintSettings     *settings,
-							      const gchar          *key,
-							      GtkUnit               unit);
-void              gtk_print_settings_set_length              (GtkPrintSettings     *settings,
-							      const gchar          *key,
-							      gdouble               value,
-							      GtkUnit               unit);
-gint              gtk_print_settings_get_int                 (GtkPrintSettings     *settings,
-							      const gchar          *key);
-gint              gtk_print_settings_get_int_with_default    (GtkPrintSettings     *settings,
-							      const gchar          *key,
-							      gint                  def);
-void              gtk_print_settings_set_int                 (GtkPrintSettings     *settings,
-							      const gchar          *key,
-							      gint                  value);
-
-#define GTK_PRINT_SETTINGS_PRINTER        "printer"
-#define GTK_PRINT_SETTINGS_ORIENTATION    "orientation"
-#define GTK_PRINT_SETTINGS_PAPER_FORMAT   "paper-format"
-#define GTK_PRINT_SETTINGS_PAPER_WIDTH    "paper-width"
-#define GTK_PRINT_SETTINGS_PAPER_HEIGHT   "paper-height"
-#define GTK_PRINT_SETTINGS_N_COPIES       "n-copies"
-#define GTK_PRINT_SETTINGS_DEFAULT_SOURCE "default-source"
-#define GTK_PRINT_SETTINGS_QUALITY        "quality"
-#define GTK_PRINT_SETTINGS_RESOLUTION     "resolution"
-#define GTK_PRINT_SETTINGS_USE_COLOR      "use-color"
-#define GTK_PRINT_SETTINGS_DUPLEX         "duplex"
-#define GTK_PRINT_SETTINGS_COLLATE        "collate"
-#define GTK_PRINT_SETTINGS_REVERSE        "reverse"
-#define GTK_PRINT_SETTINGS_MEDIA_TYPE     "media-type"
-#define GTK_PRINT_SETTINGS_DITHER         "dither"
-#define GTK_PRINT_SETTINGS_SCALE          "scale"
-#define GTK_PRINT_SETTINGS_PRINT_PAGES    "print-pages"
-#define GTK_PRINT_SETTINGS_PAGE_RANGES    "page-ranges"
-#define GTK_PRINT_SETTINGS_PAGE_SET       "page-set"
-#define GTK_PRINT_SETTINGS_FINISHINGS     "finishings"
-#define GTK_PRINT_SETTINGS_NUMBER_UP      "number-up"
-#define GTK_PRINT_SETTINGS_OUTPUT_BIN     "output-bin"
-
-#define GTK_PRINT_SETTINGS_OUTPUT_FILE_FORMAT  "output-file-format"
-#define GTK_PRINT_SETTINGS_OUTPUT_URI          "output-uri"
-
-#define GTK_PRINT_SETTINGS_WIN32_DRIVER_VERSION "win32-driver-version"
-#define GTK_PRINT_SETTINGS_WIN32_DRIVER_EXTRA   "win32-driver-extra"
-
-/* Helpers: */
-
-G_CONST_RETURN gchar *gtk_print_settings_get_printer     (GtkPrintSettings   *settings);
-void               gtk_print_settings_set_printer        (GtkPrintSettings   *settings,
-							  const gchar        *printer);
-GtkPageOrientation gtk_print_settings_get_orientation    (GtkPrintSettings   *settings);
-void               gtk_print_settings_set_orientation    (GtkPrintSettings   *settings,
-							  GtkPageOrientation  orientation);
-GtkPaperSize *     gtk_print_settings_get_paper_size     (GtkPrintSettings   *settings);
-void               gtk_print_settings_set_paper_size     (GtkPrintSettings   *settings,
-							  GtkPaperSize       *paper_size);
-gdouble            gtk_print_settings_get_paper_width    (GtkPrintSettings   *settings,
-							  GtkUnit             unit);
-void               gtk_print_settings_set_paper_width    (GtkPrintSettings   *settings,
-							  gdouble             width,
-							  GtkUnit             unit);
-gdouble            gtk_print_settings_get_paper_height   (GtkPrintSettings   *settings,
-							  GtkUnit             unit);
-void               gtk_print_settings_set_paper_height   (GtkPrintSettings   *settings,
-							  gdouble             height,
-							  GtkUnit             unit);
-gboolean           gtk_print_settings_get_use_color      (GtkPrintSettings   *settings);
-void               gtk_print_settings_set_use_color      (GtkPrintSettings   *settings,
-							  gboolean            use_color);
-gboolean           gtk_print_settings_get_collate        (GtkPrintSettings   *settings);
-void               gtk_print_settings_set_collate        (GtkPrintSettings   *settings,
-							  gboolean            collate);
-gboolean           gtk_print_settings_get_reverse        (GtkPrintSettings   *settings);
-void               gtk_print_settings_set_reverse        (GtkPrintSettings   *settings,
-							  gboolean            reverse);
-GtkPrintDuplex     gtk_print_settings_get_duplex         (GtkPrintSettings   *settings);
-void               gtk_print_settings_set_duplex         (GtkPrintSettings   *settings,
-							  GtkPrintDuplex      duplex);
-GtkPrintQuality    gtk_print_settings_get_quality        (GtkPrintSettings   *settings);
-void               gtk_print_settings_set_quality        (GtkPrintSettings   *settings,
-							  GtkPrintQuality     quality);
-gint               gtk_print_settings_get_n_copies       (GtkPrintSettings   *settings);
-void               gtk_print_settings_set_n_copies       (GtkPrintSettings   *settings,
-							  gint                num_copies);
-gint               gtk_print_settings_get_number_up      (GtkPrintSettings   *settings);
-void               gtk_print_settings_set_number_up      (GtkPrintSettings   *settings,
-							  gint                number_up);
-gint               gtk_print_settings_get_resolution     (GtkPrintSettings   *settings);
-void               gtk_print_settings_set_resolution     (GtkPrintSettings   *settings,
-							  gint                resolution);
-gdouble            gtk_print_settings_get_scale          (GtkPrintSettings   *settings);
-void               gtk_print_settings_set_scale          (GtkPrintSettings   *settings,
-							  gdouble             scale);
-GtkPrintPages      gtk_print_settings_get_print_pages    (GtkPrintSettings   *settings);
-void               gtk_print_settings_set_print_pages    (GtkPrintSettings   *settings,
-							  GtkPrintPages       pages);
-GtkPageRange *     gtk_print_settings_get_page_ranges    (GtkPrintSettings   *settings,
-							  gint               *num_ranges);
-void               gtk_print_settings_set_page_ranges    (GtkPrintSettings   *settings,
-							  GtkPageRange       *page_ranges,
-							  gint                num_ranges);
-GtkPageSet         gtk_print_settings_get_page_set       (GtkPrintSettings   *settings);
-void               gtk_print_settings_set_page_set       (GtkPrintSettings   *settings,
-							  GtkPageSet          page_set);
-G_CONST_RETURN gchar *gtk_print_settings_get_default_source (GtkPrintSettings   *settings);
-void               gtk_print_settings_set_default_source (GtkPrintSettings   *settings,
-							  const gchar        *default_source);
-G_CONST_RETURN gchar *gtk_print_settings_get_media_type  (GtkPrintSettings   *settings);
-void               gtk_print_settings_set_media_type     (GtkPrintSettings   *settings,
-							  const gchar        *media_type);
-G_CONST_RETURN gchar *gtk_print_settings_get_dither      (GtkPrintSettings   *settings);
-void               gtk_print_settings_set_dither         (GtkPrintSettings   *settings,
-							  const gchar        *dither);
-G_CONST_RETURN gchar *gtk_print_settings_get_finishings  (GtkPrintSettings   *settings);
-void               gtk_print_settings_set_finishings     (GtkPrintSettings   *settings,
-							  const gchar        *finishings);
-G_CONST_RETURN gchar *gtk_print_settings_get_output_bin  (GtkPrintSettings   *settings);
-void               gtk_print_settings_set_output_bin     (GtkPrintSettings   *settings,
-							  const gchar        *output_bin);
-
-G_END_DECLS
-
-#endif /* __GTK_PRINT_SETTINGS_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprivate.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprivate.h
deleted file mode 100644
index 690cc8a3..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprivate.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_PRIVATE_H__
-#define __GTK_PRIVATE_H__
-
-
-#include <gtk/gtkobject.h>
-#include <gtk/gtkwidget.h>
-
-
-G_BEGIN_DECLS
-
-/* The private flags that are used in the private_flags member of GtkWidget.
- */
-typedef enum
-{
-  PRIVATE_GTK_USER_STYLE	= 1 <<  0,
-  PRIVATE_GTK_RESIZE_PENDING	= 1 <<  2,
-  PRIVATE_GTK_LEAVE_PENDING	= 1 <<  4,
-  PRIVATE_GTK_HAS_SHAPE_MASK	= 1 <<  5,
-  PRIVATE_GTK_IN_REPARENT       = 1 <<  6,
-  PRIVATE_GTK_DIRECTION_SET     = 1 <<  7,   /* If the reading direction is not DIR_NONE */
-  PRIVATE_GTK_DIRECTION_LTR     = 1 <<  8,   /* If the reading direction is DIR_LTR */
-  PRIVATE_GTK_ANCHORED          = 1 <<  9,   /* If widget has a GtkWindow ancestor */
-  PRIVATE_GTK_CHILD_VISIBLE     = 1 <<  10,  /* If widget should be mapped when parent is mapped */
-  PRIVATE_GTK_REDRAW_ON_ALLOC   = 1 <<  11,  /* If we should queue a draw on the entire widget when it is reallocated */
-  PRIVATE_GTK_ALLOC_NEEDED      = 1 <<  12,  /* If we we should allocate even if the allocation is the same */
-  PRIVATE_GTK_REQUEST_NEEDED    = 1 <<  13   /* Whether we need to call gtk_widget_size_request */
-} GtkPrivateFlags;
-
-/* Macros for extracting a widgets private_flags from GtkWidget.
- */
-#define GTK_PRIVATE_FLAGS(wid)            (GTK_WIDGET (wid)->private_flags)
-#define GTK_WIDGET_USER_STYLE(obj)	  ((GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_USER_STYLE) != 0)
-#define GTK_CONTAINER_RESIZE_PENDING(obj) ((GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_RESIZE_PENDING) != 0)
-#define GTK_WIDGET_LEAVE_PENDING(obj)	  ((GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_LEAVE_PENDING) != 0)
-#define GTK_WIDGET_HAS_SHAPE_MASK(obj)	  ((GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_HAS_SHAPE_MASK) != 0)
-#define GTK_WIDGET_IN_REPARENT(obj)	  ((GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_IN_REPARENT) != 0)
-#define GTK_WIDGET_DIRECTION_SET(obj)	  ((GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_DIRECTION_SET) != 0)
-#define GTK_WIDGET_DIRECTION_LTR(obj)     ((GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_DIRECTION_LTR) != 0)
-#define GTK_WIDGET_ANCHORED(obj)          ((GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_ANCHORED) != 0)
-#define GTK_WIDGET_CHILD_VISIBLE(obj)     ((GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_CHILD_VISIBLE) != 0)
-#define GTK_WIDGET_REDRAW_ON_ALLOC(obj)   ((GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_REDRAW_ON_ALLOC) != 0)
-#define GTK_WIDGET_ALLOC_NEEDED(obj)      ((GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_ALLOC_NEEDED) != 0)
-#define GTK_WIDGET_REQUEST_NEEDED(obj)    ((GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_REQUEST_NEEDED) != 0)
-
-/* Macros for setting and clearing private widget flags.
- * we use a preprocessor string concatenation here for a clear
- * flags/private_flags distinction at the cost of single flag operations.
- */
-#define GTK_PRIVATE_SET_FLAG(wid,flag)    G_STMT_START{ (GTK_PRIVATE_FLAGS (wid) |= (PRIVATE_ ## flag)); }G_STMT_END
-#define GTK_PRIVATE_UNSET_FLAG(wid,flag)  G_STMT_START{ (GTK_PRIVATE_FLAGS (wid) &= ~(PRIVATE_ ## flag)); }G_STMT_END
-
-#ifdef G_OS_WIN32
-
-const gchar *_gtk_get_datadir ();
-const gchar *_gtk_get_libdir ();
-const gchar *_gtk_get_sysconfdir ();
-const gchar *_gtk_get_localedir ();
-const gchar *_gtk_get_data_prefix ();
-
-#undef GTK_DATADIR
-#define GTK_DATADIR _gtk_get_datadir ()
-#undef GTK_LIBDIR
-#define GTK_LIBDIR _gtk_get_libdir ()
-#undef GTK_LOCALEDIR
-#define GTK_LOCALEDIR _gtk_get_localedir ()
-#undef GTK_SYSCONFDIR
-#define GTK_SYSCONFDIR _gtk_get_sysconfdir ()
-#undef GTK_DATA_PREFIX
-#define GTK_DATA_PREFIX _gtk_get_data_prefix ()
-
-#endif /* G_OS_WIN32 */
-
-gboolean _gtk_fnmatch (const char *pattern,
-		       const char *string,
-		       gboolean    no_leading_period);
-
-#define GTK_PARAM_READABLE G_PARAM_READABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
-#define GTK_PARAM_WRITABLE G_PARAM_WRITABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
-#define GTK_PARAM_READWRITE G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
-
-G_END_DECLS
-
-#endif /* __GTK_PRIVATE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprogress.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprogress.h
deleted file mode 100644
index 477ae33d..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprogress.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_PROGRESS_H__
-#define __GTK_PROGRESS_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkadjustment.h>
-
-
-G_BEGIN_DECLS
-
-#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
-
-#define GTK_TYPE_PROGRESS            (gtk_progress_get_type ())
-#define GTK_PROGRESS(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_PROGRESS, GtkProgress))
-#define GTK_PROGRESS_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_PROGRESS, GtkProgressClass))
-#define GTK_IS_PROGRESS(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_PROGRESS))
-#define GTK_IS_PROGRESS_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PROGRESS))
-#define GTK_PROGRESS_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_PROGRESS, GtkProgressClass))
-
-#endif /* !GTK_DISABLE_DEPRECATED || GTK_COMPILATION */
-
-typedef struct _GtkProgress       GtkProgress;
-typedef struct _GtkProgressClass  GtkProgressClass;
-
-
-struct _GtkProgress
-{
-  GtkWidget widget;
-
-  GtkAdjustment *adjustment;
-  GdkPixmap     *offscreen_pixmap;
-  gchar         *format;
-  gfloat         x_align;
-  gfloat         y_align;
-
-  guint          show_text : 1;
-  guint          activity_mode : 1;
-  guint          use_text_format : 1;
-};
-
-struct _GtkProgressClass
-{
-  GtkWidgetClass parent_class;
-
-  void (* paint)            (GtkProgress *progress);
-  void (* update)           (GtkProgress *progress);
-  void (* act_mode_enter)   (GtkProgress *progress);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-/* This entire interface is deprecated. Use GtkProgressBar
- * directly.
- */
-
-#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
-
-GType      gtk_progress_get_type            (void) G_GNUC_CONST;
-void       gtk_progress_set_show_text       (GtkProgress   *progress,
-					     gboolean       show_text);
-void       gtk_progress_set_text_alignment  (GtkProgress   *progress,
-					     gfloat         x_align,
-					     gfloat         y_align);
-void       gtk_progress_set_format_string   (GtkProgress   *progress,
-					     const gchar   *format);
-void       gtk_progress_set_adjustment      (GtkProgress   *progress,
-					     GtkAdjustment *adjustment);
-void       gtk_progress_configure           (GtkProgress   *progress,
-					     gdouble        value,
-					     gdouble        hmin,
-					     gdouble        max);
-void       gtk_progress_set_percentage      (GtkProgress   *progress,
-					     gdouble        percentage);
-void       gtk_progress_set_value           (GtkProgress   *progress,
-					     gdouble        value);
-gdouble    gtk_progress_get_value           (GtkProgress   *progress);
-void       gtk_progress_set_activity_mode   (GtkProgress   *progress,
-					     gboolean       activity_mode);
-gchar*     gtk_progress_get_current_text    (GtkProgress   *progress);
-gchar*     gtk_progress_get_text_from_value (GtkProgress   *progress,
-					     gdouble        value);
-gdouble    gtk_progress_get_current_percentage (GtkProgress *progress);
-gdouble    gtk_progress_get_percentage_from_value (GtkProgress *progress,
-						   gdouble      value);
-
-#endif /* !GTK_DISABLE_DEPRECATED || GTK_COMPILATION */
-
-G_END_DECLS
-
-#endif /* __GTK_PROGRESS_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprogressbar.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprogressbar.h
deleted file mode 100644
index 1e556164..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprogressbar.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_PROGRESS_BAR_H__
-#define __GTK_PROGRESS_BAR_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkprogress.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_PROGRESS_BAR            (gtk_progress_bar_get_type ())
-#define GTK_PROGRESS_BAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PROGRESS_BAR, GtkProgressBar))
-#define GTK_PROGRESS_BAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PROGRESS_BAR, GtkProgressBarClass))
-#define GTK_IS_PROGRESS_BAR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PROGRESS_BAR))
-#define GTK_IS_PROGRESS_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PROGRESS_BAR))
-#define GTK_PROGRESS_BAR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PROGRESS_BAR, GtkProgressBarClass))
-
-
-typedef struct _GtkProgressBar       GtkProgressBar;
-typedef struct _GtkProgressBarClass  GtkProgressBarClass;
-
-typedef enum
-{
-  GTK_PROGRESS_CONTINUOUS,
-  GTK_PROGRESS_DISCRETE
-} GtkProgressBarStyle;
-
-typedef enum
-{
-  GTK_PROGRESS_LEFT_TO_RIGHT,
-  GTK_PROGRESS_RIGHT_TO_LEFT,
-  GTK_PROGRESS_BOTTOM_TO_TOP,
-  GTK_PROGRESS_TOP_TO_BOTTOM
-} GtkProgressBarOrientation;
-
-struct _GtkProgressBar
-{
-  GtkProgress progress;
-
-  GtkProgressBarStyle bar_style;
-  GtkProgressBarOrientation orientation;
-
-  guint blocks;
-  gint  in_block;
-
-  gint  activity_pos;
-  guint activity_step;
-  guint activity_blocks;
-
-  gdouble pulse_fraction;
-  
-  guint activity_dir : 1;
-  guint ellipsize : 3;
-  guint dirty : 1;
-};
-
-struct _GtkProgressBarClass
-{
-  GtkProgressClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType      gtk_progress_bar_get_type             (void) G_GNUC_CONST;
-GtkWidget* gtk_progress_bar_new                  (void);
-
-/*
- * GtkProgress/GtkProgressBar had serious problems in GTK 1.2.
- * 
- *  - Only 3 or 4 functions are really needed for 95% of progress  
- *    interfaces; GtkProgress[Bar] had about 25 functions, and 
- *    didn't even include these 3 or 4.
- *  - In activity mode, the API involves setting the adjustment 
- *    to any random value, just to have the side effect of 
- *    calling the progress bar update function - the adjustment
- *    is totally ignored in activity mode
- *  - You set the activity step as a pixel value, which means to 
- *    set the activity step you basically need to connect to 
- *    size_allocate
- *  - There are ctree_set_expander_style()-functions, to randomly 
- *    change look-and-feel for no good reason
- *  - The split between GtkProgress and GtkProgressBar makes no sense 
- *    to me whatsoever.
- *  
- * This was a big wart on GTK and made people waste lots of time,
- * both learning and using the interface.
- * 
- * So, I have added what I feel is the correct API, and marked all the
- * rest deprecated. However, the changes are 100% backward-compatible and
- * should break no existing code.
- *
- * The following 9 functions are the new programming interface. 
- */
-void       gtk_progress_bar_pulse                (GtkProgressBar *pbar);
-void       gtk_progress_bar_set_text             (GtkProgressBar *pbar,
-                                                  const gchar    *text);
-void       gtk_progress_bar_set_fraction         (GtkProgressBar *pbar,
-                                                  gdouble         fraction);
-
-void       gtk_progress_bar_set_pulse_step       (GtkProgressBar *pbar,
-                                                  gdouble         fraction);
-void       gtk_progress_bar_set_orientation      (GtkProgressBar *pbar,
-						  GtkProgressBarOrientation orientation);
-
-G_CONST_RETURN gchar* gtk_progress_bar_get_text       (GtkProgressBar *pbar);
-gdouble               gtk_progress_bar_get_fraction   (GtkProgressBar *pbar);
-gdouble               gtk_progress_bar_get_pulse_step (GtkProgressBar *pbar);
-
-GtkProgressBarOrientation gtk_progress_bar_get_orientation (GtkProgressBar *pbar);
-void               gtk_progress_bar_set_ellipsize (GtkProgressBar     *pbar,
-						   PangoEllipsizeMode  mode);
-PangoEllipsizeMode gtk_progress_bar_get_ellipsize (GtkProgressBar     *pbar);
-
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-/* Everything below here is deprecated */
-GtkWidget* gtk_progress_bar_new_with_adjustment  (GtkAdjustment  *adjustment);
-void       gtk_progress_bar_set_bar_style        (GtkProgressBar *pbar,
-						  GtkProgressBarStyle style);
-void       gtk_progress_bar_set_discrete_blocks  (GtkProgressBar *pbar,
-						  guint           blocks);
-/* set_activity_step() is not only deprecated, it doesn't even work.
- * (Of course, it wasn't usable anyway, you had to set it from a size_allocate
- * handler or something)
- */
-void       gtk_progress_bar_set_activity_step    (GtkProgressBar *pbar,
-                                                  guint           step);
-void       gtk_progress_bar_set_activity_blocks  (GtkProgressBar *pbar,
-						  guint           blocks);
-void       gtk_progress_bar_update               (GtkProgressBar *pbar,
-						  gdouble         percentage);
-
-#endif /* GTK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GTK_PROGRESS_BAR_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkquery.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkquery.h
deleted file mode 100644
index 7e32eb6e..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkquery.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2005 Novell, 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,
- *
- * Author: Anders Carlsson <andersca@imendio.com>
- *
- * Based on nautilus-query.h
- */
-
-#ifndef __GTK_QUERY_H__
-#define __GTK_QUERY_H__
-
-/* This is a "semi-private" header; it is meant only for
- * alternate GtkFileChooser implementations; no stability guarantees 
- * are made at this point
- */
-#ifndef GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
-#error "gtkfilechooserprivate.h is not supported API for general use"
-#endif
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_QUERY		(_gtk_query_get_type ())
-#define GTK_QUERY(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_QUERY, GtkQuery))
-#define GTK_QUERY_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_QUERY, GtkQueryClass))
-#define GTK_IS_QUERY(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_QUERY))
-#define GTK_IS_QUERY_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_QUERY))
-#define GTK_QUERY_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_QUERY, GtkQueryClass))
-
-typedef struct _GtkQuery GtkQuery;
-typedef struct _GtkQueryClass GtkQueryClass;
-typedef struct _GtkQueryPrivate GtkQueryPrivate;
-
-struct _GtkQuery 
-{
-  GObject parent;
-
-  GtkQueryPrivate *priv;
-};
-
-struct _GtkQueryClass
-{
-  GObjectClass parent_class;
-};
-
-GType     _gtk_query_get_type       (void);
-gboolean  _gtk_query_enabled        (void);
-
-GtkQuery* _gtk_query_new            (void);
-
-gchar*    _gtk_query_get_text       (GtkQuery    *query);
-void      _gtk_query_set_text       (GtkQuery    *query, 
-				     const gchar *text);
-
-gchar*    _gtk_query_get_location   (GtkQuery    *query);
-void      _gtk_query_set_location   (GtkQuery    *query, 
-				     const gchar *uri);
-
-GList*    _gtk_query_get_mime_types (GtkQuery    *query);
-void      _gtk_query_set_mime_types (GtkQuery    *query, 
-				     GList       *mime_types);
-void      _gtk_query_add_mime_type  (GtkQuery    *query, 
-				     const gchar *mime_type);
-
-G_END_DECLS
-
-#endif /* __GTK_QUERY_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkradioaction.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkradioaction.h
deleted file mode 100644
index d39648b4..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkradioaction.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * GTK - The GIMP Toolkit
- * Copyright (C) 1998, 1999 Red Hat, Inc.
- * All rights reserved.
- *
- * 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 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.
- */
-
-/*
- * Author: James Henstridge <james@daa.com.au>
- *
- * Modified by the GTK+ Team and others 2003.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-#ifndef __GTK_RADIO_ACTION_H__
-#define __GTK_RADIO_ACTION_H__
-
-#include <gtk/gtktoggleaction.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_RADIO_ACTION            (gtk_radio_action_get_type ())
-#define GTK_RADIO_ACTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RADIO_ACTION, GtkRadioAction))
-#define GTK_RADIO_ACTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RADIO_ACTION, GtkRadioActionClass))
-#define GTK_IS_RADIO_ACTION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RADIO_ACTION))
-#define GTK_IS_RADIO_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RADIO_ACTION))
-#define GTK_RADIO_ACTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_RADIO_ACTION, GtkRadioActionClass))
-
-typedef struct _GtkRadioAction        GtkRadioAction;
-typedef struct _GtkRadioActionPrivate GtkRadioActionPrivate;
-typedef struct _GtkRadioActionClass   GtkRadioActionClass;
-
-struct _GtkRadioAction
-{
-  GtkToggleAction parent;
-
-  /*< private >*/
-
-  GtkRadioActionPrivate *private_data;
-};
-
-struct _GtkRadioActionClass
-{
-  GtkToggleActionClass parent_class;
-
-  void       (* changed) (GtkRadioAction *action, GtkRadioAction *current);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType           gtk_radio_action_get_type          (void) G_GNUC_CONST;
-GtkRadioAction *gtk_radio_action_new               (const gchar           *name,
-                                                    const gchar           *label,
-                                                    const gchar           *tooltip,
-                                                    const gchar           *stock_id,
-                                                    gint                   value);
-GSList         *gtk_radio_action_get_group         (GtkRadioAction        *action);
-void            gtk_radio_action_set_group         (GtkRadioAction        *action,
-                                                    GSList                *group);
-gint            gtk_radio_action_get_current_value (GtkRadioAction        *action);
-void            gtk_radio_action_set_current_value (GtkRadioAction        *action,
-                                                    gint                   current_value);
-
-G_END_DECLS
-
-#endif  /* __GTK_RADIO_ACTION_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkradiobutton.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkradiobutton.h
deleted file mode 100644
index 0d885e63..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkradiobutton.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_RADIO_BUTTON_H__
-#define __GTK_RADIO_BUTTON_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkcheckbutton.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_RADIO_BUTTON		       (gtk_radio_button_get_type ())
-#define GTK_RADIO_BUTTON(obj)		       (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RADIO_BUTTON, GtkRadioButton))
-#define GTK_RADIO_BUTTON_CLASS(klass)	       (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RADIO_BUTTON, GtkRadioButtonClass))
-#define GTK_IS_RADIO_BUTTON(obj)	       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RADIO_BUTTON))
-#define GTK_IS_RADIO_BUTTON_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RADIO_BUTTON))
-#define GTK_RADIO_BUTTON_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_RADIO_BUTTON, GtkRadioButtonClass))
-
-
-typedef struct _GtkRadioButton	     GtkRadioButton;
-typedef struct _GtkRadioButtonClass  GtkRadioButtonClass;
-
-struct _GtkRadioButton
-{
-  GtkCheckButton check_button;
-  
-  GSList *group;
-};
-
-struct _GtkRadioButtonClass
-{
-  GtkCheckButtonClass parent_class;
-
-  /* Signals */
-  void (*group_changed) (GtkRadioButton *radio_button);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType	   gtk_radio_button_get_type	     (void) G_GNUC_CONST;
-
-GtkWidget* gtk_radio_button_new                           (GSList         *group);
-GtkWidget* gtk_radio_button_new_from_widget               (GtkRadioButton *radio_group_member);
-GtkWidget* gtk_radio_button_new_with_label                (GSList         *group,
-                                                           const gchar    *label);
-GtkWidget* gtk_radio_button_new_with_label_from_widget    (GtkRadioButton *radio_group_member,
-                                                           const gchar    *label);
-GtkWidget* gtk_radio_button_new_with_mnemonic             (GSList         *group,
-                                                           const gchar    *label);
-GtkWidget* gtk_radio_button_new_with_mnemonic_from_widget (GtkRadioButton *radio_group_member,
-                                                           const gchar    *label);
-GSList*    gtk_radio_button_get_group                     (GtkRadioButton *radio_button);
-void       gtk_radio_button_set_group                     (GtkRadioButton *radio_button,
-                                                           GSList         *group);
-
-#ifndef GTK_DISABLE_DEPRECATED
-#define gtk_radio_button_group gtk_radio_button_get_group
-#endif
-
-G_END_DECLS
-
-#endif /* __GTK_RADIO_BUTTON_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkradiomenuitem.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkradiomenuitem.h
deleted file mode 100644
index 2adb5636..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkradiomenuitem.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_RADIO_MENU_ITEM_H__
-#define __GTK_RADIO_MENU_ITEM_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkcheckmenuitem.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_RADIO_MENU_ITEM	      (gtk_radio_menu_item_get_type ())
-#define GTK_RADIO_MENU_ITEM(obj)	      (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItem))
-#define GTK_RADIO_MENU_ITEM_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItemClass))
-#define GTK_IS_RADIO_MENU_ITEM(obj)	      (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RADIO_MENU_ITEM))
-#define GTK_IS_RADIO_MENU_ITEM_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RADIO_MENU_ITEM))
-#define GTK_RADIO_MENU_ITEM_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItemClass))
-
-
-typedef struct _GtkRadioMenuItem       GtkRadioMenuItem;
-typedef struct _GtkRadioMenuItemClass  GtkRadioMenuItemClass;
-
-struct _GtkRadioMenuItem
-{
-  GtkCheckMenuItem check_menu_item;
-  
-  GSList *group;
-};
-
-struct _GtkRadioMenuItemClass
-{
-  GtkCheckMenuItemClass parent_class;
-  
-  /* Signals */
-  void (*group_changed) (GtkRadioMenuItem *radio_menu_item);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType      gtk_radio_menu_item_get_type	         (void) G_GNUC_CONST;
-							
-GtkWidget* gtk_radio_menu_item_new                           (GSList           *group);
-GtkWidget* gtk_radio_menu_item_new_with_label                (GSList           *group,
-							      const gchar      *label);
-GtkWidget* gtk_radio_menu_item_new_with_mnemonic             (GSList           *group,
-							      const gchar      *label);
-GtkWidget* gtk_radio_menu_item_new_from_widget               (GtkRadioMenuItem *group);
-GtkWidget *gtk_radio_menu_item_new_with_mnemonic_from_widget (GtkRadioMenuItem *group,
-							      const gchar      *label);
-GtkWidget *gtk_radio_menu_item_new_with_label_from_widget    (GtkRadioMenuItem *group,
-							      const gchar      *label);
-GSList*    gtk_radio_menu_item_get_group                     (GtkRadioMenuItem *radio_menu_item);
-void       gtk_radio_menu_item_set_group                     (GtkRadioMenuItem *radio_menu_item,
-							      GSList           *group);
-
-#ifndef GTK_DISABLE_DEPRECATED
-#define gtk_radio_menu_item_group gtk_radio_menu_item_get_group
-#endif
-
-G_END_DECLS
-
-#endif /* __GTK_RADIO_MENU_ITEM_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkradiotoolbutton.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkradiotoolbutton.h
deleted file mode 100644
index febdcf77..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkradiotoolbutton.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* gtkradiotoolbutton.h
- *
- * Copyright (C) 2002 Anders Carlsson <andersca@gnome.org>
- * Copyright (C) 2002 James Henstridge <james@daa.com.au>
- * Copyright (C) 2003 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 __GTK_RADIO_TOOL_BUTTON_H__
-#define __GTK_RADIO_TOOL_BUTTON_H__
-
-#include "gtktoggletoolbutton.h"
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_RADIO_TOOL_BUTTON            (gtk_radio_tool_button_get_type ())
-#define GTK_RADIO_TOOL_BUTTON(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RADIO_TOOL_BUTTON, GtkRadioToolButton))
-#define GTK_RADIO_TOOL_BUTTON_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RADIO_TOOL_BUTTON, GtkRadioToolButtonClass))
-#define GTK_IS_RADIO_TOOL_BUTTON(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RADIO_TOOL_BUTTON))
-#define GTK_IS_RADIO_TOOL_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RADIO_TOOL_BUTTON))
-#define GTK_RADIO_TOOL_BUTTON_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_RADIO_TOOL_BUTTON, GtkRadioToolButtonClass))
-
-typedef struct _GtkRadioToolButton      GtkRadioToolButton;
-typedef struct _GtkRadioToolButtonClass GtkRadioToolButtonClass;
-
-struct _GtkRadioToolButton
-{
-  GtkToggleToolButton parent;
-};
-
-struct _GtkRadioToolButtonClass
-{
-  GtkToggleToolButtonClass parent_class;
-
-  /* Padding for future expansion */
-  void (* _gtk_reserved1) (void);
-  void (* _gtk_reserved2) (void);
-  void (* _gtk_reserved3) (void);
-  void (* _gtk_reserved4) (void);
-};
-
-GType        gtk_radio_tool_button_get_type       (void) G_GNUC_CONST;
-
-GtkToolItem *gtk_radio_tool_button_new                        (GSList             *group);
-GtkToolItem *gtk_radio_tool_button_new_from_stock             (GSList             *group,
-							       const gchar        *stock_id);
-GtkToolItem *gtk_radio_tool_button_new_from_widget            (GtkRadioToolButton *group);
-GtkToolItem *gtk_radio_tool_button_new_with_stock_from_widget (GtkRadioToolButton *group,
-							       const gchar        *stock_id);
-GSList *     gtk_radio_tool_button_get_group                  (GtkRadioToolButton *button);
-void         gtk_radio_tool_button_set_group                  (GtkRadioToolButton *button,
-							       GSList             *group);
-
-G_END_DECLS
-
-#endif /* __GTK_RADIO_TOOL_BUTTON_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrange.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrange.h
deleted file mode 100644
index 7ebb9df6..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrange.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_RANGE_H__
-#define __GTK_RANGE_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkadjustment.h>
-#include <gtk/gtkwidget.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_RANGE            (gtk_range_get_type ())
-#define GTK_RANGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RANGE, GtkRange))
-#define GTK_RANGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RANGE, GtkRangeClass))
-#define GTK_IS_RANGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RANGE))
-#define GTK_IS_RANGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RANGE))
-#define GTK_RANGE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_RANGE, GtkRangeClass))
-
-/* These two are private/opaque types, ignore */
-typedef struct _GtkRangeLayout    GtkRangeLayout;
-typedef struct _GtkRangeStepTimer GtkRangeStepTimer;
-
-typedef struct _GtkRange        GtkRange;
-typedef struct _GtkRangeClass   GtkRangeClass;
-
-struct _GtkRange
-{
-  GtkWidget widget;
-
-  GtkAdjustment *adjustment;
-  GtkUpdateType update_policy;
-  guint inverted : 1;
-
-  /*< protected >*/
-  
-  guint flippable : 1;
-  
-  /* Steppers are: < > ---- < >
-   *               a b      c d
-   */
-   
-  guint has_stepper_a : 1;
-  guint has_stepper_b : 1;
-  guint has_stepper_c : 1;
-  guint has_stepper_d : 1;
-
-  guint need_recalc : 1;
-
-  guint slider_size_fixed : 1;
-  
-  gint min_slider_size;
-
-  GtkOrientation orientation;
-
-  /* Area of entire stepper + trough assembly in widget->window coords */
-  GdkRectangle range_rect;
-  /* Slider range along the long dimension, in widget->window coords */
-  gint slider_start, slider_end;
-
-  /* Round off value to this many digits, -1 for no rounding */
-  gint round_digits;
-  
-  /*< private >*/
-  guint trough_click_forward : 1;  /* trough click was on the forward side of slider */
-  guint update_pending : 1;        /* need to emit value_changed */
-  GtkRangeLayout *layout;
-  GtkRangeStepTimer *timer;
-  gint slide_initial_slider_position;
-  gint slide_initial_coordinate;
-  guint update_timeout_id;
-  GdkWindow *event_window;
-};
-
-struct _GtkRangeClass
-{
-  GtkWidgetClass parent_class;
-
-  /* what detail to pass to GTK drawing functions */
-  gchar *slider_detail;
-  gchar *stepper_detail;
-
-  void (* value_changed)    (GtkRange     *range);
-  void (* adjust_bounds)    (GtkRange     *range,
-                             gdouble	   new_value);
-  
-  /* action signals for keybindings */
-  void (* move_slider)      (GtkRange     *range,
-                             GtkScrollType scroll);
-
-  /* Virtual functions */
-  void (* get_range_border) (GtkRange     *range,
-                             GtkBorder    *border_);
-
-  gboolean (* change_value) (GtkRange     *range,
-                             GtkScrollType scroll,
-                             gdouble       new_value);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-};
-
-
-GType              gtk_range_get_type                      (void) G_GNUC_CONST;
-
-void               gtk_range_set_update_policy             (GtkRange      *range,
-                                                            GtkUpdateType  policy);
-GtkUpdateType      gtk_range_get_update_policy             (GtkRange      *range);
-
-void               gtk_range_set_adjustment                (GtkRange      *range,
-                                                            GtkAdjustment *adjustment);
-GtkAdjustment*     gtk_range_get_adjustment                (GtkRange      *range);
-
-void               gtk_range_set_inverted                  (GtkRange      *range,
-                                                            gboolean       setting);
-gboolean           gtk_range_get_inverted                  (GtkRange      *range);
-
-void               gtk_range_set_lower_stepper_sensitivity (GtkRange      *range,
-                                                            GtkSensitivityType sensitivity);
-GtkSensitivityType gtk_range_get_lower_stepper_sensitivity (GtkRange      *range);
-void               gtk_range_set_upper_stepper_sensitivity (GtkRange      *range,
-                                                            GtkSensitivityType sensitivity);
-GtkSensitivityType gtk_range_get_upper_stepper_sensitivity (GtkRange      *range);
-
-void               gtk_range_set_increments                (GtkRange      *range,
-                                                            gdouble        step,
-                                                            gdouble        page);
-void               gtk_range_set_range                     (GtkRange      *range,
-                                                            gdouble        min,
-                                                            gdouble        max);
-void               gtk_range_set_value                     (GtkRange      *range,
-                                                            gdouble        value);
-gdouble            gtk_range_get_value                     (GtkRange      *range);
-
-void               gtk_range_set_show_fill_level           (GtkRange      *range,
-                                                            gboolean       show_fill_level);
-gboolean           gtk_range_get_show_fill_level           (GtkRange      *range);
-void               gtk_range_set_restrict_to_fill_level    (GtkRange      *range,
-                                                            gboolean       restrict_to_fill_level);
-gboolean           gtk_range_get_restrict_to_fill_level    (GtkRange      *range);
-void               gtk_range_set_fill_level                (GtkRange      *range,
-                                                            gdouble        fill_level);
-gdouble            gtk_range_get_fill_level                (GtkRange      *range);
-
-gdouble            _gtk_range_get_wheel_delta              (GtkRange      *range,
-                                                            GdkScrollDirection direction);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_RANGE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrc.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrc.h
deleted file mode 100644
index c6880af2..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrc.h
+++ /dev/null
@@ -1,267 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_RC_H__
-#define __GTK_RC_H__
-
-
-#include <gtk/gtkstyle.h>
-
-G_BEGIN_DECLS
-
-/* Forward declarations */
-typedef struct _GtkIconFactory  GtkIconFactory;
-typedef struct _GtkRcContext    GtkRcContext;
-
-typedef struct _GtkRcStyleClass GtkRcStyleClass;
-
-#define GTK_TYPE_RC_STYLE              (gtk_rc_style_get_type ())
-#define GTK_RC_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GTK_TYPE_RC_STYLE, GtkRcStyle))
-#define GTK_RC_STYLE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RC_STYLE, GtkRcStyleClass))
-#define GTK_IS_RC_STYLE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GTK_TYPE_RC_STYLE))
-#define GTK_IS_RC_STYLE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RC_STYLE))
-#define GTK_RC_STYLE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_RC_STYLE, GtkRcStyleClass))
-
-typedef enum
-{
-  GTK_RC_FG		= 1 << 0,
-  GTK_RC_BG		= 1 << 1,
-  GTK_RC_TEXT		= 1 << 2,
-  GTK_RC_BASE		= 1 << 3
-} GtkRcFlags;
-
-struct _GtkRcStyle
-{
-  GObject parent_instance;
-
-  /*< public >*/
-  
-  gchar *name;
-  gchar *bg_pixmap_name[5];
-  PangoFontDescription *font_desc;
-
-  GtkRcFlags color_flags[5];
-  GdkColor   fg[5];
-  GdkColor   bg[5];
-  GdkColor   text[5];
-  GdkColor   base[5];
-
-  gint xthickness;
-  gint ythickness;
-
-  /*< private >*/
-  GArray *rc_properties;
-  
-  /* list of RC style lists including this RC style */
-  GSList *rc_style_lists;
-
-  GSList *icon_factories;
-
-  guint engine_specified : 1;	/* The RC file specified the engine */
-};
-
-struct _GtkRcStyleClass
-{
-  GObjectClass parent_class;
-
-  /* Create an empty RC style of the same type as this RC style.
-   * The default implementation, which does
-   * g_object_new (G_OBJECT_TYPE (style), NULL);
-   * should work in most cases.
-   */
-  GtkRcStyle * (*create_rc_style) (GtkRcStyle *rc_style);
-
-  /* Fill in engine specific parts of GtkRcStyle by parsing contents
-   * of brackets. Returns G_TOKEN_NONE if successful, otherwise returns
-   * the token it expected but didn't get.
-   */
-  guint     (*parse)  (GtkRcStyle   *rc_style,
-		       GtkSettings  *settings,
-		       GScanner     *scanner);
-  
-  /* Combine RC style data from src into dest. If overridden, this
-   * function should chain to the parent.
-   */
-  void      (*merge)  (GtkRcStyle *dest,
-		       GtkRcStyle *src);
-
-  /* Create an empty style suitable to this RC style
-   */
-  GtkStyle * (*create_style) (GtkRcStyle *rc_style);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-#ifdef G_OS_WIN32
-/* Reserve old names for DLL ABI backward compatibility */
-#define gtk_rc_add_default_file gtk_rc_add_default_file_utf8
-#define gtk_rc_set_default_files gtk_rc_set_default_files_utf8
-#define gtk_rc_parse gtk_rc_parse_utf8
-#endif
-
-void	  _gtk_rc_init			 (void);
-GSList*   _gtk_rc_parse_widget_class_path (const gchar *pattern);
-void      _gtk_rc_free_widget_class_path (GSList       *list);
-gboolean  _gtk_rc_match_widget_class     (GSList       *list,
-                                          gint          length,
-                                          gchar        *path,
-                                          gchar        *path_reversed);
-
-void      gtk_rc_add_default_file	(const gchar *filename);
-void      gtk_rc_set_default_files      (gchar **filenames);
-gchar**   gtk_rc_get_default_files      (void);
-GtkStyle* gtk_rc_get_style		(GtkWidget   *widget);
-GtkStyle* gtk_rc_get_style_by_paths     (GtkSettings *settings,
-					 const char  *widget_path,
-					 const char  *class_path,
-					 GType        type);
-
-gboolean gtk_rc_reparse_all_for_settings (GtkSettings *settings,
-					  gboolean     force_load);
-void     gtk_rc_reset_styles             (GtkSettings *settings);
-
-gchar*   gtk_rc_find_pixmap_in_path (GtkSettings  *settings,
-				     GScanner     *scanner,
-				     const gchar  *pixmap_file);
-
-void	  gtk_rc_parse			(const gchar *filename);
-void	  gtk_rc_parse_string		(const gchar *rc_string);
-gboolean  gtk_rc_reparse_all		(void);
-
-#ifndef GTK_DISABLE_DEPRECATED
-void	  gtk_rc_add_widget_name_style	(GtkRcStyle   *rc_style,
-					 const gchar  *pattern);
-void	  gtk_rc_add_widget_class_style (GtkRcStyle   *rc_style,
-					 const gchar  *pattern);
-void	  gtk_rc_add_class_style	(GtkRcStyle   *rc_style,
-					 const gchar  *pattern);
-#endif /* GTK_DISABLE_DEPRECATED */
-
-
-GType       gtk_rc_style_get_type   (void) G_GNUC_CONST;
-GtkRcStyle* gtk_rc_style_new        (void);
-GtkRcStyle* gtk_rc_style_copy       (GtkRcStyle *orig);
-
-#ifndef GTK_DISABLE_DEPRECATED
-void        gtk_rc_style_ref        (GtkRcStyle *rc_style);
-void        gtk_rc_style_unref      (GtkRcStyle *rc_style);
-#endif
-
-gchar*		gtk_rc_find_module_in_path	(const gchar 	*module_file);
-gchar*		gtk_rc_get_theme_dir		(void);
-gchar*		gtk_rc_get_module_dir		(void);
-gchar*		gtk_rc_get_im_module_path	(void);
-gchar*		gtk_rc_get_im_module_file	(void);
-
-/* private functions/definitions */
-typedef enum {
-  GTK_RC_TOKEN_INVALID = G_TOKEN_LAST,
-  GTK_RC_TOKEN_INCLUDE,
-  GTK_RC_TOKEN_NORMAL,
-  GTK_RC_TOKEN_ACTIVE,
-  GTK_RC_TOKEN_PRELIGHT,
-  GTK_RC_TOKEN_SELECTED,
-  GTK_RC_TOKEN_INSENSITIVE,
-  GTK_RC_TOKEN_FG,
-  GTK_RC_TOKEN_BG,
-  GTK_RC_TOKEN_TEXT,
-  GTK_RC_TOKEN_BASE,
-  GTK_RC_TOKEN_XTHICKNESS,
-  GTK_RC_TOKEN_YTHICKNESS,
-  GTK_RC_TOKEN_FONT,
-  GTK_RC_TOKEN_FONTSET,
-  GTK_RC_TOKEN_FONT_NAME,
-  GTK_RC_TOKEN_BG_PIXMAP,
-  GTK_RC_TOKEN_PIXMAP_PATH,
-  GTK_RC_TOKEN_STYLE,
-  GTK_RC_TOKEN_BINDING,
-  GTK_RC_TOKEN_BIND,
-  GTK_RC_TOKEN_WIDGET,
-  GTK_RC_TOKEN_WIDGET_CLASS,
-  GTK_RC_TOKEN_CLASS,
-  GTK_RC_TOKEN_LOWEST,
-  GTK_RC_TOKEN_GTK,
-  GTK_RC_TOKEN_APPLICATION,
-  GTK_RC_TOKEN_THEME,
-  GTK_RC_TOKEN_RC,
-  GTK_RC_TOKEN_HIGHEST,
-  GTK_RC_TOKEN_ENGINE,
-  GTK_RC_TOKEN_MODULE_PATH,
-  GTK_RC_TOKEN_IM_MODULE_PATH,
-  GTK_RC_TOKEN_IM_MODULE_FILE,
-  GTK_RC_TOKEN_STOCK,
-  GTK_RC_TOKEN_LTR,
-  GTK_RC_TOKEN_RTL,
-  GTK_RC_TOKEN_COLOR,
-  GTK_RC_TOKEN_UNBIND,
-  GTK_RC_TOKEN_LAST
-} GtkRcTokenType;
-
-GScanner* gtk_rc_scanner_new	(void);
-guint	  gtk_rc_parse_color	(GScanner	     *scanner,
-				 GdkColor	     *color);
-guint	  gtk_rc_parse_color_full (GScanner	     *scanner,
-                                   GtkRcStyle        *style,
-				   GdkColor	     *color);
-guint	  gtk_rc_parse_state	(GScanner	     *scanner,
-				 GtkStateType	     *state);
-guint	  gtk_rc_parse_priority	(GScanner	     *scanner,
-				 GtkPathPriorityType *priority);
-
-/* rc properties
- * (structure forward declared in gtkstyle.h)
- */
-struct _GtkRcProperty
-{
-  /* quark-ified property identifier like "GtkScrollbar::spacing" */
-  GQuark type_name;
-  GQuark property_name;
-
-  /* fields similar to GtkSettingsValue */
-  gchar *origin;
-  GValue value;
-};
-const GtkRcProperty* _gtk_rc_style_lookup_rc_property (GtkRcStyle *rc_style,
-						       GQuark      type_name,
-						       GQuark      property_name);
-void	      _gtk_rc_style_set_rc_property	      (GtkRcStyle *rc_style,
-						       GtkRcProperty *property);
-void	      _gtk_rc_style_unset_rc_property	      (GtkRcStyle *rc_style,
-						       GQuark      type_name,
-						       GQuark      property_name);
-
-GSList     * _gtk_rc_style_get_color_hashes        (GtkRcStyle *rc_style);
-
-const gchar* _gtk_rc_context_get_default_font_name (GtkSettings *settings);
-void         _gtk_rc_context_destroy               (GtkSettings *settings);
-
-G_END_DECLS
-
-#endif /* __GTK_RC_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentaction.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentaction.h
deleted file mode 100644
index 776f9426..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentaction.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Recent chooser action for GtkUIManager
- *
- * Copyright (C) 2007, Emmanuele Bassi
- * 
- * 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 __GTK_RECENT_ACTION_H__
-#define __GTK_RECENT_ACTION_H__
-
-#include <gtk/gtkaction.h>
-#include <gtk/gtkrecentmanager.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_RECENT_ACTION                  (gtk_recent_action_get_type ())
-#define GTK_RECENT_ACTION(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RECENT_ACTION, GtkRecentAction))
-#define GTK_IS_RECENT_ACTION(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RECENT_ACTION))
-#define GTK_RECENT_ACTION_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RECENT_ACTION, GtkRecentActionClass))
-#define GTK_IS_RECENT_ACTION_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RECENT_ACTION))
-#define GTK_RECENT_ACTION_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_RECENT_ACTION, GtkRecentActionClass))
-
-typedef struct _GtkRecentAction         GtkRecentAction;
-typedef struct _GtkRecentActionPrivate  GtkRecentActionPrivate;
-typedef struct _GtkRecentActionClass    GtkRecentActionClass;
-
-struct _GtkRecentAction
-{
-  GtkAction parent_instance;
-  
-  /*< private >*/
-  GtkRecentActionPrivate *priv;
-};
-
-struct _GtkRecentActionClass
-{
-  GtkActionClass parent_class;
-};
-
-GType      gtk_recent_action_get_type         (void) G_GNUC_CONST;
-GtkAction *gtk_recent_action_new              (const gchar      *name,
-                                               const gchar      *label,
-                                               const gchar      *tooltip,
-                                               const gchar      *stock_id);
-GtkAction *gtk_recent_action_new_for_manager  (const gchar      *name,
-                                               const gchar      *label,
-                                               const gchar      *tooltip,
-                                               const gchar      *stock_id,
-                                               GtkRecentManager *manager);
-gboolean   gtk_recent_action_get_show_numbers (GtkRecentAction  *action);
-void       gtk_recent_action_set_show_numbers (GtkRecentAction  *action,
-                                               gboolean          show_numbers);
-
-G_END_DECLS
-
-#endif /* __GTK_RECENT_ACTION_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentchooser.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentchooser.h
deleted file mode 100644
index 738a9b67..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentchooser.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkrecentchooser.h - Abstract interface for recent file selectors GUIs
- *
- * Copyright (C) 2006, Emmanuele Bassi
- * 
- * 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 __GTK_RECENT_CHOOSER_H__
-#define __GTK_RECENT_CHOOSER_H__
-
-#include <gtk/gtkwidget.h>
-
-#include "gtkrecentmanager.h"
-#include "gtkrecentfilter.h"
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_RECENT_CHOOSER			(gtk_recent_chooser_get_type ())
-#define GTK_RECENT_CHOOSER(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RECENT_CHOOSER, GtkRecentChooser))
-#define GTK_IS_RECENT_CHOOSER(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RECENT_CHOOSER))
-#define GTK_RECENT_CHOOSER_GET_IFACE(inst)	(G_TYPE_INSTANCE_GET_INTERFACE ((inst), GTK_TYPE_RECENT_CHOOSER, GtkRecentChooserIface))
-
-/**
- * GtkRecentSortType:
- * @GTK_RECENT_SORT_NONE: Do not sort the returned list of recently used
- *   resources.
- * @GTK_RECENT_SORT_MRU: Sort the returned list with the most recently used
- *   items first.
- * @GTK_RECENT_SORT_LRU: Sort the returned list with the least recently used
- *   items first.
- * @GTK_RECENT_SORT_CUSTOM: Sort the returned list using a custom sorting
- *   function passed using gtk_recent_manager_set_sort_func().
- *
- * Used to specify the sorting method to be applyed to the recently
- * used resource list.
- **/
-typedef enum
-{
-  GTK_RECENT_SORT_NONE = 0,
-  GTK_RECENT_SORT_MRU,
-  GTK_RECENT_SORT_LRU,
-  GTK_RECENT_SORT_CUSTOM
-} GtkRecentSortType;
-
-typedef gint (*GtkRecentSortFunc) (GtkRecentInfo *a,
-				   GtkRecentInfo *b,
-				   gpointer       user_data);
-
-
-typedef struct _GtkRecentChooser      GtkRecentChooser; /* dummy */
-typedef struct _GtkRecentChooserIface GtkRecentChooserIface;
-
-#define GTK_RECENT_CHOOSER_ERROR	(gtk_recent_chooser_error_quark ())
-
-typedef enum
-{
-  GTK_RECENT_CHOOSER_ERROR_NOT_FOUND,
-  GTK_RECENT_CHOOSER_ERROR_INVALID_URI
-} GtkRecentChooserError;
-
-GQuark  gtk_recent_chooser_error_quark (void);
-
-
-struct _GtkRecentChooserIface
-{
-  GTypeInterface base_iface;
-  
-  /*
-   * Methods
-   */
-  gboolean          (* set_current_uri)    (GtkRecentChooser  *chooser,
-  					    const gchar       *uri,
-  					    GError           **error);
-  gchar *           (* get_current_uri)    (GtkRecentChooser  *chooser);
-  gboolean          (* select_uri)         (GtkRecentChooser  *chooser,
-  					    const gchar       *uri,
-  					    GError           **error);
-  void              (* unselect_uri)       (GtkRecentChooser  *chooser,
-                                            const gchar       *uri);
-  void              (* select_all)         (GtkRecentChooser  *chooser);
-  void              (* unselect_all)       (GtkRecentChooser  *chooser);
-  GList *           (* get_items)          (GtkRecentChooser  *chooser);
-  GtkRecentManager *(* get_recent_manager) (GtkRecentChooser  *chooser);
-  void              (* add_filter)         (GtkRecentChooser  *chooser,
-  					    GtkRecentFilter   *filter);
-  void              (* remove_filter)      (GtkRecentChooser  *chooser,
-  					    GtkRecentFilter   *filter);
-  GSList *          (* list_filters)       (GtkRecentChooser  *chooser);
-  void              (* set_sort_func)      (GtkRecentChooser  *chooser,
-  					    GtkRecentSortFunc  sort_func,
-  					    gpointer           data,
-  					    GDestroyNotify     destroy);
-  
-  /*
-   * Signals
-   */
-  void		    (* item_activated)     (GtkRecentChooser  *chooser);
-  void		    (* selection_changed)  (GtkRecentChooser  *chooser);
-};
-
-GType   gtk_recent_chooser_get_type    (void) G_GNUC_CONST;
-
-/*
- * Configuration
- */
-void              gtk_recent_chooser_set_show_private    (GtkRecentChooser  *chooser,
-							  gboolean           show_private);
-gboolean          gtk_recent_chooser_get_show_private    (GtkRecentChooser  *chooser);
-void              gtk_recent_chooser_set_show_not_found  (GtkRecentChooser  *chooser,
-							  gboolean           show_not_found);
-gboolean          gtk_recent_chooser_get_show_not_found  (GtkRecentChooser  *chooser);
-void              gtk_recent_chooser_set_select_multiple (GtkRecentChooser  *chooser,
-							  gboolean           select_multiple);
-gboolean          gtk_recent_chooser_get_select_multiple (GtkRecentChooser  *chooser);
-void              gtk_recent_chooser_set_limit           (GtkRecentChooser  *chooser,
-							  gint               limit);
-gint              gtk_recent_chooser_get_limit           (GtkRecentChooser  *chooser);
-void              gtk_recent_chooser_set_local_only      (GtkRecentChooser  *chooser,
-							  gboolean           local_only);
-gboolean          gtk_recent_chooser_get_local_only      (GtkRecentChooser  *chooser);
-void              gtk_recent_chooser_set_show_tips       (GtkRecentChooser  *chooser,
-							  gboolean           show_tips);
-gboolean          gtk_recent_chooser_get_show_tips       (GtkRecentChooser  *chooser);
-#ifndef GTK_DISABLE_DEPRECATED
-void              gtk_recent_chooser_set_show_numbers    (GtkRecentChooser  *chooser,
-							  gboolean           show_numbers);
-gboolean          gtk_recent_chooser_get_show_numbers    (GtkRecentChooser  *chooser);
-#endif /* GTK_DISABLE_DEPRECATED */
-void              gtk_recent_chooser_set_show_icons      (GtkRecentChooser  *chooser,
-							  gboolean           show_icons);
-gboolean          gtk_recent_chooser_get_show_icons      (GtkRecentChooser  *chooser);
-void              gtk_recent_chooser_set_sort_type       (GtkRecentChooser  *chooser,
-							  GtkRecentSortType  sort_type);
-GtkRecentSortType gtk_recent_chooser_get_sort_type       (GtkRecentChooser  *chooser);
-void              gtk_recent_chooser_set_sort_func       (GtkRecentChooser  *chooser,
-							  GtkRecentSortFunc  sort_func,
-							  gpointer           sort_data,
-							  GDestroyNotify     data_destroy);
-
-/*
- * Items handling
- */
-gboolean       gtk_recent_chooser_set_current_uri  (GtkRecentChooser  *chooser,
-						    const gchar       *uri,
-						    GError           **error);
-gchar *        gtk_recent_chooser_get_current_uri  (GtkRecentChooser  *chooser);
-GtkRecentInfo *gtk_recent_chooser_get_current_item (GtkRecentChooser  *chooser);
-gboolean       gtk_recent_chooser_select_uri       (GtkRecentChooser  *chooser,
-						    const gchar       *uri,
-						    GError           **error);
-void           gtk_recent_chooser_unselect_uri     (GtkRecentChooser  *chooser,
-					            const gchar       *uri);
-void           gtk_recent_chooser_select_all       (GtkRecentChooser  *chooser);
-void           gtk_recent_chooser_unselect_all     (GtkRecentChooser  *chooser);
-GList *        gtk_recent_chooser_get_items        (GtkRecentChooser  *chooser);
-gchar **       gtk_recent_chooser_get_uris         (GtkRecentChooser  *chooser,
-						    gsize             *length);
-
-/*
- * Filters
- */
-void 		 gtk_recent_chooser_add_filter    (GtkRecentChooser *chooser,
-			 			   GtkRecentFilter  *filter);
-void 		 gtk_recent_chooser_remove_filter (GtkRecentChooser *chooser,
-						   GtkRecentFilter  *filter);
-GSList * 	 gtk_recent_chooser_list_filters  (GtkRecentChooser *chooser);
-void 		 gtk_recent_chooser_set_filter    (GtkRecentChooser *chooser,
-						   GtkRecentFilter  *filter);
-GtkRecentFilter *gtk_recent_chooser_get_filter    (GtkRecentChooser *chooser);
-
-
-G_END_DECLS
-
-#endif /* __GTK_RECENT_CHOOSER_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentchooserdialog.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentchooserdialog.h
deleted file mode 100644
index 22be218d..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentchooserdialog.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkrecentchooserdialog.h: Recent files selector dialog
- * Copyright (C) 2006 Emmanuele Bassi
- * 
- * 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 __GTK_RECENT_CHOOSER_DIALOG_H__
-#define __GTK_RECENT_CHOOSER_DIALOG_H__
-
-#include <gtk/gtkdialog.h>
-#include "gtkrecentchooser.h"
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_RECENT_CHOOSER_DIALOG		  (gtk_recent_chooser_dialog_get_type ())
-#define GTK_RECENT_CHOOSER_DIALOG(obj)		  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RECENT_CHOOSER_DIALOG, GtkRecentChooserDialog))
-#define GTK_IS_RECENT_CHOOSER_DIALOG(obj)	  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RECENT_CHOOSER_DIALOG))
-#define GTK_RECENT_CHOOSER_DIALOG_CLASS(klass)	  (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RECENT_CHOOSER_DIALOG, GtkRecentChooserDialogClass))
-#define GTK_IS_RECENT_CHOOSER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RECENT_CHOOSER_DIALOG))
-#define GTK_RECENT_CHOOSER_DIALOG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_RECENT_CHOOSER_DIALOG, GtkRecentChooserDialogClass))
-
-typedef struct _GtkRecentChooserDialog        GtkRecentChooserDialog;
-typedef struct _GtkRecentChooserDialogClass   GtkRecentChooserDialogClass;
-
-typedef struct _GtkRecentChooserDialogPrivate GtkRecentChooserDialogPrivate;
-
-
-struct _GtkRecentChooserDialog
-{
-  /*< private >*/
-  GtkDialog parent_instance;
-  
-  GtkRecentChooserDialogPrivate *priv;
-};
-
-struct _GtkRecentChooserDialogClass
-{
-  GtkDialogClass parent_class;
-};
-
-
-GType      gtk_recent_chooser_dialog_get_type        (void) G_GNUC_CONST;
-
-GtkWidget *gtk_recent_chooser_dialog_new             (const gchar      *title,
-					              GtkWindow        *parent,
-					              const gchar      *first_button_text,
-					              ...) G_GNUC_NULL_TERMINATED;
-GtkWidget *gtk_recent_chooser_dialog_new_for_manager (const gchar      *title,
-						      GtkWindow        *parent,
-						      GtkRecentManager *manager,
-						      const gchar      *first_button_text,
-						      ...) G_GNUC_NULL_TERMINATED;
-
-G_END_DECLS
-
-#endif /* __GTK_RECENT_CHOOSER_DIALOG_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentchoosermenu.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentchoosermenu.h
deleted file mode 100644
index 200233f9..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentchoosermenu.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkrecentchoosermenu.h - Recently used items menu widget
- * Copyright (C) 2006, Emmanuele Bassi
- * 
- * 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 __GTK_RECENT_CHOOSER_MENU_H__
-#define __GTK_RECENT_CHOOSER_MENU_H__
-
-#include <gtk/gtkmenu.h>
-#include "gtkrecentchooser.h"
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_RECENT_CHOOSER_MENU		(gtk_recent_chooser_menu_get_type ())
-#define GTK_RECENT_CHOOSER_MENU(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RECENT_CHOOSER_MENU, GtkRecentChooserMenu))
-#define GTK_IS_RECENT_CHOOSER_MENU(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RECENT_CHOOSER_MENU))
-#define GTK_RECENT_CHOOSER_MENU_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RECENT_CHOOSER_MENU, GtkRecentChooserMenuClass))
-#define GTK_IS_RECENT_CHOOSER_MENU_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RECENT_CHOOSER_MENU))
-#define GTK_RECENT_CHOOSER_MENU_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_RECENT_CHOOSER_MENU, GtkRecentChooserMenuClass))
-
-typedef struct _GtkRecentChooserMenu		GtkRecentChooserMenu;
-typedef struct _GtkRecentChooserMenuClass	GtkRecentChooserMenuClass;
-typedef struct _GtkRecentChooserMenuPrivate	GtkRecentChooserMenuPrivate;
-
-struct _GtkRecentChooserMenu
-{
-  /*< private >*/
-  GtkMenu parent_instance;
-
-  GtkRecentChooserMenuPrivate *priv;
-};
-
-struct _GtkRecentChooserMenuClass
-{
-  GtkMenuClass parent_class;
-  
-  /* padding for future expansion */
-  void (* gtk_recent1) (void);
-  void (* gtk_recent2) (void);
-  void (* gtk_recent3) (void);
-  void (* gtk_recent4) (void);
-};
-
-GType      gtk_recent_chooser_menu_get_type         (void) G_GNUC_CONST;
-
-GtkWidget *gtk_recent_chooser_menu_new              (void);
-GtkWidget *gtk_recent_chooser_menu_new_for_manager  (GtkRecentManager     *manager);
-
-gboolean   gtk_recent_chooser_menu_get_show_numbers (GtkRecentChooserMenu *menu);
-void       gtk_recent_chooser_menu_set_show_numbers (GtkRecentChooserMenu *menu,
-						     gboolean              show_numbers);
-
-G_END_DECLS
-
-#endif /* ! __GTK_RECENT_CHOOSER_MENU_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentchooserwidget.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentchooserwidget.h
deleted file mode 100644
index 96aea95f..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentchooserwidget.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkrecentchooserwidget.h: embeddable recently used resources chooser widget
- * Copyright (C) 2006 Emmanuele Bassi
- * 
- * 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 __GTK_RECENT_CHOOSER_WIDGET_H__
-#define __GTK_RECENT_CHOOSER_WIDGET_H__
-
-#include "gtkrecentchooser.h"
-#include <gtk/gtkvbox.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_RECENT_CHOOSER_WIDGET		  (gtk_recent_chooser_widget_get_type ())
-#define GTK_RECENT_CHOOSER_WIDGET(obj)		  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RECENT_CHOOSER_WIDGET, GtkRecentChooserWidget))
-#define GTK_IS_RECENT_CHOOSER_WIDGET(obj)	  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RECENT_CHOOSER_WIDGET))
-#define GTK_RECENT_CHOOSER_WIDGET_CLASS(klass)	  (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RECENT_CHOOSER_WIDGET, GtkRecentChooserWidgetClass))
-#define GTK_IS_RECENT_CHOOSER_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RECENT_CHOOSER_WIDGET))
-#define GTK_RECENT_CHOOSER_WIDGET_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_RECENT_CHOOSER_WIDGET, GtkRecentChooserWidgetClass))
-
-typedef struct _GtkRecentChooserWidget        GtkRecentChooserWidget;
-typedef struct _GtkRecentChooserWidgetClass   GtkRecentChooserWidgetClass;
-
-typedef struct _GtkRecentChooserWidgetPrivate GtkRecentChooserWidgetPrivate;
-
-struct _GtkRecentChooserWidget
-{
-  /*< private >*/
-  GtkVBox parent_instance;
-  
-  GtkRecentChooserWidgetPrivate *priv;
-};
-
-struct _GtkRecentChooserWidgetClass
-{
-  GtkVBoxClass parent_class;
-};
-
-GType      gtk_recent_chooser_widget_get_type        (void) G_GNUC_CONST;
-GtkWidget *gtk_recent_chooser_widget_new             (void);
-GtkWidget *gtk_recent_chooser_widget_new_for_manager (GtkRecentManager *manager);
-
-G_END_DECLS
-
-#endif /* __GTK_RECENT_CHOOSER_WIDGET_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentfilter.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentfilter.h
deleted file mode 100644
index 28f6fe7a..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentfilter.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkrecentfilter.h - Filter object for recently used resources
- * Copyright (C) 2006, Emmanuele Bassi
- * 
- * 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 __GTK_RECENT_FILTER_H__
-#define __GTK_RECENT_FILTER_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_RECENT_FILTER		(gtk_recent_filter_get_type ())
-#define GTK_RECENT_FILTER(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RECENT_FILTER, GtkRecentFilter))
-#define GTK_IS_RECENT_FILTER(obj)	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RECENT_FILTER))
-
-typedef struct _GtkRecentFilter		GtkRecentFilter;
-typedef struct _GtkRecentFilterInfo	GtkRecentFilterInfo;
-
-typedef enum {
-  GTK_RECENT_FILTER_URI          = 1 << 0,
-  GTK_RECENT_FILTER_DISPLAY_NAME = 1 << 1,
-  GTK_RECENT_FILTER_MIME_TYPE    = 1 << 2,
-  GTK_RECENT_FILTER_APPLICATION  = 1 << 3,
-  GTK_RECENT_FILTER_GROUP        = 1 << 4,
-  GTK_RECENT_FILTER_AGE          = 1 << 5
-} GtkRecentFilterFlags;
-
-typedef gboolean (*GtkRecentFilterFunc) (const GtkRecentFilterInfo *filter_info,
-					 gpointer                   user_data);
-
-struct _GtkRecentFilterInfo
-{
-  GtkRecentFilterFlags contains;
-
-  const gchar *uri;
-  const gchar *display_name;
-  const gchar *mime_type;
-  const gchar **applications;
-  const gchar **groups;
-  
-  gint age;
-};
-
-GType                 gtk_recent_filter_get_type (void) G_GNUC_CONST;
-
-GtkRecentFilter *     gtk_recent_filter_new      (void);
-void                  gtk_recent_filter_set_name (GtkRecentFilter *filter,
-						  const gchar     *name);
-G_CONST_RETURN gchar *gtk_recent_filter_get_name (GtkRecentFilter *filter);
-
-void gtk_recent_filter_add_mime_type      (GtkRecentFilter      *filter,
-					   const gchar          *mime_type);
-void gtk_recent_filter_add_pattern        (GtkRecentFilter      *filter,
-					   const gchar          *pattern);
-void gtk_recent_filter_add_pixbuf_formats (GtkRecentFilter      *filter);
-void gtk_recent_filter_add_application    (GtkRecentFilter      *filter,
-					   const gchar          *application);
-void gtk_recent_filter_add_group          (GtkRecentFilter      *filter,
-					   const gchar          *group);
-void gtk_recent_filter_add_age            (GtkRecentFilter      *filter,
-					   gint                  days);
-void gtk_recent_filter_add_custom         (GtkRecentFilter      *filter,
-					   GtkRecentFilterFlags  needed,
-					   GtkRecentFilterFunc   func,
-					   gpointer              data,
-					   GDestroyNotify        data_destroy);
-
-GtkRecentFilterFlags gtk_recent_filter_get_needed (GtkRecentFilter           *filter);
-gboolean             gtk_recent_filter_filter     (GtkRecentFilter           *filter,
-						   const GtkRecentFilterInfo *filter_info);
-
-G_END_DECLS
-
-#endif /* ! __GTK_RECENT_FILTER_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentmanager.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentmanager.h
deleted file mode 100644
index b184b3fa..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentmanager.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkrecentmanager.h: a manager for the recently used resources
- *
- * Copyright (C) 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 __GTK_RECENT_MANAGER_H__
-#define __GTK_RECENT_MANAGER_H__
-
-#include <glib-object.h>
-#include <gdk/gdkscreen.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <time.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_RECENT_INFO			(gtk_recent_info_get_type ())
-
-#define GTK_TYPE_RECENT_MANAGER			(gtk_recent_manager_get_type ())
-#define GTK_RECENT_MANAGER(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RECENT_MANAGER, GtkRecentManager))
-#define GTK_IS_RECENT_MANAGER(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RECENT_MANAGER))
-#define GTK_RECENT_MANAGER_CLASS(klass) 	(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RECENT_MANAGER, GtkRecentManagerClass))
-#define GTK_IS_RECENT_MANAGER_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RECENT_MANAGER))
-#define GTK_RECENT_MANAGER_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_RECENT_MANAGER, GtkRecentManagerClass))
-
-typedef struct _GtkRecentInfo		GtkRecentInfo;
-typedef struct _GtkRecentData		GtkRecentData;
-typedef struct _GtkRecentManager	GtkRecentManager;
-typedef struct _GtkRecentManagerClass	GtkRecentManagerClass;
-typedef struct _GtkRecentManagerPrivate GtkRecentManagerPrivate;
-
-/**
- * GtkRecentData:
- * @display_name: a UTF-8 encoded string, containing the name of the recently
- *   used resource to be displayed, or %NULL;
- * @description: a UTF-8 encoded string, containing a short description of
- *   the resource, or %NULL;
- * @mime_type: the MIME type of the resource;
- * @app_name: the name of the application that is registering this recently
- *   used resource;
- * @app_exec: command line used to launch this resource; may contain the
- *   "&percnt;f" and "&percnt;u" escape characters which will be expanded 
- *   to the resource file path and URI respectively when the command line 
- *   is retrieved;
- * @groups: a vector of strings containing groups names;
- * @is_private: whether this resource should be displayed only by the
- *   applications that have registered it or not.
- *
- * Meta-data to be passed to gtk_recent_manager_add_full() when
- * registering a recently used resource.
- **/
-struct _GtkRecentData
-{
-  gchar *display_name;
-  gchar *description;
-  
-  gchar *mime_type;
-  
-  gchar *app_name;
-  gchar *app_exec;
-  
-  gchar **groups;
-  
-  gboolean is_private;
-};
-
-struct _GtkRecentManager
-{
-  /*< private >*/
-  GObject parent_instance;
-  
-  GtkRecentManagerPrivate *priv;
-};
-
-struct _GtkRecentManagerClass
-{
-  /*< private >*/
-  GObjectClass parent_class;
-  
-  void (*changed) (GtkRecentManager *manager);
-  
-  /* padding for future expansion */
-  void (*_gtk_recent1) (void);
-  void (*_gtk_recent2) (void);
-  void (*_gtk_recent3) (void);
-  void (*_gtk_recent4) (void);
-};
-
-/**
- * GtkRecentManagerError:
- * @GTK_RECENT_MANAGER_ERROR_NOT_FOUND: the URI specified does not exists in
- *   the recently used resources list.
- * @GTK_RECENT_MANAGER_ERROR_INVALID_URI: the URI specified is not valid.
- * @GTK_RECENT_MANAGER_ERROR_INVALID_ENCODING: the supplied string is not
- *   UTF-8 encoded.
- * @GTK_RECENT_MANAGER_ERROR_NOT_REGISTERED: no application has registered
- *   the specified item.
- * @GTK_RECENT_MANAGER_ERROR_READ: failure while reading the recently used
- *   resources file.
- * @GTK_RECENT_MANAGER_ERROR_WRITE: failure while writing the recently used
- *   resources file.
- * @GTK_RECENT_MANAGER_ERROR_UNKNOWN: unspecified error.
- *
- * Error codes for GtkRecentManager operations
- **/
-typedef enum
-{
-  GTK_RECENT_MANAGER_ERROR_NOT_FOUND,
-  GTK_RECENT_MANAGER_ERROR_INVALID_URI,
-  GTK_RECENT_MANAGER_ERROR_INVALID_ENCODING,
-  GTK_RECENT_MANAGER_ERROR_NOT_REGISTERED,
-  GTK_RECENT_MANAGER_ERROR_READ,
-  GTK_RECENT_MANAGER_ERROR_WRITE,
-  GTK_RECENT_MANAGER_ERROR_UNKNOWN
-} GtkRecentManagerError;
-
-#define GTK_RECENT_MANAGER_ERROR	(gtk_recent_manager_error_quark ())
-GQuark 	gtk_recent_manager_error_quark (void);
-
-
-GType 		  gtk_recent_manager_get_type       (void) G_GNUC_CONST;
-
-GtkRecentManager *gtk_recent_manager_new            (void);
-GtkRecentManager *gtk_recent_manager_get_default    (void);
-
-#ifndef GTK_DISABLE_DEPRECATED
-GtkRecentManager *gtk_recent_manager_get_for_screen (GdkScreen            *screen);
-void              gtk_recent_manager_set_screen     (GtkRecentManager     *manager,
-						     GdkScreen            *screen);
-#endif
-
-gboolean          gtk_recent_manager_add_item       (GtkRecentManager     *manager,
-						     const gchar          *uri);
-gboolean          gtk_recent_manager_add_full       (GtkRecentManager     *manager,
-						     const gchar          *uri,
-						     const GtkRecentData  *recent_data);
-gboolean          gtk_recent_manager_remove_item    (GtkRecentManager     *manager,
-						     const gchar          *uri,
-						     GError              **error);
-GtkRecentInfo *   gtk_recent_manager_lookup_item    (GtkRecentManager     *manager,
-						     const gchar          *uri,
-						     GError              **error);
-gboolean          gtk_recent_manager_has_item       (GtkRecentManager     *manager,
-						     const gchar          *uri);
-gboolean          gtk_recent_manager_move_item      (GtkRecentManager     *manager,
-						     const gchar          *uri,
-						     const gchar          *new_uri,
-						     GError              **error);
-void              gtk_recent_manager_set_limit      (GtkRecentManager     *manager,
-						     gint                  limit);
-gint              gtk_recent_manager_get_limit      (GtkRecentManager     *manager);
-GList *           gtk_recent_manager_get_items      (GtkRecentManager     *manager);
-gint              gtk_recent_manager_purge_items    (GtkRecentManager     *manager,
-						     GError              **error);
-
-
-GType	              gtk_recent_info_get_type             (void) G_GNUC_CONST;
-
-GtkRecentInfo *       gtk_recent_info_ref                  (GtkRecentInfo  *info);
-void                  gtk_recent_info_unref                (GtkRecentInfo  *info);
-
-G_CONST_RETURN gchar *gtk_recent_info_get_uri              (GtkRecentInfo  *info);
-G_CONST_RETURN gchar *gtk_recent_info_get_display_name     (GtkRecentInfo  *info);
-G_CONST_RETURN gchar *gtk_recent_info_get_description      (GtkRecentInfo  *info);
-G_CONST_RETURN gchar *gtk_recent_info_get_mime_type        (GtkRecentInfo  *info);
-time_t                gtk_recent_info_get_added            (GtkRecentInfo  *info);
-time_t                gtk_recent_info_get_modified         (GtkRecentInfo  *info);
-time_t                gtk_recent_info_get_visited          (GtkRecentInfo  *info);
-gboolean              gtk_recent_info_get_private_hint     (GtkRecentInfo  *info);
-gboolean              gtk_recent_info_get_application_info (GtkRecentInfo  *info,
-							    const gchar    *app_name,
-							    gchar         **app_exec,
-							    guint          *count,
-							    time_t         *time_);
-gchar **              gtk_recent_info_get_applications     (GtkRecentInfo  *info,
-							    gsize          *length) G_GNUC_MALLOC;
-gchar *               gtk_recent_info_last_application     (GtkRecentInfo  *info) G_GNUC_MALLOC;
-gboolean              gtk_recent_info_has_application      (GtkRecentInfo  *info,
-							    const gchar    *app_name);
-gchar **              gtk_recent_info_get_groups           (GtkRecentInfo  *info,
-							    gsize          *length) G_GNUC_MALLOC;
-gboolean              gtk_recent_info_has_group            (GtkRecentInfo  *info,
-							    const gchar    *group_name);
-GdkPixbuf *           gtk_recent_info_get_icon             (GtkRecentInfo  *info,
-							    gint            size);
-gchar *               gtk_recent_info_get_short_name       (GtkRecentInfo  *info) G_GNUC_MALLOC;
-gchar *               gtk_recent_info_get_uri_display      (GtkRecentInfo  *info) G_GNUC_MALLOC;
-gint                  gtk_recent_info_get_age              (GtkRecentInfo  *info);
-gboolean              gtk_recent_info_is_local             (GtkRecentInfo  *info);
-gboolean              gtk_recent_info_exists               (GtkRecentInfo  *info);
-gboolean              gtk_recent_info_match                (GtkRecentInfo  *info_a,
-							    GtkRecentInfo  *info_b);
-
-/* private */
-void _gtk_recent_manager_sync (void);
-
-G_END_DECLS
-
-#endif /* __GTK_RECENT_MANAGER_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkruler.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkruler.h
deleted file mode 100644
index 7b8fe529..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkruler.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-/*
- * NOTE this widget is considered too specialized/little-used for
- * GTK+, and will in the future be moved to some other package.  If
- * your application needs this widget, feel free to use it, as the
- * widget does work and is useful in some applications; it's just not
- * of general interest. However, we are not accepting new features for
- * the widget, and it will eventually move out of the GTK+
- * distribution.
- */
-
-#ifndef __GTK_RULER_H__
-#define __GTK_RULER_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkwidget.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_RULER            (gtk_ruler_get_type ())
-#define GTK_RULER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RULER, GtkRuler))
-#define GTK_RULER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RULER, GtkRulerClass))
-#define GTK_IS_RULER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RULER))
-#define GTK_IS_RULER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RULER))
-#define GTK_RULER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_RULER, GtkRulerClass))
-
-
-typedef struct _GtkRuler        GtkRuler;
-typedef struct _GtkRulerClass   GtkRulerClass;
-typedef struct _GtkRulerMetric  GtkRulerMetric;
-
-/* All distances below are in 1/72nd's of an inch. (According to
- * Adobe that's a point, but points are really 1/72.27 in.)
- */
-struct _GtkRuler
-{
-  GtkWidget widget;
-
-  GdkPixmap *backing_store;
-  GdkGC *non_gr_exp_gc;		/* unused */
-  GtkRulerMetric *metric;
-  gint xsrc, ysrc;
-  gint slider_size;
-
-  /* The upper limit of the ruler (in points) */
-  gdouble lower;
-  /* The lower limit of the ruler */
-  gdouble upper;
-  /* The position of the mark on the ruler */
-  gdouble position;
-  /* The maximum size of the ruler */
-  gdouble max_size;
-};
-
-struct _GtkRulerClass
-{
-  GtkWidgetClass parent_class;
-
-  void (* draw_ticks) (GtkRuler *ruler);
-  void (* draw_pos)   (GtkRuler *ruler);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-struct _GtkRulerMetric
-{
-  gchar *metric_name;
-  gchar *abbrev;
-  /* This should be points_per_unit. This is the size of the unit
-   * in 1/72nd's of an inch and has nothing to do with screen pixels */
-  gdouble pixels_per_unit;
-  gdouble ruler_scale[10];
-  gint subdivide[5];        /* five possible modes of subdivision */
-};
-
-
-GType   gtk_ruler_get_type   (void) G_GNUC_CONST;
-void    gtk_ruler_set_metric (GtkRuler      *ruler,
-			      GtkMetricType  metric);
-void    gtk_ruler_set_range  (GtkRuler      *ruler,
-			      gdouble        lower,
-			      gdouble        upper,
-			      gdouble        position,
-			      gdouble        max_size);
-void    gtk_ruler_draw_ticks (GtkRuler      *ruler);
-void    gtk_ruler_draw_pos   (GtkRuler      *ruler);
-
-GtkMetricType gtk_ruler_get_metric (GtkRuler *ruler);
-void          gtk_ruler_get_range  (GtkRuler *ruler,
-				    gdouble  *lower,
-				    gdouble  *upper,
-				    gdouble  *position,
-				    gdouble  *max_size);
-
-G_END_DECLS
-
-#endif /* __GTK_RULER_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkscale.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkscale.h
deleted file mode 100644
index b249c290..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkscale.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_SCALE_H__
-#define __GTK_SCALE_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkrange.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_SCALE            (gtk_scale_get_type ())
-#define GTK_SCALE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SCALE, GtkScale))
-#define GTK_SCALE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SCALE, GtkScaleClass))
-#define GTK_IS_SCALE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SCALE))
-#define GTK_IS_SCALE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SCALE))
-#define GTK_SCALE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SCALE, GtkScaleClass))
-
-
-typedef struct _GtkScale        GtkScale;
-typedef struct _GtkScaleClass   GtkScaleClass;
-
-struct _GtkScale
-{
-  GtkRange range;
-
-  gint digits;
-  guint draw_value : 1;
-  guint value_pos : 2;
-};
-
-struct _GtkScaleClass
-{
-  GtkRangeClass parent_class;
-
-  gchar* (* format_value) (GtkScale *scale,
-                           gdouble   value);  
-  
-  void (* draw_value) (GtkScale *scale);
-
-  void (* get_layout_offsets) (GtkScale *scale,
-                               gint     *x,
-                               gint     *y);
-  /* Padding for future expansion */
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType           gtk_scale_get_type       (void) G_GNUC_CONST;
-
-void            gtk_scale_set_digits     (GtkScale        *scale,
-                                          gint             digits);
-gint            gtk_scale_get_digits     (GtkScale        *scale);
-void            gtk_scale_set_draw_value (GtkScale        *scale,
-                                          gboolean         draw_value);
-gboolean        gtk_scale_get_draw_value (GtkScale        *scale);
-void            gtk_scale_set_value_pos  (GtkScale        *scale,
-                                          GtkPositionType  pos);
-GtkPositionType gtk_scale_get_value_pos  (GtkScale        *scale);
-
-PangoLayout     *gtk_scale_get_layout        (GtkScale        *scale);
-void            gtk_scale_get_layout_offsets (GtkScale        *scale,
-					      gint            *x,
-					      gint            *y);
-void    _gtk_scale_clear_layout    (GtkScale        *scale);
-
-void    _gtk_scale_get_value_size  (GtkScale        *scale,
-                                    gint            *width,
-                                    gint            *height);
-gchar  *_gtk_scale_format_value    (GtkScale        *scale,
-                                    gdouble          value);
-
-
-G_END_DECLS
-
-#endif /* __GTK_SCALE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkscalebutton.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkscalebutton.h
deleted file mode 100644
index 0644ace2..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkscalebutton.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2005 Ronald S. Bultje
- * Copyright (C) 2006, 2007 Christian Persch
- * Copyright (C) 2006 Jan Arne Petersen
- * Copyright (C) 2007 Red Hat, Inc.
- *
- * Authors:
- * - Ronald S. Bultje <rbultje@ronald.bitfreak.net>
- * - Bastien Nocera <bnocera@redhat.com>
- * - Jan Arne Petersen <jpetersen@jpetersen.org>
- * - Christian Persch <chpe@svn.gnome.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 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 GTK+ Team and others 2007.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_SCALE_BUTTON_H__
-#define __GTK_SCALE_BUTTON_H__
-
-#include <gtk/gtkbutton.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_SCALE_BUTTON                 (gtk_scale_button_get_type ())
-#define GTK_SCALE_BUTTON(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SCALE_BUTTON, GtkScaleButton))
-#define GTK_SCALE_BUTTON_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SCALE_BUTTON, GtkScaleButtonClass))
-#define GTK_IS_SCALE_BUTTON(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SCALE_BUTTON))
-#define GTK_IS_SCALE_BUTTON_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SCALE_BUTTON))
-#define GTK_SCALE_BUTTON_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SCALE_BUTTON, GtkScaleButtonClass))
-
-typedef struct _GtkScaleButton        GtkScaleButton;
-typedef struct _GtkScaleButtonClass   GtkScaleButtonClass;
-typedef struct _GtkScaleButtonPrivate GtkScaleButtonPrivate;
-
-struct _GtkScaleButtonClass
-{
-  GtkButtonClass parent_class;
-
-  /* signals */
-  void	(* value_changed) (GtkScaleButton *button, gdouble value);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-struct _GtkScaleButton
-{
-  GtkButton parent;
-  
-  GtkWidget *plus_button;
-  GtkWidget *minus_button;
-  
-  /*< private >*/
-  GtkScaleButtonPrivate *priv;
-};
-
-GType		gtk_scale_button_get_type	(void) G_GNUC_CONST;
-GtkWidget*	gtk_scale_button_new		(GtkIconSize     size,
-						 gdouble         min,
-						 gdouble         max,
-						 gdouble         step,
-						 const gchar   **icons);
-void		gtk_scale_button_set_icons	(GtkScaleButton *button,
-						 const gchar   **icons);
-gdouble		gtk_scale_button_get_value	(GtkScaleButton *button);
-void		gtk_scale_button_set_value	(GtkScaleButton *button,
-						 gdouble         value);
-GtkAdjustment*	gtk_scale_button_get_adjustment	(GtkScaleButton *button);
-void		gtk_scale_button_set_adjustment	(GtkScaleButton *button,
-						 GtkAdjustment  *adjustment);
-
-G_END_DECLS
-
-#endif /* __GTK_SCALE_BUTTON_H__ */
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkscrollbar.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkscrollbar.h
deleted file mode 100644
index 2fb94e86..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkscrollbar.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_SCROLLBAR_H__
-#define __GTK_SCROLLBAR_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkrange.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_SCROLLBAR            (gtk_scrollbar_get_type ())
-#define GTK_SCROLLBAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SCROLLBAR, GtkScrollbar))
-#define GTK_SCROLLBAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SCROLLBAR, GtkScrollbarClass))
-#define GTK_IS_SCROLLBAR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SCROLLBAR))
-#define GTK_IS_SCROLLBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SCROLLBAR))
-#define GTK_SCROLLBAR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SCROLLBAR, GtkScrollbarClass))
-
-
-typedef struct _GtkScrollbar        GtkScrollbar;
-typedef struct _GtkScrollbarClass   GtkScrollbarClass;
-
-struct _GtkScrollbar
-{
-  GtkRange range;
-};
-
-struct _GtkScrollbarClass
-{
-  GtkRangeClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType gtk_scrollbar_get_type (void) G_GNUC_CONST;
-
-
-G_END_DECLS
-
-#endif /* __GTK_SCROLLBAR_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkscrolledwindow.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkscrolledwindow.h
deleted file mode 100644
index c9668f37..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkscrolledwindow.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_SCROLLED_WINDOW_H__
-#define __GTK_SCROLLED_WINDOW_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkhscrollbar.h>
-#include <gtk/gtkvscrollbar.h>
-#include <gtk/gtkviewport.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_SCROLLED_WINDOW            (gtk_scrolled_window_get_type ())
-#define GTK_SCROLLED_WINDOW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SCROLLED_WINDOW, GtkScrolledWindow))
-#define GTK_SCROLLED_WINDOW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SCROLLED_WINDOW, GtkScrolledWindowClass))
-#define GTK_IS_SCROLLED_WINDOW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SCROLLED_WINDOW))
-#define GTK_IS_SCROLLED_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SCROLLED_WINDOW))
-#define GTK_SCROLLED_WINDOW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SCROLLED_WINDOW, GtkScrolledWindowClass))
-
-
-
-typedef struct _GtkScrolledWindow       GtkScrolledWindow;
-typedef struct _GtkScrolledWindowClass  GtkScrolledWindowClass;
-
-struct _GtkScrolledWindow
-{
-  GtkBin container;
-
-  /*< public >*/
-  GtkWidget *hscrollbar;
-  GtkWidget *vscrollbar;
-
-  /*< private >*/
-  guint hscrollbar_policy      : 2;
-  guint vscrollbar_policy      : 2;
-  guint hscrollbar_visible     : 1;
-  guint vscrollbar_visible     : 1;
-  guint window_placement       : 2;
-  guint focus_out              : 1;	/* Flag used by ::move-focus-out implementation */
-
-  guint16 shadow_type;
-};
-
-struct _GtkScrolledWindowClass
-{
-  GtkBinClass parent_class;
-  
-  gint scrollbar_spacing;
-
-  /* Action signals for keybindings. Do not connect to these signals
-   */
-
-  /* Unfortunately, GtkScrollType is deficient in that there is
-   * no horizontal/vertical variants for GTK_SCROLL_START/END,
-   * so we have to add an additional boolean flag.
-   */
-  gboolean (*scroll_child) (GtkScrolledWindow *scrolled_window,
-	  		    GtkScrollType      scroll,
-			    gboolean           horizontal);
-
-  void (* move_focus_out) (GtkScrolledWindow *scrolled_window,
-			   GtkDirectionType   direction);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType          gtk_scrolled_window_get_type          (void) G_GNUC_CONST;
-GtkWidget*     gtk_scrolled_window_new               (GtkAdjustment     *hadjustment,
-						      GtkAdjustment     *vadjustment);
-void           gtk_scrolled_window_set_hadjustment   (GtkScrolledWindow *scrolled_window,
-						      GtkAdjustment     *hadjustment);
-void           gtk_scrolled_window_set_vadjustment   (GtkScrolledWindow *scrolled_window,
-						      GtkAdjustment     *vadjustment);
-GtkAdjustment* gtk_scrolled_window_get_hadjustment   (GtkScrolledWindow *scrolled_window);
-GtkAdjustment* gtk_scrolled_window_get_vadjustment   (GtkScrolledWindow *scrolled_window);
-GtkWidget*     gtk_scrolled_window_get_hscrollbar    (GtkScrolledWindow *scrolled_window);
-GtkWidget*     gtk_scrolled_window_get_vscrollbar    (GtkScrolledWindow *scrolled_window);
-void           gtk_scrolled_window_set_policy        (GtkScrolledWindow *scrolled_window,
-						      GtkPolicyType      hscrollbar_policy,
-						      GtkPolicyType      vscrollbar_policy);
-void           gtk_scrolled_window_get_policy        (GtkScrolledWindow *scrolled_window,
-						      GtkPolicyType     *hscrollbar_policy,
-						      GtkPolicyType     *vscrollbar_policy);
-void           gtk_scrolled_window_set_placement     (GtkScrolledWindow *scrolled_window,
-						      GtkCornerType      window_placement);
-void           gtk_scrolled_window_unset_placement   (GtkScrolledWindow *scrolled_window);
-
-GtkCornerType  gtk_scrolled_window_get_placement     (GtkScrolledWindow *scrolled_window);
-void           gtk_scrolled_window_set_shadow_type   (GtkScrolledWindow *scrolled_window,
-						      GtkShadowType      type);
-GtkShadowType  gtk_scrolled_window_get_shadow_type   (GtkScrolledWindow *scrolled_window);
-void	       gtk_scrolled_window_add_with_viewport (GtkScrolledWindow *scrolled_window,
-						      GtkWidget		*child);
-
-gint _gtk_scrolled_window_get_scrollbar_spacing (GtkScrolledWindow *scrolled_window);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_SCROLLED_WINDOW_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtksearchengine.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtksearchengine.h
deleted file mode 100644
index c8611083..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtksearchengine.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2005 Novell, 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,
- *
- * Author: Anders Carlsson <andersca@imendio.com> 
- *
- * Based on nautilus-search-engine.h
- */
-
-#ifndef __GTK_SEARCH_ENGINE_H__
-#define __GTK_SEARCH_ENGINE_H__
-
-/* This is a "semi-private" header; it is meant only for
- * alternate GtkFileChooser implementations; no stability guarantees 
- * are made at this point
- */
-#ifndef GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
-#error "gtkfilechooserprivate.h is not supported API for general use"
-#endif
-
-#include <glib-object.h>
-#include "gtkquery.h"
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_SEARCH_ENGINE		(_gtk_search_engine_get_type ())
-#define GTK_SEARCH_ENGINE(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SEARCH_ENGINE, GtkSearchEngine))
-#define GTK_SEARCH_ENGINE_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SEARCH_ENGINE, GtkSearchEngineClass))
-#define GTK_IS_SEARCH_ENGINE(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SEARCH_ENGINE))
-#define GTK_IS_SEARCH_ENGINE_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SEARCH_ENGINE))
-#define GTK_SEARCH_ENGINE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SEARCH_ENGINE, GtkSearchEngineClass))
-
-typedef struct _GtkSearchEngine GtkSearchEngine;
-typedef struct _GtkSearchEngineClass GtkSearchEngineClass;
-typedef struct _GtkSearchEnginePrivate GtkSearchEnginePrivate;
-
-struct _GtkSearchEngine 
-{
-  GObject parent;
-
-  GtkSearchEnginePrivate *priv;
-};
-
-struct _GtkSearchEngineClass 
-{
-  GObjectClass parent_class;
-  
-  /* VTable */
-  void     (*set_query)       (GtkSearchEngine *engine, 
-			       GtkQuery        *query);
-  void     (*start)           (GtkSearchEngine *engine);
-  void     (*stop)            (GtkSearchEngine *engine);
-  gboolean (*is_indexed)      (GtkSearchEngine *engine);
-  
-  /* Signals */
-  void     (*hits_added)      (GtkSearchEngine *engine, 
-			       GList           *hits);
-  void     (*hits_subtracted) (GtkSearchEngine *engine, 
-			       GList           *hits);
-  void     (*finished)        (GtkSearchEngine *engine);
-  void     (*error)           (GtkSearchEngine *engine, 
-			       const gchar     *error_message);
-};
-
-GType            _gtk_search_engine_get_type        (void);
-gboolean         _gtk_search_engine_enabled         (void);
-
-GtkSearchEngine* _gtk_search_engine_new             (void);
-
-void             _gtk_search_engine_set_query       (GtkSearchEngine *engine, 
-                                                     GtkQuery        *query);
-void	         _gtk_search_engine_start           (GtkSearchEngine *engine);
-void	         _gtk_search_engine_stop            (GtkSearchEngine *engine);
-gboolean         _gtk_search_engine_is_indexed      (GtkSearchEngine *engine);
-
-void	         _gtk_search_engine_hits_added      (GtkSearchEngine *engine, 
-						     GList           *hits);
-void	         _gtk_search_engine_hits_subtracted (GtkSearchEngine *engine, 
-						     GList           *hits);
-void	         _gtk_search_engine_finished        (GtkSearchEngine *engine);
-void	         _gtk_search_engine_error           (GtkSearchEngine *engine, 
-						     const gchar     *error_message);
-
-G_END_DECLS
-
-#endif /* __GTK_SEARCH_ENGINE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkselection.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkselection.h
deleted file mode 100644
index 9e97ae2a..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkselection.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_SELECTION_H__
-#define __GTK_SELECTION_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkenums.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtktextiter.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GtkTargetList    GtkTargetList;
-typedef struct _GtkTargetEntry   GtkTargetEntry;
-
-#define GTK_TYPE_SELECTION_DATA (gtk_selection_data_get_type ())
-#define GTK_TYPE_TARGET_LIST    (gtk_target_list_get_type ())
-
-/* The contents of a selection are returned in a GtkSelectionData
- * structure. selection/target identify the request.  type specifies
- * the type of the return; if length < 0, and the data should be
- * ignored. This structure has object semantics - no fields should be
- * modified directly, they should not be created directly, and
- * pointers to them should not be stored beyond the duration of a
- * callback. (If the last is changed, we'll need to add reference
- * counting.) The time field gives the timestamp at which the data was
- * sent.
- */
-
-struct _GtkSelectionData
-{
-  GdkAtom	selection;
-  GdkAtom	target;
-  GdkAtom	type;
-  gint		format;
-  guchar       *data;  
-  gint		length;
-  GdkDisplay   *display;
-};
-
-struct _GtkTargetEntry {
-  gchar *target;
-  guint  flags;
-  guint  info;
-};
-
-/* These structures not public, and are here only for the convenience of
- * gtkdnd.c 
- */
-
-typedef struct _GtkTargetPair GtkTargetPair;
-
-/* This structure is a list of destinations, and associated guint id's */
-struct _GtkTargetList {
-  GList *list;
-  guint ref_count;
-};
-
-struct _GtkTargetPair {
-  GdkAtom   target;
-  guint     flags;
-  guint     info;
-};
-
-GtkTargetList *gtk_target_list_new       (const GtkTargetEntry *targets,
-					  guint                 ntargets);
-GtkTargetList *gtk_target_list_ref       (GtkTargetList  *list);
-void           gtk_target_list_unref     (GtkTargetList  *list);
-void           gtk_target_list_add       (GtkTargetList  *list,
-				  	  GdkAtom         target,
-					  guint           flags,
-					  guint           info);
-void           gtk_target_list_add_text_targets      (GtkTargetList  *list,
-                                                      guint           info);
-void           gtk_target_list_add_rich_text_targets (GtkTargetList  *list,
-                                                      guint           info,
-                                                      gboolean        deserializable,
-                                                      GtkTextBuffer  *buffer);
-void           gtk_target_list_add_image_targets     (GtkTargetList  *list,
-                                                      guint           info,
-                                                      gboolean        writable);
-void           gtk_target_list_add_uri_targets       (GtkTargetList  *list,
-                                                      guint           info);
-void           gtk_target_list_add_table (GtkTargetList        *list,
-					  const GtkTargetEntry *targets,
-					  guint                 ntargets);
-void           gtk_target_list_remove    (GtkTargetList  *list,
-					  GdkAtom         target);
-gboolean       gtk_target_list_find      (GtkTargetList  *list,
-					  GdkAtom         target,
-					  guint          *info);
-
-GtkTargetEntry * gtk_target_table_new_from_list (GtkTargetList  *list,
-                                                 gint           *n_targets);
-void             gtk_target_table_free          (GtkTargetEntry *targets,
-                                                 gint            n_targets);
-
-/* Public interface */
-
-gboolean gtk_selection_owner_set             (GtkWidget  *widget,
-					      GdkAtom     selection,
-					      guint32     time_);
-gboolean gtk_selection_owner_set_for_display (GdkDisplay *display,
-					      GtkWidget  *widget,
-					      GdkAtom     selection,
-					      guint32     time_);
-
-void     gtk_selection_add_target    (GtkWidget            *widget,
-				      GdkAtom               selection,
-				      GdkAtom               target,
-				      guint                 info);
-void     gtk_selection_add_targets   (GtkWidget            *widget,
-				      GdkAtom               selection,
-				      const GtkTargetEntry *targets,
-				      guint                 ntargets);
-void     gtk_selection_clear_targets (GtkWidget            *widget,
-				      GdkAtom               selection);
-gboolean gtk_selection_convert       (GtkWidget            *widget,
-				      GdkAtom               selection,
-				      GdkAtom               target,
-				      guint32               time_);
-void     gtk_selection_data_set      (GtkSelectionData     *selection_data,
-				      GdkAtom               type,
-				      gint                  format,
-				      const guchar         *data,
-				      gint                  length);
-gboolean gtk_selection_data_set_text (GtkSelectionData     *selection_data,
-				      const gchar          *str,
-				      gint                  len);
-guchar * gtk_selection_data_get_text (GtkSelectionData     *selection_data);
-gboolean gtk_selection_data_set_pixbuf   (GtkSelectionData  *selection_data,
-				          GdkPixbuf         *pixbuf);
-GdkPixbuf *gtk_selection_data_get_pixbuf (GtkSelectionData  *selection_data);
-gboolean gtk_selection_data_set_uris (GtkSelectionData     *selection_data,
-				      gchar               **uris);
-gchar  **gtk_selection_data_get_uris (GtkSelectionData     *selection_data);
-
-gboolean gtk_selection_data_get_targets          (GtkSelectionData  *selection_data,
-						  GdkAtom          **targets,
-						  gint              *n_atoms);
-gboolean gtk_selection_data_targets_include_text (GtkSelectionData  *selection_data);
-gboolean gtk_selection_data_targets_include_rich_text (GtkSelectionData *selection_data,
-                                                       GtkTextBuffer    *buffer);
-gboolean gtk_selection_data_targets_include_image (GtkSelectionData  *selection_data,
-						   gboolean           writable);
-gboolean gtk_selection_data_targets_include_uri  (GtkSelectionData  *selection_data);
-gboolean gtk_targets_include_text                (GdkAtom       *targets,
-						  gint           n_targets);
-gboolean gtk_targets_include_rich_text           (GdkAtom       *targets,
-						  gint           n_targets,
-                                                  GtkTextBuffer *buffer);
-gboolean gtk_targets_include_image               (GdkAtom       *targets,
-						  gint           n_targets,
-						  gboolean       writable);
-gboolean gtk_targets_include_uri                 (GdkAtom       *targets,
-						  gint           n_targets);
-
-/* Called when a widget is destroyed */
-
-void gtk_selection_remove_all      (GtkWidget *widget);
-
-/* Event handlers */
-#if !defined(GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
-gboolean gtk_selection_clear		  (GtkWidget 	     *widget,
-					   GdkEventSelection *event);
-#endif
-gboolean _gtk_selection_request		  (GtkWidget  	     *widget,
-					   GdkEventSelection *event);
-gboolean _gtk_selection_incr_event	  (GdkWindow         *window,
-					   GdkEventProperty  *event);
-gboolean _gtk_selection_notify		  (GtkWidget         *widget,
-					   GdkEventSelection *event);
-gboolean _gtk_selection_property_notify	  (GtkWidget         *widget,
-					   GdkEventProperty  *event);
-
-GType             gtk_selection_data_get_type (void) G_GNUC_CONST;
-GtkSelectionData *gtk_selection_data_copy     (GtkSelectionData *data);
-void		  gtk_selection_data_free     (GtkSelectionData *data);
-
-GType             gtk_target_list_get_type    (void) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __GTK_SELECTION_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkseparator.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkseparator.h
deleted file mode 100644
index 5ea35644..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkseparator.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_SEPARATOR_H__
-#define __GTK_SEPARATOR_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkwidget.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_SEPARATOR                  (gtk_separator_get_type ())
-#define GTK_SEPARATOR(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SEPARATOR, GtkSeparator))
-#define GTK_SEPARATOR_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SEPARATOR, GtkSeparatorClass))
-#define GTK_IS_SEPARATOR(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SEPARATOR))
-#define GTK_IS_SEPARATOR_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SEPARATOR))
-#define GTK_SEPARATOR_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SEPARATOR, GtkSeparatorClass))
-
-
-
-typedef struct _GtkSeparator       GtkSeparator;
-typedef struct _GtkSeparatorClass  GtkSeparatorClass;
-
-struct _GtkSeparator
-{
-  GtkWidget widget;
-};
-
-struct _GtkSeparatorClass
-{
-  GtkWidgetClass parent_class;
-};
-
-
-GType  gtk_separator_get_type (void) G_GNUC_CONST;
-
-
-G_END_DECLS
-
-#endif /* __GTK_SEPARATOR_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkseparatormenuitem.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkseparatormenuitem.h
deleted file mode 100644
index fe4f96bf..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkseparatormenuitem.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_SEPARATOR_MENU_ITEM_H__
-#define __GTK_SEPARATOR_MENU_ITEM_H__
-
-#include <gdk/gdk.h>
-#include <gtk/gtkmenuitem.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_SEPARATOR_MENU_ITEM            (gtk_separator_menu_item_get_type ())
-#define GTK_SEPARATOR_MENU_ITEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SEPARATOR_MENU_ITEM, GtkSeparatorMenuItem))
-#define GTK_SEPARATOR_MENU_ITEM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SEPARATOR_MENU_ITEM, GtkSeparatorMenuItemClass))
-#define GTK_IS_SEPARATOR_MENU_ITEM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SEPARATOR_MENU_ITEM))
-#define GTK_IS_SEPARATOR_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SEPARATOR_MENU_ITEM))
-#define GTK_SEPARATOR_MENU_ITEM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SEPARATOR_MENU_ITEM, GtkSeparatorMenuItemClass))
-
-
-typedef struct _GtkSeparatorMenuItem       GtkSeparatorMenuItem;
-typedef struct _GtkSeparatorMenuItemClass  GtkSeparatorMenuItemClass;
-
-struct _GtkSeparatorMenuItem
-{
-  GtkMenuItem menu_item;
-};
-
-struct _GtkSeparatorMenuItemClass
-{
-  GtkMenuItemClass parent_class;
-};
-
-
-GType	   gtk_separator_menu_item_get_type	   (void) G_GNUC_CONST;
-GtkWidget* gtk_separator_menu_item_new	           (void);
-
-
-G_END_DECLS
-
-#endif /* __GTK_SEPARATOR_MENU_ITEM_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkseparatortoolitem.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkseparatortoolitem.h
deleted file mode 100644
index 55e404be..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkseparatortoolitem.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* gtktoggletoolbutton.h
- *
- * Copyright (C) 2002 Anders Carlsson <andersca@gnome.org>
- * Copyright (C) 2002 James Henstridge <james@daa.com.au>
- *
- * 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 __GTK_SEPARATOR_TOOL_ITEM_H__
-#define __GTK_SEPARATOR_TOOL_ITEM_H__
-
-#include "gtktoolitem.h"
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_SEPARATOR_TOOL_ITEM            (gtk_separator_tool_item_get_type ())
-#define GTK_SEPARATOR_TOOL_ITEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SEPARATOR_TOOL_ITEM, GtkSeparatorToolItem))
-#define GTK_SEPARATOR_TOOL_ITEM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SEPARATOR_TOOL_ITEM, GtkSeparatorToolItemClass))
-#define GTK_IS_SEPARATOR_TOOL_ITEM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SEPARATOR_TOOL_ITEM))
-#define GTK_IS_SEPARATOR_TOOL_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SEPARATOR_TOOL_ITEM))
-#define GTK_SEPARATOR_TOOL_ITEM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_SEPARATOR_TOOL_ITEM, GtkSeparatorToolItemClass))
-
-typedef struct _GtkSeparatorToolItem        GtkSeparatorToolItem;
-typedef struct _GtkSeparatorToolItemClass   GtkSeparatorToolItemClass;
-typedef struct _GtkSeparatorToolItemPrivate GtkSeparatorToolItemPrivate;
-
-struct _GtkSeparatorToolItem
-{
-  GtkToolItem parent;
-  
-  /*< private >*/
-  GtkSeparatorToolItemPrivate *priv;
-};
-
-struct _GtkSeparatorToolItemClass
-{
-  GtkToolItemClass parent_class;
-
-  /* Padding for future expansion */
-  void (* _gtk_reserved1) (void);
-  void (* _gtk_reserved2) (void);
-  void (* _gtk_reserved3) (void);
-  void (* _gtk_reserved4) (void);
-};
-
-GType        gtk_separator_tool_item_get_type (void) G_GNUC_CONST;
-GtkToolItem *gtk_separator_tool_item_new      (void);
-
-gboolean     gtk_separator_tool_item_get_draw (GtkSeparatorToolItem *item);
-void         gtk_separator_tool_item_set_draw (GtkSeparatorToolItem *item,
-					       gboolean              draw);
-
-G_END_DECLS
-
-#endif /* __GTK_SEPARATOR_TOOL_ITEM_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtksettings.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtksettings.h
deleted file mode 100644
index f058e00a..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtksettings.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-#ifndef __GTK_SETTINGS_H__
-#define __GTK_SETTINGS_H__
-
-#include	<gtk/gtkrc.h>
-
-G_BEGIN_DECLS
-
-
-/* -- type macros --- */
-#define GTK_TYPE_SETTINGS             (gtk_settings_get_type ())
-#define GTK_SETTINGS(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SETTINGS, GtkSettings))
-#define GTK_SETTINGS_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SETTINGS, GtkSettingsClass))
-#define GTK_IS_SETTINGS(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SETTINGS))
-#define GTK_IS_SETTINGS_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SETTINGS))
-#define GTK_SETTINGS_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SETTINGS, GtkSettingsClass))
-
-
-/* --- typedefs --- */
-typedef struct    _GtkSettingsClass GtkSettingsClass;
-typedef struct    _GtkSettingsValue GtkSettingsValue;
-typedef struct    _GtkSettingsPropertyValue GtkSettingsPropertyValue; /* Internal */
-
-
-/* --- structures --- */
-struct _GtkSettings
-{
-  GObject parent_instance;
-
-  GData  *queued_settings;	/* of type GtkSettingsValue* */
-  GtkSettingsPropertyValue *property_values;
-
-  GtkRcContext *rc_context;
-  GdkScreen    *screen;
-};
-struct _GtkSettingsClass
-{
-  GObjectClass parent_class;
-  
-};
-struct _GtkSettingsValue
-{
-  /* origin should be something like "filename:linenumber" for rc files,
-   * or e.g. "XProperty" for other sources
-   */
-  gchar *origin;
-
-  /* valid types are LONG, DOUBLE and STRING corresponding to the token parsed,
-   * or a GSTRING holding an unparsed statement
-   */
-  GValue value;
-};
-
-
-/* --- functions --- */
-GType		gtk_settings_get_type		     (void) G_GNUC_CONST;
-#ifndef GDK_MULTIHEAD_SAFE
-GtkSettings*	gtk_settings_get_default	     (void);
-#endif
-GtkSettings*	gtk_settings_get_for_screen	     (GdkScreen *screen);
-  
-void		gtk_settings_install_property	     (GParamSpec         *pspec);
-void		gtk_settings_install_property_parser (GParamSpec         *pspec,
-						      GtkRcPropertyParser parser);
-
-/* --- precoded parsing functions --- */
-gboolean gtk_rc_property_parse_color       (const GParamSpec *pspec,
-					    const GString    *gstring,
-					    GValue           *property_value);
-gboolean gtk_rc_property_parse_enum        (const GParamSpec *pspec,
-					    const GString    *gstring,
-					    GValue           *property_value);
-gboolean gtk_rc_property_parse_flags       (const GParamSpec *pspec,
-					    const GString    *gstring,
-					    GValue           *property_value);
-gboolean gtk_rc_property_parse_requisition (const GParamSpec *pspec,
-					    const GString    *gstring,
-					    GValue           *property_value);
-gboolean gtk_rc_property_parse_border      (const GParamSpec *pspec,
-					    const GString    *gstring,
-					    GValue           *property_value);
-
-/*< private >*/
-void		gtk_settings_set_property_value	 (GtkSettings	*settings,
-						  const gchar	*name,
-						  const GtkSettingsValue *svalue);
-void		gtk_settings_set_string_property (GtkSettings	*settings,
-						  const gchar	*name,
-						  const gchar	*v_string,
-						  const gchar   *origin);
-void		gtk_settings_set_long_property	 (GtkSettings	*settings,
-						  const gchar	*name,
-						  glong		 v_long,
-						  const gchar   *origin);
-void		gtk_settings_set_double_property (GtkSettings	*settings,
-						  const gchar	*name,
-						  gdouble	 v_double,
-						  const gchar   *origin);
-
-
-/* implementation details */
-void _gtk_settings_set_property_value_from_rc (GtkSettings            *settings,
-					       const gchar            *name,
-					       const GtkSettingsValue *svalue);
-void _gtk_settings_reset_rc_values            (GtkSettings            *settings);
-
-void                _gtk_settings_handle_event        (GdkEventSetting    *event);
-GtkRcPropertyParser _gtk_rc_property_parser_from_type (GType               type);
-gboolean	    _gtk_settings_parse_convert       (GtkRcPropertyParser parser,
-						       const GValue       *src_value,
-						       GParamSpec         *pspec,
-						       GValue	          *dest_value);
-
-
-G_END_DECLS
-
-#endif /* __GTK_SETTINGS_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtksignal.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtksignal.h
deleted file mode 100644
index 56bbe0b4..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtksignal.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_SIGNAL_H__
-#define __GTK_SIGNAL_H__
-
-
-#include <gtk/gtkenums.h>
-#include <gtk/gtkobject.h>
-#include <gtk/gtkmarshal.h>
-
-G_BEGIN_DECLS
-  
-#ifndef GTK_DISABLE_DEPRECATED
-
-#define	gtk_signal_default_marshaller	g_cclosure_marshal_VOID__VOID
-
-
-/* --- compat defines --- */
-#define GTK_SIGNAL_OFFSET	                      GTK_STRUCT_OFFSET
-#define	gtk_signal_lookup(name,object_type)	                                       \
-   g_signal_lookup ((name), (object_type))
-#define	gtk_signal_name(signal_id)                                                     \
-   g_signal_name (signal_id)
-#define	gtk_signal_emit_stop(object,signal_id)                                         \
-   g_signal_stop_emission ((object), (signal_id), 0)
-#define	gtk_signal_connect(object,name,func,func_data)                                 \
-   gtk_signal_connect_full ((object), (name), (func), NULL, (func_data), NULL, 0, 0)
-#define	gtk_signal_connect_after(object,name,func,func_data)                           \
-   gtk_signal_connect_full ((object), (name), (func), NULL, (func_data), NULL, 0, 1)
-#define	gtk_signal_connect_object(object,name,func,slot_object)                        \
-   gtk_signal_connect_full ((object), (name), (func), NULL, (slot_object), NULL, 1, 0)
-#define	gtk_signal_connect_object_after(object,name,func,slot_object)                  \
-   gtk_signal_connect_full ((object), (name), (func), NULL, (slot_object), NULL, 1, 1)
-#define	gtk_signal_disconnect(object,handler_id)                                       \
-   g_signal_handler_disconnect ((object), (handler_id))
-#define	gtk_signal_handler_block(object,handler_id)                                    \
-   g_signal_handler_block ((object), (handler_id))
-#define	gtk_signal_handler_unblock(object,handler_id)                                  \
-   g_signal_handler_unblock ((object), (handler_id))
-#define	gtk_signal_disconnect_by_func(object,func,data)	                               \
-   gtk_signal_compat_matched ((object), (func), (data),                                \
-			      (GSignalMatchType)(G_SIGNAL_MATCH_FUNC |                 \
-						 G_SIGNAL_MATCH_DATA), 0)
-#define	gtk_signal_disconnect_by_data(object,data)                                     \
-   gtk_signal_compat_matched ((object), 0, (data), G_SIGNAL_MATCH_DATA, 0)
-#define	gtk_signal_handler_block_by_func(object,func,data)                             \
-   gtk_signal_compat_matched ((object), (func), (data),                                \
-			      (GSignalMatchType)(G_SIGNAL_MATCH_FUNC |                 \
-						 G_SIGNAL_MATCH_DATA), 1)
-#define	gtk_signal_handler_block_by_data(object,data)                                  \
-   gtk_signal_compat_matched ((object), 0, (data), G_SIGNAL_MATCH_DATA, 1)
-#define	gtk_signal_handler_unblock_by_func(object,func,data)                           \
-   gtk_signal_compat_matched ((object), (func), (data),                                \
-			      (GSignalMatchType)(G_SIGNAL_MATCH_FUNC |                 \
-						 G_SIGNAL_MATCH_DATA), 2)
-#define	gtk_signal_handler_unblock_by_data(object,data)                                \
-   gtk_signal_compat_matched ((object), 0, (data), G_SIGNAL_MATCH_DATA, 2)
-#define	gtk_signal_handler_pending(object,signal_id,may_be_blocked)                    \
-   g_signal_has_handler_pending ((object), (signal_id), 0, (may_be_blocked))
-#define	gtk_signal_handler_pending_by_func(object,signal_id,may_be_blocked,func,data)  \
-   (g_signal_handler_find ((object),                                                             \
-			   (GSignalMatchType)(G_SIGNAL_MATCH_ID |                                \
-                                              G_SIGNAL_MATCH_FUNC |                              \
-                                              G_SIGNAL_MATCH_DATA |                              \
-                                              ((may_be_blocked) ? 0 : G_SIGNAL_MATCH_UNBLOCKED)),\
-                           (signal_id), 0, 0, (func), (data)) != 0)
-
-
-/* --- compat functions --- */
-guint	gtk_signal_newv				(const gchar	    *name,
-						 GtkSignalRunType    signal_flags,
-						 GtkType	     object_type,
-						 guint		     function_offset,
-						 GtkSignalMarshaller marshaller,
-						 GtkType	     return_val,
-						 guint		     n_args,
-						 GtkType	    *args);
-guint	gtk_signal_new				(const gchar	    *name,
-						 GtkSignalRunType    signal_flags,
-						 GtkType	     object_type,
-						 guint		     function_offset,
-						 GtkSignalMarshaller marshaller,
-						 GtkType	     return_val,
-						 guint		     n_args,
-						 ...);
-void	gtk_signal_emit_stop_by_name		(GtkObject	    *object,
-						 const gchar	    *name);
-void	gtk_signal_connect_object_while_alive	(GtkObject	    *object,
-						 const gchar        *name,
-						 GtkSignalFunc	     func,
-						 GtkObject	    *alive_object);
-void	gtk_signal_connect_while_alive		(GtkObject	    *object,
-						 const gchar        *name,
-						 GtkSignalFunc	     func,
-						 gpointer	     func_data,
-						 GtkObject	    *alive_object);
-gulong	gtk_signal_connect_full			(GtkObject	    *object,
-						 const gchar	    *name,
-						 GtkSignalFunc	     func,
-						 GtkCallbackMarshal  unsupported,
-						 gpointer	     data,
-						 GtkDestroyNotify    destroy_func,
-						 gint		     object_signal,
-						 gint		     after);
-void	gtk_signal_emitv			(GtkObject	    *object,
-						 guint		     signal_id,
-						 GtkArg		    *args);
-void	gtk_signal_emit				(GtkObject	    *object,
-						 guint		     signal_id,
-						 ...);
-void	gtk_signal_emit_by_name			(GtkObject	    *object,
-						 const gchar	    *name,
-						 ...);
-void	gtk_signal_emitv_by_name		(GtkObject	    *object,
-						 const gchar	    *name,
-						 GtkArg		    *args);
-void	gtk_signal_compat_matched		(GtkObject	    *object,
-						 GtkSignalFunc 	     func,
-						 gpointer      	     data,
-						 GSignalMatchType    match,
-						 guint               action);
-
-#endif /* GTK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GTK_SIGNAL_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtksizegroup.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtksizegroup.h
deleted file mode 100644
index 4a831538..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtksizegroup.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtksizegroup.h: 
- * Copyright (C) 2000 Red Hat Software
- *
- * 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 __GTK_SIZE_GROUP_H__
-#define __GTK_SIZE_GROUP_H__
-
-#include <gtk/gtkwidget.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_SIZE_GROUP            (gtk_size_group_get_type ())
-#define GTK_SIZE_GROUP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SIZE_GROUP, GtkSizeGroup))
-#define GTK_SIZE_GROUP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SIZE_GROUP, GtkSizeGroupClass))
-#define GTK_IS_SIZE_GROUP(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SIZE_GROUP))
-#define GTK_IS_SIZE_GROUP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SIZE_GROUP))
-#define GTK_SIZE_GROUP_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SIZE_GROUP, GtkSizeGroupClass))
-
-
-typedef struct _GtkSizeGroup       GtkSizeGroup;
-typedef struct _GtkSizeGroupClass  GtkSizeGroupClass;
-
-struct _GtkSizeGroup
-{
-  GObject parent_instance;
-
-  /* <private> */
-  GSList *widgets;
-
-  guint8 mode;
-  
-  guint have_width : 1;
-  guint have_height : 1;
-  guint ignore_hidden : 1;
-
-  GtkRequisition requisition;
-};
-
-struct _GtkSizeGroupClass
-{
-  GObjectClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-/**
- * GtkSizeGroupMode:
- * @GTK_SIZE_GROUP_NONE: group has no effect  
- * @GTK_SIZE_GROUP_HORIZONTAL: group affects horizontal requisition
- * @GTK_SIZE_GROUP_VERTICAL: group affects vertical requisition
- * @GTK_SIZE_GROUP_BOTH: group affects both horizontal and vertical requisition
- * 
- * The mode of the size group determines the directions in which the size
- * group affects the requested sizes of its component widgets.
- **/
-typedef enum {
-  GTK_SIZE_GROUP_NONE,
-  GTK_SIZE_GROUP_HORIZONTAL,
-  GTK_SIZE_GROUP_VERTICAL,
-  GTK_SIZE_GROUP_BOTH
-} GtkSizeGroupMode;
-
-GType            gtk_size_group_get_type      (void) G_GNUC_CONST;
-
-GtkSizeGroup *   gtk_size_group_new           (GtkSizeGroupMode  mode);
-void             gtk_size_group_set_mode      (GtkSizeGroup     *size_group,
-					       GtkSizeGroupMode  mode);
-GtkSizeGroupMode gtk_size_group_get_mode      (GtkSizeGroup     *size_group);
-void             gtk_size_group_set_ignore_hidden (GtkSizeGroup *size_group,
-						   gboolean      ignore_hidden);
-gboolean         gtk_size_group_get_ignore_hidden (GtkSizeGroup *size_group);
-void             gtk_size_group_add_widget    (GtkSizeGroup     *size_group,
-					       GtkWidget        *widget);
-void             gtk_size_group_remove_widget (GtkSizeGroup     *size_group,
-					       GtkWidget        *widget);
-GSList *         gtk_size_group_get_widgets   (GtkSizeGroup     *size_group);
-
-
-void _gtk_size_group_get_child_requisition (GtkWidget      *widget,
-					    GtkRequisition *requisition);
-void _gtk_size_group_compute_requisition   (GtkWidget      *widget,
-					    GtkRequisition *requisition);
-void _gtk_size_group_queue_resize          (GtkWidget      *widget);
-
-G_END_DECLS
-
-#endif /* __GTK_SIZE_GROUP_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtksocket.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtksocket.h
deleted file mode 100644
index c522e5ba..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtksocket.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_SOCKET_H__
-#define __GTK_SOCKET_H__
-
-#include <gtk/gtkcontainer.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_SOCKET            (gtk_socket_get_type ())
-#define GTK_SOCKET(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOCKET, GtkSocket))
-#define GTK_SOCKET_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOCKET, GtkSocketClass))
-#define GTK_IS_SOCKET(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SOCKET))
-#define GTK_IS_SOCKET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOCKET))
-#define GTK_SOCKET_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SOCKET, GtkSocketClass))
-
-
-typedef struct _GtkSocket        GtkSocket;
-typedef struct _GtkSocketClass   GtkSocketClass;
-
-struct _GtkSocket
-{
-  GtkContainer container;
-
-  guint16 request_width;
-  guint16 request_height;
-  guint16 current_width;
-  guint16 current_height;
-  
-  GdkWindow *plug_window;
-  GtkWidget *plug_widget;
-
-  gshort xembed_version;	/* -1 == not xembed */
-  guint same_app : 1;
-  guint focus_in : 1;
-  guint have_size : 1;
-  guint need_map : 1;
-  guint is_mapped : 1;
-  guint active : 1;
-  
-  GtkAccelGroup *accel_group;
-  GtkWidget *toplevel;
-};
-
-struct _GtkSocketClass
-{
-  GtkContainerClass parent_class;
-
-  void     (*plug_added)   (GtkSocket *socket_);
-  gboolean (*plug_removed) (GtkSocket *socket_);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType          gtk_socket_get_type (void) G_GNUC_CONST;
-GtkWidget*     gtk_socket_new      (void);
-
-void            gtk_socket_add_id (GtkSocket       *socket_,
-				   GdkNativeWindow  window_id);
-GdkNativeWindow gtk_socket_get_id (GtkSocket       *socket_);
-
-#ifndef GTK_DISABLE_DEPRECATED
-void           gtk_socket_steal    (GtkSocket      *socket_,
-				    GdkNativeWindow wid);
-#endif /* GTK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GTK_SOCKET_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkspinbutton.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkspinbutton.h
deleted file mode 100644
index 4bf3570c..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkspinbutton.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * GtkSpinButton widget for GTK+
- * Copyright (C) 1998 Lars Hamann and Stefan Jeske
- *
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_SPIN_BUTTON_H__
-#define __GTK_SPIN_BUTTON_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkadjustment.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_SPIN_BUTTON                  (gtk_spin_button_get_type ())
-#define GTK_SPIN_BUTTON(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SPIN_BUTTON, GtkSpinButton))
-#define GTK_SPIN_BUTTON_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SPIN_BUTTON, GtkSpinButtonClass))
-#define GTK_IS_SPIN_BUTTON(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SPIN_BUTTON))
-#define GTK_IS_SPIN_BUTTON_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SPIN_BUTTON))
-#define GTK_SPIN_BUTTON_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SPIN_BUTTON, GtkSpinButtonClass))
-
-#define GTK_INPUT_ERROR -1
-
-typedef enum
-{
-  GTK_UPDATE_ALWAYS,
-  GTK_UPDATE_IF_VALID
-} GtkSpinButtonUpdatePolicy;
-
-typedef enum
-{
-  GTK_SPIN_STEP_FORWARD,
-  GTK_SPIN_STEP_BACKWARD,
-  GTK_SPIN_PAGE_FORWARD,
-  GTK_SPIN_PAGE_BACKWARD,
-  GTK_SPIN_HOME,
-  GTK_SPIN_END,
-  GTK_SPIN_USER_DEFINED
-} GtkSpinType;
-
-
-typedef struct _GtkSpinButton	    GtkSpinButton;
-typedef struct _GtkSpinButtonClass  GtkSpinButtonClass;
-
-
-struct _GtkSpinButton
-{
-  GtkEntry entry;
-  
-  GtkAdjustment *adjustment;
-  
-  GdkWindow *panel;
-  
-  guint32 timer;
-  
-  gdouble climb_rate;
-  gdouble timer_step;
-  
-  GtkSpinButtonUpdatePolicy update_policy;
-  
-  guint in_child : 2;
-  guint click_child : 2; /* valid: GTK_ARROW_UP=0, GTK_ARROW_DOWN=1 or 2=NONE/BOTH */
-  guint button : 2;
-  guint need_timer : 1;
-  guint timer_calls : 3;
-  guint digits : 10;
-  guint numeric : 1;
-  guint wrap : 1;
-  guint snap_to_ticks : 1;
-};
-
-struct _GtkSpinButtonClass
-{
-  GtkEntryClass parent_class;
-
-  gint (*input)  (GtkSpinButton *spin_button,
-		  gdouble       *new_value);
-  gint (*output) (GtkSpinButton *spin_button);
-  void (*value_changed) (GtkSpinButton *spin_button);
-
-  /* Action signals for keybindings, do not connect to these */
-  void (*change_value) (GtkSpinButton *spin_button,
-			GtkScrollType  scroll);
-
-  void (*wrapped) (GtkSpinButton *spin_button);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-};
-
-
-GType		gtk_spin_button_get_type	   (void) G_GNUC_CONST;
-
-void		gtk_spin_button_configure	   (GtkSpinButton  *spin_button,
-						    GtkAdjustment  *adjustment,
-						    gdouble	    climb_rate,
-						    guint	    digits);
-
-GtkWidget*	gtk_spin_button_new		   (GtkAdjustment  *adjustment,
-						    gdouble	    climb_rate,
-						    guint	    digits);
-
-GtkWidget*	gtk_spin_button_new_with_range	   (gdouble  min,
-						    gdouble  max,
-						    gdouble  step);
-
-void		gtk_spin_button_set_adjustment	   (GtkSpinButton  *spin_button,
-						    GtkAdjustment  *adjustment);
-
-GtkAdjustment*	gtk_spin_button_get_adjustment	   (GtkSpinButton  *spin_button);
-
-void		gtk_spin_button_set_digits	   (GtkSpinButton  *spin_button,
-						    guint	    digits);
-guint           gtk_spin_button_get_digits         (GtkSpinButton  *spin_button);
-
-void		gtk_spin_button_set_increments	   (GtkSpinButton  *spin_button,
-						    gdouble         step,
-						    gdouble         page);
-void            gtk_spin_button_get_increments     (GtkSpinButton  *spin_button,
-						    gdouble        *step,
-						    gdouble        *page);
-
-void		gtk_spin_button_set_range	   (GtkSpinButton  *spin_button,
-						    gdouble         min,
-						    gdouble         max);
-void            gtk_spin_button_get_range          (GtkSpinButton  *spin_button,
-						    gdouble        *min,
-						    gdouble        *max);
-
-gdouble		gtk_spin_button_get_value          (GtkSpinButton  *spin_button);
-
-gint		gtk_spin_button_get_value_as_int   (GtkSpinButton  *spin_button);
-
-void		gtk_spin_button_set_value	   (GtkSpinButton  *spin_button, 
-						    gdouble	    value);
-
-void		gtk_spin_button_set_update_policy  (GtkSpinButton  *spin_button,
-						    GtkSpinButtonUpdatePolicy  policy);
-GtkSpinButtonUpdatePolicy gtk_spin_button_get_update_policy (GtkSpinButton *spin_button);
-
-void		gtk_spin_button_set_numeric	   (GtkSpinButton  *spin_button,
-						    gboolean	    numeric);
-gboolean        gtk_spin_button_get_numeric        (GtkSpinButton  *spin_button);
-
-void		gtk_spin_button_spin		   (GtkSpinButton  *spin_button,
-						    GtkSpinType     direction,
-						    gdouble	    increment);
-
-void		gtk_spin_button_set_wrap	   (GtkSpinButton  *spin_button,
-						    gboolean	    wrap);
-gboolean        gtk_spin_button_get_wrap           (GtkSpinButton  *spin_button);
-
-void		gtk_spin_button_set_snap_to_ticks  (GtkSpinButton  *spin_button,
-						    gboolean	    snap_to_ticks);
-gboolean        gtk_spin_button_get_snap_to_ticks  (GtkSpinButton  *spin_button);
-void            gtk_spin_button_update             (GtkSpinButton  *spin_button);
-
-
-#ifndef GTK_DISABLE_DEPRECATED
-#define gtk_spin_button_get_value_as_float gtk_spin_button_get_value
-#endif
-
-G_END_DECLS
-
-#endif /* __GTK_SPIN_BUTTON_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkstatusbar.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkstatusbar.h
deleted file mode 100644
index 47025331..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkstatusbar.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- * GtkStatusbar Copyright (C) 1998 Shawn T. Amundson
- *
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_STATUSBAR_H__
-#define __GTK_STATUSBAR_H__
-
-#include <gtk/gtkhbox.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_STATUSBAR            (gtk_statusbar_get_type ())
-#define GTK_STATUSBAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_STATUSBAR, GtkStatusbar))
-#define GTK_STATUSBAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_STATUSBAR, GtkStatusbarClass))
-#define GTK_IS_STATUSBAR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_STATUSBAR))
-#define GTK_IS_STATUSBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_STATUSBAR))
-#define GTK_STATUSBAR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_STATUSBAR, GtkStatusbarClass))
-
-
-typedef struct _GtkStatusbar      GtkStatusbar;
-typedef struct _GtkStatusbarClass GtkStatusbarClass;
-
-struct _GtkStatusbar
-{
-  GtkHBox parent_widget;
-
-  GtkWidget *frame;
-  GtkWidget *label;
-
-  GSList *messages;
-  GSList *keys;
-
-  guint seq_context_id;
-  guint seq_message_id;
-
-  GdkWindow *grip_window;
-  
-  guint has_resize_grip : 1;
-};
-
-struct _GtkStatusbarClass
-{
-  GtkHBoxClass parent_class;
-
-  gpointer reserved;
-
-  void	(*text_pushed)	(GtkStatusbar	*statusbar,
-			 guint		 context_id,
-			 const gchar	*text);
-  void	(*text_popped)	(GtkStatusbar	*statusbar,
-			 guint		 context_id,
-			 const gchar	*text);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType      gtk_statusbar_get_type     	(void) G_GNUC_CONST;
-GtkWidget* gtk_statusbar_new          	(void);
-/* If you don't want to use contexts, 0 is a predefined global
- * context_id you can pass to push/pop/remove
- */
-guint	   gtk_statusbar_get_context_id	(GtkStatusbar *statusbar,
-					 const gchar  *context_description);
-/* Returns message_id used for gtk_statusbar_remove */
-guint      gtk_statusbar_push          	(GtkStatusbar *statusbar,
-					 guint	       context_id,
-					 const gchar  *text);
-void       gtk_statusbar_pop          	(GtkStatusbar *statusbar,
-					 guint	       context_id);
-void       gtk_statusbar_remove        	(GtkStatusbar *statusbar,
-					 guint	       context_id,
-					 guint         message_id);
-
-void     gtk_statusbar_set_has_resize_grip (GtkStatusbar *statusbar,
-					    gboolean      setting);
-gboolean gtk_statusbar_get_has_resize_grip (GtkStatusbar *statusbar);
-
-G_END_DECLS
-
-#endif /* __GTK_STATUSBAR_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkstatusicon.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkstatusicon.h
deleted file mode 100644
index e58eb6ad..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkstatusicon.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* gtkstatusicon.h:
- *
- * Copyright (C) 2003 Sun Microsystems, 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.
- *
- * Authors:
- *      Mark McLoughlin <mark@skynet.ie>
- */
-
-#ifndef __GTK_STATUS_ICON_H__
-#define __GTK_STATUS_ICON_H__
-
-#include <gtk/gtkimage.h>
-#include <gtk/gtkmenu.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_STATUS_ICON         (gtk_status_icon_get_type ())
-#define GTK_STATUS_ICON(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GTK_TYPE_STATUS_ICON, GtkStatusIcon))
-#define GTK_STATUS_ICON_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), GTK_TYPE_STATUS_ICON, GtkStatusIconClass))
-#define GTK_IS_STATUS_ICON(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTK_TYPE_STATUS_ICON))
-#define GTK_IS_STATUS_ICON_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), GTK_TYPE_STATUS_ICON))
-#define GTK_STATUS_ICON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GTK_TYPE_STATUS_ICON, GtkStatusIconClass))
-
-typedef struct _GtkStatusIcon	     GtkStatusIcon;
-typedef struct _GtkStatusIconClass   GtkStatusIconClass;
-typedef struct _GtkStatusIconPrivate GtkStatusIconPrivate;
-
-struct _GtkStatusIcon
-{
-  GObject               parent_instance;
-
-  GtkStatusIconPrivate *priv;
-};
-
-struct _GtkStatusIconClass
-{
-  GObjectClass parent_class;
-
-  void     (* activate)     (GtkStatusIcon *status_icon);
-  void     (* popup_menu)   (GtkStatusIcon *status_icon,
-			     guint          button,
-			     guint32        activate_time);
-  gboolean (* size_changed) (GtkStatusIcon *status_icon,
-			     gint           size);
-
-  void (*__gtk_reserved1);
-  void (*__gtk_reserved2);
-  void (*__gtk_reserved3);
-  void (*__gtk_reserved4);
-  void (*__gtk_reserved5);
-  void (*__gtk_reserved6);  
-};
-
-GType                 gtk_status_icon_get_type           (void) G_GNUC_CONST;
-
-GtkStatusIcon        *gtk_status_icon_new                (void);
-GtkStatusIcon        *gtk_status_icon_new_from_pixbuf    (GdkPixbuf          *pixbuf);
-GtkStatusIcon        *gtk_status_icon_new_from_file      (const gchar        *filename);
-GtkStatusIcon        *gtk_status_icon_new_from_stock     (const gchar        *stock_id);
-GtkStatusIcon        *gtk_status_icon_new_from_icon_name (const gchar        *icon_name);
-
-void                  gtk_status_icon_set_from_pixbuf    (GtkStatusIcon      *status_icon,
-							  GdkPixbuf          *pixbuf);
-void                  gtk_status_icon_set_from_file      (GtkStatusIcon      *status_icon,
-							  const gchar        *filename);
-void                  gtk_status_icon_set_from_stock     (GtkStatusIcon      *status_icon,
-							  const gchar        *stock_id);
-void                  gtk_status_icon_set_from_icon_name (GtkStatusIcon      *status_icon,
-							  const gchar        *icon_name);
-
-GtkImageType          gtk_status_icon_get_storage_type   (GtkStatusIcon      *status_icon);
-
-GdkPixbuf            *gtk_status_icon_get_pixbuf         (GtkStatusIcon      *status_icon);
-G_CONST_RETURN gchar *gtk_status_icon_get_stock          (GtkStatusIcon      *status_icon);
-G_CONST_RETURN gchar *gtk_status_icon_get_icon_name      (GtkStatusIcon      *status_icon);
-
-gint                  gtk_status_icon_get_size           (GtkStatusIcon      *status_icon);
-
-void                  gtk_status_icon_set_screen         (GtkStatusIcon      *status_icon,
-                                                          GdkScreen          *screen);
-GdkScreen            *gtk_status_icon_get_screen         (GtkStatusIcon      *status_icon);
-
-void                  gtk_status_icon_set_tooltip        (GtkStatusIcon      *status_icon,
-							  const gchar        *tooltip_text);
-
-void                  gtk_status_icon_set_visible        (GtkStatusIcon      *status_icon,
-							  gboolean            visible);
-gboolean              gtk_status_icon_get_visible        (GtkStatusIcon      *status_icon);
-
-void                  gtk_status_icon_set_blinking       (GtkStatusIcon      *status_icon,
-							  gboolean            blinking);
-gboolean              gtk_status_icon_get_blinking       (GtkStatusIcon      *status_icon);
-
-gboolean              gtk_status_icon_is_embedded        (GtkStatusIcon      *status_icon);
-
-void                  gtk_status_icon_position_menu      (GtkMenu            *menu,
-							  gint               *x,
-							  gint               *y,
-							  gboolean           *push_in,
-							  gpointer            user_data);
-gboolean              gtk_status_icon_get_geometry       (GtkStatusIcon      *status_icon,
-							  GdkScreen         **screen,
-							  GdkRectangle       *area,
-							  GtkOrientation     *orientation);
-
-G_END_DECLS
-
-#endif /* __GTK_STATUS_ICON_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkstock.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkstock.h
deleted file mode 100644
index 75d3b1fd..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkstock.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_STOCK_H__
-#define __GTK_STOCK_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkitemfactory.h> /* for GtkTranslateFunc */
-
-G_BEGIN_DECLS
-
-typedef struct _GtkStockItem GtkStockItem;
-
-struct _GtkStockItem
-{
-  gchar *stock_id;
-  gchar *label;
-  GdkModifierType modifier;
-  guint keyval;
-  gchar *translation_domain;
-};
-
-void     gtk_stock_add        (const GtkStockItem  *items,
-                               guint                n_items);
-void     gtk_stock_add_static (const GtkStockItem  *items,
-                               guint                n_items);
-gboolean gtk_stock_lookup     (const gchar         *stock_id,
-                               GtkStockItem        *item);
-
-/* Should free the list (and free each string in it also).
- * This function is only useful for GUI builders and such.
- */
-GSList*  gtk_stock_list_ids  (void);
-
-GtkStockItem *gtk_stock_item_copy (const GtkStockItem *item);
-void          gtk_stock_item_free (GtkStockItem       *item);
-
-void          gtk_stock_set_translate_func (const gchar      *domain,
-					    GtkTranslateFunc  func,
-					    gpointer          data,
-					    GtkDestroyNotify  notify);
-
-/* Stock IDs (not all are stock items; some are images only) */
-#define GTK_STOCK_DIALOG_AUTHENTICATION \
-                                   "gtk-dialog-authentication"
-#define GTK_STOCK_DIALOG_INFO      "gtk-dialog-info"
-#define GTK_STOCK_DIALOG_WARNING   "gtk-dialog-warning"
-#define GTK_STOCK_DIALOG_ERROR     "gtk-dialog-error"
-#define GTK_STOCK_DIALOG_QUESTION  "gtk-dialog-question"
-
-#define GTK_STOCK_DND              "gtk-dnd"
-#define GTK_STOCK_DND_MULTIPLE     "gtk-dnd-multiple"
-
-#define GTK_STOCK_ABOUT            "gtk-about"
-#define GTK_STOCK_ADD              "gtk-add"
-#define GTK_STOCK_APPLY            "gtk-apply"
-#define GTK_STOCK_BOLD             "gtk-bold"
-#define GTK_STOCK_CANCEL           "gtk-cancel"
-#define GTK_STOCK_CDROM            "gtk-cdrom"
-#define GTK_STOCK_CLEAR            "gtk-clear"
-#define GTK_STOCK_CLOSE            "gtk-close"
-#define GTK_STOCK_COLOR_PICKER     "gtk-color-picker"
-#define GTK_STOCK_CONVERT          "gtk-convert"
-#define GTK_STOCK_CONNECT          "gtk-connect"
-#define GTK_STOCK_COPY             "gtk-copy"
-#define GTK_STOCK_CUT              "gtk-cut"
-#define GTK_STOCK_DELETE           "gtk-delete"
-#define GTK_STOCK_DIRECTORY        "gtk-directory"
-#define GTK_STOCK_DISCARD          "gtk-discard"
-#define GTK_STOCK_DISCONNECT       "gtk-disconnect"
-#define GTK_STOCK_EDIT             "gtk-edit"
-#define GTK_STOCK_EXECUTE          "gtk-execute"
-#define GTK_STOCK_FILE             "gtk-file"
-#define GTK_STOCK_FIND             "gtk-find"
-#define GTK_STOCK_FIND_AND_REPLACE "gtk-find-and-replace"
-#define GTK_STOCK_FLOPPY           "gtk-floppy"
-#define GTK_STOCK_FULLSCREEN       "gtk-fullscreen"
-#define GTK_STOCK_GOTO_BOTTOM      "gtk-goto-bottom"
-#define GTK_STOCK_GOTO_FIRST       "gtk-goto-first"
-#define GTK_STOCK_GOTO_LAST        "gtk-goto-last"
-#define GTK_STOCK_GOTO_TOP         "gtk-goto-top"
-#define GTK_STOCK_GO_BACK          "gtk-go-back"
-#define GTK_STOCK_GO_DOWN          "gtk-go-down"
-#define GTK_STOCK_GO_FORWARD       "gtk-go-forward"
-#define GTK_STOCK_GO_UP            "gtk-go-up"
-#define GTK_STOCK_HARDDISK         "gtk-harddisk"
-#define GTK_STOCK_HELP             "gtk-help"
-#define GTK_STOCK_HOME             "gtk-home"
-#define GTK_STOCK_INDEX            "gtk-index"
-#define GTK_STOCK_INDENT           "gtk-indent"
-#define GTK_STOCK_INFO             "gtk-info"
-#define GTK_STOCK_UNINDENT         "gtk-unindent"
-#define GTK_STOCK_ITALIC           "gtk-italic"
-#define GTK_STOCK_JUMP_TO          "gtk-jump-to"
-#define GTK_STOCK_JUSTIFY_CENTER   "gtk-justify-center"
-#define GTK_STOCK_JUSTIFY_FILL     "gtk-justify-fill"
-#define GTK_STOCK_JUSTIFY_LEFT     "gtk-justify-left"
-#define GTK_STOCK_JUSTIFY_RIGHT    "gtk-justify-right"
-#define GTK_STOCK_LEAVE_FULLSCREEN "gtk-leave-fullscreen"
-#define GTK_STOCK_MISSING_IMAGE    "gtk-missing-image"
-#define GTK_STOCK_MEDIA_FORWARD    "gtk-media-forward"
-#define GTK_STOCK_MEDIA_NEXT       "gtk-media-next"
-#define GTK_STOCK_MEDIA_PAUSE      "gtk-media-pause"
-#define GTK_STOCK_MEDIA_PLAY       "gtk-media-play"
-#define GTK_STOCK_MEDIA_PREVIOUS   "gtk-media-previous"
-#define GTK_STOCK_MEDIA_RECORD     "gtk-media-record"
-#define GTK_STOCK_MEDIA_REWIND     "gtk-media-rewind"
-#define GTK_STOCK_MEDIA_STOP       "gtk-media-stop"
-#define GTK_STOCK_NETWORK          "gtk-network"
-#define GTK_STOCK_NEW              "gtk-new"
-#define GTK_STOCK_NO               "gtk-no"
-#define GTK_STOCK_OK               "gtk-ok"
-#define GTK_STOCK_OPEN             "gtk-open"
-#define GTK_STOCK_ORIENTATION_PORTRAIT "gtk-orientation-portrait"
-#define GTK_STOCK_ORIENTATION_LANDSCAPE "gtk-orientation-landscape"
-#define GTK_STOCK_ORIENTATION_REVERSE_LANDSCAPE "gtk-orientation-reverse-landscape"
-#define GTK_STOCK_ORIENTATION_REVERSE_PORTRAIT "gtk-orientation-reverse-portrait"
-#define GTK_STOCK_PASTE            "gtk-paste"
-#define GTK_STOCK_PREFERENCES      "gtk-preferences"
-#define GTK_STOCK_PRINT            "gtk-print"
-#define GTK_STOCK_PRINT_PREVIEW    "gtk-print-preview"
-#define GTK_STOCK_PROPERTIES       "gtk-properties"
-#define GTK_STOCK_QUIT             "gtk-quit"
-#define GTK_STOCK_REDO             "gtk-redo"
-#define GTK_STOCK_REFRESH          "gtk-refresh"
-#define GTK_STOCK_REMOVE           "gtk-remove"
-#define GTK_STOCK_REVERT_TO_SAVED  "gtk-revert-to-saved"
-#define GTK_STOCK_SAVE             "gtk-save"
-#define GTK_STOCK_SAVE_AS          "gtk-save-as"
-#define GTK_STOCK_SELECT_ALL       "gtk-select-all"
-#define GTK_STOCK_SELECT_COLOR     "gtk-select-color"
-#define GTK_STOCK_SELECT_FONT      "gtk-select-font"
-#define GTK_STOCK_SORT_ASCENDING   "gtk-sort-ascending"
-#define GTK_STOCK_SORT_DESCENDING  "gtk-sort-descending"
-#define GTK_STOCK_SPELL_CHECK      "gtk-spell-check"
-#define GTK_STOCK_STOP             "gtk-stop"
-#define GTK_STOCK_STRIKETHROUGH    "gtk-strikethrough"
-#define GTK_STOCK_UNDELETE         "gtk-undelete"
-#define GTK_STOCK_UNDERLINE        "gtk-underline"
-#define GTK_STOCK_UNDO             "gtk-undo"
-#define GTK_STOCK_YES              "gtk-yes"
-#define GTK_STOCK_ZOOM_100         "gtk-zoom-100"
-#define GTK_STOCK_ZOOM_FIT         "gtk-zoom-fit"
-#define GTK_STOCK_ZOOM_IN          "gtk-zoom-in"
-#define GTK_STOCK_ZOOM_OUT         "gtk-zoom-out"
-
-G_END_DECLS
-
-#endif /* __GTK_STOCK_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkstyle.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkstyle.h
deleted file mode 100644
index bed56e0c..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkstyle.h
+++ /dev/null
@@ -1,908 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_STYLE_H__
-#define __GTK_STYLE_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkenums.h>
-#include <pango/pango.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_STYLE              (gtk_style_get_type ())
-#define GTK_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GTK_TYPE_STYLE, GtkStyle))
-#define GTK_STYLE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_STYLE, GtkStyleClass))
-#define GTK_IS_STYLE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GTK_TYPE_STYLE))
-#define GTK_IS_STYLE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_STYLE))
-#define GTK_STYLE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_STYLE, GtkStyleClass))
-
-#define GTK_TYPE_BORDER             (gtk_border_get_type ())
-
-/* Some forward declarations needed to rationalize the header
- * files.
- */
-typedef struct _GtkBorder      GtkBorder;
-typedef struct _GtkStyle       GtkStyle;
-typedef struct _GtkStyleClass  GtkStyleClass;
-typedef struct _GtkThemeEngine GtkThemeEngine;
-typedef struct _GtkRcStyle     GtkRcStyle;
-typedef struct _GtkIconSet     GtkIconSet;
-typedef struct _GtkIconSource  GtkIconSource;
-typedef struct _GtkRcProperty  GtkRcProperty;
-typedef struct _GtkSettings    GtkSettings;
-typedef gboolean (*GtkRcPropertyParser) (const GParamSpec *pspec,
-					 const GString    *rc_string,
-					 GValue           *property_value);
-
-/* We make this forward declaration here, since we pass
- * GtkWidget's to the draw functions.
- */
-typedef struct _GtkWidget      GtkWidget;
-
-#define GTK_STYLE_ATTACHED(style)	(GTK_STYLE (style)->attach_count > 0)
-
-struct _GtkStyle
-{
-  GObject parent_instance;
-
-  /*< public >*/
-  
-  GdkColor fg[5];
-  GdkColor bg[5];
-  GdkColor light[5];
-  GdkColor dark[5];
-  GdkColor mid[5];
-  GdkColor text[5];
-  GdkColor base[5];
-  GdkColor text_aa[5];		/* Halfway between text/base */
-  
-  GdkColor black;
-  GdkColor white;
-  PangoFontDescription *font_desc;
-  
-  gint xthickness;
-  gint ythickness;
-  
-  GdkGC *fg_gc[5];
-  GdkGC *bg_gc[5];
-  GdkGC *light_gc[5];
-  GdkGC *dark_gc[5];
-  GdkGC *mid_gc[5];
-  GdkGC *text_gc[5];
-  GdkGC *base_gc[5];
-  GdkGC *text_aa_gc[5];
-  GdkGC *black_gc;
-  GdkGC *white_gc;
-  
-  GdkPixmap *bg_pixmap[5];
-
-  /*< private >*/
-  
-  gint attach_count;
-  
-  gint depth;
-  GdkColormap *colormap;
-  GdkFont *private_font;
-  PangoFontDescription *private_font_desc; /* Font description for style->private_font or %NULL */
-  
-  /* the RcStyle from which this style was created */
-  GtkRcStyle	 *rc_style;
-
-  GSList	 *styles;	  /* of type GtkStyle* */
-  GArray	 *property_cache;
-  GSList         *icon_factories; /* of type GtkIconFactory* */
-};
-
-struct _GtkStyleClass
-{
-  GObjectClass parent_class;
-
-  /* Initialize for a particular colormap/depth
-   * combination. style->colormap/style->depth will have
-   * been set at this point. Will typically chain to parent.
-   */
-  void (*realize)               (GtkStyle               *style);
-
-  /* Clean up for a particular colormap/depth combination. Will
-   * typically chain to parent.
-   */
-  void (*unrealize)             (GtkStyle               *style);
-
-  /* Make style an exact duplicate of src.
-   */
-  void (*copy)                  (GtkStyle               *style,
-				 GtkStyle               *src);
-
-  /* Create an empty style of the same type as this style.
-   * The default implementation, which does
-   * g_object_new (G_OBJECT_TYPE (style), NULL);
-   * should work in most cases.
-   */
-  GtkStyle *(*clone)             (GtkStyle               *style);
-
-  /* Initialize the GtkStyle with the values in the GtkRcStyle.
-   * should chain to the parent implementation.
-   */
-  void     (*init_from_rc)      (GtkStyle               *style,
-				 GtkRcStyle             *rc_style);
-
-  void (*set_background)        (GtkStyle               *style,
-				 GdkWindow              *window,
-				 GtkStateType            state_type);
-
-
-  GdkPixbuf * (* render_icon)   (GtkStyle               *style,
-                                 const GtkIconSource    *source,
-                                 GtkTextDirection        direction,
-                                 GtkStateType            state,
-                                 GtkIconSize             size,
-                                 GtkWidget              *widget,
-                                 const gchar            *detail);
-  
-  /* Drawing functions
-   */
-  
-  void (*draw_hline)		(GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 gint			 x1,
-				 gint			 x2,
-				 gint			 y);
-  void (*draw_vline)		(GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 gint			 y1_,
-				 gint			 y2_,
-				 gint			 x);
-  void (*draw_shadow)		(GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 GtkShadowType		 shadow_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 gint			 x,
-				 gint			 y,
-				 gint			 width,
-				 gint			 height);
-  void (*draw_polygon)		(GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 GtkShadowType		 shadow_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 GdkPoint		*point,
-				 gint			 npoints,
-				 gboolean		 fill);
-  void (*draw_arrow)		(GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 GtkShadowType		 shadow_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 GtkArrowType		 arrow_type,
-				 gboolean		 fill,
-				 gint			 x,
-				 gint			 y,
-				 gint			 width,
-				 gint			 height);
-  void (*draw_diamond)		(GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 GtkShadowType		 shadow_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 gint			 x,
-				 gint			 y,
-				 gint			 width,
-				 gint			 height);
-  void (*draw_string)		(GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 gint			 x,
-				 gint			 y,
-				 const gchar		*string);
-  void (*draw_box)		(GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 GtkShadowType		 shadow_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 gint			 x,
-				 gint			 y,
-				 gint			 width,
-				 gint			 height);
-  void (*draw_flat_box)		(GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 GtkShadowType		 shadow_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 gint			 x,
-				 gint			 y,
-				 gint			 width,
-				 gint			 height);
-  void (*draw_check)		(GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 GtkShadowType		 shadow_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 gint			 x,
-				 gint			 y,
-				 gint			 width,
-				 gint			 height);
-  void (*draw_option)		(GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 GtkShadowType		 shadow_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 gint			 x,
-				 gint			 y,
-				 gint			 width,
-				 gint			 height);
-  void (*draw_tab)		(GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 GtkShadowType		 shadow_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 gint			 x,
-				 gint			 y,
-				 gint			 width,
-				 gint			 height); 
-  void (*draw_shadow_gap)	(GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 GtkShadowType		 shadow_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 gint			 x,
-				 gint			 y,
-				 gint			 width,
-				 gint			 height,
-				 GtkPositionType	 gap_side,
-				 gint			 gap_x,
-				 gint			 gap_width);
-  void (*draw_box_gap)		(GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 GtkShadowType		 shadow_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 gint			 x,
-				 gint			 y,
-				 gint			 width,
-				 gint			 height,
-				 GtkPositionType	 gap_side,
-				 gint			 gap_x,
-				 gint			 gap_width);
-  void (*draw_extension)	(GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 GtkShadowType		 shadow_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 gint			 x,
-				 gint			 y,
-				 gint			 width,
-				 gint			 height,
-				 GtkPositionType	 gap_side);
-  void (*draw_focus)		(GtkStyle		*style,
-				 GdkWindow		*window,
-                                 GtkStateType            state_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 gint			 x,
-				 gint			 y,
-				 gint			 width,
-				 gint			 height);
-  void (*draw_slider)		(GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 GtkShadowType		 shadow_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 gint			 x,
-				 gint			 y,
-				 gint			 width,
-				 gint			 height,
-				 GtkOrientation		 orientation);
-  void (*draw_handle)		(GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 GtkShadowType		 shadow_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 gint			 x,
-				 gint			 y,
-				 gint			 width,
-				 gint			 height,
-				 GtkOrientation		 orientation);
-
-  void (*draw_expander)		(GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 gint			 x,
-				 gint			 y,
-                                 GtkExpanderStyle        expander_style);
-  void (*draw_layout)		(GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 gboolean                use_text,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 gint			 x,
-				 gint			 y,
-                                 PangoLayout            *layout);
-  void (*draw_resize_grip)      (GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-                                 GdkWindowEdge           edge,
-				 gint			 x,
-				 gint			 y,
-				 gint			 width,
-				 gint			 height);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1)  (void);
-  void (*_gtk_reserved2)  (void);
-  void (*_gtk_reserved3)  (void);
-  void (*_gtk_reserved4)  (void);
-  void (*_gtk_reserved5)  (void);
-  void (*_gtk_reserved6)  (void);
-  void (*_gtk_reserved7)  (void);
-  void (*_gtk_reserved8)  (void);
-  void (*_gtk_reserved9)  (void);
-  void (*_gtk_reserved10) (void);
-  void (*_gtk_reserved11) (void);
-  void (*_gtk_reserved12) (void);
-};
-
-struct _GtkBorder
-{
-  gint left;
-  gint right;
-  gint top;
-  gint bottom;
-};
-
-GType     gtk_style_get_type                 (void) G_GNUC_CONST;
-GtkStyle* gtk_style_new			     (void);
-GtkStyle* gtk_style_copy		     (GtkStyle	   *style);
-GtkStyle* gtk_style_attach		     (GtkStyle	   *style,
-					      GdkWindow	   *window) G_GNUC_WARN_UNUSED_RESULT;
-void	  gtk_style_detach		     (GtkStyle	   *style);
-
-#ifndef GTK_DISABLE_DEPRECATED
-GtkStyle* gtk_style_ref			     (GtkStyle	   *style);
-void	  gtk_style_unref		     (GtkStyle	   *style);
-
-GdkFont * gtk_style_get_font                 (GtkStyle     *style);
-void      gtk_style_set_font                 (GtkStyle     *style,
-					      GdkFont      *font);
-#endif /* GTK_DISABLE_DEPRECATED */
-
-void	  gtk_style_set_background	     (GtkStyle	   *style,
-					      GdkWindow	   *window,
-					      GtkStateType  state_type);
-void	  gtk_style_apply_default_background (GtkStyle	   *style,
-					      GdkWindow	   *window,
-					      gboolean	    set_bg,
-					      GtkStateType  state_type, 
-					      GdkRectangle *area, 
-					      gint	    x, 
-					      gint	    y, 
-					      gint	    width, 
-					      gint	    height);
-
-GtkIconSet* gtk_style_lookup_icon_set        (GtkStyle     *style,
-                                              const gchar  *stock_id);
-gboolean    gtk_style_lookup_color           (GtkStyle     *style,
-                                              const gchar  *color_name,
-                                              GdkColor     *color);
-
-GdkPixbuf*  gtk_style_render_icon     (GtkStyle            *style,
-                                       const GtkIconSource *source,
-                                       GtkTextDirection     direction,
-                                       GtkStateType         state,
-                                       GtkIconSize          size,
-                                       GtkWidget           *widget,
-                                       const gchar         *detail);
-
-#ifndef GTK_DISABLE_DEPRECATED
-void gtk_draw_hline      (GtkStyle        *style,
-			  GdkWindow       *window,
-			  GtkStateType     state_type,
-			  gint             x1,
-			  gint             x2,
-			  gint             y);
-void gtk_draw_vline      (GtkStyle        *style,
-			  GdkWindow       *window,
-			  GtkStateType     state_type,
-			  gint             y1_,
-			  gint             y2_,
-			  gint             x);
-void gtk_draw_shadow     (GtkStyle        *style,
-			  GdkWindow       *window,
-			  GtkStateType     state_type,
-			  GtkShadowType    shadow_type,
-			  gint             x,
-			  gint             y,
-			  gint             width,
-			  gint             height);
-void gtk_draw_polygon    (GtkStyle        *style,
-			  GdkWindow       *window,
-			  GtkStateType     state_type,
-			  GtkShadowType    shadow_type,
-			  GdkPoint        *points,
-			  gint             npoints,
-			  gboolean         fill);
-void gtk_draw_arrow      (GtkStyle        *style,
-			  GdkWindow       *window,
-			  GtkStateType     state_type,
-			  GtkShadowType    shadow_type,
-			  GtkArrowType     arrow_type,
-			  gboolean         fill,
-			  gint             x,
-			  gint             y,
-			  gint             width,
-			  gint             height);
-void gtk_draw_diamond    (GtkStyle        *style,
-			  GdkWindow       *window,
-			  GtkStateType     state_type,
-			  GtkShadowType    shadow_type,
-			  gint             x,
-			  gint             y,
-			  gint             width,
-			  gint             height);
-void gtk_draw_box        (GtkStyle        *style,
-			  GdkWindow       *window,
-			  GtkStateType     state_type,
-			  GtkShadowType    shadow_type,
-			  gint             x,
-			  gint             y,
-			  gint             width,
-			  gint             height);
-void gtk_draw_flat_box   (GtkStyle        *style,
-			  GdkWindow       *window,
-			  GtkStateType     state_type,
-			  GtkShadowType    shadow_type,
-			  gint             x,
-			  gint             y,
-			  gint             width,
-			  gint             height);
-void gtk_draw_check      (GtkStyle        *style,
-			  GdkWindow       *window,
-			  GtkStateType     state_type,
-			  GtkShadowType    shadow_type,
-			  gint             x,
-			  gint             y,
-			  gint             width,
-			  gint             height);
-void gtk_draw_option     (GtkStyle        *style,
-			  GdkWindow       *window,
-			  GtkStateType     state_type,
-			  GtkShadowType    shadow_type,
-			  gint             x,
-			  gint             y,
-			  gint             width,
-			  gint             height);
-void gtk_draw_tab        (GtkStyle        *style,
-			  GdkWindow       *window,
-			  GtkStateType     state_type,
-			  GtkShadowType    shadow_type,
-			  gint             x,
-			  gint             y,
-			  gint             width,
-			  gint             height);
-void gtk_draw_shadow_gap (GtkStyle        *style,
-			  GdkWindow       *window,
-			  GtkStateType     state_type,
-			  GtkShadowType    shadow_type,
-			  gint             x,
-			  gint             y,
-			  gint             width,
-			  gint             height,
-			  GtkPositionType  gap_side,
-			  gint             gap_x,
-			  gint             gap_width);
-void gtk_draw_box_gap    (GtkStyle        *style,
-			  GdkWindow       *window,
-			  GtkStateType     state_type,
-			  GtkShadowType    shadow_type,
-			  gint             x,
-			  gint             y,
-			  gint             width,
-			  gint             height,
-			  GtkPositionType  gap_side,
-			  gint             gap_x,
-			  gint             gap_width);
-void gtk_draw_extension  (GtkStyle        *style,
-			  GdkWindow       *window,
-			  GtkStateType     state_type,
-			  GtkShadowType    shadow_type,
-			  gint             x,
-			  gint             y,
-			  gint             width,
-			  gint             height,
-			  GtkPositionType  gap_side);
-void gtk_draw_focus      (GtkStyle        *style,
-			  GdkWindow       *window,
-			  gint             x,
-			  gint             y,
-			  gint             width,
-			  gint             height);
-void gtk_draw_slider     (GtkStyle        *style,
-			  GdkWindow       *window,
-			  GtkStateType     state_type,
-			  GtkShadowType    shadow_type,
-			  gint             x,
-			  gint             y,
-			  gint             width,
-			  gint             height,
-			  GtkOrientation   orientation);
-void gtk_draw_handle     (GtkStyle        *style,
-			  GdkWindow       *window,
-			  GtkStateType     state_type,
-			  GtkShadowType    shadow_type,
-			  gint             x,
-			  gint             y,
-			  gint             width,
-			  gint             height,
-			  GtkOrientation   orientation);
-void gtk_draw_expander   (GtkStyle        *style,
-                          GdkWindow       *window,
-                          GtkStateType     state_type,
-                          gint             x,
-                          gint             y,
-			  GtkExpanderStyle expander_style);
-void gtk_draw_layout     (GtkStyle        *style,
-                          GdkWindow       *window,
-                          GtkStateType     state_type,
-			  gboolean         use_text,
-                          gint             x,
-                          gint             y,
-                          PangoLayout     *layout);
-void gtk_draw_resize_grip (GtkStyle       *style,
-                           GdkWindow      *window,
-                           GtkStateType    state_type,
-                           GdkWindowEdge   edge,
-                           gint            x,
-                           gint            y,
-                           gint            width,
-                           gint            height);
-#endif /* GTK_DISABLE_DEPRECATED */
-
-void gtk_paint_hline      (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   const gchar     *detail,
-			   gint             x1,
-			   gint             x2,
-			   gint             y);
-void gtk_paint_vline      (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   const gchar     *detail,
-			   gint             y1_,
-			   gint             y2_,
-			   gint             x);
-void gtk_paint_shadow     (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GtkShadowType    shadow_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   const gchar     *detail,
-			   gint             x,
-			   gint             y,
-			   gint             width,
-			   gint             height);
-void gtk_paint_polygon    (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GtkShadowType    shadow_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   const gchar     *detail,
-			   GdkPoint        *points,
-			   gint             npoints,
-			   gboolean         fill);
-void gtk_paint_arrow      (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GtkShadowType    shadow_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   const gchar     *detail,
-			   GtkArrowType     arrow_type,
-			   gboolean         fill,
-			   gint             x,
-			   gint             y,
-			   gint             width,
-			   gint             height);
-void gtk_paint_diamond    (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GtkShadowType    shadow_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   const gchar     *detail,
-			   gint             x,
-			   gint             y,
-			   gint             width,
-			   gint             height);
-void gtk_paint_box        (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GtkShadowType    shadow_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   const gchar     *detail,
-			   gint             x,
-			   gint             y,
-			   gint             width,
-			   gint             height);
-void gtk_paint_flat_box   (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GtkShadowType    shadow_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   const gchar     *detail,
-			   gint             x,
-			   gint             y,
-			   gint             width,
-			   gint             height);
-void gtk_paint_check      (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GtkShadowType    shadow_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   const gchar     *detail,
-			   gint             x,
-			   gint             y,
-			   gint             width,
-			   gint             height);
-void gtk_paint_option     (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GtkShadowType    shadow_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   const gchar     *detail,
-			   gint             x,
-			   gint             y,
-			   gint             width,
-			   gint             height);
-void gtk_paint_tab        (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GtkShadowType    shadow_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   const gchar     *detail,
-			   gint             x,
-			   gint             y,
-			   gint             width,
-			   gint             height);
-void gtk_paint_shadow_gap (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GtkShadowType    shadow_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   gchar           *detail,
-			   gint             x,
-			   gint             y,
-			   gint             width,
-			   gint             height,
-			   GtkPositionType  gap_side,
-			   gint             gap_x,
-			   gint             gap_width);
-void gtk_paint_box_gap    (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GtkShadowType    shadow_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   gchar           *detail,
-			   gint             x,
-			   gint             y,
-			   gint             width,
-			   gint             height,
-			   GtkPositionType  gap_side,
-			   gint             gap_x,
-			   gint             gap_width);
-void gtk_paint_extension  (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GtkShadowType    shadow_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   gchar           *detail,
-			   gint             x,
-			   gint             y,
-			   gint             width,
-			   gint             height,
-			   GtkPositionType  gap_side);
-void gtk_paint_focus      (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   const gchar     *detail,
-			   gint             x,
-			   gint             y,
-			   gint             width,
-			   gint             height);
-void gtk_paint_slider     (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GtkShadowType    shadow_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   const gchar     *detail,
-			   gint             x,
-			   gint             y,
-			   gint             width,
-			   gint             height,
-			   GtkOrientation   orientation);
-void gtk_paint_handle     (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GtkShadowType    shadow_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   const gchar     *detail,
-			   gint             x,
-			   gint             y,
-			   gint             width,
-			   gint             height,
-			   GtkOrientation   orientation);
-void gtk_paint_expander   (GtkStyle        *style,
-                           GdkWindow       *window,
-                           GtkStateType     state_type,
-                           GdkRectangle    *area,
-                           GtkWidget       *widget,
-                           const gchar     *detail,
-                           gint             x,
-                           gint             y,
-			   GtkExpanderStyle expander_style);
-void gtk_paint_layout     (GtkStyle        *style,
-                           GdkWindow       *window,
-                           GtkStateType     state_type,
-			   gboolean         use_text,
-                           GdkRectangle    *area,
-                           GtkWidget       *widget,
-                           const gchar     *detail,
-                           gint             x,
-                           gint             y,
-                           PangoLayout     *layout);
-
-void gtk_paint_resize_grip (GtkStyle		*style,
-                            GdkWindow		*window,
-                            GtkStateType         state_type,
-                            GdkRectangle        *area,
-                            GtkWidget		*widget,
-                            const gchar		*detail,
-                            GdkWindowEdge        edge,
-                            gint                 x,
-                            gint                 y,
-                            gint                 width,
-                            gint           	 height);
-
-
-GType      gtk_border_get_type (void) G_GNUC_CONST;
-GtkBorder *gtk_border_copy     (const GtkBorder *border_);
-void       gtk_border_free     (GtkBorder       *border_);
-
-/* --- private API --- */
-const GValue* _gtk_style_peek_property_value (GtkStyle           *style,
-					      GType               widget_type,
-					      GParamSpec         *pspec,
-					      GtkRcPropertyParser parser);
-
-void          _gtk_style_init_for_settings   (GtkStyle           *style,
-                                              GtkSettings        *settings);
-
-void          _gtk_style_shade               (GdkColor           *a,
-                                              GdkColor           *b,
-                                              gdouble             k);
-
-/* deprecated */
-#ifndef GTK_DISABLE_DEPRECATED
-#define gtk_style_apply_default_pixmap(s,gw,st,a,x,y,w,h) gtk_style_apply_default_background (s,gw,1,st,a,x,y,w,h)
-void gtk_draw_string     (GtkStyle        *style,
-			  GdkWindow       *window,
-			  GtkStateType     state_type,
-			  gint             x,
-			  gint             y,
-			  const gchar     *string);
-void gtk_paint_string     (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   const gchar     *detail,
-			   gint             x,
-			   gint             y,
-			   const gchar     *string);
-#endif /* GTK_DISABLE_DEPRECATED */
-
-void   gtk_draw_insertion_cursor (GtkWidget        *widget,
-				  GdkDrawable      *drawable,
-				  GdkRectangle     *area,
-				  GdkRectangle     *location,
-				  gboolean          is_primary,
-				  GtkTextDirection  direction,
-				  gboolean          draw_arrow);
-GdkGC *_gtk_widget_get_cursor_gc    (GtkWidget *widget);
-void   _gtk_widget_get_cursor_color (GtkWidget *widget,
-				     GdkColor  *color);
-
-G_END_DECLS
-
-#endif /* __GTK_STYLE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktable.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktable.h
deleted file mode 100644
index f925d330..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktable.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_TABLE_H__
-#define __GTK_TABLE_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkcontainer.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_TABLE			(gtk_table_get_type ())
-#define GTK_TABLE(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TABLE, GtkTable))
-#define GTK_TABLE_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TABLE, GtkTableClass))
-#define GTK_IS_TABLE(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TABLE))
-#define GTK_IS_TABLE_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TABLE))
-#define GTK_TABLE_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TABLE, GtkTableClass))
-
-
-typedef struct _GtkTable	GtkTable;
-typedef struct _GtkTableClass	GtkTableClass;
-typedef struct _GtkTableChild	GtkTableChild;
-typedef struct _GtkTableRowCol	GtkTableRowCol;
-
-struct _GtkTable
-{
-  GtkContainer container;
-  
-  GList *children;
-  GtkTableRowCol *rows;
-  GtkTableRowCol *cols;
-  guint16 nrows;
-  guint16 ncols;
-  guint16 column_spacing;
-  guint16 row_spacing;
-  guint homogeneous : 1;
-};
-
-struct _GtkTableClass
-{
-  GtkContainerClass parent_class;
-};
-
-struct _GtkTableChild
-{
-  GtkWidget *widget;
-  guint16 left_attach;
-  guint16 right_attach;
-  guint16 top_attach;
-  guint16 bottom_attach;
-  guint16 xpadding;
-  guint16 ypadding;
-  guint xexpand : 1;
-  guint yexpand : 1;
-  guint xshrink : 1;
-  guint yshrink : 1;
-  guint xfill : 1;
-  guint yfill : 1;
-};
-
-struct _GtkTableRowCol
-{
-  guint16 requisition;
-  guint16 allocation;
-  guint16 spacing;
-  guint need_expand : 1;
-  guint need_shrink : 1;
-  guint expand : 1;
-  guint shrink : 1;
-  guint empty : 1;
-};
-
-
-GType	   gtk_table_get_type	      (void) G_GNUC_CONST;
-GtkWidget* gtk_table_new	      (guint		rows,
-				       guint		columns,
-				       gboolean		homogeneous);
-void	   gtk_table_resize	      (GtkTable	       *table,
-				       guint            rows,
-				       guint            columns);
-void	   gtk_table_attach	      (GtkTable	       *table,
-				       GtkWidget       *child,
-				       guint		left_attach,
-				       guint		right_attach,
-				       guint		top_attach,
-				       guint		bottom_attach,
-				       GtkAttachOptions xoptions,
-				       GtkAttachOptions yoptions,
-				       guint		xpadding,
-				       guint		ypadding);
-void	   gtk_table_attach_defaults  (GtkTable	       *table,
-				       GtkWidget       *widget,
-				       guint		left_attach,
-				       guint		right_attach,
-				       guint		top_attach,
-				       guint		bottom_attach);
-void	   gtk_table_set_row_spacing  (GtkTable	       *table,
-				       guint		row,
-				       guint		spacing);
-guint      gtk_table_get_row_spacing  (GtkTable        *table,
-				       guint            row);
-void	   gtk_table_set_col_spacing  (GtkTable	       *table,
-				       guint		column,
-				       guint		spacing);
-guint      gtk_table_get_col_spacing  (GtkTable        *table,
-				       guint            column);
-void	   gtk_table_set_row_spacings (GtkTable	       *table,
-				       guint		spacing);
-guint      gtk_table_get_default_row_spacing (GtkTable        *table);
-void	   gtk_table_set_col_spacings (GtkTable	       *table,
-				       guint		spacing);
-guint      gtk_table_get_default_col_spacing (GtkTable        *table);
-void	   gtk_table_set_homogeneous  (GtkTable	       *table,
-				       gboolean		homogeneous);
-gboolean   gtk_table_get_homogeneous  (GtkTable        *table);
-
-
-G_END_DECLS
-
-#endif /* __GTK_TABLE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktearoffmenuitem.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktearoffmenuitem.h
deleted file mode 100644
index cd744b0d..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktearoffmenuitem.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_TEAROFF_MENU_ITEM_H__
-#define __GTK_TEAROFF_MENU_ITEM_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkmenuitem.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_TEAROFF_MENU_ITEM	      (gtk_tearoff_menu_item_get_type ())
-#define GTK_TEAROFF_MENU_ITEM(obj)	      (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TEAROFF_MENU_ITEM, GtkTearoffMenuItem))
-#define GTK_TEAROFF_MENU_ITEM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEAROFF_MENU_ITEM, GtkTearoffMenuItemClass))
-#define GTK_IS_TEAROFF_MENU_ITEM(obj)	      (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TEAROFF_MENU_ITEM))
-#define GTK_IS_TEAROFF_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TEAROFF_MENU_ITEM))
-#define GTK_TEAROFF_MENU_ITEM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TEAROFF_MENU_ITEM, GtkTearoffMenuItemClass))
-
-
-typedef struct _GtkTearoffMenuItem       GtkTearoffMenuItem;
-typedef struct _GtkTearoffMenuItemClass  GtkTearoffMenuItemClass;
-
-struct _GtkTearoffMenuItem
-{
-  GtkMenuItem menu_item;
-
-  guint torn_off : 1;
-};
-
-struct _GtkTearoffMenuItemClass
-{
-  GtkMenuItemClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType	   gtk_tearoff_menu_item_get_type     (void) G_GNUC_CONST;
-GtkWidget* gtk_tearoff_menu_item_new	      (void);
-
-G_END_DECLS
-
-#endif /* __GTK_TEAROFF_MENU_ITEM_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktext.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktext.h
deleted file mode 100644
index a2be7faf..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktext.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifdef GTK_ENABLE_BROKEN
-
-#ifndef __GTK_TEXT_H__
-#define __GTK_TEXT_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkadjustment.h>
-#include <gtk/gtkoldeditable.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_TEXT                  (gtk_text_get_type ())
-#define GTK_TEXT(obj)                  (GTK_CHECK_CAST ((obj), GTK_TYPE_TEXT, GtkText))
-#define GTK_TEXT_CLASS(klass)          (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT, GtkTextClass))
-#define GTK_IS_TEXT(obj)               (GTK_CHECK_TYPE ((obj), GTK_TYPE_TEXT))
-#define GTK_IS_TEXT_CLASS(klass)       (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TEXT))
-#define GTK_TEXT_GET_CLASS(obj)        (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TEXT, GtkTextClass))
-
-
-typedef struct _GtkTextFont       GtkTextFont;
-typedef struct _GtkPropertyMark   GtkPropertyMark;
-typedef struct _GtkText           GtkText;
-typedef struct _GtkTextClass      GtkTextClass;
-
-struct _GtkPropertyMark
-{
-  /* Position in list. */
-  GList* property;
-
-  /* Offset into that property. */
-  guint offset;
-
-  /* Current index. */
-  guint index;
-};
-
-struct _GtkText
-{
-  GtkOldEditable old_editable;
-
-  GdkWindow *text_area;
-
-  GtkAdjustment *hadj;
-  GtkAdjustment *vadj;
-
-  GdkGC *gc;
-
-  GdkPixmap* line_wrap_bitmap;
-  GdkPixmap* line_arrow_bitmap;
-
-		      /* GAPPED TEXT SEGMENT */
-
-  /* The text, a single segment of text a'la emacs, with a gap
-   * where insertion occurs. */
-  union { GdkWChar *wc; guchar  *ch; } text;
-  /* The allocated length of the text segment. */
-  guint text_len;
-  /* The gap position, index into address where a char
-   * should be inserted. */
-  guint gap_position;
-  /* The gap size, s.t. *(text + gap_position + gap_size) is
-   * the first valid character following the gap. */
-  guint gap_size;
-  /* The last character position, index into address where a
-   * character should be appeneded.  Thus, text_end - gap_size
-   * is the length of the actual data. */
-  guint text_end;
-			/* LINE START CACHE */
-
-  /* A cache of line-start information.  Data is a LineParam*. */
-  GList *line_start_cache;
-  /* Index to the start of the first visible line. */
-  guint first_line_start_index;
-  /* The number of pixels cut off of the top line. */
-  guint first_cut_pixels;
-  /* First visible horizontal pixel. */
-  guint first_onscreen_hor_pixel;
-  /* First visible vertical pixel. */
-  guint first_onscreen_ver_pixel;
-
-			     /* FLAGS */
-
-  /* True iff this buffer is wrapping lines, otherwise it is using a
-   * horizontal scrollbar. */
-  guint line_wrap : 1;
-  guint word_wrap : 1;
- /* If a fontset is supplied for the widget, use_wchar become true,
-   * and we use GdkWchar as the encoding of text. */
-  guint use_wchar : 1;
-
-  /* Frozen, don't do updates. @@@ fixme */
-  guint freeze_count;
-			/* TEXT PROPERTIES */
-
-  /* A doubly-linked-list containing TextProperty objects. */
-  GList *text_properties;
-  /* The end of this list. */
-  GList *text_properties_end;
-  /* The first node before or on the point along with its offset to
-   * the point and the buffer's current point.  This is the only
-   * PropertyMark whose index is guaranteed to remain correct
-   * following a buffer insertion or deletion. */
-  GtkPropertyMark point;
-
-			  /* SCRATCH AREA */
-
-  union { GdkWChar *wc; guchar *ch; } scratch_buffer;
-  guint   scratch_buffer_len;
-
-			   /* SCROLLING */
-
-  gint last_ver_value;
-
-			     /* CURSOR */
-
-  gint            cursor_pos_x;       /* Position of cursor. */
-  gint            cursor_pos_y;       /* Baseline of line cursor is drawn on. */
-  GtkPropertyMark cursor_mark;        /* Where it is in the buffer. */
-  GdkWChar        cursor_char;        /* Character to redraw. */
-  gchar           cursor_char_offset; /* Distance from baseline of the font. */
-  gint            cursor_virtual_x;   /* Where it would be if it could be. */
-  gint            cursor_drawn_level; /* How many people have undrawn. */
-
-			  /* Current Line */
-
-  GList *current_line;
-
-			   /* Tab Stops */
-
-  GList *tab_stops;
-  gint default_tab_width;
-
-  GtkTextFont *current_font;	/* Text font for current style */
-
-  /* Timer used for auto-scrolling off ends */
-  gint timer;
-  
-  guint button;			/* currently pressed mouse button */
-  GdkGC *bg_gc;			/* gc for drawing background pixmap */
-};
-
-struct _GtkTextClass
-{
-  GtkOldEditableClass parent_class;
-
-  void  (*set_scroll_adjustments)   (GtkText	    *text,
-				     GtkAdjustment  *hadjustment,
-				     GtkAdjustment  *vadjustment);
-};
-
-
-GtkType    gtk_text_get_type        (void) G_GNUC_CONST;
-GtkWidget* gtk_text_new             (GtkAdjustment *hadj,
-				     GtkAdjustment *vadj);
-void       gtk_text_set_editable    (GtkText       *text,
-				     gboolean       editable);
-void       gtk_text_set_word_wrap   (GtkText       *text,
-				     gboolean       word_wrap);
-void       gtk_text_set_line_wrap   (GtkText       *text,
-				     gboolean       line_wrap);
-void       gtk_text_set_adjustments (GtkText       *text,
-				     GtkAdjustment *hadj,
-				     GtkAdjustment *vadj);
-void       gtk_text_set_point       (GtkText       *text,
-				     guint          index);
-guint      gtk_text_get_point       (GtkText       *text);
-guint      gtk_text_get_length      (GtkText       *text);
-void       gtk_text_freeze          (GtkText       *text);
-void       gtk_text_thaw            (GtkText       *text);
-void       gtk_text_insert          (GtkText        *text,
-				     GdkFont        *font,
-				     const GdkColor *fore,
-				     const GdkColor *back,
-				     const char     *chars,
-				     gint            length);
-gboolean   gtk_text_backward_delete (GtkText       *text,
-				     guint          nchars);
-gboolean   gtk_text_forward_delete  (GtkText       *text,
-				     guint          nchars);
-
-#define GTK_TEXT_INDEX(t, index)	(((t)->use_wchar) \
-	? ((index) < (t)->gap_position ? (t)->text.wc[index] : \
-					(t)->text.wc[(index)+(t)->gap_size]) \
-	: ((index) < (t)->gap_position ? (t)->text.ch[index] : \
-					(t)->text.ch[(index)+(t)->gap_size]))
-
-G_END_DECLS
-
-#endif /* __GTK_TEXT_H__ */
-
-#endif /* GTK_ENABLE_BROKEN */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextbuffer.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextbuffer.h
deleted file mode 100644
index 9a0eb9d2..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextbuffer.h
+++ /dev/null
@@ -1,403 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtktextbuffer.h 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.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __GTK_TEXT_BUFFER_H__
-#define __GTK_TEXT_BUFFER_H__
-
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkclipboard.h>
-#include <gtk/gtktexttagtable.h>
-#include <gtk/gtktextiter.h>
-#include <gtk/gtktextmark.h>
-#include <gtk/gtktextchild.h>
-
-G_BEGIN_DECLS
-
-/*
- * This is the PUBLIC representation of a text buffer.
- * GtkTextBTree is the PRIVATE internal representation of it.
- */
-
-/* these values are used as "info" for the targets contained in the
- * lists returned by gtk_text_buffer_get_copy,paste_target_list()
- *
- * the enum counts down from G_MAXUINT to avoid clashes with application
- * added drag destinations which usually start at 0.
- */
-typedef enum
-{
-  GTK_TEXT_BUFFER_TARGET_INFO_BUFFER_CONTENTS = - 1,
-  GTK_TEXT_BUFFER_TARGET_INFO_RICH_TEXT       = - 2,
-  GTK_TEXT_BUFFER_TARGET_INFO_TEXT            = - 3
-} GtkTextBufferTargetInfo;
-
-typedef struct _GtkTextBTree GtkTextBTree;
-
-typedef struct _GtkTextLogAttrCache GtkTextLogAttrCache;
-
-#define GTK_TYPE_TEXT_BUFFER            (gtk_text_buffer_get_type ())
-#define GTK_TEXT_BUFFER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TEXT_BUFFER, GtkTextBuffer))
-#define GTK_TEXT_BUFFER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_BUFFER, GtkTextBufferClass))
-#define GTK_IS_TEXT_BUFFER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TEXT_BUFFER))
-#define GTK_IS_TEXT_BUFFER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TEXT_BUFFER))
-#define GTK_TEXT_BUFFER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TEXT_BUFFER, GtkTextBufferClass))
-
-typedef struct _GtkTextBufferClass GtkTextBufferClass;
-
-struct _GtkTextBuffer
-{
-  GObject parent_instance;
-
-  GtkTextTagTable *tag_table;
-  GtkTextBTree *btree;
-
-  GSList *clipboard_contents_buffers;
-  GSList *selection_clipboards;
-
-  GtkTextLogAttrCache *log_attr_cache;
-
-  guint user_action_count;
-  
-  /* Whether the buffer has been modified since last save */
-  guint modified : 1;
-
-  guint has_selection : 1;
-};
-
-struct _GtkTextBufferClass
-{
-  GObjectClass parent_class;
-
-  void (* insert_text)     (GtkTextBuffer *buffer,
-                            GtkTextIter *pos,
-                            const gchar *text,
-                            gint length);
-
-  void (* insert_pixbuf)   (GtkTextBuffer *buffer,
-                            GtkTextIter   *pos,
-                            GdkPixbuf     *pixbuf);
-
-  void (* insert_child_anchor)   (GtkTextBuffer      *buffer,
-                                  GtkTextIter        *pos,
-                                  GtkTextChildAnchor *anchor);
-  
-  void (* delete_range)     (GtkTextBuffer *buffer,
-                             GtkTextIter   *start,
-                             GtkTextIter   *end);
-
-  /* Only for text/widgets/pixbuf changed, marks/tags don't cause this
-   * to be emitted
-   */
-  void (* changed)         (GtkTextBuffer *buffer);
-
-
-  /* New value for the modified flag */
-  void (* modified_changed)   (GtkTextBuffer *buffer);
-
-  /* Mark moved or created */
-  void (* mark_set)           (GtkTextBuffer *buffer,
-                               const GtkTextIter *location,
-                               GtkTextMark *mark);
-
-  void (* mark_deleted)       (GtkTextBuffer *buffer,
-                               GtkTextMark *mark);
-
-  void (* apply_tag)          (GtkTextBuffer *buffer,
-                               GtkTextTag *tag,
-                               const GtkTextIter *start_char,
-                               const GtkTextIter *end_char);
-
-  void (* remove_tag)         (GtkTextBuffer *buffer,
-                               GtkTextTag *tag,
-                               const GtkTextIter *start_char,
-                               const GtkTextIter *end_char);
-
-  /* Called at the start and end of an atomic user action */
-  void (* begin_user_action)  (GtkTextBuffer *buffer);
-  void (* end_user_action)    (GtkTextBuffer *buffer);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-  void (*_gtk_reserved5) (void);
-  void (*_gtk_reserved6) (void);
-};
-
-GType        gtk_text_buffer_get_type       (void) G_GNUC_CONST;
-
-
-
-/* table is NULL to create a new one */
-GtkTextBuffer *gtk_text_buffer_new            (GtkTextTagTable *table);
-gint           gtk_text_buffer_get_line_count (GtkTextBuffer   *buffer);
-gint           gtk_text_buffer_get_char_count (GtkTextBuffer   *buffer);
-
-
-GtkTextTagTable* gtk_text_buffer_get_tag_table (GtkTextBuffer  *buffer);
-
-/* Delete whole buffer, then insert */
-void gtk_text_buffer_set_text          (GtkTextBuffer *buffer,
-                                        const gchar   *text,
-                                        gint           len);
-
-/* Insert into the buffer */
-void gtk_text_buffer_insert            (GtkTextBuffer *buffer,
-                                        GtkTextIter   *iter,
-                                        const gchar   *text,
-                                        gint           len);
-void gtk_text_buffer_insert_at_cursor  (GtkTextBuffer *buffer,
-                                        const gchar   *text,
-                                        gint           len);
-
-gboolean gtk_text_buffer_insert_interactive           (GtkTextBuffer *buffer,
-                                                       GtkTextIter   *iter,
-                                                       const gchar   *text,
-                                                       gint           len,
-                                                       gboolean       default_editable);
-gboolean gtk_text_buffer_insert_interactive_at_cursor (GtkTextBuffer *buffer,
-                                                       const gchar   *text,
-                                                       gint           len,
-                                                       gboolean       default_editable);
-
-void     gtk_text_buffer_insert_range             (GtkTextBuffer     *buffer,
-                                                   GtkTextIter       *iter,
-                                                   const GtkTextIter *start,
-                                                   const GtkTextIter *end);
-gboolean gtk_text_buffer_insert_range_interactive (GtkTextBuffer     *buffer,
-                                                   GtkTextIter       *iter,
-                                                   const GtkTextIter *start,
-                                                   const GtkTextIter *end,
-                                                   gboolean           default_editable);
-
-void    gtk_text_buffer_insert_with_tags          (GtkTextBuffer     *buffer,
-                                                   GtkTextIter       *iter,
-                                                   const gchar       *text,
-                                                   gint               len,
-                                                   GtkTextTag        *first_tag,
-                                                   ...) G_GNUC_NULL_TERMINATED;
-
-void    gtk_text_buffer_insert_with_tags_by_name  (GtkTextBuffer     *buffer,
-                                                   GtkTextIter       *iter,
-                                                   const gchar       *text,
-                                                   gint               len,
-                                                   const gchar       *first_tag_name,
-                                                   ...) G_GNUC_NULL_TERMINATED;
-
-/* Delete from the buffer */
-void     gtk_text_buffer_delete             (GtkTextBuffer *buffer,
-					     GtkTextIter   *start,
-					     GtkTextIter   *end);
-gboolean gtk_text_buffer_delete_interactive (GtkTextBuffer *buffer,
-					     GtkTextIter   *start_iter,
-					     GtkTextIter   *end_iter,
-					     gboolean       default_editable);
-gboolean gtk_text_buffer_backspace          (GtkTextBuffer *buffer,
-					     GtkTextIter   *iter,
-					     gboolean       interactive,
-					     gboolean       default_editable);
-
-/* Obtain strings from the buffer */
-gchar          *gtk_text_buffer_get_text            (GtkTextBuffer     *buffer,
-                                                     const GtkTextIter *start,
-                                                     const GtkTextIter *end,
-                                                     gboolean           include_hidden_chars);
-
-gchar          *gtk_text_buffer_get_slice           (GtkTextBuffer     *buffer,
-                                                     const GtkTextIter *start,
-                                                     const GtkTextIter *end,
-                                                     gboolean           include_hidden_chars);
-
-/* Insert a pixbuf */
-void gtk_text_buffer_insert_pixbuf         (GtkTextBuffer *buffer,
-                                            GtkTextIter   *iter,
-                                            GdkPixbuf     *pixbuf);
-
-/* Insert a child anchor */
-void               gtk_text_buffer_insert_child_anchor (GtkTextBuffer      *buffer,
-                                                        GtkTextIter        *iter,
-                                                        GtkTextChildAnchor *anchor);
-
-/* Convenience, create and insert a child anchor */
-GtkTextChildAnchor *gtk_text_buffer_create_child_anchor (GtkTextBuffer *buffer,
-                                                         GtkTextIter   *iter);
-
-/* Mark manipulation */
-void           gtk_text_buffer_add_mark    (GtkTextBuffer     *buffer,
-                                            GtkTextMark       *mark,
-                                            const GtkTextIter *where);
-GtkTextMark   *gtk_text_buffer_create_mark (GtkTextBuffer     *buffer,
-                                            const gchar       *mark_name,
-                                            const GtkTextIter *where,
-                                            gboolean           left_gravity);
-void           gtk_text_buffer_move_mark   (GtkTextBuffer     *buffer,
-                                            GtkTextMark       *mark,
-                                            const GtkTextIter *where);
-void           gtk_text_buffer_delete_mark (GtkTextBuffer     *buffer,
-                                            GtkTextMark       *mark);
-GtkTextMark*   gtk_text_buffer_get_mark    (GtkTextBuffer     *buffer,
-                                            const gchar       *name);
-
-void gtk_text_buffer_move_mark_by_name   (GtkTextBuffer     *buffer,
-                                          const gchar       *name,
-                                          const GtkTextIter *where);
-void gtk_text_buffer_delete_mark_by_name (GtkTextBuffer     *buffer,
-                                          const gchar       *name);
-
-GtkTextMark* gtk_text_buffer_get_insert          (GtkTextBuffer *buffer);
-GtkTextMark* gtk_text_buffer_get_selection_bound (GtkTextBuffer *buffer);
-
-/* efficiently move insert and selection_bound at the same time */
-void gtk_text_buffer_place_cursor (GtkTextBuffer     *buffer,
-                                   const GtkTextIter *where);
-void gtk_text_buffer_select_range (GtkTextBuffer     *buffer,
-                                   const GtkTextIter *ins,
-				   const GtkTextIter *bound);
-
-
-
-/* Tag manipulation */
-void gtk_text_buffer_apply_tag             (GtkTextBuffer     *buffer,
-                                            GtkTextTag        *tag,
-                                            const GtkTextIter *start,
-                                            const GtkTextIter *end);
-void gtk_text_buffer_remove_tag            (GtkTextBuffer     *buffer,
-                                            GtkTextTag        *tag,
-                                            const GtkTextIter *start,
-                                            const GtkTextIter *end);
-void gtk_text_buffer_apply_tag_by_name     (GtkTextBuffer     *buffer,
-                                            const gchar       *name,
-                                            const GtkTextIter *start,
-                                            const GtkTextIter *end);
-void gtk_text_buffer_remove_tag_by_name    (GtkTextBuffer     *buffer,
-                                            const gchar       *name,
-                                            const GtkTextIter *start,
-                                            const GtkTextIter *end);
-void gtk_text_buffer_remove_all_tags       (GtkTextBuffer     *buffer,
-                                            const GtkTextIter *start,
-                                            const GtkTextIter *end);
-
-
-/* You can either ignore the return value, or use it to
- * set the attributes of the tag. tag_name can be NULL
- */
-GtkTextTag    *gtk_text_buffer_create_tag (GtkTextBuffer *buffer,
-                                           const gchar   *tag_name,
-                                           const gchar   *first_property_name,
-                                           ...);
-
-/* Obtain iterators pointed at various places, then you can move the
- * iterator around using the GtkTextIter operators
- */
-void gtk_text_buffer_get_iter_at_line_offset (GtkTextBuffer *buffer,
-                                              GtkTextIter   *iter,
-                                              gint           line_number,
-                                              gint           char_offset);
-void gtk_text_buffer_get_iter_at_line_index  (GtkTextBuffer *buffer,
-                                              GtkTextIter   *iter,
-                                              gint           line_number,
-                                              gint           byte_index);
-void gtk_text_buffer_get_iter_at_offset      (GtkTextBuffer *buffer,
-                                              GtkTextIter   *iter,
-                                              gint           char_offset);
-void gtk_text_buffer_get_iter_at_line        (GtkTextBuffer *buffer,
-                                              GtkTextIter   *iter,
-                                              gint           line_number);
-void gtk_text_buffer_get_start_iter          (GtkTextBuffer *buffer,
-                                              GtkTextIter   *iter);
-void gtk_text_buffer_get_end_iter            (GtkTextBuffer *buffer,
-                                              GtkTextIter   *iter);
-void gtk_text_buffer_get_bounds              (GtkTextBuffer *buffer,
-                                              GtkTextIter   *start,
-                                              GtkTextIter   *end);
-void gtk_text_buffer_get_iter_at_mark        (GtkTextBuffer *buffer,
-                                              GtkTextIter   *iter,
-                                              GtkTextMark   *mark);
-
-void gtk_text_buffer_get_iter_at_child_anchor (GtkTextBuffer      *buffer,
-                                               GtkTextIter        *iter,
-                                               GtkTextChildAnchor *anchor);
-
-/* There's no get_first_iter because you just get the iter for
-   line or char 0 */
-
-/* Used to keep track of whether the buffer needs saving; anytime the
-   buffer contents change, the modified flag is turned on. Whenever
-   you save, turn it off. Tags and marks do not affect the modified
-   flag, but if you would like them to you can connect a handler to
-   the tag/mark signals and call set_modified in your handler */
-
-gboolean        gtk_text_buffer_get_modified            (GtkTextBuffer *buffer);
-void            gtk_text_buffer_set_modified            (GtkTextBuffer *buffer,
-                                                         gboolean       setting);
-
-gboolean        gtk_text_buffer_get_has_selection       (GtkTextBuffer *buffer);
-
-void gtk_text_buffer_add_selection_clipboard    (GtkTextBuffer     *buffer,
-						 GtkClipboard      *clipboard);
-void gtk_text_buffer_remove_selection_clipboard (GtkTextBuffer     *buffer,
-						 GtkClipboard      *clipboard);
-
-void            gtk_text_buffer_cut_clipboard           (GtkTextBuffer *buffer,
-							 GtkClipboard  *clipboard,
-                                                         gboolean       default_editable);
-void            gtk_text_buffer_copy_clipboard          (GtkTextBuffer *buffer,
-							 GtkClipboard  *clipboard);
-void            gtk_text_buffer_paste_clipboard         (GtkTextBuffer *buffer,
-							 GtkClipboard  *clipboard,
-							 GtkTextIter   *override_location,
-                                                         gboolean       default_editable);
-
-gboolean        gtk_text_buffer_get_selection_bounds    (GtkTextBuffer *buffer,
-                                                         GtkTextIter   *start,
-                                                         GtkTextIter   *end);
-gboolean        gtk_text_buffer_delete_selection        (GtkTextBuffer *buffer,
-                                                         gboolean       interactive,
-                                                         gboolean       default_editable);                                                    
-
-/* Called to specify atomic user actions, used to implement undo */
-void            gtk_text_buffer_begin_user_action       (GtkTextBuffer *buffer);
-void            gtk_text_buffer_end_user_action         (GtkTextBuffer *buffer);
-
-GtkTargetList * gtk_text_buffer_get_copy_target_list    (GtkTextBuffer *buffer);
-GtkTargetList * gtk_text_buffer_get_paste_target_list   (GtkTextBuffer *buffer);
-
-/* INTERNAL private stuff */
-void            _gtk_text_buffer_spew                  (GtkTextBuffer      *buffer);
-
-GtkTextBTree*   _gtk_text_buffer_get_btree             (GtkTextBuffer      *buffer);
-
-const PangoLogAttr* _gtk_text_buffer_get_line_log_attrs (GtkTextBuffer     *buffer,
-                                                         const GtkTextIter *anywhere_in_line,
-                                                         gint              *char_len);
-
-void _gtk_text_buffer_notify_will_remove_tag (GtkTextBuffer *buffer,
-                                              GtkTextTag    *tag);
-
-G_END_DECLS
-
-#endif
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextbufferrichtext.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextbufferrichtext.h
deleted file mode 100644
index 96fc3c96..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextbufferrichtext.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* gtkrichtext.h
- *
- * Copyright (C) 2006 Imendio AB
- * Contact: Michael Natterer <mitch@imendio.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 __GTK_TEXT_BUFFER_RICH_TEXT_H__
-#define __GTK_TEXT_BUFFER_RICH_TEXT_H__
-
-#include <gtk/gtktextbuffer.h>
-
-G_BEGIN_DECLS
-
-typedef guint8 * (* GtkTextBufferSerializeFunc)   (GtkTextBuffer     *register_buffer,
-                                                   GtkTextBuffer     *content_buffer,
-                                                   const GtkTextIter *start,
-                                                   const GtkTextIter *end,
-                                                   gsize             *length,
-                                                   gpointer           user_data);
-typedef gboolean (* GtkTextBufferDeserializeFunc) (GtkTextBuffer     *register_buffer,
-                                                   GtkTextBuffer     *content_buffer,
-                                                   GtkTextIter       *iter,
-                                                   const guint8      *data,
-                                                   gsize              length,
-                                                   gboolean           create_tags,
-                                                   gpointer           user_data,
-                                                   GError           **error);
-
-GdkAtom   gtk_text_buffer_register_serialize_format   (GtkTextBuffer                *buffer,
-                                                       const gchar                  *mime_type,
-                                                       GtkTextBufferSerializeFunc    function,
-                                                       gpointer                      user_data,
-                                                       GDestroyNotify                user_data_destroy);
-GdkAtom   gtk_text_buffer_register_serialize_tagset   (GtkTextBuffer                *buffer,
-                                                       const gchar                  *tagset_name);
-
-GdkAtom   gtk_text_buffer_register_deserialize_format (GtkTextBuffer                *buffer,
-                                                       const gchar                  *mime_type,
-                                                       GtkTextBufferDeserializeFunc  function,
-                                                       gpointer                      user_data,
-                                                       GDestroyNotify                user_data_destroy);
-GdkAtom   gtk_text_buffer_register_deserialize_tagset (GtkTextBuffer                *buffer,
-                                                       const gchar                  *tagset_name);
-
-void    gtk_text_buffer_unregister_serialize_format   (GtkTextBuffer                *buffer,
-                                                       GdkAtom                       format);
-void    gtk_text_buffer_unregister_deserialize_format (GtkTextBuffer                *buffer,
-                                                       GdkAtom                       format);
-
-void     gtk_text_buffer_deserialize_set_can_create_tags (GtkTextBuffer             *buffer,
-                                                          GdkAtom                    format,
-                                                          gboolean                   can_create_tags);
-gboolean gtk_text_buffer_deserialize_get_can_create_tags (GtkTextBuffer             *buffer,
-                                                          GdkAtom                    format);
-
-GdkAtom * gtk_text_buffer_get_serialize_formats       (GtkTextBuffer                *buffer,
-                                                       gint                         *n_formats);
-GdkAtom * gtk_text_buffer_get_deserialize_formats     (GtkTextBuffer                *buffer,
-                                                       gint                         *n_formats);
-
-guint8  * gtk_text_buffer_serialize                   (GtkTextBuffer                *register_buffer,
-                                                       GtkTextBuffer                *content_buffer,
-                                                       GdkAtom                       format,
-                                                       const GtkTextIter            *start,
-                                                       const GtkTextIter            *end,
-                                                       gsize                        *length);
-gboolean  gtk_text_buffer_deserialize                 (GtkTextBuffer                *register_buffer,
-                                                       GtkTextBuffer                *content_buffer,
-                                                       GdkAtom                       format,
-                                                       GtkTextIter                  *iter,
-                                                       const guint8                 *data,
-                                                       gsize                         length,
-                                                       GError                      **error);
-
-G_END_DECLS
-
-#endif /* __GTK_TEXT_BUFFER_RICH_TEXT_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextchild.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextchild.h
deleted file mode 100644
index 19c3ad9a..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextchild.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtktextchild.h 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.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __GTK_TEXT_CHILD_H__
-#define __GTK_TEXT_CHILD_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/* A GtkTextChildAnchor is a spot in the buffer where child widgets
- * can be "anchored" (inserted inline, as if they were characters).
- * The anchor can have multiple widgets anchored, to allow for multiple
- * views.
- */
-
-typedef struct _GtkTextChildAnchor      GtkTextChildAnchor;
-typedef struct _GtkTextChildAnchorClass GtkTextChildAnchorClass;
-
-#define GTK_TYPE_TEXT_CHILD_ANCHOR              (gtk_text_child_anchor_get_type ())
-#define GTK_TEXT_CHILD_ANCHOR(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GTK_TYPE_TEXT_CHILD_ANCHOR, GtkTextChildAnchor))
-#define GTK_TEXT_CHILD_ANCHOR_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_CHILD_ANCHOR, GtkTextChildAnchorClass))
-#define GTK_IS_TEXT_CHILD_ANCHOR(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GTK_TYPE_TEXT_CHILD_ANCHOR))
-#define GTK_IS_TEXT_CHILD_ANCHOR_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TEXT_CHILD_ANCHOR))
-#define GTK_TEXT_CHILD_ANCHOR_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TEXT_CHILD_ANCHOR, GtkTextChildAnchorClass))
-
-struct _GtkTextChildAnchor
-{
-  GObject parent_instance;
-
-  gpointer segment;
-};
-
-struct _GtkTextChildAnchorClass
-{
-  GObjectClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType gtk_text_child_anchor_get_type (void) G_GNUC_CONST;
-
-GtkTextChildAnchor* gtk_text_child_anchor_new (void);
-
-GList*   gtk_text_child_anchor_get_widgets (GtkTextChildAnchor *anchor);
-gboolean gtk_text_child_anchor_get_deleted (GtkTextChildAnchor *anchor);
-
-G_END_DECLS
-
-#endif
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextdisplay.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextdisplay.h
deleted file mode 100644
index b93a84c2..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextdisplay.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* gtktextdisplay.c - display layed-out text
- *
- * Copyright (c) 1992-1994 The Regents of the University of California.
- * Copyright (c) 1994-1997 Sun Microsystems, Inc.
- * Copyright (c) 2000 Red Hat, Inc.
- * Tk->Gtk port by Havoc Pennington
- *
- * This file can be used under your choice of two licenses, the LGPL
- * and the original Tk license.
- *
- * LGPL:
- *
- * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Original Tk license:
- *
- * This software is copyrighted by the Regents of the University of
- * California, Sun Microsystems, Inc., and other parties.  The
- * following terms apply to all files associated with the software
- * unless explicitly disclaimed in individual files.
- *
- * The authors hereby grant permission to use, copy, modify,
- * distribute, and license this software and its documentation for any
- * purpose, provided that existing copyright notices are retained in
- * all copies and that this notice is included verbatim in any
- * distributions. No written agreement, license, or royalty fee is
- * required for any of the authorized uses.  Modifications to this
- * software may be copyrighted by their authors and need not follow
- * the licensing terms described here, provided that the new terms are
- * clearly indicated on the first page of each file where they apply.
- *
- * IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY
- * PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
- * DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION,
- * OR ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND
- * NON-INFRINGEMENT.  THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS,
- * AND THE AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE
- * MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * GOVERNMENT USE: If you are acquiring this software on behalf of the
- * U.S. government, the Government shall have only "Restricted Rights"
- * in the software and related documentation as defined in the Federal
- * Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
- * are acquiring the software on behalf of the Department of Defense,
- * the software shall be classified as "Commercial Computer Software"
- * and the Government shall have only "Restricted Rights" as defined
- * in Clause 252.227-7013 (c) (1) of DFARs.  Notwithstanding the
- * foregoing, the authors grant the U.S. Government and others acting
- * in its behalf permission to use and distribute the software in
- * accordance with the terms specified in this license.
- *
- */
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __GTK_TEXT_DISPLAY_H__
-#define __GTK_TEXT_DISPLAY_H__
-
-#include <gtk/gtktextlayout.h>
-
-G_BEGIN_DECLS
-
-/* A semi-public header intended for use by code that also
- * uses GtkTextLayout
- */
-
-/* The drawable should be pre-initialized to your preferred background.
- * widget            - Widget to grab some style info from
- * drawable          - Drawable to render to
- * cursor_gc         - Graphics context to use for cursor
- * x_offset/y_offset - Position of the drawable in layout coordinates
- * x/y/width/height  - Region of the layout to render. x,y must be inside
- *                     the drawable.
- * widgets           - list of widgets that need exposing
- */
-void gtk_text_layout_draw (GtkTextLayout        *layout,
-                           GtkWidget            *widget,
-                           GdkDrawable          *drawable,
-			   GdkGC                *cursor_gc,
-                           gint                  x_offset,
-                           gint                  y_offset,
-                           gint                  x,
-                           gint                  y,
-                           gint                  width,
-                           gint                  height,
-                           GList               **widgets);
-
-
-G_END_DECLS
-
-#endif  /* __GTK_TEXT_DISPLAY_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextiter.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextiter.h
deleted file mode 100644
index f788397f..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextiter.h
+++ /dev/null
@@ -1,303 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtktextiter.h 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.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __GTK_TEXT_ITER_H__
-#define __GTK_TEXT_ITER_H__
-
-#include <gtk/gtktexttag.h>
-#include <gtk/gtktextchild.h>
-
-G_BEGIN_DECLS
-
-typedef enum {
-  GTK_TEXT_SEARCH_VISIBLE_ONLY = 1 << 0,
-  GTK_TEXT_SEARCH_TEXT_ONLY    = 1 << 1
-  /* Possible future plans: SEARCH_CASE_INSENSITIVE, SEARCH_REGEXP */
-} GtkTextSearchFlags;
-
-/*
- * Iter: represents a location in the text. Becomes invalid if the
- * characters/pixmaps/widgets (indexable objects) in the text buffer
- * are changed.
- */
-
-typedef struct _GtkTextBuffer GtkTextBuffer;
-
-#define GTK_TYPE_TEXT_ITER     (gtk_text_iter_get_type ())
-
-struct _GtkTextIter {
-  /* GtkTextIter is an opaque datatype; ignore all these fields.
-   * Initialize the iter with gtk_text_buffer_get_iter_*
-   * functions
-   */
-  /*< private >*/
-  gpointer dummy1;
-  gpointer dummy2;
-  gint dummy3;
-  gint dummy4;
-  gint dummy5;
-  gint dummy6;
-  gint dummy7;
-  gint dummy8;
-  gpointer dummy9;
-  gpointer dummy10;
-  gint dummy11;
-  gint dummy12;
-  /* padding */
-  gint dummy13;
-  gpointer dummy14;
-};
-
-
-/* This is primarily intended for language bindings that want to avoid
-   a "buffer" argument to text insertions, deletions, etc. */
-GtkTextBuffer *gtk_text_iter_get_buffer (const GtkTextIter *iter);
-
-/*
- * Life cycle
- */
-
-GtkTextIter *gtk_text_iter_copy     (const GtkTextIter *iter);
-void         gtk_text_iter_free     (GtkTextIter       *iter);
-
-GType        gtk_text_iter_get_type (void) G_GNUC_CONST;
-
-/*
- * Convert to different kinds of index
- */
-
-gint gtk_text_iter_get_offset      (const GtkTextIter *iter);
-gint gtk_text_iter_get_line        (const GtkTextIter *iter);
-gint gtk_text_iter_get_line_offset (const GtkTextIter *iter);
-gint gtk_text_iter_get_line_index  (const GtkTextIter *iter);
-
-gint gtk_text_iter_get_visible_line_offset (const GtkTextIter *iter);
-gint gtk_text_iter_get_visible_line_index (const GtkTextIter *iter);
-
-
-/*
- * "Dereference" operators
- */
-gunichar gtk_text_iter_get_char          (const GtkTextIter  *iter);
-
-/* includes the 0xFFFC char for pixmaps/widgets, so char offsets
- * into the returned string map properly into buffer char offsets
- */
-gchar   *gtk_text_iter_get_slice         (const GtkTextIter  *start,
-                                          const GtkTextIter  *end);
-
-/* includes only text, no 0xFFFC */
-gchar   *gtk_text_iter_get_text          (const GtkTextIter  *start,
-                                          const GtkTextIter  *end);
-/* exclude invisible chars */
-gchar   *gtk_text_iter_get_visible_slice (const GtkTextIter  *start,
-                                          const GtkTextIter  *end);
-gchar   *gtk_text_iter_get_visible_text  (const GtkTextIter  *start,
-                                          const GtkTextIter  *end);
-
-GdkPixbuf* gtk_text_iter_get_pixbuf (const GtkTextIter *iter);
-GSList  *  gtk_text_iter_get_marks  (const GtkTextIter *iter);
-
-GtkTextChildAnchor* gtk_text_iter_get_child_anchor (const GtkTextIter *iter);
-
-/* Return list of tags toggled at this point (toggled_on determines
- * whether the list is of on-toggles or off-toggles)
- */
-GSList  *gtk_text_iter_get_toggled_tags  (const GtkTextIter  *iter,
-                                          gboolean            toggled_on);
-
-gboolean gtk_text_iter_begins_tag        (const GtkTextIter  *iter,
-                                          GtkTextTag         *tag);
-
-gboolean gtk_text_iter_ends_tag          (const GtkTextIter  *iter,
-                                          GtkTextTag         *tag);
-
-gboolean gtk_text_iter_toggles_tag       (const GtkTextIter  *iter,
-                                          GtkTextTag         *tag);
-
-gboolean gtk_text_iter_has_tag           (const GtkTextIter   *iter,
-                                          GtkTextTag          *tag);
-GSList  *gtk_text_iter_get_tags          (const GtkTextIter   *iter);
-
-gboolean gtk_text_iter_editable          (const GtkTextIter   *iter,
-                                          gboolean             default_setting);
-gboolean gtk_text_iter_can_insert        (const GtkTextIter   *iter,
-                                          gboolean             default_editability);
-
-gboolean gtk_text_iter_starts_word        (const GtkTextIter   *iter);
-gboolean gtk_text_iter_ends_word          (const GtkTextIter   *iter);
-gboolean gtk_text_iter_inside_word        (const GtkTextIter   *iter);
-gboolean gtk_text_iter_starts_sentence    (const GtkTextIter   *iter);
-gboolean gtk_text_iter_ends_sentence      (const GtkTextIter   *iter);
-gboolean gtk_text_iter_inside_sentence    (const GtkTextIter   *iter);
-gboolean gtk_text_iter_starts_line        (const GtkTextIter   *iter);
-gboolean gtk_text_iter_ends_line          (const GtkTextIter   *iter);
-gboolean gtk_text_iter_is_cursor_position (const GtkTextIter   *iter);
-
-gint     gtk_text_iter_get_chars_in_line (const GtkTextIter   *iter);
-gint     gtk_text_iter_get_bytes_in_line (const GtkTextIter   *iter);
-
-gboolean       gtk_text_iter_get_attributes (const GtkTextIter *iter,
-					     GtkTextAttributes *values);
-PangoLanguage* gtk_text_iter_get_language   (const GtkTextIter *iter);
-gboolean       gtk_text_iter_is_end         (const GtkTextIter *iter);
-gboolean       gtk_text_iter_is_start       (const GtkTextIter *iter);
-
-/*
- * Moving around the buffer
- */
-
-gboolean gtk_text_iter_forward_char         (GtkTextIter *iter);
-gboolean gtk_text_iter_backward_char        (GtkTextIter *iter);
-gboolean gtk_text_iter_forward_chars        (GtkTextIter *iter,
-                                             gint         count);
-gboolean gtk_text_iter_backward_chars       (GtkTextIter *iter,
-                                             gint         count);
-gboolean gtk_text_iter_forward_line         (GtkTextIter *iter);
-gboolean gtk_text_iter_backward_line        (GtkTextIter *iter);
-gboolean gtk_text_iter_forward_lines        (GtkTextIter *iter,
-                                             gint         count);
-gboolean gtk_text_iter_backward_lines       (GtkTextIter *iter,
-                                             gint         count);
-gboolean gtk_text_iter_forward_word_end     (GtkTextIter *iter);
-gboolean gtk_text_iter_backward_word_start  (GtkTextIter *iter);
-gboolean gtk_text_iter_forward_word_ends    (GtkTextIter *iter,
-                                             gint         count);
-gboolean gtk_text_iter_backward_word_starts (GtkTextIter *iter,
-                                             gint         count);
-                                             
-gboolean gtk_text_iter_forward_visible_line   (GtkTextIter *iter);
-gboolean gtk_text_iter_backward_visible_line  (GtkTextIter *iter);
-gboolean gtk_text_iter_forward_visible_lines  (GtkTextIter *iter,
-                                               gint         count);
-gboolean gtk_text_iter_backward_visible_lines (GtkTextIter *iter,
-                                               gint         count);
-
-gboolean gtk_text_iter_forward_visible_word_end     (GtkTextIter *iter);
-gboolean gtk_text_iter_backward_visible_word_start  (GtkTextIter *iter);
-gboolean gtk_text_iter_forward_visible_word_ends    (GtkTextIter *iter,
-                                             gint         count);
-gboolean gtk_text_iter_backward_visible_word_starts (GtkTextIter *iter,
-                                             gint         count);
-
-gboolean gtk_text_iter_forward_sentence_end     (GtkTextIter *iter);
-gboolean gtk_text_iter_backward_sentence_start  (GtkTextIter *iter);
-gboolean gtk_text_iter_forward_sentence_ends    (GtkTextIter *iter,
-                                                 gint         count);
-gboolean gtk_text_iter_backward_sentence_starts (GtkTextIter *iter,
-                                                 gint         count);
-/* cursor positions are almost equivalent to chars, but not quite;
- * in some languages, you can't put the cursor between certain
- * chars. Also, you can't put the cursor between \r\n at the end
- * of a line.
- */
-gboolean gtk_text_iter_forward_cursor_position   (GtkTextIter *iter);
-gboolean gtk_text_iter_backward_cursor_position  (GtkTextIter *iter);
-gboolean gtk_text_iter_forward_cursor_positions  (GtkTextIter *iter,
-                                                  gint         count);
-gboolean gtk_text_iter_backward_cursor_positions (GtkTextIter *iter,
-                                                  gint         count);
-
-gboolean gtk_text_iter_forward_visible_cursor_position   (GtkTextIter *iter);
-gboolean gtk_text_iter_backward_visible_cursor_position  (GtkTextIter *iter);
-gboolean gtk_text_iter_forward_visible_cursor_positions  (GtkTextIter *iter,
-                                                          gint         count);
-gboolean gtk_text_iter_backward_visible_cursor_positions (GtkTextIter *iter,
-                                                          gint         count);
-
-
-void     gtk_text_iter_set_offset         (GtkTextIter *iter,
-                                           gint         char_offset);
-void     gtk_text_iter_set_line           (GtkTextIter *iter,
-                                           gint         line_number);
-void     gtk_text_iter_set_line_offset    (GtkTextIter *iter,
-                                           gint         char_on_line);
-void     gtk_text_iter_set_line_index     (GtkTextIter *iter,
-                                           gint         byte_on_line);
-void     gtk_text_iter_forward_to_end     (GtkTextIter *iter);
-gboolean gtk_text_iter_forward_to_line_end (GtkTextIter *iter);
-
-void     gtk_text_iter_set_visible_line_offset (GtkTextIter *iter,
-                                                gint         char_on_line);
-void     gtk_text_iter_set_visible_line_index  (GtkTextIter *iter,
-                                                gint         byte_on_line);
-
-/* returns TRUE if a toggle was found; NULL for the tag pointer
- * means "any tag toggle", otherwise the next toggle of the
- * specified tag is located.
- */
-gboolean gtk_text_iter_forward_to_tag_toggle (GtkTextIter *iter,
-                                              GtkTextTag  *tag);
-
-gboolean gtk_text_iter_backward_to_tag_toggle (GtkTextIter *iter,
-                                               GtkTextTag  *tag);
-
-typedef gboolean (* GtkTextCharPredicate) (gunichar ch, gpointer user_data);
-
-gboolean gtk_text_iter_forward_find_char  (GtkTextIter          *iter,
-                                           GtkTextCharPredicate  pred,
-                                           gpointer              user_data,
-                                           const GtkTextIter    *limit);
-gboolean gtk_text_iter_backward_find_char (GtkTextIter          *iter,
-                                           GtkTextCharPredicate  pred,
-                                           gpointer              user_data,
-                                           const GtkTextIter    *limit);
-
-gboolean gtk_text_iter_forward_search  (const GtkTextIter *iter,
-                                        const gchar       *str,
-                                        GtkTextSearchFlags flags,
-                                        GtkTextIter       *match_start,
-                                        GtkTextIter       *match_end,
-                                        const GtkTextIter *limit);
-
-gboolean gtk_text_iter_backward_search (const GtkTextIter *iter,
-                                        const gchar       *str,
-                                        GtkTextSearchFlags flags,
-                                        GtkTextIter       *match_start,
-                                        GtkTextIter       *match_end,
-                                        const GtkTextIter *limit);
-
-
-/*
- * Comparisons
- */
-gboolean gtk_text_iter_equal           (const GtkTextIter *lhs,
-                                        const GtkTextIter *rhs);
-gint     gtk_text_iter_compare         (const GtkTextIter *lhs,
-                                        const GtkTextIter *rhs);
-gboolean gtk_text_iter_in_range        (const GtkTextIter *iter,
-                                        const GtkTextIter *start,
-                                        const GtkTextIter *end);
-
-/* Put these two in ascending order */
-void     gtk_text_iter_order           (GtkTextIter *first,
-                                        GtkTextIter *second);
-
-G_END_DECLS
-
-#endif
-
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextlayout.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextlayout.h
deleted file mode 100644
index cb357864..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextlayout.h
+++ /dev/null
@@ -1,440 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtktextlayout.h
- *
- * Copyright (c) 1992-1994 The Regents of the University of California.
- * Copyright (c) 1994-1997 Sun Microsystems, Inc.
- * Copyright (c) 2000 Red Hat, Inc.
- * Tk->Gtk port by Havoc Pennington
- * Pango support by Owen Taylor
- *
- * This file can be used under your choice of two licenses, the LGPL
- * and the original Tk license.
- *
- * LGPL:
- *
- * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Original Tk license:
- *
- * This software is copyrighted by the Regents of the University of
- * California, Sun Microsystems, Inc., and other parties.  The
- * following terms apply to all files associated with the software
- * unless explicitly disclaimed in individual files.
- *
- * The authors hereby grant permission to use, copy, modify,
- * distribute, and license this software and its documentation for any
- * purpose, provided that existing copyright notices are retained in
- * all copies and that this notice is included verbatim in any
- * distributions. No written agreement, license, or royalty fee is
- * required for any of the authorized uses.  Modifications to this
- * software may be copyrighted by their authors and need not follow
- * the licensing terms described here, provided that the new terms are
- * clearly indicated on the first page of each file where they apply.
- *
- * IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY
- * PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
- * DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION,
- * OR ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND
- * NON-INFRINGEMENT.  THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS,
- * AND THE AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE
- * MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * GOVERNMENT USE: If you are acquiring this software on behalf of the
- * U.S. government, the Government shall have only "Restricted Rights"
- * in the software and related documentation as defined in the Federal
- * Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
- * are acquiring the software on behalf of the Department of Defense,
- * the software shall be classified as "Commercial Computer Software"
- * and the Government shall have only "Restricted Rights" as defined
- * in Clause 252.227-7013 (c) (1) of DFARs.  Notwithstanding the
- * foregoing, the authors grant the U.S. Government and others acting
- * in its behalf permission to use and distribute the software in
- * accordance with the terms specified in this license.
- *
- */
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __GTK_TEXT_LAYOUT_H__
-#define __GTK_TEXT_LAYOUT_H__
-
-/* This is a "semi-private" header; it is intended for
- * use by the text widget, and the text canvas item,
- * but that's all. We may have to install it so the
- * canvas item can use it, but users are not supposed
- * to use it.
- */
-#ifndef GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
-#error "You are not supposed to be including this file; the equivalent public API is in gtktextview.h"
-#endif
-
-#include <gtk/gtktextbuffer.h>
-#include <gtk/gtktextiter.h>
-
-G_BEGIN_DECLS
-
-/* forward declarations that have to be here to avoid including
- * gtktextbtree.h
- */
-typedef struct _GtkTextLine     GtkTextLine;
-typedef struct _GtkTextLineData GtkTextLineData;
-
-#define GTK_TYPE_TEXT_LAYOUT             (gtk_text_layout_get_type ())
-#define GTK_TEXT_LAYOUT(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TEXT_LAYOUT, GtkTextLayout))
-#define GTK_TEXT_LAYOUT_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_LAYOUT, GtkTextLayoutClass))
-#define GTK_IS_TEXT_LAYOUT(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TEXT_LAYOUT))
-#define GTK_IS_TEXT_LAYOUT_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TEXT_LAYOUT))
-#define GTK_TEXT_LAYOUT_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TEXT_LAYOUT, GtkTextLayoutClass))
-
-typedef struct _GtkTextLayout         GtkTextLayout;
-typedef struct _GtkTextLayoutClass    GtkTextLayoutClass;
-typedef struct _GtkTextLineDisplay    GtkTextLineDisplay;
-typedef struct _GtkTextCursorDisplay  GtkTextCursorDisplay;
-typedef struct _GtkTextAttrAppearance GtkTextAttrAppearance;
-
-struct _GtkTextLayout
-{
-  GObject parent_instance;
-
-  /* width of the display area on-screen,
-   * i.e. pixels we should wrap to fit inside. */
-  gint screen_width;
-
-  /* width/height of the total logical area being layed out */
-  gint width;
-  gint height;
-
-  /* Pixel offsets from the left and from the top to be used when we
-   * draw; these allow us to create left/top margins. We don't need
-   * anything special for bottom/right margins, because those don't
-   * affect drawing.
-   */
-  /* gint left_edge; */
-  /* gint top_edge; */
-
-  GtkTextBuffer *buffer;
-
-  /* Default style used if no tags override it */
-  GtkTextAttributes *default_style;
-
-  /* Pango contexts used for creating layouts */
-  PangoContext *ltr_context;
-  PangoContext *rtl_context;
-
-  /* A cache of one style; this is used to ensure
-   * we don't constantly regenerate the style
-   * over long runs with the same style. */
-  GtkTextAttributes *one_style_cache;
-
-  /* A cache of one line display. Getting the same line
-   * many times in a row is the most common case.
-   */
-  GtkTextLineDisplay *one_display_cache;
-
-  /* Whether we are allowed to wrap right now */
-  gint wrap_loop_count;
-  
-  /* Whether to show the insertion cursor */
-  guint cursor_visible : 1;
-
-  /* For what GtkTextDirection to draw cursor GTK_TEXT_DIR_NONE -
-   * means draw both cursors.
-   */
-  guint cursor_direction : 2;
-
-  /* The keyboard direction is used to default the alignment when
-     there are no strong characters.
-  */
-  guint keyboard_direction : 2;
-
-  /* The preedit string and attributes, if any */
-
-  gchar *preedit_string;
-  PangoAttrList *preedit_attrs;
-  gint preedit_len;
-  gint preedit_cursor;
-
-  guint overwrite_mode : 1;
-};
-
-struct _GtkTextLayoutClass
-{
-  GObjectClass parent_class;
-
-  /* Some portion of the layout was invalidated
-   */
-  void  (*invalidated)  (GtkTextLayout *layout);
-
-  /* A range of the layout changed appearance and possibly height
-   */
-  void  (*changed)              (GtkTextLayout     *layout,
-                                 gint               y,
-                                 gint               old_height,
-                                 gint               new_height);
-  GtkTextLineData* (*wrap)      (GtkTextLayout     *layout,
-                                 GtkTextLine       *line,
-                                 GtkTextLineData   *line_data); /* may be NULL */
-  void  (*get_log_attrs)        (GtkTextLayout     *layout,
-                                 GtkTextLine       *line,
-                                 PangoLogAttr     **attrs,
-                                 gint              *n_attrs);
-  void  (*invalidate)           (GtkTextLayout     *layout,
-                                 const GtkTextIter *start,
-                                 const GtkTextIter *end);
-  void  (*free_line_data)       (GtkTextLayout     *layout,
-                                 GtkTextLine       *line,
-                                 GtkTextLineData   *line_data);
-
-  void (*allocate_child)        (GtkTextLayout     *layout,
-                                 GtkWidget         *child,
-                                 gint               x,
-                                 gint               y);
-
-  void (*invalidate_cursors)    (GtkTextLayout     *layout,
-                                 const GtkTextIter *start,
-                                 const GtkTextIter *end);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-};
-
-struct _GtkTextAttrAppearance
-{
-  PangoAttribute attr;
-  GtkTextAppearance appearance;
-};
-struct _GtkTextCursorDisplay
-{
-  gint x;
-  gint y;
-  gint height;
-  guint is_strong : 1;
-  guint is_weak : 1;
-};
-struct _GtkTextLineDisplay
-{
-  PangoLayout *layout;
-  GSList *cursors;
-  GSList *shaped_objects;	/* Only for backwards compatibility */
-  
-  GtkTextDirection direction;
-
-  gint width;                   /* Width of layout */
-  gint total_width;             /* width - margins, if no width set on layout, if width set on layout, -1 */
-  gint height;
-  /* Amount layout is shifted from left edge - this is the left margin
-   * plus any other factors, such as alignment or indentation.
-   */
-  gint x_offset;
-  gint left_margin;
-  gint right_margin;
-  gint top_margin;
-  gint bottom_margin;
-  gint insert_index;		/* Byte index of insert cursor within para or -1 */
-
-  gboolean size_only;
-  GtkTextLine *line;
-  
-  GdkColor *pg_bg_color;
-
-  GdkRectangle block_cursor;
-  guint cursors_invalid : 1;
-  guint has_block_cursor : 1;
-  guint cursor_at_line_end : 1;
-};
-
-extern PangoAttrType gtk_text_attr_appearance_type;
-
-GType         gtk_text_layout_get_type    (void) G_GNUC_CONST;
-
-GtkTextLayout*     gtk_text_layout_new                   (void);
-void               gtk_text_layout_set_buffer            (GtkTextLayout     *layout,
-							  GtkTextBuffer     *buffer);
-GtkTextBuffer     *gtk_text_layout_get_buffer            (GtkTextLayout     *layout);
-void               gtk_text_layout_set_default_style     (GtkTextLayout     *layout,
-							  GtkTextAttributes *values);
-void               gtk_text_layout_set_contexts          (GtkTextLayout     *layout,
-							  PangoContext      *ltr_context,
-							  PangoContext      *rtl_context);
-void               gtk_text_layout_set_cursor_direction  (GtkTextLayout     *layout,
-                                                          GtkTextDirection   direction);
-void		   gtk_text_layout_set_overwrite_mode	 (GtkTextLayout     *layout,
-							  gboolean           overwrite);
-void               gtk_text_layout_set_keyboard_direction (GtkTextLayout     *layout,
-							   GtkTextDirection keyboard_dir);
-void               gtk_text_layout_default_style_changed (GtkTextLayout     *layout);
-
-void gtk_text_layout_set_screen_width       (GtkTextLayout     *layout,
-                                             gint               width);
-void gtk_text_layout_set_preedit_string     (GtkTextLayout     *layout,
- 					     const gchar       *preedit_string,
- 					     PangoAttrList     *preedit_attrs,
- 					     gint               cursor_pos);
-
-void     gtk_text_layout_set_cursor_visible (GtkTextLayout     *layout,
-                                             gboolean           cursor_visible);
-gboolean gtk_text_layout_get_cursor_visible (GtkTextLayout     *layout);
-
-/* Getting the size or the lines potentially results in a call to
- * recompute, which is pretty massively expensive. Thus it should
- * basically only be done in an idle handler.
- *
- * Long-term, we would really like to be able to do these without
- * a full recompute so they may get cheaper over time.
- */
-void    gtk_text_layout_get_size  (GtkTextLayout  *layout,
-                                   gint           *width,
-                                   gint           *height);
-GSList* gtk_text_layout_get_lines (GtkTextLayout  *layout,
-                                   /* [top_y, bottom_y) */
-                                   gint            top_y,
-                                   gint            bottom_y,
-                                   gint           *first_line_y);
-
-void gtk_text_layout_wrap_loop_start (GtkTextLayout *layout);
-void gtk_text_layout_wrap_loop_end   (GtkTextLayout *layout);
-
-GtkTextLineDisplay* gtk_text_layout_get_line_display  (GtkTextLayout      *layout,
-                                                       GtkTextLine        *line,
-                                                       gboolean            size_only);
-void                gtk_text_layout_free_line_display (GtkTextLayout      *layout,
-                                                       GtkTextLineDisplay *display);
-
-void gtk_text_layout_get_line_at_y     (GtkTextLayout     *layout,
-                                        GtkTextIter       *target_iter,
-                                        gint               y,
-                                        gint              *line_top);
-void gtk_text_layout_get_iter_at_pixel (GtkTextLayout     *layout,
-                                        GtkTextIter       *iter,
-                                        gint               x,
-                                        gint               y);
-void gtk_text_layout_get_iter_at_position (GtkTextLayout     *layout,
-					   GtkTextIter       *iter,
-					   gint              *trailing,
-					   gint               x,
-					   gint               y);
-void gtk_text_layout_invalidate        (GtkTextLayout     *layout,
-                                        const GtkTextIter *start,
-                                        const GtkTextIter *end);
-void gtk_text_layout_invalidate_cursors(GtkTextLayout     *layout,
-                                        const GtkTextIter *start,
-                                        const GtkTextIter *end);
-void gtk_text_layout_free_line_data    (GtkTextLayout     *layout,
-                                        GtkTextLine       *line,
-                                        GtkTextLineData   *line_data);
-
-gboolean gtk_text_layout_is_valid        (GtkTextLayout *layout);
-void     gtk_text_layout_validate_yrange (GtkTextLayout *layout,
-                                          GtkTextIter   *anchor_line,
-                                          gint           y0_,
-                                          gint           y1_);
-void     gtk_text_layout_validate        (GtkTextLayout *layout,
-                                          gint           max_pixels);
-
-/* This function should return the passed-in line data,
- * OR remove the existing line data from the line, and
- * return a NEW line data after adding it to the line.
- * That is, invariant after calling the callback is that
- * there should be exactly one line data for this view
- * stored on the btree line.
- */
-GtkTextLineData* gtk_text_layout_wrap  (GtkTextLayout   *layout,
-                                        GtkTextLine     *line,
-                                        GtkTextLineData *line_data); /* may be NULL */
-void     gtk_text_layout_changed              (GtkTextLayout     *layout,
-                                               gint               y,
-                                               gint               old_height,
-                                               gint               new_height);
-void     gtk_text_layout_cursors_changed      (GtkTextLayout     *layout,
-                                               gint               y,
-                                               gint               old_height,
-                                               gint               new_height);
-void     gtk_text_layout_get_iter_location    (GtkTextLayout     *layout,
-                                               const GtkTextIter *iter,
-                                               GdkRectangle      *rect);
-void     gtk_text_layout_get_line_yrange      (GtkTextLayout     *layout,
-                                               const GtkTextIter *iter,
-                                               gint              *y,
-                                               gint              *height);
-void     _gtk_text_layout_get_line_xrange     (GtkTextLayout     *layout,
-                                               const GtkTextIter *iter,
-                                               gint              *x,
-                                               gint              *width);
-void     gtk_text_layout_get_cursor_locations (GtkTextLayout     *layout,
-                                               GtkTextIter       *iter,
-                                               GdkRectangle      *strong_pos,
-                                               GdkRectangle      *weak_pos);
-gboolean _gtk_text_layout_get_block_cursor    (GtkTextLayout     *layout,
-					       GdkRectangle      *pos);
-gboolean gtk_text_layout_clamp_iter_to_vrange (GtkTextLayout     *layout,
-                                               GtkTextIter       *iter,
-                                               gint               top,
-                                               gint               bottom);
-
-gboolean gtk_text_layout_move_iter_to_line_end      (GtkTextLayout *layout,
-                                                     GtkTextIter   *iter,
-                                                     gint           direction);
-gboolean gtk_text_layout_move_iter_to_previous_line (GtkTextLayout *layout,
-                                                     GtkTextIter   *iter);
-gboolean gtk_text_layout_move_iter_to_next_line     (GtkTextLayout *layout,
-                                                     GtkTextIter   *iter);
-void     gtk_text_layout_move_iter_to_x             (GtkTextLayout *layout,
-                                                     GtkTextIter   *iter,
-                                                     gint           x);
-gboolean gtk_text_layout_move_iter_visually         (GtkTextLayout *layout,
-                                                     GtkTextIter   *iter,
-                                                     gint           count);
-
-gboolean gtk_text_layout_iter_starts_line           (GtkTextLayout       *layout,
-                                                     const GtkTextIter   *iter);
-
-void     gtk_text_layout_get_iter_at_line           (GtkTextLayout *layout,
-                                                     GtkTextIter    *iter,
-                                                     GtkTextLine    *line,
-                                                     gint            byte_offset);
-
-/* Don't use these. Use gtk_text_view_add_child_at_anchor().
- * These functions are defined in gtktextchild.c, but here
- * since they are semi-public and require GtkTextLayout to
- * be declared.
- */
-void gtk_text_child_anchor_register_child   (GtkTextChildAnchor *anchor,
-                                             GtkWidget          *child,
-                                             GtkTextLayout      *layout);
-void gtk_text_child_anchor_unregister_child (GtkTextChildAnchor *anchor,
-                                             GtkWidget          *child);
-
-void gtk_text_child_anchor_queue_resize     (GtkTextChildAnchor *anchor,
-                                             GtkTextLayout      *layout);
-
-void gtk_text_anchored_child_set_layout     (GtkWidget          *child,
-                                             GtkTextLayout      *layout);
-
-void gtk_text_layout_spew (GtkTextLayout *layout);
-
-G_END_DECLS
-
-#endif  /* __GTK_TEXT_LAYOUT_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextmark.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextmark.h
deleted file mode 100644
index 41bcb949..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextmark.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* gtktextmark.h - mark segments
- *
- * Copyright (c) 1994 The Regents of the University of California.
- * Copyright (c) 1994-1997 Sun Microsystems, Inc.
- * Copyright (c) 2000      Red Hat, Inc.
- * Tk -> Gtk port by Havoc Pennington <hp@redhat.com>
- *
- * This software is copyrighted by the Regents of the University of
- * California, Sun Microsystems, Inc., and other parties.  The
- * following terms apply to all files associated with the software
- * unless explicitly disclaimed in individual files.
- *
- * The authors hereby grant permission to use, copy, modify,
- * distribute, and license this software and its documentation for any
- * purpose, provided that existing copyright notices are retained in
- * all copies and that this notice is included verbatim in any
- * distributions. No written agreement, license, or royalty fee is
- * required for any of the authorized uses.  Modifications to this
- * software may be copyrighted by their authors and need not follow
- * the licensing terms described here, provided that the new terms are
- * clearly indicated on the first page of each file where they apply.
- *
- * IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY
- * PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
- * DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION,
- * OR ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND
- * NON-INFRINGEMENT.  THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS,
- * AND THE AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE
- * MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * GOVERNMENT USE: If you are acquiring this software on behalf of the
- * U.S. government, the Government shall have only "Restricted Rights"
- * in the software and related documentation as defined in the Federal
- * Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
- * are acquiring the software on behalf of the Department of Defense,
- * the software shall be classified as "Commercial Computer Software"
- * and the Government shall have only "Restricted Rights" as defined
- * in Clause 252.227-7013 (c) (1) of DFARs.  Notwithstanding the
- * foregoing, the authors grant the U.S. Government and others acting
- * in its behalf permission to use and distribute the software in
- * accordance with the terms specified in this license.
- *
- */
-
-#ifndef __GTK_TEXT_MARK_H__
-#define __GTK_TEXT_MARK_H__
-
-G_BEGIN_DECLS
-
-/* The GtkTextMark data type */
-
-typedef struct _GtkTextMark      GtkTextMark;
-typedef struct _GtkTextMarkClass GtkTextMarkClass;
-
-#define GTK_TYPE_TEXT_MARK              (gtk_text_mark_get_type ())
-#define GTK_TEXT_MARK(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GTK_TYPE_TEXT_MARK, GtkTextMark))
-#define GTK_TEXT_MARK_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_MARK, GtkTextMarkClass))
-#define GTK_IS_TEXT_MARK(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GTK_TYPE_TEXT_MARK))
-#define GTK_IS_TEXT_MARK_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TEXT_MARK))
-#define GTK_TEXT_MARK_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TEXT_MARK, GtkTextMarkClass))
-
-struct _GtkTextMark
-{
-  GObject parent_instance;
-
-  gpointer segment;
-};
-
-struct _GtkTextMarkClass
-{
-  GObjectClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType        gtk_text_mark_get_type   (void) G_GNUC_CONST;
-
-void           gtk_text_mark_set_visible (GtkTextMark *mark,
-                                          gboolean     setting);
-gboolean       gtk_text_mark_get_visible (GtkTextMark *mark);
-
-GtkTextMark          *gtk_text_mark_new              (const gchar *name,
-						      gboolean     left_gravity);
-G_CONST_RETURN gchar* gtk_text_mark_get_name         (GtkTextMark *mark);
-gboolean              gtk_text_mark_get_deleted      (GtkTextMark *mark);
-GtkTextBuffer*        gtk_text_mark_get_buffer       (GtkTextMark *mark);
-gboolean              gtk_text_mark_get_left_gravity (GtkTextMark *mark);
-
-G_END_DECLS
-
-#endif
-
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktexttag.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktexttag.h
deleted file mode 100644
index 61d60d9a..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktexttag.h
+++ /dev/null
@@ -1,284 +0,0 @@
-/* gtktexttag.c - text tag object
- *
- * Copyright (c) 1992-1994 The Regents of the University of California.
- * Copyright (c) 1994-1997 Sun Microsystems, Inc.
- * Copyright (c) 2000      Red Hat, Inc.
- * Tk -> Gtk port by Havoc Pennington <hp@redhat.com>
- *
- * This software is copyrighted by the Regents of the University of
- * California, Sun Microsystems, Inc., and other parties.  The
- * following terms apply to all files associated with the software
- * unless explicitly disclaimed in individual files.
- *
- * The authors hereby grant permission to use, copy, modify,
- * distribute, and license this software and its documentation for any
- * purpose, provided that existing copyright notices are retained in
- * all copies and that this notice is included verbatim in any
- * distributions. No written agreement, license, or royalty fee is
- * required for any of the authorized uses.  Modifications to this
- * software may be copyrighted by their authors and need not follow
- * the licensing terms described here, provided that the new terms are
- * clearly indicated on the first page of each file where they apply.
- *
- * IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY
- * PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
- * DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION,
- * OR ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND
- * NON-INFRINGEMENT.  THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS,
- * AND THE AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE
- * MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * GOVERNMENT USE: If you are acquiring this software on behalf of the
- * U.S. government, the Government shall have only "Restricted Rights"
- * in the software and related documentation as defined in the Federal
- * Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
- * are acquiring the software on behalf of the Department of Defense,
- * the software shall be classified as "Commercial Computer Software"
- * and the Government shall have only "Restricted Rights" as defined
- * in Clause 252.227-7013 (c) (1) of DFARs.  Notwithstanding the
- * foregoing, the authors grant the U.S. Government and others acting
- * in its behalf permission to use and distribute the software in
- * accordance with the terms specified in this license.
- *
- */
-
-#ifndef __GTK_TEXT_TAG_H__
-#define __GTK_TEXT_TAG_H__
-
-#include <glib-object.h>
-#include <gdk/gdk.h>
-#include <gtk/gtkenums.h>
-
-/* Not needed, retained for compatibility -Yosh */
-#include <gtk/gtkobject.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GtkTextIter GtkTextIter;
-typedef struct _GtkTextTagTable GtkTextTagTable;
-
-typedef struct _GtkTextAttributes GtkTextAttributes;
-
-#define GTK_TYPE_TEXT_TAG            (gtk_text_tag_get_type ())
-#define GTK_TEXT_TAG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TEXT_TAG, GtkTextTag))
-#define GTK_TEXT_TAG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_TAG, GtkTextTagClass))
-#define GTK_IS_TEXT_TAG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TEXT_TAG))
-#define GTK_IS_TEXT_TAG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TEXT_TAG))
-#define GTK_TEXT_TAG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TEXT_TAG, GtkTextTagClass))
-
-#define GTK_TYPE_TEXT_ATTRIBUTES     (gtk_text_attributes_get_type ())
-
-typedef struct _GtkTextTag GtkTextTag;
-typedef struct _GtkTextTagClass GtkTextTagClass;
-
-struct _GtkTextTag
-{
-  GObject parent_instance;
-
-  GtkTextTagTable *table;
-
-  char *name;                   /* Name of this tag.  This field is actually
-                                 * a pointer to the key from the entry in
-                                 * tkxt->tagTable, so it needn't be freed
-                                 * explicitly. */
-  int priority;         /* Priority of this tag within widget.  0
-                         * means lowest priority.  Exactly one tag
-                         * has each integer value between 0 and
-                         * numTags-1. */
-  /*
-   * Information for displaying text with this tag.  The information
-   * belows acts as an override on information specified by lower-priority
-   * tags.  If no value is specified, then the next-lower-priority tag
-   * on the text determins the value.  The text widget itself provides
-   * defaults if no tag specifies an override.
-   */
-
-  GtkTextAttributes *values;
-  
-  /* Flags for whether a given value is set; if a value is unset, then
-   * this tag does not affect it.
-   */
-  guint bg_color_set : 1;
-  guint bg_stipple_set : 1;
-  guint fg_color_set : 1;
-  guint scale_set : 1;
-  guint fg_stipple_set : 1;
-  guint justification_set : 1;
-  guint left_margin_set : 1;
-  guint indent_set : 1;
-  guint rise_set : 1;
-  guint strikethrough_set : 1;
-  guint right_margin_set : 1;
-  guint pixels_above_lines_set : 1;
-  guint pixels_below_lines_set : 1;
-  guint pixels_inside_wrap_set : 1;
-  guint tabs_set : 1;
-  guint underline_set : 1;
-  guint wrap_mode_set : 1;
-  guint bg_full_height_set : 1;
-  guint invisible_set : 1;
-  guint editable_set : 1;
-  guint language_set : 1;
-  guint pg_bg_color_set : 1;
-
-  /* Whether these margins accumulate or override */
-  guint accumulative_margin : 1;
-
-  guint pad1 : 1;
-};
-
-struct _GtkTextTagClass
-{
-  GObjectClass parent_class;
-
-  gboolean (* event) (GtkTextTag        *tag,
-                      GObject           *event_object, /* widget, canvas item, whatever */
-                      GdkEvent          *event,        /* the event itself */
-                      const GtkTextIter *iter);        /* location of event in buffer */
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType        gtk_text_tag_get_type     (void) G_GNUC_CONST;
-GtkTextTag  *gtk_text_tag_new          (const gchar       *name);
-gint         gtk_text_tag_get_priority (GtkTextTag        *tag);
-void         gtk_text_tag_set_priority (GtkTextTag        *tag,
-                                        gint               priority);
-gboolean     gtk_text_tag_event        (GtkTextTag        *tag,
-                                        GObject           *event_object,
-                                        GdkEvent          *event,
-                                        const GtkTextIter *iter);
-
-/*
- * Style object created by folding a set of tags together
- */
-
-typedef struct _GtkTextAppearance GtkTextAppearance;
-
-struct _GtkTextAppearance
-{
-  /*< public >*/
-  GdkColor bg_color;
-  GdkColor fg_color;
-  GdkBitmap *bg_stipple;
-  GdkBitmap *fg_stipple;
-
-  /* super/subscript rise, can be negative */
-  gint rise;
-
-  /*< private >*/
-  /* I'm not sure this can really be used without breaking some things
-   * an app might do :-/
-   */
-  gpointer padding1;
-
-  /*< public >*/
-  guint underline : 4;          /* PangoUnderline */
-  guint strikethrough : 1;
-
-  /* Whether to use background-related values; this is irrelevant for
-   * the values struct when in a tag, but is used for the composite
-   * values struct; it's true if any of the tags being composited
-   * had background stuff set.
-   */
-  guint draw_bg : 1;
-  
-  /* These are only used when we are actually laying out and rendering
-   * a paragraph; not when a GtkTextAppearance is part of a
-   * GtkTextAttributes.
-   */
-  guint inside_selection : 1;
-  guint is_text : 1;
-
-  /*< private >*/
-  guint pad1 : 1;
-  guint pad2 : 1;
-  guint pad3 : 1;
-  guint pad4 : 1;
-};
-
-struct _GtkTextAttributes
-{
-  /*< private >*/
-  guint refcount;
-
-  /*< public >*/
-  GtkTextAppearance appearance;
-
-  GtkJustification justification;
-  GtkTextDirection direction;
-
-  /* Individual chunks of this can be set/unset as a group */
-  PangoFontDescription *font;
-
-  gdouble font_scale;
-  
-  gint left_margin;
-
-  gint indent;  
-
-  gint right_margin;
-
-  gint pixels_above_lines;
-
-  gint pixels_below_lines;
-
-  gint pixels_inside_wrap;
-
-  PangoTabArray *tabs;
-
-  GtkWrapMode wrap_mode;        /* How to handle wrap-around for this tag.
-                                 * Must be GTK_WRAPMODE_CHAR,
-                                 * GTK_WRAPMODE_NONE, GTK_WRAPMODE_WORD
-                                 */
-
-  PangoLanguage *language;
-
-  /*< private >*/
-  GdkColor *pg_bg_color;
-
-  /*< public >*/
-  /* hide the text  */
-  guint invisible : 1;
-
-  /* Background is fit to full line height rather than
-   * baseline +/- ascent/descent (font height)
-   */
-  guint bg_full_height : 1;
-
-  /* can edit this text */
-  guint editable : 1;
-
-  /* colors are allocated etc. */
-  guint realized : 1;
-
-  /*< private >*/
-  guint pad1 : 1;
-  guint pad2 : 1;
-  guint pad3 : 1;
-  guint pad4 : 1;
-};
-
-GtkTextAttributes* gtk_text_attributes_new         (void);
-GtkTextAttributes* gtk_text_attributes_copy        (GtkTextAttributes *src);
-void               gtk_text_attributes_copy_values (GtkTextAttributes *src,
-                                                    GtkTextAttributes *dest);
-void               gtk_text_attributes_unref       (GtkTextAttributes *values);
-GtkTextAttributes *gtk_text_attributes_ref         (GtkTextAttributes *values);
-
-GType              gtk_text_attributes_get_type    (void) G_GNUC_CONST;
-
-
-G_END_DECLS
-
-#endif
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktexttagtable.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktexttagtable.h
deleted file mode 100644
index 6582c7ec..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktexttagtable.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_TEXT_TAG_TABLE_H__
-#define __GTK_TEXT_TAG_TABLE_H__
-
-#include <gtk/gtktexttag.h>
-
-G_BEGIN_DECLS
-
-#include <gtk/gtktexttag.h>
-
-typedef void (* GtkTextTagTableForeach) (GtkTextTag *tag, gpointer data);
-
-#define GTK_TYPE_TEXT_TAG_TABLE            (gtk_text_tag_table_get_type ())
-#define GTK_TEXT_TAG_TABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TEXT_TAG_TABLE, GtkTextTagTable))
-#define GTK_TEXT_TAG_TABLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_TAG_TABLE, GtkTextTagTableClass))
-#define GTK_IS_TEXT_TAG_TABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TEXT_TAG_TABLE))
-#define GTK_IS_TEXT_TAG_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TEXT_TAG_TABLE))
-#define GTK_TEXT_TAG_TABLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TEXT_TAG_TABLE, GtkTextTagTableClass))
-
-typedef struct _GtkTextTagTableClass GtkTextTagTableClass;
-
-struct _GtkTextTagTable
-{
-  GObject parent_instance;
-
-  GHashTable *hash;
-  GSList *anonymous;
-  gint anon_count;
-
-  GSList *buffers;
-};
-
-struct _GtkTextTagTableClass
-{
-  GObjectClass parent_class;
-
-  void (* tag_changed) (GtkTextTagTable *table, GtkTextTag *tag, gboolean size_changed);
-  void (* tag_added) (GtkTextTagTable *table, GtkTextTag *tag);
-  void (* tag_removed) (GtkTextTagTable *table, GtkTextTag *tag);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType          gtk_text_tag_table_get_type (void) G_GNUC_CONST;
-
-GtkTextTagTable *gtk_text_tag_table_new      (void);
-void             gtk_text_tag_table_add      (GtkTextTagTable        *table,
-                                              GtkTextTag             *tag);
-void             gtk_text_tag_table_remove   (GtkTextTagTable        *table,
-                                              GtkTextTag             *tag);
-GtkTextTag      *gtk_text_tag_table_lookup   (GtkTextTagTable        *table,
-                                              const gchar            *name);
-void             gtk_text_tag_table_foreach  (GtkTextTagTable        *table,
-                                              GtkTextTagTableForeach  func,
-                                              gpointer                data);
-gint             gtk_text_tag_table_get_size (GtkTextTagTable        *table);
-
-
-/* INTERNAL private stuff - not even exported from the library on
- * many platforms
- */
-void _gtk_text_tag_table_add_buffer    (GtkTextTagTable *table,
-                                        gpointer         buffer);
-void _gtk_text_tag_table_remove_buffer (GtkTextTagTable *table,
-                                        gpointer         buffer);
-
-G_END_DECLS
-
-#endif
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextview.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextview.h
deleted file mode 100644
index d5223118..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextview.h
+++ /dev/null
@@ -1,367 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtktextview.h 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.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __GTK_TEXT_VIEW_H__
-#define __GTK_TEXT_VIEW_H__
-
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtkimcontext.h>
-#include <gtk/gtktextbuffer.h>
-#include <gtk/gtkmenu.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_TEXT_VIEW             (gtk_text_view_get_type ())
-#define GTK_TEXT_VIEW(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TEXT_VIEW, GtkTextView))
-#define GTK_TEXT_VIEW_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_VIEW, GtkTextViewClass))
-#define GTK_IS_TEXT_VIEW(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TEXT_VIEW))
-#define GTK_IS_TEXT_VIEW_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TEXT_VIEW))
-#define GTK_TEXT_VIEW_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TEXT_VIEW, GtkTextViewClass))
-
-typedef enum
-{
-  GTK_TEXT_WINDOW_PRIVATE,
-  GTK_TEXT_WINDOW_WIDGET,
-  GTK_TEXT_WINDOW_TEXT,
-  GTK_TEXT_WINDOW_LEFT,
-  GTK_TEXT_WINDOW_RIGHT,
-  GTK_TEXT_WINDOW_TOP,
-  GTK_TEXT_WINDOW_BOTTOM
-} GtkTextWindowType;
-
-#define GTK_TEXT_VIEW_PRIORITY_VALIDATE (GDK_PRIORITY_REDRAW + 5)
-
-typedef struct _GtkTextView GtkTextView;
-typedef struct _GtkTextViewClass GtkTextViewClass;
-
-/* Internal private types. */
-typedef struct _GtkTextWindow GtkTextWindow;
-typedef struct _GtkTextPendingScroll GtkTextPendingScroll;
-
-struct _GtkTextView
-{
-  GtkContainer parent_instance;
-
-  struct _GtkTextLayout *layout;
-  GtkTextBuffer *buffer;
-
-  guint selection_drag_handler;
-  guint scroll_timeout;
-
-  /* Default style settings */
-  gint pixels_above_lines;
-  gint pixels_below_lines;
-  gint pixels_inside_wrap;
-  GtkWrapMode wrap_mode;  
-  GtkJustification justify;
-  gint left_margin;
-  gint right_margin;
-  gint indent;
-  PangoTabArray *tabs;
-  guint editable : 1;
-
-  
-  
-  guint overwrite_mode : 1;
-  guint cursor_visible : 1;
-
-  /* if we have reset the IM since the last character entered */  
-  guint  need_im_reset : 1;	
-
-  guint accepts_tab : 1;
-  
-  guint width_changed : 1;
-  
-  /* debug flag - means that we've validated onscreen since the
-   * last "invalidate" signal from the layout
-   */
-  guint onscreen_validated : 1;
-
-  guint mouse_cursor_obscured : 1;
-
-  GtkTextWindow *text_window;
-  GtkTextWindow *left_window;
-  GtkTextWindow *right_window;
-  GtkTextWindow *top_window;
-  GtkTextWindow *bottom_window;
-
-  GtkAdjustment *hadjustment;
-  GtkAdjustment *vadjustment;
-
-  gint xoffset;                 /* Offsets between widget coordinates and buffer coordinates */
-  gint yoffset;
-  gint width;                   /* Width and height of the buffer */
-  gint height;
-
-  /* The virtual cursor position is normally the same as the
-   * actual (strong) cursor position, except in two circumstances:
-   *
-   * a) When the cursor is moved vertically with the keyboard
-   * b) When the text view is scrolled with the keyboard
-   *
-   * In case a), virtual_cursor_x is preserved, but not virtual_cursor_y
-   * In case b), both virtual_cursor_x and virtual_cursor_y are preserved.
-   */
-  gint virtual_cursor_x;           /* -1 means use actual cursor position */
-  gint virtual_cursor_y;           /* -1 means use actual cursor position */
-
-  GtkTextMark *first_para_mark;    /* Mark at the beginning of the first onscreen paragraph */
-  gint first_para_pixels;          /* Offset of top of screen in the first onscreen paragraph */
-
-  GtkTextMark *dnd_mark;
-  guint blink_timeout;
-
-  guint first_validate_idle;            /* Idle to revalidate onscreen portion, runs before resize */
-  guint incremental_validate_idle;      /* Idle to revalidate offscreen portions, runs after redraw */
-
-  GtkIMContext *im_context;
-  GtkWidget *popup_menu;
-
-  gint drag_start_x;
-  gint drag_start_y;
-
-  GSList *children;
-
-  GtkTextPendingScroll *pending_scroll;
-
-  gint pending_place_cursor_button;
-};
-
-struct _GtkTextViewClass
-{
-  GtkContainerClass parent_class;
-
-  void (* set_scroll_adjustments)   (GtkTextView    *text_view,
-                                     GtkAdjustment  *hadjustment,
-                                     GtkAdjustment  *vadjustment);
-
-  void (* populate_popup)           (GtkTextView    *text_view,
-                                     GtkMenu        *menu);
-  
-  /* These are all RUN_ACTION signals for keybindings */
-
-  /* move insertion point */
-  void (* move_cursor) (GtkTextView    *text_view,
-                        GtkMovementStep step,
-                        gint            count,
-                        gboolean        extend_selection);
-
-  /* FIXME should be deprecated in favor of adding GTK_MOVEMENT_HORIZONTAL_PAGES
-   * or something in GTK 2.2, was put in to avoid adding enum values during
-   * the freeze.
-   */
-  void (* page_horizontally) (GtkTextView *text_view,
-                              gint         count,
-                              gboolean     extend_selection);
-  
-  /* move the "anchor" (what Emacs calls the mark) to the cursor position */
-  void (* set_anchor)  (GtkTextView    *text_view);
-
-  /* Edits */
-  void (* insert_at_cursor)      (GtkTextView *text_view,
-                                  const gchar *str);
-  void (* delete_from_cursor)    (GtkTextView  *text_view,
-                                  GtkDeleteType type,
-                                  gint          count);
-  void (* backspace)             (GtkTextView *text_view);
-
-  /* cut copy paste */
-  void (* cut_clipboard)   (GtkTextView *text_view);
-  void (* copy_clipboard)  (GtkTextView *text_view);
-  void (* paste_clipboard) (GtkTextView *text_view);
-  /* overwrite */
-  void (* toggle_overwrite) (GtkTextView *text_view);
-
-  /* as of GTK+ 2.12 the "move-focus" signal has been moved to GtkWidget,
-   * so this is merley a virtual function now. Overriding it in subclasses
-   * continues to work though.
-   */
-  void (* move_focus)       (GtkTextView     *text_view,
-                             GtkDirectionType direction);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-  void (*_gtk_reserved5) (void);
-  void (*_gtk_reserved6) (void);
-  void (*_gtk_reserved7) (void);
-};
-
-GType          gtk_text_view_get_type              (void) G_GNUC_CONST;
-GtkWidget *    gtk_text_view_new                   (void);
-GtkWidget *    gtk_text_view_new_with_buffer       (GtkTextBuffer *buffer);
-void           gtk_text_view_set_buffer            (GtkTextView   *text_view,
-                                                    GtkTextBuffer *buffer);
-GtkTextBuffer *gtk_text_view_get_buffer            (GtkTextView   *text_view);
-gboolean       gtk_text_view_scroll_to_iter        (GtkTextView   *text_view,
-                                                    GtkTextIter   *iter,
-                                                    gdouble        within_margin,
-                                                    gboolean       use_align,
-                                                    gdouble        xalign,
-                                                    gdouble        yalign);
-void           gtk_text_view_scroll_to_mark        (GtkTextView   *text_view,
-                                                    GtkTextMark   *mark,
-                                                    gdouble        within_margin,
-                                                    gboolean       use_align,
-                                                    gdouble        xalign,
-                                                    gdouble        yalign);
-void           gtk_text_view_scroll_mark_onscreen  (GtkTextView   *text_view,
-                                                    GtkTextMark   *mark);
-gboolean       gtk_text_view_move_mark_onscreen    (GtkTextView   *text_view,
-                                                    GtkTextMark   *mark);
-gboolean       gtk_text_view_place_cursor_onscreen (GtkTextView   *text_view);
-
-void           gtk_text_view_get_visible_rect      (GtkTextView   *text_view,
-                                                    GdkRectangle  *visible_rect);
-void           gtk_text_view_set_cursor_visible    (GtkTextView   *text_view,
-                                                    gboolean       setting);
-gboolean       gtk_text_view_get_cursor_visible    (GtkTextView   *text_view);
-
-void           gtk_text_view_get_iter_location     (GtkTextView   *text_view,
-                                                    const GtkTextIter *iter,
-                                                    GdkRectangle  *location);
-void           gtk_text_view_get_iter_at_location  (GtkTextView   *text_view,
-                                                    GtkTextIter   *iter,
-                                                    gint           x,
-                                                    gint           y);
-void           gtk_text_view_get_iter_at_position  (GtkTextView   *text_view,
-                                                    GtkTextIter   *iter,
-						    gint          *trailing,
-                                                    gint           x,
-                                                    gint           y);
-void           gtk_text_view_get_line_yrange       (GtkTextView       *text_view,
-                                                    const GtkTextIter *iter,
-                                                    gint              *y,
-                                                    gint              *height);
-
-void           gtk_text_view_get_line_at_y         (GtkTextView       *text_view,
-                                                    GtkTextIter       *target_iter,
-                                                    gint               y,
-                                                    gint              *line_top);
-
-void gtk_text_view_buffer_to_window_coords (GtkTextView       *text_view,
-                                            GtkTextWindowType  win,
-                                            gint               buffer_x,
-                                            gint               buffer_y,
-                                            gint              *window_x,
-                                            gint              *window_y);
-void gtk_text_view_window_to_buffer_coords (GtkTextView       *text_view,
-                                            GtkTextWindowType  win,
-                                            gint               window_x,
-                                            gint               window_y,
-                                            gint              *buffer_x,
-                                            gint              *buffer_y);
-
-GdkWindow*        gtk_text_view_get_window      (GtkTextView       *text_view,
-                                                 GtkTextWindowType  win);
-GtkTextWindowType gtk_text_view_get_window_type (GtkTextView       *text_view,
-                                                 GdkWindow         *window);
-
-void gtk_text_view_set_border_window_size (GtkTextView       *text_view,
-                                           GtkTextWindowType  type,
-                                           gint               size);
-gint gtk_text_view_get_border_window_size (GtkTextView       *text_view,
-					   GtkTextWindowType  type);
-
-gboolean gtk_text_view_forward_display_line           (GtkTextView       *text_view,
-                                                       GtkTextIter       *iter);
-gboolean gtk_text_view_backward_display_line          (GtkTextView       *text_view,
-                                                       GtkTextIter       *iter);
-gboolean gtk_text_view_forward_display_line_end       (GtkTextView       *text_view,
-                                                       GtkTextIter       *iter);
-gboolean gtk_text_view_backward_display_line_start    (GtkTextView       *text_view,
-                                                       GtkTextIter       *iter);
-gboolean gtk_text_view_starts_display_line            (GtkTextView       *text_view,
-                                                       const GtkTextIter *iter);
-gboolean gtk_text_view_move_visually                  (GtkTextView       *text_view,
-                                                       GtkTextIter       *iter,
-                                                       gint               count);
-
-/* Adding child widgets */
-void gtk_text_view_add_child_at_anchor (GtkTextView          *text_view,
-                                        GtkWidget            *child,
-                                        GtkTextChildAnchor   *anchor);
-
-void gtk_text_view_add_child_in_window (GtkTextView          *text_view,
-                                        GtkWidget            *child,
-                                        GtkTextWindowType     which_window,
-                                        /* window coordinates */
-                                        gint                  xpos,
-                                        gint                  ypos);
-
-void gtk_text_view_move_child          (GtkTextView          *text_view,
-                                        GtkWidget            *child,
-                                        /* window coordinates */
-                                        gint                  xpos,
-                                        gint                  ypos);
-
-/* Default style settings (fallbacks if no tag affects the property) */
-
-void             gtk_text_view_set_wrap_mode          (GtkTextView      *text_view,
-                                                       GtkWrapMode       wrap_mode);
-GtkWrapMode      gtk_text_view_get_wrap_mode          (GtkTextView      *text_view);
-void             gtk_text_view_set_editable           (GtkTextView      *text_view,
-                                                       gboolean          setting);
-gboolean         gtk_text_view_get_editable           (GtkTextView      *text_view);
-void             gtk_text_view_set_overwrite          (GtkTextView      *text_view,
-						       gboolean          overwrite);
-gboolean         gtk_text_view_get_overwrite          (GtkTextView      *text_view);
-void		 gtk_text_view_set_accepts_tab        (GtkTextView	*text_view,
-						       gboolean		 accepts_tab);
-gboolean	 gtk_text_view_get_accepts_tab        (GtkTextView	*text_view);
-void             gtk_text_view_set_pixels_above_lines (GtkTextView      *text_view,
-                                                       gint              pixels_above_lines);
-gint             gtk_text_view_get_pixels_above_lines (GtkTextView      *text_view);
-void             gtk_text_view_set_pixels_below_lines (GtkTextView      *text_view,
-                                                       gint              pixels_below_lines);
-gint             gtk_text_view_get_pixels_below_lines (GtkTextView      *text_view);
-void             gtk_text_view_set_pixels_inside_wrap (GtkTextView      *text_view,
-                                                       gint              pixels_inside_wrap);
-gint             gtk_text_view_get_pixels_inside_wrap (GtkTextView      *text_view);
-void             gtk_text_view_set_justification      (GtkTextView      *text_view,
-                                                       GtkJustification  justification);
-GtkJustification gtk_text_view_get_justification      (GtkTextView      *text_view);
-void             gtk_text_view_set_left_margin        (GtkTextView      *text_view,
-                                                       gint              left_margin);
-gint             gtk_text_view_get_left_margin        (GtkTextView      *text_view);
-void             gtk_text_view_set_right_margin       (GtkTextView      *text_view,
-                                                       gint              right_margin);
-gint             gtk_text_view_get_right_margin       (GtkTextView      *text_view);
-void             gtk_text_view_set_indent             (GtkTextView      *text_view,
-                                                       gint              indent);
-gint             gtk_text_view_get_indent             (GtkTextView      *text_view);
-void             gtk_text_view_set_tabs               (GtkTextView      *text_view,
-                                                       PangoTabArray    *tabs);
-PangoTabArray*   gtk_text_view_get_tabs               (GtkTextView      *text_view);
-
-/* note that the return value of this changes with the theme */
-GtkTextAttributes* gtk_text_view_get_default_attributes (GtkTextView    *text_view);
-
-G_END_DECLS
-
-#endif /* __GTK_TEXT_VIEW_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktipsquery.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktipsquery.h
deleted file mode 100644
index 2a09baed..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktipsquery.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * GtkQueryTips: Query onscreen widgets for their tooltips
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-#ifndef __GTK_TIPS_QUERY_H__
-#define __GTK_TIPS_QUERY_H__
-
-
-#include <gtk/gtklabel.h>
-
-
-G_BEGIN_DECLS
-
-/* --- type macros --- */
-#define	GTK_TYPE_TIPS_QUERY		(gtk_tips_query_get_type ())
-#define GTK_TIPS_QUERY(obj)		(GTK_CHECK_CAST ((obj), GTK_TYPE_TIPS_QUERY, GtkTipsQuery))
-#define GTK_TIPS_QUERY_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TIPS_QUERY, GtkTipsQueryClass))
-#define GTK_IS_TIPS_QUERY(obj)		(GTK_CHECK_TYPE ((obj), GTK_TYPE_TIPS_QUERY))
-#define GTK_IS_TIPS_QUERY_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TIPS_QUERY))
-#define GTK_TIPS_QUERY_GET_CLASS(obj)   (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TIPS_QUERY, GtkTipsQueryClass))
-
-
-/* --- typedefs --- */
-typedef	struct	_GtkTipsQuery		GtkTipsQuery;
-typedef	struct	_GtkTipsQueryClass	GtkTipsQueryClass;
-
-
-/* --- structures --- */
-struct	_GtkTipsQuery
-{
-  GtkLabel	label;
-
-  guint		emit_always : 1;
-  guint		in_query : 1;
-  gchar		*label_inactive;
-  gchar		*label_no_tip;
-
-  GtkWidget	*caller;
-  GtkWidget	*last_crossed;
-
-  GdkCursor	*query_cursor;
-};
-
-struct	_GtkTipsQueryClass
-{
-  GtkLabelClass			parent_class;
-
-  void	(*start_query)		(GtkTipsQuery	*tips_query);
-  void	(*stop_query)		(GtkTipsQuery	*tips_query);
-  void	(*widget_entered)	(GtkTipsQuery	*tips_query,
-				 GtkWidget	*widget,
-				 const gchar	*tip_text,
-				 const gchar	*tip_private);
-  gint	(*widget_selected)	(GtkTipsQuery	*tips_query,
-				 GtkWidget	*widget,
-				 const gchar	*tip_text,
-				 const gchar	*tip_private,
-				 GdkEventButton	*event);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-/* --- prototypes --- */
-GtkType		gtk_tips_query_get_type		(void) G_GNUC_CONST;
-GtkWidget*	gtk_tips_query_new		(void);
-void		gtk_tips_query_start_query	(GtkTipsQuery	*tips_query);
-void		gtk_tips_query_stop_query	(GtkTipsQuery	*tips_query);
-void		gtk_tips_query_set_caller	(GtkTipsQuery	*tips_query,
-						 GtkWidget	*caller);
-void		gtk_tips_query_set_labels 	(GtkTipsQuery   *tips_query,
-						 const gchar    *label_inactive,
-						 const gchar    *label_no_tip);
-     
-G_END_DECLS
-
-#endif	/* __GTK_TIPS_QUERY_H__ */
-
-#endif /* GTK_DISABLE_DEPRECATED */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktoggleaction.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktoggleaction.h
deleted file mode 100644
index 6325c35b..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktoggleaction.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * GTK - The GIMP Toolkit
- * Copyright (C) 1998, 1999 Red Hat, Inc.
- * All rights reserved.
- *
- * 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 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.
- */
-
-/*
- * Author: James Henstridge <james@daa.com.au>
- *
- * Modified by the GTK+ Team and others 2003.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-#ifndef __GTK_TOGGLE_ACTION_H__
-#define __GTK_TOGGLE_ACTION_H__
-
-#include <gtk/gtkaction.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_TOGGLE_ACTION            (gtk_toggle_action_get_type ())
-#define GTK_TOGGLE_ACTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOGGLE_ACTION, GtkToggleAction))
-#define GTK_TOGGLE_ACTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOGGLE_ACTION, GtkToggleActionClass))
-#define GTK_IS_TOGGLE_ACTION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TOGGLE_ACTION))
-#define GTK_IS_TOGGLE_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TOGGLE_ACTION))
-#define GTK_TOGGLE_ACTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_TOGGLE_ACTION, GtkToggleActionClass))
-
-typedef struct _GtkToggleAction        GtkToggleAction;
-typedef struct _GtkToggleActionPrivate GtkToggleActionPrivate;
-typedef struct _GtkToggleActionClass   GtkToggleActionClass;
-
-struct _GtkToggleAction
-{
-  GtkAction parent;
-
-  /*< private >*/
-
-  GtkToggleActionPrivate *private_data;
-};
-
-struct _GtkToggleActionClass
-{
-  GtkActionClass parent_class;
-
-  void (* toggled) (GtkToggleAction *action);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType            gtk_toggle_action_get_type          (void) G_GNUC_CONST;
-GtkToggleAction *gtk_toggle_action_new               (const gchar     *name,
-                                                      const gchar     *label,
-                                                      const gchar     *tooltip,
-                                                      const gchar     *stock_id);
-void             gtk_toggle_action_toggled           (GtkToggleAction *action);
-void             gtk_toggle_action_set_active        (GtkToggleAction *action,
-                                                      gboolean         is_active);
-gboolean         gtk_toggle_action_get_active        (GtkToggleAction *action);
-void             gtk_toggle_action_set_draw_as_radio (GtkToggleAction *action,
-                                                      gboolean         draw_as_radio);
-gboolean         gtk_toggle_action_get_draw_as_radio (GtkToggleAction *action);
-
-
-G_END_DECLS
-
-#endif  /* __GTK_TOGGLE_ACTION_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktogglebutton.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktogglebutton.h
deleted file mode 100644
index c5bb68e3..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktogglebutton.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_TOGGLE_BUTTON_H__
-#define __GTK_TOGGLE_BUTTON_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkbutton.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_TOGGLE_BUTTON                  (gtk_toggle_button_get_type ())
-#define GTK_TOGGLE_BUTTON(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOGGLE_BUTTON, GtkToggleButton))
-#define GTK_TOGGLE_BUTTON_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOGGLE_BUTTON, GtkToggleButtonClass))
-#define GTK_IS_TOGGLE_BUTTON(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TOGGLE_BUTTON))
-#define GTK_IS_TOGGLE_BUTTON_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TOGGLE_BUTTON))
-#define GTK_TOGGLE_BUTTON_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TOGGLE_BUTTON, GtkToggleButtonClass))
-
-
-typedef struct _GtkToggleButton       GtkToggleButton;
-typedef struct _GtkToggleButtonClass  GtkToggleButtonClass;
-
-struct _GtkToggleButton
-{
-  GtkButton button;
-
-  guint active : 1;
-  guint draw_indicator : 1;
-  guint inconsistent : 1;
-};
-
-struct _GtkToggleButtonClass
-{
-  GtkButtonClass parent_class;
-
-  void (* toggled) (GtkToggleButton *toggle_button);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType      gtk_toggle_button_get_type          (void) G_GNUC_CONST;
-
-GtkWidget* gtk_toggle_button_new               (void);
-GtkWidget* gtk_toggle_button_new_with_label    (const gchar     *label);
-GtkWidget* gtk_toggle_button_new_with_mnemonic (const gchar     *label);
-void       gtk_toggle_button_set_mode          (GtkToggleButton *toggle_button,
-                                                gboolean         draw_indicator);
-gboolean   gtk_toggle_button_get_mode          (GtkToggleButton *toggle_button);
-void       gtk_toggle_button_set_active        (GtkToggleButton *toggle_button,
-                                                gboolean         is_active);
-gboolean   gtk_toggle_button_get_active        (GtkToggleButton *toggle_button);
-void       gtk_toggle_button_toggled           (GtkToggleButton *toggle_button);
-void       gtk_toggle_button_set_inconsistent  (GtkToggleButton *toggle_button,
-                                                gboolean         setting);
-gboolean   gtk_toggle_button_get_inconsistent  (GtkToggleButton *toggle_button);
-
-
-#ifndef GTK_DISABLE_DEPRECATED
-#define	gtk_toggle_button_set_state		gtk_toggle_button_set_active
-#endif /* GTK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GTK_TOGGLE_BUTTON_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktoggletoolbutton.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktoggletoolbutton.h
deleted file mode 100644
index 1d747d5a..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktoggletoolbutton.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* gtktoggletoolbutton.h
- *
- * Copyright (C) 2002 Anders Carlsson <andersca@gnome.org>
- * Copyright (C) 2002 James Henstridge <james@daa.com.au>
- * Copyright (C) 2003 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 __GTK_TOGGLE_TOOL_BUTTON_H__
-#define __GTK_TOGGLE_TOOL_BUTTON_H__
-
-#include "gtktoolbutton.h"
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_TOGGLE_TOOL_BUTTON             (gtk_toggle_tool_button_get_type ())
-#define GTK_TOGGLE_TOOL_BUTTON(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOGGLE_TOOL_BUTTON, GtkToggleToolButton))
-#define GTK_TOGGLE_TOOL_BUTTON_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOGGLE_TOOL_BUTTON, GtkToggleToolButtonClass))
-#define GTK_IS_TOGGLE_TOOL_BUTTON(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TOGGLE_TOOL_BUTTON))
-#define GTK_IS_TOGGLE_TOOL_BUTTON_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TOGGLE_TOOL_BUTTON))
-#define GTK_TOGGLE_TOOL_BUTTON_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_TOGGLE_TOOL_BUTTON, GtkToggleToolButtonClass))
-
-typedef struct _GtkToggleToolButton        GtkToggleToolButton;
-typedef struct _GtkToggleToolButtonClass   GtkToggleToolButtonClass;
-typedef struct _GtkToggleToolButtonPrivate GtkToggleToolButtonPrivate;
-
-struct _GtkToggleToolButton
-{
-  GtkToolButton parent;
-
-  /*< private >*/
-  GtkToggleToolButtonPrivate *priv;
-};
-
-struct _GtkToggleToolButtonClass
-{
-  GtkToolButtonClass parent_class;
-
-  /* signal */
-  void (* toggled) (GtkToggleToolButton *button);
-
-  /* Padding for future expansion */
-  void (* _gtk_reserved1) (void);
-  void (* _gtk_reserved2) (void);
-  void (* _gtk_reserved3) (void);
-  void (* _gtk_reserved4) (void);
-};
-
-GType        gtk_toggle_tool_button_get_type       (void) G_GNUC_CONST;
-GtkToolItem *gtk_toggle_tool_button_new            (void);
-GtkToolItem *gtk_toggle_tool_button_new_from_stock (const gchar *stock_id);
-
-void         gtk_toggle_tool_button_set_active     (GtkToggleToolButton *button,
-						    gboolean             is_active);
-gboolean     gtk_toggle_tool_button_get_active     (GtkToggleToolButton *button);
-
-G_END_DECLS
-
-#endif /* __GTK_TOGGLE_TOOL_BUTTON_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktoolbar.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktoolbar.h
deleted file mode 100644
index dbe72a81..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktoolbar.h
+++ /dev/null
@@ -1,278 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- * GtkToolbar copyright (C) Federico Mena
- *
- * Copyright (C) 2002 Anders Carlsson <andersca@gnome.org>
- * Copyright (C) 2002 James Henstridge <james@daa.com.au>
- * Copyright (C) 2003 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.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_TOOLBAR_H__
-#define __GTK_TOOLBAR_H__
-
-#include <gdk/gdk.h>
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtkenums.h>
-#include <gtk/gtktooltips.h>
-
-#include "gtktoolitem.h"
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-/* Not needed, retained for compatibility -Yosh */
-#include <gtk/gtkpixmap.h>
-#include <gtk/gtksignal.h>
-
-#endif /* GTK_DISABLE_DEPRECATED */
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_TOOLBAR            (gtk_toolbar_get_type ())
-#define GTK_TOOLBAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOOLBAR, GtkToolbar))
-#define GTK_TOOLBAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOOLBAR, GtkToolbarClass))
-#define GTK_IS_TOOLBAR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TOOLBAR))
-#define GTK_IS_TOOLBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TOOLBAR))
-#define GTK_TOOLBAR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TOOLBAR, GtkToolbarClass))
-
-#ifndef GTK_DISABLE_DEPRECATED
-typedef enum
-{
-  GTK_TOOLBAR_CHILD_SPACE,
-  GTK_TOOLBAR_CHILD_BUTTON,
-  GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
-  GTK_TOOLBAR_CHILD_RADIOBUTTON,
-  GTK_TOOLBAR_CHILD_WIDGET
-} GtkToolbarChildType;
-
-typedef struct _GtkToolbarChild	     GtkToolbarChild;
-
-struct _GtkToolbarChild
-{
-  GtkToolbarChildType type;
-  GtkWidget *widget;
-  GtkWidget *icon;
-  GtkWidget *label;
-};
-
-#endif /* GTK_DISABLE_DEPRECATED */
-
-typedef enum
-{
-  GTK_TOOLBAR_SPACE_EMPTY,
-  GTK_TOOLBAR_SPACE_LINE
-} GtkToolbarSpaceStyle;
-
-typedef struct _GtkToolbar           GtkToolbar;
-typedef struct _GtkToolbarClass      GtkToolbarClass;
-typedef struct _GtkToolbarPrivate    GtkToolbarPrivate;
-
-struct _GtkToolbar
-{
-  GtkContainer container;
-
-  /*< public >*/
-  gint             num_children;
-  GList           *children;
-  GtkOrientation   orientation;
-  GtkToolbarStyle  style;
-  GtkIconSize      icon_size;
-  
-#ifndef GTK_DISABLE_DEPRECATED
-  GtkTooltips     *tooltips;
-#else
-  gpointer         _tooltips;
-#endif
-  
-  /*< private >*/
-  gint             button_maxw;		/* maximum width of homogeneous children */
-  gint             button_maxh;		/* maximum height of homogeneous children */
-
-  guint            _gtk_reserved1;
-  guint            _gtk_reserved2;
-
-  guint            style_set : 1;
-  guint            icon_size_set : 1;
-};
-
-struct _GtkToolbarClass
-{
-  GtkContainerClass parent_class;
-  
-  /* signals */
-  void     (* orientation_changed) (GtkToolbar       *toolbar,
-				    GtkOrientation    orientation);
-  void     (* style_changed)       (GtkToolbar       *toolbar,
-				    GtkToolbarStyle   style);
-  gboolean (* popup_context_menu)  (GtkToolbar       *toolbar,
-				    gint              x,
-				    gint              y,
-				    gint              button_number);
-  
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-};
-
-GType           gtk_toolbar_get_type         (void) G_GNUC_CONST;
-GtkWidget*      gtk_toolbar_new                     (void);
-void            gtk_toolbar_insert                  (GtkToolbar      *toolbar,
-						     GtkToolItem     *item,
-						     gint             pos);
-gint            gtk_toolbar_get_item_index          (GtkToolbar      *toolbar,
-						     GtkToolItem     *item);
-gint            gtk_toolbar_get_n_items             (GtkToolbar      *toolbar);
-GtkToolItem *   gtk_toolbar_get_nth_item            (GtkToolbar      *toolbar,
-						     gint             n);
-gboolean        gtk_toolbar_get_show_arrow          (GtkToolbar      *toolbar);
-void            gtk_toolbar_set_show_arrow          (GtkToolbar      *toolbar,
-						     gboolean         show_arrow);
-GtkOrientation  gtk_toolbar_get_orientation         (GtkToolbar      *toolbar);
-void            gtk_toolbar_set_orientation         (GtkToolbar      *toolbar,
-						     GtkOrientation   orientation);
-gboolean        gtk_toolbar_get_tooltips            (GtkToolbar      *toolbar);
-void            gtk_toolbar_set_tooltips            (GtkToolbar      *toolbar,
-						     gboolean         enable);
-GtkToolbarStyle gtk_toolbar_get_style               (GtkToolbar      *toolbar);
-void            gtk_toolbar_set_style               (GtkToolbar      *toolbar,
-						     GtkToolbarStyle  style);
-void            gtk_toolbar_unset_style             (GtkToolbar      *toolbar);
-GtkIconSize     gtk_toolbar_get_icon_size           (GtkToolbar      *toolbar);
-GtkReliefStyle  gtk_toolbar_get_relief_style        (GtkToolbar      *toolbar);
-gint            gtk_toolbar_get_drop_index          (GtkToolbar      *toolbar,
-						     gint             x,
-						     gint             y);
-void            gtk_toolbar_set_drop_highlight_item (GtkToolbar      *toolbar,
-						     GtkToolItem     *tool_item,
-						     gint             index_);
-
-/* internal functions */
-gchar *         _gtk_toolbar_elide_underscores      (const gchar     *original);
-void            _gtk_toolbar_paint_space_line       (GtkWidget       *widget,
-						     GtkToolbar      *toolbar,
-						     GdkRectangle    *area,
-						     GtkAllocation   *allocation);
-gint            _gtk_toolbar_get_default_space_size (void);
-void            _gtk_toolbar_rebuild_menu           (GtkToolbar      *toolbar);
-
-
-void       gtk_toolbar_set_icon_size   (GtkToolbar      *toolbar,
-				        GtkIconSize      icon_size);
-void       gtk_toolbar_unset_icon_size (GtkToolbar      *toolbar);
-
-#ifndef GTK_DISABLE_DEPRECATED
-/* Simple button items */
-GtkWidget* gtk_toolbar_append_item   (GtkToolbar      *toolbar,
-				      const char      *text,
-				      const char      *tooltip_text,
-				      const char      *tooltip_private_text,
-				      GtkWidget       *icon,
-				      GtkSignalFunc    callback,
-				      gpointer         user_data);
-GtkWidget* gtk_toolbar_prepend_item  (GtkToolbar      *toolbar,
-				      const char      *text,
-				      const char      *tooltip_text,
-				      const char      *tooltip_private_text,
-				      GtkWidget       *icon,
-				      GtkSignalFunc    callback,
-				      gpointer         user_data);
-GtkWidget* gtk_toolbar_insert_item   (GtkToolbar      *toolbar,
-				      const char      *text,
-				      const char      *tooltip_text,
-				      const char      *tooltip_private_text,
-				      GtkWidget       *icon,
-				      GtkSignalFunc    callback,
-				      gpointer         user_data,
-				      gint             position);
-
-/* Stock Items */
-GtkWidget* gtk_toolbar_insert_stock    (GtkToolbar      *toolbar,
-					const gchar     *stock_id,
-					const char      *tooltip_text,
-					const char      *tooltip_private_text,
-					GtkSignalFunc    callback,
-					gpointer         user_data,
-					gint             position);
-
-/* Space Items */
-void       gtk_toolbar_append_space    (GtkToolbar      *toolbar);
-void       gtk_toolbar_prepend_space   (GtkToolbar      *toolbar);
-void       gtk_toolbar_insert_space    (GtkToolbar      *toolbar,
-					gint             position);
-void       gtk_toolbar_remove_space    (GtkToolbar      *toolbar,
-                                        gint             position);
-/* Any element type */
-GtkWidget* gtk_toolbar_append_element  (GtkToolbar      *toolbar,
-					GtkToolbarChildType type,
-					GtkWidget       *widget,
-					const char      *text,
-					const char      *tooltip_text,
-					const char      *tooltip_private_text,
-					GtkWidget       *icon,
-					GtkSignalFunc    callback,
-					gpointer         user_data);
-
-GtkWidget* gtk_toolbar_prepend_element (GtkToolbar      *toolbar,
-					GtkToolbarChildType type,
-					GtkWidget       *widget,
-					const char      *text,
-					const char      *tooltip_text,
-					const char      *tooltip_private_text,
-					GtkWidget       *icon,
-					GtkSignalFunc    callback,
-					gpointer         user_data);
-
-GtkWidget* gtk_toolbar_insert_element  (GtkToolbar      *toolbar,
-					GtkToolbarChildType type,
-					GtkWidget       *widget,
-					const char      *text,
-					const char      *tooltip_text,
-					const char      *tooltip_private_text,
-					GtkWidget       *icon,
-					GtkSignalFunc    callback,
-					gpointer         user_data,
-					gint             position);
-
-/* Generic Widgets */
-void       gtk_toolbar_append_widget   (GtkToolbar      *toolbar,
-					GtkWidget       *widget,
-					const char      *tooltip_text,
-					const char      *tooltip_private_text);
-void       gtk_toolbar_prepend_widget  (GtkToolbar      *toolbar,
-					GtkWidget       *widget,
-					const char      *tooltip_text,
-					const char	*tooltip_private_text);
-void       gtk_toolbar_insert_widget   (GtkToolbar      *toolbar,
-					GtkWidget       *widget,
-					const char      *tooltip_text,
-					const char      *tooltip_private_text,
-					gint             position);
-
-#endif /* GTK_DISABLE_DEPRECATED */
-
-
-G_END_DECLS
-
-#endif /* __GTK_TOOLBAR_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktoolbutton.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktoolbutton.h
deleted file mode 100644
index b7329a02..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktoolbutton.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* gtktoolbutton.h
- *
- * Copyright (C) 2002 Anders Carlsson <andersca@gnome.org>
- * Copyright (C) 2002 James Henstridge <james@daa.com.au>
- * Copyright (C) 2003 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 __GTK_TOOL_BUTTON_H__
-#define __GTK_TOOL_BUTTON_H__
-
-#include "gtktoolitem.h"
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_TOOL_BUTTON            (gtk_tool_button_get_type ())
-#define GTK_TOOL_BUTTON(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOOL_BUTTON, GtkToolButton))
-#define GTK_TOOL_BUTTON_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOOL_BUTTON, GtkToolButtonClass))
-#define GTK_IS_TOOL_BUTTON(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TOOL_BUTTON))
-#define GTK_IS_TOOL_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TOOL_BUTTON))
-#define GTK_TOOL_BUTTON_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_TOOL_BUTTON, GtkToolButtonClass))
-
-typedef struct _GtkToolButton        GtkToolButton;
-typedef struct _GtkToolButtonClass   GtkToolButtonClass;
-typedef struct _GtkToolButtonPrivate GtkToolButtonPrivate;
-
-struct _GtkToolButton
-{
-  GtkToolItem parent;
-
-  /*< private >*/
-  GtkToolButtonPrivate *priv;
-};
-
-struct _GtkToolButtonClass
-{
-  GtkToolItemClass parent_class;
- 
-  GType button_type;
-
-  /* signal */
-  void       (* clicked)             (GtkToolButton    *tool_item);
-
-  /* Padding for future expansion */
-  void (* _gtk_reserved1) (void);
-  void (* _gtk_reserved2) (void);
-  void (* _gtk_reserved3) (void);
-  void (* _gtk_reserved4) (void);
-};
-
-GType        gtk_tool_button_get_type       (void) G_GNUC_CONST;
-GtkToolItem *gtk_tool_button_new            (GtkWidget   *icon_widget,
-					     const gchar *label);
-GtkToolItem *gtk_tool_button_new_from_stock (const gchar *stock_id);
-
-void                  gtk_tool_button_set_label         (GtkToolButton *button,
-							 const gchar   *label);
-G_CONST_RETURN gchar *gtk_tool_button_get_label         (GtkToolButton *button);
-void                  gtk_tool_button_set_use_underline (GtkToolButton *button,
-							 gboolean       use_underline);
-gboolean              gtk_tool_button_get_use_underline (GtkToolButton *button);
-void                  gtk_tool_button_set_stock_id      (GtkToolButton *button,
-							 const gchar   *stock_id);
-G_CONST_RETURN gchar *gtk_tool_button_get_stock_id      (GtkToolButton *button);
-void                  gtk_tool_button_set_icon_name     (GtkToolButton *button,
-							 const gchar   *icon_name);
-G_CONST_RETURN gchar *gtk_tool_button_get_icon_name     (GtkToolButton *button);
-void                  gtk_tool_button_set_icon_widget   (GtkToolButton *button,
-							 GtkWidget     *icon_widget);
-GtkWidget *           gtk_tool_button_get_icon_widget   (GtkToolButton *button);
-void                  gtk_tool_button_set_label_widget  (GtkToolButton *button,
-							 GtkWidget     *label_widget);
-GtkWidget *           gtk_tool_button_get_label_widget  (GtkToolButton *button);
-
-								   
-/* internal function */
-GtkWidget *_gtk_tool_button_get_button (GtkToolButton *button);
-
-G_END_DECLS
-
-#endif /* __GTK_TOOL_BUTTON_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktoolitem.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktoolitem.h
deleted file mode 100644
index dac7c0f0..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktoolitem.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/* gtktoolitem.c
- *
- * Copyright (C) 2002 Anders Carlsson <andersca@gnome.org>
- * Copyright (C) 2002 James Henstridge <james@daa.com.au>
- * Copyright (C) 2003 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 __GTK_TOOL_ITEM_H__
-#define __GTK_TOOL_ITEM_H__
-
-#include <gtk/gtkbin.h>
-#include <gtk/gtktooltips.h>
-#include <gtk/gtkmenuitem.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_TOOL_ITEM            (gtk_tool_item_get_type ())
-#define GTK_TOOL_ITEM(o)              (G_TYPE_CHECK_INSTANCE_CAST ((o), GTK_TYPE_TOOL_ITEM, GtkToolItem))
-#define GTK_TOOL_ITEM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOOL_ITEM, GtkToolItemClass))
-#define GTK_IS_TOOL_ITEM(o)           (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTK_TYPE_TOOL_ITEM))
-#define GTK_IS_TOOL_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TOOL_ITEM))
-#define GTK_TOOL_ITEM_GET_CLASS(o)    (G_TYPE_INSTANCE_GET_CLASS((o), GTK_TYPE_TOOL_ITEM, GtkToolItemClass))
-
-typedef struct _GtkToolItem        GtkToolItem;
-typedef struct _GtkToolItemClass   GtkToolItemClass;
-typedef struct _GtkToolItemPrivate GtkToolItemPrivate;
-
-struct _GtkToolItem
-{
-  GtkBin parent;
-
-  /*< private >*/
-  GtkToolItemPrivate *priv;
-};
-
-struct _GtkToolItemClass
-{
-  GtkBinClass parent_class;
-
-  /* signals */
-  gboolean   (* create_menu_proxy)    (GtkToolItem *tool_item);
-  void       (* toolbar_reconfigured) (GtkToolItem *tool_item);
-#ifndef GTK_DISABLE_DEPRECATED
-  gboolean   (* set_tooltip)	      (GtkToolItem *tool_item,
-				       GtkTooltips *tooltips,
-				       const gchar *tip_text,
-				       const gchar *tip_private);
-#else
-  gpointer _set_tooltip;
-#endif
-
-  /* Padding for future expansion */
-  void (* _gtk_reserved1) (void);
-  void (* _gtk_reserved2) (void);
-  void (* _gtk_reserved3) (void);
-  void (* _gtk_reserved4) (void);
-};
-
-GType        gtk_tool_item_get_type (void) G_GNUC_CONST;
-GtkToolItem *gtk_tool_item_new      (void);
-
-void            gtk_tool_item_set_homogeneous          (GtkToolItem *tool_item,
-							gboolean     homogeneous);
-gboolean        gtk_tool_item_get_homogeneous          (GtkToolItem *tool_item);
-
-void            gtk_tool_item_set_expand               (GtkToolItem *tool_item,
-							gboolean     expand);
-gboolean        gtk_tool_item_get_expand               (GtkToolItem *tool_item);
-
-#ifndef GTK_DISABLE_DEPRECATED
-void            gtk_tool_item_set_tooltip              (GtkToolItem *tool_item,
-							GtkTooltips *tooltips,
-							const gchar *tip_text,
-							const gchar *tip_private);
-#endif /* GTK_DISABLE_DEPRECATED */
-void            gtk_tool_item_set_tooltip_text         (GtkToolItem *tool_item,
-							const gchar *text);
-void            gtk_tool_item_set_tooltip_markup       (GtkToolItem *tool_item,
-							const gchar *markup);
-
-void            gtk_tool_item_set_use_drag_window      (GtkToolItem *tool_item,
-							gboolean     use_drag_window);
-gboolean        gtk_tool_item_get_use_drag_window      (GtkToolItem *tool_item);
-
-void            gtk_tool_item_set_visible_horizontal   (GtkToolItem *tool_item,
-							gboolean     visible_horizontal);
-gboolean        gtk_tool_item_get_visible_horizontal   (GtkToolItem *tool_item);
-
-void            gtk_tool_item_set_visible_vertical     (GtkToolItem *tool_item,
-							gboolean     visible_vertical);
-gboolean        gtk_tool_item_get_visible_vertical     (GtkToolItem *tool_item);
-
-gboolean        gtk_tool_item_get_is_important         (GtkToolItem *tool_item);
-void            gtk_tool_item_set_is_important         (GtkToolItem *tool_item,
-							gboolean     is_important);
-
-GtkIconSize     gtk_tool_item_get_icon_size            (GtkToolItem *tool_item);
-GtkOrientation  gtk_tool_item_get_orientation          (GtkToolItem *tool_item);
-GtkToolbarStyle gtk_tool_item_get_toolbar_style        (GtkToolItem *tool_item);
-GtkReliefStyle  gtk_tool_item_get_relief_style         (GtkToolItem *tool_item);
-
-GtkWidget *     gtk_tool_item_retrieve_proxy_menu_item (GtkToolItem *tool_item);
-GtkWidget *     gtk_tool_item_get_proxy_menu_item      (GtkToolItem *tool_item,
-							const gchar *menu_item_id);
-void            gtk_tool_item_set_proxy_menu_item      (GtkToolItem *tool_item,
-							const gchar *menu_item_id,
-							GtkWidget   *menu_item);
-void		gtk_tool_item_rebuild_menu	       (GtkToolItem *tool_item);
-
-/* internal function */
-void       _gtk_tool_item_toolbar_reconfigured (GtkToolItem *tool_item);
-
-G_END_DECLS
-
-#endif /* __GTK_TOOL_ITEM_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktooltip.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktooltip.h
deleted file mode 100644
index bc498af4..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktooltip.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* gtktooltip.h
- *
- * Copyright (C) 2006-2007 Imendio AB
- * Contact: Kristian Rietveld <kris@imendio.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 __GTK_TOOLTIP_H__
-#define __GTK_TOOLTIP_H__
-
-#include "gtkwidget.h"
-#include "gtkwindow.h"
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_TOOLTIP                 (gtk_tooltip_get_type ())
-#define GTK_TOOLTIP(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOOLTIP, GtkTooltip))
-#define GTK_IS_TOOLTIP(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TOOLTIP))
-
-GType gtk_tooltip_get_type (void);
-
-void gtk_tooltip_set_markup            (GtkTooltip  *tooltip,
-			                const gchar *markup);
-void gtk_tooltip_set_text              (GtkTooltip  *tooltip,
-                                        const gchar *text);
-void gtk_tooltip_set_icon              (GtkTooltip  *tooltip,
-				        GdkPixbuf   *pixbuf);
-void gtk_tooltip_set_icon_from_stock   (GtkTooltip  *tooltip,
-				        const gchar *stock_id,
-				        GtkIconSize  size);
-void gtk_tooltip_set_custom	       (GtkTooltip  *tooltip,
-				        GtkWidget   *custom_widget);
-
-void gtk_tooltip_set_tip_area          (GtkTooltip   *tooltip,
-					GdkRectangle *rect);
-
-void gtk_tooltip_trigger_tooltip_query (GdkDisplay  *display);
-
-
-void _gtk_tooltip_focus_in             (GtkWidget   *widget);
-void _gtk_tooltip_focus_out            (GtkWidget   *widget);
-void _gtk_tooltip_toggle_keyboard_mode (GtkWidget   *widget);
-void _gtk_tooltip_handle_event         (GdkEvent    *event);
-void _gtk_tooltip_hide                 (GtkWidget   *widget);
-
-G_END_DECLS
-
-#endif /* __GTK_TOOLTIP_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktooltips.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktooltips.h
deleted file mode 100644
index a8608565..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktooltips.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-#ifndef __GTK_TOOLTIPS_H__
-#define __GTK_TOOLTIPS_H__
-
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_TOOLTIPS                  (gtk_tooltips_get_type ())
-#define GTK_TOOLTIPS(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOOLTIPS, GtkTooltips))
-#define GTK_TOOLTIPS_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOOLTIPS, GtkTooltipsClass))
-#define GTK_IS_TOOLTIPS(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TOOLTIPS))
-#define GTK_IS_TOOLTIPS_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TOOLTIPS))
-#define GTK_TOOLTIPS_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TOOLTIPS, GtkTooltipsClass))
-
-
-typedef struct _GtkTooltips	 GtkTooltips;
-typedef struct _GtkTooltipsClass GtkTooltipsClass;
-typedef struct _GtkTooltipsData	 GtkTooltipsData;
-
-struct _GtkTooltipsData
-{
-  GtkTooltips *tooltips;
-  GtkWidget *widget;
-  gchar *tip_text;
-  gchar *tip_private;
-};
-
-struct _GtkTooltips
-{
-  GtkObject parent_instance;
-
-  /*< private >*/
-  GtkWidget *tip_window;
-  GtkWidget *tip_label;
-  GtkTooltipsData *active_tips_data;
-  GList *tips_data_list; /* unused */
-
-  guint   delay : 30;
-  guint	  enabled : 1;
-  guint   have_grab : 1;
-  guint   use_sticky_delay : 1;
-  gint	  timer_tag;
-  GTimeVal last_popdown;
-};
-
-struct _GtkTooltipsClass
-{
-  GtkObjectClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType		 gtk_tooltips_get_type	   (void) G_GNUC_CONST;
-GtkTooltips*	 gtk_tooltips_new	   (void);
-
-void		 gtk_tooltips_enable	   (GtkTooltips   *tooltips);
-void		 gtk_tooltips_disable	   (GtkTooltips   *tooltips);
-void		 gtk_tooltips_set_delay	   (GtkTooltips   *tooltips,
-					    guint	   delay);
-void		 gtk_tooltips_set_tip	   (GtkTooltips   *tooltips,
-					    GtkWidget	  *widget,
-					    const gchar   *tip_text,
-					    const gchar   *tip_private);
-GtkTooltipsData* gtk_tooltips_data_get	   (GtkWidget	  *widget);
-void             gtk_tooltips_force_window (GtkTooltips   *tooltips);
-
-gboolean         gtk_tooltips_get_info_from_tip_window (GtkWindow    *tip_window,
-                                                        GtkTooltips **tooltips,
-                                                        GtkWidget   **current_widget);
-
-G_END_DECLS
-
-#endif /* __GTK_TOOLTIPS_H__ */
-
-#endif /* GTK_DISABLE_DEPRECATED */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktree.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktree.h
deleted file mode 100644
index 7e9da0eb..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktree.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifdef GTK_ENABLE_BROKEN
-
-#ifndef __GTK_TREE_H__
-#define __GTK_TREE_H__
-
-/* set this flag to enable tree debugging output */
-/* #define TREE_DEBUG */
-
-#include <gdk/gdk.h>
-#include <gtk/gtkcontainer.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_TREE                  (gtk_tree_get_type ())
-#define GTK_TREE(obj)                  (GTK_CHECK_CAST ((obj), GTK_TYPE_TREE, GtkTree))
-#define GTK_TREE_CLASS(klass)          (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE, GtkTreeClass))
-#define GTK_IS_TREE(obj)               (GTK_CHECK_TYPE ((obj), GTK_TYPE_TREE))
-#define GTK_IS_TREE_CLASS(klass)       (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TREE))
-#define GTK_TREE_GET_CLASS(obj)        (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TREE, GtkTreeClass))
-
-
-#define GTK_IS_ROOT_TREE(obj)   ((GtkObject*) GTK_TREE(obj)->root_tree == (GtkObject*)obj)
-#define GTK_TREE_ROOT_TREE(obj) (GTK_TREE(obj)->root_tree ? GTK_TREE(obj)->root_tree : GTK_TREE(obj))
-#define GTK_TREE_SELECTION_OLD(obj) (GTK_TREE_ROOT_TREE(obj)->selection)
-
-typedef enum 
-{
-  GTK_TREE_VIEW_LINE,  /* default view mode */
-  GTK_TREE_VIEW_ITEM
-} GtkTreeViewMode;
-
-typedef struct _GtkTree       GtkTree;
-typedef struct _GtkTreeClass  GtkTreeClass;
-
-struct _GtkTree
-{
-  GtkContainer container;
-  
-  GList *children;
-  
-  GtkTree* root_tree; /* owner of selection list */
-  GtkWidget* tree_owner;
-  GList *selection;
-  guint level;
-  guint indent_value;
-  guint current_indent;
-  guint selection_mode : 2;
-  guint view_mode : 1;
-  guint view_line : 1;
-};
-
-struct _GtkTreeClass
-{
-  GtkContainerClass parent_class;
-  
-  void (* selection_changed) (GtkTree   *tree);
-  void (* select_child)      (GtkTree   *tree,
-			      GtkWidget *child);
-  void (* unselect_child)    (GtkTree   *tree,
-			      GtkWidget *child);
-};
-
-
-GtkType    gtk_tree_get_type           (void) G_GNUC_CONST;
-GtkWidget* gtk_tree_new                (void);
-void       gtk_tree_append             (GtkTree          *tree,
-				        GtkWidget        *tree_item);
-void       gtk_tree_prepend            (GtkTree          *tree,
-				        GtkWidget        *tree_item);
-void       gtk_tree_insert             (GtkTree          *tree,
-				        GtkWidget        *tree_item,
-				        gint              position);
-void       gtk_tree_remove_items       (GtkTree          *tree,
-				        GList            *items);
-void       gtk_tree_clear_items        (GtkTree          *tree,
-				        gint              start,
-				        gint              end);
-void       gtk_tree_select_item        (GtkTree          *tree,
-				        gint              item);
-void       gtk_tree_unselect_item      (GtkTree          *tree,
-				        gint              item);
-void       gtk_tree_select_child       (GtkTree          *tree,
-				        GtkWidget        *tree_item);
-void       gtk_tree_unselect_child     (GtkTree          *tree,
-				        GtkWidget        *tree_item);
-gint       gtk_tree_child_position     (GtkTree          *tree,
-				        GtkWidget        *child);
-void       gtk_tree_set_selection_mode (GtkTree          *tree,
-				        GtkSelectionMode  mode);
-void       gtk_tree_set_view_mode      (GtkTree          *tree,
-				        GtkTreeViewMode   mode); 
-void       gtk_tree_set_view_lines     (GtkTree          *tree,
-					gboolean	  flag);
-
-/* deprecated function, use gtk_container_remove instead.
- */
-void       gtk_tree_remove_item        (GtkTree          *tree,
-				        GtkWidget        *child);
-
-
-G_END_DECLS
-
-#endif /* __GTK_TREE_H__ */
-
-#endif /* GTK_ENABLE_BROKEN */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreednd.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreednd.h
deleted file mode 100644
index eb983b7a..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreednd.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* gtktreednd.h
- * 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 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 __GTK_TREE_DND_H__
-#define __GTK_TREE_DND_H__
-
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtkdnd.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_TREE_DRAG_SOURCE            (gtk_tree_drag_source_get_type ())
-#define GTK_TREE_DRAG_SOURCE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_DRAG_SOURCE, GtkTreeDragSource))
-#define GTK_IS_TREE_DRAG_SOURCE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TREE_DRAG_SOURCE))
-#define GTK_TREE_DRAG_SOURCE_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_TREE_DRAG_SOURCE, GtkTreeDragSourceIface))
-
-typedef struct _GtkTreeDragSource      GtkTreeDragSource; /* Dummy typedef */
-typedef struct _GtkTreeDragSourceIface GtkTreeDragSourceIface;
-
-struct _GtkTreeDragSourceIface
-{
-  GTypeInterface g_iface;
-
-  /* VTable - not signals */
-
-  gboolean     (* row_draggable)        (GtkTreeDragSource   *drag_source,
-                                         GtkTreePath         *path);
-
-  gboolean     (* drag_data_get)        (GtkTreeDragSource   *drag_source,
-                                         GtkTreePath         *path,
-                                         GtkSelectionData    *selection_data);
-
-  gboolean     (* drag_data_delete)     (GtkTreeDragSource *drag_source,
-                                         GtkTreePath       *path);
-};
-
-GType           gtk_tree_drag_source_get_type   (void) G_GNUC_CONST;
-
-/* Returns whether the given row can be dragged */
-gboolean gtk_tree_drag_source_row_draggable    (GtkTreeDragSource *drag_source,
-                                                GtkTreePath       *path);
-
-/* Deletes the given row, or returns FALSE if it can't */
-gboolean gtk_tree_drag_source_drag_data_delete (GtkTreeDragSource *drag_source,
-                                                GtkTreePath       *path);
-
-/* Fills in selection_data with type selection_data->target based on
- * the row denoted by path, returns TRUE if it does anything
- */
-gboolean gtk_tree_drag_source_drag_data_get    (GtkTreeDragSource *drag_source,
-                                                GtkTreePath       *path,
-                                                GtkSelectionData  *selection_data);
-
-#define GTK_TYPE_TREE_DRAG_DEST            (gtk_tree_drag_dest_get_type ())
-#define GTK_TREE_DRAG_DEST(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_DRAG_DEST, GtkTreeDragDest))
-#define GTK_IS_TREE_DRAG_DEST(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TREE_DRAG_DEST))
-#define GTK_TREE_DRAG_DEST_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_TREE_DRAG_DEST, GtkTreeDragDestIface))
-
-typedef struct _GtkTreeDragDest      GtkTreeDragDest; /* Dummy typedef */
-typedef struct _GtkTreeDragDestIface GtkTreeDragDestIface;
-
-struct _GtkTreeDragDestIface
-{
-  GTypeInterface g_iface;
-
-  /* VTable - not signals */
-
-  gboolean     (* drag_data_received) (GtkTreeDragDest   *drag_dest,
-                                       GtkTreePath       *dest,
-                                       GtkSelectionData  *selection_data);
-
-  gboolean     (* row_drop_possible)  (GtkTreeDragDest   *drag_dest,
-                                       GtkTreePath       *dest_path,
-				       GtkSelectionData  *selection_data);
-};
-
-GType           gtk_tree_drag_dest_get_type   (void) G_GNUC_CONST;
-
-/* Inserts a row before dest which contains data in selection_data,
- * or returns FALSE if it can't
- */
-gboolean gtk_tree_drag_dest_drag_data_received (GtkTreeDragDest   *drag_dest,
-						GtkTreePath       *dest,
-						GtkSelectionData  *selection_data);
-
-
-/* Returns TRUE if we can drop before path; path may not exist. */
-gboolean gtk_tree_drag_dest_row_drop_possible  (GtkTreeDragDest   *drag_dest,
-						GtkTreePath       *dest_path,
-						GtkSelectionData  *selection_data);
-
-
-/* The selection data would normally have target type GTK_TREE_MODEL_ROW in this
- * case. If the target is wrong these functions return FALSE.
- */
-gboolean gtk_tree_set_row_drag_data            (GtkSelectionData  *selection_data,
-						GtkTreeModel      *tree_model,
-						GtkTreePath       *path);
-gboolean gtk_tree_get_row_drag_data            (GtkSelectionData  *selection_data,
-						GtkTreeModel     **tree_model,
-						GtkTreePath      **path);
-
-G_END_DECLS
-
-#endif /* __GTK_TREE_DND_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreeitem.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreeitem.h
deleted file mode 100644
index 0fef9e21..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreeitem.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifdef GTK_ENABLE_BROKEN
-
-#ifndef __GTK_TREE_ITEM_H__
-#define __GTK_TREE_ITEM_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkitem.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_TREE_ITEM              (gtk_tree_item_get_type ())
-#define GTK_TREE_ITEM(obj)              (GTK_CHECK_CAST ((obj), GTK_TYPE_TREE_ITEM, GtkTreeItem))
-#define GTK_TREE_ITEM_CLASS(klass)      (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE_ITEM, GtkTreeItemClass))
-#define GTK_IS_TREE_ITEM(obj)           (GTK_CHECK_TYPE ((obj), GTK_TYPE_TREE_ITEM))
-#define GTK_IS_TREE_ITEM_CLASS(klass)   (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TREE_ITEM))
-#define GTK_TREE_ITEM_GET_CLASS(obj)    (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TREE_ITEM, GtkTreeItemClass))
-
-
-#define GTK_TREE_ITEM_SUBTREE(obj)      (GTK_TREE_ITEM(obj)->subtree)
-
-
-typedef struct _GtkTreeItem       GtkTreeItem;
-typedef struct _GtkTreeItemClass  GtkTreeItemClass;
-
-struct _GtkTreeItem
-{
-  GtkItem item;
-
-  GtkWidget *subtree;
-  GtkWidget *pixmaps_box;
-  GtkWidget *plus_pix_widget, *minus_pix_widget;
-
-  GList *pixmaps;		/* pixmap node for this items color depth */
-
-  guint expanded : 1;
-};
-
-struct _GtkTreeItemClass
-{
-  GtkItemClass parent_class;
-
-  void (* expand)   (GtkTreeItem *tree_item);
-  void (* collapse) (GtkTreeItem *tree_item);
-};
-
-
-GtkType    gtk_tree_item_get_type       (void) G_GNUC_CONST;
-GtkWidget* gtk_tree_item_new            (void);
-GtkWidget* gtk_tree_item_new_with_label (const gchar *label);
-void       gtk_tree_item_set_subtree    (GtkTreeItem *tree_item,
-					 GtkWidget   *subtree);
-void       gtk_tree_item_remove_subtree (GtkTreeItem *tree_item);
-void       gtk_tree_item_select         (GtkTreeItem *tree_item);
-void       gtk_tree_item_deselect       (GtkTreeItem *tree_item);
-void       gtk_tree_item_expand         (GtkTreeItem *tree_item);
-void       gtk_tree_item_collapse       (GtkTreeItem *tree_item);
-
-
-G_END_DECLS
-
-#endif /* __GTK_TREE_ITEM_H__ */
-
-#endif /* GTK_ENABLE_BROKEN */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreemodel.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreemodel.h
deleted file mode 100644
index cc5b937d..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreemodel.h
+++ /dev/null
@@ -1,267 +0,0 @@
-/* gtktreemodel.h
- * Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb@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 __GTK_TREE_MODEL_H__
-#define __GTK_TREE_MODEL_H__
-
-#include <glib-object.h>
-
-/* Not needed, retained for compatibility -Yosh */
-#include <gtk/gtkobject.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_TREE_MODEL            (gtk_tree_model_get_type ())
-#define GTK_TREE_MODEL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_MODEL, GtkTreeModel))
-#define GTK_IS_TREE_MODEL(obj)	       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TREE_MODEL))
-#define GTK_TREE_MODEL_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_TREE_MODEL, GtkTreeModelIface))
-
-#define GTK_TYPE_TREE_ITER             (gtk_tree_iter_get_type ())
-#define GTK_TYPE_TREE_PATH             (gtk_tree_path_get_type ())
-#define GTK_TYPE_TREE_ROW_REFERENCE    (gtk_tree_row_reference_get_type ())
-
-typedef struct _GtkTreeIter         GtkTreeIter;
-typedef struct _GtkTreePath         GtkTreePath;
-typedef struct _GtkTreeRowReference GtkTreeRowReference;
-typedef struct _GtkTreeModel        GtkTreeModel; /* Dummy typedef */
-typedef struct _GtkTreeModelIface   GtkTreeModelIface;
-typedef gboolean (* GtkTreeModelForeachFunc) (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data);
-
-
-typedef enum
-{
-  GTK_TREE_MODEL_ITERS_PERSIST = 1 << 0,
-  GTK_TREE_MODEL_LIST_ONLY = 1 << 1
-} GtkTreeModelFlags;
-
-struct _GtkTreeIter
-{
-  gint stamp;
-  gpointer user_data;
-  gpointer user_data2;
-  gpointer user_data3;
-};
-
-struct _GtkTreeModelIface
-{
-  GTypeInterface g_iface;
-
-  /* Signals */
-  void         (* row_changed)           (GtkTreeModel *tree_model,
-					  GtkTreePath  *path,
-					  GtkTreeIter  *iter);
-  void         (* row_inserted)          (GtkTreeModel *tree_model,
-					  GtkTreePath  *path,
-					  GtkTreeIter  *iter);
-  void         (* row_has_child_toggled) (GtkTreeModel *tree_model,
-					  GtkTreePath  *path,
-					  GtkTreeIter  *iter);
-  void         (* row_deleted)           (GtkTreeModel *tree_model,
-					  GtkTreePath  *path);
-  void         (* rows_reordered)        (GtkTreeModel *tree_model,
-					  GtkTreePath  *path,
-					  GtkTreeIter  *iter,
-					  gint         *new_order);
-
-  /* Virtual Table */
-  GtkTreeModelFlags (* get_flags)  (GtkTreeModel *tree_model);   
-
-  gint         (* get_n_columns)   (GtkTreeModel *tree_model);
-  GType        (* get_column_type) (GtkTreeModel *tree_model,
-				    gint          index_);
-  gboolean     (* get_iter)        (GtkTreeModel *tree_model,
-				    GtkTreeIter  *iter,
-				    GtkTreePath  *path);
-  GtkTreePath *(* get_path)        (GtkTreeModel *tree_model,
-				    GtkTreeIter  *iter);
-  void         (* get_value)       (GtkTreeModel *tree_model,
-				    GtkTreeIter  *iter,
-				    gint          column,
-				    GValue       *value);
-  gboolean     (* iter_next)       (GtkTreeModel *tree_model,
-				    GtkTreeIter  *iter);
-  gboolean     (* iter_children)   (GtkTreeModel *tree_model,
-				    GtkTreeIter  *iter,
-				    GtkTreeIter  *parent);
-  gboolean     (* iter_has_child)  (GtkTreeModel *tree_model,
-				    GtkTreeIter  *iter);
-  gint         (* iter_n_children) (GtkTreeModel *tree_model,
-				    GtkTreeIter  *iter);
-  gboolean     (* iter_nth_child)  (GtkTreeModel *tree_model,
-				    GtkTreeIter  *iter,
-				    GtkTreeIter  *parent,
-				    gint          n);
-  gboolean     (* iter_parent)     (GtkTreeModel *tree_model,
-				    GtkTreeIter  *iter,
-				    GtkTreeIter  *child);
-  void         (* ref_node)        (GtkTreeModel *tree_model,
-				    GtkTreeIter  *iter);
-  void         (* unref_node)      (GtkTreeModel *tree_model,
-				    GtkTreeIter  *iter);
-};
-
-
-/* GtkTreePath operations */
-GtkTreePath *gtk_tree_path_new              (void);
-GtkTreePath *gtk_tree_path_new_from_string  (const gchar       *path);
-GtkTreePath *gtk_tree_path_new_from_indices (gint               first_index,
-					     ...);
-gchar       *gtk_tree_path_to_string        (GtkTreePath       *path);
-GtkTreePath *gtk_tree_path_new_first        (void);
-void         gtk_tree_path_append_index     (GtkTreePath       *path,
-					     gint               index_);
-void         gtk_tree_path_prepend_index    (GtkTreePath       *path,
-					     gint               index_);
-gint         gtk_tree_path_get_depth        (GtkTreePath       *path);
-gint        *gtk_tree_path_get_indices      (GtkTreePath       *path);
-void         gtk_tree_path_free             (GtkTreePath       *path);
-GtkTreePath *gtk_tree_path_copy             (const GtkTreePath *path);
-GType        gtk_tree_path_get_type         (void) G_GNUC_CONST;
-gint         gtk_tree_path_compare          (const GtkTreePath *a,
-					     const GtkTreePath *b);
-void         gtk_tree_path_next             (GtkTreePath       *path);
-gboolean     gtk_tree_path_prev             (GtkTreePath       *path);
-gboolean     gtk_tree_path_up               (GtkTreePath       *path);
-void         gtk_tree_path_down             (GtkTreePath       *path);
-
-gboolean     gtk_tree_path_is_ancestor      (GtkTreePath       *path,
-                                             GtkTreePath       *descendant);
-gboolean     gtk_tree_path_is_descendant    (GtkTreePath       *path,
-                                             GtkTreePath       *ancestor);
-
-#ifndef GTK_DISABLE_DEPRECATED
-#define gtk_tree_path_new_root() gtk_tree_path_new_first()
-#endif /* !GTK_DISABLE_DEPRECATED */
-
-/* Row reference (an object that tracks model changes so it refers to the same
- * row always; a path refers to a position, not a fixed row).  You almost always
- * want to call gtk_tree_row_reference_new.
- */
-
-GType                gtk_tree_row_reference_get_type (void) G_GNUC_CONST;
-GtkTreeRowReference *gtk_tree_row_reference_new       (GtkTreeModel        *model,
-						       GtkTreePath         *path);
-GtkTreeRowReference *gtk_tree_row_reference_new_proxy (GObject             *proxy,
-						       GtkTreeModel        *model,
-						       GtkTreePath         *path);
-GtkTreePath         *gtk_tree_row_reference_get_path  (GtkTreeRowReference *reference);
-GtkTreeModel        *gtk_tree_row_reference_get_model (GtkTreeRowReference *reference);
-gboolean             gtk_tree_row_reference_valid     (GtkTreeRowReference *reference);
-GtkTreeRowReference *gtk_tree_row_reference_copy      (GtkTreeRowReference *reference);
-void                 gtk_tree_row_reference_free      (GtkTreeRowReference *reference);
-/* These two functions are only needed if you created the row reference with a
- * proxy object */
-void                 gtk_tree_row_reference_inserted  (GObject     *proxy,
-						       GtkTreePath *path);
-void                 gtk_tree_row_reference_deleted   (GObject     *proxy,
-						       GtkTreePath *path);
-void                 gtk_tree_row_reference_reordered (GObject     *proxy,
-						       GtkTreePath *path,
-						       GtkTreeIter *iter,
-						       gint        *new_order);
-						       
-/* GtkTreeIter operations */
-GtkTreeIter *     gtk_tree_iter_copy             (GtkTreeIter  *iter);
-void              gtk_tree_iter_free             (GtkTreeIter  *iter);
-GType             gtk_tree_iter_get_type         (void) G_GNUC_CONST;
-
-GType             gtk_tree_model_get_type        (void) G_GNUC_CONST;
-GtkTreeModelFlags gtk_tree_model_get_flags       (GtkTreeModel *tree_model);
-gint              gtk_tree_model_get_n_columns   (GtkTreeModel *tree_model);
-GType             gtk_tree_model_get_column_type (GtkTreeModel *tree_model,
-						  gint          index_);
-
-
-/* Iterator movement */
-gboolean          gtk_tree_model_get_iter        (GtkTreeModel *tree_model,
-						  GtkTreeIter  *iter,
-						  GtkTreePath  *path);
-gboolean          gtk_tree_model_get_iter_from_string (GtkTreeModel *tree_model,
-						       GtkTreeIter  *iter,
-						       const gchar  *path_string);
-gchar *           gtk_tree_model_get_string_from_iter (GtkTreeModel *tree_model,
-                                                       GtkTreeIter  *iter);
-gboolean          gtk_tree_model_get_iter_first  (GtkTreeModel *tree_model,
-						  GtkTreeIter  *iter);
-GtkTreePath *     gtk_tree_model_get_path        (GtkTreeModel *tree_model,
-						  GtkTreeIter  *iter);
-void              gtk_tree_model_get_value       (GtkTreeModel *tree_model,
-						  GtkTreeIter  *iter,
-						  gint          column,
-						  GValue       *value);
-gboolean          gtk_tree_model_iter_next       (GtkTreeModel *tree_model,
-						  GtkTreeIter  *iter);
-gboolean          gtk_tree_model_iter_children   (GtkTreeModel *tree_model,
-						  GtkTreeIter  *iter,
-						  GtkTreeIter  *parent);
-gboolean          gtk_tree_model_iter_has_child  (GtkTreeModel *tree_model,
-						  GtkTreeIter  *iter);
-gint              gtk_tree_model_iter_n_children (GtkTreeModel *tree_model,
-						  GtkTreeIter  *iter);
-gboolean          gtk_tree_model_iter_nth_child  (GtkTreeModel *tree_model,
-						  GtkTreeIter  *iter,
-						  GtkTreeIter  *parent,
-						  gint          n);
-gboolean          gtk_tree_model_iter_parent     (GtkTreeModel *tree_model,
-						  GtkTreeIter  *iter,
-						  GtkTreeIter  *child);
-void              gtk_tree_model_ref_node        (GtkTreeModel *tree_model,
-						  GtkTreeIter  *iter);
-void              gtk_tree_model_unref_node      (GtkTreeModel *tree_model,
-						  GtkTreeIter  *iter);
-void              gtk_tree_model_get             (GtkTreeModel *tree_model,
-						  GtkTreeIter  *iter,
-						  ...);
-void              gtk_tree_model_get_valist      (GtkTreeModel *tree_model,
-						  GtkTreeIter  *iter,
-						  va_list       var_args);
-
-
-void              gtk_tree_model_foreach         (GtkTreeModel            *model,
-						  GtkTreeModelForeachFunc  func,
-						  gpointer                 user_data);
-
-
-#ifndef GTK_DISABLE_DEPRECATED
-#define gtk_tree_model_get_iter_root(tree_model, iter) gtk_tree_model_get_iter_first(tree_model, iter)
-#endif /* !GTK_DISABLE_DEPRECATED */
-
-/* Signals */
-void gtk_tree_model_row_changed           (GtkTreeModel *tree_model,
-					   GtkTreePath  *path,
-					   GtkTreeIter  *iter);
-void gtk_tree_model_row_inserted          (GtkTreeModel *tree_model,
-					   GtkTreePath  *path,
-					   GtkTreeIter  *iter);
-void gtk_tree_model_row_has_child_toggled (GtkTreeModel *tree_model,
-					   GtkTreePath  *path,
-					   GtkTreeIter  *iter);
-void gtk_tree_model_row_deleted           (GtkTreeModel *tree_model,
-					   GtkTreePath  *path);
-void gtk_tree_model_rows_reordered        (GtkTreeModel *tree_model,
-					   GtkTreePath  *path,
-					   GtkTreeIter  *iter,
-					   gint         *new_order);
-
-
-
-
-G_END_DECLS
-
-#endif /* __GTK_TREE_MODEL_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreemodelfilter.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreemodelfilter.h
deleted file mode 100644
index e9ab5829..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreemodelfilter.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* gtktreemodelfilter.h
- * Copyright (C) 2000,2001  Red Hat, Inc., Jonathan Blandford <jrb@redhat.com>
- * Copyright (C) 2001-2003  Kristian Rietveld <kris@gtk.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 __GTK_TREE_MODEL_FILTER_H__
-#define __GTK_TREE_MODEL_FILTER_H__
-
-#include <gtk/gtktreemodel.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_TREE_MODEL_FILTER              (gtk_tree_model_filter_get_type ())
-#define GTK_TREE_MODEL_FILTER(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_MODEL_FILTER, GtkTreeModelFilter))
-#define GTK_TREE_MODEL_FILTER_CLASS(vtable)     (G_TYPE_CHECK_CLASS_CAST ((vtable), GTK_TYPE_TREE_MODEL_FILTER, GtkTreeModelFilterClass))
-#define GTK_IS_TREE_MODEL_FILTER(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TREE_MODEL_FILTER))
-#define GTK_IS_TREE_MODEL_FILTER_CLASS(vtable)  (G_TYPE_CHECK_CLASS_TYPE ((vtable), GTK_TYPE_TREE_MODEL_FILTER))
-#define GTK_TREE_MODEL_FILTER_GET_CLASS(inst)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TREE_MODEL_FILTER, GtkTreeModelFilterClass))
-
-typedef gboolean (* GtkTreeModelFilterVisibleFunc) (GtkTreeModel *model,
-                                                    GtkTreeIter  *iter,
-                                                    gpointer      data);
-typedef void (* GtkTreeModelFilterModifyFunc) (GtkTreeModel *model,
-                                               GtkTreeIter  *iter,
-                                               GValue       *value,
-                                               gint          column,
-                                               gpointer      data);
-
-typedef struct _GtkTreeModelFilter          GtkTreeModelFilter;
-typedef struct _GtkTreeModelFilterClass     GtkTreeModelFilterClass;
-typedef struct _GtkTreeModelFilterPrivate   GtkTreeModelFilterPrivate;
-
-struct _GtkTreeModelFilter
-{
-  GObject parent;
-
-  /*< private >*/
-  GtkTreeModelFilterPrivate *priv;
-};
-
-struct _GtkTreeModelFilterClass
-{
-  GObjectClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved0) (void);
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-};
-
-/* base */
-GType         gtk_tree_model_filter_get_type                   (void) G_GNUC_CONST;
-GtkTreeModel *gtk_tree_model_filter_new                        (GtkTreeModel                 *child_model,
-                                                                GtkTreePath                  *root);
-void          gtk_tree_model_filter_set_visible_func           (GtkTreeModelFilter           *filter,
-                                                                GtkTreeModelFilterVisibleFunc func,
-                                                                gpointer                      data,
-                                                                GtkDestroyNotify              destroy);
-void          gtk_tree_model_filter_set_modify_func            (GtkTreeModelFilter           *filter,
-                                                                gint                          n_columns,
-                                                                GType                        *types,
-                                                                GtkTreeModelFilterModifyFunc  func,
-                                                                gpointer                      data,
-                                                                GtkDestroyNotify              destroy);
-void          gtk_tree_model_filter_set_visible_column         (GtkTreeModelFilter           *filter,
-                                                                gint                          column);
-
-GtkTreeModel *gtk_tree_model_filter_get_model                  (GtkTreeModelFilter           *filter);
-
-/* conversion */
-gboolean      gtk_tree_model_filter_convert_child_iter_to_iter (GtkTreeModelFilter           *filter,
-                                                                GtkTreeIter                  *filter_iter,
-                                                                GtkTreeIter                  *child_iter);
-void          gtk_tree_model_filter_convert_iter_to_child_iter (GtkTreeModelFilter           *filter,
-                                                                GtkTreeIter                  *child_iter,
-                                                                GtkTreeIter                  *filter_iter);
-GtkTreePath  *gtk_tree_model_filter_convert_child_path_to_path (GtkTreeModelFilter           *filter,
-                                                                GtkTreePath                  *child_path);
-GtkTreePath  *gtk_tree_model_filter_convert_path_to_child_path (GtkTreeModelFilter           *filter,
-                                                                GtkTreePath                  *filter_path);
-
-/* extras */
-void          gtk_tree_model_filter_refilter                   (GtkTreeModelFilter           *filter);
-void          gtk_tree_model_filter_clear_cache                (GtkTreeModelFilter           *filter);
-
-G_END_DECLS
-
-#endif /* __GTK_TREE_MODEL_FILTER_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreemodelsort.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreemodelsort.h
deleted file mode 100644
index bfd24e90..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreemodelsort.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* gtktreemodelsort.h
- * Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb@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 __GTK_TREE_MODEL_SORT_H__
-#define __GTK_TREE_MODEL_SORT_H__
-
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreesortable.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_TREE_MODEL_SORT			(gtk_tree_model_sort_get_type ())
-#define GTK_TREE_MODEL_SORT(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_MODEL_SORT, GtkTreeModelSort))
-#define GTK_TREE_MODEL_SORT_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE_MODEL_SORT, GtkTreeModelSortClass))
-#define GTK_IS_TREE_MODEL_SORT(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TREE_MODEL_SORT))
-#define GTK_IS_TREE_MODEL_SORT_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TREE_MODEL_SORT))
-#define GTK_TREE_MODEL_SORT_GET_CLASS(obj)		(G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TREE_MODEL_SORT, GtkTreeModelSortClass))
-
-typedef struct _GtkTreeModelSort       GtkTreeModelSort;
-typedef struct _GtkTreeModelSortClass  GtkTreeModelSortClass;
-
-struct _GtkTreeModelSort
-{
-  GObject parent;
-
-  /* < private > */
-  gpointer root;
-  gint stamp;
-  guint child_flags;
-  GtkTreeModel *child_model;
-  gint zero_ref_count;
-
-  /* sort information */
-  GList *sort_list;
-  gint sort_column_id;
-  GtkSortType order;
-
-  /* default sort */
-  GtkTreeIterCompareFunc default_sort_func;
-  gpointer default_sort_data;
-  GtkDestroyNotify default_sort_destroy;
-
-  /* signal ids */
-  guint changed_id;
-  guint inserted_id;
-  guint has_child_toggled_id;
-  guint deleted_id;
-  guint reordered_id;
-};
-
-struct _GtkTreeModelSortClass
-{
-  GObjectClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType         gtk_tree_model_sort_get_type                   (void) G_GNUC_CONST;
-GtkTreeModel *gtk_tree_model_sort_new_with_model             (GtkTreeModel     *child_model);
-
-GtkTreeModel *gtk_tree_model_sort_get_model                  (GtkTreeModelSort *tree_model);
-GtkTreePath  *gtk_tree_model_sort_convert_child_path_to_path (GtkTreeModelSort *tree_model_sort,
-							      GtkTreePath      *child_path);
-void          gtk_tree_model_sort_convert_child_iter_to_iter (GtkTreeModelSort *tree_model_sort,
-							      GtkTreeIter      *sort_iter,
-							      GtkTreeIter      *child_iter);
-GtkTreePath  *gtk_tree_model_sort_convert_path_to_child_path (GtkTreeModelSort *tree_model_sort,
-							      GtkTreePath      *sorted_path);
-void          gtk_tree_model_sort_convert_iter_to_child_iter (GtkTreeModelSort *tree_model_sort,
-							      GtkTreeIter      *child_iter,
-							      GtkTreeIter      *sorted_iter);
-void          gtk_tree_model_sort_reset_default_sort_func    (GtkTreeModelSort *tree_model_sort);
-void          gtk_tree_model_sort_clear_cache                (GtkTreeModelSort *tree_model_sort);
-gboolean      gtk_tree_model_sort_iter_is_valid              (GtkTreeModelSort *tree_model_sort,
-                                                              GtkTreeIter      *iter);
-
-
-G_END_DECLS
-
-#endif /* __GTK_TREE_MODEL_SORT_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreeselection.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreeselection.h
deleted file mode 100644
index 2c3e0a2b..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreeselection.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* gtktreeselection.h
- * Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb@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 __GTK_TREE_SELECTION_H__
-#define __GTK_TREE_SELECTION_H__
-
-#include <glib-object.h>
-#include <gtk/gtktreeview.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_TREE_SELECTION			(gtk_tree_selection_get_type ())
-#define GTK_TREE_SELECTION(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_SELECTION, GtkTreeSelection))
-#define GTK_TREE_SELECTION_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE_SELECTION, GtkTreeSelectionClass))
-#define GTK_IS_TREE_SELECTION(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TREE_SELECTION))
-#define GTK_IS_TREE_SELECTION_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TREE_SELECTION))
-#define GTK_TREE_SELECTION_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TREE_SELECTION, GtkTreeSelectionClass))
-
-typedef gboolean (* GtkTreeSelectionFunc)    (GtkTreeSelection  *selection,
-					      GtkTreeModel      *model,
-					      GtkTreePath       *path,
-                                              gboolean           path_currently_selected,
-					      gpointer           data);
-typedef void (* GtkTreeSelectionForeachFunc) (GtkTreeModel      *model,
-					      GtkTreePath       *path,
-					      GtkTreeIter       *iter,
-					      gpointer           data);
-
-struct _GtkTreeSelection
-{
-  GObject parent;
-
-  /*< private >*/
-  
-  GtkTreeView *tree_view;
-  GtkSelectionMode type;
-  GtkTreeSelectionFunc user_func;
-  gpointer user_data;
-  GtkDestroyNotify destroy;
-};
-
-struct _GtkTreeSelectionClass
-{
-  GObjectClass parent_class;
-
-  void (* changed) (GtkTreeSelection *selection);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType            gtk_tree_selection_get_type            (void) G_GNUC_CONST;
-
-void             gtk_tree_selection_set_mode            (GtkTreeSelection            *selection,
-							 GtkSelectionMode             type);
-GtkSelectionMode gtk_tree_selection_get_mode        (GtkTreeSelection            *selection);
-void             gtk_tree_selection_set_select_function (GtkTreeSelection            *selection,
-							 GtkTreeSelectionFunc         func,
-							 gpointer                     data,
-							 GtkDestroyNotify             destroy);
-gpointer         gtk_tree_selection_get_user_data       (GtkTreeSelection            *selection);
-GtkTreeView*     gtk_tree_selection_get_tree_view       (GtkTreeSelection            *selection);
-
-/* Only meaningful if GTK_SELECTION_SINGLE or GTK_SELECTION_BROWSE is set */
-/* Use selected_foreach or get_selected_rows for GTK_SELECTION_MULTIPLE */
-gboolean         gtk_tree_selection_get_selected        (GtkTreeSelection            *selection,
-							 GtkTreeModel               **model,
-							 GtkTreeIter                 *iter);
-GList *          gtk_tree_selection_get_selected_rows   (GtkTreeSelection            *selection,
-                                                         GtkTreeModel               **model);
-gint             gtk_tree_selection_count_selected_rows (GtkTreeSelection            *selection);
-void             gtk_tree_selection_selected_foreach    (GtkTreeSelection            *selection,
-							 GtkTreeSelectionForeachFunc  func,
-							 gpointer                     data);
-void             gtk_tree_selection_select_path         (GtkTreeSelection            *selection,
-							 GtkTreePath                 *path);
-void             gtk_tree_selection_unselect_path       (GtkTreeSelection            *selection,
-							 GtkTreePath                 *path);
-void             gtk_tree_selection_select_iter         (GtkTreeSelection            *selection,
-							 GtkTreeIter                 *iter);
-void             gtk_tree_selection_unselect_iter       (GtkTreeSelection            *selection,
-							 GtkTreeIter                 *iter);
-gboolean         gtk_tree_selection_path_is_selected    (GtkTreeSelection            *selection,
-							 GtkTreePath                 *path);
-gboolean         gtk_tree_selection_iter_is_selected    (GtkTreeSelection            *selection,
-							 GtkTreeIter                 *iter);
-void             gtk_tree_selection_select_all          (GtkTreeSelection            *selection);
-void             gtk_tree_selection_unselect_all        (GtkTreeSelection            *selection);
-void             gtk_tree_selection_select_range        (GtkTreeSelection            *selection,
-							 GtkTreePath                 *start_path,
-							 GtkTreePath                 *end_path);
-void             gtk_tree_selection_unselect_range      (GtkTreeSelection            *selection,
-                                                         GtkTreePath                 *start_path,
-							 GtkTreePath                 *end_path);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_TREE_SELECTION_H__ */
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreesortable.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreesortable.h
deleted file mode 100644
index dd7282a1..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreesortable.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* gtktreesortable.h
- * 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 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 __GTK_TREE_SORTABLE_H__
-#define __GTK_TREE_SORTABLE_H__
-
-#include <gtk/gtkenums.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktypeutils.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_TREE_SORTABLE            (gtk_tree_sortable_get_type ())
-#define GTK_TREE_SORTABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_SORTABLE, GtkTreeSortable))
-#define GTK_TREE_SORTABLE_CLASS(obj)      (G_TYPE_CHECK_CLASS_CAST ((obj), GTK_TYPE_TREE_SORTABLE, GtkTreeSortableIface))
-#define GTK_IS_TREE_SORTABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TREE_SORTABLE))
-#define GTK_TREE_SORTABLE_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_TREE_SORTABLE, GtkTreeSortableIface))
-
-enum {
-  GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID = -1,
-  GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID = -2
-};
-
-typedef struct _GtkTreeSortable      GtkTreeSortable; /* Dummy typedef */
-typedef struct _GtkTreeSortableIface GtkTreeSortableIface;
-
-typedef gint (* GtkTreeIterCompareFunc) (GtkTreeModel *model,
-					 GtkTreeIter  *a,
-					 GtkTreeIter  *b,
-					 gpointer      user_data);
-
-
-struct _GtkTreeSortableIface
-{
-  GTypeInterface g_iface;
-
-  /* signals */
-  void     (* sort_column_changed)   (GtkTreeSortable        *sortable);
-
-  /* virtual table */
-  gboolean (* get_sort_column_id)    (GtkTreeSortable        *sortable,
-				      gint                   *sort_column_id,
-				      GtkSortType            *order);
-  void     (* set_sort_column_id)    (GtkTreeSortable        *sortable,
-				      gint                    sort_column_id,
-				      GtkSortType             order);
-  void     (* set_sort_func)         (GtkTreeSortable        *sortable,
-				      gint                    sort_column_id,
-				      GtkTreeIterCompareFunc  func,
-				      gpointer                data,
-				      GtkDestroyNotify        destroy);
-  void     (* set_default_sort_func) (GtkTreeSortable        *sortable,
-				      GtkTreeIterCompareFunc  func,
-				      gpointer                data,
-				      GtkDestroyNotify        destroy);
-  gboolean (* has_default_sort_func) (GtkTreeSortable        *sortable);
-};
-
-
-GType    gtk_tree_sortable_get_type              (void) G_GNUC_CONST;
-
-void     gtk_tree_sortable_sort_column_changed   (GtkTreeSortable        *sortable);
-gboolean gtk_tree_sortable_get_sort_column_id    (GtkTreeSortable        *sortable,
-						  gint                   *sort_column_id,
-						  GtkSortType            *order);
-void     gtk_tree_sortable_set_sort_column_id    (GtkTreeSortable        *sortable,
-						  gint                    sort_column_id,
-						  GtkSortType             order);
-void     gtk_tree_sortable_set_sort_func         (GtkTreeSortable        *sortable,
-						  gint                    sort_column_id,
-						  GtkTreeIterCompareFunc  sort_func,
-						  gpointer                user_data,
-						  GtkDestroyNotify        destroy);
-void     gtk_tree_sortable_set_default_sort_func (GtkTreeSortable        *sortable,
-						  GtkTreeIterCompareFunc  sort_func,
-						  gpointer                user_data,
-						  GtkDestroyNotify        destroy);
-gboolean gtk_tree_sortable_has_default_sort_func (GtkTreeSortable        *sortable);
-						  
-						  
-G_END_DECLS
-
-#endif /* __GTK_TREE_SORTABLE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreestore.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreestore.h
deleted file mode 100644
index b7e61e2a..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreestore.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/* gtktreestore.h
- * Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb@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 __GTK_TREE_STORE_H__
-#define __GTK_TREE_STORE_H__
-
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreesortable.h>
-#include <stdarg.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_TREE_STORE			(gtk_tree_store_get_type ())
-#define GTK_TREE_STORE(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_STORE, GtkTreeStore))
-#define GTK_TREE_STORE_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE_STORE, GtkTreeStoreClass))
-#define GTK_IS_TREE_STORE(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TREE_STORE))
-#define GTK_IS_TREE_STORE_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TREE_STORE))
-#define GTK_TREE_STORE_GET_CLASS(obj)		(G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TREE_STORE, GtkTreeStoreClass))
-
-typedef struct _GtkTreeStore       GtkTreeStore;
-typedef struct _GtkTreeStoreClass  GtkTreeStoreClass;
-
-struct _GtkTreeStore
-{
-  GObject parent;
-
-  gint stamp;
-  gpointer root;
-  gpointer last;
-  gint n_columns;
-  gint sort_column_id;
-  GList *sort_list;
-  GtkSortType order;
-  GType *column_headers;
-  GtkTreeIterCompareFunc default_sort_func;
-  gpointer default_sort_data;
-  GtkDestroyNotify default_sort_destroy;
-  guint columns_dirty : 1;
-};
-
-struct _GtkTreeStoreClass
-{
-  GObjectClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType         gtk_tree_store_get_type         (void) G_GNUC_CONST;
-GtkTreeStore *gtk_tree_store_new              (gint          n_columns,
-					       ...);
-GtkTreeStore *gtk_tree_store_newv             (gint          n_columns,
-					       GType        *types);
-void          gtk_tree_store_set_column_types (GtkTreeStore *tree_store,
-					       gint          n_columns,
-					       GType        *types);
-
-/* NOTE: use gtk_tree_model_get to get values from a GtkTreeStore */
-
-void          gtk_tree_store_set_value        (GtkTreeStore *tree_store,
-					       GtkTreeIter  *iter,
-					       gint          column,
-					       GValue       *value);
-void          gtk_tree_store_set              (GtkTreeStore *tree_store,
-					       GtkTreeIter  *iter,
-					       ...);
-void          gtk_tree_store_set_valuesv      (GtkTreeStore *tree_store,
-					       GtkTreeIter  *iter,
-					       gint         *columns,
-					       GValue       *values,
-					       gint          n_values);
-void          gtk_tree_store_set_valist       (GtkTreeStore *tree_store,
-					       GtkTreeIter  *iter,
-					       va_list       var_args);
-gboolean      gtk_tree_store_remove           (GtkTreeStore *tree_store,
-					       GtkTreeIter  *iter);
-void          gtk_tree_store_insert           (GtkTreeStore *tree_store,
-					       GtkTreeIter  *iter,
-					       GtkTreeIter  *parent,
-					       gint          position);
-void          gtk_tree_store_insert_before    (GtkTreeStore *tree_store,
-					       GtkTreeIter  *iter,
-					       GtkTreeIter  *parent,
-					       GtkTreeIter  *sibling);
-void          gtk_tree_store_insert_after     (GtkTreeStore *tree_store,
-					       GtkTreeIter  *iter,
-					       GtkTreeIter  *parent,
-					       GtkTreeIter  *sibling);
-void          gtk_tree_store_insert_with_values (GtkTreeStore *tree_store,
-						 GtkTreeIter  *iter,
-						 GtkTreeIter  *parent,
-						 gint          position,
-						 ...);
-void          gtk_tree_store_insert_with_valuesv (GtkTreeStore *tree_store,
-						  GtkTreeIter  *iter,
-						  GtkTreeIter  *parent,
-						  gint          position,
-						  gint         *columns,
-						  GValue       *values,
-						  gint          n_values);
-void          gtk_tree_store_prepend          (GtkTreeStore *tree_store,
-					       GtkTreeIter  *iter,
-					       GtkTreeIter  *parent);
-void          gtk_tree_store_append           (GtkTreeStore *tree_store,
-					       GtkTreeIter  *iter,
-					       GtkTreeIter  *parent);
-gboolean      gtk_tree_store_is_ancestor      (GtkTreeStore *tree_store,
-					       GtkTreeIter  *iter,
-					       GtkTreeIter  *descendant);
-gint          gtk_tree_store_iter_depth       (GtkTreeStore *tree_store,
-					       GtkTreeIter  *iter);
-void          gtk_tree_store_clear            (GtkTreeStore *tree_store);
-gboolean      gtk_tree_store_iter_is_valid    (GtkTreeStore *tree_store,
-                                               GtkTreeIter  *iter);
-void          gtk_tree_store_reorder          (GtkTreeStore *tree_store,
-                                               GtkTreeIter  *parent,
-                                               gint         *new_order);
-void          gtk_tree_store_swap             (GtkTreeStore *tree_store,
-                                               GtkTreeIter  *a,
-                                               GtkTreeIter  *b);
-void          gtk_tree_store_move_before      (GtkTreeStore *tree_store,
-                                               GtkTreeIter  *iter,
-                                               GtkTreeIter  *position);
-void          gtk_tree_store_move_after       (GtkTreeStore *tree_store,
-                                               GtkTreeIter  *iter,
-                                               GtkTreeIter  *position);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_TREE_STORE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreeview.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreeview.h
deleted file mode 100644
index 9ea61a9f..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreeview.h
+++ /dev/null
@@ -1,429 +0,0 @@
-/* gtktreeview.h
- * Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb@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 __GTK_TREE_VIEW_H__
-#define __GTK_TREE_VIEW_H__
-
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeviewcolumn.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkentry.h>
-
-
-G_BEGIN_DECLS
-
-
-typedef enum
-{
-  /* drop before/after this row */
-  GTK_TREE_VIEW_DROP_BEFORE,
-  GTK_TREE_VIEW_DROP_AFTER,
-  /* drop as a child of this row (with fallback to before or after
-   * if into is not possible)
-   */
-  GTK_TREE_VIEW_DROP_INTO_OR_BEFORE,
-  GTK_TREE_VIEW_DROP_INTO_OR_AFTER
-} GtkTreeViewDropPosition;
-
-#define GTK_TYPE_TREE_VIEW		(gtk_tree_view_get_type ())
-#define GTK_TREE_VIEW(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_VIEW, GtkTreeView))
-#define GTK_TREE_VIEW_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE_VIEW, GtkTreeViewClass))
-#define GTK_IS_TREE_VIEW(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TREE_VIEW))
-#define GTK_IS_TREE_VIEW_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TREE_VIEW))
-#define GTK_TREE_VIEW_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TREE_VIEW, GtkTreeViewClass))
-
-typedef struct _GtkTreeView           GtkTreeView;
-typedef struct _GtkTreeViewClass      GtkTreeViewClass;
-typedef struct _GtkTreeViewPrivate    GtkTreeViewPrivate;
-typedef struct _GtkTreeSelection      GtkTreeSelection;
-typedef struct _GtkTreeSelectionClass GtkTreeSelectionClass;
-
-struct _GtkTreeView
-{
-  GtkContainer parent;
-
-  GtkTreeViewPrivate *priv;
-};
-
-struct _GtkTreeViewClass
-{
-  GtkContainerClass parent_class;
-
-  void     (* set_scroll_adjustments)     (GtkTreeView       *tree_view,
-				           GtkAdjustment     *hadjustment,
-				           GtkAdjustment     *vadjustment);
-  void     (* row_activated)              (GtkTreeView       *tree_view,
-				           GtkTreePath       *path,
-					   GtkTreeViewColumn *column);
-  gboolean (* test_expand_row)            (GtkTreeView       *tree_view,
-				           GtkTreeIter       *iter,
-				           GtkTreePath       *path);
-  gboolean (* test_collapse_row)          (GtkTreeView       *tree_view,
-				           GtkTreeIter       *iter,
-				           GtkTreePath       *path);
-  void     (* row_expanded)               (GtkTreeView       *tree_view,
-				           GtkTreeIter       *iter,
-				           GtkTreePath       *path);
-  void     (* row_collapsed)              (GtkTreeView       *tree_view,
-				           GtkTreeIter       *iter,
-				           GtkTreePath       *path);
-  void     (* columns_changed)            (GtkTreeView       *tree_view);
-  void     (* cursor_changed)             (GtkTreeView       *tree_view);
-
-  /* Key Binding signals */
-  gboolean (* move_cursor)                (GtkTreeView       *tree_view,
-				           GtkMovementStep    step,
-				           gint               count);
-  gboolean (* select_all)                 (GtkTreeView       *tree_view);
-  gboolean (* unselect_all)               (GtkTreeView       *tree_view);
-  gboolean (* select_cursor_row)          (GtkTreeView       *tree_view,
-					   gboolean           start_editing);
-  gboolean (* toggle_cursor_row)          (GtkTreeView       *tree_view);
-  gboolean (* expand_collapse_cursor_row) (GtkTreeView       *tree_view,
-					   gboolean           logical,
-					   gboolean           expand,
-					   gboolean           open_all);
-  gboolean (* select_cursor_parent)       (GtkTreeView       *tree_view);
-  gboolean (* start_interactive_search)   (GtkTreeView       *tree_view);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved0) (void);
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-typedef gboolean (* GtkTreeViewColumnDropFunc) (GtkTreeView             *tree_view,
-						GtkTreeViewColumn       *column,
-						GtkTreeViewColumn       *prev_column,
-						GtkTreeViewColumn       *next_column,
-						gpointer                 data);
-typedef void     (* GtkTreeViewMappingFunc)    (GtkTreeView             *tree_view,
-						GtkTreePath             *path,
-						gpointer                 user_data);
-typedef gboolean (*GtkTreeViewSearchEqualFunc) (GtkTreeModel            *model,
-						gint                     column,
-						const gchar             *key,
-						GtkTreeIter             *iter,
-						gpointer                 search_data);
-typedef gboolean (*GtkTreeViewRowSeparatorFunc) (GtkTreeModel      *model,
-						 GtkTreeIter       *iter,
-						 gpointer           data);
-typedef void     (*GtkTreeViewSearchPositionFunc) (GtkTreeView  *tree_view,
-						   GtkWidget    *search_dialog,
-						   gpointer      user_data);
-
-
-/* Creators */
-GType                  gtk_tree_view_get_type                      (void) G_GNUC_CONST;
-GtkWidget             *gtk_tree_view_new                           (void);
-GtkWidget             *gtk_tree_view_new_with_model                (GtkTreeModel              *model);
-
-/* Accessors */
-GtkTreeModel          *gtk_tree_view_get_model                     (GtkTreeView               *tree_view);
-void                   gtk_tree_view_set_model                     (GtkTreeView               *tree_view,
-								    GtkTreeModel              *model);
-GtkTreeSelection      *gtk_tree_view_get_selection                 (GtkTreeView               *tree_view);
-GtkAdjustment         *gtk_tree_view_get_hadjustment               (GtkTreeView               *tree_view);
-void                   gtk_tree_view_set_hadjustment               (GtkTreeView               *tree_view,
-								    GtkAdjustment             *adjustment);
-GtkAdjustment         *gtk_tree_view_get_vadjustment               (GtkTreeView               *tree_view);
-void                   gtk_tree_view_set_vadjustment               (GtkTreeView               *tree_view,
-								    GtkAdjustment             *adjustment);
-gboolean               gtk_tree_view_get_headers_visible           (GtkTreeView               *tree_view);
-void                   gtk_tree_view_set_headers_visible           (GtkTreeView               *tree_view,
-								    gboolean                   headers_visible);
-void                   gtk_tree_view_columns_autosize              (GtkTreeView               *tree_view);
-gboolean               gtk_tree_view_get_headers_clickable         (GtkTreeView *tree_view);
-void                   gtk_tree_view_set_headers_clickable         (GtkTreeView               *tree_view,
-								    gboolean                   setting);
-void                   gtk_tree_view_set_rules_hint                (GtkTreeView               *tree_view,
-								    gboolean                   setting);
-gboolean               gtk_tree_view_get_rules_hint                (GtkTreeView               *tree_view);
-
-/* Column funtions */
-gint                   gtk_tree_view_append_column                 (GtkTreeView               *tree_view,
-								    GtkTreeViewColumn         *column);
-gint                   gtk_tree_view_remove_column                 (GtkTreeView               *tree_view,
-								    GtkTreeViewColumn         *column);
-gint                   gtk_tree_view_insert_column                 (GtkTreeView               *tree_view,
-								    GtkTreeViewColumn         *column,
-								    gint                       position);
-gint                   gtk_tree_view_insert_column_with_attributes (GtkTreeView               *tree_view,
-								    gint                       position,
-								    const gchar               *title,
-								    GtkCellRenderer           *cell,
-								    ...) G_GNUC_NULL_TERMINATED;
-gint                   gtk_tree_view_insert_column_with_data_func  (GtkTreeView               *tree_view,
-								    gint                       position,
-								    const gchar               *title,
-								    GtkCellRenderer           *cell,
-                                                                    GtkTreeCellDataFunc        func,
-                                                                    gpointer                   data,
-                                                                    GDestroyNotify             dnotify);
-GtkTreeViewColumn     *gtk_tree_view_get_column                    (GtkTreeView               *tree_view,
-								    gint                       n);
-GList                 *gtk_tree_view_get_columns                   (GtkTreeView               *tree_view);
-void                   gtk_tree_view_move_column_after             (GtkTreeView               *tree_view,
-								    GtkTreeViewColumn         *column,
-								    GtkTreeViewColumn         *base_column);
-void                   gtk_tree_view_set_expander_column           (GtkTreeView               *tree_view,
-								    GtkTreeViewColumn         *column);
-GtkTreeViewColumn     *gtk_tree_view_get_expander_column           (GtkTreeView               *tree_view);
-void                   gtk_tree_view_set_column_drag_function      (GtkTreeView               *tree_view,
-								    GtkTreeViewColumnDropFunc  func,
-								    gpointer                   user_data,
-								    GtkDestroyNotify           destroy);
-
-/* Actions */
-void                   gtk_tree_view_scroll_to_point               (GtkTreeView               *tree_view,
-								    gint                       tree_x,
-								    gint                       tree_y);
-void                   gtk_tree_view_scroll_to_cell                (GtkTreeView               *tree_view,
-								    GtkTreePath               *path,
-								    GtkTreeViewColumn         *column,
-								    gboolean                   use_align,
-								    gfloat                     row_align,
-								    gfloat                     col_align);
-void                   gtk_tree_view_row_activated                 (GtkTreeView               *tree_view,
-								    GtkTreePath               *path,
-								    GtkTreeViewColumn         *column);
-void                   gtk_tree_view_expand_all                    (GtkTreeView               *tree_view);
-void                   gtk_tree_view_collapse_all                  (GtkTreeView               *tree_view);
-void                   gtk_tree_view_expand_to_path                (GtkTreeView               *tree_view,
-								    GtkTreePath               *path);
-gboolean               gtk_tree_view_expand_row                    (GtkTreeView               *tree_view,
-								    GtkTreePath               *path,
-								    gboolean                   open_all);
-gboolean               gtk_tree_view_collapse_row                  (GtkTreeView               *tree_view,
-								    GtkTreePath               *path);
-void                   gtk_tree_view_map_expanded_rows             (GtkTreeView               *tree_view,
-								    GtkTreeViewMappingFunc     func,
-								    gpointer                   data);
-gboolean               gtk_tree_view_row_expanded                  (GtkTreeView               *tree_view,
-								    GtkTreePath               *path);
-void                   gtk_tree_view_set_reorderable               (GtkTreeView               *tree_view,
-								    gboolean                   reorderable);
-gboolean               gtk_tree_view_get_reorderable               (GtkTreeView               *tree_view);
-void                   gtk_tree_view_set_cursor                    (GtkTreeView               *tree_view,
-								    GtkTreePath               *path,
-								    GtkTreeViewColumn         *focus_column,
-								    gboolean                   start_editing);
-void                   gtk_tree_view_set_cursor_on_cell            (GtkTreeView               *tree_view,
-								    GtkTreePath               *path,
-								    GtkTreeViewColumn         *focus_column,
-								    GtkCellRenderer           *focus_cell,
-								    gboolean                   start_editing);
-void                   gtk_tree_view_get_cursor                    (GtkTreeView               *tree_view,
-								    GtkTreePath              **path,
-								    GtkTreeViewColumn        **focus_column);
-
-
-/* Layout information */
-GdkWindow             *gtk_tree_view_get_bin_window                (GtkTreeView               *tree_view);
-gboolean               gtk_tree_view_get_path_at_pos               (GtkTreeView               *tree_view,
-								    gint                       x,
-								    gint                       y,
-								    GtkTreePath              **path,
-								    GtkTreeViewColumn        **column,
-								    gint                      *cell_x,
-								    gint                      *cell_y);
-void                   gtk_tree_view_get_cell_area                 (GtkTreeView               *tree_view,
-								    GtkTreePath               *path,
-								    GtkTreeViewColumn         *column,
-								    GdkRectangle              *rect);
-void                   gtk_tree_view_get_background_area           (GtkTreeView               *tree_view,
-								    GtkTreePath               *path,
-								    GtkTreeViewColumn         *column,
-								    GdkRectangle              *rect);
-void                   gtk_tree_view_get_visible_rect              (GtkTreeView               *tree_view,
-								    GdkRectangle              *visible_rect);
-
-#ifndef GTK_DISABLE_DEPRECATED
-void                   gtk_tree_view_widget_to_tree_coords         (GtkTreeView               *tree_view,
-								    gint                       wx,
-								    gint                       wy,
-								    gint                      *tx,
-								    gint                      *ty);
-void                   gtk_tree_view_tree_to_widget_coords         (GtkTreeView               *tree_view,
-								    gint                       tx,
-								    gint                       ty,
-								    gint                      *wx,
-								    gint                      *wy);
-#endif /* !GTK_DISABLE_DEPRECATED */
-gboolean               gtk_tree_view_get_visible_range             (GtkTreeView               *tree_view,
-								    GtkTreePath              **start_path,
-								    GtkTreePath              **end_path);
-
-/* Drag-and-Drop support */
-void                   gtk_tree_view_enable_model_drag_source      (GtkTreeView               *tree_view,
-								    GdkModifierType            start_button_mask,
-								    const GtkTargetEntry      *targets,
-								    gint                       n_targets,
-								    GdkDragAction              actions);
-void                   gtk_tree_view_enable_model_drag_dest        (GtkTreeView               *tree_view,
-								    const GtkTargetEntry      *targets,
-								    gint                       n_targets,
-								    GdkDragAction              actions);
-void                   gtk_tree_view_unset_rows_drag_source        (GtkTreeView               *tree_view);
-void                   gtk_tree_view_unset_rows_drag_dest          (GtkTreeView               *tree_view);
-
-
-/* These are useful to implement your own custom stuff. */
-void                   gtk_tree_view_set_drag_dest_row             (GtkTreeView               *tree_view,
-								    GtkTreePath               *path,
-								    GtkTreeViewDropPosition    pos);
-void                   gtk_tree_view_get_drag_dest_row             (GtkTreeView               *tree_view,
-								    GtkTreePath              **path,
-								    GtkTreeViewDropPosition   *pos);
-gboolean               gtk_tree_view_get_dest_row_at_pos           (GtkTreeView               *tree_view,
-								    gint                       drag_x,
-								    gint                       drag_y,
-								    GtkTreePath              **path,
-								    GtkTreeViewDropPosition   *pos);
-GdkPixmap             *gtk_tree_view_create_row_drag_icon          (GtkTreeView               *tree_view,
-								    GtkTreePath               *path);
-
-/* Interactive search */
-void                       gtk_tree_view_set_enable_search     (GtkTreeView                *tree_view,
-								gboolean                    enable_search);
-gboolean                   gtk_tree_view_get_enable_search     (GtkTreeView                *tree_view);
-gint                       gtk_tree_view_get_search_column     (GtkTreeView                *tree_view);
-void                       gtk_tree_view_set_search_column     (GtkTreeView                *tree_view,
-								gint                        column);
-GtkTreeViewSearchEqualFunc gtk_tree_view_get_search_equal_func (GtkTreeView                *tree_view);
-void                       gtk_tree_view_set_search_equal_func (GtkTreeView                *tree_view,
-								GtkTreeViewSearchEqualFunc  search_equal_func,
-								gpointer                    search_user_data,
-								GtkDestroyNotify            search_destroy);
-
-GtkEntry                     *gtk_tree_view_get_search_entry         (GtkTreeView                   *tree_view);
-void                          gtk_tree_view_set_search_entry         (GtkTreeView                   *tree_view,
-								      GtkEntry                      *entry);
-GtkTreeViewSearchPositionFunc gtk_tree_view_get_search_position_func (GtkTreeView                   *tree_view);
-void                          gtk_tree_view_set_search_position_func (GtkTreeView                   *tree_view,
-								      GtkTreeViewSearchPositionFunc  func,
-								      gpointer                       data,
-								      GDestroyNotify                 destroy);
-
-/* Convert between the different coordinate systems */
-void gtk_tree_view_convert_widget_to_tree_coords       (GtkTreeView *tree_view,
-							gint         wx,
-							gint         wy,
-							gint        *tx,
-							gint        *ty);
-void gtk_tree_view_convert_tree_to_widget_coords       (GtkTreeView *tree_view,
-							gint         tx,
-							gint         ty,
-							gint        *wx,
-							gint        *wy);
-void gtk_tree_view_convert_widget_to_bin_window_coords (GtkTreeView *tree_view,
-							gint         wx,
-							gint         wy,
-							gint        *bx,
-							gint        *by);
-void gtk_tree_view_convert_bin_window_to_widget_coords (GtkTreeView *tree_view,
-							gint         bx,
-							gint         by,
-							gint        *wx,
-							gint        *wy);
-void gtk_tree_view_convert_tree_to_bin_window_coords   (GtkTreeView *tree_view,
-							gint         tx,
-							gint         ty,
-							gint        *bx,
-							gint        *by);
-void gtk_tree_view_convert_bin_window_to_tree_coords   (GtkTreeView *tree_view,
-							gint         bx,
-							gint         by,
-							gint        *tx,
-							gint        *ty);
-
-/* This function should really never be used.  It is just for use by ATK.
- */
-typedef void (* GtkTreeDestroyCountFunc)  (GtkTreeView             *tree_view,
-					   GtkTreePath             *path,
-					   gint                     children,
-					   gpointer                 user_data);
-void gtk_tree_view_set_destroy_count_func (GtkTreeView             *tree_view,
-					   GtkTreeDestroyCountFunc  func,
-					   gpointer                 data,
-					   GtkDestroyNotify         destroy);
-
-void     gtk_tree_view_set_fixed_height_mode (GtkTreeView          *tree_view,
-					      gboolean              enable);
-gboolean gtk_tree_view_get_fixed_height_mode (GtkTreeView          *tree_view);
-void     gtk_tree_view_set_hover_selection   (GtkTreeView          *tree_view,
-					      gboolean              hover);
-gboolean gtk_tree_view_get_hover_selection   (GtkTreeView          *tree_view);
-void     gtk_tree_view_set_hover_expand      (GtkTreeView          *tree_view,
-					      gboolean              expand);
-gboolean gtk_tree_view_get_hover_expand      (GtkTreeView          *tree_view);
-void     gtk_tree_view_set_rubber_banding    (GtkTreeView          *tree_view,
-					      gboolean              enable);
-gboolean gtk_tree_view_get_rubber_banding    (GtkTreeView          *tree_view);
-
-gboolean gtk_tree_view_is_rubber_banding_active (GtkTreeView       *tree_view);
-
-GtkTreeViewRowSeparatorFunc gtk_tree_view_get_row_separator_func (GtkTreeView               *tree_view);
-void                        gtk_tree_view_set_row_separator_func (GtkTreeView                *tree_view,
-								  GtkTreeViewRowSeparatorFunc func,
-								  gpointer                    data,
-								  GtkDestroyNotify            destroy);
-
-GtkTreeViewGridLines        gtk_tree_view_get_grid_lines         (GtkTreeView                *tree_view);
-void                        gtk_tree_view_set_grid_lines         (GtkTreeView                *tree_view,
-								  GtkTreeViewGridLines        grid_lines);
-gboolean                    gtk_tree_view_get_enable_tree_lines  (GtkTreeView                *tree_view);
-void                        gtk_tree_view_set_enable_tree_lines  (GtkTreeView                *tree_view,
-								  gboolean                    enabled);
-void                        gtk_tree_view_set_show_expanders     (GtkTreeView                *tree_view,
-								  gboolean                    enabled);
-gboolean                    gtk_tree_view_get_show_expanders     (GtkTreeView                *tree_view);
-void                        gtk_tree_view_set_level_indentation  (GtkTreeView                *tree_view,
-								  gint                        indentation);
-gint                        gtk_tree_view_get_level_indentation  (GtkTreeView                *tree_view);
-
-/* Convenience functions for setting tooltips */
-void          gtk_tree_view_set_tooltip_row    (GtkTreeView       *tree_view,
-						GtkTooltip        *tooltip,
-						GtkTreePath       *path);
-void          gtk_tree_view_set_tooltip_cell   (GtkTreeView       *tree_view,
-						GtkTooltip        *tooltip,
-						GtkTreePath       *path,
-						GtkTreeViewColumn *column,
-						GtkCellRenderer   *cell);
-gboolean      gtk_tree_view_get_tooltip_context(GtkTreeView       *tree_view,
-						gint              *x,
-						gint              *y,
-						gboolean           keyboard_tip,
-						GtkTreeModel     **model,
-						GtkTreePath      **path,
-						GtkTreeIter       *iter);
-void          gtk_tree_view_set_tooltip_column (GtkTreeView       *tree_view,
-					        gint               column);
-gint          gtk_tree_view_get_tooltip_column (GtkTreeView       *tree_view);
-
-G_END_DECLS
-
-
-#endif /* __GTK_TREE_VIEW_H__ */
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreeviewcolumn.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreeviewcolumn.h
deleted file mode 100644
index d7f14cb4..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreeviewcolumn.h
+++ /dev/null
@@ -1,241 +0,0 @@
-/* gtktreeviewcolumn.h
- * Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb@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 __GTK_TREE_VIEW_COLUMN_H__
-#define __GTK_TREE_VIEW_COLUMN_H__
-
-#include <glib-object.h>
-#include <gtk/gtkcellrenderer.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreesortable.h>
-
-/* Not needed, retained for compatibility -Yosh */
-#include <gtk/gtkobject.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_TREE_VIEW_COLUMN	     (gtk_tree_view_column_get_type ())
-#define GTK_TREE_VIEW_COLUMN(obj)	     (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_VIEW_COLUMN, GtkTreeViewColumn))
-#define GTK_TREE_VIEW_COLUMN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE_VIEW_COLUMN, GtkTreeViewColumnClass))
-#define GTK_IS_TREE_VIEW_COLUMN(obj)	     (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TREE_VIEW_COLUMN))
-#define GTK_IS_TREE_VIEW_COLUMN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TREE_VIEW_COLUMN))
-#define GTK_TREE_VIEW_COLUMN_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TREE_VIEW_COLUMN, GtkTreeViewColumnClass))
-
-typedef enum
-{
-  GTK_TREE_VIEW_COLUMN_GROW_ONLY,
-  GTK_TREE_VIEW_COLUMN_AUTOSIZE,
-  GTK_TREE_VIEW_COLUMN_FIXED
-} GtkTreeViewColumnSizing;
-
-typedef struct _GtkTreeViewColumn      GtkTreeViewColumn;
-typedef struct _GtkTreeViewColumnClass GtkTreeViewColumnClass;
-
-typedef void (* GtkTreeCellDataFunc) (GtkTreeViewColumn *tree_column,
-				      GtkCellRenderer   *cell,
-				      GtkTreeModel      *tree_model,
-				      GtkTreeIter       *iter,
-				      gpointer           data);
-
-  
-struct _GtkTreeViewColumn
-{
-  GtkObject parent;
-
-  GtkWidget *tree_view;
-  GtkWidget *button;
-  GtkWidget *child;  
-  GtkWidget *arrow;
-  GtkWidget *alignment;
-  GdkWindow *window;
-  GtkCellEditable *editable_widget;
-  gfloat xalign;
-  guint property_changed_signal;
-  gint spacing;
-
-  /* Sizing fields */
-  /* see gtk+/doc/tree-column-sizing.txt for more information on them */
-  GtkTreeViewColumnSizing column_type;
-  gint requested_width;
-  gint button_request;
-  gint resized_width;
-  gint width;
-  gint fixed_width;
-  gint min_width;
-  gint max_width;
-
-  /* dragging columns */
-  gint drag_x;
-  gint drag_y;
-
-  gchar *title;
-  GList *cell_list;
-
-  /* Sorting */
-  guint sort_clicked_signal;
-  guint sort_column_changed_signal;
-  gint sort_column_id;
-  GtkSortType sort_order;
-
-  /* Flags */
-  guint visible             : 1;
-  guint resizable           : 1;
-  guint clickable           : 1;
-  guint dirty               : 1;
-  guint show_sort_indicator : 1;
-  guint maybe_reordered     : 1;
-  guint reorderable         : 1;
-  guint use_resized_width   : 1;
-  guint expand              : 1;
-};
-
-struct _GtkTreeViewColumnClass
-{
-  GtkObjectClass parent_class;
-
-  void (*clicked) (GtkTreeViewColumn *tree_column);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType                   gtk_tree_view_column_get_type            (void) G_GNUC_CONST;
-GtkTreeViewColumn      *gtk_tree_view_column_new                 (void);
-GtkTreeViewColumn      *gtk_tree_view_column_new_with_attributes (const gchar             *title,
-								  GtkCellRenderer         *cell,
-								  ...) G_GNUC_NULL_TERMINATED;
-void                    gtk_tree_view_column_pack_start          (GtkTreeViewColumn       *tree_column,
-								  GtkCellRenderer         *cell,
-								  gboolean                 expand);
-void                    gtk_tree_view_column_pack_end            (GtkTreeViewColumn       *tree_column,
-								  GtkCellRenderer         *cell,
-								  gboolean                 expand);
-void                    gtk_tree_view_column_clear               (GtkTreeViewColumn       *tree_column);
-GList                  *gtk_tree_view_column_get_cell_renderers  (GtkTreeViewColumn       *tree_column);
-void                    gtk_tree_view_column_add_attribute       (GtkTreeViewColumn       *tree_column,
-								  GtkCellRenderer         *cell_renderer,
-								  const gchar             *attribute,
-								  gint                     column);
-void                    gtk_tree_view_column_set_attributes      (GtkTreeViewColumn       *tree_column,
-								  GtkCellRenderer         *cell_renderer,
-								  ...) G_GNUC_NULL_TERMINATED;
-void                    gtk_tree_view_column_set_cell_data_func  (GtkTreeViewColumn       *tree_column,
-								  GtkCellRenderer         *cell_renderer,
-								  GtkTreeCellDataFunc      func,
-								  gpointer                 func_data,
-								  GtkDestroyNotify         destroy);
-void                    gtk_tree_view_column_clear_attributes    (GtkTreeViewColumn       *tree_column,
-								  GtkCellRenderer         *cell_renderer);
-void                    gtk_tree_view_column_set_spacing         (GtkTreeViewColumn       *tree_column,
-								  gint                     spacing);
-gint                    gtk_tree_view_column_get_spacing         (GtkTreeViewColumn       *tree_column);
-void                    gtk_tree_view_column_set_visible         (GtkTreeViewColumn       *tree_column,
-								  gboolean                 visible);
-gboolean                gtk_tree_view_column_get_visible         (GtkTreeViewColumn       *tree_column);
-void                    gtk_tree_view_column_set_resizable       (GtkTreeViewColumn       *tree_column,
-								  gboolean                 resizable);
-gboolean                gtk_tree_view_column_get_resizable       (GtkTreeViewColumn       *tree_column);
-void                    gtk_tree_view_column_set_sizing          (GtkTreeViewColumn       *tree_column,
-								  GtkTreeViewColumnSizing  type);
-GtkTreeViewColumnSizing gtk_tree_view_column_get_sizing          (GtkTreeViewColumn       *tree_column);
-gint                    gtk_tree_view_column_get_width           (GtkTreeViewColumn       *tree_column);
-gint                    gtk_tree_view_column_get_fixed_width     (GtkTreeViewColumn       *tree_column);
-void                    gtk_tree_view_column_set_fixed_width     (GtkTreeViewColumn       *tree_column,
-								  gint                     fixed_width);
-void                    gtk_tree_view_column_set_min_width       (GtkTreeViewColumn       *tree_column,
-								  gint                     min_width);
-gint                    gtk_tree_view_column_get_min_width       (GtkTreeViewColumn       *tree_column);
-void                    gtk_tree_view_column_set_max_width       (GtkTreeViewColumn       *tree_column,
-								  gint                     max_width);
-gint                    gtk_tree_view_column_get_max_width       (GtkTreeViewColumn       *tree_column);
-void                    gtk_tree_view_column_clicked             (GtkTreeViewColumn       *tree_column);
-
-
-
-/* Options for manipulating the column headers
- */
-void                    gtk_tree_view_column_set_title           (GtkTreeViewColumn       *tree_column,
-								  const gchar             *title);
-G_CONST_RETURN gchar   *gtk_tree_view_column_get_title           (GtkTreeViewColumn       *tree_column);
-void                    gtk_tree_view_column_set_expand          (GtkTreeViewColumn       *tree_column,
-								  gboolean                 expand);
-gboolean                gtk_tree_view_column_get_expand          (GtkTreeViewColumn       *tree_column);
-void                    gtk_tree_view_column_set_clickable       (GtkTreeViewColumn       *tree_column,
-								  gboolean                 clickable);
-gboolean                gtk_tree_view_column_get_clickable       (GtkTreeViewColumn       *tree_column);
-void                    gtk_tree_view_column_set_widget          (GtkTreeViewColumn       *tree_column,
-								  GtkWidget               *widget);
-GtkWidget              *gtk_tree_view_column_get_widget          (GtkTreeViewColumn       *tree_column);
-void                    gtk_tree_view_column_set_alignment       (GtkTreeViewColumn       *tree_column,
-								  gfloat                   xalign);
-gfloat                  gtk_tree_view_column_get_alignment       (GtkTreeViewColumn       *tree_column);
-void                    gtk_tree_view_column_set_reorderable     (GtkTreeViewColumn       *tree_column,
-								  gboolean                 reorderable);
-gboolean                gtk_tree_view_column_get_reorderable     (GtkTreeViewColumn       *tree_column);
-
-
-
-/* You probably only want to use gtk_tree_view_column_set_sort_column_id.  The
- * other sorting functions exist primarily to let others do their own custom sorting.
- */
-void                    gtk_tree_view_column_set_sort_column_id  (GtkTreeViewColumn       *tree_column,
-								  gint                     sort_column_id);
-gint                    gtk_tree_view_column_get_sort_column_id  (GtkTreeViewColumn       *tree_column);
-void                    gtk_tree_view_column_set_sort_indicator  (GtkTreeViewColumn       *tree_column,
-								  gboolean                 setting);
-gboolean                gtk_tree_view_column_get_sort_indicator  (GtkTreeViewColumn       *tree_column);
-void                    gtk_tree_view_column_set_sort_order      (GtkTreeViewColumn       *tree_column,
-								  GtkSortType              order);
-GtkSortType             gtk_tree_view_column_get_sort_order      (GtkTreeViewColumn       *tree_column);
-
-
-/* These functions are meant primarily for interaction between the GtkTreeView and the column.
- */
-void                    gtk_tree_view_column_cell_set_cell_data  (GtkTreeViewColumn       *tree_column,
-								  GtkTreeModel            *tree_model,
-								  GtkTreeIter             *iter,
-								  gboolean                 is_expander,
-								  gboolean                 is_expanded);
-void                    gtk_tree_view_column_cell_get_size       (GtkTreeViewColumn       *tree_column,
-								  GdkRectangle            *cell_area,
-								  gint                    *x_offset,
-								  gint                    *y_offset,
-								  gint                    *width,
-								  gint                    *height);
-gboolean                gtk_tree_view_column_cell_is_visible     (GtkTreeViewColumn       *tree_column);
-void                    gtk_tree_view_column_focus_cell          (GtkTreeViewColumn       *tree_column,
-								  GtkCellRenderer         *cell);
-gboolean                gtk_tree_view_column_cell_get_position   (GtkTreeViewColumn       *tree_column,
-					                          GtkCellRenderer         *cell_renderer,
-					                          gint                    *start_pos,
-					                          gint                    *width);
-void                    gtk_tree_view_column_queue_resize        (GtkTreeViewColumn       *tree_column);
-GtkWidget              *gtk_tree_view_column_get_tree_view       (GtkTreeViewColumn       *tree_column);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_TREE_VIEW_COLUMN_H__ */
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktypebuiltins.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktypebuiltins.h
deleted file mode 100644
index 3c3832a1..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktypebuiltins.h
+++ /dev/null
@@ -1,280 +0,0 @@
-
-/* Generated data (by glib-mkenums) */
-
-#ifndef __GTK_TYPE_BUILTINS_H__
-#define __GTK_TYPE_BUILTINS_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-/* enumerations from "gtkaccelgroup.h" */
-GType gtk_accel_flags_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_ACCEL_FLAGS (gtk_accel_flags_get_type())
-/* enumerations from "gtkassistant.h" */
-GType gtk_assistant_page_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_ASSISTANT_PAGE_TYPE (gtk_assistant_page_type_get_type())
-/* enumerations from "gtkbuilder.h" */
-GType gtk_builder_error_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_BUILDER_ERROR (gtk_builder_error_get_type())
-/* enumerations from "gtkcalendar.h" */
-GType gtk_calendar_display_options_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_CALENDAR_DISPLAY_OPTIONS (gtk_calendar_display_options_get_type())
-/* enumerations from "gtkcellrenderer.h" */
-GType gtk_cell_renderer_state_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_CELL_RENDERER_STATE (gtk_cell_renderer_state_get_type())
-GType gtk_cell_renderer_mode_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_CELL_RENDERER_MODE (gtk_cell_renderer_mode_get_type())
-/* enumerations from "gtkcellrendereraccel.h" */
-GType gtk_cell_renderer_accel_mode_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_CELL_RENDERER_ACCEL_MODE (gtk_cell_renderer_accel_mode_get_type())
-/* enumerations from "gtkclist.h" */
-GType gtk_cell_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_CELL_TYPE (gtk_cell_type_get_type())
-GType gtk_clist_drag_pos_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_CLIST_DRAG_POS (gtk_clist_drag_pos_get_type())
-GType gtk_button_action_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_BUTTON_ACTION (gtk_button_action_get_type())
-/* enumerations from "gtkctree.h" */
-GType gtk_ctree_pos_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_CTREE_POS (gtk_ctree_pos_get_type())
-GType gtk_ctree_line_style_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_CTREE_LINE_STYLE (gtk_ctree_line_style_get_type())
-GType gtk_ctree_expander_style_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_CTREE_EXPANDER_STYLE (gtk_ctree_expander_style_get_type())
-GType gtk_ctree_expansion_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_CTREE_EXPANSION_TYPE (gtk_ctree_expansion_type_get_type())
-/* enumerations from "gtkdebug.h" */
-GType gtk_debug_flag_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_DEBUG_FLAG (gtk_debug_flag_get_type())
-/* enumerations from "gtkdialog.h" */
-GType gtk_dialog_flags_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_DIALOG_FLAGS (gtk_dialog_flags_get_type())
-GType gtk_response_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_RESPONSE_TYPE (gtk_response_type_get_type())
-/* enumerations from "gtkdnd.h" */
-GType gtk_dest_defaults_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_DEST_DEFAULTS (gtk_dest_defaults_get_type())
-GType gtk_target_flags_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_TARGET_FLAGS (gtk_target_flags_get_type())
-/* enumerations from "gtkenums.h" */
-GType gtk_anchor_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_ANCHOR_TYPE (gtk_anchor_type_get_type())
-GType gtk_arrow_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_ARROW_TYPE (gtk_arrow_type_get_type())
-GType gtk_attach_options_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_ATTACH_OPTIONS (gtk_attach_options_get_type())
-GType gtk_button_box_style_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_BUTTON_BOX_STYLE (gtk_button_box_style_get_type())
-GType gtk_curve_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_CURVE_TYPE (gtk_curve_type_get_type())
-GType gtk_delete_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_DELETE_TYPE (gtk_delete_type_get_type())
-GType gtk_direction_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_DIRECTION_TYPE (gtk_direction_type_get_type())
-GType gtk_expander_style_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_EXPANDER_STYLE (gtk_expander_style_get_type())
-GType gtk_icon_size_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_ICON_SIZE (gtk_icon_size_get_type())
-GType gtk_sensitivity_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_SENSITIVITY_TYPE (gtk_sensitivity_type_get_type())
-GType gtk_side_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_SIDE_TYPE (gtk_side_type_get_type())
-GType gtk_text_direction_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_TEXT_DIRECTION (gtk_text_direction_get_type())
-GType gtk_justification_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_JUSTIFICATION (gtk_justification_get_type())
-GType gtk_match_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_MATCH_TYPE (gtk_match_type_get_type())
-GType gtk_menu_direction_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_MENU_DIRECTION_TYPE (gtk_menu_direction_type_get_type())
-GType gtk_metric_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_METRIC_TYPE (gtk_metric_type_get_type())
-GType gtk_movement_step_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_MOVEMENT_STEP (gtk_movement_step_get_type())
-GType gtk_scroll_step_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_SCROLL_STEP (gtk_scroll_step_get_type())
-GType gtk_orientation_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_ORIENTATION (gtk_orientation_get_type())
-GType gtk_corner_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_CORNER_TYPE (gtk_corner_type_get_type())
-GType gtk_pack_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_PACK_TYPE (gtk_pack_type_get_type())
-GType gtk_path_priority_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_PATH_PRIORITY_TYPE (gtk_path_priority_type_get_type())
-GType gtk_path_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_PATH_TYPE (gtk_path_type_get_type())
-GType gtk_policy_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_POLICY_TYPE (gtk_policy_type_get_type())
-GType gtk_position_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_POSITION_TYPE (gtk_position_type_get_type())
-GType gtk_preview_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_PREVIEW_TYPE (gtk_preview_type_get_type())
-GType gtk_relief_style_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_RELIEF_STYLE (gtk_relief_style_get_type())
-GType gtk_resize_mode_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_RESIZE_MODE (gtk_resize_mode_get_type())
-GType gtk_signal_run_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_SIGNAL_RUN_TYPE (gtk_signal_run_type_get_type())
-GType gtk_scroll_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_SCROLL_TYPE (gtk_scroll_type_get_type())
-GType gtk_selection_mode_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_SELECTION_MODE (gtk_selection_mode_get_type())
-GType gtk_shadow_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_SHADOW_TYPE (gtk_shadow_type_get_type())
-GType gtk_state_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_STATE_TYPE (gtk_state_type_get_type())
-GType gtk_submenu_direction_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_SUBMENU_DIRECTION (gtk_submenu_direction_get_type())
-GType gtk_submenu_placement_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_SUBMENU_PLACEMENT (gtk_submenu_placement_get_type())
-GType gtk_toolbar_style_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_TOOLBAR_STYLE (gtk_toolbar_style_get_type())
-GType gtk_update_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_UPDATE_TYPE (gtk_update_type_get_type())
-GType gtk_visibility_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_VISIBILITY (gtk_visibility_get_type())
-GType gtk_window_position_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_WINDOW_POSITION (gtk_window_position_get_type())
-GType gtk_window_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_WINDOW_TYPE (gtk_window_type_get_type())
-GType gtk_wrap_mode_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_WRAP_MODE (gtk_wrap_mode_get_type())
-GType gtk_sort_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_SORT_TYPE (gtk_sort_type_get_type())
-GType gtk_im_preedit_style_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_IM_PREEDIT_STYLE (gtk_im_preedit_style_get_type())
-GType gtk_im_status_style_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_IM_STATUS_STYLE (gtk_im_status_style_get_type())
-GType gtk_pack_direction_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_PACK_DIRECTION (gtk_pack_direction_get_type())
-GType gtk_print_pages_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_PRINT_PAGES (gtk_print_pages_get_type())
-GType gtk_page_set_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_PAGE_SET (gtk_page_set_get_type())
-GType gtk_page_orientation_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_PAGE_ORIENTATION (gtk_page_orientation_get_type())
-GType gtk_print_quality_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_PRINT_QUALITY (gtk_print_quality_get_type())
-GType gtk_print_duplex_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_PRINT_DUPLEX (gtk_print_duplex_get_type())
-GType gtk_unit_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_UNIT (gtk_unit_get_type())
-GType gtk_tree_view_grid_lines_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_TREE_VIEW_GRID_LINES (gtk_tree_view_grid_lines_get_type())
-GType gtk_drag_result_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_DRAG_RESULT (gtk_drag_result_get_type())
-/* enumerations from "gtkfilechooser.h" */
-GType gtk_file_chooser_action_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_FILE_CHOOSER_ACTION (gtk_file_chooser_action_get_type())
-GType gtk_file_chooser_confirmation_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_FILE_CHOOSER_CONFIRMATION (gtk_file_chooser_confirmation_get_type())
-GType gtk_file_chooser_error_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_FILE_CHOOSER_ERROR (gtk_file_chooser_error_get_type())
-/* enumerations from "gtkfilefilter.h" */
-GType gtk_file_filter_flags_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_FILE_FILTER_FLAGS (gtk_file_filter_flags_get_type())
-/* enumerations from "gtkicontheme.h" */
-GType gtk_icon_lookup_flags_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_ICON_LOOKUP_FLAGS (gtk_icon_lookup_flags_get_type())
-GType gtk_icon_theme_error_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_ICON_THEME_ERROR (gtk_icon_theme_error_get_type())
-/* enumerations from "gtkiconview.h" */
-GType gtk_icon_view_drop_position_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_ICON_VIEW_DROP_POSITION (gtk_icon_view_drop_position_get_type())
-/* enumerations from "gtkimage.h" */
-GType gtk_image_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_IMAGE_TYPE (gtk_image_type_get_type())
-/* enumerations from "gtkmessagedialog.h" */
-GType gtk_message_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_MESSAGE_TYPE (gtk_message_type_get_type())
-GType gtk_buttons_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_BUTTONS_TYPE (gtk_buttons_type_get_type())
-/* enumerations from "gtknotebook.h" */
-GType gtk_notebook_tab_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_NOTEBOOK_TAB (gtk_notebook_tab_get_type())
-/* enumerations from "gtkobject.h" */
-GType gtk_object_flags_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_OBJECT_FLAGS (gtk_object_flags_get_type())
-GType gtk_arg_flags_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_ARG_FLAGS (gtk_arg_flags_get_type())
-/* enumerations from "gtkprintoperation.h" */
-GType gtk_print_status_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_PRINT_STATUS (gtk_print_status_get_type())
-GType gtk_print_operation_result_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_PRINT_OPERATION_RESULT (gtk_print_operation_result_get_type())
-GType gtk_print_operation_action_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_PRINT_OPERATION_ACTION (gtk_print_operation_action_get_type())
-GType gtk_print_error_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_PRINT_ERROR (gtk_print_error_get_type())
-/* enumerations from "gtkprivate.h" */
-GType gtk_private_flags_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_PRIVATE_FLAGS (gtk_private_flags_get_type())
-/* enumerations from "gtkprogressbar.h" */
-GType gtk_progress_bar_style_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_PROGRESS_BAR_STYLE (gtk_progress_bar_style_get_type())
-GType gtk_progress_bar_orientation_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_PROGRESS_BAR_ORIENTATION (gtk_progress_bar_orientation_get_type())
-/* enumerations from "gtkrc.h" */
-GType gtk_rc_flags_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_RC_FLAGS (gtk_rc_flags_get_type())
-GType gtk_rc_token_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_RC_TOKEN_TYPE (gtk_rc_token_type_get_type())
-/* enumerations from "gtkrecentchooser.h" */
-GType gtk_recent_sort_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_RECENT_SORT_TYPE (gtk_recent_sort_type_get_type())
-GType gtk_recent_chooser_error_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_RECENT_CHOOSER_ERROR (gtk_recent_chooser_error_get_type())
-/* enumerations from "gtkrecentfilter.h" */
-GType gtk_recent_filter_flags_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_RECENT_FILTER_FLAGS (gtk_recent_filter_flags_get_type())
-/* enumerations from "gtkrecentmanager.h" */
-GType gtk_recent_manager_error_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_RECENT_MANAGER_ERROR (gtk_recent_manager_error_get_type())
-/* enumerations from "gtksizegroup.h" */
-GType gtk_size_group_mode_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_SIZE_GROUP_MODE (gtk_size_group_mode_get_type())
-/* enumerations from "gtkspinbutton.h" */
-GType gtk_spin_button_update_policy_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_SPIN_BUTTON_UPDATE_POLICY (gtk_spin_button_update_policy_get_type())
-GType gtk_spin_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_SPIN_TYPE (gtk_spin_type_get_type())
-/* enumerations from "gtktextbuffer.h" */
-GType gtk_text_buffer_target_info_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_TEXT_BUFFER_TARGET_INFO (gtk_text_buffer_target_info_get_type())
-/* enumerations from "gtktextiter.h" */
-GType gtk_text_search_flags_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_TEXT_SEARCH_FLAGS (gtk_text_search_flags_get_type())
-/* enumerations from "gtktextview.h" */
-GType gtk_text_window_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_TEXT_WINDOW_TYPE (gtk_text_window_type_get_type())
-/* enumerations from "gtktoolbar.h" */
-GType gtk_toolbar_child_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_TOOLBAR_CHILD_TYPE (gtk_toolbar_child_type_get_type())
-GType gtk_toolbar_space_style_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_TOOLBAR_SPACE_STYLE (gtk_toolbar_space_style_get_type())
-/* enumerations from "gtktree.h" */
-GType gtk_tree_view_mode_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_TREE_VIEW_MODE (gtk_tree_view_mode_get_type())
-/* enumerations from "gtktreemodel.h" */
-GType gtk_tree_model_flags_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_TREE_MODEL_FLAGS (gtk_tree_model_flags_get_type())
-/* enumerations from "gtktreeview.h" */
-GType gtk_tree_view_drop_position_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_TREE_VIEW_DROP_POSITION (gtk_tree_view_drop_position_get_type())
-/* enumerations from "gtktreeviewcolumn.h" */
-GType gtk_tree_view_column_sizing_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_TREE_VIEW_COLUMN_SIZING (gtk_tree_view_column_sizing_get_type())
-/* enumerations from "gtkuimanager.h" */
-GType gtk_ui_manager_item_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_UI_MANAGER_ITEM_TYPE (gtk_ui_manager_item_type_get_type())
-/* enumerations from "gtkwidget.h" */
-GType gtk_widget_flags_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_WIDGET_FLAGS (gtk_widget_flags_get_type())
-GType gtk_widget_help_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_WIDGET_HELP_TYPE (gtk_widget_help_type_get_type())
-G_END_DECLS
-
-#endif /* __GTK_TYPE_BUILTINS_H__ */
-
-/* Generated data ends here */
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktypeutils.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktypeutils.h
deleted file mode 100644
index 90b97ab1..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktypeutils.h
+++ /dev/null
@@ -1,267 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_TYPE_UTILS_H__
-#define __GTK_TYPE_UTILS_H__
-
-
-#include <glib-object.h>
-
-
-G_BEGIN_DECLS
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-/* Fundamental Types
- * many of these are just aliases for GLib types to maintain
- * compatibility
- */
-
-#define GTK_TYPE_INVALID G_TYPE_INVALID
-#define GTK_TYPE_NONE    G_TYPE_NONE
-#define GTK_TYPE_ENUM    G_TYPE_ENUM
-#define GTK_TYPE_FLAGS   G_TYPE_FLAGS
-
-/* GtkArg types */
-#define GTK_TYPE_CHAR    G_TYPE_CHAR
-#define GTK_TYPE_UCHAR   G_TYPE_UCHAR
-#define GTK_TYPE_BOOL    G_TYPE_BOOLEAN
-#define GTK_TYPE_INT     G_TYPE_INT
-#define GTK_TYPE_UINT    G_TYPE_UINT
-#define GTK_TYPE_LONG    G_TYPE_LONG
-#define GTK_TYPE_ULONG   G_TYPE_ULONG
-#define GTK_TYPE_FLOAT   G_TYPE_FLOAT
-#define GTK_TYPE_DOUBLE  G_TYPE_DOUBLE
-#define GTK_TYPE_STRING  G_TYPE_STRING
-#define GTK_TYPE_BOXED   G_TYPE_BOXED
-#define GTK_TYPE_POINTER G_TYPE_POINTER
-
-typedef GType GtkFundamentalType;
-
-/* --- type macros --- */
-#define GTK_CLASS_NAME(class)		(g_type_name (G_TYPE_FROM_CLASS (class)))
-#define GTK_CLASS_TYPE(class)		(G_TYPE_FROM_CLASS (class))
-#define GTK_TYPE_IS_OBJECT(type)	(g_type_is_a ((type), GTK_TYPE_OBJECT))
-
-/* outdated macros that really shouldn't e used anymore,
- * use the GLib type system instead
- */
-#define	GTK_TYPE_FUNDAMENTAL_LAST        (G_TYPE_LAST_RESERVED_FUNDAMENTAL - 1)
-#define	GTK_TYPE_FUNDAMENTAL_MAX         (G_TYPE_FUNDAMENTAL_MAX)
-
-#define	GTK_FUNDAMENTAL_TYPE	G_TYPE_FUNDAMENTAL
-#define GTK_STRUCT_OFFSET	G_STRUCT_OFFSET
-
-#endif /* GTK_DISABLE_DEPRECATED */
-
-/* glib macro wrappers (compatibility) */
-#define	GTK_CHECK_CAST		G_TYPE_CHECK_INSTANCE_CAST
-#define	GTK_CHECK_CLASS_CAST	G_TYPE_CHECK_CLASS_CAST
-#define GTK_CHECK_GET_CLASS	G_TYPE_INSTANCE_GET_CLASS
-#define	GTK_CHECK_TYPE		G_TYPE_CHECK_INSTANCE_TYPE
-#define	GTK_CHECK_CLASS_TYPE	G_TYPE_CHECK_CLASS_TYPE
-
-/* glib type wrappers (compatibility) */
-
-typedef GType			GtkType;
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-typedef GTypeInstance		GtkTypeObject;
-typedef GTypeClass		GtkTypeClass;
-typedef GBaseInitFunc		GtkClassInitFunc;
-typedef GInstanceInitFunc	GtkObjectInitFunc;
-
-#endif /* GTK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-/* Builtin Types
- */
-#include <gtk/gtktypebuiltins.h>
-
-G_BEGIN_DECLS
-
-/* urg */
-#define GTK_TYPE_IDENTIFIER (gtk_identifier_get_type ())
-GType gtk_identifier_get_type (void) G_GNUC_CONST;
-
-/* --- typedefs --- */
-/* here we come with some necessary forward declarations for structures and
- * provide some fundamental function signatures
- */
-typedef struct _GtkArg	       	     GtkArg;
-typedef struct _GtkObject   	     GtkObject; /* object forward declaration */
-typedef gboolean (*GtkFunction)	    (gpointer      data);
-typedef void (*GtkDestroyNotify)    (gpointer      data);
-typedef void (*GtkCallbackMarshal)  (GtkObject    *object,
-				     gpointer      data,
-				     guint         n_args,
-				     GtkArg       *args);
-typedef void (*GtkSignalFunc)       (void);
-#define GTK_SIGNAL_FUNC(f)	    ((GtkSignalFunc) (f))
-
-#ifndef GTK_DISABLE_DEPRECATED
-typedef struct _GtkTypeInfo 	     GtkTypeInfo;
-typedef GSignalCMarshaller          GtkSignalMarshaller;
-#endif
-
-#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
-/* Used by gtk_container_foreach_unmarshal () */
-
-/* GtkArg, used to hold differently typed values */
-struct _GtkArg
-{
-  GtkType type;
-  gchar *name;
-  
-  /* this union only defines the required storage types for
-   * the possibile values, thus there is no gint enum_data field,
-   * because that would just be a mere alias for gint int_data.
-   * use the GTK_VALUE_*() and GTK_RETLOC_*() macros to access
-   * the discrete memebers.
-   */
-  union {
-    /* flat values */
-    gchar char_data;
-    guchar uchar_data;
-    gboolean bool_data;
-    gint int_data;
-    guint uint_data;
-    glong long_data;
-    gulong ulong_data;
-    gfloat float_data;
-    gdouble double_data;
-    gchar *string_data;
-    GtkObject *object_data;
-    gpointer pointer_data;
-    
-    /* structured values */
-    struct {
-      GtkSignalFunc f;
-      gpointer d;
-    } signal_data;
-  } d;
-};
-
-/* argument value access macros, these must not contain casts,
- * to allow the usage of these macros in combination with the
- * address operator, e.g. &GTK_VALUE_CHAR (*arg)
- */
-#define GTK_VALUE_CHAR(a)	((a).d.char_data)
-#define GTK_VALUE_UCHAR(a)	((a).d.uchar_data)
-#define GTK_VALUE_BOOL(a)	((a).d.bool_data)
-#define GTK_VALUE_INT(a)	((a).d.int_data)
-#define GTK_VALUE_UINT(a)	((a).d.uint_data)
-#define GTK_VALUE_LONG(a)	((a).d.long_data)
-#define GTK_VALUE_ULONG(a)	((a).d.ulong_data)
-#define GTK_VALUE_FLOAT(a)	((a).d.float_data)
-#define GTK_VALUE_DOUBLE(a)	((a).d.double_data)
-#define GTK_VALUE_STRING(a)	((a).d.string_data)
-#define GTK_VALUE_ENUM(a)	((a).d.int_data)
-#define GTK_VALUE_FLAGS(a)	((a).d.uint_data)
-#define GTK_VALUE_BOXED(a)	((a).d.pointer_data)
-#define GTK_VALUE_OBJECT(a)	((a).d.object_data)
-#define GTK_VALUE_POINTER(a)	((a).d.pointer_data)
-#define GTK_VALUE_SIGNAL(a)	((a).d.signal_data)
-#endif /* !GTK_DISABLE_DEPRECATED || GTK_COMPILATION */
-
-#ifndef GTK_DISABLE_DEPRECATED
-/* return location macros, these all narrow down to
- * pointer types, because return values need to be
- * passed by reference
- */
-#define GTK_RETLOC_CHAR(a)	((gchar*)	(a).d.pointer_data)
-#define GTK_RETLOC_UCHAR(a)	((guchar*)	(a).d.pointer_data)
-#define GTK_RETLOC_BOOL(a)	((gboolean*)	(a).d.pointer_data)
-#define GTK_RETLOC_INT(a)	((gint*)	(a).d.pointer_data)
-#define GTK_RETLOC_UINT(a)	((guint*)	(a).d.pointer_data)
-#define GTK_RETLOC_LONG(a)	((glong*)	(a).d.pointer_data)
-#define GTK_RETLOC_ULONG(a)	((gulong*)	(a).d.pointer_data)
-#define GTK_RETLOC_FLOAT(a)	((gfloat*)	(a).d.pointer_data)
-#define GTK_RETLOC_DOUBLE(a)	((gdouble*)	(a).d.pointer_data)
-#define GTK_RETLOC_STRING(a)	((gchar**)	(a).d.pointer_data)
-#define GTK_RETLOC_ENUM(a)	((gint*)	(a).d.pointer_data)
-#define GTK_RETLOC_FLAGS(a)	((guint*)	(a).d.pointer_data)
-#define GTK_RETLOC_BOXED(a)	((gpointer*)	(a).d.pointer_data)
-#define GTK_RETLOC_OBJECT(a)	((GtkObject**)	(a).d.pointer_data)
-#define GTK_RETLOC_POINTER(a)	((gpointer*)	(a).d.pointer_data)
-/* GTK_RETLOC_SIGNAL() - no such thing */
-
-/* type registration, it is recommended to use
- * g_type_register_static() or
- * g_type_register_dynamic() instead
- */
-struct _GtkTypeInfo
-{
-  gchar			*type_name;
-  guint			 object_size;
-  guint			 class_size;
-  GtkClassInitFunc	 class_init_func;
-  GtkObjectInitFunc	 object_init_func;
-  gpointer		 reserved_1;
-  gpointer		 reserved_2;
-  GtkClassInitFunc	 base_class_init_func;
-};
-
-#endif /* GTK_DISABLE_DEPRECATED */
-
-gpointer	gtk_type_class	(GtkType	 type);
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-GtkType		gtk_type_unique	(GtkType	   parent_type,
-				 const GtkTypeInfo *gtkinfo);
-gpointer	gtk_type_new	(GtkType	 type);
-
-/* --- compatibility defines --- */
-#define	gtk_type_name(type)		 g_type_name (type)
-#define	gtk_type_from_name(name)	 g_type_from_name (name)
-#define	gtk_type_parent(type)		 g_type_parent (type)
-#define	gtk_type_is_a(type, is_a_type)	 g_type_is_a ((type), (is_a_type))
-
-/* enum/flags compatibility functions, we strongly
- * recommend to use the glib enum/flags classes directly
- */
-typedef GEnumValue  GtkEnumValue;
-typedef GFlagsValue GtkFlagValue;
-GtkEnumValue*	gtk_type_enum_get_values	(GtkType	 enum_type);
-GtkFlagValue*	gtk_type_flags_get_values	(GtkType	 flags_type);
-GtkEnumValue*	gtk_type_enum_find_value	(GtkType	 enum_type,
-						 const gchar	*value_name);
-GtkFlagValue*	gtk_type_flags_find_value	(GtkType	 flags_type,
-						 const gchar	*value_name);
-
-#endif /* GTK_DISABLE_DEPRECATED */
-
-#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
-/* deprecated, use g_type_init() instead */
-void		gtk_type_init	(GTypeDebugFlags debug_flags);
-#endif /* !GTK_DISABLE_DEPRECATED || GTK_COMPILATION */
-
-G_END_DECLS
-
-#endif /* __GTK_TYPE_UTILS_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkuimanager.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkuimanager.h
deleted file mode 100644
index 7e1e6ead..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkuimanager.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * GTK - The GIMP Toolkit
- * Copyright (C) 1998, 1999 Red Hat, Inc.
- * All rights reserved.
- *
- * 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 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.
- */
-
-/*
- * Author: James Henstridge <james@daa.com.au>
- *
- * Modified by the GTK+ Team and others 2003.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-#ifndef __GTK_UI_MANAGER_H__
-#define __GTK_UI_MANAGER_H__
-
-
-#include <glib.h>
-#include <glib-object.h>
-#include <gtk/gtkaccelgroup.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkaction.h>
-#include <gtk/gtkactiongroup.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_UI_MANAGER            (gtk_ui_manager_get_type ())
-#define GTK_UI_MANAGER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_UI_MANAGER, GtkUIManager))
-#define GTK_UI_MANAGER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_UI_MANAGER, GtkUIManagerClass))
-#define GTK_IS_UI_MANAGER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_UI_MANAGER))
-#define GTK_IS_UI_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_UI_MANAGER))
-#define GTK_UI_MANAGER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_UI_MANAGER, GtkUIManagerClass))
-
-typedef struct _GtkUIManager      GtkUIManager;
-typedef struct _GtkUIManagerClass GtkUIManagerClass;
-typedef struct _GtkUIManagerPrivate GtkUIManagerPrivate;
-
-
-struct _GtkUIManager {
-  GObject parent;
-
-  /*< private >*/
-
-  GtkUIManagerPrivate *private_data;
-};
-
-struct _GtkUIManagerClass {
-  GObjectClass parent_class;
-
-  /* Signals */
-  void (* add_widget)       (GtkUIManager *merge, 
-                             GtkWidget    *widget);
-  void (* actions_changed)  (GtkUIManager *merge);
-  void (* connect_proxy)    (GtkUIManager *merge,
-			     GtkAction    *action,
-			     GtkWidget    *proxy);
-  void (* disconnect_proxy) (GtkUIManager *merge,
-			     GtkAction    *action,
-			     GtkWidget    *proxy);
-  void (* pre_activate)     (GtkUIManager *merge,
-			     GtkAction    *action);
-  void (* post_activate)    (GtkUIManager *merge,
-			     GtkAction    *action);
-
-  /* Virtual functions */
-  GtkWidget * (* get_widget) (GtkUIManager *manager,
-                              const gchar  *path);
-  GtkAction * (* get_action) (GtkUIManager *manager,
-                              const gchar  *path);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-};
-
-typedef enum {
-  GTK_UI_MANAGER_AUTO         = 0,
-  GTK_UI_MANAGER_MENUBAR      = 1 << 0,
-  GTK_UI_MANAGER_MENU         = 1 << 1,
-  GTK_UI_MANAGER_TOOLBAR      = 1 << 2,
-  GTK_UI_MANAGER_PLACEHOLDER  = 1 << 3,
-  GTK_UI_MANAGER_POPUP        = 1 << 4,
-  GTK_UI_MANAGER_MENUITEM     = 1 << 5,
-  GTK_UI_MANAGER_TOOLITEM     = 1 << 6,
-  GTK_UI_MANAGER_SEPARATOR    = 1 << 7,
-  GTK_UI_MANAGER_ACCELERATOR  = 1 << 8
-} GtkUIManagerItemType;
-
-#ifdef G_OS_WIN32
-/* Reserve old name for DLL ABI backward compatibility */
-#define gtk_ui_manager_add_ui_from_file gtk_ui_manager_add_ui_from_file_utf8
-#endif
-
-GType          gtk_ui_manager_get_type            (void) G_GNUC_CONST;
-GtkUIManager  *gtk_ui_manager_new                 (void);
-void           gtk_ui_manager_set_add_tearoffs    (GtkUIManager          *self,
-						   gboolean               add_tearoffs);
-gboolean       gtk_ui_manager_get_add_tearoffs    (GtkUIManager          *self);
-void           gtk_ui_manager_insert_action_group (GtkUIManager          *self,
-						   GtkActionGroup        *action_group,
-						   gint                   pos);
-void           gtk_ui_manager_remove_action_group (GtkUIManager          *self,
-						   GtkActionGroup        *action_group);
-GList         *gtk_ui_manager_get_action_groups   (GtkUIManager          *self);
-GtkAccelGroup *gtk_ui_manager_get_accel_group     (GtkUIManager          *self);
-GtkWidget     *gtk_ui_manager_get_widget          (GtkUIManager          *self,
-						   const gchar           *path);
-GSList        *gtk_ui_manager_get_toplevels       (GtkUIManager          *self,
-						   GtkUIManagerItemType   types);
-GtkAction     *gtk_ui_manager_get_action          (GtkUIManager          *self,
-						   const gchar           *path);
-guint          gtk_ui_manager_add_ui_from_string  (GtkUIManager          *self,
-						   const gchar           *buffer,
-						   gssize                 length,
-						   GError               **error);
-guint          gtk_ui_manager_add_ui_from_file    (GtkUIManager          *self,
-						   const gchar           *filename,
-						   GError               **error);
-void           gtk_ui_manager_add_ui              (GtkUIManager          *self,
-						   guint                  merge_id,
-						   const gchar           *path,
-						   const gchar           *name,
-						   const gchar           *action,
-						   GtkUIManagerItemType   type,
-						   gboolean               top);
-void           gtk_ui_manager_remove_ui           (GtkUIManager          *self,
-						   guint                  merge_id);
-gchar         *gtk_ui_manager_get_ui              (GtkUIManager          *self);
-void           gtk_ui_manager_ensure_update       (GtkUIManager          *self);
-guint          gtk_ui_manager_new_merge_id        (GtkUIManager          *self);
-
-G_END_DECLS
-
-#endif /* __GTK_UI_MANAGER_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvbbox.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvbbox.h
deleted file mode 100644
index 8c21273c..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvbbox.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_VBBOX_H__
-#define __GTK_VBBOX_H__
-
-
-#include <gtk/gtkbbox.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_VBUTTON_BOX            (gtk_vbutton_box_get_type ())
-#define GTK_VBUTTON_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_VBUTTON_BOX, GtkVButtonBox))
-#define GTK_VBUTTON_BOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_VBUTTON_BOX, GtkVButtonBoxClass))
-#define GTK_IS_VBUTTON_BOX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_VBUTTON_BOX))
-#define GTK_IS_VBUTTON_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VBUTTON_BOX))
-#define GTK_VBUTTON_BOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_VBUTTON_BOX, GtkVButtonBoxClass))
-
-
-typedef struct _GtkVButtonBox       GtkVButtonBox;
-typedef struct _GtkVButtonBoxClass  GtkVButtonBoxClass;
-
-struct _GtkVButtonBox
-{
-  GtkButtonBox button_box;
-};
-
-struct _GtkVButtonBoxClass
-{
-  GtkButtonBoxClass parent_class;
-};
-
-
-GType      gtk_vbutton_box_get_type (void) G_GNUC_CONST;
-GtkWidget *gtk_vbutton_box_new      (void);
-
-/* buttons can be added by gtk_container_add() */
-
-#ifndef GTK_DISABLE_DEPRECATED
-gint gtk_vbutton_box_get_spacing_default (void);
-void gtk_vbutton_box_set_spacing_default (gint spacing);
-
-GtkButtonBoxStyle gtk_vbutton_box_get_layout_default (void);
-void gtk_vbutton_box_set_layout_default (GtkButtonBoxStyle layout);
-#endif
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_VBBOX_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvbox.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvbox.h
deleted file mode 100644
index 3cdb2ad1..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvbox.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_VBOX_H__
-#define __GTK_VBOX_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkbox.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_VBOX		 (gtk_vbox_get_type ())
-#define GTK_VBOX(obj)		 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_VBOX, GtkVBox))
-#define GTK_VBOX_CLASS(klass)	 (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_VBOX, GtkVBoxClass))
-#define GTK_IS_VBOX(obj)	 (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_VBOX))
-#define GTK_IS_VBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VBOX))
-#define GTK_VBOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_VBOX, GtkVBoxClass))
-
-
-typedef struct _GtkVBox	      GtkVBox;
-typedef struct _GtkVBoxClass  GtkVBoxClass;
-
-struct _GtkVBox
-{
-  GtkBox box;
-};
-
-struct _GtkVBoxClass
-{
-  GtkBoxClass parent_class;
-};
-
-
-GType	   gtk_vbox_get_type (void) G_GNUC_CONST;
-GtkWidget* gtk_vbox_new	     (gboolean homogeneous,
-			      gint spacing);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_VBOX_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkversion.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkversion.h
deleted file mode 100644
index 191bbe7a..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkversion.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-1999.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_VERSION_H__
-#define __GTK_VERSION_H__
-
-/* compile time version
- */
-#define GTK_MAJOR_VERSION				(2)
-#define GTK_MINOR_VERSION				(12)
-#define GTK_MICRO_VERSION				(12)
-#define GTK_BINARY_AGE					(1212)
-#define GTK_INTERFACE_AGE				(12)
-
-/* check whether a Gtk+ version equal to or greater than
- * major.minor.micro is present.
- */
-#define	GTK_CHECK_VERSION(major,minor,micro)	\
-    (GTK_MAJOR_VERSION > (major) || \
-     (GTK_MAJOR_VERSION == (major) && GTK_MINOR_VERSION > (minor)) || \
-     (GTK_MAJOR_VERSION == (major) && GTK_MINOR_VERSION == (minor) && \
-      GTK_MICRO_VERSION >= (micro)))
-
-
-#endif /* __GTK_VERSION_H__ */
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkviewport.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkviewport.h
deleted file mode 100644
index 8b64f174..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkviewport.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_VIEWPORT_H__
-#define __GTK_VIEWPORT_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkadjustment.h>
-#include <gtk/gtkbin.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_VIEWPORT            (gtk_viewport_get_type ())
-#define GTK_VIEWPORT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_VIEWPORT, GtkViewport))
-#define GTK_VIEWPORT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_VIEWPORT, GtkViewportClass))
-#define GTK_IS_VIEWPORT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_VIEWPORT))
-#define GTK_IS_VIEWPORT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VIEWPORT))
-#define GTK_VIEWPORT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_VIEWPORT, GtkViewportClass))
-
-
-typedef struct _GtkViewport       GtkViewport;
-typedef struct _GtkViewportClass  GtkViewportClass;
-
-struct _GtkViewport
-{
-  GtkBin bin;
-
-  GtkShadowType shadow_type;
-  GdkWindow *view_window;
-  GdkWindow *bin_window;
-  GtkAdjustment *hadjustment;
-  GtkAdjustment *vadjustment;
-};
-
-struct _GtkViewportClass
-{
-  GtkBinClass parent_class;
-
-  void	(*set_scroll_adjustments)	(GtkViewport	*viewport,
-					 GtkAdjustment	*hadjustment,
-					 GtkAdjustment	*vadjustment);
-};
-
-
-GType          gtk_viewport_get_type        (void) G_GNUC_CONST;
-GtkWidget*     gtk_viewport_new             (GtkAdjustment *hadjustment,
-					     GtkAdjustment *vadjustment);
-GtkAdjustment* gtk_viewport_get_hadjustment (GtkViewport   *viewport);
-GtkAdjustment* gtk_viewport_get_vadjustment (GtkViewport   *viewport);
-void           gtk_viewport_set_hadjustment (GtkViewport   *viewport,
-					     GtkAdjustment *adjustment);
-void           gtk_viewport_set_vadjustment (GtkViewport   *viewport,
-					     GtkAdjustment *adjustment);
-void           gtk_viewport_set_shadow_type (GtkViewport   *viewport,
-					     GtkShadowType  type);
-GtkShadowType  gtk_viewport_get_shadow_type (GtkViewport   *viewport);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_VIEWPORT_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvolumebutton.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvolumebutton.h
deleted file mode 100644
index 069c1228..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvolumebutton.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2007 Red Hat, Inc.
- *
- * Authors:
- * - Bastien Nocera <bnocera@redhat.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.
- */
-
-/*
- * Modified by the GTK+ Team and others 2007.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_VOLUME_BUTTON_H__
-#define __GTK_VOLUME_BUTTON_H__
-
-#include <gtk/gtkscalebutton.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_VOLUME_BUTTON                 (gtk_volume_button_get_type ())
-#define GTK_VOLUME_BUTTON(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_VOLUME_BUTTON, GtkVolumeButton))
-#define GTK_VOLUME_BUTTON_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_VOLUME_BUTTON, GtkVolumeeButtonClass))
-#define GTK_IS_VOLUME_BUTTON(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_VOLUME_BUTTON))
-#define GTK_IS_VOLUME_BUTTON_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VOLUME_BUTTON))
-#define GTK_VOLUME_BUTTON_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_VOLUME_BUTTON, GtkVolumeButtonClass))
-
-typedef struct _GtkVolumeButton       GtkVolumeButton;
-typedef struct _GtkVolumeButtonClass  GtkVolumeButtonClass;
-
-struct _GtkVolumeButtonClass
-{
-  GtkScaleButtonClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType		gtk_volume_button_get_type	(void) G_GNUC_CONST;
-GtkWidget*	gtk_volume_button_new		(void);
-
-G_END_DECLS
-
-#endif /* __GTK_VOLUME_BUTTON_H__ */
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvpaned.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvpaned.h
deleted file mode 100644
index 10bb9a0c..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvpaned.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_VPANED_H__
-#define __GTK_VPANED_H__
-
-#include <gtk/gtkpaned.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_VPANED            (gtk_vpaned_get_type ())
-#define GTK_VPANED(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_VPANED, GtkVPaned))
-#define GTK_VPANED_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_VPANED, GtkVPanedClass))
-#define GTK_IS_VPANED(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_VPANED))
-#define GTK_IS_VPANED_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VPANED))
-#define GTK_VPANED_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_VPANED, GtkVPanedClass))
-
-
-typedef struct _GtkVPaned      GtkVPaned;
-typedef struct _GtkVPanedClass GtkVPanedClass;
-
-struct _GtkVPaned
-{
-  GtkPaned paned;
-};
-
-struct _GtkVPanedClass
-{
-  GtkPanedClass parent_class;
-};
-
-GType      gtk_vpaned_get_type (void) G_GNUC_CONST;
-GtkWidget *gtk_vpaned_new      (void);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_VPANED_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvruler.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvruler.h
deleted file mode 100644
index 2b27e52f..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvruler.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-/*
- * NOTE this widget is considered too specialized/little-used for
- * GTK+, and will in the future be moved to some other package.  If
- * your application needs this widget, feel free to use it, as the
- * widget does work and is useful in some applications; it's just not
- * of general interest. However, we are not accepting new features for
- * the widget, and it will eventually move out of the GTK+
- * distribution.
- */
-
-#ifndef __GTK_VRULER_H__
-#define __GTK_VRULER_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkruler.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_VRULER            (gtk_vruler_get_type ())
-#define GTK_VRULER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_VRULER, GtkVRuler))
-#define GTK_VRULER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_VRULER, GtkVRulerClass))
-#define GTK_IS_VRULER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_VRULER))
-#define GTK_IS_VRULER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VRULER))
-#define GTK_VRULER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_VRULER, GtkVRulerClass))
-
-
-typedef struct _GtkVRuler       GtkVRuler;
-typedef struct _GtkVRulerClass  GtkVRulerClass;
-
-struct _GtkVRuler
-{
-  GtkRuler ruler;
-};
-
-struct _GtkVRulerClass
-{
-  GtkRulerClass parent_class;
-};
-
-
-GType      gtk_vruler_get_type (void) G_GNUC_CONST;
-GtkWidget* gtk_vruler_new      (void);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_VRULER_H__ */
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvscale.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvscale.h
deleted file mode 100644
index 8661b751..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvscale.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_VSCALE_H__
-#define __GTK_VSCALE_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkscale.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_VSCALE            (gtk_vscale_get_type ())
-#define GTK_VSCALE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_VSCALE, GtkVScale))
-#define GTK_VSCALE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_VSCALE, GtkVScaleClass))
-#define GTK_IS_VSCALE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_VSCALE))
-#define GTK_IS_VSCALE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VSCALE))
-#define GTK_VSCALE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_VSCALE, GtkVScaleClass))
-
-
-typedef struct _GtkVScale       GtkVScale;
-typedef struct _GtkVScaleClass  GtkVScaleClass;
-
-struct _GtkVScale
-{
-  GtkScale scale;
-};
-
-struct _GtkVScaleClass
-{
-  GtkScaleClass parent_class;
-};
-
-
-GType      gtk_vscale_get_type       (void) G_GNUC_CONST;
-GtkWidget* gtk_vscale_new            (GtkAdjustment *adjustment);
-GtkWidget* gtk_vscale_new_with_range (gdouble        min,
-                                      gdouble        max,
-                                      gdouble        step);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_VSCALE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvscrollbar.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvscrollbar.h
deleted file mode 100644
index bdd6c3d0..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvscrollbar.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_VSCROLLBAR_H__
-#define __GTK_VSCROLLBAR_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkscrollbar.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_VSCROLLBAR            (gtk_vscrollbar_get_type ())
-#define GTK_VSCROLLBAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_VSCROLLBAR, GtkVScrollbar))
-#define GTK_VSCROLLBAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_VSCROLLBAR, GtkVScrollbarClass))
-#define GTK_IS_VSCROLLBAR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_VSCROLLBAR))
-#define GTK_IS_VSCROLLBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VSCROLLBAR))
-#define GTK_VSCROLLBAR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_VSCROLLBAR, GtkVScrollbarClass))
-
-
-typedef struct _GtkVScrollbar       GtkVScrollbar;
-typedef struct _GtkVScrollbarClass  GtkVScrollbarClass;
-
-struct _GtkVScrollbar
-{
-  GtkScrollbar scrollbar;
-};
-
-struct _GtkVScrollbarClass
-{
-  GtkScrollbarClass parent_class;
-};
-
-
-GType      gtk_vscrollbar_get_type (void) G_GNUC_CONST;
-GtkWidget* gtk_vscrollbar_new      (GtkAdjustment *adjustment);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_VSCROLLBAR_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvseparator.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvseparator.h
deleted file mode 100644
index e7fd88b0..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvseparator.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_VSEPARATOR_H__
-#define __GTK_VSEPARATOR_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkseparator.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_VSEPARATOR                  (gtk_vseparator_get_type ())
-#define GTK_VSEPARATOR(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_VSEPARATOR, GtkVSeparator))
-#define GTK_VSEPARATOR_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_VSEPARATOR, GtkVSeparatorClass))
-#define GTK_IS_VSEPARATOR(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_VSEPARATOR))
-#define GTK_IS_VSEPARATOR_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VSEPARATOR))
-#define GTK_VSEPARATOR_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_VSEPARATOR, GtkVSeparatorClass))
-
-
-typedef struct _GtkVSeparator       GtkVSeparator;
-typedef struct _GtkVSeparatorClass  GtkVSeparatorClass;
-
-struct _GtkVSeparator
-{
-  GtkSeparator separator;
-};
-
-struct _GtkVSeparatorClass
-{
-  GtkSeparatorClass parent_class;
-};
-
-
-GType      gtk_vseparator_get_type (void) G_GNUC_CONST;
-GtkWidget* gtk_vseparator_new      (void);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_SEPARATOR_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkwidget.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkwidget.h
deleted file mode 100644
index b7f889ab..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkwidget.h
+++ /dev/null
@@ -1,828 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_WIDGET_H__
-#define __GTK_WIDGET_H__
-
-#include <gdk/gdk.h>
-#include <gtk/gtkaccelgroup.h>
-#include <gtk/gtkobject.h>
-#include <gtk/gtkadjustment.h>
-#include <gtk/gtkstyle.h>
-#include <gtk/gtksettings.h>
-#include <atk/atkobject.h>
-
-G_BEGIN_DECLS
-
-/* The flags that are used by GtkWidget on top of the
- * flags field of GtkObject.
- */
-typedef enum
-{
-  GTK_TOPLEVEL         = 1 << 4,
-  GTK_NO_WINDOW        = 1 << 5,
-  GTK_REALIZED         = 1 << 6,
-  GTK_MAPPED           = 1 << 7,
-  GTK_VISIBLE          = 1 << 8,
-  GTK_SENSITIVE        = 1 << 9,
-  GTK_PARENT_SENSITIVE = 1 << 10,
-  GTK_CAN_FOCUS        = 1 << 11,
-  GTK_HAS_FOCUS        = 1 << 12,
-
-  /* widget is allowed to receive the default via gtk_widget_grab_default
-   * and will reserve space to draw the default if possible
-   */
-  GTK_CAN_DEFAULT      = 1 << 13,
-
-  /* the widget currently is receiving the default action and should be drawn
-   * appropriately if possible
-   */
-  GTK_HAS_DEFAULT      = 1 << 14,
-
-  GTK_HAS_GRAB	       = 1 << 15,
-  GTK_RC_STYLE	       = 1 << 16,
-  GTK_COMPOSITE_CHILD  = 1 << 17,
-  GTK_NO_REPARENT      = 1 << 18,
-  GTK_APP_PAINTABLE    = 1 << 19,
-
-  /* the widget when focused will receive the default action and have
-   * HAS_DEFAULT set even if there is a different widget set as default
-   */
-  GTK_RECEIVES_DEFAULT = 1 << 20,
-
-  GTK_DOUBLE_BUFFERED  = 1 << 21,
-  GTK_NO_SHOW_ALL      = 1 << 22
-} GtkWidgetFlags;
-
-/* Kinds of widget-specific help */
-typedef enum
-{
-  GTK_WIDGET_HELP_TOOLTIP,
-  GTK_WIDGET_HELP_WHATS_THIS
-} GtkWidgetHelpType;
-
-/* Macro for casting a pointer to a GtkWidget or GtkWidgetClass pointer.
- * Macros for testing whether `widget' or `klass' are of type GTK_TYPE_WIDGET.
- */
-#define GTK_TYPE_WIDGET			  (gtk_widget_get_type ())
-#define GTK_WIDGET(widget)		  (G_TYPE_CHECK_INSTANCE_CAST ((widget), GTK_TYPE_WIDGET, GtkWidget))
-#define GTK_WIDGET_CLASS(klass)		  (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WIDGET, GtkWidgetClass))
-#define GTK_IS_WIDGET(widget)		  (G_TYPE_CHECK_INSTANCE_TYPE ((widget), GTK_TYPE_WIDGET))
-#define GTK_IS_WIDGET_CLASS(klass)	  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WIDGET))
-#define GTK_WIDGET_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_WIDGET, GtkWidgetClass))
-
-/* Macros for extracting various fields from GtkWidget and GtkWidgetClass.
- */
-#define GTK_WIDGET_TYPE(wid)		  (GTK_OBJECT_TYPE (wid))
-#define GTK_WIDGET_STATE(wid)		  (GTK_WIDGET (wid)->state)
-#define GTK_WIDGET_SAVED_STATE(wid)	  (GTK_WIDGET (wid)->saved_state)
-
-/* Macros for extracting the widget flags from GtkWidget.
- */
-#define GTK_WIDGET_FLAGS(wid)		  (GTK_OBJECT_FLAGS (wid))
-#define GTK_WIDGET_TOPLEVEL(wid)	  ((GTK_WIDGET_FLAGS (wid) & GTK_TOPLEVEL) != 0)
-#define GTK_WIDGET_NO_WINDOW(wid)	  ((GTK_WIDGET_FLAGS (wid) & GTK_NO_WINDOW) != 0)
-#define GTK_WIDGET_REALIZED(wid)	  ((GTK_WIDGET_FLAGS (wid) & GTK_REALIZED) != 0)
-#define GTK_WIDGET_MAPPED(wid)		  ((GTK_WIDGET_FLAGS (wid) & GTK_MAPPED) != 0)
-#define GTK_WIDGET_VISIBLE(wid)		  ((GTK_WIDGET_FLAGS (wid) & GTK_VISIBLE) != 0)
-#define GTK_WIDGET_DRAWABLE(wid)	  (GTK_WIDGET_VISIBLE (wid) && GTK_WIDGET_MAPPED (wid))
-#define GTK_WIDGET_SENSITIVE(wid)	  ((GTK_WIDGET_FLAGS (wid) & GTK_SENSITIVE) != 0)
-#define GTK_WIDGET_PARENT_SENSITIVE(wid)  ((GTK_WIDGET_FLAGS (wid) & GTK_PARENT_SENSITIVE) != 0)
-#define GTK_WIDGET_IS_SENSITIVE(wid)	  (GTK_WIDGET_SENSITIVE (wid) && \
-					   GTK_WIDGET_PARENT_SENSITIVE (wid))
-#define GTK_WIDGET_CAN_FOCUS(wid)	  ((GTK_WIDGET_FLAGS (wid) & GTK_CAN_FOCUS) != 0)
-#define GTK_WIDGET_HAS_FOCUS(wid)	  ((GTK_WIDGET_FLAGS (wid) & GTK_HAS_FOCUS) != 0)
-#define GTK_WIDGET_CAN_DEFAULT(wid)	  ((GTK_WIDGET_FLAGS (wid) & GTK_CAN_DEFAULT) != 0)
-#define GTK_WIDGET_HAS_DEFAULT(wid)	  ((GTK_WIDGET_FLAGS (wid) & GTK_HAS_DEFAULT) != 0)
-#define GTK_WIDGET_HAS_GRAB(wid)	  ((GTK_WIDGET_FLAGS (wid) & GTK_HAS_GRAB) != 0)
-#define GTK_WIDGET_RC_STYLE(wid)	  ((GTK_WIDGET_FLAGS (wid) & GTK_RC_STYLE) != 0)
-#define GTK_WIDGET_COMPOSITE_CHILD(wid)	  ((GTK_WIDGET_FLAGS (wid) & GTK_COMPOSITE_CHILD) != 0)
-#define GTK_WIDGET_APP_PAINTABLE(wid)	  ((GTK_WIDGET_FLAGS (wid) & GTK_APP_PAINTABLE) != 0)
-#define GTK_WIDGET_RECEIVES_DEFAULT(wid)  ((GTK_WIDGET_FLAGS (wid) & GTK_RECEIVES_DEFAULT) != 0)
-#define GTK_WIDGET_DOUBLE_BUFFERED(wid)	  ((GTK_WIDGET_FLAGS (wid) & GTK_DOUBLE_BUFFERED) != 0)
-  
-/* Macros for setting and clearing widget flags.
- */
-#define GTK_WIDGET_SET_FLAGS(wid,flag)	  G_STMT_START{ (GTK_WIDGET_FLAGS (wid) |= (flag)); }G_STMT_END
-#define GTK_WIDGET_UNSET_FLAGS(wid,flag)  G_STMT_START{ (GTK_WIDGET_FLAGS (wid) &= ~(flag)); }G_STMT_END
-
-#define GTK_TYPE_REQUISITION              (gtk_requisition_get_type ())
-
-/* forward declaration to avoid excessive includes (and concurrent includes)
- */
-typedef struct _GtkRequisition	   GtkRequisition;
-typedef 	GdkRectangle	   GtkAllocation;
-typedef struct _GtkSelectionData   GtkSelectionData;
-typedef struct _GtkWidgetClass	   GtkWidgetClass;
-typedef struct _GtkWidgetAuxInfo   GtkWidgetAuxInfo;
-typedef struct _GtkWidgetShapeInfo GtkWidgetShapeInfo;
-typedef struct _GtkClipboard	   GtkClipboard;
-typedef struct _GtkTooltip         GtkTooltip;
-typedef struct _GtkWindow          GtkWindow;
-typedef void     (*GtkCallback)        (GtkWidget        *widget,
-					gpointer	  data);
-
-/* A requisition is a desired amount of space which a
- *  widget may request.
- */
-struct _GtkRequisition
-{
-  gint width;
-  gint height;
-};
-
-/* The widget is the base of the tree for displayable objects.
- *  (A displayable object is one which takes up some amount
- *  of screen real estate). It provides a common base and interface
- *  which actual widgets must adhere to.
- */
-struct _GtkWidget
-{
-  /* The object structure needs to be the first
-   *  element in the widget structure in order for
-   *  the object mechanism to work correctly. This
-   *  allows a GtkWidget pointer to be cast to a
-   *  GtkObject pointer.
-   */
-  GtkObject object;
-  
-  /* 16 bits of internally used private flags.
-   * this will be packed into the same 4 byte alignment frame that
-   * state and saved_state go. we therefore don't waste any new
-   * space on this.
-   */
-  guint16 private_flags;
-  
-  /* The state of the widget. There are actually only
-   *  5 widget states (defined in "gtkenums.h").
-   */
-  guint8 state;
-  
-  /* The saved state of the widget. When a widget's state
-   *  is changed to GTK_STATE_INSENSITIVE via
-   *  "gtk_widget_set_state" or "gtk_widget_set_sensitive"
-   *  the old state is kept around in this field. The state
-   *  will be restored once the widget gets sensitive again.
-   */
-  guint8 saved_state;
-  
-  /* The widget's name. If the widget does not have a name
-   *  (the name is NULL), then its name (as returned by
-   *  "gtk_widget_get_name") is its class's name.
-   * Among other things, the widget name is used to determine
-   *  the style to use for a widget.
-   */
-  gchar *name;
-  
-  /*< public >*/
-
-  /* The style for the widget. The style contains the
-   *  colors the widget should be drawn in for each state
-   *  along with graphics contexts used to draw with and
-   *  the font to use for text.
-   */
-  GtkStyle *style;
-  
-  /* The widget's desired size.
-   */
-  GtkRequisition requisition;
-  
-  /* The widget's allocated size.
-   */
-  GtkAllocation allocation;
-  
-  /* The widget's window or its parent window if it does
-   *  not have a window. (Which will be indicated by the
-   *  GTK_NO_WINDOW flag being set).
-   */
-  GdkWindow *window;
-  
-  /* The widget's parent.
-   */
-  GtkWidget *parent;
-};
-
-struct _GtkWidgetClass
-{
-  /* The object class structure needs to be the first
-   *  element in the widget class structure in order for
-   *  the class mechanism to work correctly. This allows a
-   *  GtkWidgetClass pointer to be cast to a GtkObjectClass
-   *  pointer.
-   */
-  GtkObjectClass parent_class;
-
-  /*< public >*/
-  
-  guint activate_signal;
-
-  guint set_scroll_adjustments_signal;
-
-  /*< private >*/
-  
-  /* seldomly overidden */
-  void (*dispatch_child_properties_changed) (GtkWidget   *widget,
-					     guint        n_pspecs,
-					     GParamSpec **pspecs);
-
-  /* basics */
-  void (* show)		       (GtkWidget        *widget);
-  void (* show_all)            (GtkWidget        *widget);
-  void (* hide)		       (GtkWidget        *widget);
-  void (* hide_all)            (GtkWidget        *widget);
-  void (* map)		       (GtkWidget        *widget);
-  void (* unmap)	       (GtkWidget        *widget);
-  void (* realize)	       (GtkWidget        *widget);
-  void (* unrealize)	       (GtkWidget        *widget);
-  void (* size_request)	       (GtkWidget        *widget,
-				GtkRequisition   *requisition);
-  void (* size_allocate)       (GtkWidget        *widget,
-				GtkAllocation    *allocation);
-  void (* state_changed)       (GtkWidget        *widget,
-				GtkStateType   	  previous_state);
-  void (* parent_set)	       (GtkWidget        *widget,
-				GtkWidget        *previous_parent);
-  void (* hierarchy_changed)   (GtkWidget        *widget,
-				GtkWidget        *previous_toplevel);
-  void (* style_set)	       (GtkWidget        *widget,
-				GtkStyle         *previous_style);
-  void (* direction_changed)   (GtkWidget        *widget,
-				GtkTextDirection  previous_direction);
-  void (* grab_notify)         (GtkWidget        *widget,
-				gboolean          was_grabbed);
-  void (* child_notify)        (GtkWidget	 *widget,
-				GParamSpec       *pspec);
-  
-  /* Mnemonics */
-  gboolean (* mnemonic_activate) (GtkWidget    *widget,
-				  gboolean      group_cycling);
-  
-  /* explicit focus */
-  void     (* grab_focus)      (GtkWidget        *widget);
-  gboolean (* focus)           (GtkWidget        *widget,
-                                GtkDirectionType  direction);
-  
-  /* events */
-  gboolean (* event)			(GtkWidget	     *widget,
-					 GdkEvent	     *event);
-  gboolean (* button_press_event)	(GtkWidget	     *widget,
-					 GdkEventButton      *event);
-  gboolean (* button_release_event)	(GtkWidget	     *widget,
-					 GdkEventButton      *event);
-  gboolean (* scroll_event)		(GtkWidget           *widget,
-					 GdkEventScroll      *event);
-  gboolean (* motion_notify_event)	(GtkWidget	     *widget,
-					 GdkEventMotion      *event);
-  gboolean (* delete_event)		(GtkWidget	     *widget,
-					 GdkEventAny	     *event);
-  gboolean (* destroy_event)		(GtkWidget	     *widget,
-					 GdkEventAny	     *event);
-  gboolean (* expose_event)		(GtkWidget	     *widget,
-					 GdkEventExpose      *event);
-  gboolean (* key_press_event)		(GtkWidget	     *widget,
-					 GdkEventKey	     *event);
-  gboolean (* key_release_event)	(GtkWidget	     *widget,
-					 GdkEventKey	     *event);
-  gboolean (* enter_notify_event)	(GtkWidget	     *widget,
-					 GdkEventCrossing    *event);
-  gboolean (* leave_notify_event)	(GtkWidget	     *widget,
-					 GdkEventCrossing    *event);
-  gboolean (* configure_event)		(GtkWidget	     *widget,
-					 GdkEventConfigure   *event);
-  gboolean (* focus_in_event)		(GtkWidget	     *widget,
-					 GdkEventFocus       *event);
-  gboolean (* focus_out_event)		(GtkWidget	     *widget,
-					 GdkEventFocus       *event);
-  gboolean (* map_event)		(GtkWidget	     *widget,
-					 GdkEventAny	     *event);
-  gboolean (* unmap_event)		(GtkWidget	     *widget,
-					 GdkEventAny	     *event);
-  gboolean (* property_notify_event)	(GtkWidget	     *widget,
-					 GdkEventProperty    *event);
-  gboolean (* selection_clear_event)	(GtkWidget	     *widget,
-					 GdkEventSelection   *event);
-  gboolean (* selection_request_event)	(GtkWidget	     *widget,
-					 GdkEventSelection   *event);
-  gboolean (* selection_notify_event)	(GtkWidget	     *widget,
-					 GdkEventSelection   *event);
-  gboolean (* proximity_in_event)	(GtkWidget	     *widget,
-					 GdkEventProximity   *event);
-  gboolean (* proximity_out_event)	(GtkWidget	     *widget,
-					 GdkEventProximity   *event);
-  gboolean (* visibility_notify_event)	(GtkWidget	     *widget,
-					 GdkEventVisibility  *event);
-  gboolean (* client_event)		(GtkWidget	     *widget,
-					 GdkEventClient	     *event);
-  gboolean (* no_expose_event)		(GtkWidget	     *widget,
-					 GdkEventAny	     *event);
-  gboolean (* window_state_event)	(GtkWidget	     *widget,
-					 GdkEventWindowState *event);
-  
-  /* selection */
-  void (* selection_get)           (GtkWidget          *widget,
-				    GtkSelectionData   *selection_data,
-				    guint               info,
-				    guint               time_);
-  void (* selection_received)      (GtkWidget          *widget,
-				    GtkSelectionData   *selection_data,
-				    guint               time_);
-
-  /* Source side drag signals */
-  void (* drag_begin)	           (GtkWidget	       *widget,
-				    GdkDragContext     *context);
-  void (* drag_end)	           (GtkWidget	       *widget,
-				    GdkDragContext     *context);
-  void (* drag_data_get)           (GtkWidget          *widget,
-				    GdkDragContext     *context,
-				    GtkSelectionData   *selection_data,
-				    guint               info,
-				    guint               time_);
-  void (* drag_data_delete)        (GtkWidget	       *widget,
-				    GdkDragContext     *context);
-
-  /* Target side drag signals */
-  void (* drag_leave)	           (GtkWidget	       *widget,
-				    GdkDragContext     *context,
-				    guint               time_);
-  gboolean (* drag_motion)         (GtkWidget	       *widget,
-				    GdkDragContext     *context,
-				    gint                x,
-				    gint                y,
-				    guint               time_);
-  gboolean (* drag_drop)           (GtkWidget	       *widget,
-				    GdkDragContext     *context,
-				    gint                x,
-				    gint                y,
-				    guint               time_);
-  void (* drag_data_received)      (GtkWidget          *widget,
-				    GdkDragContext     *context,
-				    gint                x,
-				    gint                y,
-				    GtkSelectionData   *selection_data,
-				    guint               info,
-				    guint               time_);
-
-  /* Signals used only for keybindings */
-  gboolean (* popup_menu)          (GtkWidget          *widget);
-
-  /* If a widget has multiple tooltips/whatsthis, it should show the
-   * one for the current focus location, or if that doesn't make
-   * sense, should cycle through them showing each tip alongside
-   * whatever piece of the widget it applies to.
-   */
-  gboolean (* show_help)           (GtkWidget          *widget,
-                                    GtkWidgetHelpType   help_type);
-  
-  /* accessibility support 
-   */
-  AtkObject*   (*get_accessible)     (GtkWidget *widget);
-
-  void         (*screen_changed)     (GtkWidget *widget,
-                                      GdkScreen *previous_screen);
-  gboolean     (*can_activate_accel) (GtkWidget *widget,
-                                      guint      signal_id);
-
-  /* Sent when a grab is broken. */
-  gboolean (*grab_broken_event) (GtkWidget	     *widget,
-                                 GdkEventGrabBroken  *event);
-
-  void         (* composited_changed) (GtkWidget *widget);
-
-  gboolean     (* query_tooltip)      (GtkWidget  *widget,
-				       gint        x,
-				       gint        y,
-				       gboolean    keyboard_tooltip,
-				       GtkTooltip *tooltip);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved5) (void);
-  void (*_gtk_reserved6) (void);
-  void (*_gtk_reserved7) (void);
-};
-
-struct _GtkWidgetAuxInfo
-{
-  gint x;
-  gint y;
-  gint width;
-  gint height;
-  guint x_set : 1;
-  guint y_set : 1;
-};
-
-struct _GtkWidgetShapeInfo
-{
-  gint16     offset_x;
-  gint16     offset_y;
-  GdkBitmap *shape_mask;
-};
-
-GType	   gtk_widget_get_type		  (void) G_GNUC_CONST;
-GtkWidget* gtk_widget_new		  (GType		type,
-					   const gchar	       *first_property_name,
-					   ...);
-void	   gtk_widget_destroy		  (GtkWidget	       *widget);
-void	   gtk_widget_destroyed		  (GtkWidget	       *widget,
-					   GtkWidget	      **widget_pointer);
-#ifndef GTK_DISABLE_DEPRECATED
-GtkWidget* gtk_widget_ref		  (GtkWidget	       *widget);
-void	   gtk_widget_unref		  (GtkWidget	       *widget);
-void	   gtk_widget_set		  (GtkWidget	       *widget,
-					   const gchar         *first_property_name,
-					   ...) G_GNUC_NULL_TERMINATED;
-#endif /* GTK_DISABLE_DEPRECATED */
-void	   gtk_widget_unparent		  (GtkWidget	       *widget);
-void	   gtk_widget_show		  (GtkWidget	       *widget);
-void       gtk_widget_show_now            (GtkWidget           *widget);
-void	   gtk_widget_hide		  (GtkWidget	       *widget);
-void	   gtk_widget_show_all		  (GtkWidget	       *widget);
-void	   gtk_widget_hide_all		  (GtkWidget	       *widget);
-void       gtk_widget_set_no_show_all     (GtkWidget           *widget,
-					   gboolean             no_show_all);
-gboolean   gtk_widget_get_no_show_all     (GtkWidget           *widget);
-void	   gtk_widget_map		  (GtkWidget	       *widget);
-void	   gtk_widget_unmap		  (GtkWidget	       *widget);
-void	   gtk_widget_realize		  (GtkWidget	       *widget);
-void	   gtk_widget_unrealize		  (GtkWidget	       *widget);
-
-/* Queuing draws */
-void	   gtk_widget_queue_draw	  (GtkWidget	       *widget);
-void	   gtk_widget_queue_draw_area	  (GtkWidget	       *widget,
-					   gint                 x,
-					   gint                 y,
-					   gint                 width,
-					   gint                 height);
-#ifndef GTK_DISABLE_DEPRECATED
-void	   gtk_widget_queue_clear	  (GtkWidget	       *widget);
-void	   gtk_widget_queue_clear_area	  (GtkWidget	       *widget,
-					   gint                 x,
-					   gint                 y,
-					   gint                 width,
-					   gint                 height);
-#endif /* GTK_DISABLE_DEPRECATED */
-
-
-void	   gtk_widget_queue_resize	  (GtkWidget	       *widget);
-void	   gtk_widget_queue_resize_no_redraw (GtkWidget *widget);
-#ifndef GTK_DISABLE_DEPRECATED
-void	   gtk_widget_draw		  (GtkWidget	       *widget,
-					   GdkRectangle	       *area);
-#endif /* GTK_DISABLE_DEPRECATED */
-void	   gtk_widget_size_request	  (GtkWidget	       *widget,
-					   GtkRequisition      *requisition);
-void	   gtk_widget_size_allocate	  (GtkWidget	       *widget,
-					   GtkAllocation       *allocation);
-void       gtk_widget_get_child_requisition (GtkWidget	       *widget,
-					     GtkRequisition    *requisition);
-void	   gtk_widget_add_accelerator	  (GtkWidget           *widget,
-					   const gchar         *accel_signal,
-					   GtkAccelGroup       *accel_group,
-					   guint                accel_key,
-					   GdkModifierType      accel_mods,
-					   GtkAccelFlags        accel_flags);
-gboolean   gtk_widget_remove_accelerator  (GtkWidget           *widget,
-					   GtkAccelGroup       *accel_group,
-					   guint                accel_key,
-					   GdkModifierType      accel_mods);
-void       gtk_widget_set_accel_path      (GtkWidget           *widget,
-					   const gchar         *accel_path,
-					   GtkAccelGroup       *accel_group);
-const gchar* _gtk_widget_get_accel_path   (GtkWidget           *widget,
-					   gboolean	       *locked);
-GList*     gtk_widget_list_accel_closures (GtkWidget	       *widget);
-gboolean   gtk_widget_can_activate_accel  (GtkWidget           *widget,
-                                           guint                signal_id);
-gboolean   gtk_widget_mnemonic_activate   (GtkWidget           *widget,
-					   gboolean             group_cycling);
-gboolean   gtk_widget_event		  (GtkWidget	       *widget,
-					   GdkEvent	       *event);
-gint       gtk_widget_send_expose         (GtkWidget           *widget,
-					   GdkEvent            *event);
-
-gboolean   gtk_widget_activate		     (GtkWidget	       *widget);
-gboolean   gtk_widget_set_scroll_adjustments (GtkWidget        *widget,
-					      GtkAdjustment    *hadjustment,
-					      GtkAdjustment    *vadjustment);
-     
-void	   gtk_widget_reparent		  (GtkWidget	       *widget,
-					   GtkWidget	       *new_parent);
-gboolean   gtk_widget_intersect		  (GtkWidget	       *widget,
-					   GdkRectangle	       *area,
-					   GdkRectangle	       *intersection);
-GdkRegion *gtk_widget_region_intersect	  (GtkWidget	       *widget,
-					   GdkRegion	       *region);
-
-void	gtk_widget_freeze_child_notify	  (GtkWidget	       *widget);
-void	gtk_widget_child_notify		  (GtkWidget	       *widget,
-					   const gchar	       *child_property);
-void	gtk_widget_thaw_child_notify	  (GtkWidget	       *widget);
-
-gboolean   gtk_widget_is_focus            (GtkWidget           *widget);
-void	   gtk_widget_grab_focus	  (GtkWidget	       *widget);
-void	   gtk_widget_grab_default	  (GtkWidget	       *widget);
-
-void                  gtk_widget_set_name               (GtkWidget    *widget,
-							 const gchar  *name);
-G_CONST_RETURN gchar* gtk_widget_get_name               (GtkWidget    *widget);
-void                  gtk_widget_set_state              (GtkWidget    *widget,
-							 GtkStateType  state);
-void                  gtk_widget_set_sensitive          (GtkWidget    *widget,
-							 gboolean      sensitive);
-void                  gtk_widget_set_app_paintable      (GtkWidget    *widget,
-							 gboolean      app_paintable);
-void                  gtk_widget_set_double_buffered    (GtkWidget    *widget,
-							 gboolean      double_buffered);
-void                  gtk_widget_set_redraw_on_allocate (GtkWidget    *widget,
-							 gboolean      redraw_on_allocate);
-void                  gtk_widget_set_parent             (GtkWidget    *widget,
-							 GtkWidget    *parent);
-void                  gtk_widget_set_parent_window      (GtkWidget    *widget,
-							 GdkWindow    *parent_window);
-void                  gtk_widget_set_child_visible      (GtkWidget    *widget,
-							 gboolean      is_visible);
-gboolean              gtk_widget_get_child_visible      (GtkWidget    *widget);
-
-GtkWidget *gtk_widget_get_parent          (GtkWidget           *widget);
-GdkWindow *gtk_widget_get_parent_window	  (GtkWidget	       *widget);
-
-gboolean   gtk_widget_child_focus         (GtkWidget           *widget,
-                                           GtkDirectionType     direction);
-gboolean   gtk_widget_keynav_failed       (GtkWidget           *widget,
-                                           GtkDirectionType     direction);
-void       gtk_widget_error_bell          (GtkWidget           *widget);
-
-void       gtk_widget_set_size_request    (GtkWidget           *widget,
-                                           gint                 width,
-                                           gint                 height);
-void       gtk_widget_get_size_request    (GtkWidget           *widget,
-                                           gint                *width,
-                                           gint                *height);
-#ifndef GTK_DISABLE_DEPRECATED
-void	   gtk_widget_set_uposition	  (GtkWidget	       *widget,
-					   gint			x,
-					   gint			y);
-void	   gtk_widget_set_usize		  (GtkWidget	       *widget,
-					   gint			width,
-					   gint			height);
-#endif
-
-void	   gtk_widget_set_events	  (GtkWidget	       *widget,
-					   gint			events);
-void       gtk_widget_add_events          (GtkWidget           *widget,
-					   gint	                events);
-void	   gtk_widget_set_extension_events (GtkWidget		*widget,
-					    GdkExtensionMode	mode);
-
-GdkExtensionMode gtk_widget_get_extension_events (GtkWidget	*widget);
-GtkWidget*   gtk_widget_get_toplevel	(GtkWidget	*widget);
-GtkWidget*   gtk_widget_get_ancestor	(GtkWidget	*widget,
-					 GType		 widget_type);
-GdkColormap* gtk_widget_get_colormap	(GtkWidget	*widget);
-GdkVisual*   gtk_widget_get_visual	(GtkWidget	*widget);
-
-GdkScreen *   gtk_widget_get_screen      (GtkWidget *widget);
-gboolean      gtk_widget_has_screen      (GtkWidget *widget);
-GdkDisplay *  gtk_widget_get_display     (GtkWidget *widget);
-GdkWindow *   gtk_widget_get_root_window (GtkWidget *widget);
-GtkSettings*  gtk_widget_get_settings    (GtkWidget *widget);
-GtkClipboard *gtk_widget_get_clipboard   (GtkWidget *widget,
-					  GdkAtom    selection);
-
-#ifndef GTK_DISABLE_DEPRECATED
-#define gtk_widget_set_visual(widget,visual)  ((void) 0)
-#define gtk_widget_push_visual(visual)        ((void) 0)
-#define gtk_widget_pop_visual()               ((void) 0)
-#define gtk_widget_set_default_visual(visual) ((void) 0)
-#endif /* GTK_DISABLE_DEPRECATED */
-
-/* Accessibility support */
-AtkObject*       gtk_widget_get_accessible               (GtkWidget          *widget);
-
-/* The following functions must not be called on an already
- * realized widget. Because it is possible that somebody
- * can call get_colormap() or get_visual() and save the
- * result, these functions are probably only safe to
- * call in a widget's init() function.
- */
-void         gtk_widget_set_colormap    (GtkWidget      *widget,
-					 GdkColormap    *colormap);
-
-gint	     gtk_widget_get_events	(GtkWidget	*widget);
-void	     gtk_widget_get_pointer	(GtkWidget	*widget,
-					 gint		*x,
-					 gint		*y);
-
-gboolean     gtk_widget_is_ancestor	(GtkWidget	*widget,
-					 GtkWidget	*ancestor);
-
-gboolean     gtk_widget_translate_coordinates (GtkWidget  *src_widget,
-					       GtkWidget  *dest_widget,
-					       gint        src_x,
-					       gint        src_y,
-					       gint       *dest_x,
-					       gint       *dest_y);
-
-/* Hide widget and return TRUE.
- */
-gboolean     gtk_widget_hide_on_delete	(GtkWidget	*widget);
-
-/* Widget styles.
- */
-void	   gtk_widget_set_style		(GtkWidget	*widget,
-					 GtkStyle	*style);
-void	   gtk_widget_ensure_style	(GtkWidget	*widget);
-GtkStyle*  gtk_widget_get_style		(GtkWidget	*widget);
-
-void        gtk_widget_modify_style       (GtkWidget            *widget,
-					   GtkRcStyle           *style);
-GtkRcStyle *gtk_widget_get_modifier_style (GtkWidget            *widget);
-void        gtk_widget_modify_fg          (GtkWidget            *widget,
-					   GtkStateType          state,
-					   const GdkColor       *color);
-void        gtk_widget_modify_bg          (GtkWidget            *widget,
-					   GtkStateType          state,
-					   const GdkColor       *color);
-void        gtk_widget_modify_text        (GtkWidget            *widget,
-					   GtkStateType          state,
-					   const GdkColor       *color);
-void        gtk_widget_modify_base        (GtkWidget            *widget,
-					   GtkStateType          state,
-					   const GdkColor       *color);
-void        gtk_widget_modify_cursor      (GtkWidget            *widget,
-					   const GdkColor       *primary,
-					   const GdkColor       *secondary);
-void        gtk_widget_modify_font        (GtkWidget            *widget,
-					   PangoFontDescription *font_desc);
-
-#ifndef GTK_DISABLE_DEPRECATED
-#define gtk_widget_set_rc_style(widget)          (gtk_widget_set_style (widget, NULL))
-#define gtk_widget_restore_default_style(widget) (gtk_widget_set_style (widget, NULL))
-#endif
-
-PangoContext *gtk_widget_create_pango_context (GtkWidget   *widget);
-PangoContext *gtk_widget_get_pango_context    (GtkWidget   *widget);
-PangoLayout  *gtk_widget_create_pango_layout  (GtkWidget   *widget,
-					       const gchar *text);
-
-GdkPixbuf    *gtk_widget_render_icon          (GtkWidget   *widget,
-                                               const gchar *stock_id,
-                                               GtkIconSize  size,
-                                               const gchar *detail);
-
-/* handle composite names for GTK_COMPOSITE_CHILD widgets,
- * the returned name is newly allocated.
- */
-void   gtk_widget_set_composite_name	(GtkWidget	*widget,
-					 const gchar   	*name);
-gchar* gtk_widget_get_composite_name	(GtkWidget	*widget);
-     
-/* Descend recursively and set rc-style on all widgets without user styles */
-void       gtk_widget_reset_rc_styles   (GtkWidget      *widget);
-
-/* Push/pop pairs, to change default values upon a widget's creation.
- * This will override the values that got set by the
- * gtk_widget_set_default_* () functions.
- */
-void	     gtk_widget_push_colormap	     (GdkColormap *cmap);
-void	     gtk_widget_push_composite_child (void);
-void	     gtk_widget_pop_composite_child  (void);
-void	     gtk_widget_pop_colormap	     (void);
-
-/* widget style properties
- */
-void gtk_widget_class_install_style_property        (GtkWidgetClass     *klass,
-						     GParamSpec         *pspec);
-void gtk_widget_class_install_style_property_parser (GtkWidgetClass     *klass,
-						     GParamSpec         *pspec,
-						     GtkRcPropertyParser parser);
-GParamSpec*  gtk_widget_class_find_style_property   (GtkWidgetClass     *klass,
-						     const gchar        *property_name);
-GParamSpec** gtk_widget_class_list_style_properties (GtkWidgetClass     *klass,
-						     guint              *n_properties);
-void gtk_widget_style_get_property (GtkWidget	     *widget,
-				    const gchar    *property_name,
-				    GValue	     *value);
-void gtk_widget_style_get_valist   (GtkWidget	     *widget,
-				    const gchar    *first_property_name,
-				    va_list         var_args);
-void gtk_widget_style_get          (GtkWidget	     *widget,
-				    const gchar    *first_property_name,
-				    ...) G_GNUC_NULL_TERMINATED;
-
-
-/* Set certain default values to be used at widget creation time.
- */
-void	     gtk_widget_set_default_colormap (GdkColormap *colormap);
-GtkStyle*    gtk_widget_get_default_style    (void);
-#ifndef GDK_MULTIHEAD_SAFE
-GdkColormap* gtk_widget_get_default_colormap (void);
-GdkVisual*   gtk_widget_get_default_visual   (void);
-#endif
-
-/* Functions for setting directionality for widgets
- */
-
-void             gtk_widget_set_direction         (GtkWidget        *widget,
-						   GtkTextDirection  dir);
-GtkTextDirection gtk_widget_get_direction         (GtkWidget        *widget);
-
-void             gtk_widget_set_default_direction (GtkTextDirection  dir);
-GtkTextDirection gtk_widget_get_default_direction (void);
-
-/* Compositing manager functionality */
-gboolean gtk_widget_is_composited (GtkWidget *widget);
-
-/* Counterpart to gdk_window_shape_combine_mask.
- */
-void	     gtk_widget_shape_combine_mask (GtkWidget *widget,
-					    GdkBitmap *shape_mask,
-					    gint       offset_x,
-					    gint       offset_y);
-void	     gtk_widget_input_shape_combine_mask (GtkWidget *widget,
-						  GdkBitmap *shape_mask,
-						  gint       offset_x,
-						  gint       offset_y);
-
-/* internal function */
-void	     gtk_widget_reset_shapes	   (GtkWidget *widget);
-
-/* Compute a widget's path in the form "GtkWindow.MyLabel", and
- * return newly alocated strings.
- */
-void	     gtk_widget_path		   (GtkWidget *widget,
-					    guint     *path_length,
-					    gchar    **path,
-					    gchar    **path_reversed);
-void	     gtk_widget_class_path	   (GtkWidget *widget,
-					    guint     *path_length,
-					    gchar    **path,
-					    gchar    **path_reversed);
-
-GList* gtk_widget_list_mnemonic_labels  (GtkWidget *widget);
-void   gtk_widget_add_mnemonic_label    (GtkWidget *widget,
-					 GtkWidget *label);
-void   gtk_widget_remove_mnemonic_label (GtkWidget *widget,
-					 GtkWidget *label);
-
-void                  gtk_widget_set_tooltip_window    (GtkWidget   *widget,
-                                                        GtkWindow   *custom_window);
-GtkWindow *gtk_widget_get_tooltip_window    (GtkWidget   *widget);
-void       gtk_widget_trigger_tooltip_query (GtkWidget   *widget);
-void       gtk_widget_set_tooltip_text      (GtkWidget   *widget,
-                                             const gchar *text);
-gchar *    gtk_widget_get_tooltip_text      (GtkWidget   *widget);
-void       gtk_widget_set_tooltip_markup    (GtkWidget   *widget,
-                                             const gchar *markup);
-gchar *    gtk_widget_get_tooltip_markup    (GtkWidget   *widget);
-void       gtk_widget_set_has_tooltip       (GtkWidget   *widget,
-					     gboolean     has_tooltip);
-gboolean   gtk_widget_get_has_tooltip       (GtkWidget   *widget);
-
-GType           gtk_requisition_get_type (void) G_GNUC_CONST;
-GtkRequisition *gtk_requisition_copy     (const GtkRequisition *requisition);
-void            gtk_requisition_free     (GtkRequisition       *requisition);
-
-#if	defined (GTK_TRACE_OBJECTS) && defined (__GNUC__)
-#  define gtk_widget_ref gtk_object_ref
-#  define gtk_widget_unref gtk_object_unref
-#endif	/* GTK_TRACE_OBJECTS && __GNUC__ */
-
-void              _gtk_widget_grab_notify                 (GtkWidget    *widget,
-						           gboolean	was_grabbed);
-
-GtkWidgetAuxInfo *_gtk_widget_get_aux_info                (GtkWidget    *widget,
-							   gboolean      create);
-void              _gtk_widget_propagate_hierarchy_changed (GtkWidget    *widget,
-							   GtkWidget    *previous_toplevel);
-void              _gtk_widget_propagate_screen_changed    (GtkWidget    *widget,
-							   GdkScreen    *previous_screen);
-void		  _gtk_widget_propagate_composited_changed (GtkWidget    *widget);
-
-GdkColormap* _gtk_widget_peek_colormap (void);
-
-G_END_DECLS
-
-#endif /* __GTK_WIDGET_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkwindow.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkwindow.h
deleted file mode 100644
index 2f84c497..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkwindow.h
+++ /dev/null
@@ -1,435 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_WINDOW_H__
-#define __GTK_WINDOW_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkaccelgroup.h>
-#include <gtk/gtkbin.h>
-#include <gtk/gtkenums.h>
-#include <gtk/gtkwidget.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_WINDOW			(gtk_window_get_type ())
-#define GTK_WINDOW(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WINDOW, GtkWindow))
-#define GTK_WINDOW_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WINDOW, GtkWindowClass))
-#define GTK_IS_WINDOW(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WINDOW))
-#define GTK_IS_WINDOW_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WINDOW))
-#define GTK_WINDOW_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_WINDOW, GtkWindowClass))
-
-
-typedef struct _GtkWindowClass        GtkWindowClass;
-typedef struct _GtkWindowGeometryInfo GtkWindowGeometryInfo;
-typedef struct _GtkWindowGroup        GtkWindowGroup;
-typedef struct _GtkWindowGroupClass   GtkWindowGroupClass;
-
-struct _GtkWindow
-{
-  GtkBin bin;
-
-  gchar *title;
-  gchar *wmclass_name;
-  gchar *wmclass_class;
-  gchar *wm_role;
-
-  GtkWidget *focus_widget;
-  GtkWidget *default_widget;
-  GtkWindow *transient_parent;
-  GtkWindowGeometryInfo *geometry_info;
-  GdkWindow *frame;
-  GtkWindowGroup *group;
-
-  guint16 configure_request_count;
-  guint allow_shrink : 1;
-  guint allow_grow : 1;
-  guint configure_notify_received : 1;
-  /* The following flags are initially TRUE (before a window is mapped).
-   * They cause us to compute a configure request that involves
-   * default-only parameters. Once mapped, we set them to FALSE.
-   * Then we set them to TRUE again on unmap (for position)
-   * and on unrealize (for size).
-   */
-  guint need_default_position : 1;
-  guint need_default_size : 1;
-  guint position : 3;
-  guint type : 4; /* GtkWindowType */ 
-  guint has_user_ref_count : 1;
-  guint has_focus : 1;
-
-  guint modal : 1;
-  guint destroy_with_parent : 1;
-  
-  guint has_frame : 1;
-
-  /* gtk_window_iconify() called before realization */
-  guint iconify_initially : 1;
-  guint stick_initially : 1;
-  guint maximize_initially : 1;
-  guint decorated : 1;
-  
-  guint type_hint : 3; /* GdkWindowTypeHint if the hint is one of the original eight. If not, then
-			* it contains GDK_WINDOW_TYPE_HINT_NORMAL
-			*/
-  guint gravity : 5; /* GdkGravity */
-
-  guint is_active : 1;
-  guint has_toplevel_focus : 1;
-  
-  guint frame_left;
-  guint frame_top;
-  guint frame_right;
-  guint frame_bottom;
-
-  guint keys_changed_handler;
-  
-  GdkModifierType mnemonic_modifier;
-  GdkScreen      *screen;
-};
-
-struct _GtkWindowClass
-{
-  GtkBinClass parent_class;
-
-  void     (* set_focus)   (GtkWindow *window,
-			    GtkWidget *focus);
-  gboolean (* frame_event) (GtkWindow *window,
-			    GdkEvent  *event);
-
-  /* G_SIGNAL_ACTION signals for keybindings */
-
-  void     (* activate_focus)          (GtkWindow       *window);
-  void     (* activate_default)        (GtkWindow       *window);
-
-  /* as of GTK+ 2.12 the "move-focus" signal has been moved to GtkWidget,
-   * so this is merley a virtual function now. Overriding it in subclasses
-   * continues to work though.
-   */
-  void     (* move_focus)              (GtkWindow       *window,
-                                        GtkDirectionType direction);
-  
-  void	   (*keys_changed)	       (GtkWindow	*window);
-  
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-#define GTK_TYPE_WINDOW_GROUP             (gtk_window_group_get_type ())
-#define GTK_WINDOW_GROUP(object)          (G_TYPE_CHECK_INSTANCE_CAST ((object), GTK_TYPE_WINDOW_GROUP, GtkWindowGroup))
-#define GTK_WINDOW_GROUP_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WINDOW_GROUP, GtkWindowGroupClass))
-#define GTK_IS_WINDOW_GROUP(object)       (G_TYPE_CHECK_INSTANCE_TYPE ((object), GTK_TYPE_WINDOW_GROUP))
-#define GTK_IS_WINDOW_GROUP_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WINDOW_GROUP))
-#define GTK_WINDOW_GROUP_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_WINDOW_GROUP, GtkWindowGroupClass))
-
-struct _GtkWindowGroup
-{
-  GObject parent_instance;
-
-  GSList *grabs;
-};
-
-struct _GtkWindowGroupClass
-{
-  GObjectClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-#ifdef G_OS_WIN32
-/* Reserve old names for DLL ABI backward compatibility */
-#define gtk_window_set_icon_from_file gtk_window_set_icon_from_file_utf8
-#define gtk_window_set_default_icon_from_file gtk_window_set_default_icon_from_file_utf8
-#endif
-
-GType      gtk_window_get_type                 (void) G_GNUC_CONST;
-GtkWidget* gtk_window_new                      (GtkWindowType        type);
-void       gtk_window_set_title                (GtkWindow           *window,
-						const gchar         *title);
-G_CONST_RETURN gchar *gtk_window_get_title     (GtkWindow           *window);
-void       gtk_window_set_wmclass              (GtkWindow           *window,
-						const gchar         *wmclass_name,
-						const gchar         *wmclass_class);
-void       gtk_window_set_role                 (GtkWindow           *window,
-                                                const gchar         *role);
-void       gtk_window_set_startup_id           (GtkWindow           *window,
-                                                const gchar         *startup_id);
-G_CONST_RETURN gchar *gtk_window_get_role      (GtkWindow           *window);
-void       gtk_window_add_accel_group          (GtkWindow           *window,
-						GtkAccelGroup	    *accel_group);
-void       gtk_window_remove_accel_group       (GtkWindow           *window,
-						GtkAccelGroup	    *accel_group);
-void       gtk_window_set_position             (GtkWindow           *window,
-						GtkWindowPosition    position);
-gboolean   gtk_window_activate_focus	       (GtkWindow           *window);
-void       gtk_window_set_focus                (GtkWindow           *window,
-						GtkWidget           *focus);
-GtkWidget *gtk_window_get_focus                (GtkWindow           *window);
-void       gtk_window_set_default              (GtkWindow           *window,
-						GtkWidget           *default_widget);
-gboolean   gtk_window_activate_default	       (GtkWindow           *window);
-
-void       gtk_window_set_transient_for        (GtkWindow           *window, 
-						GtkWindow           *parent);
-GtkWindow *gtk_window_get_transient_for        (GtkWindow           *window);
-void       gtk_window_set_opacity              (GtkWindow           *window, 
-						gdouble              opacity);
-gdouble    gtk_window_get_opacity              (GtkWindow           *window);
-void       gtk_window_set_type_hint            (GtkWindow           *window, 
-						GdkWindowTypeHint    hint);
-GdkWindowTypeHint gtk_window_get_type_hint     (GtkWindow           *window);
-void       gtk_window_set_skip_taskbar_hint    (GtkWindow           *window,
-                                                gboolean             setting);
-gboolean   gtk_window_get_skip_taskbar_hint    (GtkWindow           *window);
-void       gtk_window_set_skip_pager_hint      (GtkWindow           *window,
-                                                gboolean             setting);
-gboolean   gtk_window_get_skip_pager_hint      (GtkWindow           *window);
-void       gtk_window_set_urgency_hint         (GtkWindow           *window,
-                                                gboolean             setting);
-gboolean   gtk_window_get_urgency_hint         (GtkWindow           *window);
-void       gtk_window_set_accept_focus         (GtkWindow           *window,
-                                                gboolean             setting);
-gboolean   gtk_window_get_accept_focus         (GtkWindow           *window);
-void       gtk_window_set_focus_on_map         (GtkWindow           *window,
-                                                gboolean             setting);
-gboolean   gtk_window_get_focus_on_map         (GtkWindow           *window);
-void       gtk_window_set_destroy_with_parent  (GtkWindow           *window,
-                                                gboolean             setting);
-gboolean   gtk_window_get_destroy_with_parent  (GtkWindow           *window);
-
-void       gtk_window_set_resizable            (GtkWindow           *window,
-                                                gboolean             resizable);
-gboolean   gtk_window_get_resizable            (GtkWindow           *window);
-
-void       gtk_window_set_gravity              (GtkWindow           *window,
-                                                GdkGravity           gravity);
-GdkGravity gtk_window_get_gravity              (GtkWindow           *window);
-
-
-void       gtk_window_set_geometry_hints       (GtkWindow           *window,
-						GtkWidget           *geometry_widget,
-						GdkGeometry         *geometry,
-						GdkWindowHints       geom_mask);
-
-void	   gtk_window_set_screen	       (GtkWindow	    *window,
-						GdkScreen	    *screen);
-GdkScreen* gtk_window_get_screen	       (GtkWindow	    *window);
-
-gboolean   gtk_window_is_active                (GtkWindow           *window);
-gboolean   gtk_window_has_toplevel_focus       (GtkWindow           *window);
-
-
-
-/* gtk_window_set_has_frame () must be called before realizing the window_*/
-void       gtk_window_set_has_frame            (GtkWindow *window, 
-						gboolean   setting);
-gboolean   gtk_window_get_has_frame            (GtkWindow *window);
-void       gtk_window_set_frame_dimensions     (GtkWindow *window, 
-						gint       left,
-						gint       top,
-						gint       right,
-						gint       bottom);
-void       gtk_window_get_frame_dimensions     (GtkWindow *window, 
-						gint      *left,
-						gint      *top,
-						gint      *right,
-						gint      *bottom);
-void       gtk_window_set_decorated            (GtkWindow *window,
-                                                gboolean   setting);
-gboolean   gtk_window_get_decorated            (GtkWindow *window);
-void       gtk_window_set_deletable            (GtkWindow *window,
-                                                gboolean   setting);
-gboolean   gtk_window_get_deletable            (GtkWindow *window);
-
-void       gtk_window_set_icon_list                (GtkWindow  *window,
-                                                    GList      *list);
-GList*     gtk_window_get_icon_list                (GtkWindow  *window);
-void       gtk_window_set_icon                     (GtkWindow  *window,
-                                                    GdkPixbuf  *icon);
-void       gtk_window_set_icon_name                (GtkWindow   *window,
-						    const gchar *name);
-gboolean   gtk_window_set_icon_from_file           (GtkWindow   *window,
-						    const gchar *filename,
-						    GError     **err);
-GdkPixbuf* gtk_window_get_icon                     (GtkWindow  *window);
-G_CONST_RETURN 
-gchar     *gtk_window_get_icon_name                (GtkWindow  *window);
-void       gtk_window_set_default_icon_list        (GList      *list);
-GList*     gtk_window_get_default_icon_list        (void);
-void       gtk_window_set_default_icon             (GdkPixbuf  *icon);
-void       gtk_window_set_default_icon_name        (const gchar *name);
-gboolean   gtk_window_set_default_icon_from_file   (const gchar *filename,
-						    GError     **err);
-
-void       gtk_window_set_auto_startup_notification (gboolean setting);
-
-/* If window is set modal, input will be grabbed when show and released when hide */
-void       gtk_window_set_modal      (GtkWindow *window,
-				      gboolean   modal);
-gboolean   gtk_window_get_modal      (GtkWindow *window);
-GList*     gtk_window_list_toplevels (void);
-
-void     gtk_window_add_mnemonic          (GtkWindow       *window,
-					   guint            keyval,
-					   GtkWidget       *target);
-void     gtk_window_remove_mnemonic       (GtkWindow       *window,
-					   guint            keyval,
-					   GtkWidget       *target);
-gboolean gtk_window_mnemonic_activate     (GtkWindow       *window,
-					   guint            keyval,
-					   GdkModifierType  modifier);
-void     gtk_window_set_mnemonic_modifier (GtkWindow       *window,
-					   GdkModifierType  modifier);
-GdkModifierType gtk_window_get_mnemonic_modifier (GtkWindow *window);
-
-gboolean gtk_window_activate_key          (GtkWindow        *window,
-					   GdkEventKey      *event);
-gboolean gtk_window_propagate_key_event   (GtkWindow        *window,
-					   GdkEventKey      *event);
-
-void     gtk_window_present            (GtkWindow *window);
-void     gtk_window_present_with_time  (GtkWindow *window,
-				        guint32    timestamp);
-void     gtk_window_iconify       (GtkWindow *window);
-void     gtk_window_deiconify     (GtkWindow *window);
-void     gtk_window_stick         (GtkWindow *window);
-void     gtk_window_unstick       (GtkWindow *window);
-void     gtk_window_maximize      (GtkWindow *window);
-void     gtk_window_unmaximize    (GtkWindow *window);
-void     gtk_window_fullscreen    (GtkWindow *window);
-void     gtk_window_unfullscreen  (GtkWindow *window);
-void     gtk_window_set_keep_above    (GtkWindow *window, gboolean setting);
-void     gtk_window_set_keep_below    (GtkWindow *window, gboolean setting);
-
-void gtk_window_begin_resize_drag (GtkWindow     *window,
-                                   GdkWindowEdge  edge,
-                                   gint           button,
-                                   gint           root_x,
-                                   gint           root_y,
-                                   guint32        timestamp);
-void gtk_window_begin_move_drag   (GtkWindow     *window,
-                                   gint           button,
-                                   gint           root_x,
-                                   gint           root_y,
-                                   guint32        timestamp);
-
-#ifndef GTK_DISABLE_DEPRECATED
-void       gtk_window_set_policy               (GtkWindow           *window,
-						gint                 allow_shrink,
-						gint                 allow_grow,
-						gint                 auto_shrink);
-#define	gtk_window_position			gtk_window_set_position
-#endif /* GTK_DISABLE_DEPRECATED */
-
-/* Set initial default size of the window (does not constrain user
- * resize operations)
- */
-void     gtk_window_set_default_size (GtkWindow   *window,
-                                      gint         width,
-                                      gint         height);
-void     gtk_window_get_default_size (GtkWindow   *window,
-                                      gint        *width,
-                                      gint        *height);
-void     gtk_window_resize           (GtkWindow   *window,
-                                      gint         width,
-                                      gint         height);
-void     gtk_window_get_size         (GtkWindow   *window,
-                                      gint        *width,
-                                      gint        *height);
-void     gtk_window_move             (GtkWindow   *window,
-                                      gint         x,
-                                      gint         y);
-void     gtk_window_get_position     (GtkWindow   *window,
-                                      gint        *root_x,
-                                      gint        *root_y);
-gboolean gtk_window_parse_geometry   (GtkWindow   *window,
-                                      const gchar *geometry);
-GtkWindowGroup *gtk_window_get_group (GtkWindow   *window);
-
-/* Ignore this unless you are writing a GUI builder */
-void     gtk_window_reshow_with_initial_size (GtkWindow *window);
-
-/* Window groups
- */
-GType            gtk_window_group_get_type      (void) G_GNUC_CONST;
-
-GtkWindowGroup * gtk_window_group_new           (void);
-void             gtk_window_group_add_window    (GtkWindowGroup     *window_group,
-						 GtkWindow          *window);
-void             gtk_window_group_remove_window (GtkWindowGroup     *window_group,
-					         GtkWindow          *window);
-
-/* --- internal functions --- */
-void            _gtk_window_internal_set_focus (GtkWindow *window,
-						GtkWidget *focus);
-void            gtk_window_remove_embedded_xid (GtkWindow *window,
-						guint      xid);
-void            gtk_window_add_embedded_xid    (GtkWindow *window,
-						guint      xid);
-void            _gtk_window_reposition         (GtkWindow *window,
-						gint       x,
-						gint       y);
-void            _gtk_window_constrain_size     (GtkWindow *window,
-						gint       width,
-						gint       height,
-						gint      *new_width,
-						gint      *new_height);
-GtkWidget      *_gtk_window_group_get_current_grab (GtkWindowGroup *window_group);
-
-void            _gtk_window_set_has_toplevel_focus (GtkWindow *window,
-						    gboolean   has_toplevel_focus);
-void            _gtk_window_unset_focus_and_default (GtkWindow *window,
-						     GtkWidget *widget);
-
-void            _gtk_window_set_is_active          (GtkWindow *window,
-						    gboolean   is_active);
-
-typedef void (*GtkWindowKeysForeachFunc) (GtkWindow      *window,
-					  guint           keyval,
-					  GdkModifierType modifiers,
-					  gboolean        is_mnemonic,
-					  gpointer        data);
-
-void _gtk_window_keys_foreach (GtkWindow               *window,
-			       GtkWindowKeysForeachFunc func,
-			       gpointer                 func_data);
-
-/* --- internal (GtkAcceleratable) --- */
-gboolean	_gtk_window_query_nonaccels	(GtkWindow	*window,
-						 guint		 accel_key,
-						 GdkModifierType accel_mods);
-
-G_END_DECLS
-
-#endif /* __GTK_WINDOW_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-unix-print-2.0/gtk/gtkpagesetupunixdialog.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-unix-print-2.0/gtk/gtkpagesetupunixdialog.h
deleted file mode 100644
index a99a07d6..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-unix-print-2.0/gtk/gtkpagesetupunixdialog.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* GtkPageSetupUnixDialog 
- * Copyright (C) 2006 Alexander Larsson <alexl@redhat.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 __GTK_PAGE_SETUP_UNIX_DIALOG_H__
-#define __GTK_PAGE_SETUP_UNIX_DIALOG_H__
-
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkpagesetup.h>
-#include <gtk/gtkprintsettings.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_PAGE_SETUP_UNIX_DIALOG                  (gtk_page_setup_unix_dialog_get_type ())
-#define GTK_PAGE_SETUP_UNIX_DIALOG(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PAGE_SETUP_UNIX_DIALOG, GtkPageSetupUnixDialog))
-#define GTK_PAGE_SETUP_UNIX_DIALOG_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PAGE_SETUP_UNIX_DIALOG, GtkPageSetupUnixDialogClass))
-#define GTK_IS_PAGE_SETUP_UNIX_DIALOG(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PAGE_SETUP_UNIX_DIALOG))
-#define GTK_IS_PAGE_SETUP_UNIX_DIALOG_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PAGE_SETUP_UNIX_DIALOG))
-#define GTK_PAGE_SETUP_UNIX_DIALOG_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PAGE_SETUP_UNIX_DIALOG, GtkPageSetupUnixDialogClass))
-
-
-typedef struct _GtkPageSetupUnixDialog         GtkPageSetupUnixDialog;
-typedef struct _GtkPageSetupUnixDialogClass    GtkPageSetupUnixDialogClass;
-typedef struct GtkPageSetupUnixDialogPrivate   GtkPageSetupUnixDialogPrivate;
-
-struct _GtkPageSetupUnixDialog
-{
-  GtkDialog parent_instance;
-
-  GtkPageSetupUnixDialogPrivate *priv;
-};
-
-struct _GtkPageSetupUnixDialogClass
-{
-  GtkDialogClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-  void (*_gtk_reserved5) (void);
-  void (*_gtk_reserved6) (void);
-  void (*_gtk_reserved7) (void);
-};
-
-GType 		  gtk_page_setup_unix_dialog_get_type	        (void) G_GNUC_CONST;
-GtkWidget *       gtk_page_setup_unix_dialog_new                (const gchar            *title,
-								 GtkWindow              *parent);
-void              gtk_page_setup_unix_dialog_set_page_setup     (GtkPageSetupUnixDialog *dialog,
-								 GtkPageSetup           *page_setup);
-GtkPageSetup *    gtk_page_setup_unix_dialog_get_page_setup     (GtkPageSetupUnixDialog *dialog);
-void              gtk_page_setup_unix_dialog_set_print_settings (GtkPageSetupUnixDialog *dialog,
-								 GtkPrintSettings       *print_settings);
-GtkPrintSettings *gtk_page_setup_unix_dialog_get_print_settings (GtkPageSetupUnixDialog *dialog);
-
-G_END_DECLS
-
-#endif /* __GTK_PAGE_SETUP_UNIX_DIALOG_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-unix-print-2.0/gtk/gtkprinter.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-unix-print-2.0/gtk/gtkprinter.h
deleted file mode 100644
index 2d8bec1f..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-unix-print-2.0/gtk/gtkprinter.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/* GtkPrinter 
- * Copyright (C) 2006 John (J5) Palmieri <johnp@redhat.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 __GTK_PRINTER_H__
-#define __GTK_PRINTER_H__
-
-#include <glib-object.h>
-#include <cairo.h>
-#include <gtk/gtkprintsettings.h>
-#include <gtk/gtkpagesetup.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_PRINT_CAPABILITIES (gtk_print_capabilities_get_type ())
-
-/* Note, this type is manually registered with GObject in gtkprinter.c
- * If you add any flags, update the registration as well!
- */
-typedef enum
-{
-  GTK_PRINT_CAPABILITY_PAGE_SET     = 1 << 0,
-  GTK_PRINT_CAPABILITY_COPIES       = 1 << 1,
-  GTK_PRINT_CAPABILITY_COLLATE      = 1 << 2,
-  GTK_PRINT_CAPABILITY_REVERSE      = 1 << 3,
-  GTK_PRINT_CAPABILITY_SCALE        = 1 << 4,
-  GTK_PRINT_CAPABILITY_GENERATE_PDF = 1 << 5,
-  GTK_PRINT_CAPABILITY_GENERATE_PS  = 1 << 6,
-  GTK_PRINT_CAPABILITY_PREVIEW      = 1 << 7,
-  GTK_PRINT_CAPABILITY_NUMBER_UP    = 1 << 8
-} GtkPrintCapabilities;
-
-GType gtk_print_capabilities_get_type (void) G_GNUC_CONST;
-
-#define GTK_TYPE_PRINTER                  (gtk_printer_get_type ())
-#define GTK_PRINTER(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PRINTER, GtkPrinter))
-#define GTK_PRINTER_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PRINTER, GtkPrinterClass))
-#define GTK_IS_PRINTER(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PRINTER))
-#define GTK_IS_PRINTER_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PRINTER))
-#define GTK_PRINTER_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PRINTER, GtkPrinterClass))
-
-typedef struct _GtkPrinter          GtkPrinter;
-typedef struct _GtkPrinterClass     GtkPrinterClass;
-typedef struct _GtkPrinterPrivate   GtkPrinterPrivate;
-typedef struct _GtkPrintBackend     GtkPrintBackend;
-
-struct _GtkPrintBackend;
-
-struct _GtkPrinter
-{
-  GObject parent_instance;
-
-  GtkPrinterPrivate *priv;
-};
-
-struct _GtkPrinterClass
-{
-  GObjectClass parent_class;
-
-  void (*details_acquired) (GtkPrinter *printer, gboolean success);
-  
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-  void (*_gtk_reserved5) (void);
-  void (*_gtk_reserved6) (void);
-  void (*_gtk_reserved7) (void);
-};
-
-GType                    gtk_printer_get_type          (void) G_GNUC_CONST;
-GtkPrinter              *gtk_printer_new               (const gchar     *name,
-							GtkPrintBackend *backend,
-							gboolean         virtual_);
-GtkPrintBackend         *gtk_printer_get_backend       (GtkPrinter      *printer);
-G_CONST_RETURN gchar    *gtk_printer_get_name          (GtkPrinter      *printer);
-G_CONST_RETURN gchar    *gtk_printer_get_state_message (GtkPrinter      *printer);
-G_CONST_RETURN gchar    *gtk_printer_get_description   (GtkPrinter      *printer);
-G_CONST_RETURN gchar    *gtk_printer_get_location      (GtkPrinter      *printer);
-G_CONST_RETURN gchar    *gtk_printer_get_icon_name     (GtkPrinter      *printer);
-gint                     gtk_printer_get_job_count     (GtkPrinter      *printer);
-gboolean                 gtk_printer_is_active         (GtkPrinter      *printer);
-gboolean                 gtk_printer_is_virtual        (GtkPrinter      *printer);
-gboolean                 gtk_printer_is_default        (GtkPrinter      *printer);
-gboolean                 gtk_printer_accepts_pdf       (GtkPrinter      *printer);
-gboolean                 gtk_printer_accepts_ps        (GtkPrinter      *printer);
-GList                   *gtk_printer_list_papers       (GtkPrinter      *printer);
-gint                     gtk_printer_compare           (GtkPrinter *a,
-							GtkPrinter *b);
-gboolean                 gtk_printer_has_details       (GtkPrinter       *printer);
-void                     gtk_printer_request_details   (GtkPrinter       *printer);
-GtkPrintCapabilities     gtk_printer_get_capabilities  (GtkPrinter       *printer);
-
-typedef gboolean (*GtkPrinterFunc) (GtkPrinter *printer,
-				    gpointer    data);
-
-void                     gtk_enumerate_printers        (GtkPrinterFunc   func,
-							gpointer         data,
-							GDestroyNotify   destroy,
-							gboolean         wait);
-
-G_END_DECLS
-
-#endif /* __GTK_PRINTER_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-unix-print-2.0/gtk/gtkprintjob.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-unix-print-2.0/gtk/gtkprintjob.h
deleted file mode 100644
index 89a3d5bc..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-unix-print-2.0/gtk/gtkprintjob.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* GtkPrintJob 
- * Copyright (C) 2006 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 __GTK_PRINT_JOB_H__
-#define __GTK_PRINT_JOB_H__
-
-#include <glib-object.h>
-#include <cairo.h>
-
-#include <gtk/gtkprinter.h>
-#include <gtk/gtkprintoperation.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_PRINT_JOB                  (gtk_print_job_get_type ())
-#define GTK_PRINT_JOB(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PRINT_JOB, GtkPrintJob))
-#define GTK_PRINT_JOB_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PRINT_JOB, GtkPrintJobClass))
-#define GTK_IS_PRINT_JOB(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PRINT_JOB))
-#define GTK_IS_PRINT_JOB_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PRINT_JOB))
-#define GTK_PRINT_JOB_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PRINT_JOB, GtkPrintJobClass))
-
-typedef struct _GtkPrintJob          GtkPrintJob;
-typedef struct _GtkPrintJobClass     GtkPrintJobClass;
-typedef struct _GtkPrintJobPrivate   GtkPrintJobPrivate;
-
-typedef void (*GtkPrintJobCompleteFunc) (GtkPrintJob *print_job,
-                                         gpointer     user_data, 
-                                         GError      *error);
-
-struct _GtkPrinter;
-
-struct _GtkPrintJob
-{
-  GObject parent_instance;
-
-  GtkPrintJobPrivate *priv;
-
-  /* Settings the client has to implement:
-   * (These are read-only, set at initialization)
-   */
-  GtkPrintPages print_pages;
-  GtkPageRange *page_ranges;
-  gint num_page_ranges;
-  GtkPageSet page_set;
-  gint num_copies;
-  gdouble scale;
-  guint rotate_to_orientation : 1;
-  guint collate               : 1;
-  guint reverse               : 1;
-};
-
-struct _GtkPrintJobClass
-{
-  GObjectClass parent_class;
-
-  void (*status_changed) (GtkPrintJob *job);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-  void (*_gtk_reserved5) (void);
-  void (*_gtk_reserved6) (void);
-  void (*_gtk_reserved7) (void);
-};
-
-GType                    gtk_print_job_get_type               (void) G_GNUC_CONST;
-GtkPrintJob             *gtk_print_job_new                    (const gchar              *title,
-							       GtkPrinter               *printer,
-							       GtkPrintSettings         *settings,
-							       GtkPageSetup             *page_setup);
-GtkPrintSettings        *gtk_print_job_get_settings           (GtkPrintJob              *job);
-GtkPrinter              *gtk_print_job_get_printer            (GtkPrintJob              *job);
-G_CONST_RETURN gchar    *gtk_print_job_get_title              (GtkPrintJob              *job);
-GtkPrintStatus           gtk_print_job_get_status             (GtkPrintJob              *job);
-gboolean                 gtk_print_job_set_source_file        (GtkPrintJob              *job,
-							       const gchar              *filename,
-							       GError                  **error);
-cairo_surface_t         *gtk_print_job_get_surface            (GtkPrintJob              *job,
-							       GError                  **error);
-void                     gtk_print_job_set_track_print_status (GtkPrintJob              *job,
-							       gboolean                  track_status);
-gboolean                 gtk_print_job_get_track_print_status (GtkPrintJob              *job);
-void                     gtk_print_job_send                   (GtkPrintJob              *job,
-							       GtkPrintJobCompleteFunc   callback,
-							       gpointer                  user_data,
-							       GDestroyNotify            dnotify);
-
-G_END_DECLS
-
-#endif /* __GTK_PRINT_JOB_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/gtk-unix-print-2.0/gtk/gtkprintunixdialog.h b/lib-x86-32/gtk-2.12.12/usr/include/gtk-unix-print-2.0/gtk/gtkprintunixdialog.h
deleted file mode 100644
index b6ad921a..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/gtk-unix-print-2.0/gtk/gtkprintunixdialog.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* GtkPrintUnixDialog 
- * Copyright (C) 2006 John (J5) Palmieri <johnp@redhat.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 __GTK_PRINT_UNIX_DIALOG_H__
-#define __GTK_PRINT_UNIX_DIALOG_H__
-
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkprinter.h>
-#include <gtk/gtkprintjob.h>
-#include <gtk/gtkprintsettings.h>
-#include <gtk/gtkpagesetup.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_PRINT_UNIX_DIALOG                  (gtk_print_unix_dialog_get_type ())
-#define GTK_PRINT_UNIX_DIALOG(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PRINT_UNIX_DIALOG, GtkPrintUnixDialog))
-#define GTK_PRINT_UNIX_DIALOG_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PRINT_UNIX_DIALOG, GtkPrintUnixDialogClass))
-#define GTK_IS_PRINT_UNIX_DIALOG(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PRINT_UNIX_DIALOG))
-#define GTK_IS_PRINT_UNIX_DIALOG_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PRINT_UNIX_DIALOG))
-#define GTK_PRINT_UNIX_DIALOG_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PRINT_UNIX_DIALOG, GtkPrintUnixDialogClass))
-
-
-typedef struct _GtkPrintUnixDialog         GtkPrintUnixDialog;
-typedef struct _GtkPrintUnixDialogClass    GtkPrintUnixDialogClass;
-typedef struct GtkPrintUnixDialogPrivate   GtkPrintUnixDialogPrivate;
-
-struct _GtkPrintUnixDialog
-{
-  GtkDialog parent_instance;
-
-  GtkPrintUnixDialogPrivate *priv;
-};
-
-struct _GtkPrintUnixDialogClass
-{
-  GtkDialogClass parent_class;
-
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-  void (*_gtk_reserved5) (void);
-  void (*_gtk_reserved6) (void);
-  void (*_gtk_reserved7) (void);
-};
-
-GType		  gtk_print_unix_dialog_get_type	     (void) G_GNUC_CONST;
-GtkWidget *       gtk_print_unix_dialog_new                  (const gchar *title,
-                                                              GtkWindow   *parent);
-
-void              gtk_print_unix_dialog_set_page_setup       (GtkPrintUnixDialog *dialog,
-							      GtkPageSetup       *page_setup);
-GtkPageSetup *    gtk_print_unix_dialog_get_page_setup       (GtkPrintUnixDialog *dialog);
-void              gtk_print_unix_dialog_set_current_page     (GtkPrintUnixDialog *dialog,
-							      gint                current_page);
-gint              gtk_print_unix_dialog_get_current_page     (GtkPrintUnixDialog *dialog);
-void              gtk_print_unix_dialog_set_settings         (GtkPrintUnixDialog *dialog,
-							      GtkPrintSettings   *settings);
-GtkPrintSettings *gtk_print_unix_dialog_get_settings         (GtkPrintUnixDialog *dialog);
-GtkPrinter *      gtk_print_unix_dialog_get_selected_printer (GtkPrintUnixDialog *dialog);
-void              gtk_print_unix_dialog_add_custom_tab       (GtkPrintUnixDialog *dialog,
-							      GtkWidget          *child,
-							      GtkWidget          *tab_label);
-void              gtk_print_unix_dialog_set_manual_capabilities (GtkPrintUnixDialog *dialog,
-								 GtkPrintCapabilities capabilities);
-
-G_END_DECLS
-
-#endif /* __GTK_PRINT_UNIX_DIALOG_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-attributes.h b/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-attributes.h
deleted file mode 100644
index ad7a0861..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-attributes.h
+++ /dev/null
@@ -1,276 +0,0 @@
-/* Pango
- * pango-attributes.h: Attributed text
- *
- * Copyright (C) 2000 Red Hat Software
- *
- * 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 __PANGO_ATTRIBUTES_H__
-#define __PANGO_ATTRIBUTES_H__
-
-#include <pango/pango-font.h>
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/* PangoColor */
-
-typedef struct _PangoColor PangoColor;
-
-struct _PangoColor
-{
-  guint16 red;
-  guint16 green;
-  guint16 blue;
-};
-
-#define PANGO_TYPE_COLOR pango_color_get_type ()
-GType       pango_color_get_type (void) G_GNUC_CONST;
-
-PangoColor *pango_color_copy     (const PangoColor *src);
-void        pango_color_free     (PangoColor       *color);
-gboolean    pango_color_parse    (PangoColor       *color,
-				  const char       *spec);
-gchar      *pango_color_to_string(const PangoColor *color);
-
-
-/* Attributes */
-
-typedef struct _PangoAttribute    PangoAttribute;
-typedef struct _PangoAttrClass    PangoAttrClass;
-
-typedef struct _PangoAttrString   PangoAttrString;
-typedef struct _PangoAttrLanguage PangoAttrLanguage;
-typedef struct _PangoAttrInt      PangoAttrInt;
-typedef struct _PangoAttrSize     PangoAttrSize;
-typedef struct _PangoAttrFloat    PangoAttrFloat;
-typedef struct _PangoAttrColor    PangoAttrColor;
-typedef struct _PangoAttrFontDesc PangoAttrFontDesc;
-typedef struct _PangoAttrShape    PangoAttrShape;
-
-#define PANGO_TYPE_ATTR_LIST pango_attr_list_get_type ()
-typedef struct _PangoAttrList     PangoAttrList;
-typedef struct _PangoAttrIterator PangoAttrIterator;
-
-typedef enum
-{
-  PANGO_ATTR_INVALID,           /* 0 is an invalid attribute type */
-  PANGO_ATTR_LANGUAGE,		/* PangoAttrLanguage */
-  PANGO_ATTR_FAMILY,		/* PangoAttrString */
-  PANGO_ATTR_STYLE,		/* PangoAttrInt */
-  PANGO_ATTR_WEIGHT,		/* PangoAttrInt */
-  PANGO_ATTR_VARIANT,		/* PangoAttrInt */
-  PANGO_ATTR_STRETCH,		/* PangoAttrInt */
-  PANGO_ATTR_SIZE,		/* PangoAttrSize */
-  PANGO_ATTR_FONT_DESC,		/* PangoAttrFontDesc */
-  PANGO_ATTR_FOREGROUND,	/* PangoAttrColor */
-  PANGO_ATTR_BACKGROUND,	/* PangoAttrColor */
-  PANGO_ATTR_UNDERLINE,		/* PangoAttrInt */
-  PANGO_ATTR_STRIKETHROUGH,	/* PangoAttrInt */
-  PANGO_ATTR_RISE,		/* PangoAttrInt */
-  PANGO_ATTR_SHAPE,		/* PangoAttrShape */
-  PANGO_ATTR_SCALE,             /* PangoAttrFloat */
-  PANGO_ATTR_FALLBACK,          /* PangoAttrInt */
-  PANGO_ATTR_LETTER_SPACING,    /* PangoAttrInt */
-  PANGO_ATTR_UNDERLINE_COLOR,	/* PangoAttrColor */
-  PANGO_ATTR_STRIKETHROUGH_COLOR,/* PangoAttrColor */
-  PANGO_ATTR_ABSOLUTE_SIZE,	/* PangoAttrSize */
-  PANGO_ATTR_GRAVITY,		/* PangoAttrInt */
-  PANGO_ATTR_GRAVITY_HINT	/* PangoAttrInt */
-} PangoAttrType;
-
-typedef enum {
-  PANGO_UNDERLINE_NONE,
-  PANGO_UNDERLINE_SINGLE,
-  PANGO_UNDERLINE_DOUBLE,
-  PANGO_UNDERLINE_LOW,
-  PANGO_UNDERLINE_ERROR
-} PangoUnderline;
-
-struct _PangoAttribute
-{
-  const PangoAttrClass *klass;
-  guint start_index;	/* in bytes */
-  guint end_index;	/* in bytes. The character at this index is not included */
-};
-
-typedef gboolean (*PangoAttrFilterFunc) (PangoAttribute *attribute,
-					 gpointer        data);
-
-typedef gpointer (*PangoAttrDataCopyFunc) (gconstpointer data);
-
-struct _PangoAttrClass
-{
-  /*< public >*/
-  PangoAttrType type;
-  PangoAttribute * (*copy) (const PangoAttribute *attr);
-  void             (*destroy) (PangoAttribute *attr);
-  gboolean         (*equal) (const PangoAttribute *attr1, const PangoAttribute *attr2);
-};
-
-struct _PangoAttrString
-{
-  PangoAttribute attr;
-  char *value;
-};
-
-struct _PangoAttrLanguage
-{
-  PangoAttribute attr;
-  PangoLanguage *value;
-};
-
-struct _PangoAttrInt
-{
-  PangoAttribute attr;
-  int value;
-};
-
-struct _PangoAttrFloat
-{
-  PangoAttribute attr;
-  double value;
-};
-
-struct _PangoAttrColor
-{
-  PangoAttribute attr;
-  PangoColor color;
-};
-
-struct _PangoAttrSize
-{
-  PangoAttribute attr;
-  int size;
-  guint absolute : 1;
-};
-
-struct _PangoAttrShape
-{
-  PangoAttribute attr;
-  PangoRectangle ink_rect;
-  PangoRectangle logical_rect;
-
-  gpointer              data;
-  PangoAttrDataCopyFunc copy_func;
-  GDestroyNotify        destroy_func;
-};
-
-struct _PangoAttrFontDesc
-{
-  PangoAttribute attr;
-  PangoFontDescription *desc;
-};
-
-PangoAttrType    pango_attr_type_register    (const gchar          *name);
-
-void             pango_attribute_init        (PangoAttribute       *attr,
-					      const PangoAttrClass *klass);
-PangoAttribute * pango_attribute_copy        (const PangoAttribute *attr);
-void             pango_attribute_destroy     (PangoAttribute       *attr);
-gboolean         pango_attribute_equal       (const PangoAttribute *attr1,
-					      const PangoAttribute *attr2) G_GNUC_PURE;
-
-PangoAttribute *pango_attr_language_new      (PangoLanguage              *language);
-PangoAttribute *pango_attr_family_new        (const char                 *family);
-PangoAttribute *pango_attr_foreground_new    (guint16                     red,
-					      guint16                     green,
-					      guint16                     blue);
-PangoAttribute *pango_attr_background_new    (guint16                     red,
-					      guint16                     green,
-					      guint16                     blue);
-PangoAttribute *pango_attr_size_new          (int                         size);
-PangoAttribute *pango_attr_size_new_absolute (int                         size);
-PangoAttribute *pango_attr_style_new         (PangoStyle                  style);
-PangoAttribute *pango_attr_weight_new        (PangoWeight                 weight);
-PangoAttribute *pango_attr_variant_new       (PangoVariant                variant);
-PangoAttribute *pango_attr_stretch_new       (PangoStretch                stretch);
-PangoAttribute *pango_attr_font_desc_new     (const PangoFontDescription *desc);
-
-PangoAttribute *pango_attr_underline_new           (PangoUnderline underline);
-PangoAttribute *pango_attr_underline_color_new     (guint16        red,
-						    guint16        green,
-						    guint16        blue);
-PangoAttribute *pango_attr_strikethrough_new       (gboolean       strikethrough);
-PangoAttribute *pango_attr_strikethrough_color_new (guint16        red,
-						    guint16        green,
-						    guint16        blue);
-
-PangoAttribute *pango_attr_rise_new          (int                         rise);
-PangoAttribute *pango_attr_scale_new         (double                      scale_factor);
-PangoAttribute *pango_attr_fallback_new      (gboolean                    enable_fallback);
-PangoAttribute *pango_attr_letter_spacing_new (int                        letter_spacing);
-
-PangoAttribute *pango_attr_shape_new           (const PangoRectangle       *ink_rect,
-						const PangoRectangle       *logical_rect);
-PangoAttribute *pango_attr_shape_new_with_data (const PangoRectangle       *ink_rect,
-						const PangoRectangle       *logical_rect,
-						gpointer                    data,
-						PangoAttrDataCopyFunc       copy_func,
-						GDestroyNotify              destroy_func);
-
-PangoAttribute *pango_attr_gravity_new      (PangoGravity     gravity);
-PangoAttribute *pango_attr_gravity_hint_new (PangoGravityHint hint);
-
-GType              pango_attr_list_get_type      (void) G_GNUC_CONST;
-PangoAttrList *    pango_attr_list_new           (void);
-PangoAttrList *    pango_attr_list_ref           (PangoAttrList  *list);
-void               pango_attr_list_unref         (PangoAttrList  *list);
-PangoAttrList *    pango_attr_list_copy          (PangoAttrList  *list);
-void               pango_attr_list_insert        (PangoAttrList  *list,
-						  PangoAttribute *attr);
-void               pango_attr_list_insert_before (PangoAttrList  *list,
-						  PangoAttribute *attr);
-void               pango_attr_list_change        (PangoAttrList  *list,
-						  PangoAttribute *attr);
-void               pango_attr_list_splice        (PangoAttrList  *list,
-						  PangoAttrList  *other,
-						  gint            pos,
-						  gint            len);
-
-PangoAttrList *pango_attr_list_filter (PangoAttrList       *list,
-				       PangoAttrFilterFunc  func,
-				       gpointer             data);
-
-PangoAttrIterator *pango_attr_list_get_iterator  (PangoAttrList  *list);
-
-void               pango_attr_iterator_range    (PangoAttrIterator     *iterator,
-						 gint                  *start,
-						 gint                  *end);
-gboolean           pango_attr_iterator_next     (PangoAttrIterator     *iterator);
-PangoAttrIterator *pango_attr_iterator_copy     (PangoAttrIterator     *iterator);
-void               pango_attr_iterator_destroy  (PangoAttrIterator     *iterator);
-PangoAttribute *   pango_attr_iterator_get      (PangoAttrIterator     *iterator,
-						 PangoAttrType          type);
-void               pango_attr_iterator_get_font (PangoAttrIterator     *iterator,
-						 PangoFontDescription  *desc,
-						 PangoLanguage        **language,
-						 GSList               **extra_attrs);
-GSList *          pango_attr_iterator_get_attrs (PangoAttrIterator     *iterator);
-
-
-gboolean pango_parse_markup (const char                 *markup_text,
-			     int                         length,
-			     gunichar                    accel_marker,
-			     PangoAttrList             **attr_list,
-			     char                      **text,
-			     gunichar                   *accel_char,
-			     GError                    **error);
-
-G_END_DECLS
-
-#endif /* __PANGO_ATTRIBUTES_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-break.h b/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-break.h
deleted file mode 100644
index fe22acec..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-break.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* Pango
- * pango-break.h:
- *
- * Copyright (C) 1999 Red Hat Software
- *
- * 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 __PANGO_BREAK_H__
-#define __PANGO_BREAK_H__
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-#include <pango/pango-item.h>
-
-/* Logical attributes of a character.
- */
-struct _PangoLogAttr
-{
-  guint is_line_break : 1;      /* Can break line in front of character */
-
-  guint is_mandatory_break : 1; /* Must break line in front of character */
-
-  guint is_char_break : 1;      /* Can break here when doing char wrap */
-
-  guint is_white : 1;           /* Whitespace character */
-
-  /* Cursor can appear in front of character (i.e. this is a grapheme
-   * boundary, or the first character in the text).
-   */
-  guint is_cursor_position : 1;
-
-  /* Note that in degenerate cases, you could have both start/end set on
-   * some text, most likely for sentences (e.g. no space after a period, so
-   * the next sentence starts right away).
-   */
-
-  guint is_word_start : 1;      /* first character in a word */
-  guint is_word_end   : 1;      /* is first non-word char after a word */
-
-  /* There are two ways to divide sentences. The first assigns all
-   * intersentence whitespace/control/format chars to some sentence,
-   * so all chars are in some sentence; is_sentence_boundary denotes
-   * the boundaries there. The second way doesn't assign
-   * between-sentence spaces, etc. to any sentence, so
-   * is_sentence_start/is_sentence_end mark the boundaries of those
-   * sentences.
-   */
-  guint is_sentence_boundary : 1;
-  guint is_sentence_start : 1;  /* first character in a sentence */
-  guint is_sentence_end : 1;    /* first non-sentence char after a sentence */
-
-  /* If set, backspace deletes one character rather than
-   * the entire grapheme cluster.
-   */
-  guint backspace_deletes_character : 1;
-
-  /* Only few space variants (U+0020 and U+00A0) have variable
-   * width during justification.
-   */
-  guint is_expandable_space : 1;
-};
-
-/* Determine information about cluster/word/line breaks in a string
- * of Unicode text.
- */
-void pango_break (const gchar   *text,
-		  int            length,
-		  PangoAnalysis *analysis,
-		  PangoLogAttr  *attrs,
-		  int            attrs_len);
-
-void pango_find_paragraph_boundary (const gchar *text,
-				    gint         length,
-				    gint        *paragraph_delimiter_index,
-				    gint        *next_paragraph_start);
-
-void pango_get_log_attrs (const char    *text,
-			  int            length,
-			  int            level,
-			  PangoLanguage *language,
-			  PangoLogAttr  *log_attrs,
-			  int            attrs_len);
-
-#ifdef PANGO_ENABLE_ENGINE
-
-/* This is the default break algorithm, used if no language
- * engine overrides it. Normally you should use pango_break()
- * instead; this function is mostly useful for chaining up
- * from a language engine override.
- */
-void pango_default_break (const gchar   *text,
-			  int            length,
-			  PangoAnalysis *analysis,
-			  PangoLogAttr  *attrs,
-			  int            attrs_len);
-
-#endif /* PANGO_ENABLE_ENGINE */
-
-G_END_DECLS
-
-#endif /* __PANGO_BREAK_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-context.h b/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-context.h
deleted file mode 100644
index 5cd88404..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-context.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* Pango
- * pango-context.h: Rendering contexts
- *
- * Copyright (C) 2000 Red Hat Software
- *
- * 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 __PANGO_CONTEXT_H__
-#define __PANGO_CONTEXT_H__
-
-#include <pango/pango-font.h>
-#include <pango/pango-fontmap.h>
-#include <pango/pango-attributes.h>
-
-G_BEGIN_DECLS
-
-/* Sort of like a GC - application set information about how
- * to handle scripts
- */
-
-/* PangoContext typedefed in pango-fontmap.h */
-typedef struct _PangoContextClass PangoContextClass;
-
-#define PANGO_TYPE_CONTEXT              (pango_context_get_type ())
-#define PANGO_CONTEXT(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_CONTEXT, PangoContext))
-#define PANGO_CONTEXT_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_CONTEXT, PangoContextClass))
-#define PANGO_IS_CONTEXT(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_CONTEXT))
-#define PANGO_IS_CONTEXT_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_CONTEXT))
-#define PANGO_CONTEXT_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_CONTEXT, PangoContextClass))
-
-
-/* The PangoContext and PangoContextClass structs are private; if you
- * need to create a subclass of these, file a bug.
- */
-
-GType         pango_context_get_type      (void) G_GNUC_CONST;
-
-#ifdef PANGO_ENABLE_BACKEND
-PangoContext *pango_context_new           (void);
-void          pango_context_set_font_map  (PangoContext                 *context,
-					   PangoFontMap                 *font_map);
-#endif /* PANGO_ENABLE_BACKEND */
-PangoFontMap *pango_context_get_font_map  (PangoContext                 *context);
-
-void          pango_context_list_families (PangoContext                 *context,
-					   PangoFontFamily            ***families,
-					   int                          *n_families);
-PangoFont *   pango_context_load_font     (PangoContext                 *context,
-					   const PangoFontDescription   *desc);
-PangoFontset *pango_context_load_fontset  (PangoContext                 *context,
-					   const PangoFontDescription   *desc,
-					   PangoLanguage                *language);
-
-PangoFontMetrics *pango_context_get_metrics   (PangoContext                 *context,
-					       const PangoFontDescription   *desc,
-					       PangoLanguage                *language);
-
-void                      pango_context_set_font_description (PangoContext               *context,
-							      const PangoFontDescription *desc);
-PangoFontDescription *    pango_context_get_font_description (PangoContext               *context);
-PangoLanguage            *pango_context_get_language         (PangoContext               *context);
-void                      pango_context_set_language         (PangoContext               *context,
-							      PangoLanguage              *language);
-void                      pango_context_set_base_dir         (PangoContext               *context,
-							      PangoDirection              direction);
-PangoDirection            pango_context_get_base_dir         (PangoContext               *context);
-void                      pango_context_set_base_gravity     (PangoContext               *context,
-							      PangoGravity                gravity);
-PangoGravity              pango_context_get_base_gravity     (PangoContext               *context);
-PangoGravity              pango_context_get_gravity          (PangoContext               *context);
-void                      pango_context_set_gravity_hint     (PangoContext               *context,
-							      PangoGravityHint            hint);
-PangoGravityHint          pango_context_get_gravity_hint     (PangoContext               *context);
-
-void                        pango_context_set_matrix (PangoContext      *context,
-						      const PangoMatrix *matrix);
-G_CONST_RETURN PangoMatrix *pango_context_get_matrix (PangoContext      *context);
-
-/* Break a string of Unicode characters into segments with
- * consistent shaping/language engine and bidrectional level.
- * Returns a #GList of #PangoItem's
- */
-GList *pango_itemize                (PangoContext      *context,
-				     const char        *text,
-				     int                start_index,
-				     int                length,
-				     PangoAttrList     *attrs,
-				     PangoAttrIterator *cached_iter);
-GList *pango_itemize_with_base_dir  (PangoContext      *context,
-				     PangoDirection     base_dir,
-				     const char        *text,
-				     int                start_index,
-				     int                length,
-				     PangoAttrList     *attrs,
-				     PangoAttrIterator *cached_iter);
-
-G_END_DECLS
-
-#endif /* __PANGO_CONTEXT_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-coverage.h b/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-coverage.h
deleted file mode 100644
index e1e8d133..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-coverage.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Pango
- * pango-coverage.h: Coverage sets for fonts
- *
- * Copyright (C) 2000 Red Hat Software
- *
- * 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 __PANGO_COVERAGE_H__
-#define __PANGO_COVERAGE_H__
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-typedef struct _PangoCoverage PangoCoverage;
-
-typedef enum {
-  PANGO_COVERAGE_NONE,
-  PANGO_COVERAGE_FALLBACK,
-  PANGO_COVERAGE_APPROXIMATE,
-  PANGO_COVERAGE_EXACT
-} PangoCoverageLevel;
-
-PangoCoverage *    pango_coverage_new     (void);
-PangoCoverage *    pango_coverage_ref     (PangoCoverage      *coverage);
-void               pango_coverage_unref   (PangoCoverage      *coverage);
-PangoCoverage *    pango_coverage_copy    (PangoCoverage      *coverage);
-PangoCoverageLevel pango_coverage_get     (PangoCoverage      *coverage,
-					   int                 index_);
-void               pango_coverage_set     (PangoCoverage      *coverage,
-					   int                 index_,
-					   PangoCoverageLevel  level);
-void               pango_coverage_max     (PangoCoverage      *coverage,
-					   PangoCoverage      *other);
-
-void           pango_coverage_to_bytes   (PangoCoverage  *coverage,
-					  guchar        **bytes,
-					  int            *n_bytes);
-PangoCoverage *pango_coverage_from_bytes (guchar         *bytes,
-					  int             n_bytes);
-
-G_END_DECLS
-
-#endif /* __PANGO_COVERAGE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-engine.h b/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-engine.h
deleted file mode 100644
index ddc9ab16..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-engine.h
+++ /dev/null
@@ -1,379 +0,0 @@
-/* Pango
- * pango-engine.h: Engines for script and language specific processing
- *
- * Copyright (C) 2000,2003 Red Hat Software
- *
- * 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 __PANGO_ENGINE_H__
-#define __PANGO_ENGINE_H__
-
-#include <pango/pango-types.h>
-#include <pango/pango-item.h>
-#include <pango/pango-font.h>
-#include <pango/pango-glyph.h>
-#include <pango/pango-script.h>
-
-G_BEGIN_DECLS
-
-#ifdef PANGO_ENABLE_ENGINE
-
-/* Module API */
-
-#define PANGO_RENDER_TYPE_NONE "PangoRenderNone"
-
-#define PANGO_TYPE_ENGINE              (pango_engine_get_type ())
-#define PANGO_ENGINE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_ENGINE, PangoEngine))
-#define PANGO_IS_ENGINE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_ENGINE))
-#define PANGO_ENGINE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_ENGINE, PangoEngineClass))
-#define PANGO_IS_ENGINE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_ENGINE))
-#define PANGO_ENGINE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_ENGINE, PangoEngineClass))
-
-typedef struct _PangoEngine PangoEngine;
-typedef struct _PangoEngineClass PangoEngineClass;
-
-/**
- * PangoEngine:
- *
- * #PangoEngine is the base class for all types of language and
- * script specific engines. It has no functionality by itself.
- **/
-struct _PangoEngine
-{
-  /*< private >*/
-  GObject parent_instance;
-};
-
-/**
- * PangoEngineClass:
- *
- * Class structure for #PangoEngine
- **/
-struct _PangoEngineClass
-{
-  /*< private >*/
-  GObjectClass parent_class;
-};
-
-GType pango_engine_get_type (void) G_GNUC_CONST;
-
-#define PANGO_ENGINE_TYPE_LANG "PangoEngineLang"
-
-#define PANGO_TYPE_ENGINE_LANG              (pango_engine_lang_get_type ())
-#define PANGO_ENGINE_LANG(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_ENGINE_LANG, PangoEngineLang))
-#define PANGO_IS_ENGINE_LANG(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_ENGINE_LANG))
-#define PANGO_ENGINE_LANG_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_ENGINE_LANG, PangoEngineLangClass))
-#define PANGO_IS_ENGINE_LANG_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_ENGINE_LANG))
-#define PANGO_ENGINE_LANG_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_ENGINE_LANG, PangoEngineLangClass))
-
-typedef struct _PangoEngineLangClass PangoEngineLangClass;
-
-/**
- * PangoEngineLang:
- *
- * The #PangoEngineLang class is implemented by engines that
- * customize the rendering-system independent part of the
- * Pango pipeline for a particular script or language. For
- * instance, a custom #PangoEngineLang could be provided for
- * Thai to implement the dictionary-based word boundary
- * lookups needed for that language.
- **/
-struct _PangoEngineLang
-{
-  /*< private >*/
-  PangoEngine parent_instance;
-};
-
-/**
- * PangoEngineLangClass:
- * @script_break: Provides a custom implementation of pango_break().
- * If %NULL, pango_default_break() is used instead. If not %NULL, for
- * Pango versions before 1.16 (module interface version before 1.6.0),
- * this was called instead of pango_default_break(), but in newer versions,
- * pango_default_break() is always called and this is called after that to
- * allow tailoring the breaking results.
- *
- * Class structure for #PangoEngineLang
- **/
-struct _PangoEngineLangClass
-{
-  /*< private >*/
-  PangoEngineClass parent_class;
-
-  /*< public >*/
-  void (*script_break) (PangoEngineLang *engine,
-			const char    *text,
-			int            len,
-			PangoAnalysis *analysis,
-			PangoLogAttr  *attrs,
-			int            attrs_len);
-};
-
-GType pango_engine_lang_get_type (void) G_GNUC_CONST;
-
-#define PANGO_ENGINE_TYPE_SHAPE "PangoEngineShape"
-
-#define PANGO_TYPE_ENGINE_SHAPE              (pango_engine_shape_get_type ())
-#define PANGO_ENGINE_SHAPE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_ENGINE_SHAPE, PangoEngineShape))
-#define PANGO_IS_ENGINE_SHAPE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_ENGINE_SHAPE))
-#define PANGO_ENGINE_SHAPE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_ENGINE_SHAPE, PangoEngine_ShapeClass))
-#define PANGO_IS_ENGINE_SHAPE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_ENGINE_SHAPE))
-#define PANGO_ENGINE_SHAPE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_ENGINE_SHAPE, PangoEngineShapeClass))
-
-typedef struct _PangoEngineShapeClass PangoEngineShapeClass;
-
-/**
- * PangoEngineShape
- *
- * The #PangoEngineShape class is implemented by engines that
- * customize the rendering-system dependent part of the
- * Pango pipeline for a particular script or language.
- * A #PangoEngineShape implementation is then specific to both
- * a particular rendering system or group of rendering systems
- * and to a particular script. For instance, there is one
- * #PangoEngineShape implementation to handle shaping Arabic
- * for Fontconfig-based backends.
- **/
-struct _PangoEngineShape
-{
-  PangoEngine parent_instance;
-};
-
-/**
- * PangoEngineShapeClass:
- * @script_shape: Given a font, a piece of text, and a #PangoAnalysis
- *   structure, converts characters to glyphs and positions the
- *   resulting glyphs. The results are stored in the #PangoGlyphString
- *   that is passed in. (The implementation should resize it
- *   appropriately using pango_glyph_string_set_size()). All fields
- *   of the @log_clusters and @glyphs array must be filled in, with
- *   the exception that Pango will automatically generate
- *   <literal>glyphs->glyphs[i].attr.is_cluster_start</literal>
- *   using the @log_clusters array. Each input character must occur in one
- *   of the output logical clusters;
- *   if no rendering is desired for a character, this may involve
- *   inserting glyphs with the #PangoGlyph ID #PANGO_GLYPH_EMPTY, which
- *   is guaranteed never to render. If the shaping fails for any reason,
- *   the shaper should return with an empty (zero-size) glyph string.
- *   If the shaper has not set the size on the glyph string yet, simply
- *   returning signals the failure too.
- * @covers: Returns the characters that this engine can cover
- *   with a given font for a given language. If not overridden, the default
- *   implementation simply returns the coverage information for the
- *   font itself unmodified.
- *
- * Class structure for #PangoEngineShape
- **/
-struct _PangoEngineShapeClass
-{
-  /*< private >*/
-  PangoEngineClass parent_class;
-
-  /*< public >*/
-  void (*script_shape) (PangoEngineShape *engine,
-			PangoFont        *font,
-			const char       *text,
-			int               length,
-			const PangoAnalysis *analysis,
-			PangoGlyphString *glyphs);
-  PangoCoverageLevel (*covers)   (PangoEngineShape *engine,
-				  PangoFont        *font,
-				  PangoLanguage    *language,
-				  gunichar          wc);
-};
-
-GType pango_engine_shape_get_type (void) G_GNUC_CONST;
-
-typedef struct _PangoEngineInfo PangoEngineInfo;
-typedef struct _PangoEngineScriptInfo PangoEngineScriptInfo;
-
-struct _PangoEngineScriptInfo
-{
-  PangoScript script;
-  const gchar *langs;
-};
-
-struct _PangoEngineInfo
-{
-  const gchar *id;
-  const gchar *engine_type;
-  const gchar *render_type;
-  PangoEngineScriptInfo *scripts;
-  gint n_scripts;
-};
-
-/**
- * script_engine_list:
- * @engines: location to store a pointer to an array of engines.
- * @n_engines: location to store the number of elements in @engines.
- *
- * Function to be provided by a module to list the engines that the
- * module supplies. The function stores a pointer to an array
- * of #PangoEngineInfo structures and the length of that array in
- * the given location.
- *
- * Note that script_engine_init() will not be called before this
- * function.
- **/
-void script_engine_list (PangoEngineInfo **engines,
-			 int              *n_engines);
-
-/**
- * script_engine_init:
- * @module: a #GTypeModule structure used to associate any
- *  GObject types created in this module with the module.
- *
- * Function to be provided by a module to register any
- * GObject types in the module.
- **/
-void script_engine_init (GTypeModule *module);
-
-
-/**
- * script_engine_exit:
- *
- * Function to be provided by the module that is called
- * when the module is unloading. Frequently does nothing.
- **/
-void script_engine_exit (void);
-
-/**
- * script_engine_create:
- * @id: the ID of an engine as reported by script_engine_list.
- *
- * Function to be provided by the module to create an instance
- * of one of the engines implemented by the module.
- *
- * Return value: a newly created #PangoEngine of the specified
- *  type, or %NULL if an error occurred. (In normal operation,
- *  a module should not return %NULL. A %NULL return is only
- *  acceptable in the case where system misconfiguration or
- *  bugs in the driver routine are encountered.)
- **/
-PangoEngine *script_engine_create (const char *id);
-
-/* Utility macro used by PANGO_ENGINE_LANG_DEFINE_TYPE and
- * PANGO_ENGINE_LANG_DEFINE_TYPE
- */
-#define PANGO_ENGINE_DEFINE_TYPE(name, prefix, class_init, instance_init, parent_type) \
-static GType prefix ## _type;						  \
-static void								  \
-prefix ## _register_type (GTypeModule *module)				  \
-{									  \
-  const GTypeInfo object_info =						  \
-    {									  \
-      sizeof (name ## Class),						  \
-      (GBaseInitFunc) NULL,						  \
-      (GBaseFinalizeFunc) NULL,						  \
-      (GClassInitFunc) class_init,					  \
-      (GClassFinalizeFunc) NULL,					  \
-      NULL,          /* class_data */					  \
-      sizeof (name),							  \
-      0,             /* n_prelocs */					  \
-      (GInstanceInitFunc) instance_init,				  \
-      NULL           /* value_table */					  \
-    };									  \
-									  \
-  prefix ## _type =  g_type_module_register_type (module, parent_type,	  \
-						  # name,		  \
-						  &object_info, 0);	  \
-}
-
-/**
- * PANGO_ENGINE_LANG_DEFINE_TYPE:
- * @name: Name of the the type to register (for example:, <literal>ArabicEngineFc</literal>
- * @prefix: Prefix for symbols that will be defined (for example:, <literal>arabic_engine_fc</literal>
- * @class_init: Class initialization function for the new type, or %NULL
- * @instance_init: Instance initialization function for the new type, or %NULL
- *
- * Outputs the necessary code for GObject type registration for a
- * #PangoEngineLang class defined in a module. Two static symbols
- * are defined.
- *
- * <programlisting>
- *  static GType <replaceable>prefix</replaceable>_type;
- *  static void <replaceable>prefix</replaceable>_register_type (GTypeModule module);
- * </programlisting>
- *
- * The <function><replaceable>prefix</replaceable>_register_type()</function>
- * function should be called in your script_engine_init() function for
- * each type that your module implements, and then your script_engine_create()
- * function can create instances of the object as follows:
- *
- * <informalexample><programlisting>
- *  PangoEngine *engine = g_object_new (<replaceable>prefix</replaceable>_type, NULL);
- * </programlisting></informalexample>
- **/
-#define PANGO_ENGINE_LANG_DEFINE_TYPE(name, prefix, class_init, instance_init)	\
-  PANGO_ENGINE_DEFINE_TYPE (name, prefix,				\
-			    class_init, instance_init,			\
-			    PANGO_TYPE_ENGINE_LANG)
-
-/**
- * PANGO_ENGINE_SHAPE_DEFINE_TYPE:
- * @name: Name of the the type to register (for example:, <literal>ArabicEngineFc</literal>
- * @prefix: Prefix for symbols that will be defined (for example:, <literal>arabic_engine_fc</literal>
- * @class_init: Class initialization function for the new type, or %NULL
- * @instance_init: Instance initialization function for the new type, or %NULL
- *
- * Outputs the necessary code for GObject type registration for a
- * #PangoEngineShape class defined in a module. Two static symbols
- * are defined.
- *
- * <programlisting>
- *  static GType <replaceable>prefix</replaceable>_type;
- *  static void <replaceable>prefix</replaceable>_register_type (GTypeModule module);
- * </programlisting>
- *
- * The <function><replaceable>prefix</replaceable>_register_type()</function>
- * function should be called in your script_engine_init() function for
- * each type that your module implements, and then your script_engine_create()
- * function can create instances of the object as follows:
- *
- * <informalexample><programlisting>
- *  PangoEngine *engine = g_object_new (<replaceable>prefix</replaceable>_type, NULL);
- * </programlisting></informalexample>
- **/
-#define PANGO_ENGINE_SHAPE_DEFINE_TYPE(name, prefix, class_init, instance_init)	\
-  PANGO_ENGINE_DEFINE_TYPE (name, prefix,				\
-			    class_init, instance_init,			\
-			    PANGO_TYPE_ENGINE_SHAPE)
-
-/* Macro used for possibly builtin Pango modules. Not useful
- * for externally build modules. If we are compiling a module standaline,
- * then we name the entry points script_engine_list, etc. But if we
- * are compiling it for inclusion directly in Pango, then we need them to
- * to have distinct names for this module, so we prepend a prefix.
- *
- * The two intermediate macros are to deal with details of the C
- * preprocessor; token pasting tokens must be function arguments,
- * and macro substitution isn't used on function arguments that
- * are used for token pasting.
- */
-#ifdef PANGO_MODULE_PREFIX
-#define PANGO_MODULE_ENTRY(func) _PANGO_MODULE_ENTRY2(PANGO_MODULE_PREFIX,func)
-#define _PANGO_MODULE_ENTRY2(prefix,func) _PANGO_MODULE_ENTRY3(prefix,func)
-#define _PANGO_MODULE_ENTRY3(prefix,func) prefix##_script_engine_##func
-#else
-#define PANGO_MODULE_ENTRY(func) script_engine_##func
-#endif
-
-#endif /* PANGO_ENABLE_ENGINE */
-
-G_END_DECLS
-
-#endif /* __PANGO_ENGINE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-enum-types.h b/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-enum-types.h
deleted file mode 100644
index 8aca839a..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-enum-types.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-/* Generated data (by glib-mkenums) */
-
-#ifndef __PANGO_ENUM_TYPES_H__
-#define __PANGO_ENUM_TYPES_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-/* enumerations from "pango-attributes.h" */
-GType pango_attr_type_get_type (void);
-#define PANGO_TYPE_ATTR_TYPE (pango_attr_type_get_type())
-GType pango_underline_get_type (void);
-#define PANGO_TYPE_UNDERLINE (pango_underline_get_type())
-/* enumerations from "pango-coverage.h" */
-GType pango_coverage_level_get_type (void);
-#define PANGO_TYPE_COVERAGE_LEVEL (pango_coverage_level_get_type())
-/* enumerations from "pango-font.h" */
-GType pango_style_get_type (void);
-#define PANGO_TYPE_STYLE (pango_style_get_type())
-GType pango_variant_get_type (void);
-#define PANGO_TYPE_VARIANT (pango_variant_get_type())
-GType pango_weight_get_type (void);
-#define PANGO_TYPE_WEIGHT (pango_weight_get_type())
-GType pango_stretch_get_type (void);
-#define PANGO_TYPE_STRETCH (pango_stretch_get_type())
-GType pango_font_mask_get_type (void);
-#define PANGO_TYPE_FONT_MASK (pango_font_mask_get_type())
-/* enumerations from "pango-gravity.h" */
-GType pango_gravity_get_type (void);
-#define PANGO_TYPE_GRAVITY (pango_gravity_get_type())
-GType pango_gravity_hint_get_type (void);
-#define PANGO_TYPE_GRAVITY_HINT (pango_gravity_hint_get_type())
-/* enumerations from "pango-layout.h" */
-GType pango_alignment_get_type (void);
-#define PANGO_TYPE_ALIGNMENT (pango_alignment_get_type())
-GType pango_wrap_mode_get_type (void);
-#define PANGO_TYPE_WRAP_MODE (pango_wrap_mode_get_type())
-GType pango_ellipsize_mode_get_type (void);
-#define PANGO_TYPE_ELLIPSIZE_MODE (pango_ellipsize_mode_get_type())
-/* enumerations from "pango-renderer.h" */
-GType pango_render_part_get_type (void);
-#define PANGO_TYPE_RENDER_PART (pango_render_part_get_type())
-/* enumerations from "pango-script.h" */
-GType pango_script_get_type (void);
-#define PANGO_TYPE_SCRIPT (pango_script_get_type())
-/* enumerations from "pango-tabs.h" */
-GType pango_tab_align_get_type (void);
-#define PANGO_TYPE_TAB_ALIGN (pango_tab_align_get_type())
-/* enumerations from "pango-types.h" */
-GType pango_direction_get_type (void);
-#define PANGO_TYPE_DIRECTION (pango_direction_get_type())
-G_END_DECLS
-
-#endif /* __PANGO_ENUM_TYPES_H__ */
-
-/* Generated data ends here */
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-features.h b/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-features.h
deleted file mode 100644
index 48c66dc7..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-features.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* Generated by configure. Do not edit */
-#ifndef PANGO_FEATURES_H
-#define PANGO_FEATURES_H
-
-#define PANGO_VERSION_MAJOR 1
-#define PANGO_VERSION_MINOR 20
-#define PANGO_VERSION_MICRO 5
-
-#define PANGO_VERSION_STRING "1.20.5"
-
-
-#endif
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-font.h b/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-font.h
deleted file mode 100644
index 66e68aa8..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-font.h
+++ /dev/null
@@ -1,382 +0,0 @@
-/* Pango
- * pango-font.h: Font handling
- *
- * Copyright (C) 2000 Red Hat Software
- *
- * 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 __PANGO_FONT_H__
-#define __PANGO_FONT_H__
-
-#include <pango/pango-coverage.h>
-#include <pango/pango-types.h>
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-typedef struct _PangoFontDescription PangoFontDescription;
-typedef struct _PangoFontMetrics PangoFontMetrics;
-
-/**
- * PangoStyle:
- * @PANGO_STYLE_NORMAL: the font is upright.
- * @PANGO_STYLE_OBLIQUE: the font is slanted, but in a roman style.
- * @PANGO_STYLE_ITALIC: the font is slanted in an italic style.
- *
- * An enumeration specifying the various slant styles possible for a font.
- **/
-typedef enum {
-  PANGO_STYLE_NORMAL,
-  PANGO_STYLE_OBLIQUE,
-  PANGO_STYLE_ITALIC
-} PangoStyle;
-
-typedef enum {
-  PANGO_VARIANT_NORMAL,
-  PANGO_VARIANT_SMALL_CAPS
-} PangoVariant;
-
-typedef enum {
-  PANGO_WEIGHT_ULTRALIGHT = 200,
-  PANGO_WEIGHT_LIGHT = 300,
-  PANGO_WEIGHT_NORMAL = 400,
-  PANGO_WEIGHT_SEMIBOLD = 600,
-  PANGO_WEIGHT_BOLD = 700,
-  PANGO_WEIGHT_ULTRABOLD = 800,
-  PANGO_WEIGHT_HEAVY = 900
-} PangoWeight;
-
-typedef enum {
-  PANGO_STRETCH_ULTRA_CONDENSED,
-  PANGO_STRETCH_EXTRA_CONDENSED,
-  PANGO_STRETCH_CONDENSED,
-  PANGO_STRETCH_SEMI_CONDENSED,
-  PANGO_STRETCH_NORMAL,
-  PANGO_STRETCH_SEMI_EXPANDED,
-  PANGO_STRETCH_EXPANDED,
-  PANGO_STRETCH_EXTRA_EXPANDED,
-  PANGO_STRETCH_ULTRA_EXPANDED
-} PangoStretch;
-
-typedef enum {
-  PANGO_FONT_MASK_FAMILY  = 1 << 0,
-  PANGO_FONT_MASK_STYLE   = 1 << 1,
-  PANGO_FONT_MASK_VARIANT = 1 << 2,
-  PANGO_FONT_MASK_WEIGHT  = 1 << 3,
-  PANGO_FONT_MASK_STRETCH = 1 << 4,
-  PANGO_FONT_MASK_SIZE    = 1 << 5,
-  PANGO_FONT_MASK_GRAVITY = 1 << 6
-} PangoFontMask;
-
-/* CSS scale factors (1.2 factor between each size) */
-#define PANGO_SCALE_XX_SMALL ((double)0.5787037037037)
-#define PANGO_SCALE_X_SMALL  ((double)0.6444444444444)
-#define PANGO_SCALE_SMALL    ((double)0.8333333333333)
-#define PANGO_SCALE_MEDIUM   ((double)1.0)
-#define PANGO_SCALE_LARGE    ((double)1.2)
-#define PANGO_SCALE_X_LARGE  ((double)1.4399999999999)
-#define PANGO_SCALE_XX_LARGE ((double)1.728)
-
-/*
- * PangoFontDescription
- */
-
-#define PANGO_TYPE_FONT_DESCRIPTION (pango_font_description_get_type ())
-
-GType                 pango_font_description_get_type    (void) G_GNUC_CONST;
-PangoFontDescription *pango_font_description_new         (void);
-PangoFontDescription *pango_font_description_copy        (const PangoFontDescription  *desc);
-PangoFontDescription *pango_font_description_copy_static (const PangoFontDescription  *desc);
-guint                 pango_font_description_hash        (const PangoFontDescription  *desc) G_GNUC_PURE;
-gboolean              pango_font_description_equal       (const PangoFontDescription  *desc1,
-							  const PangoFontDescription  *desc2) G_GNUC_PURE;
-void                  pango_font_description_free        (PangoFontDescription        *desc);
-void                  pango_font_descriptions_free       (PangoFontDescription       **descs,
-							  int                          n_descs);
-
-void                 pango_font_description_set_family        (PangoFontDescription *desc,
-							       const char           *family);
-void                 pango_font_description_set_family_static (PangoFontDescription *desc,
-							       const char           *family);
-G_CONST_RETURN char *pango_font_description_get_family        (const PangoFontDescription *desc) G_GNUC_PURE;
-void                 pango_font_description_set_style         (PangoFontDescription *desc,
-							       PangoStyle            style);
-PangoStyle           pango_font_description_get_style         (const PangoFontDescription *desc) G_GNUC_PURE;
-void                 pango_font_description_set_variant       (PangoFontDescription *desc,
-							       PangoVariant          variant);
-PangoVariant         pango_font_description_get_variant       (const PangoFontDescription *desc) G_GNUC_PURE;
-void                 pango_font_description_set_weight        (PangoFontDescription *desc,
-							       PangoWeight           weight);
-PangoWeight          pango_font_description_get_weight        (const PangoFontDescription *desc) G_GNUC_PURE;
-void                 pango_font_description_set_stretch       (PangoFontDescription *desc,
-							       PangoStretch          stretch);
-PangoStretch         pango_font_description_get_stretch       (const PangoFontDescription *desc) G_GNUC_PURE;
-void                 pango_font_description_set_size          (PangoFontDescription *desc,
-							       gint                  size);
-gint                 pango_font_description_get_size          (const PangoFontDescription *desc) G_GNUC_PURE;
-void                 pango_font_description_set_absolute_size (PangoFontDescription *desc,
-							       double                size);
-gboolean             pango_font_description_get_size_is_absolute (const PangoFontDescription *desc) G_GNUC_PURE;
-void                 pango_font_description_set_gravity       (PangoFontDescription *desc,
-							       PangoGravity          gravity);
-PangoGravity         pango_font_description_get_gravity       (const PangoFontDescription *desc) G_GNUC_PURE;
-
-PangoFontMask pango_font_description_get_set_fields (const PangoFontDescription *desc) G_GNUC_PURE;
-void          pango_font_description_unset_fields   (PangoFontDescription       *desc,
-						     PangoFontMask               to_unset);
-
-void pango_font_description_merge        (PangoFontDescription       *desc,
-					  const PangoFontDescription *desc_to_merge,
-					  gboolean                    replace_existing);
-void pango_font_description_merge_static (PangoFontDescription       *desc,
-					  const PangoFontDescription *desc_to_merge,
-					  gboolean                    replace_existing);
-
-gboolean pango_font_description_better_match (const PangoFontDescription *desc,
-					      const PangoFontDescription *old_match,
-					      const PangoFontDescription *new_match) G_GNUC_PURE;
-
-PangoFontDescription *pango_font_description_from_string (const char                  *str);
-char *                pango_font_description_to_string   (const PangoFontDescription  *desc);
-char *                pango_font_description_to_filename (const PangoFontDescription  *desc);
-
-/*
- * PangoFontMetrics
- */
-
-#define PANGO_TYPE_FONT_METRICS  (pango_font_metrics_get_type ())
-GType             pango_font_metrics_get_type                    (void) G_GNUC_CONST;
-PangoFontMetrics *pango_font_metrics_ref                         (PangoFontMetrics *metrics);
-void              pango_font_metrics_unref                       (PangoFontMetrics *metrics);
-int               pango_font_metrics_get_ascent                  (PangoFontMetrics *metrics) G_GNUC_PURE;
-int               pango_font_metrics_get_descent                 (PangoFontMetrics *metrics) G_GNUC_PURE;
-int               pango_font_metrics_get_approximate_char_width  (PangoFontMetrics *metrics) G_GNUC_PURE;
-int               pango_font_metrics_get_approximate_digit_width (PangoFontMetrics *metrics) G_GNUC_PURE;
-int               pango_font_metrics_get_underline_position      (PangoFontMetrics *metrics) G_GNUC_PURE;
-int               pango_font_metrics_get_underline_thickness     (PangoFontMetrics *metrics) G_GNUC_PURE;
-int               pango_font_metrics_get_strikethrough_position  (PangoFontMetrics *metrics) G_GNUC_PURE;
-int               pango_font_metrics_get_strikethrough_thickness (PangoFontMetrics *metrics) G_GNUC_PURE;
-
-#ifdef PANGO_ENABLE_BACKEND
-
-PangoFontMetrics *pango_font_metrics_new (void);
-
-struct _PangoFontMetrics
-{
-  guint ref_count;
-
-  int ascent;
-  int descent;
-  int approximate_char_width;
-  int approximate_digit_width;
-  int underline_position;
-  int underline_thickness;
-  int strikethrough_position;
-  int strikethrough_thickness;
-};
-
-#endif /* PANGO_ENABLE_BACKEND */
-
-/*
- * PangoFontFamily
- */
-
-#define PANGO_TYPE_FONT_FAMILY              (pango_font_family_get_type ())
-#define PANGO_FONT_FAMILY(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_FONT_FAMILY, PangoFontFamily))
-#define PANGO_IS_FONT_FAMILY(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_FONT_FAMILY))
-
-typedef struct _PangoFontFamily      PangoFontFamily;
-typedef struct _PangoFontFace        PangoFontFace;
-
-GType      pango_font_family_get_type       (void) G_GNUC_CONST;
-
-void                 pango_font_family_list_faces (PangoFontFamily  *family,
-						   PangoFontFace  ***faces,
-						   int              *n_faces);
-G_CONST_RETURN char *pango_font_family_get_name   (PangoFontFamily  *family) G_GNUC_PURE;
-gboolean   pango_font_family_is_monospace         (PangoFontFamily  *family) G_GNUC_PURE;
-
-#ifdef PANGO_ENABLE_BACKEND
-
-#define PANGO_FONT_FAMILY_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_FONT_FAMILY, PangoFontFamilyClass))
-#define PANGO_IS_FONT_FAMILY_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_FONT_FAMILY))
-#define PANGO_FONT_FAMILY_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_FONT_FAMILY, PangoFontFamilyClass))
-
-typedef struct _PangoFontFamilyClass PangoFontFamilyClass;
-
-struct _PangoFontFamily
-{
-  GObject parent_instance;
-};
-
-struct _PangoFontFamilyClass
-{
-  GObjectClass parent_class;
-
-  /*< public >*/
-
-  void  (*list_faces)      (PangoFontFamily  *family,
-			    PangoFontFace  ***faces,
-			    int              *n_faces);
-  const char * (*get_name) (PangoFontFamily  *family);
-  gboolean (*is_monospace) (PangoFontFamily *family);
-
-  /*< private >*/
-
-  /* Padding for future expansion */
-  void (*_pango_reserved2) (void);
-  void (*_pango_reserved3) (void);
-  void (*_pango_reserved4) (void);
-};
-
-#endif /* PANGO_ENABLE_BACKEND */
-
-/*
- * PangoFontFace
- */
-
-#define PANGO_TYPE_FONT_FACE              (pango_font_face_get_type ())
-#define PANGO_FONT_FACE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_FONT_FACE, PangoFontFace))
-#define PANGO_IS_FONT_FACE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_FONT_FACE))
-
-GType      pango_font_face_get_type       (void) G_GNUC_CONST;
-
-PangoFontDescription *pango_font_face_describe       (PangoFontFace  *face);
-G_CONST_RETURN char  *pango_font_face_get_face_name  (PangoFontFace  *face) G_GNUC_PURE;
-void                  pango_font_face_list_sizes     (PangoFontFace  *face,
-						      int           **sizes,
-						      int            *n_sizes);
-gboolean              pango_font_face_is_synthesized (PangoFontFace  *face) G_GNUC_PURE;
-
-#ifdef PANGO_ENABLE_BACKEND
-
-#define PANGO_FONT_FACE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_FONT_FACE, PangoFontFaceClass))
-#define PANGO_IS_FONT_FACE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_FONT_FACE))
-#define PANGO_FONT_FACE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_FONT_FACE, PangoFontFaceClass))
-
-typedef struct _PangoFontFaceClass   PangoFontFaceClass;
-
-struct _PangoFontFace
-{
-  GObject parent_instance;
-};
-
-struct _PangoFontFaceClass
-{
-  GObjectClass parent_class;
-
-  /*< public >*/
-
-  const char           * (*get_face_name)  (PangoFontFace *face);
-  PangoFontDescription * (*describe)       (PangoFontFace *face);
-  void                   (*list_sizes)     (PangoFontFace  *face,
-					    int           **sizes,
-					    int            *n_sizes);
-  gboolean               (*is_synthesized) (PangoFontFace *face);
-
-  /*< private >*/
-
-  /* Padding for future expansion */
-  void (*_pango_reserved3) (void);
-  void (*_pango_reserved4) (void);
-};
-
-#endif /* PANGO_ENABLE_BACKEND */
-
-/*
- * PangoFont
- */
-
-#define PANGO_TYPE_FONT              (pango_font_get_type ())
-#define PANGO_FONT(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_FONT, PangoFont))
-#define PANGO_IS_FONT(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_FONT))
-
-GType                 pango_font_get_type          (void) G_GNUC_CONST;
-
-PangoFontDescription *pango_font_describe          (PangoFont        *font);
-PangoFontDescription *pango_font_describe_with_absolute_size (PangoFont        *font);
-PangoCoverage *       pango_font_get_coverage      (PangoFont        *font,
-						    PangoLanguage    *language);
-PangoEngineShape *    pango_font_find_shaper       (PangoFont        *font,
-						    PangoLanguage    *language,
-						    guint32           ch);
-PangoFontMetrics *    pango_font_get_metrics       (PangoFont        *font,
-						    PangoLanguage    *language);
-void                  pango_font_get_glyph_extents (PangoFont        *font,
-						    PangoGlyph        glyph,
-						    PangoRectangle   *ink_rect,
-						    PangoRectangle   *logical_rect);
-PangoFontMap         *pango_font_get_font_map      (PangoFont        *font);
-
-#ifdef PANGO_ENABLE_BACKEND
-
-#define PANGO_FONT_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_FONT, PangoFontClass))
-#define PANGO_IS_FONT_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_FONT))
-#define PANGO_FONT_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_FONT, PangoFontClass))
-
-typedef struct _PangoFontClass       PangoFontClass;
-
-struct _PangoFont
-{
-  GObject parent_instance;
-};
-
-struct _PangoFontClass
-{
-  GObjectClass parent_class;
-
-  /*< public >*/
-
-  PangoFontDescription *(*describe)           (PangoFont      *font);
-  PangoCoverage *       (*get_coverage)       (PangoFont      *font,
-					       PangoLanguage  *lang);
-  PangoEngineShape *    (*find_shaper)        (PangoFont      *font,
-					       PangoLanguage  *lang,
-					       guint32         ch);
-  void                  (*get_glyph_extents)  (PangoFont      *font,
-					       PangoGlyph      glyph,
-					       PangoRectangle *ink_rect,
-					       PangoRectangle *logical_rect);
-  PangoFontMetrics *    (*get_metrics)        (PangoFont      *font,
-					       PangoLanguage  *language);
-  PangoFontMap *        (*get_font_map)       (PangoFont      *font);
-  PangoFontDescription *(*describe_absolute)  (PangoFont      *font);
-  /*< private >*/
-
-  /* Padding for future expansion */
-  void (*_pango_reserved1) (void);
-  void (*_pango_reserved2) (void);
-};
-
-/* used for very rare and miserable situtations that we cannot even
- * draw a hexbox
- */
-#define PANGO_UNKNOWN_GLYPH_WIDTH  10
-#define PANGO_UNKNOWN_GLYPH_HEIGHT 14
-
-#endif /* PANGO_ENABLE_BACKEND */
-
-#define PANGO_GLYPH_EMPTY           ((PangoGlyph)0x0FFFFFFF)
-#define PANGO_GLYPH_INVALID_INPUT   ((PangoGlyph)0xFFFFFFFF)
-#define PANGO_GLYPH_UNKNOWN_FLAG    ((PangoGlyph)0x10000000)
-#define PANGO_GET_UNKNOWN_GLYPH(wc) ((PangoGlyph)(wc)|PANGO_GLYPH_UNKNOWN_FLAG)
-
-
-G_END_DECLS
-
-#endif /* __PANGO_FONT_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-fontmap.h b/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-fontmap.h
deleted file mode 100644
index 204178fc..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-fontmap.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* Pango
- * pango-font.h: Font handling
- *
- * Copyright (C) 2000 Red Hat Software
- *
- * 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 __PANGO_FONTMAP_H__
-#define __PANGO_FONTMAP_H__
-
-#include <pango/pango-font.h>
-#include <pango/pango-fontset.h>
-
-G_BEGIN_DECLS
-
-#define PANGO_TYPE_FONT_MAP              (pango_font_map_get_type ())
-#define PANGO_FONT_MAP(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_FONT_MAP, PangoFontMap))
-#define PANGO_IS_FONT_MAP(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_FONT_MAP))
-
-typedef struct _PangoContext PangoContext;
-
-GType         pango_font_map_get_type       (void) G_GNUC_CONST;
-PangoFont *   pango_font_map_load_font     (PangoFontMap                 *fontmap,
-					    PangoContext                 *context,
-					    const PangoFontDescription   *desc);
-PangoFontset *pango_font_map_load_fontset  (PangoFontMap                 *fontmap,
-					    PangoContext                 *context,
-					    const PangoFontDescription   *desc,
-					    PangoLanguage                *language);
-void          pango_font_map_list_families (PangoFontMap                 *fontmap,
-					    PangoFontFamily            ***families,
-					    int                          *n_families);
-
-#ifdef PANGO_ENABLE_BACKEND
-
-#define PANGO_FONT_MAP_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_FONT_MAP, PangoFontMapClass))
-#define PANGO_IS_FONT_MAP_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_FONT_MAP))
-#define PANGO_FONT_MAP_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_FONT_MAP, PangoFontMapClass))
-
-typedef struct _PangoFontMapClass PangoFontMapClass;
-
-struct _PangoFontMap
-{
-  GObject parent_instance;
-};
-
-struct _PangoFontMapClass
-{
-  GObjectClass parent_class;
-
-  /*< public >*/
-
-  PangoFont *   (*load_font)     (PangoFontMap               *fontmap,
-				  PangoContext               *context,
-				  const PangoFontDescription *desc);
-  void          (*list_families) (PangoFontMap               *fontmap,
-				  PangoFontFamily          ***families,
-				  int                        *n_families);
-  PangoFontset *(*load_fontset)  (PangoFontMap               *fontmap,
-				  PangoContext               *context,
-				  const PangoFontDescription *desc,
-				  PangoLanguage              *language);
-
-  const char *shape_engine_type;
-
-  /*< private >*/
-
-  /* Padding for future expansion */
-  void (*_pango_reserved1) (void);
-  void (*_pango_reserved2) (void);
-  void (*_pango_reserved3) (void);
-  void (*_pango_reserved4) (void);
-};
-
-const char   *pango_font_map_get_shape_engine_type (PangoFontMap *fontmap);
-
-#endif /* PANGO_ENABLE_BACKEND */
-
-G_END_DECLS
-
-#endif /* __PANGO_FONTMAP_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-fontset.h b/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-fontset.h
deleted file mode 100644
index 5c6c7488..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-fontset.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/* Pango
- * pango-fontset.h: Font set handling
- *
- * Copyright (C) 2001 Red Hat Software
- *
- * 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 __PANGO_FONTSET_H__
-#define __PANGO_FONTSET_H__
-
-#include <pango/pango-coverage.h>
-#include <pango/pango-types.h>
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/*
- * PangoFontset
- */
-
-#define PANGO_TYPE_FONTSET              (pango_fontset_get_type ())
-#define PANGO_FONTSET(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_FONTSET, PangoFontset))
-#define PANGO_IS_FONTSET(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_FONTSET))
-
-GType pango_fontset_get_type (void) G_GNUC_CONST;
-
-typedef struct _PangoFontset        PangoFontset;
-
-/**
- * PangoFontsetForeachFunc
- * @fontset: a #PangoFontset
- * @font: a font from @fontset
- * @data: callback data
- *
- * A callback function used by pango_fontset_foreach() when enumerating
- * the fonts in a fontset.
- *
- * Returns: if %TRUE, stop iteration and return immediately.
- *
- * Since: 1.4
- **/
-typedef gboolean (*PangoFontsetForeachFunc) (PangoFontset  *fontset,
-					     PangoFont     *font,
-					     gpointer       data);
-
-PangoFont *       pango_fontset_get_font    (PangoFontset           *fontset,
-					     guint                   wc);
-PangoFontMetrics *pango_fontset_get_metrics (PangoFontset           *fontset);
-void              pango_fontset_foreach     (PangoFontset           *fontset,
-					     PangoFontsetForeachFunc func,
-					     gpointer                data);
-
-#ifdef PANGO_ENABLE_BACKEND
-
-typedef struct _PangoFontsetClass   PangoFontsetClass;
-
-#define PANGO_FONTSET_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_FONTSET, PangoFontsetClass))
-#define PANGO_IS_FONTSET_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_FONTSET))
-#define PANGO_FONTSET_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_FONTSET, PangoFontsetClass))
-
-struct _PangoFontset
-{
-  GObject parent_instance;
-};
-
-struct _PangoFontsetClass
-{
-  GObjectClass parent_class;
-
-  /*< public >*/
-
-  PangoFont *       (*get_font)     (PangoFontset     *fontset,
-				     guint             wc);
-
-  PangoFontMetrics *(*get_metrics)  (PangoFontset     *fontset);
-  PangoLanguage *   (*get_language) (PangoFontset     *fontset);
-  void              (*foreach)      (PangoFontset           *fontset,
-				     PangoFontsetForeachFunc func,
-				     gpointer                data);
-
-  /*< private >*/
-
-  /* Padding for future expansion */
-  void (*_pango_reserved1) (void);
-  void (*_pango_reserved2) (void);
-  void (*_pango_reserved3) (void);
-  void (*_pango_reserved4) (void);
-};
-
-/*
- * PangoFontsetSimple
- */
-
-#define PANGO_TYPE_FONTSET_SIMPLE       (pango_fontset_simple_get_type ())
-#define PANGO_FONTSET_SIMPLE(object)    (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_FONTSET_SIMPLE, PangoFontsetSimple))
-#define PANGO_IS_FONTSET_SIMPLE(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_FONTSET_SIMPLE))
-
-typedef struct _PangoFontsetSimple  PangoFontsetSimple;
-typedef struct _PangoFontsetSimpleClass  PangoFontsetSimpleClass;
-
-GType pango_fontset_simple_get_type (void) G_GNUC_CONST;
-
-PangoFontsetSimple * pango_fontset_simple_new    (PangoLanguage      *language);
-void                 pango_fontset_simple_append (PangoFontsetSimple *fontset,
-						  PangoFont          *font);
-int                  pango_fontset_simple_size   (PangoFontsetSimple *fontset);
-
-#endif /* PANGO_ENABLE_BACKEND */
-
-G_END_DECLS
-
-#endif /* __PANGO_FONTSET_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-glyph-item.h b/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-glyph-item.h
deleted file mode 100644
index 4bad2651..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-glyph-item.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Pango
- * pango-glyph-item.h: Pair of PangoItem and a glyph string
- *
- * Copyright (C) 2002 Red Hat Software
- *
- * 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 __PANGO_GLYPH_ITEM_H__
-#define __PANGO_GLYPH_ITEM_H__
-
-#include <pango/pango-attributes.h>
-#include <pango/pango-break.h>
-#include <pango/pango-item.h>
-#include <pango/pango-glyph.h>
-
-G_BEGIN_DECLS
-
-typedef struct _PangoGlyphItem PangoGlyphItem;
-
-struct _PangoGlyphItem
-{
-  PangoItem        *item;
-  PangoGlyphString *glyphs;
-};
-
-#define PANGO_TYPE_GLYPH_ITEM (pango_glyph_item_get_type ())
-
-GType pango_glyph_item_get_type (void) G_GNUC_CONST;
-
-PangoGlyphItem *pango_glyph_item_split        (PangoGlyphItem *orig,
-					       const char     *text,
-					       int             split_index);
-PangoGlyphItem *pango_glyph_item_copy         (PangoGlyphItem *orig);
-void            pango_glyph_item_free         (PangoGlyphItem *glyph_item);
-GSList *        pango_glyph_item_apply_attrs  (PangoGlyphItem *glyph_item,
-					       const char     *text,
-					       PangoAttrList  *list);
-void            pango_glyph_item_letter_space (PangoGlyphItem *glyph_item,
-					       const char     *text,
-					       PangoLogAttr   *log_attrs,
-					       int             letter_spacing);
-
-G_END_DECLS
-
-#endif /* __PANGO_GLYPH_ITEM_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-glyph.h b/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-glyph.h
deleted file mode 100644
index cd26f53c..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-glyph.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/* Pango
- * pango-glyph.h: Glyph storage
- *
- * Copyright (C) 2000 Red Hat Software
- *
- * 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 __PANGO_GLYPH_H__
-#define __PANGO_GLYPH_H__
-
-#include <pango/pango-types.h>
-#include <pango/pango-item.h>
-
-G_BEGIN_DECLS
-
-typedef struct _PangoGlyphGeometry PangoGlyphGeometry;
-typedef struct _PangoGlyphVisAttr PangoGlyphVisAttr;
-typedef struct _PangoGlyphInfo PangoGlyphInfo;
-typedef struct _PangoGlyphString PangoGlyphString;
-
-/* 1024ths of a device unit */
-typedef gint32 PangoGlyphUnit;
-
-/* Positioning information about a glyph
- */
-struct _PangoGlyphGeometry
-{
-  PangoGlyphUnit width;
-  PangoGlyphUnit x_offset;
-  PangoGlyphUnit y_offset;
-};
-
-/* Visual attributes of a glyph
- */
-struct _PangoGlyphVisAttr
-{
-  guint is_cluster_start : 1;
-};
-
-/* A single glyph
- */
-struct _PangoGlyphInfo
-{
-  PangoGlyph    glyph;
-  PangoGlyphGeometry geometry;
-  PangoGlyphVisAttr  attr;
-};
-
-/* A string of glyphs with positional information and visual attributes -
- * ready for drawing
- */
-struct _PangoGlyphString {
-  gint num_glyphs;
-
-  PangoGlyphInfo *glyphs;
-
-  /* This is a memory inefficient way of representing the information
-   * here - each value gives the byte index within the text
-   * corresponding to the glyph string of the start of the cluster to
-   * which the glyph belongs.
-   */
-  gint *log_clusters;
-
-  /*< private >*/
-  gint space;
-};
-
-#define PANGO_TYPE_GLYPH_STRING (pango_glyph_string_get_type ())
-
-PangoGlyphString *pango_glyph_string_new      (void);
-void              pango_glyph_string_set_size (PangoGlyphString *string,
-					       gint              new_len);
-GType             pango_glyph_string_get_type (void) G_GNUC_CONST;
-PangoGlyphString *pango_glyph_string_copy     (PangoGlyphString *string);
-void              pango_glyph_string_free     (PangoGlyphString *string);
-void              pango_glyph_string_extents  (PangoGlyphString *glyphs,
-					       PangoFont        *font,
-					       PangoRectangle   *ink_rect,
-					       PangoRectangle   *logical_rect);
-int               pango_glyph_string_get_width(PangoGlyphString *glyphs) G_GNUC_PURE;
-
-void              pango_glyph_string_extents_range  (PangoGlyphString *glyphs,
-						     int               start,
-						     int               end,
-						     PangoFont        *font,
-						     PangoRectangle   *ink_rect,
-						     PangoRectangle   *logical_rect);
-
-void pango_glyph_string_get_logical_widths (PangoGlyphString *glyphs,
-					    const char       *text,
-					    int               length,
-					    int               embedding_level,
-					    int              *logical_widths);
-
-void pango_glyph_string_index_to_x (PangoGlyphString *glyphs,
-				    char             *text,
-				    int               length,
-				    PangoAnalysis    *analysis,
-				    int               index_,
-				    gboolean          trailing,
-				    int              *x_pos);
-void pango_glyph_string_x_to_index (PangoGlyphString *glyphs,
-				    char             *text,
-				    int               length,
-				    PangoAnalysis    *analysis,
-				    int               x_pos,
-				    int              *index_,
-				    int              *trailing);
-
-/* Turn a string of characters into a string of glyphs
- */
-void pango_shape (const gchar      *text,
-		  gint              length,
-		  const PangoAnalysis *analysis,
-		  PangoGlyphString *glyphs);
-
-GList *pango_reorder_items (GList *logical_items);
-
-G_END_DECLS
-
-#endif /* __PANGO_GLYPH_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-gravity.h b/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-gravity.h
deleted file mode 100644
index 2e42ebd8..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-gravity.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* Pango
- * pango-gravity.h: Gravity routines
- *
- * Copyright (C) 2006, 2007 Red Hat Software
- *
- * 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 __PANGO_GRAVITY_H__
-#define __PANGO_GRAVITY_H__
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-/**
- * PangoGravity:
- * @PANGO_GRAVITY_SOUTH: Glyphs stand upright (default)
- * @PANGO_GRAVITY_EAST: Glyphs are rotated 90 degrees clockwise
- * @PANGO_GRAVITY_NORTH: Glyphs are upside-down
- * @PANGO_GRAVITY_WEST: Glyphs are rotated 90 degrees counter-clockwise
- * @PANGO_GRAVITY_AUTO: Gravity is resolved from the context matrix
- *
- * The #PangoGravity type represents the orientation of glyphs in a segment
- * of text.  This is useful when rendering vertical text layouts.  In
- * those situations, the layout is rotated using a non-identity PangoMatrix,
- * and then glyph orientation is controlled using #PangoGravity.
- * Not every value in this enumeration makes sense for every usage of
- * #PangoGravity; for example, %PANGO_GRAVITY_AUTO only can be passed to
- * pango_context_set_base_gravity() and can only be returned by
- * pango_context_get_base_gravity().
- *
- * See also: #PangoGravityHint
- *
- * Since: 1.16
- **/
-typedef enum {
-  PANGO_GRAVITY_SOUTH,
-  PANGO_GRAVITY_EAST,
-  PANGO_GRAVITY_NORTH,
-  PANGO_GRAVITY_WEST,
-  PANGO_GRAVITY_AUTO
-} PangoGravity;
-
-/**
- * PangoGravityHint:
- * @PANGO_GRAVITY_HINT_NATURAL: scripts will take their natural gravity based
- * on the base gravity and the script.  This is the default.
- * @PANGO_GRAVITY_HINT_STRONG: always use the base gravity set, regardless of
- * the script.
- * @PANGO_GRAVITY_HINT_LINE: for scripts not in their natural direction (eg.
- * Latin in East gravity), choose per-script gravity such that every script
- * respects the line progression.  This means, Latin and Arabic will take
- * opposite gravities and both flow top-to-bottom for example.
- *
- * The #PangoGravityHint defines how horizontal scripts should behave in a
- * vertical context.  That is, English excerpt in a vertical paragraph for
- * example.
- *
- * See #PangoGravity.
- *
- * Since: 1.16
- **/
-typedef enum {
-  PANGO_GRAVITY_HINT_NATURAL,
-  PANGO_GRAVITY_HINT_STRONG,
-  PANGO_GRAVITY_HINT_LINE
-} PangoGravityHint;
-
-/**
- * PANGO_GRAVITY_IS_VERTICAL:
- * @gravity: the #PangoGravity to check
- *
- * Whether a #PangoGravity represents vertical writing directions.
- *
- * Returns: %TRUE if @gravity is %PANGO_GRAVITY_EAST or %PANGO_GRAVITY_WEST,
- *          %FALSE otherwise.
- *
- * Since: 1.16
- **/
-#define PANGO_GRAVITY_IS_VERTICAL(gravity) \
-	((gravity) == PANGO_GRAVITY_EAST || (gravity) == PANGO_GRAVITY_WEST)
-
-#include <pango/pango-matrix.h>
-#include <pango/pango-script.h>
-
-double       pango_gravity_to_rotation    (PangoGravity       gravity) G_GNUC_CONST;
-PangoGravity pango_gravity_get_for_matrix (const PangoMatrix *matrix) G_GNUC_PURE;
-PangoGravity pango_gravity_get_for_script (PangoScript        script,
-					   PangoGravity       base_gravity,
-					   PangoGravityHint   hint) G_GNUC_CONST;
-
-
-G_END_DECLS
-
-#endif /* __PANGO_GRAVITY_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-item.h b/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-item.h
deleted file mode 100644
index 0775003c..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-item.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Pango
- * pango-item.h: Structure for storing run information
- *
- * Copyright (C) 2000 Red Hat Software
- *
- * 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 __PANGO_ITEM_H__
-#define __PANGO_ITEM_H__
-
-#include <pango/pango-types.h>
-
-G_BEGIN_DECLS
-
-typedef struct _PangoAnalysis PangoAnalysis;
-typedef struct _PangoItem PangoItem;
-
-/* TODO: if more flags are needed, turn this into a real PangoAnalysisFlags enum */
-#define PANGO_ANALYSIS_FLAG_CENTERED_BASELINE (1 << 0)
-
-struct _PangoAnalysis
-{
-  PangoEngineShape *shape_engine;
-  PangoEngineLang  *lang_engine;
-  PangoFont *font;
-
-  guint8 level;
-  guint8 gravity; /* PangoGravity */
-  guint8 flags;
-
-  guint8 script; /* PangoScript */
-  PangoLanguage *language;
-
-  GSList *extra_attrs;
-};
-
-struct _PangoItem
-{
-  gint offset;
-  gint length;
-  gint num_chars;
-  PangoAnalysis analysis;
-};
-
-#define PANGO_TYPE_ITEM (pango_item_get_type ())
-
-GType pango_item_get_type (void) G_GNUC_CONST;
-
-PangoItem *pango_item_new   (void);
-PangoItem *pango_item_copy  (PangoItem  *item);
-void       pango_item_free  (PangoItem  *item);
-PangoItem *pango_item_split (PangoItem  *orig,
-			     int         split_index,
-			     int         split_offset);
-
-G_END_DECLS
-
-#endif /* __PANGO_ITEM_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-language.h b/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-language.h
deleted file mode 100644
index 9c1a9d8d..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-language.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Pango
- * pango-language.h: Language handling routines
- *
- * Copyright (C) 1999 Red Hat Software
- *
- * 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 __PANGO_LANGUAGE_H__
-#define __PANGO_LANGUAGE_H__
-
-#include <glib.h>
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/* Dummy typedef - internally it's a 'const char *' */
-typedef struct _PangoLanguage PangoLanguage;
-
-#define PANGO_TYPE_LANGUAGE (pango_language_get_type ())
-
-GType          pango_language_get_type    (void) G_GNUC_CONST;
-PangoLanguage *pango_language_from_string (const char *language);
-
-#define pango_language_to_string(language) ((const char *)language)
-
-G_CONST_RETURN char *pango_language_get_sample_string (PangoLanguage *language) G_GNUC_CONST;
-PangoLanguage *pango_language_get_default (void) G_GNUC_CONST;
-
-gboolean      pango_language_matches  (PangoLanguage *language,
-				       const char *range_list) G_GNUC_PURE;
-
-G_END_DECLS
-
-#endif /* __PANGO_LANGUAGE_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-layout.h b/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-layout.h
deleted file mode 100644
index 108ce872..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-layout.h
+++ /dev/null
@@ -1,290 +0,0 @@
-/* Pango
- * pango-layout.h: High-level layout driver
- *
- * Copyright (C) 2000 Red Hat Software
- *
- * 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 __PANGO_LAYOUT_H__
-#define __PANGO_LAYOUT_H__
-
-#include <pango/pango-attributes.h>
-#include <pango/pango-context.h>
-#include <pango/pango-glyph-item.h>
-#include <pango/pango-tabs.h>
-
-G_BEGIN_DECLS
-
-typedef struct _PangoLayout      PangoLayout;
-typedef struct _PangoLayoutClass PangoLayoutClass;
-typedef struct _PangoLayoutLine  PangoLayoutLine;
-
-typedef PangoGlyphItem PangoLayoutRun;
-
-typedef enum {
-  PANGO_ALIGN_LEFT,
-  PANGO_ALIGN_CENTER,
-  PANGO_ALIGN_RIGHT
-} PangoAlignment;
-
-typedef enum {
-  PANGO_WRAP_WORD,
-  PANGO_WRAP_CHAR,
-  PANGO_WRAP_WORD_CHAR
-} PangoWrapMode;
-
-/**
- * PangoEllipsizeMode
- * @PANGO_ELLIPSIZE_NONE: No ellipsization
- * @PANGO_ELLIPSIZE_START: Omit characters at the start of the text
- * @PANGO_ELLIPSIZE_MIDDLE: Omit characters in the middle of the text
- * @PANGO_ELLIPSIZE_END: Omit characters at the end of the text
- *
- * The #PangoEllipsizeMode type describes what sort of (if any)
- * ellipsization should be applied to a line of text. In
- * the ellipsization process characters are removed from the
- * text in order to make it fit to a given width and replaced
- * with an ellipsis.
- */
-typedef enum {
-  PANGO_ELLIPSIZE_NONE,
-  PANGO_ELLIPSIZE_START,
-  PANGO_ELLIPSIZE_MIDDLE,
-  PANGO_ELLIPSIZE_END
-} PangoEllipsizeMode;
-
-struct _PangoLayoutLine
-{
-  PangoLayout *layout;
-  gint         start_index;     /* start of line as byte index into layout->text */
-  gint         length;		/* length of line in bytes */
-  GSList      *runs;
-  guint        is_paragraph_start : 1;  /* TRUE if this is the first line of the paragraph */
-  guint        resolved_dir : 3;  /* Resolved PangoDirection of line */
-};
-
-#define PANGO_TYPE_LAYOUT              (pango_layout_get_type ())
-#define PANGO_LAYOUT(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_LAYOUT, PangoLayout))
-#define PANGO_LAYOUT_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_LAYOUT, PangoLayoutClass))
-#define PANGO_IS_LAYOUT(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_LAYOUT))
-#define PANGO_IS_LAYOUT_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_LAYOUT))
-#define PANGO_LAYOUT_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_LAYOUT, PangoLayoutClass))
-
-/* The PangoLayout and PangoLayoutClass structs are private; if you
- * need to create a subclass of these, file a bug.
- */
-
-GType        pango_layout_get_type       (void) G_GNUC_CONST;
-PangoLayout *pango_layout_new            (PangoContext   *context);
-PangoLayout *pango_layout_copy           (PangoLayout    *src);
-
-PangoContext  *pango_layout_get_context    (PangoLayout    *layout);
-
-void           pango_layout_set_attributes (PangoLayout    *layout,
-					    PangoAttrList  *attrs);
-PangoAttrList *pango_layout_get_attributes (PangoLayout    *layout);
-
-void           pango_layout_set_text       (PangoLayout    *layout,
-					    const char     *text,
-					    int             length);
-const char    *pango_layout_get_text       (PangoLayout    *layout);
-
-void           pango_layout_set_markup     (PangoLayout    *layout,
-					    const char     *markup,
-					    int             length);
-
-void           pango_layout_set_markup_with_accel (PangoLayout    *layout,
-						   const char     *markup,
-						   int             length,
-						   gunichar        accel_marker,
-						   gunichar       *accel_char);
-
-void           pango_layout_set_font_description (PangoLayout                *layout,
-						  const PangoFontDescription *desc);
-
-G_CONST_RETURN PangoFontDescription *pango_layout_get_font_description (PangoLayout *layout);
-
-void           pango_layout_set_width            (PangoLayout                *layout,
-						  int                         width);
-int            pango_layout_get_width            (PangoLayout                *layout);
-void           pango_layout_set_height           (PangoLayout                *layout,
-						  int                         height);
-int            pango_layout_get_height           (PangoLayout                *layout);
-void           pango_layout_set_wrap             (PangoLayout                *layout,
-						  PangoWrapMode               wrap);
-PangoWrapMode  pango_layout_get_wrap             (PangoLayout                *layout);
-gboolean       pango_layout_is_wrapped           (PangoLayout                *layout);
-void           pango_layout_set_indent           (PangoLayout                *layout,
-						  int                         indent);
-int            pango_layout_get_indent           (PangoLayout                *layout);
-void           pango_layout_set_spacing          (PangoLayout                *layout,
-						  int                         spacing);
-int            pango_layout_get_spacing          (PangoLayout                *layout);
-void           pango_layout_set_justify          (PangoLayout                *layout,
-						  gboolean                    justify);
-gboolean       pango_layout_get_justify          (PangoLayout                *layout);
-void           pango_layout_set_auto_dir         (PangoLayout                *layout,
-						  gboolean                    auto_dir);
-gboolean       pango_layout_get_auto_dir         (PangoLayout                *layout);
-void           pango_layout_set_alignment        (PangoLayout                *layout,
-						  PangoAlignment              alignment);
-PangoAlignment pango_layout_get_alignment        (PangoLayout                *layout);
-
-void           pango_layout_set_tabs             (PangoLayout                *layout,
-						  PangoTabArray              *tabs);
-
-PangoTabArray* pango_layout_get_tabs             (PangoLayout                *layout);
-
-void           pango_layout_set_single_paragraph_mode (PangoLayout                *layout,
-						       gboolean                    setting);
-gboolean       pango_layout_get_single_paragraph_mode (PangoLayout                *layout);
-
-void               pango_layout_set_ellipsize (PangoLayout        *layout,
-					       PangoEllipsizeMode  ellipsize);
-PangoEllipsizeMode pango_layout_get_ellipsize (PangoLayout        *layout);
-gboolean           pango_layout_is_ellipsized (PangoLayout        *layout);
-
-int      pango_layout_get_unknown_glyphs_count (PangoLayout    *layout);
-
-void     pango_layout_context_changed (PangoLayout    *layout);
-
-void     pango_layout_get_log_attrs (PangoLayout    *layout,
-				     PangoLogAttr  **attrs,
-				     gint           *n_attrs);
-
-void     pango_layout_index_to_pos         (PangoLayout    *layout,
-					    int             index_,
-					    PangoRectangle *pos);
-void     pango_layout_index_to_line_x      (PangoLayout    *layout,
-					    int             index_,
-					    gboolean        trailing,
-					    int            *line,
-					    int            *x_pos);
-void     pango_layout_get_cursor_pos       (PangoLayout    *layout,
-					    int             index_,
-					    PangoRectangle *strong_pos,
-					    PangoRectangle *weak_pos);
-void     pango_layout_move_cursor_visually (PangoLayout    *layout,
-					    gboolean        strong,
-					    int             old_index,
-					    int             old_trailing,
-					    int             direction,
-					    int            *new_index,
-					    int            *new_trailing);
-gboolean pango_layout_xy_to_index          (PangoLayout    *layout,
-					    int             x,
-					    int             y,
-					    int            *index_,
-					    int            *trailing);
-void     pango_layout_get_extents          (PangoLayout    *layout,
-					    PangoRectangle *ink_rect,
-					    PangoRectangle *logical_rect);
-void     pango_layout_get_pixel_extents    (PangoLayout    *layout,
-					    PangoRectangle *ink_rect,
-					    PangoRectangle *logical_rect);
-void     pango_layout_get_size             (PangoLayout    *layout,
-					    int            *width,
-					    int            *height);
-void     pango_layout_get_pixel_size       (PangoLayout    *layout,
-					    int            *width,
-					    int            *height);
-
-int              pango_layout_get_line_count       (PangoLayout    *layout);
-PangoLayoutLine *pango_layout_get_line             (PangoLayout    *layout,
-						    int             line);
-PangoLayoutLine *pango_layout_get_line_readonly    (PangoLayout    *layout,
-						    int             line);
-GSList *         pango_layout_get_lines            (PangoLayout    *layout);
-GSList *         pango_layout_get_lines_readonly   (PangoLayout    *layout);
-
-
-#define PANGO_TYPE_LAYOUT_LINE (pango_layout_line_get_type ())
-
-GType    pango_layout_line_get_type     (void) G_GNUC_CONST;
-
-PangoLayoutLine *pango_layout_line_ref   (PangoLayoutLine *line);
-void             pango_layout_line_unref (PangoLayoutLine *line);
-
-gboolean pango_layout_line_x_to_index   (PangoLayoutLine  *line,
-					 int               x_pos,
-					 int              *index_,
-					 int              *trailing);
-void     pango_layout_line_index_to_x   (PangoLayoutLine  *line,
-					 int               index_,
-					 gboolean          trailing,
-					 int              *x_pos);
-void     pango_layout_line_get_x_ranges (PangoLayoutLine  *line,
-					 int               start_index,
-					 int               end_index,
-					 int             **ranges,
-					 int              *n_ranges);
-void     pango_layout_line_get_extents  (PangoLayoutLine  *line,
-					 PangoRectangle   *ink_rect,
-					 PangoRectangle   *logical_rect);
-void     pango_layout_line_get_pixel_extents (PangoLayoutLine *layout_line,
-					      PangoRectangle  *ink_rect,
-					      PangoRectangle  *logical_rect);
-
-typedef struct _PangoLayoutIter PangoLayoutIter;
-
-#define PANGO_TYPE_LAYOUT_ITER         (pango_layout_iter_get_type ())
-
-GType            pango_layout_iter_get_type (void) G_GNUC_CONST;
-
-PangoLayoutIter *pango_layout_get_iter  (PangoLayout     *layout);
-PangoLayoutIter *pango_layout_iter_copy (PangoLayoutIter *iter);
-void             pango_layout_iter_free (PangoLayoutIter *iter);
-
-int              pango_layout_iter_get_index  (PangoLayoutIter *iter);
-PangoLayoutRun  *pango_layout_iter_get_run    (PangoLayoutIter *iter);
-PangoLayoutRun  *pango_layout_iter_get_run_readonly   (PangoLayoutIter *iter);
-PangoLayoutLine *pango_layout_iter_get_line   (PangoLayoutIter *iter);
-PangoLayoutLine *pango_layout_iter_get_line_readonly  (PangoLayoutIter *iter);
-gboolean         pango_layout_iter_at_last_line (PangoLayoutIter *iter);
-PangoLayout     *pango_layout_iter_get_layout (PangoLayoutIter *iter);
-
-gboolean pango_layout_iter_next_char    (PangoLayoutIter *iter);
-gboolean pango_layout_iter_next_cluster (PangoLayoutIter *iter);
-gboolean pango_layout_iter_next_run     (PangoLayoutIter *iter);
-gboolean pango_layout_iter_next_line    (PangoLayoutIter *iter);
-
-void pango_layout_iter_get_char_extents    (PangoLayoutIter *iter,
-					    PangoRectangle  *logical_rect);
-void pango_layout_iter_get_cluster_extents (PangoLayoutIter *iter,
-					    PangoRectangle  *ink_rect,
-					    PangoRectangle  *logical_rect);
-void pango_layout_iter_get_run_extents     (PangoLayoutIter *iter,
-					    PangoRectangle  *ink_rect,
-					    PangoRectangle  *logical_rect);
-void pango_layout_iter_get_line_extents    (PangoLayoutIter *iter,
-					    PangoRectangle  *ink_rect,
-					    PangoRectangle  *logical_rect);
-/* All the yranges meet, unlike the logical_rect's (i.e. the yranges
- * assign between-line spacing to the nearest line)
- */
-void pango_layout_iter_get_line_yrange     (PangoLayoutIter *iter,
-					    int             *y0_,
-					    int             *y1_);
-void pango_layout_iter_get_layout_extents  (PangoLayoutIter *iter,
-					    PangoRectangle  *ink_rect,
-					    PangoRectangle  *logical_rect);
-int  pango_layout_iter_get_baseline        (PangoLayoutIter *iter);
-
-G_END_DECLS
-
-#endif /* __PANGO_LAYOUT_H__ */
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-matrix.h b/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-matrix.h
deleted file mode 100644
index 5909367d..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-matrix.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* Pango
- * pango-matrix.h: Matrix manipulation routines
- *
- * Copyright (C) 2002, 2006 Red Hat Software
- *
- * 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 __PANGO_MATRIX_H__
-#define __PANGO_MATRIX_H__
-
-#include <glib.h>
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-typedef struct _PangoMatrix    PangoMatrix;
-
-/**
- * PangoMatrix:
- * @xx: 1st component of the transformation matrix
- * @xy: 2nd component of the transformation matrix
- * @yx: 3rd component of the transformation matrix
- * @yy: 4th component of the transformation matrix
- * @x0: x translation
- * @y0: y translation
- *
- * A structure specifying a transformation between user-space
- * coordinates and device coordinates. The transformation
- * is given by
- *
- * <programlisting>
- * x_device = x_user * matrix->xx + y_user * matrix->xy + matrix->x0;
- * y_device = x_user * matrix->yx + y_user * matrix->yy + matrix->y0;
- * </programlisting>
- *
- * Since: 1.6
- **/
-struct _PangoMatrix
-{
-  double xx;
-  double xy;
-  double yx;
-  double yy;
-  double x0;
-  double y0;
-};
-
-/**
- * PANGO_TYPE_MATRIX
- *
- * The GObject type for #PangoMatrix
- **/
-#define PANGO_TYPE_MATRIX (pango_matrix_get_type ())
-
-/**
- * PANGO_MATRIX_INIT
- *
- * Constant that can be used to initialize a PangoMatrix to
- * the identity transform.
- *
- * <informalexample><programlisting>
- * PangoMatrix matrix = PANGO_MATRIX_INIT;
- * pango_matrix_rotate (&amp;matrix, 45.);
- * </programlisting></informalexample>
- *
- * Since: 1.6
- **/
-#define PANGO_MATRIX_INIT { 1., 0., 0., 1., 0., 0. }
-
-/* for PangoRectangle */
-#include <pango/pango-types.h>
-
-GType pango_matrix_get_type (void) G_GNUC_CONST;
-
-PangoMatrix *pango_matrix_copy   (const PangoMatrix *matrix);
-void         pango_matrix_free   (PangoMatrix *matrix);
-
-void pango_matrix_translate (PangoMatrix *matrix,
-			     double       tx,
-			     double       ty);
-void pango_matrix_scale     (PangoMatrix *matrix,
-			     double       scale_x,
-			     double       scale_y);
-void pango_matrix_rotate    (PangoMatrix *matrix,
-			     double       degrees);
-void pango_matrix_concat    (PangoMatrix       *matrix,
-			     const PangoMatrix *new_matrix);
-void pango_matrix_transform_point    (const PangoMatrix *matrix,
-				      double            *x,
-				      double            *y);
-void pango_matrix_transform_distance (const PangoMatrix *matrix,
-				      double            *dx,
-				      double            *dy);
-void pango_matrix_transform_rectangle (const PangoMatrix *matrix,
-				       PangoRectangle    *rect);
-void pango_matrix_transform_pixel_rectangle (const PangoMatrix *matrix,
-					     PangoRectangle    *rect);
-double pango_matrix_get_font_scale_factor (const PangoMatrix *matrix) G_GNUC_PURE;
-
-
-G_END_DECLS
-
-#endif /* __PANGO_MATRIX_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-modules.h b/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-modules.h
deleted file mode 100644
index 5dbcfe9f..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-modules.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Pango
- * pango-modules.h:
- *
- * Copyright (C) 1999 Red Hat Software
- *
- * 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 __PANGO_MODULES_H__
-#define __PANGO_MODULES_H__
-
-#include <pango/pango-engine.h>
-
-G_BEGIN_DECLS
-
-#ifdef PANGO_ENABLE_BACKEND
-
-typedef struct _PangoMap PangoMap;
-typedef struct _PangoMapEntry PangoMapEntry;
-
-typedef struct _PangoIncludedModule PangoIncludedModule;
-
-struct _PangoIncludedModule
-{
-  void (*list) (PangoEngineInfo **engines,
-		int              *n_engines);
-  void (*init) (GTypeModule      *module);
-  void (*exit) (void);
-  PangoEngine *(*create) (const char       *id);
-};
-
-PangoMap *     pango_find_map        (PangoLanguage       *language,
-				      guint                engine_type_id,
-				      guint                render_type_id);
-PangoEngine *  pango_map_get_engine  (PangoMap            *map,
-				      PangoScript          script);
-void           pango_map_get_engines (PangoMap            *map,
-				      PangoScript          script,
-				      GSList             **exact_engines,
-				      GSList             **fallback_engines);
-void           pango_module_register (PangoIncludedModule *module);
-
-#endif /* PANGO_ENABLE_BACKEND */
-
-G_END_DECLS
-
-#endif /* __PANGO_MODULES_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-ot.h b/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-ot.h
deleted file mode 100644
index f9d787a8..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-ot.h
+++ /dev/null
@@ -1,196 +0,0 @@
-/* Pango
- * pango-ot.h:
- *
- * Copyright (C) 2000,2007 Red Hat Software
- *
- * 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 __PANGO_OT_H__
-#define __PANGO_OT_H__
-
-#include <pango/pangofc-font.h>
-#include <pango/pango-glyph.h>
-#include <pango/pango-font.h>
-#include <pango/pango-script.h>
-#include <pango/pango-language.h>
-
-G_BEGIN_DECLS
-
-#ifdef PANGO_ENABLE_ENGINE
-
-typedef guint32 PangoOTTag;
-
-#define PANGO_OT_TAG_MAKE(c1,c2,c3,c4)		((PangoOTTag) FT_MAKE_TAG (c1, c2, c3, c4))
-#define PANGO_OT_TAG_MAKE_FROM_STRING(s)	(PANGO_OT_TAG_MAKE(((const char *) s)[0], \
-								   ((const char *) s)[1], \
-								   ((const char *) s)[2], \
-								   ((const char *) s)[3]))
-
-typedef struct _PangoOTInfo       PangoOTInfo;
-typedef struct _PangoOTBuffer     PangoOTBuffer;
-typedef struct _PangoOTGlyph      PangoOTGlyph;
-typedef struct _PangoOTRuleset    PangoOTRuleset;
-typedef struct _PangoOTFeatureMap PangoOTFeatureMap;
-typedef struct _PangoOTRulesetDescription PangoOTRulesetDescription;
-
-typedef enum
-{
-  PANGO_OT_TABLE_GSUB,
-  PANGO_OT_TABLE_GPOS
-} PangoOTTableType;
-
-#define PANGO_OT_ALL_GLYPHS			((guint) 0xFFFF)
-#define PANGO_OT_NO_FEATURE			((guint) 0xFFFF)
-#define PANGO_OT_NO_SCRIPT			((guint) 0xFFFF)
-#define PANGO_OT_DEFAULT_LANGUAGE		((guint) 0xFFFF)
-
-#define PANGO_OT_TAG_DEFAULT_SCRIPT		PANGO_OT_TAG_MAKE ('D', 'F', 'L', 'T')
-#define PANGO_OT_TAG_DEFAULT_LANGUAGE		PANGO_OT_TAG_MAKE ('d', 'f', 'l', 't')
-
-/* Note that this must match HB_GlyphItem */
-struct _PangoOTGlyph
-{
-  guint    glyph;
-  guint    properties;
-  guint    cluster;
-  gushort  component;
-  gushort  ligID;
-  gushort  property_cache;    /* Internal */
-};
-
-struct _PangoOTFeatureMap
-{
-  char     feature_name[5];
-  gulong   property_bit;
-};
-
-struct _PangoOTRulesetDescription {
-  PangoScript               script;
-  PangoLanguage            *language;
-  const PangoOTFeatureMap  *static_gsub_features;
-  guint                   n_static_gsub_features;
-  const PangoOTFeatureMap  *static_gpos_features;
-  guint                   n_static_gpos_features;
-  const PangoOTFeatureMap  *other_features;
-  guint                   n_other_features;
-};
-
-
-#define PANGO_TYPE_OT_INFO              (pango_ot_info_get_type ())
-#define PANGO_OT_INFO(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_OT_INFO, PangoOTInfo))
-#define PANGO_IS_OT_INFO(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_OT_INFO))
-GType pango_ot_info_get_type (void) G_GNUC_CONST;
-
-#define PANGO_TYPE_OT_RULESET           (pango_ot_ruleset_get_type ())
-#define PANGO_OT_RULESET(object)        (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_OT_RULESET, PangoOTRuleset))
-#define PANGO_IS_OT_RULESET(object)     (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_OT_RULESET))
-GType pango_ot_ruleset_get_type (void) G_GNUC_CONST;
-
-
-PangoOTInfo *pango_ot_info_get (FT_Face face);
-
-gboolean pango_ot_info_find_script   (PangoOTInfo      *info,
-				      PangoOTTableType  table_type,
-				      PangoOTTag        script_tag,
-				      guint            *script_index);
-gboolean pango_ot_info_find_language (PangoOTInfo      *info,
-				      PangoOTTableType  table_type,
-				      guint             script_index,
-				      PangoOTTag        language_tag,
-				      guint            *language_index,
-				      guint            *required_feature_index);
-gboolean pango_ot_info_find_feature  (PangoOTInfo      *info,
-				      PangoOTTableType  table_type,
-				      PangoOTTag        feature_tag,
-				      guint             script_index,
-				      guint             language_index,
-				      guint            *feature_index);
-
-PangoOTTag *pango_ot_info_list_scripts   (PangoOTInfo      *info,
-					  PangoOTTableType  table_type);
-PangoOTTag *pango_ot_info_list_languages (PangoOTInfo      *info,
-					  PangoOTTableType  table_type,
-					  guint             script_index,
-					  PangoOTTag        language_tag);
-PangoOTTag *pango_ot_info_list_features  (PangoOTInfo      *info,
-					  PangoOTTableType  table_type,
-					  PangoOTTag        tag,
-					  guint             script_index,
-					  guint             language_index);
-
-PangoOTBuffer *pango_ot_buffer_new        (PangoFcFont       *font);
-void           pango_ot_buffer_destroy    (PangoOTBuffer     *buffer);
-void           pango_ot_buffer_clear      (PangoOTBuffer     *buffer);
-void           pango_ot_buffer_set_rtl    (PangoOTBuffer     *buffer,
-					   gboolean           rtl);
-void           pango_ot_buffer_add_glyph  (PangoOTBuffer     *buffer,
-					   guint              glyph,
-					   guint              properties,
-					   guint              cluster);
-void           pango_ot_buffer_get_glyphs (const PangoOTBuffer  *buffer,
-					   PangoOTGlyph        **glyphs,
-					   int                  *n_glyphs);
-void           pango_ot_buffer_output     (const PangoOTBuffer  *buffer,
-					   PangoGlyphString     *glyphs);
-
-void           pango_ot_buffer_set_zero_width_marks (PangoOTBuffer     *buffer,
-						     gboolean           zero_width_marks);
-
-const PangoOTRuleset *pango_ot_ruleset_get_for_description (PangoOTInfo                     *info,
-							    const PangoOTRulesetDescription *desc);
-PangoOTRuleset *pango_ot_ruleset_new (PangoOTInfo       *info);
-PangoOTRuleset *pango_ot_ruleset_new_for (PangoOTInfo       *info,
-					  PangoScript        script,
-					  PangoLanguage     *language);
-PangoOTRuleset *pango_ot_ruleset_new_from_description (PangoOTInfo                     *info,
-						       const PangoOTRulesetDescription *desc);
-void            pango_ot_ruleset_add_feature (PangoOTRuleset   *ruleset,
-					      PangoOTTableType  table_type,
-					      guint             feature_index,
-					      gulong            property_bit);
-gboolean        pango_ot_ruleset_maybe_add_feature (PangoOTRuleset   *ruleset,
-						    PangoOTTableType  table_type,
-						    PangoOTTag        feature_tag,
-						    gulong            property_bit);
-guint           pango_ot_ruleset_maybe_add_features (PangoOTRuleset          *ruleset,
-						     PangoOTTableType         table_type,
-						     const PangoOTFeatureMap *features,
-						     guint                    n_features);
-guint           pango_ot_ruleset_get_feature_count (const PangoOTRuleset   *ruleset,
-						    guint                  *n_gsub_features,
-						    guint                  *n_gpos_features);
-void            pango_ot_ruleset_substitute  (const PangoOTRuleset   *ruleset,
-					      PangoOTBuffer          *buffer);
-void            pango_ot_ruleset_position    (const PangoOTRuleset   *ruleset,
-					      PangoOTBuffer          *buffer);
-PangoScript     pango_ot_tag_to_script     (PangoOTTag     script_tag) G_GNUC_CONST;
-PangoOTTag      pango_ot_tag_from_script   (PangoScript    script) G_GNUC_CONST;
-PangoLanguage  *pango_ot_tag_to_language   (PangoOTTag     language_tag) G_GNUC_CONST;
-PangoOTTag      pango_ot_tag_from_language (PangoLanguage *language) G_GNUC_CONST;
-
-guint           pango_ot_ruleset_description_hash  (const PangoOTRulesetDescription *desc) G_GNUC_PURE;
-gboolean        pango_ot_ruleset_description_equal (const PangoOTRulesetDescription *desc1,
-						    const PangoOTRulesetDescription *desc2) G_GNUC_PURE;
-PangoOTRulesetDescription *pango_ot_ruleset_description_copy  (const PangoOTRulesetDescription *desc);
-void            pango_ot_ruleset_description_free  (PangoOTRulesetDescription       *desc);
-
-
-#endif /* PANGO_ENABLE_ENGINE */
-
-G_END_DECLS
-
-#endif /* __PANGO_OT_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-renderer.h b/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-renderer.h
deleted file mode 100644
index 89c45fac..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-renderer.h
+++ /dev/null
@@ -1,246 +0,0 @@
-/* Pango
- * pango-renderer.h: Base class for rendering
- *
- * Copyright (C) 2004, 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 __PANGO_RENDERER_H_
-#define __PANGO_RENDERER_H_
-
-#include <pango/pango-layout.h>
-
-G_BEGIN_DECLS
-
-#define PANGO_TYPE_RENDERER            (pango_renderer_get_type())
-#define PANGO_RENDERER(object)         (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_RENDERER, PangoRenderer))
-#define PANGO_IS_RENDERER(object)      (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_RENDERER))
-#define PANGO_RENDERER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_RENDERER, PangoRendererClass))
-#define PANGO_IS_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_RENDERER))
-#define PANGO_RENDERER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_RENDERER, PangoRendererClass))
-
-typedef struct _PangoRenderer        PangoRenderer;
-typedef struct _PangoRendererClass   PangoRendererClass;
-typedef struct _PangoRendererPrivate PangoRendererPrivate;
-
-/**
- * PangoRenderPart:
- * @PANGO_RENDER_PART_FOREGROUND: the text itself
- * @PANGO_RENDER_PART_BACKGROUND: the area behind the text
- * @PANGO_RENDER_PART_UNDERLINE: underlines
- * @PANGO_RENDER_PART_STRIKETHROUGH: strikethrough lines
- *
- * #PangoRenderPart defines different items to render for such
- * purposes as setting colors.
- *
- * Since: 1.8
- **/
-/* When extending, note N_RENDER_PARTS #define in pango-renderer.c */
-typedef enum
-{
-  PANGO_RENDER_PART_FOREGROUND,
-  PANGO_RENDER_PART_BACKGROUND,
-  PANGO_RENDER_PART_UNDERLINE,
-  PANGO_RENDER_PART_STRIKETHROUGH
-} PangoRenderPart;
-
-/**
- * PangoRenderer:
- * @matrix: the current transformation matrix for the Renderer; may
- *    be %NULL, which should be treated the same as the identity matrix.
- *
- * #PangoRenderer is a base class for objects that are used to
- * render Pango objects such as #PangoGlyphString and
- * #PangoLayout.
- *
- * Since: 1.8
- **/
-struct _PangoRenderer
-{
-  /*< private >*/
-  GObject parent_instance;
-
-  PangoUnderline underline;
-  gboolean strikethrough;
-  int active_count;
-
-  /*< public >*/
-  PangoMatrix *matrix;		/* May be NULL */
-
-  /*< private >*/
-  PangoRendererPrivate *priv;
-};
-
-/**
- * PangoRendererClass:
- * @draw_glyphs: draws a #PangoGlyphString
- * @draw_rectangle: draws a rectangle
- * @draw_error_underline: draws a squiggly line that approximately
- * covers the given rectangle in the style of an underline used to
- * indicate a spelling error.
- * @draw_shape: draw content for a glyph shaped with #PangoAttrShape.
- *   @x, @y are the coordinates of the left edge of the baseline,
- *   in user coordinates.
- * @draw_trapezoid: draws a trapezoidal filled area
- * @draw_glyph: draws a single glyph
- * @part_changed: do renderer specific processing when rendering
- *  attributes change
- * @begin: Do renderer-specific initialization before drawing
- * @end: Do renderer-specific cleanup after drawing
- * @prepare_run: updates the renderer for a new run
- *
- * Class structure for #PangoRenderer.
- *
- * Since: 1.8
- **/
-struct _PangoRendererClass
-{
-  /*< private >*/
-  GObjectClass parent_class;
-
-  /* vtable - not signals */
-  /*< public >*/
-
-  /* All of the following have default implementations
-   * and take as coordinates user coordinates in Pango units
-   */
-  void (*draw_glyphs) (PangoRenderer     *renderer,
-		       PangoFont         *font,
-		       PangoGlyphString  *glyphs,
-		       int                x,
-		       int                y);
-  void (*draw_rectangle) (PangoRenderer     *renderer,
-			  PangoRenderPart    part,
-			  int                x,
-			  int                y,
-			  int                width,
-			  int                height);
-  void (*draw_error_underline) (PangoRenderer     *renderer,
-				int                x,
-				int                y,
-				int                width,
-				int                height);
-
-  /* Nothing is drawn for shaped glyphs unless this is implemented */
-  void (*draw_shape) (PangoRenderer  *renderer,
-		      PangoAttrShape *attr,
-		      int             x,
-		      int             y);
-
-  /* These two must be implemented and take coordinates in
-   * device space as doubles.
-   */
-  void (*draw_trapezoid) (PangoRenderer  *renderer,
-			  PangoRenderPart part,
-			  double          y1_,
-			  double          x11,
-			  double          x21,
-			  double          y2,
-			  double          x12,
-			  double          x22);
-  void (*draw_glyph) (PangoRenderer *renderer,
-		      PangoFont     *font,
-		      PangoGlyph     glyph,
-		      double         x,
-		      double         y);
-
-  /* Notification of change in rendering attributes
-   */
-  void (*part_changed) (PangoRenderer   *renderer,
-			PangoRenderPart  part);
-
-  /* Paired around drawing operations
-   */
-  void (*begin) (PangoRenderer *renderer);
-  void (*end)   (PangoRenderer *renderer);
-
-  /* Hooks into the details of layout rendering
-   */
-  void (*prepare_run) (PangoRenderer  *renderer,
-		       PangoLayoutRun *run);
-
-  /*< private >*/
-
-  /* Padding for future expansion */
-  void (*_pango_reserved1) (void);
-  void (*_pango_reserved2) (void);
-  void (*_pango_reserved3) (void);
-  void (*_pango_reserved4) (void);
-};
-
-GType pango_renderer_get_type    (void) G_GNUC_CONST;
-
-void pango_renderer_draw_layout          (PangoRenderer    *renderer,
-					  PangoLayout      *layout,
-					  int               x,
-					  int               y);
-void pango_renderer_draw_layout_line     (PangoRenderer    *renderer,
-					  PangoLayoutLine  *line,
-					  int               x,
-					  int               y);
-void pango_renderer_draw_glyphs          (PangoRenderer    *renderer,
-					  PangoFont        *font,
-					  PangoGlyphString *glyphs,
-					  int               x,
-					  int               y);
-void pango_renderer_draw_rectangle       (PangoRenderer    *renderer,
-					  PangoRenderPart   part,
-					  int               x,
-					  int               y,
-					  int               width,
-					  int               height);
-void pango_renderer_draw_error_underline (PangoRenderer    *renderer,
-					  int               x,
-					  int               y,
-					  int               width,
-					  int               height);
-void pango_renderer_draw_trapezoid       (PangoRenderer    *renderer,
-					  PangoRenderPart   part,
-					  double            y1_,
-					  double            x11,
-					  double            x21,
-					  double            y2,
-					  double            x12,
-					  double            x22);
-void pango_renderer_draw_glyph           (PangoRenderer    *renderer,
-					  PangoFont        *font,
-					  PangoGlyph        glyph,
-					  double            x,
-					  double            y);
-
-void pango_renderer_activate             (PangoRenderer    *renderer);
-void pango_renderer_deactivate           (PangoRenderer    *renderer);
-
-void        pango_renderer_part_changed (PangoRenderer   *renderer,
-					 PangoRenderPart  part);
-
-void        pango_renderer_set_color (PangoRenderer    *renderer,
-				      PangoRenderPart   part,
-				      const PangoColor *color);
-PangoColor *pango_renderer_get_color (PangoRenderer    *renderer,
-				      PangoRenderPart   part);
-
-void                        pango_renderer_set_matrix (PangoRenderer     *renderer,
-						       const PangoMatrix *matrix);
-G_CONST_RETURN PangoMatrix *pango_renderer_get_matrix (PangoRenderer     *renderer);
-
-PangoLayout     *pango_renderer_get_layout      (PangoRenderer     *renderer);
-PangoLayoutLine *pango_renderer_get_layout_line (PangoRenderer     *renderer);
-
-G_END_DECLS
-
-#endif /* __PANGO_RENDERER_H_ */
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-script.h b/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-script.h
deleted file mode 100644
index 16e99b8c..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-script.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/* Pango
- * pango-script.h: Script tag handling
- *
- * Copyright (C) 2002 Red Hat Software
- *
- * 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 __PANGO_SCRIPT_H__
-#define __PANGO_SCRIPT_H__
-
-#include <glib.h>
-
-#include <pango/pango-language.h>
-
-G_BEGIN_DECLS
-
-/**
- * PangoScriptIter:
- *
- * A #PangoScriptIter is used to iterate through a string
- * and identify ranges in different scripts.
- **/
-typedef struct _PangoScriptIter PangoScriptIter;
-
-typedef enum {                         /* ISO 15924 code */
-      PANGO_SCRIPT_INVALID_CODE = -1,
-      PANGO_SCRIPT_COMMON       = 0,   /* Zyyy */
-      PANGO_SCRIPT_INHERITED,          /* Qaai */
-      PANGO_SCRIPT_ARABIC,             /* Arab */
-      PANGO_SCRIPT_ARMENIAN,           /* Armn */
-      PANGO_SCRIPT_BENGALI,            /* Beng */
-      PANGO_SCRIPT_BOPOMOFO,           /* Bopo */
-      PANGO_SCRIPT_CHEROKEE,           /* Cher */
-      PANGO_SCRIPT_COPTIC,             /* Qaac */
-      PANGO_SCRIPT_CYRILLIC,           /* Cyrl (Cyrs) */
-      PANGO_SCRIPT_DESERET,            /* Dsrt */
-      PANGO_SCRIPT_DEVANAGARI,         /* Deva */
-      PANGO_SCRIPT_ETHIOPIC,           /* Ethi */
-      PANGO_SCRIPT_GEORGIAN,           /* Geor (Geon, Geoa) */
-      PANGO_SCRIPT_GOTHIC,             /* Goth */
-      PANGO_SCRIPT_GREEK,              /* Grek */
-      PANGO_SCRIPT_GUJARATI,           /* Gujr */
-      PANGO_SCRIPT_GURMUKHI,           /* Guru */
-      PANGO_SCRIPT_HAN,                /* Hani */
-      PANGO_SCRIPT_HANGUL,             /* Hang */
-      PANGO_SCRIPT_HEBREW,             /* Hebr */
-      PANGO_SCRIPT_HIRAGANA,           /* Hira */
-      PANGO_SCRIPT_KANNADA,            /* Knda */
-      PANGO_SCRIPT_KATAKANA,           /* Kana */
-      PANGO_SCRIPT_KHMER,              /* Khmr */
-      PANGO_SCRIPT_LAO,                /* Laoo */
-      PANGO_SCRIPT_LATIN,              /* Latn (Latf, Latg) */
-      PANGO_SCRIPT_MALAYALAM,          /* Mlym */
-      PANGO_SCRIPT_MONGOLIAN,          /* Mong */
-      PANGO_SCRIPT_MYANMAR,            /* Mymr */
-      PANGO_SCRIPT_OGHAM,              /* Ogam */
-      PANGO_SCRIPT_OLD_ITALIC,         /* Ital */
-      PANGO_SCRIPT_ORIYA,              /* Orya */
-      PANGO_SCRIPT_RUNIC,              /* Runr */
-      PANGO_SCRIPT_SINHALA,            /* Sinh */
-      PANGO_SCRIPT_SYRIAC,             /* Syrc (Syrj, Syrn, Syre) */
-      PANGO_SCRIPT_TAMIL,              /* Taml */
-      PANGO_SCRIPT_TELUGU,             /* Telu */
-      PANGO_SCRIPT_THAANA,             /* Thaa */
-      PANGO_SCRIPT_THAI,               /* Thai */
-      PANGO_SCRIPT_TIBETAN,            /* Tibt */
-      PANGO_SCRIPT_CANADIAN_ABORIGINAL, /* Cans */
-      PANGO_SCRIPT_YI,                 /* Yiii */
-      PANGO_SCRIPT_TAGALOG,            /* Tglg */
-      PANGO_SCRIPT_HANUNOO,            /* Hano */
-      PANGO_SCRIPT_BUHID,              /* Buhd */
-      PANGO_SCRIPT_TAGBANWA,           /* Tagb */
-
-      /* Unicode-4.0 additions */
-      PANGO_SCRIPT_BRAILLE,            /* Brai */
-      PANGO_SCRIPT_CYPRIOT,            /* Cprt */
-      PANGO_SCRIPT_LIMBU,              /* Limb */
-      PANGO_SCRIPT_OSMANYA,            /* Osma */
-      PANGO_SCRIPT_SHAVIAN,            /* Shaw */
-      PANGO_SCRIPT_LINEAR_B,           /* Linb */
-      PANGO_SCRIPT_TAI_LE,             /* Tale */
-      PANGO_SCRIPT_UGARITIC,           /* Ugar */
-
-      /* Unicode-4.1 additions */
-      PANGO_SCRIPT_NEW_TAI_LUE,        /* Talu */
-      PANGO_SCRIPT_BUGINESE,           /* Bugi */
-      PANGO_SCRIPT_GLAGOLITIC,         /* Glag */
-      PANGO_SCRIPT_TIFINAGH,           /* Tfng */
-      PANGO_SCRIPT_SYLOTI_NAGRI,       /* Sylo */
-      PANGO_SCRIPT_OLD_PERSIAN,        /* Xpeo */
-      PANGO_SCRIPT_KHAROSHTHI,         /* Khar */
-
-      /* Unicode-5.0 additions */
-      PANGO_SCRIPT_UNKNOWN,            /* Zzzz */
-      PANGO_SCRIPT_BALINESE,           /* Bali */
-      PANGO_SCRIPT_CUNEIFORM,          /* Xsux */
-      PANGO_SCRIPT_PHOENICIAN,         /* Phnx */
-      PANGO_SCRIPT_PHAGS_PA,           /* Phag */
-      PANGO_SCRIPT_NKO,                /* Nkoo */
-
-      /* Unicode-5.1 additions */
-      PANGO_SCRIPT_KAYAH_LI,           /* Kali */
-      PANGO_SCRIPT_LEPCHA,             /* Lepc */
-      PANGO_SCRIPT_REJANG,             /* Rjng */
-      PANGO_SCRIPT_SUNDANESE,          /* Sund */
-      PANGO_SCRIPT_SAURASHTRA,         /* Saur */
-      PANGO_SCRIPT_CHAM,               /* Cham */
-      PANGO_SCRIPT_OL_CHIKI,           /* Olck */
-      PANGO_SCRIPT_VAI,                /* Vaii */
-      PANGO_SCRIPT_CARIAN,             /* Cari */
-      PANGO_SCRIPT_LYCIAN,             /* Lyci */
-      PANGO_SCRIPT_LYDIAN              /* Lydi */
-} PangoScript;
-
-PangoScript pango_script_for_unichar         (gunichar             ch) G_GNUC_CONST;
-
-PangoScriptIter *pango_script_iter_new       (const char          *text,
-					      int                  length);
-void             pango_script_iter_get_range (PangoScriptIter      *iter,
-					      G_CONST_RETURN char **start,
-					      G_CONST_RETURN char **end,
-					      PangoScript          *script);
-gboolean         pango_script_iter_next      (PangoScriptIter      *iter);
-void             pango_script_iter_free      (PangoScriptIter      *iter);
-
-PangoLanguage *pango_script_get_sample_language (PangoScript    script) G_GNUC_PURE;
-gboolean       pango_language_includes_script   (PangoLanguage *language,
-						 PangoScript    script) G_GNUC_PURE;
-
-G_END_DECLS
-
-#endif /* __PANGO_SCRIPT_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-tabs.h b/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-tabs.h
deleted file mode 100644
index 7f52d1d0..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-tabs.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Pango
- * pango-tabs.h: Tab-related stuff
- *
- * Copyright (C) 2000 Red Hat Software
- *
- * 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 __PANGO_TABS_H__
-#define __PANGO_TABS_H__
-
-#include <pango/pango-types.h>
-
-G_BEGIN_DECLS
-
-typedef struct _PangoTabArray PangoTabArray;
-
-typedef enum
-{
-  PANGO_TAB_LEFT
-
-  /* These are not supported now, but may be in the
-   * future.
-   *
-   *  PANGO_TAB_RIGHT,
-   *  PANGO_TAB_CENTER,
-   *  PANGO_TAB_NUMERIC
-   */
-} PangoTabAlign;
-
-#define PANGO_TYPE_TAB_ARRAY (pango_tab_array_get_type ())
-
-PangoTabArray  *pango_tab_array_new                 (gint           initial_size,
-						     gboolean       positions_in_pixels);
-PangoTabArray  *pango_tab_array_new_with_positions  (gint           size,
-						     gboolean       positions_in_pixels,
-						     PangoTabAlign  first_alignment,
-						     gint           first_position,
-						     ...);
-GType           pango_tab_array_get_type            (void) G_GNUC_CONST;
-PangoTabArray  *pango_tab_array_copy                (PangoTabArray *src);
-void            pango_tab_array_free                (PangoTabArray *tab_array);
-gint            pango_tab_array_get_size            (PangoTabArray *tab_array);
-void            pango_tab_array_resize              (PangoTabArray *tab_array,
-						     gint           new_size);
-void            pango_tab_array_set_tab             (PangoTabArray *tab_array,
-						     gint           tab_index,
-						     PangoTabAlign  alignment,
-						     gint           location);
-void            pango_tab_array_get_tab             (PangoTabArray *tab_array,
-						     gint           tab_index,
-						     PangoTabAlign *alignment,
-						     gint          *location);
-void            pango_tab_array_get_tabs            (PangoTabArray *tab_array,
-						     PangoTabAlign **alignments,
-						     gint          **locations);
-
-gboolean        pango_tab_array_get_positions_in_pixels (PangoTabArray *tab_array);
-
-
-G_END_DECLS
-
-#endif /* __PANGO_TABS_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-types.h b/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-types.h
deleted file mode 100644
index 41d68e98..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-types.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/* Pango
- * pango-types.h:
- *
- * Copyright (C) 1999 Red Hat Software
- *
- * 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 __PANGO_TYPES_H__
-#define __PANGO_TYPES_H__
-
-#include <glib.h>
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-typedef struct _PangoLogAttr PangoLogAttr;
-
-typedef struct _PangoEngineLang PangoEngineLang;
-typedef struct _PangoEngineShape PangoEngineShape;
-
-typedef struct _PangoFont    PangoFont;
-typedef struct _PangoFontMap PangoFontMap;
-
-typedef struct _PangoRectangle PangoRectangle;
-
-
-
-/* A index of a glyph into a font. Rendering system dependent */
-typedef guint32 PangoGlyph;
-
-
-
-#define PANGO_SCALE 1024
-#define PANGO_PIXELS(d) (((int)(d) + 512) >> 10)
-#define PANGO_PIXELS_FLOOR(d) (((int)(d)) >> 10)
-#define PANGO_PIXELS_CEIL(d) (((int)(d) + 1023) >> 10)
-/* The above expressions are just slightly wrong for floating point d;
- * For example we'd expect PANGO_PIXELS(-512.5) => -1 but instead we get 0.
- * That's unlikely to matter for practical use and the expression is much
- * more compact and faster than alternatives that work exactly for both
- * integers and floating point.
- *
- * PANGO_PIXELS also behaves differently for +512 and -512.
- */
-
-#define PANGO_UNITS_ROUND(d)				\
-  (((d) + (PANGO_SCALE >> 1)) & ~(PANGO_SCALE - 1))
-
-
-int    pango_units_from_double (double d) G_GNUC_CONST;
-double pango_units_to_double (int i) G_GNUC_CONST;
-
-
-
-/* A rectangle. Used to store logical and physical extents of glyphs,
- * runs, strings, etc.
- */
-struct _PangoRectangle
-{
-  int x;
-  int y;
-  int width;
-  int height;
-};
-
-/* Macros to translate from extents rectangles to ascent/descent/lbearing/rbearing
- */
-#define PANGO_ASCENT(rect) (-(rect).y)
-#define PANGO_DESCENT(rect) ((rect).y + (rect).height)
-#define PANGO_LBEARING(rect) ((rect).x)
-#define PANGO_RBEARING(rect) ((rect).x + (rect).width)
-
-void pango_extents_to_pixels (PangoRectangle *inclusive,
-			      PangoRectangle *nearest);
-
-/**
- * PangoDirection:
- * @PANGO_DIRECTION_LTR: A strong left-to-right direction
- * @PANGO_DIRECTION_RTL: A strong right-to-left direction
- * @PANGO_DIRECTION_TTB_LTR: Deprecated value; treated the
- *   same as %PANGO_DIRECTION_RTL.
- * @PANGO_DIRECTION_TTB_RTL: Deprecated value; treated the
- *   same as %PANGO_DIRECTION_LTR
- * @PANGO_DIRECTION_WEAK_LTR: A weak left-to-right direction
- * @PANGO_DIRECTION_WEAK_RTL: A weak right-to-left direction
- * @PANGO_DIRECTION_NEUTRAL: No direction specified
- *
- * The #PangoDirection type represents a direction in the
- * Unicode bidirectional algorithm; not every value in this
- * enumeration makes sense for every usage of #PangoDirection;
- * for example, the return value of pango_unichar_direction()
- * and pango_find_base_dir() cannot be %PANGO_DIRECTION_WEAK_LTR
- * or %PANGO_DIRECTION_WEAK_RTL, since every character is either
- * neutral or has a strong direction; on the other hand
- * %PANGO_DIRECTION_NEUTRAL doesn't make sense to pass
- * to pango_itemize_with_base_dir().
- *
- * The %PANGO_DIRECTION_TTB_LTR, %PANGO_DIRECTION_TTB_RTL
- * values come from an earlier interpretation of this
- * enumeration as the writing direction of a block of
- * text and are no longer used; See #PangoGravity for how
- * vertical text is handled in Pango.
- **/
-typedef enum {
-  PANGO_DIRECTION_LTR,
-  PANGO_DIRECTION_RTL,
-  PANGO_DIRECTION_TTB_LTR,
-  PANGO_DIRECTION_TTB_RTL,
-  PANGO_DIRECTION_WEAK_LTR,
-  PANGO_DIRECTION_WEAK_RTL,
-  PANGO_DIRECTION_NEUTRAL
-} PangoDirection;
-
-PangoDirection pango_unichar_direction      (gunichar     ch) G_GNUC_CONST;
-PangoDirection pango_find_base_dir          (const gchar *text,
-					     gint         length);
-
-#ifndef PANGO_DISABLE_DEPRECATED
-gboolean       pango_get_mirror_char        (gunichar     ch,
-					     gunichar    *mirrored_ch);
-#endif
-
-
-#include <pango/pango-gravity.h>
-#include <pango/pango-language.h>
-#include <pango/pango-matrix.h>
-#include <pango/pango-script.h>
-
-
-G_END_DECLS
-
-#endif /* __PANGO_TYPES_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-utils.h b/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-utils.h
deleted file mode 100644
index 41a8bbb0..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango-utils.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/* Pango
- * pango-utils.c: Utilities for internal functions and modules
- *
- * Copyright (C) 2000 Red Hat Software
- *
- * 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 __PANGO_UTILS_H__
-#define __PANGO_UTILS_H__
-
-#include <stdio.h>
-#include <glib.h>
-#include <pango/pango-font.h>
-
-G_BEGIN_DECLS
-
-char **  pango_split_file_list (const char *str);
-
-char    *pango_trim_string     (const char *str);
-gint     pango_read_line      (FILE        *stream,
-			       GString     *str);
-gboolean pango_skip_space     (const char **pos);
-gboolean pango_scan_word      (const char **pos,
-			       GString     *out);
-gboolean pango_scan_string    (const char **pos,
-			       GString     *out);
-gboolean pango_scan_int       (const char **pos,
-			       int         *out);
-
-#ifdef PANGO_ENABLE_BACKEND
-char *   pango_config_key_get (const char  *key);
-void     pango_lookup_aliases (const char   *fontname,
-			       char       ***families,
-			       int          *n_families);
-#endif /* PANGO_ENABLE_BACKEND */
-
-gboolean pango_parse_enum     (GType       type,
-			       const char *str,
-			       int        *value,
-			       gboolean    warn,
-			       char      **possible_values);
-
-/* Functions for parsing textual representations
- * of PangoFontDescription fields. They return TRUE if the input string
- * contains a valid value, which then has been assigned to the corresponding
- * field in the PangoFontDescription. If the warn parameter is TRUE,
- * a warning is printed (with g_warning) if the string does not
- * contain a valid value.
- */
-gboolean pango_parse_style   (const char   *str,
-			      PangoStyle   *style,
-			      gboolean      warn);
-gboolean pango_parse_variant (const char   *str,
-			      PangoVariant *variant,
-			      gboolean      warn);
-gboolean pango_parse_weight  (const char   *str,
-			      PangoWeight  *weight,
-			      gboolean      warn);
-gboolean pango_parse_stretch (const char   *str,
-			      PangoStretch *stretch,
-			      gboolean      warn);
-
-#ifdef PANGO_ENABLE_BACKEND
-
-/* On Unix, return the name of the "pango" subdirectory of SYSCONFDIR
- * (which is set at compile time). On Win32, return the Pango
- * installation directory (which is set at installation time, and
- * stored in the registry). The returned string should not be
- * g_free'd.
- */
-G_CONST_RETURN char *   pango_get_sysconf_subdirectory (void) G_GNUC_PURE;
-
-/* Ditto for LIBDIR/pango. On Win32, use the same Pango
- * installation directory. This returned string should not be
- * g_free'd either.
- */
-G_CONST_RETURN char *   pango_get_lib_subdirectory (void) G_GNUC_PURE;
-
-#endif /* PANGO_ENABLE_BACKEND */
-
-/* Hint line position and thickness.
- */
-void pango_quantize_line_geometry (int *thickness,
-				   int *position);
-
-/* A routine from fribidi that we either wrap or provide ourselves.
- */
-guint8 * pango_log2vis_get_embedding_levels (const gchar    *text,
-					     int             length,
-					     PangoDirection *pbase_dir);
-
-/* Unicode characters that are zero-width and should not be rendered
- * normally.
- */
-gboolean pango_is_zero_width (gunichar ch) G_GNUC_CONST;
-
-/* Pango version checking */
-
-/* Encode a Pango version as an integer */
-#define PANGO_VERSION_ENCODE(major, minor, micro) (     \
-	  ((major) * 10000)                             \
-	+ ((minor) *   100)                             \
-	+ ((micro) *     1))
-
-/* Encoded version of Pango at compile-time */
-#define PANGO_VERSION PANGO_VERSION_ENCODE(     \
-	PANGO_VERSION_MAJOR,                    \
-	PANGO_VERSION_MINOR,                    \
-	PANGO_VERSION_MICRO)
-
-/* Check that compile-time Pango is as new as required */
-#define PANGO_VERSION_CHECK(major,minor,micro)    \
-	(PANGO_VERSION >= PANGO_VERSION_ENCODE(major,minor,micro))
-
-
-/* Return encoded version of Pango at run-time */
-int pango_version (void) G_GNUC_CONST;
-
-/* Return run-time Pango version as an string */
-G_CONST_RETURN char * pango_version_string (void) G_GNUC_CONST;
-
-/* Check that run-time Pango is as new as required */
-G_CONST_RETURN char * pango_version_check (int required_major,
-					   int required_minor,
-					   int required_micro) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __PANGO_UTILS_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango.h b/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango.h
deleted file mode 100644
index 5b5ef1e4..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pango.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Pango
- * pango.h:
- *
- * Copyright (C) 1999 Red Hat Software
- *
- * 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 __PANGO_H__
-#define __PANGO_H__
-
-#include <pango/pango-attributes.h>
-#include <pango/pango-break.h>
-#include <pango/pango-context.h>
-#include <pango/pango-coverage.h>
-#include <pango/pango-engine.h>
-#include <pango/pango-enum-types.h>
-#include <pango/pango-features.h>
-#include <pango/pango-font.h>
-#include <pango/pango-fontmap.h>
-#include <pango/pango-fontset.h>
-#include <pango/pango-glyph.h>
-#include <pango/pango-glyph-item.h>
-#include <pango/pango-gravity.h>
-#include <pango/pango-item.h>
-#include <pango/pango-layout.h>
-#include <pango/pango-matrix.h>
-#include <pango/pango-renderer.h>
-#include <pango/pango-script.h>
-#include <pango/pango-tabs.h>
-#include <pango/pango-types.h>
-#include <pango/pango-utils.h>
-
-#endif /* __PANGO_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pangocairo.h b/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pangocairo.h
deleted file mode 100644
index 364d8019..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pangocairo.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/* Pango
- * pangocairo.h:
- *
- * Copyright (C) 1999, 2004 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 __PANGOCAIRO_H__
-#define __PANGOCAIRO_H__
-
-#include <pango/pango.h>
-#include <cairo.h>
-
-G_BEGIN_DECLS
-
-/**
- * PangoCairoFont:
- *
- * #PangoCairoFont is an interface exported by fonts for
- * use with Cairo. The actual type of the font will depend
- * on the particular font technology Cairo was compiled to use.
- *
- * Since: 1.18
- **/
-typedef struct _PangoCairoFont      PangoCairoFont;
-#define PANGO_TYPE_CAIRO_FONT       (pango_cairo_font_get_type ())
-#define PANGO_CAIRO_FONT(object)    (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_CAIRO_FONT, PangoCairoFont))
-#define PANGO_IS_CAIRO_FONT(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_CAIRO_FONT))
-
-/**
- * PangoCairoFontMap:
- *
- * #PangoCairoFontMap is an interface exported by font maps for
- * use with Cairo. The actual type of the font map will depend
- * on the particular font technology Cairo was compiled to use.
- *
- * Since: 1.10
- **/
-typedef struct _PangoCairoFontMap        PangoCairoFontMap;
-#define PANGO_TYPE_CAIRO_FONT_MAP       (pango_cairo_font_map_get_type ())
-#define PANGO_CAIRO_FONT_MAP(object)    (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_CAIRO_FONT_MAP, PangoCairoFontMap))
-#define PANGO_IS_CAIRO_FONT_MAP(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_CAIRO_FONT_MAP))
-
-typedef void (* PangoCairoShapeRendererFunc) (cairo_t        *cr,
-					      PangoAttrShape *attr,
-					      gboolean        do_path,
-					      gpointer        data);
-
-/*
- * PangoCairoFontMap
- */
-GType         pango_cairo_font_map_get_type          (void) G_GNUC_CONST;
-
-PangoFontMap *pango_cairo_font_map_new               (void);
-PangoFontMap *pango_cairo_font_map_new_for_font_type (cairo_font_type_t fonttype);
-PangoFontMap *pango_cairo_font_map_get_default       (void);
-cairo_font_type_t pango_cairo_font_map_get_font_type (PangoCairoFontMap *fontmap);
-
-void          pango_cairo_font_map_set_resolution (PangoCairoFontMap *fontmap,
-						   double             dpi);
-double        pango_cairo_font_map_get_resolution (PangoCairoFontMap *fontmap);
-PangoContext *pango_cairo_font_map_create_context (PangoCairoFontMap *fontmap);
-
-/*
- * PangoCairoFont
- */
-GType         pango_cairo_font_get_type               (void) G_GNUC_CONST;
-
-cairo_scaled_font_t *pango_cairo_font_get_scaled_font (PangoCairoFont *font);
-
-/* Update a Pango context for the current state of a cairo context
- */
-void         pango_cairo_update_context (cairo_t      *cr,
-					 PangoContext *context);
-
-void                        pango_cairo_context_set_font_options (PangoContext               *context,
-								  const cairo_font_options_t *options);
-const cairo_font_options_t *pango_cairo_context_get_font_options (PangoContext               *context);
-
-void               pango_cairo_context_set_resolution     (PangoContext       *context,
-							   double              dpi);
-double             pango_cairo_context_get_resolution     (PangoContext       *context);
-
-void                        pango_cairo_context_set_shape_renderer (PangoContext                *context,
-								    PangoCairoShapeRendererFunc  func,
-								    gpointer                     data,
-								    GDestroyNotify               dnotify);
-PangoCairoShapeRendererFunc pango_cairo_context_get_shape_renderer (PangoContext                *context,
-								    gpointer                    *data);
-
-/* Convenience
- */
-PangoLayout *pango_cairo_create_layout (cairo_t     *cr);
-void         pango_cairo_update_layout (cairo_t     *cr,
-					PangoLayout *layout);
-
-/*
- * Rendering
- */
-void pango_cairo_show_glyph_string (cairo_t          *cr,
-				    PangoFont        *font,
-				    PangoGlyphString *glyphs);
-void pango_cairo_show_layout_line  (cairo_t          *cr,
-				    PangoLayoutLine  *line);
-void pango_cairo_show_layout       (cairo_t          *cr,
-				    PangoLayout      *layout);
-
-void pango_cairo_show_error_underline (cairo_t       *cr,
-				       double         x,
-				       double         y,
-				       double         width,
-				       double         height);
-
-/*
- * Rendering to a path
- */
-void pango_cairo_glyph_string_path (cairo_t          *cr,
-				    PangoFont        *font,
-				    PangoGlyphString *glyphs);
-void pango_cairo_layout_line_path  (cairo_t          *cr,
-				    PangoLayoutLine  *line);
-void pango_cairo_layout_path       (cairo_t          *cr,
-				    PangoLayout      *layout);
-
-void pango_cairo_error_underline_path (cairo_t       *cr,
-				       double         x,
-				       double         y,
-				       double         width,
-				       double         height);
-
-G_END_DECLS
-
-#endif /* __PANGOCAIRO_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pangofc-decoder.h b/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pangofc-decoder.h
deleted file mode 100644
index 8e341469..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pangofc-decoder.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/* Pango
- * pangofc-decoder.h: Custom encoders/decoders on a per-font basis.
- *
- * Copyright (C) 2004 Red Hat Software
- *
- * 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 __PANGO_DECODER_H_
-#define __PANGO_DECODER_H_
-
-#include <pango/pangofc-font.h>
-
-G_BEGIN_DECLS
-
-#define PANGO_TYPE_FC_DECODER       (pango_fc_decoder_get_type())
-#define PANGO_FC_DECODER(object)    (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_FC_DECODER, PangoFcDecoder))
-#define PANGO_IS_FC_DECODER(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_FC_DECODER))
-
-typedef struct _PangoFcDecoder      PangoFcDecoder;
-typedef struct _PangoFcDecoderClass PangoFcDecoderClass;
-
-#define PANGO_FC_DECODER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_FC_DECODER, PangoFcDecoderClass))
-#define PANGO_IS_FC_DECODER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_FC_DECODER))
-#define PANGO_FC_DECODER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_FC_DECODER, PangoFcDecoderClass))
-
-/**
- * PangoFcDecoder:
- *
- * #PangoFcDecoder is a virtual base class that implementations will
- * inherit from.  It's the interface that is used to define a custom
- * encoding for a font.  These objects are created in your code from a
- * function callback that was originally registered with
- * pango_fc_font_map_add_decoder_find_func().  Pango requires
- * information about the supported charset for a font as well as the
- * individual character to glyph conversions.  Pango gets that
- * information via the #get_charset and #get_glyph callbacks into your
- * object implementation.
- *
- * Since: 1.6
- **/
-struct _PangoFcDecoder
-{
-  /*< private >*/
-  GObject parent_instance;
-};
-
-/**
- * PangoFcDecoderClass:
- * @get_charset: This returns an #FcCharset given a #PangoFcFont that
- *  includes a list of supported characters in the font.  The
- *  #FcCharSet that is returned should be an internal reference to your
- *  code.  Pango will not free this structure.  It is important that
- *  you make this callback fast because this callback is called
- *  separately for each character to determine Unicode coverage.
- * @get_glyph: This returns a single #PangoGlyph for a given Unicode
- *  code point.
- *
- * Class structure for #PangoFcDecoder.
- *
- * Since: 1.6
- **/
-struct _PangoFcDecoderClass
-{
-  /*< private >*/
-  GObjectClass parent_class;
-
-  /* vtable - not signals */
-  /*< public >*/
-  FcCharSet  *(*get_charset) (PangoFcDecoder *decoder,
-			      PangoFcFont    *fcfont);
-  PangoGlyph  (*get_glyph)   (PangoFcDecoder *decoder,
-			      PangoFcFont    *fcfont,
-			      guint32         wc);
-
-  /*< private >*/
-
-  /* Padding for future expansion */
-  void (*_pango_reserved1) (void);
-  void (*_pango_reserved2) (void);
-  void (*_pango_reserved3) (void);
-  void (*_pango_reserved4) (void);
-};
-
-GType      pango_fc_decoder_get_type    (void) G_GNUC_CONST;
-
-FcCharSet *pango_fc_decoder_get_charset (PangoFcDecoder *decoder,
-					 PangoFcFont    *fcfont);
-
-PangoGlyph pango_fc_decoder_get_glyph   (PangoFcDecoder *decoder,
-					 PangoFcFont    *fcfont,
-					 guint32         wc);
-
-G_END_DECLS
-
-#endif /* __PANGO_DECODER_H_ */
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pangofc-font.h b/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pangofc-font.h
deleted file mode 100644
index ae16b168..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pangofc-font.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/* Pango
- * pangofc-font.h: Base fontmap type for fontconfig-based backends
- *
- * Copyright (C) 2003 Red Hat Software
- *
- * 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 __PANGO_FC_FONT_H__
-#define __PANGO_FC_FONT_H__
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#include <fontconfig/fontconfig.h>
-#include <pango/pango-font.h>
-#include <pango/pango-fontmap.h>
-#include <pango/pango-glyph.h>
-
-G_BEGIN_DECLS
-
-#define PANGO_TYPE_FC_FONT              (pango_fc_font_get_type ())
-#define PANGO_FC_FONT(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_FC_FONT, PangoFcFont))
-#define PANGO_IS_FC_FONT(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_FC_FONT))
-
-typedef struct _PangoFcFont      PangoFcFont;
-typedef struct _PangoFcFontClass PangoFcFontClass;
-
-#if defined(PANGO_ENABLE_ENGINE) || defined(PANGO_ENABLE_BACKEND)
-
-/**
- * PANGO_RENDER_TYPE_FC:
- *
- * A string constant used to identify shape engines that work
- * with the fontconfig based backends. See the @engine_type field
- * of #PangoEngineInfo.
- **/
-#define PANGO_RENDER_TYPE_FC "PangoRenderFc"
-
-#ifdef PANGO_ENABLE_BACKEND
-
-#define PANGO_FC_FONT_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_FC_FONT, PangoFcFontClass))
-#define PANGO_IS_FC_FONT_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_FC_FONT))
-#define PANGO_FC_FONT_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_FC_FONT, PangoFcFontClass))
-
-/**
- * PangoFcFont:
- *
- * #PangoFcFont is a base class for font implementations
- * using the Fontconfig and FreeType libraries and is used in
- * conjunction with #PangoFcFontMap. When deriving from this
- * class, you need to implement all of its virtual functions
- * other than shutdown() along with the get_glyph_extents()
- * virtual function from #PangoFont.
- **/
-struct _PangoFcFont
-{
-  PangoFont parent_instance;
-
-  FcPattern *font_pattern;	    /* fully resolved pattern */
-  PangoFontMap *fontmap;	    /* associated map */
-  gpointer priv;		    /* used internally */
-  PangoMatrix matrix;		    /* used internally */
-  PangoFontDescription *description;
-
-  GSList *metrics_by_lang;
-
-  guint is_hinted : 1;
-  guint is_transformed : 1;
-};
-
-/**
- * PangoFcFontClass:
- * @lock_face: Returns the FT_Face of the font and increases
- *  the reference count for the face by one.
- * @unlock_face: Decreases the reference count for the
- *  FT_Face of the font by one. When the count is zero,
- *  the #PangoFcFont subclass is allowed to free the
- *  FT_Face.
- * @has_char: Return %TRUE if the the font contains a glyph
- *   corresponding to the specified character.
- * @get_glyph: Gets the glyph that corresponds to the given
- *   Unicode character.
- * @get_unknown_glyph: Gets the glyph that should be used to
- *   display an unknown-glyph indication for the specified
- *   Unicode character.
- *   May be %NULL.
- * @shutdown: Performs any font-specific shutdown code that
- *   needs to be done when pango_fc_font_map_shutdown is called.
- *   May be %NULL.
- *
- * Class structure for #PangoFcFont.
- **/
-struct _PangoFcFontClass
-{
-  /*< private >*/
-  PangoFontClass parent_class;
-
-  /*< public >*/
-  FT_Face    (*lock_face)         (PangoFcFont      *font);
-  void       (*unlock_face)       (PangoFcFont      *font);
-  gboolean   (*has_char)          (PangoFcFont      *font,
-				   gunichar          wc);
-  guint      (*get_glyph)         (PangoFcFont      *font,
-				   gunichar          wc);
-  PangoGlyph (*get_unknown_glyph) (PangoFcFont      *font,
-				   gunichar          wc);
-  void       (*shutdown)          (PangoFcFont      *font);
-  /*< private >*/
-
-  /* Padding for future expansion */
-  void (*_pango_reserved1) (void);
-  void (*_pango_reserved2) (void);
-  void (*_pango_reserved3) (void);
-  void (*_pango_reserved4) (void);
-};
-
-#endif /* PANGO_ENABLE_BACKEND */
-
-gboolean   pango_fc_font_has_char          (PangoFcFont      *font,
-					    gunichar          wc);
-guint      pango_fc_font_get_glyph         (PangoFcFont      *font,
-					    gunichar          wc);
-#ifndef PANGO_DISABLE_DEPRECATED
-PangoGlyph pango_fc_font_get_unknown_glyph (PangoFcFont      *font,
-					    gunichar          wc);
-#endif /* PANGO_DISABLE_DEPRECATED */
-void       pango_fc_font_kern_glyphs       (PangoFcFont      *font,
-					    PangoGlyphString *glyphs);
-
-#endif /* PANGO_ENABLE_ENGINE || PANGO_ENABLE_BACKEND */
-
-GType      pango_fc_font_get_type (void) G_GNUC_CONST;
-
-FT_Face    pango_fc_font_lock_face         (PangoFcFont      *font);
-void       pango_fc_font_unlock_face       (PangoFcFont      *font);
-
-G_END_DECLS
-#endif /* __PANGO_FC_FONT_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pangofc-fontmap.h b/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pangofc-fontmap.h
deleted file mode 100644
index 69a56ade..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pangofc-fontmap.h
+++ /dev/null
@@ -1,203 +0,0 @@
-/* Pango
- * pangofc-fontmap.h: Base fontmap type for fontconfig-based backends
- *
- * Copyright (C) 2003 Red Hat Software
- *
- * 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 __PANGO_FC_FONT_MAP_H__
-#define __PANGO_FC_FONT_MAP_H__
-
-#include <fontconfig/fontconfig.h>
-#include <pango/pango-fontmap.h>
-#include <pango/pangofc-decoder.h>
-#include <pango/pangofc-font.h>
-
-G_BEGIN_DECLS
-
-#define PANGO_TYPE_FC_FONT_MAP              (pango_fc_font_map_get_type ())
-#define PANGO_FC_FONT_MAP(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_FC_FONT_MAP, PangoFcFontMap))
-#define PANGO_IS_FC_FONT_MAP(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_FC_FONT_MAP))
-
-typedef struct _PangoFcFontMap        PangoFcFontMap;
-typedef struct _PangoFcFontMapClass   PangoFcFontMapClass;
-typedef struct _PangoFcFontMapPrivate PangoFcFontMapPrivate;
-
-#ifdef PANGO_ENABLE_BACKEND
-
-#define PANGO_FC_FONT_MAP_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_FC_FONT_MAP, PangoFcFontMapClass))
-#define PANGO_IS_FC_FONT_MAP_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_FC_FONT_MAP))
-#define PANGO_FC_FONT_MAP_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_FC_FONT_MAP, PangoFcFontMapClass))
-
-/**
- * PangoFcFontMap:
- *
- * #PangoFcFontMap is a base class for font map implementations
- * using the Fontconfig and FreeType libraries. To create a new
- * backend using Fontconfig and FreeType, you derive from this class
- * and implement a new_font() virtual function that creates an
- * instance deriving from #PangoFcFont.
- **/
-struct _PangoFcFontMap
-{
-  PangoFontMap parent_instance;
-
-  PangoFcFontMapPrivate *priv;
-};
-
-/**
- * PangoFcFontMapClass:
- * @default_substitute: Substitutes in default values for
- *  unspecified fields in a #FcPattern. This will be called
- *  prior to creating a font for the pattern. May be %NULL.
- *  Deprecated in favor of @context_substitute().
- * @new_font: Creates a new #PangoFcFont for the specified
- *  pattern of the appropriate type for this font map. The
- *  @pattern argument must be passed to the "pattern" property
- *  of #PangoFcFont when you call g_object_new(). Deprecated
- *  in favor of @create_font().
- * @get_resolution: Gets the resolution (the scale factor
- *  between logical and absolute font sizes) that the backend
- *  will use for a particular fontmap and context. @context
- *  may be null.
- * @context_key_get: Gets an opaque key holding backend
- *  specific options for the context that will affect
- *  fonts created by create_font(). The result must point to
- *  persistant storage owned by the fontmap. This key
- *  is used to index hash tables used to look up fontsets
- *  and fonts.
- * @context_key_copy: Copies a context key. Pango uses this
- *  to make a persistant copy of the value returned from
- *  @context_key_get.
- * @context_key_free: Frees a context key copied with
- *  @context_key_copy.
- * @context_key_hash: Gets a hash value for a context key
- * @context_key_equal: Compares two context keys for equality.
- * @create_font: Creates a new #PangoFcFont for the specified
- *  pattern of the appropriate type for this font map using
- *  information from the context that is passed in. The
- *  @pattern argument must be passed to the "pattern" property
- *  of #PangoFcFont when you call g_object_new(). Deprecated
- *  in favor of @create_font(). If %NULL, new_font() is used.
- * @context_substitute: Substitutes in default values for
- *  unspecified fields in a #FcPattern. This will be called
- *  prior to creating a font for the pattern. May be %NULL.
- *
- * Class structure for #PangoFcFontMap.
- **/
-struct _PangoFcFontMapClass
-{
-  /*< private >*/
-  PangoFontMapClass parent_class;
-
-  /*< public >*/
-  /* Deprecated in favor of context_substitute */
-  void         (*default_substitute) (PangoFcFontMap   *fontmap,
-				      FcPattern        *pattern);
-  /* Deprecated in favor of create_font */
-  PangoFcFont  *(*new_font)          (PangoFcFontMap  *fontmap,
-				      FcPattern       *pattern);
-
-  double       (*get_resolution)     (PangoFcFontMap             *fcfontmap,
-				      PangoContext               *context);
-
-  gconstpointer (*context_key_get)   (PangoFcFontMap             *fcfontmap,
-				      PangoContext               *context);
-  gpointer     (*context_key_copy)   (PangoFcFontMap             *fcfontmap,
-				      gconstpointer               key);
-  void         (*context_key_free)   (PangoFcFontMap             *fcfontmap,
-				      gpointer                    key);
-  guint32      (*context_key_hash)   (PangoFcFontMap             *fcfontmap,
-				      gconstpointer               key);
-  gboolean     (*context_key_equal)  (PangoFcFontMap             *fcfontmap,
-				      gconstpointer               key_a,
-				      gconstpointer               key_b);
-
-  void         (*context_substitute) (PangoFcFontMap             *fontmap,
-				      PangoContext               *context,
-				      FcPattern                  *pattern);
-  PangoFcFont  *(*create_font)       (PangoFcFontMap             *fontmap,
-				      PangoContext               *context,
-				      const PangoFontDescription *desc,
-				      FcPattern                  *pattern);
-  /*< private >*/
-
-  /* Padding for future expansion */
-  void (*_pango_reserved1) (void);
-  void (*_pango_reserved2) (void);
-  void (*_pango_reserved3) (void);
-  void (*_pango_reserved4) (void);
-};
-
-PangoContext * pango_fc_font_map_create_context (PangoFcFontMap *fcfontmap);
-void           pango_fc_font_map_cache_clear    (PangoFcFontMap *fcfontmap);
-void           pango_fc_font_map_shutdown       (PangoFcFontMap *fcfontmap);
-
-#endif
-
-GType pango_fc_font_map_get_type (void) G_GNUC_CONST;
-
-/**
- * PangoFcDecoderFindFunc:
- * @pattern: a fully resolved #FcPattern specifying the font on the system
- * @user_data: user data passed to pango_fc_font_map_add_decoder_find_func()
- *
- * Callback function passed to pango_fc_font_map_add_decoder_find_func().
- *
- * Return value: a new reference to a custom decoder for this pattern,
- *  or %NULL if the default decoder handling should be used.
- **/
-typedef PangoFcDecoder * (*PangoFcDecoderFindFunc) (FcPattern *pattern,
-						    gpointer   user_data);
-
-void pango_fc_font_map_add_decoder_find_func (PangoFcFontMap        *fcfontmap,
-					      PangoFcDecoderFindFunc findfunc,
-					      gpointer               user_data,
-					      GDestroyNotify         dnotify);
-
-PangoFontDescription *pango_fc_font_description_from_pattern (FcPattern *pattern,
-							      gboolean   include_size);
-
-/**
- * PANGO_FC_GRAVITY:
- *
- * String representing a fontconfig property name that Pango sets on any
- * fontconfig pattern it passes to fontconfig if a #PangoGravity other
- * than %PangoGravitySouth is desired.
- *
- * The property will have a #PangoGravity value as a string, like "east".
- *
- * Since: 1.20
- */
-#define PANGO_FC_GRAVITY "pangogravity"
-
-/**
- * PANGO_FC_VERSION:
- *
- * String representing a fontconfig property name that Pango sets on any
- * fontconfig pattern it passes to fontconfig.
- *
- * The property will have an integer value equal to what
- * pango_version() returns.
- *
- * Since: 1.20
- */
-#define PANGO_FC_VERSION "pangoversion"
-
-G_END_DECLS
-
-#endif /* __PANGO_FC_FONT_MAP_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pangoft2.h b/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pangoft2.h
deleted file mode 100644
index 27acfa6e..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pangoft2.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/* Pango
- * pangoft2.h:
- *
- * Copyright (C) 1999 Red Hat Software
- * Copyright (C) 2000 Tor Lillqvist
- *
- * 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 __PANGOFT2_H__
-#define __PANGOFT2_H__
-
-#include <fontconfig/fontconfig.h>
-
-#include <pango/pango-layout.h>
-#include <pango/pangofc-font.h>
-
-G_BEGIN_DECLS
-
-#ifndef PANGO_DISABLE_DEPRECATED
-#define PANGO_RENDER_TYPE_FT2 "PangoRenderFT2"
-#endif
-
-#define PANGO_TYPE_FT2_FONT_MAP              (pango_ft2_font_map_get_type ())
-#define PANGO_FT2_FONT_MAP(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_FT2_FONT_MAP, PangoFT2FontMap))
-#define PANGO_FT2_IS_FONT_MAP(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_FT2_FONT_MAP))
-
-typedef struct _PangoFT2FontMap      PangoFT2FontMap;
-
-typedef void (*PangoFT2SubstituteFunc) (FcPattern *pattern,
-					gpointer   data);
-
-/* Calls for applications */
-
-void pango_ft2_render             (FT_Bitmap         *bitmap,
-				   PangoFont         *font,
-				   PangoGlyphString  *glyphs,
-				   gint               x,
-				   gint               y);
-void pango_ft2_render_transformed (FT_Bitmap         *bitmap,
-				   const PangoMatrix *matrix,
-				   PangoFont         *font,
-				   PangoGlyphString  *glyphs,
-				   int                x,
-				   int                y);
-
-void pango_ft2_render_layout_line          (FT_Bitmap        *bitmap,
-					    PangoLayoutLine  *line,
-					    int               x,
-					    int               y);
-void pango_ft2_render_layout_line_subpixel (FT_Bitmap        *bitmap,
-					    PangoLayoutLine  *line,
-					    int               x,
-					    int               y);
-void pango_ft2_render_layout               (FT_Bitmap        *bitmap,
-					    PangoLayout      *layout,
-					    int               x,
-					    int               y);
-void pango_ft2_render_layout_subpixel      (FT_Bitmap        *bitmap,
-					    PangoLayout      *layout,
-					    int               x,
-					    int               y);
-
-GType pango_ft2_font_map_get_type (void) G_GNUC_CONST;
-
-PangoFontMap *pango_ft2_font_map_new                    (void);
-void          pango_ft2_font_map_set_resolution         (PangoFT2FontMap        *fontmap,
-							 double                  dpi_x,
-							 double                  dpi_y);
-void          pango_ft2_font_map_set_default_substitute (PangoFT2FontMap        *fontmap,
-							 PangoFT2SubstituteFunc  func,
-							 gpointer                data,
-							 GDestroyNotify          notify);
-void          pango_ft2_font_map_substitute_changed     (PangoFT2FontMap         *fontmap);
-PangoContext *pango_ft2_font_map_create_context         (PangoFT2FontMap         *fontmap);
-
-
-/* API for rendering modules
- */
-#ifndef PANGO_DISABLE_DEPRECATED
-PangoContext      *pango_ft2_get_context          (double dpi_x,
-						   double dpi_y);
-PangoFontMap      *pango_ft2_font_map_for_display (void);
-void               pango_ft2_shutdown_display     (void);
-
-PangoGlyph     pango_ft2_get_unknown_glyph (PangoFont       *font);
-int            pango_ft2_font_get_kerning  (PangoFont       *font,
-					    PangoGlyph       left,
-					    PangoGlyph       right);
-FT_Face        pango_ft2_font_get_face     (PangoFont       *font);
-PangoCoverage *pango_ft2_font_get_coverage (PangoFont       *font,
-					    PangoLanguage   *language);
-#endif /* PANGO_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __PANGOFT2_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pangox.h b/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pangox.h
deleted file mode 100644
index dc41b61e..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pangox.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/* Pango
- * pangox.h:
- *
- * Copyright (C) 1999 Red Hat Software
- * Copyright (C) 2000 SuSE Linux Ltd
- *
- * 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 __PANGOX_H__
-#define __PANGOX_H__
-
-#include <glib.h>
-#include <pango/pango-layout.h>
-
-G_BEGIN_DECLS
-
-#include <X11/Xlib.h>
-
-#ifndef PANGO_DISABLE_DEPRECATED
-
-#define PANGO_RENDER_TYPE_X "PangoRenderX"
-
-typedef GC (*PangoGetGCFunc) (PangoContext *context, PangoColor *color, GC base_gc);
-typedef void (*PangoFreeGCFunc) (PangoContext *context, GC gc);
-
-/* Calls for applications
- */
-PangoContext * pango_x_get_context        (Display          *display);
-void           pango_x_context_set_funcs  (PangoContext     *context,
-					   PangoGetGCFunc    get_gc_func,
-					   PangoFreeGCFunc   free_gc_func);
-
-PangoFont *    pango_x_load_font          (Display          *display,
-					   const gchar      *spec);
-void           pango_x_render             (Display          *display,
-					   Drawable          d,
-					   GC                gc,
-					   PangoFont        *font,
-					   PangoGlyphString *glyphs,
-					   gint              x,
-					   gint              y);
-void           pango_x_render_layout_line (Display          *display,
-					   Drawable          drawable,
-					   GC                gc,
-					   PangoLayoutLine  *line,
-					   int               x,
-					   int               y);
-void           pango_x_render_layout      (Display          *display,
-					   Drawable          drawable,
-					   GC                gc,
-					   PangoLayout      *layout,
-					   int               x,
-					   int               y);
-
-/* API for rendering modules
- */
-typedef guint16 PangoXSubfont;
-
-#define PANGO_X_MAKE_GLYPH(subfont,index_) ((subfont)<<16 | (index_))
-#define PANGO_X_GLYPH_SUBFONT(glyph) ((glyph)>>16)
-#define PANGO_X_GLYPH_INDEX(glyph) ((glyph) & 0xffff)
-
-int        pango_x_list_subfonts     (PangoFont      *font,
-				      char          **charsets,
-				      int             n_charsets,
-				      PangoXSubfont **subfont_ids,
-				      int           **subfont_charsets);
-gboolean   pango_x_has_glyph         (PangoFont      *font,
-				      PangoGlyph      glyph);
-PangoGlyph pango_x_get_unknown_glyph (PangoFont      *font);
-
-#ifdef PANGO_ENABLE_ENGINE
-PangoGlyph pango_x_font_get_unknown_glyph (PangoFont    *font,
-					   gunichar      wc);
-#endif /* PANGO_ENABLE_ENGINE */
-
-/* API for libraries that want to use PangoX mixed with classic X fonts.
- */
-typedef struct _PangoXFontCache PangoXFontCache;
-
-PangoXFontCache *pango_x_font_cache_new     (Display         *display);
-void             pango_x_font_cache_free    (PangoXFontCache *cache);
-
-XFontStruct * pango_x_font_cache_load      (PangoXFontCache *cache,
-					    const char      *xlfd);
-void          pango_x_font_cache_unload    (PangoXFontCache *cache,
-					    XFontStruct     *fs);
-
-PangoFontMap *   pango_x_font_map_for_display  (Display     *display);
-void             pango_x_shutdown_display      (Display     *display);
-PangoXFontCache *pango_x_font_map_get_font_cache (PangoFontMap *font_map);
-
-char *pango_x_font_subfont_xlfd (PangoFont     *font,
-				 PangoXSubfont  subfont_id);
-
-
-gboolean pango_x_find_first_subfont (PangoFont     *font,
-				     char         **charsets,
-				     int            n_charsets,
-				     PangoXSubfont *rfont);
-
-void pango_x_fallback_shape (PangoFont        *font,
-			     PangoGlyphString *glyphs,
-			     const char       *text,
-			     int               n_chars);
-
-gboolean pango_x_apply_ligatures (PangoFont     *font,
-				  PangoXSubfont  subfont,
-				  gunichar     **glyphs,
-				  int           *n_glyphs,
-				  int          **clusters);
-
-#endif /* PANGO_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __PANGOX_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pangoxft-render.h b/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pangoxft-render.h
deleted file mode 100644
index 87c26a75..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pangoxft-render.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/* Pango
- * pangoxft-render.h: Rendering routines for the Xft library
- *
- * Copyright (C) 2004 Red Hat Software
- *
- * 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 __PANGOXFT_RENDER_H__
-#define __PANGOXFT_RENDER_H__
-
-#include <pango/pango-renderer.h>
-
-G_BEGIN_DECLS
-
-#define _XFT_NO_COMPAT_
-#include <X11/Xlib.h>
-#include <X11/Xft/Xft.h>
-#if defined(XftVersion) && XftVersion >= 20000
-#else
-#error "must have Xft version 2 or newer"
-#endif
-
-typedef struct _PangoXftRenderer        PangoXftRenderer;
-typedef struct _PangoXftRendererClass   PangoXftRendererClass;
-typedef struct _PangoXftRendererPrivate PangoXftRendererPrivate;
-
-#define PANGO_TYPE_XFT_RENDERER            (pango_xft_renderer_get_type())
-#define PANGO_XFT_RENDERER(object)         (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_XFT_RENDERER, PangoXftRenderer))
-#define PANGO_IS_XFT_RENDERER(object)      (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_XFT_RENDERER))
-#define PANGO_XFT_RENDERER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_XFT_RENDERER, PangoXftRendererClass))
-#define PANGO_IS_XFT_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_XFT_RENDERER))
-#define PANGO_XFT_RENDERER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_XFT_RENDERER, PangoXftRendererClass))
-
-/**
- * PangoXftRenderer
- *
- * #PangoXftRenderer is a subclass of #PangoRenderer used for rendering
- * with Pango's Xft backend. It can be used directly, or it can be
- * further subclassed to modify exactly how drawing of individual
- * elements occurs.
- *
- * Since: 1.8
- */
-struct _PangoXftRenderer
-{
-  /*< private >*/
-  PangoRenderer parent_instance;
-
-  Display *display;
-  int screen;
-  XftDraw *draw;
-
-  PangoXftRendererPrivate *priv;
-};
-
-/**
- * PangoXftRendererClass
- * @composite_trapezoids: draw the specified trapezoids using
- *   the current color and other attributes for @part
- * @composite_glyphs: draw the specified glyphs using
- *   the current foreground color and other foreground
- *   attributes
- *
- * The class structure for #PangoXftRenderer
- *
- * Since: 1.8
- */
-struct _PangoXftRendererClass
-{
-  /*< private >*/
-  PangoRendererClass parent_class;
-
-  /*< public >*/
-  void (*composite_trapezoids) (PangoXftRenderer *xftrenderer,
-				PangoRenderPart   part,
-				XTrapezoid       *trapezoids,
-				int               n_trapezoids);
-  void (*composite_glyphs)     (PangoXftRenderer *xftrenderer,
-				XftFont          *xft_font,
-				XftGlyphSpec     *glyphs,
-				int               n_glyphs);
-};
-
-GType pango_xft_renderer_get_type    (void) G_GNUC_CONST;
-
-PangoRenderer *pango_xft_renderer_new                 (Display          *display,
-						       int               screen);
-void           pango_xft_renderer_set_draw            (PangoXftRenderer *xftrenderer,
-						       XftDraw          *draw);
-void           pango_xft_renderer_set_default_color   (PangoXftRenderer *xftrenderer,
-						       PangoColor       *default_color);
-
-void pango_xft_render             (XftDraw          *draw,
-				   XftColor         *color,
-				   PangoFont        *font,
-				   PangoGlyphString *glyphs,
-				   gint              x,
-				   gint              y);
-void pango_xft_picture_render     (Display          *display,
-				   Picture           src_picture,
-				   Picture           dest_picture,
-				   PangoFont        *font,
-				   PangoGlyphString *glyphs,
-				   gint              x,
-				   gint              y);
-void pango_xft_render_transformed (XftDraw          *draw,
-				   XftColor         *color,
-				   PangoMatrix      *matrix,
-				   PangoFont        *font,
-				   PangoGlyphString *glyphs,
-				   int               x,
-				   int               y);
-void pango_xft_render_layout_line (XftDraw          *draw,
-				   XftColor         *color,
-				   PangoLayoutLine  *line,
-				   int               x,
-				   int               y);
-void pango_xft_render_layout      (XftDraw          *draw,
-				   XftColor         *color,
-				   PangoLayout      *layout,
-				   int               x,
-				   int               y);
-
-G_END_DECLS
-
-#endif /* __PANGOXFT_RENDER_H__ */
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pangoxft.h b/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pangoxft.h
deleted file mode 100644
index a84571a8..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/include/pango-1.0/pango/pangoxft.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* Pango
- * pangoxft.h:
- *
- * Copyright (C) 1999 Red Hat Software
- * Copyright (C) 2000 SuSE Linux Ltd
- *
- * 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 __PANGOXFT_H__
-#define __PANGOXFT_H__
-
-#include <pango/pango-context.h>
-#include <pango/pango-ot.h>
-#include <pango/pangofc-font.h>
-#include <pango/pango-layout.h>
-#include <pango/pangoxft-render.h>
-
-G_BEGIN_DECLS
-
-#ifndef PANGO_DISABLE_DEPRECATED
-#define PANGO_RENDER_TYPE_XFT "PangoRenderXft"
-#endif
-
-#define PANGO_TYPE_XFT_FONT_MAP              (pango_xft_font_map_get_type ())
-#define PANGO_XFT_FONT_MAP(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_XFT_FONT_MAP, PangoXftFontMap))
-#define PANGO_XFT_IS_FONT_MAP(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_XFT_FONT_MAP))
-
-typedef struct _PangoXftFontMap      PangoXftFontMap;
-
-typedef struct _PangoXftFont    PangoXftFont;
-
-typedef void (*PangoXftSubstituteFunc) (FcPattern *pattern,
-					gpointer   data);
-
-/* Calls for applications
- */
-PangoFontMap *pango_xft_get_font_map     (Display *display,
-					  int      screen);
-PangoContext *pango_xft_get_context      (Display *display,
-					  int      screen);
-void          pango_xft_shutdown_display (Display *display,
-					  int      screen);
-
-void pango_xft_set_default_substitute (Display                *display,
-				       int                     screen,
-				       PangoXftSubstituteFunc  func,
-				       gpointer                data,
-				       GDestroyNotify          notify);
-void pango_xft_substitute_changed     (Display                *display,
-				       int                     screen);
-
-GType pango_xft_font_map_get_type (void) G_GNUC_CONST;
-
-#define PANGO_XFT_FONT(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_XFT_FONT, PangoXftFont))
-#define PANGO_TYPE_XFT_FONT              (pango_xft_font_get_type ())
-#define PANGO_XFT_IS_FONT(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_XFT_FONT))
-
-GType      pango_xft_font_get_type (void) G_GNUC_CONST;
-
-/* For shape engines
- */
-
-#ifdef PANGO_ENABLE_ENGINE
-XftFont *     pango_xft_font_get_font          (PangoFont *font);
-Display *     pango_xft_font_get_display       (PangoFont *font);
-#ifndef PANGO_DISABLE_DEPRECATED
-FT_Face       pango_xft_font_lock_face         (PangoFont *font);
-void	      pango_xft_font_unlock_face       (PangoFont *font);
-guint	      pango_xft_font_get_glyph	       (PangoFont *font,
-						gunichar   wc);
-gboolean      pango_xft_font_has_char          (PangoFont *font,
-						gunichar   wc);
-PangoGlyph    pango_xft_font_get_unknown_glyph (PangoFont *font,
-						gunichar   wc);
-#endif /* PANGO_DISABLE_DEPRECATED */
-#endif /* PANGO_ENABLE_ENGINE */
-
-G_END_DECLS
-
-#endif /* __PANGOXFT_H__ */
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/glib-2.0/include/glibconfig.h b/lib-x86-32/gtk-2.12.12/usr/lib/glib-2.0/include/glibconfig.h
deleted file mode 100644
index 9547c550..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/glib-2.0/include/glibconfig.h
+++ /dev/null
@@ -1,202 +0,0 @@
-/* glibconfig.h
- *
- * This is a generated file.  Please modify 'configure.in'
- */
-
-#ifndef __G_LIBCONFIG_H__
-#define __G_LIBCONFIG_H__
-
-#include <glib/gmacros.h>
-
-#include <limits.h>
-#include <float.h>
-#define GLIB_HAVE_ALLOCA_H
-#define GLIB_HAVE_SYS_POLL_H
-
-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
-
-typedef signed int gssize;
-typedef unsigned int gsize;
-#define G_GSIZE_MODIFIER ""
-#define G_GSSIZE_FORMAT "i"
-#define G_GSIZE_FORMAT "u"
-
-#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 GPOINTER_TO_INT(p)	((gint)   (p))
-#define GPOINTER_TO_UINT(p)	((guint)  (p))
-
-#define GINT_TO_POINTER(i)	((gpointer)  (i))
-#define GUINT_TO_POINTER(u)	((gpointer)  (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 16
-#define GLIB_MICRO_VERSION 6
-
-#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 0
-
-#define G_HAVE_GNUC_VISIBILITY 1
-#if 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
-typedef struct _GStaticMutex GStaticMutex;
-struct _GStaticMutex
-{
-  struct _GMutex *runtime_mutex;
-  union {
-    char   pad[24];
-    double dummy_double;
-    void  *dummy_pointer;
-    long   dummy_long;
-  } static_mutex;
-};
-#define	G_STATIC_MUTEX_INIT	{ NULL, { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} } }
-#define	g_static_mutex_get_mutex(mutex) \
-  (g_thread_use_default_impl ? ((GMutex*) ((mutex)->static_mutex.pad)) : \
-   g_static_mutex_get_mutex_impl_shortcut (&((mutex)->runtime_mutex)))
-/* This represents a system thread as used by the implementation. An
- * alien implementaion, as loaded by g_thread_init can only count on
- * "sizeof (gpointer)" bytes to store their info. We however need more
- * for some of our native implementations. */
-typedef union _GSystemThread GSystemThread;
-union _GSystemThread
-{
-  char   data[4];
-  double dummy_double;
-  void  *dummy_pointer;
-  long   dummy_long;
-};
-
-#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 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;
-
-G_END_DECLS
-
-#endif /* GLIBCONFIG_H */
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/gtk-2.0/2.10.0/immodule-files.d/libgtk2.0-0.immodules b/lib-x86-32/gtk-2.12.12/usr/lib/gtk-2.0/2.10.0/immodule-files.d/libgtk2.0-0.immodules
deleted file mode 100644
index ec0f7a23..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/gtk-2.0/2.10.0/immodule-files.d/libgtk2.0-0.immodules
+++ /dev/null
@@ -1,34 +0,0 @@
-# automatically generated by dh_gtkmodules, do not edit
-"/usr/lib/gtk-2.0/2.10.0/immodules/im-multipress.so" 
-"multipress" "Multipress" "gtk20" "" "" 
-
-"/usr/lib/gtk-2.0/2.10.0/immodules/im-ipa.so" 
-"ipa" "IPA" "gtk20" "/usr/share/locale" "" 
-
-"/usr/lib/gtk-2.0/2.10.0/immodules/im-thai.so" 
-"thai" "Thai-Lao" "gtk20" "/usr/share/locale" "lo:th" 
-
-"/usr/lib/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.so" 
-"cyrillic_translit" "Cyrillic (Transliterated)" "gtk20" "/usr/share/locale" "" 
-
-"/usr/lib/gtk-2.0/2.10.0/immodules/im-xim.so" 
-"xim" "X Input Method" "gtk20" "/usr/share/locale" "ko:ja:th:zh" 
-
-"/usr/lib/gtk-2.0/2.10.0/immodules/im-inuktitut.so" 
-"inuktitut" "Inuktitut (Transliterated)" "gtk20" "/usr/share/locale" "iu" 
-
-"/usr/lib/gtk-2.0/2.10.0/immodules/im-cedilla.so" 
-"cedilla" "Cedilla" "gtk20" "/usr/share/locale" "az:ca:co:fr:gv:oc:pt:sq:tr:wa" 
-
-"/usr/lib/gtk-2.0/2.10.0/immodules/im-viqr.so" 
-"viqr" "Vietnamese (VIQR)" "gtk20" "/usr/share/locale" "vi" 
-
-"/usr/lib/gtk-2.0/2.10.0/immodules/im-ti-et.so" 
-"ti_et" "Tigrigna-Ethiopian (EZ+)" "gtk20" "/usr/share/locale" "ti" 
-
-"/usr/lib/gtk-2.0/2.10.0/immodules/im-ti-er.so" 
-"ti_er" "Tigrigna-Eritrean (EZ+)" "gtk20" "/usr/share/locale" "ti" 
-
-"/usr/lib/gtk-2.0/2.10.0/immodules/im-am-et.so" 
-"am_et" "Amharic (EZ+)" "gtk20" "/usr/share/locale" "am" 
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/gtk-2.0/2.10.0/loader-files.d/libgtk2.0-0.loaders b/lib-x86-32/gtk-2.12.12/usr/lib/gtk-2.0/2.10.0/loader-files.d/libgtk2.0-0.loaders
deleted file mode 100644
index 61a59835..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/gtk-2.0/2.10.0/loader-files.d/libgtk2.0-0.loaders
+++ /dev/null
@@ -1,106 +0,0 @@
-# automatically generated by dh_gtkmodules, do not edit
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.so"
-"xbm" 4 "gtk20" "The XBM image format"
-"image/x-xbitmap" ""
-"xbm" ""
-"#define " "" 100
-"/*" "" 50
-
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.so"
-"gif" 4 "gtk20" "The GIF image format"
-"image/gif" ""
-"gif" ""
-"GIF8" "" 100
-
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.so"
-"bmp" 5 "gtk20" "The BMP image format"
-"image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
-"bmp" ""
-"BM" "" 100
-
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.so"
-"tga" 4 "gtk20" "The Targa image format"
-"image/x-tga" ""
-"tga" "targa" ""
-" \001\001" "x  " 100
-" \001\t" "x  " 100
-"  \002" "xz " 99
-"  \003" "xz " 100
-"  \n" "xz " 100
-"  \013" "xz " 100
-
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.so"
-"ani" 4 "gtk20" "The ANI image format"
-"application/x-navi-animation" ""
-"ani" ""
-"RIFF    ACON" "    xxxx    " 100
-
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.so"
-"jpeg" 5 "gtk20" "The JPEG image format"
-"image/jpeg" ""
-"jpeg" "jpe" "jpg" ""
-"\377\330" "" 100
-
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.so"
-"pcx" 4 "gtk20" "The PCX image format"
-"image/x-pcx" ""
-"pcx" ""
-"\n \001" "" 100
-"\n\002\001" "" 100
-"\n\003\001" "" 100
-"\n\004\001" "" 100
-"\n\005\001" "" 100
-
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.so"
-"ico" 5 "gtk20" "The ICO image format"
-"image/x-icon" "image/x-ico" "image/x-win-bitmap" ""
-"ico" "cur" ""
-"  \001   " "zz znz" 100
-"  \002   " "zz znz" 100
-
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.so"
-"ras" 4 "gtk20" "The Sun raster image format"
-"image/x-cmu-raster" "image/x-sun-raster" ""
-"ras" ""
-"Y\246j\225" "" 100
-
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.so"
-"png" 5 "gtk20" "The PNG image format"
-"image/png" ""
-"png" ""
-"\211PNG\r\n\032\n" "" 100
-
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.so"
-"tiff" 1 "gtk20" "The TIFF image format"
-"image/tiff" ""
-"tiff" "tif" ""
-"MM *" "  z " 100
-"II* " "   z" 100
-"II* \020   CR\002 " "   z zzz   z" 0
-
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.so"
-"xpm" 4 "gtk20" "The XPM image format"
-"image/x-xpixmap" ""
-"xpm" ""
-"/* XPM */" "" 100
-
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.so"
-"pnm" 4 "gtk20" "The PNM/PBM/PGM/PPM image format family"
-"image/x-portable-anymap" "image/x-portable-bitmap" "image/x-portable-graymap" "image/x-portable-pixmap" ""
-"pnm" "pbm" "pgm" "ppm" ""
-"P1" "" 100
-"P2" "" 100
-"P3" "" 100
-"P4" "" 100
-"P5" "" 100
-"P6" "" 100
-
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.so"
-"wbmp" 4 "gtk20" "The WBMP image format"
-"image/vnd.wap.wbmp" ""
-"wbmp" ""
-"  " "zz" 1
-" `" "z " 1
-" @" "z " 1
-"  " "z " 1
-
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/gtk-2.0/include/gdkconfig.h b/lib-x86-32/gtk-2.12.12/usr/lib/gtk-2.0/include/gdkconfig.h
deleted file mode 100644
index 67c1a719..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/gtk-2.0/include/gdkconfig.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* gdkconfig.h
- *
- * This is a generated file.  Please modify `configure.in'
- */
-
-#ifndef GDKCONFIG_H
-#define GDKCONFIG_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-#define GDK_WINDOWING_X11
-
-#define GDK_HAVE_WCHAR_H 1
-#define GDK_HAVE_WCTYPE_H 1
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* GDKCONFIG_H */
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/libatk-1.0.a b/lib-x86-32/gtk-2.12.12/usr/lib/libatk-1.0.a
deleted file mode 100644
index 8d921336..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/libatk-1.0.a
+++ /dev/null
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/libcairo.a b/lib-x86-32/gtk-2.12.12/usr/lib/libcairo.a
deleted file mode 100644
index 82525219..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/libcairo.a
+++ /dev/null
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/libgdk-x11-2.0.a b/lib-x86-32/gtk-2.12.12/usr/lib/libgdk-x11-2.0.a
deleted file mode 100644
index 146456de..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/libgdk-x11-2.0.a
+++ /dev/null
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/libgdk-x11-2.0.so.0 b/lib-x86-32/gtk-2.12.12/usr/lib/libgdk-x11-2.0.so.0
deleted file mode 120000
index fb923fe6..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/libgdk-x11-2.0.so.0
+++ /dev/null
@@ -1 +0,0 @@
-libgdk-x11-2.0.so.0.1200.12
\ No newline at end of file
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/libgdk-x11-2.0.so.0.1200.12 b/lib-x86-32/gtk-2.12.12/usr/lib/libgdk-x11-2.0.so.0.1200.12
deleted file mode 100644
index 30a03995..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/libgdk-x11-2.0.so.0.1200.12
+++ /dev/null
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/libgdk_pixbuf-2.0.a b/lib-x86-32/gtk-2.12.12/usr/lib/libgdk_pixbuf-2.0.a
deleted file mode 100644
index 3bb26661..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/libgdk_pixbuf-2.0.a
+++ /dev/null
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/libgdk_pixbuf-2.0.so.0 b/lib-x86-32/gtk-2.12.12/usr/lib/libgdk_pixbuf-2.0.so.0
deleted file mode 120000
index 2e72bfba..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/libgdk_pixbuf-2.0.so.0
+++ /dev/null
@@ -1 +0,0 @@
-libgdk_pixbuf-2.0.so.0.1200.12
\ No newline at end of file
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/libgdk_pixbuf-2.0.so.0.1200.12 b/lib-x86-32/gtk-2.12.12/usr/lib/libgdk_pixbuf-2.0.so.0.1200.12
deleted file mode 100644
index e387ba87..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/libgdk_pixbuf-2.0.so.0.1200.12
+++ /dev/null
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/libgdk_pixbuf_xlib-2.0.a b/lib-x86-32/gtk-2.12.12/usr/lib/libgdk_pixbuf_xlib-2.0.a
deleted file mode 100644
index 13427ce8..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/libgdk_pixbuf_xlib-2.0.a
+++ /dev/null
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/libgdk_pixbuf_xlib-2.0.so.0 b/lib-x86-32/gtk-2.12.12/usr/lib/libgdk_pixbuf_xlib-2.0.so.0
deleted file mode 120000
index dea5e2d5..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/libgdk_pixbuf_xlib-2.0.so.0
+++ /dev/null
@@ -1 +0,0 @@
-libgdk_pixbuf_xlib-2.0.so.0.1200.12
\ No newline at end of file
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/libgdk_pixbuf_xlib-2.0.so.0.1200.12 b/lib-x86-32/gtk-2.12.12/usr/lib/libgdk_pixbuf_xlib-2.0.so.0.1200.12
deleted file mode 100644
index 4db981bf..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/libgdk_pixbuf_xlib-2.0.so.0.1200.12
+++ /dev/null
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/libgio-2.0.a b/lib-x86-32/gtk-2.12.12/usr/lib/libgio-2.0.a
deleted file mode 100644
index db4950fd..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/libgio-2.0.a
+++ /dev/null
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/libgio-2.0.so.0 b/lib-x86-32/gtk-2.12.12/usr/lib/libgio-2.0.so.0
deleted file mode 120000
index e0ab7969..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/libgio-2.0.so.0
+++ /dev/null
@@ -1 +0,0 @@
-libgio-2.0.so.0.0.0
\ No newline at end of file
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/libgio-2.0.so.0.0.0 b/lib-x86-32/gtk-2.12.12/usr/lib/libgio-2.0.so.0.0.0
deleted file mode 100644
index eddeba55..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/libgio-2.0.so.0.0.0
+++ /dev/null
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/libglib-2.0.a b/lib-x86-32/gtk-2.12.12/usr/lib/libglib-2.0.a
deleted file mode 100644
index caada97f..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/libglib-2.0.a
+++ /dev/null
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/libglib-2.0.so.0 b/lib-x86-32/gtk-2.12.12/usr/lib/libglib-2.0.so.0
deleted file mode 120000
index 95259513..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/libglib-2.0.so.0
+++ /dev/null
@@ -1 +0,0 @@
-libglib-2.0.so.0.1600.6
\ No newline at end of file
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/libglib-2.0.so.0.1600.6 b/lib-x86-32/gtk-2.12.12/usr/lib/libglib-2.0.so.0.1600.6
deleted file mode 100644
index 87dcd725..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/libglib-2.0.so.0.1600.6
+++ /dev/null
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/libgmodule-2.0.a b/lib-x86-32/gtk-2.12.12/usr/lib/libgmodule-2.0.a
deleted file mode 100644
index 07bfe714..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/libgmodule-2.0.a
+++ /dev/null
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/libgmodule-2.0.so.0 b/lib-x86-32/gtk-2.12.12/usr/lib/libgmodule-2.0.so.0
deleted file mode 120000
index ef6e9389..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/libgmodule-2.0.so.0
+++ /dev/null
@@ -1 +0,0 @@
-libgmodule-2.0.so.0.1600.6
\ No newline at end of file
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/libgmodule-2.0.so.0.1600.6 b/lib-x86-32/gtk-2.12.12/usr/lib/libgmodule-2.0.so.0.1600.6
deleted file mode 100644
index d797c8c5..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/libgmodule-2.0.so.0.1600.6
+++ /dev/null
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/libgobject-2.0.a b/lib-x86-32/gtk-2.12.12/usr/lib/libgobject-2.0.a
deleted file mode 100644
index 73f38cac..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/libgobject-2.0.a
+++ /dev/null
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/libgobject-2.0.so.0 b/lib-x86-32/gtk-2.12.12/usr/lib/libgobject-2.0.so.0
deleted file mode 120000
index 8595413e..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/libgobject-2.0.so.0
+++ /dev/null
@@ -1 +0,0 @@
-libgobject-2.0.so.0.1600.6
\ No newline at end of file
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/libgobject-2.0.so.0.1600.6 b/lib-x86-32/gtk-2.12.12/usr/lib/libgobject-2.0.so.0.1600.6
deleted file mode 100644
index d08346cc..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/libgobject-2.0.so.0.1600.6
+++ /dev/null
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/libgthread-2.0.a b/lib-x86-32/gtk-2.12.12/usr/lib/libgthread-2.0.a
deleted file mode 100644
index eed565f9..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/libgthread-2.0.a
+++ /dev/null
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/libgthread-2.0.so.0 b/lib-x86-32/gtk-2.12.12/usr/lib/libgthread-2.0.so.0
deleted file mode 120000
index c83be93b..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/libgthread-2.0.so.0
+++ /dev/null
@@ -1 +0,0 @@
-libgthread-2.0.so.0.1600.6
\ No newline at end of file
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/libgthread-2.0.so.0.1600.6 b/lib-x86-32/gtk-2.12.12/usr/lib/libgthread-2.0.so.0.1600.6
deleted file mode 100644
index 461ad5b2..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/libgthread-2.0.so.0.1600.6
+++ /dev/null
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/libgtk-x11-2.0.a b/lib-x86-32/gtk-2.12.12/usr/lib/libgtk-x11-2.0.a
deleted file mode 100644
index 74b9dcc8..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/libgtk-x11-2.0.a
+++ /dev/null
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/libgtk-x11-2.0.so.0 b/lib-x86-32/gtk-2.12.12/usr/lib/libgtk-x11-2.0.so.0
deleted file mode 120000
index 88c6eb39..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/libgtk-x11-2.0.so.0
+++ /dev/null
@@ -1 +0,0 @@
-libgtk-x11-2.0.so.0.1200.12
\ No newline at end of file
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/libgtk-x11-2.0.so.0.1200.12 b/lib-x86-32/gtk-2.12.12/usr/lib/libgtk-x11-2.0.so.0.1200.12
deleted file mode 100644
index 01630100..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/libgtk-x11-2.0.so.0.1200.12
+++ /dev/null
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/libgtk2.0-0/gdk-pixbuf-query-loaders b/lib-x86-32/gtk-2.12.12/usr/lib/libgtk2.0-0/gdk-pixbuf-query-loaders
deleted file mode 100755
index 07cba6bc..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/libgtk2.0-0/gdk-pixbuf-query-loaders
+++ /dev/null
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/libgtk2.0-0/gtk-query-immodules-2.0 b/lib-x86-32/gtk-2.12.12/usr/lib/libgtk2.0-0/gtk-query-immodules-2.0
deleted file mode 100755
index 881f03f0..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/libgtk2.0-0/gtk-query-immodules-2.0
+++ /dev/null
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/libgtk2.0-0/gtk-update-icon-cache b/lib-x86-32/gtk-2.12.12/usr/lib/libgtk2.0-0/gtk-update-icon-cache
deleted file mode 100755
index 28f9f1c2..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/libgtk2.0-0/gtk-update-icon-cache
+++ /dev/null
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/libgtk2.0-0/update-gdkpixbuf-loaders b/lib-x86-32/gtk-2.12.12/usr/lib/libgtk2.0-0/update-gdkpixbuf-loaders
deleted file mode 100755
index 7199af85..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/libgtk2.0-0/update-gdkpixbuf-loaders
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-# this script is a no-op since 2.10.3-2
-exit 0
-
-set -e
-
-VERSION="2.12.12"
-APIVER="2.0"
-SHARED_PKG="libgtk2.0-0"
-TMPFILE=$(mktemp -t "gtk+$APIVER-$VERSION.XXXXXXXXXX")
-
-echo -n "Updating the gdk-pixbuf loaders list for Gtk+ $VERSION..."
-"/usr/lib/$SHARED_PKG/gdk-pixbuf-query-loaders" > $TMPFILE
-if [ "x`cat "$TMPFILE" | grep -v '^#'`" = "x" ]; then
-    echo "no gdk-pixbuf loader found."
-else
-    echo "done."
-fi
-if ! test -d "/etc/gtk-$APIVER"; then
-    echo -n "Creating /etc/gtk-$APIVER..."
-    mkdir "/etc/gtk-$APIVER"
-    echo "done."
-fi
-cp "$TMPFILE" "/etc/gtk-$APIVER/gdk-pixbuf.loaders"
-chmod 644 "/etc/gtk-$APIVER/gdk-pixbuf.loaders"
-
-rm -f "$TMPFILE"
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/libgtk2.0-0/update-gtk-immodules b/lib-x86-32/gtk-2.12.12/usr/lib/libgtk2.0-0/update-gtk-immodules
deleted file mode 100755
index a01db2d0..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/libgtk2.0-0/update-gtk-immodules
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-# this script is a no-op since 2.10.3-2
-exit 0
-
-set -e
-
-VERSION="2.12.12"
-GTK_BINARY_VERSION="2.10.0"
-APIVER="2.0"
-SHARED_PKG="libgtk2.0-0"
-TMPFILE=$(mktemp -t "gtk+$APIVER-$VERSION.XXXXXXXXXX")
-
-echo -n "Updating the IM modules list for Gtk+ $VERSION..."
-"/usr/lib/$SHARED_PKG/gtk-query-immodules-$APIVER" \
-    $(find "/usr/lib/gtk-$APIVER/$GTK_BINARY_VERSION/immodules" -name '*.so') \
-    > "$TMPFILE"
-if [ "x`cat "$TMPFILE" | grep -v '^#'`" = "x" ]; then
-    echo "no Gtk+ IM modules found."
-else
-    echo "done."
-fi
-if ! test -d "/etc/gtk-$APIVER"; then
-    echo -n "Creating /etc/gtk-$APIVER..."
-    mkdir "/etc/gtk-$APIVER"
-    echo "done."
-fi
-cp "$TMPFILE" "/etc/gtk-$APIVER/gtk.immodules"
-chmod 644 "/etc/gtk-$APIVER/gtk.immodules"
-
-rm -f "$TMPFILE"
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/libpango-1.0.a b/lib-x86-32/gtk-2.12.12/usr/lib/libpango-1.0.a
deleted file mode 100644
index f81ed93c..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/libpango-1.0.a
+++ /dev/null
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/libpangocairo-1.0.a b/lib-x86-32/gtk-2.12.12/usr/lib/libpangocairo-1.0.a
deleted file mode 100644
index f5fc97b1..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/libpangocairo-1.0.a
+++ /dev/null
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/libpangoft2-1.0.a b/lib-x86-32/gtk-2.12.12/usr/lib/libpangoft2-1.0.a
deleted file mode 100644
index deb48622..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/libpangoft2-1.0.a
+++ /dev/null
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/libpangox-1.0.a b/lib-x86-32/gtk-2.12.12/usr/lib/libpangox-1.0.a
deleted file mode 100644
index 8338be4a..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/libpangox-1.0.a
+++ /dev/null
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/libpangoxft-1.0.a b/lib-x86-32/gtk-2.12.12/usr/lib/libpangoxft-1.0.a
deleted file mode 100644
index 5a2942b1..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/libpangoxft-1.0.a
+++ /dev/null
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/atk.pc b/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/atk.pc
deleted file mode 100644
index 8e1cab06..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/atk.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: Atk
-Description: Accessibility Toolkit
-Version: 1.22.0
-Requires: gobject-2.0 gmodule-no-export-2.0
-Libs: -L${libdir} -latk-1.0
-Cflags: -I${includedir}/atk-1.0
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/cairo-directfb.pc b/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/cairo-directfb.pc
deleted file mode 100644
index 51de49d2..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/cairo-directfb.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=NONE
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: cairo-directfb
-Description: directfb backend for cairo graphics library
-Version: 1.6.4
-
-Requires: cairo directfb 
-Libs: 
-Cflags: -I${includedir}/cairo 
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/cairo-ft.pc b/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/cairo-ft.pc
deleted file mode 100644
index 65726c9e..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/cairo-ft.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=NONE
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: cairo-ft
-Description: FreeType font backend for cairo graphics library
-Version: 1.6.4
-
-Requires: cairo freetype2 >= 9.7.3 fontconfig 
-Libs: 
-Cflags: -I${includedir}/cairo 
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/cairo-pdf.pc b/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/cairo-pdf.pc
deleted file mode 100644
index 45508107..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/cairo-pdf.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=NONE
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: cairo-pdf
-Description: PDF backend for cairo graphics library
-Version: 1.6.4
-
-Requires: cairo 
-Libs: -lz 
-Cflags: -I${includedir}/cairo 
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/cairo-png.pc b/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/cairo-png.pc
deleted file mode 100644
index 6d19486a..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/cairo-png.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=NONE
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: cairo-png
-Description: PNG backend for cairo graphics library
-Version: 1.6.4
-
-Requires: cairo libpng12 
-Libs: 
-Cflags: -I${includedir}/cairo 
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/cairo-ps.pc b/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/cairo-ps.pc
deleted file mode 100644
index 73f9b89b..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/cairo-ps.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=NONE
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: cairo-ps
-Description: PostScript backend for cairo graphics library
-Version: 1.6.4
-
-Requires: cairo 
-Libs: -lz 
-Cflags: -I${includedir}/cairo 
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/cairo-svg.pc b/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/cairo-svg.pc
deleted file mode 100644
index 9fea7ec3..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/cairo-svg.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=NONE
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: cairo-svg
-Description: SVG backend for cairo graphics library
-Version: 1.6.4
-
-Requires: cairo 
-Libs: 
-Cflags: -I${includedir}/cairo 
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/cairo-xcb.pc b/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/cairo-xcb.pc
deleted file mode 100644
index 1e3423a9..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/cairo-xcb.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=NONE
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: cairo-xcb
-Description: XCB backend for cairo graphics library
-Version: 1.6.4
-
-Requires: cairo xcb >= 0.9.92 xcb-render >= 0.9.92 xcb-renderutil 
-Libs: 
-Cflags: -I${includedir}/cairo 
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/cairo-xlib-xrender.pc b/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/cairo-xlib-xrender.pc
deleted file mode 100644
index ac2c2537..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/cairo-xlib-xrender.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=NONE
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: cairo-xlib_xrender
-Description: Xlib Xrender backend for cairo graphics library
-Version: 1.6.4
-
-Requires: cairo-xlib xrender >= 0.6 
-Libs: 
-Cflags: -I${includedir}/cairo 
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/cairo-xlib.pc b/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/cairo-xlib.pc
deleted file mode 100644
index 5625dbe2..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/cairo-xlib.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=NONE
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: cairo-xlib
-Description: Xlib backend for cairo graphics library
-Version: 1.6.4
-
-Requires: cairo x11 
-Libs: 
-Cflags: -I${includedir}/cairo 
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/cairo.pc b/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/cairo.pc
deleted file mode 100644
index 464fa6cc..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/cairo.pc
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: cairo
-Description: Multi-platform 2D graphics library
-Version: 1.6.4
-
-Requires.private: freetype2 >= 9.7.3 fontconfig directfb libpng12 xcb >= 0.9.92 xcb-render >= 0.9.92 xcb-renderutil xrender >= 0.6 x11 pixman-1 >= 0.10.0 
-Libs: -L${libdir} -lcairo
-Libs.private: -lz -lz -lm
-Cflags: -I${includedir}/cairo
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gdk-2.0.pc b/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gdk-2.0.pc
deleted file mode 100644
index 3cdd1737..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gdk-2.0.pc
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=${prefix}/include
-target=x11
-
-Name: GDK
-Description: GIMP Drawing Kit (${target} target)
-Version: 2.12.12
-Requires: gdk-pixbuf-2.0 pango pangocairo
-Requires.private: fontconfig x11 xext xrender xinerama xi xrandr xcursor xfixes xcomposite xdamage
-Libs: -L${libdir} -lgdk-${target}-2.0 
-Cflags: -I${includedir}/gtk-2.0 -I${libdir}/gtk-2.0/include 
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gdk-pixbuf-2.0.pc b/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gdk-pixbuf-2.0.pc
deleted file mode 100644
index ac67b526..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gdk-pixbuf-2.0.pc
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=${prefix}/include
-
-Name: GdkPixbuf
-Description: Image loading and scaling
-Version: 2.12.12
-Requires: gobject-2.0,gmodule-no-export-2.0
-Libs: -L${libdir} -lgdk_pixbuf-2.0 -lm
-Cflags: -I${includedir}/gtk-2.0 
-
-Libs.private: -ltiff -ljpeg -lpng12
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gdk-pixbuf-xlib-2.0.pc b/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gdk-pixbuf-xlib-2.0.pc
deleted file mode 100644
index 31194ce2..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gdk-pixbuf-xlib-2.0.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=${prefix}/include
-
-Name: GdkPixbuf Xlib
-Description: GdkPixbuf rendering for Xlib
-Version: 2.12.12
-Requires: gobject-2.0,gmodule-no-export-2.0,gdk-pixbuf-2.0
-Libs: -L${libdir} -lgdk_pixbuf_xlib-2.0
-Cflags: -I${includedir}
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gdk-x11-2.0.pc b/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gdk-x11-2.0.pc
deleted file mode 100644
index 3cdd1737..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gdk-x11-2.0.pc
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=${prefix}/include
-target=x11
-
-Name: GDK
-Description: GIMP Drawing Kit (${target} target)
-Version: 2.12.12
-Requires: gdk-pixbuf-2.0 pango pangocairo
-Requires.private: fontconfig x11 xext xrender xinerama xi xrandr xcursor xfixes xcomposite xdamage
-Libs: -L${libdir} -lgdk-${target}-2.0 
-Cflags: -I${includedir}/gtk-2.0 -I${libdir}/gtk-2.0/include 
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gio-2.0.pc b/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gio-2.0.pc
deleted file mode 100644
index ad465fdf..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gio-2.0.pc
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-giomoduledir=${libdir}/gio/modules
-
-Name: GIO
-Description: glib I/O library
-Version: 2.16.6
-Requires: glib-2.0,gobject-2.0,gmodule-no-export-2.0
-Libs: -L${libdir} -lgio-2.0
-Cflags: 
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gio-unix-2.0.pc b/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gio-unix-2.0.pc
deleted file mode 100644
index c7d221f8..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gio-unix-2.0.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-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.16.6
-Requires: gobject-2.0,gmodule-no-export-2.0,gio-2.0
-Libs: -L${libdir} -lgio-2.0
-Cflags: -I${includedir}/gio-unix-2.0/
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/glib-2.0.pc b/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/glib-2.0.pc
deleted file mode 100644
index d926ca47..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/glib-2.0.pc
+++ /dev/null
@@ -1,14 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-glib_genmarshal=glib-genmarshal
-gobject_query=gobject-query
-glib_mkenums=glib-mkenums
-
-Name: GLib
-Description: C Utility Library
-Version: 2.16.6
-Libs: -L${libdir} -lglib-2.0  
-Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include 
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gmodule-2.0.pc b/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gmodule-2.0.pc
deleted file mode 100644
index 6c29784f..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gmodule-2.0.pc
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=/usr
-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.16.6
-Libs: -L${libdir} -Wl,--export-dynamic -lgmodule-2.0 -ldl
-Cflags:
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gmodule-export-2.0.pc b/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gmodule-export-2.0.pc
deleted file mode 100644
index 6c29784f..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gmodule-export-2.0.pc
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=/usr
-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.16.6
-Libs: -L${libdir} -Wl,--export-dynamic -lgmodule-2.0 -ldl
-Cflags:
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gmodule-no-export-2.0.pc b/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gmodule-no-export-2.0.pc
deleted file mode 100644
index c833cd19..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gmodule-no-export-2.0.pc
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=/usr
-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.16.6
-Libs: -L${libdir} -lgmodule-2.0 -ldl
-Cflags:
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gobject-2.0.pc b/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gobject-2.0.pc
deleted file mode 100644
index 59e6d1d9..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gobject-2.0.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-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.16.6
-Libs: -L${libdir} -lgobject-2.0
-Cflags:
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gthread-2.0.pc b/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gthread-2.0.pc
deleted file mode 100644
index 5dc7071b..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gthread-2.0.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: GThread
-Description: Thread support for GLib
-Requires: glib-2.0
-Version: 2.16.6
-Libs: -L${libdir} -lgthread-2.0 -pthread  -lrt
-Cflags: -pthread
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gtk+-2.0.pc b/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gtk+-2.0.pc
deleted file mode 100644
index 3a547609..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gtk+-2.0.pc
+++ /dev/null
@@ -1,15 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=${prefix}/include
-target=x11
-
-gtk_binary_version=2.10.0
-gtk_host=i486-pc-linux-gnu
-
-Name: GTK+
-Description: GIMP Tool Kit (${target} target)
-Version: 2.12.12
-Requires: gdk-${target}-2.0 atk cairo
-Libs: -L${libdir} -lgtk-${target}-2.0 
-Cflags: -I${includedir}/gtk-2.0 
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gtk+-unix-print-2.0.pc b/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gtk+-unix-print-2.0.pc
deleted file mode 100644
index acd97e0e..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gtk+-unix-print-2.0.pc
+++ /dev/null
@@ -1,14 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=${prefix}/include
-target=x11
-
-gtk_binary_version=2.10.0
-gtk_host=i486-pc-linux-gnu
-
-Name: GTK+
-Description: GIMP Tool Kit Unix print support
-Version: 2.12.12
-Requires: gtk+-${target}-2.0 atk cairo
-Cflags: -I${includedir}/gtk-unix-print-2.0
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gtk+-x11-2.0.pc b/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gtk+-x11-2.0.pc
deleted file mode 100644
index 3a547609..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/gtk+-x11-2.0.pc
+++ /dev/null
@@ -1,15 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=${prefix}/include
-target=x11
-
-gtk_binary_version=2.10.0
-gtk_host=i486-pc-linux-gnu
-
-Name: GTK+
-Description: GIMP Tool Kit (${target} target)
-Version: 2.12.12
-Requires: gdk-${target}-2.0 atk cairo
-Libs: -L${libdir} -lgtk-${target}-2.0 
-Cflags: -I${includedir}/gtk-2.0 
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/pango.pc b/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/pango.pc
deleted file mode 100644
index 7dfc2aaa..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/pango.pc
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=${prefix}/include
-
-pango_module_version=1.6.0
-
-Name: Pango
-Description: Internationalized text handling
-Version: 1.20.5
-Requires: glib-2.0,gobject-2.0,gmodule-no-export-2.0
-Libs: -L${libdir} -lpango-1.0 
-Cflags: -I${includedir}/pango-1.0
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/pangocairo.pc b/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/pangocairo.pc
deleted file mode 100644
index ade47757..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/pangocairo.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=${prefix}/include
-
-Name: Pango Cairo
-Description: Cairo rendering support for Pango
-Version: 1.20.5
-Requires: pango cairo 
-Libs: -L${libdir} -lpangocairo-1.0
-Cflags: -I${includedir}/pango-1.0
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/pangoft2.pc b/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/pangoft2.pc
deleted file mode 100644
index 22b928e4..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/pangoft2.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=${prefix}/include
-
-Name: Pango FT2 and Pango Fc
-Description: Freetype 2.0 and fontconfig font support for Pango
-Version: 1.20.5
-Requires: pango freetype2 fontconfig
-Libs: -L${libdir} -lpangoft2-1.0
-Cflags: -I${includedir}/pango-1.0
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/pangox.pc b/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/pangox.pc
deleted file mode 100644
index 0bd5c465..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/pangox.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=${prefix}/include
-
-Name: Pango X
-Description: X Window System font support for Pango
-Version: 1.20.5
-Requires: pango
-Libs: -L${libdir} -lpangox-1.0  -lX11
-Cflags: -I${includedir}/pango-1.0 
diff --git a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/pangoxft.pc b/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/pangoxft.pc
deleted file mode 100644
index f8beac91..00000000
--- a/lib-x86-32/gtk-2.12.12/usr/lib/pkgconfig/pangoxft.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=${prefix}/include
-
-Name: Pango Xft
-Description: Xft font support for Pango
-Version: 1.20.5
-Requires: pango pangoft2 xft
-Libs: -L${libdir} -lpangoxft-1.0
-Cflags: -I${includedir}/pango-1.0
diff --git a/lib-x86-32/include/FLAC/Makefile.am b/lib-x86-32/include/FLAC/Makefile.am
deleted file mode 100644
index 19f49b1f..00000000
--- a/lib-x86-32/include/FLAC/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-#  libFLAC - Free Lossless Audio Codec library
-#  Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007  Josh Coalson
-#
-#  Redistribution and use in source and binary forms, with or without
-#  modification, are permitted provided that the following conditions
-#  are met:
-#
-#  - Redistributions of source code must retain the above copyright
-#  notice, this list of conditions and the following disclaimer.
-#
-#  - 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.
-#
-#  - Neither the name of the Xiph.org Foundation nor the names of its
-#  contributors may be used to endorse or promote products derived from
-#  this software without specific prior written permission.
-#
-#  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 FOUNDATION 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.
-
-flaccincludedir = $(includedir)/FLAC
-
-flaccinclude_HEADERS = \
-	all.h \
-	assert.h \
-	callback.h \
-	export.h \
-	format.h \
-	metadata.h \
-	ordinals.h \
-	stream_decoder.h \
-	stream_encoder.h
diff --git a/lib-x86-32/include/FLAC/all.h b/lib-x86-32/include/FLAC/all.h
deleted file mode 100644
index c542c0d5..00000000
--- a/lib-x86-32/include/FLAC/all.h
+++ /dev/null
@@ -1,370 +0,0 @@
-/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007  Josh Coalson
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - 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.
- *
- * - Neither the name of the Xiph.org Foundation nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * 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 FOUNDATION 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 FLAC__ALL_H
-#define FLAC__ALL_H
-
-#include "export.h"
-
-#include "assert.h"
-#include "callback.h"
-#include "format.h"
-#include "metadata.h"
-#include "ordinals.h"
-#include "stream_decoder.h"
-#include "stream_encoder.h"
-
-/** \mainpage
- *
- * \section intro Introduction
- *
- * This is the documentation for the FLAC C and C++ APIs.  It is
- * highly interconnected; this introduction should give you a top
- * level idea of the structure and how to find the information you
- * need.  As a prerequisite you should have at least a basic
- * knowledge of the FLAC format, documented
- * <A HREF="../format.html">here</A>.
- *
- * \section c_api FLAC C API
- *
- * The FLAC C API is the interface to libFLAC, a set of structures
- * describing the components of FLAC streams, and functions for
- * encoding and decoding streams, as well as manipulating FLAC
- * metadata in files.  The public include files will be installed
- * in your include area (for example /usr/include/FLAC/...).
- *
- * By writing a little code and linking against libFLAC, it is
- * relatively easy to add FLAC support to another program.  The
- * library is licensed under <A HREF="../license.html">Xiph's BSD license</A>.
- * Complete source code of libFLAC as well as the command-line
- * encoder and plugins is available and is a useful source of
- * examples.
- *
- * Aside from encoders and decoders, libFLAC provides a powerful
- * metadata interface for manipulating metadata in FLAC files.  It
- * allows the user to add, delete, and modify FLAC metadata blocks
- * and it can automatically take advantage of PADDING blocks to avoid
- * rewriting the entire FLAC file when changing the size of the
- * metadata.
- *
- * libFLAC usually only requires the standard C library and C math
- * library. In particular, threading is not used so there is no
- * dependency on a thread library. However, libFLAC does not use
- * global variables and should be thread-safe.
- *
- * libFLAC also supports encoding to and decoding from Ogg FLAC.
- * However the metadata editing interfaces currently have limited
- * read-only support for Ogg FLAC files.
- *
- * \section cpp_api FLAC C++ API
- *
- * The FLAC C++ API is a set of classes that encapsulate the
- * structures and functions in libFLAC.  They provide slightly more
- * functionality with respect to metadata but are otherwise
- * equivalent.  For the most part, they share the same usage as
- * their counterparts in libFLAC, and the FLAC C API documentation
- * can be used as a supplement.  The public include files
- * for the C++ API will be installed in your include area (for
- * example /usr/include/FLAC++/...).
- *
- * libFLAC++ is also licensed under
- * <A HREF="../license.html">Xiph's BSD license</A>.
- *
- * \section getting_started Getting Started
- *
- * A good starting point for learning the API is to browse through
- * the <A HREF="modules.html">modules</A>.  Modules are logical
- * groupings of related functions or classes, which correspond roughly
- * to header files or sections of header files.  Each module includes a
- * detailed description of the general usage of its functions or
- * classes.
- *
- * From there you can go on to look at the documentation of
- * individual functions.  You can see different views of the individual
- * functions through the links in top bar across this page.
- *
- * If you prefer a more hands-on approach, you can jump right to some
- * <A HREF="../documentation_example_code.html">example code</A>.
- *
- * \section porting_guide Porting Guide
- *
- * Starting with FLAC 1.1.3 a \link porting Porting Guide \endlink
- * has been introduced which gives detailed instructions on how to
- * port your code to newer versions of FLAC.
- *
- * \section embedded_developers Embedded Developers
- *
- * libFLAC has grown larger over time as more functionality has been
- * included, but much of it may be unnecessary for a particular embedded
- * implementation.  Unused parts may be pruned by some simple editing of
- * src/libFLAC/Makefile.am.  In general, the decoders, encoders, and
- * metadata interface are all independent from each other.
- *
- * It is easiest to just describe the dependencies:
- *
- * - All modules depend on the \link flac_format Format \endlink module.
- * - The decoders and encoders depend on the bitbuffer.
- * - The decoder is independent of the encoder.  The encoder uses the
- *   decoder because of the verify feature, but this can be removed if
- *   not needed.
- * - Parts of the metadata interface require the stream decoder (but not
- *   the encoder).
- * - Ogg support is selectable through the compile time macro
- *   \c FLAC__HAS_OGG.
- *
- * For example, if your application only requires the stream decoder, no
- * encoder, and no metadata interface, you can remove the stream encoder
- * and the metadata interface, which will greatly reduce the size of the
- * library.
- *
- * Also, there are several places in the libFLAC code with comments marked
- * with "OPT:" where a #define can be changed to enable code that might be
- * faster on a specific platform.  Experimenting with these can yield faster
- * binaries.
- */
-
-/** \defgroup porting Porting Guide for New Versions
- *
- * This module describes differences in the library interfaces from
- * version to version.  It assists in the porting of code that uses
- * the libraries to newer versions of FLAC.
- *
- * One simple facility for making porting easier that has been added
- * in FLAC 1.1.3 is a set of \c #defines in \c export.h of each
- * library's includes (e.g. \c include/FLAC/export.h).  The
- * \c #defines mirror the libraries'
- * <A HREF="http://www.gnu.org/software/libtool/manual.html#Libtool-versioning">libtool version numbers</A>,
- * e.g. in libFLAC there are \c FLAC_API_VERSION_CURRENT,
- * \c FLAC_API_VERSION_REVISION, and \c FLAC_API_VERSION_AGE.
- * These can be used to support multiple versions of an API during the
- * transition phase, e.g.
- *
- * \code
- * #if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7
- *   legacy code
- * #else
- *   new code
- * #endif
- * \endcode
- *
- * The the source will work for multiple versions and the legacy code can
- * easily be removed when the transition is complete.
- *
- * Another available symbol is FLAC_API_SUPPORTS_OGG_FLAC (defined in
- * include/FLAC/export.h), which can be used to determine whether or not
- * the library has been compiled with support for Ogg FLAC.  This is
- * simpler than trying to call an Ogg init function and catching the
- * error.
- */
-
-/** \defgroup porting_1_1_2_to_1_1_3 Porting from FLAC 1.1.2 to 1.1.3
- *  \ingroup porting
- *
- *  \brief
- *  This module describes porting from FLAC 1.1.2 to FLAC 1.1.3.
- *
- * The main change between the APIs in 1.1.2 and 1.1.3 is that they have
- * been simplified.  First, libOggFLAC has been merged into libFLAC and
- * libOggFLAC++ has been merged into libFLAC++.  Second, both the three
- * decoding layers and three encoding layers have been merged into a
- * single stream decoder and stream encoder.  That is, the functionality
- * of FLAC__SeekableStreamDecoder and FLAC__FileDecoder has been merged
- * into FLAC__StreamDecoder, and FLAC__SeekableStreamEncoder and
- * FLAC__FileEncoder into FLAC__StreamEncoder.  Only the
- * FLAC__StreamDecoder and FLAC__StreamEncoder remain.  What this means
- * is there is now a single API that can be used to encode or decode
- * streams to/from native FLAC or Ogg FLAC and the single API can work
- * on both seekable and non-seekable streams.
- *
- * Instead of creating an encoder or decoder of a certain layer, now the
- * client will always create a FLAC__StreamEncoder or
- * FLAC__StreamDecoder.  The old layers are now differentiated by the
- * initialization function.  For example, for the decoder,
- * FLAC__stream_decoder_init() has been replaced by
- * FLAC__stream_decoder_init_stream().  This init function takes
- * callbacks for the I/O, and the seeking callbacks are optional.  This
- * allows the client to use the same object for seekable and
- * non-seekable streams.  For decoding a FLAC file directly, the client
- * can use FLAC__stream_decoder_init_file() and pass just a filename
- * and fewer callbacks; most of the other callbacks are supplied
- * internally.  For situations where fopen()ing by filename is not
- * possible (e.g. Unicode filenames on Windows) the client can instead
- * open the file itself and supply the FILE* to
- * FLAC__stream_decoder_init_FILE().  The init functions now returns a
- * FLAC__StreamDecoderInitStatus instead of FLAC__StreamDecoderState.
- * Since the callbacks and client data are now passed to the init
- * function, the FLAC__stream_decoder_set_*_callback() functions and
- * FLAC__stream_decoder_set_client_data() are no longer needed.  The
- * rest of the calls to the decoder are the same as before.
- *
- * There are counterpart init functions for Ogg FLAC, e.g.
- * FLAC__stream_decoder_init_ogg_stream().  All the rest of the calls
- * and callbacks are the same as for native FLAC.
- *
- * As an example, in FLAC 1.1.2 a seekable stream decoder would have
- * been set up like so:
- *
- * \code
- * FLAC__SeekableStreamDecoder *decoder = FLAC__seekable_stream_decoder_new();
- * if(decoder == NULL) do_something;
- * FLAC__seekable_stream_decoder_set_md5_checking(decoder, true);
- * [... other settings ...]
- * FLAC__seekable_stream_decoder_set_read_callback(decoder, my_read_callback);
- * FLAC__seekable_stream_decoder_set_seek_callback(decoder, my_seek_callback);
- * FLAC__seekable_stream_decoder_set_tell_callback(decoder, my_tell_callback);
- * FLAC__seekable_stream_decoder_set_length_callback(decoder, my_length_callback);
- * FLAC__seekable_stream_decoder_set_eof_callback(decoder, my_eof_callback);
- * FLAC__seekable_stream_decoder_set_write_callback(decoder, my_write_callback);
- * FLAC__seekable_stream_decoder_set_metadata_callback(decoder, my_metadata_callback);
- * FLAC__seekable_stream_decoder_set_error_callback(decoder, my_error_callback);
- * FLAC__seekable_stream_decoder_set_client_data(decoder, my_client_data);
- * if(FLAC__seekable_stream_decoder_init(decoder) != FLAC__SEEKABLE_STREAM_DECODER_OK) do_something;
- * \endcode
- *
- * In FLAC 1.1.3 it is like this:
- *
- * \code
- * FLAC__StreamDecoder *decoder = FLAC__stream_decoder_new();
- * if(decoder == NULL) do_something;
- * FLAC__stream_decoder_set_md5_checking(decoder, true);
- * [... other settings ...]
- * if(FLAC__stream_decoder_init_stream(
- *   decoder,
- *   my_read_callback,
- *   my_seek_callback,      // or NULL
- *   my_tell_callback,      // or NULL
- *   my_length_callback,    // or NULL
- *   my_eof_callback,       // or NULL
- *   my_write_callback,
- *   my_metadata_callback,  // or NULL
- *   my_error_callback,
- *   my_client_data
- * ) != FLAC__STREAM_DECODER_INIT_STATUS_OK) do_something;
- * \endcode
- *
- * or you could do;
- *
- * \code
- * [...]
- * FILE *file = fopen("somefile.flac","rb");
- * if(file == NULL) do_somthing;
- * if(FLAC__stream_decoder_init_FILE(
- *   decoder,
- *   file,
- *   my_write_callback,
- *   my_metadata_callback,  // or NULL
- *   my_error_callback,
- *   my_client_data
- * ) != FLAC__STREAM_DECODER_INIT_STATUS_OK) do_something;
- * \endcode
- *
- * or just:
- *
- * \code
- * [...]
- * if(FLAC__stream_decoder_init_file(
- *   decoder,
- *   "somefile.flac",
- *   my_write_callback,
- *   my_metadata_callback,  // or NULL
- *   my_error_callback,
- *   my_client_data
- * ) != FLAC__STREAM_DECODER_INIT_STATUS_OK) do_something;
- * \endcode
- *
- * Another small change to the decoder is in how it handles unparseable
- * streams.  Before, when the decoder found an unparseable stream
- * (reserved for when the decoder encounters a stream from a future
- * encoder that it can't parse), it changed the state to
- * \c FLAC__STREAM_DECODER_UNPARSEABLE_STREAM.  Now the decoder instead
- * drops sync and calls the error callback with a new error code
- * \c FLAC__STREAM_DECODER_ERROR_STATUS_UNPARSEABLE_STREAM.  This is
- * more robust.  If your error callback does not discriminate on the the
- * error state, your code does not need to be changed.
- *
- * The encoder now has a new setting:
- * FLAC__stream_encoder_set_apodization().  This is for setting the
- * method used to window the data before LPC analysis.  You only need to
- * add a call to this function if the default is not suitable.   There
- * are also two new convenience functions that may be useful:
- * FLAC__metadata_object_cuesheet_calculate_cddb_id() and
- * FLAC__metadata_get_cuesheet().
- *
- * The \a bytes parameter to FLAC__StreamDecoderReadCallback,
- * FLAC__StreamEncoderReadCallback, and FLAC__StreamEncoderWriteCallback
- * is now \c size_t instead of \c unsigned.
- */
-
-/** \defgroup porting_1_1_3_to_1_1_4 Porting from FLAC 1.1.3 to 1.1.4
- *  \ingroup porting
- *
- *  \brief
- *  This module describes porting from FLAC 1.1.3 to FLAC 1.1.4.
- *
- * There were no changes to any of the interfaces from 1.1.3 to 1.1.4.
- * There was a slight change in the implementation of
- * FLAC__stream_encoder_set_metadata(); the function now makes a copy
- * of the \a metadata array of pointers so the client no longer needs
- * to maintain it after the call.  The objects themselves that are
- * pointed to by the array are still not copied though and must be
- * maintained until the call to FLAC__stream_encoder_finish().
- */
-
-/** \defgroup porting_1_1_4_to_1_2_0 Porting from FLAC 1.1.4 to 1.2.0
- *  \ingroup porting
- *
- *  \brief
- *  This module describes porting from FLAC 1.1.4 to FLAC 1.2.0.
- *
- * There were only very minor changes to the interfaces from 1.1.4 to 1.2.0.
- * In libFLAC, \c FLAC__format_sample_rate_is_subset() was added.
- * In libFLAC++, \c FLAC::Decoder::Stream::get_decode_position() was added.
- *
- * Finally, value of the constant \c FLAC__FRAME_HEADER_RESERVED_LEN
- * has changed to reflect the conversion of one of the reserved bits
- * into active use.  It used to be \c 2 and now is \c 1.  However the
- * FLAC frame header length has not changed, so to skip the proper
- * number of bits, use \c FLAC__FRAME_HEADER_RESERVED_LEN +
- * \c FLAC__FRAME_HEADER_BLOCKING_STRATEGY_LEN
- */
-
-/** \defgroup flac FLAC C API
- *
- * The FLAC C API is the interface to libFLAC, a set of structures
- * describing the components of FLAC streams, and functions for
- * encoding and decoding streams, as well as manipulating FLAC
- * metadata in files.
- *
- * You should start with the format components as all other modules
- * are dependent on it.
- */
-
-#endif
diff --git a/lib-x86-32/include/FLAC/assert.h b/lib-x86-32/include/FLAC/assert.h
deleted file mode 100644
index 3fc03f31..00000000
--- a/lib-x86-32/include/FLAC/assert.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2001,2002,2003,2004,2005,2006,2007  Josh Coalson
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - 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.
- *
- * - Neither the name of the Xiph.org Foundation nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * 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 FOUNDATION 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 FLAC__ASSERT_H
-#define FLAC__ASSERT_H
-
-/* we need this since some compilers (like MSVC) leave assert()s on release code (and we don't want to use their ASSERT) */
-#ifdef DEBUG
-#include <assert.h>
-#define FLAC__ASSERT(x) assert(x)
-#define FLAC__ASSERT_DECLARATION(x) x
-#else
-#define FLAC__ASSERT(x)
-#define FLAC__ASSERT_DECLARATION(x)
-#endif
-
-#endif
diff --git a/lib-x86-32/include/FLAC/callback.h b/lib-x86-32/include/FLAC/callback.h
deleted file mode 100644
index c9541210..00000000
--- a/lib-x86-32/include/FLAC/callback.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2004,2005,2006,2007  Josh Coalson
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - 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.
- *
- * - Neither the name of the Xiph.org Foundation nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * 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 FOUNDATION 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 FLAC__CALLBACK_H
-#define FLAC__CALLBACK_H
-
-#include "ordinals.h"
-#include <stdlib.h> /* for size_t */
-
-/** \file include/FLAC/callback.h
- *
- *  \brief
- *  This module defines the structures for describing I/O callbacks
- *  to the other FLAC interfaces.
- *
- *  See the detailed documentation for callbacks in the
- *  \link flac_callbacks callbacks \endlink module.
- */
-
-/** \defgroup flac_callbacks FLAC/callback.h: I/O callback structures
- *  \ingroup flac
- *
- *  \brief
- *  This module defines the structures for describing I/O callbacks
- *  to the other FLAC interfaces.
- *
- *  The purpose of the I/O callback functions is to create a common way
- *  for the metadata interfaces to handle I/O.
- *
- *  Originally the metadata interfaces required filenames as the way of
- *  specifying FLAC files to operate on.  This is problematic in some
- *  environments so there is an additional option to specify a set of
- *  callbacks for doing I/O on the FLAC file, instead of the filename.
- *
- *  In addition to the callbacks, a FLAC__IOHandle type is defined as an
- *  opaque structure for a data source.
- *
- *  The callback function prototypes are similar (but not identical) to the
- *  stdio functions fread, fwrite, fseek, ftell, feof, and fclose.  If you use
- *  stdio streams to implement the callbacks, you can pass fread, fwrite, and
- *  fclose anywhere a FLAC__IOCallback_Read, FLAC__IOCallback_Write, or
- *  FLAC__IOCallback_Close is required, and a FILE* anywhere a FLAC__IOHandle
- *  is required.  \warning You generally CANNOT directly use fseek or ftell
- *  for FLAC__IOCallback_Seek or FLAC__IOCallback_Tell since on most systems
- *  these use 32-bit offsets and FLAC requires 64-bit offsets to deal with
- *  large files.  You will have to find an equivalent function (e.g. ftello),
- *  or write a wrapper.  The same is true for feof() since this is usually
- *  implemented as a macro, not as a function whose address can be taken.
- *
- * \{
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** This is the opaque handle type used by the callbacks.  Typically
- *  this is a \c FILE* or address of a file descriptor.
- */
-typedef void* FLAC__IOHandle;
-
-/** Signature for the read callback.
- *  The signature and semantics match POSIX fread() implementations
- *  and can generally be used interchangeably.
- *
- * \param  ptr      The address of the read buffer.
- * \param  size     The size of the records to be read.
- * \param  nmemb    The number of records to be read.
- * \param  handle   The handle to the data source.
- * \retval size_t
- *    The number of records read.
- */
-typedef size_t (*FLAC__IOCallback_Read) (void *ptr, size_t size, size_t nmemb, FLAC__IOHandle handle);
-
-/** Signature for the write callback.
- *  The signature and semantics match POSIX fwrite() implementations
- *  and can generally be used interchangeably.
- *
- * \param  ptr      The address of the write buffer.
- * \param  size     The size of the records to be written.
- * \param  nmemb    The number of records to be written.
- * \param  handle   The handle to the data source.
- * \retval size_t
- *    The number of records written.
- */
-typedef size_t (*FLAC__IOCallback_Write) (const void *ptr, size_t size, size_t nmemb, FLAC__IOHandle handle);
-
-/** Signature for the seek callback.
- *  The signature and semantics mostly match POSIX fseek() WITH ONE IMPORTANT
- *  EXCEPTION: the offset is a 64-bit type whereas fseek() is generally 'long'
- *  and 32-bits wide.
- *
- * \param  handle   The handle to the data source.
- * \param  offset   The new position, relative to \a whence
- * \param  whence   \c SEEK_SET, \c SEEK_CUR, or \c SEEK_END
- * \retval int
- *    \c 0 on success, \c -1 on error.
- */
-typedef int (*FLAC__IOCallback_Seek) (FLAC__IOHandle handle, FLAC__int64 offset, int whence);
-
-/** Signature for the tell callback.
- *  The signature and semantics mostly match POSIX ftell() WITH ONE IMPORTANT
- *  EXCEPTION: the offset is a 64-bit type whereas ftell() is generally 'long'
- *  and 32-bits wide.
- *
- * \param  handle   The handle to the data source.
- * \retval FLAC__int64
- *    The current position on success, \c -1 on error.
- */
-typedef FLAC__int64 (*FLAC__IOCallback_Tell) (FLAC__IOHandle handle);
-
-/** Signature for the EOF callback.
- *  The signature and semantics mostly match POSIX feof() but WATCHOUT:
- *  on many systems, feof() is a macro, so in this case a wrapper function
- *  must be provided instead.
- *
- * \param  handle   The handle to the data source.
- * \retval int
- *    \c 0 if not at end of file, nonzero if at end of file.
- */
-typedef int (*FLAC__IOCallback_Eof) (FLAC__IOHandle handle);
-
-/** Signature for the close callback.
- *  The signature and semantics match POSIX fclose() implementations
- *  and can generally be used interchangeably.
- *
- * \param  handle   The handle to the data source.
- * \retval int
- *    \c 0 on success, \c EOF on error.
- */
-typedef int (*FLAC__IOCallback_Close) (FLAC__IOHandle handle);
-
-/** A structure for holding a set of callbacks.
- *  Each FLAC interface that requires a FLAC__IOCallbacks structure will
- *  describe which of the callbacks are required.  The ones that are not
- *  required may be set to NULL.
- *
- *  If the seek requirement for an interface is optional, you can signify that
- *  a data sorce is not seekable by setting the \a seek field to \c NULL.
- */
-typedef struct {
-	FLAC__IOCallback_Read read;
-	FLAC__IOCallback_Write write;
-	FLAC__IOCallback_Seek seek;
-	FLAC__IOCallback_Tell tell;
-	FLAC__IOCallback_Eof eof;
-	FLAC__IOCallback_Close close;
-} FLAC__IOCallbacks;
-
-/* \} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib-x86-32/include/FLAC/export.h b/lib-x86-32/include/FLAC/export.h
deleted file mode 100644
index a525f29c..00000000
--- a/lib-x86-32/include/FLAC/export.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007  Josh Coalson
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - 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.
- *
- * - Neither the name of the Xiph.org Foundation nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * 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 FOUNDATION 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 FLAC__EXPORT_H
-#define FLAC__EXPORT_H
-
-/** \file include/FLAC/export.h
- *
- *  \brief
- *  This module contains #defines and symbols for exporting function
- *  calls, and providing version information and compiled-in features.
- *
- *  See the \link flac_export export \endlink module.
- */
-
-/** \defgroup flac_export FLAC/export.h: export symbols
- *  \ingroup flac
- *
- *  \brief
- *  This module contains #defines and symbols for exporting function
- *  calls, and providing version information and compiled-in features.
- *
- *  If you are compiling with MSVC and will link to the static library
- *  (libFLAC.lib) you should define FLAC__NO_DLL in your project to
- *  make sure the symbols are exported properly.
- *
- * \{
- */
-
-#if defined(FLAC__NO_DLL) || !defined(_MSC_VER)
-#define FLAC_API
-
-#else
-
-#ifdef FLAC_API_EXPORTS
-#define	FLAC_API	_declspec(dllexport)
-#else
-#define FLAC_API	_declspec(dllimport)
-
-#endif
-#endif
-
-/** These #defines will mirror the libtool-based library version number, see
- * http://www.gnu.org/software/libtool/manual.html#Libtool-versioning
- */
-#define FLAC_API_VERSION_CURRENT 10
-#define FLAC_API_VERSION_REVISION 0 /**< see above */
-#define FLAC_API_VERSION_AGE 2 /**< see above */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** \c 1 if the library has been compiled with support for Ogg FLAC, else \c 0. */
-extern FLAC_API int FLAC_API_SUPPORTS_OGG_FLAC;
-
-#ifdef __cplusplus
-}
-#endif
-
-/* \} */
-
-#endif
diff --git a/lib-x86-32/include/FLAC/format.h b/lib-x86-32/include/FLAC/format.h
deleted file mode 100644
index 77e2d013..00000000
--- a/lib-x86-32/include/FLAC/format.h
+++ /dev/null
@@ -1,1010 +0,0 @@
-/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007  Josh Coalson
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - 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.
- *
- * - Neither the name of the Xiph.org Foundation nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * 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 FOUNDATION 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 FLAC__FORMAT_H
-#define FLAC__FORMAT_H
-
-#include "export.h"
-#include "ordinals.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** \file include/FLAC/format.h
- *
- *  \brief
- *  This module contains structure definitions for the representation
- *  of FLAC format components in memory.  These are the basic
- *  structures used by the rest of the interfaces.
- *
- *  See the detailed documentation in the
- *  \link flac_format format \endlink module.
- */
-
-/** \defgroup flac_format FLAC/format.h: format components
- *  \ingroup flac
- *
- *  \brief
- *  This module contains structure definitions for the representation
- *  of FLAC format components in memory.  These are the basic
- *  structures used by the rest of the interfaces.
- *
- *  First, you should be familiar with the
- *  <A HREF="../format.html">FLAC format</A>.  Many of the values here
- *  follow directly from the specification.  As a user of libFLAC, the
- *  interesting parts really are the structures that describe the frame
- *  header and metadata blocks.
- *
- *  The format structures here are very primitive, designed to store
- *  information in an efficient way.  Reading information from the
- *  structures is easy but creating or modifying them directly is
- *  more complex.  For the most part, as a user of a library, editing
- *  is not necessary; however, for metadata blocks it is, so there are
- *  convenience functions provided in the \link flac_metadata metadata
- *  module \endlink to simplify the manipulation of metadata blocks.
- *
- * \note
- * It's not the best convention, but symbols ending in _LEN are in bits
- * and _LENGTH are in bytes.  _LENGTH symbols are \#defines instead of
- * global variables because they are usually used when declaring byte
- * arrays and some compilers require compile-time knowledge of array
- * sizes when declared on the stack.
- *
- * \{
- */
-
-
-/*
-	Most of the values described in this file are defined by the FLAC
-	format specification.  There is nothing to tune here.
-*/
-
-/** The largest legal metadata type code. */
-#define FLAC__MAX_METADATA_TYPE_CODE (126u)
-
-/** The minimum block size, in samples, permitted by the format. */
-#define FLAC__MIN_BLOCK_SIZE (16u)
-
-/** The maximum block size, in samples, permitted by the format. */
-#define FLAC__MAX_BLOCK_SIZE (65535u)
-
-/** The maximum block size, in samples, permitted by the FLAC subset for
- *  sample rates up to 48kHz. */
-#define FLAC__SUBSET_MAX_BLOCK_SIZE_48000HZ (4608u)
-
-/** The maximum number of channels permitted by the format. */
-#define FLAC__MAX_CHANNELS (8u)
-
-/** The minimum sample resolution permitted by the format. */
-#define FLAC__MIN_BITS_PER_SAMPLE (4u)
-
-/** The maximum sample resolution permitted by the format. */
-#define FLAC__MAX_BITS_PER_SAMPLE (32u)
-
-/** The maximum sample resolution permitted by libFLAC.
- *
- * \warning
- * FLAC__MAX_BITS_PER_SAMPLE is the limit of the FLAC format.  However,
- * the reference encoder/decoder is currently limited to 24 bits because
- * of prevalent 32-bit math, so make sure and use this value when
- * appropriate.
- */
-#define FLAC__REFERENCE_CODEC_MAX_BITS_PER_SAMPLE (24u)
-
-/** The maximum sample rate permitted by the format.  The value is
- *  ((2 ^ 16) - 1) * 10; see <A HREF="../format.html">FLAC format</A>
- *  as to why.
- */
-#define FLAC__MAX_SAMPLE_RATE (655350u)
-
-/** The maximum LPC order permitted by the format. */
-#define FLAC__MAX_LPC_ORDER (32u)
-
-/** The maximum LPC order permitted by the FLAC subset for sample rates
- *  up to 48kHz. */
-#define FLAC__SUBSET_MAX_LPC_ORDER_48000HZ (12u)
-
-/** The minimum quantized linear predictor coefficient precision
- *  permitted by the format.
- */
-#define FLAC__MIN_QLP_COEFF_PRECISION (5u)
-
-/** The maximum quantized linear predictor coefficient precision
- *  permitted by the format.
- */
-#define FLAC__MAX_QLP_COEFF_PRECISION (15u)
-
-/** The maximum order of the fixed predictors permitted by the format. */
-#define FLAC__MAX_FIXED_ORDER (4u)
-
-/** The maximum Rice partition order permitted by the format. */
-#define FLAC__MAX_RICE_PARTITION_ORDER (15u)
-
-/** The maximum Rice partition order permitted by the FLAC Subset. */
-#define FLAC__SUBSET_MAX_RICE_PARTITION_ORDER (8u)
-
-/** The version string of the release, stamped onto the libraries and binaries.
- *
- * \note
- * This does not correspond to the shared library version number, which
- * is used to determine binary compatibility.
- */
-extern FLAC_API const char *FLAC__VERSION_STRING;
-
-/** The vendor string inserted by the encoder into the VORBIS_COMMENT block.
- *  This is a NUL-terminated ASCII string; when inserted into the
- *  VORBIS_COMMENT the trailing null is stripped.
- */
-extern FLAC_API const char *FLAC__VENDOR_STRING;
-
-/** The byte string representation of the beginning of a FLAC stream. */
-extern FLAC_API const FLAC__byte FLAC__STREAM_SYNC_STRING[4]; /* = "fLaC" */
-
-/** The 32-bit integer big-endian representation of the beginning of
- *  a FLAC stream.
- */
-extern FLAC_API const unsigned FLAC__STREAM_SYNC; /* = 0x664C6143 */
-
-/** The length of the FLAC signature in bits. */
-extern FLAC_API const unsigned FLAC__STREAM_SYNC_LEN; /* = 32 bits */
-
-/** The length of the FLAC signature in bytes. */
-#define FLAC__STREAM_SYNC_LENGTH (4u)
-
-
-/*****************************************************************************
- *
- * Subframe structures
- *
- *****************************************************************************/
-
-/*****************************************************************************/
-
-/** An enumeration of the available entropy coding methods. */
-typedef enum {
-	FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE = 0,
-	/**< Residual is coded by partitioning into contexts, each with it's own
-	 * 4-bit Rice parameter. */
-
-	FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2 = 1
-	/**< Residual is coded by partitioning into contexts, each with it's own
-	 * 5-bit Rice parameter. */
-} FLAC__EntropyCodingMethodType;
-
-/** Maps a FLAC__EntropyCodingMethodType to a C string.
- *
- *  Using a FLAC__EntropyCodingMethodType as the index to this array will
- *  give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__EntropyCodingMethodTypeString[];
-
-
-/** Contents of a Rice partitioned residual
- */
-typedef struct {
-
-	unsigned *parameters;
-	/**< The Rice parameters for each context. */
-
-	unsigned *raw_bits;
-	/**< Widths for escape-coded partitions.  Will be non-zero for escaped
-	 * partitions and zero for unescaped partitions.
-	 */
-
-	unsigned capacity_by_order;
-	/**< The capacity of the \a parameters and \a raw_bits arrays
-	 * specified as an order, i.e. the number of array elements
-	 * allocated is 2 ^ \a capacity_by_order.
-	 */
-} FLAC__EntropyCodingMethod_PartitionedRiceContents;
-
-/** Header for a Rice partitioned residual.  (c.f. <A HREF="../format.html#partitioned_rice">format specification</A>)
- */
-typedef struct {
-
-	unsigned order;
-	/**< The partition order, i.e. # of contexts = 2 ^ \a order. */
-
-	const FLAC__EntropyCodingMethod_PartitionedRiceContents *contents;
-	/**< The context's Rice parameters and/or raw bits. */
-
-} FLAC__EntropyCodingMethod_PartitionedRice;
-
-extern FLAC_API const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_ORDER_LEN; /**< == 4 (bits) */
-extern FLAC_API const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_PARAMETER_LEN; /**< == 4 (bits) */
-extern FLAC_API const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2_PARAMETER_LEN; /**< == 5 (bits) */
-extern FLAC_API const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_RAW_LEN; /**< == 5 (bits) */
-
-extern FLAC_API const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_ESCAPE_PARAMETER;
-/**< == (1<<FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_PARAMETER_LEN)-1 */
-extern FLAC_API const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2_ESCAPE_PARAMETER;
-/**< == (1<<FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2_PARAMETER_LEN)-1 */
-
-/** Header for the entropy coding method.  (c.f. <A HREF="../format.html#residual">format specification</A>)
- */
-typedef struct {
-	FLAC__EntropyCodingMethodType type;
-	union {
-		FLAC__EntropyCodingMethod_PartitionedRice partitioned_rice;
-	} data;
-} FLAC__EntropyCodingMethod;
-
-extern FLAC_API const unsigned FLAC__ENTROPY_CODING_METHOD_TYPE_LEN; /**< == 2 (bits) */
-
-/*****************************************************************************/
-
-/** An enumeration of the available subframe types. */
-typedef enum {
-	FLAC__SUBFRAME_TYPE_CONSTANT = 0, /**< constant signal */
-	FLAC__SUBFRAME_TYPE_VERBATIM = 1, /**< uncompressed signal */
-	FLAC__SUBFRAME_TYPE_FIXED = 2, /**< fixed polynomial prediction */
-	FLAC__SUBFRAME_TYPE_LPC = 3 /**< linear prediction */
-} FLAC__SubframeType;
-
-/** Maps a FLAC__SubframeType to a C string.
- *
- *  Using a FLAC__SubframeType as the index to this array will
- *  give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__SubframeTypeString[];
-
-
-/** CONSTANT subframe.  (c.f. <A HREF="../format.html#subframe_constant">format specification</A>)
- */
-typedef struct {
-	FLAC__int32 value; /**< The constant signal value. */
-} FLAC__Subframe_Constant;
-
-
-/** VERBATIM subframe.  (c.f. <A HREF="../format.html#subframe_verbatim">format specification</A>)
- */
-typedef struct {
-	const FLAC__int32 *data; /**< A pointer to verbatim signal. */
-} FLAC__Subframe_Verbatim;
-
-
-/** FIXED subframe.  (c.f. <A HREF="../format.html#subframe_fixed">format specification</A>)
- */
-typedef struct {
-	FLAC__EntropyCodingMethod entropy_coding_method;
-	/**< The residual coding method. */
-
-	unsigned order;
-	/**< The polynomial order. */
-
-	FLAC__int32 warmup[FLAC__MAX_FIXED_ORDER];
-	/**< Warmup samples to prime the predictor, length == order. */
-
-	const FLAC__int32 *residual;
-	/**< The residual signal, length == (blocksize minus order) samples. */
-} FLAC__Subframe_Fixed;
-
-
-/** LPC subframe.  (c.f. <A HREF="../format.html#subframe_lpc">format specification</A>)
- */
-typedef struct {
-	FLAC__EntropyCodingMethod entropy_coding_method;
-	/**< The residual coding method. */
-
-	unsigned order;
-	/**< The FIR order. */
-
-	unsigned qlp_coeff_precision;
-	/**< Quantized FIR filter coefficient precision in bits. */
-
-	int quantization_level;
-	/**< The qlp coeff shift needed. */
-
-	FLAC__int32 qlp_coeff[FLAC__MAX_LPC_ORDER];
-	/**< FIR filter coefficients. */
-
-	FLAC__int32 warmup[FLAC__MAX_LPC_ORDER];
-	/**< Warmup samples to prime the predictor, length == order. */
-
-	const FLAC__int32 *residual;
-	/**< The residual signal, length == (blocksize minus order) samples. */
-} FLAC__Subframe_LPC;
-
-extern FLAC_API const unsigned FLAC__SUBFRAME_LPC_QLP_COEFF_PRECISION_LEN; /**< == 4 (bits) */
-extern FLAC_API const unsigned FLAC__SUBFRAME_LPC_QLP_SHIFT_LEN; /**< == 5 (bits) */
-
-
-/** FLAC subframe structure.  (c.f. <A HREF="../format.html#subframe">format specification</A>)
- */
-typedef struct {
-	FLAC__SubframeType type;
-	union {
-		FLAC__Subframe_Constant constant;
-		FLAC__Subframe_Fixed fixed;
-		FLAC__Subframe_LPC lpc;
-		FLAC__Subframe_Verbatim verbatim;
-	} data;
-	unsigned wasted_bits;
-} FLAC__Subframe;
-
-/** == 1 (bit)
- *
- * This used to be a zero-padding bit (hence the name
- * FLAC__SUBFRAME_ZERO_PAD_LEN) but is now a reserved bit.  It still has a
- * mandatory value of \c 0 but in the future may take on the value \c 0 or \c 1
- * to mean something else.
- */
-extern FLAC_API const unsigned FLAC__SUBFRAME_ZERO_PAD_LEN;
-extern FLAC_API const unsigned FLAC__SUBFRAME_TYPE_LEN; /**< == 6 (bits) */
-extern FLAC_API const unsigned FLAC__SUBFRAME_WASTED_BITS_FLAG_LEN; /**< == 1 (bit) */
-
-extern FLAC_API const unsigned FLAC__SUBFRAME_TYPE_CONSTANT_BYTE_ALIGNED_MASK; /**< = 0x00 */
-extern FLAC_API const unsigned FLAC__SUBFRAME_TYPE_VERBATIM_BYTE_ALIGNED_MASK; /**< = 0x02 */
-extern FLAC_API const unsigned FLAC__SUBFRAME_TYPE_FIXED_BYTE_ALIGNED_MASK; /**< = 0x10 */
-extern FLAC_API const unsigned FLAC__SUBFRAME_TYPE_LPC_BYTE_ALIGNED_MASK; /**< = 0x40 */
-
-/*****************************************************************************/
-
-
-/*****************************************************************************
- *
- * Frame structures
- *
- *****************************************************************************/
-
-/** An enumeration of the available channel assignments. */
-typedef enum {
-	FLAC__CHANNEL_ASSIGNMENT_INDEPENDENT = 0, /**< independent channels */
-	FLAC__CHANNEL_ASSIGNMENT_LEFT_SIDE = 1, /**< left+side stereo */
-	FLAC__CHANNEL_ASSIGNMENT_RIGHT_SIDE = 2, /**< right+side stereo */
-	FLAC__CHANNEL_ASSIGNMENT_MID_SIDE = 3 /**< mid+side stereo */
-} FLAC__ChannelAssignment;
-
-/** Maps a FLAC__ChannelAssignment to a C string.
- *
- *  Using a FLAC__ChannelAssignment as the index to this array will
- *  give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__ChannelAssignmentString[];
-
-/** An enumeration of the possible frame numbering methods. */
-typedef enum {
-	FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER, /**< number contains the frame number */
-	FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER /**< number contains the sample number of first sample in frame */
-} FLAC__FrameNumberType;
-
-/** Maps a FLAC__FrameNumberType to a C string.
- *
- *  Using a FLAC__FrameNumberType as the index to this array will
- *  give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__FrameNumberTypeString[];
-
-
-/** FLAC frame header structure.  (c.f. <A HREF="../format.html#frame_header">format specification</A>)
- */
-typedef struct {
-	unsigned blocksize;
-	/**< The number of samples per subframe. */
-
-	unsigned sample_rate;
-	/**< The sample rate in Hz. */
-
-	unsigned channels;
-	/**< The number of channels (== number of subframes). */
-
-	FLAC__ChannelAssignment channel_assignment;
-	/**< The channel assignment for the frame. */
-
-	unsigned bits_per_sample;
-	/**< The sample resolution. */
-
-	FLAC__FrameNumberType number_type;
-	/**< The numbering scheme used for the frame.  As a convenience, the
-	 * decoder will always convert a frame number to a sample number because
-	 * the rules are complex. */
-
-	union {
-		FLAC__uint32 frame_number;
-		FLAC__uint64 sample_number;
-	} number;
-	/**< The frame number or sample number of first sample in frame;
-	 * use the \a number_type value to determine which to use. */
-
-	FLAC__uint8 crc;
-	/**< CRC-8 (polynomial = x^8 + x^2 + x^1 + x^0, initialized with 0)
-	 * of the raw frame header bytes, meaning everything before the CRC byte
-	 * including the sync code.
-	 */
-} FLAC__FrameHeader;
-
-extern FLAC_API const unsigned FLAC__FRAME_HEADER_SYNC; /**< == 0x3ffe; the frame header sync code */
-extern FLAC_API const unsigned FLAC__FRAME_HEADER_SYNC_LEN; /**< == 14 (bits) */
-extern FLAC_API const unsigned FLAC__FRAME_HEADER_RESERVED_LEN; /**< == 1 (bits) */
-extern FLAC_API const unsigned FLAC__FRAME_HEADER_BLOCKING_STRATEGY_LEN; /**< == 1 (bits) */
-extern FLAC_API const unsigned FLAC__FRAME_HEADER_BLOCK_SIZE_LEN; /**< == 4 (bits) */
-extern FLAC_API const unsigned FLAC__FRAME_HEADER_SAMPLE_RATE_LEN; /**< == 4 (bits) */
-extern FLAC_API const unsigned FLAC__FRAME_HEADER_CHANNEL_ASSIGNMENT_LEN; /**< == 4 (bits) */
-extern FLAC_API const unsigned FLAC__FRAME_HEADER_BITS_PER_SAMPLE_LEN; /**< == 3 (bits) */
-extern FLAC_API const unsigned FLAC__FRAME_HEADER_ZERO_PAD_LEN; /**< == 1 (bit) */
-extern FLAC_API const unsigned FLAC__FRAME_HEADER_CRC_LEN; /**< == 8 (bits) */
-
-
-/** FLAC frame footer structure.  (c.f. <A HREF="../format.html#frame_footer">format specification</A>)
- */
-typedef struct {
-	FLAC__uint16 crc;
-	/**< CRC-16 (polynomial = x^16 + x^15 + x^2 + x^0, initialized with
-	 * 0) of the bytes before the crc, back to and including the frame header
-	 * sync code.
-	 */
-} FLAC__FrameFooter;
-
-extern FLAC_API const unsigned FLAC__FRAME_FOOTER_CRC_LEN; /**< == 16 (bits) */
-
-
-/** FLAC frame structure.  (c.f. <A HREF="../format.html#frame">format specification</A>)
- */
-typedef struct {
-	FLAC__FrameHeader header;
-	FLAC__Subframe subframes[FLAC__MAX_CHANNELS];
-	FLAC__FrameFooter footer;
-} FLAC__Frame;
-
-/*****************************************************************************/
-
-
-/*****************************************************************************
- *
- * Meta-data structures
- *
- *****************************************************************************/
-
-/** An enumeration of the available metadata block types. */
-typedef enum {
-
-	FLAC__METADATA_TYPE_STREAMINFO = 0,
-	/**< <A HREF="../format.html#metadata_block_streaminfo">STREAMINFO</A> block */
-
-	FLAC__METADATA_TYPE_PADDING = 1,
-	/**< <A HREF="../format.html#metadata_block_padding">PADDING</A> block */
-
-	FLAC__METADATA_TYPE_APPLICATION = 2,
-	/**< <A HREF="../format.html#metadata_block_application">APPLICATION</A> block */
-
-	FLAC__METADATA_TYPE_SEEKTABLE = 3,
-	/**< <A HREF="../format.html#metadata_block_seektable">SEEKTABLE</A> block */
-
-	FLAC__METADATA_TYPE_VORBIS_COMMENT = 4,
-	/**< <A HREF="../format.html#metadata_block_vorbis_comment">VORBISCOMMENT</A> block (a.k.a. FLAC tags) */
-
-	FLAC__METADATA_TYPE_CUESHEET = 5,
-	/**< <A HREF="../format.html#metadata_block_cuesheet">CUESHEET</A> block */
-
-	FLAC__METADATA_TYPE_PICTURE = 6,
-	/**< <A HREF="../format.html#metadata_block_picture">PICTURE</A> block */
-
-	FLAC__METADATA_TYPE_UNDEFINED = 7
-	/**< marker to denote beginning of undefined type range; this number will increase as new metadata types are added */
-
-} FLAC__MetadataType;
-
-/** Maps a FLAC__MetadataType to a C string.
- *
- *  Using a FLAC__MetadataType as the index to this array will
- *  give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__MetadataTypeString[];
-
-
-/** FLAC STREAMINFO structure.  (c.f. <A HREF="../format.html#metadata_block_streaminfo">format specification</A>)
- */
-typedef struct {
-	unsigned min_blocksize, max_blocksize;
-	unsigned min_framesize, max_framesize;
-	unsigned sample_rate;
-	unsigned channels;
-	unsigned bits_per_sample;
-	FLAC__uint64 total_samples;
-	FLAC__byte md5sum[16];
-} FLAC__StreamMetadata_StreamInfo;
-
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_MIN_BLOCK_SIZE_LEN; /**< == 16 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_MAX_BLOCK_SIZE_LEN; /**< == 16 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_MIN_FRAME_SIZE_LEN; /**< == 24 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_MAX_FRAME_SIZE_LEN; /**< == 24 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_SAMPLE_RATE_LEN; /**< == 20 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_CHANNELS_LEN; /**< == 3 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_BITS_PER_SAMPLE_LEN; /**< == 5 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_TOTAL_SAMPLES_LEN; /**< == 36 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_MD5SUM_LEN; /**< == 128 (bits) */
-
-/** The total stream length of the STREAMINFO block in bytes. */
-#define FLAC__STREAM_METADATA_STREAMINFO_LENGTH (34u)
-
-/** FLAC PADDING structure.  (c.f. <A HREF="../format.html#metadata_block_padding">format specification</A>)
- */
-typedef struct {
-	int dummy;
-	/**< Conceptually this is an empty struct since we don't store the
-	 * padding bytes.  Empty structs are not allowed by some C compilers,
-	 * hence the dummy.
-	 */
-} FLAC__StreamMetadata_Padding;
-
-
-/** FLAC APPLICATION structure.  (c.f. <A HREF="../format.html#metadata_block_application">format specification</A>)
- */
-typedef struct {
-	FLAC__byte id[4];
-	FLAC__byte *data;
-} FLAC__StreamMetadata_Application;
-
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_APPLICATION_ID_LEN; /**< == 32 (bits) */
-
-/** SeekPoint structure used in SEEKTABLE blocks.  (c.f. <A HREF="../format.html#seekpoint">format specification</A>)
- */
-typedef struct {
-	FLAC__uint64 sample_number;
-	/**<  The sample number of the target frame. */
-
-	FLAC__uint64 stream_offset;
-	/**< The offset, in bytes, of the target frame with respect to
-	 * beginning of the first frame. */
-
-	unsigned frame_samples;
-	/**< The number of samples in the target frame. */
-} FLAC__StreamMetadata_SeekPoint;
-
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_SEEKPOINT_SAMPLE_NUMBER_LEN; /**< == 64 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_SEEKPOINT_STREAM_OFFSET_LEN; /**< == 64 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_SEEKPOINT_FRAME_SAMPLES_LEN; /**< == 16 (bits) */
-
-/** The total stream length of a seek point in bytes. */
-#define FLAC__STREAM_METADATA_SEEKPOINT_LENGTH (18u)
-
-/** The value used in the \a sample_number field of
- *  FLAC__StreamMetadataSeekPoint used to indicate a placeholder
- *  point (== 0xffffffffffffffff).
- */
-extern FLAC_API const FLAC__uint64 FLAC__STREAM_METADATA_SEEKPOINT_PLACEHOLDER;
-
-
-/** FLAC SEEKTABLE structure.  (c.f. <A HREF="../format.html#metadata_block_seektable">format specification</A>)
- *
- * \note From the format specification:
- * - The seek points must be sorted by ascending sample number.
- * - Each seek point's sample number must be the first sample of the
- *   target frame.
- * - Each seek point's sample number must be unique within the table.
- * - Existence of a SEEKTABLE block implies a correct setting of
- *   total_samples in the stream_info block.
- * - Behavior is undefined when more than one SEEKTABLE block is
- *   present in a stream.
- */
-typedef struct {
-	unsigned num_points;
-	FLAC__StreamMetadata_SeekPoint *points;
-} FLAC__StreamMetadata_SeekTable;
-
-
-/** Vorbis comment entry structure used in VORBIS_COMMENT blocks.  (c.f. <A HREF="../format.html#metadata_block_vorbis_comment">format specification</A>)
- *
- *  For convenience, the APIs maintain a trailing NUL character at the end of
- *  \a entry which is not counted toward \a length, i.e.
- *  \code strlen(entry) == length \endcode
- */
-typedef struct {
-	FLAC__uint32 length;
-	FLAC__byte *entry;
-} FLAC__StreamMetadata_VorbisComment_Entry;
-
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN; /**< == 32 (bits) */
-
-
-/** FLAC VORBIS_COMMENT structure.  (c.f. <A HREF="../format.html#metadata_block_vorbis_comment">format specification</A>)
- */
-typedef struct {
-	FLAC__StreamMetadata_VorbisComment_Entry vendor_string;
-	FLAC__uint32 num_comments;
-	FLAC__StreamMetadata_VorbisComment_Entry *comments;
-} FLAC__StreamMetadata_VorbisComment;
-
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_VORBIS_COMMENT_NUM_COMMENTS_LEN; /**< == 32 (bits) */
-
-
-/** FLAC CUESHEET track index structure.  (See the
- * <A HREF="../format.html#cuesheet_track_index">format specification</A> for
- * the full description of each field.)
- */
-typedef struct {
-	FLAC__uint64 offset;
-	/**< Offset in samples, relative to the track offset, of the index
-	 * point.
-	 */
-
-	FLAC__byte number;
-	/**< The index point number. */
-} FLAC__StreamMetadata_CueSheet_Index;
-
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_INDEX_OFFSET_LEN; /**< == 64 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_INDEX_NUMBER_LEN; /**< == 8 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_INDEX_RESERVED_LEN; /**< == 3*8 (bits) */
-
-
-/** FLAC CUESHEET track structure.  (See the
- * <A HREF="../format.html#cuesheet_track">format specification</A> for
- * the full description of each field.)
- */
-typedef struct {
-	FLAC__uint64 offset;
-	/**< Track offset in samples, relative to the beginning of the FLAC audio stream. */
-
-	FLAC__byte number;
-	/**< The track number. */
-
-	char isrc[13];
-	/**< Track ISRC.  This is a 12-digit alphanumeric code plus a trailing \c NUL byte */
-
-	unsigned type:1;
-	/**< The track type: 0 for audio, 1 for non-audio. */
-
-	unsigned pre_emphasis:1;
-	/**< The pre-emphasis flag: 0 for no pre-emphasis, 1 for pre-emphasis. */
-
-	FLAC__byte num_indices;
-	/**< The number of track index points. */
-
-	FLAC__StreamMetadata_CueSheet_Index *indices;
-	/**< NULL if num_indices == 0, else pointer to array of index points. */
-
-} FLAC__StreamMetadata_CueSheet_Track;
-
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_OFFSET_LEN; /**< == 64 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_NUMBER_LEN; /**< == 8 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_ISRC_LEN; /**< == 12*8 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_TYPE_LEN; /**< == 1 (bit) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_PRE_EMPHASIS_LEN; /**< == 1 (bit) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_RESERVED_LEN; /**< == 6+13*8 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_NUM_INDICES_LEN; /**< == 8 (bits) */
-
-
-/** FLAC CUESHEET structure.  (See the
- * <A HREF="../format.html#metadata_block_cuesheet">format specification</A>
- * for the full description of each field.)
- */
-typedef struct {
-	char media_catalog_number[129];
-	/**< Media catalog number, in ASCII printable characters 0x20-0x7e.  In
-	 * general, the media catalog number may be 0 to 128 bytes long; any
-	 * unused characters should be right-padded with NUL characters.
-	 */
-
-	FLAC__uint64 lead_in;
-	/**< The number of lead-in samples. */
-
-	FLAC__bool is_cd;
-	/**< \c true if CUESHEET corresponds to a Compact Disc, else \c false. */
-
-	unsigned num_tracks;
-	/**< The number of tracks. */
-
-	FLAC__StreamMetadata_CueSheet_Track *tracks;
-	/**< NULL if num_tracks == 0, else pointer to array of tracks. */
-
-} FLAC__StreamMetadata_CueSheet;
-
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_MEDIA_CATALOG_NUMBER_LEN; /**< == 128*8 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_LEAD_IN_LEN; /**< == 64 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_IS_CD_LEN; /**< == 1 (bit) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_RESERVED_LEN; /**< == 7+258*8 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_NUM_TRACKS_LEN; /**< == 8 (bits) */
-
-
-/** An enumeration of the PICTURE types (see FLAC__StreamMetadataPicture and id3 v2.4 APIC tag). */
-typedef enum {
-	FLAC__STREAM_METADATA_PICTURE_TYPE_OTHER = 0, /**< Other */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_FILE_ICON_STANDARD = 1, /**< 32x32 pixels 'file icon' (PNG only) */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_FILE_ICON = 2, /**< Other file icon */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_FRONT_COVER = 3, /**< Cover (front) */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_BACK_COVER = 4, /**< Cover (back) */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_LEAFLET_PAGE = 5, /**< Leaflet page */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_MEDIA = 6, /**< Media (e.g. label side of CD) */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_LEAD_ARTIST = 7, /**< Lead artist/lead performer/soloist */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_ARTIST = 8, /**< Artist/performer */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_CONDUCTOR = 9, /**< Conductor */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_BAND = 10, /**< Band/Orchestra */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_COMPOSER = 11, /**< Composer */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_LYRICIST = 12, /**< Lyricist/text writer */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_RECORDING_LOCATION = 13, /**< Recording Location */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_DURING_RECORDING = 14, /**< During recording */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_DURING_PERFORMANCE = 15, /**< During performance */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_VIDEO_SCREEN_CAPTURE = 16, /**< Movie/video screen capture */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_FISH = 17, /**< A bright coloured fish */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_ILLUSTRATION = 18, /**< Illustration */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_BAND_LOGOTYPE = 19, /**< Band/artist logotype */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_PUBLISHER_LOGOTYPE = 20, /**< Publisher/Studio logotype */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_UNDEFINED
-} FLAC__StreamMetadata_Picture_Type;
-
-/** Maps a FLAC__StreamMetadata_Picture_Type to a C string.
- *
- *  Using a FLAC__StreamMetadata_Picture_Type as the index to this array
- *  will give the string equivalent.  The contents should not be
- *  modified.
- */
-extern FLAC_API const char * const FLAC__StreamMetadata_Picture_TypeString[];
-
-/** FLAC PICTURE structure.  (See the
- * <A HREF="../format.html#metadata_block_picture">format specification</A>
- * for the full description of each field.)
- */
-typedef struct {
-	FLAC__StreamMetadata_Picture_Type type;
-	/**< The kind of picture stored. */
-
-	char *mime_type;
-	/**< Picture data's MIME type, in ASCII printable characters
-	 * 0x20-0x7e, NUL terminated.  For best compatibility with players,
-	 * use picture data of MIME type \c image/jpeg or \c image/png.  A
-	 * MIME type of '-->' is also allowed, in which case the picture
-	 * data should be a complete URL.  In file storage, the MIME type is
-	 * stored as a 32-bit length followed by the ASCII string with no NUL
-	 * terminator, but is converted to a plain C string in this structure
-	 * for convenience.
-	 */
-
-	FLAC__byte *description;
-	/**< Picture's description in UTF-8, NUL terminated.  In file storage,
-	 * the description is stored as a 32-bit length followed by the UTF-8
-	 * string with no NUL terminator, but is converted to a plain C string
-	 * in this structure for convenience.
-	 */
-
-	FLAC__uint32 width;
-	/**< Picture's width in pixels. */
-
-	FLAC__uint32 height;
-	/**< Picture's height in pixels. */
-
-	FLAC__uint32 depth;
-	/**< Picture's color depth in bits-per-pixel. */
-
-	FLAC__uint32 colors;
-	/**< For indexed palettes (like GIF), picture's number of colors (the
-	 * number of palette entries), or \c 0 for non-indexed (i.e. 2^depth).
-	 */
-
-	FLAC__uint32 data_length;
-	/**< Length of binary picture data in bytes. */
-
-	FLAC__byte *data;
-	/**< Binary picture data. */
-
-} FLAC__StreamMetadata_Picture;
-
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_PICTURE_TYPE_LEN; /**< == 32 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_PICTURE_MIME_TYPE_LENGTH_LEN; /**< == 32 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_PICTURE_DESCRIPTION_LENGTH_LEN; /**< == 32 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_PICTURE_WIDTH_LEN; /**< == 32 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_PICTURE_HEIGHT_LEN; /**< == 32 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_PICTURE_DEPTH_LEN; /**< == 32 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_PICTURE_COLORS_LEN; /**< == 32 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_PICTURE_DATA_LENGTH_LEN; /**< == 32 (bits) */
-
-
-/** Structure that is used when a metadata block of unknown type is loaded.
- *  The contents are opaque.  The structure is used only internally to
- *  correctly handle unknown metadata.
- */
-typedef struct {
-	FLAC__byte *data;
-} FLAC__StreamMetadata_Unknown;
-
-
-/** FLAC metadata block structure.  (c.f. <A HREF="../format.html#metadata_block">format specification</A>)
- */
-typedef struct {
-	FLAC__MetadataType type;
-	/**< The type of the metadata block; used determine which member of the
-	 * \a data union to dereference.  If type >= FLAC__METADATA_TYPE_UNDEFINED
-	 * then \a data.unknown must be used. */
-
-	FLAC__bool is_last;
-	/**< \c true if this metadata block is the last, else \a false */
-
-	unsigned length;
-	/**< Length, in bytes, of the block data as it appears in the stream. */
-
-	union {
-		FLAC__StreamMetadata_StreamInfo stream_info;
-		FLAC__StreamMetadata_Padding padding;
-		FLAC__StreamMetadata_Application application;
-		FLAC__StreamMetadata_SeekTable seek_table;
-		FLAC__StreamMetadata_VorbisComment vorbis_comment;
-		FLAC__StreamMetadata_CueSheet cue_sheet;
-		FLAC__StreamMetadata_Picture picture;
-		FLAC__StreamMetadata_Unknown unknown;
-	} data;
-	/**< Polymorphic block data; use the \a type value to determine which
-	 * to use. */
-} FLAC__StreamMetadata;
-
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_IS_LAST_LEN; /**< == 1 (bit) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_TYPE_LEN; /**< == 7 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_LENGTH_LEN; /**< == 24 (bits) */
-
-/** The total stream length of a metadata block header in bytes. */
-#define FLAC__STREAM_METADATA_HEADER_LENGTH (4u)
-
-/*****************************************************************************/
-
-
-/*****************************************************************************
- *
- * Utility functions
- *
- *****************************************************************************/
-
-/** Tests that a sample rate is valid for FLAC.
- *
- * \param sample_rate  The sample rate to test for compliance.
- * \retval FLAC__bool
- *    \c true if the given sample rate conforms to the specification, else
- *    \c false.
- */
-FLAC_API FLAC__bool FLAC__format_sample_rate_is_valid(unsigned sample_rate);
-
-/** Tests that a sample rate is valid for the FLAC subset.  The subset rules
- *  for valid sample rates are slightly more complex since the rate has to
- *  be expressible completely in the frame header.
- *
- * \param sample_rate  The sample rate to test for compliance.
- * \retval FLAC__bool
- *    \c true if the given sample rate conforms to the specification for the
- *    subset, else \c false.
- */
-FLAC_API FLAC__bool FLAC__format_sample_rate_is_subset(unsigned sample_rate);
-
-/** Check a Vorbis comment entry name to see if it conforms to the Vorbis
- *  comment specification.
- *
- *  Vorbis comment names must be composed only of characters from
- *  [0x20-0x3C,0x3E-0x7D].
- *
- * \param name       A NUL-terminated string to be checked.
- * \assert
- *    \code name != NULL \endcode
- * \retval FLAC__bool
- *    \c false if entry name is illegal, else \c true.
- */
-FLAC_API FLAC__bool FLAC__format_vorbiscomment_entry_name_is_legal(const char *name);
-
-/** Check a Vorbis comment entry value to see if it conforms to the Vorbis
- *  comment specification.
- *
- *  Vorbis comment values must be valid UTF-8 sequences.
- *
- * \param value      A string to be checked.
- * \param length     A the length of \a value in bytes.  May be
- *                   \c (unsigned)(-1) to indicate that \a value is a plain
- *                   UTF-8 NUL-terminated string.
- * \assert
- *    \code value != NULL \endcode
- * \retval FLAC__bool
- *    \c false if entry name is illegal, else \c true.
- */
-FLAC_API FLAC__bool FLAC__format_vorbiscomment_entry_value_is_legal(const FLAC__byte *value, unsigned length);
-
-/** Check a Vorbis comment entry to see if it conforms to the Vorbis
- *  comment specification.
- *
- *  Vorbis comment entries must be of the form 'name=value', and 'name' and
- *  'value' must be legal according to
- *  FLAC__format_vorbiscomment_entry_name_is_legal() and
- *  FLAC__format_vorbiscomment_entry_value_is_legal() respectively.
- *
- * \param entry      An entry to be checked.
- * \param length     The length of \a entry in bytes.
- * \assert
- *    \code value != NULL \endcode
- * \retval FLAC__bool
- *    \c false if entry name is illegal, else \c true.
- */
-FLAC_API FLAC__bool FLAC__format_vorbiscomment_entry_is_legal(const FLAC__byte *entry, unsigned length);
-
-/** Check a seek table to see if it conforms to the FLAC specification.
- *  See the format specification for limits on the contents of the
- *  seek table.
- *
- * \param seek_table  A pointer to a seek table to be checked.
- * \assert
- *    \code seek_table != NULL \endcode
- * \retval FLAC__bool
- *    \c false if seek table is illegal, else \c true.
- */
-FLAC_API FLAC__bool FLAC__format_seektable_is_legal(const FLAC__StreamMetadata_SeekTable *seek_table);
-
-/** Sort a seek table's seek points according to the format specification.
- *  This includes a "unique-ification" step to remove duplicates, i.e.
- *  seek points with identical \a sample_number values.  Duplicate seek
- *  points are converted into placeholder points and sorted to the end of
- *  the table.
- *
- * \param seek_table  A pointer to a seek table to be sorted.
- * \assert
- *    \code seek_table != NULL \endcode
- * \retval unsigned
- *    The number of duplicate seek points converted into placeholders.
- */
-FLAC_API unsigned FLAC__format_seektable_sort(FLAC__StreamMetadata_SeekTable *seek_table);
-
-/** Check a cue sheet to see if it conforms to the FLAC specification.
- *  See the format specification for limits on the contents of the
- *  cue sheet.
- *
- * \param cue_sheet  A pointer to an existing cue sheet to be checked.
- * \param check_cd_da_subset  If \c true, check CUESHEET against more
- *                   stringent requirements for a CD-DA (audio) disc.
- * \param violation  Address of a pointer to a string.  If there is a
- *                   violation, a pointer to a string explanation of the
- *                   violation will be returned here. \a violation may be
- *                   \c NULL if you don't need the returned string.  Do not
- *                   free the returned string; it will always point to static
- *                   data.
- * \assert
- *    \code cue_sheet != NULL \endcode
- * \retval FLAC__bool
- *    \c false if cue sheet is illegal, else \c true.
- */
-FLAC_API FLAC__bool FLAC__format_cuesheet_is_legal(const FLAC__StreamMetadata_CueSheet *cue_sheet, FLAC__bool check_cd_da_subset, const char **violation);
-
-/** Check picture data to see if it conforms to the FLAC specification.
- *  See the format specification for limits on the contents of the
- *  PICTURE block.
- *
- * \param picture    A pointer to existing picture data to be checked.
- * \param violation  Address of a pointer to a string.  If there is a
- *                   violation, a pointer to a string explanation of the
- *                   violation will be returned here. \a violation may be
- *                   \c NULL if you don't need the returned string.  Do not
- *                   free the returned string; it will always point to static
- *                   data.
- * \assert
- *    \code picture != NULL \endcode
- * \retval FLAC__bool
- *    \c false if picture data is illegal, else \c true.
- */
-FLAC_API FLAC__bool FLAC__format_picture_is_legal(const FLAC__StreamMetadata_Picture *picture, const char **violation);
-
-/* \} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib-x86-32/include/FLAC/metadata.h b/lib-x86-32/include/FLAC/metadata.h
deleted file mode 100644
index fff90b0b..00000000
--- a/lib-x86-32/include/FLAC/metadata.h
+++ /dev/null
@@ -1,2181 +0,0 @@
-/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2001,2002,2003,2004,2005,2006,2007  Josh Coalson
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - 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.
- *
- * - Neither the name of the Xiph.org Foundation nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * 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 FOUNDATION 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 FLAC__METADATA_H
-#define FLAC__METADATA_H
-
-#include <sys/types.h> /* for off_t */
-#include "export.h"
-#include "callback.h"
-#include "format.h"
-
-/* --------------------------------------------------------------------
-   (For an example of how all these routines are used, see the source
-   code for the unit tests in src/test_libFLAC/metadata_*.c, or
-   metaflac in src/metaflac/)
-   ------------------------------------------------------------------*/
-
-/** \file include/FLAC/metadata.h
- *
- *  \brief
- *  This module provides functions for creating and manipulating FLAC
- *  metadata blocks in memory, and three progressively more powerful
- *  interfaces for traversing and editing metadata in FLAC files.
- *
- *  See the detailed documentation for each interface in the
- *  \link flac_metadata metadata \endlink module.
- */
-
-/** \defgroup flac_metadata FLAC/metadata.h: metadata interfaces
- *  \ingroup flac
- *
- *  \brief
- *  This module provides functions for creating and manipulating FLAC
- *  metadata blocks in memory, and three progressively more powerful
- *  interfaces for traversing and editing metadata in native FLAC files.
- *  Note that currently only the Chain interface (level 2) supports Ogg
- *  FLAC files, and it is read-only i.e. no writing back changed
- *  metadata to file.
- *
- *  There are three metadata interfaces of increasing complexity:
- *
- *  Level 0:
- *  Read-only access to the STREAMINFO, VORBIS_COMMENT, CUESHEET, and
- *  PICTURE blocks.
- *
- *  Level 1:
- *  Read-write access to all metadata blocks.  This level is write-
- *  efficient in most cases (more on this below), and uses less memory
- *  than level 2.
- *
- *  Level 2:
- *  Read-write access to all metadata blocks.  This level is write-
- *  efficient in all cases, but uses more memory since all metadata for
- *  the whole file is read into memory and manipulated before writing
- *  out again.
- *
- *  What do we mean by efficient?  Since FLAC metadata appears at the
- *  beginning of the file, when writing metadata back to a FLAC file
- *  it is possible to grow or shrink the metadata such that the entire
- *  file must be rewritten.  However, if the size remains the same during
- *  changes or PADDING blocks are utilized, only the metadata needs to be
- *  overwritten, which is much faster.
- *
- *  Efficient means the whole file is rewritten at most one time, and only
- *  when necessary.  Level 1 is not efficient only in the case that you
- *  cause more than one metadata block to grow or shrink beyond what can
- *  be accomodated by padding.  In this case you should probably use level
- *  2, which allows you to edit all the metadata for a file in memory and
- *  write it out all at once.
- *
- *  All levels know how to skip over and not disturb an ID3v2 tag at the
- *  front of the file.
- *
- *  All levels access files via their filenames.  In addition, level 2
- *  has additional alternative read and write functions that take an I/O
- *  handle and callbacks, for situations where access by filename is not
- *  possible.
- *
- *  In addition to the three interfaces, this module defines functions for
- *  creating and manipulating various metadata objects in memory.  As we see
- *  from the Format module, FLAC metadata blocks in memory are very primitive
- *  structures for storing information in an efficient way.  Reading
- *  information from the structures is easy but creating or modifying them
- *  directly is more complex.  The metadata object routines here facilitate
- *  this by taking care of the consistency and memory management drudgery.
- *
- *  Unless you will be using the level 1 or 2 interfaces to modify existing
- *  metadata however, you will not probably not need these.
- *
- *  From a dependency standpoint, none of the encoders or decoders require
- *  the metadata module.  This is so that embedded users can strip out the
- *  metadata module from libFLAC to reduce the size and complexity.
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/** \defgroup flac_metadata_level0 FLAC/metadata.h: metadata level 0 interface
- *  \ingroup flac_metadata
- *
- *  \brief
- *  The level 0 interface consists of individual routines to read the
- *  STREAMINFO, VORBIS_COMMENT, CUESHEET, and PICTURE blocks, requiring
- *  only a filename.
- *
- *  They try to skip any ID3v2 tag at the head of the file.
- *
- * \{
- */
-
-/** Read the STREAMINFO metadata block of the given FLAC file.  This function
- *  will try to skip any ID3v2 tag at the head of the file.
- *
- * \param filename    The path to the FLAC file to read.
- * \param streaminfo  A pointer to space for the STREAMINFO block.  Since
- *                    FLAC__StreamMetadata is a simple structure with no
- *                    memory allocation involved, you pass the address of
- *                    an existing structure.  It need not be initialized.
- * \assert
- *    \code filename != NULL \endcode
- *    \code streaminfo != NULL \endcode
- * \retval FLAC__bool
- *    \c true if a valid STREAMINFO block was read from \a filename.  Returns
- *    \c false if there was a memory allocation error, a file decoder error,
- *    or the file contained no STREAMINFO block.  (A memory allocation error
- *    is possible because this function must set up a file decoder.)
- */
-FLAC_API FLAC__bool FLAC__metadata_get_streaminfo(const char *filename, FLAC__StreamMetadata *streaminfo);
-
-/** Read the VORBIS_COMMENT metadata block of the given FLAC file.  This
- *  function will try to skip any ID3v2 tag at the head of the file.
- *
- * \param filename    The path to the FLAC file to read.
- * \param tags        The address where the returned pointer will be
- *                    stored.  The \a tags object must be deleted by
- *                    the caller using FLAC__metadata_object_delete().
- * \assert
- *    \code filename != NULL \endcode
- *    \code tags != NULL \endcode
- * \retval FLAC__bool
- *    \c true if a valid VORBIS_COMMENT block was read from \a filename,
- *    and \a *tags will be set to the address of the metadata structure.
- *    Returns \c false if there was a memory allocation error, a file
- *    decoder error, or the file contained no VORBIS_COMMENT block, and
- *    \a *tags will be set to \c NULL.
- */
-FLAC_API FLAC__bool FLAC__metadata_get_tags(const char *filename, FLAC__StreamMetadata **tags);
-
-/** Read the CUESHEET metadata block of the given FLAC file.  This
- *  function will try to skip any ID3v2 tag at the head of the file.
- *
- * \param filename    The path to the FLAC file to read.
- * \param cuesheet    The address where the returned pointer will be
- *                    stored.  The \a cuesheet object must be deleted by
- *                    the caller using FLAC__metadata_object_delete().
- * \assert
- *    \code filename != NULL \endcode
- *    \code cuesheet != NULL \endcode
- * \retval FLAC__bool
- *    \c true if a valid CUESHEET block was read from \a filename,
- *    and \a *cuesheet will be set to the address of the metadata
- *    structure.  Returns \c false if there was a memory allocation
- *    error, a file decoder error, or the file contained no CUESHEET
- *    block, and \a *cuesheet will be set to \c NULL.
- */
-FLAC_API FLAC__bool FLAC__metadata_get_cuesheet(const char *filename, FLAC__StreamMetadata **cuesheet);
-
-/** Read a PICTURE metadata block of the given FLAC file.  This
- *  function will try to skip any ID3v2 tag at the head of the file.
- *  Since there can be more than one PICTURE block in a file, this
- *  function takes a number of parameters that act as constraints to
- *  the search.  The PICTURE block with the largest area matching all
- *  the constraints will be returned, or \a *picture will be set to
- *  \c NULL if there was no such block.
- *
- * \param filename    The path to the FLAC file to read.
- * \param picture     The address where the returned pointer will be
- *                    stored.  The \a picture object must be deleted by
- *                    the caller using FLAC__metadata_object_delete().
- * \param type        The desired picture type.  Use \c -1 to mean
- *                    "any type".
- * \param mime_type   The desired MIME type, e.g. "image/jpeg".  The
- *                    string will be matched exactly.  Use \c NULL to
- *                    mean "any MIME type".
- * \param description The desired description.  The string will be
- *                    matched exactly.  Use \c NULL to mean "any
- *                    description".
- * \param max_width   The maximum width in pixels desired.  Use
- *                    \c (unsigned)(-1) to mean "any width".
- * \param max_height  The maximum height in pixels desired.  Use
- *                    \c (unsigned)(-1) to mean "any height".
- * \param max_depth   The maximum color depth in bits-per-pixel desired.
- *                    Use \c (unsigned)(-1) to mean "any depth".
- * \param max_colors  The maximum number of colors desired.  Use
- *                    \c (unsigned)(-1) to mean "any number of colors".
- * \assert
- *    \code filename != NULL \endcode
- *    \code picture != NULL \endcode
- * \retval FLAC__bool
- *    \c true if a valid PICTURE block was read from \a filename,
- *    and \a *picture will be set to the address of the metadata
- *    structure.  Returns \c false if there was a memory allocation
- *    error, a file decoder error, or the file contained no PICTURE
- *    block, and \a *picture will be set to \c NULL.
- */
-FLAC_API FLAC__bool FLAC__metadata_get_picture(const char *filename, FLAC__StreamMetadata **picture, FLAC__StreamMetadata_Picture_Type type, const char *mime_type, const FLAC__byte *description, unsigned max_width, unsigned max_height, unsigned max_depth, unsigned max_colors);
-
-/* \} */
-
-
-/** \defgroup flac_metadata_level1 FLAC/metadata.h: metadata level 1 interface
- *  \ingroup flac_metadata
- *
- * \brief
- * The level 1 interface provides read-write access to FLAC file metadata and
- * operates directly on the FLAC file.
- *
- * The general usage of this interface is:
- *
- * - Create an iterator using FLAC__metadata_simple_iterator_new()
- * - Attach it to a file using FLAC__metadata_simple_iterator_init() and check
- *   the exit code.  Call FLAC__metadata_simple_iterator_is_writable() to
- *   see if the file is writable, or only read access is allowed.
- * - Use FLAC__metadata_simple_iterator_next() and
- *   FLAC__metadata_simple_iterator_prev() to traverse the blocks.
- *   This is does not read the actual blocks themselves.
- *   FLAC__metadata_simple_iterator_next() is relatively fast.
- *   FLAC__metadata_simple_iterator_prev() is slower since it needs to search
- *   forward from the front of the file.
- * - Use FLAC__metadata_simple_iterator_get_block_type() or
- *   FLAC__metadata_simple_iterator_get_block() to access the actual data at
- *   the current iterator position.  The returned object is yours to modify
- *   and free.
- * - Use FLAC__metadata_simple_iterator_set_block() to write a modified block
- *   back.  You must have write permission to the original file.  Make sure to
- *   read the whole comment to FLAC__metadata_simple_iterator_set_block()
- *   below.
- * - Use FLAC__metadata_simple_iterator_insert_block_after() to add new blocks.
- *   Use the object creation functions from
- *   \link flac_metadata_object here \endlink to generate new objects.
- * - Use FLAC__metadata_simple_iterator_delete_block() to remove the block
- *   currently referred to by the iterator, or replace it with padding.
- * - Destroy the iterator with FLAC__metadata_simple_iterator_delete() when
- *   finished.
- *
- * \note
- * The FLAC file remains open the whole time between
- * FLAC__metadata_simple_iterator_init() and
- * FLAC__metadata_simple_iterator_delete(), so make sure you are not altering
- * the file during this time.
- *
- * \note
- * Do not modify the \a is_last, \a length, or \a type fields of returned
- * FLAC__StreamMetadata objects.  These are managed automatically.
- *
- * \note
- * If any of the modification functions
- * (FLAC__metadata_simple_iterator_set_block(),
- * FLAC__metadata_simple_iterator_delete_block(),
- * FLAC__metadata_simple_iterator_insert_block_after(), etc.) return \c false,
- * you should delete the iterator as it may no longer be valid.
- *
- * \{
- */
-
-struct FLAC__Metadata_SimpleIterator;
-/** The opaque structure definition for the level 1 iterator type.
- *  See the
- *  \link flac_metadata_level1 metadata level 1 module \endlink
- *  for a detailed description.
- */
-typedef struct FLAC__Metadata_SimpleIterator FLAC__Metadata_SimpleIterator;
-
-/** Status type for FLAC__Metadata_SimpleIterator.
- *
- *  The iterator's current status can be obtained by calling FLAC__metadata_simple_iterator_status().
- */
-typedef enum {
-
-	FLAC__METADATA_SIMPLE_ITERATOR_STATUS_OK = 0,
-	/**< The iterator is in the normal OK state */
-
-	FLAC__METADATA_SIMPLE_ITERATOR_STATUS_ILLEGAL_INPUT,
-	/**< The data passed into a function violated the function's usage criteria */
-
-	FLAC__METADATA_SIMPLE_ITERATOR_STATUS_ERROR_OPENING_FILE,
-	/**< The iterator could not open the target file */
-
-	FLAC__METADATA_SIMPLE_ITERATOR_STATUS_NOT_A_FLAC_FILE,
-	/**< The iterator could not find the FLAC signature at the start of the file */
-
-	FLAC__METADATA_SIMPLE_ITERATOR_STATUS_NOT_WRITABLE,
-	/**< The iterator tried to write to a file that was not writable */
-
-	FLAC__METADATA_SIMPLE_ITERATOR_STATUS_BAD_METADATA,
-	/**< The iterator encountered input that does not conform to the FLAC metadata specification */
-
-	FLAC__METADATA_SIMPLE_ITERATOR_STATUS_READ_ERROR,
-	/**< The iterator encountered an error while reading the FLAC file */
-
-	FLAC__METADATA_SIMPLE_ITERATOR_STATUS_SEEK_ERROR,
-	/**< The iterator encountered an error while seeking in the FLAC file */
-
-	FLAC__METADATA_SIMPLE_ITERATOR_STATUS_WRITE_ERROR,
-	/**< The iterator encountered an error while writing the FLAC file */
-
-	FLAC__METADATA_SIMPLE_ITERATOR_STATUS_RENAME_ERROR,
-	/**< The iterator encountered an error renaming the FLAC file */
-
-	FLAC__METADATA_SIMPLE_ITERATOR_STATUS_UNLINK_ERROR,
-	/**< The iterator encountered an error removing the temporary file */
-
-	FLAC__METADATA_SIMPLE_ITERATOR_STATUS_MEMORY_ALLOCATION_ERROR,
-	/**< Memory allocation failed */
-
-	FLAC__METADATA_SIMPLE_ITERATOR_STATUS_INTERNAL_ERROR
-	/**< The caller violated an assertion or an unexpected error occurred */
-
-} FLAC__Metadata_SimpleIteratorStatus;
-
-/** Maps a FLAC__Metadata_SimpleIteratorStatus to a C string.
- *
- *  Using a FLAC__Metadata_SimpleIteratorStatus as the index to this array
- *  will give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__Metadata_SimpleIteratorStatusString[];
-
-
-/** Create a new iterator instance.
- *
- * \retval FLAC__Metadata_SimpleIterator*
- *    \c NULL if there was an error allocating memory, else the new instance.
- */
-FLAC_API FLAC__Metadata_SimpleIterator *FLAC__metadata_simple_iterator_new(void);
-
-/** Free an iterator instance.  Deletes the object pointed to by \a iterator.
- *
- * \param iterator  A pointer to an existing iterator.
- * \assert
- *    \code iterator != NULL \endcode
- */
-FLAC_API void FLAC__metadata_simple_iterator_delete(FLAC__Metadata_SimpleIterator *iterator);
-
-/** Get the current status of the iterator.  Call this after a function
- *  returns \c false to get the reason for the error.  Also resets the status
- *  to FLAC__METADATA_SIMPLE_ITERATOR_STATUS_OK.
- *
- * \param iterator  A pointer to an existing iterator.
- * \assert
- *    \code iterator != NULL \endcode
- * \retval FLAC__Metadata_SimpleIteratorStatus
- *    The current status of the iterator.
- */
-FLAC_API FLAC__Metadata_SimpleIteratorStatus FLAC__metadata_simple_iterator_status(FLAC__Metadata_SimpleIterator *iterator);
-
-/** Initialize the iterator to point to the first metadata block in the
- *  given FLAC file.
- *
- * \param iterator             A pointer to an existing iterator.
- * \param filename             The path to the FLAC file.
- * \param read_only            If \c true, the FLAC file will be opened
- *                             in read-only mode; if \c false, the FLAC
- *                             file will be opened for edit even if no
- *                             edits are performed.
- * \param preserve_file_stats  If \c true, the owner and modification
- *                             time will be preserved even if the FLAC
- *                             file is written to.
- * \assert
- *    \code iterator != NULL \endcode
- *    \code filename != NULL \endcode
- * \retval FLAC__bool
- *    \c false if a memory allocation error occurs, the file can't be
- *    opened, or another error occurs, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_simple_iterator_init(FLAC__Metadata_SimpleIterator *iterator, const char *filename, FLAC__bool read_only, FLAC__bool preserve_file_stats);
-
-/** Returns \c true if the FLAC file is writable.  If \c false, calls to
- *  FLAC__metadata_simple_iterator_set_block() and
- *  FLAC__metadata_simple_iterator_insert_block_after() will fail.
- *
- * \param iterator             A pointer to an existing iterator.
- * \assert
- *    \code iterator != NULL \endcode
- * \retval FLAC__bool
- *    See above.
- */
-FLAC_API FLAC__bool FLAC__metadata_simple_iterator_is_writable(const FLAC__Metadata_SimpleIterator *iterator);
-
-/** Moves the iterator forward one metadata block, returning \c false if
- *  already at the end.
- *
- * \param iterator  A pointer to an existing initialized iterator.
- * \assert
- *    \code iterator != NULL \endcode
- *    \a iterator has been successfully initialized with
- *    FLAC__metadata_simple_iterator_init()
- * \retval FLAC__bool
- *    \c false if already at the last metadata block of the chain, else
- *    \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_simple_iterator_next(FLAC__Metadata_SimpleIterator *iterator);
-
-/** Moves the iterator backward one metadata block, returning \c false if
- *  already at the beginning.
- *
- * \param iterator  A pointer to an existing initialized iterator.
- * \assert
- *    \code iterator != NULL \endcode
- *    \a iterator has been successfully initialized with
- *    FLAC__metadata_simple_iterator_init()
- * \retval FLAC__bool
- *    \c false if already at the first metadata block of the chain, else
- *    \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_simple_iterator_prev(FLAC__Metadata_SimpleIterator *iterator);
-
-/** Returns a flag telling if the current metadata block is the last.
- *
- * \param iterator  A pointer to an existing initialized iterator.
- * \assert
- *    \code iterator != NULL \endcode
- *    \a iterator has been successfully initialized with
- *    FLAC__metadata_simple_iterator_init()
- * \retval FLAC__bool
- *    \c true if the current metadata block is the last in the file,
- *    else \c false.
- */
-FLAC_API FLAC__bool FLAC__metadata_simple_iterator_is_last(const FLAC__Metadata_SimpleIterator *iterator);
-
-/** Get the offset of the metadata block at the current position.  This
- *  avoids reading the actual block data which can save time for large
- *  blocks.
- *
- * \param iterator  A pointer to an existing initialized iterator.
- * \assert
- *    \code iterator != NULL \endcode
- *    \a iterator has been successfully initialized with
- *    FLAC__metadata_simple_iterator_init()
- * \retval off_t
- *    The offset of the metadata block at the current iterator position.
- *    This is the byte offset relative to the beginning of the file of
- *    the current metadata block's header.
- */
-FLAC_API off_t FLAC__metadata_simple_iterator_get_block_offset(const FLAC__Metadata_SimpleIterator *iterator);
-
-/** Get the type of the metadata block at the current position.  This
- *  avoids reading the actual block data which can save time for large
- *  blocks.
- *
- * \param iterator  A pointer to an existing initialized iterator.
- * \assert
- *    \code iterator != NULL \endcode
- *    \a iterator has been successfully initialized with
- *    FLAC__metadata_simple_iterator_init()
- * \retval FLAC__MetadataType
- *    The type of the metadata block at the current iterator position.
- */
-FLAC_API FLAC__MetadataType FLAC__metadata_simple_iterator_get_block_type(const FLAC__Metadata_SimpleIterator *iterator);
-
-/** Get the length of the metadata block at the current position.  This
- *  avoids reading the actual block data which can save time for large
- *  blocks.
- *
- * \param iterator  A pointer to an existing initialized iterator.
- * \assert
- *    \code iterator != NULL \endcode
- *    \a iterator has been successfully initialized with
- *    FLAC__metadata_simple_iterator_init()
- * \retval unsigned
- *    The length of the metadata block at the current iterator position.
- *    The is same length as that in the
- *    <a href="http://flac.sourceforge.net/format.html#metadata_block_header">metadata block header</a>,
- *    i.e. the length of the metadata body that follows the header.
- */
-FLAC_API unsigned FLAC__metadata_simple_iterator_get_block_length(const FLAC__Metadata_SimpleIterator *iterator);
-
-/** Get the application ID of the \c APPLICATION block at the current
- *  position.  This avoids reading the actual block data which can save
- *  time for large blocks.
- *
- * \param iterator  A pointer to an existing initialized iterator.
- * \param id        A pointer to a buffer of at least \c 4 bytes where
- *                  the ID will be stored.
- * \assert
- *    \code iterator != NULL \endcode
- *    \code id != NULL \endcode
- *    \a iterator has been successfully initialized with
- *    FLAC__metadata_simple_iterator_init()
- * \retval FLAC__bool
- *    \c true if the ID was successfully read, else \c false, in which
- *    case you should check FLAC__metadata_simple_iterator_status() to
- *    find out why.  If the status is
- *    \c FLAC__METADATA_SIMPLE_ITERATOR_STATUS_ILLEGAL_INPUT, then the
- *    current metadata block is not an \c APPLICATION block.  Otherwise
- *    if the status is
- *    \c FLAC__METADATA_SIMPLE_ITERATOR_STATUS_READ_ERROR or
- *    \c FLAC__METADATA_SIMPLE_ITERATOR_STATUS_SEEK_ERROR, an I/O error
- *    occurred and the iterator can no longer be used.
- */
-FLAC_API FLAC__bool FLAC__metadata_simple_iterator_get_application_id(FLAC__Metadata_SimpleIterator *iterator, FLAC__byte *id);
-
-/** Get the metadata block at the current position.  You can modify the
- *  block but must use FLAC__metadata_simple_iterator_set_block() to
- *  write it back to the FLAC file.
- *
- *  You must call FLAC__metadata_object_delete() on the returned object
- *  when you are finished with it.
- *
- * \param iterator  A pointer to an existing initialized iterator.
- * \assert
- *    \code iterator != NULL \endcode
- *    \a iterator has been successfully initialized with
- *    FLAC__metadata_simple_iterator_init()
- * \retval FLAC__StreamMetadata*
- *    The current metadata block, or \c NULL if there was a memory
- *    allocation error.
- */
-FLAC_API FLAC__StreamMetadata *FLAC__metadata_simple_iterator_get_block(FLAC__Metadata_SimpleIterator *iterator);
-
-/** Write a block back to the FLAC file.  This function tries to be
- *  as efficient as possible; how the block is actually written is
- *  shown by the following:
- *
- *  Existing block is a STREAMINFO block and the new block is a
- *  STREAMINFO block: the new block is written in place.  Make sure
- *  you know what you're doing when changing the values of a
- *  STREAMINFO block.
- *
- *  Existing block is a STREAMINFO block and the new block is a
- *  not a STREAMINFO block: this is an error since the first block
- *  must be a STREAMINFO block.  Returns \c false without altering the
- *  file.
- *
- *  Existing block is not a STREAMINFO block and the new block is a
- *  STREAMINFO block: this is an error since there may be only one
- *  STREAMINFO block.  Returns \c false without altering the file.
- *
- *  Existing block and new block are the same length: the existing
- *  block will be replaced by the new block, written in place.
- *
- *  Existing block is longer than new block: if use_padding is \c true,
- *  the existing block will be overwritten in place with the new
- *  block followed by a PADDING block, if possible, to make the total
- *  size the same as the existing block.  Remember that a padding
- *  block requires at least four bytes so if the difference in size
- *  between the new block and existing block is less than that, the
- *  entire file will have to be rewritten, using the new block's
- *  exact size.  If use_padding is \c false, the entire file will be
- *  rewritten, replacing the existing block by the new block.
- *
- *  Existing block is shorter than new block: if use_padding is \c true,
- *  the function will try and expand the new block into the following
- *  PADDING block, if it exists and doing so won't shrink the PADDING
- *  block to less than 4 bytes.  If there is no following PADDING
- *  block, or it will shrink to less than 4 bytes, or use_padding is
- *  \c false, the entire file is rewritten, replacing the existing block
- *  with the new block.  Note that in this case any following PADDING
- *  block is preserved as is.
- *
- *  After writing the block, the iterator will remain in the same
- *  place, i.e. pointing to the new block.
- *
- * \param iterator     A pointer to an existing initialized iterator.
- * \param block        The block to set.
- * \param use_padding  See above.
- * \assert
- *    \code iterator != NULL \endcode
- *    \a iterator has been successfully initialized with
- *    FLAC__metadata_simple_iterator_init()
- *    \code block != NULL \endcode
- * \retval FLAC__bool
- *    \c true if successful, else \c false.
- */
-FLAC_API FLAC__bool FLAC__metadata_simple_iterator_set_block(FLAC__Metadata_SimpleIterator *iterator, FLAC__StreamMetadata *block, FLAC__bool use_padding);
-
-/** This is similar to FLAC__metadata_simple_iterator_set_block()
- *  except that instead of writing over an existing block, it appends
- *  a block after the existing block.  \a use_padding is again used to
- *  tell the function to try an expand into following padding in an
- *  attempt to avoid rewriting the entire file.
- *
- *  This function will fail and return \c false if given a STREAMINFO
- *  block.
- *
- *  After writing the block, the iterator will be pointing to the
- *  new block.
- *
- * \param iterator     A pointer to an existing initialized iterator.
- * \param block        The block to set.
- * \param use_padding  See above.
- * \assert
- *    \code iterator != NULL \endcode
- *    \a iterator has been successfully initialized with
- *    FLAC__metadata_simple_iterator_init()
- *    \code block != NULL \endcode
- * \retval FLAC__bool
- *    \c true if successful, else \c false.
- */
-FLAC_API FLAC__bool FLAC__metadata_simple_iterator_insert_block_after(FLAC__Metadata_SimpleIterator *iterator, FLAC__StreamMetadata *block, FLAC__bool use_padding);
-
-/** Deletes the block at the current position.  This will cause the
- *  entire FLAC file to be rewritten, unless \a use_padding is \c true,
- *  in which case the block will be replaced by an equal-sized PADDING
- *  block.  The iterator will be left pointing to the block before the
- *  one just deleted.
- *
- *  You may not delete the STREAMINFO block.
- *
- * \param iterator     A pointer to an existing initialized iterator.
- * \param use_padding  See above.
- * \assert
- *    \code iterator != NULL \endcode
- *    \a iterator has been successfully initialized with
- *    FLAC__metadata_simple_iterator_init()
- * \retval FLAC__bool
- *    \c true if successful, else \c false.
- */
-FLAC_API FLAC__bool FLAC__metadata_simple_iterator_delete_block(FLAC__Metadata_SimpleIterator *iterator, FLAC__bool use_padding);
-
-/* \} */
-
-
-/** \defgroup flac_metadata_level2 FLAC/metadata.h: metadata level 2 interface
- *  \ingroup flac_metadata
- *
- * \brief
- * The level 2 interface provides read-write access to FLAC file metadata;
- * all metadata is read into memory, operated on in memory, and then written
- * to file, which is more efficient than level 1 when editing multiple blocks.
- *
- * Currently Ogg FLAC is supported for read only, via
- * FLAC__metadata_chain_read_ogg() but a subsequent
- * FLAC__metadata_chain_write() will fail.
- *
- * The general usage of this interface is:
- *
- * - Create a new chain using FLAC__metadata_chain_new().  A chain is a
- *   linked list of FLAC metadata blocks.
- * - Read all metadata into the the chain from a FLAC file using
- *   FLAC__metadata_chain_read() or FLAC__metadata_chain_read_ogg() and
- *   check the status.
- * - Optionally, consolidate the padding using
- *   FLAC__metadata_chain_merge_padding() or
- *   FLAC__metadata_chain_sort_padding().
- * - Create a new iterator using FLAC__metadata_iterator_new()
- * - Initialize the iterator to point to the first element in the chain
- *   using FLAC__metadata_iterator_init()
- * - Traverse the chain using FLAC__metadata_iterator_next and
- *   FLAC__metadata_iterator_prev().
- * - Get a block for reading or modification using
- *   FLAC__metadata_iterator_get_block().  The pointer to the object
- *   inside the chain is returned, so the block is yours to modify.
- *   Changes will be reflected in the FLAC file when you write the
- *   chain.  You can also add and delete blocks (see functions below).
- * - When done, write out the chain using FLAC__metadata_chain_write().
- *   Make sure to read the whole comment to the function below.
- * - Delete the chain using FLAC__metadata_chain_delete().
- *
- * \note
- * Even though the FLAC file is not open while the chain is being
- * manipulated, you must not alter the file externally during
- * this time.  The chain assumes the FLAC file will not change
- * between the time of FLAC__metadata_chain_read()/FLAC__metadata_chain_read_ogg()
- * and FLAC__metadata_chain_write().
- *
- * \note
- * Do not modify the is_last, length, or type fields of returned
- * FLAC__StreamMetadata objects.  These are managed automatically.
- *
- * \note
- * The metadata objects returned by FLAC__metadata_iterator_get_block()
- * are owned by the chain; do not FLAC__metadata_object_delete() them.
- * In the same way, blocks passed to FLAC__metadata_iterator_set_block()
- * become owned by the chain and they will be deleted when the chain is
- * deleted.
- *
- * \{
- */
-
-struct FLAC__Metadata_Chain;
-/** The opaque structure definition for the level 2 chain type.
- */
-typedef struct FLAC__Metadata_Chain FLAC__Metadata_Chain;
-
-struct FLAC__Metadata_Iterator;
-/** The opaque structure definition for the level 2 iterator type.
- */
-typedef struct FLAC__Metadata_Iterator FLAC__Metadata_Iterator;
-
-typedef enum {
-	FLAC__METADATA_CHAIN_STATUS_OK = 0,
-	/**< The chain is in the normal OK state */
-
-	FLAC__METADATA_CHAIN_STATUS_ILLEGAL_INPUT,
-	/**< The data passed into a function violated the function's usage criteria */
-
-	FLAC__METADATA_CHAIN_STATUS_ERROR_OPENING_FILE,
-	/**< The chain could not open the target file */
-
-	FLAC__METADATA_CHAIN_STATUS_NOT_A_FLAC_FILE,
-	/**< The chain could not find the FLAC signature at the start of the file */
-
-	FLAC__METADATA_CHAIN_STATUS_NOT_WRITABLE,
-	/**< The chain tried to write to a file that was not writable */
-
-	FLAC__METADATA_CHAIN_STATUS_BAD_METADATA,
-	/**< The chain encountered input that does not conform to the FLAC metadata specification */
-
-	FLAC__METADATA_CHAIN_STATUS_READ_ERROR,
-	/**< The chain encountered an error while reading the FLAC file */
-
-	FLAC__METADATA_CHAIN_STATUS_SEEK_ERROR,
-	/**< The chain encountered an error while seeking in the FLAC file */
-
-	FLAC__METADATA_CHAIN_STATUS_WRITE_ERROR,
-	/**< The chain encountered an error while writing the FLAC file */
-
-	FLAC__METADATA_CHAIN_STATUS_RENAME_ERROR,
-	/**< The chain encountered an error renaming the FLAC file */
-
-	FLAC__METADATA_CHAIN_STATUS_UNLINK_ERROR,
-	/**< The chain encountered an error removing the temporary file */
-
-	FLAC__METADATA_CHAIN_STATUS_MEMORY_ALLOCATION_ERROR,
-	/**< Memory allocation failed */
-
-	FLAC__METADATA_CHAIN_STATUS_INTERNAL_ERROR,
-	/**< The caller violated an assertion or an unexpected error occurred */
-
-	FLAC__METADATA_CHAIN_STATUS_INVALID_CALLBACKS,
-	/**< One or more of the required callbacks was NULL */
-
-	FLAC__METADATA_CHAIN_STATUS_READ_WRITE_MISMATCH,
-	/**< FLAC__metadata_chain_write() was called on a chain read by
-	 *   FLAC__metadata_chain_read_with_callbacks()/FLAC__metadata_chain_read_ogg_with_callbacks(),
-	 *   or 
-	 *   FLAC__metadata_chain_write_with_callbacks()/FLAC__metadata_chain_write_with_callbacks_and_tempfile()
-	 *   was called on a chain read by
-	 *   FLAC__metadata_chain_read()/FLAC__metadata_chain_read_ogg().
-	 *   Matching read/write methods must always be used. */
-
-	FLAC__METADATA_CHAIN_STATUS_WRONG_WRITE_CALL
-	/**< FLAC__metadata_chain_write_with_callbacks() was called when the
-	 *   chain write requires a tempfile; use
-	 *   FLAC__metadata_chain_write_with_callbacks_and_tempfile() instead.
-	 *   Or, FLAC__metadata_chain_write_with_callbacks_and_tempfile() was
-	 *   called when the chain write does not require a tempfile; use
-	 *   FLAC__metadata_chain_write_with_callbacks() instead.
-	 *   Always check FLAC__metadata_chain_check_if_tempfile_needed()
-	 *   before writing via callbacks. */
-
-} FLAC__Metadata_ChainStatus;
-
-/** Maps a FLAC__Metadata_ChainStatus to a C string.
- *
- *  Using a FLAC__Metadata_ChainStatus as the index to this array
- *  will give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__Metadata_ChainStatusString[];
-
-/*********** FLAC__Metadata_Chain ***********/
-
-/** Create a new chain instance.
- *
- * \retval FLAC__Metadata_Chain*
- *    \c NULL if there was an error allocating memory, else the new instance.
- */
-FLAC_API FLAC__Metadata_Chain *FLAC__metadata_chain_new(void);
-
-/** Free a chain instance.  Deletes the object pointed to by \a chain.
- *
- * \param chain  A pointer to an existing chain.
- * \assert
- *    \code chain != NULL \endcode
- */
-FLAC_API void FLAC__metadata_chain_delete(FLAC__Metadata_Chain *chain);
-
-/** Get the current status of the chain.  Call this after a function
- *  returns \c false to get the reason for the error.  Also resets the
- *  status to FLAC__METADATA_CHAIN_STATUS_OK.
- *
- * \param chain    A pointer to an existing chain.
- * \assert
- *    \code chain != NULL \endcode
- * \retval FLAC__Metadata_ChainStatus
- *    The current status of the chain.
- */
-FLAC_API FLAC__Metadata_ChainStatus FLAC__metadata_chain_status(FLAC__Metadata_Chain *chain);
-
-/** Read all metadata from a FLAC file into the chain.
- *
- * \param chain    A pointer to an existing chain.
- * \param filename The path to the FLAC file to read.
- * \assert
- *    \code chain != NULL \endcode
- *    \code filename != NULL \endcode
- * \retval FLAC__bool
- *    \c true if a valid list of metadata blocks was read from
- *    \a filename, else \c false.  On failure, check the status with
- *    FLAC__metadata_chain_status().
- */
-FLAC_API FLAC__bool FLAC__metadata_chain_read(FLAC__Metadata_Chain *chain, const char *filename);
-
-/** Read all metadata from an Ogg FLAC file into the chain.
- *
- * \note Ogg FLAC metadata data writing is not supported yet and
- * FLAC__metadata_chain_write() will fail.
- *
- * \param chain    A pointer to an existing chain.
- * \param filename The path to the Ogg FLAC file to read.
- * \assert
- *    \code chain != NULL \endcode
- *    \code filename != NULL \endcode
- * \retval FLAC__bool
- *    \c true if a valid list of metadata blocks was read from
- *    \a filename, else \c false.  On failure, check the status with
- *    FLAC__metadata_chain_status().
- */
-FLAC_API FLAC__bool FLAC__metadata_chain_read_ogg(FLAC__Metadata_Chain *chain, const char *filename);
-
-/** Read all metadata from a FLAC stream into the chain via I/O callbacks.
- *
- *  The \a handle need only be open for reading, but must be seekable.
- *  The equivalent minimum stdio fopen() file mode is \c "r" (or \c "rb"
- *  for Windows).
- *
- * \param chain    A pointer to an existing chain.
- * \param handle   The I/O handle of the FLAC stream to read.  The
- *                 handle will NOT be closed after the metadata is read;
- *                 that is the duty of the caller.
- * \param callbacks
- *                 A set of callbacks to use for I/O.  The mandatory
- *                 callbacks are \a read, \a seek, and \a tell.
- * \assert
- *    \code chain != NULL \endcode
- * \retval FLAC__bool
- *    \c true if a valid list of metadata blocks was read from
- *    \a handle, else \c false.  On failure, check the status with
- *    FLAC__metadata_chain_status().
- */
-FLAC_API FLAC__bool FLAC__metadata_chain_read_with_callbacks(FLAC__Metadata_Chain *chain, FLAC__IOHandle handle, FLAC__IOCallbacks callbacks);
-
-/** Read all metadata from an Ogg FLAC stream into the chain via I/O callbacks.
- *
- *  The \a handle need only be open for reading, but must be seekable.
- *  The equivalent minimum stdio fopen() file mode is \c "r" (or \c "rb"
- *  for Windows).
- *
- * \note Ogg FLAC metadata data writing is not supported yet and
- * FLAC__metadata_chain_write() will fail.
- *
- * \param chain    A pointer to an existing chain.
- * \param handle   The I/O handle of the Ogg FLAC stream to read.  The
- *                 handle will NOT be closed after the metadata is read;
- *                 that is the duty of the caller.
- * \param callbacks
- *                 A set of callbacks to use for I/O.  The mandatory
- *                 callbacks are \a read, \a seek, and \a tell.
- * \assert
- *    \code chain != NULL \endcode
- * \retval FLAC__bool
- *    \c true if a valid list of metadata blocks was read from
- *    \a handle, else \c false.  On failure, check the status with
- *    FLAC__metadata_chain_status().
- */
-FLAC_API FLAC__bool FLAC__metadata_chain_read_ogg_with_callbacks(FLAC__Metadata_Chain *chain, FLAC__IOHandle handle, FLAC__IOCallbacks callbacks);
-
-/** Checks if writing the given chain would require the use of a
- *  temporary file, or if it could be written in place.
- *
- *  Under certain conditions, padding can be utilized so that writing
- *  edited metadata back to the FLAC file does not require rewriting the
- *  entire file.  If rewriting is required, then a temporary workfile is
- *  required.  When writing metadata using callbacks, you must check
- *  this function to know whether to call
- *  FLAC__metadata_chain_write_with_callbacks() or
- *  FLAC__metadata_chain_write_with_callbacks_and_tempfile().  When
- *  writing with FLAC__metadata_chain_write(), the temporary file is
- *  handled internally.
- *
- * \param chain    A pointer to an existing chain.
- * \param use_padding
- *                 Whether or not padding will be allowed to be used
- *                 during the write.  The value of \a use_padding given
- *                 here must match the value later passed to
- *                 FLAC__metadata_chain_write_with_callbacks() or
- *                 FLAC__metadata_chain_write_with_callbacks_with_tempfile().
- * \assert
- *    \code chain != NULL \endcode
- * \retval FLAC__bool
- *    \c true if writing the current chain would require a tempfile, or
- *    \c false if metadata can be written in place.
- */
-FLAC_API FLAC__bool FLAC__metadata_chain_check_if_tempfile_needed(FLAC__Metadata_Chain *chain, FLAC__bool use_padding);
-
-/** Write all metadata out to the FLAC file.  This function tries to be as
- *  efficient as possible; how the metadata is actually written is shown by
- *  the following:
- *
- *  If the current chain is the same size as the existing metadata, the new
- *  data is written in place.
- *
- *  If the current chain is longer than the existing metadata, and
- *  \a use_padding is \c true, and the last block is a PADDING block of
- *  sufficient length, the function will truncate the final padding block
- *  so that the overall size of the metadata is the same as the existing
- *  metadata, and then just rewrite the metadata.  Otherwise, if not all of
- *  the above conditions are met, the entire FLAC file must be rewritten.
- *  If you want to use padding this way it is a good idea to call
- *  FLAC__metadata_chain_sort_padding() first so that you have the maximum
- *  amount of padding to work with, unless you need to preserve ordering
- *  of the PADDING blocks for some reason.
- *
- *  If the current chain is shorter than the existing metadata, and
- *  \a use_padding is \c true, and the final block is a PADDING block, the padding
- *  is extended to make the overall size the same as the existing data.  If
- *  \a use_padding is \c true and the last block is not a PADDING block, a new
- *  PADDING block is added to the end of the new data to make it the same
- *  size as the existing data (if possible, see the note to
- *  FLAC__metadata_simple_iterator_set_block() about the four byte limit)
- *  and the new data is written in place.  If none of the above apply or
- *  \a use_padding is \c false, the entire FLAC file is rewritten.
- *
- *  If \a preserve_file_stats is \c true, the owner and modification time will
- *  be preserved even if the FLAC file is written.
- *
- *  For this write function to be used, the chain must have been read with
- *  FLAC__metadata_chain_read()/FLAC__metadata_chain_read_ogg(), not
- *  FLAC__metadata_chain_read_with_callbacks()/FLAC__metadata_chain_read_ogg_with_callbacks().
- *
- * \param chain               A pointer to an existing chain.
- * \param use_padding         See above.
- * \param preserve_file_stats See above.
- * \assert
- *    \code chain != NULL \endcode
- * \retval FLAC__bool
- *    \c true if the write succeeded, else \c false.  On failure,
- *    check the status with FLAC__metadata_chain_status().
- */
-FLAC_API FLAC__bool FLAC__metadata_chain_write(FLAC__Metadata_Chain *chain, FLAC__bool use_padding, FLAC__bool preserve_file_stats);
-
-/** Write all metadata out to a FLAC stream via callbacks.
- *
- *  (See FLAC__metadata_chain_write() for the details on how padding is
- *  used to write metadata in place if possible.)
- *
- *  The \a handle must be open for updating and be seekable.  The
- *  equivalent minimum stdio fopen() file mode is \c "r+" (or \c "r+b"
- *  for Windows).
- *
- *  For this write function to be used, the chain must have been read with
- *  FLAC__metadata_chain_read_with_callbacks()/FLAC__metadata_chain_read_ogg_with_callbacks(),
- *  not FLAC__metadata_chain_read()/FLAC__metadata_chain_read_ogg().
- *  Also, FLAC__metadata_chain_check_if_tempfile_needed() must have returned
- *  \c false.
- *
- * \param chain        A pointer to an existing chain.
- * \param use_padding  See FLAC__metadata_chain_write()
- * \param handle       The I/O handle of the FLAC stream to write.  The
- *                     handle will NOT be closed after the metadata is
- *                     written; that is the duty of the caller.
- * \param callbacks    A set of callbacks to use for I/O.  The mandatory
- *                     callbacks are \a write and \a seek.
- * \assert
- *    \code chain != NULL \endcode
- * \retval FLAC__bool
- *    \c true if the write succeeded, else \c false.  On failure,
- *    check the status with FLAC__metadata_chain_status().
- */
-FLAC_API FLAC__bool FLAC__metadata_chain_write_with_callbacks(FLAC__Metadata_Chain *chain, FLAC__bool use_padding, FLAC__IOHandle handle, FLAC__IOCallbacks callbacks);
-
-/** Write all metadata out to a FLAC stream via callbacks.
- *
- *  (See FLAC__metadata_chain_write() for the details on how padding is
- *  used to write metadata in place if possible.)
- *
- *  This version of the write-with-callbacks function must be used when
- *  FLAC__metadata_chain_check_if_tempfile_needed() returns true.  In
- *  this function, you must supply an I/O handle corresponding to the
- *  FLAC file to edit, and a temporary handle to which the new FLAC
- *  file will be written.  It is the caller's job to move this temporary
- *  FLAC file on top of the original FLAC file to complete the metadata
- *  edit.
- *
- *  The \a handle must be open for reading and be seekable.  The
- *  equivalent minimum stdio fopen() file mode is \c "r" (or \c "rb"
- *  for Windows).
- *
- *  The \a temp_handle must be open for writing.  The
- *  equivalent minimum stdio fopen() file mode is \c "w" (or \c "wb"
- *  for Windows).  It should be an empty stream, or at least positioned
- *  at the start-of-file (in which case it is the caller's duty to
- *  truncate it on return).
- *
- *  For this write function to be used, the chain must have been read with
- *  FLAC__metadata_chain_read_with_callbacks()/FLAC__metadata_chain_read_ogg_with_callbacks(),
- *  not FLAC__metadata_chain_read()/FLAC__metadata_chain_read_ogg().
- *  Also, FLAC__metadata_chain_check_if_tempfile_needed() must have returned
- *  \c true.
- *
- * \param chain        A pointer to an existing chain.
- * \param use_padding  See FLAC__metadata_chain_write()
- * \param handle       The I/O handle of the original FLAC stream to read.
- *                     The handle will NOT be closed after the metadata is
- *                     written; that is the duty of the caller.
- * \param callbacks    A set of callbacks to use for I/O on \a handle.
- *                     The mandatory callbacks are \a read, \a seek, and
- *                     \a eof.
- * \param temp_handle  The I/O handle of the FLAC stream to write.  The
- *                     handle will NOT be closed after the metadata is
- *                     written; that is the duty of the caller.
- * \param temp_callbacks
- *                     A set of callbacks to use for I/O on temp_handle.
- *                     The only mandatory callback is \a write.
- * \assert
- *    \code chain != NULL \endcode
- * \retval FLAC__bool
- *    \c true if the write succeeded, else \c false.  On failure,
- *    check the status with FLAC__metadata_chain_status().
- */
-FLAC_API FLAC__bool FLAC__metadata_chain_write_with_callbacks_and_tempfile(FLAC__Metadata_Chain *chain, FLAC__bool use_padding, FLAC__IOHandle handle, FLAC__IOCallbacks callbacks, FLAC__IOHandle temp_handle, FLAC__IOCallbacks temp_callbacks);
-
-/** Merge adjacent PADDING blocks into a single block.
- *
- * \note This function does not write to the FLAC file, it only
- * modifies the chain.
- *
- * \warning Any iterator on the current chain will become invalid after this
- * call.  You should delete the iterator and get a new one.
- *
- * \param chain               A pointer to an existing chain.
- * \assert
- *    \code chain != NULL \endcode
- */
-FLAC_API void FLAC__metadata_chain_merge_padding(FLAC__Metadata_Chain *chain);
-
-/** This function will move all PADDING blocks to the end on the metadata,
- *  then merge them into a single block.
- *
- * \note This function does not write to the FLAC file, it only
- * modifies the chain.
- *
- * \warning Any iterator on the current chain will become invalid after this
- * call.  You should delete the iterator and get a new one.
- *
- * \param chain  A pointer to an existing chain.
- * \assert
- *    \code chain != NULL \endcode
- */
-FLAC_API void FLAC__metadata_chain_sort_padding(FLAC__Metadata_Chain *chain);
-
-
-/*********** FLAC__Metadata_Iterator ***********/
-
-/** Create a new iterator instance.
- *
- * \retval FLAC__Metadata_Iterator*
- *    \c NULL if there was an error allocating memory, else the new instance.
- */
-FLAC_API FLAC__Metadata_Iterator *FLAC__metadata_iterator_new(void);
-
-/** Free an iterator instance.  Deletes the object pointed to by \a iterator.
- *
- * \param iterator  A pointer to an existing iterator.
- * \assert
- *    \code iterator != NULL \endcode
- */
-FLAC_API void FLAC__metadata_iterator_delete(FLAC__Metadata_Iterator *iterator);
-
-/** Initialize the iterator to point to the first metadata block in the
- *  given chain.
- *
- * \param iterator  A pointer to an existing iterator.
- * \param chain     A pointer to an existing and initialized (read) chain.
- * \assert
- *    \code iterator != NULL \endcode
- *    \code chain != NULL \endcode
- */
-FLAC_API void FLAC__metadata_iterator_init(FLAC__Metadata_Iterator *iterator, FLAC__Metadata_Chain *chain);
-
-/** Moves the iterator forward one metadata block, returning \c false if
- *  already at the end.
- *
- * \param iterator  A pointer to an existing initialized iterator.
- * \assert
- *    \code iterator != NULL \endcode
- *    \a iterator has been successfully initialized with
- *    FLAC__metadata_iterator_init()
- * \retval FLAC__bool
- *    \c false if already at the last metadata block of the chain, else
- *    \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_iterator_next(FLAC__Metadata_Iterator *iterator);
-
-/** Moves the iterator backward one metadata block, returning \c false if
- *  already at the beginning.
- *
- * \param iterator  A pointer to an existing initialized iterator.
- * \assert
- *    \code iterator != NULL \endcode
- *    \a iterator has been successfully initialized with
- *    FLAC__metadata_iterator_init()
- * \retval FLAC__bool
- *    \c false if already at the first metadata block of the chain, else
- *    \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_iterator_prev(FLAC__Metadata_Iterator *iterator);
-
-/** Get the type of the metadata block at the current position.
- *
- * \param iterator  A pointer to an existing initialized iterator.
- * \assert
- *    \code iterator != NULL \endcode
- *    \a iterator has been successfully initialized with
- *    FLAC__metadata_iterator_init()
- * \retval FLAC__MetadataType
- *    The type of the metadata block at the current iterator position.
- */
-FLAC_API FLAC__MetadataType FLAC__metadata_iterator_get_block_type(const FLAC__Metadata_Iterator *iterator);
-
-/** Get the metadata block at the current position.  You can modify
- *  the block in place but must write the chain before the changes
- *  are reflected to the FLAC file.  You do not need to call
- *  FLAC__metadata_iterator_set_block() to reflect the changes;
- *  the pointer returned by FLAC__metadata_iterator_get_block()
- *  points directly into the chain.
- *
- * \warning
- * Do not call FLAC__metadata_object_delete() on the returned object;
- * to delete a block use FLAC__metadata_iterator_delete_block().
- *
- * \param iterator  A pointer to an existing initialized iterator.
- * \assert
- *    \code iterator != NULL \endcode
- *    \a iterator has been successfully initialized with
- *    FLAC__metadata_iterator_init()
- * \retval FLAC__StreamMetadata*
- *    The current metadata block.
- */
-FLAC_API FLAC__StreamMetadata *FLAC__metadata_iterator_get_block(FLAC__Metadata_Iterator *iterator);
-
-/** Set the metadata block at the current position, replacing the existing
- *  block.  The new block passed in becomes owned by the chain and it will be
- *  deleted when the chain is deleted.
- *
- * \param iterator  A pointer to an existing initialized iterator.
- * \param block     A pointer to a metadata block.
- * \assert
- *    \code iterator != NULL \endcode
- *    \a iterator has been successfully initialized with
- *    FLAC__metadata_iterator_init()
- *    \code block != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the conditions in the above description are not met, or
- *    a memory allocation error occurs, otherwise \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_iterator_set_block(FLAC__Metadata_Iterator *iterator, FLAC__StreamMetadata *block);
-
-/** Removes the current block from the chain.  If \a replace_with_padding is
- *  \c true, the block will instead be replaced with a padding block of equal
- *  size.  You can not delete the STREAMINFO block.  The iterator will be
- *  left pointing to the block before the one just "deleted", even if
- *  \a replace_with_padding is \c true.
- *
- * \param iterator              A pointer to an existing initialized iterator.
- * \param replace_with_padding  See above.
- * \assert
- *    \code iterator != NULL \endcode
- *    \a iterator has been successfully initialized with
- *    FLAC__metadata_iterator_init()
- * \retval FLAC__bool
- *    \c false if the conditions in the above description are not met,
- *    otherwise \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_iterator_delete_block(FLAC__Metadata_Iterator *iterator, FLAC__bool replace_with_padding);
-
-/** Insert a new block before the current block.  You cannot insert a block
- *  before the first STREAMINFO block.  You cannot insert a STREAMINFO block
- *  as there can be only one, the one that already exists at the head when you
- *  read in a chain.  The chain takes ownership of the new block and it will be
- *  deleted when the chain is deleted.  The iterator will be left pointing to
- *  the new block.
- *
- * \param iterator  A pointer to an existing initialized iterator.
- * \param block     A pointer to a metadata block to insert.
- * \assert
- *    \code iterator != NULL \endcode
- *    \a iterator has been successfully initialized with
- *    FLAC__metadata_iterator_init()
- * \retval FLAC__bool
- *    \c false if the conditions in the above description are not met, or
- *    a memory allocation error occurs, otherwise \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_iterator_insert_block_before(FLAC__Metadata_Iterator *iterator, FLAC__StreamMetadata *block);
-
-/** Insert a new block after the current block.  You cannot insert a STREAMINFO
- *  block as there can be only one, the one that already exists at the head when
- *  you read in a chain.  The chain takes ownership of the new block and it will
- *  be deleted when the chain is deleted.  The iterator will be left pointing to
- *  the new block.
- *
- * \param iterator  A pointer to an existing initialized iterator.
- * \param block     A pointer to a metadata block to insert.
- * \assert
- *    \code iterator != NULL \endcode
- *    \a iterator has been successfully initialized with
- *    FLAC__metadata_iterator_init()
- * \retval FLAC__bool
- *    \c false if the conditions in the above description are not met, or
- *    a memory allocation error occurs, otherwise \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_iterator_insert_block_after(FLAC__Metadata_Iterator *iterator, FLAC__StreamMetadata *block);
-
-/* \} */
-
-
-/** \defgroup flac_metadata_object FLAC/metadata.h: metadata object methods
- *  \ingroup flac_metadata
- *
- * \brief
- * This module contains methods for manipulating FLAC metadata objects.
- *
- * Since many are variable length we have to be careful about the memory
- * management.  We decree that all pointers to data in the object are
- * owned by the object and memory-managed by the object.
- *
- * Use the FLAC__metadata_object_new() and FLAC__metadata_object_delete()
- * functions to create all instances.  When using the
- * FLAC__metadata_object_set_*() functions to set pointers to data, set
- * \a copy to \c true to have the function make it's own copy of the data, or
- * to \c false to give the object ownership of your data.  In the latter case
- * your pointer must be freeable by free() and will be free()d when the object
- * is FLAC__metadata_object_delete()d.  It is legal to pass a null pointer as
- * the data pointer to a FLAC__metadata_object_set_*() function as long as
- * the length argument is 0 and the \a copy argument is \c false.
- *
- * The FLAC__metadata_object_new() and FLAC__metadata_object_clone() function
- * will return \c NULL in the case of a memory allocation error, otherwise a new
- * object.  The FLAC__metadata_object_set_*() functions return \c false in the
- * case of a memory allocation error.
- *
- * We don't have the convenience of C++ here, so note that the library relies
- * on you to keep the types straight.  In other words, if you pass, for
- * example, a FLAC__StreamMetadata* that represents a STREAMINFO block to
- * FLAC__metadata_object_application_set_data(), you will get an assertion
- * failure.
- *
- * For convenience the FLAC__metadata_object_vorbiscomment_*() functions
- * maintain a trailing NUL on each Vorbis comment entry.  This is not counted
- * toward the length or stored in the stream, but it can make working with plain
- * comments (those that don't contain embedded-NULs in the value) easier.
- * Entries passed into these functions have trailing NULs added if missing, and
- * returned entries are guaranteed to have a trailing NUL.
- *
- * The FLAC__metadata_object_vorbiscomment_*() functions that take a Vorbis
- * comment entry/name/value will first validate that it complies with the Vorbis
- * comment specification and return false if it does not.
- *
- * There is no need to recalculate the length field on metadata blocks you
- * have modified.  They will be calculated automatically before they  are
- * written back to a file.
- *
- * \{
- */
-
-
-/** Create a new metadata object instance of the given type.
- *
- *  The object will be "empty"; i.e. values and data pointers will be \c 0,
- *  with the exception of FLAC__METADATA_TYPE_VORBIS_COMMENT, which will have
- *  the vendor string set (but zero comments).
- *
- *  Do not pass in a value greater than or equal to
- *  \a FLAC__METADATA_TYPE_UNDEFINED unless you really know what you're
- *  doing.
- *
- * \param type  Type of object to create
- * \retval FLAC__StreamMetadata*
- *    \c NULL if there was an error allocating memory or the type code is
- *    greater than FLAC__MAX_METADATA_TYPE_CODE, else the new instance.
- */
-FLAC_API FLAC__StreamMetadata *FLAC__metadata_object_new(FLAC__MetadataType type);
-
-/** Create a copy of an existing metadata object.
- *
- *  The copy is a "deep" copy, i.e. dynamically allocated data within the
- *  object is also copied.  The caller takes ownership of the new block and
- *  is responsible for freeing it with FLAC__metadata_object_delete().
- *
- * \param object  Pointer to object to copy.
- * \assert
- *    \code object != NULL \endcode
- * \retval FLAC__StreamMetadata*
- *    \c NULL if there was an error allocating memory, else the new instance.
- */
-FLAC_API FLAC__StreamMetadata *FLAC__metadata_object_clone(const FLAC__StreamMetadata *object);
-
-/** Free a metadata object.  Deletes the object pointed to by \a object.
- *
- *  The delete is a "deep" delete, i.e. dynamically allocated data within the
- *  object is also deleted.
- *
- * \param object  A pointer to an existing object.
- * \assert
- *    \code object != NULL \endcode
- */
-FLAC_API void FLAC__metadata_object_delete(FLAC__StreamMetadata *object);
-
-/** Compares two metadata objects.
- *
- *  The compare is "deep", i.e. dynamically allocated data within the
- *  object is also compared.
- *
- * \param block1  A pointer to an existing object.
- * \param block2  A pointer to an existing object.
- * \assert
- *    \code block1 != NULL \endcode
- *    \code block2 != NULL \endcode
- * \retval FLAC__bool
- *    \c true if objects are identical, else \c false.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_is_equal(const FLAC__StreamMetadata *block1, const FLAC__StreamMetadata *block2);
-
-/** Sets the application data of an APPLICATION block.
- *
- *  If \a copy is \c true, a copy of the data is stored; otherwise, the object
- *  takes ownership of the pointer.  The existing data will be freed if this
- *  function is successful, otherwise the original data will remain if \a copy
- *  is \c true and malloc() fails.
- *
- * \note It is safe to pass a const pointer to \a data if \a copy is \c true.
- *
- * \param object  A pointer to an existing APPLICATION object.
- * \param data    A pointer to the data to set.
- * \param length  The length of \a data in bytes.
- * \param copy    See above.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_APPLICATION \endcode
- *    \code (data != NULL && length > 0) ||
- * (data == NULL && length == 0 && copy == false) \endcode
- * \retval FLAC__bool
- *    \c false if \a copy is \c true and malloc() fails, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_application_set_data(FLAC__StreamMetadata *object, FLAC__byte *data, unsigned length, FLAC__bool copy);
-
-/** Resize the seekpoint array.
- *
- *  If the size shrinks, elements will truncated; if it grows, new placeholder
- *  points will be added to the end.
- *
- * \param object          A pointer to an existing SEEKTABLE object.
- * \param new_num_points  The desired length of the array; may be \c 0.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_SEEKTABLE \endcode
- *    \code (object->data.seek_table.points == NULL && object->data.seek_table.num_points == 0) ||
- * (object->data.seek_table.points != NULL && object->data.seek_table.num_points > 0) \endcode
- * \retval FLAC__bool
- *    \c false if memory allocation error, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_seektable_resize_points(FLAC__StreamMetadata *object, unsigned new_num_points);
-
-/** Set a seekpoint in a seektable.
- *
- * \param object     A pointer to an existing SEEKTABLE object.
- * \param point_num  Index into seekpoint array to set.
- * \param point      The point to set.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_SEEKTABLE \endcode
- *    \code object->data.seek_table.num_points > point_num \endcode
- */
-FLAC_API void FLAC__metadata_object_seektable_set_point(FLAC__StreamMetadata *object, unsigned point_num, FLAC__StreamMetadata_SeekPoint point);
-
-/** Insert a seekpoint into a seektable.
- *
- * \param object     A pointer to an existing SEEKTABLE object.
- * \param point_num  Index into seekpoint array to set.
- * \param point      The point to set.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_SEEKTABLE \endcode
- *    \code object->data.seek_table.num_points >= point_num \endcode
- * \retval FLAC__bool
- *    \c false if memory allocation error, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_seektable_insert_point(FLAC__StreamMetadata *object, unsigned point_num, FLAC__StreamMetadata_SeekPoint point);
-
-/** Delete a seekpoint from a seektable.
- *
- * \param object     A pointer to an existing SEEKTABLE object.
- * \param point_num  Index into seekpoint array to set.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_SEEKTABLE \endcode
- *    \code object->data.seek_table.num_points > point_num \endcode
- * \retval FLAC__bool
- *    \c false if memory allocation error, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_seektable_delete_point(FLAC__StreamMetadata *object, unsigned point_num);
-
-/** Check a seektable to see if it conforms to the FLAC specification.
- *  See the format specification for limits on the contents of the
- *  seektable.
- *
- * \param object  A pointer to an existing SEEKTABLE object.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_SEEKTABLE \endcode
- * \retval FLAC__bool
- *    \c false if seek table is illegal, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_seektable_is_legal(const FLAC__StreamMetadata *object);
-
-/** Append a number of placeholder points to the end of a seek table.
- *
- * \note
- * As with the other ..._seektable_template_... functions, you should
- * call FLAC__metadata_object_seektable_template_sort() when finished
- * to make the seek table legal.
- *
- * \param object  A pointer to an existing SEEKTABLE object.
- * \param num     The number of placeholder points to append.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_SEEKTABLE \endcode
- * \retval FLAC__bool
- *    \c false if memory allocation fails, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_seektable_template_append_placeholders(FLAC__StreamMetadata *object, unsigned num);
-
-/** Append a specific seek point template to the end of a seek table.
- *
- * \note
- * As with the other ..._seektable_template_... functions, you should
- * call FLAC__metadata_object_seektable_template_sort() when finished
- * to make the seek table legal.
- *
- * \param object  A pointer to an existing SEEKTABLE object.
- * \param sample_number  The sample number of the seek point template.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_SEEKTABLE \endcode
- * \retval FLAC__bool
- *    \c false if memory allocation fails, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_seektable_template_append_point(FLAC__StreamMetadata *object, FLAC__uint64 sample_number);
-
-/** Append specific seek point templates to the end of a seek table.
- *
- * \note
- * As with the other ..._seektable_template_... functions, you should
- * call FLAC__metadata_object_seektable_template_sort() when finished
- * to make the seek table legal.
- *
- * \param object  A pointer to an existing SEEKTABLE object.
- * \param sample_numbers  An array of sample numbers for the seek points.
- * \param num     The number of seek point templates to append.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_SEEKTABLE \endcode
- * \retval FLAC__bool
- *    \c false if memory allocation fails, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_seektable_template_append_points(FLAC__StreamMetadata *object, FLAC__uint64 sample_numbers[], unsigned num);
-
-/** Append a set of evenly-spaced seek point templates to the end of a
- *  seek table.
- *
- * \note
- * As with the other ..._seektable_template_... functions, you should
- * call FLAC__metadata_object_seektable_template_sort() when finished
- * to make the seek table legal.
- *
- * \param object  A pointer to an existing SEEKTABLE object.
- * \param num     The number of placeholder points to append.
- * \param total_samples  The total number of samples to be encoded;
- *                       the seekpoints will be spaced approximately
- *                       \a total_samples / \a num samples apart.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_SEEKTABLE \endcode
- *    \code total_samples > 0 \endcode
- * \retval FLAC__bool
- *    \c false if memory allocation fails, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_seektable_template_append_spaced_points(FLAC__StreamMetadata *object, unsigned num, FLAC__uint64 total_samples);
-
-/** Append a set of evenly-spaced seek point templates to the end of a
- *  seek table.
- *
- * \note
- * As with the other ..._seektable_template_... functions, you should
- * call FLAC__metadata_object_seektable_template_sort() when finished
- * to make the seek table legal.
- *
- * \param object  A pointer to an existing SEEKTABLE object.
- * \param samples The number of samples apart to space the placeholder
- *                points.  The first point will be at sample \c 0, the
- *                second at sample \a samples, then 2*\a samples, and
- *                so on.  As long as \a samples and \a total_samples
- *                are greater than \c 0, there will always be at least
- *                one seekpoint at sample \c 0.
- * \param total_samples  The total number of samples to be encoded;
- *                       the seekpoints will be spaced
- *                       \a samples samples apart.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_SEEKTABLE \endcode
- *    \code samples > 0 \endcode
- *    \code total_samples > 0 \endcode
- * \retval FLAC__bool
- *    \c false if memory allocation fails, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_seektable_template_append_spaced_points_by_samples(FLAC__StreamMetadata *object, unsigned samples, FLAC__uint64 total_samples);
-
-/** Sort a seek table's seek points according to the format specification,
- *  removing duplicates.
- *
- * \param object   A pointer to a seek table to be sorted.
- * \param compact  If \c false, behaves like FLAC__format_seektable_sort().
- *                 If \c true, duplicates are deleted and the seek table is
- *                 shrunk appropriately; the number of placeholder points
- *                 present in the seek table will be the same after the call
- *                 as before.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_SEEKTABLE \endcode
- * \retval FLAC__bool
- *    \c false if realloc() fails, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_seektable_template_sort(FLAC__StreamMetadata *object, FLAC__bool compact);
-
-/** Sets the vendor string in a VORBIS_COMMENT block.
- *
- *  For convenience, a trailing NUL is added to the entry if it doesn't have
- *  one already.
- *
- *  If \a copy is \c true, a copy of the entry is stored; otherwise, the object
- *  takes ownership of the \c entry.entry pointer.
- *
- *  \note If this function returns \c false, the caller still owns the
- *  pointer.
- *
- * \param object  A pointer to an existing VORBIS_COMMENT object.
- * \param entry   The entry to set the vendor string to.
- * \param copy    See above.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT \endcode
- *    \code (entry.entry != NULL && entry.length > 0) ||
- * (entry.entry == NULL && entry.length == 0) \endcode
- * \retval FLAC__bool
- *    \c false if memory allocation fails or \a entry does not comply with the
- *    Vorbis comment specification, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_set_vendor_string(FLAC__StreamMetadata *object, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy);
-
-/** Resize the comment array.
- *
- *  If the size shrinks, elements will truncated; if it grows, new empty
- *  fields will be added to the end.
- *
- * \param object            A pointer to an existing VORBIS_COMMENT object.
- * \param new_num_comments  The desired length of the array; may be \c 0.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT \endcode
- *    \code (object->data.vorbis_comment.comments == NULL && object->data.vorbis_comment.num_comments == 0) ||
- * (object->data.vorbis_comment.comments != NULL && object->data.vorbis_comment.num_comments > 0) \endcode
- * \retval FLAC__bool
- *    \c false if memory allocation fails, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_resize_comments(FLAC__StreamMetadata *object, unsigned new_num_comments);
-
-/** Sets a comment in a VORBIS_COMMENT block.
- *
- *  For convenience, a trailing NUL is added to the entry if it doesn't have
- *  one already.
- *
- *  If \a copy is \c true, a copy of the entry is stored; otherwise, the object
- *  takes ownership of the \c entry.entry pointer.
- *
- *  \note If this function returns \c false, the caller still owns the
- *  pointer.
- *
- * \param object       A pointer to an existing VORBIS_COMMENT object.
- * \param comment_num  Index into comment array to set.
- * \param entry        The entry to set the comment to.
- * \param copy         See above.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT \endcode
- *    \code comment_num < object->data.vorbis_comment.num_comments \endcode
- *    \code (entry.entry != NULL && entry.length > 0) ||
- * (entry.entry == NULL && entry.length == 0) \endcode
- * \retval FLAC__bool
- *    \c false if memory allocation fails or \a entry does not comply with the
- *    Vorbis comment specification, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_set_comment(FLAC__StreamMetadata *object, unsigned comment_num, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy);
-
-/** Insert a comment in a VORBIS_COMMENT block at the given index.
- *
- *  For convenience, a trailing NUL is added to the entry if it doesn't have
- *  one already.
- *
- *  If \a copy is \c true, a copy of the entry is stored; otherwise, the object
- *  takes ownership of the \c entry.entry pointer.
- *
- *  \note If this function returns \c false, the caller still owns the
- *  pointer.
- *
- * \param object       A pointer to an existing VORBIS_COMMENT object.
- * \param comment_num  The index at which to insert the comment.  The comments
- *                     at and after \a comment_num move right one position.
- *                     To append a comment to the end, set \a comment_num to
- *                     \c object->data.vorbis_comment.num_comments .
- * \param entry        The comment to insert.
- * \param copy         See above.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT \endcode
- *    \code object->data.vorbis_comment.num_comments >= comment_num \endcode
- *    \code (entry.entry != NULL && entry.length > 0) ||
- * (entry.entry == NULL && entry.length == 0 && copy == false) \endcode
- * \retval FLAC__bool
- *    \c false if memory allocation fails or \a entry does not comply with the
- *    Vorbis comment specification, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_insert_comment(FLAC__StreamMetadata *object, unsigned comment_num, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy);
-
-/** Appends a comment to a VORBIS_COMMENT block.
- *
- *  For convenience, a trailing NUL is added to the entry if it doesn't have
- *  one already.
- *
- *  If \a copy is \c true, a copy of the entry is stored; otherwise, the object
- *  takes ownership of the \c entry.entry pointer.
- *
- *  \note If this function returns \c false, the caller still owns the
- *  pointer.
- *
- * \param object       A pointer to an existing VORBIS_COMMENT object.
- * \param entry        The comment to insert.
- * \param copy         See above.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT \endcode
- *    \code (entry.entry != NULL && entry.length > 0) ||
- * (entry.entry == NULL && entry.length == 0 && copy == false) \endcode
- * \retval FLAC__bool
- *    \c false if memory allocation fails or \a entry does not comply with the
- *    Vorbis comment specification, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_append_comment(FLAC__StreamMetadata *object, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy);
-
-/** Replaces comments in a VORBIS_COMMENT block with a new one.
- *
- *  For convenience, a trailing NUL is added to the entry if it doesn't have
- *  one already.
- *
- *  Depending on the the value of \a all, either all or just the first comment
- *  whose field name(s) match the given entry's name will be replaced by the
- *  given entry.  If no comments match, \a entry will simply be appended.
- *
- *  If \a copy is \c true, a copy of the entry is stored; otherwise, the object
- *  takes ownership of the \c entry.entry pointer.
- *
- *  \note If this function returns \c false, the caller still owns the
- *  pointer.
- *
- * \param object       A pointer to an existing VORBIS_COMMENT object.
- * \param entry        The comment to insert.
- * \param all          If \c true, all comments whose field name matches
- *                     \a entry's field name will be removed, and \a entry will
- *                     be inserted at the position of the first matching
- *                     comment.  If \c false, only the first comment whose
- *                     field name matches \a entry's field name will be
- *                     replaced with \a entry.
- * \param copy         See above.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT \endcode
- *    \code (entry.entry != NULL && entry.length > 0) ||
- * (entry.entry == NULL && entry.length == 0 && copy == false) \endcode
- * \retval FLAC__bool
- *    \c false if memory allocation fails or \a entry does not comply with the
- *    Vorbis comment specification, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_replace_comment(FLAC__StreamMetadata *object, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool all, FLAC__bool copy);
-
-/** Delete a comment in a VORBIS_COMMENT block at the given index.
- *
- * \param object       A pointer to an existing VORBIS_COMMENT object.
- * \param comment_num  The index of the comment to delete.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT \endcode
- *    \code object->data.vorbis_comment.num_comments > comment_num \endcode
- * \retval FLAC__bool
- *    \c false if realloc() fails, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_delete_comment(FLAC__StreamMetadata *object, unsigned comment_num);
-
-/** Creates a Vorbis comment entry from NUL-terminated name and value strings.
- *
- *  On return, the filled-in \a entry->entry pointer will point to malloc()ed
- *  memory and shall be owned by the caller.  For convenience the entry will
- *  have a terminating NUL.
- *
- * \param entry              A pointer to a Vorbis comment entry.  The entry's
- *                           \c entry pointer should not point to allocated
- *                           memory as it will be overwritten.
- * \param field_name         The field name in ASCII, \c NUL terminated.
- * \param field_value        The field value in UTF-8, \c NUL terminated.
- * \assert
- *    \code entry != NULL \endcode
- *    \code field_name != NULL \endcode
- *    \code field_value != NULL \endcode
- * \retval FLAC__bool
- *    \c false if malloc() fails, or if \a field_name or \a field_value does
- *    not comply with the Vorbis comment specification, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair(FLAC__StreamMetadata_VorbisComment_Entry *entry, const char *field_name, const char *field_value);
-
-/** Splits a Vorbis comment entry into NUL-terminated name and value strings.
- *
- *  The returned pointers to name and value will be allocated by malloc()
- *  and shall be owned by the caller.
- *
- * \param entry              An existing Vorbis comment entry.
- * \param field_name         The address of where the returned pointer to the
- *                           field name will be stored.
- * \param field_value        The address of where the returned pointer to the
- *                           field value will be stored.
- * \assert
- *    \code (entry.entry != NULL && entry.length > 0) \endcode
- *    \code memchr(entry.entry, '=', entry.length) != NULL \endcode
- *    \code field_name != NULL \endcode
- *    \code field_value != NULL \endcode
- * \retval FLAC__bool
- *    \c false if memory allocation fails or \a entry does not comply with the
- *    Vorbis comment specification, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_entry_to_name_value_pair(const FLAC__StreamMetadata_VorbisComment_Entry entry, char **field_name, char **field_value);
-
-/** Check if the given Vorbis comment entry's field name matches the given
- *  field name.
- *
- * \param entry              An existing Vorbis comment entry.
- * \param field_name         The field name to check.
- * \param field_name_length  The length of \a field_name, not including the
- *                           terminating \c NUL.
- * \assert
- *    \code (entry.entry != NULL && entry.length > 0) \endcode
- * \retval FLAC__bool
- *    \c true if the field names match, else \c false
- */
-FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_entry_matches(const FLAC__StreamMetadata_VorbisComment_Entry entry, const char *field_name, unsigned field_name_length);
-
-/** Find a Vorbis comment with the given field name.
- *
- *  The search begins at entry number \a offset; use an offset of 0 to
- *  search from the beginning of the comment array.
- *
- * \param object      A pointer to an existing VORBIS_COMMENT object.
- * \param offset      The offset into the comment array from where to start
- *                    the search.
- * \param field_name  The field name of the comment to find.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT \endcode
- *    \code field_name != NULL \endcode
- * \retval int
- *    The offset in the comment array of the first comment whose field
- *    name matches \a field_name, or \c -1 if no match was found.
- */
-FLAC_API int FLAC__metadata_object_vorbiscomment_find_entry_from(const FLAC__StreamMetadata *object, unsigned offset, const char *field_name);
-
-/** Remove first Vorbis comment matching the given field name.
- *
- * \param object      A pointer to an existing VORBIS_COMMENT object.
- * \param field_name  The field name of comment to delete.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT \endcode
- * \retval int
- *    \c -1 for memory allocation error, \c 0 for no matching entries,
- *    \c 1 for one matching entry deleted.
- */
-FLAC_API int FLAC__metadata_object_vorbiscomment_remove_entry_matching(FLAC__StreamMetadata *object, const char *field_name);
-
-/** Remove all Vorbis comments matching the given field name.
- *
- * \param object      A pointer to an existing VORBIS_COMMENT object.
- * \param field_name  The field name of comments to delete.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT \endcode
- * \retval int
- *    \c -1 for memory allocation error, \c 0 for no matching entries,
- *    else the number of matching entries deleted.
- */
-FLAC_API int FLAC__metadata_object_vorbiscomment_remove_entries_matching(FLAC__StreamMetadata *object, const char *field_name);
-
-/** Create a new CUESHEET track instance.
- *
- *  The object will be "empty"; i.e. values and data pointers will be \c 0.
- *
- * \retval FLAC__StreamMetadata_CueSheet_Track*
- *    \c NULL if there was an error allocating memory, else the new instance.
- */
-FLAC_API FLAC__StreamMetadata_CueSheet_Track *FLAC__metadata_object_cuesheet_track_new(void);
-
-/** Create a copy of an existing CUESHEET track object.
- *
- *  The copy is a "deep" copy, i.e. dynamically allocated data within the
- *  object is also copied.  The caller takes ownership of the new object and
- *  is responsible for freeing it with
- *  FLAC__metadata_object_cuesheet_track_delete().
- *
- * \param object  Pointer to object to copy.
- * \assert
- *    \code object != NULL \endcode
- * \retval FLAC__StreamMetadata_CueSheet_Track*
- *    \c NULL if there was an error allocating memory, else the new instance.
- */
-FLAC_API FLAC__StreamMetadata_CueSheet_Track *FLAC__metadata_object_cuesheet_track_clone(const FLAC__StreamMetadata_CueSheet_Track *object);
-
-/** Delete a CUESHEET track object
- *
- * \param object       A pointer to an existing CUESHEET track object.
- * \assert
- *    \code object != NULL \endcode
- */
-FLAC_API void FLAC__metadata_object_cuesheet_track_delete(FLAC__StreamMetadata_CueSheet_Track *object);
-
-/** Resize a track's index point array.
- *
- *  If the size shrinks, elements will truncated; if it grows, new blank
- *  indices will be added to the end.
- *
- * \param object           A pointer to an existing CUESHEET object.
- * \param track_num        The index of the track to modify.  NOTE: this is not
- *                         necessarily the same as the track's \a number field.
- * \param new_num_indices  The desired length of the array; may be \c 0.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_CUESHEET \endcode
- *    \code object->data.cue_sheet.num_tracks > track_num \endcode
- *    \code (object->data.cue_sheet.tracks[track_num].indices == NULL && object->data.cue_sheet.tracks[track_num].num_indices == 0) ||
- * (object->data.cue_sheet.tracks[track_num].indices != NULL && object->data.cue_sheet.tracks[track_num].num_indices > 0) \endcode
- * \retval FLAC__bool
- *    \c false if memory allocation error, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_track_resize_indices(FLAC__StreamMetadata *object, unsigned track_num, unsigned new_num_indices);
-
-/** Insert an index point in a CUESHEET track at the given index.
- *
- * \param object       A pointer to an existing CUESHEET object.
- * \param track_num    The index of the track to modify.  NOTE: this is not
- *                     necessarily the same as the track's \a number field.
- * \param index_num    The index into the track's index array at which to
- *                     insert the index point.  NOTE: this is not necessarily
- *                     the same as the index point's \a number field.  The
- *                     indices at and after \a index_num move right one
- *                     position.  To append an index point to the end, set
- *                     \a index_num to
- *                     \c object->data.cue_sheet.tracks[track_num].num_indices .
- * \param index        The index point to insert.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_CUESHEET \endcode
- *    \code object->data.cue_sheet.num_tracks > track_num \endcode
- *    \code object->data.cue_sheet.tracks[track_num].num_indices >= index_num \endcode
- * \retval FLAC__bool
- *    \c false if realloc() fails, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_track_insert_index(FLAC__StreamMetadata *object, unsigned track_num, unsigned index_num, FLAC__StreamMetadata_CueSheet_Index index);
-
-/** Insert a blank index point in a CUESHEET track at the given index.
- *
- *  A blank index point is one in which all field values are zero.
- *
- * \param object       A pointer to an existing CUESHEET object.
- * \param track_num    The index of the track to modify.  NOTE: this is not
- *                     necessarily the same as the track's \a number field.
- * \param index_num    The index into the track's index array at which to
- *                     insert the index point.  NOTE: this is not necessarily
- *                     the same as the index point's \a number field.  The
- *                     indices at and after \a index_num move right one
- *                     position.  To append an index point to the end, set
- *                     \a index_num to
- *                     \c object->data.cue_sheet.tracks[track_num].num_indices .
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_CUESHEET \endcode
- *    \code object->data.cue_sheet.num_tracks > track_num \endcode
- *    \code object->data.cue_sheet.tracks[track_num].num_indices >= index_num \endcode
- * \retval FLAC__bool
- *    \c false if realloc() fails, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_track_insert_blank_index(FLAC__StreamMetadata *object, unsigned track_num, unsigned index_num);
-
-/** Delete an index point in a CUESHEET track at the given index.
- *
- * \param object       A pointer to an existing CUESHEET object.
- * \param track_num    The index into the track array of the track to
- *                     modify.  NOTE: this is not necessarily the same
- *                     as the track's \a number field.
- * \param index_num    The index into the track's index array of the index
- *                     to delete.  NOTE: this is not necessarily the same
- *                     as the index's \a number field.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_CUESHEET \endcode
- *    \code object->data.cue_sheet.num_tracks > track_num \endcode
- *    \code object->data.cue_sheet.tracks[track_num].num_indices > index_num \endcode
- * \retval FLAC__bool
- *    \c false if realloc() fails, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_track_delete_index(FLAC__StreamMetadata *object, unsigned track_num, unsigned index_num);
-
-/** Resize the track array.
- *
- *  If the size shrinks, elements will truncated; if it grows, new blank
- *  tracks will be added to the end.
- *
- * \param object            A pointer to an existing CUESHEET object.
- * \param new_num_tracks    The desired length of the array; may be \c 0.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_CUESHEET \endcode
- *    \code (object->data.cue_sheet.tracks == NULL && object->data.cue_sheet.num_tracks == 0) ||
- * (object->data.cue_sheet.tracks != NULL && object->data.cue_sheet.num_tracks > 0) \endcode
- * \retval FLAC__bool
- *    \c false if memory allocation error, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_resize_tracks(FLAC__StreamMetadata *object, unsigned new_num_tracks);
-
-/** Sets a track in a CUESHEET block.
- *
- *  If \a copy is \c true, a copy of the track is stored; otherwise, the object
- *  takes ownership of the \a track pointer.
- *
- * \param object       A pointer to an existing CUESHEET object.
- * \param track_num    Index into track array to set.  NOTE: this is not
- *                     necessarily the same as the track's \a number field.
- * \param track        The track to set the track to.  You may safely pass in
- *                     a const pointer if \a copy is \c true.
- * \param copy         See above.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_CUESHEET \endcode
- *    \code track_num < object->data.cue_sheet.num_tracks \endcode
- *    \code (track->indices != NULL && track->num_indices > 0) ||
- * (track->indices == NULL && track->num_indices == 0)
- * \retval FLAC__bool
- *    \c false if \a copy is \c true and malloc() fails, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_set_track(FLAC__StreamMetadata *object, unsigned track_num, FLAC__StreamMetadata_CueSheet_Track *track, FLAC__bool copy);
-
-/** Insert a track in a CUESHEET block at the given index.
- *
- *  If \a copy is \c true, a copy of the track is stored; otherwise, the object
- *  takes ownership of the \a track pointer.
- *
- * \param object       A pointer to an existing CUESHEET object.
- * \param track_num    The index at which to insert the track.  NOTE: this
- *                     is not necessarily the same as the track's \a number
- *                     field.  The tracks at and after \a track_num move right
- *                     one position.  To append a track to the end, set
- *                     \a track_num to \c object->data.cue_sheet.num_tracks .
- * \param track        The track to insert.  You may safely pass in a const
- *                     pointer if \a copy is \c true.
- * \param copy         See above.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_CUESHEET \endcode
- *    \code object->data.cue_sheet.num_tracks >= track_num \endcode
- * \retval FLAC__bool
- *    \c false if \a copy is \c true and malloc() fails, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_insert_track(FLAC__StreamMetadata *object, unsigned track_num, FLAC__StreamMetadata_CueSheet_Track *track, FLAC__bool copy);
-
-/** Insert a blank track in a CUESHEET block at the given index.
- *
- *  A blank track is one in which all field values are zero.
- *
- * \param object       A pointer to an existing CUESHEET object.
- * \param track_num    The index at which to insert the track.  NOTE: this
- *                     is not necessarily the same as the track's \a number
- *                     field.  The tracks at and after \a track_num move right
- *                     one position.  To append a track to the end, set
- *                     \a track_num to \c object->data.cue_sheet.num_tracks .
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_CUESHEET \endcode
- *    \code object->data.cue_sheet.num_tracks >= track_num \endcode
- * \retval FLAC__bool
- *    \c false if \a copy is \c true and malloc() fails, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_insert_blank_track(FLAC__StreamMetadata *object, unsigned track_num);
-
-/** Delete a track in a CUESHEET block at the given index.
- *
- * \param object       A pointer to an existing CUESHEET object.
- * \param track_num    The index into the track array of the track to
- *                     delete.  NOTE: this is not necessarily the same
- *                     as the track's \a number field.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_CUESHEET \endcode
- *    \code object->data.cue_sheet.num_tracks > track_num \endcode
- * \retval FLAC__bool
- *    \c false if realloc() fails, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_delete_track(FLAC__StreamMetadata *object, unsigned track_num);
-
-/** Check a cue sheet to see if it conforms to the FLAC specification.
- *  See the format specification for limits on the contents of the
- *  cue sheet.
- *
- * \param object     A pointer to an existing CUESHEET object.
- * \param check_cd_da_subset  If \c true, check CUESHEET against more
- *                   stringent requirements for a CD-DA (audio) disc.
- * \param violation  Address of a pointer to a string.  If there is a
- *                   violation, a pointer to a string explanation of the
- *                   violation will be returned here. \a violation may be
- *                   \c NULL if you don't need the returned string.  Do not
- *                   free the returned string; it will always point to static
- *                   data.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_CUESHEET \endcode
- * \retval FLAC__bool
- *    \c false if cue sheet is illegal, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_is_legal(const FLAC__StreamMetadata *object, FLAC__bool check_cd_da_subset, const char **violation);
-
-/** Calculate and return the CDDB/freedb ID for a cue sheet.  The function
- *  assumes the cue sheet corresponds to a CD; the result is undefined
- *  if the cuesheet's is_cd bit is not set.
- *
- * \param object     A pointer to an existing CUESHEET object.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_CUESHEET \endcode
- * \retval FLAC__uint32
- *    The unsigned integer representation of the CDDB/freedb ID
- */
-FLAC_API FLAC__uint32 FLAC__metadata_object_cuesheet_calculate_cddb_id(const FLAC__StreamMetadata *object);
-
-/** Sets the MIME type of a PICTURE block.
- *
- *  If \a copy is \c true, a copy of the string is stored; otherwise, the object
- *  takes ownership of the pointer.  The existing string will be freed if this
- *  function is successful, otherwise the original string will remain if \a copy
- *  is \c true and malloc() fails.
- *
- * \note It is safe to pass a const pointer to \a mime_type if \a copy is \c true.
- *
- * \param object      A pointer to an existing PICTURE object.
- * \param mime_type   A pointer to the MIME type string.  The string must be
- *                    ASCII characters 0x20-0x7e, NUL-terminated.  No validation
- *                    is done.
- * \param copy        See above.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_PICTURE \endcode
- *    \code (mime_type != NULL) \endcode
- * \retval FLAC__bool
- *    \c false if \a copy is \c true and malloc() fails, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_picture_set_mime_type(FLAC__StreamMetadata *object, char *mime_type, FLAC__bool copy);
-
-/** Sets the description of a PICTURE block.
- *
- *  If \a copy is \c true, a copy of the string is stored; otherwise, the object
- *  takes ownership of the pointer.  The existing string will be freed if this
- *  function is successful, otherwise the original string will remain if \a copy
- *  is \c true and malloc() fails.
- *
- * \note It is safe to pass a const pointer to \a description if \a copy is \c true.
- *
- * \param object      A pointer to an existing PICTURE object.
- * \param description A pointer to the description string.  The string must be
- *                    valid UTF-8, NUL-terminated.  No validation is done.
- * \param copy        See above.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_PICTURE \endcode
- *    \code (description != NULL) \endcode
- * \retval FLAC__bool
- *    \c false if \a copy is \c true and malloc() fails, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_picture_set_description(FLAC__StreamMetadata *object, FLAC__byte *description, FLAC__bool copy);
-
-/** Sets the picture data of a PICTURE block.
- *
- *  If \a copy is \c true, a copy of the data is stored; otherwise, the object
- *  takes ownership of the pointer.  Also sets the \a data_length field of the
- *  metadata object to what is passed in as the \a length parameter.  The
- *  existing data will be freed if this function is successful, otherwise the
- *  original data and data_length will remain if \a copy is \c true and
- *  malloc() fails.
- *
- * \note It is safe to pass a const pointer to \a data if \a copy is \c true.
- *
- * \param object  A pointer to an existing PICTURE object.
- * \param data    A pointer to the data to set.
- * \param length  The length of \a data in bytes.
- * \param copy    See above.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_PICTURE \endcode
- *    \code (data != NULL && length > 0) ||
- * (data == NULL && length == 0 && copy == false) \endcode
- * \retval FLAC__bool
- *    \c false if \a copy is \c true and malloc() fails, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_picture_set_data(FLAC__StreamMetadata *object, FLAC__byte *data, FLAC__uint32 length, FLAC__bool copy);
-
-/** Check a PICTURE block to see if it conforms to the FLAC specification.
- *  See the format specification for limits on the contents of the
- *  PICTURE block.
- *
- * \param object     A pointer to existing PICTURE block to be checked.
- * \param violation  Address of a pointer to a string.  If there is a
- *                   violation, a pointer to a string explanation of the
- *                   violation will be returned here. \a violation may be
- *                   \c NULL if you don't need the returned string.  Do not
- *                   free the returned string; it will always point to static
- *                   data.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_PICTURE \endcode
- * \retval FLAC__bool
- *    \c false if PICTURE block is illegal, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_picture_is_legal(const FLAC__StreamMetadata *object, const char **violation);
-
-/* \} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib-x86-32/include/FLAC/ordinals.h b/lib-x86-32/include/FLAC/ordinals.h
deleted file mode 100644
index a7a5cd96..00000000
--- a/lib-x86-32/include/FLAC/ordinals.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007  Josh Coalson
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - 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.
- *
- * - Neither the name of the Xiph.org Foundation nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * 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 FOUNDATION 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 FLAC__ORDINALS_H
-#define FLAC__ORDINALS_H
-
-#if !(defined(_MSC_VER) || defined(__BORLANDC__) || defined(__EMX__))
-#include <inttypes.h>
-#endif
-
-typedef signed char FLAC__int8;
-typedef unsigned char FLAC__uint8;
-
-#if defined(_MSC_VER) || defined(__BORLANDC__)
-typedef __int16 FLAC__int16;
-typedef __int32 FLAC__int32;
-typedef __int64 FLAC__int64;
-typedef unsigned __int16 FLAC__uint16;
-typedef unsigned __int32 FLAC__uint32;
-typedef unsigned __int64 FLAC__uint64;
-#elif defined(__EMX__)
-typedef short FLAC__int16;
-typedef long FLAC__int32;
-typedef long long FLAC__int64;
-typedef unsigned short FLAC__uint16;
-typedef unsigned long FLAC__uint32;
-typedef unsigned long long FLAC__uint64;
-#else
-typedef int16_t FLAC__int16;
-typedef int32_t FLAC__int32;
-typedef int64_t FLAC__int64;
-typedef uint16_t FLAC__uint16;
-typedef uint32_t FLAC__uint32;
-typedef uint64_t FLAC__uint64;
-#endif
-
-typedef int FLAC__bool;
-
-typedef FLAC__uint8 FLAC__byte;
-
-#ifdef true
-#undef true
-#endif
-#ifdef false
-#undef false
-#endif
-#ifndef __cplusplus
-#define true 1
-#define false 0
-#endif
-
-#endif
diff --git a/lib-x86-32/include/FLAC/stream_decoder.h b/lib-x86-32/include/FLAC/stream_decoder.h
deleted file mode 100644
index 9ac15947..00000000
--- a/lib-x86-32/include/FLAC/stream_decoder.h
+++ /dev/null
@@ -1,1559 +0,0 @@
-/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007  Josh Coalson
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - 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.
- *
- * - Neither the name of the Xiph.org Foundation nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * 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 FOUNDATION 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 FLAC__STREAM_DECODER_H
-#define FLAC__STREAM_DECODER_H
-
-#include <stdio.h> /* for FILE */
-#include "export.h"
-#include "format.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/** \file include/FLAC/stream_decoder.h
- *
- *  \brief
- *  This module contains the functions which implement the stream
- *  decoder.
- *
- *  See the detailed documentation in the
- *  \link flac_stream_decoder stream decoder \endlink module.
- */
-
-/** \defgroup flac_decoder FLAC/ \*_decoder.h: decoder interfaces
- *  \ingroup flac
- *
- *  \brief
- *  This module describes the decoder layers provided by libFLAC.
- *
- * The stream decoder can be used to decode complete streams either from
- * the client via callbacks, or directly from a file, depending on how
- * it is initialized.  When decoding via callbacks, the client provides
- * callbacks for reading FLAC data and writing decoded samples, and
- * handling metadata and errors.  If the client also supplies seek-related
- * callback, the decoder function for sample-accurate seeking within the
- * FLAC input is also available.  When decoding from a file, the client
- * needs only supply a filename or open \c FILE* and write/metadata/error
- * callbacks; the rest of the callbacks are supplied internally.  For more
- * info see the \link flac_stream_decoder stream decoder \endlink module.
- */
-
-/** \defgroup flac_stream_decoder FLAC/stream_decoder.h: stream decoder interface
- *  \ingroup flac_decoder
- *
- *  \brief
- *  This module contains the functions which implement the stream
- *  decoder.
- *
- * The stream decoder can decode native FLAC, and optionally Ogg FLAC
- * (check FLAC_API_SUPPORTS_OGG_FLAC) streams and files.
- *
- * The basic usage of this decoder is as follows:
- * - The program creates an instance of a decoder using
- *   FLAC__stream_decoder_new().
- * - The program overrides the default settings using
- *   FLAC__stream_decoder_set_*() functions.
- * - The program initializes the instance to validate the settings and
- *   prepare for decoding using
- *   - FLAC__stream_decoder_init_stream() or FLAC__stream_decoder_init_FILE()
- *     or FLAC__stream_decoder_init_file() for native FLAC,
- *   - FLAC__stream_decoder_init_ogg_stream() or FLAC__stream_decoder_init_ogg_FILE()
- *     or FLAC__stream_decoder_init_ogg_file() for Ogg FLAC
- * - The program calls the FLAC__stream_decoder_process_*() functions
- *   to decode data, which subsequently calls the callbacks.
- * - The program finishes the decoding with FLAC__stream_decoder_finish(),
- *   which flushes the input and output and resets the decoder to the
- *   uninitialized state.
- * - The instance may be used again or deleted with
- *   FLAC__stream_decoder_delete().
- *
- * In more detail, the program will create a new instance by calling
- * FLAC__stream_decoder_new(), then call FLAC__stream_decoder_set_*()
- * functions to override the default decoder options, and call
- * one of the FLAC__stream_decoder_init_*() functions.
- *
- * There are three initialization functions for native FLAC, one for
- * setting up the decoder to decode FLAC data from the client via
- * callbacks, and two for decoding directly from a FLAC file.
- *
- * For decoding via callbacks, use FLAC__stream_decoder_init_stream().
- * You must also supply several callbacks for handling I/O.  Some (like
- * seeking) are optional, depending on the capabilities of the input.
- *
- * For decoding directly from a file, use FLAC__stream_decoder_init_FILE()
- * or FLAC__stream_decoder_init_file().  Then you must only supply an open
- * \c FILE* or filename and fewer callbacks; the decoder will handle
- * the other callbacks internally.
- *
- * There are three similarly-named init functions for decoding from Ogg
- * FLAC streams.  Check \c FLAC_API_SUPPORTS_OGG_FLAC to find out if the
- * library has been built with Ogg support.
- *
- * Once the decoder is initialized, your program will call one of several
- * functions to start the decoding process:
- *
- * - FLAC__stream_decoder_process_single() - Tells the decoder to process at
- *   most one metadata block or audio frame and return, calling either the
- *   metadata callback or write callback, respectively, once.  If the decoder
- *   loses sync it will return with only the error callback being called.
- * - FLAC__stream_decoder_process_until_end_of_metadata() - Tells the decoder
- *   to process the stream from the current location and stop upon reaching
- *   the first audio frame.  The client will get one metadata, write, or error
- *   callback per metadata block, audio frame, or sync error, respectively.
- * - FLAC__stream_decoder_process_until_end_of_stream() - Tells the decoder
- *   to process the stream from the current location until the read callback
- *   returns FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM or
- *   FLAC__STREAM_DECODER_READ_STATUS_ABORT.  The client will get one metadata,
- *   write, or error callback per metadata block, audio frame, or sync error,
- *   respectively.
- *
- * When the decoder has finished decoding (normally or through an abort),
- * the instance is finished by calling FLAC__stream_decoder_finish(), which
- * ensures the decoder is in the correct state and frees memory.  Then the
- * instance may be deleted with FLAC__stream_decoder_delete() or initialized
- * again to decode another stream.
- *
- * Seeking is exposed through the FLAC__stream_decoder_seek_absolute() method.
- * At any point after the stream decoder has been initialized, the client can
- * call this function to seek to an exact sample within the stream.
- * Subsequently, the first time the write callback is called it will be
- * passed a (possibly partial) block starting at that sample.
- *
- * If the client cannot seek via the callback interface provided, but still
- * has another way of seeking, it can flush the decoder using
- * FLAC__stream_decoder_flush() and start feeding data from the new position
- * through the read callback.
- *
- * The stream decoder also provides MD5 signature checking.  If this is
- * turned on before initialization, FLAC__stream_decoder_finish() will
- * report when the decoded MD5 signature does not match the one stored
- * in the STREAMINFO block.  MD5 checking is automatically turned off
- * (until the next FLAC__stream_decoder_reset()) if there is no signature
- * in the STREAMINFO block or when a seek is attempted.
- *
- * The FLAC__stream_decoder_set_metadata_*() functions deserve special
- * attention.  By default, the decoder only calls the metadata_callback for
- * the STREAMINFO block.  These functions allow you to tell the decoder
- * explicitly which blocks to parse and return via the metadata_callback
- * and/or which to skip.  Use a FLAC__stream_decoder_set_metadata_respond_all(),
- * FLAC__stream_decoder_set_metadata_ignore() ... or FLAC__stream_decoder_set_metadata_ignore_all(),
- * FLAC__stream_decoder_set_metadata_respond() ... sequence to exactly specify
- * which blocks to return.  Remember that metadata blocks can potentially
- * be big (for example, cover art) so filtering out the ones you don't
- * use can reduce the memory requirements of the decoder.  Also note the
- * special forms FLAC__stream_decoder_set_metadata_respond_application(id)
- * and FLAC__stream_decoder_set_metadata_ignore_application(id) for
- * filtering APPLICATION blocks based on the application ID.
- *
- * STREAMINFO and SEEKTABLE blocks are always parsed and used internally, but
- * they still can legally be filtered from the metadata_callback.
- *
- * \note
- * The "set" functions may only be called when the decoder is in the
- * state FLAC__STREAM_DECODER_UNINITIALIZED, i.e. after
- * FLAC__stream_decoder_new() or FLAC__stream_decoder_finish(), but
- * before FLAC__stream_decoder_init_*().  If this is the case they will
- * return \c true, otherwise \c false.
- *
- * \note
- * FLAC__stream_decoder_finish() resets all settings to the constructor
- * defaults, including the callbacks.
- *
- * \{
- */
-
-
-/** State values for a FLAC__StreamDecoder
- *
- * The decoder's state can be obtained by calling FLAC__stream_decoder_get_state().
- */
-typedef enum {
-
-	FLAC__STREAM_DECODER_SEARCH_FOR_METADATA = 0,
-	/**< The decoder is ready to search for metadata. */
-
-	FLAC__STREAM_DECODER_READ_METADATA,
-	/**< The decoder is ready to or is in the process of reading metadata. */
-
-	FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC,
-	/**< The decoder is ready to or is in the process of searching for the
-	 * frame sync code.
-	 */
-
-	FLAC__STREAM_DECODER_READ_FRAME,
-	/**< The decoder is ready to or is in the process of reading a frame. */
-
-	FLAC__STREAM_DECODER_END_OF_STREAM,
-	/**< The decoder has reached the end of the stream. */
-
-	FLAC__STREAM_DECODER_OGG_ERROR,
-	/**< An error occurred in the underlying Ogg layer.  */
-
-	FLAC__STREAM_DECODER_SEEK_ERROR,
-	/**< An error occurred while seeking.  The decoder must be flushed
-	 * with FLAC__stream_decoder_flush() or reset with
-	 * FLAC__stream_decoder_reset() before decoding can continue.
-	 */
-
-	FLAC__STREAM_DECODER_ABORTED,
-	/**< The decoder was aborted by the read callback. */
-
-	FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR,
-	/**< An error occurred allocating memory.  The decoder is in an invalid
-	 * state and can no longer be used.
-	 */
-
-	FLAC__STREAM_DECODER_UNINITIALIZED
-	/**< The decoder is in the uninitialized state; one of the
-	 * FLAC__stream_decoder_init_*() functions must be called before samples
-	 * can be processed.
-	 */
-
-} FLAC__StreamDecoderState;
-
-/** Maps a FLAC__StreamDecoderState to a C string.
- *
- *  Using a FLAC__StreamDecoderState as the index to this array
- *  will give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__StreamDecoderStateString[];
-
-
-/** Possible return values for the FLAC__stream_decoder_init_*() functions.
- */
-typedef enum {
-
-	FLAC__STREAM_DECODER_INIT_STATUS_OK = 0,
-	/**< Initialization was successful. */
-
-	FLAC__STREAM_DECODER_INIT_STATUS_UNSUPPORTED_CONTAINER,
-	/**< The library was not compiled with support for the given container
-	 * format.
-	 */
-
-	FLAC__STREAM_DECODER_INIT_STATUS_INVALID_CALLBACKS,
-	/**< A required callback was not supplied. */
-
-	FLAC__STREAM_DECODER_INIT_STATUS_MEMORY_ALLOCATION_ERROR,
-	/**< An error occurred allocating memory. */
-
-	FLAC__STREAM_DECODER_INIT_STATUS_ERROR_OPENING_FILE,
-	/**< fopen() failed in FLAC__stream_decoder_init_file() or
-	 * FLAC__stream_decoder_init_ogg_file(). */
-
-	FLAC__STREAM_DECODER_INIT_STATUS_ALREADY_INITIALIZED
-	/**< FLAC__stream_decoder_init_*() was called when the decoder was
-	 * already initialized, usually because
-	 * FLAC__stream_decoder_finish() was not called.
-	 */
-
-} FLAC__StreamDecoderInitStatus;
-
-/** Maps a FLAC__StreamDecoderInitStatus to a C string.
- *
- *  Using a FLAC__StreamDecoderInitStatus as the index to this array
- *  will give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__StreamDecoderInitStatusString[];
-
-
-/** Return values for the FLAC__StreamDecoder read callback.
- */
-typedef enum {
-
-	FLAC__STREAM_DECODER_READ_STATUS_CONTINUE,
-	/**< The read was OK and decoding can continue. */
-
-	FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM,
-	/**< The read was attempted while at the end of the stream.  Note that
-	 * the client must only return this value when the read callback was
-	 * called when already at the end of the stream.  Otherwise, if the read
-	 * itself moves to the end of the stream, the client should still return
-	 * the data and \c FLAC__STREAM_DECODER_READ_STATUS_CONTINUE, and then on
-	 * the next read callback it should return
-	 * \c FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM with a byte count
-	 * of \c 0.
-	 */
-
-	FLAC__STREAM_DECODER_READ_STATUS_ABORT
-	/**< An unrecoverable error occurred.  The decoder will return from the process call. */
-
-} FLAC__StreamDecoderReadStatus;
-
-/** Maps a FLAC__StreamDecoderReadStatus to a C string.
- *
- *  Using a FLAC__StreamDecoderReadStatus as the index to this array
- *  will give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__StreamDecoderReadStatusString[];
-
-
-/** Return values for the FLAC__StreamDecoder seek callback.
- */
-typedef enum {
-
-	FLAC__STREAM_DECODER_SEEK_STATUS_OK,
-	/**< The seek was OK and decoding can continue. */
-
-	FLAC__STREAM_DECODER_SEEK_STATUS_ERROR,
-	/**< An unrecoverable error occurred.  The decoder will return from the process call. */
-
-	FLAC__STREAM_DECODER_SEEK_STATUS_UNSUPPORTED
-	/**< Client does not support seeking. */
-
-} FLAC__StreamDecoderSeekStatus;
-
-/** Maps a FLAC__StreamDecoderSeekStatus to a C string.
- *
- *  Using a FLAC__StreamDecoderSeekStatus as the index to this array
- *  will give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__StreamDecoderSeekStatusString[];
-
-
-/** Return values for the FLAC__StreamDecoder tell callback.
- */
-typedef enum {
-
-	FLAC__STREAM_DECODER_TELL_STATUS_OK,
-	/**< The tell was OK and decoding can continue. */
-
-	FLAC__STREAM_DECODER_TELL_STATUS_ERROR,
-	/**< An unrecoverable error occurred.  The decoder will return from the process call. */
-
-	FLAC__STREAM_DECODER_TELL_STATUS_UNSUPPORTED
-	/**< Client does not support telling the position. */
-
-} FLAC__StreamDecoderTellStatus;
-
-/** Maps a FLAC__StreamDecoderTellStatus to a C string.
- *
- *  Using a FLAC__StreamDecoderTellStatus as the index to this array
- *  will give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__StreamDecoderTellStatusString[];
-
-
-/** Return values for the FLAC__StreamDecoder length callback.
- */
-typedef enum {
-
-	FLAC__STREAM_DECODER_LENGTH_STATUS_OK,
-	/**< The length call was OK and decoding can continue. */
-
-	FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR,
-	/**< An unrecoverable error occurred.  The decoder will return from the process call. */
-
-	FLAC__STREAM_DECODER_LENGTH_STATUS_UNSUPPORTED
-	/**< Client does not support reporting the length. */
-
-} FLAC__StreamDecoderLengthStatus;
-
-/** Maps a FLAC__StreamDecoderLengthStatus to a C string.
- *
- *  Using a FLAC__StreamDecoderLengthStatus as the index to this array
- *  will give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__StreamDecoderLengthStatusString[];
-
-
-/** Return values for the FLAC__StreamDecoder write callback.
- */
-typedef enum {
-
-	FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE,
-	/**< The write was OK and decoding can continue. */
-
-	FLAC__STREAM_DECODER_WRITE_STATUS_ABORT
-	/**< An unrecoverable error occurred.  The decoder will return from the process call. */
-
-} FLAC__StreamDecoderWriteStatus;
-
-/** Maps a FLAC__StreamDecoderWriteStatus to a C string.
- *
- *  Using a FLAC__StreamDecoderWriteStatus as the index to this array
- *  will give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__StreamDecoderWriteStatusString[];
-
-
-/** Possible values passed back to the FLAC__StreamDecoder error callback.
- *  \c FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC is the generic catch-
- *  all.  The rest could be caused by bad sync (false synchronization on
- *  data that is not the start of a frame) or corrupted data.  The error
- *  itself is the decoder's best guess at what happened assuming a correct
- *  sync.  For example \c FLAC__STREAM_DECODER_ERROR_STATUS_BAD_HEADER
- *  could be caused by a correct sync on the start of a frame, but some
- *  data in the frame header was corrupted.  Or it could be the result of
- *  syncing on a point the stream that looked like the starting of a frame
- *  but was not.  \c FLAC__STREAM_DECODER_ERROR_STATUS_UNPARSEABLE_STREAM
- *  could be because the decoder encountered a valid frame made by a future
- *  version of the encoder which it cannot parse, or because of a false
- *  sync making it appear as though an encountered frame was generated by
- *  a future encoder.
- */
-typedef enum {
-
-	FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC,
-	/**< An error in the stream caused the decoder to lose synchronization. */
-
-	FLAC__STREAM_DECODER_ERROR_STATUS_BAD_HEADER,
-	/**< The decoder encountered a corrupted frame header. */
-
-	FLAC__STREAM_DECODER_ERROR_STATUS_FRAME_CRC_MISMATCH,
-	/**< The frame's data did not match the CRC in the footer. */
-
-	FLAC__STREAM_DECODER_ERROR_STATUS_UNPARSEABLE_STREAM
-	/**< The decoder encountered reserved fields in use in the stream. */
-
-} FLAC__StreamDecoderErrorStatus;
-
-/** Maps a FLAC__StreamDecoderErrorStatus to a C string.
- *
- *  Using a FLAC__StreamDecoderErrorStatus as the index to this array
- *  will give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__StreamDecoderErrorStatusString[];
-
-
-/***********************************************************************
- *
- * class FLAC__StreamDecoder
- *
- ***********************************************************************/
-
-struct FLAC__StreamDecoderProtected;
-struct FLAC__StreamDecoderPrivate;
-/** The opaque structure definition for the stream decoder type.
- *  See the \link flac_stream_decoder stream decoder module \endlink
- *  for a detailed description.
- */
-typedef struct {
-	struct FLAC__StreamDecoderProtected *protected_; /* avoid the C++ keyword 'protected' */
-	struct FLAC__StreamDecoderPrivate *private_; /* avoid the C++ keyword 'private' */
-} FLAC__StreamDecoder;
-
-/** Signature for the read callback.
- *
- *  A function pointer matching this signature must be passed to
- *  FLAC__stream_decoder_init*_stream(). The supplied function will be
- *  called when the decoder needs more input data.  The address of the
- *  buffer to be filled is supplied, along with the number of bytes the
- *  buffer can hold.  The callback may choose to supply less data and
- *  modify the byte count but must be careful not to overflow the buffer.
- *  The callback then returns a status code chosen from
- *  FLAC__StreamDecoderReadStatus.
- *
- * Here is an example of a read callback for stdio streams:
- * \code
- * FLAC__StreamDecoderReadStatus read_cb(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data)
- * {
- *   FILE *file = ((MyClientData*)client_data)->file;
- *   if(*bytes > 0) {
- *     *bytes = fread(buffer, sizeof(FLAC__byte), *bytes, file);
- *     if(ferror(file))
- *       return FLAC__STREAM_DECODER_READ_STATUS_ABORT;
- *     else if(*bytes == 0)
- *       return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
- *     else
- *       return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
- *   }
- *   else
- *     return FLAC__STREAM_DECODER_READ_STATUS_ABORT;
- * }
- * \endcode
- *
- * \note In general, FLAC__StreamDecoder functions which change the
- * state should not be called on the \a decoder while in the callback.
- *
- * \param  decoder  The decoder instance calling the callback.
- * \param  buffer   A pointer to a location for the callee to store
- *                  data to be decoded.
- * \param  bytes    A pointer to the size of the buffer.  On entry
- *                  to the callback, it contains the maximum number
- *                  of bytes that may be stored in \a buffer.  The
- *                  callee must set it to the actual number of bytes
- *                  stored (0 in case of error or end-of-stream) before
- *                  returning.
- * \param  client_data  The callee's client data set through
- *                      FLAC__stream_decoder_init_*().
- * \retval FLAC__StreamDecoderReadStatus
- *    The callee's return status.  Note that the callback should return
- *    \c FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM if and only if
- *    zero bytes were read and there is no more data to be read.
- */
-typedef FLAC__StreamDecoderReadStatus (*FLAC__StreamDecoderReadCallback)(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data);
-
-/** Signature for the seek callback.
- *
- *  A function pointer matching this signature may be passed to
- *  FLAC__stream_decoder_init*_stream().  The supplied function will be
- *  called when the decoder needs to seek the input stream.  The decoder
- *  will pass the absolute byte offset to seek to, 0 meaning the
- *  beginning of the stream.
- *
- * Here is an example of a seek callback for stdio streams:
- * \code
- * FLAC__StreamDecoderSeekStatus seek_cb(const FLAC__StreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data)
- * {
- *   FILE *file = ((MyClientData*)client_data)->file;
- *   if(file == stdin)
- *     return FLAC__STREAM_DECODER_SEEK_STATUS_UNSUPPORTED;
- *   else if(fseeko(file, (off_t)absolute_byte_offset, SEEK_SET) < 0)
- *     return FLAC__STREAM_DECODER_SEEK_STATUS_ERROR;
- *   else
- *     return FLAC__STREAM_DECODER_SEEK_STATUS_OK;
- * }
- * \endcode
- *
- * \note In general, FLAC__StreamDecoder functions which change the
- * state should not be called on the \a decoder while in the callback.
- *
- * \param  decoder  The decoder instance calling the callback.
- * \param  absolute_byte_offset  The offset from the beginning of the stream
- *                               to seek to.
- * \param  client_data  The callee's client data set through
- *                      FLAC__stream_decoder_init_*().
- * \retval FLAC__StreamDecoderSeekStatus
- *    The callee's return status.
- */
-typedef FLAC__StreamDecoderSeekStatus (*FLAC__StreamDecoderSeekCallback)(const FLAC__StreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data);
-
-/** Signature for the tell callback.
- *
- *  A function pointer matching this signature may be passed to
- *  FLAC__stream_decoder_init*_stream().  The supplied function will be
- *  called when the decoder wants to know the current position of the
- *  stream.  The callback should return the byte offset from the
- *  beginning of the stream.
- *
- * Here is an example of a tell callback for stdio streams:
- * \code
- * FLAC__StreamDecoderTellStatus tell_cb(const FLAC__StreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data)
- * {
- *   FILE *file = ((MyClientData*)client_data)->file;
- *   off_t pos;
- *   if(file == stdin)
- *     return FLAC__STREAM_DECODER_TELL_STATUS_UNSUPPORTED;
- *   else if((pos = ftello(file)) < 0)
- *     return FLAC__STREAM_DECODER_TELL_STATUS_ERROR;
- *   else {
- *     *absolute_byte_offset = (FLAC__uint64)pos;
- *     return FLAC__STREAM_DECODER_TELL_STATUS_OK;
- *   }
- * }
- * \endcode
- *
- * \note In general, FLAC__StreamDecoder functions which change the
- * state should not be called on the \a decoder while in the callback.
- *
- * \param  decoder  The decoder instance calling the callback.
- * \param  absolute_byte_offset  A pointer to storage for the current offset
- *                               from the beginning of the stream.
- * \param  client_data  The callee's client data set through
- *                      FLAC__stream_decoder_init_*().
- * \retval FLAC__StreamDecoderTellStatus
- *    The callee's return status.
- */
-typedef FLAC__StreamDecoderTellStatus (*FLAC__StreamDecoderTellCallback)(const FLAC__StreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data);
-
-/** Signature for the length callback.
- *
- *  A function pointer matching this signature may be passed to
- *  FLAC__stream_decoder_init*_stream().  The supplied function will be
- *  called when the decoder wants to know the total length of the stream
- *  in bytes.
- *
- * Here is an example of a length callback for stdio streams:
- * \code
- * FLAC__StreamDecoderLengthStatus length_cb(const FLAC__StreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data)
- * {
- *   FILE *file = ((MyClientData*)client_data)->file;
- *   struct stat filestats;
- *
- *   if(file == stdin)
- *     return FLAC__STREAM_DECODER_LENGTH_STATUS_UNSUPPORTED;
- *   else if(fstat(fileno(file), &filestats) != 0)
- *     return FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR;
- *   else {
- *     *stream_length = (FLAC__uint64)filestats.st_size;
- *     return FLAC__STREAM_DECODER_LENGTH_STATUS_OK;
- *   }
- * }
- * \endcode
- *
- * \note In general, FLAC__StreamDecoder functions which change the
- * state should not be called on the \a decoder while in the callback.
- *
- * \param  decoder  The decoder instance calling the callback.
- * \param  stream_length  A pointer to storage for the length of the stream
- *                        in bytes.
- * \param  client_data  The callee's client data set through
- *                      FLAC__stream_decoder_init_*().
- * \retval FLAC__StreamDecoderLengthStatus
- *    The callee's return status.
- */
-typedef FLAC__StreamDecoderLengthStatus (*FLAC__StreamDecoderLengthCallback)(const FLAC__StreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data);
-
-/** Signature for the EOF callback.
- *
- *  A function pointer matching this signature may be passed to
- *  FLAC__stream_decoder_init*_stream().  The supplied function will be
- *  called when the decoder needs to know if the end of the stream has
- *  been reached.
- *
- * Here is an example of a EOF callback for stdio streams:
- * FLAC__bool eof_cb(const FLAC__StreamDecoder *decoder, void *client_data)
- * \code
- * {
- *   FILE *file = ((MyClientData*)client_data)->file;
- *   return feof(file)? true : false;
- * }
- * \endcode
- *
- * \note In general, FLAC__StreamDecoder functions which change the
- * state should not be called on the \a decoder while in the callback.
- *
- * \param  decoder  The decoder instance calling the callback.
- * \param  client_data  The callee's client data set through
- *                      FLAC__stream_decoder_init_*().
- * \retval FLAC__bool
- *    \c true if the currently at the end of the stream, else \c false.
- */
-typedef FLAC__bool (*FLAC__StreamDecoderEofCallback)(const FLAC__StreamDecoder *decoder, void *client_data);
-
-/** Signature for the write callback.
- *
- *  A function pointer matching this signature must be passed to one of
- *  the FLAC__stream_decoder_init_*() functions.
- *  The supplied function will be called when the decoder has decoded a
- *  single audio frame.  The decoder will pass the frame metadata as well
- *  as an array of pointers (one for each channel) pointing to the
- *  decoded audio.
- *
- * \note In general, FLAC__StreamDecoder functions which change the
- * state should not be called on the \a decoder while in the callback.
- *
- * \param  decoder  The decoder instance calling the callback.
- * \param  frame    The description of the decoded frame.  See
- *                  FLAC__Frame.
- * \param  buffer   An array of pointers to decoded channels of data.
- *                  Each pointer will point to an array of signed
- *                  samples of length \a frame->header.blocksize.
- *                  Channels will be ordered according to the FLAC
- *                  specification; see the documentation for the
- *                  <A HREF="../format.html#frame_header">frame header</A>.
- * \param  client_data  The callee's client data set through
- *                      FLAC__stream_decoder_init_*().
- * \retval FLAC__StreamDecoderWriteStatus
- *    The callee's return status.
- */
-typedef FLAC__StreamDecoderWriteStatus (*FLAC__StreamDecoderWriteCallback)(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
-
-/** Signature for the metadata callback.
- *
- *  A function pointer matching this signature must be passed to one of
- *  the FLAC__stream_decoder_init_*() functions.
- *  The supplied function will be called when the decoder has decoded a
- *  metadata block.  In a valid FLAC file there will always be one
- *  \c STREAMINFO block, followed by zero or more other metadata blocks.
- *  These will be supplied by the decoder in the same order as they
- *  appear in the stream and always before the first audio frame (i.e.
- *  write callback).  The metadata block that is passed in must not be
- *  modified, and it doesn't live beyond the callback, so you should make
- *  a copy of it with FLAC__metadata_object_clone() if you will need it
- *  elsewhere.  Since metadata blocks can potentially be large, by
- *  default the decoder only calls the metadata callback for the
- *  \c STREAMINFO block; you can instruct the decoder to pass or filter
- *  other blocks with FLAC__stream_decoder_set_metadata_*() calls.
- *
- * \note In general, FLAC__StreamDecoder functions which change the
- * state should not be called on the \a decoder while in the callback.
- *
- * \param  decoder  The decoder instance calling the callback.
- * \param  metadata The decoded metadata block.
- * \param  client_data  The callee's client data set through
- *                      FLAC__stream_decoder_init_*().
- */
-typedef void (*FLAC__StreamDecoderMetadataCallback)(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
-
-/** Signature for the error callback.
- *
- *  A function pointer matching this signature must be passed to one of
- *  the FLAC__stream_decoder_init_*() functions.
- *  The supplied function will be called whenever an error occurs during
- *  decoding.
- *
- * \note In general, FLAC__StreamDecoder functions which change the
- * state should not be called on the \a decoder while in the callback.
- *
- * \param  decoder  The decoder instance calling the callback.
- * \param  status   The error encountered by the decoder.
- * \param  client_data  The callee's client data set through
- *                      FLAC__stream_decoder_init_*().
- */
-typedef void (*FLAC__StreamDecoderErrorCallback)(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
-
-
-/***********************************************************************
- *
- * Class constructor/destructor
- *
- ***********************************************************************/
-
-/** Create a new stream decoder instance.  The instance is created with
- *  default settings; see the individual FLAC__stream_decoder_set_*()
- *  functions for each setting's default.
- *
- * \retval FLAC__StreamDecoder*
- *    \c NULL if there was an error allocating memory, else the new instance.
- */
-FLAC_API FLAC__StreamDecoder *FLAC__stream_decoder_new(void);
-
-/** Free a decoder instance.  Deletes the object pointed to by \a decoder.
- *
- * \param decoder  A pointer to an existing decoder.
- * \assert
- *    \code decoder != NULL \endcode
- */
-FLAC_API void FLAC__stream_decoder_delete(FLAC__StreamDecoder *decoder);
-
-
-/***********************************************************************
- *
- * Public class method prototypes
- *
- ***********************************************************************/
-
-/** Set the serial number for the FLAC stream within the Ogg container.
- *  The default behavior is to use the serial number of the first Ogg
- *  page.  Setting a serial number here will explicitly specify which
- *  stream is to be decoded.
- *
- * \note
- * This does not need to be set for native FLAC decoding.
- *
- * \default \c use serial number of first page
- * \param  decoder        A decoder instance to set.
- * \param  serial_number  See above.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the decoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_decoder_set_ogg_serial_number(FLAC__StreamDecoder *decoder, long serial_number);
-
-/** Set the "MD5 signature checking" flag.  If \c true, the decoder will
- *  compute the MD5 signature of the unencoded audio data while decoding
- *  and compare it to the signature from the STREAMINFO block, if it
- *  exists, during FLAC__stream_decoder_finish().
- *
- *  MD5 signature checking will be turned off (until the next
- *  FLAC__stream_decoder_reset()) if there is no signature in the
- *  STREAMINFO block or when a seek is attempted.
- *
- *  Clients that do not use the MD5 check should leave this off to speed
- *  up decoding.
- *
- * \default \c false
- * \param  decoder  A decoder instance to set.
- * \param  value    Flag value (see above).
- * \assert
- *    \code decoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the decoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_decoder_set_md5_checking(FLAC__StreamDecoder *decoder, FLAC__bool value);
-
-/** Direct the decoder to pass on all metadata blocks of type \a type.
- *
- * \default By default, only the \c STREAMINFO block is returned via the
- *          metadata callback.
- * \param  decoder  A decoder instance to set.
- * \param  type     See above.
- * \assert
- *    \code decoder != NULL \endcode
- *    \a type is valid
- * \retval FLAC__bool
- *    \c false if the decoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_decoder_set_metadata_respond(FLAC__StreamDecoder *decoder, FLAC__MetadataType type);
-
-/** Direct the decoder to pass on all APPLICATION metadata blocks of the
- *  given \a id.
- *
- * \default By default, only the \c STREAMINFO block is returned via the
- *          metadata callback.
- * \param  decoder  A decoder instance to set.
- * \param  id       See above.
- * \assert
- *    \code decoder != NULL \endcode
- *    \code id != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the decoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_decoder_set_metadata_respond_application(FLAC__StreamDecoder *decoder, const FLAC__byte id[4]);
-
-/** Direct the decoder to pass on all metadata blocks of any type.
- *
- * \default By default, only the \c STREAMINFO block is returned via the
- *          metadata callback.
- * \param  decoder  A decoder instance to set.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the decoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_decoder_set_metadata_respond_all(FLAC__StreamDecoder *decoder);
-
-/** Direct the decoder to filter out all metadata blocks of type \a type.
- *
- * \default By default, only the \c STREAMINFO block is returned via the
- *          metadata callback.
- * \param  decoder  A decoder instance to set.
- * \param  type     See above.
- * \assert
- *    \code decoder != NULL \endcode
- *    \a type is valid
- * \retval FLAC__bool
- *    \c false if the decoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_decoder_set_metadata_ignore(FLAC__StreamDecoder *decoder, FLAC__MetadataType type);
-
-/** Direct the decoder to filter out all APPLICATION metadata blocks of
- *  the given \a id.
- *
- * \default By default, only the \c STREAMINFO block is returned via the
- *          metadata callback.
- * \param  decoder  A decoder instance to set.
- * \param  id       See above.
- * \assert
- *    \code decoder != NULL \endcode
- *    \code id != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the decoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_decoder_set_metadata_ignore_application(FLAC__StreamDecoder *decoder, const FLAC__byte id[4]);
-
-/** Direct the decoder to filter out all metadata blocks of any type.
- *
- * \default By default, only the \c STREAMINFO block is returned via the
- *          metadata callback.
- * \param  decoder  A decoder instance to set.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the decoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_decoder_set_metadata_ignore_all(FLAC__StreamDecoder *decoder);
-
-/** Get the current decoder state.
- *
- * \param  decoder  A decoder instance to query.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval FLAC__StreamDecoderState
- *    The current decoder state.
- */
-FLAC_API FLAC__StreamDecoderState FLAC__stream_decoder_get_state(const FLAC__StreamDecoder *decoder);
-
-/** Get the current decoder state as a C string.
- *
- * \param  decoder  A decoder instance to query.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval const char *
- *    The decoder state as a C string.  Do not modify the contents.
- */
-FLAC_API const char *FLAC__stream_decoder_get_resolved_state_string(const FLAC__StreamDecoder *decoder);
-
-/** Get the "MD5 signature checking" flag.
- *  This is the value of the setting, not whether or not the decoder is
- *  currently checking the MD5 (remember, it can be turned off automatically
- *  by a seek).  When the decoder is reset the flag will be restored to the
- *  value returned by this function.
- *
- * \param  decoder  A decoder instance to query.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval FLAC__bool
- *    See above.
- */
-FLAC_API FLAC__bool FLAC__stream_decoder_get_md5_checking(const FLAC__StreamDecoder *decoder);
-
-/** Get the total number of samples in the stream being decoded.
- *  Will only be valid after decoding has started and will contain the
- *  value from the \c STREAMINFO block.  A value of \c 0 means "unknown".
- *
- * \param  decoder  A decoder instance to query.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval unsigned
- *    See above.
- */
-FLAC_API FLAC__uint64 FLAC__stream_decoder_get_total_samples(const FLAC__StreamDecoder *decoder);
-
-/** Get the current number of channels in the stream being decoded.
- *  Will only be valid after decoding has started and will contain the
- *  value from the most recently decoded frame header.
- *
- * \param  decoder  A decoder instance to query.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval unsigned
- *    See above.
- */
-FLAC_API unsigned FLAC__stream_decoder_get_channels(const FLAC__StreamDecoder *decoder);
-
-/** Get the current channel assignment in the stream being decoded.
- *  Will only be valid after decoding has started and will contain the
- *  value from the most recently decoded frame header.
- *
- * \param  decoder  A decoder instance to query.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval FLAC__ChannelAssignment
- *    See above.
- */
-FLAC_API FLAC__ChannelAssignment FLAC__stream_decoder_get_channel_assignment(const FLAC__StreamDecoder *decoder);
-
-/** Get the current sample resolution in the stream being decoded.
- *  Will only be valid after decoding has started and will contain the
- *  value from the most recently decoded frame header.
- *
- * \param  decoder  A decoder instance to query.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval unsigned
- *    See above.
- */
-FLAC_API unsigned FLAC__stream_decoder_get_bits_per_sample(const FLAC__StreamDecoder *decoder);
-
-/** Get the current sample rate in Hz of the stream being decoded.
- *  Will only be valid after decoding has started and will contain the
- *  value from the most recently decoded frame header.
- *
- * \param  decoder  A decoder instance to query.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval unsigned
- *    See above.
- */
-FLAC_API unsigned FLAC__stream_decoder_get_sample_rate(const FLAC__StreamDecoder *decoder);
-
-/** Get the current blocksize of the stream being decoded.
- *  Will only be valid after decoding has started and will contain the
- *  value from the most recently decoded frame header.
- *
- * \param  decoder  A decoder instance to query.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval unsigned
- *    See above.
- */
-FLAC_API unsigned FLAC__stream_decoder_get_blocksize(const FLAC__StreamDecoder *decoder);
-
-/** Returns the decoder's current read position within the stream.
- *  The position is the byte offset from the start of the stream.
- *  Bytes before this position have been fully decoded.  Note that
- *  there may still be undecoded bytes in the decoder's read FIFO.
- *  The returned position is correct even after a seek.
- *
- *  \warning This function currently only works for native FLAC,
- *           not Ogg FLAC streams.
- *
- * \param  decoder   A decoder instance to query.
- * \param  position  Address at which to return the desired position.
- * \assert
- *    \code decoder != NULL \endcode
- *    \code position != NULL \endcode
- * \retval FLAC__bool
- *    \c true if successful, \c false if the stream is not native FLAC,
- *    or there was an error from the 'tell' callback or it returned
- *    \c FLAC__STREAM_DECODER_TELL_STATUS_UNSUPPORTED.
- */
-FLAC_API FLAC__bool FLAC__stream_decoder_get_decode_position(const FLAC__StreamDecoder *decoder, FLAC__uint64 *position);
-
-/** Initialize the decoder instance to decode native FLAC streams.
- *
- *  This flavor of initialization sets up the decoder to decode from a
- *  native FLAC stream. I/O is performed via callbacks to the client.
- *  For decoding from a plain file via filename or open FILE*,
- *  FLAC__stream_decoder_init_file() and FLAC__stream_decoder_init_FILE()
- *  provide a simpler interface.
- *
- *  This function should be called after FLAC__stream_decoder_new() and
- *  FLAC__stream_decoder_set_*() but before any of the
- *  FLAC__stream_decoder_process_*() functions.  Will set and return the
- *  decoder state, which will be FLAC__STREAM_DECODER_SEARCH_FOR_METADATA
- *  if initialization succeeded.
- *
- * \param  decoder            An uninitialized decoder instance.
- * \param  read_callback      See FLAC__StreamDecoderReadCallback.  This
- *                            pointer must not be \c NULL.
- * \param  seek_callback      See FLAC__StreamDecoderSeekCallback.  This
- *                            pointer may be \c NULL if seeking is not
- *                            supported.  If \a seek_callback is not \c NULL then a
- *                            \a tell_callback, \a length_callback, and \a eof_callback must also be supplied.
- *                            Alternatively, a dummy seek callback that just
- *                            returns \c FLAC__STREAM_DECODER_SEEK_STATUS_UNSUPPORTED
- *                            may also be supplied, all though this is slightly
- *                            less efficient for the decoder.
- * \param  tell_callback      See FLAC__StreamDecoderTellCallback.  This
- *                            pointer may be \c NULL if not supported by the client.  If
- *                            \a seek_callback is not \c NULL then a
- *                            \a tell_callback must also be supplied.
- *                            Alternatively, a dummy tell callback that just
- *                            returns \c FLAC__STREAM_DECODER_TELL_STATUS_UNSUPPORTED
- *                            may also be supplied, all though this is slightly
- *                            less efficient for the decoder.
- * \param  length_callback    See FLAC__StreamDecoderLengthCallback.  This
- *                            pointer may be \c NULL if not supported by the client.  If
- *                            \a seek_callback is not \c NULL then a
- *                            \a length_callback must also be supplied.
- *                            Alternatively, a dummy length callback that just
- *                            returns \c FLAC__STREAM_DECODER_LENGTH_STATUS_UNSUPPORTED
- *                            may also be supplied, all though this is slightly
- *                            less efficient for the decoder.
- * \param  eof_callback       See FLAC__StreamDecoderEofCallback.  This
- *                            pointer may be \c NULL if not supported by the client.  If
- *                            \a seek_callback is not \c NULL then a
- *                            \a eof_callback must also be supplied.
- *                            Alternatively, a dummy length callback that just
- *                            returns \c false
- *                            may also be supplied, all though this is slightly
- *                            less efficient for the decoder.
- * \param  write_callback     See FLAC__StreamDecoderWriteCallback.  This
- *                            pointer must not be \c NULL.
- * \param  metadata_callback  See FLAC__StreamDecoderMetadataCallback.  This
- *                            pointer may be \c NULL if the callback is not
- *                            desired.
- * \param  error_callback     See FLAC__StreamDecoderErrorCallback.  This
- *                            pointer must not be \c NULL.
- * \param  client_data        This value will be supplied to callbacks in their
- *                            \a client_data argument.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval FLAC__StreamDecoderInitStatus
- *    \c FLAC__STREAM_DECODER_INIT_STATUS_OK if initialization was successful;
- *    see FLAC__StreamDecoderInitStatus for the meanings of other return values.
- */
-FLAC_API FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_stream(
-	FLAC__StreamDecoder *decoder,
-	FLAC__StreamDecoderReadCallback read_callback,
-	FLAC__StreamDecoderSeekCallback seek_callback,
-	FLAC__StreamDecoderTellCallback tell_callback,
-	FLAC__StreamDecoderLengthCallback length_callback,
-	FLAC__StreamDecoderEofCallback eof_callback,
-	FLAC__StreamDecoderWriteCallback write_callback,
-	FLAC__StreamDecoderMetadataCallback metadata_callback,
-	FLAC__StreamDecoderErrorCallback error_callback,
-	void *client_data
-);
-
-/** Initialize the decoder instance to decode Ogg FLAC streams.
- *
- *  This flavor of initialization sets up the decoder to decode from a
- *  FLAC stream in an Ogg container. I/O is performed via callbacks to the
- *  client.  For decoding from a plain file via filename or open FILE*,
- *  FLAC__stream_decoder_init_ogg_file() and FLAC__stream_decoder_init_ogg_FILE()
- *  provide a simpler interface.
- *
- *  This function should be called after FLAC__stream_decoder_new() and
- *  FLAC__stream_decoder_set_*() but before any of the
- *  FLAC__stream_decoder_process_*() functions.  Will set and return the
- *  decoder state, which will be FLAC__STREAM_DECODER_SEARCH_FOR_METADATA
- *  if initialization succeeded.
- *
- *  \note Support for Ogg FLAC in the library is optional.  If this
- *  library has been built without support for Ogg FLAC, this function
- *  will return \c FLAC__STREAM_DECODER_INIT_STATUS_UNSUPPORTED_CONTAINER.
- *
- * \param  decoder            An uninitialized decoder instance.
- * \param  read_callback      See FLAC__StreamDecoderReadCallback.  This
- *                            pointer must not be \c NULL.
- * \param  seek_callback      See FLAC__StreamDecoderSeekCallback.  This
- *                            pointer may be \c NULL if seeking is not
- *                            supported.  If \a seek_callback is not \c NULL then a
- *                            \a tell_callback, \a length_callback, and \a eof_callback must also be supplied.
- *                            Alternatively, a dummy seek callback that just
- *                            returns \c FLAC__STREAM_DECODER_SEEK_STATUS_UNSUPPORTED
- *                            may also be supplied, all though this is slightly
- *                            less efficient for the decoder.
- * \param  tell_callback      See FLAC__StreamDecoderTellCallback.  This
- *                            pointer may be \c NULL if not supported by the client.  If
- *                            \a seek_callback is not \c NULL then a
- *                            \a tell_callback must also be supplied.
- *                            Alternatively, a dummy tell callback that just
- *                            returns \c FLAC__STREAM_DECODER_TELL_STATUS_UNSUPPORTED
- *                            may also be supplied, all though this is slightly
- *                            less efficient for the decoder.
- * \param  length_callback    See FLAC__StreamDecoderLengthCallback.  This
- *                            pointer may be \c NULL if not supported by the client.  If
- *                            \a seek_callback is not \c NULL then a
- *                            \a length_callback must also be supplied.
- *                            Alternatively, a dummy length callback that just
- *                            returns \c FLAC__STREAM_DECODER_LENGTH_STATUS_UNSUPPORTED
- *                            may also be supplied, all though this is slightly
- *                            less efficient for the decoder.
- * \param  eof_callback       See FLAC__StreamDecoderEofCallback.  This
- *                            pointer may be \c NULL if not supported by the client.  If
- *                            \a seek_callback is not \c NULL then a
- *                            \a eof_callback must also be supplied.
- *                            Alternatively, a dummy length callback that just
- *                            returns \c false
- *                            may also be supplied, all though this is slightly
- *                            less efficient for the decoder.
- * \param  write_callback     See FLAC__StreamDecoderWriteCallback.  This
- *                            pointer must not be \c NULL.
- * \param  metadata_callback  See FLAC__StreamDecoderMetadataCallback.  This
- *                            pointer may be \c NULL if the callback is not
- *                            desired.
- * \param  error_callback     See FLAC__StreamDecoderErrorCallback.  This
- *                            pointer must not be \c NULL.
- * \param  client_data        This value will be supplied to callbacks in their
- *                            \a client_data argument.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval FLAC__StreamDecoderInitStatus
- *    \c FLAC__STREAM_DECODER_INIT_STATUS_OK if initialization was successful;
- *    see FLAC__StreamDecoderInitStatus for the meanings of other return values.
- */
-FLAC_API FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_ogg_stream(
-	FLAC__StreamDecoder *decoder,
-	FLAC__StreamDecoderReadCallback read_callback,
-	FLAC__StreamDecoderSeekCallback seek_callback,
-	FLAC__StreamDecoderTellCallback tell_callback,
-	FLAC__StreamDecoderLengthCallback length_callback,
-	FLAC__StreamDecoderEofCallback eof_callback,
-	FLAC__StreamDecoderWriteCallback write_callback,
-	FLAC__StreamDecoderMetadataCallback metadata_callback,
-	FLAC__StreamDecoderErrorCallback error_callback,
-	void *client_data
-);
-
-/** Initialize the decoder instance to decode native FLAC files.
- *
- *  This flavor of initialization sets up the decoder to decode from a
- *  plain native FLAC file.  For non-stdio streams, you must use
- *  FLAC__stream_decoder_init_stream() and provide callbacks for the I/O.
- *
- *  This function should be called after FLAC__stream_decoder_new() and
- *  FLAC__stream_decoder_set_*() but before any of the
- *  FLAC__stream_decoder_process_*() functions.  Will set and return the
- *  decoder state, which will be FLAC__STREAM_DECODER_SEARCH_FOR_METADATA
- *  if initialization succeeded.
- *
- * \param  decoder            An uninitialized decoder instance.
- * \param  file               An open FLAC file.  The file should have been
- *                            opened with mode \c "rb" and rewound.  The file
- *                            becomes owned by the decoder and should not be
- *                            manipulated by the client while decoding.
- *                            Unless \a file is \c stdin, it will be closed
- *                            when FLAC__stream_decoder_finish() is called.
- *                            Note however that seeking will not work when
- *                            decoding from \c stdout since it is not seekable.
- * \param  write_callback     See FLAC__StreamDecoderWriteCallback.  This
- *                            pointer must not be \c NULL.
- * \param  metadata_callback  See FLAC__StreamDecoderMetadataCallback.  This
- *                            pointer may be \c NULL if the callback is not
- *                            desired.
- * \param  error_callback     See FLAC__StreamDecoderErrorCallback.  This
- *                            pointer must not be \c NULL.
- * \param  client_data        This value will be supplied to callbacks in their
- *                            \a client_data argument.
- * \assert
- *    \code decoder != NULL \endcode
- *    \code file != NULL \endcode
- * \retval FLAC__StreamDecoderInitStatus
- *    \c FLAC__STREAM_DECODER_INIT_STATUS_OK if initialization was successful;
- *    see FLAC__StreamDecoderInitStatus for the meanings of other return values.
- */
-FLAC_API FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_FILE(
-	FLAC__StreamDecoder *decoder,
-	FILE *file,
-	FLAC__StreamDecoderWriteCallback write_callback,
-	FLAC__StreamDecoderMetadataCallback metadata_callback,
-	FLAC__StreamDecoderErrorCallback error_callback,
-	void *client_data
-);
-
-/** Initialize the decoder instance to decode Ogg FLAC files.
- *
- *  This flavor of initialization sets up the decoder to decode from a
- *  plain Ogg FLAC file.  For non-stdio streams, you must use
- *  FLAC__stream_decoder_init_ogg_stream() and provide callbacks for the I/O.
- *
- *  This function should be called after FLAC__stream_decoder_new() and
- *  FLAC__stream_decoder_set_*() but before any of the
- *  FLAC__stream_decoder_process_*() functions.  Will set and return the
- *  decoder state, which will be FLAC__STREAM_DECODER_SEARCH_FOR_METADATA
- *  if initialization succeeded.
- *
- *  \note Support for Ogg FLAC in the library is optional.  If this
- *  library has been built without support for Ogg FLAC, this function
- *  will return \c FLAC__STREAM_DECODER_INIT_STATUS_UNSUPPORTED_CONTAINER.
- *
- * \param  decoder            An uninitialized decoder instance.
- * \param  file               An open FLAC file.  The file should have been
- *                            opened with mode \c "rb" and rewound.  The file
- *                            becomes owned by the decoder and should not be
- *                            manipulated by the client while decoding.
- *                            Unless \a file is \c stdin, it will be closed
- *                            when FLAC__stream_decoder_finish() is called.
- *                            Note however that seeking will not work when
- *                            decoding from \c stdout since it is not seekable.
- * \param  write_callback     See FLAC__StreamDecoderWriteCallback.  This
- *                            pointer must not be \c NULL.
- * \param  metadata_callback  See FLAC__StreamDecoderMetadataCallback.  This
- *                            pointer may be \c NULL if the callback is not
- *                            desired.
- * \param  error_callback     See FLAC__StreamDecoderErrorCallback.  This
- *                            pointer must not be \c NULL.
- * \param  client_data        This value will be supplied to callbacks in their
- *                            \a client_data argument.
- * \assert
- *    \code decoder != NULL \endcode
- *    \code file != NULL \endcode
- * \retval FLAC__StreamDecoderInitStatus
- *    \c FLAC__STREAM_DECODER_INIT_STATUS_OK if initialization was successful;
- *    see FLAC__StreamDecoderInitStatus for the meanings of other return values.
- */
-FLAC_API FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_ogg_FILE(
-	FLAC__StreamDecoder *decoder,
-	FILE *file,
-	FLAC__StreamDecoderWriteCallback write_callback,
-	FLAC__StreamDecoderMetadataCallback metadata_callback,
-	FLAC__StreamDecoderErrorCallback error_callback,
-	void *client_data
-);
-
-/** Initialize the decoder instance to decode native FLAC files.
- *
- *  This flavor of initialization sets up the decoder to decode from a plain
- *  native FLAC file.  If POSIX fopen() semantics are not sufficient, (for
- *  example, with Unicode filenames on Windows), you must use
- *  FLAC__stream_decoder_init_FILE(), or FLAC__stream_decoder_init_stream()
- *  and provide callbacks for the I/O.
- *
- *  This function should be called after FLAC__stream_decoder_new() and
- *  FLAC__stream_decoder_set_*() but before any of the
- *  FLAC__stream_decoder_process_*() functions.  Will set and return the
- *  decoder state, which will be FLAC__STREAM_DECODER_SEARCH_FOR_METADATA
- *  if initialization succeeded.
- *
- * \param  decoder            An uninitialized decoder instance.
- * \param  filename           The name of the file to decode from.  The file will
- *                            be opened with fopen().  Use \c NULL to decode from
- *                            \c stdin.  Note that \c stdin is not seekable.
- * \param  write_callback     See FLAC__StreamDecoderWriteCallback.  This
- *                            pointer must not be \c NULL.
- * \param  metadata_callback  See FLAC__StreamDecoderMetadataCallback.  This
- *                            pointer may be \c NULL if the callback is not
- *                            desired.
- * \param  error_callback     See FLAC__StreamDecoderErrorCallback.  This
- *                            pointer must not be \c NULL.
- * \param  client_data        This value will be supplied to callbacks in their
- *                            \a client_data argument.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval FLAC__StreamDecoderInitStatus
- *    \c FLAC__STREAM_DECODER_INIT_STATUS_OK if initialization was successful;
- *    see FLAC__StreamDecoderInitStatus for the meanings of other return values.
- */
-FLAC_API FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_file(
-	FLAC__StreamDecoder *decoder,
-	const char *filename,
-	FLAC__StreamDecoderWriteCallback write_callback,
-	FLAC__StreamDecoderMetadataCallback metadata_callback,
-	FLAC__StreamDecoderErrorCallback error_callback,
-	void *client_data
-);
-
-/** Initialize the decoder instance to decode Ogg FLAC files.
- *
- *  This flavor of initialization sets up the decoder to decode from a plain
- *  Ogg FLAC file.  If POSIX fopen() semantics are not sufficient, (for
- *  example, with Unicode filenames on Windows), you must use
- *  FLAC__stream_decoder_init_ogg_FILE(), or FLAC__stream_decoder_init_ogg_stream()
- *  and provide callbacks for the I/O.
- *
- *  This function should be called after FLAC__stream_decoder_new() and
- *  FLAC__stream_decoder_set_*() but before any of the
- *  FLAC__stream_decoder_process_*() functions.  Will set and return the
- *  decoder state, which will be FLAC__STREAM_DECODER_SEARCH_FOR_METADATA
- *  if initialization succeeded.
- *
- *  \note Support for Ogg FLAC in the library is optional.  If this
- *  library has been built without support for Ogg FLAC, this function
- *  will return \c FLAC__STREAM_DECODER_INIT_STATUS_UNSUPPORTED_CONTAINER.
- *
- * \param  decoder            An uninitialized decoder instance.
- * \param  filename           The name of the file to decode from.  The file will
- *                            be opened with fopen().  Use \c NULL to decode from
- *                            \c stdin.  Note that \c stdin is not seekable.
- * \param  write_callback     See FLAC__StreamDecoderWriteCallback.  This
- *                            pointer must not be \c NULL.
- * \param  metadata_callback  See FLAC__StreamDecoderMetadataCallback.  This
- *                            pointer may be \c NULL if the callback is not
- *                            desired.
- * \param  error_callback     See FLAC__StreamDecoderErrorCallback.  This
- *                            pointer must not be \c NULL.
- * \param  client_data        This value will be supplied to callbacks in their
- *                            \a client_data argument.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval FLAC__StreamDecoderInitStatus
- *    \c FLAC__STREAM_DECODER_INIT_STATUS_OK if initialization was successful;
- *    see FLAC__StreamDecoderInitStatus for the meanings of other return values.
- */
-FLAC_API FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_ogg_file(
-	FLAC__StreamDecoder *decoder,
-	const char *filename,
-	FLAC__StreamDecoderWriteCallback write_callback,
-	FLAC__StreamDecoderMetadataCallback metadata_callback,
-	FLAC__StreamDecoderErrorCallback error_callback,
-	void *client_data
-);
-
-/** Finish the decoding process.
- *  Flushes the decoding buffer, releases resources, resets the decoder
- *  settings to their defaults, and returns the decoder state to
- *  FLAC__STREAM_DECODER_UNINITIALIZED.
- *
- *  In the event of a prematurely-terminated decode, it is not strictly
- *  necessary to call this immediately before FLAC__stream_decoder_delete()
- *  but it is good practice to match every FLAC__stream_decoder_init_*()
- *  with a FLAC__stream_decoder_finish().
- *
- * \param  decoder  An uninitialized decoder instance.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if MD5 checking is on AND a STREAMINFO block was available
- *    AND the MD5 signature in the STREAMINFO block was non-zero AND the
- *    signature does not match the one computed by the decoder; else
- *    \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_decoder_finish(FLAC__StreamDecoder *decoder);
-
-/** Flush the stream input.
- *  The decoder's input buffer will be cleared and the state set to
- *  \c FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC.  This will also turn
- *  off MD5 checking.
- *
- * \param  decoder  A decoder instance.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval FLAC__bool
- *    \c true if successful, else \c false if a memory allocation
- *    error occurs (in which case the state will be set to
- *    \c FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR).
- */
-FLAC_API FLAC__bool FLAC__stream_decoder_flush(FLAC__StreamDecoder *decoder);
-
-/** Reset the decoding process.
- *  The decoder's input buffer will be cleared and the state set to
- *  \c FLAC__STREAM_DECODER_SEARCH_FOR_METADATA.  This is similar to
- *  FLAC__stream_decoder_finish() except that the settings are
- *  preserved; there is no need to call FLAC__stream_decoder_init_*()
- *  before decoding again.  MD5 checking will be restored to its original
- *  setting.
- *
- *  If the decoder is seekable, or was initialized with
- *  FLAC__stream_decoder_init*_FILE() or FLAC__stream_decoder_init*_file(),
- *  the decoder will also attempt to seek to the beginning of the file.
- *  If this rewind fails, this function will return \c false.  It follows
- *  that FLAC__stream_decoder_reset() cannot be used when decoding from
- *  \c stdin.
- *
- *  If the decoder was initialized with FLAC__stream_encoder_init*_stream()
- *  and is not seekable (i.e. no seek callback was provided or the seek
- *  callback returns \c FLAC__STREAM_DECODER_SEEK_STATUS_UNSUPPORTED), it
- *  is the duty of the client to start feeding data from the beginning of
- *  the stream on the next FLAC__stream_decoder_process() or
- *  FLAC__stream_decoder_process_interleaved() call.
- *
- * \param  decoder  A decoder instance.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval FLAC__bool
- *    \c true if successful, else \c false if a memory allocation occurs
- *    (in which case the state will be set to
- *    \c FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR) or a seek error
- *    occurs (the state will be unchanged).
- */
-FLAC_API FLAC__bool FLAC__stream_decoder_reset(FLAC__StreamDecoder *decoder);
-
-/** Decode one metadata block or audio frame.
- *  This version instructs the decoder to decode a either a single metadata
- *  block or a single frame and stop, unless the callbacks return a fatal
- *  error or the read callback returns
- *  \c FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM.
- *
- *  As the decoder needs more input it will call the read callback.
- *  Depending on what was decoded, the metadata or write callback will be
- *  called with the decoded metadata block or audio frame.
- *
- *  Unless there is a fatal read error or end of stream, this function
- *  will return once one whole frame is decoded.  In other words, if the
- *  stream is not synchronized or points to a corrupt frame header, the
- *  decoder will continue to try and resync until it gets to a valid
- *  frame, then decode one frame, then return.  If the decoder points to
- *  a frame whose frame CRC in the frame footer does not match the
- *  computed frame CRC, this function will issue a
- *  FLAC__STREAM_DECODER_ERROR_STATUS_FRAME_CRC_MISMATCH error to the
- *  error callback, and return, having decoded one complete, although
- *  corrupt, frame.  (Such corrupted frames are sent as silence of the
- *  correct length to the write callback.)
- *
- * \param  decoder  An initialized decoder instance.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if any fatal read, write, or memory allocation error
- *    occurred (meaning decoding must stop), else \c true; for more
- *    information about the decoder, check the decoder state with
- *    FLAC__stream_decoder_get_state().
- */
-FLAC_API FLAC__bool FLAC__stream_decoder_process_single(FLAC__StreamDecoder *decoder);
-
-/** Decode until the end of the metadata.
- *  This version instructs the decoder to decode from the current position
- *  and continue until all the metadata has been read, or until the
- *  callbacks return a fatal error or the read callback returns
- *  \c FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM.
- *
- *  As the decoder needs more input it will call the read callback.
- *  As each metadata block is decoded, the metadata callback will be called
- *  with the decoded metadata.
- *
- * \param  decoder  An initialized decoder instance.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if any fatal read, write, or memory allocation error
- *    occurred (meaning decoding must stop), else \c true; for more
- *    information about the decoder, check the decoder state with
- *    FLAC__stream_decoder_get_state().
- */
-FLAC_API FLAC__bool FLAC__stream_decoder_process_until_end_of_metadata(FLAC__StreamDecoder *decoder);
-
-/** Decode until the end of the stream.
- *  This version instructs the decoder to decode from the current position
- *  and continue until the end of stream (the read callback returns
- *  \c FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM), or until the
- *  callbacks return a fatal error.
- *
- *  As the decoder needs more input it will call the read callback.
- *  As each metadata block and frame is decoded, the metadata or write
- *  callback will be called with the decoded metadata or frame.
- *
- * \param  decoder  An initialized decoder instance.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if any fatal read, write, or memory allocation error
- *    occurred (meaning decoding must stop), else \c true; for more
- *    information about the decoder, check the decoder state with
- *    FLAC__stream_decoder_get_state().
- */
-FLAC_API FLAC__bool FLAC__stream_decoder_process_until_end_of_stream(FLAC__StreamDecoder *decoder);
-
-/** Skip one audio frame.
- *  This version instructs the decoder to 'skip' a single frame and stop,
- *  unless the callbacks return a fatal error or the read callback returns
- *  \c FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM.
- *
- *  The decoding flow is the same as what occurs when
- *  FLAC__stream_decoder_process_single() is called to process an audio
- *  frame, except that this function does not decode the parsed data into
- *  PCM or call the write callback.  The integrity of the frame is still
- *  checked the same way as in the other process functions.
- *
- *  This function will return once one whole frame is skipped, in the
- *  same way that FLAC__stream_decoder_process_single() will return once
- *  one whole frame is decoded.
- *
- *  This function can be used in more quickly determining FLAC frame
- *  boundaries when decoding of the actual data is not needed, for
- *  example when an application is separating a FLAC stream into frames
- *  for editing or storing in a container.  To do this, the application
- *  can use FLAC__stream_decoder_skip_single_frame() to quickly advance
- *  to the next frame, then use
- *  FLAC__stream_decoder_get_decode_position() to find the new frame
- *  boundary.
- *
- *  This function should only be called when the stream has advanced
- *  past all the metadata, otherwise it will return \c false.
- *
- * \param  decoder  An initialized decoder instance not in a metadata
- *                  state.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if any fatal read, write, or memory allocation error
- *    occurred (meaning decoding must stop), or if the decoder
- *    is in the FLAC__STREAM_DECODER_SEARCH_FOR_METADATA or
- *    FLAC__STREAM_DECODER_READ_METADATA state, else \c true; for more
- *    information about the decoder, check the decoder state with
- *    FLAC__stream_decoder_get_state().
- */
-FLAC_API FLAC__bool FLAC__stream_decoder_skip_single_frame(FLAC__StreamDecoder *decoder);
-
-/** Flush the input and seek to an absolute sample.
- *  Decoding will resume at the given sample.  Note that because of
- *  this, the next write callback may contain a partial block.  The
- *  client must support seeking the input or this function will fail
- *  and return \c false.  Furthermore, if the decoder state is
- *  \c FLAC__STREAM_DECODER_SEEK_ERROR, then the decoder must be flushed
- *  with FLAC__stream_decoder_flush() or reset with
- *  FLAC__stream_decoder_reset() before decoding can continue.
- *
- * \param  decoder  A decoder instance.
- * \param  sample   The target sample number to seek to.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval FLAC__bool
- *    \c true if successful, else \c false.
- */
-FLAC_API FLAC__bool FLAC__stream_decoder_seek_absolute(FLAC__StreamDecoder *decoder, FLAC__uint64 sample);
-
-/* \} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib-x86-32/include/FLAC/stream_encoder.h b/lib-x86-32/include/FLAC/stream_encoder.h
deleted file mode 100644
index dbbbb23e..00000000
--- a/lib-x86-32/include/FLAC/stream_encoder.h
+++ /dev/null
@@ -1,1768 +0,0 @@
-/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007  Josh Coalson
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - 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.
- *
- * - Neither the name of the Xiph.org Foundation nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * 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 FOUNDATION 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 FLAC__STREAM_ENCODER_H
-#define FLAC__STREAM_ENCODER_H
-
-#include <stdio.h> /* for FILE */
-#include "export.h"
-#include "format.h"
-#include "stream_decoder.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/** \file include/FLAC/stream_encoder.h
- *
- *  \brief
- *  This module contains the functions which implement the stream
- *  encoder.
- *
- *  See the detailed documentation in the
- *  \link flac_stream_encoder stream encoder \endlink module.
- */
-
-/** \defgroup flac_encoder FLAC/ \*_encoder.h: encoder interfaces
- *  \ingroup flac
- *
- *  \brief
- *  This module describes the encoder layers provided by libFLAC.
- *
- * The stream encoder can be used to encode complete streams either to the
- * client via callbacks, or directly to a file, depending on how it is
- * initialized.  When encoding via callbacks, the client provides a write
- * callback which will be called whenever FLAC data is ready to be written.
- * If the client also supplies a seek callback, the encoder will also
- * automatically handle the writing back of metadata discovered while
- * encoding, like stream info, seek points offsets, etc.  When encoding to
- * a file, the client needs only supply a filename or open \c FILE* and an
- * optional progress callback for periodic notification of progress; the
- * write and seek callbacks are supplied internally.  For more info see the
- * \link flac_stream_encoder stream encoder \endlink module.
- */
-
-/** \defgroup flac_stream_encoder FLAC/stream_encoder.h: stream encoder interface
- *  \ingroup flac_encoder
- *
- *  \brief
- *  This module contains the functions which implement the stream
- *  encoder.
- *
- * The stream encoder can encode to native FLAC, and optionally Ogg FLAC
- * (check FLAC_API_SUPPORTS_OGG_FLAC) streams and files.
- *
- * The basic usage of this encoder is as follows:
- * - The program creates an instance of an encoder using
- *   FLAC__stream_encoder_new().
- * - The program overrides the default settings using
- *   FLAC__stream_encoder_set_*() functions.  At a minimum, the following
- *   functions should be called:
- *   - FLAC__stream_encoder_set_channels()
- *   - FLAC__stream_encoder_set_bits_per_sample()
- *   - FLAC__stream_encoder_set_sample_rate()
- *   - FLAC__stream_encoder_set_ogg_serial_number() (if encoding to Ogg FLAC)
- *   - FLAC__stream_encoder_set_total_samples_estimate() (if known)
- * - If the application wants to control the compression level or set its own
- *   metadata, then the following should also be called:
- *   - FLAC__stream_encoder_set_compression_level()
- *   - FLAC__stream_encoder_set_verify()
- *   - FLAC__stream_encoder_set_metadata()
- * - The rest of the set functions should only be called if the client needs
- *   exact control over how the audio is compressed; thorough understanding
- *   of the FLAC format is necessary to achieve good results.
- * - The program initializes the instance to validate the settings and
- *   prepare for encoding using
- *   - FLAC__stream_encoder_init_stream() or FLAC__stream_encoder_init_FILE()
- *     or FLAC__stream_encoder_init_file() for native FLAC
- *   - FLAC__stream_encoder_init_ogg_stream() or FLAC__stream_encoder_init_ogg_FILE()
- *     or FLAC__stream_encoder_init_ogg_file() for Ogg FLAC
- * - The program calls FLAC__stream_encoder_process() or
- *   FLAC__stream_encoder_process_interleaved() to encode data, which
- *   subsequently calls the callbacks when there is encoder data ready
- *   to be written.
- * - The program finishes the encoding with FLAC__stream_encoder_finish(),
- *   which causes the encoder to encode any data still in its input pipe,
- *   update the metadata with the final encoding statistics if output
- *   seeking is possible, and finally reset the encoder to the
- *   uninitialized state.
- * - The instance may be used again or deleted with
- *   FLAC__stream_encoder_delete().
- *
- * In more detail, the stream encoder functions similarly to the
- * \link flac_stream_decoder stream decoder \endlink, but has fewer
- * callbacks and more options.  Typically the client will create a new
- * instance by calling FLAC__stream_encoder_new(), then set the necessary
- * parameters with FLAC__stream_encoder_set_*(), and initialize it by
- * calling one of the FLAC__stream_encoder_init_*() functions.
- *
- * Unlike the decoders, the stream encoder has many options that can
- * affect the speed and compression ratio.  When setting these parameters
- * you should have some basic knowledge of the format (see the
- * <A HREF="../documentation.html#format">user-level documentation</A>
- * or the <A HREF="../format.html">formal description</A>).  The
- * FLAC__stream_encoder_set_*() functions themselves do not validate the
- * values as many are interdependent.  The FLAC__stream_encoder_init_*()
- * functions will do this, so make sure to pay attention to the state
- * returned by FLAC__stream_encoder_init_*() to make sure that it is
- * FLAC__STREAM_ENCODER_INIT_STATUS_OK.  Any parameters that are not set
- * before FLAC__stream_encoder_init_*() will take on the defaults from
- * the constructor.
- *
- * There are three initialization functions for native FLAC, one for
- * setting up the encoder to encode FLAC data to the client via
- * callbacks, and two for encoding directly to a file.
- *
- * For encoding via callbacks, use FLAC__stream_encoder_init_stream().
- * You must also supply a write callback which will be called anytime
- * there is raw encoded data to write.  If the client can seek the output
- * it is best to also supply seek and tell callbacks, as this allows the
- * encoder to go back after encoding is finished to write back
- * information that was collected while encoding, like seek point offsets,
- * frame sizes, etc.
- *
- * For encoding directly to a file, use FLAC__stream_encoder_init_FILE()
- * or FLAC__stream_encoder_init_file().  Then you must only supply a
- * filename or open \c FILE*; the encoder will handle all the callbacks
- * internally.  You may also supply a progress callback for periodic
- * notification of the encoding progress.
- *
- * There are three similarly-named init functions for encoding to Ogg
- * FLAC streams.  Check \c FLAC_API_SUPPORTS_OGG_FLAC to find out if the
- * library has been built with Ogg support.
- *
- * The call to FLAC__stream_encoder_init_*() currently will also immediately
- * call the write callback several times, once with the \c fLaC signature,
- * and once for each encoded metadata block.  Note that for Ogg FLAC
- * encoding you will usually get at least twice the number of callbacks than
- * with native FLAC, one for the Ogg page header and one for the page body.
- *
- * After initializing the instance, the client may feed audio data to the
- * encoder in one of two ways:
- *
- * - Channel separate, through FLAC__stream_encoder_process() - The client
- *   will pass an array of pointers to buffers, one for each channel, to
- *   the encoder, each of the same length.  The samples need not be
- *   block-aligned, but each channel should have the same number of samples.
- * - Channel interleaved, through
- *   FLAC__stream_encoder_process_interleaved() - The client will pass a single
- *   pointer to data that is channel-interleaved (i.e. channel0_sample0,
- *   channel1_sample0, ... , channelN_sample0, channel0_sample1, ...).
- *   Again, the samples need not be block-aligned but they must be
- *   sample-aligned, i.e. the first value should be channel0_sample0 and
- *   the last value channelN_sampleM.
- *
- * Note that for either process call, each sample in the buffers should be a
- * signed integer, right-justified to the resolution set by
- * FLAC__stream_encoder_set_bits_per_sample().  For example, if the resolution
- * is 16 bits per sample, the samples should all be in the range [-32768,32767].
- *
- * When the client is finished encoding data, it calls
- * FLAC__stream_encoder_finish(), which causes the encoder to encode any
- * data still in its input pipe, and call the metadata callback with the
- * final encoding statistics.  Then the instance may be deleted with
- * FLAC__stream_encoder_delete() or initialized again to encode another
- * stream.
- *
- * For programs that write their own metadata, but that do not know the
- * actual metadata until after encoding, it is advantageous to instruct
- * the encoder to write a PADDING block of the correct size, so that
- * instead of rewriting the whole stream after encoding, the program can
- * just overwrite the PADDING block.  If only the maximum size of the
- * metadata is known, the program can write a slightly larger padding
- * block, then split it after encoding.
- *
- * Make sure you understand how lengths are calculated.  All FLAC metadata
- * blocks have a 4 byte header which contains the type and length.  This
- * length does not include the 4 bytes of the header.  See the format page
- * for the specification of metadata blocks and their lengths.
- *
- * \note
- * If you are writing the FLAC data to a file via callbacks, make sure it
- * is open for update (e.g. mode "w+" for stdio streams).  This is because
- * after the first encoding pass, the encoder will try to seek back to the
- * beginning of the stream, to the STREAMINFO block, to write some data
- * there.  (If using FLAC__stream_encoder_init*_file() or
- * FLAC__stream_encoder_init*_FILE(), the file is managed internally.)
- *
- * \note
- * The "set" functions may only be called when the encoder is in the
- * state FLAC__STREAM_ENCODER_UNINITIALIZED, i.e. after
- * FLAC__stream_encoder_new() or FLAC__stream_encoder_finish(), but
- * before FLAC__stream_encoder_init_*().  If this is the case they will
- * return \c true, otherwise \c false.
- *
- * \note
- * FLAC__stream_encoder_finish() resets all settings to the constructor
- * defaults.
- *
- * \{
- */
-
-
-/** State values for a FLAC__StreamEncoder.
- *
- * The encoder's state can be obtained by calling FLAC__stream_encoder_get_state().
- *
- * If the encoder gets into any other state besides \c FLAC__STREAM_ENCODER_OK
- * or \c FLAC__STREAM_ENCODER_UNINITIALIZED, it becomes invalid for encoding and
- * must be deleted with FLAC__stream_encoder_delete().
- */
-typedef enum {
-
-	FLAC__STREAM_ENCODER_OK = 0,
-	/**< The encoder is in the normal OK state and samples can be processed. */
-
-	FLAC__STREAM_ENCODER_UNINITIALIZED,
-	/**< The encoder is in the uninitialized state; one of the
-	 * FLAC__stream_encoder_init_*() functions must be called before samples
-	 * can be processed.
-	 */
-
-	FLAC__STREAM_ENCODER_OGG_ERROR,
-	/**< An error occurred in the underlying Ogg layer.  */
-
-	FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR,
-	/**< An error occurred in the underlying verify stream decoder;
-	 * check FLAC__stream_encoder_get_verify_decoder_state().
-	 */
-
-	FLAC__STREAM_ENCODER_VERIFY_MISMATCH_IN_AUDIO_DATA,
-	/**< The verify decoder detected a mismatch between the original
-	 * audio signal and the decoded audio signal.
-	 */
-
-	FLAC__STREAM_ENCODER_CLIENT_ERROR,
-	/**< One of the callbacks returned a fatal error. */
-
-	FLAC__STREAM_ENCODER_IO_ERROR,
-	/**< An I/O error occurred while opening/reading/writing a file.
-	 * Check \c errno.
-	 */
-
-	FLAC__STREAM_ENCODER_FRAMING_ERROR,
-	/**< An error occurred while writing the stream; usually, the
-	 * write_callback returned an error.
-	 */
-
-	FLAC__STREAM_ENCODER_MEMORY_ALLOCATION_ERROR
-	/**< Memory allocation failed. */
-
-} FLAC__StreamEncoderState;
-
-/** Maps a FLAC__StreamEncoderState to a C string.
- *
- *  Using a FLAC__StreamEncoderState as the index to this array
- *  will give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__StreamEncoderStateString[];
-
-
-/** Possible return values for the FLAC__stream_encoder_init_*() functions.
- */
-typedef enum {
-
-	FLAC__STREAM_ENCODER_INIT_STATUS_OK = 0,
-	/**< Initialization was successful. */
-
-	FLAC__STREAM_ENCODER_INIT_STATUS_ENCODER_ERROR,
-	/**< General failure to set up encoder; call FLAC__stream_encoder_get_state() for cause. */
-
-	FLAC__STREAM_ENCODER_INIT_STATUS_UNSUPPORTED_CONTAINER,
-	/**< The library was not compiled with support for the given container
-	 * format.
-	 */
-
-	FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_CALLBACKS,
-	/**< A required callback was not supplied. */
-
-	FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_NUMBER_OF_CHANNELS,
-	/**< The encoder has an invalid setting for number of channels. */
-
-	FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_BITS_PER_SAMPLE,
-	/**< The encoder has an invalid setting for bits-per-sample.
-	 * FLAC supports 4-32 bps but the reference encoder currently supports
-	 * only up to 24 bps.
-	 */
-
-	FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_SAMPLE_RATE,
-	/**< The encoder has an invalid setting for the input sample rate. */
-
-	FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_BLOCK_SIZE,
-	/**< The encoder has an invalid setting for the block size. */
-
-	FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_MAX_LPC_ORDER,
-	/**< The encoder has an invalid setting for the maximum LPC order. */
-
-	FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_QLP_COEFF_PRECISION,
-	/**< The encoder has an invalid setting for the precision of the quantized linear predictor coefficients. */
-
-	FLAC__STREAM_ENCODER_INIT_STATUS_BLOCK_SIZE_TOO_SMALL_FOR_LPC_ORDER,
-	/**< The specified block size is less than the maximum LPC order. */
-
-	FLAC__STREAM_ENCODER_INIT_STATUS_NOT_STREAMABLE,
-	/**< The encoder is bound to the <A HREF="../format.html#subset">Subset</A> but other settings violate it. */
-
-	FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_METADATA,
-	/**< The metadata input to the encoder is invalid, in one of the following ways:
-	 * - FLAC__stream_encoder_set_metadata() was called with a null pointer but a block count > 0
-	 * - One of the metadata blocks contains an undefined type
-	 * - It contains an illegal CUESHEET as checked by FLAC__format_cuesheet_is_legal()
-	 * - It contains an illegal SEEKTABLE as checked by FLAC__format_seektable_is_legal()
-	 * - It contains more than one SEEKTABLE block or more than one VORBIS_COMMENT block
-	 */
-
-	FLAC__STREAM_ENCODER_INIT_STATUS_ALREADY_INITIALIZED
-	/**< FLAC__stream_encoder_init_*() was called when the encoder was
-	 * already initialized, usually because
-	 * FLAC__stream_encoder_finish() was not called.
-	 */
-
-} FLAC__StreamEncoderInitStatus;
-
-/** Maps a FLAC__StreamEncoderInitStatus to a C string.
- *
- *  Using a FLAC__StreamEncoderInitStatus as the index to this array
- *  will give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__StreamEncoderInitStatusString[];
-
-
-/** Return values for the FLAC__StreamEncoder read callback.
- */
-typedef enum {
-
-	FLAC__STREAM_ENCODER_READ_STATUS_CONTINUE,
-	/**< The read was OK and decoding can continue. */
-
-	FLAC__STREAM_ENCODER_READ_STATUS_END_OF_STREAM,
-	/**< The read was attempted at the end of the stream. */
-
-	FLAC__STREAM_ENCODER_READ_STATUS_ABORT,
-	/**< An unrecoverable error occurred. */
-
-	FLAC__STREAM_ENCODER_READ_STATUS_UNSUPPORTED
-	/**< Client does not support reading back from the output. */
-
-} FLAC__StreamEncoderReadStatus;
-
-/** Maps a FLAC__StreamEncoderReadStatus to a C string.
- *
- *  Using a FLAC__StreamEncoderReadStatus as the index to this array
- *  will give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__StreamEncoderReadStatusString[];
-
-
-/** Return values for the FLAC__StreamEncoder write callback.
- */
-typedef enum {
-
-	FLAC__STREAM_ENCODER_WRITE_STATUS_OK = 0,
-	/**< The write was OK and encoding can continue. */
-
-	FLAC__STREAM_ENCODER_WRITE_STATUS_FATAL_ERROR
-	/**< An unrecoverable error occurred.  The encoder will return from the process call. */
-
-} FLAC__StreamEncoderWriteStatus;
-
-/** Maps a FLAC__StreamEncoderWriteStatus to a C string.
- *
- *  Using a FLAC__StreamEncoderWriteStatus as the index to this array
- *  will give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__StreamEncoderWriteStatusString[];
-
-
-/** Return values for the FLAC__StreamEncoder seek callback.
- */
-typedef enum {
-
-	FLAC__STREAM_ENCODER_SEEK_STATUS_OK,
-	/**< The seek was OK and encoding can continue. */
-
-	FLAC__STREAM_ENCODER_SEEK_STATUS_ERROR,
-	/**< An unrecoverable error occurred. */
-
-	FLAC__STREAM_ENCODER_SEEK_STATUS_UNSUPPORTED
-	/**< Client does not support seeking. */
-
-} FLAC__StreamEncoderSeekStatus;
-
-/** Maps a FLAC__StreamEncoderSeekStatus to a C string.
- *
- *  Using a FLAC__StreamEncoderSeekStatus as the index to this array
- *  will give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__StreamEncoderSeekStatusString[];
-
-
-/** Return values for the FLAC__StreamEncoder tell callback.
- */
-typedef enum {
-
-	FLAC__STREAM_ENCODER_TELL_STATUS_OK,
-	/**< The tell was OK and encoding can continue. */
-
-	FLAC__STREAM_ENCODER_TELL_STATUS_ERROR,
-	/**< An unrecoverable error occurred. */
-
-	FLAC__STREAM_ENCODER_TELL_STATUS_UNSUPPORTED
-	/**< Client does not support seeking. */
-
-} FLAC__StreamEncoderTellStatus;
-
-/** Maps a FLAC__StreamEncoderTellStatus to a C string.
- *
- *  Using a FLAC__StreamEncoderTellStatus as the index to this array
- *  will give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__StreamEncoderTellStatusString[];
-
-
-/***********************************************************************
- *
- * class FLAC__StreamEncoder
- *
- ***********************************************************************/
-
-struct FLAC__StreamEncoderProtected;
-struct FLAC__StreamEncoderPrivate;
-/** The opaque structure definition for the stream encoder type.
- *  See the \link flac_stream_encoder stream encoder module \endlink
- *  for a detailed description.
- */
-typedef struct {
-	struct FLAC__StreamEncoderProtected *protected_; /* avoid the C++ keyword 'protected' */
-	struct FLAC__StreamEncoderPrivate *private_; /* avoid the C++ keyword 'private' */
-} FLAC__StreamEncoder;
-
-/** Signature for the read callback.
- *
- *  A function pointer matching this signature must be passed to
- *  FLAC__stream_encoder_init_ogg_stream() if seeking is supported.
- *  The supplied function will be called when the encoder needs to read back
- *  encoded data.  This happens during the metadata callback, when the encoder
- *  has to read, modify, and rewrite the metadata (e.g. seekpoints) gathered
- *  while encoding.  The address of the buffer to be filled is supplied, along
- *  with the number of bytes the buffer can hold.  The callback may choose to
- *  supply less data and modify the byte count but must be careful not to
- *  overflow the buffer.  The callback then returns a status code chosen from
- *  FLAC__StreamEncoderReadStatus.
- *
- * Here is an example of a read callback for stdio streams:
- * \code
- * FLAC__StreamEncoderReadStatus read_cb(const FLAC__StreamEncoder *encoder, FLAC__byte buffer[], size_t *bytes, void *client_data)
- * {
- *   FILE *file = ((MyClientData*)client_data)->file;
- *   if(*bytes > 0) {
- *     *bytes = fread(buffer, sizeof(FLAC__byte), *bytes, file);
- *     if(ferror(file))
- *       return FLAC__STREAM_ENCODER_READ_STATUS_ABORT;
- *     else if(*bytes == 0)
- *       return FLAC__STREAM_ENCODER_READ_STATUS_END_OF_STREAM;
- *     else
- *       return FLAC__STREAM_ENCODER_READ_STATUS_CONTINUE;
- *   }
- *   else
- *     return FLAC__STREAM_ENCODER_READ_STATUS_ABORT;
- * }
- * \endcode
- *
- * \note In general, FLAC__StreamEncoder functions which change the
- * state should not be called on the \a encoder while in the callback.
- *
- * \param  encoder  The encoder instance calling the callback.
- * \param  buffer   A pointer to a location for the callee to store
- *                  data to be encoded.
- * \param  bytes    A pointer to the size of the buffer.  On entry
- *                  to the callback, it contains the maximum number
- *                  of bytes that may be stored in \a buffer.  The
- *                  callee must set it to the actual number of bytes
- *                  stored (0 in case of error or end-of-stream) before
- *                  returning.
- * \param  client_data  The callee's client data set through
- *                      FLAC__stream_encoder_set_client_data().
- * \retval FLAC__StreamEncoderReadStatus
- *    The callee's return status.
- */
-typedef FLAC__StreamEncoderReadStatus (*FLAC__StreamEncoderReadCallback)(const FLAC__StreamEncoder *encoder, FLAC__byte buffer[], size_t *bytes, void *client_data);
-
-/** Signature for the write callback.
- *
- *  A function pointer matching this signature must be passed to
- *  FLAC__stream_encoder_init*_stream().  The supplied function will be called
- *  by the encoder anytime there is raw encoded data ready to write.  It may
- *  include metadata mixed with encoded audio frames and the data is not
- *  guaranteed to be aligned on frame or metadata block boundaries.
- *
- *  The only duty of the callback is to write out the \a bytes worth of data
- *  in \a buffer to the current position in the output stream.  The arguments
- *  \a samples and \a current_frame are purely informational.  If \a samples
- *  is greater than \c 0, then \a current_frame will hold the current frame
- *  number that is being written; otherwise it indicates that the write
- *  callback is being called to write metadata.
- *
- * \note
- * Unlike when writing to native FLAC, when writing to Ogg FLAC the
- * write callback will be called twice when writing each audio
- * frame; once for the page header, and once for the page body.
- * When writing the page header, the \a samples argument to the
- * write callback will be \c 0.
- *
- * \note In general, FLAC__StreamEncoder functions which change the
- * state should not be called on the \a encoder while in the callback.
- *
- * \param  encoder  The encoder instance calling the callback.
- * \param  buffer   An array of encoded data of length \a bytes.
- * \param  bytes    The byte length of \a buffer.
- * \param  samples  The number of samples encoded by \a buffer.
- *                  \c 0 has a special meaning; see above.
- * \param  current_frame  The number of the current frame being encoded.
- * \param  client_data  The callee's client data set through
- *                      FLAC__stream_encoder_init_*().
- * \retval FLAC__StreamEncoderWriteStatus
- *    The callee's return status.
- */
-typedef FLAC__StreamEncoderWriteStatus (*FLAC__StreamEncoderWriteCallback)(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data);
-
-/** Signature for the seek callback.
- *
- *  A function pointer matching this signature may be passed to
- *  FLAC__stream_encoder_init*_stream().  The supplied function will be called
- *  when the encoder needs to seek the output stream.  The encoder will pass
- *  the absolute byte offset to seek to, 0 meaning the beginning of the stream.
- *
- * Here is an example of a seek callback for stdio streams:
- * \code
- * FLAC__StreamEncoderSeekStatus seek_cb(const FLAC__StreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data)
- * {
- *   FILE *file = ((MyClientData*)client_data)->file;
- *   if(file == stdin)
- *     return FLAC__STREAM_ENCODER_SEEK_STATUS_UNSUPPORTED;
- *   else if(fseeko(file, (off_t)absolute_byte_offset, SEEK_SET) < 0)
- *     return FLAC__STREAM_ENCODER_SEEK_STATUS_ERROR;
- *   else
- *     return FLAC__STREAM_ENCODER_SEEK_STATUS_OK;
- * }
- * \endcode
- *
- * \note In general, FLAC__StreamEncoder functions which change the
- * state should not be called on the \a encoder while in the callback.
- *
- * \param  encoder  The encoder instance calling the callback.
- * \param  absolute_byte_offset  The offset from the beginning of the stream
- *                               to seek to.
- * \param  client_data  The callee's client data set through
- *                      FLAC__stream_encoder_init_*().
- * \retval FLAC__StreamEncoderSeekStatus
- *    The callee's return status.
- */
-typedef FLAC__StreamEncoderSeekStatus (*FLAC__StreamEncoderSeekCallback)(const FLAC__StreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data);
-
-/** Signature for the tell callback.
- *
- *  A function pointer matching this signature may be passed to
- *  FLAC__stream_encoder_init*_stream().  The supplied function will be called
- *  when the encoder needs to know the current position of the output stream.
- *
- * \warning
- * The callback must return the true current byte offset of the output to
- * which the encoder is writing.  If you are buffering the output, make
- * sure and take this into account.  If you are writing directly to a
- * FILE* from your write callback, ftell() is sufficient.  If you are
- * writing directly to a file descriptor from your write callback, you
- * can use lseek(fd, SEEK_CUR, 0).  The encoder may later seek back to
- * these points to rewrite metadata after encoding.
- *
- * Here is an example of a tell callback for stdio streams:
- * \code
- * FLAC__StreamEncoderTellStatus tell_cb(const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data)
- * {
- *   FILE *file = ((MyClientData*)client_data)->file;
- *   off_t pos;
- *   if(file == stdin)
- *     return FLAC__STREAM_ENCODER_TELL_STATUS_UNSUPPORTED;
- *   else if((pos = ftello(file)) < 0)
- *     return FLAC__STREAM_ENCODER_TELL_STATUS_ERROR;
- *   else {
- *     *absolute_byte_offset = (FLAC__uint64)pos;
- *     return FLAC__STREAM_ENCODER_TELL_STATUS_OK;
- *   }
- * }
- * \endcode
- *
- * \note In general, FLAC__StreamEncoder functions which change the
- * state should not be called on the \a encoder while in the callback.
- *
- * \param  encoder  The encoder instance calling the callback.
- * \param  absolute_byte_offset  The address at which to store the current
- *                               position of the output.
- * \param  client_data  The callee's client data set through
- *                      FLAC__stream_encoder_init_*().
- * \retval FLAC__StreamEncoderTellStatus
- *    The callee's return status.
- */
-typedef FLAC__StreamEncoderTellStatus (*FLAC__StreamEncoderTellCallback)(const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data);
-
-/** Signature for the metadata callback.
- *
- *  A function pointer matching this signature may be passed to
- *  FLAC__stream_encoder_init*_stream().  The supplied function will be called
- *  once at the end of encoding with the populated STREAMINFO structure.  This
- *  is so the client can seek back to the beginning of the file and write the
- *  STREAMINFO block with the correct statistics after encoding (like
- *  minimum/maximum frame size and total samples).
- *
- * \note In general, FLAC__StreamEncoder functions which change the
- * state should not be called on the \a encoder while in the callback.
- *
- * \param  encoder      The encoder instance calling the callback.
- * \param  metadata     The final populated STREAMINFO block.
- * \param  client_data  The callee's client data set through
- *                      FLAC__stream_encoder_init_*().
- */
-typedef void (*FLAC__StreamEncoderMetadataCallback)(const FLAC__StreamEncoder *encoder, const FLAC__StreamMetadata *metadata, void *client_data);
-
-/** Signature for the progress callback.
- *
- *  A function pointer matching this signature may be passed to
- *  FLAC__stream_encoder_init*_file() or FLAC__stream_encoder_init*_FILE().
- *  The supplied function will be called when the encoder has finished
- *  writing a frame.  The \c total_frames_estimate argument to the
- *  callback will be based on the value from
- *  FLAC__stream_encoder_set_total_samples_estimate().
- *
- * \note In general, FLAC__StreamEncoder functions which change the
- * state should not be called on the \a encoder while in the callback.
- *
- * \param  encoder          The encoder instance calling the callback.
- * \param  bytes_written    Bytes written so far.
- * \param  samples_written  Samples written so far.
- * \param  frames_written   Frames written so far.
- * \param  total_frames_estimate  The estimate of the total number of
- *                                frames to be written.
- * \param  client_data      The callee's client data set through
- *                          FLAC__stream_encoder_init_*().
- */
-typedef void (*FLAC__StreamEncoderProgressCallback)(const FLAC__StreamEncoder *encoder, FLAC__uint64 bytes_written, FLAC__uint64 samples_written, unsigned frames_written, unsigned total_frames_estimate, void *client_data);
-
-
-/***********************************************************************
- *
- * Class constructor/destructor
- *
- ***********************************************************************/
-
-/** Create a new stream encoder instance.  The instance is created with
- *  default settings; see the individual FLAC__stream_encoder_set_*()
- *  functions for each setting's default.
- *
- * \retval FLAC__StreamEncoder*
- *    \c NULL if there was an error allocating memory, else the new instance.
- */
-FLAC_API FLAC__StreamEncoder *FLAC__stream_encoder_new(void);
-
-/** Free an encoder instance.  Deletes the object pointed to by \a encoder.
- *
- * \param encoder  A pointer to an existing encoder.
- * \assert
- *    \code encoder != NULL \endcode
- */
-FLAC_API void FLAC__stream_encoder_delete(FLAC__StreamEncoder *encoder);
-
-
-/***********************************************************************
- *
- * Public class method prototypes
- *
- ***********************************************************************/
-
-/** Set the serial number for the FLAC stream to use in the Ogg container.
- *
- * \note
- * This does not need to be set for native FLAC encoding.
- *
- * \note
- * It is recommended to set a serial number explicitly as the default of '0'
- * may collide with other streams.
- *
- * \default \c 0
- * \param  encoder        An encoder instance to set.
- * \param  serial_number  See above.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_ogg_serial_number(FLAC__StreamEncoder *encoder, long serial_number);
-
-/** Set the "verify" flag.  If \c true, the encoder will verify it's own
- *  encoded output by feeding it through an internal decoder and comparing
- *  the original signal against the decoded signal.  If a mismatch occurs,
- *  the process call will return \c false.  Note that this will slow the
- *  encoding process by the extra time required for decoding and comparison.
- *
- * \default \c false
- * \param  encoder  An encoder instance to set.
- * \param  value    Flag value (see above).
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_verify(FLAC__StreamEncoder *encoder, FLAC__bool value);
-
-/** Set the <A HREF="../format.html#subset">Subset</A> flag.  If \c true,
- *  the encoder will comply with the Subset and will check the
- *  settings during FLAC__stream_encoder_init_*() to see if all settings
- *  comply.  If \c false, the settings may take advantage of the full
- *  range that the format allows.
- *
- *  Make sure you know what it entails before setting this to \c false.
- *
- * \default \c true
- * \param  encoder  An encoder instance to set.
- * \param  value    Flag value (see above).
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_streamable_subset(FLAC__StreamEncoder *encoder, FLAC__bool value);
-
-/** Set the number of channels to be encoded.
- *
- * \default \c 2
- * \param  encoder  An encoder instance to set.
- * \param  value    See above.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_channels(FLAC__StreamEncoder *encoder, unsigned value);
-
-/** Set the sample resolution of the input to be encoded.
- *
- * \warning
- * Do not feed the encoder data that is wider than the value you
- * set here or you will generate an invalid stream.
- *
- * \default \c 16
- * \param  encoder  An encoder instance to set.
- * \param  value    See above.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_bits_per_sample(FLAC__StreamEncoder *encoder, unsigned value);
-
-/** Set the sample rate (in Hz) of the input to be encoded.
- *
- * \default \c 44100
- * \param  encoder  An encoder instance to set.
- * \param  value    See above.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_sample_rate(FLAC__StreamEncoder *encoder, unsigned value);
-
-/** Set the compression level
- *
- * The compression level is roughly proportional to the amount of effort
- * the encoder expends to compress the file.  A higher level usually
- * means more computation but higher compression.  The default level is
- * suitable for most applications.
- *
- * Currently the levels range from \c 0 (fastest, least compression) to
- * \c 8 (slowest, most compression).  A value larger than \c 8 will be
- * treated as \c 8.
- *
- * This function automatically calls the following other \c _set_
- * functions with appropriate values, so the client does not need to
- * unless it specifically wants to override them:
- * - FLAC__stream_encoder_set_do_mid_side_stereo()
- * - FLAC__stream_encoder_set_loose_mid_side_stereo()
- * - FLAC__stream_encoder_set_apodization()
- * - FLAC__stream_encoder_set_max_lpc_order()
- * - FLAC__stream_encoder_set_qlp_coeff_precision()
- * - FLAC__stream_encoder_set_do_qlp_coeff_prec_search()
- * - FLAC__stream_encoder_set_do_escape_coding()
- * - FLAC__stream_encoder_set_do_exhaustive_model_search()
- * - FLAC__stream_encoder_set_min_residual_partition_order()
- * - FLAC__stream_encoder_set_max_residual_partition_order()
- * - FLAC__stream_encoder_set_rice_parameter_search_dist()
- *
- * The actual values set for each level are:
- * <table>
- * <tr>
- *  <td><b>level</b><td>
- *  <td>do mid-side stereo<td>
- *  <td>loose mid-side stereo<td>
- *  <td>apodization<td>
- *  <td>max lpc order<td>
- *  <td>qlp coeff precision<td>
- *  <td>qlp coeff prec search<td>
- *  <td>escape coding<td>
- *  <td>exhaustive model search<td>
- *  <td>min residual partition order<td>
- *  <td>max residual partition order<td>
- *  <td>rice parameter search dist<td>
- * </tr>
- * <tr>  <td><b>0</b><td>  <td>false<td>  <td>false<td>  <td>tukey(0.5)<td>  <td>0<td>   <td>0<td>  <td>false<td>  <td>false<td>  <td>false<td>  <td>0<td>  <td>3<td>  <td>0<td>  </tr>
- * <tr>  <td><b>1</b><td>  <td>true<td>   <td>true<td>   <td>tukey(0.5)<td>  <td>0<td>   <td>0<td>  <td>false<td>  <td>false<td>  <td>false<td>  <td>0<td>  <td>3<td>  <td>0<td>  </tr>
- * <tr>  <td><b>2</b><td>  <td>true<td>   <td>false<td>  <td>tukey(0.5)<td>  <td>0<td>   <td>0<td>  <td>false<td>  <td>false<td>  <td>false<td>  <td>0<td>  <td>3<td>  <td>0<td>  </tr>
- * <tr>  <td><b>3</b><td>  <td>false<td>  <td>false<td>  <td>tukey(0.5)<td>  <td>6<td>   <td>0<td>  <td>false<td>  <td>false<td>  <td>false<td>  <td>0<td>  <td>4<td>  <td>0<td>  </tr>
- * <tr>  <td><b>4</b><td>  <td>true<td>   <td>true<td>   <td>tukey(0.5)<td>  <td>8<td>   <td>0<td>  <td>false<td>  <td>false<td>  <td>false<td>  <td>0<td>  <td>4<td>  <td>0<td>  </tr>
- * <tr>  <td><b>5</b><td>  <td>true<td>   <td>false<td>  <td>tukey(0.5)<td>  <td>8<td>   <td>0<td>  <td>false<td>  <td>false<td>  <td>false<td>  <td>0<td>  <td>5<td>  <td>0<td>  </tr>
- * <tr>  <td><b>6</b><td>  <td>true<td>   <td>false<td>  <td>tukey(0.5)<td>  <td>8<td>   <td>0<td>  <td>false<td>  <td>false<td>  <td>false<td>  <td>0<td>  <td>6<td>  <td>0<td>  </tr>
- * <tr>  <td><b>7</b><td>  <td>true<td>   <td>false<td>  <td>tukey(0.5)<td>  <td>8<td>   <td>0<td>  <td>false<td>  <td>false<td>  <td>true<td>   <td>0<td>  <td>6<td>  <td>0<td>  </tr>
- * <tr>  <td><b>8</b><td>  <td>true<td>   <td>false<td>  <td>tukey(0.5)<td>  <td>12<td>  <td>0<td>  <td>false<td>  <td>false<td>  <td>true<td>   <td>0<td>  <td>6<td>  <td>0<td>  </tr>
- * </table>
- *
- * \default \c 5
- * \param  encoder  An encoder instance to set.
- * \param  value    See above.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_compression_level(FLAC__StreamEncoder *encoder, unsigned value);
-
-/** Set the blocksize to use while encoding.
- *
- * The number of samples to use per frame.  Use \c 0 to let the encoder
- * estimate a blocksize; this is usually best.
- *
- * \default \c 0
- * \param  encoder  An encoder instance to set.
- * \param  value    See above.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_blocksize(FLAC__StreamEncoder *encoder, unsigned value);
-
-/** Set to \c true to enable mid-side encoding on stereo input.  The
- *  number of channels must be 2 for this to have any effect.  Set to
- *  \c false to use only independent channel coding.
- *
- * \default \c false
- * \param  encoder  An encoder instance to set.
- * \param  value    Flag value (see above).
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_do_mid_side_stereo(FLAC__StreamEncoder *encoder, FLAC__bool value);
-
-/** Set to \c true to enable adaptive switching between mid-side and
- *  left-right encoding on stereo input.  Set to \c false to use
- *  exhaustive searching.  Setting this to \c true requires
- *  FLAC__stream_encoder_set_do_mid_side_stereo() to also be set to
- *  \c true in order to have any effect.
- *
- * \default \c false
- * \param  encoder  An encoder instance to set.
- * \param  value    Flag value (see above).
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_loose_mid_side_stereo(FLAC__StreamEncoder *encoder, FLAC__bool value);
-
-/** Sets the apodization function(s) the encoder will use when windowing
- *  audio data for LPC analysis.
- *
- * The \a specification is a plain ASCII string which specifies exactly
- * which functions to use.  There may be more than one (up to 32),
- * separated by \c ';' characters.  Some functions take one or more
- * comma-separated arguments in parentheses.
- *
- * The available functions are \c bartlett, \c bartlett_hann,
- * \c blackman, \c blackman_harris_4term_92db, \c connes, \c flattop,
- * \c gauss(STDDEV), \c hamming, \c hann, \c kaiser_bessel, \c nuttall,
- * \c rectangle, \c triangle, \c tukey(P), \c welch.
- *
- * For \c gauss(STDDEV), STDDEV specifies the standard deviation
- * (0<STDDEV<=0.5).
- *
- * For \c tukey(P), P specifies the fraction of the window that is
- * tapered (0<=P<=1).  P=0 corresponds to \c rectangle and P=1
- * corresponds to \c hann.
- *
- * Example specifications are \c "blackman" or
- * \c "hann;triangle;tukey(0.5);tukey(0.25);tukey(0.125)"
- *
- * Any function that is specified erroneously is silently dropped.  Up
- * to 32 functions are kept, the rest are dropped.  If the specification
- * is empty the encoder defaults to \c "tukey(0.5)".
- *
- * When more than one function is specified, then for every subframe the
- * encoder will try each of them separately and choose the window that
- * results in the smallest compressed subframe.
- *
- * Note that each function specified causes the encoder to occupy a
- * floating point array in which to store the window.
- *
- * \default \c "tukey(0.5)"
- * \param  encoder        An encoder instance to set.
- * \param  specification  See above.
- * \assert
- *    \code encoder != NULL \endcode
- *    \code specification != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_apodization(FLAC__StreamEncoder *encoder, const char *specification);
-
-/** Set the maximum LPC order, or \c 0 to use only the fixed predictors.
- *
- * \default \c 0
- * \param  encoder  An encoder instance to set.
- * \param  value    See above.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_max_lpc_order(FLAC__StreamEncoder *encoder, unsigned value);
-
-/** Set the precision, in bits, of the quantized linear predictor
- *  coefficients, or \c 0 to let the encoder select it based on the
- *  blocksize.
- *
- * \note
- * In the current implementation, qlp_coeff_precision + bits_per_sample must
- * be less than 32.
- *
- * \default \c 0
- * \param  encoder  An encoder instance to set.
- * \param  value    See above.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_qlp_coeff_precision(FLAC__StreamEncoder *encoder, unsigned value);
-
-/** Set to \c false to use only the specified quantized linear predictor
- *  coefficient precision, or \c true to search neighboring precision
- *  values and use the best one.
- *
- * \default \c false
- * \param  encoder  An encoder instance to set.
- * \param  value    See above.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_do_qlp_coeff_prec_search(FLAC__StreamEncoder *encoder, FLAC__bool value);
-
-/** Deprecated.  Setting this value has no effect.
- *
- * \default \c false
- * \param  encoder  An encoder instance to set.
- * \param  value    See above.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_do_escape_coding(FLAC__StreamEncoder *encoder, FLAC__bool value);
-
-/** Set to \c false to let the encoder estimate the best model order
- *  based on the residual signal energy, or \c true to force the
- *  encoder to evaluate all order models and select the best.
- *
- * \default \c false
- * \param  encoder  An encoder instance to set.
- * \param  value    See above.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_do_exhaustive_model_search(FLAC__StreamEncoder *encoder, FLAC__bool value);
-
-/** Set the minimum partition order to search when coding the residual.
- *  This is used in tandem with
- *  FLAC__stream_encoder_set_max_residual_partition_order().
- *
- *  The partition order determines the context size in the residual.
- *  The context size will be approximately <tt>blocksize / (2 ^ order)</tt>.
- *
- *  Set both min and max values to \c 0 to force a single context,
- *  whose Rice parameter is based on the residual signal variance.
- *  Otherwise, set a min and max order, and the encoder will search
- *  all orders, using the mean of each context for its Rice parameter,
- *  and use the best.
- *
- * \default \c 0
- * \param  encoder  An encoder instance to set.
- * \param  value    See above.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_min_residual_partition_order(FLAC__StreamEncoder *encoder, unsigned value);
-
-/** Set the maximum partition order to search when coding the residual.
- *  This is used in tandem with
- *  FLAC__stream_encoder_set_min_residual_partition_order().
- *
- *  The partition order determines the context size in the residual.
- *  The context size will be approximately <tt>blocksize / (2 ^ order)</tt>.
- *
- *  Set both min and max values to \c 0 to force a single context,
- *  whose Rice parameter is based on the residual signal variance.
- *  Otherwise, set a min and max order, and the encoder will search
- *  all orders, using the mean of each context for its Rice parameter,
- *  and use the best.
- *
- * \default \c 0
- * \param  encoder  An encoder instance to set.
- * \param  value    See above.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_max_residual_partition_order(FLAC__StreamEncoder *encoder, unsigned value);
-
-/** Deprecated.  Setting this value has no effect.
- *
- * \default \c 0
- * \param  encoder  An encoder instance to set.
- * \param  value    See above.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_rice_parameter_search_dist(FLAC__StreamEncoder *encoder, unsigned value);
-
-/** Set an estimate of the total samples that will be encoded.
- *  This is merely an estimate and may be set to \c 0 if unknown.
- *  This value will be written to the STREAMINFO block before encoding,
- *  and can remove the need for the caller to rewrite the value later
- *  if the value is known before encoding.
- *
- * \default \c 0
- * \param  encoder  An encoder instance to set.
- * \param  value    See above.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_total_samples_estimate(FLAC__StreamEncoder *encoder, FLAC__uint64 value);
-
-/** Set the metadata blocks to be emitted to the stream before encoding.
- *  A value of \c NULL, \c 0 implies no metadata; otherwise, supply an
- *  array of pointers to metadata blocks.  The array is non-const since
- *  the encoder may need to change the \a is_last flag inside them, and
- *  in some cases update seek point offsets.  Otherwise, the encoder will
- *  not modify or free the blocks.  It is up to the caller to free the
- *  metadata blocks after encoding finishes.
- *
- * \note
- * The encoder stores only copies of the pointers in the \a metadata array;
- * the metadata blocks themselves must survive at least until after
- * FLAC__stream_encoder_finish() returns.  Do not free the blocks until then.
- *
- * \note
- * The STREAMINFO block is always written and no STREAMINFO block may
- * occur in the supplied array.
- *
- * \note
- * By default the encoder does not create a SEEKTABLE.  If one is supplied
- * in the \a metadata array, but the client has specified that it does not
- * support seeking, then the SEEKTABLE will be written verbatim.  However
- * by itself this is not very useful as the client will not know the stream
- * offsets for the seekpoints ahead of time.  In order to get a proper
- * seektable the client must support seeking.  See next note.
- *
- * \note
- * SEEKTABLE blocks are handled specially.  Since you will not know
- * the values for the seek point stream offsets, you should pass in
- * a SEEKTABLE 'template', that is, a SEEKTABLE object with the
- * required sample numbers (or placeholder points), with \c 0 for the
- * \a frame_samples and \a stream_offset fields for each point.  If the
- * client has specified that it supports seeking by providing a seek
- * callback to FLAC__stream_encoder_init_stream() or both seek AND read
- * callback to FLAC__stream_encoder_init_ogg_stream() (or by using
- * FLAC__stream_encoder_init*_file() or FLAC__stream_encoder_init*_FILE()),
- * then while it is encoding the encoder will fill the stream offsets in
- * for you and when encoding is finished, it will seek back and write the
- * real values into the SEEKTABLE block in the stream.  There are helper
- * routines for manipulating seektable template blocks; see metadata.h:
- * FLAC__metadata_object_seektable_template_*().  If the client does
- * not support seeking, the SEEKTABLE will have inaccurate offsets which
- * will slow down or remove the ability to seek in the FLAC stream.
- *
- * \note
- * The encoder instance \b will modify the first \c SEEKTABLE block
- * as it transforms the template to a valid seektable while encoding,
- * but it is still up to the caller to free all metadata blocks after
- * encoding.
- *
- * \note
- * A VORBIS_COMMENT block may be supplied.  The vendor string in it
- * will be ignored.  libFLAC will use it's own vendor string. libFLAC
- * will not modify the passed-in VORBIS_COMMENT's vendor string, it
- * will simply write it's own into the stream.  If no VORBIS_COMMENT
- * block is present in the \a metadata array, libFLAC will write an
- * empty one, containing only the vendor string.
- *
- * \note The Ogg FLAC mapping requires that the VORBIS_COMMENT block be
- * the second metadata block of the stream.  The encoder already supplies
- * the STREAMINFO block automatically.  If \a metadata does not contain a
- * VORBIS_COMMENT block, the encoder will supply that too.  Otherwise, if
- * \a metadata does contain a VORBIS_COMMENT block and it is not the
- * first, the init function will reorder \a metadata by moving the
- * VORBIS_COMMENT block to the front; the relative ordering of the other
- * blocks will remain as they were.
- *
- * \note The Ogg FLAC mapping limits the number of metadata blocks per
- * stream to \c 65535.  If \a num_blocks exceeds this the function will
- * return \c false.
- *
- * \default \c NULL, 0
- * \param  encoder     An encoder instance to set.
- * \param  metadata    See above.
- * \param  num_blocks  See above.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- *    \c false if the encoder is already initialized, or if
- *    \a num_blocks > 65535 if encoding to Ogg FLAC, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_metadata(FLAC__StreamEncoder *encoder, FLAC__StreamMetadata **metadata, unsigned num_blocks);
-
-/** Get the current encoder state.
- *
- * \param  encoder  An encoder instance to query.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__StreamEncoderState
- *    The current encoder state.
- */
-FLAC_API FLAC__StreamEncoderState FLAC__stream_encoder_get_state(const FLAC__StreamEncoder *encoder);
-
-/** Get the state of the verify stream decoder.
- *  Useful when the stream encoder state is
- *  \c FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR.
- *
- * \param  encoder  An encoder instance to query.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__StreamDecoderState
- *    The verify stream decoder state.
- */
-FLAC_API FLAC__StreamDecoderState FLAC__stream_encoder_get_verify_decoder_state(const FLAC__StreamEncoder *encoder);
-
-/** Get the current encoder state as a C string.
- *  This version automatically resolves
- *  \c FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR by getting the
- *  verify decoder's state.
- *
- * \param  encoder  A encoder instance to query.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval const char *
- *    The encoder state as a C string.  Do not modify the contents.
- */
-FLAC_API const char *FLAC__stream_encoder_get_resolved_state_string(const FLAC__StreamEncoder *encoder);
-
-/** Get relevant values about the nature of a verify decoder error.
- *  Useful when the stream encoder state is
- *  \c FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR.  The arguments should
- *  be addresses in which the stats will be returned, or NULL if value
- *  is not desired.
- *
- * \param  encoder  An encoder instance to query.
- * \param  absolute_sample  The absolute sample number of the mismatch.
- * \param  frame_number  The number of the frame in which the mismatch occurred.
- * \param  channel       The channel in which the mismatch occurred.
- * \param  sample        The number of the sample (relative to the frame) in
- *                       which the mismatch occurred.
- * \param  expected      The expected value for the sample in question.
- * \param  got           The actual value returned by the decoder.
- * \assert
- *    \code encoder != NULL \endcode
- */
-FLAC_API void FLAC__stream_encoder_get_verify_decoder_error_stats(const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_sample, unsigned *frame_number, unsigned *channel, unsigned *sample, FLAC__int32 *expected, FLAC__int32 *got);
-
-/** Get the "verify" flag.
- *
- * \param  encoder  An encoder instance to query.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    See FLAC__stream_encoder_set_verify().
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_get_verify(const FLAC__StreamEncoder *encoder);
-
-/** Get the <A HREF="../format.html#subset>Subset</A> flag.
- *
- * \param  encoder  An encoder instance to query.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    See FLAC__stream_encoder_set_streamable_subset().
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_get_streamable_subset(const FLAC__StreamEncoder *encoder);
-
-/** Get the number of input channels being processed.
- *
- * \param  encoder  An encoder instance to query.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval unsigned
- *    See FLAC__stream_encoder_set_channels().
- */
-FLAC_API unsigned FLAC__stream_encoder_get_channels(const FLAC__StreamEncoder *encoder);
-
-/** Get the input sample resolution setting.
- *
- * \param  encoder  An encoder instance to query.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval unsigned
- *    See FLAC__stream_encoder_set_bits_per_sample().
- */
-FLAC_API unsigned FLAC__stream_encoder_get_bits_per_sample(const FLAC__StreamEncoder *encoder);
-
-/** Get the input sample rate setting.
- *
- * \param  encoder  An encoder instance to query.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval unsigned
- *    See FLAC__stream_encoder_set_sample_rate().
- */
-FLAC_API unsigned FLAC__stream_encoder_get_sample_rate(const FLAC__StreamEncoder *encoder);
-
-/** Get the blocksize setting.
- *
- * \param  encoder  An encoder instance to query.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval unsigned
- *    See FLAC__stream_encoder_set_blocksize().
- */
-FLAC_API unsigned FLAC__stream_encoder_get_blocksize(const FLAC__StreamEncoder *encoder);
-
-/** Get the "mid/side stereo coding" flag.
- *
- * \param  encoder  An encoder instance to query.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    See FLAC__stream_encoder_get_do_mid_side_stereo().
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_get_do_mid_side_stereo(const FLAC__StreamEncoder *encoder);
-
-/** Get the "adaptive mid/side switching" flag.
- *
- * \param  encoder  An encoder instance to query.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    See FLAC__stream_encoder_set_loose_mid_side_stereo().
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_get_loose_mid_side_stereo(const FLAC__StreamEncoder *encoder);
-
-/** Get the maximum LPC order setting.
- *
- * \param  encoder  An encoder instance to query.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval unsigned
- *    See FLAC__stream_encoder_set_max_lpc_order().
- */
-FLAC_API unsigned FLAC__stream_encoder_get_max_lpc_order(const FLAC__StreamEncoder *encoder);
-
-/** Get the quantized linear predictor coefficient precision setting.
- *
- * \param  encoder  An encoder instance to query.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval unsigned
- *    See FLAC__stream_encoder_set_qlp_coeff_precision().
- */
-FLAC_API unsigned FLAC__stream_encoder_get_qlp_coeff_precision(const FLAC__StreamEncoder *encoder);
-
-/** Get the qlp coefficient precision search flag.
- *
- * \param  encoder  An encoder instance to query.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    See FLAC__stream_encoder_set_do_qlp_coeff_prec_search().
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_get_do_qlp_coeff_prec_search(const FLAC__StreamEncoder *encoder);
-
-/** Get the "escape coding" flag.
- *
- * \param  encoder  An encoder instance to query.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    See FLAC__stream_encoder_set_do_escape_coding().
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_get_do_escape_coding(const FLAC__StreamEncoder *encoder);
-
-/** Get the exhaustive model search flag.
- *
- * \param  encoder  An encoder instance to query.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    See FLAC__stream_encoder_set_do_exhaustive_model_search().
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_get_do_exhaustive_model_search(const FLAC__StreamEncoder *encoder);
-
-/** Get the minimum residual partition order setting.
- *
- * \param  encoder  An encoder instance to query.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval unsigned
- *    See FLAC__stream_encoder_set_min_residual_partition_order().
- */
-FLAC_API unsigned FLAC__stream_encoder_get_min_residual_partition_order(const FLAC__StreamEncoder *encoder);
-
-/** Get maximum residual partition order setting.
- *
- * \param  encoder  An encoder instance to query.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval unsigned
- *    See FLAC__stream_encoder_set_max_residual_partition_order().
- */
-FLAC_API unsigned FLAC__stream_encoder_get_max_residual_partition_order(const FLAC__StreamEncoder *encoder);
-
-/** Get the Rice parameter search distance setting.
- *
- * \param  encoder  An encoder instance to query.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval unsigned
- *    See FLAC__stream_encoder_set_rice_parameter_search_dist().
- */
-FLAC_API unsigned FLAC__stream_encoder_get_rice_parameter_search_dist(const FLAC__StreamEncoder *encoder);
-
-/** Get the previously set estimate of the total samples to be encoded.
- *  The encoder merely mimics back the value given to
- *  FLAC__stream_encoder_set_total_samples_estimate() since it has no
- *  other way of knowing how many samples the client will encode.
- *
- * \param  encoder  An encoder instance to set.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__uint64
- *    See FLAC__stream_encoder_get_total_samples_estimate().
- */
-FLAC_API FLAC__uint64 FLAC__stream_encoder_get_total_samples_estimate(const FLAC__StreamEncoder *encoder);
-
-/** Initialize the encoder instance to encode native FLAC streams.
- *
- *  This flavor of initialization sets up the encoder to encode to a
- *  native FLAC stream. I/O is performed via callbacks to the client.
- *  For encoding to a plain file via filename or open \c FILE*,
- *  FLAC__stream_encoder_init_file() and FLAC__stream_encoder_init_FILE()
- *  provide a simpler interface.
- *
- *  This function should be called after FLAC__stream_encoder_new() and
- *  FLAC__stream_encoder_set_*() but before FLAC__stream_encoder_process()
- *  or FLAC__stream_encoder_process_interleaved().
- *  initialization succeeded.
- *
- *  The call to FLAC__stream_encoder_init_stream() currently will also
- *  immediately call the write callback several times, once with the \c fLaC
- *  signature, and once for each encoded metadata block.
- *
- * \param  encoder            An uninitialized encoder instance.
- * \param  write_callback     See FLAC__StreamEncoderWriteCallback.  This
- *                            pointer must not be \c NULL.
- * \param  seek_callback      See FLAC__StreamEncoderSeekCallback.  This
- *                            pointer may be \c NULL if seeking is not
- *                            supported.  The encoder uses seeking to go back
- *                            and write some some stream statistics to the
- *                            STREAMINFO block; this is recommended but not
- *                            necessary to create a valid FLAC stream.  If
- *                            \a seek_callback is not \c NULL then a
- *                            \a tell_callback must also be supplied.
- *                            Alternatively, a dummy seek callback that just
- *                            returns \c FLAC__STREAM_ENCODER_SEEK_STATUS_UNSUPPORTED
- *                            may also be supplied, all though this is slightly
- *                            less efficient for the encoder.
- * \param  tell_callback      See FLAC__StreamEncoderTellCallback.  This
- *                            pointer may be \c NULL if seeking is not
- *                            supported.  If \a seek_callback is \c NULL then
- *                            this argument will be ignored.  If
- *                            \a seek_callback is not \c NULL then a
- *                            \a tell_callback must also be supplied.
- *                            Alternatively, a dummy tell callback that just
- *                            returns \c FLAC__STREAM_ENCODER_TELL_STATUS_UNSUPPORTED
- *                            may also be supplied, all though this is slightly
- *                            less efficient for the encoder.
- * \param  metadata_callback  See FLAC__StreamEncoderMetadataCallback.  This
- *                            pointer may be \c NULL if the callback is not
- *                            desired.  If the client provides a seek callback,
- *                            this function is not necessary as the encoder
- *                            will automatically seek back and update the
- *                            STREAMINFO block.  It may also be \c NULL if the
- *                            client does not support seeking, since it will
- *                            have no way of going back to update the
- *                            STREAMINFO.  However the client can still supply
- *                            a callback if it would like to know the details
- *                            from the STREAMINFO.
- * \param  client_data        This value will be supplied to callbacks in their
- *                            \a client_data argument.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__StreamEncoderInitStatus
- *    \c FLAC__STREAM_ENCODER_INIT_STATUS_OK if initialization was successful;
- *    see FLAC__StreamEncoderInitStatus for the meanings of other return values.
- */
-FLAC_API FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_stream(FLAC__StreamEncoder *encoder, FLAC__StreamEncoderWriteCallback write_callback, FLAC__StreamEncoderSeekCallback seek_callback, FLAC__StreamEncoderTellCallback tell_callback, FLAC__StreamEncoderMetadataCallback metadata_callback, void *client_data);
-
-/** Initialize the encoder instance to encode Ogg FLAC streams.
- *
- *  This flavor of initialization sets up the encoder to encode to a FLAC
- *  stream in an Ogg container.  I/O is performed via callbacks to the
- *  client.  For encoding to a plain file via filename or open \c FILE*,
- *  FLAC__stream_encoder_init_ogg_file() and FLAC__stream_encoder_init_ogg_FILE()
- *  provide a simpler interface.
- *
- *  This function should be called after FLAC__stream_encoder_new() and
- *  FLAC__stream_encoder_set_*() but before FLAC__stream_encoder_process()
- *  or FLAC__stream_encoder_process_interleaved().
- *  initialization succeeded.
- *
- *  The call to FLAC__stream_encoder_init_ogg_stream() currently will also
- *  immediately call the write callback several times to write the metadata
- *  packets.
- *
- * \param  encoder            An uninitialized encoder instance.
- * \param  read_callback      See FLAC__StreamEncoderReadCallback.  This
- *                            pointer must not be \c NULL if \a seek_callback
- *                            is non-NULL since they are both needed to be
- *                            able to write data back to the Ogg FLAC stream
- *                            in the post-encode phase.
- * \param  write_callback     See FLAC__StreamEncoderWriteCallback.  This
- *                            pointer must not be \c NULL.
- * \param  seek_callback      See FLAC__StreamEncoderSeekCallback.  This
- *                            pointer may be \c NULL if seeking is not
- *                            supported.  The encoder uses seeking to go back
- *                            and write some some stream statistics to the
- *                            STREAMINFO block; this is recommended but not
- *                            necessary to create a valid FLAC stream.  If
- *                            \a seek_callback is not \c NULL then a
- *                            \a tell_callback must also be supplied.
- *                            Alternatively, a dummy seek callback that just
- *                            returns \c FLAC__STREAM_ENCODER_SEEK_STATUS_UNSUPPORTED
- *                            may also be supplied, all though this is slightly
- *                            less efficient for the encoder.
- * \param  tell_callback      See FLAC__StreamEncoderTellCallback.  This
- *                            pointer may be \c NULL if seeking is not
- *                            supported.  If \a seek_callback is \c NULL then
- *                            this argument will be ignored.  If
- *                            \a seek_callback is not \c NULL then a
- *                            \a tell_callback must also be supplied.
- *                            Alternatively, a dummy tell callback that just
- *                            returns \c FLAC__STREAM_ENCODER_TELL_STATUS_UNSUPPORTED
- *                            may also be supplied, all though this is slightly
- *                            less efficient for the encoder.
- * \param  metadata_callback  See FLAC__StreamEncoderMetadataCallback.  This
- *                            pointer may be \c NULL if the callback is not
- *                            desired.  If the client provides a seek callback,
- *                            this function is not necessary as the encoder
- *                            will automatically seek back and update the
- *                            STREAMINFO block.  It may also be \c NULL if the
- *                            client does not support seeking, since it will
- *                            have no way of going back to update the
- *                            STREAMINFO.  However the client can still supply
- *                            a callback if it would like to know the details
- *                            from the STREAMINFO.
- * \param  client_data        This value will be supplied to callbacks in their
- *                            \a client_data argument.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__StreamEncoderInitStatus
- *    \c FLAC__STREAM_ENCODER_INIT_STATUS_OK if initialization was successful;
- *    see FLAC__StreamEncoderInitStatus for the meanings of other return values.
- */
-FLAC_API FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_ogg_stream(FLAC__StreamEncoder *encoder, FLAC__StreamEncoderReadCallback read_callback, FLAC__StreamEncoderWriteCallback write_callback, FLAC__StreamEncoderSeekCallback seek_callback, FLAC__StreamEncoderTellCallback tell_callback, FLAC__StreamEncoderMetadataCallback metadata_callback, void *client_data);
-
-/** Initialize the encoder instance to encode native FLAC files.
- *
- *  This flavor of initialization sets up the encoder to encode to a
- *  plain native FLAC file.  For non-stdio streams, you must use
- *  FLAC__stream_encoder_init_stream() and provide callbacks for the I/O.
- *
- *  This function should be called after FLAC__stream_encoder_new() and
- *  FLAC__stream_encoder_set_*() but before FLAC__stream_encoder_process()
- *  or FLAC__stream_encoder_process_interleaved().
- *  initialization succeeded.
- *
- * \param  encoder            An uninitialized encoder instance.
- * \param  file               An open file.  The file should have been opened
- *                            with mode \c "w+b" and rewound.  The file
- *                            becomes owned by the encoder and should not be
- *                            manipulated by the client while encoding.
- *                            Unless \a file is \c stdout, it will be closed
- *                            when FLAC__stream_encoder_finish() is called.
- *                            Note however that a proper SEEKTABLE cannot be
- *                            created when encoding to \c stdout since it is
- *                            not seekable.
- * \param  progress_callback  See FLAC__StreamEncoderProgressCallback.  This
- *                            pointer may be \c NULL if the callback is not
- *                            desired.
- * \param  client_data        This value will be supplied to callbacks in their
- *                            \a client_data argument.
- * \assert
- *    \code encoder != NULL \endcode
- *    \code file != NULL \endcode
- * \retval FLAC__StreamEncoderInitStatus
- *    \c FLAC__STREAM_ENCODER_INIT_STATUS_OK if initialization was successful;
- *    see FLAC__StreamEncoderInitStatus for the meanings of other return values.
- */
-FLAC_API FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_FILE(FLAC__StreamEncoder *encoder, FILE *file, FLAC__StreamEncoderProgressCallback progress_callback, void *client_data);
-
-/** Initialize the encoder instance to encode Ogg FLAC files.
- *
- *  This flavor of initialization sets up the encoder to encode to a
- *  plain Ogg FLAC file.  For non-stdio streams, you must use
- *  FLAC__stream_encoder_init_ogg_stream() and provide callbacks for the I/O.
- *
- *  This function should be called after FLAC__stream_encoder_new() and
- *  FLAC__stream_encoder_set_*() but before FLAC__stream_encoder_process()
- *  or FLAC__stream_encoder_process_interleaved().
- *  initialization succeeded.
- *
- * \param  encoder            An uninitialized encoder instance.
- * \param  file               An open file.  The file should have been opened
- *                            with mode \c "w+b" and rewound.  The file
- *                            becomes owned by the encoder and should not be
- *                            manipulated by the client while encoding.
- *                            Unless \a file is \c stdout, it will be closed
- *                            when FLAC__stream_encoder_finish() is called.
- *                            Note however that a proper SEEKTABLE cannot be
- *                            created when encoding to \c stdout since it is
- *                            not seekable.
- * \param  progress_callback  See FLAC__StreamEncoderProgressCallback.  This
- *                            pointer may be \c NULL if the callback is not
- *                            desired.
- * \param  client_data        This value will be supplied to callbacks in their
- *                            \a client_data argument.
- * \assert
- *    \code encoder != NULL \endcode
- *    \code file != NULL \endcode
- * \retval FLAC__StreamEncoderInitStatus
- *    \c FLAC__STREAM_ENCODER_INIT_STATUS_OK if initialization was successful;
- *    see FLAC__StreamEncoderInitStatus for the meanings of other return values.
- */
-FLAC_API FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_ogg_FILE(FLAC__StreamEncoder *encoder, FILE *file, FLAC__StreamEncoderProgressCallback progress_callback, void *client_data);
-
-/** Initialize the encoder instance to encode native FLAC files.
- *
- *  This flavor of initialization sets up the encoder to encode to a plain
- *  FLAC file.  If POSIX fopen() semantics are not sufficient (for example,
- *  with Unicode filenames on Windows), you must use
- *  FLAC__stream_encoder_init_FILE(), or FLAC__stream_encoder_init_stream()
- *  and provide callbacks for the I/O.
- *
- *  This function should be called after FLAC__stream_encoder_new() and
- *  FLAC__stream_encoder_set_*() but before FLAC__stream_encoder_process()
- *  or FLAC__stream_encoder_process_interleaved().
- *  initialization succeeded.
- *
- * \param  encoder            An uninitialized encoder instance.
- * \param  filename           The name of the file to encode to.  The file will
- *                            be opened with fopen().  Use \c NULL to encode to
- *                            \c stdout.  Note however that a proper SEEKTABLE
- *                            cannot be created when encoding to \c stdout since
- *                            it is not seekable.
- * \param  progress_callback  See FLAC__StreamEncoderProgressCallback.  This
- *                            pointer may be \c NULL if the callback is not
- *                            desired.
- * \param  client_data        This value will be supplied to callbacks in their
- *                            \a client_data argument.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__StreamEncoderInitStatus
- *    \c FLAC__STREAM_ENCODER_INIT_STATUS_OK if initialization was successful;
- *    see FLAC__StreamEncoderInitStatus for the meanings of other return values.
- */
-FLAC_API FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_file(FLAC__StreamEncoder *encoder, const char *filename, FLAC__StreamEncoderProgressCallback progress_callback, void *client_data);
-
-/** Initialize the encoder instance to encode Ogg FLAC files.
- *
- *  This flavor of initialization sets up the encoder to encode to a plain
- *  Ogg FLAC file.  If POSIX fopen() semantics are not sufficient (for example,
- *  with Unicode filenames on Windows), you must use
- *  FLAC__stream_encoder_init_ogg_FILE(), or FLAC__stream_encoder_init_ogg_stream()
- *  and provide callbacks for the I/O.
- *
- *  This function should be called after FLAC__stream_encoder_new() and
- *  FLAC__stream_encoder_set_*() but before FLAC__stream_encoder_process()
- *  or FLAC__stream_encoder_process_interleaved().
- *  initialization succeeded.
- *
- * \param  encoder            An uninitialized encoder instance.
- * \param  filename           The name of the file to encode to.  The file will
- *                            be opened with fopen().  Use \c NULL to encode to
- *                            \c stdout.  Note however that a proper SEEKTABLE
- *                            cannot be created when encoding to \c stdout since
- *                            it is not seekable.
- * \param  progress_callback  See FLAC__StreamEncoderProgressCallback.  This
- *                            pointer may be \c NULL if the callback is not
- *                            desired.
- * \param  client_data        This value will be supplied to callbacks in their
- *                            \a client_data argument.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__StreamEncoderInitStatus
- *    \c FLAC__STREAM_ENCODER_INIT_STATUS_OK if initialization was successful;
- *    see FLAC__StreamEncoderInitStatus for the meanings of other return values.
- */
-FLAC_API FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_ogg_file(FLAC__StreamEncoder *encoder, const char *filename, FLAC__StreamEncoderProgressCallback progress_callback, void *client_data);
-
-/** Finish the encoding process.
- *  Flushes the encoding buffer, releases resources, resets the encoder
- *  settings to their defaults, and returns the encoder state to
- *  FLAC__STREAM_ENCODER_UNINITIALIZED.  Note that this can generate
- *  one or more write callbacks before returning, and will generate
- *  a metadata callback.
- *
- *  Note that in the course of processing the last frame, errors can
- *  occur, so the caller should be sure to check the return value to
- *  ensure the file was encoded properly.
- *
- *  In the event of a prematurely-terminated encode, it is not strictly
- *  necessary to call this immediately before FLAC__stream_encoder_delete()
- *  but it is good practice to match every FLAC__stream_encoder_init_*()
- *  with a FLAC__stream_encoder_finish().
- *
- * \param  encoder  An uninitialized encoder instance.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if an error occurred processing the last frame; or if verify
- *    mode is set (see FLAC__stream_encoder_set_verify()), there was a
- *    verify mismatch; else \c true.  If \c false, caller should check the
- *    state with FLAC__stream_encoder_get_state() for more information
- *    about the error.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_finish(FLAC__StreamEncoder *encoder);
-
-/** Submit data for encoding.
- *  This version allows you to supply the input data via an array of
- *  pointers, each pointer pointing to an array of \a samples samples
- *  representing one channel.  The samples need not be block-aligned,
- *  but each channel should have the same number of samples.  Each sample
- *  should be a signed integer, right-justified to the resolution set by
- *  FLAC__stream_encoder_set_bits_per_sample().  For example, if the
- *  resolution is 16 bits per sample, the samples should all be in the
- *  range [-32768,32767].
- *
- *  For applications where channel order is important, channels must
- *  follow the order as described in the
- *  <A HREF="../format.html#frame_header">frame header</A>.
- *
- * \param  encoder  An initialized encoder instance in the OK state.
- * \param  buffer   An array of pointers to each channel's signal.
- * \param  samples  The number of samples in one channel.
- * \assert
- *    \code encoder != NULL \endcode
- *    \code FLAC__stream_encoder_get_state(encoder) == FLAC__STREAM_ENCODER_OK \endcode
- * \retval FLAC__bool
- *    \c true if successful, else \c false; in this case, check the
- *    encoder state with FLAC__stream_encoder_get_state() to see what
- *    went wrong.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_process(FLAC__StreamEncoder *encoder, const FLAC__int32 * const buffer[], unsigned samples);
-
-/** Submit data for encoding.
- *  This version allows you to supply the input data where the channels
- *  are interleaved into a single array (i.e. channel0_sample0,
- *  channel1_sample0, ... , channelN_sample0, channel0_sample1, ...).
- *  The samples need not be block-aligned but they must be
- *  sample-aligned, i.e. the first value should be channel0_sample0
- *  and the last value channelN_sampleM.  Each sample should be a signed
- *  integer, right-justified to the resolution set by
- *  FLAC__stream_encoder_set_bits_per_sample().  For example, if the
- *  resolution is 16 bits per sample, the samples should all be in the
- *  range [-32768,32767].
- *
- *  For applications where channel order is important, channels must
- *  follow the order as described in the
- *  <A HREF="../format.html#frame_header">frame header</A>.
- *
- * \param  encoder  An initialized encoder instance in the OK state.
- * \param  buffer   An array of channel-interleaved data (see above).
- * \param  samples  The number of samples in one channel, the same as for
- *                  FLAC__stream_encoder_process().  For example, if
- *                  encoding two channels, \c 1000 \a samples corresponds
- *                  to a \a buffer of 2000 values.
- * \assert
- *    \code encoder != NULL \endcode
- *    \code FLAC__stream_encoder_get_state(encoder) == FLAC__STREAM_ENCODER_OK \endcode
- * \retval FLAC__bool
- *    \c true if successful, else \c false; in this case, check the
- *    encoder state with FLAC__stream_encoder_get_state() to see what
- *    went wrong.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_process_interleaved(FLAC__StreamEncoder *encoder, const FLAC__int32 buffer[], unsigned samples);
-
-/* \} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib-x86-32/include/cddb/Makefile.am b/lib-x86-32/include/cddb/Makefile.am
deleted file mode 100644
index f6c2f70f..00000000
--- a/lib-x86-32/include/cddb/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-
-pkgincludedir=$(includedir)/cddb
-pkginclude_HEADERS = cddb.h cddb_config.h cddb_disc.h cddb_track.h \
-                     cddb_error.h cddb_conn.h cddb_cmd.h cddb_log.h \
-                     version.h cddb_site.h
-noinst_HEADERS = cddb_ni.h cddb_regex.h cddb_conn_ni.h cddb_cmd_ni.h \
-                 cddb_net.h cddb_log_ni.h ll.h
-
-EXTRA_DIST = version.h.in
diff --git a/lib-x86-32/include/cddb/cddb.h b/lib-x86-32/include/cddb/cddb.h
deleted file mode 100644
index c46700a6..00000000
--- a/lib-x86-32/include/cddb/cddb.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
-    $Id: cddb.h,v 1.14 2006/10/15 12:54:33 airborne Exp $
-
-    Copyright (C) 2003, 2004, 2005 Kris Verbeeck <airborne@advalvas.be>
-
-    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 CDDB_H
-#define CDDB_H 1
-
-#include <cddb/version.h>
-
-#ifdef __cplusplus
-    extern "C" {
-#endif
-
-
-#include <cddb/cddb_config.h>
-#include <cddb/cddb_error.h>
-#include <cddb/cddb_track.h>
-#include <cddb/cddb_disc.h>
-#include <cddb/cddb_site.h>
-#include <cddb/cddb_conn.h>
-#include <cddb/cddb_cmd.h>
-#include <cddb/cddb_log.h>
-
-
-/**
- * \mainpage libCDDB, a C API for CDDB server access
- */
-
-
-#define BIT(n) (1 << n)
-
-/**
- * An enumeration of flags that influence the behaviour of the
- * library.  You can set or reset these flags using the
- * #libcddb_set_flags and #libcddb_reset_flags functions.
- */
-typedef enum {
-    CDDB_F_EMPTY_STR = BIT(0),    /**< never return NULL pointer strings
-                                       (default), return an empty string
-                                       instead */
-    CDDB_F_NO_TRACK_ARTIST = BIT(1), /**< do not return the disc artist as the
-                                       track artist (default), return NULL
-                                       instead */
-} cddb_flag_t;
-
-/**
- * Initializes the library.  This is used to setup any globally used
- * variables.  The first time you create a new CDDB connection structure
- * the library will automatically initialize itself.  So, there is no
- * need to explicitly call this function.
- */
-void libcddb_init(void);
-
-/**
- * Frees up any global (cross connection) resources.  You should call
- * this function before terminating your program.  Using any library
- * calls after shutting down are bound to give problems.
- */
-void libcddb_shutdown(void);
-
-/**
- * Set one or more flags that influence the library behvaiour
- *
- * @param flags A bitwise ORed set of values from #cddb_flag_t.
- */
-void libcddb_set_flags(unsigned int flags);
-
-/**
- * Reset one or more flags that influence the library behvaiour
- *
- * @param flags A bitwise ORed set of values from #cddb_flag_t.
- */
-void libcddb_reset_flags(unsigned int flags);
-
-
-#ifdef __cplusplus
-    }
-#endif
-
-#endif /* CDDB_H */
diff --git a/lib-x86-32/include/cddb/cddb_cmd.h b/lib-x86-32/include/cddb/cddb_cmd.h
deleted file mode 100644
index c5a01fef..00000000
--- a/lib-x86-32/include/cddb/cddb_cmd.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
-    $Id: cddb_cmd.h,v 1.17 2006/10/15 08:58:51 airborne Exp $
-
-    Copyright (C) 2003, 2004, 2005 Kris Verbeeck <airborne@advalvas.be>
-
-    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 CDDB_CMD_H
-#define CDDB_CMD_H 1
-
-#ifdef __cplusplus
-    extern "C" {
-#endif
-
-
-/* --- accessing data on the CDDB server --- */
-
-
-/**
- * Retrieve a disc record from the CDDB server.  This function
- * requires that the category and disc ID of the provided disc
- * structure are valid.
- *
- * If nothing goes wrong, the function will return 1 and the error
- * code will be reset to:
- * - #CDDB_ERR_OK:
- *     If everything went as planned.
- *
- * If there is a problem with reading data from the CDDB server one of
- * the following error codes will be set:
- * - #CDDB_ERR_DATA_MISSING:
- *     If some required data is missing from the given disc
- *     structure to execute this command.
- * - #CDDB_ERR_DISC_NOT_FOUND:
- *     If the requested disc is not known by the CDDB server.
- * - #CDDB_ERR_SERVER_ERROR:
- *     If the server encountered an error while trying to process your
- *     request.
- * - #CDDB_ERR_UNKNOWN:
- *     If the server specified an unknown response code.  Please
- *     report this as a libcddb bug.
- *
- * When there are problems with the connection to the CDDB server one
- * of the following error codes will be set:
- * - #CDDB_ERR_UNKNOWN_HOST_NAME:
- *     If there was an error when resolving the host name of the CDDB
- *     server.
- * - #CDDB_ERR_CONNECT:
- *     If a connection to the CDDB server could not be established.
- *     This can be due to incorrect data about the location of the
- *     server (host name, port).
- * - #CDDB_ERR_NOT_CONNECTED:
- *     If something when wrong in the process and you got
- *     disconnected.  Retrying might succeed (but no guarantees).
- * - #CDDB_ERR_PERMISSION_DENIED:
- *     If the server is up and running but denied the connection.
- *     This can occur when the server is too highly loaded or the
- *     handshake information (user name, ...) is considered to be
- *     invalid.
- *
- * @param c    The CDDB connection structure.
- * @param disc A non-null CDDB disc structure.
- * @return 1 on succes, 0 on failure
- */
-int cddb_read(cddb_conn_t *c, cddb_disc_t *disc);
-
-/**
- * Query the CDDB database for a list of possible disc matches.  This
- * function requires that the disc ID and disc length of the provided
- * disc structure are valid.  The disc should also contain a number of
- * tracks and for each track its frame offset on the CD should be
- * valid.
- *
- * If there are multiple matches then only the first one will be
- * returned by this function.  For other matches you will have to use
- * the #cddb_query_next function.
- *
- * @param c    The CDDB connection structure.
- * @param disc A non-null CDDB disc structure.
- *
- * @return The number of matches found or -1 on error.
- */
-int cddb_query(cddb_conn_t *c, cddb_disc_t *disc);
-
-/**
- * Returns the next match in a CDDB query result set.  This function
- * should be used in conjunction with #cddb_query.
- *
- * @param c    The CDDB connection structure.
- * @param disc A non-null CDDB disc structure.
- */
-int cddb_query_next(cddb_conn_t *c, cddb_disc_t *disc);
-
-/**
- * Perform a text search in the CDDB database.  Instead of actually
- * needing information about a real disc like in #cddb_query this
- * function accept a string that is used for searching the database.
- *
- * If there are multiple matches then only the first one will be
- * returned by this function.  For other matches you will have to use
- * the #cddb_search_next function.
- *
- * @param c    The CDDB connection structure.
- * @param disc A non-null CDDB disc structure.
- * @param str  The search string
- *
- * @return The number of matches found or -1 on error.
- */
-int cddb_search(cddb_conn_t *c, cddb_disc_t *disc, const char *str);
-
-/**
- * Returns the next match in a CDDB search result set.  This function
- * should be used in conjunction with #cddb_search.
- *
- * @param c    The CDDB connection structure.
- * @param disc A non-null CDDB disc structure.
- */
-int cddb_search_next(cddb_conn_t *c, cddb_disc_t *disc);
-
-/**
- * Perform a text search in the CDDB database.  It uses the album
- * command implemented on the freedb2.org servers.  Either the album
- * title or artist's name should be filled in, in the disc structure.
- *
- * If there are multiple matches then only the first one will be
- * returned by this function.  For other matches you will have to use
- * the #cddb_album_next function.
- *
- * @param c The CDDB connection structure.
- * @param disc A non-null CDDB disc structure.
- *
- * @return The number of matches found or -1 on error.
- */
-int cddb_album(cddb_conn_t *c, cddb_disc_t *disc);
-
-/**
- * Returns the next match in a CDDB album result set.  This function
- * should be used in conjunction with #cddb_album.
- *
- * @param c    The CDDB connection structure.
- * @param disc A non-null CDDB disc structure.
- */
-int cddb_album_next(cddb_conn_t *c, cddb_disc_t *disc);
-
-/**
- * Submit a new or updated disc to the CDDB database.  This function
- * requires that the disc ID, length, category, artist and title of
- * the provided disc structure are valid.  The disc should also
- * contain a number of tracks and for each track its frame offset on
- * the CD and title should be valid.
- *
- * @param c    The CDDB connection structure.
- * @param disc A non-null CDDB disc structure.
- */
-int cddb_write(cddb_conn_t *c, cddb_disc_t *disc);
-
-/**
- * Query the currently configured server for a list of mirrors.
- * Accessing the list of mirror sites is done with the iterator
- * functions #cddb_first_site and #cddb_next_site.
- *
- * @param c The CDDB connection structure.
- */
-int cddb_sites(cddb_conn_t *c);
-
-
-#ifdef __cplusplus
-    }
-#endif
-
-#endif /* CDDB_CMD_H */
diff --git a/lib-x86-32/include/cddb/cddb_cmd_ni.h b/lib-x86-32/include/cddb/cddb_cmd_ni.h
deleted file mode 100644
index 4b02190a..00000000
--- a/lib-x86-32/include/cddb/cddb_cmd_ni.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-    $Id: cddb_cmd_ni.h,v 1.12 2006/10/15 08:59:20 airborne Exp $
-
-    Copyright (C) 2003, 2004, 2005 Kris Verbeeck <airborne@advalvas.be>
-
-    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 CDDB_CMD_NI_H
-#define CDDB_CMD_NI_H 1
-
-#ifdef __cplusplus
-    extern "C" {
-#endif
-
-
-typedef enum {
-       CMD_HELLO = 0,
-       CMD_QUIT,
-       CMD_READ,
-       CMD_QUERY,
-       CMD_WRITE,
-       CMD_PROTO,
-       CMD_SITES,
-       CMD_SEARCH,
-       CMD_ALBUM,
-       /* dummy for array size */
-       CMD_LAST
-} cddb_cmd_t;
-
-
-/* --- utility functions --- */
-
-
-/**
- * Will read in one line from the response input stream and parse both
- * the code and message in that line.  Errors will be signaled by
- * returning -1.
- *
- * @param c   the CDDB connection structure
- * @param msg the CDDB response msg
- * @return the CDDB response code or -1 on error
- */
-int cddb_get_response_code(cddb_conn_t *c, char **msg);
-
-/**
- */
-int cddb_send_cmd(cddb_conn_t *c, int cmd, ...);
-
-
-#ifdef __cplusplus
-    }
-#endif
-
-#endif /* CDDB_CMD_H */
diff --git a/lib-x86-32/include/cddb/cddb_config.h b/lib-x86-32/include/cddb/cddb_config.h
deleted file mode 100644
index fd0d3769..00000000
--- a/lib-x86-32/include/cddb/cddb_config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-    $Id: cddb_config.h.in,v 1.3 2005/03/11 21:29:29 airborne Exp $
-
-    Copyright (C) 2004, 2005 Kris Verbeeck <airborne@advalvas.be>
-
-    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 CDDB_CONFIG_H
-#define CDDB_CONFIG_H 1
-
-/* Define if you have <unistd.h> and need it included. 
-   On MacOS, <regex.h> needs this but that header doesn't
-   include it.
-*/
-#undef CDDB_NEED_UNISTD_H
-
-/* Define if you have <sys/socket.h> and need it included. 
-   On MacOS, <cddb_net.h> needs this but that header doesn't
-   include it.
-*/
-#undef CDDB_NEED_SYS_SOCKET_H
-
-#endif /* CDDB_CONFIG_H */
diff --git a/lib-x86-32/include/cddb/cddb_config.h.in b/lib-x86-32/include/cddb/cddb_config.h.in
deleted file mode 100644
index fd0d3769..00000000
--- a/lib-x86-32/include/cddb/cddb_config.h.in
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-    $Id: cddb_config.h.in,v 1.3 2005/03/11 21:29:29 airborne Exp $
-
-    Copyright (C) 2004, 2005 Kris Verbeeck <airborne@advalvas.be>
-
-    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 CDDB_CONFIG_H
-#define CDDB_CONFIG_H 1
-
-/* Define if you have <unistd.h> and need it included. 
-   On MacOS, <regex.h> needs this but that header doesn't
-   include it.
-*/
-#undef CDDB_NEED_UNISTD_H
-
-/* Define if you have <sys/socket.h> and need it included. 
-   On MacOS, <cddb_net.h> needs this but that header doesn't
-   include it.
-*/
-#undef CDDB_NEED_SYS_SOCKET_H
-
-#endif /* CDDB_CONFIG_H */
diff --git a/lib-x86-32/include/cddb/cddb_conn.h b/lib-x86-32/include/cddb/cddb_conn.h
deleted file mode 100644
index ada3cdda..00000000
--- a/lib-x86-32/include/cddb/cddb_conn.h
+++ /dev/null
@@ -1,562 +0,0 @@
-/*
-    $Id: cddb_conn.h,v 1.31 2009/03/01 03:28:07 jcaratzas Exp $
-
-    Copyright (C) 2003, 2004, 2005 Kris Verbeeck <airborne@advalvas.be>
-
-    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 CDDB_CONN_H
-#define CDDB_CONN_H 1
-
-#ifdef __cplusplus
-    extern "C" {
-#endif
-
-
-#include <stdio.h>
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-
-#include "cddb/cddb_site.h"
-
-
-typedef enum {
-    CACHE_OFF = 0,              /**< do not use local CDDB cache, network
-                                     only */
-    CACHE_ON,                   /**< use local CDDB cache, if possible */
-    CACHE_ONLY                  /**< only use local CDDB cache, no network
-                                     access */
-} cddb_cache_mode_t;
-
-/**
- * Forward declaration of opaque structure used for character set
- * conversions.
- */
-typedef struct cddb_iconv_s *cddb_iconv_t;
-
-/**
- * An opaque structure for keeping state about the connection to a
- * CDDB server.
- */
-typedef struct cddb_conn_s cddb_conn_t;
-
-/**
- * Which fields to use for the full text search is defined by one or
- * more of the constants below.
- */
-typedef enum {
-    SEARCH_NONE = 0,            /**< no fields */
-    SEARCH_ARTIST = 1,          /**< artist name field */
-    SEARCH_TITLE = 2,           /**< disc title field */
-    SEARCH_TRACK = 4,           /**< track title field */
-    SEARCH_OTHER = 8,           /**< other fields */
-    SEARCH_ALL = ~0,            /**< all fields */
-} cddb_search_t;
-
-/**
- * Macro to be used for building the category search bit-string from
- * the values of #cddb_cat_t.
- */
-#define SEARCHCAT(c) (1 << (c))
-
-
-/* --- construction / destruction --- */
-
-
-/**
- * Creates a new CDDB connection structure.  This structure will have
- * to be passed to all libcddb functions.  Default values will be used
- * for the connection parameters allowing it to contact the CDDB
- * server at freedb.org.
- *
- * @return The CDDB connection structure or NULL if something went wrong.
- */
-cddb_conn_t *cddb_new(void);
-
-/**
- * Free all resources associated with the given CDDB connection
- * structure.
- */
-void cddb_destroy(cddb_conn_t *c);
-
-
-/* --- getters & setters --- */
-
-
-/**
- * Set the character set.  By default the FreeDB server uses UTF-8 when
- * providing CD data.  When a character set is defined with this function
- * any strings retrieved from or sent to the server will automatically be
- * converted.
- *
- * @param c The connection structure.
- * @param cs The character set that will be used.
- * @return False if the specified character set is unknown, or no conversion
- *         from/to UTF-8 is available.  True otherwise.
- */
-int cddb_set_charset(cddb_conn_t *c, const char *cs);
-
-/**
- * Change the size of the internal buffer.
- *
- * @param c The connection structure.
- * @param size The new buffer size.
- */
-void cddb_set_buf_size(cddb_conn_t *c, unsigned int size);
-
-/**
- * Set all server details in one go through the use of a site structure.  This
- * function initializzes the server address, port, protocol and query path in
- * case of HTTP.
- *
- * @see cddb_sites
- * @see cddb_first_site
- * @see cddb_next_site
- *
- * @param c The connection structure.
- * @param site The site to use.
- * @return Error code: CDDB_ERR_OK or CDDB_ERR_INVALID.
- */
-cddb_error_t cddb_set_site(cddb_conn_t *c, const cddb_site_t *site);
-
-/**
- * Get the host name of the CDDB server that is currently being used.
- *
- * @see cddb_set_server_name
- *
- * @param c The connection structure.
- * @return The server host name.
- */
-const char *cddb_get_server_name(const cddb_conn_t *c);
-
-/**
- * Set the host name of the CDDB server.  The default value for the
- * server is 'freedb.org'.
- *
- * @see cddb_get_server_name
- *
- * @param c      The connection structure.
- * @param server The server host name.
- */
-void cddb_set_server_name(cddb_conn_t *c, const char *server);
-
-/**
- * Get the port of the CDDB server that is currently being used.
- *
- * @see cddb_set_server_port
- *
- * @param c The connection structure.
- * @return The server port.
- */
-unsigned int cddb_get_server_port(const cddb_conn_t *c);
-
-/**
- * Set the port of the CDDB server.  The default value is 888.
- *
- * @see cddb_get_server_port
- *
- * @param c    The connection structure.
- * @param port The server port.
- */
-void cddb_set_server_port(cddb_conn_t *c, int port);
-
-/**
- * Get the network time out value (in seconds).
- *
- * @see cddb_set_timeout
- *
- * @param c The connection structure.
- * @return The current time out in seconds.
- */
-unsigned int cddb_get_timeout(const cddb_conn_t *c);
-
-/**
- * Set the network time out value (in seconds).  The default is 10
- * seconds.
- *
- * @see cddb_get_timeout
- *
- * @param c The connection structure.
- * @param t The new time out in seconds.
- */
-void cddb_set_timeout(cddb_conn_t *c, unsigned int t);
-
-/**
- * Get the URL path for querying a CDDB server through HTTP.
- *
- * @see cddb_set_http_path_query
- *
- * @param c The connection structure.
- * @return The URL path.
- */
-const char *cddb_get_http_path_query(const cddb_conn_t *c);
-
-/**
- * Set the URL path for querying a CDDB server through HTTP.  The
- * default value is '/~cddb/cddb.cgi'.
- *
- * @see cddb_get_http_path_query
- *
- * @param c    The connection structure.
- * @param path The URL path.
- */
-void cddb_set_http_path_query(cddb_conn_t *c, const char *path);
-
-/**
- * Get the URL path for submitting to a CDDB server through HTTP.
- *
- * @see cddb_set_http_path_submit
- *
- * @param c The connection structure.
- * @return The URL path.
- */
-const char *cddb_get_http_path_submit(const cddb_conn_t *c);
-
-/**
- * Set the URL path for submitting to a CDDB server through HTTP.  The
- * default value is '/~cddb/submit.cgi'.
- *
- * @see cddb_get_http_path_submit
- *
- * @param c The connection structure.
- * @param path The URL path.
- */
-void cddb_set_http_path_submit(cddb_conn_t *c, const char *path);
-
-/**
- * Returns true if the HTTP protocol is currently enabled and false if
- * CDDBP is enabled.
- *
- * @see cddb_http_enable
- * @see cddb_http_disable
- *
- * @param c The CDDB connection structure.
- * @return True or false.
- */
-unsigned int cddb_is_http_enabled(const cddb_conn_t *c);
-
-/**
- * Enable HTTP tunneling to connect to the CDDB server.  By default
- * this option is disabled.
- *
- * @see cddb_is_http_enabled
- * @see cddb_http_disable
- *
- * @param c The CDDB connection structure.
- */
-void cddb_http_enable(cddb_conn_t *c);
-
-/**
- * Disable HTTP tunneling to connect to the CDDB server.  By default this
- * option is disabled.
- *
- * @see cddb_is_http_enabled
- * @see cddb_http_enable
- *
- * @param c The CDDB connection structure.
- */
-void cddb_http_disable(cddb_conn_t *c);
-
-/**
- * Returns true if the proxy support is currently enabled and false if
- * it is not.  This fucntion does not check whether HTTP is enabled.
- * So it is possible that true will be returned while in reality the
- * CDDBP protocol is being used (no proxy support).
- *
- * @see cddb_http_proxy_enable
- * @see cddb_http_proxy_disable
- *
- * @param c The CDDB connection structure.
- * @return True or false.
- */
-unsigned int cddb_is_http_proxy_enabled(const cddb_conn_t *c);
-
-/**
- * Enable HTTP tunneling through an HTTP proxy server to connect to
- * the CDDB server.  The usage of an HTTP proxy implies normal HTTP
- * tunneling instead of connecting directly to the CDDB server.  By
- * default this option is disabled.
- *
- * @see cddb_is_http_proxy_enabled
- * @see cddb_http_proxy_disable
- *
- * @param c The CDDB connection structure.
- */
-void cddb_http_proxy_enable(cddb_conn_t *c);
-
-/**
- * Disable HTTP tunneling through an HTTP proxy server to connect to
- * the CDDB server.  By default this option is disabled.
- *
- * @see cddb_is_http_proxy_enabled
- * @see cddb_http_proxy_enable
- *
- * @param c The CDDB connection structure.
- */
-void cddb_http_proxy_disable(cddb_conn_t *c);
-
-/**
- * Get the host name of the HTTP proxy server.
- *
- * @see cddb_set_http_proxy_server_name
- *
- * @param c The connection structure.
- * @return The proxy server host name.
- */
-const char *cddb_get_http_proxy_server_name(const cddb_conn_t *c);
-
-/**
- * Set the host name of the HTTP proxy server.  There is no default
- * value.
- *
- * @see cddb_get_http_proxy_server_name
- *
- * @param c      The connection structure.
- * @param server The server host name.
- */
-void cddb_set_http_proxy_server_name(cddb_conn_t *c, const char *server);
-
-/**
- * Get the port of the HTTP proxy server.
- *
- * @see cddb_set_http_proxy_server_port
- *
- * @param c The connection structure.
- * @return The proxy server port.
- */
-unsigned int cddb_get_http_proxy_server_port(const cddb_conn_t *c);
-
-/**
- * Set the port of the HTTP proxy server.  The default value is 8080.
- *
- * @see cddb_get_http_proxy_server_port
- *
- * @param c    The connection structure.
- * @param port The server port.
- */
-void cddb_set_http_proxy_server_port(cddb_conn_t *c, int port);
-
-/**
- * Set the HTTP proxy user name which is used when Basic Authentication
- * is required.
- *
- * @param c        The connection structure.
- * @param username The user name.
- */
-void cddb_set_http_proxy_username(cddb_conn_t* c, const char* username);
-
-/**
- * Get the HTTP proxy user name.
- *
- * @param c The connection structure.
- * @return The user name.
- */
-const char *cddb_get_http_proxy_username(const cddb_conn_t *c);
-
-/**
- * Set the HTTP proxy password which is used when Basic Authentication
- * is required.
- *
- * @param c      The connection structure.
- * @param passwd The password.
- */
-void cddb_set_http_proxy_password(cddb_conn_t* c, const char* passwd);
-
-/**
- * Get the HTTP proxy password. 
- *
- * @param c The connection structure.
- * @return The password.
- */
-const char *cddb_get_http_proxy_password(const cddb_conn_t *c);
-
-/**
- * Set the HTTP proxy user name and password in one go.  These
- * credentials are used when Basic Authentication is required.  The
- * advantage of using this function over setting the user name and
- * password seperately is that the cleartext user name and password
- * are not kept in memory longer than needed.
- *
- * @param c        The connection structure.
- * @param username The user name.
- * @param passwd   The password.
- */
-void cddb_set_http_proxy_credentials(cddb_conn_t* c,
-                                     const char *username, const char* passwd);
-
-/**
- * Get the error number returned by the last libcddb command.
- *
- * @param c The CDDB connection structure.
- * @return The error number.
- */
-cddb_error_t cddb_errno(const cddb_conn_t *c);
-
-/**
- * Set the name and version of the client program overwriting the
- * previous values.  This function will make a copy of the provided
- * strings.  The defaults are 'libcddb' and the version number of the
- * libcddb library in use.  Both parameters must be valid strings.  If
- * any of teh strings is NULL, this fucntion will return without
- * changing anything.
- *
- * @param c        The connection structure.
- * @param cname    The name of the client program.
- * @param cversion The version number of the client program.
- */
-void cddb_set_client(cddb_conn_t *c, const char *cname, const char *cversion);
-
-/**
- * Sets the user name and host name of the local machine.  This
- * function will parse out the user name and host name from the e-mail
- * address.
- *
- * @param c     The connection structure.
- * @param email The e-mail address of the user.
- */
-int cddb_set_email_address(cddb_conn_t *c, const char *email);
-
-/**
- * Returns the current cache mode.  This can be either on, off or
- * cache only.
- *
- * @see CACHE_ON
- * @see CACHE_ONLY
- * @see CACHE_OFF
- * @see cddb_cache_enable
- * @see cddb_cache_only
- * @see cddb_cache_disable
- *
- * @param c The connection structure.
- */
-cddb_cache_mode_t cddb_cache_mode(const cddb_conn_t *c);
-
-/**
- * Enable caching of CDDB entries locally.  Caching is enabled by
- * default.  The cache directory can be changed with the
- * cddb_cache_set_dir function.
- *
- * @see cddb_cache_mode
- * @see cddb_cache_disable
- * @see cddb_cache_only
- *
- * @param c The connection structure.
- */
-void cddb_cache_enable(cddb_conn_t *c);
-
-/**
- * Only use the local CDDB cache.  Never contact a server to retrieve
- * any data.  The cache directory can be changed with the
- * cddb_cache_set_dir function.
- *
- * @see cddb_cache_mode
- * @see cddb_cache_enable
- * @see cddb_cache_disable
- *
- * @param c The connection structure.
- */
-void cddb_cache_only(cddb_conn_t *c);
-
-/**
- * Disable caching of CDDB entries locally.  All data will be fetched
- * from a CDDB server everytime and the retrieved data will not be
- * cached locally.
- *
- * @see cddb_cache_mode
- * @see cddb_cache_enable
- * @see cddb_cache_only
- *
- * @param c The connection structure.
- */
-void cddb_cache_disable(cddb_conn_t *c);
-
-/**
- * Return the directory currently being used for caching.
- *
- * @see cddb_cache_set_dir
- *
- * @param c The connection structure.
- * @return The directory being used for caching.
- */
-const char *cddb_cache_get_dir(const cddb_conn_t *c);
-
-/**
- * Change the directory used for caching CDDB entries locally.  The
- * default location of the cached entries is a subdirectory
- * (.cddbslave) of the user's home directory.  If the first character
- * of the directory is '~', then it will be expanded to the contents
- * of $HOME.
- *
- * @see cddb_cache_get_dir
- *
- * @param c   The connection structure.
- * @param dir The directory to use for caching.
- */
-int cddb_cache_set_dir(cddb_conn_t *c, const char *dir);
-
-/**
- * Retrieve the first CDDB mirror site.
- *
- * @param c The connection structure.
- * @return The first mirror site or NULL if not found.
- */
-const cddb_site_t *cddb_first_site(cddb_conn_t *c);
-
-/**
- * Retrieve the next CDDB mirror site.
- *
- * @param c The connection structure.
- * @return The next mirror site or NULL if not found.
- */
-const cddb_site_t *cddb_next_site(cddb_conn_t *c);
-
-/**
- * Set the bit-string specifying which fields to examine when
- * performing a text search.  By default only the artist and disc
- * title fields are searched.
- *
- * @param c The connection structure.
- * @param fields A bitwise ORed set of values from #cddb_search_t.
- */
-void cddb_search_set_fields(cddb_conn_t *c, unsigned int fields);
-
-/**
- * Set the bit-string specifying which categories to examine when
- * performing a text search.  The #SEARCHCAT macro needs to be used to
- * build the actual bit-string from individual categories.  The
- * #cddb_search_t values #SEARCH_NONE and #SEARCH_ALL are also valid.
- * The example below shows some possible combinations.  By default all
- * categories are searched.
- *
- * @code
- * unsigned int cats = SEARCHCAT(CDDB_CAT_ROCK) | SEARCHCAT(CDDB_CAT_MISC);
- * unsigned int cats = SEARCH_ALL;
- * unsigned int cats = SEARCH_NONE;
- * @endcode
- *
- * @param c The connection structure.
- * @param cats A bitwise ORed set of values from #SEARCHCAT(#cddb_cat_t).
- */
-void cddb_search_set_categories(cddb_conn_t *c, unsigned int cats);
-
-
-#ifdef __cplusplus
-    }
-#endif
-
-#endif /* CDDB_CONN_H */
diff --git a/lib-x86-32/include/cddb/cddb_conn_ni.h b/lib-x86-32/include/cddb/cddb_conn_ni.h
deleted file mode 100644
index 6eddbdcf..00000000
--- a/lib-x86-32/include/cddb/cddb_conn_ni.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
-    $Id: cddb_conn_ni.h,v 1.14 2005/08/03 18:27:19 airborne Exp $
-
-    Copyright (C) 2003, 2004, 2005 Kris Verbeeck <airborne@advalvas.be>
-
-    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 CDDB_CONN_NI_H
-#define CDDB_CONN_NI_H 1
-
-#ifdef __cplusplus
-    extern "C" {
-#endif
-
-
-#include "cddb_ni.h"
-#include "ll.h"
-
-
-/* --- type definitions */
-
-
-/** Actual definition of iconv structure. */
-struct cddb_iconv_s
-{
-    iconv_t cd_to_freedb;       /**< character set conversion descriptor for
-                                     converting from user to FreeDB format */
-    iconv_t cd_from_freedb;     /**< character set conversion descriptor for
-                                     converting from FreeDB to user format */
-};
-
-/** Actual definition of serach parameters structure. */
-typedef struct cddb_search_params_s
-{
-    unsigned int fields;        /**< fields to search (cddb_search_t
-                                     bit string) */
-    unsigned int cats;          /**< categories to search (cddb_cat_t
-                                     bit string) */
-} cddb_search_params_t;
-
-/** Actual definition of connection structure. */
-struct cddb_conn_s 
-{
-    unsigned int buf_size;      /**< maximum line/buffer size, defaults to 1024
-                                     (see DEFAULT_BUF_SIZE) */
-    char *line;                 /**< last line read */
-
-    int is_connected;           /**< are we already connected to the server? */
-    struct sockaddr_in sa;      /**< the socket address structure for
-                                     connecting to the CDDB server */
-    int socket;                 /**< the socket file descriptor */
-    char *server_name;          /**< host name of the CDDB server, defaults
-                                     to 'freedb.org' (see DEFAULT_SERVER) */
-    int server_port;            /**< port of the CDDB server, defaults to 888 
-                                     (see DEFAULT_PORT) */
-    int timeout;                /**< time out interval (in seconds) used during
-                                     network operations, defaults to 10 seconds
-                                     (see DEFAULT_TIMEOUT) */
-
-    char *http_path_query;      /**< URL for querying the server through HTTP,
-                                     defaults to /~cddb/cddb.cgi'
-                                     (see DEFAULT_PATH_QUERY) */
-    char *http_path_submit;     /**< URL for submitting to the server through HTTP,
-                                     defaults to /~cddb/submit.cgi'
-                                     (see DEFAULT_PATH_SUBMIT) */
-    int is_http_enabled;        /**< use HTTP, disabled by default */
-
-    int is_http_proxy_enabled;  /**< use HTTP through a proxy server,
-                                     disabled by default */
-    char *http_proxy_server;    /**< host name of the HTTP proxy server */
-    int http_proxy_server_port; /**< port of the HTTP proxy server,
-                                     defaults to 8080 (see DEFAULT_PROXY_PORT) */
-    char *http_proxy_username;  /**< HTTP proxy user name */
-    char *http_proxy_password;  /**< HTTP proxy password */
-    char *http_proxy_auth;      /**< Base64 encoded username:password */
-
-    FILE *cache_fp;             /**< a file pointer to a cached CDDB entry or
-                                     NULL if no cached version is available */
-    cddb_cache_mode_t use_cache;/**< field to specify local CDDB cache behaviour, 
-                                     enabled by default (CACHE_ON) */
-    char *cache_dir;            /**< CDDB slave cache, defaults to 
-                                     '~/.cddbslave' (see DEFAULT_CACHE) */
-    int cache_read;             /**< read data from cached file instead of
-                                     from the network */
-
-    char *cname;                /**< name of the client program, 'libcddb' by
-                                     default */
-    char *cversion;             /**< version of the client program, current 
-                                     libcddb version by default */
-    char *user;                 /**< user name supplied to CDDB server, defaults
-                                     to the value of the 'USER' environment 
-                                     variable or 'anonymous' if undefined */
-    char *hostname;             /**< host name of the local machine, defaults
-                                     to the value of the 'HOSTNAME' environment
-                                     variable or 'localhost' if undefined */
-
-    cddb_error_t errnum;        /**< error number of last CDDB command */
-
-    list_t *query_data;         /**< list to keep CDDB query results */
-    list_t *sites_data;         /**< list to keep FreeDB mirror sites */
-    cddb_search_params_t srch;  /**< parameters for text search */
-
-    cddb_iconv_t charset;       /**< character set conversion settings */
-};
-
-
-/* --- getters & setters --- */
-
-
-#define cddb_cache_file(c) (c)->cache_fp
-
-
-/* --- connecting / disconnecting --- */
-
-
-int cddb_connect(cddb_conn_t *c);
-
-void cddb_disconnect(cddb_conn_t *c);
-
-
-/* --- miscellaneous --- */
-
-
-/**
- * Clone proxy settings from source connection to destinaton
- * connection.
- */
-void cddb_clone_proxy(cddb_conn_t *dst, cddb_conn_t *src);
-
-
-/* --- error handling --- */
-
-
-/**
- * Set the error number for the last libcddb command.
- *
- * @param c The CDDB connection structure.
- * @param n The error number
- */
-#define cddb_errno_set(c, n) (c)->errnum = n
-
-/**
- * Set the error number for the last libcddb command.  If this number
- * is different from CDDB_ERR_OK, a message is also logged with the
- * level specified.
- *
- * @param c The CDDB connection structure.
- * @param n The error number
- * @param l The log level
- */
-#define cddb_errno_log(c, n, l) cddb_errno_set(c, n); cddb_log(l, cddb_error_str(n))
-
-#define cddb_errno_log_debug(c, n) cddb_errno_log(c, n, CDDB_LOG_DEBUG)
-#define cddb_errno_log_info(c, n) cddb_errno_log(c, n, CDDB_LOG_INFO)
-#define cddb_errno_log_warn(c, n) cddb_errno_log(c, n, CDDB_LOG_WARN)
-#define cddb_errno_log_error(c, n) cddb_errno_log(c, n, CDDB_LOG_ERROR)
-#define cddb_errno_log_crit(c, n) cddb_errno_log(c, n, CDDB_LOG_CRITICAL)
-
-
-#ifdef __cplusplus
-    }
-#endif
-
-#endif /* CDDB_CONN_NI_H */
diff --git a/lib-x86-32/include/cddb/cddb_disc.h b/lib-x86-32/include/cddb/cddb_disc.h
deleted file mode 100644
index 7951ae96..00000000
--- a/lib-x86-32/include/cddb/cddb_disc.h
+++ /dev/null
@@ -1,450 +0,0 @@
-/*
-    $Id: cddb_disc.h,v 1.22 2007/08/07 03:12:53 jcaratzas Exp $
-
-    Copyright (C) 2003, 2004, 2005 Kris Verbeeck <airborne@advalvas.be>
-
-    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 CDDB_DISC_H
-#define CDDB_DISC_H 1
-
-#ifdef __cplusplus
-    extern "C" {
-#endif
-
-
-#include <cddb/cddb_track.h>
-
-
-/**
- * The number of frames that fit into one second.
- */
-#define FRAMES_PER_SECOND 75
-
-/**
- * This macro converts an amount of frames into an amount of seconds.
- */
-#define FRAMES_TO_SECONDS(f) ((f) / FRAMES_PER_SECOND)
-
-/**
- * This macro converts an amount of seconds into an amount of frames.
- */
-#define SECONDS_TO_FRAMES(s) ((s) * FRAMES_PER_SECOND)
-
-/**
- * The different CDDB categories.
- */
-typedef enum {
-    CDDB_CAT_DATA = 0,          /**< data disc */
-    CDDB_CAT_FOLK,              /**< folk music */
-    CDDB_CAT_JAZZ,              /**< jazz music */
-    CDDB_CAT_MISC,              /**< miscellaneous, use if no other
-                                     category matches */
-    CDDB_CAT_ROCK,              /**< rock and pop music */
-    CDDB_CAT_COUNTRY,           /**< country music */
-    CDDB_CAT_BLUES,             /**< blues music */
-    CDDB_CAT_NEWAGE,            /**< new age music */
-    CDDB_CAT_REGGAE,            /**< reggae music */
-    CDDB_CAT_CLASSICAL,         /**< classical music */
-    CDDB_CAT_SOUNDTRACK,        /**< soundtracks */
-    CDDB_CAT_INVALID,           /**< (internal) invalid category */
-    CDDB_CAT_LAST               /**< (internal) category counter */
-} cddb_cat_t;
-
-/**
- * String values for the CDDB categories.
- */
-extern const char *CDDB_CATEGORY[CDDB_CAT_LAST];
-
-/**
- * The CDDB disc structure.  Contains all information associated with
- * a full CD.
- */
-typedef struct cddb_disc_s cddb_disc_t;
-
-
-/* --- construction / destruction */
-
-
-/**
- * Creates a new CDDB disc structure.
- *
- * @return The CDDB disc structure or NULL if memory allocation failed.
- */
-cddb_disc_t *cddb_disc_new(void);
-
-/**
- * Free all resources associated with the given CDDB disc structure.
- * The tracks will also be freed automatically.
- *
- * @param disc The CDDB disc structure.
- */
-void cddb_disc_destroy(cddb_disc_t *disc);
-
-/**
- * Creates a clone of the given disc.
- *
- * @param disc The CDDB disc structure.
- */
-cddb_disc_t *cddb_disc_clone(const cddb_disc_t *disc);
-
-
-/* --- track manipulation */
-
-
-/**
- * Add a new track to a disc.  The track is added to the end of the
- * existing list of tracks.
- *
- * @param disc The CDDB disc structure.
- * @param track The CDDB track structure.
- */
-void cddb_disc_add_track(cddb_disc_t *disc, cddb_track_t *track);
-
-/**
- * Retrieves a numbered track from the disc.  If there is no track
- * with the given number, then NULL will be returned.
- *
- * @param disc The CDDB disc structure.
- * @param track_no The track number; starting at 0.
- */
-cddb_track_t *cddb_disc_get_track(const cddb_disc_t *disc, int track_no);
-
-/**
- * Returns the first track of the disc.  If there is no such track
- * then NULL will be returned.  The internal track iterator will also
- * be reset.  This function should be called before the first call to
- * cddb_disc_get_track_next.
- *
- * @see cddb_disc_get_track_next
- *
- * @param disc The CDDB disc structure.
- */
-cddb_track_t *cddb_disc_get_track_first(cddb_disc_t *disc);
-
-/**
- * Returns the next track on the disc and advances the internal track
- * iterator.  If there is no such track then NULL will be returned.
- * This function should be called after calling
- * cddb_disc_get_track_first.
- *
- * @see cddb_disc_get_track_first
- *
- * @param disc The CDDB disc structure.
- */
-cddb_track_t *cddb_disc_get_track_next(cddb_disc_t *disc);
-
-
-/* --- setters / getters --- */
-
-
-/**
- * Get the ID of the disc.  If the disc is invalid or the disc ID is
- * not yet initialized 0 will be returned.
- *
- * @param disc The CDDB disc structure.
- */
-unsigned int cddb_disc_get_discid(const cddb_disc_t *disc);
-
-/**
- * Set the ID of the disc.  When the disc ID is not known yet, then it
- * can be calculated with the cddb_disc_calc_discid function (which
- * will automatically initialize the correct field in the disc
- * structure).
- *
- * @see cddb_disc_calc_discid
- *
- * @param disc The CDDB disc structure.
- * @param id The disc ID.
- */
-void cddb_disc_set_discid(cddb_disc_t *disc, unsigned int id);
-
-/**
- * Get the disc CDDB category ID.  If the disc is invalid or no
- * category is set then CDDB_CAT_INVALID will be returned.  If you
- * want a string representation of the category use the
- * cddb_disc_get_category_str function.
- *
- * @see cddb_disc_set_category
- * @see cddb_disc_get_category_str
- * @see cddb_disc_set_category_str
- * @see cddb_cat_t
- * @see CDDB_CATEGORY
- *
- * @param disc The CDDB disc structure.
- * @return The CDDB category ID.
- */
-cddb_cat_t cddb_disc_get_category(const cddb_disc_t *disc);
-
-/**
- * Set the disc CDDB category ID.
- *
- * @see cddb_disc_get_category
- * @see cddb_disc_get_category_str
- * @see cddb_disc_set_category_str
- * @see cddb_cat_t
- * @see CDDB_CATEGORY
- *
- * @param disc The CDDB disc structure.
- * @param cat  The CDDB category ID.
- */
-void cddb_disc_set_category(cddb_disc_t *disc, cddb_cat_t cat);
-
-/**
- * Get the disc CDDB category as a string.  If no category is set for
- * this disc then 'invalid' will be returned.  If the disc structure
- * is invalid NULL is returned.  If you only want the ID of the
- * category use the cddb_disc_get_category function.
- *
- * @see cddb_disc_get_category
- * @see cddb_disc_set_category
- * @see cddb_disc_set_category_str
- *
- * @param disc The CDDB disc structure.
- * @return The CDDB category ID.
- */
-const char *cddb_disc_get_category_str(cddb_disc_t *disc);
-
-/**
- * Sets the category of the disc.  If the specified category is
- * an invalid CDDB category, then CDDB_CAT_MISC will be used.
- *
- * @see cddb_disc_get_category
- * @see cddb_disc_set_category
- * @see cddb_disc_get_category_str
- * @see CDDB_CATEGORY
- *
- * @param disc The CDDB disc structure.
- * @param cat The category string.
- */
-void cddb_disc_set_category_str(cddb_disc_t *disc, const char *cat);
-
-/**
- * Get the disc genre.  If no genre is set for this disc then NULL
- * will be returned.  As opposed to the disc category, this field is
- * not limited to a predefined set.
- *
- * @param disc The CDDB disc structure.
- * @return The disc genre.
- */
-const char *cddb_disc_get_genre(const cddb_disc_t *disc);
-
-/**
- * Set the disc genre.  As opposed to the disc category, this field is
- * not limited to a predefined set.  If the disc already had a genre,
- * then the memory for that string will be freed.  The new genre will
- * be copied into a new chunk of memory.
- *
- * @see cddb_disc_get_category_str
- *
- * @param disc  The CDDB disc structure.
- * @param genre The disc genre.
- */
-void cddb_disc_set_genre(cddb_disc_t *disc, const char *genre);
-
-/**
- * Get the disc length.  If no length is set for this disc then 0 will
- * be returned.
- *
- * @param disc The CDDB disc structure.
- * @return The disc length in seconds.
- */
-unsigned int cddb_disc_get_length(const cddb_disc_t *disc);
-
-/**
- * Set the disc length.
- *
- * @param disc The CDDB disc structure.
- * @param l    The disc length in seconds.
- */
-void cddb_disc_set_length(cddb_disc_t *disc, unsigned int l);
-
-/**
- * Get the revision number of the disc.
- *
- * @param disc The CDDB disc structure.
- */
-unsigned int cddb_disc_get_revision(const cddb_disc_t *disc);
-
-/**
- * Set the revision number of the disc.
- *
- * @param disc The CDDB disc structure.
- * @param rev The revision number.
- */
-void cddb_disc_set_revision(cddb_disc_t *disc, unsigned int rev);
-
-/**
- * Get the year of publication for this disc.  If no year is defined 0
- * is returned.
- *
- * @param disc The CDDB disc structure.
- * @return The disc year.
- */
-unsigned int cddb_disc_get_year(const cddb_disc_t *disc);
-
-/**
- * Set the year of publication for this disc.
- *
- * @param disc The CDDB disc structure.
- * @param y    The disc year.
- */
-void cddb_disc_set_year(cddb_disc_t *disc, unsigned int y);
-
-/**
- * Get the number of tracks on the disc.  If the disc is invalid -1 is
- * returned.
- *
- * @param disc The CDDB disc structure.
- * @return The number of tracks.
- */
-int cddb_disc_get_track_count(const cddb_disc_t *disc);
-
-/**
- * Get the disc title.  If the disc is invalid or no title is set then
- * NULL will be returned.
- *
- * @param disc The CDDB disc structure.
- * @return The disc title.
- */
-const char *cddb_disc_get_title(const cddb_disc_t *disc);
-
-/**
- * Set the disc title.  If the disc already had a title, then the
- * memory for that string will be freed.  The new title will be copied
- * into a new chunk of memory.  If the given title is NULL, then the
- * title of the disc will be deleted.
- *
- * @param disc The CDDB disc structure.
- * @param title The new disc title.
- */
-void cddb_disc_set_title(cddb_disc_t *disc, const char *title);
-
-/**
- * Append to the disc title.  If the disc does not have a title yet,
- * then a new one will be created from the given string, otherwise
- * that string will be appended to the existing title.
- *
- * @param disc The CDDB disc structure.
- * @param title Part of the disc title.
- */
-void cddb_disc_append_title(cddb_disc_t *disc, const char *title);
-
-/**
- * Get the disc artist name.  If the disc is invalid or no artist is
- * set then NULL will be returned.
- *
- * @param disc The CDDB disc structure.
- * @return The disc artist name.
- */
-const char *cddb_disc_get_artist(const cddb_disc_t *disc);
-
-/**
- * Set the disc artist name.  If the disc already had an artist name,
- * then the memory for that string will be freed.  The new artist name
- * will be copied into a new chunk of memory.  If the given artist
- * name is NULL, then the artist name of the disc will be deleted.
- *
- * @param disc   The CDDB disc structure.
- * @param artist The new disc artist name.
- */
-void cddb_disc_set_artist(cddb_disc_t *disc, const char *artist);
-
-/**
- * Append to the disc artist.  If the disc does not have an artist
- * yet, then a new one will be created from the given string,
- * otherwise that string will be appended to the existing artist.
- *
- * @param disc  The CDDB disc structure.
- * @param artist Part of the artist name.
- */
-void cddb_disc_append_artist(cddb_disc_t *disc, const char *artist);
-
-/**
- * Get the extended disc data.  If the disc is invalid or no extended
- * data is set then NULL will be returned.
- *
- * @param disc The CDDB disc structure.
- * @return The extended data.
- */
-const char *cddb_disc_get_ext_data(const cddb_disc_t *disc);
-
-/**
- * Set the extended data for the disc.  If the disc already had
- * extended data, then the memory for that string will be freed.  The
- * new extended data will be copied into a new chunk of memory.  If
- * the given extended data is NULL, then the existing data will be
- * deleted.
- *
- * @param disc     The CDDB disc structure.
- * @param ext_data The new extended data.
- */
-void cddb_disc_set_ext_data(cddb_disc_t *disc, const char *ext_data);
-
-/**
- * Append to the extended disc data.  If the disc does not have an
- * extended data section yet, then a new one will be created from the
- * given string, otherwise that string will be appended to the
- * existing data.
- *
- * @param disc     The CDDB disc structure.
- * @param ext_data Part of the extended disc data.
- */
-void cddb_disc_append_ext_data(cddb_disc_t *disc, const char *ext_data);
-
-
-/* --- miscellaneous */
-
-
-/**
- * Copy all data from one disc to another.  Any fields that are
- * unavailable in the source disc structure will not result in a reset
- * of the same field in the destination disc structure; e.g. if there
- * is no title in the source disc, but there is one in the destination
- * disc, then the destination's title will remain unchanged.
- *
- * @param dst The destination CDDB disc structure.
- * @param src The source CDDB disc structure.
- */
-void cddb_disc_copy(cddb_disc_t *dst, cddb_disc_t *src);
-
-/**
- * Calculate the CDDB disc ID.  To calculate a disc ID the provided
- * disc needs to have its length set, and every track in the disc
- * structure needs to have its frame offset initialized.  The disc ID
- * field will be set in the disc structure.
- *
- * @param disc The CDDB disc structure.
- * @return A non-zero value if the calculation succeeded, zero
- *         otherwise.
- */
-int cddb_disc_calc_discid(cddb_disc_t *disc);
-
-/**
- * Prints information about the disc on stdout.  This is just a
- * debugging routine to display the structure's content.
- *
- * @param disc The CDDB disc structure.
- */
-void cddb_disc_print(cddb_disc_t *disc);
-
-
-#ifdef __cplusplus
-    }
-#endif
-
-#endif /* CDDB_DISC_H */
diff --git a/lib-x86-32/include/cddb/cddb_error.h b/lib-x86-32/include/cddb/cddb_error.h
deleted file mode 100644
index 6e779900..00000000
--- a/lib-x86-32/include/cddb/cddb_error.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
-    $Id: cddb_error.h,v 1.12 2005/05/29 08:11:04 airborne Exp $
-
-    Copyright (C) 2003, 2004, 2005 Kris Verbeeck <airborne@advalvas.be>
-
-    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 CDDB_ERROR_H
-#define CDDB_ERROR_H 1
-
-#ifdef __cplusplus
-    extern "C" {
-#endif
-
-
-#include <stdio.h>
-
-
-/**
- * A list of error codes returned by various libcddb functions.
- */
-typedef enum {
-
-    CDDB_ERR_OK = 0,            /**< no error occurred */
-
-    /* --- general errors --- */
-
-    CDDB_ERR_OUT_OF_MEMORY,     /**< out of memory */
-    CDDB_ERR_LINE_SIZE,         /**< internal buffer too small */
-    CDDB_ERR_NOT_IMPLEMENTED,   /**< feature not (yet) implemented */
-    CDDB_ERR_UNKNOWN,           /**< problem unknown */
-
-    /* --- connection errors --- */
-
-    CDDB_ERR_SERVER_ERROR,      /**< CDDB server error */
-    CDDB_ERR_UNKNOWN_HOST_NAME, /**< unknown host name */ 
-    CDDB_ERR_CONNECT,           /**< connection error */
-    CDDB_ERR_PERMISSION_DENIED, /**< permission denied */
-    CDDB_ERR_NOT_CONNECTED,     /**< not yet connected or connection
-                                     has been closed */
-
-    /* --- response parsing errors --- */
-
-    CDDB_ERR_UNEXPECTED_EOF,    /**< unexpected end-of-file encountered */
-    CDDB_ERR_INVALID_RESPONSE,  /**< invalid response data */
-    CDDB_ERR_DISC_NOT_FOUND,    /**< no results found */
-
-    /* --- library errors --- */
-
-    CDDB_ERR_DATA_MISSING,      /**< some data is missing for executing
-                                     a certain command */
-    CDDB_ERR_TRACK_NOT_FOUND,   /**< specified track is not present */
-    CDDB_ERR_REJECTED,          /**< posted data rejected */
-    CDDB_ERR_EMAIL_INVALID,     /**< the e-mail address used when
-                                     submitting is invalid */
-
-    CDDB_ERR_INVALID_CHARSET,   /**< invalid character set or unsupported
-                                     conversion */
-    CDDB_ERR_ICONV_FAIL,        /**< character set conversion failed */
-
-    /* --- new errors added to back of list for backward compatibility --- */
-
-    CDDB_ERR_PROXY_AUTH,        /**< proxy authentication failed */
-    CDDB_ERR_INVALID,           /**< invalid input parameter(s) */
-
-    /* --- terminator --- */
-
-    CDDB_ERR_LAST
-} cddb_error_t;
-
-
-/* --- error handling --- */
-
-
-/**
- * Returns a string representation of the CDDB error code.
- *
- * @return The error string
- */
-const char *cddb_error_str(cddb_error_t errnum);
-
-/**
- * Prints the error message associated with the current error number
- * on the given stream.
- *
- * @param stream The stream
- * @param errnum The error number
- */
-void cddb_error_stream_print(FILE *stream, cddb_error_t errnum);
-
-/**
- * Prints the error message associated with the current error number
- * to stderr.
- *
- * @param errnum The error number
- */
-void cddb_error_print(cddb_error_t errnum);
-
-
-#ifdef __cplusplus
-    }
-#endif
-
-#endif /* CDDB_ERROR_H */
diff --git a/lib-x86-32/include/cddb/cddb_log.h b/lib-x86-32/include/cddb/cddb_log.h
deleted file mode 100644
index 30fe7899..00000000
--- a/lib-x86-32/include/cddb/cddb_log.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-    $Id: cddb_log.h,v 1.4 2005/03/11 21:29:29 airborne Exp $
-
-    Copyright (C) 2003, 2004, 2005 Kris Verbeeck <airborne@advalvas.be>
-
-    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 CDDB_LOH_H
-#define CDDB_LOG_H
-
-#ifdef __cplusplus
-    extern "C" {
-#endif
-
-/**
- * The different log levels supported by libcddb.
- */
-typedef enum {
-    CDDB_LOG_DEBUG = 1,         /**< Debug-level messages. */
-    CDDB_LOG_INFO,              /**< Informational. */
-    CDDB_LOG_WARN,              /**< Warning conditions. */
-    CDDB_LOG_ERROR,             /**< Error conditions.  */
-    CDDB_LOG_CRITICAL,          /**< Critical conditions. */
-    CDDB_LOG_NONE = 99          /**< No log messages. */
-} cddb_log_level_t;
-
-
-/**
- * This type defines the signature of a libcddb log handler.  For
- * every message being logged by libcddb, the handler will receive the
- * log level and the message string.
- *
- * @see cddb_log_set_handler
- * @see cddb_log_level_t
- *
- * @param level   The log level.
- * @param message The log message.
- */
-typedef void (*cddb_log_handler_t)(cddb_log_level_t level, const char *message);
-
-/**
- * Set a custom log handler for libcddb.  The return value is the log
- * handler being replaced.  If the provided parameter is NULL, then
- * the handler will be reset to the default handler.
- *
- * @see cddb_log_handler_t
- *
- * @param new_handler The new log handler.
- * @return The previous log handler.
- */
-cddb_log_handler_t cddb_log_set_handler(cddb_log_handler_t new_handler);
-
-/**
- * Set the minimum log level.  This function is only useful in
- * conjunction with the default log handler.  The default log handler
- * will print any log messages that have a log level equal or higher
- * than this minimum log level to stderr.  By default the minimum log
- * level is set to CDDB_LOG_WARN.  This means that only warning, error
- * and critical messages will be printed.  You can silence the default
- * log handler by setting the minimum log level to CDDB_LOG_NONE.
- *
- * @see cddb_log_level_t
- *
- * @param level The minimum log level.
- */
-void cddb_log_set_level(cddb_log_level_t level);
-
-
-#ifdef __cplusplus
-    }
-#endif
-
-#endif /* CDDB_LOG_H */
diff --git a/lib-x86-32/include/cddb/cddb_log_ni.h b/lib-x86-32/include/cddb/cddb_log_ni.h
deleted file mode 100644
index ea7727fc..00000000
--- a/lib-x86-32/include/cddb/cddb_log_ni.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-    $Id: cddb_log_ni.h,v 1.3 2005/03/11 21:29:29 airborne Exp $
-
-    Copyright (C) 2003, 2004, 2005 Kris Verbeeck <airborne@advalvas.be>
-
-    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 CDDB_LOH_NI_H
-#define CDDB_LOG_NI_H
-
-#ifdef __cplusplus
-    extern "C" {
-#endif
-
-
-/**
- */
-void cddb_log(cddb_log_level_t level, const char *format, ...);
-
-/**
- */
-#define cddb_log_debug(...) cddb_log(CDDB_LOG_DEBUG, __VA_ARGS__)
-
-/**
- */
-#define cddb_log_info(...) cddb_log(CDDB_LOG_INFO, __VA_ARGS__)
-
-/**
- */
-#define cddb_log_warn(...) cddb_log(CDDB_LOG_WARN, __VA_ARGS__)
-
-/**
- */
-#define cddb_log_error(...) cddb_log(CDDB_LOG_ERROR, __VA_ARGS__)
-
-/**
- */
-#define cddb_log_crit(...) cddb_log(CDDB_LOG_CRITICAL, __VA_ARGS__)
-
-
-#ifdef __cplusplus
-    }
-#endif
-
-#endif /* CDDB_LOG_NI_H */
diff --git a/lib-x86-32/include/cddb/cddb_net.h b/lib-x86-32/include/cddb/cddb_net.h
deleted file mode 100644
index 60c5464b..00000000
--- a/lib-x86-32/include/cddb/cddb_net.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
-    $Id: cddb_net.h,v 1.11 2005/03/11 21:29:29 airborne Exp $
-
-    Copyright (C) 2003, 2004, 2005 Kris Verbeeck <airborne@advalvas.be>
-
-    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 CDDB_NET_H
-#define CDDB_NET_H 1
-
-#ifdef __cplusplus
-    extern "C" {
-#endif
-
-
-#include <stdarg.h>
-
-#if defined( UNDER_CE )
-#   include <winsock.h>
-#elif defined( WIN32 )
-#   include <winsock2.h>
-#   include <ws2tcpip.h>
-#endif 
-
-#include <cddb/cddb_ni.h>
-#include <cddb/cddb_config.h>
-
-#if defined(CDDB_NEED_SYS_SOCKET_H) || defined(HAVE_SYS_SOCKET_H)
-#include <sys/socket.h>
-#endif
-
-
-/* --- socket-based work-alikes --- */
-
-
-/**
- * This function performs the same task as the standard fgets except
- * for the fact that it might time-out if the socket read takes too
- * long.  In case of a time out, errno will be set to ETIMEDOUT.
- *
- * @param s       The string buffer.
- * @param size    Size of the buffer.
- * @param c       The CDDB connection structure.
- * @return The string that was read or NULL on error or EOF when no
- *         characters were read.
- */
-char *sock_fgets(char *s, int size, cddb_conn_t *c);
-
-/**
- * This function performs the same task as the standard fwrite except
- * for the fact that it might time-out if the socket write takes too
- * long.  In case of a time out, errno will be set to ETIMEDOUT.
- *
- * @param ptr     Pointer to data record.
- * @param size    Size of data record.
- * @param nmemb   The number of data records to write.
- * @param c       The CDDB connection structure.
- * @return The number of records written.
- */
-size_t sock_fwrite(const void *ptr, size_t size, size_t nmemb, cddb_conn_t *c);
-
-/**
- * This function performs the same task as the standard fprintf except
- * for the fact that it might time-out if the socket write takes too
- * long.  In case of a time out, errno will be set to ETIMEDOUT.
- *
- * @param c       The CDDB connection structure.
- * @param format  Pointer to data record.
- * @return The number of characters written.
- */
-int sock_fprintf(cddb_conn_t *c, const char *format, ...);
-
-/**
- * This function performs the same task as the standard vfprintf
- * except for the fact that it might time-out if the socket write
- * takes too long.  In case of a time out, errno will be set to
- * ETIMEDOUT.
- *
- * @param c       The CDDB connection structure.
- * @param format  Pointer to data record.
- * @param ap      Variable argument list.
- * @return The number of characters written.
- */
-int sock_vfprintf(cddb_conn_t *c, const char *format, va_list ap);
-
-/* --- time-out enabled work-alikes --- */
-
-/**
- * This function performs the same task as the standard gethostbyname
- * except for the fact that it might time-out if the query takes too
- * long.  In case of a time out, errno will be set to ETIMEDOUT.
- *
- * @param hostname The hostname that needs to be resolved.
- * @param timeout  Number of seconds after which to time out.
- * @return The host entity for given host name or NULL if not found or
- *         timed out (errno will be set).
- */
-struct hostent *timeout_gethostbyname(const char *hostname, int timeout);
-
-/**
- * This function performs the same task as the standard connect except
- * for the fact that it might time-out if the connect takes too long.
- * In case of a time out, errno will be set to ETIMEDOUT.
- * 
- * @param sockfd   The socket.
- * @param addr     The address to connect to.
- * @param len      The size of the address structure.
- * @param timeout  Number of seconds after which to time out.
- * @return Zero on success, -1 on failure (errno will be set).
- */
-int timeout_connect(int sockfd, const struct sockaddr *addr, size_t len, 
-                    int timeout);
-
-
-#ifdef __cplusplus
-    }
-#endif
-
-#endif /* CDDB_NET_H */
diff --git a/lib-x86-32/include/cddb/cddb_ni.h b/lib-x86-32/include/cddb/cddb_ni.h
deleted file mode 100644
index d32fdc13..00000000
--- a/lib-x86-32/include/cddb/cddb_ni.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
-    $Id: cddb_ni.h,v 1.32 2009/03/01 03:28:07 jcaratzas Exp $
-
-    Copyright (C) 2003, 2004, 2005 Kris Verbeeck <airborne@advalvas.be>
-
-    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 CDDB_NI_H
-#define CDDB_NI_H 1
-
-#ifdef __cplusplus
-    extern "C" {
-#endif
-
-
-#if HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-#ifdef HAVE_ICONV_H
-#  include <iconv.h>
-#else
-   typedef void *iconv_t;       /* for code uniformity */
-#endif
-
-#ifdef HAVE_WINDOWS_H
-#include <windows.h>
-#endif
-
-#ifdef HAVE_WINSOCK2_H
-#include <winsock2.h>
-#ifndef ETIMEDOUT
-#define ETIMEDOUT   WSAETIMEDOUT
-#endif
-#ifndef EWOULDBLOCK
-#define EWOULDBLOCK WSAEWOULDBLOCK
-#endif
-#ifndef EINPROGRESS
-#define EINPROGRESS WSAEINPROGRESS
-#endif
-#endif
-
-#include "cddb/cddb_regex.h"
-#include "cddb/cddb.h"
-#include "cddb/cddb_conn_ni.h"
-#include "cddb/cddb_net.h"
-#include "cddb/cddb_cmd_ni.h"
-#include "cddb/cddb_log_ni.h"
-
-
-#define FALSE          0
-#define TRUE           1
-
-#define CHR_CR         '\r'
-#define CHR_LF         '\n'
-#define CHR_EOS        '\0'
-#define CHR_SPACE      ' '
-#define CHR_DOT        '.'
-
-#define DEFAULT_BUF_SIZE 1024
-
-#define CLIENT_NAME    PACKAGE
-#define CLIENT_VERSION VERSION
-
-#define DEFAULT_USER        "anonymous"
-#define DEFAULT_HOST        "localhost"
-#define DEFAULT_SERVER      "freedb.org"
-#define DEFAULT_PORT        888
-#define DEFAULT_TIMEOUT     10
-#define DEFAULT_PATH_QUERY  "/~cddb/cddb.cgi"
-#define DEFAULT_PATH_SUBMIT "/~cddb/submit.cgi"
-#define DEFAULT_CACHE       ".cddbslave"
-#define DEFAULT_PROXY_PORT  8080
-
-#define DEFAULT_PROTOCOL_VERSION 6
-#define SERVER_CHARSET           "UTF8"
-
-
-#define FREE_NOT_NULL(p) if (p) { free(p); p = NULL; }
-#define CONNECTION_OK(c) (c->socket != -1)
-#define STR_OR_NULL(s) ((s) ? s : "NULL")
-#define STR_OR_EMPTY(s) ((s) ? s : "")
-
-#define RETURN_STR_OR_EMPTY(s) \
-            return (!s && (libcddb_flags() & CDDB_F_EMPTY_STR)) ? "" : s
-
-#define ASSERT(cond, error) \
-            if (!(cond)) { return error; }
-#define ASSERT_NOT_NULL(ptr) \
-            ASSERT(ptr!=NULL, CDDB_ERR_INVALID)
-#define ASSERT_RANGE(num,lo,hi) \
-            ASSERT((num>=lo)&&(num<=hi), CDDB_ERR_INVALID)
-
-
-/* --- type definitions */
-
-
-/** Actual definition of track structure. */
-struct cddb_track_s
-{
-    int num;                    /**< track number on the disc */
-    int frame_offset;           /**< frame offset of the track on the disc */
-    int length;                 /**< track length in seconds */
-    char *title;                /**< track title */
-    char *artist;               /**< (optional) track artist */
-    char *ext_data;             /**< (optional) extended disc data */
-    struct cddb_track_s *prev;  /**< pointer to previous track, or NULL */
-    struct cddb_track_s *next;  /**< pointer to next track, or NULL */
-    struct cddb_disc_s *disc;   /**< disc of which this is a track */
-};
-
-/** Actual definition of disc structure. */
-struct cddb_disc_s
-{
-    unsigned int revision;      /**< revision number */
-    unsigned int discid;        /**< four byte disc ID */
-    cddb_cat_t category;        /**< CDDB category */
-    char *genre;                /**< disc genre */
-    char *title;                /**< disc title */
-    char *artist;               /**< disc artist */
-    unsigned int length;        /**< disc length in seconds */
-    unsigned int year;          /**< (optional) disc year YYYY */
-    char *ext_data;             /**< (optional) extended disc data  */
-    int track_cnt;              /**< number of tracks on the disc */
-    cddb_track_t *tracks;       /**< pointer to the first track */
-    cddb_track_t *iterator;     /**< track iterator */
-};
-
-
-/* --- global variables */
-
-
-/** Server connection used especially for text searches. */
-extern cddb_conn_t *cddb_search_conn;
-
-
-/* --- non-exported function prototypes */
-
-
-unsigned int libcddb_flags(void);
-
-/**
- * Convert a string to a new character encoding according to the given
- * conversion descriptor.
- */
-int cddb_str_iconv(iconv_t cd, ICONV_CONST char *in, char **out);
-
-/**
- * Converts all disc and track strings to user character encoding.
- */
-int cddb_disc_iconv(iconv_t cd, cddb_disc_t *disc);
-
-/**
- * Converts all track strings to user character encoding.
- */
-int cddb_track_iconv(iconv_t cd, cddb_track_t *track);
-
-/**
- * Converts all site strings to user character encoding.
- */
-int cddb_site_iconv(iconv_t cd, cddb_site_t *site);
-
-/**
- * Base64 encode the source string and write it to the destination
- * buffer.  The destination buffer should be large enough (= 4/3 of
- * src string length).
- */
-void cddb_b64_encode(char *dst, const char *src);
-
-
-#ifdef __cplusplus
-    }
-#endif
-
-#endif /* CDDB_NI_H */
diff --git a/lib-x86-32/include/cddb/cddb_regex.h b/lib-x86-32/include/cddb/cddb_regex.h
deleted file mode 100644
index 9b50e097..00000000
--- a/lib-x86-32/include/cddb/cddb_regex.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-    $Id: cddb_regex.h,v 1.14 2007/08/07 03:12:53 jcaratzas Exp $
-
-    Copyright (C) 2003, 2004, 2005 Kris Verbeeck <airborne@advalvas.be>
-
-    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 CDDB_REGEX_H
-#define CDDB_REGEX_H 1
-
-#ifdef HAVE_REGEX_H
-#ifdef __cplusplus
-    extern "C" {
-#endif
-
-#include <cddb/cddb_config.h>
-#include <stdlib.h>
-
-#ifdef CDDB_NEED_UNISTD_H
-#include <unistd.h>
-#endif
-#include <sys/types.h>          /* need for MacOS X */
-#include <regex.h>
-
-
-extern regex_t *REGEX_TRACK_FRAME_OFFSETS;
-extern regex_t *REGEX_TRACK_FRAME_OFFSET;
-extern regex_t *REGEX_DISC_LENGTH;
-extern regex_t *REGEX_DISC_REVISION;
-extern regex_t *REGEX_DISC_TITLE;
-extern regex_t *REGEX_DISC_YEAR;
-extern regex_t *REGEX_DISC_GENRE;
-extern regex_t *REGEX_DISC_EXT;
-extern regex_t *REGEX_TRACK_TITLE;
-extern regex_t *REGEX_TRACK_EXT;
-extern regex_t *REGEX_PLAY_ORDER;
-extern regex_t *REGEX_QUERY_MATCH;
-extern regex_t *REGEX_SITE;
-extern regex_t *REGEX_TEXT_SEARCH;
-
-
-void cddb_regex_init(void);
-
-void cddb_regex_destroy(void);
-
-int cddb_regex_get_int(const char *s, regmatch_t matches[], int idx);
-
-unsigned long cddb_regex_get_hex(const char *s, regmatch_t matches[], int idx);
-
-double cddb_regex_get_float(const char *s, regmatch_t matches[], int idx);
-
-char *cddb_regex_get_string(const char *s, regmatch_t matches[], int idx);
-
-
-#ifdef __cplusplus
-    }
-#endif
-#endif /* HAVE_REGEX_H */
-
-#endif /* CDDB_REGEX_H */
diff --git a/lib-x86-32/include/cddb/cddb_site.h b/lib-x86-32/include/cddb/cddb_site.h
deleted file mode 100644
index 9c48ac6c..00000000
--- a/lib-x86-32/include/cddb/cddb_site.h
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
-    $Id: cddb_site.h,v 1.3 2005/06/15 16:08:28 airborne Exp $
-
-    Copyright (C) 2005 Kris Verbeeck <airborne@advalvas.be>
-
-    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 CDDB_SITE_H
-#define CDDB_SITE_H 1
-
-#ifdef __cplusplus
-    extern "C" {
-#endif
-
-
-#include "cddb/cddb_error.h"
-
-
-/* --- type and structure definitions */
-
-
-/**
- * Enumeration defining the CDDB protocol supported by a specific
- * site.
- */
-typedef enum {
-    PROTO_UNKNOWN = 0,          /**< Unknown protocol */
-    PROTO_CDDBP,                /**< FreeDB custom protocol */
-    PROTO_HTTP                  /**< Command tunneling over HTTP */
-} cddb_protocol_t;
-
-/**
- * The CDDB site structure.  Contains all information about one
- * particular CDDB server.
- */
-typedef struct cddb_site_s cddb_site_t;
-
-
-/* --- construction / destruction */
-
-
-/**
- * Creates a new CDDB site structure.
- *
- * @return The CDDB site structure or NULL if memory allocation failed.
- */
-cddb_site_t *cddb_site_new(void);
-
-/**
- * Free all resources associated with the given CDDB site structure.
- *
- * @param site The CDDB site structure.
- */
-cddb_error_t cddb_site_destroy(cddb_site_t *site);
-
-/**
- * Creates a clone of the given site.
- *
- * @param site The CDDB site structure.
- */
-cddb_site_t *cddb_site_clone(cddb_site_t *site);
-
-
-/* --- setters / getters --- */
-
-
-/**
- * Get the site's address.
- *
- * @param site The CDDB site structure.
- * @param address The address of the server upon returning.
- * @param port The port of the server upon returning.
- * @return Error code: CDDB_ERR_OK or CDDB_ERR_INVALID.
- */
-cddb_error_t cddb_site_get_address(const cddb_site_t *site,
-                                   const char **address, unsigned int *port);
-
-/**
- * Set the site's address.  A copy of the address string is made.  So the caller
- * should free any memory associated with the input parameter.
- *
- * @param site The CDDB site structure.
- * @param address The address of the server.
- * @param port The port of the server.
- * @return Error code: CDDB_ERR_OK, CDDB_ERR_INVALID or CDDB_ERR_OUT_OF_MEMORY.
- */
-cddb_error_t cddb_site_set_address(cddb_site_t *site,
-                                   const char *address, unsigned int port);
-
-/**
- * Get the protocol used by the site.
- *
- * @see cddb_protocol_t
- *
- * @param site The CDDB site structure.
- * @return The protocol.
- */
-cddb_protocol_t cddb_site_get_protocol(const cddb_site_t *site);
-
-/**
- * Set the protocol used by the site.
- *
- * @see cddb_protocol_t
- *
- * @param site The CDDB site structure.
- * @param proto The protocol.
- * @return Error code: CDDB_ERR_OK or CDDB_ERR_INVALID.
- */
-cddb_error_t cddb_site_set_protocol(cddb_site_t *site, cddb_protocol_t proto);
-
-/**
- * Get the query path in case the HTTP protocol is used.
- *
- * @param site The CDDB site structure.
- * @param path The query path upon returning.
- * @return Error code: CDDB_ERR_OK or CDDB_ERR_INVALID.
- */
-cddb_error_t cddb_site_get_query_path(const cddb_site_t *site,
-                                      const char **path);
-
-/**
- * Set the query path in case the HTTP protocol is used.  A copy of the path
- * string is made.  So the caller should free any memory associated with the
- * input parameter.
- *
- * @param site The CDDB site structure.
- * @param path The query path.  A value of NULL deletes the current path.
- * @return Error code: CDDB_ERR_OK, CDDB_ERR_INVALID or CDDB_ERR_OUT_OF_MEMORY.
- */
-cddb_error_t cddb_site_set_query_path(cddb_site_t *site, const char *path);
-
-/**
- * Get the submit path in case the HTTP protocol is used.
- *
- * @param site The CDDB site structure.
- * @param path The submit path upon returning.
- * @return Error code: CDDB_ERR_OK or CDDB_ERR_INVALID.
- */
-cddb_error_t cddb_site_get_submit_path(const cddb_site_t *site,
-                                       const char **path);
-
-/**
- * Set the submit path in case the HTTP protocol is used.  A copy of the path
- * string is made.  So the caller should free any memory associated with the
- * input parameter.
- *
- * @param site The CDDB site structure.
- * @param path The query path.  A value of NULL deletes the current path.
- * @return Error code: CDDB_ERR_OK, CDDB_ERR_INVALID or CDDB_ERR_OUT_OF_MEMORY.
- */
-cddb_error_t cddb_site_set_submit_path(cddb_site_t *site, const char *path);
-
-/**
- * Get the site's location.
- *
- * @param site The CDDB site structure.
- * @param latitude Will contain the server's latitude upon returning.
- *                 A positive number is used for the northern
- *                 hemisphere, a negative one for the southern
- *                 hemisphere.
- * @param longitude Will contain the server's longitude upon returning.
- *                  A positive number is used for the eastern
- *                  hemisphere, a negative one for the western
- *                  hemisphere.
- * @return Error code: CDDB_ERR_OK or CDDB_ERR_INVALID.
- */
-cddb_error_t cddb_site_get_location(const cddb_site_t *site,
-                                    float *latitude, float *longitude);
-
-/**
- * Set the site's location.
- *
- * @param site The CDDB site structure.
- * @param latitude The server's latitude.  Use a positive number for the
- *                 northern hemisphere, a negative one for the southern
- *                 hemisphere.
- * @param longitude The server's longitude.  Use a positive number for the
- *                  eastern hemisphere, a negative one for the western
- *                  hemisphere.
- * @return Error code: CDDB_ERR_OK or CDDB_ERR_INVALID.
- */
-cddb_error_t cddb_site_set_location(cddb_site_t *site,
-                                    float latitude, float longitude);
-
-/**
- * Get a description of the site.
- *
- * @param site The CDDB site structure.
- * @param desc The description upon returning.
- * @return Error code: CDDB_ERR_OK or CDDB_ERR_INVALID.
- */
-cddb_error_t cddb_site_get_description(const cddb_site_t *site,
-                                       const char **desc);
-
-/**
- * Set a description for the site.  A copy of the description string is made.
- * So the caller should free any memory associated with the input parameter.
- *
- * @param site The CDDB site structure.
- * @param desc The description.  A value of NULL deletes the current
- *             description.
- * @return Error code: CDDB_ERR_OK, CDDB_ERR_INVALID or CDDB_ERR_OUT_OF_MEMORY.
- */
-cddb_error_t cddb_site_set_description(cddb_site_t *site, const char *desc);
-
-
-/* --- miscellaneous */
-
-
-/**
- * Parses one line of data as returned by the sites command and
- * populates the given structure.
- *
- * @param site The CDDB site structure.
- * @param line The result line.
- * @return True in case of success or false on failure.
- */
-int cddb_site_parse(cddb_site_t *site, const char *line);
-
-/**
- * Prints information about the site on stdout.  This is just a
- * debugging routine to display the structure's content.
- *
- * @param site The CDDB site structure.
- * @return Error code: CDDB_ERR_OK or CDDB_ERR_INVALID.
- */
-cddb_error_t cddb_site_print(const cddb_site_t *site);
-
-
-#ifdef __cplusplus
-    }
-#endif
-
-#endif /* CDDB_SITE_H */
diff --git a/lib-x86-32/include/cddb/cddb_track.h b/lib-x86-32/include/cddb/cddb_track.h
deleted file mode 100644
index 0f6ee0f9..00000000
--- a/lib-x86-32/include/cddb/cddb_track.h
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
-    $Id: cddb_track.h,v 1.20 2006/10/15 06:51:11 airborne Exp $
-
-    Copyright (C) 2003, 2004, 2005 Kris Verbeeck <airborne@advalvas.be>
-
-    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 CDDB_TRACK_H
-#define CDDB_TRACK_H 1
-
-#ifdef __cplusplus
-    extern "C" {
-#endif
-
-
-/**
- * The CDDB track structure.  Contains all information associated with
- * a single CD track.  This structure will be used to populate the
- * tracks linked list of the cddb_disc_s structure.
- */
-typedef struct cddb_track_s cddb_track_t;
-
-
-/* --- construction / destruction */
-
-
-/**
- * Creates a new CDDB track structure.
- *
- * @return The CDDB track structure or NULL if memory allocation failed.
- */
-cddb_track_t *cddb_track_new(void);
-
-/**
- * Free all resources associated with the given CDDB track structure.
- * The linked list pointer (next) will not be touched.  So you have to
- * make sure that no other tracks are attached to this one before
- * calling this function.
- *
- * @param track The CDDB track structure.
- */
-void cddb_track_destroy(cddb_track_t *track);
-
-/**
- * Creates a clone of the given track.
- *
- * @param track The CDDB track structure.
- */
-cddb_track_t *cddb_track_clone(const cddb_track_t *track);
-
-
-/* --- getters & setters --- */
-
-
-/**
- * Get the number of this track.  This track number starts counting at
- * 1.  If the track is invalid or the track number is not defined -1
- * will be returned.
- *
- * @param track The CDDB track structure.
- * @return The track number.
- */
-int cddb_track_get_number(const cddb_track_t *track);
-
-/**
- * Get the frame offset of this track on the disc.  If the track is
- * invalid -1 will be returned.
- *
- * @param track The CDDB track structure.
- * @return The frame offset.
- */
-int cddb_track_get_frame_offset(const cddb_track_t *track);
-
-/**
- * Set the frame offset of this track on the disc.
- *
- * @param track The CDDB track structure.
- * @param offset The frame offset.
- * @return The frame offset.
- */
-void cddb_track_set_frame_offset(cddb_track_t *track, int offset);
-
-/**
- * Get the length of the track in seconds.  If the track length is not
- * defined this routine will try to calculate it using the frame
- * offsets of the tracks and the total disc length.  These
- * calculations will do no rounding to the nearest second.  So it is
- * possible that the sum off all track lengths does not add up to the
- * actual disc length.  If the length can not be calculated -1 will be
- * returned.
- *
- * @param track The CDDB track structure.
- * @return The track length.
- */
-int cddb_track_get_length(cddb_track_t *track);
-
-/**
- * Set the length of the track.  If no frame offset is yet known for
- * this track, and it is part of a disc, then the frame offset will be
- * calculated.
- *
- * @param track  The CDDB track structure.
- * @param length The track length in seconds.
- */
-void cddb_track_set_length(cddb_track_t *track, int length);
-
-/**
- * Get the track title.  If the track is invalid or no title is set
- * for this track then NULL will be returned.
- *
- * @param track The CDDB track structure.
- * @return The track title.
- */
-const char *cddb_track_get_title(const cddb_track_t *track);
-
-/**
- * Set the track title.  If the track already had a title, then the
- * memory for that string will be freed.  The new title will be copied
- * into a new chunk of memory.  If the given title is NULL, then the
- * title of the track will be deleted.
- *
- * @param track The CDDB track structure.
- * @param title The new track title.
- */
-void cddb_track_set_title(cddb_track_t *track, const char *title);
-
-/**
- * Append to the track title.  If the track does not have a title yet,
- * then a new one will be created from the given string, otherwise
- * that string will be appended to the existing title.
- *
- * @param track The CDDB track structure.
- * @param title Part of the track title.
- */
-void cddb_track_append_title(cddb_track_t *track, const char *title);
-
-/**
- * Get the track artist name.  If there is no track artist defined,
- * the disc artist will be returned.  NULL will be returned if neither
- * is defined.
- *
- * @param track  The CDDB track structure.
- */
-const char *cddb_track_get_artist(cddb_track_t *track);
-
-/**
- * Set the track artist name.  If the track already had an artist
- * name, then the memory for that string will be freed.  The new
- * artist name will be copied into a new chunk of memory.  If the given artist
- * name is NULL, then the artist name of the track will be deleted.
- *
- * @param track  The CDDB track structure.
- * @param artist The new track artist name.
- */
-void cddb_track_set_artist(cddb_track_t *track, const char *artist);
-
-/**
- * Append to the track artist.  If the track does not have an artist
- * yet, then a new one will be created from the given string,
- * otherwise that string will be appended to the existing artist.
- *
- * @param track  The CDDB track structure.
- * @param artist Part of the artist name.
- */
-void cddb_track_append_artist(cddb_track_t *track, const char *artist);
-
-/**
- * Get the extended track data.  If no extended data is set for this
- * track then NULL will be returned.
- *
- * @param track The CDDB track structure.
- * @return The extended data.
- */
-const char *cddb_track_get_ext_data(cddb_track_t *track);
-
-/**
- * Set the extended data for the track.  If the track already had
- * extended data, then the memory for that string will be freed.  The
- * new extended data will be copied into a new chunk of memory.  If
- * the given extended data is NULL, then the existing data will be
- * deleted.
- *
- * @param track    The CDDB track structure.
- * @param ext_data The new extended data.
- */
-void cddb_track_set_ext_data(cddb_track_t *track, const char *ext_data);
-
-/**
- * Append to the extended track data.  If the track does not have an
- * extended data section yet, then a new one will be created from the
- * given string, otherwise that string will be appended to the
- * existing data.
- *
- * @param track    The CDDB track structure.
- * @param ext_data Part of the extended track data.
- */
-void cddb_track_append_ext_data(cddb_track_t *track, const char *ext_data);
-
-
-/* --- miscellaneous */
-
-
-/**
- * Copy all data from one track to another.  Any fields that are
- * unavailable in the source track structure will not result in a
- * reset of the same field in the destination track structure; e.g. if
- * there is no title in the source track, but there is one in the
- * destination track, then the destination's title will remain
- * unchanged.
- *
- * @param dst The destination CDDB track structure.
- * @param src The source CDDB track structure.
- */
-void cddb_track_copy(cddb_track_t *dst, cddb_track_t *src);
-
-/**
- * Prints information about the track on stdout.  This is just a
- * debugging routine to display the structure's content.  It is used
- * by cddb_disc_print to print the contents of a complete disc.
- *
- * @param track The CDDB track structure.
- */
-void cddb_track_print(cddb_track_t *track);
-
-
-#ifdef __cplusplus
-    }
-#endif
-
-#endif /* CDDB_TRACK_H */
diff --git a/lib-x86-32/include/cddb/ll.h b/lib-x86-32/include/cddb/ll.h
deleted file mode 100644
index 9486e59f..00000000
--- a/lib-x86-32/include/cddb/ll.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
-    $Id: ll.h,v 1.1 2005/05/29 08:24:04 airborne Exp $
-
-    Copyright (C) 2005 Kris Verbeeck <airborne@advalvas.be>
-
-    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 LL_H
-#define LL_H 1
-
-#ifdef __cplusplus
-    extern "C" {
-#endif
-
-
-/* --- type definitions */
-
-
-/**
- * Linked list element.
- */
-typedef struct elem_s elem_t;
-
-/**
- * Linked list.
- */
-typedef struct list_s list_t;
-
-/**
- * Callback prototype for destroying element data.
- */
-typedef void elem_destroy_cb(void *data);
-
-
-/* --- construction / destruction */
-
-
-/**
- * Creates a new linked list.
- *
- * @param cb The callback used to destroy the element data or NULL if
- *           no further action is required.
- * @return The linked list structure or NULL if memory allocation failed.
- */
-list_t *list_new(elem_destroy_cb *cb);
-
-/**
- * Free all resources associated with the given linked list.  Embedded
- * data will be freed by use of the callback registered at list
- * creation.
- *
- * @param list The linked list.
- */
-void list_destroy(list_t *list);
-
-/**
- * Remove all elements from the list without destroying the list
- * itself.  Embedded data will be freed by use of the callback
- * registered at list creation.
- *
- * @param list The linked list.
- */
-void list_flush(list_t *list);
-
-
-/* --- list elements --- */
-
-/**
- * Retrieves the data associated with a list element.
- *
- * @param elem The list element.
- * @return The data associated with the element or NULL if the element
- *         was invalid.
- */
-void *element_data(elem_t *elem);
-
-
-/* --- getters & setters --- */
-
-
-/**
- * Append a new element to the end of the list.
- *
- * @param list The linked list.
- * @param data The data to append to the list.
- * @return The list element that was appended or NULL if memory
- *         allocation fails or the list is invalid.
- */
-elem_t *list_append(list_t *list, void *data);
-
-/**
- * Returns the number of elements in the list.
- *
- * @param list The linked list.
- * @return The number of elements.
- */
-int list_size(list_t *list);
-
-/**
- * Returns the list element at the specified index or NULL if the
- * index is invalid.
- *
- * @param list The linked list.
- * @param idx The element index (first = 0).
- * @return The element or NULL if not found.
- */
-elem_t *list_get(list_t *list, int idx);
-
-/**
- * Returns the first list element.
- *
- * @param list The linked list.
- * @return The first element or NULL if the list is empty.
- */
-elem_t *list_first(list_t *list);
-
-/**
- * Returns the next list element.  Before using this function you
- * should call list_first to initialize the iterator.
- *
- * @param list The linked list.
- * @return The next element or NULL if not found.
- */
-elem_t *list_next(list_t *list);
-
-
-/* --- iteration */
-
-
-#ifdef __cplusplus
-    }
-#endif
-
-#endif /* LL_H */
diff --git a/lib-x86-32/include/cddb/version.h b/lib-x86-32/include/cddb/version.h
deleted file mode 100644
index f72839b2..00000000
--- a/lib-x86-32/include/cddb/version.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* $Id: version.h.in,v 1.1 2005/04/08 01:49:35 rockyb Exp $ */
-/** \file version.h 
- *
- *  \brief A file containing the libcdio package version
- *  number (131) and OS build name. 
- */
-
-/*! CDDB_VERSION can as a string in programs to show what version is used. */
-#define CDDB_VERSION "1.3.2 i686-pc-linux-gnu"
-
-/*! LIBCDDB_VERSION_NUM  can be used for testing in the C preprocessor */
-#define LIBCDDB_VERSION_NUM 131
diff --git a/lib-x86-32/include/cddb/version.h.in b/lib-x86-32/include/cddb/version.h.in
deleted file mode 100644
index 48d4c3fc..00000000
--- a/lib-x86-32/include/cddb/version.h.in
+++ /dev/null
@@ -1,12 +0,0 @@
-/* $Id: version.h.in,v 1.1 2005/04/08 01:49:35 rockyb Exp $ */
-/** \file version.h 
- *
- *  \brief A file containing the libcdio package version
- *  number (@LIBCDDB_VERSION_NUM@) and OS build name. 
- */
-
-/*! CDDB_VERSION can as a string in programs to show what version is used. */
-#define CDDB_VERSION "@VERSION@ @build@"
-
-/*! LIBCDDB_VERSION_NUM  can be used for testing in the C preprocessor */
-#define LIBCDDB_VERSION_NUM @LIBCDDB_VERSION_NUM@
diff --git a/lib-x86-32/include/cdio/Makefile.am b/lib-x86-32/include/cdio/Makefile.am
deleted file mode 100644
index ea695618..00000000
--- a/lib-x86-32/include/cdio/Makefile.am
+++ /dev/null
@@ -1,62 +0,0 @@
-#   $Id: Makefile.am,v 1.34 2008/03/20 19:02:37 karl Exp $
-#
-#   Copyright (C) 2003, 2004, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
-#
-#   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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-
-########################################################
-# Things to make the install (public) libcdio headers
-########################################################
-#
-
-if BUILD_CD_PARANOIA
-paranoiaheaders = cdda.h cdtext.h 
-endif
-
-libcdioincludedir=$(includedir)/cdio
-libcdioinclude_HEADERS = \
-	audio.h \
-	bytesex.h \
-	bytesex_asm.h \
-	cdio.h \
-	cdio_config.h \
-	cd_types.h \
-	device.h \
-	disc.h \
-	ds.h \
-	dvd.h \
-	ecma_167.h \
-	iso9660.h \
-	logging.h \
-	mmc.h \
-	paranoia.h \
-	posix.h \
-	read.h \
-	rock.h \
-	sector.h \
-        track.h \
-        types.h \
-	udf.h \
-	udf_file.h \
-	udf_time.h \
-	utf8.h \
-	util.h \
-	version.h \
-	xa.h \
-	$(paranoiaheaders)
-
-EXTRA_DIST = version.h.in
-BUILT_SOURCES = version.h
-
-DISTCLEANFILES = cdio_config.h
diff --git a/lib-x86-32/include/cdio/audio.h b/lib-x86-32/include/cdio/audio.h
deleted file mode 100644
index 880cd541..00000000
--- a/lib-x86-32/include/cdio/audio.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/* -*- c -*-
-    $Id: audio.h,v 1.12 2008/03/25 15:59:08 karl Exp $
-
-    Copyright (C) 2005, 2007, 2008 Rocky Bernstein <rocky@gnu.org>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-/** \file audio.h 
- *
- *  \brief The top-level header for CD audio-related libcdio
- *         calls.  These control playing of the CD-ROM through its 
- *         line-out jack.
- */
-#ifndef __CDIO_AUDIO_H__
-#define __CDIO_AUDIO_H__
-
-#include <cdio/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-  /*! This struct is used by the cdio_audio_read_subchannel */
-  typedef struct cdio_subchannel_s 
-  {
-    uint8_t format;
-    uint8_t audio_status;
-    uint8_t address:	4;
-    uint8_t control:	4;
-    uint8_t track;
-    uint8_t index;
-    msf_t   abs_addr;
-    msf_t   rel_addr;
-  } cdio_subchannel_t;
-  
-  /*! This struct is used by cdio_audio_get_volume and cdio_audio_set_volume */
-  typedef struct cdio_audio_volume_s
-  {
-    uint8_t level[4];
-  } cdio_audio_volume_t;
-  
-
-  /*! This struct is used by the CDROMPLAYTRKIND ioctl */
-  typedef struct cdio_track_index_s
-  {
-    uint8_t	i_start_track;	/**< start track */
-    uint8_t	i_start_index;	/**< start index */
-    uint8_t	i_end_track;	/**< end track */
-    uint8_t	i_end_index;	/**< end index */
-  } cdio_track_index_t;
-
-  /*!
-    Get volume of an audio CD.
-    
-    @param p_cdio the CD object to be acted upon.
-    @param p_volume place to put the list of volume outputs levels
-
-    p_volume can be NULL in which case we return only whether the driver
-    has the ability to get the volume or not.
-
-  */
-  driver_return_code_t cdio_audio_get_volume (CdIo_t *p_cdio,  /*out*/
-					      cdio_audio_volume_t *p_volume);
-
-  /*! 
-    Return the number of seconds (discarding frame portion) of an MSF 
-  */
-  uint32_t cdio_audio_get_msf_seconds(msf_t *p_msf);
-
-  /*!
-    Pause playing CD through analog output
-
-    @param p_cdio the CD object to be acted upon.
-  */
-  driver_return_code_t cdio_audio_pause (CdIo_t *p_cdio);
-
-  /*!
-    Playing CD through analog output at the given MSF.
-
-    @param p_cdio the CD object to be acted upon.
-    @param p_start_msf pointer to staring MSF
-    @param p_end_msf pointer to ending MSF
-  */
-  driver_return_code_t cdio_audio_play_msf (CdIo_t *p_cdio, 
-					    /*in*/msf_t *p_start_msf,
-					    /*in*/ msf_t *p_end_msf);
-
-  /*!
-    Playing CD through analog output at the desired track and index
-
-    @param p_cdio the CD object to be acted upon.
-    @param p_track_index location to start/end.
-  */
-  driver_return_code_t cdio_audio_play_track_index 
-  ( CdIo_t *p_cdio,  cdio_track_index_t *p_track_index);
-
-  /*!
-    Get subchannel information.
-
-    @param p_cdio the CD object to be acted upon.
-    @param p_subchannel place for returned subchannel information
-  */
-  driver_return_code_t cdio_audio_read_subchannel (CdIo_t *p_cdio, 
-						   /*out*/ cdio_subchannel_t *p_subchannel);
-
-  /*!
-    Resume playing an audio CD.
-    
-    @param p_cdio the CD object to be acted upon.
-
-  */
-  driver_return_code_t cdio_audio_resume (CdIo_t *p_cdio);
-
-  /*!
-    Set volume of an audio CD.
-    
-    @param p_cdio the CD object to be acted upon.
-    @param p_volume place for returned volume-level information
-
-  */
-  driver_return_code_t cdio_audio_set_volume (CdIo_t *p_cdio, /*out*/
-					      cdio_audio_volume_t *p_volume);
-
-  /*!
-    Stop playing an audio CD.
-    
-    @param p_cdio the CD object to be acted upon.
-
-  */
-  driver_return_code_t cdio_audio_stop (CdIo_t *p_cdio);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __CDIO_AUDIO_H__ */
diff --git a/lib-x86-32/include/cdio/bytesex.h b/lib-x86-32/include/cdio/bytesex.h
deleted file mode 100644
index e1be483e..00000000
--- a/lib-x86-32/include/cdio/bytesex.h
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
-    $Id: bytesex.h,v 1.5 2008/03/25 15:59:08 karl Exp $
-
-    Copyright (C) 2000, 2004 Herbert Valerio Riedel <hvr@gnu.org>
-    Copyright (C) 2005, 2008 Rocky Bernstein <rocky@gnu.org>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-/** \file bytesex.h 
- *  \brief  Generic Byte-swapping routines.
- *
- *   Note: this header will is slated to get removed and libcdio will
- *   use glib.h routines instead.
-*/
-
-#ifndef __CDIO_BYTESEX_H__
-#define __CDIO_BYTESEX_H__
-
-#include <cdio/types.h>
-#include <cdio/bytesex_asm.h>
-#include <cdio/logging.h>
-
-/** 16-bit big-endian to little-endian */
-#define UINT16_SWAP_LE_BE_C(val) ((uint16_t) ( \
-    (((uint16_t) (val) & (uint16_t) 0x00ffU) << 8) | \
-    (((uint16_t) (val) & (uint16_t) 0xff00U) >> 8)))
-
-/** 32-bit big-endian to little-endian */
-#define UINT32_SWAP_LE_BE_C(val) ((uint32_t) ( \
-    (((uint32_t) (val) & (uint32_t) 0x000000ffU) << 24) | \
-    (((uint32_t) (val) & (uint32_t) 0x0000ff00U) <<  8) | \
-    (((uint32_t) (val) & (uint32_t) 0x00ff0000U) >>  8) | \
-    (((uint32_t) (val) & (uint32_t) 0xff000000U) >> 24)))
-
-/** 64-bit big-endian to little-endian */
-#define UINT64_SWAP_LE_BE_C(val) ((uint64_t) ( \
-    (((uint64_t) (val) & (uint64_t) UINT64_C(0x00000000000000ff)) << 56) | \
-    (((uint64_t) (val) & (uint64_t) UINT64_C(0x000000000000ff00)) << 40) | \
-    (((uint64_t) (val) & (uint64_t) UINT64_C(0x0000000000ff0000)) << 24) | \
-    (((uint64_t) (val) & (uint64_t) UINT64_C(0x00000000ff000000)) <<  8) | \
-    (((uint64_t) (val) & (uint64_t) UINT64_C(0x000000ff00000000)) >>  8) | \
-    (((uint64_t) (val) & (uint64_t) UINT64_C(0x0000ff0000000000)) >> 24) | \
-    (((uint64_t) (val) & (uint64_t) UINT64_C(0x00ff000000000000)) >> 40) | \
-    (((uint64_t) (val) & (uint64_t) UINT64_C(0xff00000000000000)) >> 56)))
-
-#ifndef UINT16_SWAP_LE_BE
-# define UINT16_SWAP_LE_BE UINT16_SWAP_LE_BE_C
-#endif
-
-#ifndef UINT32_SWAP_LE_BE
-# define UINT32_SWAP_LE_BE UINT32_SWAP_LE_BE_C
-#endif
-
-#ifndef UINT64_SWAP_LE_BE
-# define UINT64_SWAP_LE_BE UINT64_SWAP_LE_BE_C
-#endif
-
-inline static 
-uint16_t uint16_swap_le_be (const uint16_t val)
-{
-  return UINT16_SWAP_LE_BE (val);
-}
-
-inline static 
-uint32_t uint32_swap_le_be (const uint32_t val)
-{
-  return UINT32_SWAP_LE_BE (val);
-}
-
-inline static 
-uint64_t uint64_swap_le_be (const uint64_t val)
-{
-  return UINT64_SWAP_LE_BE (val);
-}
-
-# define UINT8_TO_BE(val)      ((uint8_t) (val))
-# define UINT8_TO_LE(val)      ((uint8_t) (val))
-#ifdef WORDS_BIGENDIAN
-# define UINT16_TO_BE(val)     ((uint16_t) (val))
-# define UINT16_TO_LE(val)     ((uint16_t) UINT16_SWAP_LE_BE(val))
-
-# define UINT32_TO_BE(val)     ((uint32_t) (val))
-# define UINT32_TO_LE(val)     ((uint32_t) UINT32_SWAP_LE_BE(val))
-
-# define UINT64_TO_BE(val)     ((uint64_t) (val))
-# define UINT64_TO_LE(val)     ((uint64_t) UINT64_SWAP_LE_BE(val))
-#else
-# define UINT16_TO_BE(val)     ((uint16_t) UINT16_SWAP_LE_BE(val))
-# define UINT16_TO_LE(val)     ((uint16_t) (val))
-
-# define UINT32_TO_BE(val)     ((uint32_t) UINT32_SWAP_LE_BE(val))
-# define UINT32_TO_LE(val)     ((uint32_t) (val))
-
-# define UINT64_TO_BE(val)     ((uint64_t) UINT64_SWAP_LE_BE(val))
-# define UINT64_TO_LE(val)     ((uint64_t) (val))
-#endif
-
-/** symmetric conversions */
-#define UINT8_FROM_BE(val)     (UINT8_TO_BE (val))
-#define UINT8_FROM_LE(val)     (UINT8_TO_LE (val))
-#define UINT16_FROM_BE(val)    (UINT16_TO_BE (val))
-#define UINT16_FROM_LE(val)    (UINT16_TO_LE (val))
-#define UINT32_FROM_BE(val)    (UINT32_TO_BE (val))
-#define UINT32_FROM_LE(val)    (UINT32_TO_LE (val))
-#define UINT64_FROM_BE(val)    (UINT64_TO_BE (val))
-#define UINT64_FROM_LE(val)    (UINT64_TO_LE (val))
-
-/** converter function template */
-#define CVT_TO_FUNC(bits) \
- static inline uint ## bits ## _t \
- uint ## bits ## _to_be (uint ## bits ## _t val) \
- { return UINT ## bits ## _TO_BE (val); } \
- static inline uint ## bits ## _t \
- uint ## bits ## _to_le (uint ## bits ## _t val) \
- { return UINT ## bits ## _TO_LE (val); } \
-
-CVT_TO_FUNC(8)
-CVT_TO_FUNC(16)
-CVT_TO_FUNC(32)
-CVT_TO_FUNC(64)
-
-#undef CVT_TO_FUNC
-
-#define uint8_from_be(val)     (uint8_to_be (val))
-#define uint8_from_le(val)     (uint8_to_le (val))
-#define uint16_from_be(val)    (uint16_to_be (val))
-#define uint16_from_le(val)    (uint16_to_le (val))
-#define uint32_from_be(val)    (uint32_to_be (val))
-#define uint32_from_le(val)    (uint32_to_le (val))
-#define uint64_from_be(val)    (uint64_to_be (val))
-#define uint64_from_le(val)    (uint64_to_le (val))
-
-/** ISO9660-related field conversion routines */
-
-/** Convert from uint8_t to ISO 9660 7.1.1 format */
-#define to_711(i)   uint8_to_le(i)
-
-/** Convert from ISO 9660 7.1.1 format to uint8_t */
-#define from_711(i) uint8_from_le(i)
-
-/** Convert from uint16_t to ISO 9669 7.2.1 format */
-#define to_721(i)   uint16_to_le(i)
-
-/** Convert from ISO 9660 7.2.1 format to uint16_t */
-#define from_721(i) uint16_from_le(i)
-
-/** Convert from uint16_t to ISO 9669 7.2.2 format */
-#define to_722(i)   uint16_to_be(i)
-
-/** Convert from ISO 9660 7.2.2 format to uint16_t */
-#define from_722(i) uint16_from_be(i)
-
-/** Convert from uint16_t to ISO 9669 7.2.3 format */
-static inline uint32_t
-to_723(uint16_t i)
-{
-  return uint32_swap_le_be(i) | i;
-}
-
-/** Convert from ISO 9660 7.2.3 format to uint16_t */
-static inline uint16_t 
-from_723 (uint32_t p)
-{
-  if (uint32_swap_le_be (p) != p)
-    cdio_warn ("from_723: broken byte order");
-
-  return (0xFFFF & p);
-}
-
-/** Convert from uint16_t to ISO 9669 7.3.1 format */
-#define to_731(i)   uint32_to_le(i)
-
-/** Convert from ISO 9660 7.3.1 format to uint32_t */
-#define from_731(i) uint32_from_le(i)
-
-/** Convert from uint32_t to ISO 9669 7.3.2 format */
-#define to_732(i)   uint32_to_be(i)
-
-/** Convert from ISO 9660 7.3.2 format to uint32_t */
-#define from_732(i) uint32_from_be(i)
-
-/** Convert from uint16_t to ISO 9669 7.3.3 format */
-static inline uint64_t
-to_733(uint32_t i)
-{
-  return uint64_swap_le_be(i) | i;
-}
-
-/** Convert from ISO 9660 7.3.3 format to uint32_t */
-static inline uint32_t 
-from_733 (uint64_t p)
-{
-  if (uint64_swap_le_be (p) != p)
-    cdio_warn ("from_733: broken byte order");
-    
-  return (UINT32_C(0xFFFFFFFF) & p);
-}
-
-#endif /* __CDIO_BYTESEX_H__ */
-
-
-/* 
- * Local variables:
- *  c-file-style: "gnu"
- *  tab-width: 8
- *  indent-tabs-mode: nil
- * End:
- */
diff --git a/lib-x86-32/include/cdio/bytesex_asm.h b/lib-x86-32/include/cdio/bytesex_asm.h
deleted file mode 100644
index 7f1f131a..00000000
--- a/lib-x86-32/include/cdio/bytesex_asm.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-    $Id: bytesex_asm.h,v 1.3 2008/03/25 15:59:08 karl Exp $
-
-    Copyright (C) 2008 Rocky Bernstein <rocky@gnu.org>
-                  2001, 2004, 2005 Herbert Valerio Riedel <hvr@gnu.org>
-                  2001 Sven Ottemann <ac-logic@freenet.de>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-/** \file bytesex_asm.h 
- *  \brief  Assembly code to handle byte-swapping.
-
-    Note: this header will is slated to get removed and libcdio will use 
-    glib.h routines instead. 
-*/
-
-#ifndef __CDIO_BYTESEX_ASM_H__
-#define __CDIO_BYTESEX_ASM_H__
-#if !defined(DISABLE_ASM_OPTIMIZE)
-
-#include <cdio/types.h>
-
-#if defined(__powerpc__) && defined(__GNUC__)
-
-inline static
-uint32_t uint32_swap_le_be_asm(const uint32_t a)
-{
-  uint32_t b;
-
-  __asm__ ("lwbrx %0,0,%1"
-           :"=r"(b)
-           :"r"(&a), "m"(a));
-
-  return b;
-}
-
-inline static
-uint16_t uint16_swap_le_be_asm(const uint16_t a)
-{
-  uint32_t b;
-
-  __asm__ ("lhbrx %0,0,%1"
-           :"=r"(b)
-           :"r"(&a), "m"(a));
-
-  return b;
-}
-
-#define UINT16_SWAP_LE_BE uint16_swap_le_be_asm
-#define UINT32_SWAP_LE_BE uint32_swap_le_be_asm
-
-#elif defined(__mc68000__) &&  defined(__STORMGCC__)
-
-inline static 
-uint32_t uint32_swap_le_be_asm(uint32_t a __asm__("d0"))
-{
-  /* __asm__("rolw #8,%0; swap %0; rolw #8,%0" : "=d" (val) : "0" (val)); */
-
-  __asm__("move.l %1,d0;rol.w #8,d0;swap d0;rol.w #8,d0;move.l d0,%0"
-          :"=r"(a)
-          :"r"(a));
-
-  return(a);
-}
-
-inline static
-uint16_t uint16_swap_le_be_asm(uint16_t a __asm__("d0"))
-{
-  __asm__("move.l %1,d0;rol.w #8,d0;move.l d0,%0"
-          :"=r"(a)
-          :"r"(a));
-  
-  return(a);
-}
-
-#define UINT16_SWAP_LE_BE uint16_swap_le_be_asm
-#define UINT32_SWAP_LE_BE uint32_swap_le_be_asm
-
-#elif 0 && defined(__i386__) && defined(__GNUC__)
-
-inline static 
-uint32_t uint32_swap_le_be_asm(uint32_t a)
-{
-  __asm__("xchgb %b0,%h0\n\t"     /* swap lower bytes     */
-	  "rorl $16,%0\n\t"       /* swap words           */
-	  "xchgb %b0,%h0"         /* swap higher bytes    */
-	  :"=q" (a)
-	  : "0" (a));
-
-  return(a);
-}
-
-inline static
-uint16_t uint16_swap_le_be_asm(uint16_t a)
-{
-  __asm__("xchgb %b0,%h0"         /* swap bytes           */ 
-	  : "=q" (a) 
-	  :  "0" (a));
-  
-  return(a);
-}
-
-#define UINT16_SWAP_LE_BE uint16_swap_le_be_asm
-#define UINT32_SWAP_LE_BE uint32_swap_le_be_asm
-
-#endif
-
-#endif /* !defined(DISABLE_ASM_OPTIMIZE) */
-#endif /* __CDIO_BYTESEX_ASM_H__ */
-
-
-/* 
- * Local variables:
- *  c-file-style: "gnu"
- *  tab-width: 8
- *  indent-tabs-mode: nil
- * End:
- */
diff --git a/lib-x86-32/include/cdio/cd_types.h b/lib-x86-32/include/cdio/cd_types.h
deleted file mode 100644
index bc1f16c0..00000000
--- a/lib-x86-32/include/cdio/cd_types.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
-    $Id: cd_types.h,v 1.18 2008/03/25 15:59:08 karl Exp $
-
-    Copyright (C) 2003, 2006, 2008 Rocky Bernstein <rocky@cpan.org>
-    Copyright (C) 1996,1997,1998  Gerd Knorr <kraxel@bytesex.org>
-         and       Heiko Eißfeldt <heiko@hexco.de>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-/** \file cd_types.h 
- *  \brief Header for routines which automatically determine the Compact Disc
- *  format and possibly filesystem on the CD.
- *         
- */
-
-#ifndef __CDIO_CD_TYPES_H__
-#define __CDIO_CD_TYPES_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/**
- * Filesystem types we understand. The highest-numbered fs type should
- *  be less than CDIO_FS_MASK defined below.
- */
-  typedef enum {
-    CDIO_FS_AUDIO                = 1, /**< audio only - not really a 
-                                         filesystem */
-    CDIO_FS_HIGH_SIERRA	         = 2, /**< High-Sierra Filesystem */
-    CDIO_FS_ISO_9660	         = 3, /**< ISO 9660 filesystem */
-    CDIO_FS_INTERACTIVE	         = 4,
-    CDIO_FS_HFS		         = 5, /**< file system used on the Macintosh 
-                                         system in MacOS 6 through MacOS 9
-                                         and deprecated in OSX. */
-    CDIO_FS_UFS		         = 6, /**< Generic Unix file system derived
-                                         from the Berkeley fast file 
-                                         system. */
-    
-    /**<
-     * EXT2 was the GNU/Linux native filesystem for early kernels. Newer
-     * GNU/Linux OS's may use EXT3 which is EXT2 with a journal. 
-     */
-    CDIO_FS_EXT2		 = 7,
-
-    CDIO_FS_ISO_HFS              = 8,  /**< both HFS & ISO-9660 filesystem */
-    CDIO_FS_ISO_9660_INTERACTIVE = 9,  /**< both CD-RTOS and ISO filesystem */
-
-
-    /**<
-     * The 3DO is, technically, a set of specifications created by the 3DO
-     * company.  These specs are for making a 3DO Interactive Multiplayer
-     * which uses a CD-player. Panasonic in the early 90's was the first
-     * company to manufacture and market a 3DO player. 
-     */
-    CDIO_FS_3DO		        = 10,
-
-
-    /**<
-       Microsoft X-BOX CD.
-    */
-    CDIO_FS_XISO 		= 11,
-    CDIO_FS_UDFX 		= 12,
-    CDIO_FS_UDF 		= 13,
-    CDIO_FS_ISO_UDF             = 14
-  } cdio_fs_t;
-
-
-/** 
- * Macro to extract just the FS type portion defined above 
-*/
-#define CDIO_FSTYPE(fs) (fs & CDIO_FS_MASK)
-
-/**
- *  Bit masks for the classes of CD-images. These are generally
- *  higher-level than the fs-type information above and may be determined
- *  based of the fs type information. This 
- */
-  typedef enum {
-    CDIO_FS_MASK	      =	  0x000f, /**< Note: this should be 2**n-1 and
-                                               and greater than the highest 
-                                               CDIO_FS number above */
-    CDIO_FS_ANAL_XA           =	  0x00010, /**< eXtended Architecture format */
-    CDIO_FS_ANAL_MULTISESSION =   0x00020, /**< CD has multisesion */
-    CDIO_FS_ANAL_PHOTO_CD     =	  0x00040, /**< Is a Kodak Photo CD */
-    CDIO_FS_ANAL_HIDDEN_TRACK =   0x00080, /**< Hidden track at the 
-                                               beginning of the CD */
-    CDIO_FS_ANAL_CDTV         =	  0x00100,
-    CDIO_FS_ANAL_BOOTABLE     =   0x00200, /**< CD is bootable */
-    CDIO_FS_ANAL_VIDEOCD      =   0x00400, /**< VCD 1.1 */
-    CDIO_FS_ANAL_ROCKRIDGE    =   0x00800, /**< Has Rock Ridge Extensions to
-                                               ISO 9660, */
-    CDIO_FS_ANAL_JOLIET       =   0x01000, /**< Microsoft Joliet extensions 
-                                                to ISO 9660, */
-    CDIO_FS_ANAL_SVCD         =   0x02000, /**< Super VCD or Choiji Video CD */
-    CDIO_FS_ANAL_CVD          =   0x04000, /**< Choiji Video CD */
-    CDIO_FS_ANAL_XISO         =   0x08000, /**< XBOX CD */
-    CDIO_FS_ANAL_ISO9660_ANY  =   0x10000, /**< Any sort fo ISO9660 FS */
-    CDIO_FS_ANAL_VCD_ANY      =   (CDIO_FS_ANAL_VIDEOCD|CDIO_FS_ANAL_SVCD|
-                                   CDIO_FS_ANAL_CVD),
-    CDIO_FS_MATCH_ALL         =  ~CDIO_FS_MASK /**< bitmask which can
-                                                 be used by
-                                                 cdio_get_devices to
-                                                 specify matching any
-                                                 sort of CD. */
-  } cdio_fs_cap_t;
-    
-
-#define CDIO_FS_UNKNOWN	            CDIO_FS_MASK
-
-/**
- * 
- */
-#define CDIO_FS_MATCH_ALL            (cdio_fs_anal_t) (~CDIO_FS_MASK)
-
-
-/*!
-  \brief The type used to return analysis information from
-  cdio_guess_cd_type. 
-
-  These fields make sense only for when an ISO-9660 filesystem is used.
- */
-typedef struct 
-{
-  unsigned int  joliet_level;  /**< If has Joliet extensions, this is the
-                                  associated level number (i.e. 1, 2, or 3). */
-  char          iso_label[33]; /**< This is 32 + 1 for null byte at the end in 
-				    formatting the string */
-  unsigned int  isofs_size;
-  uint8_t       UDFVerMinor;   /**< For UDF filesystems only */
-  uint8_t       UDFVerMajor;   /**< For UDF filesystems only */
-} cdio_iso_analysis_t;
-
-/**
- *  Try to determine what kind of CD-image and/or filesystem we
- *  have at track track_num. Return information about the CD image
- *  is returned in iso_analysis and the return value.
- */
-cdio_fs_anal_t cdio_guess_cd_type(const CdIo_t *cdio, int start_session, 
-				  track_t track_num, 
-				  /*out*/ cdio_iso_analysis_t *iso_analysis);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-/** The below variables are trickery to force the above enum symbol
-    values to be recorded in debug symbol tables. They are used to
-    allow one to refer to the enumeration value names in the typedefs
-    above in a debugger and debugger expressions.
-*/
-extern cdio_fs_cap_t debug_cdio_fs_cap;
-extern cdio_fs_t     debug_cdio_fs;
-
-#endif /* __CDIO_CD_TYPES_H__ */
-
-/* 
- * Local variables:
- *  c-file-style: "gnu"
- *  tab-width: 8
- *  indent-tabs-mode: nil
- * End:
- */
diff --git a/lib-x86-32/include/cdio/cdda.h b/lib-x86-32/include/cdio/cdda.h
deleted file mode 100644
index c30e129d..00000000
--- a/lib-x86-32/include/cdio/cdda.h
+++ /dev/null
@@ -1,411 +0,0 @@
-/*
-  $Id: cdda.h,v 1.30 2008/03/25 15:59:08 karl Exp $
-
-  Copyright (C) 2004, 2005, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
-  Copyright (C) 2001 Xiph.org and Heiko Eissfeldt heiko@escape.colossus.de
-
-  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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-/** \file cdda.h
- *
- *  \brief The top-level interface header for libcdio_cdda.
- *  Applications include this for paranoia access.
- *
- ******************************************************************/
-
-#ifndef _CDDA_INTERFACE_H_
-#define _CDDA_INTERFACE_H_
-
-#include <cdio/cdio.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-  /** cdrom_paranoia is an opaque structure which is used in all of the
-      library operations.
-  */
-  typedef struct cdrom_paranoia_s cdrom_paranoia_t;
-  typedef struct cdrom_drive_s   cdrom_drive_t;
-  
-  /** For compatibility. cdrom_drive_t is deprecated, use cdrom_drive_t
-      instead. */
-
-  /**
-     Flags for simulating jitter used in testing.
-
-     The enumeration type one probably wouldn't really use in a program.
-     It is here instead of defines to give symbolic names that can be
-     helpful in debuggers where wants just to say refer to
-     CDDA_TEST_JITTER_SMALL and get the correct value.
-  */
-  typedef enum {
-    CDDA_MESSAGE_FORGETIT = 0,
-    CDDA_MESSAGE_PRINTIT  = 1,
-    CDDA_MESSAGE_LOGIT    = 2,
-    CD_FRAMESAMPLES       = CDIO_CD_FRAMESIZE_RAW / 4,
-    MAXTRK                = (CDIO_CD_MAX_TRACKS+1)
-  } paranoia_cdda_enums_t;
-  
-
-#include <signal.h>
-
-/** We keep MAXTRK since this header is exposed publicly and other
-   programs may have used this.
-*/
-#define MAXTRK (CDIO_CD_MAX_TRACKS+1)
-
-/** \brief Structure for cdparanoia's CD Table of Contents */
-typedef struct TOC_s {	
-  unsigned char bTrack;
-  int32_t       dwStartSector;
-} TOC_t;
-
-/** For compatibility. TOC is deprecated, use TOC_t instead. */
-#define TOC TOC_t
-
-/** \brief Structure for cdparanoia's CD-ROM access */
-struct cdrom_drive_s {
-
-  CdIo_t *p_cdio;
-  int opened; /**< This struct may just represent a candidate for opening */
-
-  char *cdda_device_name;
-
-  char *drive_model;
-  int drive_type;
-  int bigendianp; /**< Whether data returned on the CDDA is bigendian or
-		       not. 1 if big endian, 0 if little endian and -1 if
-		       we don't know.
-		   */
-  int nsectors;   /**< Number of sectors use in reading. Multiply by 
-		   CDIO_CD_FRAMESIZE_RAW to get number of bytes used in
-		  the read buffer. */
-
-  int cd_extra;   /**< -1 if we can't get multisession info, 0 if
-                       there is one session only or the multi-session
-                       LBA is less than or 100 (don't ask me why -- I
-                       don't know), and 1 if the multi-session lba is
-                       greater than 100. */
-
-  bool b_swap_bytes;  /**< Swap bytes if Endian-ness of drive
-			   mismatches the endian-ness of the
-			   computer? */
-  track_t tracks;
-  TOC_t disc_toc[MAXTRK]; /**< info here starts origin 0 rather than the
-			     first track number (usually 1). So to take 
-			     a track number and use it here, subtract
-			     off cdio_get_first_track_num() beforehand.
-			   */
-  lsn_t audio_first_sector;
-  lsn_t audio_last_sector;
-
-  int errordest;
-  int messagedest;
-  char *errorbuf;
-  char *messagebuf;
-
-  /* functions specific to particular drives/interfaces */
-
-  int  (*enable_cdda)  (cdrom_drive_t *d, int onoff);
-  int  (*read_toc)     (cdrom_drive_t *d);
-  long (*read_audio)   (cdrom_drive_t *d, void *p, lsn_t begin, 
-		       long sectors);
-  int  (*set_speed)    (cdrom_drive_t *d, int speed);
-  int error_retry;
-  int report_all;
-
-  int is_atapi;
-  int is_mmc;
-
-  int i_test_flags; /**< Normally set 0. But if we are testing
-		       paranoia operation this can be set to one of
-		       the flag masks to simulate a particular kind of
-		       failure.    */
-
-};
-
-
-  /**
-     Flags for simulating jitter used in testing.
-
-     The enumeration type one probably wouldn't really use in a program.
-     It is here instead of defines to give symbolic names that can be
-     helpful in debuggers where wants just to say refer to
-     CDDA_TEST_JITTER_SMALL and get the correct value.
-  */
-  typedef enum {
-    CDDA_TEST_JITTER_SMALL   = 1,
-    CDDA_TEST_JITTER_LARGE   = 2,
-    CDDA_TEST_JITTER_MASSIVE = 3,
-    CDDA_TEST_FRAG_SMALL     = (1<<3),
-    CDDA_TEST_FRAG_LARGE     = (2<<3),
-    CDDA_TEST_FRAG_MASSIVE   = (3<<3),
-    CDDA_TEST_UNDERRUN       = 64 
-  } paranoia_jitter_t;
-  
-/** jitter testing. The first two bits are set to determine the
-     byte-distance we will jitter the data; 0 is no shifting.
- */
-
-/**< jitter testing. Set the below bit to always cause jittering on reads.
-     The below bit only has any effect if the first two (above) bits are 
-     nonzero. If the above bits are set, but the below bit isn't we'll
-     jitter 90% of the time.
-  */
-#define CDDA_TEST_ALWAYS_JITTER     4 
-
-/** fragment testing */
-#define CDDA_TEST_FRAG_SMALL   (1<<3)
-#define CDDA_TEST_FRAG_LARGE   (2<<3)
-#define CDDA_TEST_FRAG_MASSIVE (3<<3)
-
-/**< under-run testing. The below bit is set for testing.  */
-#define CDDA_TEST_UNDERRUN         64 
-
-#if TESTING_IS_FINISHED
-
- /** scratch testing */
-#define CDDA_TEST_SCRATCH         128
-#undef  CDDA_TEST_BOGUS_BYTES     256
-#undef  CDDA_TEST_DROPDUPE_BYTES  512
-#endif /* TESTING_IS_FINISHED */
-
-/** autosense functions */
-
-/** Get a CD-ROM drive with a CD-DA in it. 
-    If mesagedest is 1, then any messages in the process will be stored 
-    in message.
-*/
-extern cdrom_drive_t *cdio_cddap_find_a_cdrom(int messagedest, 
-					      char **ppsz_message);
-
-/** Returns a paranoia CD-ROM drive object with a CD-DA in it or NULL
-    if there was an error.
-    @see cdio_cddap_identify_cdio
- */
-extern cdrom_drive_t *cdio_cddap_identify(const char *psz_device, 
-					  int messagedest, 
-					  char **ppsz_message);
-
-/** Returns a paranoia CD-ROM drive object with a CD-DA in it or NULL
-    if there was an error.  In contrast to cdio_cddap_identify, we
-    start out with an initialized p_cdio object. For example you may
-    have used that for other purposes such as to get CDDB/CD-Text
-    information.  @see cdio_cddap_identify
- */
-cdrom_drive_t *cdio_cddap_identify_cdio(CdIo_t *p_cdio, 
-					int messagedest, char **ppsz_messages);
-
-/** drive-oriented functions */
-
-extern int     cdio_cddap_speed_set(cdrom_drive_t *d, int speed);
-extern void    cdio_cddap_verbose_set(cdrom_drive_t *d, int err_action, 
-				      int mes_action);
-extern char   *cdio_cddap_messages(cdrom_drive_t *d);
-extern char   *cdio_cddap_errors(cdrom_drive_t *d);
-
-/*!
-  Closes d and releases all storage associated with it except
-  the internal p_cdio pointer. 
-
-  @param d cdrom_drive_t object to be closed.
-  @return 0 if passed a null pointer and 1 if not in which case
-  some work was probably done.
-
-  @see cdio_cddap_close
-*/
-bool cdio_cddap_close_no_free_cdio(cdrom_drive_t *d);
-
-/*!
-  Closes d and releases all storage associated with it.
-  Doubles as "cdrom_drive_free()". 
-
-  @param d cdrom_drive_t object to be closed.
-  @return 0 if passed a null pointer and 1 if not in which case
-  some work was probably done.
-
-  @see cdio_cddap_close_no_free_cdio
-*/
-extern int     cdio_cddap_close(cdrom_drive_t *d);
-
-extern int     cdio_cddap_open(cdrom_drive_t *d);
-
-extern long    cdio_cddap_read(cdrom_drive_t *d, void *p_buffer,
-			       lsn_t beginsector, long sectors);
-
-/*! Return the lsn for the start of track i_track */
-extern lsn_t   cdio_cddap_track_firstsector(cdrom_drive_t *d, 
-				      track_t i_track);
-
-/*! Get last lsn of the track. This generally one less than the start
-  of the next track. -1 is returned on error. */
-extern lsn_t   cdio_cddap_track_lastsector(cdrom_drive_t *d, track_t i_track);
-
-/*! Return the number of tracks on the CD. */
-extern track_t cdio_cddap_tracks(cdrom_drive_t *d);
-
-/*! Return the track containing the given LSN. If the LSN is before
-    the first track (in the pregap), 0 is returned. If there was an
-    error or the LSN after the LEADOUT (beyond the end of the CD), then
-    CDIO_INVALID_TRACK is returned.
- */
-extern int     cdio_cddap_sector_gettrack(cdrom_drive_t *d, lsn_t lsn);
-
-/*! Return the number of channels in track: 2 or 4; -2 if not
-  implemented or -1 for error.
-  Not meaningful if track is not an audio track.
-*/
-extern int     cdio_cddap_track_channels(cdrom_drive_t *d, track_t i_track);
-
-/*! Return 1 is track is an audio track, 0 otherwise. */
-extern int     cdio_cddap_track_audiop(cdrom_drive_t *d, track_t i_track);
-
-/*! Return 1 is track has copy permit set, 0 otherwise. */
-extern int     cdio_cddap_track_copyp(cdrom_drive_t *d, track_t i_track);
-
-/*! Return 1 is audio track has linear preemphasis set, 0 otherwise. 
-    Only makes sense for audio tracks.
- */
-extern int     cdio_cddap_track_preemp(cdrom_drive_t *d, track_t i_track);
-
-/*! Get first lsn of the first audio track. -1 is returned on error. */
-extern lsn_t   cdio_cddap_disc_firstsector(cdrom_drive_t *d);
-
-/*! Get last lsn of the last audio track. The last lsn is generally one
-  less than the start of the next track after the audio track. -1 is
-  returned on error. */
-extern lsn_t   cdio_cddap_disc_lastsector(cdrom_drive_t *d);
-
-/*! Determine Endian-ness of the CD-drive based on reading data from
-  it. Some drives return audio data Big Endian while some (most)
-  return data Little Endian. Drives known to return data bigendian are
-  SCSI drives from Kodak, Ricoh, HP, Philips, Plasmon, Grundig
-  CDR100IPW, and Mitsumi CD-R. ATAPI and MMC drives are little endian.
-
-  rocky: As someone who didn't write the code, I have to say this is
-  nothing less than brilliant. An FFT is done both ways and the the
-  transform is looked at to see which has data in the FFT (or audible)
-  portion. (Or so that's how I understand it.)
-
-  @return 1 if big-endian, 0 if little-endian, -1 if we couldn't
-  figure things out or some error.
- */
-extern int data_bigendianp(cdrom_drive_t *d);
-
-/** transport errors: */
-
-typedef enum {
-  TR_OK =            0,
-  TR_EWRITE =        1  /**< Error writing packet command (transport) */,
-  TR_EREAD =         2  /**< Error reading packet data (transport) */,
-  TR_UNDERRUN =      3  /**< Read underrun */,
-  TR_OVERRUN =       4  /**< Read overrun */,
-  TR_ILLEGAL =       5  /**< Illegal/rejected request */,
-  TR_MEDIUM =        6  /**< Medium error */,
-  TR_BUSY =          7  /**< Device busy */,
-  TR_NOTREADY =      8  /**< Device not ready */,
-  TR_FAULT =         9  /**< Device failure */,
-  TR_UNKNOWN =      10  /**< Unspecified error */,
-  TR_STREAMING =    11  /**< loss of streaming */,
-} transport_error_t;
-  
-
-#ifdef NEED_STRERROR_TR
-const char *strerror_tr[]={
-  "Success",
-  "Error writing packet command to device",
-  "Error reading command from device",
-  "SCSI packet data underrun (too little data)",
-  "SCSI packet data overrun (too much data)",
-  "Illegal SCSI request (rejected by target)",
-  "Medium reading data from medium",
-  "Device busy",
-  "Device not ready",
-  "Target hardware fault",
-  "Unspecified error",
-  "Drive lost streaming"
-};
-#endif /*NEED_STERROR_TR*/
-
-/** Errors returned by lib: 
-
-\verbatim 
-001: Unable to set CDROM to read audio mode
-002: Unable to read table of contents lead-out
-003: CDROM reporting illegal number of tracks
-004: Unable to read table of contents header
-005: Unable to read table of contents entry
-006: Could not read any data from drive
-007: Unknown, unrecoverable error reading data
-008: Unable to identify CDROM model
-009: CDROM reporting illegal table of contents
-010: Unaddressable sector 
-
-100: Interface not supported
-101: Drive is neither a CDROM nor a WORM device
-102: Permision denied on cdrom (ioctl) device
-103: Permision denied on cdrom (data) device
-
-300: Kernel memory error
-
-400: Device not open
-401: Invalid track number
-402: Track not audio data
-403: No audio tracks on disc
-\endverbatim
-
-*/
-
-#ifndef DO_NOT_WANT_PARANOIA_COMPATIBILITY
-/** For compatibility with good ol' paranoia */
-#define cdda_find_a_cdrom       cdio_cddap_find_a_cdrom
-#define cdda_identify           cdio_cddap_identify
-#define cdda_speed_set          cdio_cddap_speed_set
-#define cdda_verbose_set        cdio_cddap_verbose_set
-#define cdda_messages           cdio_cddap_messages
-#define cdda_errors             cdio_cddap_errors
-#define cdda_close              cdio_cddap_close
-#define cdda_open               cdio_cddap_open
-#define cdda_read               cdio_cddap_read
-#define cdda_track_firstsector  cdio_cddap_track_firstsector 
-#define cdda_track_lastsector   cdio_cddap_track_lastsector 
-#define cdda_tracks             cdio_cddap_tracks 
-#define cdda_sector_gettrack    cdio_cddap_sector_gettrack  
-#define cdda_track_channels     cdio_cddap_track_channels
-#define cdda_track_audiop       cdio_cddap_track_audiop
-#define cdda_track_copyp        cdio_cddap_track_copyp
-#define cdda_track_preemp       cdio_cddap_track_preemp
-#define cdda_disc_firstsector   cdio_cddap_disc_firstsector
-#define cdda_disc_lastsector    cdio_cddap_disc_lastsector
-#define cdrom_drive             cdrom_drive_t
-
-#endif /*DO_NOT_WANT_PARANOIA_COMPATIBILITY*/
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-/** The below variables are trickery to force the above enum symbol
-    values to be recorded in debug symbol tables. They are used to
-    allow one to refer to the enumeration value names in the typedefs
-    above in a debugger and debugger expressions
-*/
-
-extern paranoia_jitter_t     debug_paranoia_jitter;
-extern paranoia_cdda_enums_t debug_paranoia_cdda_enums;
-
-#endif /*_CDDA_INTERFACE_H_*/
-
diff --git a/lib-x86-32/include/cdio/cdio.h b/lib-x86-32/include/cdio/cdio.h
deleted file mode 100644
index 84e54b10..00000000
--- a/lib-x86-32/include/cdio/cdio.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- c -*-
-    $Id: cdio.h,v 1.82 2008/03/25 15:59:08 karl Exp $
-
-    Copyright (C) 2003, 2004, 2005, 2008 Rocky Bernstein <rocky@gnu.org>
-    Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-/** \file cdio.h 
- *
- *  \brief The top-level header for libcdio: the CD Input and Control
- *  library. Applications include this for anything regarding libcdio.
- */
-
-
-#ifndef __CDIO_H__
-#define __CDIO_H__
-
-/** Application Interface or Protocol version number. If the public
- *  interface changes, we increase this number.
- */
-#define CDIO_API_VERSION 5
-
-#include <cdio/version.h>
-
-#ifdef  HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef  HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include <cdio/types.h>
-#include <cdio/sector.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* For compatibility. */
-#define CdIo CdIo_t
-    
-  /** This is an opaque structure for the CD object. */
-  typedef struct _CdIo CdIo_t; 
-
-  /** This is an opaque structure for the CD-Text object. */
-  typedef struct cdtext cdtext_t;
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-/* Drive(r)/Device-related functions. Perhaps we should break out 
-   Driver from device?
-*/
-#include <cdio/device.h>
-
-/* Disc-related functions. */
-#include <cdio/disc.h>
-
-/* Sector (frame, or block)-related functions. Uses driver_return_code_t
-   from <cdio/device.h> so it should come after that. 
-*/
-#include <cdio/read.h>
-
-/* CD-Text-related functions. */
-#include <cdio/cdtext.h>
-
-/* Track-related functions. */
-#include <cdio/track.h>
-
-#endif /* __CDIO_H__ */
diff --git a/lib-x86-32/include/cdio/cdio_config.h b/lib-x86-32/include/cdio/cdio_config.h
deleted file mode 100644
index 2005b888..00000000
--- a/lib-x86-32/include/cdio/cdio_config.h
+++ /dev/null
@@ -1,258 +0,0 @@
-/** \file cdio_config.h
- *  \brief  configuration-time settings useful in compilation; a run-time
-    version of config.h
-*/
-/* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define if building universal (internal helper macro) */
-/* #undef AC_APPLE_UNIVERSAL_BUILD */
-
-/* Define 1 if you are compiling using cygwin */
-/* #undef CYGWIN */
-
-/* what to put between the brackets for empty arrays */
-#define EMPTY_ARRAY_SIZE 
-
-/* Define 1 if you have BSDI-type CD-ROM support */
-/* #undef HAVE_BSDI_CDROM */
-
-/* Define to 1 if you have the `bzero' function. */
-#define HAVE_BZERO 1
-
-/* Define this if you have libcddb installed */
-#define HAVE_CDDB /**/
-
-/* Define to 1 if you have the <CoreFoundation/CFBase.h> header file. */
-/* #undef HAVE_COREFOUNDATION_CFBASE_H */
-
-/* Define to 1 if you have the <curses.h> header file. */
-/* #undef HAVE_CURSES_H */
-
-/* Define 1 if you have Darwin OS X-type CD-ROM support */
-/* #undef HAVE_DARWIN_CDROM */
-
-/* Define if time.h defines extern long timezone and int daylight vars. */
-#define HAVE_DAYLIGHT 1
-
-/* Define to 1 if you have the Apple DiskArbitration framework */
-/* #undef HAVE_DISKARBITRATION */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define to 1 if you have the `drand48' function. */
-#define HAVE_DRAND48 1
-
-/* Define to 1 if you have the <dvd.h> header file. */
-/* #undef HAVE_DVD_H */
-
-/* Define to 1 if you have the <errno.h> header file. */
-#define HAVE_ERRNO_H 1
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define 1 if you have FreeBSD CD-ROM support */
-/* #undef HAVE_FREEBSD_CDROM */
-
-/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
-/* #undef HAVE_FSEEKO */
-
-/* Define to 1 if you have the `ftruncate' function. */
-#define HAVE_FTRUNCATE 1
-
-/* Define to 1 if you have the `geteuid' function. */
-#define HAVE_GETEUID 1
-
-/* Define to 1 if you have the `getgid' function. */
-#define HAVE_GETGID 1
-
-/* Define to 1 if you have the <getopt.h> header file. */
-#define HAVE_GETOPT_H 1
-
-/* Define to 1 if you have the `getpwuid' function. */
-#define HAVE_GETPWUID 1
-
-/* Define to 1 if you have the `gettimeofday' function. */
-#define HAVE_GETTIMEOFDAY 1
-
-/* Define to 1 if you have the `getuid' function. */
-#define HAVE_GETUID 1
-
-/* Define to 1 if you have the <glob.h> header file. */
-#define HAVE_GLOB_H 1
-
-/* Define to 1 if you have the `gmtime_r' function. */
-#define HAVE_GMTIME_R 1
-
-/* Define if you have the iconv() function and it works. */
-#define HAVE_ICONV 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the <IOKit/IOKitLib.h> header file. */
-/* #undef HAVE_IOKIT_IOKITLIB_H */
-
-/* Supports ISO _Pragma() macro */
-#define HAVE_ISOC99_PRAGMA /**/
-
-/* Define 1 if you want ISO-9660 Joliet extension support. You must have also
-   libiconv installed to get Joliet extension support. */
-#define HAVE_JOLIET 1
-
-/* Define this if your libcurses has keypad */
-#define HAVE_KEYPAD /**/
-
-/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
-#define HAVE_LANGINFO_CODESET 1
-
-/* Define to 1 if you have the `nsl' library (-lnsl). */
-/* #undef HAVE_LIBNSL */
-
-/* Define to 1 if you have the `socket' library (-lsocket). */
-/* #undef HAVE_LIBSOCKET */
-
-/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* Define 1 if you have Linux-type CD-ROM support */
-#define HAVE_LINUX_CDROM 1
-
-/* Define to 1 if you have the <linux/cdrom.h> header file. */
-#define HAVE_LINUX_CDROM_H 1
-
-/* Define 1 if timeout is in cdrom_generic_command struct */
-/* #undef HAVE_LINUX_CDROM_TIMEOUT */
-
-/* Define to 1 if you have the <linux/major.h> header file. */
-#define HAVE_LINUX_MAJOR_H 1
-
-/* Define to 1 if you have the <linux/version.h> header file. */
-#define HAVE_LINUX_VERSION_H 1
-
-/* Define to 1 if you have the `localtime_r' function. */
-#define HAVE_LOCALTIME_R 1
-
-/* Define to 1 if you have the `lstat' function. */
-#define HAVE_LSTAT 1
-
-/* Define to 1 if you have the `memcpy' function. */
-#define HAVE_MEMCPY 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `memset' function. */
-#define HAVE_MEMSET 1
-
-/* Define to 1 if you have the <ncurses.h> header file. */
-#define HAVE_NCURSES_H 1
-
-/* Define 1 if you have NetBSD CD-ROM support */
-/* #undef HAVE_NETBSD_CDROM */
-
-/* Define 1 if you have OS/2 CD-ROM support */
-/* #undef HAVE_OS2_CDROM */
-
-/* Define to 1 if you have the <pwd.h> header file. */
-#define HAVE_PWD_H 1
-
-/* Define to 1 if you have the `rand' function. */
-#define HAVE_RAND 1
-
-/* Define to 1 if you have the `readlink' function. */
-#define HAVE_READLINK 1
-
-/* Define 1 if you want ISO-9660 Rock-Ridge extension support. */
-#define HAVE_ROCK 1
-
-/* Define to 1 if you have the `setegid' function. */
-#define HAVE_SETEGID 1
-
-/* Define to 1 if you have the `setenv' function. */
-#define HAVE_SETENV 1
-
-/* Define to 1 if you have the `seteuid' function. */
-#define HAVE_SETEUID 1
-
-/* Define to 1 if you have the `sleep' function. */
-#define HAVE_SLEEP 1
-
-/* Define to 1 if you have the `snprintf' function. */
-#define HAVE_SNPRINTF 1
-
-/* Define 1 if you have Solaris CD-ROM support */
-/* #undef HAVE_SOLARIS_CDROM */
-
-/* Define to 1 if you have the <stdarg.h> header file. */
-#define HAVE_STDARG_H 1
-
-/* Define to 1 if you have the <stdbool.h> header file. */
-#define HAVE_STDBOOL_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdio.h> header file. */
-#define HAVE_STDIO_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define this if you have struct timespec */
-#define HAVE_STRUCT_TIMESPEC /**/
-
-/* Define to 1 if you have the <sys/cdio.h> header file. */
-/* #undef HAVE_SYS_CDIO_H */
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-#define HAVE_SYS_PARAM_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/timeb.h> header file. */
-#define HAVE_SYS_TIMEB_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <sys/utsname.h> header file. */
-#define HAVE_SYS_UTSNAME_H 1
-
-/* Define this <sys/stat.h> defines S_ISLNK() */
-#define HAVE_S_ISLNK /**/
-
-/* Define this <sys/stat.h> defines S_ISSOCK() */
-#define HAVE_S_ISSOCK /**/
-
-/* Define to 1 if timegm is available */
-#define HAVE_TIMEGM 1
-
-/* Define if you have an extern long timenzone variable. */
-#define HAVE_TIMEZONE_VAR 1
-
-/* Define if struct tm has the tm_gmtoff member. */
-#define HAVE_TM_GMTOFF 1
-
-/* Define if time.h defines extern extern char *tzname[2] variable */
-#define HAVE_TZNAME 1
-
-/* Define to 1 if you have the `tzset' function. */
-#define HAVE_TZSET 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the `unsetenv' function. */
diff --git a/lib-x86-32/include/cdio/cdtext.h b/lib-x86-32/include/cdio/cdtext.h
deleted file mode 100644
index daac733f..00000000
--- a/lib-x86-32/include/cdio/cdtext.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
-    $Id: cdtext.h,v 1.14 2008/03/25 15:59:08 karl Exp $
-
-    Copyright (C) 2004, 2005, 2008 Rocky Bernstein <rocky@gnu.org>
-    adapted from cuetools
-    Copyright (C) 2003 Svend Sanjay Sorensen <ssorensen@fastmail.fm>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-/*!
- * \file cdtext.h 
- *
- * \brief The top-level header for CD-Text information. Applications
- *  include this for CD-Text access.
-*/
-
-
-#ifndef __CDIO_CDTEXT_H__
-#define __CDIO_CDTEXT_H__
-
-#include <cdio/cdio.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define MAX_CDTEXT_FIELDS 13
-#define MIN_CDTEXT_FIELD  0
-  
-  /*! \brief structure for holding CD-Text information
-
-  @see cdtext_init, cdtext_destroy, cdtext_get, and cdtext_set.
-  */
-  struct cdtext {
-    char *field[MAX_CDTEXT_FIELDS];
-  };
-  
-  /*! \brief A list of all of the CD-Text fields. Because
-    the interval has no gaps, we can use ++ to iterate over fields.
-   */
-  typedef enum {
-    CDTEXT_ARRANGER   =  0,   /**< name(s) of the arranger(s) */
-    CDTEXT_COMPOSER   =  1,   /**< name(s) of the composer(s) */
-    CDTEXT_DISCID     =  2,   /**< disc identification information */
-    CDTEXT_GENRE      =  3,   /**< genre identification and genre information */
-    CDTEXT_MESSAGE    =  4,   /**< ISRC code of each track */
-    CDTEXT_ISRC       =  5,   /**< message(s) from the content provider or artist */
-    CDTEXT_PERFORMER  =  6,   /**< name(s) of the performer(s) */
-    CDTEXT_SIZE_INFO  =  7,   /**< size information of the block */
-    CDTEXT_SONGWRITER =  8,   /**< name(s) of the songwriter(s) */
-    CDTEXT_TITLE      =  9,   /**< title of album name or track titles */
-    CDTEXT_TOC_INFO   = 10,   /**< table of contents information */
-    CDTEXT_TOC_INFO2  = 11,   /**< second table of contents information */
-    CDTEXT_UPC_EAN    = 12,
-    CDTEXT_INVALID    = MAX_CDTEXT_FIELDS
-  } cdtext_field_t;
-
-  /*! Return string representation of the enum values above */
-  const char *cdtext_field2str (cdtext_field_t i);
-  
-  /*! Initialize a new cdtext structure.
-    When the structure is no longer needed, release the 
-    resources using cdtext_delete.
-  */
-  void cdtext_init (cdtext_t *cdtext);
-  
-  /*! Free memory assocated with cdtext*/
-  void cdtext_destroy (cdtext_t *cdtext);
-  
-  /*! returns an allocated string associated with the given field.  NULL is
-    returned if key is CDTEXT_INVALID or the field is not set.
-
-    The user needs to free the string when done with it.
-
-    @see cdio_get_const to retrieve a constant string that doesn't
-    have to be freed.
-  */
-  char *cdtext_get (cdtext_field_t key, const cdtext_t *cdtext);
-
-  /*! returns a const string associated with the given field.  NULL is
-    returned if key is CDTEXT_INVALID or the field is not set.
-
-    Don't use the string when the cdtext object (i.e. the CdIo_t object
-    you got it from) is no longer valid.
-
-    @see cdio_get to retrieve an allocated string that persists past
-    the cdtext object.
-  */
-  const char *cdtext_get_const (cdtext_field_t key, const cdtext_t *cdtext);
-  
-  /*!
-    returns enum of keyword if key is a CD-Text keyword, 
-    returns MAX_CDTEXT_FIELDS non-zero otherwise.
-  */
-  cdtext_field_t cdtext_is_keyword (const char *key);
-  
-  /*! 
-    sets cdtext's keyword entry to field 
-  */
-  void cdtext_set (cdtext_field_t key, const char *value, cdtext_t *cdtext);
-  
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __CDIO_CDTEXT_H__ */
-
-/* 
- * Local variables:
- *  c-file-style: "gnu"
- *  tab-width: 8
- *  indent-tabs-mode: nil
- * End:
- */
diff --git a/lib-x86-32/include/cdio/device.h b/lib-x86-32/include/cdio/device.h
deleted file mode 100644
index cc84e79a..00000000
--- a/lib-x86-32/include/cdio/device.h
+++ /dev/null
@@ -1,995 +0,0 @@
-/* -*- c -*-
-    $Id: device.h,v 1.39 2008/03/28 01:28:50 rocky Exp $
-
-    Copyright (C) 2005, 2006, 2008, 2009 Rocky Bernstein <rocky@gnu.org>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-/** \file device.h 
- *
- *  \brief C header for driver- or device-related libcdio
- *          calls.  ("device" includes CD-image reading devices).
- */
-#ifndef __CDIO_DEVICE_H__
-#define __CDIO_DEVICE_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-  /*! The type of an drive capability bit mask. See below for values*/
-  typedef uint32_t cdio_drive_read_cap_t;
-  typedef uint32_t cdio_drive_write_cap_t;
-  typedef uint32_t cdio_drive_misc_cap_t;
-  
-  /*!
-    \brief Drive capability bits returned by cdio_get_drive_cap()
-    NOTE: Setting a bit here means the presence of a capability.
-  */ 
-
-  /** Miscellaneous capabilities. */
-  typedef enum {
-    CDIO_DRIVE_CAP_ERROR             = 0x40000, /**< Error */
-    CDIO_DRIVE_CAP_UNKNOWN           = 0x80000, /**< Dunno. It can be on if we
-					        have only partial information 
-                                                or are not completely certain
-						*/
-    CDIO_DRIVE_CAP_MISC_CLOSE_TRAY   = 0x00001, /**< caddy systems can't 
-                                                     close... */
-    CDIO_DRIVE_CAP_MISC_EJECT        = 0x00002, /**< but can eject.  */
-    CDIO_DRIVE_CAP_MISC_LOCK	     = 0x00004, /**< disable manual eject */
-    CDIO_DRIVE_CAP_MISC_SELECT_SPEED = 0x00008, /**< programmable speed */
-    CDIO_DRIVE_CAP_MISC_SELECT_DISC  = 0x00010, /**< select disc from 
-                                                      juke-box */
-    CDIO_DRIVE_CAP_MISC_MULTI_SESSION= 0x00020, /**< read sessions>1 */
-    CDIO_DRIVE_CAP_MISC_MEDIA_CHANGED= 0x00080, /**< media changed */
-    CDIO_DRIVE_CAP_MISC_RESET        = 0x00100, /**< hard reset device */
-    CDIO_DRIVE_CAP_MISC_FILE         = 0x20000 /**< drive is really a file,
-						  i.e a CD file image */
-  } cdio_drive_cap_misc_t;
-
-  /*! Reading masks.. */
-  typedef enum {
-    CDIO_DRIVE_CAP_READ_AUDIO        = 0x00001, /**< drive can play CD audio */
-    CDIO_DRIVE_CAP_READ_CD_DA        = 0x00002, /**< drive can read CD-DA */
-    CDIO_DRIVE_CAP_READ_CD_G         = 0x00004, /**< drive can read CD+G  */
-    CDIO_DRIVE_CAP_READ_CD_R         = 0x00008, /**< drive can read CD-R  */
-    CDIO_DRIVE_CAP_READ_CD_RW        = 0x00010, /**< drive can read CD-RW */
-    CDIO_DRIVE_CAP_READ_DVD_R        = 0x00020, /**< drive can read DVD-R */
-    CDIO_DRIVE_CAP_READ_DVD_PR       = 0x00040, /**< drive can read DVD+R */
-    CDIO_DRIVE_CAP_READ_DVD_RAM      = 0x00080, /**< drive can read DVD-RAM */
-    CDIO_DRIVE_CAP_READ_DVD_ROM      = 0x00100, /**< drive can read DVD-ROM */
-    CDIO_DRIVE_CAP_READ_DVD_RW       = 0x00200, /**< drive can read DVD-RW  */
-    CDIO_DRIVE_CAP_READ_DVD_RPW      = 0x00400, /**< drive can read DVD+RW  */
-    CDIO_DRIVE_CAP_READ_C2_ERRS      = 0x00800, /**< has C2 error correction */
-    CDIO_DRIVE_CAP_READ_MODE2_FORM1  = 0x01000, /**< can read mode 2 form 1 */
-    CDIO_DRIVE_CAP_READ_MODE2_FORM2  = 0x02000, /**< can read mode 2 form 2 */
-    CDIO_DRIVE_CAP_READ_MCN          = 0x04000, /**< can read MCN      */
-    CDIO_DRIVE_CAP_READ_ISRC         = 0x08000 /**< can read ISRC     */
-  } cdio_drive_cap_read_t;
-
-  /*! Writing masks.. */
-  typedef enum {
-    CDIO_DRIVE_CAP_WRITE_CD_R        = 0x00001, /**< drive can write CD-R */
-    CDIO_DRIVE_CAP_WRITE_CD_RW       = 0x00002, /**< drive can write CD-RW */
-    CDIO_DRIVE_CAP_WRITE_DVD_R       = 0x00004, /**< drive can write DVD-R */
-    CDIO_DRIVE_CAP_WRITE_DVD_PR      = 0x00008, /**< drive can write DVD+R */
-    CDIO_DRIVE_CAP_WRITE_DVD_RAM     = 0x00010, /**< drive can write DVD-RAM */
-    CDIO_DRIVE_CAP_WRITE_DVD_RW      = 0x00020, /**< drive can write DVD-RW */
-    CDIO_DRIVE_CAP_WRITE_DVD_RPW     = 0x00040, /**< drive can write DVD+RW */
-    CDIO_DRIVE_CAP_WRITE_MT_RAINIER  = 0x00080, /**< Mount Rainier           */
-    CDIO_DRIVE_CAP_WRITE_BURN_PROOF  = 0x00100, /**< burn proof */
-    CDIO_DRIVE_CAP_WRITE_CD =
-    (CDIO_DRIVE_CAP_WRITE_CD_R | CDIO_DRIVE_CAP_WRITE_CD_RW),
-    /**< Has some sort of CD writer ability */
-
-    CDIO_DRIVE_CAP_WRITE_DVD = 
-    (CDIO_DRIVE_CAP_WRITE_DVD_R | CDIO_DRIVE_CAP_WRITE_DVD_PR 
-     | CDIO_DRIVE_CAP_WRITE_DVD_RAM | CDIO_DRIVE_CAP_WRITE_DVD_RW 
-     | CDIO_DRIVE_CAP_WRITE_DVD_RPW ),
-    /**< Has some sort of DVD writer ability */
-
-    CDIO_DRIVE_CAP_WRITE = 
-    (CDIO_DRIVE_CAP_WRITE_CD | CDIO_DRIVE_CAP_WRITE_DVD)
-    /**< Has some sort of DVD or CD writing ability */
-  } cdio_drive_cap_write_t;
-    
-/*! Size of fields returned by an INQUIRY command */
-  typedef enum {
-    CDIO_MMC_HW_VENDOR_LEN   =  8, /**< length of vendor field */
-    CDIO_MMC_HW_MODEL_LEN    = 16, /**< length of model field */
-    CDIO_MMC_HW_REVISION_LEN =  4  /**< length of revision field */
-  } cdio_mmc_hw_len_t;
-    
-
-  /*! \brief Structure to return CD vendor, model, and revision-level
-      strings obtained via the INQUIRY command  */
-  typedef struct cdio_hwinfo 
-  {
-    char psz_vendor  [CDIO_MMC_HW_VENDOR_LEN+1];
-    char psz_model   [CDIO_MMC_HW_MODEL_LEN+1];
-    char psz_revision[CDIO_MMC_HW_REVISION_LEN+1];
-  } cdio_hwinfo_t;
-
-
-  /** Flags specifying the category of device to open or is opened. */
-  typedef enum {
-    CDIO_SRC_IS_DISK_IMAGE_MASK = 0x0001, /**< Read source is a CD image. */
-    CDIO_SRC_IS_DEVICE_MASK     = 0x0002, /**< Read source is a CD device. */
-    CDIO_SRC_IS_SCSI_MASK       = 0x0004, /**< Read source SCSI device. */
-    CDIO_SRC_IS_NATIVE_MASK     = 0x0008
-  } cdio_src_category_mask_t;
-    
-
-  /** The driver_id_t enumerations may be used to tag a specific driver
-   * that is opened or is desired to be opened. Note that this is
-   * different than what is available on a given host.
-   *
-   * Order should not be changed lightly because it breaks the ABI.
-   * One is not supposed to iterate over the values, but iterate over the
-   * cdio_drivers and cdio_device_drivers arrays.
-   *
-   * NOTE: IF YOU MODIFY ENUM MAKE SURE INITIALIZATION IN CDIO.C AGREES.
-   *     
-   */
-  typedef enum  {
-    DRIVER_UNKNOWN, /**< Used as input when we don't care what kind 
-		         of driver to use. */
-    DRIVER_AIX,     /**< AIX driver */
-    DRIVER_BSDI,    /**< BSDI driver */
-    DRIVER_FREEBSD, /**< FreeBSD driver - includes CAM and ioctl access */
-    DRIVER_NETBSD,  /**< NetBSD Driver. */
-    DRIVER_LINUX,   /**< GNU/Linux Driver */
-    DRIVER_SOLARIS, /**< Sun Solaris Driver */
-    DRIVER_OS2,     /**< IBM OS/2 Driver */
-    DRIVER_OSX,     /**< Apple OSX Driver */
-    DRIVER_WIN32,   /**< Microsoft Windows Driver. Includes ASPI and 
-		         ioctl access. */
-    DRIVER_CDRDAO,  /**< cdrdao format CD image. This is listed
-		         before BIN/CUE, to make the code prefer cdrdao
-		         over BIN/CUE when both exist. */
-    DRIVER_BINCUE,  /**< CDRWIN BIN/CUE format CD image. This is
-		         listed before NRG, to make the code prefer
-		         BIN/CUE over NRG when both exist. */
-    DRIVER_NRG,     /**< Nero NRG format CD image. */
-    DRIVER_DEVICE   /**< Is really a set of the above; should come last */
-  } driver_id_t;
-
-  /** A null-terminated (that is DRIVER_UNKNOWN-terminated) ordered (in
-     order of preference) array of drivers.
-  */
-  extern const driver_id_t cdio_drivers[];
-  /** A null-terminated (that is DRIVER_UNKNOWN-terminated) ordered (in
-     order of preference) array of device drivers.
-  */
-  extern const driver_id_t cdio_device_drivers[];
-
-  /** There will generally be only one hardware for a given
-     build/platform from the list above. You can use the variable
-     below to determine which you've got. If the build doesn't make an
-     hardware driver, then the value will be DRIVER_UNKNOWN.
-  */
-  extern const driver_id_t cdio_os_driver;
-  
-
-/** Those are deprecated; use cdio_drivers or cdio_device_drivers to
-    iterate over all drivers or only the device drivers.
-    Make sure what's listed for CDIO_MIN_DRIVER is the last
-    enumeration in driver_id_t. Since we have a bogus (but useful) 0th
-    entry above we don't have to add one.
-*/
-#define CDIO_MIN_DRIVER        DRIVER_AIX
-#define CDIO_MIN_DEVICE_DRIVER CDIO_MIN_DRIVER
-#define CDIO_MAX_DRIVER        DRIVER_NRG
-#define CDIO_MAX_DEVICE_DRIVER DRIVER_WIN32
-
-  /** The following are status codes for completion of a given cdio
-     operation. By design 0 is successful completion and -1 is error
-     completion. This is compatable with ioctl so those routines that
-     call ioctl can just pass the value the get back (cast as this
-     enum). Also, by using negative numbers for errors, the
-     enumeration values below can be used in places where a positive
-     value is expected when things complete successfully. For example,
-     get_blocksize returns the blocksize, but on error uses the error
-     codes below. So note that this enumeration is often cast to an
-     integer.  C seems to tolerate this.
-  */
-  typedef enum  {
-    DRIVER_OP_SUCCESS = 0,       /**< in cases where an int is returned,
-				    like cdio_set_speed, more the negative
-				    return codes are for errors and the 
-				    positive ones for success. */
-    DRIVER_OP_ERROR = -1,        /**< operation returned an error */
-    DRIVER_OP_UNSUPPORTED = -2,  /**< returned when a particular driver
-				    doesn't support a particular operation.
-				    For example an image driver which doesn't
-				    really "eject" a CD.
-				 */
-    DRIVER_OP_UNINIT = -3,       /**< returned when a particular driver
-				    hasn't been initialized or a null
-				    pointer has been passed.
-				 */
-    DRIVER_OP_NOT_PERMITTED = -4, /**< Operation not permitted.
-				    For example might be a permission
-				    problem.
-				 */
-    DRIVER_OP_BAD_PARAMETER = -5, /**< Bad parameter passed  */
-    DRIVER_OP_BAD_POINTER =   -6, /**< Bad pointer to memory area  */
-    DRIVER_OP_NO_DRIVER  =    -7, /**< Operaton called on a driver
-				     not available on this OS  */
-  } driver_return_code_t;
-
-  /*!
-    Close media tray in CD drive if there is a routine to do so. 
-    
-    @param psz_drive the name of CD-ROM to be closed. If NULL, we will
-    use the default device.
-    @param p_driver_id is the driver to be used or that got used if
-    it was DRIVER_UNKNOWN or DRIVER_DEVICE; If this is NULL, we won't
-    report back the driver used.
-  */
-  driver_return_code_t cdio_close_tray (const char *psz_drive, 
-					/*in/out*/ driver_id_t *p_driver_id);
-
-  /*!
-    @param drc the return code you want interpreted.
-    @return the string information about drc
-  */
-  const char *cdio_driver_errmsg(driver_return_code_t drc);
-  
-  /*!
-    Eject media in CD drive if there is a routine to do so. 
-
-    @param p_cdio the CD object to be acted upon.
-    If the CD is ejected *p_cdio is free'd and p_cdio set to NULL.
-  */
-  driver_return_code_t cdio_eject_media (CdIo_t **p_cdio);
-
-  /*!
-    Eject media in CD drive if there is a routine to do so. 
-
-    @param psz_drive the name of the device to be acted upon.
-    If NULL is given as the drive, we'll use the default driver device.
-  */
-  driver_return_code_t cdio_eject_media_drive (const char *psz_drive);
-
-  /*!
-    Free device list returned by cdio_get_devices or
-    cdio_get_devices_with_cap.
-    
-    @param device_list list returned by cdio_get_devices or
-    cdio_get_devices_with_cap
-
-    @see cdio_get_devices, cdio_get_devices_with_cap
-
-  */
-  void cdio_free_device_list (char * device_list[]);
-
-  /*!
-    Get the default CD device.
-    if p_cdio is NULL (we haven't initialized a specific device driver), 
-    then find a suitable one and return the default device for that.
-    
-    @param p_cdio the CD object queried
-    @return a string containing the default CD device or NULL is
-    if we couldn't get a default device.
-
-    In some situations of drivers or OS's we can't find a CD device if
-    there is no media in it and it is possible for this routine to return
-    NULL even though there may be a hardware CD-ROM.
-  */
-  char * cdio_get_default_device (const CdIo_t *p_cdio);
-
-  /*!
-    Return a string containing the default CD device if none is specified.
-    if p_driver_id is DRIVER_UNKNOWN or DRIVER_DEVICE
-    then find a suitable one set the default device for that.
-    
-    NULL is returned if we couldn't get a default device.
-  */
-  char * cdio_get_default_device_driver (/*in/out*/ driver_id_t *p_driver_id);
-
-  /*! Return an array of device names. If you want a specific
-    devices for a driver, give that device. If you want hardware
-    devices, give DRIVER_DEVICE and if you want all possible devices,
-    image drivers and hardware drivers give DRIVER_UNKNOWN.
-    
-    NULL is returned if we couldn't return a list of devices.
-
-    In some situations of drivers or OS's we can't find a CD device if
-    there is no media in it and it is possible for this routine to return
-    NULL even though there may be a hardware CD-ROM.
-  */
-  char ** cdio_get_devices (driver_id_t driver_id);
-
-  /*!
-    Get an array of device names in search_devices that have at least
-    the capabilities listed by the capabities parameter.  If
-    search_devices is NULL, then we'll search all possible CD drives.
-
-    Capabilities have two parts to them, a "filesystem" part and an
-    "analysis" part.
-
-    The filesystem part is mutually exclusive. For example either the
-    filesystem is at most one of the High-Sierra, UFS, or HFS, ISO9660,
-    fileystems. Valid combinations of say HFS and ISO9660 are
-    specified as a separate "filesystem".
-
-    Capabilities on the other hand are not mutually exclusive. For example
-    a filesystem may have none, either, or both of the XA or Rock-Ridge
-    extension properties.
-
-    If "b_any" is set false then every capability listed in the
-    analysis portion of capabilities (i.e. not the basic filesystem)
-    must be satisified. If no analysis capabilities are specified,
-    that's a match.
-
-    If "b_any" is set true, then if any of the analysis capabilities
-    matches, we call that a success. 
-
-    In either case, in the filesystem portion different filesystem
-    either specify 0 to match any filesystem or the specific
-    filesystem type.
-    
-    To find a CD-drive of any type, use the mask CDIO_FS_MATCH_ALL.
-
-    @return the array of device names or NULL if we couldn't get a
-    default device.  It is also possible to return a non NULL but
-    after dereferencing the the value is NULL. This also means nothing
-    was found.
-  */
-  char ** cdio_get_devices_with_cap (/*in*/ char *ppsz_search_devices[],
-				     cdio_fs_anal_t capabilities, bool b_any);
-
-  /*!
-    Like cdio_get_devices_with_cap but we return the driver we found
-    as well. This is because often one wants to search for kind of drive
-    and then *open* it afterwards. Giving the driver back facilitates this,
-    and speeds things up for libcdio as well.
-  */
-  char ** cdio_get_devices_with_cap_ret (/*in*/ char* ppsz_search_devices[],
-					 cdio_fs_anal_t capabilities, 
-					 bool b_any,
-					 /*out*/ driver_id_t *p_driver_id);
-
-  /*! Like cdio_get_devices, but we may change the p_driver_id if we
-      were given DRIVER_DEVICE or DRIVER_UNKNOWN. This is because
-      often one wants to get a drive name and then *open* it
-      afterwards. Giving the driver back facilitates this, and speeds
-      things up for libcdio as well.
-   */
-    
-  char ** cdio_get_devices_ret (/*in/out*/ driver_id_t *p_driver_id);
-
-  /*!
-    Get the what kind of device we've got.
-
-    @param p_cdio the CD object queried
-    @param p_read_cap pointer to return read capabilities
-    @param p_write_cap pointer to return write capabilities
-    @param p_misc_cap pointer to return miscellaneous other capabilities
-
-    In some situations of drivers or OS's we can't find a CD device if
-    there is no media in it. In this situation capabilities will show up as 
-    NULL even though there isa hardware CD-ROM.
-  */
-  void cdio_get_drive_cap (const CdIo_t *p_cdio,
-			   cdio_drive_read_cap_t  *p_read_cap,
-			   cdio_drive_write_cap_t *p_write_cap,
-			   cdio_drive_misc_cap_t  *p_misc_cap);
-  
-  /*!
-    Get the drive capabilities for a specified device.
-
-    Return a list of device capabilities.
-
-    In some situations of drivers or OS's we can't find a CD device if
-    there is no media in it. In this situation capabilities will show up as 
-    NULL even though there isa hardware CD-ROM.
-  */
-  void cdio_get_drive_cap_dev (const char *device,
-			       cdio_drive_read_cap_t  *p_read_cap,
-			       cdio_drive_write_cap_t *p_write_cap,
-			       cdio_drive_misc_cap_t  *p_misc_cap);
-
-  /*!
-    Get a string containing the name of the driver in use.
-
-    @return a string with driver name or NULL if CdIo_t is NULL (we
-    haven't initialized a specific device.
-  */
-  const char * cdio_get_driver_name (const CdIo_t *p_cdio);
-
-  /*!
-    Get the driver id. 
-    if CdIo_t is NULL (we haven't initialized a specific device driver), 
-    then return DRIVER_UNKNOWN.
-
-    @return the driver id..
-  */
-  driver_id_t cdio_get_driver_id (const CdIo_t *p_cdio);
-
-  /*! 
-    Get the CD-ROM hardware info via a SCSI MMC INQUIRY command.
-    False is returned if we had an error getting the information.
-  */
-  bool cdio_get_hwinfo ( const CdIo_t *p_cdio, 
-			 /*out*/ cdio_hwinfo_t *p_hw_info );
-
-
-  /*! Get the LSN of the first track of the last session of
-    on the CD.
-
-    @param p_cdio the CD object to be acted upon.
-    @param i_last_session pointer to the session number to be returned.
-  */
-  driver_return_code_t cdio_get_last_session (CdIo_t *p_cdio,
-					      /*out*/ lsn_t *i_last_session);
-
-  /*! 
-      Find out if media has changed since the last call.
-      @param p_cdio the CD object to be acted upon.
-      @return 1 if media has changed since last call, 0 if not. Error
-      return codes are the same as driver_return_code_t
-   */
-  int cdio_get_media_changed(CdIo_t *p_cdio);
-
-  /*! True if CD-ROM understand ATAPI commands. */
-  bool_3way_t cdio_have_atapi (CdIo_t *p_cdio);
-
-  /*! Like cdio_have_xxx but uses an enumeration instead. */
-  bool cdio_have_driver (driver_id_t driver_id);
-  
-  /*
-    Free any resources associated with p_cdio. Call this when done using p_cdio
-    and using CD reading/control operations.
-
-    @param p_cdio the CD object to eliminated.
-   */
-  void cdio_destroy (CdIo_t *p_cdio);
-
-  /*! 
-    Get a string decribing driver_id. 
-
-    @param driver_id the driver you want the description for
-    @return a string of driver description
-  */
-  const char *cdio_driver_describe (driver_id_t driver_id);
-  
-  /*! Sets up to read from place specified by psz_source and
-     driver_id. This or cdio_open_* should be called before using any
-     other routine, except cdio_init or any routine that accesses the
-     CD-ROM drive by name. cdio_open will call cdio_init, if that hasn't
-     been done previously.
-
-     @return the cdio object or NULL on error or no device.  If NULL
-     is given as the source, we'll use the default driver device.
-  */
-  CdIo_t * cdio_open (const char *psz_source, driver_id_t driver_id);
-
-  /*! Sets up to read from place specified by psz_source, driver_id
-     and access mode. This or cdio_open* should be called before using
-     any other routine, except cdio_init or any routine that accesses
-     the CD-ROM drive by name. This will call cdio_init, if that
-     hasn't been done previously.
-
-     If NULL is given as the source, we'll use the default driver device.
-
-     @return the cdio object or NULL on error or no device.
-  */
-  CdIo_t * cdio_open_am (const char *psz_source, 
-			 driver_id_t driver_id, const char *psz_access_mode);
-
-  /*! Set up BIN/CUE CD disk-image for reading. Source is the .bin or 
-      .cue file
-
-     @return the cdio object or NULL on error or no device.
-   */
-  CdIo_t * cdio_open_bincue (const char *psz_cue_name);
-  
-  /*! Set up BIN/CUE CD disk-image for reading. Source is the .bin or 
-      .cue file
-
-     @return the cdio object or NULL on error or no device..
-   */
-  CdIo_t * cdio_open_am_bincue (const char *psz_cue_name, 
-				const char *psz_access_mode);
-  
-  /*! Set up cdrdao CD disk-image for reading. Source is the .toc file
-
-     @return the cdio object or NULL on error or no device.
-   */
-  CdIo_t * cdio_open_cdrdao (const char *psz_toc_name);
-  
-  /*! Set up cdrdao CD disk-image for reading. Source is the .toc file
-
-     @return the cdio object or NULL on error or no device..
-   */
-  CdIo_t * cdio_open_am_cdrdao (const char *psz_toc_name, 
-				const char *psz_access_mode);
-  
-  /*! Return a string containing the default CUE file that would
-      be used when none is specified.
-
-     @return the cdio object or NULL on error or no device.
-   */
-  char * cdio_get_default_device_bincue(void);
-
-  char **cdio_get_devices_bincue(void);
-
-  /*! @return string containing the default CUE file that would be
-      used when none is specified. NULL is returned on error or there
-      is no device.
-   */
-  char * cdio_get_default_device_cdrdao(void);
-
-  char **cdio_get_devices_cdrdao(void);
-
-  /*! Set up CD-ROM for reading. The device_name is
-      the some sort of device name.
-
-     @return the cdio object for subsequent operations. 
-     NULL on error or there is no driver for a some sort of hardware CD-ROM.
-   */
-  CdIo_t * cdio_open_cd (const char *device_name);
-
-  /*! Set up CD-ROM for reading. The device_name is
-      the some sort of device name.
-
-     @return the cdio object for subsequent operations. 
-     NULL on error or there is no driver for a some sort of hardware CD-ROM.
-   */
-  CdIo_t * cdio_open_am_cd (const char *psz_device,
-			    const char *psz_access_mode);
-
-  /*! CDRWIN BIN/CUE CD disc-image routines. Source is the .cue file
-
-     @return the cdio object for subsequent operations. 
-     NULL on error.
-   */
-  CdIo_t * cdio_open_cue (const char *cue_name);
-
-  /*! Set up CD-ROM for reading using the AIX driver. The device_name is
-      the some sort of device name.
-
-     @return the cdio object for subsequent operations. 
-     NULL on error or there is no AIX driver.
-
-     @see cdio_open
-   */
-  CdIo_t * cdio_open_am_aix (const char *psz_source,
-			     const char *psz_access_mode);
-  
-  /*! Set up CD-ROM for reading using the AIX driver. The device_name is
-      the some sort of device name.
-
-     @return the cdio object for subsequent operations. 
-     NULL on error or there is no AIX driver.
-
-     @see cdio_open
-   */
-  CdIo_t * cdio_open_aix (const char *psz_source);
-  
-  /*! Return a string containing the default device name that the 
-      AIX driver would use when none is specified.
-
-     @return the cdio object for subsequent operations. 
-     NULL on error or there is no AIX driver.
-
-     @see cdio_open_cd, cdio_open
-   */
-  char * cdio_get_default_device_aix(void);
-
-  /*! Return a list of all of the CD-ROM devices that the AIX driver
-      can find.
-
-      In some situations of drivers or OS's we can't find a CD device if
-      there is no media in it and it is possible for this routine to return
-      NULL even though there may be a hardware CD-ROM.
-   */
-  char **cdio_get_devices_aix(void);
-  
-  /*! Set up CD-ROM for reading using the BSDI driver. The device_name is
-      the some sort of device name.
-
-     @param psz_source the name of the device to open
-     @return the cdio object for subsequent operations. 
-     NULL on error or there is no BSDI driver.
-
-     @see cdio_open
-   */
-  CdIo_t * cdio_open_bsdi (const char *psz_source);
-  
-  /*! Set up CD-ROM for reading using the BSDI driver. The device_name is
-      the some sort of device name.
-
-     @return the cdio object for subsequent operations. 
-     NULL on error or there is no BSDI driver.
-
-     @see cdio_open
-   */
-  CdIo_t * cdio_open_am_bsdi (const char *psz_source,
-			      const char *psz_access_mode);
-  
-  /*! Return a string containing the default device name that the 
-      BSDI driver would use when none is specified.
-
-     @return the cdio object for subsequent operations. 
-     NULL on error or there is no BSDI driver.
-
-     @see cdio_open_cd, cdio_open
-   */
-  char * cdio_get_default_device_bsdi(void);
-
-  /*! Return a list of all of the CD-ROM devices that the BSDI driver
-      can find.
-
-      In some situations of drivers or OS's we can't find a CD device if
-      there is no media in it and it is possible for this routine to return
-      NULL even though there may be a hardware CD-ROM.
-   */
-  char **cdio_get_devices_bsdi(void);
-  
-  /*! Set up CD-ROM for reading using the FreeBSD driver. The device_name is
-      the some sort of device name.
-
-     NULL is returned on error or there is no FreeBSD driver.
-
-     @see cdio_open_cd, cdio_open
-   */
-  CdIo_t * cdio_open_freebsd (const char *paz_psz_source);
-  
-  /*! Set up CD-ROM for reading using the FreeBSD driver. The device_name is
-      the some sort of device name.
-
-     NULL is returned on error or there is no FreeBSD driver.
-
-     @see cdio_open_cd, cdio_open
-   */
-  CdIo_t * cdio_open_am_freebsd (const char *psz_source,
-				 const char *psz_access_mode);
-  
-  /*! Return a string containing the default device name that the 
-      FreeBSD driver would use when none is specified.
-
-     NULL is returned on error or there is no CD-ROM device.
-   */
-  char * cdio_get_default_device_freebsd(void);
-
-  /*! Return a list of all of the CD-ROM devices that the FreeBSD driver
-      can find.
-   */
-  char **cdio_get_devices_freebsd(void);
-  
-  /*! Set up CD-ROM for reading using the GNU/Linux driver. The device_name is
-      the some sort of device name.
-
-     @return the cdio object for subsequent operations. 
-     NULL on error or there is no GNU/Linux driver.
-
-     In some situations of drivers or OS's we can't find a CD device if
-     there is no media in it and it is possible for this routine to return
-     NULL even though there may be a hardware CD-ROM.
-   */
-  CdIo_t * cdio_open_linux (const char *psz_source);
-
-  /*! Set up CD-ROM for reading using the GNU/Linux driver. The
-      device_name is the some sort of device name.
-
-     @return the cdio object for subsequent operations. 
-     NULL on error or there is no GNU/Linux driver.
-   */
-  CdIo_t * cdio_open_am_linux (const char *psz_source,
-			       const char *access_mode);
-
-  /*! Return a string containing the default device name that the 
-      GNU/Linux driver would use when none is specified. A scan is made
-      for CD-ROM drives with CDs in them.
-
-     NULL is returned on error or there is no CD-ROM device.
-
-     In some situations of drivers or OS's we can't find a CD device if
-     there is no media in it and it is possible for this routine to return
-     NULL even though there may be a hardware CD-ROM.
-
-     @see cdio_open_cd, cdio_open
-   */
-  char * cdio_get_default_device_linux(void);
-
-  /*! Return a list of all of the CD-ROM devices that the GNU/Linux driver
-      can find.
-   */
-  char **cdio_get_devices_linux(void);
-  
-  /*! Set up CD-ROM for reading using the Sun Solaris driver. The
-      device_name is the some sort of device name.
-
-     @return the cdio object for subsequent operations. 
-     NULL on error or there is no Solaris driver.
-   */
-  CdIo_t * cdio_open_solaris (const char *psz_source);
-  
-  /*! Set up CD-ROM for reading using the Sun Solaris driver. The
-      device_name is the some sort of device name.
-
-     @return the cdio object for subsequent operations. 
-     NULL on error or there is no Solaris driver.
-   */
-  CdIo_t * cdio_open_am_solaris (const char *psz_source, 
-				 const char *psz_access_mode);
-  
-  /*! Return a string containing the default device name that the 
-      Solaris driver would use when none is specified. A scan is made
-      for CD-ROM drives with CDs in them.
-
-     NULL is returned on error or there is no CD-ROM device.
-
-     In some situations of drivers or OS's we can't find a CD device if
-     there is no media in it and it is possible for this routine to return
-     NULL even though there may be a hardware CD-ROM.
-
-     @see cdio_open_cd, cdio_open
-   */
-  char * cdio_get_default_device_solaris(void);
-  
-  /*! Return a list of all of the CD-ROM devices that the Solaris driver
-      can find.
-   */
-  char **cdio_get_devices_solaris(void);
-  
-  /*! Set up CD-ROM for reading using the Apple OSX driver. The
-      device_name is the some sort of device name.
-
-     NULL is returned on error or there is no OSX driver.
-
-     In some situations of drivers or OS's we can't find a CD device if
-     there is no media in it and it is possible for this routine to return
-     NULL even though there may be a hardware CD-ROM.
-
-     @see cdio_open_cd, cdio_open
-   */
-  CdIo_t * cdio_open_osx (const char *psz_source);
-
-  /*! Set up CD-ROM for reading using the Apple OSX driver. The
-      device_name is the some sort of device name.
-
-     NULL is returned on error or there is no OSX driver.
-
-     @see cdio_open_cd, cdio_open
-   */
-  CdIo_t * cdio_open_am_osx (const char *psz_source,
-			     const char *psz_access_mode);
-
-  /*! Return a string containing the default device name that the 
-      OSX driver would use when none is specified. A scan is made
-      for CD-ROM drives with CDs in them.
-
-     In some situations of drivers or OS's we can't find a CD device if
-     there is no media in it and it is possible for this routine to return
-     NULL even though there may be a hardware CD-ROM.
-   */
-  char * cdio_get_default_device_osx(void);
-  
-  /*! Return a list of all of the CD-ROM devices that the OSX driver
-      can find.
-   */
-  char **cdio_get_devices_osx(void);
-  
-  /*! Set up CD-ROM for reading using the Microsoft Windows driver. The
-      device_name is the some sort of device name.
-
-     In some situations of drivers or OS's we can't find a CD device if
-     there is no media in it and it is possible for this routine to return
-     NULL even though there may be a hardware CD-ROM.
-   */
-  CdIo_t * cdio_open_win32 (const char *psz_source);
-  
-  /*! Set up CD-ROM for reading using the Microsoft Windows driver. The
-      device_name is the some sort of device name.
-
-     NULL is returned on error or there is no Microsof Windows driver.
-   */
-  CdIo_t * cdio_open_am_win32 (const char *psz_source,
-			       const char *psz_access_mode);
-  
-  /*! Return a string containing the default device name that the 
-      Win32 driver would use when none is specified. A scan is made
-      for CD-ROM drives with CDs in them.
-
-     In some situations of drivers or OS's we can't find a CD device if
-     there is no media in it and it is possible for this routine to return
-     NULL even though there may be a hardware CD-ROM.
-
-     @see cdio_open_cd, cdio_open
-   */
-  char * cdio_get_default_device_win32(void);
-
-  char **cdio_get_devices_win32(void);
-  
-  /*! Set up CD-ROM for reading using the IBM OS/2 driver. The
-      device_name is the some sort of device name.
-
-     NULL is returned on error or there is no OS/2 driver.
-
-     In some situations of drivers or OS's we can't find a CD device if
-     there is no media in it and it is possible for this routine to return
-     NULL even though there may be a hardware CD-ROM.
-
-     @see cdio_open_cd, cdio_open
-   */
-  CdIo_t * cdio_open_os2 (const char *psz_source);
-
-  /*! Set up CD-ROM for reading using the IBM OS/2 driver. The
-      device_name is the some sort of device name.
-
-     NULL is returned on error or there is no OS/2 driver.
-
-     @see cdio_open_cd, cdio_open
-   */
-  CdIo_t * cdio_open_am_os2 (const char *psz_source,
-                            const char *psz_access_mode);
-
-  /*! Return a string containing the default device name that the
-      OS/2 driver would use when none is specified. A scan is made
-      for CD-ROM drives with CDs in them.
-
-     In some situations of drivers or OS's we can't find a CD device if
-     there is no media in it and it is possible for this routine to return
-     NULL even though there may be a hardware CD-ROM.
-   */
-  char * cdio_get_default_device_os2(void);
-
-  /*! Return a list of all of the CD-ROM devices that the OS/2 driver
-      can find.
-   */
-  char **cdio_get_devices_os2(void);
-
-  /*! Set up CD-ROM for reading using the Nero driver. The
-      device_name is the some sort of device name.
-
-     @return true on success; NULL on error or there is no Nero driver. 
-   */
-  CdIo_t * cdio_open_nrg (const char *psz_source);
-  
-  /*! Set up CD-ROM for reading using the Nero driver. The
-      device_name is the some sort of device name.
-
-     @return true on success; NULL on error or there is no Nero driver. 
-   */
-  CdIo_t * cdio_open_am_nrg (const char *psz_source,
-			     const char *psz_access_mode);
-  
-  /*! Get a string containing the default device name that the NRG
-      driver would use when none is specified. A scan is made for NRG
-      disk images in the current directory.
-
-      @return string containing the default device. NULL on error or
-      there is no CD-ROM device.
-   */
-  char * cdio_get_default_device_nrg(void);
-
-  char **cdio_get_devices_nrg(void);
-
-  /*! 
-
-    Determine if bin_name is the bin file part of  a CDRWIN CD disk image.
-
-    @param bin_name location of presumed CDRWIN bin image file.
-    @return the corresponding CUE file if bin_name is a BIN file or
-    NULL if not a BIN file.
-  */
-  char *cdio_is_binfile(const char *bin_name);
-  
-  /*! 
-    Determine if cue_name is the cue sheet for a CDRWIN CD disk image.
-
-    @return corresponding BIN file if cue_name is a CDRWIN cue file or
-    NULL if not a CUE file.
-  */
-  char *cdio_is_cuefile(const char *cue_name);
-  
-  /*! 
-    Determine if psg_nrg is a Nero CD disc image.
-
-    @param psz_nrg location of presumed NRG image file.
-    @return true if psz_nrg is a Nero NRG image or false
-    if not a NRG image.
-  */
-  bool cdio_is_nrg(const char *psz_nrg);
-  
-  /*! 
-    Determine if psz_toc is a TOC file for a cdrdao CD disc image.
-
-    @param psz_toc location of presumed TOC image file.
-    @return true if toc_name is a cdrdao TOC file or false
-    if not a TOC file.
-  */
-  bool cdio_is_tocfile(const char *psz_toc);
-  
-  /*! 
-    Determine if psz_source refers to a real hardware CD-ROM.
-
-    @param psz_source location name of object
-    @param driver_id   driver for reading object. Use DRIVER_UNKNOWN if you
-    don't know what driver to use.
-    @return true if psz_source is a device; If false is returned we
-    could have a CD disk image. 
-  */
-  bool cdio_is_device(const char *psz_source, driver_id_t driver_id);
-
-  /*!
-    Set the blocksize for subsequent reads. 
-  */
-  driver_return_code_t cdio_set_blocksize ( const CdIo_t *p_cdio, 
-					    int i_blocksize );
-
-  /*!
-    Set the drive speed. 
-
-    @param p_cdio          CD structure set by cdio_open().
-    @param i_drive_speed   speed in CD-ROM speed units. Note this
-                           not Kbs as would be used in the MMC spec or
-		           in mmc_set_speed(). To convert CD-ROM speed units 
-			   to Kbs, multiply the number by 176 (for raw data)
-			   and by 150 (for filesystem data). On many CD-ROM 
-			   drives, specifying a value too large will result 
-			   in using the fastest speed.
-
-      @see mmc_set_speed and mmc_set_drive_speed
-  */
-  driver_return_code_t cdio_set_speed ( const CdIo_t *p_cdio, 
-					int i_drive_speed );
-
-  /*!
-    Get the value associatied with key. 
-
-    @param p_cdio the CD object queried
-    @param key the key to retrieve
-    @return the value associatd with "key" or NULL if p_cdio is NULL
-    or "key" does not exist.
-  */
-  const char * cdio_get_arg (const CdIo_t *p_cdio,  const char key[]);
-
-  /*!
-    Set the arg "key" with "value" in "p_cdio".
-
-    @param p_cdio the CD object to set
-    @param key the key to set
-    @param value the value to assocaiate with key
-  */
-  driver_return_code_t cdio_set_arg (CdIo_t *p_cdio, const char key[], 
-				     const char value[]);
-  
-  /*!
-    Initialize CD Reading and control routines. Should be called first.
-  */
-  bool cdio_init(void);
-  
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-/** The below variables are trickery to force the above enum symbol
-    values to be recorded in debug symbol tables. They are used to
-    allow one to refer to the enumeration value names in the typedefs
-    above in a debugger and debugger expressions.
-*/
-extern cdio_drive_cap_misc_t          debug_cdio_drive_cap_misc;
-extern cdio_drive_cap_read_t          debug_cdio_drive_cap_read_t;
-extern cdio_drive_cap_write_t         debug_drive_cap_write_t;
-extern cdio_mmc_hw_len_t              debug_cdio_mmc_hw_len;
-extern cdio_src_category_mask_t       debug_cdio_src_category_mask;
-
-#endif /* __CDIO_DEVICE_H__ */
diff --git a/lib-x86-32/include/cdio/disc.h b/lib-x86-32/include/cdio/disc.h
deleted file mode 100644
index b5ae3c49..00000000
--- a/lib-x86-32/include/cdio/disc.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* -*- c -*-
-    $Id: disc.h,v 1.9 2008/03/25 15:59:09 karl Exp $
-
-    Copyright (C) 2004, 2005, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-/** \file disc.h 
- *  \brief  The top-level header for disc-related libcdio calls.
- */
-#ifndef __CDIO_DISC_H__
-#define __CDIO_DISC_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-  /*! disc modes. The first combined from MMC-3 5.29.2.8 (Send CUESHEET)
-    and GNU/Linux /usr/include/linux/cdrom.h and we've added DVD.
-  */
-  typedef enum {
-    CDIO_DISC_MODE_CD_DA,	    /**< CD-DA */
-    CDIO_DISC_MODE_CD_DATA,	    /**< CD-ROM form 1 */
-    CDIO_DISC_MODE_CD_XA,	    /**< CD-ROM XA form2 */
-    CDIO_DISC_MODE_CD_MIXED,	    /**< Some combo of above. */
-    CDIO_DISC_MODE_DVD_ROM,         /**< DVD ROM (e.g. movies) */
-    CDIO_DISC_MODE_DVD_RAM,         /**< DVD-RAM */
-    CDIO_DISC_MODE_DVD_R,           /**< DVD-R */
-    CDIO_DISC_MODE_DVD_RW,          /**< DVD-RW */
-    CDIO_DISC_MODE_DVD_PR,          /**< DVD+R */
-    CDIO_DISC_MODE_DVD_PRW,         /**< DVD+RW */
-    CDIO_DISC_MODE_DVD_OTHER,       /**< Unknown/unclassified DVD type */
-    CDIO_DISC_MODE_NO_INFO,
-    CDIO_DISC_MODE_ERROR,
-    CDIO_DISC_MODE_CD_I	        /**< CD-i. */
-  } discmode_t;
-
-  extern const char *discmode2str[];
-  
-  /*! 
-    Get disc mode - the kind of CD (CD-DA, CD-ROM mode 1, CD-MIXED, etc.
-    that we've got. The notion of "CD" is extended a little to include
-    DVD's.
-  */
-  discmode_t cdio_get_discmode (CdIo_t *p_cdio);
-
-  /*!  
-    Get the lsn of the end of the CD
-
-    @return the lsn. On error 0 or CDIO_INVALD_LSN.
-  */
-  lsn_t cdio_get_disc_last_lsn(const CdIo_t *p_cdio);
-  
-  /*!  
-    Return the Joliet level recognized for p_cdio.
-  */
-  uint8_t cdio_get_joliet_level(const CdIo_t *p_cdio);
-
-  /*!
-    Get the media catalog number (MCN) from the CD.
-
-    @return the media catalog number or NULL if there is none or we
-    don't have the ability to get it.
-
-    Note: string is malloc'd so caller has to free() the returned
-    string when done with it.
-
-  */
-  char * cdio_get_mcn (const CdIo_t *p_cdio);
-
-  /*!
-    Get the number of tracks on the CD.
-
-    @return the number of tracks, or CDIO_INVALID_TRACK if there is
-    an error.
-  */
-  track_t cdio_get_num_tracks (const CdIo_t *p_cdio);
-  
-  /*! 
-    Return true if discmode is some sort of CD.
-  */
-  bool cdio_is_discmode_cdrom (discmode_t discmode);
-  
-  /*! 
-    Return true if discmode is some sort of DVD.
-  */
-  bool cdio_is_discmode_dvd (discmode_t discmode);
-  
-  /*! cdio_stat_size is deprecated. @see cdio_get_disc_last_lsn  */
-#define cdio_stat_size cdio_get_disc_last_lsn
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __CDIO_DISC_H__ */
diff --git a/lib-x86-32/include/cdio/ds.h b/lib-x86-32/include/cdio/ds.h
deleted file mode 100644
index 447e30df..00000000
--- a/lib-x86-32/include/cdio/ds.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-    $Id: ds.h,v 1.5 2008/03/25 15:59:09 karl Exp $
-
-    Copyright (C) 2005, 2008 Rocky Bernstein <rocky@gnu.org>
-    Copyright (C) 2000, 2004 Herbert Valerio Riedel <hvr@gnu.org>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-/** \file ds.h 
- *  \brief  The top-level header for list-related data structures.
-
-    Note: this header will is slated to get removed and libcdio will use 
-    glib.h routines instead. 
-*/
-
-
-#ifndef __CDIO_DS_H__
-#define __CDIO_DS_H__
-
-#include <cdio/types.h>
-
-/** opaque types... */
-typedef struct _CdioList CdioList_t;
-typedef struct _CdioListNode CdioListNode_t;
-
-typedef int (*_cdio_list_cmp_func_t) (void *p_data1, void *p_data2);
-typedef int (*_cdio_list_iterfunc_t) (void *p_data, void *p_user_data);
-
-/** The below are given compatibility with old code. Please use
-    the above type names, not these. */
-#define CdioList CdioList_t
-#define CdioListNode CdioListNode_t
-#define _cdio_list_cmp_func _cdio_list_cmp_func_t
-#define _cdio_list_iterfunc _cdio_list_iterfunc_t
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/** methods */
-CdioList_t *_cdio_list_new (void);
-
-void _cdio_list_free (CdioList_t *p_list, int free_data);
-
-unsigned _cdio_list_length (const CdioList_t *list);
-
-void _cdio_list_prepend (CdioList_t *p_list, void *p_data);
-
-void _cdio_list_append (CdioList_t *p_list, void *p_data);
-
-void _cdio_list_foreach (CdioList_t *p_list, _cdio_list_iterfunc_t func, 
-                         void *p_user_data);
-
-CdioListNode_t *_cdio_list_find (CdioList_t *p_list, 
-                                 _cdio_list_iterfunc_t cmp_func, 
-                                 void *p_user_data);
-
-#define _CDIO_LIST_FOREACH(node, list) \
- for (node = _cdio_list_begin (list); node; node = _cdio_list_node_next (node))
-
-/** node operations */
-
-CdioListNode_t *_cdio_list_begin (const CdioList_t *p_list);
-
-CdioListNode_t *_cdio_list_end (CdioList_t *p_list);
-
-CdioListNode_t *_cdio_list_node_next (CdioListNode_t *p_node);
-
-void _cdio_list_node_free (CdioListNode_t *p_node, int i_free_data);
-
-void *_cdio_list_node_data (CdioListNode_t *p_node);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __CDIO_DS_H__ */
-
-/* 
- * Local variables:
- *  c-file-style: "gnu"
- *  tab-width: 8
- *  indent-tabs-mode: nil
- * End:
- */
-
diff --git a/lib-x86-32/include/cdio/dvd.h b/lib-x86-32/include/cdio/dvd.h
deleted file mode 100644
index 8be8317b..00000000
--- a/lib-x86-32/include/cdio/dvd.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-    $Id: dvd.h,v 1.5 2008/03/25 15:59:09 karl Exp $
-
-    Copyright (C) 2004 Rocky Bernstein <rocky@gnu.org>
-    Modeled after GNU/Linux definitions in linux/cdrom.h
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-/*!
-   \file dvd.h 
-   \brief Definitions for DVD access.
-*/
-
-#ifndef __CDIO_DVD_H__
-#define __CDIO_DVD_H__
-
-#include <cdio/types.h>
-
-/*! Values used in a READ DVD STRUCTURE */
-
-#define CDIO_DVD_STRUCT_PHYSICAL	0x00
-#define CDIO_DVD_STRUCT_COPYRIGHT	0x01
-#define CDIO_DVD_STRUCT_DISCKEY	        0x02
-#define CDIO_DVD_STRUCT_BCA		0x03
-#define CDIO_DVD_STRUCT_MANUFACT	0x04
-
-/*! Media definitions for "Book Type" */
-#define CDIO_DVD_BOOK_DVD_ROM 0
-#define CDIO_DVD_BOOK_DVD_RAM 1
-#define CDIO_DVD_BOOK_DVD_R   2 /**< DVD-R  */
-#define CDIO_DVD_BOOK_DVD_RW  3 /**< DVD-RW */
-#define CDIO_DVD_BOOK_DVD_PR  8 /**< DVD+R  */
-#define CDIO_DVD_BOOK_DVD_PRW 9 /**< DVD+RW */
-
-typedef struct cdio_dvd_layer {
-  uint8_t book_version	: 4;
-  uint8_t book_type	: 4;
-  uint8_t min_rate	: 4;
-  uint8_t disc_size	: 4;
-  uint8_t layer_type	: 4;
-  uint8_t track_path	: 1;
-  uint8_t nlayers	: 2;
-  uint8_t track_density	: 4;
-  uint8_t linear_density: 4;
-  uint8_t bca		: 1;
-  uint32_t start_sector;
-  uint32_t end_sector;
-  uint32_t end_sector_l0;
-} cdio_dvd_layer_t;
-
-/*! Maximum number of layers in a DVD.  */
-#define CDIO_DVD_MAX_LAYERS	4
-
-typedef struct cdio_dvd_physical {
-  uint8_t type;
-  uint8_t layer_num;
-  cdio_dvd_layer_t layer[CDIO_DVD_MAX_LAYERS];
-} cdio_dvd_physical_t;
-
-typedef struct cdio_dvd_copyright {
-  uint8_t type;
-  
-  uint8_t layer_num;
-  uint8_t cpst;
-  uint8_t rmi;
-} cdio_dvd_copyright_t;
-
-typedef struct cdio_dvd_disckey {
-  uint8_t type;
-  
-  unsigned agid	: 2;
-  uint8_t value[2048];
-} cdio_dvd_disckey_t;
-
-typedef struct cdio_dvd_bca {
-  uint8_t type;
-  
-  int len;
-  uint8_t value[188];
-} cdio_dvd_bca_t;
-
-typedef struct cdio_dvd_manufact {
-  uint8_t type;
-  
-  uint8_t layer_num;
-  int len;
-  uint8_t value[2048];
-} cdio_dvd_manufact_t;
-
-typedef union {
-  uint8_t type;
-  
-  cdio_dvd_physical_t	physical;
-  cdio_dvd_copyright_t	copyright;
-  cdio_dvd_disckey_t	disckey;
-  cdio_dvd_bca_t	bca;
-  cdio_dvd_manufact_t	manufact;
-} cdio_dvd_struct_t;
-
-#endif /* __SCSI_MMC_H__ */
diff --git a/lib-x86-32/include/cdio/ecma_167.h b/lib-x86-32/include/cdio/ecma_167.h
deleted file mode 100644
index 78da7ae0..00000000
--- a/lib-x86-32/include/cdio/ecma_167.h
+++ /dev/null
@@ -1,1006 +0,0 @@
-/* 
-    Copyright (c) 2005, 2006, 2008 Rocky Bernstein <rocky@cpan.org>
-    Copyright (c) 2001-2002  Ben Fennema <bfennema@falcon.csc.calpoly.edu>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-/*
- * Some portions taken from FreeBSD ecma167-udf.h which states:
- * Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org>
- * All rights reserved.
- *
- * 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 AUTHOR 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 AUTHOR 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.
- */
-
-/*!
- * \file ecma_167.h
- *
- * \brief Definitions based on ECMA-167 3rd edition (June 1997)
- * See http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-167.pdf
-*/
-
-#ifndef _ECMA_167_H
-#define _ECMA_167_H 1
-
-#include <cdio/types.h>
-
-/**
-   Imagine the below enum values as \#define'd values rather than
-   distinct values of an enum.
-*/
-typedef enum {
-  VSD_STD_ID_SIZE    =	  5, /** Volume Structure Descriptor (ECMA 167r3 
-				2/9.1) */
-  UDF_REGID_ID_SIZE  =	 23, /**< See identifier (ECMA 167r3 1/7.4) */
-  UDF_VOLID_SIZE     =   32,
-  UDF_FID_SIZE	     =   38,
-  UDF_VOLSET_ID_SIZE =  128
-} ecma_167_enum1_t ;
-
-/** Tag Identifier (ECMA 167r3 3/7.2.1) */
-
-typedef enum {
-  TAGID_PRI_VOL          = 0x0001,
-  TAGID_ANCHOR           = 0x0002,
-  TAGID_VOL              = 0x0003,
-  TAGID_IMP_VOL          = 0x0004,
-  TAGID_PARTITION        = 0x0005,
-  TAGID_LOGVOL           = 0x0006,
-  TAGID_UNALLOC_SPACE    = 0x0007,
-  TAGID_TERM             = 0x0008,
-  TAGID_LOGVOL_INTEGRITY = 0x0009,
-  TAGID_FSD		 = 0x0100,
-  TAGID_FID		 = 0x0101,
-  TAGID_AED		 = 0x0102,
-  TAGID_IE		 = 0x0103,
-  TAGID_TE		 = 0x0104,
-  TAGID_FILE_ENTRY	 = 0x0105,
-  TAGID_EAHD		 = 0x0106,
-  TAGID_USE		 = 0x0107,
-  TAGID_SBD		 = 0x0108,
-  TAGID_PIE		 = 0x0109,
-  TAGID_EFE		 = 0x010A,
-} tag_id_t ;
-
-/** Character Set Type (ECMA 167r3 1/7.2.1.1) */
-typedef enum {
-  CHARSPEC_TYPE_CS0 = 0x00,	/**< Section 1/7.2.2 */
-  CHARSPEC_TYPE_CS1 = 0x01,	/**< Section 1/7.2.3 */
-  CHARSPEC_TYPE_CS2 = 0x02,	/**< Section 1/7.2.4 */
-  CHARSPEC_TYPE_CS3 = 0x03,	/**< Section 1/7.2.5 */
-  CHARSPEC_TYPE_CS4 = 0x04,	/**< Section 1/7.2.6 */
-  CHARSPEC_TYPE_CS5 = 0x05,	/**< Section 1/7.2.7 */
-  CHARSPEC_TYPE_CS6 = 0x06,	/**< Section 1/7.2.8 */
-  CHARSPEC_TYPE_CS7 = 0x07,	/**< Section 1/7.2.9 */
-
-  CHARSPEC_TYPE_CS8 = 0x08,	/**< Section 1/7.2.10 */
-} udf_charspec_enum_t;
-  
-typedef uint8_t  udf_Uint8_t;  /*! Section 1/7/1.1 */
-typedef uint16_t udf_Uint16_t; /*! Section 1/7.1.3 */
-typedef uint32_t udf_Uint32_t; /*! Section 1/7.1.5 */
-typedef uint64_t udf_Uint64_t; /*! Section 1/7.1.7 */
-typedef char	 udf_dstring;  /*! Section 1/7.1.12 */
-
-#define UDF_LENGTH_MASK 0x3fffffff
-
-PRAGMA_BEGIN_PACKED
-
-/** Character set specification (ECMA 167r3 1/7.2.1) */
-struct udf_charspec_s
-{
-  udf_Uint8_t	charset_type;
-  udf_Uint8_t	charset_info[63];
-} GNUC_PACKED;
-
-typedef struct udf_charspec_s udf_charspec_t;
-
-/** Timestamp (ECMA 167r3 1/7.3) */
-struct udf_timestamp_s
-{
-  udf_Uint16_t		type_tz;
-  udf_Uint16_t		year;
-  udf_Uint8_t		month;
-  udf_Uint8_t		day;
-  udf_Uint8_t		hour;
-  udf_Uint8_t		minute;
-  udf_Uint8_t		second;
-  udf_Uint8_t		centiseconds;
-  udf_Uint8_t		hundreds_of_microseconds;
-  udf_Uint8_t		microseconds;
-} GNUC_PACKED;
-
-typedef struct udf_timestamp_s udf_timestamp_t;
-
-/** Type and Time Zone (ECMA 167r3 1/7.3.1) 
-
-    Imagine the below enum values as \#define'd values rather than
-    distinct values of an enum.
-*/
-typedef enum { 
-  TIMESTAMP_TYPE_CUT        =	0x0000,
-  TIMESTAMP_TYPE_LOCAL      =	0x1000,
-  TIMESTAMP_TYPE_AGREEMENT  =	0x2000,
-  TIMESTAMP_TYPE_MASK       =   0xF000,
-  TIMESTAMP_TIMEZONE_MASK   =	0x0FFF,
-} ecma_167_timezone_enum_t ;
-
-
-#define TIMESTAMP_TYPE_MASK		0xF000
-#define TIMESTAMP_TYPE_CUT		0x0000
-#define TIMESTAMP_TYPE_LOCAL		0x1000
-#define TIMESTAMP_TYPE_AGREEMENT	0x2000
-#define TIMESTAMP_TIMEZONE_MASK		0x0FFF
-
-struct udf_id_suffix_s
-{
-  udf_Uint16_t  udf_revision;
-  udf_Uint8_t   os_class;
-  udf_Uint8_t   os_identifier;
-  udf_Uint8_t   reserved[4];
-} GNUC_PACKED;
-
-typedef struct udf_id_suffix_s udf_id_suffix_t;
-
-/** Entity identifier (ECMA 167r3 1/7.4) */
-struct udf_regid_s
-{
-  udf_Uint8_t		flags;
-  udf_Uint8_t		id[UDF_REGID_ID_SIZE];
-  udf_id_suffix_t	id_suffix;
-} GNUC_PACKED;
-
-typedef struct udf_regid_s udf_regid_t;
-
-/** Flags (ECMA 167r3 1/7.4.1) */
-#define ENTITYID_FLAGS_DIRTY		0x00
-#define ENTITYID_FLAGS_PROTECTED	0x01
-
-/** Volume Structure Descriptor (ECMA 167r3 2/9.1) */
-struct vol_struct_desc_s
-{
-  udf_Uint8_t		struct_type;
-  udf_Uint8_t		std_id[VSD_STD_ID_SIZE];
-  udf_Uint8_t		struct_version;
-  udf_Uint8_t		struct_data[2041];
-} GNUC_PACKED;
-
-/** Standard Identifier (EMCA 167r2 2/9.1.2) */
-#define VSD_STD_ID_NSR02		"NSR02"	/* (3/9.1) */
-
-/** Standard Identifier (ECMA 167r3 2/9.1.2) */
-
-/* The below const definitions are to faciltate debugging of the
-   values #define'd below. */
-extern const char VSD_STD_ID_BEA01[sizeof("BEA01")-1];
-extern const char VSD_STD_ID_BOOT2[sizeof("BOOT2")-1];
-extern const char VSD_STD_ID_CD001[sizeof("CD001")-1];
-extern const char VSD_STD_ID_CDW01[sizeof("CDW02")-1];
-extern const char VSD_STD_ID_NSR03[sizeof("NSR03")-1];
-extern const char VSD_STD_ID_TEA01[sizeof("TEA01")-1];
-
-#define VSD_STD_ID_BEA01		"BEA01"	/**< ECMA-167 2/9.2 */
-#define VSD_STD_ID_BOOT2		"BOOT2"	/**< ECMA-167 2/9.4 */
-#define VSD_STD_ID_CD001		"CD001"	/**< ECMA-119 */
-#define VSD_STD_ID_CDW02		"CDW02"	/**< ECMA-168 */
-#define VSD_STD_ID_NSR02                "NSR02" /**< ECMA-167, 3/9.1 
-					       NOTE: ECMA-167, 2nd edition */
-#define VSD_STD_ID_NSR03		"NSR03"	/**< ECMA-167 3/9.1 */
-#define VSD_STD_ID_TEA01		"TEA01"	/**< ECMA-168 2/9.3 */
-
-/** Beginning Extended Area Descriptor (ECMA 167r3 2/9.2) */
-struct beginning_extended_area_desc_s
-{
-  udf_Uint8_t		struct_type;
-  udf_Uint8_t		std_id[VSD_STD_ID_SIZE];
-  udf_Uint8_t		struct_version;
-  udf_Uint8_t		struct_data[2041];
-} GNUC_PACKED;
-
-/** Terminating Extended Area Descriptor (ECMA 167r3 2/9.3) */
-struct terminating_extended_area_desc_s
-{
-  udf_Uint8_t		struct_type;
-  udf_Uint8_t		std_id[VSD_STD_ID_SIZE];
-  udf_Uint8_t		struct_version;
-  udf_Uint8_t		struct_data[2041];
-} GNUC_PACKED;
-
-/** Boot Descriptor (ECMA 167r3 2/9.4) */
-struct boot_desc_s
-{
-  udf_Uint8_t		struct_type;
-  udf_Uint8_t		std_ident[VSD_STD_ID_SIZE];
-  udf_Uint8_t		struct_version;
-  udf_Uint8_t		reserved1;
-  udf_regid_t		arch_type;
-  udf_regid_t		boot_ident;
-  udf_Uint32_t		bool_ext_location;
-  udf_Uint32_t		bool_ext_length;
-  udf_Uint64_t		load_address;
-  udf_Uint64_t		start_address;
-  udf_timestamp_t	desc_creation_time;
-  udf_Uint16_t		flags;
-  udf_Uint8_t		reserved2[32];
-  udf_Uint8_t		boot_use[1906];
-} GNUC_PACKED;
-
-/** Flags (ECMA 167r3 2/9.4.12) */
-#define BOOT_FLAGS_ERASE		0x01
-
-/** Extent Descriptor (ECMA 167r3 3/7.1) */
-struct udf_extent_ad_s
-{
-  udf_Uint32_t		len;
-  udf_Uint32_t		loc;
-} GNUC_PACKED;
-
-typedef struct udf_extent_ad_s udf_extent_ad_t;
-
-/** Descriptor Tag (ECMA 167r3 3/7.2) */
-struct udf_tag_s
-{
-  udf_Uint16_t		id;
-  udf_Uint16_t		desc_version;
-  udf_Uint8_t		cksum;
-  udf_Uint8_t		reserved;
-  udf_Uint16_t		i_serial;
-  udf_Uint16_t		desc_CRC;
-  udf_Uint16_t		desc_CRC_len;
-  udf_Uint32_t		loc;
-} GNUC_PACKED;
-
-typedef struct udf_tag_s udf_tag_t;
-
-/** NSR Descriptor (ECMA 167r3 3/9.1) */
-struct NSR_desc_s
-{
-  udf_Uint8_t	struct_type;
-  udf_Uint8_t	std_id[VSD_STD_ID_SIZE];
-  udf_Uint8_t	struct_version;
-  udf_Uint8_t	reserved;
-  udf_Uint8_t	struct_data[2040];
-} GNUC_PACKED;
-
-/** Primary Volume Descriptor (ECMA 167r3 3/10.1) */
-struct udf_pvd_s
-{
-  udf_tag_t	  tag;
-  udf_Uint32_t	  vol_desc_seq_num;
-  udf_Uint32_t	  primary_vol_desc_num;
-  udf_dstring	  vol_ident[UDF_VOLID_SIZE];
-  udf_Uint16_t	  vol_seq_num;
-  udf_Uint16_t	  max_vol_seqnum;
-  udf_Uint16_t	  interchange_lvl;
-  udf_Uint16_t	  max_interchange_lvl;
-  udf_Uint32_t	  charset_list;
-  udf_Uint32_t	  max_charset_list;
-  udf_dstring	  volset_id[UDF_VOLSET_ID_SIZE];
-  udf_charspec_t  desc_charset;
-  udf_charspec_t  explanatory_charset;
-  udf_extent_ad_t vol_abstract;
-  udf_extent_ad_t vol_copyright;
-  udf_regid_t	  app_ident;
-  udf_timestamp_t recording_time;
-  udf_regid_t	  imp_ident;
-  udf_Uint8_t	  imp_use[64];
-  udf_Uint32_t	  predecessor_vol_desc_seq_location;
-  udf_Uint16_t	  flags;
-  udf_Uint8_t	  reserved[22];
-} GNUC_PACKED;
-
-typedef struct udf_pvd_s udf_pvd_t;
-
-/** Flags (ECMA 167r3 3/10.1.21) */
-#define PVD_FLAGS_VSID_COMMON		0x0001
-
-/** Anchor Volume Descriptor Pointer (ECMA 167r3 3/10.2) */
-struct anchor_vol_desc_ptr_s
-{
-  udf_tag_t	  tag;
-  udf_extent_ad_t main_vol_desc_seq_ext;
-  udf_extent_ad_t reserve_vol_desc_seq_ext;
-  udf_Uint8_t	  reserved[480];
-} GNUC_PACKED;
-
-typedef struct anchor_vol_desc_ptr_s anchor_vol_desc_ptr_t;
-
-/** Volume Descriptor Pointer (ECMA 167r3 3/10.3) */
-struct vol_desc_ptr_s
-{
-  udf_tag_t	  tag;
-  udf_Uint32_t	  vol_desc_seq_num;
-  udf_extent_ad_t next_vol_desc_set_ext;
-  udf_Uint8_t	  reserved[484];
-} GNUC_PACKED;
-
-/** Implementation Use Volume Descriptor (ECMA 167r3 3/10.4) */
-struct imp_use_vol_desc_s
-{
-  udf_tag_t    tag;
-  udf_Uint32_t vol_desc_seq_num;
-  udf_regid_t  imp_id;
-  udf_Uint8_t  imp_use[460];
-} GNUC_PACKED;
-
-/** Partition Descriptor (ECMA 167r3 3/10.5) */
-struct partition_desc_s
-{
-  udf_tag_t     tag;
-  udf_Uint32_t	vol_desc_seq_num;
-  udf_Uint16_t	flags;
-  udf_Uint16_t	number;             /**< Partition number */
-  udf_regid_t	contents;
-  udf_Uint8_t	contents_use[128];
-  udf_Uint32_t	access_type;
-  udf_Uint32_t	start_loc;
-  udf_Uint32_t	part_len;
-  udf_regid_t	imp_id;
-  udf_Uint8_t	imp_use[128];
-  udf_Uint8_t	reserved[156];
-} GNUC_PACKED;
-
-typedef struct partition_desc_s partition_desc_t;
-
-/** Partition Flags (ECMA 167r3 3/10.5.3) */
-#define PD_PARTITION_FLAGS_ALLOC	0x0001
-
-/** Partition Contents (ECMA 167r2 3/10.5.3) */
-#define PD_PARTITION_CONTENTS_NSR02	"+NSR02"
-
-/** Partition Contents (ECMA 167r3 3/10.5.5) */
-#define PD_PARTITION_CONTENTS_FDC01	"+FDC01"
-#define PD_PARTITION_CONTENTS_CD001	"+CD001"
-#define PD_PARTITION_CONTENTS_CDW02	"+CDW02"
-#define PD_PARTITION_CONTENTS_NSR03	"+NSR03"
-
-/** Access Type (ECMA 167r3 3/10.5.7) */
-#define PD_ACCESS_TYPE_NONE		0x00000000
-#define PD_ACCESS_TYPE_READ_ONLY	0x00000001
-#define PD_ACCESS_TYPE_WRITE_ONCE	0x00000002
-#define PD_ACCESS_TYPE_REWRITABLE	0x00000003
-#define PD_ACCESS_TYPE_OVERWRITABLE	0x00000004
-
-/** Recorded Address (ECMA 167r3 4/7.1) */
-struct udf_lb_addr_s
-{
-  udf_Uint32_t	lba;
-  udf_Uint16_t	partitionReferenceNum;
-} GNUC_PACKED;
-
-typedef struct udf_lb_addr_s udf_lb_addr_t;
-
-/** Short Allocation Descriptor (ECMA 167r3 4/14.14.1) */
-struct udf_short_ad_s
-{
-  udf_Uint32_t	len;
-  udf_Uint32_t	pos;
-} GNUC_PACKED;
-
-typedef struct udf_short_ad_s udf_short_ad_t;
-
-/** Long Allocation Descriptor (ECMA 167r3 4/14.14.2) */
-struct udf_long_ad_s
-{
-  udf_Uint32_t	len;
-  udf_lb_addr_t	loc;
-  udf_Uint8_t	imp_use[6];
-} GNUC_PACKED;
-
-typedef struct udf_long_ad_s udf_long_ad_t;
-
-/** Logical Volume Descriptor (ECMA 167r3 3/10.6) */
-struct logical_vol_desc_s
-{
-  udf_tag_t       tag;
-  udf_Uint32_t	  seq_num;
-  udf_charspec_t  desc_charset;
-  udf_dstring	  logvol_id[128];
-  udf_Uint32_t	  logical_blocksize;
-  udf_regid_t	  domain_id;
-  union {
-    udf_long_ad_t fsd_loc;
-    udf_Uint8_t	  logvol_content_use[16];
-  } lvd_use;
-  udf_Uint8_t	  logvol_contents_use[16];
-  udf_Uint32_t	  maptable_len;
-  udf_Uint32_t	  i_partition_maps;
-  udf_regid_t	  imp_id;
-  udf_Uint8_t	  imp_use[128];
-  udf_extent_ad_t integrity_seq_ext;
-  udf_Uint8_t	  partition_maps[0];
-} GNUC_PACKED;
-
-typedef struct logical_vol_desc_s logical_vol_desc_t;
-
-/** Generic Partition Map (ECMA 167r3 3/10.7.1) */
-struct generic_partition_map
-{
-  udf_Uint8_t	partition_map_type;
-  udf_Uint8_t	partition_map_length;
-  udf_Uint8_t	partition_mapping[0];
-} GNUC_PACKED;
-
-/** Partition Map Type (ECMA 167r3 3/10.7.1.1) */
-#define GP_PARTITION_MAP_TYPE_UNDEF	0x00
-#define GP_PARTIITON_MAP_TYPE_1		0x01
-#define GP_PARTITION_MAP_TYPE_2		0x02
-
-/** Type 1 Partition Map (ECMA 167r3 3/10.7.2) */
-struct generic_partition_map1
-{
-  udf_Uint8_t	partition_map_type;
-  udf_Uint8_t	partition_map_length;
-  udf_Uint16_t	vol_seq_num;
-  udf_Uint16_t	i_partition;
-} GNUC_PACKED;
-
-/** Type 2 Partition Map (ECMA 167r3 3/10.7.3) */
-struct generic_partition_map2
-{
-  udf_Uint8_t	partition_map_type;
-  udf_Uint8_t	partition_map_length; 
-  udf_Uint8_t	partition_id[62];
-} GNUC_PACKED;
-
-/** Unallocated Space Descriptor (ECMA 167r3 3/10.8) */
-struct unalloc_space_desc_s
-{
-  udf_tag_t       tag;
-  udf_Uint32_t	  vol_desc_seq_num;
-  udf_Uint32_t	  i_alloc_descs;
-  udf_extent_ad_t allocDescs[0];
-} GNUC_PACKED;
-
-/** Terminating Descriptor (ECMA 167r3 3/10.9) */
-struct terminating_desc_s
-{
-  udf_tag_t    tag;
-  udf_Uint8_t	reserved[496];
-} GNUC_PACKED;
-
-/** Logical Volume Integrity Descriptor (ECMA 167r3 3/10.10) */
-struct logvol_integrity_desc_s
-{
-  udf_tag_t       tag;
-  udf_timestamp_t recording_time;
-  udf_Uint32_t    integrity_type;
-  udf_extent_ad_t next_integrity_ext;
-  udf_Uint8_t     logvol_contents_use[32];
-  udf_Uint32_t    i_partitions;
-  udf_Uint32_t    imp_use_len;
-  udf_Uint32_t    freespace_table[0];
-  udf_Uint32_t    size_table[0];
-  udf_Uint8_t     imp_use[0];
-} GNUC_PACKED;
-
-/** Integrity Type (ECMA 167r3 3/10.10.3) */
-#define LVID_INTEGRITY_TYPE_OPEN	0x00000000
-#define LVID_INTEGRITY_TYPE_CLOSE	0x00000001
-
-/** Extended Allocation Descriptor (ECMA 167r3 4/14.14.3) */
-struct udf_ext_ad_s
-{
-  udf_Uint32_t	len;
-  udf_Uint32_t	recorded_len;
-  udf_Uint32_t	information_len;
-  udf_lb_addr_t	ext_loc;
-} GNUC_PACKED;
-
-typedef struct udf_ext_ad_s udf_ext_ad_t;
-
-/** Descriptor Tag (ECMA 167r3 4/7.2 - See 3/7.2) */
-
-/** Tag Identifier (ECMA 167r3 4/7.2.1) */
-
-/** File Set Descriptor (ECMA 167r3 4/14.1) */
-struct udf_fsd_s
-{
-  udf_tag_t       tag;
-  udf_timestamp_t recording_time;
-  udf_Uint16_t	  interchange_lvl;
-  udf_Uint16_t	  maxInterchange_lvl;
-  udf_Uint32_t	  charset_list;
-  udf_Uint32_t	  max_charset_list;
-  udf_Uint32_t	  fileset_num;
-  udf_Uint32_t	  udf_fsd_num;
-  udf_charspec_t  logical_vol_id_charset;
-  udf_dstring	  logical_vol_id[128];
-  udf_charspec_t  fileset_charset;
-  udf_dstring	  fileSet_id[32];
-  udf_dstring	  copyright_file_id[32];
-  udf_dstring	  abstract_file_id[32];
-  udf_long_ad_t	  root_icb;
-  udf_regid_t	  domain_id;
-  udf_long_ad_t	  next_ext;
-  udf_long_ad_t	  stream_directory_ICB;
-  udf_Uint8_t	  reserved[32];
-} GNUC_PACKED;
-
-typedef struct udf_fsd_s udf_fsd_t;
-
-/** Partition Header Descriptor (ECMA 167r3 4/14.3) */
-struct partition_header_desc_s
-{
-  udf_short_ad_t unalloc_space_table;
-  udf_short_ad_t unalloc_space_bitmap;
-  udf_short_ad_t partition_integrity_table;
-  udf_short_ad_t freed_space_table;
-  udf_short_ad_t freed_space_bitmap;
-  udf_Uint8_t	 reserved[88];
-} GNUC_PACKED;
-
-typedef struct partition_header_desc_s partition_header_desc_t;
-
-/** File Identifier Descriptor (ECMA 167r3 4/14.4) */
-struct udf_fileid_desc_s
-{
-  udf_tag_t     tag;
-  udf_Uint16_t	file_version_num;
-  udf_Uint8_t	file_characteristics;
-  udf_Uint8_t	i_file_id;
-  udf_long_ad_t	icb;
-  udf_Uint16_t	i_imp_use;
-  udf_Uint8_t	imp_use[0];
-  udf_Uint8_t	file_id[0];
-  udf_Uint8_t	padding[0];
-} GNUC_PACKED;
-
-typedef struct udf_fileid_desc_s udf_fileid_desc_t;
-
-/** File Characteristics (ECMA 167r3 4/14.4.3) 
-
-    Imagine the below enumeration values are \#defines to be used in a
-    bitmask rather than distinct values of an enum.
-*/
-typedef enum {
-  UDF_FILE_HIDDEN 	= (1 << 0),
-  UDF_FILE_DIRECTORY	= (1 << 1),
-  UDF_FILE_DELETED 	= (1 << 2),
-  UDF_FILE_PARENT 	= (1 << 3),
-  UDF_FILE_METADATA	= (1 << 4)
-} file_characteristics_t;
-
-/** Allocation Ext Descriptor (ECMA 167r3 4/14.5) */
-struct allocExtDesc
-{
-  udf_tag_t    tag;
-  udf_Uint32_t previous_alloc_ext_loc;
-  udf_Uint32_t i_alloc_descs;
-} GNUC_PACKED;
-
-/** ICB Tag (ECMA 167r3 4/14.6) */
-struct udf_icbtag_s
-{
-  udf_Uint32_t	prev_num_dirs;
-  udf_Uint16_t	strat_type;
-  udf_Uint16_t	strat_param;
-  udf_Uint16_t	max_num_entries;
-  udf_Uint8_t	reserved;
-  udf_Uint8_t	file_type;
-  udf_lb_addr_t	parent_ICB;
-  udf_Uint16_t	flags;
-} GNUC_PACKED;
-
-typedef struct udf_icbtag_s udf_icbtag_t;
-
-#define	UDF_ICB_TAG_FLAGS_SETUID	0x40
-#define	UDF_ICB_TAG_FLAGS_SETGID	0x80
-#define	UDF_ICB_TAG_FLAGS_STICKY	0x100
-
-/** Strategy Type (ECMA 167r3 4/14.6.2) which helpfully points
-    largely to 4/A.x */
-#define ICBTAG_STRATEGY_TYPE_UNDEF 0x0000 
-#define ICBTAG_STRATEGY_TYPE_1	   0x0001 /**< 4/A.2 Direct entries Uint16 */
-#define ICBTAG_STRATEGY_TYPE_2	   0x0002 /**< 4/A.3 List of ICB direct entries */
-#define ICBTAG_STRATEGY_TYPE_3	   0x0003 /**< 4/A.4 */
-#define ICBTAG_STRATEGY_TYPE_4	   0x0004 /**< 4/A.5 Hierarchy having one
-					   single ICB with one direct entry.
-					   This is what's most often used.
-					  */
-
-/** File Type (ECMA 167r3 4/14.6.6) 
-
-   Imagine the below enum values as \#define'd values rather than
-   distinct values of an enum.
-*/
-typedef enum {
-  ICBTAG_FILE_TYPE_UNDEF =	0x00,
-  ICBTAG_FILE_TYPE_USE =	0x01,
-  ICBTAG_FILE_TYPE_PIE =	0x02,
-  ICBTAG_FILE_TYPE_IE =		0x03,
-  ICBTAG_FILE_TYPE_DIRECTORY =	0x04,
-  ICBTAG_FILE_TYPE_REGULAR =	0x05,
-  ICBTAG_FILE_TYPE_BLOCK =	0x06,
-  ICBTAG_FILE_TYPE_CHAR =	0x07,
-  ICBTAG_FILE_TYPE_EA =		0x08,
-  ICBTAG_FILE_TYPE_FIFO =	0x09,
-  ICBTAG_FILE_TYPE_SOCKET =	0x0A,
-  ICBTAG_FILE_TYPE_TE =		0x0B,
-  ICBTAG_FILE_TYPE_SYMLINK =	0x0C,
-  ICBTAG_FILE_TYPE_STREAMDIR =	0x0D
-} icbtag_file_type_enum_t;
-
-/** Flags (ECMA 167r3 4/14.6.8) */
-typedef enum {
-  ICBTAG_FLAG_AD_MASK        =	0x0007, /**< "&" this to get below address
-					     flags */
-  ICBTAG_FLAG_AD_SHORT       =	0x0000, /**< The allocation descriptor
-					     field is filled with
-					     short_ad's.  If the
-					     offset is beyond the
-					     current extent, look for
-					     the next extent. */
-  ICBTAG_FLAG_AD_LONG        =	0x0001, /**< The allocation descriptor
-					     field is filled with
-					     long_ad's If the offset
-					     is beyond the current
-					     extent, look for the next
-					     extent. */
-  ICBTAG_FLAG_AD_EXTENDED    =	0x0002,
-  ICBTAG_FLAG_AD_IN_ICB      =	0x0003, /**< This type means that the
-					     file *data* is stored in
-					     the allocation descriptor
-					     field of the file entry. */
-  ICBTAG_FLAG_SORTED         =	0x0008,
-  ICBTAG_FLAG_NONRELOCATABLE =	0x0010,
-  ICBTAG_FLAG_ARCHIVE        =	0x0020,
-  ICBTAG_FLAG_SETUID         =	0x0040,
-  ICBTAG_FLAG_SETGID         =	0x0080,
-  ICBTAG_FLAG_STICKY         =	0x0100,
-  ICBTAG_FLAG_CONTIGUOUS     =	0x0200,
-  ICBTAG_FLAG_SYSTEM         =	0x0400,
-  ICBTAG_FLAG_TRANSFORMED    =	0x0800,
-  ICBTAG_FLAG_MULTIVERSIONS  =	0x1000,
-  ICBTAG_FLAG_STREAM =		0x2000
-} icbtag_flag_enum_t;
-  
-/** Indirect Entry (ECMA 167r3 4/14.7) */
-struct indirect_entry_s
-{
-  udf_tag_t       tag;
-  udf_icbtag_t	  icb_tag;
-  udf_long_ad_t	  indirect_ICB;
-} GNUC_PACKED;
-
-/** Terminal Entry (ECMA 167r3 4/14.8) */
-struct terminal_entry_s
-{
-  udf_tag_t       tag;
-  udf_icbtag_t	  icb_tag;
-} GNUC_PACKED;
-
-/** File Entry (ECMA 167r3 4/14.9) */
-struct udf_file_entry_s
-{
-  udf_tag_t       tag;                   
-  udf_icbtag_t	  icb_tag;                /**< 4/14.9.2 */
-  udf_Uint32_t	  uid;                    /**< 4/14.9.3 */
-  udf_Uint32_t	  gid;                    /**< 4/14.9.4 */
-  udf_Uint32_t	  permissions;            /**< 4/14.9.5 */
-  udf_Uint16_t	  link_count;             /**< 4/14.9.6 */
-  udf_Uint8_t	  rec_format;             /**< 4/14.9.7 */ 
-  udf_Uint8_t	  rec_disp_attr;          /**< 4/14.9.8 */
-  udf_Uint32_t	  rec_len;                /**< 4/14.9.9 */
-  udf_Uint64_t	  info_len;               /**< 4/14.9.10 */
-  udf_Uint64_t	  logblks_recorded;       /**< 4/14.9.11 */
-  udf_timestamp_t access_time;            /**< 4/14.9.12 - last access to 
-					   any stream of file prior to 
-					   recording file entry */
-  udf_timestamp_t modification_time;      /**< 4/14.9.13 - last access to 
-					     modification to any stream of 
-					     file */
-  udf_timestamp_t attribute_time;
-  udf_Uint32_t	  checkpoint;
-  udf_long_ad_t	  ext_attr_ICB;
-  udf_regid_t	  imp_id;
-  udf_Uint64_t	  unique_ID;
-  udf_Uint32_t	  i_extended_attr;
-  udf_Uint32_t	  i_alloc_descs;
-  udf_Uint8_t	  ext_attr[0];
-  udf_Uint8_t	  alloc_descs[0];
-} GNUC_PACKED;
-
-typedef struct udf_file_entry_s udf_file_entry_t;
-
-#define	UDF_FENTRY_SIZE	176
-#define	UDF_FENTRY_PERM_USER_MASK	0x07
-#define	UDF_FENTRY_PERM_GRP_MASK	0xE0
-#define	UDF_FENTRY_PERM_OWNER_MASK	0x1C00
-
-/** Permissions (ECMA 167r3 4/14.9.5) */
-#define FE_PERM_O_EXEC			0x00000001U
-#define FE_PERM_O_WRITE			0x00000002U
-#define FE_PERM_O_READ			0x00000004U
-#define FE_PERM_O_CHATTR		0x00000008U
-#define FE_PERM_O_DELETE		0x00000010U
-#define FE_PERM_G_EXEC			0x00000020U
-#define FE_PERM_G_WRITE			0x00000040U
-#define FE_PERM_G_READ			0x00000080U
-#define FE_PERM_G_CHATTR		0x00000100U
-#define FE_PERM_G_DELETE		0x00000200U
-#define FE_PERM_U_EXEC			0x00000400U
-#define FE_PERM_U_WRITE			0x00000800U
-#define FE_PERM_U_READ			0x00001000U
-#define FE_PERM_U_CHATTR		0x00002000U
-#define FE_PERM_U_DELETE		0x00004000U
-
-/** Record Format (ECMA 167r3 4/14.9.7) */
-#define FE_RECORD_FMT_UNDEF		0x00
-#define FE_RECORD_FMT_FIXED_PAD		0x01
-#define FE_RECORD_FMT_FIXED		0x02
-#define FE_RECORD_FMT_VARIABLE8		0x03
-#define FE_RECORD_FMT_VARIABLE16	0x04
-#define FE_RECORD_FMT_VARIABLE16_MSB	0x05
-#define FE_RECORD_FMT_VARIABLE32	0x06
-#define FE_RECORD_FMT_PRINT		0x07
-#define FE_RECORD_FMT_LF		0x08
-#define FE_RECORD_FMT_CR		0x09
-#define FE_RECORD_FMT_CRLF		0x0A
-#define FE_RECORD_FMT_LFCR		0x0B
-
-/** Record Display Attributes (ECMA 167r3 4/14.9.8) */
-#define FE_RECORD_DISPLAY_ATTR_UNDEF	0x00
-#define FE_RECORD_DISPLAY_ATTR_1	0x01
-#define FE_RECORD_DISPLAY_ATTR_2	0x02
-#define FE_RECORD_DISPLAY_ATTR_3	0x03
-
-/** Extended Attribute Header Descriptor (ECMA 167r3 4/14.10.1) */
-struct extended_attr_header_desc_s
-{
-  udf_tag_t       tag;
-  udf_Uint32_t	  imp_attr_location;
-  udf_Uint32_t	  app_attr_location;
-} GNUC_PACKED;
-
-/** Generic Format (ECMA 167r3 4/14.10.2) */
-struct generic_format_s
-{
-  udf_Uint32_t	attr_type;
-  udf_Uint8_t	attr_subtype;
-  udf_Uint8_t	reserved[3];
-  udf_Uint32_t	attrLength;
-  udf_Uint8_t	attrData[0];
-} GNUC_PACKED;
-
-/** Character Set Information (ECMA 167r3 4/14.10.3) */
-struct charSet_info_s
-{
-  udf_Uint32_t	attr_type;
-  udf_Uint8_t	attr_subtype;
-  udf_Uint8_t	reserved[3];
-  udf_Uint32_t	attrLength;
-  udf_Uint32_t	escapeSeqLength;
-  udf_Uint8_t	charSetType;
-  udf_Uint8_t	escapeSeq[0];
-} GNUC_PACKED;
-
-/* Alternate Permissions (ECMA 167r3 4/14.10.4) */
-struct alt_perms_s
-{
-  udf_Uint32_t	attr_type;
-  udf_Uint8_t	attr_subtype;
-  udf_Uint8_t	reserved[3];
-  udf_Uint32_t	attrLength;
-  udf_Uint16_t	owner_id;
-  udf_Uint16_t	group_id;
-  udf_Uint16_t	permission;
-} GNUC_PACKED;
-
-/** File Times Extended Attribute (ECMA 167r3 4/14.10.5) */
-struct filetimes_ext_attr_s
-{
-  udf_Uint32_t	attr_type;
-  udf_Uint8_t	attr_subtype;
-  udf_Uint8_t	reserved[3];
-  udf_Uint32_t	attrLength;
-  udf_Uint32_t	dataLength;
-  udf_Uint32_t	fileTimeExistence;
-  udf_Uint8_t	fileTimes;
-} GNUC_PACKED;
-
-/** FileTimeExistence (ECMA 167r3 4/14.10.5.6) */
-#define FTE_CREATION			0x00000001
-#define FTE_DELETION			0x00000004
-#define FTE_EFFECTIVE			0x00000008
-#define FTE_BACKUP			0x00000002
-
-/** Information Times Extended Attribute (ECMA 167r3 4/14.10.6) */
-struct infoTimesExtAttr
-{
-  udf_Uint32_t	attr_type;
-  udf_Uint8_t	attr_subtype;
-  udf_Uint8_t	reserved[3];
-  udf_Uint32_t	attrLength;
-  udf_Uint32_t	dataLength;
-  udf_Uint32_t	infoTimeExistence;
-  udf_Uint8_t	infoTimes[0];
-} GNUC_PACKED;
-
-/** Device Specification (ECMA 167r3 4/14.10.7) */
-struct deviceSpec
-{
-  udf_Uint32_t	attr_type;
-  udf_Uint8_t	attr_subtype;
-  udf_Uint8_t	reserved[3];
-  udf_Uint32_t	attrLength;
-  udf_Uint32_t	imp_useLength;
-  udf_Uint32_t	majorDevice_id;
-  udf_Uint32_t	minorDevice_id;
-  udf_Uint8_t	imp_use[0];
-} GNUC_PACKED;
-
-/** Implementation Use Extended Attr (ECMA 167r3 4/14.10.8) */
-struct impUseExtAttr
-{
-  udf_Uint32_t	attr_type;
-  udf_Uint8_t	attr_subtype;
-  udf_Uint8_t	reserved[3];
-  udf_Uint32_t	attrLength;
-  udf_Uint32_t	imp_useLength;
-  udf_regid_t	imp_id;
-  udf_Uint8_t	imp_use[0];
-} GNUC_PACKED;
-
-/** Application Use Extended Attribute (ECMA 167r3 4/14.10.9) */
-struct appUseExtAttr
-{
-  udf_Uint32_t	attr_type;
-  udf_Uint8_t	attr_subtype;
-  udf_Uint8_t	reserved[3];
-  udf_Uint32_t	attrLength;
-  udf_Uint32_t	appUseLength;
-  udf_regid_t	app_id;
-  udf_Uint8_t	appUse[0];
-} GNUC_PACKED;
-
-#define EXTATTR_CHAR_SET		1
-#define EXTATTR_ALT_PERMS		3
-#define EXTATTR_FILE_TIMES		5
-#define EXTATTR_INFO_TIMES		6
-#define EXTATTR_DEV_SPEC		12
-#define EXTATTR_IMP_USE			2048
-#define EXTATTR_APP_USE			65536
-
-
-/** Unallocated Space Entry (ECMA 167r3 4/14.11) */
-struct unallocSpaceEntry
-{
-  udf_tag_t     tag;
-  udf_icbtag_t	icb_tag;
-  udf_Uint32_t	lengthAllocDescs;
-  udf_Uint8_t	allocDescs[0];
-} GNUC_PACKED;
-
-/** Space Bitmap Descriptor (ECMA 167r3 4/14.12) */
-struct spaceBitmapDesc
-{
-  udf_tag_t     tag;
-  udf_Uint32_t	i_bits;
-  udf_Uint32_t	i_bytes;
-  udf_Uint8_t	bitmap[0];
-} GNUC_PACKED;
-
-/** Partition Integrity Entry (ECMA 167r3 4/14.13) */
-struct partitionIntegrityEntry
-{
-  udf_tag_t       tag;
-  udf_icbtag_t	  icb_tag;
-  udf_timestamp_t recording_time;
-  udf_Uint8_t	  integrityType;
-  udf_Uint8_t	  reserved[175];
-  udf_regid_t	  imp_id;
-  udf_Uint8_t	  imp_use[256];
-} GNUC_PACKED;
-
-/** Short Allocation Descriptor (ECMA 167r3 4/14.14.1) */
-
-/** Extent Length (ECMA 167r3 4/14.14.1.1) */
-#define EXT_RECORDED_ALLOCATED		0x00000000
-#define EXT_NOT_RECORDED_ALLOCATED	0x40000000
-#define EXT_NOT_RECORDED_NOT_ALLOCATED	0x80000000
-#define EXT_NEXT_EXTENT_ALLOCDECS	0xC0000000
-
-/** Long Allocation Descriptor (ECMA 167r3 4/14.14.2) */
-
-/** Extended Allocation Descriptor (ECMA 167r3 4/14.14.3) */
-
-/** Logical Volume Header Descriptor (ECMA 167r3 4/14.15) */
-struct logical_vol_header_desc_s 
-{
-  udf_Uint64_t	uniqueID;
-  udf_Uint8_t	reserved[24];
-} GNUC_PACKED;
-
-typedef struct logical_vol_header_desc_s logical_vol_header_desc_t;
-
-/** Path Component (ECMA 167r3 4/14.16.1) */
-struct pathComponent
-{
-  udf_Uint8_t	component_type;
-  udf_Uint8_t	lengthComponent_id;
-  udf_Uint16_t	componentFileVersionNum;
-  udf_dstring	component_id[0];
-} GNUC_PACKED;
-
-/** File Entry (ECMA 167r3 4/14.17) */
-struct extended_file_entry
-{
-  udf_tag_t 	  tag;                     /**< 4/14.17.1 - id = 266  */
-  udf_icbtag_t    icb_tag;                 /**< 4/14.17.2  & 4/14.9.2 */
-  udf_Uint32_t    uid;                     /**< 4/14.17.3  & 4/14.9.3 */
-  udf_Uint32_t    gid;                     /**< 4/14.17.4  & 4/14.9.4 */
-  udf_Uint32_t    permissions;             /**< 4/14.17.5  & 4/14.9.5 */
-  udf_Uint16_t    link_count;              /**< 4/14.17.6  & 4/14.9.6 */
-  udf_Uint8_t     rec_format;              /**< 4/14.17.7  & 4/14.9.7 */
-  udf_Uint8_t     rec_display_attr;        /**< 4/14.17.8  & 4/14.9.8 */
-  udf_Uint32_t    record_len;              /**< 4/14.17.9  & 4/14.9.9 */
-  udf_Uint64_t    info_len;                /**< 4/14.17.10 & 4/14.9.10 */
-  udf_Uint64_t    object_size;             /**< 4/14.17.11 */
-  udf_Uint64_t    logblks_recorded;        /**< 4/14.17.12 & 4/14.9.11 */
-  udf_timestamp_t access_time;             /**< 4/14.17.13 & 4/14.9.12 - last 
-					      access to any stream of file */
-  udf_timestamp_t modification_time;       /**< 4/14.17.14 & 4/14.9.13 - last
-					      modification to any stream of 
-					      file*/
-  udf_timestamp_t create_time;             /**< 4/14.17.15 */
-  udf_timestamp_t attribute_time;          /**< 4/14.17.16 & 4/14.9.14 - 
-					      most recent create or modify 
-					      time */
-  udf_Uint32_t    checkpoint;
-  udf_Uint32_t    reserved;                /**< #00 bytes */
-  udf_long_ad_t   ext_attr_ICB;
-  udf_long_ad_t   stream_directory_ICB;
-  udf_regid_t     imp_id;
-  udf_Uint64_t    unique_ID;
-  udf_Uint32_t    length_extended_attr;
-  udf_Uint32_t    length_alloc_descs;
-  udf_Uint8_t     ext_attr[0];
-  udf_Uint8_t     alloc_descs[0];
-} GNUC_PACKED;
-
-PRAGMA_END_PACKED
-
-/** The below variables are trickery to force the above enum symbol
-    values to be recorded in debug symbol tables. They are used to
-    allow one refer to the enumeration value names in the typedefs
-    above in a debugger and in debugger expressions.
-*/
-extern tag_id_t                 debug_tagid;
-extern file_characteristics_t   debug_file_characteristics;
-extern icbtag_file_type_enum_t  debug_icbtag_file_type_enum;
-extern icbtag_flag_enum_t       debug_flag_enum;
-extern ecma_167_enum1_t         debug_ecma_167_enum1;
-extern ecma_167_timezone_enum_t debug_ecma_167_timezone_enum;
-  
-#endif /* _ECMA_167_H */
diff --git a/lib-x86-32/include/cdio/iso9660.h b/lib-x86-32/include/cdio/iso9660.h
deleted file mode 100644
index a5311c8f..00000000
--- a/lib-x86-32/include/cdio/iso9660.h
+++ /dev/null
@@ -1,1116 +0,0 @@
-/*
-    $Id: iso9660.h,v 1.102 2008/07/16 00:28:54 rocky Exp $
-
-    Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008
-                  Rocky Bernstein <rocky@gnu.org>
-    Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
-
-    See also iso9660.h by Eric Youngdale (1993).
-
-    Copyright 1993 Yggdrasil Computing, Incorporated
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-/*!
- * \file iso9660.h 
- *
- * \brief The top-level interface header for libiso9660: the ISO-9660
- * filesystem library; applications include this.
- *
- * See also the ISO-9660 specification. The freely available European
- * equivalant standard is called ECMA-119.
-*/
-
-
-#ifndef __CDIO_ISO9660_H__
-#define __CDIO_ISO9660_H__
-
-#include <time.h>
-
-#include <cdio/cdio.h>
-#include <cdio/ds.h>
-#include <cdio/posix.h>
-
-/** \brief ISO 9660 Integer and Character types 
-
-These are described in the section 7 of the ISO 9660 (or ECMA 119)
-specification.
-*/
-
-typedef uint8_t  iso711_t; /*! See section 7.1.1 */
-typedef int8_t   iso712_t; /*! See section 7.1.2 */
-typedef uint16_t iso721_t; /*! See section 7.2.1 */
-typedef uint16_t iso722_t; /*! See section 7.2.2 */
-typedef uint32_t iso723_t; /*! See section 7.2.3 */
-typedef uint32_t iso731_t; /*! See section 7.3.1 */
-typedef uint32_t iso732_t; /*! See section 7.3.2 */
-typedef uint64_t iso733_t; /*! See section 7.3.3 */
-
-typedef char     achar_t;  /*! See section 7.4.1 */
-typedef char     dchar_t;  /*! See section 7.4.1 */
-
-#ifndef  EMPTY_ARRAY_SIZE
-#define EMPTY_ARRAY_SIZE 0
-#endif
-
-#include <cdio/types.h>
-#include <cdio/xa.h>
-
-#ifdef ISODCL
-#undef ISODCL
-#endif
-/* This part borrowed from the bsd386 isofs */
-#define	ISODCL(from, to)	((to) - (from) + 1)
-
-#define MIN_TRACK_SIZE 4*75
-#define MIN_ISO_SIZE MIN_TRACK_SIZE
-
-/*! The below isn't really an enumeration one would really use in a
-    program; things are done this way so that in a debugger one can to
-    refer to the enumeration value names such as in a debugger
-    expression and get something. With the more common a \#define
-    mechanism, the name/value assocation is lost at run time.
-  */
-extern enum iso_enum1_s {
-  ISO_PVD_SECTOR      =   16, /**< Sector of Primary Volume Descriptor. */
-  ISO_EVD_SECTOR      =   17, /**< Sector of End Volume Descriptor. */
-  LEN_ISONAME         =   31, /**< Size in bytes of the filename 
-                                 portion + null byte. */
-  ISO_MAX_SYSTEM_ID   =   32, /**< Maximum number of characters in a system 
-                                 id. */
-  MAX_ISONAME         =   37, /**< Size in bytes of the filename 
-                                 portion + null byte. */
-  ISO_MAX_PREPARER_ID =  128, /**< Maximum number of characters in a
-                                 preparer id. */
-  MAX_ISOPATHNAME     =  255, /**< Maximum number of characters in the
-                                 entire ISO 9660 filename. */
-  ISO_BLOCKSIZE       = 2048  /**< Number of bytes in an ISO 9660 block. */
-
-} iso_enums1;
-
-/*! An enumeration for some of the ISO_* \#defines below. This isn't
-    really an enumeration one would really use in a program it is here
-    to be helpful in debuggers where wants just to refer to the
-    ISO_*_ names and get something.
-  */
-
-/*! ISO 9660 directory flags. */
-extern enum iso_flag_enum_s {
-  ISO_FILE	      =   0,   /**<  Not really a flag...	         */
-  ISO_EXISTENCE	      =   1,   /**< Do not make existence known (hidden) */
-  ISO_DIRECTORY	      =   2,   /**< This file is a directory		 */
-  ISO_ASSOCIATED      =   4,   /**< This file is an associated file	 */
-  ISO_RECORD	      =   8,   /**< Record format in extended attr. != 0 */
-  ISO_PROTECTION      =  16,   /**< No read/execute perm. in ext. attr.  */
-  ISO_DRESERVED1      =  32,   /**<, Reserved bit 5			 */
-  ISO_DRESERVED2      =  64,   /**<, Reserved bit 6			 */
-  ISO_MULTIEXTENT     = 128,   /**< Not final entry of a mult. ext. file */
-} iso_flag_enums;
-
-/*! Volume descriptor types */
-extern enum iso_vd_enum_s {
-  ISO_VD_BOOT_RECORD   =  0,  /**< CD is bootable */
-  ISO_VD_PRIMARY       =  1,  /**< Is in any ISO-9660 */
-  ISO_VD_SUPPLEMENTARY =  2,  /**< Used by Joliet, for example */
-  ISO_VD_PARITION      =  3,  /**< Indicates a partition of a CD */
-  ISO_VD_END	       = 255
-} iso_vd_enums;
-
-  
-/*!
-   An ISO filename is: 
-   <em>abcd</em>.<em>eee</em> -> 
-   <em>filename</em>.<em>ext</em>;<em>version#</em>
-
-    For ISO-9660 Level 1, the maximum needed string length is:
-
-@code
-  	 30 chars (filename + ext)
-    +	  2 chars ('.' + ';')
-    +	  5 chars (strlen("32767"))
-    +	  1 null byte
-   ================================
-    =	 38 chars
-@endcode
-
-*/
-
-/*! \brief Maximum number of characters in a publisher id. */
-#define ISO_MAX_PUBLISHER_ID 128
-
-/*! \brief Maximum number of characters in an application id. */
-#define ISO_MAX_APPLICATION_ID 128
-
-/*! \brief Maximum number of characters in a volume id. */
-#define ISO_MAX_VOLUME_ID 32
-
-/*! \brief Maximum number of characters in a volume-set id. */
-#define ISO_MAX_VOLUMESET_ID 128
-
-/*! String inside frame which identifies an ISO 9660 filesystem. This
-    string is the "id" field of an iso9660_pvd_t or an iso9660_svd_t.
-*/
-extern const char ISO_STANDARD_ID[sizeof("CD001")-1];
-
-#define ISO_STANDARD_ID      "CD001" 
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-typedef enum strncpy_pad_check {
-  ISO9660_NOCHECK = 0,
-  ISO9660_7BIT,
-  ISO9660_ACHARS,
-  ISO9660_DCHARS
-} strncpy_pad_check_t;
-
-PRAGMA_BEGIN_PACKED
-
-/*! 
-  \brief ISO-9660 shorter-format time structure. See ECMA 9.1.5.
-  
-  @see iso9660_dtime
- */
-struct	iso9660_dtime_s {
-  iso711_t 	dt_year;   /**< Number of years since 1900 */
-  iso711_t 	dt_month;  /**< Has value in range 1..12. Note starts
-                              at 1, not 0 like a tm struct. */
-  iso711_t	dt_day;    /**< Day of the month from 1 to 31 */
-  iso711_t	dt_hour;   /**< Hour of the day from 0 to 23 */
-  iso711_t	dt_minute; /**< Minute of the hour from 0 to 59 */
-  iso711_t	dt_second; /**< Second of the minute from 0 to 59 */
-  iso712_t	dt_gmtoff; /**< GMT values -48 .. + 52 in 15 minute
-                              intervals */
-} GNUC_PACKED;
-
-typedef struct iso9660_dtime_s  iso9660_dtime_t;
-
-/*! 
-  \brief ISO-9660 longer-format time structure.
-
-  Section 8.4.26.1 of ECMA 119. All values are encoded as character
-  arrays, eg. '1', '9', '5', '5' for the year 1955 (no null terminated
-  byte).
-  
-  @see iso9660_ltime
- */
-struct	iso9660_ltime_s {
-  char	 lt_year	[ISODCL(   1,	4)];   /**< Add 1900 to value
-                                                    for the Julian
-                                                    year */
-  char	 lt_month	[ISODCL(   5,	6)];   /**< Has value in range
-                                                  1..12. Note starts
-                                                  at 1, not 0 like a
-                                                  tm struct. */
-  char	 lt_day		[ISODCL(   7,	8)];   /**< Day of month: 1..31 */
-  char	 lt_hour	[ISODCL(   9,	10)];  /**< hour: 0..23 */
-  char	 lt_minute	[ISODCL(  11,	12)];  /**< minute: 0..59 */
-  char	 lt_second	[ISODCL(  13,	14)];  /**< second: 0..59 */
-  char	 lt_hsecond	[ISODCL(  15,	16)];  /**< The value is in
-                                                  units of 1/100's of
-                                                  a second */
-  iso712_t lt_gmtoff;  /**< Offset from Greenwich Mean Time in number
-                          of 15 min intervals from -48 (West) to +52
-                          (East) recorded according to 7.1.2 numerical
-                          value */
-} GNUC_PACKED;
-
-typedef struct iso9660_ltime_s  iso9660_ltime_t;
-typedef struct iso9660_dir_s    iso9660_dir_t;
-typedef struct iso9660_stat_s   iso9660_stat_t;
-
-#include <cdio/rock.h>
-
-/*! \brief Format of an ISO-9660 directory record 
-
- Section 9.1 of ECMA 119.
-
- This structure may have an odd length depending on how many
- characters there are in the filename!  Some compilers (e.g. on
- Sun3/mc68020) pad the structures to an even length.  For this reason,
- we cannot use sizeof (struct iso_path_table) or sizeof (struct
- iso_directory_record) to compute on disk sizes.  Instead, we use
- offsetof(..., name) and add the name size.  See mkisofs.h of the 
- cdrtools package.
-
-  @see iso9660_stat
-*/
-struct iso9660_dir_s {
-  iso711_t         length;            /*! Length of Directory record (9.1.1) */
-  iso711_t         xa_length;         /*! XA length if XA is used. Otherwise
-                                          zero. (9.1.2)  */
-  iso733_t         extent;            /*! LBA of first local block allocated
-                                          to the extent */
-  iso733_t         size;              /*! data length of File Section. This 
-                                          does not include the length of 
-                                          any XA Records. (9.1.2) */
-  iso9660_dtime_t  recording_time;    /*! Recording date and time (9.1.3) */
-  uint8_t          file_flags;        /*! If no XA then zero. If a directory,
-                                        then bits 2,3 and 7 are zero. 
-                                        (9.1.6) */
-  iso711_t         file_unit_size;    /*! File Unit size for the File
-                                        Section if the File Section
-                                        is recorded in interleaved
-                                        mode. Otherwise zero. (9.1.7) */
-  iso711_t         interleave_gap;    /*! Interleave Gap size for the
-                                        File Section if the File
-                                        Section is interleaved. Otherwise
-                                        zero. (9.1.8) */
-  iso723_t volume_sequence_number;    /*! Ordinal number of the volume
-                                          in the Volume Set on which
-                                          the Extent described by this
-                                          Directory Record is
-                                          recorded. (9.1.9) */
-  iso711_t         filename_len;      /*! number of bytes in filename field */
-  char             filename[EMPTY_ARRAY_SIZE];
-} GNUC_PACKED;
-
-/*! 
-  \brief ISO-9660 Primary Volume Descriptor.
- */
-struct iso9660_pvd_s {
-  iso711_t         type;                         /**< ISO_VD_PRIMARY - 1 */
-  char             id[5];                        /**< ISO_STANDARD_ID "CD001"
-                                                  */
-  iso711_t         version;                      /**< value 1 for ECMA 119 */
-  char             unused1[1];                   /**< unused - value 0 */
-  achar_t          system_id[ISO_MAX_SYSTEM_ID]; /**< each char is an achar */
-  dchar_t          volume_id[ISO_MAX_VOLUME_ID]; /**< each char is a dchar */
-  uint8_t          unused2[8];                   /**< unused - value 0 */
-  iso733_t         volume_space_size;            /**< total number of 
-                                                    sectors */
-  uint8_t          unused3[32];                  /**< unused - value 0 */
-  iso723_t         volume_set_size;              /**< often 1 */
-  iso723_t         volume_sequence_number;       /**< often 1 */
-  iso723_t         logical_block_size;           /**< sector size, e.g. 2048 */
-  iso733_t         path_table_size;              /**< bytes in path table */
-  iso731_t         type_l_path_table;            /**< first sector of L Path
-                                                      Table */
-  iso731_t         opt_type_l_path_table;        /**< first sector of optional
-                                                    L Path Table */
-  iso732_t         type_m_path_table;            /**< first sector of M Path
-                                                    table */
-  iso732_t         opt_type_m_path_table;        /**< first sector of optional
-                                                    M Path table */
-  iso9660_dir_t    root_directory_record;        /**< See 8.4.18 and 
-                                                    section 9.1 of
-                                                    ISO 9660 spec. */
-  char             root_directory_filename;      /**< Is '\\0' or root
-                                                  directory. Also pads previous
-                                                  field to 34 bytes */
-  dchar_t          volume_set_id[ISO_MAX_VOLUMESET_ID]; /**< Volume Set of 
-                                                           which the volume is
-                                                           a member. See 
-                                                        section 8.4.19 */
-  achar_t          publisher_id[ISO_MAX_PUBLISHER_ID];  /**< Publisher of
-                                                         volume. If the first
-                                                         character is '_' 0x5F,
-                                                         the remaining bytes
-                                                         specify a file 
-                                                         containing the user.
-                                                         If all bytes are " "
-                                                         (0x20) no publisher 
-                                                         is specified. See 
-                                                         section 8.4.20 of
-                                                         ECMA 119 */
-  achar_t          preparer_id[ISO_MAX_PREPARER_ID]; /**< preparer of
-                                                         volume. If the first
-                                                         character is '_' 0x5F,
-                                                         the remaining bytes
-                                                         specify a file 
-                                                         containing the user.
-                                                         If all bytes are " "
-                                                         (0x20) no preparer 
-                                                         is specified. 
-                                                         See section 8.4.21 
-                                                         of ECMA 119 */
-  achar_t          application_id[ISO_MAX_APPLICATION_ID]; /**< application
-                                                         use to create the
-                                                         volume. If the first
-                                                         character is '_' 0x5F,
-                                                         the remaining bytes
-                                                         specify a file 
-                                                         containing the user.
-                                                         If all bytes are " "
-                                                         (0x20) no application 
-                                                         is specified.
-                                                         See section of 8.4.22 
-                                                         of ECMA 119 */
-  dchar_t          copyright_file_id[37];     /**< Name of file for
-                                                 copyright info. If
-                                                 all bytes are " "
-                                                 (0x20), then no file
-                                                 is identified.  See
-                                                 section 8.4.23 of ECMA 119
-                                                 9660 spec. */
-  dchar_t          abstract_file_id[37];      /**< See section 8.4.24 of 
-                                                 ECMA 119. */
-  dchar_t          bibliographic_file_id[37]; /**< See section 7.5 of 
-                                                 ISO 9660 spec. */
-  iso9660_ltime_t  creation_date;             /**< date and time of volume
-                                                 creation. See section 8.4.26.1
-                                                 of the ISO 9660 spec. */
-  iso9660_ltime_t  modification_date;         /**< date and time of the most
-                                                 recent modification.
-                                                 See section 8.4.27 of the
-                                                 ISO 9660 spec. */
-  iso9660_ltime_t  expiration_date;           /**< date and time when volume
-                                                 expires. See section 8.4.28
-                                                 of the ISO 9660 spec. */
-  iso9660_ltime_t  effective_date;            /**< date and time when volume
-                                                 is effective. See section 
-                                                 8.4.29 of the ISO 9660 
-                                                 spec. */
-  iso711_t         file_structure_version;    /**< value 1 for ECMA 119 */
-  uint8_t           unused4[1];                /**< unused - value 0 */
-  char             application_data[512];     /**< Application can put 
-                                                 whatever it wants here. */
-  uint8_t          unused5[653];              /**< Unused - value 0 */
-} GNUC_PACKED;
-
-typedef struct iso9660_pvd_s  iso9660_pvd_t;
-
-/*! 
-  \brief ISO-9660 Supplementary Volume Descriptor. 
-
-  This is used for Joliet Extentions and is almost the same as the
-  the primary descriptor but two unused fields, "unused1" and "unused3
-  become "flags and "escape_sequences" respectively.
-*/
-struct iso9660_svd_s {
-  iso711_t         type;                         /**< ISO_VD_SUPPLEMENTARY - 2 
-                                                  */
-  char             id[5];                        /**< ISO_STANDARD_ID "CD001" 
-                                                  */
-  iso711_t         version;                      /**< value 1 */
-  char             flags;			 /**< Section 8.5.3 */
-  achar_t          system_id[ISO_MAX_SYSTEM_ID]; /**< Section 8.5.4; each char 
-                                                    is an achar */
-  dchar_t          volume_id[ISO_MAX_VOLUME_ID]; /**< Section 8.5.5; each char
-                                                    is a dchar */
-  char             unused2[8];
-  iso733_t         volume_space_size;            /**< total number of 
-                                                    sectors */
-  char             escape_sequences[32];         /**< Section 8.5.6 */
-  iso723_t         volume_set_size;              /**< often 1 */
-  iso723_t         volume_sequence_number;       /**< often 1 */
-  iso723_t         logical_block_size;           /**< sector size, e.g. 2048 */
-  iso733_t         path_table_size;              /**< 8.5.7; bytes in path 
-                                                    table */
-  iso731_t         type_l_path_table;            /**< 8.5.8; first sector of 
-                                                    little-endian path table */
-  iso731_t         opt_type_l_path_table;        /**< 8.5.9; first sector of 
-                                                    optional little-endian 
-                                                    path table */
-  iso732_t         type_m_path_table;            /**< 8.5.10; first sector of 
-                                                    big-endian path table */
-  iso732_t         opt_type_m_path_table;        /**< 8.5.11; first sector of 
-                                                    optional big-endian path 
-                                                    table */
-  iso9660_dir_t    root_directory_record;        /**< See section 8.5.12 and
-                                                    9.1 of ISO 9660 spec. */
-  char             root_directory_filename;      /**< Is '\\0' or root
-                                                  directory. Also pads previous
-                                                  field to 34 bytes */
-  dchar_t          volume_set_id[ISO_MAX_VOLUMESET_ID];    /**< 8.5.13; 
-                                                              dchars */
-  achar_t          publisher_id[ISO_MAX_PUBLISHER_ID]; /**< 
-                                                          Publisher of volume.
-                                                          If the first char-
-                                                          aracter is '_' 0x5F,
-                                                          the remaining bytes
-                                                          specify a file 
-                                                          containing the user.
-                                                          If all bytes are " "
-                                                          (0x20) no publisher 
-                                                          is specified. See 
-                                                          section 8.5.14 of
-                                                          ECMA 119 */
-  achar_t          preparer_id[ISO_MAX_PREPARER_ID]; /**< 
-                                                        Data preparer of
-                                                        volume. If the first
-                                                        character is '_' 0x5F,
-                                                        the remaining bytes
-                                                        specify a file 
-                                                        containing the user.
-                                                        If all bytes are " "
-                                                        (0x20) no preparer 
-                                                        is specified. 
-                                                        See section 8.5.15
-                                                        of ECMA 119 */
-  achar_t          application_id[ISO_MAX_APPLICATION_ID]; /**< application
-                                                         use to create the
-                                                         volume. If the first
-                                                         character is '_' 0x5F,
-                                                         the remaining bytes
-                                                         specify a file 
-                                                         containing the user.
-                                                         If all bytes are " "
-                                                         (0x20) no application 
-                                                         is specified.
-                                                         See section of 8.5.16
-                                                         of ECMA 119 */
-  dchar_t          copyright_file_id[37];     /**< Name of file for
-                                                 copyright info. If
-                                                 all bytes are " "
-                                                 (0x20), then no file
-                                                 is identified.  See
-                                                 section 8.5.17 of ECMA 119
-                                                 9660 spec. */
-  dchar_t          abstract_file_id[37];      /**< See section 8.5.18 of 
-                                                 ECMA 119. */
-  dchar_t          bibliographic_file_id[37]; /**< See section 8.5.19 of 
-                                                 ECMA 119. */
-  iso9660_ltime_t  creation_date;             /**< date and time of volume
-                                                 creation. See section 8.4.26.1
-                                                 of the ECMA 119 spec. */
-  iso9660_ltime_t  modification_date;         /**< date and time of the most
-                                                 recent modification.
-                                                 See section 8.4.27 of the
-                                                 ECMA 119 spec. */
-  iso9660_ltime_t  expiration_date;           /**< date and time when volume
-                                                 expires. See section 8.4.28 
-                                                 of the ECMA 119 spec. */
-  iso9660_ltime_t  effective_date;            /**< date and time when volume
-                                                 is effective. See section 
-                                                 8.4.29 of the ECMA 119 
-                                                 spec. */
-  iso711_t         file_structure_version;    /**< value 1 for ECMA 119 */
-  uint8_t           unused4[1];                /**< unused - value 0 */
-  char             application_data[512];     /**< 8.5.20 Application can put 
-                                                 whatever it wants here. */
-  uint8_t          unused5[653];              /**< Unused - value 0 */
-} GNUC_PACKED;
-
-typedef struct iso9660_svd_s  iso9660_svd_t;
-
-PRAGMA_END_PACKED
-
-/*! \brief Unix stat-like version of iso9660_dir
-
-   The iso9660_stat structure is not part of the ISO-9660
-   specification. We use it for our to communicate information
-   in a C-library friendly way, e.g struct tm time structures and
-   a C-style filename string.
-
-   @see iso9660_dir
-*/
-struct iso9660_stat_s { /* big endian!! */
-
-  iso_rock_statbuf_t rr;              /**< Rock Ridge-specific fields  */
-
-  struct tm          tm;              /**< time on entry - FIXME merge with
-                                         one of entries above, like ctime? */
-  lsn_t              lsn;             /**< start logical sector number */
-  uint32_t           size;            /**< total size in bytes */
-  uint32_t           secsize;         /**< number of sectors allocated */
-  iso9660_xa_t       xa;              /**< XA attributes */
-  enum { _STAT_FILE = 1, _STAT_DIR = 2 } type;
-  bool               b_xa;
-  char         filename[EMPTY_ARRAY_SIZE]; /**< filename */
-};
-
-/** A mask used in iso9660_ifs_read_vd which allows what kinds 
-    of extensions we allow, eg. Joliet, Rock Ridge, etc. */
-typedef uint8_t iso_extension_mask_t;
-
-/*! An enumeration for some of the ISO_EXTENSION_* \#defines below. This isn't
-    really an enumeration one would really use in a program it is here
-    to be helpful in debuggers where wants just to refer to the
-    ISO_EXTENSION_*_ names and get something.
-  */
-extern enum iso_extension_enum_s {
-  ISO_EXTENSION_JOLIET_LEVEL1 = 0x01,
-  ISO_EXTENSION_JOLIET_LEVEL2 = 0x02,
-  ISO_EXTENSION_JOLIET_LEVEL3 = 0x04,
-  ISO_EXTENSION_ROCK_RIDGE    = 0x08,
-  ISO_EXTENSION_HIGH_SIERRA   = 0x10
-} iso_extension_enums;
-  
-
-#define ISO_EXTENSION_ALL           0xFF
-#define ISO_EXTENSION_NONE          0x00
-#define ISO_EXTENSION_JOLIET     \
-  (ISO_EXTENSION_JOLIET_LEVEL1 | \
-   ISO_EXTENSION_JOLIET_LEVEL2 | \
-   ISO_EXTENSION_JOLIET_LEVEL3 )
-  
-
-/** This is an opaque structure. */
-typedef struct _iso9660_s iso9660_t; 
-
-  /*! Close previously opened ISO 9660 image and free resources
-    associated with the image. Call this when done using using an ISO
-    9660 image.
-    
-    @return true is unconditionally returned. If there was an error
-    false would be returned.
-  */
-  bool iso9660_close (iso9660_t * p_iso);
-
-
-  /*!
-    Open an ISO 9660 image for reading. Maybe in the future we will have
-    a mode. NULL is returned on error.
-  */
-  iso9660_t *iso9660_open (const char *psz_path /*flags, mode */);
-  
-  /*!
-    Open an ISO 9660 image for reading allowing various ISO 9660
-    extensions.  Maybe in the future we will have a mode. NULL is
-    returned on error.
-
-    @see iso9660_open_fuzzy
-  */
-  iso9660_t *iso9660_open_ext (const char *psz_path, 
-                               iso_extension_mask_t iso_extension_mask);
-  
-  /*! Open an ISO 9660 image for "fuzzy" reading. This means that we
-    will try to guess various internal offset based on internal
-    checks. This may be useful when trying to read an ISO 9660 image
-    contained in a file format that libiso9660 doesn't know natively
-    (or knows imperfectly.)
-
-    Some tolerence allowed for positioning the ISO 9660 image. We scan
-    for STANDARD_ID and use that to set the eventual offset to adjust
-    by (as long as that is <= i_fuzz).
-
-    Maybe in the future we will have a mode. NULL is returned on error.
-    
-    @see iso9660_open, @see iso9660_fuzzy_ext
-  */
-  iso9660_t *iso9660_open_fuzzy (const char *psz_path /*flags, mode */,
-                                 uint16_t i_fuzz);
-
-  /*!
-    Open an ISO 9660 image for reading with some tolerence for positioning
-    of the ISO9660 image. We scan for ISO_STANDARD_ID and use that to set
-    the eventual offset to adjust by (as long as that is <= i_fuzz).
-    
-    Maybe in the future we will have a mode. NULL is returned on error.
-    
-    @see iso9660_open_ext @see iso9660_open_fuzzy
-  */
-  iso9660_t *iso9660_open_fuzzy_ext (const char *psz_path,
-                                     iso_extension_mask_t iso_extension_mask,
-                                     uint16_t i_fuzz
-                                     /*flags, mode */);
-
-  /*!
-    Read the Super block of an ISO 9660 image but determine framesize
-    and datastart and a possible additional offset. Generally here we are
-    not reading an ISO 9660 image but a CD-Image which contains an ISO 9660
-    filesystem.
-  */
-  bool iso9660_ifs_fuzzy_read_superblock (iso9660_t *p_iso, 
-                                          iso_extension_mask_t iso_extension_mask,
-                                          uint16_t i_fuzz);
-  
-  /*!
-    Seek to a position and then read i_size blocks. 
-
-    @param p_iso the ISO-9660 file image to get data from
-
-    @param ptr place to put returned data. It should be able to store
-    a least i_size bytes
-
-    @param start location to start reading from
-
-    @param i_size number of blocks to read. Each block is ISO_BLOCKSIZE bytes
-    long.
-
-    @return number of bytes (not blocks) read
-
-  */
-  long int iso9660_iso_seek_read (const iso9660_t *p_iso, /*out*/ void *ptr, 
-                                  lsn_t start, long int i_size);
-  
-  /*!
-    Read the Primary Volume Descriptor for a CD.
-    True is returned if read, and false if there was an error.
-  */
-  bool iso9660_fs_read_pvd ( const CdIo_t *p_cdio, 
-                             /*out*/ iso9660_pvd_t *p_pvd );
-  
-  /*!
-    Read the Primary Volume Descriptor for an ISO 9660 image.
-    True is returned if read, and false if there was an error.
-  */
-  bool iso9660_ifs_read_pvd (const iso9660_t *p_iso, 
-                             /*out*/ iso9660_pvd_t *p_pvd);
-  
-/*!
-  Read the Super block of an ISO 9660 image. This is the 
-  Primary Volume Descriptor (PVD) and perhaps a Supplemental Volume 
-  Descriptor if (Joliet) extensions are acceptable.
-*/
-  bool iso9660_fs_read_superblock (CdIo_t *p_cdio, 
-                                   iso_extension_mask_t iso_extension_mask);
-  
-  /*!
-    Read the Super block of an ISO 9660 image. This is the 
-    Primary Volume Descriptor (PVD) and perhaps a Supplemental Volume 
-    Descriptor if (Joliet) extensions are acceptable.
-  */
-  bool iso9660_ifs_read_superblock (iso9660_t *p_iso,
-                                    iso_extension_mask_t iso_extension_mask);
-
-
-/*====================================================
-  Time conversion 
- ====================================================*/
-/*!
-  Set time in format used in ISO 9660 directory index record
-  from a Unix time structure. */
-  void iso9660_set_dtime (const struct tm *tm, 
-                          /*out*/ iso9660_dtime_t *idr_date);
-
-
-  /*!
-    Set "long" time in format used in ISO 9660 primary volume descriptor
-    from a Unix time structure. */
-  void iso9660_set_ltime (const struct tm *_tm, 
-                          /*out*/ iso9660_ltime_t *p_pvd_date);
-  
-  /*!
-    Get Unix time structure from format use in an ISO 9660 directory index 
-    record. Even though tm_wday and tm_yday fields are not explicitly in
-    idr_date, they are calculated from the other fields.
-    
-    If tm is to reflect the localtime, set "b_localtime" true, otherwise
-    tm will reported in GMT.
-  */
-  bool iso9660_get_dtime (const iso9660_dtime_t *idr_date, bool b_localtime,
-                          /*out*/ struct tm *tm);
-  
-  
-  /*!
-    Get "long" time in format used in ISO 9660 primary volume descriptor
-    from a Unix time structure. 
-  */
-  bool iso9660_get_ltime (const iso9660_ltime_t *p_ldate, 
-                          /*out*/ struct tm *p_tm);
-  
-  /*====================================================
-    Character Classification and String Manipulation
-    ====================================================*/
-  /*!
-    Return true if c is a DCHAR - a character that can appear in an an
-    ISO-9600 level 1 directory name. These are the ASCII capital
-    letters A-Z, the digits 0-9 and an underscore.
-  */
-  bool iso9660_is_dchar (int c);
-  
-  /*!
-    Return true if c is an ACHAR - 
-    These are the DCHAR's plus some ASCII symbols including the space 
-    symbol.   
-  */
-  bool iso9660_is_achar (int c);
-  
-  /*!
-    Convert an ISO-9660 file name which is in the format usually stored
-    in a ISO 9660 directory entry into what's usually listed as the
-    file name in a listing.  Lowercase name, and remove trailing ;1's
-    or .;1's and turn the other ;'s into version numbers.
-    
-    @param psz_oldname the ISO-9660 filename to be translated.
-    @param psz_newname returned string. The caller allocates this and
-    it should be at least the size of psz_oldname.
-    @return length of the translated string is returned.
-  */
-  int iso9660_name_translate(const char *psz_oldname, 
-                             /*out*/ char *psz_newname);
-  
-  /*!
-    Convert an ISO-9660 file name which is in the format usually stored
-    in a ISO 9660 directory entry into what's usually listed as the
-    file name in a listing.  Lowercase name if no Joliet Extension
-    interpretation. Remove trailing ;1's or .;1's and turn the other
-    ;'s into version numbers.
-    
-    @param psz_oldname the ISO-9660 filename to be translated.
-    @param psz_newname returned string. The caller allocates this and
-    it should be at least the size of psz_oldname.
-    @param i_joliet_level 0 if not using Joliet Extension. Otherwise the
-    Joliet level.
-    @return length of the translated string is returned. It will be no greater
-    than the length of psz_oldname.
-  */
-  int iso9660_name_translate_ext(const char *psz_oldname, char *psz_newname, 
-                                 uint8_t i_joliet_level);
-  
-  /*!  
-    Pad string src with spaces to size len and copy this to dst. If
-    len is less than the length of src, dst will be truncated to the
-    first len characters of src.
-    
-    src can also be scanned to see if it contains only ACHARs, DCHARs, 
-    7-bit ASCII chars depending on the enumeration _check.
-    
-    In addition to getting changed, dst is the return value.
-    Note: this string might not be NULL terminated.
-  */
-  char *iso9660_strncpy_pad(char dst[], const char src[], size_t len, 
-                            enum strncpy_pad_check _check);
-  
-  /*=====================================================================
-    File and Directory Names 
-    ======================================================================*/
-  
-  /*!
-    Check that psz_path is a valid ISO-9660 directory name.
-    
-    A valid directory name should not start out with a slash (/), 
-    dot (.) or null byte, should be less than 37 characters long, 
-    have no more than 8 characters in a directory component 
-    which is separated by a /, and consist of only DCHARs. 
-    
-    True is returned if psz_path is valid.
-  */
-  bool iso9660_dirname_valid_p (const char psz_path[]);
-  
-  /*!  
-    Take psz_path and a version number and turn that into a ISO-9660
-    pathname.  (That's just the pathname followd by ";" and the version
-    number. For example, mydir/file.ext -> MYDIR/FILE.EXT;1 for version
-    1. The resulting ISO-9660 pathname is returned.
-  */
-  char *iso9660_pathname_isofy (const char psz_path[], uint16_t i_version);
-  
-  /*!
-    Check that psz_path is a valid ISO-9660 pathname.  
-    
-    A valid pathname contains a valid directory name, if one appears and
-    the filename portion should be no more than 8 characters for the
-    file prefix and 3 characters in the extension (or portion after a
-    dot). There should be exactly one dot somewhere in the filename
-    portion and the filename should be composed of only DCHARs.
-    
-    True is returned if psz_path is valid.
-  */
-  bool iso9660_pathname_valid_p (const char psz_path[]);
-
-/*=====================================================================
-  directory tree 
-======================================================================*/
-
-void
-iso9660_dir_init_new (void *dir, uint32_t self, uint32_t ssize, 
-                      uint32_t parent, uint32_t psize, 
-                      const time_t *dir_time);
-
-void
-iso9660_dir_init_new_su (void *dir, uint32_t self, uint32_t ssize, 
-                         const void *ssu_data, unsigned int ssu_size, 
-                         uint32_t parent, uint32_t psize, 
-                         const void *psu_data, unsigned int psu_size,
-                         const time_t *dir_time);
-
-void
-iso9660_dir_add_entry_su (void *dir, const char filename[], uint32_t extent,
-                          uint32_t size, uint8_t file_flags, 
-                          const void *su_data,
-                          unsigned int su_size, const time_t *entry_time);
-
-unsigned int 
-iso9660_dir_calc_record_size (unsigned int namelen, unsigned int su_len);
-
-/*!
-   Given a directory pointer, find the filesystem entry that contains
-   lsn and return information about it.
-
-   @return stat_t of entry if we found lsn, or NULL otherwise.
-   Caller must free return value.
- */
-#define iso9660_fs_find_lsn  iso9660_find_fs_lsn 
-iso9660_stat_t *iso9660_fs_find_lsn(CdIo_t *p_cdio, lsn_t i_lsn);
-
-
-/*!
-   Given a directory pointer, find the filesystem entry that contains
-   lsn and return information about it.
-
-   @return stat_t of entry if we found lsn, or NULL otherwise.
-   Caller must free return value.
- */
-iso9660_stat_t *iso9660_fs_find_lsn_with_path(CdIo_t *p_cdio, lsn_t i_lsn,
-                                              /*out*/ char **ppsz_path);
-
-/*!
-   Given a directory pointer, find the filesystem entry that contains
-   lsn and return information about it.
-
-   @return stat_t of entry if we found lsn, or NULL otherwise.
-   Caller must free return value.
- */
-iso9660_stat_t *iso9660_ifs_find_lsn(iso9660_t *p_iso, lsn_t i_lsn);
-
-
-/*!
-   Given a directory pointer, find the filesystem entry that contains
-   lsn and return information about it.
-
-   @param p_iso pointer to iso_t 
-   @param i_lsn LSN to find
-   @param ppsz_path  full path of lsn filename. On entry *ppsz_path should be
-   NULL. On return it will be allocated an point to the full path of the
-   file at lsn or NULL if the lsn is not found. You should deallocate
-   *ppsz_path when you are done using it.
-
-   @return stat_t of entry if we found lsn, or NULL otherwise.
-   Caller must free return value.
- */
-iso9660_stat_t *iso9660_ifs_find_lsn_with_path(iso9660_t *p_iso, 
-                                               lsn_t i_lsn,
-                                               /*out*/ char **ppsz_path);
-
-
-/*!
-  Return file status for psz_path. NULL is returned on error.
-
-  @param p_cdio the CD object to read from
-
-  @param psz_path filename path to look up and get information about
-
-  @return ISO 9660 file information
-
-  Important note:
-
-  You make get different results looking up "/" versus "/." and the
-  latter may give more complete information. "/" will take information
-  from the PVD only, whereas "/." will force a directory read of "/" and
-  find "." and in that Rock-Ridge information might be found which fills
-  in more stat information. Ideally iso9660_fs_stat should be fixed.
-  Patches anyone?
- */
-iso9660_stat_t *iso9660_fs_stat (CdIo_t *p_cdio, const char psz_path[]);
-  
-
-/*!  
-  Return file status for path name psz_path. NULL is returned on error.
-  pathname version numbers in the ISO 9660 name are dropped, i.e. ;1
-  is removed and if level 1 ISO-9660 names are lowercased.
-
-  b_mode2 is historical. It is not used.
- */
-iso9660_stat_t *iso9660_fs_stat_translate (CdIo_t *p_cdio, 
-                                           const char psz_path[], 
-                                           bool b_mode2);
-
-/*!  
-  Return file status for pathname. NULL is returned on error.
- */
-iso9660_stat_t *iso9660_ifs_stat (iso9660_t *p_iso, const char psz_path[]);
-
-
-/*!  Return file status for path name psz_path. NULL is returned on
-  error.  pathname version numbers in the ISO 9660 name are dropped,
-  i.e. ;1 is removed and if level 1 ISO-9660 names are lowercased.
- */
-iso9660_stat_t *iso9660_ifs_stat_translate (iso9660_t *p_iso, 
-                                            const char psz_path[]);
-
-/*!  Read psz_path (a directory) and return a list of iso9660_stat_t
-  pointers for the files inside that directory. The caller must free the
-  returned result.
-
-  b_mode2 is historical. It is not used.
-*/
-CdioList_t * iso9660_fs_readdir (CdIo_t *p_cdio, const char psz_path[], 
-                                 bool b_mode2);
-
-/*!  Read psz_path (a directory) and return a list of iso9660_stat_t
-  pointers for the files inside that directory. The caller must free
-  the returned result.
-*/
-CdioList_t * iso9660_ifs_readdir (iso9660_t *p_iso, const char psz_path[]);
-
-/*!
-  Return the PVD's application ID.
-  NULL is returned if there is some problem in getting this. 
-*/
-char * iso9660_get_application_id(iso9660_pvd_t *p_pvd);
-  
-/*!  
-  Get the application ID.  psz_app_id is set to NULL if there
-  is some problem in getting this and false is returned.
-*/
-bool iso9660_ifs_get_application_id(iso9660_t *p_iso,
-                                    /*out*/ cdio_utf8_t **p_psz_app_id);
-
-/*!  
-  Return the Joliet level recognized for p_iso.
-*/
-uint8_t iso9660_ifs_get_joliet_level(iso9660_t *p_iso);
-
-uint8_t iso9660_get_dir_len(const iso9660_dir_t *p_idr);
-
-#if FIXME
-uint8_t iso9660_get_dir_size(const iso9660_dir_t *p_idr);
-
-lsn_t iso9660_get_dir_extent(const iso9660_dir_t *p_idr);
-#endif
-
-  /*!
-    Return the directory name stored in the iso9660_dir_t
-    
-    A string is allocated: the caller must deallocate. This routine
-    can return NULL if memory allocation fails.
-  */
-  char * iso9660_dir_to_name (const iso9660_dir_t *p_iso9660_dir);
-  
-  /*!  
-    Returns a POSIX mode for a given p_iso_dirent.
-  */
-  mode_t iso9660_get_posix_filemode(const iso9660_stat_t *p_iso_dirent);
-
-  /*!
-    Return a string containing the preparer id with trailing
-    blanks removed.
-  */
-  char *iso9660_get_preparer_id(const iso9660_pvd_t *p_pvd);
-  
-  /*!  
-    Get the preparer ID.  psz_preparer_id is set to NULL if there
-    is some problem in getting this and false is returned.
-  */
-  bool iso9660_ifs_get_preparer_id(iso9660_t *p_iso,
-                                   /*out*/ cdio_utf8_t **p_psz_preparer_id);
-  
-  /*!
-    Return a string containing the PVD's publisher id with trailing
-    blanks removed.
-  */
-  char *iso9660_get_publisher_id(const iso9660_pvd_t *p_pvd);
-  
-  /*!  
-    Get the publisher ID.  psz_publisher_id is set to NULL if there
-    is some problem in getting this and false is returned.
-  */
-  bool iso9660_ifs_get_publisher_id(iso9660_t *p_iso,
-                                    /*out*/ cdio_utf8_t **p_psz_publisher_id);
-  
-  uint8_t iso9660_get_pvd_type(const iso9660_pvd_t *p_pvd);
-  
-  const char * iso9660_get_pvd_id(const iso9660_pvd_t *p_pvd);
-  
-  int iso9660_get_pvd_space_size(const iso9660_pvd_t *p_pvd);
-  
-  int iso9660_get_pvd_block_size(const iso9660_pvd_t *p_pvd) ;
-  
-  /*! Return the primary volume id version number (of pvd).
-    If there is an error 0 is returned. 
-  */
-  int iso9660_get_pvd_version(const iso9660_pvd_t *pvd) ;
-  
-  /*!
-    Return a string containing the PVD's system id with trailing
-    blanks removed.
-  */
-  char *iso9660_get_system_id(const iso9660_pvd_t *p_pvd);
-  
-  /*!  
-    Get the system ID.  psz_system_id is set to NULL if there
-    is some problem in getting this and false is returned.
-  */
-  bool iso9660_ifs_get_system_id(iso9660_t *p_iso,
-                                 /*out*/ cdio_utf8_t **p_psz_system_id);
-  
-  
-  /*! Return the LSN of the root directory for pvd.
-    If there is an error CDIO_INVALID_LSN is returned. 
-  */
-  lsn_t iso9660_get_root_lsn(const iso9660_pvd_t *p_pvd);
-  
-  /*!  
-    Get the volume ID in the PVD.  psz_volume_id is set to NULL if there
-    is some problem in getting this and false is returned.
-  */
-  char *iso9660_get_volume_id(const iso9660_pvd_t *p_pvd);
-  
-  /*!  
-    Get the volume ID in the PVD.  psz_volume_id is set to NULL if there
-    is some problem in getting this and false is returned.
-  */
-  bool iso9660_ifs_get_volume_id(iso9660_t *p_iso,
-                                 /*out*/ cdio_utf8_t **p_psz_volume_id);
-  
-  /*!
-    Return the volumeset ID in the PVD.
-    NULL is returned if there is some problem in getting this. 
-  */
-  char *iso9660_get_volumeset_id(const iso9660_pvd_t *p_pvd);
-  
-  /*!  
-    Get the volumeset ID.  psz_systemset_id is set to NULL if there
-    is some problem in getting this and false is returned.
-  */
-  bool iso9660_ifs_get_volumeset_id(iso9660_t *p_iso,
-                                    /*out*/ cdio_utf8_t **p_psz_volumeset_id);
-  
-  /* pathtable */
-  
-  /*! Zero's out pathable. Do this first. */
-  void iso9660_pathtable_init (void *pt);
-  
-  unsigned int iso9660_pathtable_get_size (const void *pt);
-  
-  uint16_t iso9660_pathtable_l_add_entry (void *pt, const char name[], 
-                                          uint32_t extent, uint16_t parent);
-  
-  uint16_t iso9660_pathtable_m_add_entry (void *pt, const char name[], 
-                                          uint32_t extent, uint16_t parent);
-  
-  /**=====================================================================
-     Volume Descriptors
-     ======================================================================*/
-
-  void iso9660_set_pvd (void *pd, const char volume_id[], 
-                        const char application_id[], 
-                        const char publisher_id[], const char preparer_id[],
-                        uint32_t iso_size, const void *root_dir, 
-                        uint32_t path_table_l_extent, 
-                        uint32_t path_table_m_extent,
-                        uint32_t path_table_size, const time_t *pvd_time);
-
-  void iso9660_set_evd (void *pd);
-
-  /*!
-    Return true if ISO 9660 image has extended attrributes (XA).
-  */
-  bool iso9660_ifs_is_xa (const iso9660_t * p_iso);
-
-
-#ifndef DO_NOT_WANT_COMPATIBILITY
-/** For compatibility with < 0.77 */
-#define iso9660_isdchar       iso9660_is_dchar
-#define iso9660_isachar       iso9660_is_achar
-#endif /*DO_NOT_WANT_COMPATIBILITY*/
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#undef ISODCL
-#endif /* __CDIO_ISO9660_H__ */
-
-/* 
- * Local variables:
- *  c-file-style: "gnu"
- *  tab-width: 8
- *  indent-tabs-mode: nil
- * End:
- */
diff --git a/lib-x86-32/include/cdio/logging.h b/lib-x86-32/include/cdio/logging.h
deleted file mode 100644
index 988d11c5..00000000
--- a/lib-x86-32/include/cdio/logging.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
-    $Id: logging.h,v 1.11 2008/03/25 15:59:09 karl Exp $
-
-    Copyright (C) 2003, 2004, 2008 Rocky Bernstein <rocky@gnu.org>
-    Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-/** \file logging.h 
- *  \brief Header to control logging and level of detail of output.
- *         
- */
-
-#ifndef __LOGGING_H__
-#define __LOGGING_H__
-
-#include <cdio/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * The different log levels supported.
- */
-typedef enum {
-  CDIO_LOG_DEBUG = 1, /**< Debug-level messages - helps debug what's up. */
-  CDIO_LOG_INFO,      /**< Informational - indicates perhaps something of 
-                           interest. */
-  CDIO_LOG_WARN,      /**< Warning conditions - something that looks funny. */
-  CDIO_LOG_ERROR,     /**< Error conditions - may terminate program.  */
-  CDIO_LOG_ASSERT     /**< Critical conditions - may abort program. */
-} cdio_log_level_t;
-
-/**
- * The place to save the preference concerning how much verbosity 
- * is desired. This is used by the internal default log handler, but
- * it could be use by applications which provide their own log handler.
- */
-extern cdio_log_level_t cdio_loglevel_default;
-
-/**
- * This type defines the signature of a log handler.  For every
- * message being logged, the handler will receive the log level and
- * the message string.
- *
- * @see cdio_log_set_handler
- * @see cdio_log_level_t
- *
- * @param level   The log level.
- * @param message The log message.
- */
-typedef void (*cdio_log_handler_t) (cdio_log_level_t level, 
-                                    const char message[]);
-
-/**
- * Set a custom log handler for libcdio.  The return value is the log
- * handler being replaced.  If the provided parameter is NULL, then
- * the handler will be reset to the default handler.
- *
- * @see cdio_log_handler_t
- *
- * @param new_handler The new log handler.
- * @return The previous log handler.
- */
-cdio_log_handler_t cdio_log_set_handler (cdio_log_handler_t new_handler);
-
-/**
- * Handle an message with the given log level.
- *
- * @see cdio_debug
- * @see cdio_info
- * @see cdio_warn
- * @see cdio_error
-
- * @param level   The log level.
- * @param format  printf-style format string
- * @param ...     remaining arguments needed by format string
- */
-void cdio_log (cdio_log_level_t level, 
-               const char format[], ...) GNUC_PRINTF(2, 3);
-    
-/**
- * Handle a debugging message.
- *
- * @see cdio_log for a more generic routine
- */
-void cdio_debug (const char format[], ...) GNUC_PRINTF(1,2);
-
-/**
- * Handle an informative message.
- *
- * @see cdio_log for a more generic routine
- */
-void cdio_info (const char format[], ...) GNUC_PRINTF(1,2);
-
-/**
- * Handle a warning message.
- *
- * @see cdio_log for a more generic routine
- */
-void cdio_warn (const char format[], ...) GNUC_PRINTF(1,2);
-
-/**
- * Handle an error message. Execution is terminated.
- *
- * @see cdio_log for a more generic routine.
- */
-void cdio_error (const char format[], ...) GNUC_PRINTF(1,2);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __LOGGING_H__ */
-
-
-/* 
- * Local variables:
- *  c-file-style: "gnu"
- *  tab-width: 8
- *  indent-tabs-mode: nil
- * End:
- */
diff --git a/lib-x86-32/include/cdio/mmc.h b/lib-x86-32/include/cdio/mmc.h
deleted file mode 100644
index c7a4eeaf..00000000
--- a/lib-x86-32/include/cdio/mmc.h
+++ /dev/null
@@ -1,907 +0,0 @@
-/*
-    $Id: mmc.h,v 1.32 2008/05/09 06:13:32 edsdead Exp $
-
-    Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008
-                  Rocky Bernstein <rocky@gnu.org>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-/**
- *  \file mmc.h 
- * 
- *  \brief Common definitions for MMC (Multimedia Commands). Applications
- *  include this for direct MMC access.
-*/
-
-#ifndef __CDIO_MMC_H__
-#define __CDIO_MMC_H__
-
-#include <cdio/cdio.h>
-#include <cdio/types.h>
-#include <cdio/dvd.h>
-#include <cdio/audio.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-  /** Set this to the maximum value in milliseconds that we will
-      wait on an MMC command.  */
-  extern uint32_t mmc_timeout_ms; 
-
-  /** The default timeout (non-read) is 6 seconds. */
-#define MMC_TIMEOUT_DEFAULT 6000
-
-  /** Set this to the maximum value in milliseconds that we will
-      wait on an MMC read command.  */
-  extern uint32_t mmc_read_timeout_ms;
-
-  /** The default read timeout is 3 minutes. */
-#define MMC_READ_TIMEOUT_DEFAULT 3*60*1000
-
-
-  /** \brief The opcode-portion (generic packet commands) of an MMC command.
-    
-  In general, those opcodes that end in 6 take a 6-byte command
-  descriptor, those that end in 10 take a 10-byte
-  descriptor and those that in in 12 take a 12-byte descriptor. 
-  
-  (Not that you need to know that, but it seems to be a
-  big deal in the MMC specification.)
-  
-  */
-  typedef enum {
-  CDIO_MMC_GPCMD_INQUIRY 	        = 0x12, /**< Request drive 
-						   information. */
-  CDIO_MMC_GPCMD_MODE_SELECT_6	        = 0x15, /**< Select medium 
-						   (6 bytes). */
-  CDIO_MMC_GPCMD_MODE_SENSE_6 	        = 0x1a, /**< Get medium or device
-						 information. Should be issued
-						 before MODE SELECT to get
-						 mode support or save current
-						 settings. (6 bytes). */
-  CDIO_MMC_GPCMD_START_STOP             = 0x1b, /**< Enable/disable Disc
-						     operations. (6 bytes). */
-  CDIO_MMC_GPCMD_ALLOW_MEDIUM_REMOVAL   = 0x1e, /**< Enable/disable Disc 
-						   removal. (6 bytes). */
-
-  /** Group 2 Commands (CDB's here are 10-bytes)   
-   */
-  CDIO_MMC_GPCMD_READ_10	        = 0x28, /**< Read data from drive 
-						   (10 bytes). */
-  CDIO_MMC_GPCMD_READ_SUBCHANNEL	= 0x42, /**< Read Sub-Channel data.
-						   (10 bytes). */
-  CDIO_MMC_GPCMD_READ_TOC               = 0x43, /**< READ TOC/PMA/ATIP. 
-						   (10 bytes). */
-  CDIO_MMC_GPCMD_READ_HEADER            = 0x44,
-  CDIO_MMC_GPCMD_PLAY_AUDIO_10	        = 0x45, /**< Begin audio playing at
-						   current position
-						   (10 bytes). */
-  CDIO_MMC_GPCMD_GET_CONFIGURATION      = 0x46, /**< Get drive Capabilities 
-						   (10 bytes) */
-  CDIO_MMC_GPCMD_PLAY_AUDIO_MSF	        = 0x47, /**< Begin audio playing at
-						   specified MSF (10
-						   bytes). */
-  CDIO_MMC_GPCMD_PLAY_AUDIO_TI          = 0x48,
-  CDIO_MMC_GPCMD_PLAY_TRACK_REL_10      = 0x49, /**< Play audio at the track
-						   relative LBA. (10 bytes).
-						   Doesn't seem to be part
-						   of MMC standards but is
-						   handled by Plextor drives.
-						*/
-						   
-  CDIO_MMC_GPCMD_GET_EVENT_STATUS       = 0x4a, /**< Report events and 
-						   Status. */
-  CDIO_MMC_GPCMD_PAUSE_RESUME           = 0x4b, /**< Stop or restart audio 
-						   playback. (10 bytes). 
-						   Used with a PLAY command. */
-
-  CDIO_MMC_GPCMD_READ_DISC_INFO	        = 0x51, /**< Get CD information.
-						   (10 bytes). */
-  CDIO_MMC_GPCMD_MODE_SELECT_10	        = 0x55, /**< Select medium 
-						   (10-bytes). */
-  CDIO_MMC_GPCMD_MODE_SENSE_10	        = 0x5a, /**< Get medium or device
-						 information. Should be issued
-						 before MODE SELECT to get
-						 mode support or save current
-						 settings. (6 bytes). */
-
-  /** Group 5 Commands (CDB's here are 12-bytes) 
-   */
-  CDIO_MMC_GPCMD_PLAY_AUDIO_12	        = 0xa5, /**< Begin audio playing at
-						   current position
-						 (12 bytes) */
-  CDIO_MMC_GPCMD_LOAD_UNLOAD	        = 0xa6, /**< Load/unload a Disc
-						 (12 bytes) */
-  CDIO_MMC_GPCMD_READ_12	        = 0xa8, /**< Read data from drive 
-						   (12 bytes). */
-  CDIO_MMC_GPCMD_PLAY_TRACK_REL_12      = 0xa9, /**< Play audio at the track
-						   relative LBA. (12 bytes).
-						   Doesn't seem to be part
-						   of MMC standards but is
-						   handled by Plextor drives.
-						*/
-  CDIO_MMC_GPCMD_READ_DVD_STRUCTURE     = 0xad, /**< Get DVD structure info
-						   from media (12 bytes). */
-  CDIO_MMC_GPCMD_READ_MSF	        = 0xb9, /**< Read almost any field 
-						   of a CD sector at specified
-						   MSF. (12 bytes). */
-  CDIO_MMC_GPCMD_SET_SPEED	        = 0xbb, /**< Set drive speed 
-						   (12 bytes). This is listed 
-						   as optional in ATAPI 2.6, 
-						   but is (curiously)
-						   missing from Mt. Fuji, 
-						   Table 57. It is mentioned
-						   in Mt. Fuji Table 377 as an 
-						   MMC command for SCSI
-						   devices though...  Most
-						   ATAPI drives support it. */
-  CDIO_MMC_GPCMD_READ_CD	        = 0xbe, /**< Read almost any field 
-						   of a CD sector at current
-						   location. (12 bytes). */
-  /** Vendor-unique Commands  
-   */
-  CDIO_MMC_GPCMD_CD_PLAYBACK_STATUS  = 0xc4 /**< SONY unique  = command */,
-  CDIO_MMC_GPCMD_PLAYBACK_CONTROL    = 0xc9 /**< SONY unique  = command */,
-  CDIO_MMC_GPCMD_READ_CDDA	     = 0xd8 /**< Vendor unique  = command */,
-  CDIO_MMC_GPCMD_READ_CDXA	     = 0xdb /**< Vendor unique  = command */,
-  CDIO_MMC_GPCMD_READ_ALL_SUBCODES   = 0xdf /**< Vendor unique  = command */
-  } cdio_mmc_gpcmd_t;
-
-
-  /** Read Subchannel states */
-  typedef enum {
-    CDIO_MMC_READ_SUB_ST_INVALID   = 0x00, /**< audio status not supported */
-    CDIO_MMC_READ_SUB_ST_PLAY      = 0x11, /**< audio play operation in 
-                                              progress */
-    CDIO_MMC_READ_SUB_ST_PAUSED    = 0x12, /**< audio play operation paused */
-    CDIO_MMC_READ_SUB_ST_COMPLETED = 0x13, /**< audio play successfully 
-                                              completed */
-    CDIO_MMC_READ_SUB_ST_ERROR     = 0x14, /**< audio play stopped due to 
-                                              error */
-    CDIO_MMC_READ_SUB_ST_NO_STATUS = 0x15, /**< no current audio status to
-                                              return */
-  } cdio_mmc_read_sub_state_t;
-
-  /** Level values that can go into READ_CD */
-  typedef enum {
-    CDIO_MMC_READ_TYPE_ANY  =  0,  /**< All types */
-    CDIO_MMC_READ_TYPE_CDDA =  1,  /**< Only CD-DA sectors */
-    CDIO_MMC_READ_TYPE_MODE1 = 2,  /**< mode1 sectors (user data = 2048) */
-    CDIO_MMC_READ_TYPE_MODE2 = 3,  /**< mode2 sectors form1 or form2 */
-    CDIO_MMC_READ_TYPE_M2F1 =  4,  /**< mode2 sectors form1 */
-    CDIO_MMC_READ_TYPE_M2F2 =  5   /**< mode2 sectors form2 */
-  } cdio_mmc_read_cd_type_t;
-
-  /** Format values for READ_TOC */
-  typedef enum {
-    CDIO_MMC_READTOC_FMT_TOC     =  0,
-    CDIO_MMC_READTOC_FMT_SESSION =  1,  
-    CDIO_MMC_READTOC_FMT_FULTOC  =  2,
-    CDIO_MMC_READTOC_FMT_PMA     =  3,  /**< Q subcode data */
-    CDIO_MMC_READTOC_FMT_ATIP    =  4,  /**< includes media type */
-    CDIO_MMC_READTOC_FMT_CDTEXT  =  5   /**< CD-TEXT info  */
-  } cdio_mmc_readtoc_t;
-    
-/** Page codes for MODE SENSE and MODE SET. */
-  typedef enum {
-    CDIO_MMC_R_W_ERROR_PAGE	= 0x01,
-    CDIO_MMC_WRITE_PARMS_PAGE	= 0x05,
-    CDIO_MMC_CDR_PARMS_PAGE	= 0x0d,
-    CDIO_MMC_AUDIO_CTL_PAGE	= 0x0e,
-    CDIO_MMC_POWER_PAGE		= 0x1a,
-    CDIO_MMC_FAULT_FAIL_PAGE	= 0x1c,
-    CDIO_MMC_TO_PROTECT_PAGE	= 0x1d,
-    CDIO_MMC_CAPABILITIES_PAGE	= 0x2a,
-    CDIO_MMC_ALL_PAGES		= 0x3f,
-  } cdio_mmc_mode_page_t;
-    
-
-PRAGMA_BEGIN_PACKED
-  struct mmc_audio_volume_entry_s 
-  {
-    uint8_t  selection; /* Only the lower 4 bits are used. */
-    uint8_t  volume;
-  } GNUC_PACKED;
-
-  typedef struct mmc_audio_volume_entry_s mmc_audio_volume_entry_t;
-  
-  /** This struct is used by cdio_audio_get_volume and cdio_audio_set_volume */
-  struct mmc_audio_volume_s
-  {
-    mmc_audio_volume_entry_t port[4];
-  } GNUC_PACKED;
-
-  typedef struct mmc_audio_volume_s mmc_audio_volume_t;
-  
-PRAGMA_END_PACKED
-  
-
-/** Return type codes for GET_CONFIGURATION. */
-typedef enum {
-  CDIO_MMC_GET_CONF_ALL_FEATURES     = 0,  /**< all features without regard
-                                              to currency. */
-  CDIO_MMC_GET_CONF_CURRENT_FEATURES = 1,  /**< features which are currently
-                                              in effect (e.g. based on
-                                              medium inserted). */
-  CDIO_MMC_GET_CONF_NAMED_FEATURE    = 2   /**< just the feature named in
-                                              the GET_CONFIGURATION cdb. */
-} cdio_mmc_get_conf_t;
-  
-
-/** FEATURE codes used in GET CONFIGURATION. */
-
-typedef enum {
-  CDIO_MMC_FEATURE_PROFILE_LIST     = 0x000, /**< Profile List Feature */
-  CDIO_MMC_FEATURE_CORE             = 0x001, 
-  CDIO_MMC_FEATURE_MORPHING         = 0x002, /**< Report/prevent operational
-                                                  changes  */
-  CDIO_MMC_FEATURE_REMOVABLE_MEDIUM = 0x003, /**< Removable Medium Feature */
-  CDIO_MMC_FEATURE_WRITE_PROTECT    = 0x004, /**< Write Protect Feature */
-  CDIO_MMC_FEATURE_RANDOM_READABLE  = 0x010, /**< Random Readable Feature */
-  CDIO_MMC_FEATURE_MULTI_READ       = 0x01D, /**< Multi-Read Feature */
-  CDIO_MMC_FEATURE_CD_READ          = 0x01E, /**< CD Read Feature */
-  CDIO_MMC_FEATURE_DVD_READ         = 0x01F, /**< DVD Read Feature */
-  CDIO_MMC_FEATURE_RANDOM_WRITABLE  = 0x020, /**< Random Writable Feature */
-  CDIO_MMC_FEATURE_INCR_WRITE       = 0x021, /**< Incremental Streaming 
-						Writable Feature */
-  CDIO_MMC_FEATURE_SECTOR_ERASE     = 0x022, /**< Sector Erasable Feature */
-  CDIO_MMC_FEATURE_FORMATABLE       = 0x023, /**< Formattable Feature */
-  CDIO_MMC_FEATURE_DEFECT_MGMT      = 0x024, /**< Management Ability of the 
-						Logical Unit/media system to
-						provide an apparently 
-						defect-free space.*/
-  CDIO_MMC_FEATURE_WRITE_ONCE       = 0x025, /**< Write Once
-						   Feature */
-  CDIO_MMC_FEATURE_RESTRICT_OVERW   = 0x026, /**< Restricted Overwrite
-						Feature */
-  CDIO_MMC_FEATURE_CD_RW_CAV        = 0x027, /**< CD-RW CAV Write Feature */
-  CDIO_MMC_FEATURE_MRW              = 0x028, /**< MRW Feature */
-  CDIO_MMC_FEATURE_ENHANCED_DEFECT  = 0x029, /**< Enhanced Defect Reporting */
-  CDIO_MMC_FEATURE_DVD_PRW          = 0x02A, /**< DVD+RW Feature */
-  CDIO_MMC_FEATURE_DVD_PR           = 0x02B, /**< DVD+R Feature */
-  CDIO_MMC_FEATURE_RIGID_RES_OVERW  = 0x02C, /**< Rigid Restricted Overwrite */
-  CDIO_MMC_FEATURE_CD_TAO           = 0x02D, /**< CD Track at Once */ 
-  CDIO_MMC_FEATURE_CD_SAO           = 0x02E, /**< CD Mastering (Session at 
-						Once) */
-  CDIO_MMC_FEATURE_DVD_R_RW_WRITE   = 0x02F, /**< DVD-R/RW Write */
-  CDIO_MMC_FEATURE_CD_RW_MEDIA_WRITE= 0x037, /**< CD-RW Media Write Support */
-  CDIO_MMC_FEATURE_DVD_PR_2_LAYER   = 0x03B, /**< DVD+R Double Layer */
-  CDIO_MMC_FEATURE_POWER_MGMT       = 0x100, /**< Initiator and device directed
-						power management */
-  CDIO_MMC_FEATURE_CDDA_EXT_PLAY    = 0x103, /**< Ability to play audio CDs 
-						via the Logical Unit's own
-						analog output */
-  CDIO_MMC_FEATURE_MCODE_UPGRADE    = 0x104, /* Ability for the device to 
-						accept  new microcode via
-						the interface */
-  CDIO_MMC_FEATURE_TIME_OUT         = 0x105, /**< Ability to respond to all
-						commands within a specific 
-						time */
-  CDIO_MMC_FEATURE_DVD_CSS          = 0x106, /**< Ability to perform DVD
-						CSS/CPPM authentication and
-						RPC */
-  CDIO_MMC_FEATURE_RT_STREAMING     = 0x107, /**< Ability to read and write 
-						using Initiator requested
-						performance parameters   */
-  CDIO_MMC_FEATURE_LU_SN            = 0x108, /**< The Logical Unit has a unique
-						identifier. */
-  CDIO_MMC_FEATURE_FIRMWARE_DATE    = 0x1FF, /**< Firmware creation date 
-						report */
-} cdio_mmc_feature_t;
-				
-/** Profile profile codes used in GET_CONFIGURATION - PROFILE LIST. */
-typedef enum {
-  CDIO_MMC_FEATURE_PROF_NON_REMOVABLE = 0x0001, /**< Re-writable disk, capable
-						   of changing behavior */
-  CDIO_MMC_FEATURE_PROF_REMOVABLE     = 0x0002, /**< disk Re-writable; with 
-						   removable  media */
-  CDIO_MMC_FEATURE_PROF_MO_ERASABLE   = 0x0003, /**< Erasable Magneto-Optical
-						   disk with sector erase
-						   capability */
-  CDIO_MMC_FEATURE_PROF_MO_WRITE_ONCE = 0x0004, /**< Write Once Magneto-Optical
-						   write once */
-  CDIO_MMC_FEATURE_PROF_AS_MO         = 0x0005, /**< Advance Storage
-						   Magneto-Optical */
-  CDIO_MMC_FEATURE_PROF_CD_ROM        = 0x0008, /**< Read only Compact Disc
-						   capable */
-  CDIO_MMC_FEATURE_PROF_CD_R          = 0x0009, /**< Write once Compact Disc
-						   capable */
-  CDIO_MMC_FEATURE_PROF_CD_RW         = 0x000A, /**< CD-RW Re-writable
-						   Compact Disc capable */
-  CDIO_MMC_FEATURE_PROF_DVD_ROM       = 0x0010, /**< Read only DVD */
-  CDIO_MMC_FEATURE_PROF_DVD_R_SEQ     = 0x0011, /**< Re-recordable DVD using
-						   Sequential recording */
-  CDIO_MMC_FEATURE_PROF_DVD_RAM       = 0x0012, /**< Re-writable DVD */
-  CDIO_MMC_FEATURE_PROF_DVD_RW_RO     = 0x0013, /**< Re-recordable DVD using
-						   Restricted Overwrite */
-  CDIO_MMC_FEATURE_PROF_DVD_RW_SEQ    = 0x0014, /**< Re-recordable DVD using
-						   Sequential recording */
-  CDIO_MMC_FEATURE_PROF_DVD_PRW       = 0x001A, /**< DVD+RW - DVD ReWritable */
-  CDIO_MMC_FEATURE_PROF_DVD_PR        = 0x001B, /**< DVD+R - DVD Recordable */
-  CDIO_MMC_FEATURE_PROF_DDCD_ROM      = 0x0020, /**< Read only  DDCD */
-  CDIO_MMC_FEATURE_PROF_DDCD_R        = 0x0021, /**< DDCD-R Write only DDCD */
-  CDIO_MMC_FEATURE_PROF_DDCD_RW       = 0x0022, /**< Re-Write only DDCD */
-  CDIO_MMC_FEATURE_PROF_DVD_PR2       = 0x002B, /**< DVD+R - DVD Recordable 
-                                                     double layer */
-  CDIO_MMC_FEATURE_PROF_NON_CONFORM   = 0xFFFF, /**< The Logical Unit does not
-						   conform to any Profile. */
-} cdio_mmc_feature_profile_t;
-  
-typedef enum {
-  CDIO_MMC_FEATURE_INTERFACE_UNSPECIFIED = 0,
-  CDIO_MMC_FEATURE_INTERFACE_SCSI        = 1,
-  CDIO_MMC_FEATURE_INTERFACE_ATAPI       = 2,
-  CDIO_MMC_FEATURE_INTERFACE_IEEE_1394   = 3,
-  CDIO_MMC_FEATURE_INTERFACE_IEEE_1394A  = 4,
-  CDIO_MMC_FEATURE_INTERFACE_FIBRE_CH    = 5
-} cdio_mmc_feature_interface_t;
-  
-
-/** The largest Command Descriptor Block (CDB) size.
-    The possible sizes are 6, 10, and 12 bytes.
- */
-#define MAX_CDB_LEN 12
-
-/** \brief A Command Descriptor Block (CDB) used in sending MMC 
-    commands.
- */
-typedef struct mmc_cdb_s {
-  uint8_t field[MAX_CDB_LEN];
-} mmc_cdb_t;
-  
-  /** \brief Format of header block in data returned from an MMC
-    GET_CONFIGURATION command.
-  */
-  typedef struct mmc_feature_list_header_s {
-    unsigned char length_msb;
-    unsigned char length_1sb;
-    unsigned char length_2sb;
-    unsigned char length_lsb;
-    unsigned char reserved1;
-    unsigned char reserved2;
-    unsigned char profile_msb;
-    unsigned char profile_lsb;
-  } cdio_mmc_feature_list_header_t;
-
-  /** An enumeration indicating whether an MMC command is sending
-    data or getting data.
-  */
-  typedef enum mmc_direction_s {
-    SCSI_MMC_DATA_READ,
-    SCSI_MMC_DATA_WRITE
-  } cdio_mmc_direction_t;
-  
-  typedef struct mmc_subchannel_s
-  {
-    uint8_t       reserved;
-    uint8_t       audio_status;
-    uint16_t      data_length; /**< Really ISO 9660 7.2.2 */
-    uint8_t	  format;
-    uint8_t	  address:	4;
-    uint8_t	  control:	4;
-    uint8_t	  track;
-    uint8_t	  index;
-    uint8_t       abs_addr[4];
-    uint8_t       rel_addr[4];
-  } cdio_mmc_subchannel_t;
-  
-#define CDIO_MMC_SET_COMMAND(cdb, command)      \
-  cdb[0] = command
-  
-#define CDIO_MMC_SET_READ_TYPE(cdb, sector_type) \
-  cdb[1] = (sector_type << 2)
-  
-#define CDIO_MMC_GETPOS_LEN16(p, pos)           \
-  (p[pos]<<8) + p[pos+1]
-  
-#define CDIO_MMC_GET_LEN16(p)                   \
-  (p[0]<<8) + p[1]
-  
-#define CDIO_MMC_GET_LEN32(p) \
-  (p[0] << 24) + (p[1] << 16) + (p[2] << 8) + p[3];
-  
-#define CDIO_MMC_SET_LEN16(cdb, pos, len)       \
-  cdb[pos  ] = (len >>  8) & 0xff;              \
-  cdb[pos+1] = (len      ) & 0xff
-
-#define CDIO_MMC_SET_READ_LBA(cdb, lba)         \
-  cdb[2] = (lba >> 24) & 0xff; \
-  cdb[3] = (lba >> 16) & 0xff; \
-  cdb[4] = (lba >>  8) & 0xff; \
-  cdb[5] = (lba      ) & 0xff
-
-#define CDIO_MMC_SET_START_TRACK(cdb, command) \
-  cdb[6] = command
-
-#define CDIO_MMC_SET_READ_LENGTH24(cdb, len) \
-  cdb[6] = (len >> 16) & 0xff; \
-  cdb[7] = (len >>  8) & 0xff; \
-  cdb[8] = (len      ) & 0xff
-
-#define CDIO_MMC_SET_READ_LENGTH16(cdb, len) \
-  CDIO_MMC_SET_LEN16(cdb, 7, len)
-
-#define CDIO_MMC_SET_READ_LENGTH8(cdb, len) \
-  cdb[8] = (len      ) & 0xff
-
-#define CDIO_MMC_MCSB_ALL_HEADERS 0xf
-
-#define CDIO_MMC_SET_MAIN_CHANNEL_SELECTION_BITS(cdb, val) \
-  cdb[9] = val << 3;
-
-/**
-  Read Audio Subchannel information
-  
-  @param p_cdio the CD object to be acted upon.
-  @param p_subchannel place for returned subchannel information
-*/
-driver_return_code_t
-mmc_audio_read_subchannel (CdIo_t *p_cdio, 
-                           /*out*/ cdio_subchannel_t *p_subchannel);
-  
-  /**
-    Return a string containing the name of the audio state as returned from
-    the Q_SUBCHANNEL.
-  */
-  const char *mmc_audio_state2str( uint8_t i_audio_state );
-  
-  /**
-    Eject using MMC commands. If CD-ROM is "locked" we'll unlock it.
-    Command is not "immediate" -- we'll wait for the command to complete.
-    For a more general (and lower-level) routine, @see mmc_start_stop_media.
-  */
-  driver_return_code_t mmc_eject_media( const CdIo_t *p_cdio );
-  
-  /**
-    Return a string containing the name of the given feature
-  */
-  const char *mmc_feature2str( int i_feature );
-  
-  /**
-    Return a string containing the name of the given feature
-  */
-  const char *mmc_feature_profile2str( int i_feature_profile );
-  
-  /**  
-    Return the length in bytes of the Command Descriptor
-    Buffer (CDB) for a given MMC command. The length will be 
-    either 6, 10, or 12. 
-  */
-  uint8_t mmc_get_cmd_len(uint8_t mmc_cmd);
-  
-  /**
-    Get the block size used in read requests, via MMC.
-    @return the blocksize if > 0; error if <= 0
-  */
-  int mmc_get_blocksize ( CdIo_t *p_cdio );
-  
-  /**
-   * Close tray using a MMC START STOP command.
-   */
-  driver_return_code_t mmc_close_tray( CdIo_t *p_cdio );
-  
-  /**  
-    Get the lsn of the end of the CD
-    
-    @return the lsn. On error return CDIO_INVALID_LSN.
-  */
-  lsn_t mmc_get_disc_last_lsn( const CdIo_t *p_cdio );
-  
-  /** 
-    Return the discmode as reported by the MMC Read (FULL) TOC
-    command.
-    
-    Information was obtained from Section 5.1.13 (Read TOC/PMA/ATIP)
-    pages 56-62 from the MMC draft specification, revision 10a
-    at http://www.t10.org/ftp/t10/drafts/mmc/mmc-r10a.pdf See
-    especially tables 72, 73 and 75.
-  */
-  discmode_t mmc_get_discmode( const CdIo_t *p_cdio );
-  
-  
-  /**
-    Get drive capabilities for a device.
-    @return the drive capabilities.
-  */
-  void mmc_get_drive_cap ( CdIo_t *p_cdio,
-                           /*out*/ cdio_drive_read_cap_t  *p_read_cap,
-                           /*out*/ cdio_drive_write_cap_t *p_write_cap,
-                           /*out*/ cdio_drive_misc_cap_t  *p_misc_cap);
-  
-  typedef enum {
-    CDIO_MMC_LEVEL_WEIRD,
-    CDIO_MMC_LEVEL_1,
-    CDIO_MMC_LEVEL_2,
-    CDIO_MMC_LEVEL_3,
-    CDIO_MMC_LEVEL_NONE
-  } cdio_mmc_level_t;
-  
-  /**
-    Get the MMC level supported by the device.
-  */
-  cdio_mmc_level_t mmc_get_drive_mmc_cap(CdIo_t *p_cdio);
-  
-
-  /** 
-    Get the DVD type associated with cd object.
-    
-    @return the DVD discmode.
-  */
-  discmode_t mmc_get_dvd_struct_physical ( const CdIo_t *p_cdio, 
-                                           cdio_dvd_struct_t *s);
-  
-  /*! 
-    Return results of media status
-    @param p_cdio the CD object to be acted upon.
-    @param out_buf media status code from operation
-    @return DRIVER_OP_SUCCESS (0) if we got the status.
-    return codes are the same as driver_return_code_t
-   */
-  int mmc_get_event_status(const CdIo_t *p_cdio, uint8_t out_buf[2]);
-
-  /*! 
-    Find out if media tray is open or closed.
-    @param p_cdio the CD object to be acted upon.
-    @return 1 if media is open, 0 if closed. Error
-    return codes are the same as driver_return_code_t
-  */
-  int mmc_get_tray_status ( const CdIo_t *p_cdio );
-
-  /** 
-    Get the CD-ROM hardware info via an MMC INQUIRY command.
-    
-    @return true if we were able to get hardware info, false if we had
-    an error.
-  */
-  bool mmc_get_hwinfo ( const CdIo_t *p_cdio, 
-                        /* out*/ cdio_hwinfo_t *p_hw_info );
-  
-  
-  /** 
-    Find out if media has changed since the last call.
-    @param p_cdio the CD object to be acted upon.
-    @return 1 if media has changed since last call, 0 if not. Error
-    return codes are the same as driver_return_code_t
-  */
-  int mmc_get_media_changed(const CdIo_t *p_cdio);
-  
-  /**
-    Get the media catalog number (MCN) from the CD via MMC.
-    
-    @return the media catalog number r NULL if there is none or we
-    don't have the ability to get it.
-    
-    Note: string is malloc'd so caller has to free() the returned
-    string when done with it.
-    
-  */
-  char * mmc_get_mcn ( const CdIo_t *p_cdio );
-  
-  /** Get the output port volumes and port selections used on AUDIO PLAY
-      commands via a MMC MODE SENSE command using the CD Audio Control
-      Page.
-  */
-  driver_return_code_t mmc_audio_get_volume (CdIo_t *p_cdio,  /*out*/
-                                             mmc_audio_volume_t *p_volume);
-  
-  /**
-    Report if CD-ROM has a praticular kind of interface (ATAPI, SCSCI, ...)
-    Is it possible for an interface to have serveral? If not this 
-    routine could probably return the single mmc_feature_interface_t.
-    @return true if we have the interface and false if not.
-  */
-  bool_3way_t mmc_have_interface( CdIo_t *p_cdio, 
-                                  cdio_mmc_feature_interface_t e_interface );
-  
-  /** Run a MODE_SENSE command (6- or 10-byte version) 
-    and put the results in p_buf 
-    @return DRIVER_OP_SUCCESS if we ran the command ok.
-  */
-  int mmc_mode_sense( CdIo_t *p_cdio, /*out*/ void *p_buf, int i_size, 
-                      int page);
-  
-  
-  /** Run a MODE_SENSE command (10-byte version) 
-    and put the results in p_buf 
-    @return DRIVER_OP_SUCCESS if we ran the command ok.
-  */
-  int  mmc_mode_sense_10( CdIo_t *p_cdio, /*out*/ void *p_buf, int i_size, 
-                          int page);
-  
-  /** Run a MODE_SENSE command (6-byte version) 
-    and put the results in p_buf 
-    @return DRIVER_OP_SUCCESS if we ran the command ok.
-  */
-  int  mmc_mode_sense_6( CdIo_t *p_cdio, /*out*/ void *p_buf, int i_size, 
-                         int page);
-  
-  /** Issue a MMC READ_CD command.
-    
-  @param p_cdio  object to read from 
-  
-  @param p_buf   Place to store data. The caller should ensure that 
-  p_buf can hold at least i_blocksize * i_blocks  bytes.
-  
-  @param i_lsn   sector to read 
-  
-  @param expected_sector_type restricts reading to a specific CD
-  sector type.  Only 3 bits with values 1-5 are used:
-    0 all sector types
-    1 CD-DA sectors only 
-    2 Mode 1 sectors only
-    3 Mode 2 formless sectors only. Note in contrast to all other
-      values an MMC CD-ROM is not required to support this mode.
-    4 Mode 2 Form 1 sectors only
-    5 Mode 2 Form 2 sectors only
-
-  @param b_digital_audio_play Control error concealment when the
-  data being read is CD-DA.  If the data being read is not CD-DA,
-  this parameter is ignored.  If the data being read is CD-DA and
-  DAP is false zero, then the user data returned should not be
-  modified by flaw obscuring mechanisms such as audio data mute and
-  interpolate.  If the data being read is CD-DA and DAP is true,
-  then the user data returned should be modified by flaw obscuring
-  mechanisms such as audio data mute and interpolate.  
-  
-  b_sync_header return the sync header (which will probably have
-  the same value as CDIO_SECTOR_SYNC_HEADER of size
-  CDIO_CD_SYNC_SIZE).
-  
-  @param header_codes Header Codes refer to the sector header and
-  the sub-header that is present in mode 2 formed sectors: 
-  
-   0 No header information is returned.  
-   1 The 4-byte sector header of data sectors is be returned, 
-   2 The 8-byte sector sub-header of mode 2 formed sectors is
-     returned.  
-   3 Both sector header and sub-header (12 bytes) is returned.  
-   The Header preceeds the rest of the bytes (e.g. user-data bytes) 
-   that might get returned.
-   
-   @param b_user_data  Return user data if true. 
-   
-   For CD-DA, the User Data is CDIO_CD_FRAMESIZE_RAW bytes.
-
-   For Mode 1, The User Data is ISO_BLOCKSIZE bytes beginning at
-   offset CDIO_CD_HEADER_SIZE+CDIO_CD_SUBHEADER_SIZE.
-   
-   For Mode 2 formless, The User Data is M2RAW_SECTOR_SIZE bytes
-   beginning at offset CDIO_CD_HEADER_SIZE+CDIO_CD_SUBHEADER_SIZE.
-   
-   For data Mode 2, form 1, User Data is ISO_BLOCKSIZE bytes beginning at
-   offset CDIO_CD_XA_SYNC_HEADER.
-   
-   For data Mode 2, form 2, User Data is 2 324 bytes beginning at
-   offset CDIO_CD_XA_SYNC_HEADER.
-   
-   @param b_sync 
-
-   @param b_edc_ecc true if we return EDC/ECC error detection/correction bits.
-   
-   The presence and size of EDC redundancy or ECC parity is defined
-   according to sector type: 
-   
-   CD-DA sectors have neither EDC redundancy nor ECC parity.  
-   
-   Data Mode 1 sectors have 288 bytes of EDC redundancy, Pad, and
-   ECC parity beginning at offset 2064.
-   
-   Data Mode 2 formless sectors have neither EDC redundancy nor ECC
-   parity
-   
-   Data Mode 2 form 1 sectors have 280 bytes of EDC redundancy and
-   ECC parity beginning at offset 2072
-   
-   Data Mode 2 form 2 sectors optionally have 4 bytes of EDC
-   redundancy beginning at offset 2348.
-   
-   
-   @param c2_error_information If true associate a bit with each
-   sector for C2 error The resulting bit field is ordered exactly as
-   the main channel bytes.  Each 8-bit boundary defines a byte of
-   flag bits.
-   
-   @param subchannel_selection subchannel-selection bits
-   
-     0  No Sub-channel data shall be returned.  (0 bytes)
-     1  RAW P-W Sub-channel data shall be returned.  (96 byte)
-     2  Formatted Q sub-channel data shall be transferred (16 bytes)
-     3  Reserved     
-     4  Corrected and de-interleaved R-W sub-channel (96 bytes)
-     5-7  Reserved
-
-   @param i_blocksize size of the a block expected to be returned
-     
-   @param i_blocks number of blocks expected to be returned.
-     
-  */
-  driver_return_code_t
-  mmc_read_cd ( const CdIo_t *p_cdio, void *p_buf, lsn_t i_lsn, 
-                int expected_sector_type, bool b_digital_audio_play,
-                bool b_sync, uint8_t header_codes, bool b_user_data, 
-                bool b_edc_ecc, uint8_t c2_error_information, 
-                uint8_t subchannel_selection, uint16_t i_blocksize, 
-                uint32_t i_blocks );
-  
-  /** Read just the user data part of some sort of data sector (via 
-    mmc_read_cd). 
-    
-    @param p_cdio object to read from
-
-    @param p_buf place to read data into.  The caller should make sure
-                 this location can store at least CDIO_CD_FRAMESIZE,
-                 M2RAW_SECTOR_SIZE, or M2F2_SECTOR_SIZE depending on
-                 the kind of sector getting read. If you don't know
-                 whether you have a Mode 1/2, Form 1/ Form 2/Formless
-                 sector best to reserve space for the maximum,
-                 M2RAW_SECTOR_SIZE.
-
-    @param i_lsn sector to read
-    @param i_blocksize size of each block
-    @param i_blocks number of blocks to read
-
-  */
-  driver_return_code_t mmc_read_data_sectors ( CdIo_t *p_cdio, void *p_buf, 
-                                               lsn_t i_lsn, 
-                                               uint16_t i_blocksize,
-                                               uint32_t i_blocks );
-  
-  /** Read sectors using SCSI-MMC GPCMD_READ_CD. 
-      Can read only up to 25 blocks.
-   */
-  driver_return_code_t mmc_read_sectors ( const CdIo_t *p_cdio, void *p_buf, 
-                                          lsn_t i_lsn,  int read_sector_type, 
-                                          uint32_t i_blocks);
-  
-  /**
-    Run a Multimedia command (MMC). 
-    
-    @param p_cdio	 CD structure set by cdio_open().
-    @param i_timeout_ms  time in milliseconds we will wait for the command
-                         to complete. 
-    @param p_cdb	 CDB bytes. All values that are needed should be set 
-                         on input. We'll figure out what the right CDB length 
-                         should be.
-    @param e_direction   direction the transfer is to go.
-    @param i_buf	 Size of buffer
-    @param p_buf	 Buffer for data, both sending and receiving.
-
-    @return 0 if command completed successfully.
-  */
-  driver_return_code_t
-  mmc_run_cmd( const CdIo_t *p_cdio, unsigned int i_timeout_ms,
-               const mmc_cdb_t *p_cdb,
-               cdio_mmc_direction_t e_direction, unsigned int i_buf, 
-               /*in/out*/ void *p_buf );
-
-  /**
-    Run a Multimedia command (MMC) specifying the CDB length.
-    The motivation here is for example ot use in is an undocumented 
-    debug command for LG drives (namely E7), whose length is being 
-    miscalculated by mmc_get_cmd_len(); it doesn't follow the usual 
-    code number to length conventions. Patch supplied by SukkoPera.
-
-    @param p_cdio	 CD structure set by cdio_open().
-    @param i_timeout_ms  time in milliseconds we will wait for the command
-                         to complete. 
-    @param p_cdb	 CDB bytes. All values that are needed should be set 
-                         on input. 
-    @param i_cdb	 number of CDB bytes. 
-    @param e_direction   direction the transfer is to go.
-    @param i_buf	 Size of buffer
-    @param p_buf	 Buffer for data, both sending and receiving.
-
-    @return 0 if command completed successfully.
-  */
-  driver_return_code_t
-  mmc_run_cmd_len( const CdIo_t *p_cdio, unsigned int i_timeout_ms,
-                   const mmc_cdb_t *p_cdb, unsigned int i_cdb,
-                   cdio_mmc_direction_t e_direction, unsigned int i_buf,
-                   /*in/out*/ void *p_buf );
-
-  /**
-    Set the block size for subsequest read requests, via MMC.
-  */
-  driver_return_code_t mmc_set_blocksize ( const CdIo_t *p_cdio, 
-                                           uint16_t i_blocksize);
-  
-  /**
-    Set the drive speed in CD-ROM speed units.
-
-    @param p_cdio	   CD structure set by cdio_open().
-    @param i_drive_speed   speed in CD-ROM speed units. Note this
-                           not Kbs as would be used in the MMC spec or
-		           in mmc_set_speed(). To convert CD-ROM speed units 
-			   to Kbs, multiply the number by 176 (for raw data)
-			   and by 150 (for filesystem data). On many CD-ROM 
-			   drives, specifying a value too large will result 
-			   in using the fastest speed.
-
-    @return the drive speed if greater than 0. -1 if we had an error. is -2
-    returned if this is not implemented for the current driver.
-
-     @see cdio_set_speed and mmc_set_speed
-  */
-  driver_return_code_t mmc_set_drive_speed( const CdIo_t *p_cdio, 
-                                            int i_drive_speed );
-  
-  /**
-    Set the drive speed in K bytes per second.
-
-    @param p_cdio	 CD structure set by cdio_open().
-    @param i_Kbs_speed   speed in K bytes per second. Note this is 
-                         not in standard CD-ROM speed units, e.g.
-                         1x, 4x, 16x as it is in cdio_set_speed.
-                         To convert CD-ROM speed units to Kbs,
-                         multiply the number by 176 (for raw data)
-                         and by 150 (for filesystem data). 
-                         Also note that ATAPI specs say that a value
-                         less than 176 will result in an error.
-                         On many CD-ROM drives,
-                         specifying a value too large will result in using
-                         the fastest speed.
-
-    @return the drive speed if greater than 0. -1 if we had an error. is -2
-    returned if this is not implemented for the current driver.
-
-    @see cdio_set_speed and mmc_set_drive_speed
-  */
-  driver_return_code_t mmc_set_speed( const CdIo_t *p_cdio, 
-                                      int i_Kbs_speed );
-  
-  /**
-    Load or Unload media using a MMC START STOP command. 
-    
-    @param p_cdio  the CD object to be acted upon.
-    @param b_eject eject if true and close tray if false
-    @param b_immediate wait or don't wait for operation to complete
-    @param power_condition Set CD-ROM to idle/standby/sleep. If nonzero
-    eject/load is ignored, so set to 0 if you want to eject or load.
-    
-    @see mmc_eject_media or mmc_close_tray
-  */
-  driver_return_code_t
-  mmc_start_stop_media(const CdIo_t *p_cdio, bool b_eject, bool b_immediate,
-                       uint8_t power_condition);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-/** The below variables are trickery to force the above enum symbol
-    values to be recorded in debug symbol tables. They are used to
-    allow one to refer to the enumeration value names in the typedefs
-    above in a debugger and debugger expressions
-*/
-extern cdio_mmc_feature_t           debug_cdio_mmc_feature;
-extern cdio_mmc_feature_interface_t debug_cdio_mmc_feature_interface;
-extern cdio_mmc_feature_profile_t   debug_cdio_mmc_feature_profile;
-extern cdio_mmc_get_conf_t          debug_cdio_mmc_get_conf;
-extern cdio_mmc_gpcmd_t             debug_cdio_mmc_gpcmd;
-extern cdio_mmc_read_sub_state_t    debug_cdio_mmc_read_sub_state;
-extern cdio_mmc_read_cd_type_t      debug_cdio_mmc_read_cd_type;
-extern cdio_mmc_readtoc_t           debug_cdio_mmc_readtoc;
-extern cdio_mmc_mode_page_t         debug_cdio_mmc_mode_page;
-  
-#endif /* __MMC_H__ */
-
-/* 
- * Local variables:
- *  c-file-style: "gnu"
- *  tab-width: 8
- *  indent-tabs-mode: nil
- * End:
- */
diff --git a/lib-x86-32/include/cdio/paranoia.h b/lib-x86-32/include/cdio/paranoia.h
deleted file mode 100644
index 02b50002..00000000
--- a/lib-x86-32/include/cdio/paranoia.h
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
-    $Id: paranoia.h,v 1.15 2008/03/25 15:59:09 karl Exp $
-
-    Copyright (C) 2004, 2005, 2006, 2007, 2008 Rocky Bernstein <rocky@gnu.org>
-    Copyright (C) 1998 Monty xiphmont@mit.edu
-  
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-/** \file paranoia.h 
- *
- *  \brief The top-level header for libcdda_paranoia: a device- and OS-
- *  independent library for reading CD-DA with error tolerance and
- *  repair. Applications include this for paranoia access.
- */
-
-#ifndef _CDIO_PARANOIA_H_
-#define _CDIO_PARANOIA_H_
-
-#include <cdio/cdda.h>
-
-/*! Paranoia likes to work with 16-bit numbers rather than
-    (possibly byte-swapped) bytes. So there are this many 
-    16-bit numbers block (frame, or sector) read.
-*/
-#define CD_FRAMEWORDS (CDIO_CD_FRAMESIZE_RAW/2)
-
-/**
-  Flags used in paranoia_modeset. 
-
-  The enumeration type one probably wouldn't really use in a program.
-  It is here instead of defines to give symbolic names that can be
-  helpful in debuggers where wants just to say refer to
-  PARANOIA_MODE_DISABLE and get the correct value.
-*/
-
-typedef enum  {
-  PARANOIA_MODE_DISABLE   =  0x00, /**< No fixups */
-  PARANOIA_MODE_VERIFY    =  0x01, /**< Verify data integrety in overlap area*/
-  PARANOIA_MODE_FRAGMENT  =  0x02, /**< unsupported */
-  PARANOIA_MODE_OVERLAP   =  0x04, /**< Perform overlapped reads */
-  PARANOIA_MODE_SCRATCH   =  0x08, /**< unsupported */
-  PARANOIA_MODE_REPAIR    =  0x10, /**< unsupported */
-  PARANOIA_MODE_NEVERSKIP =  0x20, /**< Do not skip failed reads (retry 
-				      maxretries) */
-  PARANOIA_MODE_FULL      =  0xff, /**< Maximum paranoia - all of the above 
-				        (except disable) */
-} paranoia_mode_t;
-  
-
-/**
-   Flags set in a callback.
-
-  The enumeration type one probably wouldn't really use in a program.
-  It is here instead of defines to give symbolic names that can be
-  helpful in debuggers where wants just to say refer to
-  PARANOIA_CB_READ and get the correct value.
-*/
-typedef enum  {
-  PARANOIA_CB_READ,           /**< Read off adjust ??? */
-  PARANOIA_CB_VERIFY,         /**< Verifying jitter */
-  PARANOIA_CB_FIXUP_EDGE,     /**< Fixed edge jitter */
-  PARANOIA_CB_FIXUP_ATOM,     /**< Fixed atom jitter */
-  PARANOIA_CB_SCRATCH,        /**< Unsupported */
-  PARANOIA_CB_REPAIR,         /**< Unsupported */
-  PARANOIA_CB_SKIP,           /**< Skip exhausted retry */
-  PARANOIA_CB_DRIFT,          /**< Skip exhausted retry */
-  PARANOIA_CB_BACKOFF,        /**< Unsupported */
-  PARANOIA_CB_OVERLAP,        /**< Dynamic overlap adjust */
-  PARANOIA_CB_FIXUP_DROPPED,  /**< Fixed dropped bytes */
-  PARANOIA_CB_FIXUP_DUPED,    /**< Fixed duplicate bytes */
-  PARANOIA_CB_READERR         /**< Hard read error */
-} paranoia_cb_mode_t;
-
-  extern const char *paranoia_cb_mode2str[];
-  
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-  /*! 
-    Get and initialize a new cdrom_paranoia object from cdrom_drive.
-    Run this before calling any of the other paranoia routines below.
-
-    @return new cdrom_paranoia object Call paranoia_free() when you are
-    done with it
-   */
-  extern cdrom_paranoia_t *cdio_paranoia_init(cdrom_drive_t *d);
-  
-  /*!
-    Free any resources associated with p.
-
-    @param p       paranoia object to for which resources are to be freed.
-
-    @see paranoia_init.
-   */
-  extern void cdio_paranoia_free(cdrom_paranoia_t *p);
-
-  /*! 
-    Set the kind of repair you want to on for reading. 
-    The modes are listed above
-
-    @param p             paranoia type
-    @param mode_flags    paranoia mode flags built from values in 
-                         paranoia_mode_t, e.g. 
-		         PARANOIA_MODE_FULL^PARANOIA_MODE_NEVERSKIP
-   */
-  extern void cdio_paranoia_modeset(cdrom_paranoia_t *p, int mode_flags);
-
-  /*!
-    reposition reading offset. 
-
-    @param p       paranoia type
-    @param seek    byte offset to seek to
-    @param whence  like corresponding parameter in libc's lseek, e.g. 
-                   SEEK_SET or SEEK_END.
-  */
-  extern lsn_t cdio_paranoia_seek(cdrom_paranoia_t *p, off_t seek, int whence);
-
-  /*!
-    Reads the next sector of audio data and returns a pointer to a full
-    sector of verified samples. 
-    
-    @param p paranoia object.
-
-    @param callback callback routine which gets called with the status
-    on each read.
-
-    @return the audio data read, CDIO_CD_FRAMESIZE_RAW (2352)
-    bytes. This data is not to be freed by the caller. It will persist
-    only until the next call to paranoia_read() for this p.
-  */
-  extern int16_t *cdio_paranoia_read(cdrom_paranoia_t *p,
-				     void(*callback)(long int, 
-						     paranoia_cb_mode_t));
-
-  /*! The same as cdio_paranoia_read but the number of retries is set.
-    @param p paranoia object.
-
-    @param callback callback routine which gets called with the status
-    on each read.
-
-    @param max_retries number of times to try re-reading a block before
-    failing.
-
-    @return the block of CDIO_FRAMEIZE_RAW bytes (or
-    CDIO_FRAMESIZE_RAW / 2 16-bit integers). Unless byte-swapping has
-    been turned off the 16-bit integers Endian independent order.
-
-    @see cdio_paranoia_read.
-    
-  */
-  extern int16_t *cdio_paranoia_read_limited(cdrom_paranoia_t *p,
-					     void(*callback)(long int, 
-							   paranoia_cb_mode_t),
-					     int max_retries);
-
-
-/*! a temporary hack */
-  extern void cdio_paranoia_overlapset(cdrom_paranoia_t *p,long overlap);
-
-  extern void cdio_paranoia_set_range(cdrom_paranoia_t *p, long int start, 
-				      long int end);
-
-#ifndef DO_NOT_WANT_PARANOIA_COMPATIBILITY
-/** For compatibility with good ol' paranoia */
-#define cdrom_paranoia        cdrom_paranoia_t
-#define paranoia_init         cdio_paranoia_init
-#define paranoia_free         cdio_paranoia_free
-#define paranoia_modeset      cdio_paranoia_modeset
-#define paranoia_seek         cdio_paranoia_seek
-#define paranoia_read         cdio_paranoia_read
-#define paranoia_read_limited cdio_paranoia_read_limited
-#define paranoia_overlapset   cdio_paranoia_overlapset
-#define paranoia_set_range    cdio_paranoia_set_range
-#endif /*DO_NOT_WANT_PARANOIA_COMPATIBILITY*/
-
-#ifdef __cplusplus
-}
-#endif
-
-/** The below variables are trickery to force the above enum symbol
-    values to be recorded in debug symbol tables. They are used to
-    allow one to refer to the enumeration value names in the typedefs
-    above in a debugger and debugger expressions
-*/
-
-extern paranoia_mode_t    debug_paranoia_mode;
-extern paranoia_cb_mode_t debug_paranoia_cb_mode;
-
-#endif /*_CDIO_PARANOIA_H_*/
diff --git a/lib-x86-32/include/cdio/posix.h b/lib-x86-32/include/cdio/posix.h
deleted file mode 100644
index 89e0ad37..00000000
--- a/lib-x86-32/include/cdio/posix.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-    $Id: posix.h,v 1.2 2008/03/25 15:59:09 karl Exp $
-
-    Copyright (C) 2005, 2008 Rocky Bernstein <rocky@gnu.org>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-/*!
- * \file posix.h 
- *
- * \brief various POSIX definitions.
-*/
-
-#ifndef __CDIO_POSIX_H__
-#define __CDIO_POSIX_H__
-
-typedef uint32_t posix_mode_t;
-typedef uint32_t posix_nlink_t;
-typedef uint32_t posix_uid_t;
-typedef uint32_t posix_gid_t;
-typedef uint16_t unicode16_t;
-
-#endif /* __CDIO_POSIX_H__ */
-
-
-/* 
- * Local variables:
- *  c-file-style: "gnu"
- *  tab-width: 8
- *  indent-tabs-mode: nil
- * End:
- */
diff --git a/lib-x86-32/include/cdio/read.h b/lib-x86-32/include/cdio/read.h
deleted file mode 100644
index 81e5148a..00000000
--- a/lib-x86-32/include/cdio/read.h
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
-    $Id: read.h,v 1.15 2008/03/25 15:59:09 karl Exp $
-
-    Copyright (C) 2005, 2006, 2007, 2008 Rocky Bernstein <rocky@gnu.org>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-/** \file read.h 
- *
- *  \brief The top-level header for sector (block, frame)-related
- *  libcdio calls. 
- */
-
-#ifndef __CDIO_READ_H__
-#define __CDIO_READ_H__
-
-#ifndef EXTERNAL_LIBCDIO_CONFIG_H
-#define EXTERNAL_LIBCDIO_CONFIG_H
-/* Need for HAVE_SYS_TYPES_H */
-#include <cdio/cdio_config.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-/* Some systems need this for off_t and ssize. */
-#include <sys/types.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-  /** All the different ways a block/sector can be read. */
-  typedef enum {
-    CDIO_READ_MODE_AUDIO,  /**< CD-DA, audio, Red Book */
-    CDIO_READ_MODE_M1F1,   /**< Mode 1 Form 1 */
-    CDIO_READ_MODE_M1F2,   /**< Mode 1 Form 2 */
-    CDIO_READ_MODE_M2F1,   /**< Mode 2 Form 1 */
-    CDIO_READ_MODE_M2F2    /**< Mode 2 Form 2 */
-  } cdio_read_mode_t;
-  
-  /*!
-    Reposition read offset
-    Similar to (if not the same as) libc's fseek()
-
-    @param p_cdio object which gets adjusted
-    @param offset amount to seek
-    @param whence  like corresponding parameter in libc's fseek, e.g. 
-                   SEEK_SET or SEEK_END.
-    @return (off_t) -1 on error. 
-  */
-
-  off_t cdio_lseek(const CdIo_t *p_cdio, off_t offset, int whence);
-    
-  /*!  Reads into buf the next size bytes.  Similar to (if not the
-    same as) libc's read(). This is a "cooked" read, or one handled by
-    the OS. It probably won't work on audio data. For that use
-    cdio_read_audio_sector(s).
-
-    @param p_cdio object to read from
-    @param p_buf place to read data into. The caller should make sure
-                 this location can store at least i_size bytes.
-    @param i_size number of bytes to read
-
-    @return (ssize_t) -1 on error. 
-  */
-  ssize_t cdio_read(const CdIo_t *p_cdio, void *p_buf, size_t i_size);
-    
-  /*!
-    Read an audio sector
-
-    @param p_cdio object to read from
-    @param p_buf place to read data into. The caller should make sure
-                 this location can store at least CDIO_FRAMESIZE_RAW
-		 bytes.
-    @param i_lsn sector to read
-  */
-  driver_return_code_t cdio_read_audio_sector (const CdIo_t *p_cdio, 
-					       void *p_buf, lsn_t i_lsn);
-
-  /*!
-    Reads audio sectors
-
-    @param p_cdio object to read from
-    @param p_buf place to read data into. The caller should make sure
-                 this location can store at least CDIO_FRAMESIZE_RAW
-		 * i_blocks bytes.
-    @param i_lsn sector to read
-    @param i_blocks number of sectors to read
-  */
-  driver_return_code_t cdio_read_audio_sectors (const CdIo_t *p_cdio, 
-						void *p_buf, lsn_t i_lsn,
-						uint32_t i_blocks);
-
-  /*!
-    Read data sectors
-
-    @param p_cdio object to read from
-    @param p_buf place to read data into.  The caller should make sure
-                 this location can store at least ISO_BLOCKSIZE, 
-		 M2RAW_SECTOR_SIZE, or M2F2_SECTOR_SIZE depending
-		 on the kind of sector getting read. If you don't 
-		 know whether you have a Mode 1/2, Form 1/ Form 2/Formless
-		 sector best to reserve space for the maximum, 
-		 M2RAW_SECTOR_SIZE.
-    @param i_lsn sector to read
-    @param i_blocksize size of block. Should be either CDIO_CD_FRAMESIZE, 
-    M2RAW_SECTOR_SIZE, or M2F2_SECTOR_SIZE. See comment above under p_buf.
-
-    @param i_blocks number of blocks to read
-  */
-  driver_return_code_t cdio_read_data_sectors ( const CdIo_t *p_cdio, 
-						void *p_buf, lsn_t i_lsn,
-						uint16_t i_blocksize,
-						uint32_t i_blocks );
-  /*!
-    Reads a mode 1 sector
-
-    @param p_cdio object to read from
-    @param p_buf place to read data into.
-    @param i_lsn sector to read
-    @param b_form2 true for reading mode 1 form 2 sectors or false for 
-    mode 1 form 1 sectors.
-  */
-  driver_return_code_t cdio_read_mode1_sector (const CdIo_t *p_cdio, 
-					       void *p_buf, lsn_t i_lsn, 
-					       bool b_form2);
-  /*!
-    Reads mode 1 sectors
-
-    @param p_cdio object to read from
-    @param p_buf place to read data into
-    @param i_lsn sector to read
-    @param b_form2 true for reading mode 1 form 2 sectors or false for 
-    mode 1 form 1 sectors.
-    @param i_blocks number of sectors to read
-  */
-  driver_return_code_t cdio_read_mode1_sectors (const CdIo_t *p_cdio, 
-						void *p_buf, lsn_t i_lsn, 
-						bool b_form2, 
-						uint32_t i_blocks);
-  /*!
-    Reads a mode 2 sector
-
-    @param p_cdio object to read from
-    @param p_buf place to read data into. The caller should make sure
-                 this location can store at least 
-		 M2RAW_SECTOR_SIZE (for form 1) or CDIO_CD_FRAMESIZE (for 
-		 form 2) bytes.
-    @param i_lsn sector to read
-    @param b_form2 true for reading mode 2 form 2 sectors or false for 
-    mode 2 form 1 sectors.
-
-    @return 0 if no error, nonzero otherwise.
-  */
-  driver_return_code_t cdio_read_mode2_sector (const CdIo_t *p_cdio, 
-					       void *p_buf, lsn_t i_lsn, 
-					       bool b_form2);
-  
-  /** The special case of reading a single block is a common one so we
-      provide a routine for that as a convenience.
-  */
-  driver_return_code_t cdio_read_sector(const CdIo_t *p_cdio, void *p_buf, 
-					lsn_t i_lsn, 
-					cdio_read_mode_t read_mode);
-  /*!
-    Reads mode 2 sectors
-
-    @param p_cdio object to read from
-    @param p_buf place to read data into. The caller should make sure
-                 this location can store at least 
-		 M2RAW_SECTOR_SIZE (for form 1) or CDIO_CD_FRAMESIZE (for 
-		 form 2) * i_blocks bytes.
-    @param i_lsn sector to read
-    @param b_form2 true for reading mode2 form 2 sectors or false for 
-           mode 2  form 1 sectors.
-    @param i_blocks number of sectors to read
-
-    @return 0 if no error, nonzero otherwise.
-  */
-  driver_return_code_t cdio_read_mode2_sectors (const CdIo_t *p_cdio, 
-						void *p_buf, lsn_t i_lsn, 
-						bool b_form2, 
-						uint32_t i_blocks);
-  
-  /*!
-    Reads a number of sectors (AKA blocks).
-
-    @param p_cdio cdio object
-    @param p_buf place to read data into. The caller should make sure
-    this location is large enough. See below for size information.
-    @param read_mode the kind of "mode" to use in reading.
-    @param i_lsn sector to read
-    @param i_blocks number of sectors to read
-    @return DRIVER_OP_SUCCESS (0) if no error, other (negative) enumerations
-    are returned on error.
-
-    If read_mode is CDIO_MODE_AUDIO,
-      *p_buf should hold at least CDIO_FRAMESIZE_RAW * i_blocks bytes.
-
-    If read_mode is CDIO_MODE_DATA,
-      *p_buf should hold at least i_blocks times either ISO_BLOCKSIZE, 
-      M1RAW_SECTOR_SIZE or M2F2_SECTOR_SIZE depending on the kind of 
-      sector getting read. If you don't know whether you have a Mode 1/2, 
-    Form 1/ Form 2/Formless sector best to reserve space for the maximum
-    which is M2RAW_SECTOR_SIZE.
-
-    If read_mode is CDIO_MODE_M2F1,
-    *p_buf should hold at least M2RAW_SECTOR_SIZE * i_blocks bytes.
-    
-    If read_mode is CDIO_MODE_M2F2,
-    *p_buf should hold at least CDIO_CD_FRAMESIZE * i_blocks bytes.
-    
-  */
-  driver_return_code_t cdio_read_sectors(const CdIo_t *p_cdio, void *p_buf, 
-					 lsn_t i_lsn, 
-					 cdio_read_mode_t read_mode,
-					 uint32_t i_blocks);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __CDIO_TRACK_H__ */
diff --git a/lib-x86-32/include/cdio/rock.h b/lib-x86-32/include/cdio/rock.h
deleted file mode 100644
index 57003276..00000000
--- a/lib-x86-32/include/cdio/rock.h
+++ /dev/null
@@ -1,396 +0,0 @@
-/*
-    $Id: rock.h,v 1.15 2008/03/25 15:59:09 karl Exp $
-
-    Copyright (C) 2005, 2006 2008 Rocky Bernstein <rocky@panix.com>
-
-    See also rock.c by Eric Youngdale (1993) from GNU/Linux 
-    This is Copyright 1993 Yggdrasil Computing, Incorporated
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-/*!
-   \file rock.h 
-   \brief Things related to the Rock Ridge Interchange Protocol (RRIP)
-
-   Applications will probably not include this directly but via 
-   the iso9660.h header.
-*/
-
-
-#ifndef __CDIO_ROCK_H__
-#define __CDIO_ROCK_H__
-
-#include <cdio/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* MSYS 1.0.10 with MinGW 3.4.2 (and perhaps others) don't have
-   S_ISSOCK() or S_ISLNK() macros, so we'll roll our own. */
-#if !defined(HAVE_S_ISSOCK) && !defined(S_ISSOCK)
-#define S_ISSOCK(st_mode) ((((st_mode)) & 0170000) == (0140000))
-#endif
-
-#if !defined(HAVE_S_ISLNK) && !defined(S_ISLNK)
-#define S_ISLNK(st_mode) ((((st_mode)) & 0170000) == (0010000))
-#endif
-
-/*! An enumeration for some of the ISO_ROCK_* \#defines below. This isn't
-  really an enumeration one would really use in a program it is to
-  be helpful in debuggers where wants just to refer to the ISO_ROCK_*
-  names and get something.
-*/
-extern enum iso_rock_enums {
-  ISO_ROCK_IRUSR  = 000400,   /**< read permission (owner) */
-  ISO_ROCK_IWUSR  = 000200,   /**< write permission (owner) */
-  ISO_ROCK_IXUSR  = 000100,   /**< execute permission (owner) */
-  ISO_ROCK_IRGRP  = 000040,   /**< read permission (group) */
-  ISO_ROCK_IWGRP  = 000020,   /**< write permission (group) */
-  ISO_ROCK_IXGRP  = 000010,   /**< execute permission (group) */
-  ISO_ROCK_IROTH  = 000004,   /**< read permission (other) */
-  ISO_ROCK_IWOTH  = 000002,   /**< write permission (other) */
-  ISO_ROCK_IXOTH  = 000001,   /**< execute permission (other) */
-
-  ISO_ROCK_ISUID  = 004000,   /**< set user ID on execution */
-  ISO_ROCK_ISGID  = 002000,   /**< set group ID on execution */
-  ISO_ROCK_ISVTX  = 001000,   /**< save swapped text even after use */
-
-  ISO_ROCK_ISSOCK = 0140000,  /**< socket */
-  ISO_ROCK_ISLNK  = 0120000,  /**< symbolic link */
-  ISO_ROCK_ISREG  = 0100000,  /**< regular */
-  ISO_ROCK_ISBLK  = 060000,   /**< block special */
-  ISO_ROCK_ISCHR  = 020000,   /**< character special */
-  ISO_ROCK_ISDIR  = 040000,   /**< directory */
-  ISO_ROCK_ISFIFO = 010000    /**< pipe or FIFO */
-} iso_rock_enums;
-
-#define ISO_ROCK_IRUSR    000400  /** read permission (owner) */
-#define ISO_ROCK_IWUSR    000200  /** write permission (owner) */
-#define ISO_ROCK_IXUSR    000100  /** execute permission (owner) */
-#define ISO_ROCK_IRGRP    000040  /** read permission (group) */
-#define ISO_ROCK_IWGRP    000020  /** write permission (group) */
-#define ISO_ROCK_IXGRP    000010  /** execute permission (group) */
-#define ISO_ROCK_IROTH    000004  /** read permission (other) */
-#define ISO_ROCK_IWOTH    000002  /** write permission (other) */
-#define ISO_ROCK_IXOTH    000001  /** execute permission (other) */
-
-#define ISO_ROCK_ISUID    004000  /** set user ID on execution */
-#define ISO_ROCK_ISGID    002000  /** set group ID on execution */
-#define ISO_ROCK_ISVTX    001000  /** save swapped text even after use */
-
-#define ISO_ROCK_ISSOCK  0140000  /** socket */
-#define ISO_ROCK_ISLNK   0120000  /** symbolic link */
-#define ISO_ROCK_ISREG   0100000  /** regular */
-#define ISO_ROCK_ISBLK    060000  /** block special */
-#define ISO_ROCK_ISCHR    020000  /** character special */
-#define ISO_ROCK_ISDIR    040000  /** directory */
-#define ISO_ROCK_ISFIFO   010000  /** pipe or FIFO */
-
-/** Enforced file locking (shared w/set group ID) */
-#define ISO_ROCK_ENFMT ISO_ROCK_ISGID
-
-PRAGMA_BEGIN_PACKED
-
-/*! The next two structs are used by the system-use-sharing protocol
-   (SUSP), in which the Rock Ridge extensions are embedded.  It is
-   quite possible that other extensions are present on the disk, and
-   this is fine as long as they all use SUSP. */
-
-/*! system-use-sharing protocol */
-typedef struct iso_su_sp_s{
-  unsigned char magic[2];
-  uint8_t       skip;
-} GNUC_PACKED iso_su_sp_t;
-
-/*! system-use extension record */
-typedef struct iso_su_er_s {
-  iso711_t      len_id;  /**< Identifier length. Value 10?. */
-  unsigned char len_des;
-  unsigned char len_src;
-  iso711_t      ext_ver; /**< Extension version. Value 1? */
-  char data[EMPTY_ARRAY_SIZE];
-} GNUC_PACKED iso_su_er_t;
-
-typedef struct iso_su_ce_s {
-  char extent[8];
-  char offset[8];
-  char size[8];
-} iso_su_ce_t;
-
-/*! POSIX file attributes, PX. See Rock Ridge Section 4.1.2 */
-typedef struct iso_rock_px_s {
-  iso733_t st_mode;       /*! file mode permissions; same as st_mode 
-                            of POSIX:5.6.1 */
-  iso733_t st_nlinks;     /*! number of links to file; same as st_nlinks
-                            of POSIX:5.6.1 */
-  iso733_t st_uid;        /*! user id owner of file; same as st_uid
-                            of POSIX:5.6.1 */
-  iso733_t st_gid;        /*! group id of file; same as st_gid of 
-                            of POSIX:5.6.1 */
-} GNUC_PACKED iso_rock_px_t ;
-
-/*! POSIX device number, PN. A PN is mandatory if the file type
-  recorded in the "PX" File Mode field for a Directory Record
-  indicates a character or block device (ISO_ROCK_ISCHR |
-  ISO_ROCK_ISBLK).  This entry is ignored for other (non-Direcotry)
-  file types. No more than one "PN" is recorded in the System Use Area
-  of a Directory Record.
-
-  See Rock Ridge Section 4.1.2 */
-typedef struct iso_rock_pn_s {
-  iso733_t dev_high;     /**< high-order 32 bits of the 64 bit device number.
-                            7.2.3 encoded */
-  iso733_t dev_low;      /**< low-order 32 bits of the 64 bit device number.
-                            7.2.3 encoded */
-} GNUC_PACKED iso_rock_pn_t ;
-
-/*! These are the bits and their meanings for flags in the SL structure. */
-typedef enum {
-  ISO_ROCK_SL_CONTINUE = 1,
-  ISO_ROCK_SL_CURRENT  = 2,
-  ISO_ROCK_SL_PARENT   = 4,
-  ISO_ROCK_SL_ROOT     = 8
-} iso_rock_sl_flag_t;
-
-#define	ISO_ROCK_SL_CONTINUE 1
-#define	ISO_ROCK_SL_CURRENT  2
-#define	ISO_ROCK_SL_PARENT   4
-#define	ISO_ROCK_SL_ROOT     8
-
-typedef struct iso_rock_sl_part_s {
-  uint8_t flags;
-  uint8_t len;
-  char text[EMPTY_ARRAY_SIZE];
-} GNUC_PACKED iso_rock_sl_part_t ;
-
-/*! Symbolic link. See Rock Ridge Section 4.1.3 */
-typedef struct iso_rock_sl_s {
-  unsigned char flags;
-  iso_rock_sl_part_t link;
-} GNUC_PACKED iso_rock_sl_t ;
-
-/*! Alternate name. See Rock Ridge Section 4.1.4 */
-
-/*! These are the bits and their meanings for flags in the NM structure. */
-typedef enum {
-  ISO_ROCK_NM_CONTINUE = 1,
-  ISO_ROCK_NM_CURRENT  = 2,
-  ISO_ROCK_NM_PARENT   = 4,
-} iso_rock_nm_flag_t;
-
-#define	ISO_ROCK_NM_CONTINUE 1
-#define	ISO_ROCK_NM_CURRENT  2
-#define	ISO_ROCK_NM_PARENT   4
-
-
-typedef struct iso_rock_nm_s {
-  unsigned char flags;
-  char name[EMPTY_ARRAY_SIZE];
-} GNUC_PACKED iso_rock_nm_t ;
-
-/*! Child link. See Section 4.1.5.1 */
-typedef struct iso_rock_cl_s {
-  char location[1];
-} GNUC_PACKED iso_rock_cl_t ;
-
-/*! Parent link. See Section 4.1.5.2 */
-typedef struct iso_rock_pl_s {
-  char location[1];
-} GNUC_PACKED iso_rock_pl_t ;
-
-/*! These are the bits and their meanings for flags in the TF structure. */
-typedef enum {
-  ISO_ROCK_TF_CREATE     =  1,
-  ISO_ROCK_TF_MODIFY     =  2,
-  ISO_ROCK_TF_ACCESS     =  4,
-  ISO_ROCK_TF_ATTRIBUTES =  8,
-  ISO_ROCK_TF_BACKUP     =  16,
-  ISO_ROCK_TF_EXPIRATION =  32,
-  ISO_ROCK_TF_EFFECTIVE  =  64,
-  ISO_ROCK_TF_LONG_FORM  = 128
-} iso_rock_tf_flag_t;
-
-/* These are the bits and their meanings for flags in the TF structure. */
-#define ISO_ROCK_TF_CREATE      1
-#define ISO_ROCK_TF_MODIFY      2
-#define ISO_ROCK_TF_ACCESS      4
-#define ISO_ROCK_TF_ATTRIBUTES  8
-#define ISO_ROCK_TF_BACKUP     16
-#define ISO_ROCK_TF_EXPIRATION 32
-#define ISO_ROCK_TF_EFFECTIVE  64
-#define ISO_ROCK_TF_LONG_FORM 128
-
-/*! Time stamp(s) for a file. See Rock Ridge Section 4.1.6 */
-typedef struct iso_rock_tf_s {
-  uint8_t flags; /**< See ISO_ROCK_TF_* bits above. */
-  uint8_t time_bytes[EMPTY_ARRAY_SIZE]; /**< A homogenious array of
-                                           iso9660_ltime_t or
-                                           iso9660_dtime_t entries
-                                           depending on flags &
-                                           ISO_ROCK_TF_LONG_FORM. Lacking
-                                           a better method, we store
-                                           this as an array of bytes
-                                           and a cast to the
-                                           appropriate type will have
-                                           to be made before
-                                           extraction.  */
-} GNUC_PACKED iso_rock_tf_t ;
-
-/*! File data in sparse format. See Rock Ridge Section 4.1.7 */
-typedef struct iso_rock_sf_s {
-  iso733_t virtual_size_high; /**< high-order 32 bits of virtual size */
-  iso733_t virtual_size_low;  /**< low-order 32 bits of virtual size */
-  uint8_t   table_depth;
-} GNUC_PACKED iso_rock_sf_t ;
-
-typedef struct iso_extension_record_s {
-  char signature[2];   /**< signature word; either 'SP', 'CE', 'ER', 'RR',
-                          'PX', 'PN', 'SL', 'NM', 'CL', 'PL', 'TF', or 
-                          'ZF' */
-  iso711_t len;        /**< length of system-user area - 44 for PX
-                          20 for PN, 5+strlen(text) for SL, 21 for 
-                          SF, etc. */
-  iso711_t version;    /**< version number - value 1 */
-  union {
-    iso_su_sp_t    SP;  /**< system-use-sharing protocol - not
-                          strictly part of Rock Ridge */
-    iso_su_er_t    ER;  /**< system-use extension packet - not
-                           strictly part of Rock Ridge */
-    iso_su_ce_t    CE;  /**< system-use -  strictly part of Rock Ridge */
-    iso_rock_px_t  PX;  /**< Rock Ridge POSIX file attributes */
-    iso_rock_pn_t  PN;  /**< Rock Ridge POSIX device number */
-    iso_rock_sl_t  SL;  /**< Rock Ridge symbolic link */
-    iso_rock_nm_t  NM;  /**< Rock Ridge alternate name */
-    iso_rock_cl_t  CL;  /**< Rock Ridge child link */
-    iso_rock_pl_t  PL;  /**< Rock Ridge parent link */
-    iso_rock_tf_t  TF;  /**< Rock Ridge timestamp(s) for a file */
-  } u;
-} GNUC_PACKED iso_extension_record_t;
-
-typedef struct iso_rock_time_s {
-  bool          b_used;     /**< If true, field has been set and  is valid. 
-                               Otherwise remaning fields are meaningless. */
-  bool          b_longdate;  /**< If true date format is a iso9660_ltime_t. 
-                               Otherwise date is iso9660_dtime_t */
-  union 
-  {
-    iso9660_ltime_t ltime;
-    iso9660_dtime_t dtime;
-  } t;
-} GNUC_PACKED iso_rock_time_t;
-
-typedef struct iso_rock_statbuf_s {
-  bool_3way_t   b3_rock;              /**< has Rock Ridge extension. 
-                                         If "yep", then the fields
-                                         are used.
-                                      */
-  posix_mode_t  st_mode;              /**< protection */
-  posix_nlink_t st_nlinks;            /**< number of hard links */
-  posix_uid_t   st_uid;               /**< user ID of owner */
-  posix_gid_t   st_gid;               /**< group ID of owner */
-  uint8_t       s_rock_offset;
-  int           i_symlink;            /**< size of psz_symlink */
-  int           i_symlink_max;        /**< max allocated to psz_symlink */
-  char         *psz_symlink;          /**< if symbolic link, name
-                                         of pointed to file.  */
-  iso_rock_time_t create;             /**< create time See ISO 9660:9.5.4. */
-  iso_rock_time_t modify;             /**< time of last modification
-                                         ISO 9660:9.5.5. st_mtime field of 
-                                         POSIX:5.6.1. */
-  iso_rock_time_t access;             /**< time of last file access st_atime 
-                                         field of POSIX:5.6.1. */
-  iso_rock_time_t attributes;         /**< time of last attribute change.
-                                         st_ctime field of POSIX:5.6.1. */
-  iso_rock_time_t backup;             /**< time of last backup. */
-  iso_rock_time_t expiration;         /**< time of expiration; See ISO 
-                                         9660:9.5.6. */
-  iso_rock_time_t effective;          /**< Effective time; See ISO 9660:9.5.7.
-                                       */
-  uint32_t i_rdev;                    /**< the upper 16-bits is major device 
-                                         number, the lower 16-bits is the
-                                         minor device number */
-
-} iso_rock_statbuf_t;
-  
-PRAGMA_END_PACKED
-
-/*! return length of name field; 0: not found, -1: to be ignored */
-int get_rock_ridge_filename(iso9660_dir_t * de, /*out*/ char * retname, 
-                            /*out*/ iso9660_stat_t *p_stat);
-
-  int parse_rock_ridge_stat(iso9660_dir_t *de, /*out*/ iso9660_stat_t *p_stat);
-
-  /*!
-    Returns POSIX mode bitstring for a given file.
-  */
-  mode_t 
-  iso9660_get_posix_filemode_from_rock(const iso_rock_statbuf_t *rr);
-
-/*!
-  Returns a string which interpreting the POSIX mode st_mode. 
-  For example:
-  \verbatim
-  drwxrws---
-  -rw---Sr--
-  lrwxrwxrwx
-  \endverbatim
-  
-  A description of the characters in the string follows
-  The 1st character is either "d" if the entry is a directory, "l" is
-  a symbolic link or "-" if neither.
-  
-  The 2nd to 4th characters refer to permissions for a user while the
-  the 5th to 7th characters refer to permissions for a group while, and 
-  the 8th to 10h characters refer to permissions for everyone. 
-  
-  In each of these triplets the first character (2, 5, 8) is "r" if
-  the entry is allowed to be read.
-
-  The second character of a triplet (3, 6, 9) is "w" if the entry is
-  allowed to be written.
-
-  The third character of a triplet (4, 7, 10) is "x" if the entry is
-  executable but not user (for character 4) or group (for characters
-  6) settable and "s" if the item has the corresponding user/group set.
-
-  For a directory having an executable property on ("x" or "s") means
-  the directory is allowed to be listed or "searched". If the execute
-  property is not allowed for a group or user but the corresponding
-  group/user is set "S" indicates this. If none of these properties
-  holds the "-" indicates this.
-*/
-const char *iso9660_get_rock_attr_str(posix_mode_t st_mode);
-
-/** These variables are not used, but are defined to facilatate debugging
-    by letting us use enumerations values (which also correspond to 
-    \#define's inside a debugged program.
- */
-extern iso_rock_nm_flag_t iso_rock_nm_flag;
-extern iso_rock_sl_flag_t iso_rock_sl_flag;
-extern iso_rock_tf_flag_t iso_rock_tf_flag;
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __ISO_ROCK_H__ */
-
-/* 
- * Local variables:
- *  c-file-style: "gnu"
- *  tab-width: 8
- *  indent-tabs-mode: nil
- * End:
- */
diff --git a/lib-x86-32/include/cdio/sector.h b/lib-x86-32/include/cdio/sector.h
deleted file mode 100644
index 6e308338..00000000
--- a/lib-x86-32/include/cdio/sector.h
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
-    $Id: sector.h,v 1.38 2008/03/25 15:59:09 karl Exp $
-
-    Copyright (C) 2003, 2004, 2005, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
-    Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-/*!
-   \file sector.h 
-   \brief Things related to CD-ROM layout: tracks, sector sizes, MSFs, LBAs.
-
-  A CD-ROM physical sector size is 2048, 2052, 2056, 2324, 2332, 2336,
-  2340, or 2352 bytes long.
-
-  Sector types of the standard CD-ROM data formats:
-
-\verbatim 
-  format   sector type               user data size (bytes)
-  -----------------------------------------------------------------------------
-    1     (Red Book)    CD-DA          2352    (CDIO_CD_FRAMESIZE_RAW)
-    2     (Yellow Book) Mode1 Form1    2048    (CDIO_CD_FRAMESIZE)
-    3     (Yellow Book) Mode1 Form2    2336    (M2RAW_SECTOR_SIZE)
-    4     (Green Book)  Mode2 Form1    2048    (CDIO_CD_FRAMESIZE)
-    5     (Green Book)  Mode2 Form2    2328    (2324+4 spare bytes)
- 
- 
-        The layout of the standard CD-ROM data formats:
-  -----------------------------------------------------------------------------
-  - audio (red):                  | audio_sample_bytes |
-                                  |        2352        |
- 
-  - data (yellow, mode1):         | sync - head - data - EDC - zero - ECC |
-                                  |  12  -   4  - 2048 -  4  -   8  - 276 |
- 
-  - data (yellow, mode2):         | sync - head - data |
-                                 |  12  -   4  - 2336 |
- 
-  - XA data (green, mode2 form1): | sync - head - sub - data - EDC - ECC |
-                                  |  12  -   4  -  8  - 2048 -  4  - 276 |
- 
-  - XA data (green, mode2 form2): | sync - head - sub - data - Spare |
-                                  |  12  -   4  -  8  - 2324 -  4    |
-\endverbatim
- 
-
-*/
-
-#ifndef _CDIO_SECTOR_H_
-#define _CDIO_SECTOR_H_
-
-#ifdef __cplusplus
-    extern "C" {
-#endif
-
-#include <cdio/types.h>
-
-      /*! Information that can be obtained through a Read Subchannel
-        command.
-      */
-#define CDIO_SUBCHANNEL_SUBQ_DATA		0
-#define CDIO_SUBCHANNEL_CURRENT_POSITION	1
-#define CDIO_SUBCHANNEL_MEDIA_CATALOG	        2
-#define CDIO_SUBCHANNEL_TRACK_ISRC		3
-      
-      /*! track flags
-       * Q Sub-channel Control Field (4.2.3.3)
-       */
-      typedef enum {
-	NONE = 			0x00,	/* no flags set */
-	PRE_EMPHASIS =		0x01,	/* audio track recorded with pre-emphasis */
-	COPY_PERMITTED =	0x02,	/* digital copy permitted */
-	DATA =			0x04,	/* data track */
-	FOUR_CHANNEL_AUDIO =	0x08,	/* 4 audio channels */
-	SCMS =			0x10	/* SCMS (5.29.2.7) */
-      } flag_t;
-      
-#define CDIO_PREGAP_SECTORS  150
-#define CDIO_POSTGAP_SECTORS 150
-      
-      /*! An enumeration for some of the CDIO_CD \#defines below. This isn't
-        really an enumeration one would really use in a program it is to
-        be helpful in debuggers where wants just to refer to the CDIO_CD_
-        names and get something.
-      */
-      extern enum cdio_cd_enums {
-        CDIO_CD_MINS =              74,   /**< max. minutes per CD, not really
-                                             a limit */
-        CDIO_CD_SECS_PER_MIN =      60,   /**< seconds per minute */
-        CDIO_CD_FRAMES_PER_SEC =    75,   /**< frames per second */
-        CDIO_CD_SYNC_SIZE =         12,   /**< 12 sync bytes per raw data 
-                                             frame */
-        CDIO_CD_CHUNK_SIZE =        24,   /**< lowest-level "data bytes 
-                                             piece" */
-        CDIO_CD_NUM_OF_CHUNKS =     98,   /**< chunks per frame */
-        CDIO_CD_FRAMESIZE_SUB =     96,   /**< subchannel data "frame" size */
-        CDIO_CD_HEADER_SIZE =        4,   /**< header (address) bytes per raw
-                                             frame */
-        CDIO_CD_SUBHEADER_SIZE =     8,   /**< subheader bytes per raw XA data 
-                                             frame */
-        CDIO_CD_ECC_SIZE =         276,   /**< bytes ECC per most raw data 
-                                             frame types */
-        CDIO_CD_FRAMESIZE =       2048,   /**< bytes per frame, "cooked" 
-                                             mode */
-        CDIO_CD_FRAMESIZE_RAW =   2352,   /**< bytes per frame, "raw" mode */
-        CDIO_CD_FRAMESIZE_RAWER = 2646,   /**< The maximum possible 
-                                             returned  */
-        CDIO_CD_FRAMESIZE_RAW1  = 2340,
-        CDIO_CD_FRAMESIZE_RAW0  = 2336,
-        CDIO_CD_MAX_SESSIONS =      99, 
-        CDIO_CD_MIN_SESSION_NO =     1,   /**<, Smallest CD session number */
-        CDIO_CD_MAX_LSN =       450150,   /**< Largest LSN in a CD */
-        CDIO_CD_MIN_LSN      = -450150,   /**< Smallest LSN in a CD */
-      } cdio_cd_enums;
-        
-      /*!
-        Some generally useful CD-ROM information -- mostly based on the above.
-        This is from linux.h - not to slight other OS's. This was the first
-        place I came across such useful stuff.
-      */
-#define CDIO_CD_MINS              74   /**< max. minutes per CD, not really
-                                          a limit */
-#define CDIO_CD_SECS_PER_MIN      60   /**< seconds per minute */
-#define CDIO_CD_FRAMES_PER_SEC    75   /**< frames per second */
-#define CDIO_CD_SYNC_SIZE         12   /**< 12 sync bytes per raw data frame */
-#define CDIO_CD_CHUNK_SIZE        24   /**< lowest-level "data bytes piece" */
-#define CDIO_CD_NUM_OF_CHUNKS     98   /**< chunks per frame */
-#define CDIO_CD_FRAMESIZE_SUB     96   /**< subchannel data "frame" size */
-#define CDIO_CD_HEADER_SIZE        4   /**< header (address) bytes per raw
-                                          data frame */
-#define CDIO_CD_SUBHEADER_SIZE     8   /**< subheader bytes per raw XA data 
-                                            frame */
-#define CDIO_CD_EDC_SIZE           4   /**< bytes EDC per most raw data
-                                          frame types */
-#define CDIO_CD_M1F1_ZERO_SIZE     8   /**< bytes zero per yellow book mode
-                                          1 frame */
-#define CDIO_CD_ECC_SIZE         276   /**< bytes ECC per most raw data frame 
-                                          types */
-#define CDIO_CD_FRAMESIZE       2048   /**< bytes per frame, "cooked" mode */
-#define CDIO_CD_FRAMESIZE_RAW   2352   /**< bytes per frame, "raw" mode */
-#define CDIO_CD_FRAMESIZE_RAWER 2646   /**< The maximum possible returned 
-                                          bytes */ 
-#define CDIO_CD_FRAMESIZE_RAW1 (CDIO_CD_CD_FRAMESIZE_RAW-CDIO_CD_SYNC_SIZE) /*2340*/
-#define CDIO_CD_FRAMESIZE_RAW0 (CDIO_CD_FRAMESIZE_RAW-CDIO_CD_SYNC_SIZE-CDIO_CD_HEADER_SIZE) /*2336*/
-      
-      /*! "before data" part of raw XA (green, mode2) frame */
-#define CDIO_CD_XA_HEADER (CDIO_CD_HEADER_SIZE+CDIO_CD_SUBHEADER_SIZE) 
-      
-      /*! "after data" part of raw XA (green, mode2 form1) frame */
-#define CDIO_CD_XA_TAIL   (CDIO_CD_EDC_SIZE+CDIO_CD_ECC_SIZE) 
-      
-      /*! "before data" sync bytes + header of XA (green, mode2) frame */
-#define CDIO_CD_XA_SYNC_HEADER   (CDIO_CD_SYNC_SIZE+CDIO_CD_XA_HEADER) 
-      
-      /*! String of bytes used to identify the beginning of a Mode 1 or
-          Mode 2 sector. */
-      extern const uint8_t CDIO_SECTOR_SYNC_HEADER[CDIO_CD_SYNC_SIZE];
-      /**<  
-        {0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0};
-      */
-      
-      /*! An enumeration for some of the M2*_SECTOR_SIZE \#defines
-        below. This isn't really an enumeration one would really use in a
-        program it is to be helpful in debuggers where wants just to refer
-        to the M2*_SECTOR_SIZE names and get something.
-      */
-      extern enum m2_sector_enums {
-        M2F2_SECTOR_SIZE  = 2324,
-        M2SUB_SECTOR_SIZE = 2332,
-        M2RAW_SECTOR_SIZE = 2336
-      } m2_sector_enums;
-      
-#define M2F2_SECTOR_SIZE    2324
-#define M2SUB_SECTOR_SIZE   2332
-#define M2RAW_SECTOR_SIZE   2336
-      
-      /*! Largest CD session number */
-#define CDIO_CD_MAX_SESSIONS    99 
-      /*! Smallest CD session number */
-#define CDIO_CD_MIN_SESSION_NO   1
-      
-      /*! Largest LSN in a CD */
-#define CDIO_CD_MAX_LSN   450150
-      /*! Smallest LSN in a CD */
-#define CDIO_CD_MIN_LSN  -450150
-      
-      
-#define CDIO_CD_FRAMES_PER_MIN                          \
-      (CDIO_CD_FRAMES_PER_SEC*CDIO_CD_SECS_PER_MIN)
-      
-#define CDIO_CD_74MIN_SECTORS (UINT32_C(74)*CDIO_CD_FRAMES_PER_MIN)
-#define CDIO_CD_80MIN_SECTORS (UINT32_C(80)*CDIO_CD_FRAMES_PER_MIN)
-#define CDIO_CD_90MIN_SECTORS (UINT32_C(90)*CDIO_CD_FRAMES_PER_MIN)
-      
-#define CDIO_CD_MAX_SECTORS                                     \
-      (UINT32_C(100)*CDIO_CD_FRAMES_PER_MIN-CDIO_PREGAP_SECTORS)
-      
-#define msf_t_SIZEOF 3
-      
-      /*! 
-        Convert an LBA into a string representation of the MSF.
-        \warning cdio_lba_to_msf_str returns new allocated string */
-      char *cdio_lba_to_msf_str (lba_t i_lba);
-      
-      /*! 
-        Convert an MSF into a string representation of the MSF.
-        \warning cdio_msf_to_msf_str returns new allocated string */
-      char *cdio_msf_to_str (const msf_t *p_msf);
-      
-      /*! 
-        Convert an LBA into the corresponding LSN.
-      */
-      lba_t cdio_lba_to_lsn (lba_t i_lba);
-      
-      /*! 
-        Convert an LBA into the corresponding MSF.
-      */
-      void  cdio_lba_to_msf(lba_t i_lba, msf_t *p_msf);
-      
-      /*! 
-        Convert an LSN into the corresponding LBA.
-        CDIO_INVALID_LBA is returned if there is an error.
-      */
-      lba_t cdio_lsn_to_lba (lsn_t i_lsn);
-      
-      /*! 
-        Convert an LSN into the corresponding MSF.
-      */
-      void  cdio_lsn_to_msf (lsn_t i_lsn, msf_t *p_msf);
-      
-      /*! 
-        Convert a MSF into the corresponding LBA.
-        CDIO_INVALID_LBA is returned if there is an error.
-      */
-      lba_t cdio_msf_to_lba (const msf_t *p_msf);
-      
-      /*! 
-        Convert a MSF into the corresponding LSN.
-        CDIO_INVALID_LSN is returned if there is an error.
-      */
-      lsn_t cdio_msf_to_lsn (const msf_t *p_msf);
-      
-      /*!  
-        Convert a MSF - broken out as 3 integer components into the
-        corresponding LBA.  
-        CDIO_INVALID_LBA is returned if there is an error.
-      */
-      lba_t cdio_msf3_to_lba (unsigned int minutes, unsigned int seconds, 
-                              unsigned int frames);
-      
-      /*! 
-        Convert a string of the form MM:SS:FF into the corresponding LBA.
-        CDIO_INVALID_LBA is returned if there is an error.
-      */
-      lba_t cdio_mmssff_to_lba (const char *psz_mmssff);
-      
-#ifdef __cplusplus
-    }
-#endif
-
-#ifndef DO_NOT_WANT_PARANOIA_COMPATIBILITY
-/** For compatibility with good ol' paranoia */
-#define CD_FRAMESIZE_RAW        CDIO_CD_FRAMESIZE_RAW
-#endif /*DO_NOT_WANT_PARANOIA_COMPATIBILITY*/
-
-#endif /* _CDIO_SECTOR_H_ */
-
-
-/* 
- * Local variables:
- *  c-file-style: "gnu"
- *  tab-width: 8
- *  indent-tabs-mode: nil
- * End:
- */
diff --git a/lib-x86-32/include/cdio/track.h b/lib-x86-32/include/cdio/track.h
deleted file mode 100644
index 9deb942b..00000000
--- a/lib-x86-32/include/cdio/track.h
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
-    $Id: track.h,v 1.14 2008/03/25 15:59:09 karl Exp $
-
-    Copyright (C) 2005, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-/** \file track.h 
- *  \brief  The top-level header for track-related libcdio calls.
- */
-#ifndef __CDIO_TRACK_H__
-#define __CDIO_TRACK_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-  /*! Printable tags for track_format_t enumeration.  */
-  extern const char *track_format2str[6];
-  
-  typedef enum  {
-    TRACK_FORMAT_AUDIO,   /**< Audio track, e.g. CD-DA */
-    TRACK_FORMAT_CDI,     /**< CD-i. How this is different from DATA below? */
-    TRACK_FORMAT_XA,      /**< Mode2 of some sort */
-    TRACK_FORMAT_DATA,    /**< Mode1 of some sort */
-    TRACK_FORMAT_PSX,     /**< Playstation CD. Like audio but only 2336 bytes
-			   *   of user data.
-			   */
-    TRACK_FORMAT_ERROR    /**< Dunno what is, or some other error. */
-  } track_format_t;
-
-  typedef enum {
-    CDIO_TRACK_FLAG_FALSE, 
-    CDIO_TRACK_FLAG_TRUE, 
-    CDIO_TRACK_FLAG_ERROR, 
-    CDIO_TRACK_FLAG_UNKNOWN
-  } track_flag_t;
-
-  /*! \brief Structure containing attributes associated with a track */
-  typedef struct {
-    track_flag_t preemphasis; /**< Linear preemphasis on an audio track */
-    track_flag_t copy_permit; /**< Whether copying is permitted */
-    int channels;             /**< Number of audio channels, 2, 4. -2 if not
-				   implemented or -1 for error.
-			      */
-  } track_flags_t;
-    
-  /*! The leadout track is always 0xAA, regardless of # of tracks on
-    disc, or what value may be used internally. For example although
-    OS X uses a different value for the lead-out track internally than
-    given below, programmers should use CDIO_CDROM_LEADOUT_TRACK and
-    not worry about this.
-  */
-
-  /*! An enumeration for some of the CDIO_CDROM_* \#defines below. This
-    isn't really an enumeration one would really use in a program; it
-    is to be helpful in debuggers where wants just to refer to the
-    CDIO_CDROM_* names and get something.
-  */
-  extern enum cdio_track_enums {
-    CDIO_CDROM_LBA           = 0x01, /**< "logical block": first frame is #0 */
-    CDIO_CDROM_MSF           = 0x02, /**< "minute-second-frame": binary, not
-					BCD here! */
-    CDIO_CDROM_DATA_TRACK    = 0x04, 
-    CDIO_CDROM_CDI_TRACK     = 0x10,
-    CDIO_CDROM_XA_TRACK      = 0x20,
-    CDIO_CD_MAX_TRACKS       =   99, /**< Largest CD track number */
-    CDIO_CDROM_LEADOUT_TRACK = 0xAA, /**< Lead-out track number */
-    CDIO_INVALID_TRACK       = 0xFF, /**<  Constant for invalid track number */
-
-   } cdio_track_enums;
-  
-#define CDIO_CD_MIN_TRACK_NO  1 /**< Smallest CD track number */
-  
-  /*! track modes (Table 350) 
-    reference: MMC-3 draft revsion - 10g
-  */
-  typedef enum {
-    AUDIO,			/**< 2352 byte block length */
-    MODE1,			/**< 2048 byte block length */
-    MODE1_RAW,			/**< 2352 byte block length */
-    MODE2,			/**< 2336 byte block length */
-    MODE2_FORM1,		/**< 2048 byte block length */
-    MODE2_FORM2,		/**< 2324 byte block length */
-    MODE2_FORM_MIX,		/**< 2336 byte block length */
-    MODE2_RAW			/**< 2352 byte block length */
-  } trackmode_t;
-  
-  /*! 
-    Get CD-Text information for a CdIo_t object.
-
-    @param p_cdio the CD object that may contain CD-Text information.
-    @param i_track track for which we are requesting CD-Text information.
-    @return the CD-Text object or NULL if obj is NULL
-    or CD-Text information does not exist.
-
-    If i_track is 0 or CDIO_CDROM_LEADOUT_TRACK the track returned
-    is the information assocated with the CD. 
-  */
-  cdtext_t *cdio_get_cdtext (CdIo_t *p_cdio, track_t i_track);
-
-  /*!
-    Get the number of the first track. 
-
-    @return the track number or CDIO_INVALID_TRACK 
-    on error.
-  */
-  track_t cdio_get_first_track_num(const CdIo_t *p_cdio);
-  
-  /*!
-    Return the last track number.
-    CDIO_INVALID_TRACK is returned on error.
-  */
-  track_t cdio_get_last_track_num (const CdIo_t *p_cdio);
-  
-
-  /*! Find the track which contains lsn.
-    CDIO_INVALID_TRACK is returned if the lsn outside of the CD or
-    if there was some error. 
-    
-    If the lsn is before the pregap of the first track 0 is returned.
-    Otherwise we return the track that spans the lsn.
-  */
-  track_t cdio_get_track(const CdIo_t *p_cdio, lsn_t lsn);
-
-  /*! Return number of channels in track: 2 or 4; -2 if not
-      implemented or -1 for error.
-      Not meaningful if track is not an audio track.
-  */
-  int cdio_get_track_channels(const CdIo_t *p_cdio, track_t i_track);
-  
-  /*! Return copy protection status on a track. Is this meaningful
-      if not an audio track?
-   */
-  track_flag_t cdio_get_track_copy_permit(const CdIo_t *p_cdio, 
-					  track_t i_track);
-  
-  /*!  
-    Get the format (audio, mode2, mode1) of track. 
-  */
-  track_format_t cdio_get_track_format(const CdIo_t *p_cdio, track_t i_track);
-  
-  /*!
-    Return true if we have XA data (green, mode2 form1) or
-    XA data (green, mode2 form2). That is track begins:
-    sync - header - subheader
-    12     4      -  8
-    
-    FIXME: there's gotta be a better design for this and get_track_format?
-  */
-  bool cdio_get_track_green(const CdIo_t *p_cdio, track_t i_track);
-    
-  /*!  
-    Return the ending LSN for track number
-    i_track in cdio.  CDIO_INVALID_LSN is returned on error.
-  */
-  lsn_t cdio_get_track_last_lsn(const CdIo_t *p_cdio, track_t i_track);
-
-  /*!  
-    Get the starting LBA for track number
-    i_track in p_cdio.  Track numbers usually start at something 
-    greater than 0, usually 1.
-
-    The "leadout" track is specified either by
-    using i_track CDIO_CDROM_LEADOUT_TRACK or the total tracks+1.
-
-    @param p_cdio object to get information from
-    @param i_track  the track number we want the LSN for
-    @return the starting LBA or CDIO_INVALID_LBA on error.
-  */
-  lba_t cdio_get_track_lba(const CdIo_t *p_cdio, track_t i_track);
-  
-  /*!  
-    Return the starting LSN for track number
-    i_track in p_cdio.  Track numbers usually start at something 
-    greater than 0, usually 1.
-
-    The "leadout" track is specified either by
-    using i_track CDIO_CDROM_LEADOUT_TRACK or the total tracks+1.
-
-    @param p_cdio object to get information from
-    @param i_track  the track number we want the LSN for
-    @return the starting LSN or CDIO_INVALID_LSN on error.
-  */
-  lsn_t cdio_get_track_lsn(const CdIo_t *p_cdio, track_t i_track);
-
-  /*!  
-    Return the starting LBA for the pregap for track number
-    i_track in p_cdio.  Track numbers usually start at something 
-    greater than 0, usually 1.
-
-    @param p_cdio object to get information from
-    @param i_track  the track number we want the LBA for
-    @return the starting LBA or CDIO_INVALID_LBA on error.
-  */
-  lba_t cdio_get_track_pregap_lba(const CdIo_t *p_cdio, track_t i_track);
-
-  /*!  
-    Return the starting LSN for the pregap for track number
-    i_track in p_cdio.  Track numbers usually start at something 
-    greater than 0, usually 1.
-
-    @param p_cdio object to get information from
-    @param i_track  the track number we want the LSN for
-    @return the starting LSN or CDIO_INVALID_LSN on error.
-  */
-  lsn_t cdio_get_track_pregap_lsn(const CdIo_t *p_cdio, track_t i_track);
-
-  /*!
-    Get the International Standard Recording Code (ISRC) for track number
-    i_track in p_cdio.  Track numbers usually start at something
-    greater than 0, usually 1.
-
-    @return the International Standard Recording Code (ISRC) or NULL
-    if there is none or we don't have the ability to get it.
-
-    Note: string is malloc'd so caller has to free() the returned
-    string when done with it.
-
-  */
-  char * cdio_get_track_isrc (const CdIo_t *p_cdio, track_t i_track);
-  
-  /*!  
-    Return the starting MSF (minutes/secs/frames) for track number
-    i_track in p_cdio.  Track numbers usually start at something 
-    greater than 0, usually 1.
-
-    The "leadout" track is specified either by
-    using i_track CDIO_CDROM_LEADOUT_TRACK or the total tracks+1.
-    
-    @return true if things worked or false if there is no track entry.
-  */
-  bool cdio_get_track_msf(const CdIo_t *p_cdio, track_t i_track, 
-			  /*out*/ msf_t *msf);
-  
-  /*! Get linear preemphasis status on an audio track 
-      This is not meaningful if not an audio track?
-   */
-  track_flag_t cdio_get_track_preemphasis(const CdIo_t *p_cdio,
-					  track_t i_track);
-  
-  /*!  
-    Get the number of sectors between this track an the next.  This
-    includes any pregap sectors before the start of the next track.
-    Track numbers usually start at something 
-    greater than 0, usually 1.
-
-    @return the number of sectors or 0 if there is an error.
-  */
-  unsigned int cdio_get_track_sec_count(const CdIo_t *p_cdio, track_t i_track);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __CDIO_TRACK_H__ */
-
diff --git a/lib-x86-32/include/cdio/types.h b/lib-x86-32/include/cdio/types.h
deleted file mode 100644
index 347bf5a7..00000000
--- a/lib-x86-32/include/cdio/types.h
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
-    $Id: types.h,v 1.37 2008/03/25 15:59:09 karl Exp $
-
-    Copyright (C) 2002, 2003, 2004, 2005, 2006, 2008
-                  Rocky Bernstein <rocky@gnu.org>
-    Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-/** \file types.h 
- *  \brief  Common type definitions used pervasively in libcdio.
- */
-
-
-#ifndef __CDIO_TYPES_H__
-#define __CDIO_TYPES_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#ifndef EXTERNAL_LIBCDIO_CONFIG_H
-#define EXTERNAL_LIBCDIO_CONFIG_H
-#include <cdio/cdio_config.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-  /* provide some C99 definitions */
-
-#if defined(HAVE_SYS_TYPES_H) 
-#include <sys/types.h>
-#endif 
-
-#if defined(HAVE_STDINT_H)
-# include <stdint.h>
-#elif defined(HAVE_INTTYPES_H)
-# include <inttypes.h>
-#elif defined(AMIGA) || defined(__linux__)
-  typedef u_int8_t uint8_t;
-  typedef u_int16_t uint16_t;
-  typedef u_int32_t uint32_t;
-  typedef u_int64_t uint64_t;
-#else
-  /* warning ISO/IEC 9899:1999 <stdint.h> was missing and even <inttypes.h> */
-  /* fixme */
-#endif /* HAVE_STDINT_H */
-  
-typedef uint8_t ubyte;
-
-  /* default HP/UX macros are broken */
-#if defined(__hpux__)
-# undef UINT16_C
-# undef UINT32_C
-# undef UINT64_C
-# undef INT64_C
-#endif
-
-  /* if it's still not defined, take a good guess... should work for
-     most 32bit and 64bit archs */
-  
-#ifndef UINT16_C
-# define UINT16_C(c) c ## U
-#endif
-  
-#ifndef UINT32_C
-# if defined (SIZEOF_INT) && SIZEOF_INT == 4
-#  define UINT32_C(c) c ## U
-# elif defined (SIZEOF_LONG) && SIZEOF_LONG == 4
-#  define UINT32_C(c) c ## UL
-# else
-#  define UINT32_C(c) c ## U
-# endif
-#endif
-  
-#ifndef UINT64_C
-# if defined (SIZEOF_LONG) && SIZEOF_LONG == 8
-#  define UINT64_C(c) c ## UL
-# elif defined (SIZEOF_INT) && SIZEOF_INT == 8
-#  define UINT64_C(c) c ## U
-# else
-#  define UINT64_C(c) c ## ULL
-# endif
-#endif
-  
-#ifndef INT64_C
-# if defined (SIZEOF_LONG) && SIZEOF_LONG == 8
-#  define INT64_C(c) c ## L
-# elif defined (SIZEOF_INT) && SIZEOF_INT == 8
-#  define INT64_C(c) c 
-# else
-#  define INT64_C(c) c ## LL
-# endif
-#endif
-  
-#ifndef __cplusplus
-# if defined(HAVE_STDBOOL_H)
-#  include <stdbool.h>
-# else
-   /* ISO/IEC 9899:1999 <stdbool.h> missing -- enabling workaround */
-  
-#   define false   0
-#   define true    1
-#   define bool uint8_t
-# endif /*HAVE_STDBOOL_H*/
-#endif /*C++*/
-  
-  /* some GCC optimizations -- gcc 2.5+ */
-  
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
-#define GNUC_PRINTF( format_idx, arg_idx )              \
-  __attribute__((format (printf, format_idx, arg_idx)))
-#define GNUC_SCANF( format_idx, arg_idx )               \
-  __attribute__((format (scanf, format_idx, arg_idx)))
-#define GNUC_FORMAT( arg_idx )                  \
-  __attribute__((format_arg (arg_idx)))
-#define GNUC_NORETURN                           \
-  __attribute__((noreturn))
-#define GNUC_CONST                              \
-  __attribute__((const))
-#define GNUC_UNUSED                             \
-  __attribute__((unused))
-#define GNUC_PACKED                             \
-  __attribute__((packed))
-#else   /* !__GNUC__ */
-#define GNUC_PRINTF( format_idx, arg_idx )
-#define GNUC_SCANF( format_idx, arg_idx )
-#define GNUC_FORMAT( arg_idx )
-#define GNUC_NORETURN
-#define GNUC_CONST
-#define GNUC_UNUSED
-#define GNUC_PACKED
-#endif  /* !__GNUC__ */
-  
-#if defined(__GNUC__)
-  /* for GCC we try to use GNUC_PACKED */
-# define PRAGMA_BEGIN_PACKED
-# define PRAGMA_END_PACKED
-#elif defined(HAVE_ISOC99_PRAGMA)
-  /* should work with most EDG-frontend based compilers */
-# define PRAGMA_BEGIN_PACKED _Pragma("pack(1)")
-# define PRAGMA_END_PACKED   _Pragma("pack()")
-#else /* neither gcc nor _Pragma() available... */
-  /* ...so let's be naive and hope the regression testsuite is run... */
-# define PRAGMA_BEGIN_PACKED
-# define PRAGMA_END_PACKED
-#endif
-  
-  /*
-   * user directed static branch prediction gcc 2.96+
-   */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 95)
-# define GNUC_LIKELY(x)   __builtin_expect((x),true)
-# define GNUC_UNLIKELY(x) __builtin_expect((x),false)
-#else 
-# define GNUC_LIKELY(x)   (x) 
-# define GNUC_UNLIKELY(x) (x)
-#endif
-  
-#ifndef NULL
-# define NULL ((void*) 0)
-#endif
-  
-  /* our own offsetof()-like macro */
-#define __cd_offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
-  
-  /*!
-    \brief MSF (minute/second/frame) structure 
-
-    One CD-ROMs addressing scheme especially used in audio formats
-    (Red Book) is an address by minute, sector and frame which
-    BCD-encoded in three bytes. An alternative format is an lba_t.
-
-    Note: the fields in this structure are BCD encoded. Use
-    cdio_to_bcd8() or cdio_from_bcd8() to convert an integer into or
-    out of this format. The format specifier %x (not %d) can be used
-    if you need to format or print values in this structure.
-    
-    @see lba_t
-  */
-  PRAGMA_BEGIN_PACKED
-  struct msf_s {
-    uint8_t m, s, f; /* BCD encoded! */
-  } GNUC_PACKED;
-  PRAGMA_END_PACKED
-  
-  typedef struct msf_s msf_t;
-
-#define msf_t_SIZEOF 3
-
-  /*!
-    \brief UTF-8 char definition 
-
-    Type to denote UTF-8 strings.
-  */
-
-  typedef char cdio_utf8_t;
-
-  typedef enum  {
-    nope  = 0,
-    yep   = 1,
-    dunno = 2
-  } bool_3way_t;
-  
-  /* type used for bit-fields in structs (1 <= bits <= 8) */
-#if defined(__GNUC__)
-  /* this is strict ISO C99 which allows only 'unsigned int', 'signed
-     int' and '_Bool' explicitly as bit-field type */
-  typedef unsigned int bitfield_t;
-#else
-  /* other compilers might increase alignment requirements to match the
-     'unsigned int' type -- fixme: find out how unalignment accesses can
-     be pragma'ed on non-gcc compilers */
-  typedef uint8_t bitfield_t;
-#endif
-  
-  /*! The type of a Logical Block Address. We allow for an lba to be 
-    negative to be consistent with an lba, although I'm not sure this
-    this is possible.
-      
-   */
-  typedef int32_t lba_t;
-  
-  /*! The type of a Logical Sector Number. Note that an lba can be negative
-    and the MMC3 specs allow for a conversion of a negative lba.
-
-    @see msf_t
-  */
-  typedef int32_t lsn_t;
-  
-  /* Address in either MSF or logical format */
-  union cdio_cdrom_addr		
-  {
-    msf_t	msf;
-    lba_t	lba;
-  };
-
-  /*! The type of a track number 0..99. */
-  typedef uint8_t track_t;
-  
-  /*! The type of a session number 0..99. */
-  typedef uint8_t session_t;
-  
-  /*! 
-    Constant for invalid session number
-  */
-#define CDIO_INVALID_SESSION   0xFF
-  
-  /*! 
-    Constant for invalid LBA. It is 151 less than the most negative
-    LBA -45150. This provide slack for the 150-frame offset in
-    LBA to LSN 150 conversions
-  */
-#define CDIO_INVALID_LBA    -45301
-  
-  /*! 
-    Constant for invalid LSN
-  */
-#define CDIO_INVALID_LSN    CDIO_INVALID_LBA
-
-  /*! 
-    Number of ASCII bytes in a media catalog number (MCN).
-  */
-#define CDIO_MCN_SIZE       13
-
-  /*! 
-    Type to hold ASCII bytes in a media catalog number (MCN).
-    We include an extra 0 byte so these can be used as C strings.
-  */
-  typedef char cdio_mcn_t[CDIO_MCN_SIZE+1];
-  
-
-  /*! 
-    Number of ASCII bytes in International Standard Recording Codes (ISRC)
-  */
-#define CDIO_ISRC_SIZE       12
-
-  /*! 
-    Type to hold ASCII bytes in a media catalog number (MCN).
-    We include an extra 0 byte so these can be used as C strings.
-  */
-  typedef char cdio_isrc_t[CDIO_ISRC_SIZE+1];
-
-  typedef int cdio_fs_anal_t;
-
-  /*! 
-    track flags
-    Q Sub-channel Control Field (4.2.3.3)
-  */
-  typedef enum {
-    CDIO_TRACK_FLAG_NONE = 		 0x00,	/**< no flags set */
-    CDIO_TRACK_FLAG_PRE_EMPHASIS =	 0x01,	/**< audio track recorded with
-                                                   pre-emphasis */
-    CDIO_TRACK_FLAG_COPY_PERMITTED =	 0x02,	/**< digital copy permitted */
-    CDIO_TRACK_FLAG_DATA =		 0x04,	/**< data track */
-    CDIO_TRACK_FLAG_FOUR_CHANNEL_AUDIO = 0x08,  /**< 4 audio channels */
-  CDIO_TRACK_FLAG_SCMS =		 0x10	/**< SCMS (5.29.2.7) */
-} cdio_track_flag;
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __CDIO_TYPES_H__ */
-
-
-/* 
- * Local variables:
- *  c-file-style: "gnu"
- *  tab-width: 8
- *  indent-tabs-mode: nil
- * End:
- */
diff --git a/lib-x86-32/include/cdio/udf.h b/lib-x86-32/include/cdio/udf.h
deleted file mode 100644
index e35d74d1..00000000
--- a/lib-x86-32/include/cdio/udf.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*  
-    $Id: udf.h,v 1.22 2008/03/25 15:59:09 karl Exp $
-
-    Copyright (C) 2005, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-/*!
- * \file udf.h 
- *
- * \brief The top-level interface header for libudf: UDF filesystem
- * library; applications include this.
- *
-*/
-
-#ifndef UDF_H
-#define UDF_H 
-
-#include <cdio/cdio.h>
-#include <cdio/ecma_167.h>
-#include <cdio/posix.h>
-
-typedef uint16_t partition_num_t;
-
-/** Opaque structures. */
-typedef struct udf_s udf_t; 
-typedef struct udf_file_s udf_file_t;
-typedef struct udf_dirent_s udf_dirent_t;
-
-/**
-   Imagine the below a \#define'd value rather than distinct values of
-   an enum.
-*/
-typedef enum {
-  UDF_BLOCKSIZE       = 2048
-} udf_enum1_t; 
-
-/** This variable is trickery to force the above enum symbol value to
-    be recorded in debug symbol tables. It is used to allow one refer
-    to above enumeration values in a debugger and debugger
-    expressions */
-extern udf_enum1_t debug_udf_enum1;
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-  /*!
-    Close UDF and free resources associated with p_udf.
-  */
-  bool udf_close (udf_t *p_udf);
-  
-  /*!  
-    Seek to a position i_start and then read i_blocks. Number of
-    blocks read is returned. One normally expects the return to be
-    equal to i_blocks.
-  */
-
-  driver_return_code_t udf_read_sectors (const udf_t *p_udf, void *ptr, 
-					 lsn_t i_start,  long int i_blocks);
-
-  /*!
-    Open an UDF for reading. Maybe in the future we will have
-    a mode. NULL is returned on error.
-    
-    Caller must free result - use udf_close for that.
-  */
-  udf_t *udf_open (const char *psz_path);
-  
-  /*!
-    Return the partition number of the the opened udf handle. -1 
-    Is returned if we have an error.
-  */
-  int16_t udf_get_part_number(const udf_t *p_udf);
-
-  /*!
-    Get the root in p_udf. If b_any_partition is false then
-    the root must be in the given partition.
-    NULL is returned if the partition is not found or a root is not found or
-    there is on error.
-
-    Caller must free result - use udf_file_free for that.
-  */
-  udf_dirent_t *udf_get_root (udf_t *p_udf, bool b_any_partition, 
-			      partition_num_t i_partition);
-  
-  /**
-   * Gets the Volume Identifier string, in 8bit unicode (latin-1)
-   * psz_volid, place to put the string
-   * i_volid_size, size of the buffer volid points to
-   * returns the size of buffer needed for all data
-   */
-  int udf_get_volume_id(udf_t *p_udf, /*out*/ char *psz_volid,  
-			unsigned int i_volid);
-  
-  /**
-   * Gets the Volume Set Identifier, as a 128-byte dstring (not decoded)
-   * WARNING This is not a null terminated string
-   * volsetid, place to put the data
-   * volsetid_size, size of the buffer volsetid points to 
-   * the buffer should be >=128 bytes to store the whole volumesetidentifier
-   * returns the size of the available volsetid information (128)
-   * or 0 on error
-   */
-  int udf_get_volumeset_id(udf_t *p_udf, /*out*/ uint8_t *volsetid,
-			   unsigned int i_volsetid);
-  
-  /*!
-    Return a file pointer matching pzz_name. 
-  */
-  udf_dirent_t *udf_fopen(udf_dirent_t *p_udf_root, const char *psz_name);
-  
-  /*! udf_mode_string - fill in string PSZ_STR with an ls-style ASCII
-    representation of the i_mode. PSZ_STR is returned.
-
-    10 characters are stored in PSZ_STR; a terminating null byte is added.
-    The characters stored in PSZ_STR are:
-    
-    0	File type.  'd' for directory, 'c' for character
-	special, 'b' for block special, 'm' for multiplex,
-	'l' for symbolic link, 's' for socket, 'p' for fifo,
-	'-' for regular, '?' for any other file type
-
-    1	'r' if the owner may read, '-' otherwise.
-
-    2	'w' if the owner may write, '-' otherwise.
-
-    3	'x' if the owner may execute, 's' if the file is
-	set-user-id, '-' otherwise.
-	'S' if the file is set-user-id, but the execute
-	bit isn't set.
-
-    4	'r' if group members may read, '-' otherwise.
-
-    5	'w' if group members may write, '-' otherwise.
-
-    6	'x' if group members may execute, 's' if the file is
-	set-group-id, '-' otherwise.
-	'S' if it is set-group-id but not executable.
-
-    7	'r' if any user may read, '-' otherwise.
-
-    8	'w' if any user may write, '-' otherwise.
-
-    9	'x' if any user may execute, 't' if the file is "sticky"
-	(will be retained in swap space after execution), '-'
-	otherwise.
-	'T' if the file is sticky but not executable.  */
-
-  char *udf_mode_string (mode_t i_mode, char *psz_str);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#include <cdio/udf_time.h>
-#include <cdio/udf_file.h>
-
-#endif /*UDF_H*/
diff --git a/lib-x86-32/include/cdio/udf_file.h b/lib-x86-32/include/cdio/udf_file.h
deleted file mode 100644
index 0b8fe99e..00000000
--- a/lib-x86-32/include/cdio/udf_file.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*  
-    $Id: udf_file.h,v 1.12 2008/03/25 15:59:09 karl Exp $
-
-    Copyright (C) 2005, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-/**
- * \file udf_file.h 
- *
- * \brief Routines involving UDF file operations
- *
-*/
-
-#ifndef UDF_FILE_H
-#define UDF_FILE_H 
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-  /**
-    Return the file id descriptor of the given file.
-  */
-  bool udf_get_fileid_descriptor(const udf_dirent_t *p_udf_dirent, 
-				 /*out*/ udf_fileid_desc_t *p_udf_fid);
-
-  /**
-    Return the name of the file
-  */
-  const char *udf_get_filename(const udf_dirent_t *p_udf_dirent);
-  
-  /**
-    Return the name of the file
-  */
-  bool udf_get_file_entry(const udf_dirent_t *p_udf_dirent, 
-			  /*out*/ udf_file_entry_t *p_udf_fe);
-
-  /**
-    Return the number of hard links of the file. Return 0 if error.
-  */
-  uint16_t udf_get_link_count(const udf_dirent_t *p_udf_dirent);
-
-  /**
-    Return the file length the file. Return 2147483647L if error.
-  */
-  uint64_t udf_get_file_length(const udf_dirent_t *p_udf_dirent);
-
-  /**  
-    Returns a POSIX mode for a given p_udf_dirent.
-  */
-  mode_t udf_get_posix_filemode(const udf_dirent_t *p_udf_dirent);
-
-  /**
-    Return the next subdirectory. 
-  */
-  udf_dirent_t *udf_opendir(const udf_dirent_t *p_udf_dirent);
-  
-  /**
-     Attempts to read up to count bytes from UDF directory entry
-     p_udf_dirent into the buffer starting at buf. buf should be a
-     multiple of UDF_BLOCKSIZE bytes. Reading continues after the
-     point at which we last read or from the beginning the first time.
-     
-     If count is zero, read() returns zero and has no other results. If
-     count is greater than SSIZE_MAX, the result is unspecified.
-     
-     If there is an error, cast the result to driver_return_code_t for 
-     the specific error code.
-  */
-  /**
-    Attempts to read up to count bytes from file descriptor fd into
-    the buffer starting at buf.
-    
-    If count is zero, read() returns zero and has no other results. If
-    count is greater than SSIZE_MAX, the result is unspecified.
-  */
-  ssize_t udf_read_block(const udf_dirent_t *p_udf_dirent, 
-			 void * buf, size_t count);
-
-  /**
-    Advances p_udf_direct to the the next directory entry in the
-    pointed to by p_udf_dir. It also returns this as the value.  NULL
-    is returned on reaching the end-of-file or if an error. Also
-    p_udf_dirent is free'd. If the end of is not reached the caller
-    must call udf_dirent_free() with p_udf_dirent when done with it to 
-    release resources.
-  */
-  udf_dirent_t *udf_readdir(udf_dirent_t *p_udf_dirent);
-  
-  /**
-    free free resources associated with p_udf_dirent.
-  */
-  bool udf_dirent_free(udf_dirent_t *p_udf_dirent);
-  
-  /**
-    Return true if the file is a directory.
-  */
-  bool udf_is_dir(const udf_dirent_t *p_udf_dirent);
-  
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /*UDF_FILE_H*/
diff --git a/lib-x86-32/include/cdio/udf_time.h b/lib-x86-32/include/cdio/udf_time.h
deleted file mode 100644
index 791fcdd9..00000000
--- a/lib-x86-32/include/cdio/udf_time.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*  
-    $Id: udf_time.h,v 1.5 2008/03/25 15:59:09 karl Exp $
-
-    Copyright (C) 2005, 2008 Rocky Bernstein <rocky@gnu.org>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-/*!
- * \file udf_time.h 
- *
- * \brief UDF time conversion and access files.
- *
-*/
-
-#ifndef UDF_TIME_H
-#define UDF_TIME_H 
-
-#include <time.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-  /*!
-    Return the access time of the file.
-  */
-  time_t udf_get_access_time(const udf_dirent_t *p_udf_dirent);
-
-  /*!
-    Return the attribute (most recent create or access) time of the file
-  */
-  time_t udf_get_attribute_time(const udf_dirent_t *p_udf_dirent);
-
-  /*!
-    Return the modification time of the file.
-  */
-  time_t udf_get_modification_time(const udf_dirent_t *p_udf_dirent);
-
-  /*!
-    Return the access timestamp of the file
-  */
-  udf_timestamp_t *udf_get_access_timestamp(const udf_dirent_t *p_udf_dirent);
-
-  /*!
-    Return the modification timestamp of the file
-  */
-  udf_timestamp_t *udf_get_modification_timestamp(const udf_dirent_t 
-						  *p_udf_dirent);
-
-  /*!
-    Return the attr timestamp of the file
-  */
-  udf_timestamp_t *udf_get_attr_timestamp(const udf_dirent_t *p_udf_dirent);
-
-  /*!
-    Convert a UDF timestamp to a time_t. If microseconds are desired,
-    use dest_usec. The return value is the same as dest. */
-  time_t *udf_stamp_to_time(time_t *dest, long int *dest_usec, 
-			  const udf_timestamp_t src);
-
-  udf_timestamp_t *udf_timespec_to_stamp(const struct timespec ts,
-					 udf_timestamp_t *dest);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /*UDF_TIME_H*/
diff --git a/lib-x86-32/include/cdio/utf8.h b/lib-x86-32/include/cdio/utf8.h
deleted file mode 100644
index 236105e9..00000000
--- a/lib-x86-32/include/cdio/utf8.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-    $Id: utf8.h,v 1.2 2008/03/25 15:59:09 karl Exp $
-    
-    Copyright (C) 2008 Rocky Bernstein <rocky@gnu.org>
-    Copyright (C) 2006 Burkhard Plaum <plaum@ipf.uni-stuttgart.de>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-/* UTF-8 support */
-
-
-#include <cdio/types.h>
-
-/** \brief Opaque characterset converter
- */
-
-typedef struct cdio_charset_coverter_s cdio_charset_coverter_t;
-
-/** \brief Create a charset converter
- *  \param src_charset Source charset
- *  \param dst_charset Destination charset
- *  \returns A newly allocated charset converter
- */
-
-cdio_charset_coverter_t *
-cdio_charset_converter_create(const char * src_charset,
-                              const char * dst_charset);
-
-/** \brief Destroy a characterset converter
- *  \param cnv A characterset converter
- */
-
-void cdio_charset_converter_destroy(cdio_charset_coverter_t*cnv);
-
-/** \brief Convert a string from one character set to another
- *  \param cnv A charset converter
- *  \param src Source string
- *  \param src_len Length of source string
- *  \param dst Returns destination string
- *  \param dst_len If non NULL, returns the length of the destination string
- *  \returns true if conversion was sucessful, false else.
- *
- *  The destination string must be freed by the caller with free().
- *  If you pass -1 for src_len, strlen() will be used.
- */
-
-bool cdio_charset_convert(cdio_charset_coverter_t*cnv,
-                          char * src, int src_len,
-                          char ** dst, int * dst_len);
-
-/** \brief Convert a string from UTF-8 to another charset
- *  \param src Source string (0 terminated)
- *  \param dst Returns destination string
- *  \param dst_len If non NULL, returns the length of the destination string
- *  \param dst_charset The characterset to convert to
- *  \returns true if conversion was sucessful, false else.
- *
- *  This is a convenience function, which creates a charset converter,
- *  converts one string and destroys the charset converter.
- */
-
-
-bool cdio_charset_from_utf8(cdio_utf8_t * src, char ** dst,
-                            int * dst_len, const char * dst_charset);
-
-/** \brief Convert a string from another charset to UTF-8 
- *  \param src Source string
- *  \param src_len Length of the source string
- *  \param dst Returns destination string (0 terminated)
- *  \param src_charset The characterset to convert from
- *  \returns true if conversion was sucessful, false else.
- *
- *  This is a convenience function, which creates a charset converter,
- *  converts one string and destroys the charset converter. If you pass -1
- *  for src_len, strlen() will be used.
- */
-
-
-bool cdio_charset_to_utf8(char *src, size_t src_len, cdio_utf8_t **dst,
-                          const char * src_charset);
-
diff --git a/lib-x86-32/include/cdio/util.h b/lib-x86-32/include/cdio/util.h
deleted file mode 100644
index 81557dc7..00000000
--- a/lib-x86-32/include/cdio/util.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-    $Id: util.h,v 1.12 2008/03/25 15:59:10 karl Exp $
-
-    Copyright (C) 2004, 2005, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
-    Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __CDIO_UTIL_H__
-#define __CDIO_UTIL_H__
-
-/*!
-   \file util.h 
-   \brief Miscellaneous utility functions. 
-
-   Warning: this will probably get removed/replaced by using glib.h
-*/
-#include <stdlib.h>
-
-#undef  MAX
-#define MAX(a, b)  (((a) > (b)) ? (a) : (b))
-
-#undef  MIN
-#define MIN(a, b)  (((a) < (b)) ? (a) : (b))
-
-#undef  IN
-#define IN(x, low, high) ((x) >= (low) && (x) <= (high))
-
-#undef  CLAMP
-#define CLAMP(x, low, high)  (((x) > (high)) ? (high) : (((x) < (low)) ? (low) : (x)))
-
-static inline uint32_t
-_cdio_len2blocks (uint32_t i_len, uint16_t i_blocksize)
-{
-  uint32_t i_blocks;
-
-  i_blocks = i_len / (uint32_t) i_blocksize;
-  if (i_len % i_blocksize)
-    i_blocks++;
-
-  return i_blocks;
-}
-
-/* round up to next block boundary */
-static inline unsigned 
-_cdio_ceil2block (unsigned offset, uint16_t i_blocksize)
-{
-  return _cdio_len2blocks (offset, i_blocksize) * i_blocksize;
-}
-
-static inline unsigned int
-_cdio_ofs_add (unsigned offset, unsigned length, uint16_t i_blocksize)
-{
-  if (i_blocksize - (offset % i_blocksize) < length)
-    offset = _cdio_ceil2block (offset, i_blocksize);
-
-  offset += length;
-
-  return offset;
-}
-
-static inline const char *
-_cdio_bool_str (bool b)
-{
-  return b ? "yes" : "no";
-}
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void *
-_cdio_memdup (const void *mem, size_t count);
-
-char *
-_cdio_strdup_upper (const char str[]);
-
-void
-_cdio_strfreev(char **strv);
-
-size_t
-_cdio_strlenv(char **str_array);
-
-char **
-_cdio_strsplit(const char str[], char delim);
-
-uint8_t cdio_to_bcd8(uint8_t n);
-uint8_t cdio_from_bcd8(uint8_t p);
-
-void cdio_follow_symlink (const char * src, char * dst);
-  
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __CDIO_UTIL_H__ */
-
-
-/* 
- * Local variables:
- *  c-file-style: "gnu"
- *  tab-width: 8
- *  indent-tabs-mode: nil
- * End:
- */
diff --git a/lib-x86-32/include/cdio/version.h b/lib-x86-32/include/cdio/version.h
deleted file mode 100644
index 8eb564dc..00000000
--- a/lib-x86-32/include/cdio/version.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* $Id: version.h.in,v 1.6 2005/01/29 20:54:20 rocky Exp $ */
-/** \file version.h 
- *
- *  \brief A file containing the libcdio package version
- *  number (82) and OS build name. 
- */
-
-/*! CDIO_VERSION can as a string in programs to show what version is used. */
-#define CDIO_VERSION "0.82 i686-pc-linux-gnu"
-
-/*! LIBCDIO_VERSION_NUM  can be used for testing in the C preprocessor */
-#define LIBCDIO_VERSION_NUM 82
diff --git a/lib-x86-32/include/cdio/version.h.in b/lib-x86-32/include/cdio/version.h.in
deleted file mode 100644
index 17d199e7..00000000
--- a/lib-x86-32/include/cdio/version.h.in
+++ /dev/null
@@ -1,12 +0,0 @@
-/* $Id: version.h.in,v 1.6 2005/01/29 20:54:20 rocky Exp $ */
-/** \file version.h 
- *
- *  \brief A file containing the libcdio package version
- *  number (@LIBCDIO_VERSION_NUM@) and OS build name. 
- */
-
-/*! CDIO_VERSION can as a string in programs to show what version is used. */
-#define CDIO_VERSION "@VERSION@ @build@"
-
-/*! LIBCDIO_VERSION_NUM  can be used for testing in the C preprocessor */
-#define LIBCDIO_VERSION_NUM @LIBCDIO_VERSION_NUM@
diff --git a/lib-x86-32/include/cdio/xa.h b/lib-x86-32/include/cdio/xa.h
deleted file mode 100644
index 13b21c8f..00000000
--- a/lib-x86-32/include/cdio/xa.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
-    $Id: xa.h,v 1.19 2008/03/25 15:59:10 karl Exp $
-
-    Copyright (C) 2003, 2004, 2005, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
-    Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
-
-    See also iso9660.h by Eric Youngdale (1993) and in cdrtools. These are 
-
-    Copyright 1993 Yggdrasil Computing, Incorporated
-    Copyright (c) 1999,2000 J. Schilling
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-/*!
-   \file xa.h 
-   \brief Things related to the ISO-9660 XA (Extended Attributes) format
-
-   Applications will probably not include this directly but via 
-   the iso9660.h header.
-*/
-
-
-#ifndef __CDIO_XA_H__
-#define __CDIO_XA_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-  /*! An enumeration for some of the XA_* \#defines below. This isn't
-    really an enumeration one would really use in a program it is to
-    be helpful in debuggers where wants just to refer to the XA_*
-    names and get something.
-  */
-  typedef enum {
-    ISO_XA_MARKER_OFFSET =   1024,
-    XA_PERM_RSYS =         0x0001,  /**< System Group Read */
-    XA_PERM_XSYS =         0x0004,  /**< System Group Execute */
-    
-    XA_PERM_RUSR =         0x0010,  /**< User (owner) Read */
-    XA_PERM_XUSR =         0x0040,  /**< User (owner) Execute */
-    
-    XA_PERM_RGRP =         0x0100,  /**< Group Read */
-    XA_PERM_XGRP =         0x0400,  /**< Group Execute */
-    
-    XA_PERM_ROTH =         0x1000,  /**< Other (world) Read */
-    XA_PERM_XOTH =         0x4000,  /**< Other (world) Execute */
-    
-    XA_ATTR_MODE2FORM1  =   (1 << 11),
-    XA_ATTR_MODE2FORM2  =   (1 << 12),
-    XA_ATTR_INTERLEAVED =   (1 << 13),
-    XA_ATTR_CDDA        =   (1 << 14),
-    XA_ATTR_DIRECTORY   =   (1 << 15),
-    
-    XA_PERM_ALL_READ    =   (XA_PERM_RUSR | XA_PERM_RSYS | XA_PERM_RGRP),
-    XA_PERM_ALL_EXEC    =   (XA_PERM_XUSR | XA_PERM_XSYS | XA_PERM_XGRP),
-    XA_PERM_ALL_ALL     =   (XA_PERM_ALL_READ | XA_PERM_ALL_EXEC),
-    
-    XA_FORM1_DIR  = (XA_ATTR_DIRECTORY | XA_ATTR_MODE2FORM1 | XA_PERM_ALL_ALL),
-    XA_FORM1_FILE =  (XA_ATTR_MODE2FORM1 | XA_PERM_ALL_ALL),
-    XA_FORM2_FILE =  (XA_ATTR_MODE2FORM2 | XA_PERM_ALL_ALL)
-  } xa_misc_enum_t;
-  
-extern const char ISO_XA_MARKER_STRING[sizeof("CD-XA001")-1];
-
-#define ISO_XA_MARKER_STRING    "CD-XA001"
-
-/*! \brief "Extended Architecture" according to the Philips Yellow Book.
- 
-CD-ROM EXtended Architecture is a modification to the CD-ROM
-specification that defines two new types of sectors.  CD-ROM XA was
-developed jointly by Sony, Philips, and Microsoft, and announced in
-August 1988. Its specifications were published in an extension to the
-Yellow Book.  CD-i, Photo CD, Video CD and CD-EXTRA have all
-subsequently been based on CD-ROM XA.
-
-CD-XA defines another way of formatting sectors on a CD-ROM, including
-headers in the sectors that describe the type (audio, video, data) and
-some additional info (markers, resolution in case of a video or audio
-sector, file numbers, etc).
-
-The data written on a CD-XA is consistent with and can be in ISO-9660
-file system format and therefore be readable by ISO-9660 file system
-translators. But also a CD-I player can also read CD-XA discs even if
-its own `Green Book' file system only resembles ISO 9660 and isn't
-fully compatible. 
-
- Note structure is big-endian.
-*/
-typedef struct iso9660_xa_s
-{
-  uint16_t group_id;      /**< 0 */
-  uint16_t user_id;       /**< 0 */
-  uint16_t attributes;    /**< XA_ATTR_ */ 
-  char     signature[2];  /**< { 'X', 'A' } */
-  uint8_t  filenum;       /**< file number, see also XA subheader */
-  uint8_t  reserved[5];   /**< zero */
-} GNUC_PACKED iso9660_xa_t;
-  
-  
-  /*!
-    Returns POSIX mode bitstring for a given file.
-  */
-  posix_mode_t iso9660_get_posix_filemode_from_xa(uint16_t i_perms);
-
-/*!
-  Returns a string interpreting the extended attribute xa_attr. 
-  For example:
-  \verbatim
-  d---1xrxrxr
-  ---2--r-r-r
-  -a--1xrxrxr
-  \endverbatim
-  
-  A description of the characters in the string follows.
-  The 1st character is either "d" if the entry is a directory, or "-" if not
-  The 2nd character is either "a" if the entry is CDDA (audio), or "-" if not
-  The 3rd character is either "i" if the entry is interleaved, or "-" if not
-  The 4th character is either "2" if the entry is mode2 form2 or "-" if not
-  The 5th character is either "1" if the entry is mode2 form1 or "-" if not
-  Note that an entry will either be in mode2 form1 or mode form2. That
-  is you will either see "2-" or "-1" in the 4th & 5th positions.
-  
-  The 6th and 7th characters refer to permissions for a user while the
-  the 8th and 9th characters refer to permissions for a group while, and 
-  the 10th and 11th characters refer to permissions for everyone. 
-  
-  In each of these pairs the first character (6, 8, 10) is "x" if the 
-  entry is executable. For a directory this means the directory is
-  allowed to be listed or "searched".
-  The second character of a pair (7, 9, 11) is "r" if the entry is allowed
-  to be read. 
-*/
-const char *
-iso9660_get_xa_attr_str (uint16_t xa_attr);
-  
-/*! 
-  Allocates and initalizes a new iso9600_xa_t variable and returns
-  it. The caller should free the returned result.
-
-  @see iso9660_xa
-*/
-iso9660_xa_t *
-iso9660_xa_init (iso9660_xa_t *_xa, uint16_t uid, uint16_t gid, uint16_t attr, 
-		 uint8_t filenum);
-
-#ifdef __cplusplus
-}
-
-/** The below variables are trickery to force the above enum symbol
-    values to be recorded in debug symbol tables. They are used to
-    allow one to refer to the enumeration value names in the typedefs
-    above in a debugger and debugger expressions.
-*/
-extern xa_misc_enum_t debugger_xa_misc_enum;
-
-  
-#endif /* __cplusplus */
-
-#endif /* __CDIO_XA_H__ */
-
-/* 
- * Local variables:
- *  c-file-style: "gnu"
- *  tab-width: 8
- *  indent-tabs-mode: nil
- * End:
- */
diff --git a/lib-x86-32/include/curl/Makefile.am b/lib-x86-32/include/curl/Makefile.am
deleted file mode 100644
index a3b44438..00000000
--- a/lib-x86-32/include/curl/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-pkginclude_HEADERS = \
-	curl.h curlver.h easy.h mprintf.h stdcheaders.h types.h multi.h \
-	typecheck-gcc.h curlbuild.h curlrules.h
-
-pkgincludedir= $(includedir)/curl
-
-# curlbuild.h does not exist in the git tree. When the original libcurl
-# source code distribution archive file is created, curlbuild.h.dist is
-# renamed to curlbuild.h and included in the tarball so that it can be
-# used directly on non-configure systems.
-#
-# The distributed curlbuild.h will be overwritten on configure systems
-# when the configure script runs, with one that is suitable and specific
-# to the library being configured and built.
-#
-# curlbuild.h.in is the distributed template file from which the configure
-# script creates curlbuild.h at library configuration time, overwiting the
-# one included in the distribution archive.
-#
-# curlbuild.h.dist is not included in the source code distribution archive.
-
-EXTRA_DIST = curlbuild.h.in
-
-DISTCLEANFILES = curlbuild.h
-
diff --git a/lib-x86-32/include/curl/curl.h b/lib-x86-32/include/curl/curl.h
deleted file mode 100644
index cb9d0fbf..00000000
--- a/lib-x86-32/include/curl/curl.h
+++ /dev/null
@@ -1,2119 +0,0 @@
-#ifndef __CURL_CURL_H
-#define __CURL_CURL_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-
-/*
- * If you have libcurl problems, all docs and details are found here:
- *   http://curl.haxx.se/libcurl/
- *
- * curl-library mailing list subscription and unsubscription web interface:
- *   http://cool.haxx.se/mailman/listinfo/curl-library/
- */
-
-#include "curlver.h"         /* libcurl version defines   */
-#include "curlbuild.h"       /* libcurl build definitions */
-#include "curlrules.h"       /* libcurl rules enforcement */
-
-/*
- * Define WIN32 when build target is Win32 API
- */
-
-#if (defined(_WIN32) || defined(__WIN32__)) && \
-     !defined(WIN32) && !defined(__SYMBIAN32__)
-#define WIN32
-#endif
-
-#include <stdio.h>
-#include <limits.h>
-
-#if defined(__FreeBSD__) && (__FreeBSD__ >= 2)
-/* Needed for __FreeBSD_version symbol definition */
-#include <osreldate.h>
-#endif
-
-/* The include stuff here below is mainly for time_t! */
-#include <sys/types.h>
-#include <time.h>
-
-#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__GNUC__) && \
-  !defined(__CYGWIN__) || defined(__MINGW32__)
-#if !(defined(_WINSOCKAPI_) || defined(_WINSOCK_H))
-/* The check above prevents the winsock2 inclusion if winsock.h already was
-   included, since they can't co-exist without problems */
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#endif
-#else
-
-/* HP-UX systems version 9, 10 and 11 lack sys/select.h and so does oldish
-   libc5-based Linux systems. Only include it on system that are known to
-   require it! */
-#if defined(_AIX) || defined(__NOVELL_LIBC__) || defined(__NetBSD__) || \
-    defined(__minix) || defined(__SYMBIAN32__) || defined(__INTEGRITY) || \
-    defined(ANDROID) || \
-   (defined(__FreeBSD_version) && (__FreeBSD_version < 800000))
-#include <sys/select.h>
-#endif
-
-#ifndef _WIN32_WCE
-#include <sys/socket.h>
-#endif
-#if !defined(WIN32) && !defined(__WATCOMC__) && !defined(__VXWORKS__)
-#include <sys/time.h>
-#endif
-#include <sys/types.h>
-#endif
-
-#ifdef __BEOS__
-#include <support/SupportDefs.h>
-#endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef void CURL;
-
-/*
- * Decorate exportable functions for Win32 and Symbian OS DLL linking.
- * This avoids using a .def file for building libcurl.dll.
- */
-#if (defined(WIN32) || defined(_WIN32) || defined(__SYMBIAN32__)) && \
-     !defined(CURL_STATICLIB)
-#if defined(BUILDING_LIBCURL)
-#define CURL_EXTERN  __declspec(dllexport)
-#else
-#define CURL_EXTERN  __declspec(dllimport)
-#endif
-#else
-
-#ifdef CURL_HIDDEN_SYMBOLS
-/*
- * This definition is used to make external definitions visible in the
- * shared library when symbols are hidden by default.  It makes no
- * difference when compiling applications whether this is set or not,
- * only when compiling the library.
- */
-#define CURL_EXTERN CURL_EXTERN_SYMBOL
-#else
-#define CURL_EXTERN
-#endif
-#endif
-
-#ifndef curl_socket_typedef
-/* socket typedef */
-#ifdef WIN32
-typedef SOCKET curl_socket_t;
-#define CURL_SOCKET_BAD INVALID_SOCKET
-#else
-typedef int curl_socket_t;
-#define CURL_SOCKET_BAD -1
-#endif
-#define curl_socket_typedef
-#endif /* curl_socket_typedef */
-
-struct curl_httppost {
-  struct curl_httppost *next;       /* next entry in the list */
-  char *name;                       /* pointer to allocated name */
-  long namelength;                  /* length of name length */
-  char *contents;                   /* pointer to allocated data contents */
-  long contentslength;              /* length of contents field */
-  char *buffer;                     /* pointer to allocated buffer contents */
-  long bufferlength;                /* length of buffer field */
-  char *contenttype;                /* Content-Type */
-  struct curl_slist* contentheader; /* list of extra headers for this form */
-  struct curl_httppost *more;       /* if one field name has more than one
-                                       file, this link should link to following
-                                       files */
-  long flags;                       /* as defined below */
-#define HTTPPOST_FILENAME (1<<0)    /* specified content is a file name */
-#define HTTPPOST_READFILE (1<<1)    /* specified content is a file name */
-#define HTTPPOST_PTRNAME (1<<2)     /* name is only stored pointer
-                                       do not free in formfree */
-#define HTTPPOST_PTRCONTENTS (1<<3) /* contents is only stored pointer
-                                       do not free in formfree */
-#define HTTPPOST_BUFFER (1<<4)      /* upload file from buffer */
-#define HTTPPOST_PTRBUFFER (1<<5)   /* upload file from pointer contents */
-#define HTTPPOST_CALLBACK (1<<6)    /* upload file contents by using the
-                                       regular read callback to get the data
-                                       and pass the given pointer as custom
-                                       pointer */
-
-  char *showfilename;               /* The file name to show. If not set, the
-                                       actual file name will be used (if this
-                                       is a file part) */
-  void *userp;                      /* custom pointer used for
-                                       HTTPPOST_CALLBACK posts */
-};
-
-typedef int (*curl_progress_callback)(void *clientp,
-                                      double dltotal,
-                                      double dlnow,
-                                      double ultotal,
-                                      double ulnow);
-
-#ifndef CURL_MAX_WRITE_SIZE
-  /* Tests have proven that 20K is a very bad buffer size for uploads on
-     Windows, while 16K for some odd reason performed a lot better.
-     We do the ifndef check to allow this value to easier be changed at build
-     time for those who feel adventurous. The practical minimum is about
-     400 bytes since libcurl uses a buffer of this size as a scratch area
-     (unrelated to network send operations). */
-#define CURL_MAX_WRITE_SIZE 16384
-#endif
-
-#ifndef CURL_MAX_HTTP_HEADER
-/* The only reason to have a max limit for this is to avoid the risk of a bad
-   server feeding libcurl with a never-ending header that will cause reallocs
-   infinitely */
-#define CURL_MAX_HTTP_HEADER (100*1024)
-#endif
-
-
-/* This is a magic return code for the write callback that, when returned,
-   will signal libcurl to pause receiving on the current transfer. */
-#define CURL_WRITEFUNC_PAUSE 0x10000001
-typedef size_t (*curl_write_callback)(char *buffer,
-                                      size_t size,
-                                      size_t nitems,
-                                      void *outstream);
-
-
-
-/* enumeration of file types */
-typedef enum {
-  CURLFILETYPE_FILE = 0,
-  CURLFILETYPE_DIRECTORY,
-  CURLFILETYPE_SYMLINK,
-  CURLFILETYPE_DEVICE_BLOCK,
-  CURLFILETYPE_DEVICE_CHAR,
-  CURLFILETYPE_NAMEDPIPE,
-  CURLFILETYPE_SOCKET,
-  CURLFILETYPE_DOOR, /* is possible only on Sun Solaris now */
-
-  CURLFILETYPE_UNKNOWN /* should never occur */
-} curlfiletype;
-
-#define CURLFINFOFLAG_KNOWN_FILENAME    (1<<0)
-#define CURLFINFOFLAG_KNOWN_FILETYPE    (1<<1)
-#define CURLFINFOFLAG_KNOWN_TIME        (1<<2)
-#define CURLFINFOFLAG_KNOWN_PERM        (1<<3)
-#define CURLFINFOFLAG_KNOWN_UID         (1<<4)
-#define CURLFINFOFLAG_KNOWN_GID         (1<<5)
-#define CURLFINFOFLAG_KNOWN_SIZE        (1<<6)
-#define CURLFINFOFLAG_KNOWN_HLINKCOUNT  (1<<7)
-
-/* Content of this structure depends on information which is known and is
-   achievable (e.g. by FTP LIST parsing). Please see the url_easy_setopt(3) man
-   page for callbacks returning this structure -- some fields are mandatory,
-   some others are optional. The FLAG field has special meaning. */
-struct curl_fileinfo {
-  char *filename;
-  curlfiletype filetype;
-  time_t time;
-  unsigned int perm;
-  int uid;
-  int gid;
-  curl_off_t size;
-  long int hardlinks;
-
-  struct {
-    /* If some of these fields is not NULL, it is a pointer to b_data. */
-    char *time;
-    char *perm;
-    char *user;
-    char *group;
-    char *target; /* pointer to the target filename of a symlink */
-  } strings;
-
-  unsigned int flags;
-
-  /* used internally */
-  char * b_data;
-  size_t b_size;
-  size_t b_used;
-};
-
-/* return codes for CURLOPT_CHUNK_BGN_FUNCTION */
-#define CURL_CHUNK_BGN_FUNC_OK      0
-#define CURL_CHUNK_BGN_FUNC_FAIL    1 /* tell the lib to end the task */
-#define CURL_CHUNK_BGN_FUNC_SKIP    2 /* skip this chunk over */
-
-/* if splitting of data transfer is enabled, this callback is called before
-   download of an individual chunk started. Note that parameter "remains" works
-   only for FTP wildcard downloading (for now), otherwise is not used */
-typedef long (*curl_chunk_bgn_callback)(const void *transfer_info,
-                                        void *ptr,
-                                        int remains);
-
-/* return codes for CURLOPT_CHUNK_END_FUNCTION */
-#define CURL_CHUNK_END_FUNC_OK      0
-#define CURL_CHUNK_END_FUNC_FAIL    1 /* tell the lib to end the task */
-
-/* If splitting of data transfer is enabled this callback is called after
-   download of an individual chunk finished.
-   Note! After this callback was set then it have to be called FOR ALL chunks.
-   Even if downloading of this chunk was skipped in CHUNK_BGN_FUNC.
-   This is the reason why we don't need "transfer_info" parameter in this
-   callback and we are not interested in "remains" parameter too. */
-typedef long (*curl_chunk_end_callback)(void *ptr);
-
-/* return codes for FNMATCHFUNCTION */
-#define CURL_FNMATCHFUNC_MATCH    0 /* string corresponds to the pattern */
-#define CURL_FNMATCHFUNC_NOMATCH  1 /* pattern doesn't match the string */
-#define CURL_FNMATCHFUNC_FAIL     2 /* an error occurred */
-
-/* callback type for wildcard downloading pattern matching. If the
-   string matches the pattern, return CURL_FNMATCHFUNC_MATCH value, etc. */
-typedef int (*curl_fnmatch_callback)(void *ptr,
-                                     const char *pattern,
-                                     const char *string);
-
-/* These are the return codes for the seek callbacks */
-#define CURL_SEEKFUNC_OK       0
-#define CURL_SEEKFUNC_FAIL     1 /* fail the entire transfer */
-#define CURL_SEEKFUNC_CANTSEEK 2 /* tell libcurl seeking can't be done, so
-                                    libcurl might try other means instead */
-typedef int (*curl_seek_callback)(void *instream,
-                                  curl_off_t offset,
-                                  int origin); /* 'whence' */
-
-/* This is a return code for the read callback that, when returned, will
-   signal libcurl to immediately abort the current transfer. */
-#define CURL_READFUNC_ABORT 0x10000000
-/* This is a return code for the read callback that, when returned, will
-   signal libcurl to pause sending data on the current transfer. */
-#define CURL_READFUNC_PAUSE 0x10000001
-
-typedef size_t (*curl_read_callback)(char *buffer,
-                                      size_t size,
-                                      size_t nitems,
-                                      void *instream);
-
-typedef enum  {
-  CURLSOCKTYPE_IPCXN, /* socket created for a specific IP connection */
-  CURLSOCKTYPE_LAST   /* never use */
-} curlsocktype;
-
-typedef int (*curl_sockopt_callback)(void *clientp,
-                                     curl_socket_t curlfd,
-                                     curlsocktype purpose);
-
-struct curl_sockaddr {
-  int family;
-  int socktype;
-  int protocol;
-  unsigned int addrlen; /* addrlen was a socklen_t type before 7.18.0 but it
-                           turned really ugly and painful on the systems that
-                           lack this type */
-  struct sockaddr addr;
-};
-
-typedef curl_socket_t
-(*curl_opensocket_callback)(void *clientp,
-                            curlsocktype purpose,
-                            struct curl_sockaddr *address);
-
-typedef enum {
-  CURLIOE_OK,            /* I/O operation successful */
-  CURLIOE_UNKNOWNCMD,    /* command was unknown to callback */
-  CURLIOE_FAILRESTART,   /* failed to restart the read */
-  CURLIOE_LAST           /* never use */
-} curlioerr;
-
-typedef enum  {
-  CURLIOCMD_NOP,         /* no operation */
-  CURLIOCMD_RESTARTREAD, /* restart the read stream from start */
-  CURLIOCMD_LAST         /* never use */
-} curliocmd;
-
-typedef curlioerr (*curl_ioctl_callback)(CURL *handle,
-                                         int cmd,
-                                         void *clientp);
-
-/*
- * The following typedef's are signatures of malloc, free, realloc, strdup and
- * calloc respectively.  Function pointers of these types can be passed to the
- * curl_global_init_mem() function to set user defined memory management
- * callback routines.
- */
-typedef void *(*curl_malloc_callback)(size_t size);
-typedef void (*curl_free_callback)(void *ptr);
-typedef void *(*curl_realloc_callback)(void *ptr, size_t size);
-typedef char *(*curl_strdup_callback)(const char *str);
-typedef void *(*curl_calloc_callback)(size_t nmemb, size_t size);
-
-/* the kind of data that is passed to information_callback*/
-typedef enum {
-  CURLINFO_TEXT = 0,
-  CURLINFO_HEADER_IN,    /* 1 */
-  CURLINFO_HEADER_OUT,   /* 2 */
-  CURLINFO_DATA_IN,      /* 3 */
-  CURLINFO_DATA_OUT,     /* 4 */
-  CURLINFO_SSL_DATA_IN,  /* 5 */
-  CURLINFO_SSL_DATA_OUT, /* 6 */
-  CURLINFO_END
-} curl_infotype;
-
-typedef int (*curl_debug_callback)
-       (CURL *handle,      /* the handle/transfer this concerns */
-        curl_infotype type, /* what kind of data */
-        char *data,        /* points to the data */
-        size_t size,       /* size of the data pointed to */
-        void *userptr);    /* whatever the user please */
-
-/* All possible error codes from all sorts of curl functions. Future versions
-   may return other values, stay prepared.
-
-   Always add new return codes last. Never *EVER* remove any. The return
-   codes must remain the same!
- */
-
-typedef enum {
-  CURLE_OK = 0,
-  CURLE_UNSUPPORTED_PROTOCOL,    /* 1 */
-  CURLE_FAILED_INIT,             /* 2 */
-  CURLE_URL_MALFORMAT,           /* 3 */
-  CURLE_OBSOLETE4,               /* 4 - NOT USED */
-  CURLE_COULDNT_RESOLVE_PROXY,   /* 5 */
-  CURLE_COULDNT_RESOLVE_HOST,    /* 6 */
-  CURLE_COULDNT_CONNECT,         /* 7 */
-  CURLE_FTP_WEIRD_SERVER_REPLY,  /* 8 */
-  CURLE_REMOTE_ACCESS_DENIED,    /* 9 a service was denied by the server
-                                    due to lack of access - when login fails
-                                    this is not returned. */
-  CURLE_OBSOLETE10,              /* 10 - NOT USED */
-  CURLE_FTP_WEIRD_PASS_REPLY,    /* 11 */
-  CURLE_OBSOLETE12,              /* 12 - NOT USED */
-  CURLE_FTP_WEIRD_PASV_REPLY,    /* 13 */
-  CURLE_FTP_WEIRD_227_FORMAT,    /* 14 */
-  CURLE_FTP_CANT_GET_HOST,       /* 15 */
-  CURLE_OBSOLETE16,              /* 16 - NOT USED */
-  CURLE_FTP_COULDNT_SET_TYPE,    /* 17 */
-  CURLE_PARTIAL_FILE,            /* 18 */
-  CURLE_FTP_COULDNT_RETR_FILE,   /* 19 */
-  CURLE_OBSOLETE20,              /* 20 - NOT USED */
-  CURLE_QUOTE_ERROR,             /* 21 - quote command failure */
-  CURLE_HTTP_RETURNED_ERROR,     /* 22 */
-  CURLE_WRITE_ERROR,             /* 23 */
-  CURLE_OBSOLETE24,              /* 24 - NOT USED */
-  CURLE_UPLOAD_FAILED,           /* 25 - failed upload "command" */
-  CURLE_READ_ERROR,              /* 26 - couldn't open/read from file */
-  CURLE_OUT_OF_MEMORY,           /* 27 */
-  /* Note: CURLE_OUT_OF_MEMORY may sometimes indicate a conversion error
-           instead of a memory allocation error if CURL_DOES_CONVERSIONS
-           is defined
-  */
-  CURLE_OPERATION_TIMEDOUT,      /* 28 - the timeout time was reached */
-  CURLE_OBSOLETE29,              /* 29 - NOT USED */
-  CURLE_FTP_PORT_FAILED,         /* 30 - FTP PORT operation failed */
-  CURLE_FTP_COULDNT_USE_REST,    /* 31 - the REST command failed */
-  CURLE_OBSOLETE32,              /* 32 - NOT USED */
-  CURLE_RANGE_ERROR,             /* 33 - RANGE "command" didn't work */
-  CURLE_HTTP_POST_ERROR,         /* 34 */
-  CURLE_SSL_CONNECT_ERROR,       /* 35 - wrong when connecting with SSL */
-  CURLE_BAD_DOWNLOAD_RESUME,     /* 36 - couldn't resume download */
-  CURLE_FILE_COULDNT_READ_FILE,  /* 37 */
-  CURLE_LDAP_CANNOT_BIND,        /* 38 */
-  CURLE_LDAP_SEARCH_FAILED,      /* 39 */
-  CURLE_OBSOLETE40,              /* 40 - NOT USED */
-  CURLE_FUNCTION_NOT_FOUND,      /* 41 */
-  CURLE_ABORTED_BY_CALLBACK,     /* 42 */
-  CURLE_BAD_FUNCTION_ARGUMENT,   /* 43 */
-  CURLE_OBSOLETE44,              /* 44 - NOT USED */
-  CURLE_INTERFACE_FAILED,        /* 45 - CURLOPT_INTERFACE failed */
-  CURLE_OBSOLETE46,              /* 46 - NOT USED */
-  CURLE_TOO_MANY_REDIRECTS ,     /* 47 - catch endless re-direct loops */
-  CURLE_UNKNOWN_TELNET_OPTION,   /* 48 - User specified an unknown option */
-  CURLE_TELNET_OPTION_SYNTAX ,   /* 49 - Malformed telnet option */
-  CURLE_OBSOLETE50,              /* 50 - NOT USED */
-  CURLE_PEER_FAILED_VERIFICATION, /* 51 - peer's certificate or fingerprint
-                                     wasn't verified fine */
-  CURLE_GOT_NOTHING,             /* 52 - when this is a specific error */
-  CURLE_SSL_ENGINE_NOTFOUND,     /* 53 - SSL crypto engine not found */
-  CURLE_SSL_ENGINE_SETFAILED,    /* 54 - can not set SSL crypto engine as
-                                    default */
-  CURLE_SEND_ERROR,              /* 55 - failed sending network data */
-  CURLE_RECV_ERROR,              /* 56 - failure in receiving network data */
-  CURLE_OBSOLETE57,              /* 57 - NOT IN USE */
-  CURLE_SSL_CERTPROBLEM,         /* 58 - problem with the local certificate */
-  CURLE_SSL_CIPHER,              /* 59 - couldn't use specified cipher */
-  CURLE_SSL_CACERT,              /* 60 - problem with the CA cert (path?) */
-  CURLE_BAD_CONTENT_ENCODING,    /* 61 - Unrecognized transfer encoding */
-  CURLE_LDAP_INVALID_URL,        /* 62 - Invalid LDAP URL */
-  CURLE_FILESIZE_EXCEEDED,       /* 63 - Maximum file size exceeded */
-  CURLE_USE_SSL_FAILED,          /* 64 - Requested FTP SSL level failed */
-  CURLE_SEND_FAIL_REWIND,        /* 65 - Sending the data requires a rewind
-                                    that failed */
-  CURLE_SSL_ENGINE_INITFAILED,   /* 66 - failed to initialise ENGINE */
-  CURLE_LOGIN_DENIED,            /* 67 - user, password or similar was not
-                                    accepted and we failed to login */
-  CURLE_TFTP_NOTFOUND,           /* 68 - file not found on server */
-  CURLE_TFTP_PERM,               /* 69 - permission problem on server */
-  CURLE_REMOTE_DISK_FULL,        /* 70 - out of disk space on server */
-  CURLE_TFTP_ILLEGAL,            /* 71 - Illegal TFTP operation */
-  CURLE_TFTP_UNKNOWNID,          /* 72 - Unknown transfer ID */
-  CURLE_REMOTE_FILE_EXISTS,      /* 73 - File already exists */
-  CURLE_TFTP_NOSUCHUSER,         /* 74 - No such user */
-  CURLE_CONV_FAILED,             /* 75 - conversion failed */
-  CURLE_CONV_REQD,               /* 76 - caller must register conversion
-                                    callbacks using curl_easy_setopt options
-                                    CURLOPT_CONV_FROM_NETWORK_FUNCTION,
-                                    CURLOPT_CONV_TO_NETWORK_FUNCTION, and
-                                    CURLOPT_CONV_FROM_UTF8_FUNCTION */
-  CURLE_SSL_CACERT_BADFILE,      /* 77 - could not load CACERT file, missing
-                                    or wrong format */
-  CURLE_REMOTE_FILE_NOT_FOUND,   /* 78 - remote file not found */
-  CURLE_SSH,                     /* 79 - error from the SSH layer, somewhat
-                                    generic so the error message will be of
-                                    interest when this has happened */
-
-  CURLE_SSL_SHUTDOWN_FAILED,     /* 80 - Failed to shut down the SSL
-                                    connection */
-  CURLE_AGAIN,                   /* 81 - socket is not ready for send/recv,
-                                    wait till it's ready and try again (Added
-                                    in 7.18.2) */
-  CURLE_SSL_CRL_BADFILE,         /* 82 - could not load CRL file, missing or
-                                    wrong format (Added in 7.19.0) */
-  CURLE_SSL_ISSUER_ERROR,        /* 83 - Issuer check failed.  (Added in
-                                    7.19.0) */
-  CURLE_FTP_PRET_FAILED,         /* 84 - a PRET command failed */
-  CURLE_RTSP_CSEQ_ERROR,         /* 85 - mismatch of RTSP CSeq numbers */
-  CURLE_RTSP_SESSION_ERROR,      /* 86 - mismatch of RTSP Session Identifiers */
-  CURLE_FTP_BAD_FILE_LIST,       /* 87 - unable to parse FTP file list */
-  CURLE_CHUNK_FAILED,            /* 88 - chunk callback reported error */
-
-  CURL_LAST /* never use! */
-} CURLcode;
-
-#ifndef CURL_NO_OLDIES /* define this to test if your app builds with all
-                          the obsolete stuff removed! */
-
-/* Backwards compatibility with older names */
-
-/* The following were added in 7.17.1 */
-/* These are scheduled to disappear by 2009 */
-#define CURLE_SSL_PEER_CERTIFICATE CURLE_PEER_FAILED_VERIFICATION
-
-/* The following were added in 7.17.0 */
-/* These are scheduled to disappear by 2009 */
-#define CURLE_OBSOLETE CURLE_OBSOLETE50 /* noone should be using this! */
-#define CURLE_BAD_PASSWORD_ENTERED CURLE_OBSOLETE46
-#define CURLE_BAD_CALLING_ORDER CURLE_OBSOLETE44
-#define CURLE_FTP_USER_PASSWORD_INCORRECT CURLE_OBSOLETE10
-#define CURLE_FTP_CANT_RECONNECT CURLE_OBSOLETE16
-#define CURLE_FTP_COULDNT_GET_SIZE CURLE_OBSOLETE32
-#define CURLE_FTP_COULDNT_SET_ASCII CURLE_OBSOLETE29
-#define CURLE_FTP_WEIRD_USER_REPLY CURLE_OBSOLETE12
-#define CURLE_FTP_WRITE_ERROR CURLE_OBSOLETE20
-#define CURLE_LIBRARY_NOT_FOUND CURLE_OBSOLETE40
-#define CURLE_MALFORMAT_USER CURLE_OBSOLETE24
-#define CURLE_SHARE_IN_USE CURLE_OBSOLETE57
-#define CURLE_URL_MALFORMAT_USER CURLE_OBSOLETE4
-
-#define CURLE_FTP_ACCESS_DENIED CURLE_REMOTE_ACCESS_DENIED
-#define CURLE_FTP_COULDNT_SET_BINARY CURLE_FTP_COULDNT_SET_TYPE
-#define CURLE_FTP_QUOTE_ERROR CURLE_QUOTE_ERROR
-#define CURLE_TFTP_DISKFULL CURLE_REMOTE_DISK_FULL
-#define CURLE_TFTP_EXISTS CURLE_REMOTE_FILE_EXISTS
-#define CURLE_HTTP_RANGE_ERROR CURLE_RANGE_ERROR
-#define CURLE_FTP_SSL_FAILED CURLE_USE_SSL_FAILED
-
-/* The following were added earlier */
-
-#define CURLE_OPERATION_TIMEOUTED CURLE_OPERATION_TIMEDOUT
-
-#define CURLE_HTTP_NOT_FOUND CURLE_HTTP_RETURNED_ERROR
-#define CURLE_HTTP_PORT_FAILED CURLE_INTERFACE_FAILED
-#define CURLE_FTP_COULDNT_STOR_FILE CURLE_UPLOAD_FAILED
-
-#define CURLE_FTP_PARTIAL_FILE CURLE_PARTIAL_FILE
-#define CURLE_FTP_BAD_DOWNLOAD_RESUME CURLE_BAD_DOWNLOAD_RESUME
-
-/* This was the error code 50 in 7.7.3 and a few earlier versions, this
-   is no longer used by libcurl but is instead #defined here only to not
-   make programs break */
-#define CURLE_ALREADY_COMPLETE 99999
-
-#endif /*!CURL_NO_OLDIES*/
-
-/* This prototype applies to all conversion callbacks */
-typedef CURLcode (*curl_conv_callback)(char *buffer, size_t length);
-
-typedef CURLcode (*curl_ssl_ctx_callback)(CURL *curl,    /* easy handle */
-                                          void *ssl_ctx, /* actually an
-                                                            OpenSSL SSL_CTX */
-                                          void *userptr);
-
-typedef enum {
-  CURLPROXY_HTTP = 0,   /* added in 7.10, new in 7.19.4 default is to use
-                           CONNECT HTTP/1.1 */
-  CURLPROXY_HTTP_1_0 = 1,   /* added in 7.19.4, force to use CONNECT
-                               HTTP/1.0  */
-  CURLPROXY_SOCKS4 = 4, /* support added in 7.15.2, enum existed already
-                           in 7.10 */
-  CURLPROXY_SOCKS5 = 5, /* added in 7.10 */
-  CURLPROXY_SOCKS4A = 6, /* added in 7.18.0 */
-  CURLPROXY_SOCKS5_HOSTNAME = 7 /* Use the SOCKS5 protocol but pass along the
-                                   host name rather than the IP address. added
-                                   in 7.18.0 */
-} curl_proxytype;  /* this enum was added in 7.10 */
-
-#define CURLAUTH_NONE         0       /* nothing */
-#define CURLAUTH_BASIC        (1<<0)  /* Basic (default) */
-#define CURLAUTH_DIGEST       (1<<1)  /* Digest */
-#define CURLAUTH_GSSNEGOTIATE (1<<2)  /* GSS-Negotiate */
-#define CURLAUTH_NTLM         (1<<3)  /* NTLM */
-#define CURLAUTH_DIGEST_IE    (1<<4)  /* Digest with IE flavour */
-#define CURLAUTH_ANY (~CURLAUTH_DIGEST_IE)  /* all fine types set */
-#define CURLAUTH_ANYSAFE (~(CURLAUTH_BASIC|CURLAUTH_DIGEST_IE))
-
-#define CURLSSH_AUTH_ANY       ~0     /* all types supported by the server */
-#define CURLSSH_AUTH_NONE      0      /* none allowed, silly but complete */
-#define CURLSSH_AUTH_PUBLICKEY (1<<0) /* public/private key files */
-#define CURLSSH_AUTH_PASSWORD  (1<<1) /* password */
-#define CURLSSH_AUTH_HOST      (1<<2) /* host key files */
-#define CURLSSH_AUTH_KEYBOARD  (1<<3) /* keyboard interactive */
-#define CURLSSH_AUTH_DEFAULT CURLSSH_AUTH_ANY
-
-#define CURL_ERROR_SIZE 256
-
-struct curl_khkey {
-  const char *key; /* points to a zero-terminated string encoded with base64
-                      if len is zero, otherwise to the "raw" data */
-  size_t len;
-  enum type {
-    CURLKHTYPE_UNKNOWN,
-    CURLKHTYPE_RSA1,
-    CURLKHTYPE_RSA,
-    CURLKHTYPE_DSS
-  } keytype;
-};
-
-/* this is the set of return values expected from the curl_sshkeycallback
-   callback */
-enum curl_khstat {
-  CURLKHSTAT_FINE_ADD_TO_FILE,
-  CURLKHSTAT_FINE,
-  CURLKHSTAT_REJECT, /* reject the connection, return an error */
-  CURLKHSTAT_DEFER,  /* do not accept it, but we can't answer right now so
-                        this causes a CURLE_DEFER error but otherwise the
-                        connection will be left intact etc */
-  CURLKHSTAT_LAST    /* not for use, only a marker for last-in-list */
-};
-
-/* this is the set of status codes pass in to the callback */
-enum curl_khmatch {
-  CURLKHMATCH_OK,       /* match */
-  CURLKHMATCH_MISMATCH, /* host found, key mismatch! */
-  CURLKHMATCH_MISSING,  /* no matching host/key found */
-  CURLKHMATCH_LAST      /* not for use, only a marker for last-in-list */
-};
-
-typedef int
-  (*curl_sshkeycallback) (CURL *easy,     /* easy handle */
-                          const struct curl_khkey *knownkey, /* known */
-                          const struct curl_khkey *foundkey, /* found */
-                          enum curl_khmatch, /* libcurl's view on the keys */
-                          void *clientp); /* custom pointer passed from app */
-
-/* parameter for the CURLOPT_USE_SSL option */
-typedef enum {
-  CURLUSESSL_NONE,    /* do not attempt to use SSL */
-  CURLUSESSL_TRY,     /* try using SSL, proceed anyway otherwise */
-  CURLUSESSL_CONTROL, /* SSL for the control connection or fail */
-  CURLUSESSL_ALL,     /* SSL for all communication or fail */
-  CURLUSESSL_LAST     /* not an option, never use */
-} curl_usessl;
-
-#ifndef CURL_NO_OLDIES /* define this to test if your app builds with all
-                          the obsolete stuff removed! */
-
-/* Backwards compatibility with older names */
-/* These are scheduled to disappear by 2009 */
-
-#define CURLFTPSSL_NONE CURLUSESSL_NONE
-#define CURLFTPSSL_TRY CURLUSESSL_TRY
-#define CURLFTPSSL_CONTROL CURLUSESSL_CONTROL
-#define CURLFTPSSL_ALL CURLUSESSL_ALL
-#define CURLFTPSSL_LAST CURLUSESSL_LAST
-#define curl_ftpssl curl_usessl
-#endif /*!CURL_NO_OLDIES*/
-
-/* parameter for the CURLOPT_FTP_SSL_CCC option */
-typedef enum {
-  CURLFTPSSL_CCC_NONE,    /* do not send CCC */
-  CURLFTPSSL_CCC_PASSIVE, /* Let the server initiate the shutdown */
-  CURLFTPSSL_CCC_ACTIVE,  /* Initiate the shutdown */
-  CURLFTPSSL_CCC_LAST     /* not an option, never use */
-} curl_ftpccc;
-
-/* parameter for the CURLOPT_FTPSSLAUTH option */
-typedef enum {
-  CURLFTPAUTH_DEFAULT, /* let libcurl decide */
-  CURLFTPAUTH_SSL,     /* use "AUTH SSL" */
-  CURLFTPAUTH_TLS,     /* use "AUTH TLS" */
-  CURLFTPAUTH_LAST /* not an option, never use */
-} curl_ftpauth;
-
-/* parameter for the CURLOPT_FTP_CREATE_MISSING_DIRS option */
-typedef enum {
-  CURLFTP_CREATE_DIR_NONE,  /* do NOT create missing dirs! */
-  CURLFTP_CREATE_DIR,       /* (FTP/SFTP) if CWD fails, try MKD and then CWD
-                               again if MKD succeeded, for SFTP this does
-                               similar magic */
-  CURLFTP_CREATE_DIR_RETRY, /* (FTP only) if CWD fails, try MKD and then CWD
-                               again even if MKD failed! */
-  CURLFTP_CREATE_DIR_LAST   /* not an option, never use */
-} curl_ftpcreatedir;
-
-/* parameter for the CURLOPT_FTP_FILEMETHOD option */
-typedef enum {
-  CURLFTPMETHOD_DEFAULT,   /* let libcurl pick */
-  CURLFTPMETHOD_MULTICWD,  /* single CWD operation for each path part */
-  CURLFTPMETHOD_NOCWD,     /* no CWD at all */
-  CURLFTPMETHOD_SINGLECWD, /* one CWD to full dir, then work on file */
-  CURLFTPMETHOD_LAST       /* not an option, never use */
-} curl_ftpmethod;
-
-/* CURLPROTO_ defines are for the CURLOPT_*PROTOCOLS options */
-#define CURLPROTO_HTTP   (1<<0)
-#define CURLPROTO_HTTPS  (1<<1)
-#define CURLPROTO_FTP    (1<<2)
-#define CURLPROTO_FTPS   (1<<3)
-#define CURLPROTO_SCP    (1<<4)
-#define CURLPROTO_SFTP   (1<<5)
-#define CURLPROTO_TELNET (1<<6)
-#define CURLPROTO_LDAP   (1<<7)
-#define CURLPROTO_LDAPS  (1<<8)
-#define CURLPROTO_DICT   (1<<9)
-#define CURLPROTO_FILE   (1<<10)
-#define CURLPROTO_TFTP   (1<<11)
-#define CURLPROTO_IMAP   (1<<12)
-#define CURLPROTO_IMAPS  (1<<13)
-#define CURLPROTO_POP3   (1<<14)
-#define CURLPROTO_POP3S  (1<<15)
-#define CURLPROTO_SMTP   (1<<16)
-#define CURLPROTO_SMTPS  (1<<17)
-#define CURLPROTO_RTSP   (1<<18)
-#define CURLPROTO_RTMP   (1<<19)
-#define CURLPROTO_RTMPT  (1<<20)
-#define CURLPROTO_RTMPE  (1<<21)
-#define CURLPROTO_RTMPTE (1<<22)
-#define CURLPROTO_RTMPS  (1<<23)
-#define CURLPROTO_RTMPTS (1<<24)
-#define CURLPROTO_GOPHER (1<<25)
-#define CURLPROTO_ALL    (~0) /* enable everything */
-
-/* long may be 32 or 64 bits, but we should never depend on anything else
-   but 32 */
-#define CURLOPTTYPE_LONG          0
-#define CURLOPTTYPE_OBJECTPOINT   10000
-#define CURLOPTTYPE_FUNCTIONPOINT 20000
-#define CURLOPTTYPE_OFF_T         30000
-
-/* name is uppercase CURLOPT_<name>,
-   type is one of the defined CURLOPTTYPE_<type>
-   number is unique identifier */
-#ifdef CINIT
-#undef CINIT
-#endif
-
-#ifdef CURL_ISOCPP
-#define CINIT(name,type,number) CURLOPT_ ## name = CURLOPTTYPE_ ## type + number
-#else
-/* The macro "##" is ISO C, we assume pre-ISO C doesn't support it. */
-#define LONG          CURLOPTTYPE_LONG
-#define OBJECTPOINT   CURLOPTTYPE_OBJECTPOINT
-#define FUNCTIONPOINT CURLOPTTYPE_FUNCTIONPOINT
-#define OFF_T         CURLOPTTYPE_OFF_T
-#define CINIT(name,type,number) CURLOPT_/**/name = type + number
-#endif
-
-/*
- * This macro-mania below setups the CURLOPT_[what] enum, to be used with
- * curl_easy_setopt(). The first argument in the CINIT() macro is the [what]
- * word.
- */
-
-typedef enum {
-  /* This is the FILE * or void * the regular output should be written to. */
-  CINIT(FILE, OBJECTPOINT, 1),
-
-  /* The full URL to get/put */
-  CINIT(URL,  OBJECTPOINT, 2),
-
-  /* Port number to connect to, if other than default. */
-  CINIT(PORT, LONG, 3),
-
-  /* Name of proxy to use. */
-  CINIT(PROXY, OBJECTPOINT, 4),
-
-  /* "name:password" to use when fetching. */
-  CINIT(USERPWD, OBJECTPOINT, 5),
-
-  /* "name:password" to use with proxy. */
-  CINIT(PROXYUSERPWD, OBJECTPOINT, 6),
-
-  /* Range to get, specified as an ASCII string. */
-  CINIT(RANGE, OBJECTPOINT, 7),
-
-  /* not used */
-
-  /* Specified file stream to upload from (use as input): */
-  CINIT(INFILE, OBJECTPOINT, 9),
-
-  /* Buffer to receive error messages in, must be at least CURL_ERROR_SIZE
-   * bytes big. If this is not used, error messages go to stderr instead: */
-  CINIT(ERRORBUFFER, OBJECTPOINT, 10),
-
-  /* Function that will be called to store the output (instead of fwrite). The
-   * parameters will use fwrite() syntax, make sure to follow them. */
-  CINIT(WRITEFUNCTION, FUNCTIONPOINT, 11),
-
-  /* Function that will be called to read the input (instead of fread). The
-   * parameters will use fread() syntax, make sure to follow them. */
-  CINIT(READFUNCTION, FUNCTIONPOINT, 12),
-
-  /* Time-out the read operation after this amount of seconds */
-  CINIT(TIMEOUT, LONG, 13),
-
-  /* If the CURLOPT_INFILE is used, this can be used to inform libcurl about
-   * how large the file being sent really is. That allows better error
-   * checking and better verifies that the upload was successful. -1 means
-   * unknown size.
-   *
-   * For large file support, there is also a _LARGE version of the key
-   * which takes an off_t type, allowing platforms with larger off_t
-   * sizes to handle larger files.  See below for INFILESIZE_LARGE.
-   */
-  CINIT(INFILESIZE, LONG, 14),
-
-  /* POST static input fields. */
-  CINIT(POSTFIELDS, OBJECTPOINT, 15),
-
-  /* Set the referrer page (needed by some CGIs) */
-  CINIT(REFERER, OBJECTPOINT, 16),
-
-  /* Set the FTP PORT string (interface name, named or numerical IP address)
-     Use i.e '-' to use default address. */
-  CINIT(FTPPORT, OBJECTPOINT, 17),
-
-  /* Set the User-Agent string (examined by some CGIs) */
-  CINIT(USERAGENT, OBJECTPOINT, 18),
-
-  /* If the download receives less than "low speed limit" bytes/second
-   * during "low speed time" seconds, the operations is aborted.
-   * You could i.e if you have a pretty high speed connection, abort if
-   * it is less than 2000 bytes/sec during 20 seconds.
-   */
-
-  /* Set the "low speed limit" */
-  CINIT(LOW_SPEED_LIMIT, LONG, 19),
-
-  /* Set the "low speed time" */
-  CINIT(LOW_SPEED_TIME, LONG, 20),
-
-  /* Set the continuation offset.
-   *
-   * Note there is also a _LARGE version of this key which uses
-   * off_t types, allowing for large file offsets on platforms which
-   * use larger-than-32-bit off_t's.  Look below for RESUME_FROM_LARGE.
-   */
-  CINIT(RESUME_FROM, LONG, 21),
-
-  /* Set cookie in request: */
-  CINIT(COOKIE, OBJECTPOINT, 22),
-
-  /* This points to a linked list of headers, struct curl_slist kind */
-  CINIT(HTTPHEADER, OBJECTPOINT, 23),
-
-  /* This points to a linked list of post entries, struct curl_httppost */
-  CINIT(HTTPPOST, OBJECTPOINT, 24),
-
-  /* name of the file keeping your private SSL-certificate */
-  CINIT(SSLCERT, OBJECTPOINT, 25),
-
-  /* password for the SSL or SSH private key */
-  CINIT(KEYPASSWD, OBJECTPOINT, 26),
-
-  /* send TYPE parameter? */
-  CINIT(CRLF, LONG, 27),
-
-  /* send linked-list of QUOTE commands */
-  CINIT(QUOTE, OBJECTPOINT, 28),
-
-  /* send FILE * or void * to store headers to, if you use a callback it
-     is simply passed to the callback unmodified */
-  CINIT(WRITEHEADER, OBJECTPOINT, 29),
-
-  /* point to a file to read the initial cookies from, also enables
-     "cookie awareness" */
-  CINIT(COOKIEFILE, OBJECTPOINT, 31),
-
-  /* What version to specifically try to use.
-     See CURL_SSLVERSION defines below. */
-  CINIT(SSLVERSION, LONG, 32),
-
-  /* What kind of HTTP time condition to use, see defines */
-  CINIT(TIMECONDITION, LONG, 33),
-
-  /* Time to use with the above condition. Specified in number of seconds
-     since 1 Jan 1970 */
-  CINIT(TIMEVALUE, LONG, 34),
-
-  /* 35 = OBSOLETE */
-
-  /* Custom request, for customizing the get command like
-     HTTP: DELETE, TRACE and others
-     FTP: to use a different list command
-     */
-  CINIT(CUSTOMREQUEST, OBJECTPOINT, 36),
-
-  /* HTTP request, for odd commands like DELETE, TRACE and others */
-  CINIT(STDERR, OBJECTPOINT, 37),
-
-  /* 38 is not used */
-
-  /* send linked-list of post-transfer QUOTE commands */
-  CINIT(POSTQUOTE, OBJECTPOINT, 39),
-
-  /* Pass a pointer to string of the output using full variable-replacement
-     as described elsewhere. */
-  CINIT(WRITEINFO, OBJECTPOINT, 40),
-
-  CINIT(VERBOSE, LONG, 41),      /* talk a lot */
-  CINIT(HEADER, LONG, 42),       /* throw the header out too */
-  CINIT(NOPROGRESS, LONG, 43),   /* shut off the progress meter */
-  CINIT(NOBODY, LONG, 44),       /* use HEAD to get http document */
-  CINIT(FAILONERROR, LONG, 45),  /* no output on http error codes >= 300 */
-  CINIT(UPLOAD, LONG, 46),       /* this is an upload */
-  CINIT(POST, LONG, 47),         /* HTTP POST method */
-  CINIT(DIRLISTONLY, LONG, 48),  /* return bare names when listing directories */
-
-  CINIT(APPEND, LONG, 50),       /* Append instead of overwrite on upload! */
-
-  /* Specify whether to read the user+password from the .netrc or the URL.
-   * This must be one of the CURL_NETRC_* enums below. */
-  CINIT(NETRC, LONG, 51),
-
-  CINIT(FOLLOWLOCATION, LONG, 52),  /* use Location: Luke! */
-
-  CINIT(TRANSFERTEXT, LONG, 53), /* transfer data in text/ASCII format */
-  CINIT(PUT, LONG, 54),          /* HTTP PUT */
-
-  /* 55 = OBSOLETE */
-
-  /* Function that will be called instead of the internal progress display
-   * function. This function should be defined as the curl_progress_callback
-   * prototype defines. */
-  CINIT(PROGRESSFUNCTION, FUNCTIONPOINT, 56),
-
-  /* Data passed to the progress callback */
-  CINIT(PROGRESSDATA, OBJECTPOINT, 57),
-
-  /* We want the referrer field set automatically when following locations */
-  CINIT(AUTOREFERER, LONG, 58),
-
-  /* Port of the proxy, can be set in the proxy string as well with:
-     "[host]:[port]" */
-  CINIT(PROXYPORT, LONG, 59),
-
-  /* size of the POST input data, if strlen() is not good to use */
-  CINIT(POSTFIELDSIZE, LONG, 60),
-
-  /* tunnel non-http operations through a HTTP proxy */
-  CINIT(HTTPPROXYTUNNEL, LONG, 61),
-
-  /* Set the interface string to use as outgoing network interface */
-  CINIT(INTERFACE, OBJECTPOINT, 62),
-
-  /* Set the krb4/5 security level, this also enables krb4/5 awareness.  This
-   * is a string, 'clear', 'safe', 'confidential' or 'private'.  If the string
-   * is set but doesn't match one of these, 'private' will be used.  */
-  CINIT(KRBLEVEL, OBJECTPOINT, 63),
-
-  /* Set if we should verify the peer in ssl handshake, set 1 to verify. */
-  CINIT(SSL_VERIFYPEER, LONG, 64),
-
-  /* The CApath or CAfile used to validate the peer certificate
-     this option is used only if SSL_VERIFYPEER is true */
-  CINIT(CAINFO, OBJECTPOINT, 65),
-
-  /* 66 = OBSOLETE */
-  /* 67 = OBSOLETE */
-
-  /* Maximum number of http redirects to follow */
-  CINIT(MAXREDIRS, LONG, 68),
-
-  /* Pass a long set to 1 to get the date of the requested document (if
-     possible)! Pass a zero to shut it off. */
-  CINIT(FILETIME, LONG, 69),
-
-  /* This points to a linked list of telnet options */
-  CINIT(TELNETOPTIONS, OBJECTPOINT, 70),
-
-  /* Max amount of cached alive connections */
-  CINIT(MAXCONNECTS, LONG, 71),
-
-  /* What policy to use when closing connections when the cache is filled
-     up */
-  CINIT(CLOSEPOLICY, LONG, 72),
-
-  /* 73 = OBSOLETE */
-
-  /* Set to explicitly use a new connection for the upcoming transfer.
-     Do not use this unless you're absolutely sure of this, as it makes the
-     operation slower and is less friendly for the network. */
-  CINIT(FRESH_CONNECT, LONG, 74),
-
-  /* Set to explicitly forbid the upcoming transfer's connection to be re-used
-     when done. Do not use this unless you're absolutely sure of this, as it
-     makes the operation slower and is less friendly for the network. */
-  CINIT(FORBID_REUSE, LONG, 75),
-
-  /* Set to a file name that contains random data for libcurl to use to
-     seed the random engine when doing SSL connects. */
-  CINIT(RANDOM_FILE, OBJECTPOINT, 76),
-
-  /* Set to the Entropy Gathering Daemon socket pathname */
-  CINIT(EGDSOCKET, OBJECTPOINT, 77),
-
-  /* Time-out connect operations after this amount of seconds, if connects
-     are OK within this time, then fine... This only aborts the connect
-     phase. [Only works on unix-style/SIGALRM operating systems] */
-  CINIT(CONNECTTIMEOUT, LONG, 78),
-
-  /* Function that will be called to store headers (instead of fwrite). The
-   * parameters will use fwrite() syntax, make sure to follow them. */
-  CINIT(HEADERFUNCTION, FUNCTIONPOINT, 79),
-
-  /* Set this to force the HTTP request to get back to GET. Only really usable
-     if POST, PUT or a custom request have been used first.
-   */
-  CINIT(HTTPGET, LONG, 80),
-
-  /* Set if we should verify the Common name from the peer certificate in ssl
-   * handshake, set 1 to check existence, 2 to ensure that it matches the
-   * provided hostname. */
-  CINIT(SSL_VERIFYHOST, LONG, 81),
-
-  /* Specify which file name to write all known cookies in after completed
-     operation. Set file name to "-" (dash) to make it go to stdout. */
-  CINIT(COOKIEJAR, OBJECTPOINT, 82),
-
-  /* Specify which SSL ciphers to use */
-  CINIT(SSL_CIPHER_LIST, OBJECTPOINT, 83),
-
-  /* Specify which HTTP version to use! This must be set to one of the
-     CURL_HTTP_VERSION* enums set below. */
-  CINIT(HTTP_VERSION, LONG, 84),
-
-  /* Specifically switch on or off the FTP engine's use of the EPSV command. By
-     default, that one will always be attempted before the more traditional
-     PASV command. */
-  CINIT(FTP_USE_EPSV, LONG, 85),
-
-  /* type of the file keeping your SSL-certificate ("DER", "PEM", "ENG") */
-  CINIT(SSLCERTTYPE, OBJECTPOINT, 86),
-
-  /* name of the file keeping your private SSL-key */
-  CINIT(SSLKEY, OBJECTPOINT, 87),
-
-  /* type of the file keeping your private SSL-key ("DER", "PEM", "ENG") */
-  CINIT(SSLKEYTYPE, OBJECTPOINT, 88),
-
-  /* crypto engine for the SSL-sub system */
-  CINIT(SSLENGINE, OBJECTPOINT, 89),
-
-  /* set the crypto engine for the SSL-sub system as default
-     the param has no meaning...
-   */
-  CINIT(SSLENGINE_DEFAULT, LONG, 90),
-
-  /* Non-zero value means to use the global dns cache */
-  CINIT(DNS_USE_GLOBAL_CACHE, LONG, 91), /* To become OBSOLETE soon */
-
-  /* DNS cache timeout */
-  CINIT(DNS_CACHE_TIMEOUT, LONG, 92),
-
-  /* send linked-list of pre-transfer QUOTE commands */
-  CINIT(PREQUOTE, OBJECTPOINT, 93),
-
-  /* set the debug function */
-  CINIT(DEBUGFUNCTION, FUNCTIONPOINT, 94),
-
-  /* set the data for the debug function */
-  CINIT(DEBUGDATA, OBJECTPOINT, 95),
-
-  /* mark this as start of a cookie session */
-  CINIT(COOKIESESSION, LONG, 96),
-
-  /* The CApath directory used to validate the peer certificate
-     this option is used only if SSL_VERIFYPEER is true */
-  CINIT(CAPATH, OBJECTPOINT, 97),
-
-  /* Instruct libcurl to use a smaller receive buffer */
-  CINIT(BUFFERSIZE, LONG, 98),
-
-  /* Instruct libcurl to not use any signal/alarm handlers, even when using
-     timeouts. This option is useful for multi-threaded applications.
-     See libcurl-the-guide for more background information. */
-  CINIT(NOSIGNAL, LONG, 99),
-
-  /* Provide a CURLShare for mutexing non-ts data */
-  CINIT(SHARE, OBJECTPOINT, 100),
-
-  /* indicates type of proxy. accepted values are CURLPROXY_HTTP (default),
-     CURLPROXY_SOCKS4, CURLPROXY_SOCKS4A and CURLPROXY_SOCKS5. */
-  CINIT(PROXYTYPE, LONG, 101),
-
-  /* Set the Accept-Encoding string. Use this to tell a server you would like
-     the response to be compressed. */
-  CINIT(ENCODING, OBJECTPOINT, 102),
-
-  /* Set pointer to private data */
-  CINIT(PRIVATE, OBJECTPOINT, 103),
-
-  /* Set aliases for HTTP 200 in the HTTP Response header */
-  CINIT(HTTP200ALIASES, OBJECTPOINT, 104),
-
-  /* Continue to send authentication (user+password) when following locations,
-     even when hostname changed. This can potentially send off the name
-     and password to whatever host the server decides. */
-  CINIT(UNRESTRICTED_AUTH, LONG, 105),
-
-  /* Specifically switch on or off the FTP engine's use of the EPRT command ( it
-     also disables the LPRT attempt). By default, those ones will always be
-     attempted before the good old traditional PORT command. */
-  CINIT(FTP_USE_EPRT, LONG, 106),
-
-  /* Set this to a bitmask value to enable the particular authentications
-     methods you like. Use this in combination with CURLOPT_USERPWD.
-     Note that setting multiple bits may cause extra network round-trips. */
-  CINIT(HTTPAUTH, LONG, 107),
-
-  /* Set the ssl context callback function, currently only for OpenSSL ssl_ctx
-     in second argument. The function must be matching the
-     curl_ssl_ctx_callback proto. */
-  CINIT(SSL_CTX_FUNCTION, FUNCTIONPOINT, 108),
-
-  /* Set the userdata for the ssl context callback function's third
-     argument */
-  CINIT(SSL_CTX_DATA, OBJECTPOINT, 109),
-
-  /* FTP Option that causes missing dirs to be created on the remote server.
-     In 7.19.4 we introduced the convenience enums for this option using the
-     CURLFTP_CREATE_DIR prefix.
-  */
-  CINIT(FTP_CREATE_MISSING_DIRS, LONG, 110),
-
-  /* Set this to a bitmask value to enable the particular authentications
-     methods you like. Use this in combination with CURLOPT_PROXYUSERPWD.
-     Note that setting multiple bits may cause extra network round-trips. */
-  CINIT(PROXYAUTH, LONG, 111),
-
-  /* FTP option that changes the timeout, in seconds, associated with
-     getting a response.  This is different from transfer timeout time and
-     essentially places a demand on the FTP server to acknowledge commands
-     in a timely manner. */
-  CINIT(FTP_RESPONSE_TIMEOUT, LONG, 112),
-#define CURLOPT_SERVER_RESPONSE_TIMEOUT CURLOPT_FTP_RESPONSE_TIMEOUT
-
-  /* Set this option to one of the CURL_IPRESOLVE_* defines (see below) to
-     tell libcurl to resolve names to those IP versions only. This only has
-     affect on systems with support for more than one, i.e IPv4 _and_ IPv6. */
-  CINIT(IPRESOLVE, LONG, 113),
-
-  /* Set this option to limit the size of a file that will be downloaded from
-     an HTTP or FTP server.
-
-     Note there is also _LARGE version which adds large file support for
-     platforms which have larger off_t sizes.  See MAXFILESIZE_LARGE below. */
-  CINIT(MAXFILESIZE, LONG, 114),
-
-  /* See the comment for INFILESIZE above, but in short, specifies
-   * the size of the file being uploaded.  -1 means unknown.
-   */
-  CINIT(INFILESIZE_LARGE, OFF_T, 115),
-
-  /* Sets the continuation offset.  There is also a LONG version of this;
-   * look above for RESUME_FROM.
-   */
-  CINIT(RESUME_FROM_LARGE, OFF_T, 116),
-
-  /* Sets the maximum size of data that will be downloaded from
-   * an HTTP or FTP server.  See MAXFILESIZE above for the LONG version.
-   */
-  CINIT(MAXFILESIZE_LARGE, OFF_T, 117),
-
-  /* Set this option to the file name of your .netrc file you want libcurl
-     to parse (using the CURLOPT_NETRC option). If not set, libcurl will do
-     a poor attempt to find the user's home directory and check for a .netrc
-     file in there. */
-  CINIT(NETRC_FILE, OBJECTPOINT, 118),
-
-  /* Enable SSL/TLS for FTP, pick one of:
-     CURLFTPSSL_TRY     - try using SSL, proceed anyway otherwise
-     CURLFTPSSL_CONTROL - SSL for the control connection or fail
-     CURLFTPSSL_ALL     - SSL for all communication or fail
-  */
-  CINIT(USE_SSL, LONG, 119),
-
-  /* The _LARGE version of the standard POSTFIELDSIZE option */
-  CINIT(POSTFIELDSIZE_LARGE, OFF_T, 120),
-
-  /* Enable/disable the TCP Nagle algorithm */
-  CINIT(TCP_NODELAY, LONG, 121),
-
-  /* 122 OBSOLETE, used in 7.12.3. Gone in 7.13.0 */
-  /* 123 OBSOLETE. Gone in 7.16.0 */
-  /* 124 OBSOLETE, used in 7.12.3. Gone in 7.13.0 */
-  /* 125 OBSOLETE, used in 7.12.3. Gone in 7.13.0 */
-  /* 126 OBSOLETE, used in 7.12.3. Gone in 7.13.0 */
-  /* 127 OBSOLETE. Gone in 7.16.0 */
-  /* 128 OBSOLETE. Gone in 7.16.0 */
-
-  /* When FTP over SSL/TLS is selected (with CURLOPT_USE_SSL), this option
-     can be used to change libcurl's default action which is to first try
-     "AUTH SSL" and then "AUTH TLS" in this order, and proceed when a OK
-     response has been received.
-
-     Available parameters are:
-     CURLFTPAUTH_DEFAULT - let libcurl decide
-     CURLFTPAUTH_SSL     - try "AUTH SSL" first, then TLS
-     CURLFTPAUTH_TLS     - try "AUTH TLS" first, then SSL
-  */
-  CINIT(FTPSSLAUTH, LONG, 129),
-
-  CINIT(IOCTLFUNCTION, FUNCTIONPOINT, 130),
-  CINIT(IOCTLDATA, OBJECTPOINT, 131),
-
-  /* 132 OBSOLETE. Gone in 7.16.0 */
-  /* 133 OBSOLETE. Gone in 7.16.0 */
-
-  /* zero terminated string for pass on to the FTP server when asked for
-     "account" info */
-  CINIT(FTP_ACCOUNT, OBJECTPOINT, 134),
-
-  /* feed cookies into cookie engine */
-  CINIT(COOKIELIST, OBJECTPOINT, 135),
-
-  /* ignore Content-Length */
-  CINIT(IGNORE_CONTENT_LENGTH, LONG, 136),
-
-  /* Set to non-zero to skip the IP address received in a 227 PASV FTP server
-     response. Typically used for FTP-SSL purposes but is not restricted to
-     that. libcurl will then instead use the same IP address it used for the
-     control connection. */
-  CINIT(FTP_SKIP_PASV_IP, LONG, 137),
-
-  /* Select "file method" to use when doing FTP, see the curl_ftpmethod
-     above. */
-  CINIT(FTP_FILEMETHOD, LONG, 138),
-
-  /* Local port number to bind the socket to */
-  CINIT(LOCALPORT, LONG, 139),
-
-  /* Number of ports to try, including the first one set with LOCALPORT.
-     Thus, setting it to 1 will make no additional attempts but the first.
-  */
-  CINIT(LOCALPORTRANGE, LONG, 140),
-
-  /* no transfer, set up connection and let application use the socket by
-     extracting it with CURLINFO_LASTSOCKET */
-  CINIT(CONNECT_ONLY, LONG, 141),
-
-  /* Function that will be called to convert from the
-     network encoding (instead of using the iconv calls in libcurl) */
-  CINIT(CONV_FROM_NETWORK_FUNCTION, FUNCTIONPOINT, 142),
-
-  /* Function that will be called to convert to the
-     network encoding (instead of using the iconv calls in libcurl) */
-  CINIT(CONV_TO_NETWORK_FUNCTION, FUNCTIONPOINT, 143),
-
-  /* Function that will be called to convert from UTF8
-     (instead of using the iconv calls in libcurl)
-     Note that this is used only for SSL certificate processing */
-  CINIT(CONV_FROM_UTF8_FUNCTION, FUNCTIONPOINT, 144),
-
-  /* if the connection proceeds too quickly then need to slow it down */
-  /* limit-rate: maximum number of bytes per second to send or receive */
-  CINIT(MAX_SEND_SPEED_LARGE, OFF_T, 145),
-  CINIT(MAX_RECV_SPEED_LARGE, OFF_T, 146),
-
-  /* Pointer to command string to send if USER/PASS fails. */
-  CINIT(FTP_ALTERNATIVE_TO_USER, OBJECTPOINT, 147),
-
-  /* callback function for setting socket options */
-  CINIT(SOCKOPTFUNCTION, FUNCTIONPOINT, 148),
-  CINIT(SOCKOPTDATA, OBJECTPOINT, 149),
-
-  /* set to 0 to disable session ID re-use for this transfer, default is
-     enabled (== 1) */
-  CINIT(SSL_SESSIONID_CACHE, LONG, 150),
-
-  /* allowed SSH authentication methods */
-  CINIT(SSH_AUTH_TYPES, LONG, 151),
-
-  /* Used by scp/sftp to do public/private key authentication */
-  CINIT(SSH_PUBLIC_KEYFILE, OBJECTPOINT, 152),
-  CINIT(SSH_PRIVATE_KEYFILE, OBJECTPOINT, 153),
-
-  /* Send CCC (Clear Command Channel) after authentication */
-  CINIT(FTP_SSL_CCC, LONG, 154),
-
-  /* Same as TIMEOUT and CONNECTTIMEOUT, but with ms resolution */
-  CINIT(TIMEOUT_MS, LONG, 155),
-  CINIT(CONNECTTIMEOUT_MS, LONG, 156),
-
-  /* set to zero to disable the libcurl's decoding and thus pass the raw body
-     data to the application even when it is encoded/compressed */
-  CINIT(HTTP_TRANSFER_DECODING, LONG, 157),
-  CINIT(HTTP_CONTENT_DECODING, LONG, 158),
-
-  /* Permission used when creating new files and directories on the remote
-     server for protocols that support it, SFTP/SCP/FILE */
-  CINIT(NEW_FILE_PERMS, LONG, 159),
-  CINIT(NEW_DIRECTORY_PERMS, LONG, 160),
-
-  /* Set the behaviour of POST when redirecting. Values must be set to one
-     of CURL_REDIR* defines below. This used to be called CURLOPT_POST301 */
-  CINIT(POSTREDIR, LONG, 161),
-
-  /* used by scp/sftp to verify the host's public key */
-  CINIT(SSH_HOST_PUBLIC_KEY_MD5, OBJECTPOINT, 162),
-
-  /* Callback function for opening socket (instead of socket(2)). Optionally,
-     callback is able change the address or refuse to connect returning
-     CURL_SOCKET_BAD.  The callback should have type
-     curl_opensocket_callback */
-  CINIT(OPENSOCKETFUNCTION, FUNCTIONPOINT, 163),
-  CINIT(OPENSOCKETDATA, OBJECTPOINT, 164),
-
-  /* POST volatile input fields. */
-  CINIT(COPYPOSTFIELDS, OBJECTPOINT, 165),
-
-  /* set transfer mode (;type=<a|i>) when doing FTP via an HTTP proxy */
-  CINIT(PROXY_TRANSFER_MODE, LONG, 166),
-
-  /* Callback function for seeking in the input stream */
-  CINIT(SEEKFUNCTION, FUNCTIONPOINT, 167),
-  CINIT(SEEKDATA, OBJECTPOINT, 168),
-
-  /* CRL file */
-  CINIT(CRLFILE, OBJECTPOINT, 169),
-
-  /* Issuer certificate */
-  CINIT(ISSUERCERT, OBJECTPOINT, 170),
-
-  /* (IPv6) Address scope */
-  CINIT(ADDRESS_SCOPE, LONG, 171),
-
-  /* Collect certificate chain info and allow it to get retrievable with
-     CURLINFO_CERTINFO after the transfer is complete. (Unfortunately) only
-     working with OpenSSL-powered builds. */
-  CINIT(CERTINFO, LONG, 172),
-
-  /* "name" and "pwd" to use when fetching. */
-  CINIT(USERNAME, OBJECTPOINT, 173),
-  CINIT(PASSWORD, OBJECTPOINT, 174),
-
-    /* "name" and "pwd" to use with Proxy when fetching. */
-  CINIT(PROXYUSERNAME, OBJECTPOINT, 175),
-  CINIT(PROXYPASSWORD, OBJECTPOINT, 176),
-
-  /* Comma separated list of hostnames defining no-proxy zones. These should
-     match both hostnames directly, and hostnames within a domain. For
-     example, local.com will match local.com and www.local.com, but NOT
-     notlocal.com or www.notlocal.com. For compatibility with other
-     implementations of this, .local.com will be considered to be the same as
-     local.com. A single * is the only valid wildcard, and effectively
-     disables the use of proxy. */
-  CINIT(NOPROXY, OBJECTPOINT, 177),
-
-  /* block size for TFTP transfers */
-  CINIT(TFTP_BLKSIZE, LONG, 178),
-
-  /* Socks Service */
-  CINIT(SOCKS5_GSSAPI_SERVICE, OBJECTPOINT, 179),
-
-  /* Socks Service */
-  CINIT(SOCKS5_GSSAPI_NEC, LONG, 180),
-
-  /* set the bitmask for the protocols that are allowed to be used for the
-     transfer, which thus helps the app which takes URLs from users or other
-     external inputs and want to restrict what protocol(s) to deal
-     with. Defaults to CURLPROTO_ALL. */
-  CINIT(PROTOCOLS, LONG, 181),
-
-  /* set the bitmask for the protocols that libcurl is allowed to follow to,
-     as a subset of the CURLOPT_PROTOCOLS ones. That means the protocol needs
-     to be set in both bitmasks to be allowed to get redirected to. Defaults
-     to all protocols except FILE and SCP. */
-  CINIT(REDIR_PROTOCOLS, LONG, 182),
-
-  /* set the SSH knownhost file name to use */
-  CINIT(SSH_KNOWNHOSTS, OBJECTPOINT, 183),
-
-  /* set the SSH host key callback, must point to a curl_sshkeycallback
-     function */
-  CINIT(SSH_KEYFUNCTION, FUNCTIONPOINT, 184),
-
-  /* set the SSH host key callback custom pointer */
-  CINIT(SSH_KEYDATA, OBJECTPOINT, 185),
-
-  /* set the SMTP mail originator */
-  CINIT(MAIL_FROM, OBJECTPOINT, 186),
-
-  /* set the SMTP mail receiver(s) */
-  CINIT(MAIL_RCPT, OBJECTPOINT, 187),
-
-  /* FTP: send PRET before PASV */
-  CINIT(FTP_USE_PRET, LONG, 188),
-
-  /* RTSP request method (OPTIONS, SETUP, PLAY, etc...) */
-  CINIT(RTSP_REQUEST, LONG, 189),
-
-  /* The RTSP session identifier */
-  CINIT(RTSP_SESSION_ID, OBJECTPOINT, 190),
-
-  /* The RTSP stream URI */
-  CINIT(RTSP_STREAM_URI, OBJECTPOINT, 191),
-
-  /* The Transport: header to use in RTSP requests */
-  CINIT(RTSP_TRANSPORT, OBJECTPOINT, 192),
-
-  /* Manually initialize the client RTSP CSeq for this handle */
-  CINIT(RTSP_CLIENT_CSEQ, LONG, 193),
-
-  /* Manually initialize the server RTSP CSeq for this handle */
-  CINIT(RTSP_SERVER_CSEQ, LONG, 194),
-
-  /* The stream to pass to INTERLEAVEFUNCTION. */
-  CINIT(INTERLEAVEDATA, OBJECTPOINT, 195),
-
-  /* Let the application define a custom write method for RTP data */
-  CINIT(INTERLEAVEFUNCTION, FUNCTIONPOINT, 196),
-
-  /* Turn on wildcard matching */
-  CINIT(WILDCARDMATCH, LONG, 197),
-
-  /* Directory matching callback called before downloading of an
-     individual file (chunk) started */
-  CINIT(CHUNK_BGN_FUNCTION, FUNCTIONPOINT, 198),
-
-  /* Directory matching callback called after the file (chunk)
-     was downloaded, or skipped */
-  CINIT(CHUNK_END_FUNCTION, FUNCTIONPOINT, 199),
-
-  /* Change match (fnmatch-like) callback for wildcard matching */
-  CINIT(FNMATCH_FUNCTION, FUNCTIONPOINT, 200),
-
-  /* Let the application define custom chunk data pointer */
-  CINIT(CHUNK_DATA, OBJECTPOINT, 201),
-
-  /* FNMATCH_FUNCTION user pointer */
-  CINIT(FNMATCH_DATA, OBJECTPOINT, 202),
-
-  CURLOPT_LASTENTRY /* the last unused */
-} CURLoption;
-
-#ifndef CURL_NO_OLDIES /* define this to test if your app builds with all
-                          the obsolete stuff removed! */
-
-/* Backwards compatibility with older names */
-/* These are scheduled to disappear by 2011 */
-
-/* This was added in version 7.19.1 */
-#define CURLOPT_POST301 CURLOPT_POSTREDIR
-
-/* These are scheduled to disappear by 2009 */
-
-/* The following were added in 7.17.0 */
-#define CURLOPT_SSLKEYPASSWD CURLOPT_KEYPASSWD
-#define CURLOPT_FTPAPPEND CURLOPT_APPEND
-#define CURLOPT_FTPLISTONLY CURLOPT_DIRLISTONLY
-#define CURLOPT_FTP_SSL CURLOPT_USE_SSL
-
-/* The following were added earlier */
-
-#define CURLOPT_SSLCERTPASSWD CURLOPT_KEYPASSWD
-#define CURLOPT_KRB4LEVEL CURLOPT_KRBLEVEL
-
-#else
-/* This is set if CURL_NO_OLDIES is defined at compile-time */
-#undef CURLOPT_DNS_USE_GLOBAL_CACHE /* soon obsolete */
-#endif
-
-
-  /* Below here follows defines for the CURLOPT_IPRESOLVE option. If a host
-     name resolves addresses using more than one IP protocol version, this
-     option might be handy to force libcurl to use a specific IP version. */
-#define CURL_IPRESOLVE_WHATEVER 0 /* default, resolves addresses to all IP
-                                     versions that your system allows */
-#define CURL_IPRESOLVE_V4       1 /* resolve to ipv4 addresses */
-#define CURL_IPRESOLVE_V6       2 /* resolve to ipv6 addresses */
-
-  /* three convenient "aliases" that follow the name scheme better */
-#define CURLOPT_WRITEDATA CURLOPT_FILE
-#define CURLOPT_READDATA  CURLOPT_INFILE
-#define CURLOPT_HEADERDATA CURLOPT_WRITEHEADER
-#define CURLOPT_RTSPHEADER CURLOPT_HTTPHEADER
-
-  /* These enums are for use with the CURLOPT_HTTP_VERSION option. */
-enum {
-  CURL_HTTP_VERSION_NONE, /* setting this means we don't care, and that we'd
-                             like the library to choose the best possible
-                             for us! */
-  CURL_HTTP_VERSION_1_0,  /* please use HTTP 1.0 in the request */
-  CURL_HTTP_VERSION_1_1,  /* please use HTTP 1.1 in the request */
-
-  CURL_HTTP_VERSION_LAST /* *ILLEGAL* http version */
-};
-
-/*
- * Public API enums for RTSP requests
- */
-enum {
-    CURL_RTSPREQ_NONE, /* first in list */
-    CURL_RTSPREQ_OPTIONS,
-    CURL_RTSPREQ_DESCRIBE,
-    CURL_RTSPREQ_ANNOUNCE,
-    CURL_RTSPREQ_SETUP,
-    CURL_RTSPREQ_PLAY,
-    CURL_RTSPREQ_PAUSE,
-    CURL_RTSPREQ_TEARDOWN,
-    CURL_RTSPREQ_GET_PARAMETER,
-    CURL_RTSPREQ_SET_PARAMETER,
-    CURL_RTSPREQ_RECORD,
-    CURL_RTSPREQ_RECEIVE,
-    CURL_RTSPREQ_LAST /* last in list */
-};
-
-  /* These enums are for use with the CURLOPT_NETRC option. */
-enum CURL_NETRC_OPTION {
-  CURL_NETRC_IGNORED,     /* The .netrc will never be read.
-                           * This is the default. */
-  CURL_NETRC_OPTIONAL,    /* A user:password in the URL will be preferred
-                           * to one in the .netrc. */
-  CURL_NETRC_REQUIRED,    /* A user:password in the URL will be ignored.
-                           * Unless one is set programmatically, the .netrc
-                           * will be queried. */
-  CURL_NETRC_LAST
-};
-
-enum {
-  CURL_SSLVERSION_DEFAULT,
-  CURL_SSLVERSION_TLSv1,
-  CURL_SSLVERSION_SSLv2,
-  CURL_SSLVERSION_SSLv3,
-
-  CURL_SSLVERSION_LAST /* never use, keep last */
-};
-
-/* symbols to use with CURLOPT_POSTREDIR.
-   CURL_REDIR_POST_301 and CURL_REDIR_POST_302 can be bitwise ORed so that
-   CURL_REDIR_POST_301 | CURL_REDIR_POST_302 == CURL_REDIR_POST_ALL */
-
-#define CURL_REDIR_GET_ALL  0
-#define CURL_REDIR_POST_301 1
-#define CURL_REDIR_POST_302 2
-#define CURL_REDIR_POST_ALL (CURL_REDIR_POST_301|CURL_REDIR_POST_302)
-
-typedef enum {
-  CURL_TIMECOND_NONE,
-
-  CURL_TIMECOND_IFMODSINCE,
-  CURL_TIMECOND_IFUNMODSINCE,
-  CURL_TIMECOND_LASTMOD,
-
-  CURL_TIMECOND_LAST
-} curl_TimeCond;
-
-
-/* curl_strequal() and curl_strnequal() are subject for removal in a future
-   libcurl, see lib/README.curlx for details */
-CURL_EXTERN int (curl_strequal)(const char *s1, const char *s2);
-CURL_EXTERN int (curl_strnequal)(const char *s1, const char *s2, size_t n);
-
-/* name is uppercase CURLFORM_<name> */
-#ifdef CFINIT
-#undef CFINIT
-#endif
-
-#ifdef CURL_ISOCPP
-#define CFINIT(name) CURLFORM_ ## name
-#else
-/* The macro "##" is ISO C, we assume pre-ISO C doesn't support it. */
-#define CFINIT(name) CURLFORM_/**/name
-#endif
-
-typedef enum {
-  CFINIT(NOTHING),        /********* the first one is unused ************/
-
-  /*  */
-  CFINIT(COPYNAME),
-  CFINIT(PTRNAME),
-  CFINIT(NAMELENGTH),
-  CFINIT(COPYCONTENTS),
-  CFINIT(PTRCONTENTS),
-  CFINIT(CONTENTSLENGTH),
-  CFINIT(FILECONTENT),
-  CFINIT(ARRAY),
-  CFINIT(OBSOLETE),
-  CFINIT(FILE),
-
-  CFINIT(BUFFER),
-  CFINIT(BUFFERPTR),
-  CFINIT(BUFFERLENGTH),
-
-  CFINIT(CONTENTTYPE),
-  CFINIT(CONTENTHEADER),
-  CFINIT(FILENAME),
-  CFINIT(END),
-  CFINIT(OBSOLETE2),
-
-  CFINIT(STREAM),
-
-  CURLFORM_LASTENTRY /* the last unused */
-} CURLformoption;
-
-#undef CFINIT /* done */
-
-/* structure to be used as parameter for CURLFORM_ARRAY */
-struct curl_forms {
-  CURLformoption option;
-  const char     *value;
-};
-
-/* use this for multipart formpost building */
-/* Returns code for curl_formadd()
- *
- * Returns:
- * CURL_FORMADD_OK             on success
- * CURL_FORMADD_MEMORY         if the FormInfo allocation fails
- * CURL_FORMADD_OPTION_TWICE   if one option is given twice for one Form
- * CURL_FORMADD_NULL           if a null pointer was given for a char
- * CURL_FORMADD_MEMORY         if the allocation of a FormInfo struct failed
- * CURL_FORMADD_UNKNOWN_OPTION if an unknown option was used
- * CURL_FORMADD_INCOMPLETE     if the some FormInfo is not complete (or error)
- * CURL_FORMADD_MEMORY         if a curl_httppost struct cannot be allocated
- * CURL_FORMADD_MEMORY         if some allocation for string copying failed.
- * CURL_FORMADD_ILLEGAL_ARRAY  if an illegal option is used in an array
- *
- ***************************************************************************/
-typedef enum {
-  CURL_FORMADD_OK, /* first, no error */
-
-  CURL_FORMADD_MEMORY,
-  CURL_FORMADD_OPTION_TWICE,
-  CURL_FORMADD_NULL,
-  CURL_FORMADD_UNKNOWN_OPTION,
-  CURL_FORMADD_INCOMPLETE,
-  CURL_FORMADD_ILLEGAL_ARRAY,
-  CURL_FORMADD_DISABLED, /* libcurl was built with this disabled */
-
-  CURL_FORMADD_LAST /* last */
-} CURLFORMcode;
-
-/*
- * NAME curl_formadd()
- *
- * DESCRIPTION
- *
- * Pretty advanced function for building multi-part formposts. Each invoke
- * adds one part that together construct a full post. Then use
- * CURLOPT_HTTPPOST to send it off to libcurl.
- */
-CURL_EXTERN CURLFORMcode curl_formadd(struct curl_httppost **httppost,
-                                      struct curl_httppost **last_post,
-                                      ...);
-
-/*
- * callback function for curl_formget()
- * The void *arg pointer will be the one passed as second argument to
- *   curl_formget().
- * The character buffer passed to it must not be freed.
- * Should return the buffer length passed to it as the argument "len" on
- *   success.
- */
-typedef size_t (*curl_formget_callback)(void *arg, const char *buf, size_t len);
-
-/*
- * NAME curl_formget()
- *
- * DESCRIPTION
- *
- * Serialize a curl_httppost struct built with curl_formadd().
- * Accepts a void pointer as second argument which will be passed to
- * the curl_formget_callback function.
- * Returns 0 on success.
- */
-CURL_EXTERN int curl_formget(struct curl_httppost *form, void *arg,
-                             curl_formget_callback append);
-/*
- * NAME curl_formfree()
- *
- * DESCRIPTION
- *
- * Free a multipart formpost previously built with curl_formadd().
- */
-CURL_EXTERN void curl_formfree(struct curl_httppost *form);
-
-/*
- * NAME curl_getenv()
- *
- * DESCRIPTION
- *
- * Returns a malloc()'ed string that MUST be curl_free()ed after usage is
- * complete. DEPRECATED - see lib/README.curlx
- */
-CURL_EXTERN char *curl_getenv(const char *variable);
-
-/*
- * NAME curl_version()
- *
- * DESCRIPTION
- *
- * Returns a static ascii string of the libcurl version.
- */
-CURL_EXTERN char *curl_version(void);
-
-/*
- * NAME curl_easy_escape()
- *
- * DESCRIPTION
- *
- * Escapes URL strings (converts all letters consider illegal in URLs to their
- * %XX versions). This function returns a new allocated string or NULL if an
- * error occurred.
- */
-CURL_EXTERN char *curl_easy_escape(CURL *handle,
-                                   const char *string,
-                                   int length);
-
-/* the previous version: */
-CURL_EXTERN char *curl_escape(const char *string,
-                              int length);
-
-
-/*
- * NAME curl_easy_unescape()
- *
- * DESCRIPTION
- *
- * Unescapes URL encoding in strings (converts all %XX codes to their 8bit
- * versions). This function returns a new allocated string or NULL if an error
- * occurred.
- * Conversion Note: On non-ASCII platforms the ASCII %XX codes are
- * converted into the host encoding.
- */
-CURL_EXTERN char *curl_easy_unescape(CURL *handle,
-                                     const char *string,
-                                     int length,
-                                     int *outlength);
-
-/* the previous version */
-CURL_EXTERN char *curl_unescape(const char *string,
-                                int length);
-
-/*
- * NAME curl_free()
- *
- * DESCRIPTION
- *
- * Provided for de-allocation in the same translation unit that did the
- * allocation. Added in libcurl 7.10
- */
-CURL_EXTERN void curl_free(void *p);
-
-/*
- * NAME curl_global_init()
- *
- * DESCRIPTION
- *
- * curl_global_init() should be invoked exactly once for each application that
- * uses libcurl and before any call of other libcurl functions.
- *
- * This function is not thread-safe!
- */
-CURL_EXTERN CURLcode curl_global_init(long flags);
-
-/*
- * NAME curl_global_init_mem()
- *
- * DESCRIPTION
- *
- * curl_global_init() or curl_global_init_mem() should be invoked exactly once
- * for each application that uses libcurl.  This function can be used to
- * initialize libcurl and set user defined memory management callback
- * functions.  Users can implement memory management routines to check for
- * memory leaks, check for mis-use of the curl library etc.  User registered
- * callback routines with be invoked by this library instead of the system
- * memory management routines like malloc, free etc.
- */
-CURL_EXTERN CURLcode curl_global_init_mem(long flags,
-                                          curl_malloc_callback m,
-                                          curl_free_callback f,
-                                          curl_realloc_callback r,
-                                          curl_strdup_callback s,
-                                          curl_calloc_callback c);
-
-/*
- * NAME curl_global_cleanup()
- *
- * DESCRIPTION
- *
- * curl_global_cleanup() should be invoked exactly once for each application
- * that uses libcurl
- */
-CURL_EXTERN void curl_global_cleanup(void);
-
-/* linked-list structure for the CURLOPT_QUOTE option (and other) */
-struct curl_slist {
-  char *data;
-  struct curl_slist *next;
-};
-
-/*
- * NAME curl_slist_append()
- *
- * DESCRIPTION
- *
- * Appends a string to a linked list. If no list exists, it will be created
- * first. Returns the new list, after appending.
- */
-CURL_EXTERN struct curl_slist *curl_slist_append(struct curl_slist *,
-                                                 const char *);
-
-/*
- * NAME curl_slist_free_all()
- *
- * DESCRIPTION
- *
- * free a previously built curl_slist.
- */
-CURL_EXTERN void curl_slist_free_all(struct curl_slist *);
-
-/*
- * NAME curl_getdate()
- *
- * DESCRIPTION
- *
- * Returns the time, in seconds since 1 Jan 1970 of the time string given in
- * the first argument. The time argument in the second parameter is unused
- * and should be set to NULL.
- */
-CURL_EXTERN time_t curl_getdate(const char *p, const time_t *unused);
-
-/* info about the certificate chain, only for OpenSSL builds. Asked
-   for with CURLOPT_CERTINFO / CURLINFO_CERTINFO */
-struct curl_certinfo {
-  int num_of_certs;             /* number of certificates with information */
-  struct curl_slist **certinfo; /* for each index in this array, there's a
-                                   linked list with textual information in the
-                                   format "name: value" */
-};
-
-#define CURLINFO_STRING   0x100000
-#define CURLINFO_LONG     0x200000
-#define CURLINFO_DOUBLE   0x300000
-#define CURLINFO_SLIST    0x400000
-#define CURLINFO_MASK     0x0fffff
-#define CURLINFO_TYPEMASK 0xf00000
-
-typedef enum {
-  CURLINFO_NONE, /* first, never use this */
-  CURLINFO_EFFECTIVE_URL    = CURLINFO_STRING + 1,
-  CURLINFO_RESPONSE_CODE    = CURLINFO_LONG   + 2,
-  CURLINFO_TOTAL_TIME       = CURLINFO_DOUBLE + 3,
-  CURLINFO_NAMELOOKUP_TIME  = CURLINFO_DOUBLE + 4,
-  CURLINFO_CONNECT_TIME     = CURLINFO_DOUBLE + 5,
-  CURLINFO_PRETRANSFER_TIME = CURLINFO_DOUBLE + 6,
-  CURLINFO_SIZE_UPLOAD      = CURLINFO_DOUBLE + 7,
-  CURLINFO_SIZE_DOWNLOAD    = CURLINFO_DOUBLE + 8,
-  CURLINFO_SPEED_DOWNLOAD   = CURLINFO_DOUBLE + 9,
-  CURLINFO_SPEED_UPLOAD     = CURLINFO_DOUBLE + 10,
-  CURLINFO_HEADER_SIZE      = CURLINFO_LONG   + 11,
-  CURLINFO_REQUEST_SIZE     = CURLINFO_LONG   + 12,
-  CURLINFO_SSL_VERIFYRESULT = CURLINFO_LONG   + 13,
-  CURLINFO_FILETIME         = CURLINFO_LONG   + 14,
-  CURLINFO_CONTENT_LENGTH_DOWNLOAD   = CURLINFO_DOUBLE + 15,
-  CURLINFO_CONTENT_LENGTH_UPLOAD     = CURLINFO_DOUBLE + 16,
-  CURLINFO_STARTTRANSFER_TIME = CURLINFO_DOUBLE + 17,
-  CURLINFO_CONTENT_TYPE     = CURLINFO_STRING + 18,
-  CURLINFO_REDIRECT_TIME    = CURLINFO_DOUBLE + 19,
-  CURLINFO_REDIRECT_COUNT   = CURLINFO_LONG   + 20,
-  CURLINFO_PRIVATE          = CURLINFO_STRING + 21,
-  CURLINFO_HTTP_CONNECTCODE = CURLINFO_LONG   + 22,
-  CURLINFO_HTTPAUTH_AVAIL   = CURLINFO_LONG   + 23,
-  CURLINFO_PROXYAUTH_AVAIL  = CURLINFO_LONG   + 24,
-  CURLINFO_OS_ERRNO         = CURLINFO_LONG   + 25,
-  CURLINFO_NUM_CONNECTS     = CURLINFO_LONG   + 26,
-  CURLINFO_SSL_ENGINES      = CURLINFO_SLIST  + 27,
-  CURLINFO_COOKIELIST       = CURLINFO_SLIST  + 28,
-  CURLINFO_LASTSOCKET       = CURLINFO_LONG   + 29,
-  CURLINFO_FTP_ENTRY_PATH   = CURLINFO_STRING + 30,
-  CURLINFO_REDIRECT_URL     = CURLINFO_STRING + 31,
-  CURLINFO_PRIMARY_IP       = CURLINFO_STRING + 32,
-  CURLINFO_APPCONNECT_TIME  = CURLINFO_DOUBLE + 33,
-  CURLINFO_CERTINFO         = CURLINFO_SLIST  + 34,
-  CURLINFO_CONDITION_UNMET  = CURLINFO_LONG   + 35,
-  CURLINFO_RTSP_SESSION_ID  = CURLINFO_STRING + 36,
-  CURLINFO_RTSP_CLIENT_CSEQ = CURLINFO_LONG   + 37,
-  CURLINFO_RTSP_SERVER_CSEQ = CURLINFO_LONG   + 38,
-  CURLINFO_RTSP_CSEQ_RECV   = CURLINFO_LONG   + 39,
-  CURLINFO_PRIMARY_PORT     = CURLINFO_LONG   + 40,
-  CURLINFO_LOCAL_IP         = CURLINFO_STRING + 41,
-  CURLINFO_LOCAL_PORT       = CURLINFO_LONG   + 42,
-  /* Fill in new entries below here! */
-
-  CURLINFO_LASTONE          = 42
-} CURLINFO;
-
-/* CURLINFO_RESPONSE_CODE is the new name for the option previously known as
-   CURLINFO_HTTP_CODE */
-#define CURLINFO_HTTP_CODE CURLINFO_RESPONSE_CODE
-
-typedef enum {
-  CURLCLOSEPOLICY_NONE, /* first, never use this */
-
-  CURLCLOSEPOLICY_OLDEST,
-  CURLCLOSEPOLICY_LEAST_RECENTLY_USED,
-  CURLCLOSEPOLICY_LEAST_TRAFFIC,
-  CURLCLOSEPOLICY_SLOWEST,
-  CURLCLOSEPOLICY_CALLBACK,
-
-  CURLCLOSEPOLICY_LAST /* last, never use this */
-} curl_closepolicy;
-
-#define CURL_GLOBAL_SSL (1<<0)
-#define CURL_GLOBAL_WIN32 (1<<1)
-#define CURL_GLOBAL_ALL (CURL_GLOBAL_SSL|CURL_GLOBAL_WIN32)
-#define CURL_GLOBAL_NOTHING 0
-#define CURL_GLOBAL_DEFAULT CURL_GLOBAL_ALL
-
-
-/*****************************************************************************
- * Setup defines, protos etc for the sharing stuff.
- */
-
-/* Different data locks for a single share */
-typedef enum {
-  CURL_LOCK_DATA_NONE = 0,
-  /*  CURL_LOCK_DATA_SHARE is used internally to say that
-   *  the locking is just made to change the internal state of the share
-   *  itself.
-   */
-  CURL_LOCK_DATA_SHARE,
-  CURL_LOCK_DATA_COOKIE,
-  CURL_LOCK_DATA_DNS,
-  CURL_LOCK_DATA_SSL_SESSION,
-  CURL_LOCK_DATA_CONNECT,
-  CURL_LOCK_DATA_LAST
-} curl_lock_data;
-
-/* Different lock access types */
-typedef enum {
-  CURL_LOCK_ACCESS_NONE = 0,   /* unspecified action */
-  CURL_LOCK_ACCESS_SHARED = 1, /* for read perhaps */
-  CURL_LOCK_ACCESS_SINGLE = 2, /* for write perhaps */
-  CURL_LOCK_ACCESS_LAST        /* never use */
-} curl_lock_access;
-
-typedef void (*curl_lock_function)(CURL *handle,
-                                   curl_lock_data data,
-                                   curl_lock_access locktype,
-                                   void *userptr);
-typedef void (*curl_unlock_function)(CURL *handle,
-                                     curl_lock_data data,
-                                     void *userptr);
-
-typedef void CURLSH;
-
-typedef enum {
-  CURLSHE_OK,  /* all is fine */
-  CURLSHE_BAD_OPTION, /* 1 */
-  CURLSHE_IN_USE,     /* 2 */
-  CURLSHE_INVALID,    /* 3 */
-  CURLSHE_NOMEM,      /* out of memory */
-  CURLSHE_LAST /* never use */
-} CURLSHcode;
-
-typedef enum {
-  CURLSHOPT_NONE,  /* don't use */
-  CURLSHOPT_SHARE,   /* specify a data type to share */
-  CURLSHOPT_UNSHARE, /* specify which data type to stop sharing */
-  CURLSHOPT_LOCKFUNC,   /* pass in a 'curl_lock_function' pointer */
-  CURLSHOPT_UNLOCKFUNC, /* pass in a 'curl_unlock_function' pointer */
-  CURLSHOPT_USERDATA,   /* pass in a user data pointer used in the lock/unlock
-                           callback functions */
-  CURLSHOPT_LAST  /* never use */
-} CURLSHoption;
-
-CURL_EXTERN CURLSH *curl_share_init(void);
-CURL_EXTERN CURLSHcode curl_share_setopt(CURLSH *, CURLSHoption option, ...);
-CURL_EXTERN CURLSHcode curl_share_cleanup(CURLSH *);
-
-/****************************************************************************
- * Structures for querying information about the curl library at runtime.
- */
-
-typedef enum {
-  CURLVERSION_FIRST,
-  CURLVERSION_SECOND,
-  CURLVERSION_THIRD,
-  CURLVERSION_FOURTH,
-  CURLVERSION_LAST /* never actually use this */
-} CURLversion;
-
-/* The 'CURLVERSION_NOW' is the symbolic name meant to be used by
-   basically all programs ever that want to get version information. It is
-   meant to be a built-in version number for what kind of struct the caller
-   expects. If the struct ever changes, we redefine the NOW to another enum
-   from above. */
-#define CURLVERSION_NOW CURLVERSION_FOURTH
-
-typedef struct {
-  CURLversion age;          /* age of the returned struct */
-  const char *version;      /* LIBCURL_VERSION */
-  unsigned int version_num; /* LIBCURL_VERSION_NUM */
-  const char *host;         /* OS/host/cpu/machine when configured */
-  int features;             /* bitmask, see defines below */
-  const char *ssl_version;  /* human readable string */
-  long ssl_version_num;     /* not used anymore, always 0 */
-  const char *libz_version; /* human readable string */
-  /* protocols is terminated by an entry with a NULL protoname */
-  const char * const *protocols;
-
-  /* The fields below this were added in CURLVERSION_SECOND */
-  const char *ares;
-  int ares_num;
-
-  /* This field was added in CURLVERSION_THIRD */
-  const char *libidn;
-
-  /* These field were added in CURLVERSION_FOURTH */
-
-  /* Same as '_libiconv_version' if built with HAVE_ICONV */
-  int iconv_ver_num;
-
-  const char *libssh_version; /* human readable string */
-
-} curl_version_info_data;
-
-#define CURL_VERSION_IPV6      (1<<0)  /* IPv6-enabled */
-#define CURL_VERSION_KERBEROS4 (1<<1)  /* kerberos auth is supported */
-#define CURL_VERSION_SSL       (1<<2)  /* SSL options are present */
-#define CURL_VERSION_LIBZ      (1<<3)  /* libz features are present */
-#define CURL_VERSION_NTLM      (1<<4)  /* NTLM auth is supported */
-#define CURL_VERSION_GSSNEGOTIATE (1<<5) /* Negotiate auth support */
-#define CURL_VERSION_DEBUG     (1<<6)  /* built with debug capabilities */
-#define CURL_VERSION_ASYNCHDNS (1<<7)  /* asynchronous dns resolves */
-#define CURL_VERSION_SPNEGO    (1<<8)  /* SPNEGO auth */
-#define CURL_VERSION_LARGEFILE (1<<9)  /* supports files bigger than 2GB */
-#define CURL_VERSION_IDN       (1<<10) /* International Domain Names support */
-#define CURL_VERSION_SSPI      (1<<11) /* SSPI is supported */
-#define CURL_VERSION_CONV      (1<<12) /* character conversions supported */
-#define CURL_VERSION_CURLDEBUG (1<<13) /* debug memory tracking supported */
-
-/*
- * NAME curl_version_info()
- *
- * DESCRIPTION
- *
- * This function returns a pointer to a static copy of the version info
- * struct. See above.
- */
-CURL_EXTERN curl_version_info_data *curl_version_info(CURLversion);
-
-/*
- * NAME curl_easy_strerror()
- *
- * DESCRIPTION
- *
- * The curl_easy_strerror function may be used to turn a CURLcode value
- * into the equivalent human readable error string.  This is useful
- * for printing meaningful error messages.
- */
-CURL_EXTERN const char *curl_easy_strerror(CURLcode);
-
-/*
- * NAME curl_share_strerror()
- *
- * DESCRIPTION
- *
- * The curl_share_strerror function may be used to turn a CURLSHcode value
- * into the equivalent human readable error string.  This is useful
- * for printing meaningful error messages.
- */
-CURL_EXTERN const char *curl_share_strerror(CURLSHcode);
-
-/*
- * NAME curl_easy_pause()
- *
- * DESCRIPTION
- *
- * The curl_easy_pause function pauses or unpauses transfers. Select the new
- * state by setting the bitmask, use the convenience defines below.
- *
- */
-CURL_EXTERN CURLcode curl_easy_pause(CURL *handle, int bitmask);
-
-#define CURLPAUSE_RECV      (1<<0)
-#define CURLPAUSE_RECV_CONT (0)
-
-#define CURLPAUSE_SEND      (1<<2)
-#define CURLPAUSE_SEND_CONT (0)
-
-#define CURLPAUSE_ALL       (CURLPAUSE_RECV|CURLPAUSE_SEND)
-#define CURLPAUSE_CONT      (CURLPAUSE_RECV_CONT|CURLPAUSE_SEND_CONT)
-
-#ifdef  __cplusplus
-}
-#endif
-
-/* unfortunately, the easy.h and multi.h include files need options and info
-  stuff before they can be included! */
-#include "easy.h" /* nothing in curl is fun without the easy stuff */
-#include "multi.h"
-
-/* the typechecker doesn't work in C++ (yet) */
-#if defined(__GNUC__) && defined(__GNUC_MINOR__) && \
-    ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) && \
-    !defined(__cplusplus) && !defined(CURL_DISABLE_TYPECHECK)
-#include "typecheck-gcc.h"
-#else
-#if defined(__STDC__) && (__STDC__ >= 1)
-/* This preprocessor magic that replaces a call with the exact same call is
-   only done to make sure application authors pass exactly three arguments
-   to these functions. */
-#define curl_easy_setopt(handle,opt,param) curl_easy_setopt(handle,opt,param)
-#define curl_easy_getinfo(handle,info,arg) curl_easy_getinfo(handle,info,arg)
-#define curl_share_setopt(share,opt,param) curl_share_setopt(share,opt,param)
-#define curl_multi_setopt(handle,opt,param) curl_multi_setopt(handle,opt,param)
-#endif /* __STDC__ >= 1 */
-#endif /* gcc >= 4.3 && !__cplusplus */
-
-#endif /* __CURL_CURL_H */
diff --git a/lib-x86-32/include/curl/curlbuild.h b/lib-x86-32/include/curl/curlbuild.h
deleted file mode 100644
index 81f4a285..00000000
--- a/lib-x86-32/include/curl/curlbuild.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/* include/curl/curlbuild.h.  Generated from curlbuild.h.in by configure.  */
-#ifndef __CURL_CURLBUILD_H
-#define __CURL_CURLBUILD_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-
-/* ================================================================ */
-/*               NOTES FOR CONFIGURE CAPABLE SYSTEMS                */
-/* ================================================================ */
-
-/*
- * NOTE 1:
- * -------
- *
- * Nothing in this file is intended to be modified or adjusted by the
- * curl library user nor by the curl library builder.
- *
- * If you think that something actually needs to be changed, adjusted
- * or fixed in this file, then, report it on the libcurl development
- * mailing list: http://cool.haxx.se/mailman/listinfo/curl-library/
- *
- * This header file shall only export symbols which are 'curl' or 'CURL'
- * prefixed, otherwise public name space would be polluted.
- *
- * NOTE 2:
- * -------
- *
- * Right now you might be staring at file include/curl/curlbuild.h.in or
- * at file include/curl/curlbuild.h, this is due to the following reason:
- *
- * On systems capable of running the configure script, the configure process
- * will overwrite the distributed include/curl/curlbuild.h file with one that
- * is suitable and specific to the library being configured and built, which
- * is generated from the include/curl/curlbuild.h.in template file.
- *
- */
-
-/* ================================================================ */
-/*  DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE  */
-/* ================================================================ */
-
-#ifdef CURL_SIZEOF_LONG
-#  error "CURL_SIZEOF_LONG shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_SIZEOF_LONG_already_defined
-#endif
-
-#ifdef CURL_TYPEOF_CURL_SOCKLEN_T
-#  error "CURL_TYPEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_TYPEOF_CURL_SOCKLEN_T_already_defined
-#endif
-
-#ifdef CURL_SIZEOF_CURL_SOCKLEN_T
-#  error "CURL_SIZEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_SIZEOF_CURL_SOCKLEN_T_already_defined
-#endif
-
-#ifdef CURL_TYPEOF_CURL_OFF_T
-#  error "CURL_TYPEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_TYPEOF_CURL_OFF_T_already_defined
-#endif
-
-#ifdef CURL_FORMAT_CURL_OFF_T
-#  error "CURL_FORMAT_CURL_OFF_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_T_already_defined
-#endif
-
-#ifdef CURL_FORMAT_CURL_OFF_TU
-#  error "CURL_FORMAT_CURL_OFF_TU shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_TU_already_defined
-#endif
-
-#ifdef CURL_FORMAT_OFF_T
-#  error "CURL_FORMAT_OFF_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_FORMAT_OFF_T_already_defined
-#endif
-
-#ifdef CURL_SIZEOF_CURL_OFF_T
-#  error "CURL_SIZEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_SIZEOF_CURL_OFF_T_already_defined
-#endif
-
-#ifdef CURL_SUFFIX_CURL_OFF_T
-#  error "CURL_SUFFIX_CURL_OFF_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_T_already_defined
-#endif
-
-#ifdef CURL_SUFFIX_CURL_OFF_TU
-#  error "CURL_SUFFIX_CURL_OFF_TU shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_TU_already_defined
-#endif
-
-/* ================================================================ */
-/*  EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY  */
-/* ================================================================ */
-
-/* Configure process defines this to 1 when it finds out that system  */
-/* header file ws2tcpip.h must be included by the external interface. */
-/* #undef CURL_PULL_WS2TCPIP_H */
-#ifdef CURL_PULL_WS2TCPIP_H
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
-#  include <windows.h>
-#  include <winsock2.h>
-#  include <ws2tcpip.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system   */
-/* header file sys/types.h must be included by the external interface. */
-#define CURL_PULL_SYS_TYPES_H 1
-#ifdef CURL_PULL_SYS_TYPES_H
-#  include <sys/types.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system */
-/* header file stdint.h must be included by the external interface.  */
-#define CURL_PULL_STDINT_H 1
-#ifdef CURL_PULL_STDINT_H
-#  include <stdint.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system  */
-/* header file inttypes.h must be included by the external interface. */
-#define CURL_PULL_INTTYPES_H 1
-#ifdef CURL_PULL_INTTYPES_H
-#  include <inttypes.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system    */
-/* header file sys/socket.h must be included by the external interface. */
-#define CURL_PULL_SYS_SOCKET_H 1
-#ifdef CURL_PULL_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
-
-/* The size of `long', as computed by sizeof. */
-#define CURL_SIZEOF_LONG 4
-
-/* Integral data type used for curl_socklen_t. */
-#define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
-
-/* The size of `curl_socklen_t', as computed by sizeof. */
-#define CURL_SIZEOF_CURL_SOCKLEN_T 4
-
-/* Data type definition of curl_socklen_t. */
-typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t;
-
-/* Signed integral data type used for curl_off_t. */
-#define CURL_TYPEOF_CURL_OFF_T int64_t
-
-/* Data type definition of curl_off_t. */
-typedef CURL_TYPEOF_CURL_OFF_T curl_off_t;
-
-/* curl_off_t formatting string directive without "%" conversion specifier. */
-#define CURL_FORMAT_CURL_OFF_T "lld"
-
-/* unsigned curl_off_t formatting string without "%" conversion specifier. */
-#define CURL_FORMAT_CURL_OFF_TU "llu"
-
-/* curl_off_t formatting string directive with "%" conversion specifier. */
-#define CURL_FORMAT_OFF_T "%lld"
-
-/* The size of `curl_off_t', as computed by sizeof. */
-#define CURL_SIZEOF_CURL_OFF_T 8
-
-/* curl_off_t constant suffix. */
-#define CURL_SUFFIX_CURL_OFF_T LL
-
-/* unsigned curl_off_t constant suffix. */
-#define CURL_SUFFIX_CURL_OFF_TU ULL
-
-#endif /* __CURL_CURLBUILD_H */
diff --git a/lib-x86-32/include/curl/curlbuild.h.cmake b/lib-x86-32/include/curl/curlbuild.h.cmake
deleted file mode 100644
index 3aa772fc..00000000
--- a/lib-x86-32/include/curl/curlbuild.h.cmake
+++ /dev/null
@@ -1,180 +0,0 @@
-#ifndef __CURL_CURLBUILD_H
-#define __CURL_CURLBUILD_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-
-/* ================================================================ */
-/*               NOTES FOR CONFIGURE CAPABLE SYSTEMS                */
-/* ================================================================ */
-
-/*
- * NOTE 1:
- * -------
- *
- * Nothing in this file is intended to be modified or adjusted by the
- * curl library user nor by the curl library builder.
- *
- * If you think that something actually needs to be changed, adjusted
- * or fixed in this file, then, report it on the libcurl development
- * mailing list: http://cool.haxx.se/mailman/listinfo/curl-library/
- *
- * This header file shall only export symbols which are 'curl' or 'CURL'
- * prefixed, otherwise public name space would be polluted.
- *
- * NOTE 2:
- * -------
- *
- * Right now you might be staring at file include/curl/curlbuild.h.in or
- * at file include/curl/curlbuild.h, this is due to the following reason:
- *
- * On systems capable of running the configure script, the configure process
- * will overwrite the distributed include/curl/curlbuild.h file with one that
- * is suitable and specific to the library being configured and built, which
- * is generated from the include/curl/curlbuild.h.in template file.
- *
- */
-
-/* ================================================================ */
-/*  DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE  */
-/* ================================================================ */
-
-#ifdef CURL_SIZEOF_LONG
-#  error "CURL_SIZEOF_LONG shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_SIZEOF_LONG_already_defined
-#endif
-
-#ifdef CURL_TYPEOF_CURL_SOCKLEN_T
-#  error "CURL_TYPEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_TYPEOF_CURL_SOCKLEN_T_already_defined
-#endif
-
-#ifdef CURL_SIZEOF_CURL_SOCKLEN_T
-#  error "CURL_SIZEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_SIZEOF_CURL_SOCKLEN_T_already_defined
-#endif
-#ifdef CURL_TYPEOF_CURL_OFF_T
-#  error "CURL_TYPEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_TYPEOF_CURL_OFF_T_already_defined
-#endif
-
-#ifdef CURL_FORMAT_CURL_OFF_T
-#  error "CURL_FORMAT_CURL_OFF_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_T_already_defined
-#endif
-
-#ifdef CURL_FORMAT_CURL_OFF_TU
-#  error "CURL_FORMAT_CURL_OFF_TU shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_TU_already_defined
-#endif
-
-#ifdef CURL_FORMAT_OFF_T
-#  error "CURL_FORMAT_OFF_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_FORMAT_OFF_T_already_defined
-#endif
-
-#ifdef CURL_SIZEOF_CURL_OFF_T
-#  error "CURL_SIZEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_SIZEOF_CURL_OFF_T_already_defined
-#endif
-
-#ifdef CURL_SUFFIX_CURL_OFF_T
-#  error "CURL_SUFFIX_CURL_OFF_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_T_already_defined
-#endif
-
-#ifdef CURL_SUFFIX_CURL_OFF_TU
-#  error "CURL_SUFFIX_CURL_OFF_TU shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_TU_already_defined
-#endif
-
-/* ================================================================ */
-/*  EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY  */
-/* ================================================================ */
-
-/* Configure process defines this to 1 when it finds out that system   */
-/* header file sys/types.h must be included by the external interface. */
-#cmakedefine CURL_PULL_SYS_TYPES_H ${CURL_PULL_SYS_TYPES_H}
-#ifdef CURL_PULL_SYS_TYPES_H
-#  include <sys/types.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system */
-/* header file stdint.h must be included by the external interface.  */
-#cmakedefine CURL_PULL_STDINT_H ${CURL_PULL_STDINT_H}
-#ifdef CURL_PULL_STDINT_H
-#  include <stdint.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system  */
-/* header file inttypes.h must be included by the external interface. */
-#cmakedefine CURL_PULL_INTTYPES_H ${CURL_PULL_INTTYPES_H}
-#ifdef CURL_PULL_INTTYPES_H
-#  include <inttypes.h>
-#endif
-
-/* The size of `long', as computed by sizeof. */
-#cmakedefine CURL_SIZEOF_LONG ${CURL_SIZEOF_LONG}
-
-/* Integral data type used for curl_socklen_t. */
-#cmakedefine CURL_TYPEOF_CURL_SOCKLEN_T ${CURL_TYPEOF_CURL_SOCKLEN_T}
-
-/* on windows socklen_t is in here */
-#ifdef _WIN32
-#  include <winsock2.h>
-#  include <ws2tcpip.h>
-#endif
-
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
-
-/* Data type definition of curl_socklen_t. */
-typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t;
-
-/* The size of `curl_socklen_t', as computed by sizeof. */
-#cmakedefine CURL_SIZEOF_CURL_SOCKLEN_T ${CURL_SIZEOF_CURL_SOCKLEN_T}
-
-/* Signed integral data type used for curl_off_t. */
-#cmakedefine CURL_TYPEOF_CURL_OFF_T ${CURL_TYPEOF_CURL_OFF_T}
-
-/* Data type definition of curl_off_t. */
-typedef CURL_TYPEOF_CURL_OFF_T curl_off_t;
-
-/* curl_off_t formatting string directive without "%" conversion specifier. */
-#cmakedefine CURL_FORMAT_CURL_OFF_T "${CURL_FORMAT_CURL_OFF_T}"
-
-/* unsigned curl_off_t formatting string without "%" conversion specifier. */
-#cmakedefine CURL_FORMAT_CURL_OFF_TU "${CURL_FORMAT_CURL_OFF_TU}"
-
-/* curl_off_t formatting string directive with "%" conversion specifier. */
-#cmakedefine CURL_FORMAT_OFF_T "${CURL_FORMAT_OFF_T}"
-
-/* The size of `curl_off_t', as computed by sizeof. */
-#cmakedefine CURL_SIZEOF_CURL_OFF_T ${CURL_SIZEOF_CURL_OFF_T}
-
-/* curl_off_t constant suffix. */
-#cmakedefine CURL_SUFFIX_CURL_OFF_T ${CURL_SUFFIX_CURL_OFF_T}
-
-/* unsigned curl_off_t constant suffix. */
-#cmakedefine CURL_SUFFIX_CURL_OFF_TU ${CURL_SUFFIX_CURL_OFF_TU}
-
-#endif /* __CURL_CURLBUILD_H */
diff --git a/lib-x86-32/include/curl/curlbuild.h.in b/lib-x86-32/include/curl/curlbuild.h.in
deleted file mode 100644
index cb1de80a..00000000
--- a/lib-x86-32/include/curl/curlbuild.h.in
+++ /dev/null
@@ -1,190 +0,0 @@
-#ifndef __CURL_CURLBUILD_H
-#define __CURL_CURLBUILD_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-
-/* ================================================================ */
-/*               NOTES FOR CONFIGURE CAPABLE SYSTEMS                */
-/* ================================================================ */
-
-/*
- * NOTE 1:
- * -------
- *
- * Nothing in this file is intended to be modified or adjusted by the
- * curl library user nor by the curl library builder.
- *
- * If you think that something actually needs to be changed, adjusted
- * or fixed in this file, then, report it on the libcurl development
- * mailing list: http://cool.haxx.se/mailman/listinfo/curl-library/
- *
- * This header file shall only export symbols which are 'curl' or 'CURL'
- * prefixed, otherwise public name space would be polluted.
- *
- * NOTE 2:
- * -------
- *
- * Right now you might be staring at file include/curl/curlbuild.h.in or
- * at file include/curl/curlbuild.h, this is due to the following reason:
- *
- * On systems capable of running the configure script, the configure process
- * will overwrite the distributed include/curl/curlbuild.h file with one that
- * is suitable and specific to the library being configured and built, which
- * is generated from the include/curl/curlbuild.h.in template file.
- *
- */
-
-/* ================================================================ */
-/*  DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE  */
-/* ================================================================ */
-
-#ifdef CURL_SIZEOF_LONG
-#  error "CURL_SIZEOF_LONG shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_SIZEOF_LONG_already_defined
-#endif
-
-#ifdef CURL_TYPEOF_CURL_SOCKLEN_T
-#  error "CURL_TYPEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_TYPEOF_CURL_SOCKLEN_T_already_defined
-#endif
-
-#ifdef CURL_SIZEOF_CURL_SOCKLEN_T
-#  error "CURL_SIZEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_SIZEOF_CURL_SOCKLEN_T_already_defined
-#endif
-
-#ifdef CURL_TYPEOF_CURL_OFF_T
-#  error "CURL_TYPEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_TYPEOF_CURL_OFF_T_already_defined
-#endif
-
-#ifdef CURL_FORMAT_CURL_OFF_T
-#  error "CURL_FORMAT_CURL_OFF_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_T_already_defined
-#endif
-
-#ifdef CURL_FORMAT_CURL_OFF_TU
-#  error "CURL_FORMAT_CURL_OFF_TU shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_TU_already_defined
-#endif
-
-#ifdef CURL_FORMAT_OFF_T
-#  error "CURL_FORMAT_OFF_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_FORMAT_OFF_T_already_defined
-#endif
-
-#ifdef CURL_SIZEOF_CURL_OFF_T
-#  error "CURL_SIZEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_SIZEOF_CURL_OFF_T_already_defined
-#endif
-
-#ifdef CURL_SUFFIX_CURL_OFF_T
-#  error "CURL_SUFFIX_CURL_OFF_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_T_already_defined
-#endif
-
-#ifdef CURL_SUFFIX_CURL_OFF_TU
-#  error "CURL_SUFFIX_CURL_OFF_TU shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_TU_already_defined
-#endif
-
-/* ================================================================ */
-/*  EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY  */
-/* ================================================================ */
-
-/* Configure process defines this to 1 when it finds out that system  */
-/* header file ws2tcpip.h must be included by the external interface. */
-#undef CURL_PULL_WS2TCPIP_H
-#ifdef CURL_PULL_WS2TCPIP_H
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
-#  include <windows.h>
-#  include <winsock2.h>
-#  include <ws2tcpip.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system   */
-/* header file sys/types.h must be included by the external interface. */
-#undef CURL_PULL_SYS_TYPES_H
-#ifdef CURL_PULL_SYS_TYPES_H
-#  include <sys/types.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system */
-/* header file stdint.h must be included by the external interface.  */
-#undef CURL_PULL_STDINT_H
-#ifdef CURL_PULL_STDINT_H
-#  include <stdint.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system  */
-/* header file inttypes.h must be included by the external interface. */
-#undef CURL_PULL_INTTYPES_H
-#ifdef CURL_PULL_INTTYPES_H
-#  include <inttypes.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system    */
-/* header file sys/socket.h must be included by the external interface. */
-#undef CURL_PULL_SYS_SOCKET_H
-#ifdef CURL_PULL_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
-
-/* The size of `long', as computed by sizeof. */
-#undef CURL_SIZEOF_LONG
-
-/* Integral data type used for curl_socklen_t. */
-#undef CURL_TYPEOF_CURL_SOCKLEN_T
-
-/* The size of `curl_socklen_t', as computed by sizeof. */
-#undef CURL_SIZEOF_CURL_SOCKLEN_T
-
-/* Data type definition of curl_socklen_t. */
-typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t;
-
-/* Signed integral data type used for curl_off_t. */
-#undef CURL_TYPEOF_CURL_OFF_T
-
-/* Data type definition of curl_off_t. */
-typedef CURL_TYPEOF_CURL_OFF_T curl_off_t;
-
-/* curl_off_t formatting string directive without "%" conversion specifier. */
-#undef CURL_FORMAT_CURL_OFF_T
-
-/* unsigned curl_off_t formatting string without "%" conversion specifier. */
-#undef CURL_FORMAT_CURL_OFF_TU
-
-/* curl_off_t formatting string directive with "%" conversion specifier. */
-#undef CURL_FORMAT_OFF_T
-
-/* The size of `curl_off_t', as computed by sizeof. */
-#undef CURL_SIZEOF_CURL_OFF_T
-
-/* curl_off_t constant suffix. */
-#undef CURL_SUFFIX_CURL_OFF_T
-
-/* unsigned curl_off_t constant suffix. */
-#undef CURL_SUFFIX_CURL_OFF_TU
-
-#endif /* __CURL_CURLBUILD_H */
diff --git a/lib-x86-32/include/curl/curlrules.h b/lib-x86-32/include/curl/curlrules.h
deleted file mode 100644
index 8aad1df6..00000000
--- a/lib-x86-32/include/curl/curlrules.h
+++ /dev/null
@@ -1,252 +0,0 @@
-#ifndef __CURL_CURLRULES_H
-#define __CURL_CURLRULES_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-
-/* ================================================================ */
-/*                    COMPILE TIME SANITY CHECKS                    */
-/* ================================================================ */
-
-/*
- * NOTE 1:
- * -------
- *
- * All checks done in this file are intentionally placed in a public
- * header file which is pulled by curl/curl.h when an application is
- * being built using an already built libcurl library. Additionally
- * this file is also included and used when building the library.
- *
- * If compilation fails on this file it is certainly sure that the
- * problem is elsewhere. It could be a problem in the curlbuild.h
- * header file, or simply that you are using different compilation
- * settings than those used to build the library.
- *
- * Nothing in this file is intended to be modified or adjusted by the
- * curl library user nor by the curl library builder.
- *
- * Do not deactivate any check, these are done to make sure that the
- * library is properly built and used.
- *
- * You can find further help on the libcurl development mailing list:
- * http://cool.haxx.se/mailman/listinfo/curl-library/
- *
- * NOTE 2
- * ------
- *
- * Some of the following compile time checks are based on the fact
- * that the dimension of a constant array can not be a negative one.
- * In this way if the compile time verification fails, the compilation
- * will fail issuing an error. The error description wording is compiler
- * dependent but it will be quite similar to one of the following:
- *
- *   "negative subscript or subscript is too large"
- *   "array must have at least one element"
- *   "-1 is an illegal array size"
- *   "size of array is negative"
- *
- * If you are building an application which tries to use an already
- * built libcurl library and you are getting this kind of errors on
- * this file, it is a clear indication that there is a mismatch between
- * how the library was built and how you are trying to use it for your
- * application. Your already compiled or binary library provider is the
- * only one who can give you the details you need to properly use it.
- */
-
-/*
- * Verify that some macros are actually defined.
- */
-
-#ifndef CURL_SIZEOF_LONG
-#  error "CURL_SIZEOF_LONG definition is missing!"
-   Error Compilation_aborted_CURL_SIZEOF_LONG_is_missing
-#endif
-
-#ifndef CURL_TYPEOF_CURL_SOCKLEN_T
-#  error "CURL_TYPEOF_CURL_SOCKLEN_T definition is missing!"
-   Error Compilation_aborted_CURL_TYPEOF_CURL_SOCKLEN_T_is_missing
-#endif
-
-#ifndef CURL_SIZEOF_CURL_SOCKLEN_T
-#  error "CURL_SIZEOF_CURL_SOCKLEN_T definition is missing!"
-   Error Compilation_aborted_CURL_SIZEOF_CURL_SOCKLEN_T_is_missing
-#endif
-
-#ifndef CURL_TYPEOF_CURL_OFF_T
-#  error "CURL_TYPEOF_CURL_OFF_T definition is missing!"
-   Error Compilation_aborted_CURL_TYPEOF_CURL_OFF_T_is_missing
-#endif
-
-#ifndef CURL_FORMAT_CURL_OFF_T
-#  error "CURL_FORMAT_CURL_OFF_T definition is missing!"
-   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_T_is_missing
-#endif
-
-#ifndef CURL_FORMAT_CURL_OFF_TU
-#  error "CURL_FORMAT_CURL_OFF_TU definition is missing!"
-   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_TU_is_missing
-#endif
-
-#ifndef CURL_FORMAT_OFF_T
-#  error "CURL_FORMAT_OFF_T definition is missing!"
-   Error Compilation_aborted_CURL_FORMAT_OFF_T_is_missing
-#endif
-
-#ifndef CURL_SIZEOF_CURL_OFF_T
-#  error "CURL_SIZEOF_CURL_OFF_T definition is missing!"
-   Error Compilation_aborted_CURL_SIZEOF_CURL_OFF_T_is_missing
-#endif
-
-#ifndef CURL_SUFFIX_CURL_OFF_T
-#  error "CURL_SUFFIX_CURL_OFF_T definition is missing!"
-   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_T_is_missing
-#endif
-
-#ifndef CURL_SUFFIX_CURL_OFF_TU
-#  error "CURL_SUFFIX_CURL_OFF_TU definition is missing!"
-   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_TU_is_missing
-#endif
-
-/*
- * Macros private to this header file.
- */
-
-#define CurlchkszEQ(t, s) sizeof(t) == s ? 1 : -1
-
-#define CurlchkszGE(t1, t2) sizeof(t1) >= sizeof(t2) ? 1 : -1
-
-/*
- * Verify that the size previously defined and expected for long
- * is the same as the one reported by sizeof() at compile time.
- */
-
-typedef char
-  __curl_rule_01__
-    [CurlchkszEQ(long, CURL_SIZEOF_LONG)];
-
-/*
- * Verify that the size previously defined and expected for
- * curl_off_t is actually the the same as the one reported
- * by sizeof() at compile time.
- */
-
-typedef char
-  __curl_rule_02__
-    [CurlchkszEQ(curl_off_t, CURL_SIZEOF_CURL_OFF_T)];
-
-/*
- * Verify at compile time that the size of curl_off_t as reported
- * by sizeof() is greater or equal than the one reported for long
- * for the current compilation.
- */
-
-typedef char
-  __curl_rule_03__
-    [CurlchkszGE(curl_off_t, long)];
-
-/*
- * Verify that the size previously defined and expected for
- * curl_socklen_t is actually the the same as the one reported
- * by sizeof() at compile time.
- */
-
-typedef char
-  __curl_rule_04__
-    [CurlchkszEQ(curl_socklen_t, CURL_SIZEOF_CURL_SOCKLEN_T)];
-
-/*
- * Verify at compile time that the size of curl_socklen_t as reported
- * by sizeof() is greater or equal than the one reported for int for
- * the current compilation.
- */
-
-typedef char
-  __curl_rule_05__
-    [CurlchkszGE(curl_socklen_t, int)];
-
-/* ================================================================ */
-/*          EXTERNALLY AND INTERNALLY VISIBLE DEFINITIONS           */
-/* ================================================================ */
-
-/*
- * CURL_ISOCPP and CURL_OFF_T_C definitions are done here in order to allow
- * these to be visible and exported by the external libcurl interface API,
- * while also making them visible to the library internals, simply including
- * setup.h, without actually needing to include curl.h internally.
- * If some day this section would grow big enough, all this should be moved
- * to its own header file.
- */
-
-/*
- * Figure out if we can use the ## preprocessor operator, which is supported
- * by ISO/ANSI C and C++. Some compilers support it without setting __STDC__
- * or  __cplusplus so we need to carefully check for them too.
- */
-
-#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus) || \
-  defined(__HP_aCC) || defined(__BORLANDC__) || defined(__LCC__) || \
-  defined(__POCC__) || defined(__SALFORDC__) || defined(__HIGHC__) || \
-  defined(__ILEC400__)
-  /* This compiler is believed to have an ISO compatible preprocessor */
-#define CURL_ISOCPP
-#else
-  /* This compiler is believed NOT to have an ISO compatible preprocessor */
-#undef CURL_ISOCPP
-#endif
-
-/*
- * Macros for minimum-width signed and unsigned curl_off_t integer constants.
- */
-
-#ifdef CURL_ISOCPP
-#  define __CURL_OFF_T_C_HELPER2(Val,Suffix) Val ## Suffix
-#else
-#  define __CURL_OFF_T_C_HELPER2(Val,Suffix) Val/**/Suffix
-#endif
-#define __CURL_OFF_T_C_HELPER1(Val,Suffix) __CURL_OFF_T_C_HELPER2(Val,Suffix)
-#define CURL_OFF_T_C(Val)  __CURL_OFF_T_C_HELPER1(Val,CURL_SUFFIX_CURL_OFF_T)
-#define CURL_OFF_TU_C(Val) __CURL_OFF_T_C_HELPER1(Val,CURL_SUFFIX_CURL_OFF_TU)
-
-/*
- * Get rid of macros private to this header file.
- */
-
-#undef CurlchkszEQ
-#undef CurlchkszGE
-
-/*
- * Get rid of macros not intended to exist beyond this point.
- */
-
-#undef CURL_PULL_WS2TCPIP_H
-#undef CURL_PULL_SYS_TYPES_H
-#undef CURL_PULL_SYS_SOCKET_H
-#undef CURL_PULL_STDINT_H
-#undef CURL_PULL_INTTYPES_H
-
-#undef CURL_TYPEOF_CURL_SOCKLEN_T
-#undef CURL_TYPEOF_CURL_OFF_T
-
-#ifdef CURL_NO_OLDIES
-#undef CURL_FORMAT_OFF_T /* not required since 7.19.0 - obsoleted in 7.20.0 */
-#endif
-
-#endif /* __CURL_CURLRULES_H */
diff --git a/lib-x86-32/include/curl/curlver.h b/lib-x86-32/include/curl/curlver.h
deleted file mode 100644
index e345f56d..00000000
--- a/lib-x86-32/include/curl/curlver.h
+++ /dev/null
@@ -1,69 +0,0 @@
-#ifndef __CURL_CURLVER_H
-#define __CURL_CURLVER_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-
-/* This header file contains nothing but libcurl version info, generated by
-   a script at release-time. This was made its own header file in 7.11.2 */
-
-/* This is the global package copyright */
-#define LIBCURL_COPYRIGHT "1996 - 2010 Daniel Stenberg, <daniel@haxx.se>."
-
-/* This is the version number of the libcurl package from which this header
-   file origins: */
-#define LIBCURL_VERSION "7.21.2"
-
-/* The numeric version number is also available "in parts" by using these
-   defines: */
-#define LIBCURL_VERSION_MAJOR 7
-#define LIBCURL_VERSION_MINOR 21
-#define LIBCURL_VERSION_PATCH 2
-
-/* This is the numeric version of the libcurl version number, meant for easier
-   parsing and comparions by programs. The LIBCURL_VERSION_NUM define will
-   always follow this syntax:
-
-         0xXXYYZZ
-
-   Where XX, YY and ZZ are the main version, release and patch numbers in
-   hexadecimal (using 8 bits each). All three numbers are always represented
-   using two digits.  1.2 would appear as "0x010200" while version 9.11.7
-   appears as "0x090b07".
-
-   This 6-digit (24 bits) hexadecimal number does not show pre-release number,
-   and it is always a greater number in a more recent release. It makes
-   comparisons with greater than and less than work.
-*/
-#define LIBCURL_VERSION_NUM 0x071502
-
-/*
- * This is the date and time when the full source package was created. The
- * timestamp is not stored in git, as the timestamp is properly set in the
- * tarballs by the maketgz script.
- *
- * The format of the date should follow this template:
- *
- * "Mon Feb 12 11:35:33 UTC 2007"
- */
-#define LIBCURL_TIMESTAMP "Tue Oct 12 22:03:31 UTC 2010"
-
-#endif /* __CURL_CURLVER_H */
diff --git a/lib-x86-32/include/curl/easy.h b/lib-x86-32/include/curl/easy.h
deleted file mode 100644
index 1ddb4fe5..00000000
--- a/lib-x86-32/include/curl/easy.h
+++ /dev/null
@@ -1,102 +0,0 @@
-#ifndef __CURL_EASY_H
-#define __CURL_EASY_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-CURL_EXTERN CURL *curl_easy_init(void);
-CURL_EXTERN CURLcode curl_easy_setopt(CURL *curl, CURLoption option, ...);
-CURL_EXTERN CURLcode curl_easy_perform(CURL *curl);
-CURL_EXTERN void curl_easy_cleanup(CURL *curl);
-
-/*
- * NAME curl_easy_getinfo()
- *
- * DESCRIPTION
- *
- * Request internal information from the curl session with this function.  The
- * third argument MUST be a pointer to a long, a pointer to a char * or a
- * pointer to a double (as the documentation describes elsewhere).  The data
- * pointed to will be filled in accordingly and can be relied upon only if the
- * function returns CURLE_OK.  This function is intended to get used *AFTER* a
- * performed transfer, all results from this function are undefined until the
- * transfer is completed.
- */
-CURL_EXTERN CURLcode curl_easy_getinfo(CURL *curl, CURLINFO info, ...);
-
-
-/*
- * NAME curl_easy_duphandle()
- *
- * DESCRIPTION
- *
- * Creates a new curl session handle with the same options set for the handle
- * passed in. Duplicating a handle could only be a matter of cloning data and
- * options, internal state info and things like persistant connections cannot
- * be transfered. It is useful in multithreaded applications when you can run
- * curl_easy_duphandle() for each new thread to avoid a series of identical
- * curl_easy_setopt() invokes in every thread.
- */
-CURL_EXTERN CURL* curl_easy_duphandle(CURL *curl);
-
-/*
- * NAME curl_easy_reset()
- *
- * DESCRIPTION
- *
- * Re-initializes a CURL handle to the default values. This puts back the
- * handle to the same state as it was in when it was just created.
- *
- * It does keep: live connections, the Session ID cache, the DNS cache and the
- * cookies.
- */
-CURL_EXTERN void curl_easy_reset(CURL *curl);
-
-/*
- * NAME curl_easy_recv()
- *
- * DESCRIPTION
- *
- * Receives data from the connected socket. Use after successful
- * curl_easy_perform() with CURLOPT_CONNECT_ONLY option.
- */
-CURL_EXTERN CURLcode curl_easy_recv(CURL *curl, void *buffer, size_t buflen,
-                                    size_t *n);
-
-/*
- * NAME curl_easy_send()
- *
- * DESCRIPTION
- *
- * Sends data over the connected socket. Use after successful
- * curl_easy_perform() with CURLOPT_CONNECT_ONLY option.
- */
-CURL_EXTERN CURLcode curl_easy_send(CURL *curl, const void *buffer,
-                                    size_t buflen, size_t *n);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib-x86-32/include/curl/mprintf.h b/lib-x86-32/include/curl/mprintf.h
deleted file mode 100644
index de7dd2f3..00000000
--- a/lib-x86-32/include/curl/mprintf.h
+++ /dev/null
@@ -1,81 +0,0 @@
-#ifndef __CURL_MPRINTF_H
-#define __CURL_MPRINTF_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2006, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-
-#include <stdarg.h>
-#include <stdio.h> /* needed for FILE */
-
-#include "curl.h"
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-CURL_EXTERN int curl_mprintf(const char *format, ...);
-CURL_EXTERN int curl_mfprintf(FILE *fd, const char *format, ...);
-CURL_EXTERN int curl_msprintf(char *buffer, const char *format, ...);
-CURL_EXTERN int curl_msnprintf(char *buffer, size_t maxlength,
-                               const char *format, ...);
-CURL_EXTERN int curl_mvprintf(const char *format, va_list args);
-CURL_EXTERN int curl_mvfprintf(FILE *fd, const char *format, va_list args);
-CURL_EXTERN int curl_mvsprintf(char *buffer, const char *format, va_list args);
-CURL_EXTERN int curl_mvsnprintf(char *buffer, size_t maxlength,
-                                const char *format, va_list args);
-CURL_EXTERN char *curl_maprintf(const char *format, ...);
-CURL_EXTERN char *curl_mvaprintf(const char *format, va_list args);
-
-#ifdef _MPRINTF_REPLACE
-# undef printf
-# undef fprintf
-# undef sprintf
-# undef vsprintf
-# undef snprintf
-# undef vprintf
-# undef vfprintf
-# undef vsnprintf
-# undef aprintf
-# undef vaprintf
-# define printf curl_mprintf
-# define fprintf curl_mfprintf
-#ifdef CURLDEBUG
-/* When built with CURLDEBUG we define away the sprintf() functions since we
-   don't want internal code to be using them */
-# define sprintf sprintf_was_used
-# define vsprintf vsprintf_was_used
-#else
-# define sprintf curl_msprintf
-# define vsprintf curl_mvsprintf
-#endif
-# define snprintf curl_msnprintf
-# define vprintf curl_mvprintf
-# define vfprintf curl_mvfprintf
-# define vsnprintf curl_mvsnprintf
-# define aprintf curl_maprintf
-# define vaprintf curl_mvaprintf
-#endif
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif /* __CURL_MPRINTF_H */
diff --git a/lib-x86-32/include/curl/multi.h b/lib-x86-32/include/curl/multi.h
deleted file mode 100644
index f9656666..00000000
--- a/lib-x86-32/include/curl/multi.h
+++ /dev/null
@@ -1,345 +0,0 @@
-#ifndef __CURL_MULTI_H
-#define __CURL_MULTI_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-/*
-  This is an "external" header file. Don't give away any internals here!
-
-  GOALS
-
-  o Enable a "pull" interface. The application that uses libcurl decides where
-    and when to ask libcurl to get/send data.
-
-  o Enable multiple simultaneous transfers in the same thread without making it
-    complicated for the application.
-
-  o Enable the application to select() on its own file descriptors and curl's
-    file descriptors simultaneous easily.
-
-*/
-
-/*
- * This header file should not really need to include "curl.h" since curl.h
- * itself includes this file and we expect user applications to do #include
- * <curl/curl.h> without the need for especially including multi.h.
- *
- * For some reason we added this include here at one point, and rather than to
- * break existing (wrongly written) libcurl applications, we leave it as-is
- * but with this warning attached.
- */
-#include "curl.h"
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef void CURLM;
-
-typedef enum {
-  CURLM_CALL_MULTI_PERFORM = -1, /* please call curl_multi_perform() or
-                                    curl_multi_socket*() soon */
-  CURLM_OK,
-  CURLM_BAD_HANDLE,      /* the passed-in handle is not a valid CURLM handle */
-  CURLM_BAD_EASY_HANDLE, /* an easy handle was not good/valid */
-  CURLM_OUT_OF_MEMORY,   /* if you ever get this, you're in deep sh*t */
-  CURLM_INTERNAL_ERROR,  /* this is a libcurl bug */
-  CURLM_BAD_SOCKET,      /* the passed in socket argument did not match */
-  CURLM_UNKNOWN_OPTION,  /* curl_multi_setopt() with unsupported option */
-  CURLM_LAST
-} CURLMcode;
-
-/* just to make code nicer when using curl_multi_socket() you can now check
-   for CURLM_CALL_MULTI_SOCKET too in the same style it works for
-   curl_multi_perform() and CURLM_CALL_MULTI_PERFORM */
-#define CURLM_CALL_MULTI_SOCKET CURLM_CALL_MULTI_PERFORM
-
-typedef enum {
-  CURLMSG_NONE, /* first, not used */
-  CURLMSG_DONE, /* This easy handle has completed. 'result' contains
-                   the CURLcode of the transfer */
-  CURLMSG_LAST /* last, not used */
-} CURLMSG;
-
-struct CURLMsg {
-  CURLMSG msg;       /* what this message means */
-  CURL *easy_handle; /* the handle it concerns */
-  union {
-    void *whatever;    /* message-specific data */
-    CURLcode result;   /* return code for transfer */
-  } data;
-};
-typedef struct CURLMsg CURLMsg;
-
-/*
- * Name:    curl_multi_init()
- *
- * Desc:    inititalize multi-style curl usage
- *
- * Returns: a new CURLM handle to use in all 'curl_multi' functions.
- */
-CURL_EXTERN CURLM *curl_multi_init(void);
-
-/*
- * Name:    curl_multi_add_handle()
- *
- * Desc:    add a standard curl handle to the multi stack
- *
- * Returns: CURLMcode type, general multi error code.
- */
-CURL_EXTERN CURLMcode curl_multi_add_handle(CURLM *multi_handle,
-                                            CURL *curl_handle);
-
- /*
-  * Name:    curl_multi_remove_handle()
-  *
-  * Desc:    removes a curl handle from the multi stack again
-  *
-  * Returns: CURLMcode type, general multi error code.
-  */
-CURL_EXTERN CURLMcode curl_multi_remove_handle(CURLM *multi_handle,
-                                               CURL *curl_handle);
-
- /*
-  * Name:    curl_multi_fdset()
-  *
-  * Desc:    Ask curl for its fd_set sets. The app can use these to select() or
-  *          poll() on. We want curl_multi_perform() called as soon as one of
-  *          them are ready.
-  *
-  * Returns: CURLMcode type, general multi error code.
-  */
-CURL_EXTERN CURLMcode curl_multi_fdset(CURLM *multi_handle,
-                                       fd_set *read_fd_set,
-                                       fd_set *write_fd_set,
-                                       fd_set *exc_fd_set,
-                                       int *max_fd);
-
- /*
-  * Name:    curl_multi_perform()
-  *
-  * Desc:    When the app thinks there's data available for curl it calls this
-  *          function to read/write whatever there is right now. This returns
-  *          as soon as the reads and writes are done. This function does not
-  *          require that there actually is data available for reading or that
-  *          data can be written, it can be called just in case. It returns
-  *          the number of handles that still transfer data in the second
-  *          argument's integer-pointer.
-  *
-  * Returns: CURLMcode type, general multi error code. *NOTE* that this only
-  *          returns errors etc regarding the whole multi stack. There might
-  *          still have occurred problems on invidual transfers even when this
-  *          returns OK.
-  */
-CURL_EXTERN CURLMcode curl_multi_perform(CURLM *multi_handle,
-                                         int *running_handles);
-
- /*
-  * Name:    curl_multi_cleanup()
-  *
-  * Desc:    Cleans up and removes a whole multi stack. It does not free or
-  *          touch any individual easy handles in any way. We need to define
-  *          in what state those handles will be if this function is called
-  *          in the middle of a transfer.
-  *
-  * Returns: CURLMcode type, general multi error code.
-  */
-CURL_EXTERN CURLMcode curl_multi_cleanup(CURLM *multi_handle);
-
-/*
- * Name:    curl_multi_info_read()
- *
- * Desc:    Ask the multi handle if there's any messages/informationals from
- *          the individual transfers. Messages include informationals such as
- *          error code from the transfer or just the fact that a transfer is
- *          completed. More details on these should be written down as well.
- *
- *          Repeated calls to this function will return a new struct each
- *          time, until a special "end of msgs" struct is returned as a signal
- *          that there is no more to get at this point.
- *
- *          The data the returned pointer points to will not survive calling
- *          curl_multi_cleanup().
- *
- *          The 'CURLMsg' struct is meant to be very simple and only contain
- *          very basic informations. If more involved information is wanted,
- *          we will provide the particular "transfer handle" in that struct
- *          and that should/could/would be used in subsequent
- *          curl_easy_getinfo() calls (or similar). The point being that we
- *          must never expose complex structs to applications, as then we'll
- *          undoubtably get backwards compatibility problems in the future.
- *
- * Returns: A pointer to a filled-in struct, or NULL if it failed or ran out
- *          of structs. It also writes the number of messages left in the
- *          queue (after this read) in the integer the second argument points
- *          to.
- */
-CURL_EXTERN CURLMsg *curl_multi_info_read(CURLM *multi_handle,
-                                          int *msgs_in_queue);
-
-/*
- * Name:    curl_multi_strerror()
- *
- * Desc:    The curl_multi_strerror function may be used to turn a CURLMcode
- *          value into the equivalent human readable error string.  This is
- *          useful for printing meaningful error messages.
- *
- * Returns: A pointer to a zero-terminated error message.
- */
-CURL_EXTERN const char *curl_multi_strerror(CURLMcode);
-
-/*
- * Name:    curl_multi_socket() and
- *          curl_multi_socket_all()
- *
- * Desc:    An alternative version of curl_multi_perform() that allows the
- *          application to pass in one of the file descriptors that have been
- *          detected to have "action" on them and let libcurl perform.
- *          See man page for details.
- */
-#define CURL_POLL_NONE   0
-#define CURL_POLL_IN     1
-#define CURL_POLL_OUT    2
-#define CURL_POLL_INOUT  3
-#define CURL_POLL_REMOVE 4
-
-#define CURL_SOCKET_TIMEOUT CURL_SOCKET_BAD
-
-#define CURL_CSELECT_IN   0x01
-#define CURL_CSELECT_OUT  0x02
-#define CURL_CSELECT_ERR  0x04
-
-typedef int (*curl_socket_callback)(CURL *easy,      /* easy handle */
-                                    curl_socket_t s, /* socket */
-                                    int what,        /* see above */
-                                    void *userp,     /* private callback
-                                                        pointer */
-                                    void *socketp);  /* private socket
-                                                        pointer */
-/*
- * Name:    curl_multi_timer_callback
- *
- * Desc:    Called by libcurl whenever the library detects a change in the
- *          maximum number of milliseconds the app is allowed to wait before
- *          curl_multi_socket() or curl_multi_perform() must be called
- *          (to allow libcurl's timed events to take place).
- *
- * Returns: The callback should return zero.
- */
-typedef int (*curl_multi_timer_callback)(CURLM *multi,    /* multi handle */
-                                         long timeout_ms, /* see above */
-                                         void *userp);    /* private callback
-                                                             pointer */
-
-CURL_EXTERN CURLMcode curl_multi_socket(CURLM *multi_handle, curl_socket_t s,
-                                        int *running_handles);
-
-CURL_EXTERN CURLMcode curl_multi_socket_action(CURLM *multi_handle,
-                                               curl_socket_t s,
-                                               int ev_bitmask,
-                                               int *running_handles);
-
-CURL_EXTERN CURLMcode curl_multi_socket_all(CURLM *multi_handle,
-                                            int *running_handles);
-
-#ifndef CURL_ALLOW_OLD_MULTI_SOCKET
-/* This macro below was added in 7.16.3 to push users who recompile to use
-   the new curl_multi_socket_action() instead of the old curl_multi_socket()
-*/
-#define curl_multi_socket(x,y,z) curl_multi_socket_action(x,y,0,z)
-#endif
-
-/*
- * Name:    curl_multi_timeout()
- *
- * Desc:    Returns the maximum number of milliseconds the app is allowed to
- *          wait before curl_multi_socket() or curl_multi_perform() must be
- *          called (to allow libcurl's timed events to take place).
- *
- * Returns: CURLM error code.
- */
-CURL_EXTERN CURLMcode curl_multi_timeout(CURLM *multi_handle,
-                                         long *milliseconds);
-
-#undef CINIT /* re-using the same name as in curl.h */
-
-#ifdef CURL_ISOCPP
-#define CINIT(name,type,num) CURLMOPT_ ## name = CURLOPTTYPE_ ## type + num
-#else
-/* The macro "##" is ISO C, we assume pre-ISO C doesn't support it. */
-#define LONG          CURLOPTTYPE_LONG
-#define OBJECTPOINT   CURLOPTTYPE_OBJECTPOINT
-#define FUNCTIONPOINT CURLOPTTYPE_FUNCTIONPOINT
-#define OFF_T         CURLOPTTYPE_OFF_T
-#define CINIT(name,type,number) CURLMOPT_/**/name = type + number
-#endif
-
-typedef enum {
-  /* This is the socket callback function pointer */
-  CINIT(SOCKETFUNCTION, FUNCTIONPOINT, 1),
-
-  /* This is the argument passed to the socket callback */
-  CINIT(SOCKETDATA, OBJECTPOINT, 2),
-
-    /* set to 1 to enable pipelining for this multi handle */
-  CINIT(PIPELINING, LONG, 3),
-
-   /* This is the timer callback function pointer */
-  CINIT(TIMERFUNCTION, FUNCTIONPOINT, 4),
-
-  /* This is the argument passed to the timer callback */
-  CINIT(TIMERDATA, OBJECTPOINT, 5),
-
-  /* maximum number of entries in the connection cache */
-  CINIT(MAXCONNECTS, LONG, 6),
-
-  CURLMOPT_LASTENTRY /* the last unused */
-} CURLMoption;
-
-
-/*
- * Name:    curl_multi_setopt()
- *
- * Desc:    Sets options for the multi handle.
- *
- * Returns: CURLM error code.
- */
-CURL_EXTERN CURLMcode curl_multi_setopt(CURLM *multi_handle,
-                                        CURLMoption option, ...);
-
-
-/*
- * Name:    curl_multi_assign()
- *
- * Desc:    This function sets an association in the multi handle between the
- *          given socket and a private pointer of the application. This is
- *          (only) useful for curl_multi_socket uses.
- *
- * Returns: CURLM error code.
- */
-CURL_EXTERN CURLMcode curl_multi_assign(CURLM *multi_handle,
-                                        curl_socket_t sockfd, void *sockp);
-
-#ifdef __cplusplus
-} /* end of extern "C" */
-#endif
-
-#endif
diff --git a/lib-x86-32/include/curl/stdcheaders.h b/lib-x86-32/include/curl/stdcheaders.h
deleted file mode 100644
index ad82ef63..00000000
--- a/lib-x86-32/include/curl/stdcheaders.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef __STDC_HEADERS_H
-#define __STDC_HEADERS_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-
-#include <sys/types.h>
-
-size_t fread (void *, size_t, size_t, FILE *);
-size_t fwrite (const void *, size_t, size_t, FILE *);
-
-int strcasecmp(const char *, const char *);
-int strncasecmp(const char *, const char *, size_t);
-
-#endif /* __STDC_HEADERS_H */
diff --git a/lib-x86-32/include/curl/typecheck-gcc.h b/lib-x86-32/include/curl/typecheck-gcc.h
deleted file mode 100644
index e6f74a95..00000000
--- a/lib-x86-32/include/curl/typecheck-gcc.h
+++ /dev/null
@@ -1,584 +0,0 @@
-#ifndef __CURL_TYPECHECK_GCC_H
-#define __CURL_TYPECHECK_GCC_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-
-/* wraps curl_easy_setopt() with typechecking */
-
-/* To add a new kind of warning, add an
- *   if(_curl_is_sometype_option(_curl_opt))
- *     if(!_curl_is_sometype(value))
- *       _curl_easy_setopt_err_sometype();
- * block and define _curl_is_sometype_option, _curl_is_sometype and
- * _curl_easy_setopt_err_sometype below
- *
- * NOTE: We use two nested 'if' statements here instead of the && operator, in
- *       order to work around gcc bug #32061.  It affects only gcc 4.3.x/4.4.x
- *       when compiling with -Wlogical-op.
- *
- * To add an option that uses the same type as an existing option, you'll just
- * need to extend the appropriate _curl_*_option macro
- */
-#define curl_easy_setopt(handle, option, value)                               \
-__extension__ ({                                                              \
-  __typeof__ (option) _curl_opt = option;                                     \
-  if (__builtin_constant_p(_curl_opt)) {                                      \
-    if (_curl_is_long_option(_curl_opt))                                      \
-      if (!_curl_is_long(value))                                              \
-        _curl_easy_setopt_err_long();                                         \
-    if (_curl_is_off_t_option(_curl_opt))                                     \
-      if (!_curl_is_off_t(value))                                             \
-        _curl_easy_setopt_err_curl_off_t();                                   \
-    if (_curl_is_string_option(_curl_opt))                                    \
-      if (!_curl_is_string(value))                                            \
-        _curl_easy_setopt_err_string();                                       \
-    if (_curl_is_write_cb_option(_curl_opt))                                  \
-      if (!_curl_is_write_cb(value))                                          \
-        _curl_easy_setopt_err_write_callback();                               \
-    if ((_curl_opt) == CURLOPT_READFUNCTION)                                  \
-      if (!_curl_is_read_cb(value))                                           \
-        _curl_easy_setopt_err_read_cb();                                      \
-    if ((_curl_opt) == CURLOPT_IOCTLFUNCTION)                                 \
-      if (!_curl_is_ioctl_cb(value))                                          \
-        _curl_easy_setopt_err_ioctl_cb();                                     \
-    if ((_curl_opt) == CURLOPT_SOCKOPTFUNCTION)                               \
-      if (!_curl_is_sockopt_cb(value))                                        \
-        _curl_easy_setopt_err_sockopt_cb();                                   \
-    if ((_curl_opt) == CURLOPT_OPENSOCKETFUNCTION)                            \
-      if (!_curl_is_opensocket_cb(value))                                     \
-        _curl_easy_setopt_err_opensocket_cb();                                \
-    if ((_curl_opt) == CURLOPT_PROGRESSFUNCTION)                              \
-      if (!_curl_is_progress_cb(value))                                       \
-        _curl_easy_setopt_err_progress_cb();                                  \
-    if ((_curl_opt) == CURLOPT_DEBUGFUNCTION)                                 \
-      if (!_curl_is_debug_cb(value))                                          \
-        _curl_easy_setopt_err_debug_cb();                                     \
-    if ((_curl_opt) == CURLOPT_SSL_CTX_FUNCTION)                              \
-      if (!_curl_is_ssl_ctx_cb(value))                                        \
-        _curl_easy_setopt_err_ssl_ctx_cb();                                   \
-    if (_curl_is_conv_cb_option(_curl_opt))                                   \
-      if (!_curl_is_conv_cb(value))                                           \
-        _curl_easy_setopt_err_conv_cb();                                      \
-    if ((_curl_opt) == CURLOPT_SEEKFUNCTION)                                  \
-      if (!_curl_is_seek_cb(value))                                           \
-        _curl_easy_setopt_err_seek_cb();                                      \
-    if (_curl_is_cb_data_option(_curl_opt))                                   \
-      if (!_curl_is_cb_data(value))                                           \
-        _curl_easy_setopt_err_cb_data();                                      \
-    if ((_curl_opt) == CURLOPT_ERRORBUFFER)                                   \
-      if (!_curl_is_error_buffer(value))                                      \
-        _curl_easy_setopt_err_error_buffer();                                 \
-    if ((_curl_opt) == CURLOPT_STDERR)                                        \
-      if (!_curl_is_FILE(value))                                              \
-        _curl_easy_setopt_err_FILE();                                         \
-    if (_curl_is_postfields_option(_curl_opt))                                \
-      if (!_curl_is_postfields(value))                                        \
-        _curl_easy_setopt_err_postfields();                                   \
-    if ((_curl_opt) == CURLOPT_HTTPPOST)                                      \
-      if (!_curl_is_arr((value), struct curl_httppost))                       \
-        _curl_easy_setopt_err_curl_httpost();                                 \
-    if (_curl_is_slist_option(_curl_opt))                                     \
-      if (!_curl_is_arr((value), struct curl_slist))                          \
-        _curl_easy_setopt_err_curl_slist();                                   \
-    if ((_curl_opt) == CURLOPT_SHARE)                                         \
-      if (!_curl_is_ptr((value), CURLSH))                                     \
-        _curl_easy_setopt_err_CURLSH();                                       \
-  }                                                                           \
-  curl_easy_setopt(handle, _curl_opt, value);                                 \
-})
-
-/* wraps curl_easy_getinfo() with typechecking */
-/* FIXME: don't allow const pointers */
-#define curl_easy_getinfo(handle, info, arg)                                  \
-__extension__ ({                                                              \
-  __typeof__ (info) _curl_info = info;                                        \
-  if (__builtin_constant_p(_curl_info)) {                                     \
-    if (_curl_is_string_info(_curl_info))                                     \
-      if (!_curl_is_arr((arg), char *))                                       \
-        _curl_easy_getinfo_err_string();                                      \
-    if (_curl_is_long_info(_curl_info))                                       \
-      if (!_curl_is_arr((arg), long))                                         \
-        _curl_easy_getinfo_err_long();                                        \
-    if (_curl_is_double_info(_curl_info))                                     \
-      if (!_curl_is_arr((arg), double))                                       \
-        _curl_easy_getinfo_err_double();                                      \
-    if (_curl_is_slist_info(_curl_info))                                      \
-      if (!_curl_is_arr((arg), struct curl_slist *))                          \
-        _curl_easy_getinfo_err_curl_slist();                                  \
-  }                                                                           \
-  curl_easy_getinfo(handle, _curl_info, arg);                                 \
-})
-
-/* TODO: typechecking for curl_share_setopt() and curl_multi_setopt(),
- * for now just make sure that the functions are called with three
- * arguments
- */
-#define curl_share_setopt(share,opt,param) curl_share_setopt(share,opt,param)
-#define curl_multi_setopt(handle,opt,param) curl_multi_setopt(handle,opt,param)
-
-
-/* the actual warnings, triggered by calling the _curl_easy_setopt_err*
- * functions */
-
-/* To define a new warning, use _CURL_WARNING(identifier, "message") */
-#define _CURL_WARNING(id, message)                                            \
-  static void __attribute__((warning(message))) __attribute__((unused))       \
-  __attribute__((noinline)) id(void) { __asm__(""); }
-
-_CURL_WARNING(_curl_easy_setopt_err_long,
-  "curl_easy_setopt expects a long argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_curl_off_t,
-  "curl_easy_setopt expects a curl_off_t argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_string,
-  "curl_easy_setopt expects a string (char* or char[]) argument for this option"
-  )
-_CURL_WARNING(_curl_easy_setopt_err_write_callback,
-  "curl_easy_setopt expects a curl_write_callback argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_read_cb,
-  "curl_easy_setopt expects a curl_read_callback argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_ioctl_cb,
-  "curl_easy_setopt expects a curl_ioctl_callback argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_sockopt_cb,
-  "curl_easy_setopt expects a curl_sockopt_callback argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_opensocket_cb,
-  "curl_easy_setopt expects a curl_opensocket_callback argument for this option"
-  )
-_CURL_WARNING(_curl_easy_setopt_err_progress_cb,
-  "curl_easy_setopt expects a curl_progress_callback argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_debug_cb,
-  "curl_easy_setopt expects a curl_debug_callback argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_ssl_ctx_cb,
-  "curl_easy_setopt expects a curl_ssl_ctx_callback argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_conv_cb,
-  "curl_easy_setopt expects a curl_conv_callback argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_seek_cb,
-  "curl_easy_setopt expects a curl_seek_callback argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_cb_data,
-  "curl_easy_setopt expects a private data pointer as argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_error_buffer,
-  "curl_easy_setopt expects a char buffer of CURL_ERROR_SIZE as argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_FILE,
-  "curl_easy_setopt expects a FILE* argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_postfields,
-  "curl_easy_setopt expects a void* or char* argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_curl_httpost,
-  "curl_easy_setopt expects a struct curl_httppost* argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_curl_slist,
-  "curl_easy_setopt expects a struct curl_slist* argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_CURLSH,
-  "curl_easy_setopt expects a CURLSH* argument for this option")
-
-_CURL_WARNING(_curl_easy_getinfo_err_string,
-  "curl_easy_getinfo expects a pointer to char * for this info")
-_CURL_WARNING(_curl_easy_getinfo_err_long,
-  "curl_easy_getinfo expects a pointer to long for this info")
-_CURL_WARNING(_curl_easy_getinfo_err_double,
-  "curl_easy_getinfo expects a pointer to double for this info")
-_CURL_WARNING(_curl_easy_getinfo_err_curl_slist,
-  "curl_easy_getinfo expects a pointer to struct curl_slist * for this info")
-
-/* groups of curl_easy_setops options that take the same type of argument */
-
-/* To add a new option to one of the groups, just add
- *   (option) == CURLOPT_SOMETHING
- * to the or-expression. If the option takes a long or curl_off_t, you don't
- * have to do anything
- */
-
-/* evaluates to true if option takes a long argument */
-#define _curl_is_long_option(option)                                          \
-  (0 < (option) && (option) < CURLOPTTYPE_OBJECTPOINT)
-
-#define _curl_is_off_t_option(option)                                         \
-  ((option) > CURLOPTTYPE_OFF_T)
-
-/* evaluates to true if option takes a char* argument */
-#define _curl_is_string_option(option)                                        \
-  ((option) == CURLOPT_URL ||                                                 \
-   (option) == CURLOPT_PROXY ||                                               \
-   (option) == CURLOPT_INTERFACE ||                                           \
-   (option) == CURLOPT_NETRC_FILE ||                                          \
-   (option) == CURLOPT_USERPWD ||                                             \
-   (option) == CURLOPT_USERNAME ||                                            \
-   (option) == CURLOPT_PASSWORD ||                                            \
-   (option) == CURLOPT_PROXYUSERPWD ||                                        \
-   (option) == CURLOPT_PROXYUSERNAME ||                                       \
-   (option) == CURLOPT_PROXYPASSWORD ||                                       \
-   (option) == CURLOPT_NOPROXY ||                                             \
-   (option) == CURLOPT_ENCODING ||                                            \
-   (option) == CURLOPT_REFERER ||                                             \
-   (option) == CURLOPT_USERAGENT ||                                           \
-   (option) == CURLOPT_COOKIE ||                                              \
-   (option) == CURLOPT_COOKIEFILE ||                                          \
-   (option) == CURLOPT_COOKIEJAR ||                                           \
-   (option) == CURLOPT_COOKIELIST ||                                          \
-   (option) == CURLOPT_FTPPORT ||                                             \
-   (option) == CURLOPT_FTP_ALTERNATIVE_TO_USER ||                             \
-   (option) == CURLOPT_FTP_ACCOUNT ||                                         \
-   (option) == CURLOPT_RANGE ||                                               \
-   (option) == CURLOPT_CUSTOMREQUEST ||                                       \
-   (option) == CURLOPT_SSLCERT ||                                             \
-   (option) == CURLOPT_SSLCERTTYPE ||                                         \
-   (option) == CURLOPT_SSLKEY ||                                              \
-   (option) == CURLOPT_SSLKEYTYPE ||                                          \
-   (option) == CURLOPT_KEYPASSWD ||                                           \
-   (option) == CURLOPT_SSLENGINE ||                                           \
-   (option) == CURLOPT_CAINFO ||                                              \
-   (option) == CURLOPT_CAPATH ||                                              \
-   (option) == CURLOPT_RANDOM_FILE ||                                         \
-   (option) == CURLOPT_EGDSOCKET ||                                           \
-   (option) == CURLOPT_SSL_CIPHER_LIST ||                                     \
-   (option) == CURLOPT_KRBLEVEL ||                                            \
-   (option) == CURLOPT_SSH_HOST_PUBLIC_KEY_MD5 ||                             \
-   (option) == CURLOPT_SSH_PUBLIC_KEYFILE ||                                  \
-   (option) == CURLOPT_SSH_PRIVATE_KEYFILE ||                                 \
-   (option) == CURLOPT_CRLFILE ||                                             \
-   (option) == CURLOPT_ISSUERCERT ||                                          \
-   (option) == CURLOPT_SOCKS5_GSSAPI_SERVICE ||                               \
-   (option) == CURLOPT_SSH_KNOWNHOSTS ||                                      \
-   (option) == CURLOPT_MAIL_FROM ||                                           \
-   (option) == CURLOPT_RTSP_SESSION_ID ||                                     \
-   (option) == CURLOPT_RTSP_STREAM_URI ||                                     \
-   (option) == CURLOPT_RTSP_TRANSPORT ||                                      \
-   0)
-
-/* evaluates to true if option takes a curl_write_callback argument */
-#define _curl_is_write_cb_option(option)                                      \
-  ((option) == CURLOPT_HEADERFUNCTION ||                                      \
-   (option) == CURLOPT_WRITEFUNCTION)
-
-/* evaluates to true if option takes a curl_conv_callback argument */
-#define _curl_is_conv_cb_option(option)                                       \
-  ((option) == CURLOPT_CONV_TO_NETWORK_FUNCTION ||                            \
-   (option) == CURLOPT_CONV_FROM_NETWORK_FUNCTION ||                          \
-   (option) == CURLOPT_CONV_FROM_UTF8_FUNCTION)
-
-/* evaluates to true if option takes a data argument to pass to a callback */
-#define _curl_is_cb_data_option(option)                                       \
-  ((option) == CURLOPT_WRITEDATA ||                                           \
-   (option) == CURLOPT_READDATA ||                                            \
-   (option) == CURLOPT_IOCTLDATA ||                                           \
-   (option) == CURLOPT_SOCKOPTDATA ||                                         \
-   (option) == CURLOPT_OPENSOCKETDATA ||                                      \
-   (option) == CURLOPT_PROGRESSDATA ||                                        \
-   (option) == CURLOPT_WRITEHEADER ||                                         \
-   (option) == CURLOPT_DEBUGDATA ||                                           \
-   (option) == CURLOPT_SSL_CTX_DATA ||                                        \
-   (option) == CURLOPT_SEEKDATA ||                                            \
-   (option) == CURLOPT_PRIVATE ||                                             \
-   (option) == CURLOPT_SSH_KEYDATA ||                                         \
-   (option) == CURLOPT_INTERLEAVEDATA ||                                      \
-   (option) == CURLOPT_CHUNK_DATA ||                                          \
-   (option) == CURLOPT_FNMATCH_DATA ||                                        \
-   0)
-
-/* evaluates to true if option takes a POST data argument (void* or char*) */
-#define _curl_is_postfields_option(option)                                    \
-  ((option) == CURLOPT_POSTFIELDS ||                                          \
-   (option) == CURLOPT_COPYPOSTFIELDS ||                                      \
-   0)
-
-/* evaluates to true if option takes a struct curl_slist * argument */
-#define _curl_is_slist_option(option)                                         \
-  ((option) == CURLOPT_HTTPHEADER ||                                          \
-   (option) == CURLOPT_HTTP200ALIASES ||                                      \
-   (option) == CURLOPT_QUOTE ||                                               \
-   (option) == CURLOPT_POSTQUOTE ||                                           \
-   (option) == CURLOPT_PREQUOTE ||                                            \
-   (option) == CURLOPT_TELNETOPTIONS ||                                       \
-   (option) == CURLOPT_MAIL_RCPT ||                                           \
-   0)
-
-/* groups of curl_easy_getinfo infos that take the same type of argument */
-
-/* evaluates to true if info expects a pointer to char * argument */
-#define _curl_is_string_info(info)                                            \
-  (CURLINFO_STRING < (info) && (info) < CURLINFO_LONG)
-
-/* evaluates to true if info expects a pointer to long argument */
-#define _curl_is_long_info(info)                                              \
-  (CURLINFO_LONG < (info) && (info) < CURLINFO_DOUBLE)
-
-/* evaluates to true if info expects a pointer to double argument */
-#define _curl_is_double_info(info)                                            \
-  (CURLINFO_DOUBLE < (info) && (info) < CURLINFO_SLIST)
-
-/* true if info expects a pointer to struct curl_slist * argument */
-#define _curl_is_slist_info(info)                                             \
-  (CURLINFO_SLIST < (info))
-
-
-/* typecheck helpers -- check whether given expression has requested type*/
-
-/* For pointers, you can use the _curl_is_ptr/_curl_is_arr macros,
- * otherwise define a new macro. Search for __builtin_types_compatible_p
- * in the GCC manual.
- * NOTE: these macros MUST NOT EVALUATE their arguments! The argument is
- * the actual expression passed to the curl_easy_setopt macro. This
- * means that you can only apply the sizeof and __typeof__ operators, no
- * == or whatsoever.
- */
-
-/* XXX: should evaluate to true iff expr is a pointer */
-#define _curl_is_any_ptr(expr)                                                \
-  (sizeof(expr) == sizeof(void*))
-
-/* evaluates to true if expr is NULL */
-/* XXX: must not evaluate expr, so this check is not accurate */
-#define _curl_is_NULL(expr)                                                   \
-  (__builtin_types_compatible_p(__typeof__(expr), __typeof__(NULL)))
-
-/* evaluates to true if expr is type*, const type* or NULL */
-#define _curl_is_ptr(expr, type)                                              \
-  (_curl_is_NULL(expr) ||                                                     \
-   __builtin_types_compatible_p(__typeof__(expr), type *) ||                  \
-   __builtin_types_compatible_p(__typeof__(expr), const type *))
-
-/* evaluates to true if expr is one of type[], type*, NULL or const type* */
-#define _curl_is_arr(expr, type)                                              \
-  (_curl_is_ptr((expr), type) ||                                              \
-   __builtin_types_compatible_p(__typeof__(expr), type []))
-
-/* evaluates to true if expr is a string */
-#define _curl_is_string(expr)                                                 \
-  (_curl_is_arr((expr), char) ||                                              \
-   _curl_is_arr((expr), signed char) ||                                       \
-   _curl_is_arr((expr), unsigned char))
-
-/* evaluates to true if expr is a long (no matter the signedness)
- * XXX: for now, int is also accepted (and therefore short and char, which
- * are promoted to int when passed to a variadic function) */
-#define _curl_is_long(expr)                                                   \
-  (__builtin_types_compatible_p(__typeof__(expr), long) ||                    \
-   __builtin_types_compatible_p(__typeof__(expr), signed long) ||             \
-   __builtin_types_compatible_p(__typeof__(expr), unsigned long) ||           \
-   __builtin_types_compatible_p(__typeof__(expr), int) ||                     \
-   __builtin_types_compatible_p(__typeof__(expr), signed int) ||              \
-   __builtin_types_compatible_p(__typeof__(expr), unsigned int) ||            \
-   __builtin_types_compatible_p(__typeof__(expr), short) ||                   \
-   __builtin_types_compatible_p(__typeof__(expr), signed short) ||            \
-   __builtin_types_compatible_p(__typeof__(expr), unsigned short) ||          \
-   __builtin_types_compatible_p(__typeof__(expr), char) ||                    \
-   __builtin_types_compatible_p(__typeof__(expr), signed char) ||             \
-   __builtin_types_compatible_p(__typeof__(expr), unsigned char))
-
-/* evaluates to true if expr is of type curl_off_t */
-#define _curl_is_off_t(expr)                                                  \
-  (__builtin_types_compatible_p(__typeof__(expr), curl_off_t))
-
-/* evaluates to true if expr is abuffer suitable for CURLOPT_ERRORBUFFER */
-/* XXX: also check size of an char[] array? */
-#define _curl_is_error_buffer(expr)                                           \
-  (__builtin_types_compatible_p(__typeof__(expr), char *) ||                  \
-   __builtin_types_compatible_p(__typeof__(expr), char[]))
-
-/* evaluates to true if expr is of type (const) void* or (const) FILE* */
-#if 0
-#define _curl_is_cb_data(expr)                                                \
-  (_curl_is_ptr((expr), void) ||                                              \
-   _curl_is_ptr((expr), FILE))
-#else /* be less strict */
-#define _curl_is_cb_data(expr)                                                \
-  _curl_is_any_ptr(expr)
-#endif
-
-/* evaluates to true if expr is of type FILE* */
-#define _curl_is_FILE(expr)                                                   \
-  (__builtin_types_compatible_p(__typeof__(expr), FILE *))
-
-/* evaluates to true if expr can be passed as POST data (void* or char*) */
-#define _curl_is_postfields(expr)                                             \
-  (_curl_is_ptr((expr), void) ||                                              \
-   _curl_is_arr((expr), char))
-
-/* FIXME: the whole callback checking is messy...
- * The idea is to tolerate char vs. void and const vs. not const
- * pointers in arguments at least
- */
-/* helper: __builtin_types_compatible_p distinguishes between functions and
- * function pointers, hide it */
-#define _curl_callback_compatible(func, type)                                 \
-  (__builtin_types_compatible_p(__typeof__(func), type) ||                    \
-   __builtin_types_compatible_p(__typeof__(func), type*))
-
-/* evaluates to true if expr is of type curl_read_callback or "similar" */
-#define _curl_is_read_cb(expr)                                          \
-  (_curl_is_NULL(expr) ||                                                     \
-   __builtin_types_compatible_p(__typeof__(expr), __typeof__(fread)) ||       \
-   __builtin_types_compatible_p(__typeof__(expr), curl_read_callback) ||      \
-   _curl_callback_compatible((expr), _curl_read_callback1) ||                 \
-   _curl_callback_compatible((expr), _curl_read_callback2) ||                 \
-   _curl_callback_compatible((expr), _curl_read_callback3) ||                 \
-   _curl_callback_compatible((expr), _curl_read_callback4) ||                 \
-   _curl_callback_compatible((expr), _curl_read_callback5) ||                 \
-   _curl_callback_compatible((expr), _curl_read_callback6))
-typedef size_t (_curl_read_callback1)(char *, size_t, size_t, void*);
-typedef size_t (_curl_read_callback2)(char *, size_t, size_t, const void*);
-typedef size_t (_curl_read_callback3)(char *, size_t, size_t, FILE*);
-typedef size_t (_curl_read_callback4)(void *, size_t, size_t, void*);
-typedef size_t (_curl_read_callback5)(void *, size_t, size_t, const void*);
-typedef size_t (_curl_read_callback6)(void *, size_t, size_t, FILE*);
-
-/* evaluates to true if expr is of type curl_write_callback or "similar" */
-#define _curl_is_write_cb(expr)                                               \
-  (_curl_is_read_cb(expr) ||                                            \
-   __builtin_types_compatible_p(__typeof__(expr), __typeof__(fwrite)) ||      \
-   __builtin_types_compatible_p(__typeof__(expr), curl_write_callback) ||     \
-   _curl_callback_compatible((expr), _curl_write_callback1) ||                \
-   _curl_callback_compatible((expr), _curl_write_callback2) ||                \
-   _curl_callback_compatible((expr), _curl_write_callback3) ||                \
-   _curl_callback_compatible((expr), _curl_write_callback4) ||                \
-   _curl_callback_compatible((expr), _curl_write_callback5) ||                \
-   _curl_callback_compatible((expr), _curl_write_callback6))
-typedef size_t (_curl_write_callback1)(const char *, size_t, size_t, void*);
-typedef size_t (_curl_write_callback2)(const char *, size_t, size_t,
-                                       const void*);
-typedef size_t (_curl_write_callback3)(const char *, size_t, size_t, FILE*);
-typedef size_t (_curl_write_callback4)(const void *, size_t, size_t, void*);
-typedef size_t (_curl_write_callback5)(const void *, size_t, size_t,
-                                       const void*);
-typedef size_t (_curl_write_callback6)(const void *, size_t, size_t, FILE*);
-
-/* evaluates to true if expr is of type curl_ioctl_callback or "similar" */
-#define _curl_is_ioctl_cb(expr)                                         \
-  (_curl_is_NULL(expr) ||                                                     \
-   __builtin_types_compatible_p(__typeof__(expr), curl_ioctl_callback) ||     \
-   _curl_callback_compatible((expr), _curl_ioctl_callback1) ||                \
-   _curl_callback_compatible((expr), _curl_ioctl_callback2) ||                \
-   _curl_callback_compatible((expr), _curl_ioctl_callback3) ||                \
-   _curl_callback_compatible((expr), _curl_ioctl_callback4))
-typedef curlioerr (_curl_ioctl_callback1)(CURL *, int, void*);
-typedef curlioerr (_curl_ioctl_callback2)(CURL *, int, const void*);
-typedef curlioerr (_curl_ioctl_callback3)(CURL *, curliocmd, void*);
-typedef curlioerr (_curl_ioctl_callback4)(CURL *, curliocmd, const void*);
-
-/* evaluates to true if expr is of type curl_sockopt_callback or "similar" */
-#define _curl_is_sockopt_cb(expr)                                       \
-  (_curl_is_NULL(expr) ||                                                     \
-   __builtin_types_compatible_p(__typeof__(expr), curl_sockopt_callback) ||   \
-   _curl_callback_compatible((expr), _curl_sockopt_callback1) ||              \
-   _curl_callback_compatible((expr), _curl_sockopt_callback2))
-typedef int (_curl_sockopt_callback1)(void *, curl_socket_t, curlsocktype);
-typedef int (_curl_sockopt_callback2)(const void *, curl_socket_t,
-                                      curlsocktype);
-
-/* evaluates to true if expr is of type curl_opensocket_callback or "similar" */
-#define _curl_is_opensocket_cb(expr)                                    \
-  (_curl_is_NULL(expr) ||                                                     \
-   __builtin_types_compatible_p(__typeof__(expr), curl_opensocket_callback) ||\
-   _curl_callback_compatible((expr), _curl_opensocket_callback1) ||           \
-   _curl_callback_compatible((expr), _curl_opensocket_callback2) ||           \
-   _curl_callback_compatible((expr), _curl_opensocket_callback3) ||           \
-   _curl_callback_compatible((expr), _curl_opensocket_callback4))
-typedef curl_socket_t (_curl_opensocket_callback1)
-  (void *, curlsocktype, struct curl_sockaddr *);
-typedef curl_socket_t (_curl_opensocket_callback2)
-  (void *, curlsocktype, const struct curl_sockaddr *);
-typedef curl_socket_t (_curl_opensocket_callback3)
-  (const void *, curlsocktype, struct curl_sockaddr *);
-typedef curl_socket_t (_curl_opensocket_callback4)
-  (const void *, curlsocktype, const struct curl_sockaddr *);
-
-/* evaluates to true if expr is of type curl_progress_callback or "similar" */
-#define _curl_is_progress_cb(expr)                                      \
-  (_curl_is_NULL(expr) ||                                                     \
-   __builtin_types_compatible_p(__typeof__(expr), curl_progress_callback) ||  \
-   _curl_callback_compatible((expr), _curl_progress_callback1) ||             \
-   _curl_callback_compatible((expr), _curl_progress_callback2))
-typedef int (_curl_progress_callback1)(void *,
-    double, double, double, double);
-typedef int (_curl_progress_callback2)(const void *,
-    double, double, double, double);
-
-/* evaluates to true if expr is of type curl_debug_callback or "similar" */
-#define _curl_is_debug_cb(expr)                                         \
-  (_curl_is_NULL(expr) ||                                                     \
-   __builtin_types_compatible_p(__typeof__(expr), curl_debug_callback) ||     \
-   _curl_callback_compatible((expr), _curl_debug_callback1) ||                \
-   _curl_callback_compatible((expr), _curl_debug_callback2) ||                \
-   _curl_callback_compatible((expr), _curl_debug_callback3) ||                \
-   _curl_callback_compatible((expr), _curl_debug_callback4))
-typedef int (_curl_debug_callback1) (CURL *,
-    curl_infotype, char *, size_t, void *);
-typedef int (_curl_debug_callback2) (CURL *,
-    curl_infotype, char *, size_t, const void *);
-typedef int (_curl_debug_callback3) (CURL *,
-    curl_infotype, const char *, size_t, void *);
-typedef int (_curl_debug_callback4) (CURL *,
-    curl_infotype, const char *, size_t, const void *);
-
-/* evaluates to true if expr is of type curl_ssl_ctx_callback or "similar" */
-/* this is getting even messier... */
-#define _curl_is_ssl_ctx_cb(expr)                                       \
-  (_curl_is_NULL(expr) ||                                                     \
-   __builtin_types_compatible_p(__typeof__(expr), curl_ssl_ctx_callback) ||   \
-   _curl_callback_compatible((expr), _curl_ssl_ctx_callback1) ||              \
-   _curl_callback_compatible((expr), _curl_ssl_ctx_callback2) ||              \
-   _curl_callback_compatible((expr), _curl_ssl_ctx_callback3) ||              \
-   _curl_callback_compatible((expr), _curl_ssl_ctx_callback4) ||              \
-   _curl_callback_compatible((expr), _curl_ssl_ctx_callback5) ||              \
-   _curl_callback_compatible((expr), _curl_ssl_ctx_callback6) ||              \
-   _curl_callback_compatible((expr), _curl_ssl_ctx_callback7) ||              \
-   _curl_callback_compatible((expr), _curl_ssl_ctx_callback8))
-typedef CURLcode (_curl_ssl_ctx_callback1)(CURL *, void *, void *);
-typedef CURLcode (_curl_ssl_ctx_callback2)(CURL *, void *, const void *);
-typedef CURLcode (_curl_ssl_ctx_callback3)(CURL *, const void *, void *);
-typedef CURLcode (_curl_ssl_ctx_callback4)(CURL *, const void *, const void *);
-#ifdef HEADER_SSL_H
-/* hack: if we included OpenSSL's ssl.h, we know about SSL_CTX
- * this will of course break if we're included before OpenSSL headers...
- */
-typedef CURLcode (_curl_ssl_ctx_callback5)(CURL *, SSL_CTX, void *);
-typedef CURLcode (_curl_ssl_ctx_callback6)(CURL *, SSL_CTX, const void *);
-typedef CURLcode (_curl_ssl_ctx_callback7)(CURL *, const SSL_CTX, void *);
-typedef CURLcode (_curl_ssl_ctx_callback8)(CURL *, const SSL_CTX, const void *);
-#else
-typedef _curl_ssl_ctx_callback1 _curl_ssl_ctx_callback5;
-typedef _curl_ssl_ctx_callback1 _curl_ssl_ctx_callback6;
-typedef _curl_ssl_ctx_callback1 _curl_ssl_ctx_callback7;
-typedef _curl_ssl_ctx_callback1 _curl_ssl_ctx_callback8;
-#endif
-
-/* evaluates to true if expr is of type curl_conv_callback or "similar" */
-#define _curl_is_conv_cb(expr)                                          \
-  (_curl_is_NULL(expr) ||                                                     \
-   __builtin_types_compatible_p(__typeof__(expr), curl_conv_callback) ||      \
-   _curl_callback_compatible((expr), _curl_conv_callback1) ||                 \
-   _curl_callback_compatible((expr), _curl_conv_callback2) ||                 \
-   _curl_callback_compatible((expr), _curl_conv_callback3) ||                 \
-   _curl_callback_compatible((expr), _curl_conv_callback4))
-typedef CURLcode (*_curl_conv_callback1)(char *, size_t length);
-typedef CURLcode (*_curl_conv_callback2)(const char *, size_t length);
-typedef CURLcode (*_curl_conv_callback3)(void *, size_t length);
-typedef CURLcode (*_curl_conv_callback4)(const void *, size_t length);
-
-/* evaluates to true if expr is of type curl_seek_callback or "similar" */
-#define _curl_is_seek_cb(expr)                                          \
-  (_curl_is_NULL(expr) ||                                                     \
-   __builtin_types_compatible_p(__typeof__(expr), curl_seek_callback) ||      \
-   _curl_callback_compatible((expr), _curl_seek_callback1) ||                 \
-   _curl_callback_compatible((expr), _curl_seek_callback2))
-typedef CURLcode (*_curl_seek_callback1)(void *, curl_off_t, int);
-typedef CURLcode (*_curl_seek_callback2)(const void *, curl_off_t, int);
-
-
-#endif /* __CURL_TYPECHECK_GCC_H */
diff --git a/lib-x86-32/include/curl/types.h b/lib-x86-32/include/curl/types.h
deleted file mode 100644
index d37d6ae9..00000000
--- a/lib-x86-32/include/curl/types.h
+++ /dev/null
@@ -1 +0,0 @@
-/* not used */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-address.h b/lib-x86-32/include/dbus-1/dbus/dbus-address.h
deleted file mode 100644
index e51ef0ae..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-address.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-address.h  Server address parser.
- *
- * Copyright (C) 2003  CodeFactory AB
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#if !defined (DBUS_INSIDE_DBUS_H) && !defined (DBUS_COMPILATION)
-#error "Only <dbus/dbus.h> can be included directly, this file may disappear or change contents."
-#endif
-
-#ifndef DBUS_ADDRESS_H
-#define DBUS_ADDRESS_H
-
-#include <dbus/dbus-types.h>
-#include <dbus/dbus-errors.h>
-
-DBUS_BEGIN_DECLS
-
-/**
- * @addtogroup DBusAddress
- * @{
- */
-
-/** Opaque type representing one of the semicolon-separated items in an address */
-typedef struct DBusAddressEntry DBusAddressEntry;
-
-DBUS_EXPORT
-dbus_bool_t dbus_parse_address            (const char         *address,
-					   DBusAddressEntry ***entry,
-					   int                *array_len,
-					   DBusError          *error);
-DBUS_EXPORT
-const char *dbus_address_entry_get_value  (DBusAddressEntry   *entry,
-					   const char         *key);
-DBUS_EXPORT
-const char *dbus_address_entry_get_method (DBusAddressEntry   *entry);
-DBUS_EXPORT
-void        dbus_address_entries_free     (DBusAddressEntry  **entries);
-
-DBUS_EXPORT
-char* dbus_address_escape_value   (const char *value);
-DBUS_EXPORT
-char* dbus_address_unescape_value (const char *value,
-                                   DBusError  *error);
-
-/** @} */
-
-DBUS_END_DECLS
-
-#endif /* DBUS_ADDRESS_H */
-
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-arch-deps.h b/lib-x86-32/include/dbus-1/dbus/dbus-arch-deps.h
deleted file mode 100644
index c8359c8c..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-arch-deps.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu" -*- */
-/* dbus-arch-deps.h Header with architecture/compiler specific information, installed to libdir
- *
- * Copyright (C) 2003 Red Hat, Inc.
- *
- * Licensed under the Academic Free License version 2.0
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#if !defined (DBUS_INSIDE_DBUS_H) && !defined (DBUS_COMPILATION)
-#error "Only <dbus/dbus.h> can be included directly, this file may disappear or change contents."
-#endif
-
-#ifndef DBUS_ARCH_DEPS_H
-#define DBUS_ARCH_DEPS_H
-
-#include <dbus/dbus-macros.h>
-
-DBUS_BEGIN_DECLS
-
-#if 1
-#define DBUS_HAVE_INT64 1
-_DBUS_GNUC_EXTENSION typedef long long dbus_int64_t;
-_DBUS_GNUC_EXTENSION typedef unsigned long long dbus_uint64_t;
-
-#define DBUS_INT64_CONSTANT(val)  (_DBUS_GNUC_EXTENSION (val##LL))
-#define DBUS_UINT64_CONSTANT(val) (_DBUS_GNUC_EXTENSION (val##ULL))
-
-#else
-#undef DBUS_HAVE_INT64
-#undef DBUS_INT64_CONSTANT
-#undef DBUS_UINT64_CONSTANT
-#endif
-
-typedef int dbus_int32_t;
-typedef unsigned int dbus_uint32_t;
-
-typedef short dbus_int16_t;
-typedef unsigned short dbus_uint16_t;
-
-/* This is not really arch-dependent, but it's not worth
- * creating an additional generated header just for this
- */
-#define DBUS_MAJOR_VERSION 1
-#define DBUS_MINOR_VERSION 4
-#define DBUS_MICRO_VERSION 0
-
-#define DBUS_VERSION_STRING "1.4.0"
-
-#define DBUS_VERSION ((1 << 16) | (4 << 8) | (0)) 
-
-DBUS_END_DECLS
-
-#endif /* DBUS_ARCH_DEPS_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-auth-script.h b/lib-x86-32/include/dbus-1/dbus/dbus-auth-script.h
deleted file mode 100644
index 39e6c7c4..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-auth-script.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-auth-script.h Test DBusAuth using a special script file (internal to D-Bus implementation)
- * 
- * Copyright (C) 2003 Red Hat, Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef DBUS_AUTH_SCRIPT_H
-#define DBUS_AUTH_SCRIPT_H
-
-#include <dbus/dbus-memory.h>
-#include <dbus/dbus-types.h>
-#include <dbus/dbus-string.h>
-
-DBUS_BEGIN_DECLS
-
-dbus_bool_t _dbus_auth_script_run (const DBusString *filename);
-
-DBUS_END_DECLS
-
-#endif /* DBUS_AUTH_SCRIPT_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-auth.h b/lib-x86-32/include/dbus-1/dbus/dbus-auth.h
deleted file mode 100644
index ae3f3647..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-auth.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-auth.h Authentication
- *
- * Copyright (C) 2002  Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#ifndef DBUS_AUTH_H
-#define DBUS_AUTH_H
-
-#include <dbus/dbus-macros.h>
-#include <dbus/dbus-errors.h>
-#include <dbus/dbus-string.h>
-#include <dbus/dbus-sysdeps.h>
-
-DBUS_BEGIN_DECLS
-
-typedef struct DBusAuth DBusAuth;
-
-typedef enum
-{
-  DBUS_AUTH_STATE_WAITING_FOR_INPUT,
-  DBUS_AUTH_STATE_WAITING_FOR_MEMORY,
-  DBUS_AUTH_STATE_HAVE_BYTES_TO_SEND,
-  DBUS_AUTH_STATE_NEED_DISCONNECT,
-  DBUS_AUTH_STATE_AUTHENTICATED
-} DBusAuthState;
-
-DBusAuth*     _dbus_auth_server_new          (const DBusString       *guid);
-DBusAuth*     _dbus_auth_client_new          (void);
-DBusAuth*     _dbus_auth_ref                 (DBusAuth               *auth);
-void          _dbus_auth_unref               (DBusAuth               *auth);
-dbus_bool_t   _dbus_auth_set_mechanisms      (DBusAuth               *auth,
-                                              const char            **mechanisms);
-DBusAuthState _dbus_auth_do_work             (DBusAuth               *auth);
-dbus_bool_t   _dbus_auth_get_bytes_to_send   (DBusAuth               *auth,
-                                              const DBusString      **str);
-void          _dbus_auth_bytes_sent          (DBusAuth               *auth,
-                                              int                     bytes_sent);
-void          _dbus_auth_get_buffer          (DBusAuth               *auth,
-                                              DBusString            **buffer);
-void          _dbus_auth_return_buffer       (DBusAuth               *auth,
-                                              DBusString             *buffer,
-                                              int                     bytes_read);
-void          _dbus_auth_get_unused_bytes    (DBusAuth               *auth,
-                                              const DBusString      **str);
-void          _dbus_auth_delete_unused_bytes (DBusAuth               *auth);
-dbus_bool_t   _dbus_auth_needs_encoding      (DBusAuth               *auth);
-dbus_bool_t   _dbus_auth_encode_data         (DBusAuth               *auth,
-                                              const DBusString       *plaintext,
-                                              DBusString             *encoded);
-dbus_bool_t   _dbus_auth_needs_decoding      (DBusAuth               *auth);
-dbus_bool_t   _dbus_auth_decode_data         (DBusAuth               *auth,
-                                              const DBusString       *encoded,
-                                              DBusString             *plaintext);
-dbus_bool_t   _dbus_auth_set_credentials     (DBusAuth               *auth,
-                                              DBusCredentials        *credentials);
-DBusCredentials* _dbus_auth_get_identity     (DBusAuth               *auth);
-dbus_bool_t   _dbus_auth_set_context         (DBusAuth               *auth,
-                                              const DBusString       *context);
-const char*   _dbus_auth_get_guid_from_server(DBusAuth               *auth);
-
-void          _dbus_auth_set_unix_fd_possible(DBusAuth               *auth, dbus_bool_t b);
-dbus_bool_t   _dbus_auth_get_unix_fd_negotiated(DBusAuth             *auth);
-
-DBUS_END_DECLS
-
-#endif /* DBUS_AUTH_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-bus.h b/lib-x86-32/include/dbus-1/dbus/dbus-bus.h
deleted file mode 100644
index 02a95711..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-bus.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-bus.h  Convenience functions for communicating with the bus.
- *
- * Copyright (C) 2003  CodeFactory AB
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#if !defined (DBUS_INSIDE_DBUS_H) && !defined (DBUS_COMPILATION)
-#error "Only <dbus/dbus.h> can be included directly, this file may disappear or change contents."
-#endif
-
-#ifndef DBUS_BUS_H
-#define DBUS_BUS_H
-
-#include <dbus/dbus-connection.h>
-
-DBUS_BEGIN_DECLS
-
-/**
- * @addtogroup DBusBus
- * @{
- */
-
-DBUS_EXPORT
-DBusConnection *dbus_bus_get              (DBusBusType     type,
-					   DBusError      *error);
-DBUS_EXPORT
-DBusConnection *dbus_bus_get_private      (DBusBusType     type,
-					   DBusError      *error);
-
-DBUS_EXPORT
-dbus_bool_t     dbus_bus_register         (DBusConnection *connection,
-					   DBusError      *error);
-DBUS_EXPORT
-dbus_bool_t     dbus_bus_set_unique_name  (DBusConnection *connection,
-					   const char     *unique_name);
-DBUS_EXPORT
-const char*     dbus_bus_get_unique_name  (DBusConnection *connection);
-DBUS_EXPORT
-unsigned long   dbus_bus_get_unix_user    (DBusConnection *connection,
-			                   const char     *name,
-                                           DBusError      *error);
-DBUS_EXPORT
-char*           dbus_bus_get_id           (DBusConnection *connection,
-                                           DBusError      *error);
-DBUS_EXPORT
-int             dbus_bus_request_name     (DBusConnection *connection,
-					   const char     *name,
-					   unsigned int    flags,
-					   DBusError      *error);
-DBUS_EXPORT
-int             dbus_bus_release_name     (DBusConnection *connection,
-					   const char     *name,
-					   DBusError      *error);
-DBUS_EXPORT
-dbus_bool_t     dbus_bus_name_has_owner   (DBusConnection *connection,
-					   const char     *name,
-					   DBusError      *error);
-
-DBUS_EXPORT
-dbus_bool_t     dbus_bus_start_service_by_name (DBusConnection *connection,
-                                                const char     *name,
-                                                dbus_uint32_t   flags,
-                                                dbus_uint32_t  *reply,
-                                                DBusError      *error);
-
-DBUS_EXPORT
-void            dbus_bus_add_match        (DBusConnection *connection,
-                                           const char     *rule,
-                                           DBusError      *error);
-DBUS_EXPORT
-void            dbus_bus_remove_match     (DBusConnection *connection,
-                                           const char     *rule,
-                                           DBusError      *error);
-
-/** @} */
-
-DBUS_END_DECLS
-
-#endif /* DBUS_BUS_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-connection-internal.h b/lib-x86-32/include/dbus-1/dbus/dbus-connection-internal.h
deleted file mode 100644
index cdf3f59d..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-connection-internal.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-connection-internal.h DBusConnection internal interfaces
- *
- * Copyright (C) 2002  Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#ifndef DBUS_CONNECTION_INTERNAL_H
-#define DBUS_CONNECTION_INTERNAL_H
-
-#include <dbus/dbus-internals.h>
-#include <dbus/dbus-connection.h>
-#include <dbus/dbus-message.h>
-#include <dbus/dbus-transport.h>
-#include <dbus/dbus-resources.h>
-#include <dbus/dbus-list.h>
-#include <dbus/dbus-timeout.h>
-#include <dbus/dbus-dataslot.h>
-
-DBUS_BEGIN_DECLS
-
-typedef enum
-{
-  DBUS_ITERATION_DO_WRITING = 1 << 0, /**< Write messages out. */
-  DBUS_ITERATION_DO_READING = 1 << 1, /**< Read messages in. */
-  DBUS_ITERATION_BLOCK      = 1 << 2  /**< Block if nothing to do. */
-} DBusIterationFlags;
-
-/** default timeout value when waiting for a message reply, 25 seconds */
-#define _DBUS_DEFAULT_TIMEOUT_VALUE (25 * 1000)
-
-void              _dbus_connection_lock                        (DBusConnection     *connection);
-void              _dbus_connection_unlock                      (DBusConnection     *connection);
-DBusConnection *  _dbus_connection_ref_unlocked                (DBusConnection     *connection);
-void              _dbus_connection_unref_unlocked              (DBusConnection     *connection);
-dbus_bool_t       _dbus_connection_queue_received_message      (DBusConnection     *connection,
-                                                                DBusMessage        *message);
-void              _dbus_connection_queue_received_message_link (DBusConnection     *connection,
-                                                                DBusList           *link);
-dbus_bool_t       _dbus_connection_has_messages_to_send_unlocked (DBusConnection     *connection);
-DBusMessage*      _dbus_connection_get_message_to_send         (DBusConnection     *connection);
-void              _dbus_connection_message_sent                (DBusConnection     *connection,
-                                                                DBusMessage        *message);
-dbus_bool_t       _dbus_connection_add_watch_unlocked          (DBusConnection     *connection,
-                                                                DBusWatch          *watch);
-void              _dbus_connection_remove_watch_unlocked       (DBusConnection     *connection,
-                                                                DBusWatch          *watch);
-void              _dbus_connection_toggle_watch_unlocked       (DBusConnection     *connection,
-                                                                DBusWatch          *watch,
-                                                                dbus_bool_t         enabled);
-dbus_bool_t       _dbus_connection_handle_watch                (DBusWatch          *watch,
-                                                                unsigned int        condition,
-                                                                void               *data);
-dbus_bool_t       _dbus_connection_add_timeout_unlocked        (DBusConnection     *connection,
-                                                                DBusTimeout        *timeout);
-void              _dbus_connection_remove_timeout_unlocked     (DBusConnection     *connection,
-                                                                DBusTimeout        *timeout);
-void              _dbus_connection_toggle_timeout_unlocked     (DBusConnection     *connection,
-                                                                DBusTimeout        *timeout,
-                                                                dbus_bool_t         enabled);
-DBusConnection*   _dbus_connection_new_for_transport           (DBusTransport      *transport);
-void              _dbus_connection_do_iteration_unlocked       (DBusConnection     *connection,
-                                                                DBusPendingCall    *pending,
-                                                                unsigned int        flags,
-                                                                int                 timeout_milliseconds);
-void              _dbus_connection_close_possibly_shared       (DBusConnection     *connection);
-void              _dbus_connection_close_if_only_one_ref       (DBusConnection     *connection);
-
-DBusPendingCall*  _dbus_pending_call_new                       (DBusConnection     *connection,
-                                                                int                 timeout_milliseconds,
-                                                                DBusTimeoutHandler  timeout_handler);
-void              _dbus_pending_call_notify                    (DBusPendingCall    *pending);
-void              _dbus_connection_remove_pending_call         (DBusConnection     *connection,
-                                                                DBusPendingCall    *pending);
-void              _dbus_connection_block_pending_call          (DBusPendingCall    *pending);
-void              _dbus_pending_call_complete_and_unlock       (DBusPendingCall    *pending,
-                                                                DBusMessage        *message);
-dbus_bool_t       _dbus_connection_send_and_unlock             (DBusConnection     *connection,
-                                                                DBusMessage        *message,
-                                                                dbus_uint32_t      *client_serial);
-
-void              _dbus_connection_queue_synthesized_message_link (DBusConnection *connection,
-						                   DBusList *link);
-void              _dbus_connection_test_get_locks                 (DBusConnection *conn,
-                                                                   DBusMutex **mutex_loc,
-                                                                   DBusMutex **dispatch_mutex_loc,
-                                                                   DBusMutex **io_path_mutex_loc,
-                                                                   DBusCondVar **dispatch_cond_loc,
-                                                                   DBusCondVar **io_path_cond_loc);
-
-/* This _dbus_bus_* stuff doesn't really belong here, but dbus-bus-internal.h seems
- * silly for one function
- */
-/**
- * @addtogroup DBusBusInternals
- * @{
- */
-
-void           _dbus_bus_notify_shared_connection_disconnected_unlocked (DBusConnection *connection);
-
-/** @} */
-
-
-DBUS_END_DECLS
-
-#endif /* DBUS_CONNECTION_INTERNAL_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-connection.h b/lib-x86-32/include/dbus-1/dbus/dbus-connection.h
deleted file mode 100644
index 3e2a7d8d..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-connection.h
+++ /dev/null
@@ -1,495 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-connection.h DBusConnection object
- *
- * Copyright (C) 2002, 2003  Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#if !defined (DBUS_INSIDE_DBUS_H) && !defined (DBUS_COMPILATION)
-#error "Only <dbus/dbus.h> can be included directly, this file may disappear or change contents."
-#endif
-
-#ifndef DBUS_CONNECTION_H
-#define DBUS_CONNECTION_H
-
-#include <dbus/dbus-errors.h>
-#include <dbus/dbus-memory.h>
-#include <dbus/dbus-message.h>
-#include <dbus/dbus-shared.h>
-
-DBUS_BEGIN_DECLS
-
-/**
- * @addtogroup DBusConnection
- * @{
- */
-
-/* documented in dbus-watch.c */
-typedef struct DBusWatch DBusWatch;
-/* documented in dbus-timeout.c */
-typedef struct DBusTimeout DBusTimeout;
-/** Opaque type representing preallocated resources so a message can be sent without further memory allocation. */
-typedef struct DBusPreallocatedSend DBusPreallocatedSend;
-/** Opaque type representing a method call that has not yet received a reply. */
-typedef struct DBusPendingCall DBusPendingCall;
-/** Opaque type representing a connection to a remote application and associated incoming/outgoing message queues. */
-typedef struct DBusConnection DBusConnection;
-/** Set of functions that must be implemented to handle messages sent to a particular object path. */
-typedef struct DBusObjectPathVTable DBusObjectPathVTable;
-
-/**
- * Indicates the status of a #DBusWatch.
- */
-typedef enum
-{
-  DBUS_WATCH_READABLE = 1 << 0, /**< As in POLLIN */
-  DBUS_WATCH_WRITABLE = 1 << 1, /**< As in POLLOUT */
-  DBUS_WATCH_ERROR    = 1 << 2, /**< As in POLLERR (can't watch for
-                                 *   this, but can be present in
-                                 *   current state passed to
-                                 *   dbus_watch_handle()).
-                                 */
-  DBUS_WATCH_HANGUP   = 1 << 3  /**< As in POLLHUP (can't watch for
-                                 *   it, but can be present in current
-                                 *   state passed to
-                                 *   dbus_watch_handle()).
-                                 */
-} DBusWatchFlags;
-
-/**
- * Indicates the status of incoming data on a #DBusConnection. This determines whether
- * dbus_connection_dispatch() needs to be called.
- */
-typedef enum
-{
-  DBUS_DISPATCH_DATA_REMAINS,  /**< There is more data to potentially convert to messages. */
-  DBUS_DISPATCH_COMPLETE,      /**< All currently available data has been processed. */
-  DBUS_DISPATCH_NEED_MEMORY    /**< More memory is needed to continue. */
-} DBusDispatchStatus;
-
-/** Called when libdbus needs a new watch to be monitored by the main
- * loop. Returns #FALSE if it lacks enough memory to add the
- * watch. Set by dbus_connection_set_watch_functions() or
- * dbus_server_set_watch_functions().
- */
-typedef dbus_bool_t (* DBusAddWatchFunction)       (DBusWatch      *watch,
-                                                    void           *data);
-/** Called when dbus_watch_get_enabled() may return a different value
- *  than it did before.  Set by dbus_connection_set_watch_functions()
- *  or dbus_server_set_watch_functions().
- */
-typedef void        (* DBusWatchToggledFunction)   (DBusWatch      *watch,
-                                                    void           *data);
-/** Called when libdbus no longer needs a watch to be monitored by the
- * main loop. Set by dbus_connection_set_watch_functions() or
- * dbus_server_set_watch_functions().
- */
-typedef void        (* DBusRemoveWatchFunction)    (DBusWatch      *watch,
-                                                    void           *data);
-/** Called when libdbus needs a new timeout to be monitored by the main
- * loop. Returns #FALSE if it lacks enough memory to add the
- * watch. Set by dbus_connection_set_timeout_functions() or
- * dbus_server_set_timeout_functions().
- */
-typedef dbus_bool_t (* DBusAddTimeoutFunction)     (DBusTimeout    *timeout,
-                                                    void           *data);
-/** Called when dbus_timeout_get_enabled() may return a different
- * value than it did before.
- * Set by dbus_connection_set_timeout_functions() or
- * dbus_server_set_timeout_functions().
- */
-typedef void        (* DBusTimeoutToggledFunction) (DBusTimeout    *timeout,
-                                                    void           *data);
-/** Called when libdbus no longer needs a timeout to be monitored by the
- * main loop. Set by dbus_connection_set_timeout_functions() or
- * dbus_server_set_timeout_functions().
- */
-typedef void        (* DBusRemoveTimeoutFunction)  (DBusTimeout    *timeout,
-                                                    void           *data);
-/** Called when the return value of dbus_connection_get_dispatch_status()
- * may have changed. Set with dbus_connection_set_dispatch_status_function().
- */
-typedef void        (* DBusDispatchStatusFunction) (DBusConnection *connection,
-                                                    DBusDispatchStatus new_status,
-                                                    void           *data);
-/**
- * Called when the main loop's thread should be notified that there's now work
- * to do. Set with dbus_connection_set_wakeup_main_function().
- */
-typedef void        (* DBusWakeupMainFunction)     (void           *data);
-
-/**
- * Called during authentication to check whether the given UNIX user
- * ID is allowed to connect, if the client tried to auth as a UNIX
- * user ID. Normally on Windows this would never happen. Set with
- * dbus_connection_set_unix_user_function().
- */ 
-typedef dbus_bool_t (* DBusAllowUnixUserFunction)  (DBusConnection *connection,
-                                                    unsigned long   uid,
-                                                    void           *data);
-
-/**
- * Called during authentication to check whether the given Windows user
- * ID is allowed to connect, if the client tried to auth as a Windows
- * user ID. Normally on UNIX this would never happen. Set with
- * dbus_connection_set_windows_user_function().
- */ 
-typedef dbus_bool_t (* DBusAllowWindowsUserFunction)  (DBusConnection *connection,
-                                                       const char     *user_sid,
-                                                       void           *data);
-
-
-/**
- * Called when a pending call now has a reply available. Set with
- * dbus_pending_call_set_notify().
- */
-typedef void (* DBusPendingCallNotifyFunction) (DBusPendingCall *pending,
-                                                void            *user_data);
-
-/**
- * Called when a message needs to be handled. The result indicates whether or
- * not more handlers should be run. Set with dbus_connection_add_filter().
- */
-typedef DBusHandlerResult (* DBusHandleMessageFunction) (DBusConnection     *connection,
-                                                         DBusMessage        *message,
-                                                         void               *user_data);
-DBUS_EXPORT
-DBusConnection*    dbus_connection_open                         (const char                 *address,
-                                                                 DBusError                  *error);
-DBUS_EXPORT
-DBusConnection*    dbus_connection_open_private                 (const char                 *address,
-                                                                 DBusError                  *error);
-DBUS_EXPORT
-DBusConnection*    dbus_connection_ref                          (DBusConnection             *connection);
-DBUS_EXPORT
-void               dbus_connection_unref                        (DBusConnection             *connection);
-DBUS_EXPORT
-void               dbus_connection_close                        (DBusConnection             *connection);
-DBUS_EXPORT
-dbus_bool_t        dbus_connection_get_is_connected             (DBusConnection             *connection);
-DBUS_EXPORT
-dbus_bool_t        dbus_connection_get_is_authenticated         (DBusConnection             *connection);
-DBUS_EXPORT
-dbus_bool_t        dbus_connection_get_is_anonymous             (DBusConnection             *connection);
-DBUS_EXPORT
-char*              dbus_connection_get_server_id                (DBusConnection             *connection);
-DBUS_EXPORT
-dbus_bool_t        dbus_connection_can_send_type                (DBusConnection             *connection,
-                                                                 int                         type);
-
-DBUS_EXPORT
-void               dbus_connection_set_exit_on_disconnect       (DBusConnection             *connection,
-                                                                 dbus_bool_t                 exit_on_disconnect);
-DBUS_EXPORT
-void               dbus_connection_flush                        (DBusConnection             *connection);
-DBUS_EXPORT
-dbus_bool_t        dbus_connection_read_write_dispatch          (DBusConnection             *connection,
-                                                                 int                         timeout_milliseconds);
-DBUS_EXPORT
-dbus_bool_t        dbus_connection_read_write                   (DBusConnection             *connection,
-                                                                 int                         timeout_milliseconds);
-DBUS_EXPORT
-DBusMessage*       dbus_connection_borrow_message               (DBusConnection             *connection);
-DBUS_EXPORT
-void               dbus_connection_return_message               (DBusConnection             *connection,
-                                                                 DBusMessage                *message);
-DBUS_EXPORT
-void               dbus_connection_steal_borrowed_message       (DBusConnection             *connection,
-                                                                 DBusMessage                *message);
-DBUS_EXPORT
-DBusMessage*       dbus_connection_pop_message                  (DBusConnection             *connection);
-DBUS_EXPORT
-DBusDispatchStatus dbus_connection_get_dispatch_status          (DBusConnection             *connection);
-DBUS_EXPORT
-DBusDispatchStatus dbus_connection_dispatch                     (DBusConnection             *connection);
-DBUS_EXPORT
-dbus_bool_t        dbus_connection_has_messages_to_send         (DBusConnection *connection);
-DBUS_EXPORT
-dbus_bool_t        dbus_connection_send                         (DBusConnection             *connection,
-                                                                 DBusMessage                *message,
-                                                                 dbus_uint32_t              *client_serial);
-DBUS_EXPORT
-dbus_bool_t        dbus_connection_send_with_reply              (DBusConnection             *connection,
-                                                                 DBusMessage                *message,
-                                                                 DBusPendingCall           **pending_return,
-                                                                 int                         timeout_milliseconds);
-DBUS_EXPORT
-DBusMessage *      dbus_connection_send_with_reply_and_block    (DBusConnection             *connection,
-                                                                 DBusMessage                *message,
-                                                                 int                         timeout_milliseconds,
-                                                                 DBusError                  *error);
-DBUS_EXPORT
-dbus_bool_t        dbus_connection_set_watch_functions          (DBusConnection             *connection,
-                                                                 DBusAddWatchFunction        add_function,
-                                                                 DBusRemoveWatchFunction     remove_function,
-                                                                 DBusWatchToggledFunction    toggled_function,
-                                                                 void                       *data,
-                                                                 DBusFreeFunction            free_data_function);
-DBUS_EXPORT
-dbus_bool_t        dbus_connection_set_timeout_functions        (DBusConnection             *connection,
-                                                                 DBusAddTimeoutFunction      add_function,
-                                                                 DBusRemoveTimeoutFunction   remove_function,
-                                                                 DBusTimeoutToggledFunction  toggled_function,
-                                                                 void                       *data,
-                                                                 DBusFreeFunction            free_data_function);
-DBUS_EXPORT
-void               dbus_connection_set_wakeup_main_function     (DBusConnection             *connection,
-                                                                 DBusWakeupMainFunction      wakeup_main_function,
-                                                                 void                       *data,
-                                                                 DBusFreeFunction            free_data_function);
-DBUS_EXPORT
-void               dbus_connection_set_dispatch_status_function (DBusConnection             *connection,
-                                                                 DBusDispatchStatusFunction  function,
-                                                                 void                       *data,
-                                                                 DBusFreeFunction            free_data_function);
-DBUS_EXPORT
-dbus_bool_t        dbus_connection_get_unix_user                (DBusConnection             *connection,
-                                                                 unsigned long              *uid);
-DBUS_EXPORT
-dbus_bool_t        dbus_connection_get_unix_process_id          (DBusConnection             *connection,
-                                                                 unsigned long              *pid);
-DBUS_EXPORT
-dbus_bool_t        dbus_connection_get_adt_audit_session_data   (DBusConnection             *connection,
-                                                                 void                      **data,
-                                                                 dbus_int32_t               *data_size);
-DBUS_EXPORT
-void               dbus_connection_set_unix_user_function       (DBusConnection             *connection,
-                                                                 DBusAllowUnixUserFunction   function,
-                                                                 void                       *data,
-                                                                 DBusFreeFunction            free_data_function);
-DBUS_EXPORT
-dbus_bool_t        dbus_connection_get_windows_user             (DBusConnection             *connection,
-                                                                 char                      **windows_sid_p); 
-DBUS_EXPORT
-void               dbus_connection_set_windows_user_function    (DBusConnection             *connection,
-                                                                 DBusAllowWindowsUserFunction function,
-                                                                 void                       *data,
-                                                                 DBusFreeFunction            free_data_function);
-DBUS_EXPORT
-void               dbus_connection_set_allow_anonymous          (DBusConnection             *connection,
-                                                                 dbus_bool_t                 value);
-DBUS_EXPORT
-void               dbus_connection_set_route_peer_messages      (DBusConnection             *connection,
-                                                                 dbus_bool_t                 value);
-
-
-/* Filters */
-
-DBUS_EXPORT
-dbus_bool_t dbus_connection_add_filter    (DBusConnection            *connection,
-                                           DBusHandleMessageFunction  function,
-                                           void                      *user_data,
-                                           DBusFreeFunction           free_data_function);
-DBUS_EXPORT
-void        dbus_connection_remove_filter (DBusConnection            *connection,
-                                           DBusHandleMessageFunction  function,
-                                           void                      *user_data);
-
-
-/* Other */
-DBUS_EXPORT
-dbus_bool_t dbus_connection_allocate_data_slot (dbus_int32_t     *slot_p);
-DBUS_EXPORT
-void        dbus_connection_free_data_slot     (dbus_int32_t     *slot_p);
-DBUS_EXPORT
-dbus_bool_t dbus_connection_set_data           (DBusConnection   *connection,
-                                                dbus_int32_t      slot,
-                                                void             *data,
-                                                DBusFreeFunction  free_data_func);
-DBUS_EXPORT
-void*       dbus_connection_get_data           (DBusConnection   *connection,
-                                                dbus_int32_t      slot);
-
-DBUS_EXPORT
-void        dbus_connection_set_change_sigpipe (dbus_bool_t       will_modify_sigpipe); 
-
-DBUS_EXPORT
-void dbus_connection_set_max_message_size  (DBusConnection *connection,
-                                            long            size);
-DBUS_EXPORT
-long dbus_connection_get_max_message_size  (DBusConnection *connection);
-DBUS_EXPORT
-void dbus_connection_set_max_received_size (DBusConnection *connection,
-                                            long            size);
-DBUS_EXPORT
-long dbus_connection_get_max_received_size (DBusConnection *connection);
-
-DBUS_EXPORT
-void dbus_connection_set_max_message_unix_fds (DBusConnection *connection,
-                                               long            n);
-DBUS_EXPORT
-long dbus_connection_get_max_message_unix_fds (DBusConnection *connection);
-DBUS_EXPORT
-void dbus_connection_set_max_received_unix_fds(DBusConnection *connection,
-                                               long            n);
-DBUS_EXPORT
-long dbus_connection_get_max_received_unix_fds(DBusConnection *connection);
-
-DBUS_EXPORT
-long dbus_connection_get_outgoing_size     (DBusConnection *connection);
-DBUS_EXPORT
-long dbus_connection_get_outgoing_unix_fds (DBusConnection *connection);
-
-DBUS_EXPORT
-DBusPreallocatedSend* dbus_connection_preallocate_send       (DBusConnection       *connection);
-DBUS_EXPORT
-void                  dbus_connection_free_preallocated_send (DBusConnection       *connection,
-                                                              DBusPreallocatedSend *preallocated);
-DBUS_EXPORT
-void                  dbus_connection_send_preallocated      (DBusConnection       *connection,
-                                                              DBusPreallocatedSend *preallocated,
-                                                              DBusMessage          *message,
-                                                              dbus_uint32_t        *client_serial);
-
-
-/* Object tree functionality */
-
-/**
- * Called when a #DBusObjectPathVTable is unregistered (or its connection is freed).
- * Found in #DBusObjectPathVTable.
- */
-typedef void              (* DBusObjectPathUnregisterFunction) (DBusConnection  *connection,
-                                                                void            *user_data);
-/**
- * Called when a message is sent to a registered object path. Found in
- * #DBusObjectPathVTable which is registered with dbus_connection_register_object_path()
- * or dbus_connection_register_fallback().
- */
-typedef DBusHandlerResult (* DBusObjectPathMessageFunction)    (DBusConnection  *connection,
-                                                                DBusMessage     *message,
-                                                                void            *user_data);
-
-/**
- * Virtual table that must be implemented to handle a portion of the
- * object path hierarchy. Attach the vtable to a particular path using
- * dbus_connection_register_object_path() or
- * dbus_connection_register_fallback().
- */
-struct DBusObjectPathVTable
-{
-  DBusObjectPathUnregisterFunction   unregister_function; /**< Function to unregister this handler */
-  DBusObjectPathMessageFunction      message_function; /**< Function to handle messages */
-  
-  void (* dbus_internal_pad1) (void *); /**< Reserved for future expansion */
-  void (* dbus_internal_pad2) (void *); /**< Reserved for future expansion */
-  void (* dbus_internal_pad3) (void *); /**< Reserved for future expansion */
-  void (* dbus_internal_pad4) (void *); /**< Reserved for future expansion */
-};
-
-DBUS_EXPORT
-dbus_bool_t dbus_connection_try_register_object_path (DBusConnection              *connection,
-                                                      const char                  *path,
-                                                      const DBusObjectPathVTable  *vtable,
-                                                      void                        *user_data,
-                                                      DBusError                   *error);
-
-DBUS_EXPORT
-dbus_bool_t dbus_connection_register_object_path   (DBusConnection              *connection,
-                                                    const char                  *path,
-                                                    const DBusObjectPathVTable  *vtable,
-                                                    void                        *user_data);
-
-DBUS_EXPORT
-dbus_bool_t dbus_connection_try_register_fallback (DBusConnection              *connection,
-                                                   const char                  *path,
-                                                   const DBusObjectPathVTable  *vtable,
-                                                   void                        *user_data,
-                                                   DBusError                   *error);
-
-DBUS_EXPORT
-dbus_bool_t dbus_connection_register_fallback      (DBusConnection              *connection,
-                                                    const char                  *path,
-                                                    const DBusObjectPathVTable  *vtable,
-                                                    void                        *user_data);
-DBUS_EXPORT
-dbus_bool_t dbus_connection_unregister_object_path (DBusConnection              *connection,
-                                                    const char                  *path);
-
-DBUS_EXPORT
-dbus_bool_t dbus_connection_get_object_path_data   (DBusConnection              *connection,
-                                                    const char                  *path,
-                                                    void                       **data_p);
-
-DBUS_EXPORT
-dbus_bool_t dbus_connection_list_registered        (DBusConnection              *connection,
-                                                    const char                  *parent_path,
-                                                    char                      ***child_entries);
-
-DBUS_EXPORT
-dbus_bool_t dbus_connection_get_unix_fd            (DBusConnection              *connection,
-                                                    int                         *fd);
-DBUS_EXPORT
-dbus_bool_t dbus_connection_get_socket             (DBusConnection              *connection,
-                                                    int                         *fd);
-
-/** @} */
-
-
-/**
- * @addtogroup DBusWatch
- * @{
- */
-
-#ifndef DBUS_DISABLE_DEPRECATED
-DBUS_EXPORT
-DBUS_DEPRECATED int dbus_watch_get_fd      (DBusWatch        *watch);
-#endif
-
-DBUS_EXPORT
-int          dbus_watch_get_unix_fd (DBusWatch        *watch);
-DBUS_EXPORT
-int          dbus_watch_get_socket  (DBusWatch        *watch);
-DBUS_EXPORT
-unsigned int dbus_watch_get_flags   (DBusWatch        *watch);
-DBUS_EXPORT
-void*        dbus_watch_get_data    (DBusWatch        *watch);
-DBUS_EXPORT
-void         dbus_watch_set_data    (DBusWatch        *watch,
-                                     void             *data,
-                                     DBusFreeFunction  free_data_function);
-DBUS_EXPORT
-dbus_bool_t  dbus_watch_handle      (DBusWatch        *watch,
-                                     unsigned int      flags);
-DBUS_EXPORT
-dbus_bool_t  dbus_watch_get_enabled (DBusWatch        *watch);
-
-/** @} */
-
-/**
- * @addtogroup DBusTimeout
- * @{
- */
-
-DBUS_EXPORT
-int         dbus_timeout_get_interval (DBusTimeout      *timeout);
-DBUS_EXPORT
-void*       dbus_timeout_get_data     (DBusTimeout      *timeout);
-DBUS_EXPORT
-void        dbus_timeout_set_data     (DBusTimeout      *timeout,
-                                       void             *data,
-                                       DBusFreeFunction  free_data_function);
-DBUS_EXPORT
-dbus_bool_t dbus_timeout_handle       (DBusTimeout      *timeout);
-DBUS_EXPORT
-dbus_bool_t dbus_timeout_get_enabled  (DBusTimeout      *timeout);
-
-/** @} */
-
-DBUS_END_DECLS
-
-#endif /* DBUS_CONNECTION_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-credentials.h b/lib-x86-32/include/dbus-1/dbus/dbus-credentials.h
deleted file mode 100644
index ef6124fd..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-credentials.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-credentials.h Credentials provable through authentication
- *
- * Copyright (C) 2007 Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#ifndef DBUS_CREDENTIALS_H
-#define DBUS_CREDENTIALS_H
-
-#include <dbus/dbus-macros.h>
-#include <dbus/dbus-errors.h>
-#include <dbus/dbus-string.h>
-#include <dbus/dbus-sysdeps.h>
-
-DBUS_BEGIN_DECLS
-
-typedef enum {
-  DBUS_CREDENTIAL_UNIX_PROCESS_ID,
-  DBUS_CREDENTIAL_UNIX_USER_ID,
-  DBUS_CREDENTIAL_ADT_AUDIT_DATA_ID,
-  DBUS_CREDENTIAL_WINDOWS_SID
-} DBusCredentialType;
-
-DBusCredentials* _dbus_credentials_new_from_current_process (void);
-DBusCredentials* _dbus_credentials_new                      (void);
-void             _dbus_credentials_ref                      (DBusCredentials    *credentials);
-void             _dbus_credentials_unref                    (DBusCredentials    *credentials);
-dbus_bool_t      _dbus_credentials_add_unix_pid             (DBusCredentials    *credentials,
-                                                             dbus_pid_t          pid);
-dbus_bool_t      _dbus_credentials_add_unix_uid             (DBusCredentials    *credentials,
-                                                             dbus_uid_t          uid);
-dbus_bool_t      _dbus_credentials_add_windows_sid          (DBusCredentials    *credentials,
-                                                             const char         *windows_sid);
-dbus_bool_t      _dbus_credentials_add_adt_audit_data       (DBusCredentials    *credentials,
-                                                             void               *audit_data,
-                                                             dbus_int32_t        size);
-dbus_bool_t      _dbus_credentials_include                  (DBusCredentials    *credentials,
-                                                             DBusCredentialType  type);
-dbus_pid_t       _dbus_credentials_get_unix_pid             (DBusCredentials    *credentials);
-dbus_uid_t       _dbus_credentials_get_unix_uid             (DBusCredentials    *credentials);
-const char*      _dbus_credentials_get_windows_sid          (DBusCredentials    *credentials);
-void *           _dbus_credentials_get_adt_audit_data       (DBusCredentials    *credentials);
-dbus_int32_t     _dbus_credentials_get_adt_audit_data_size  (DBusCredentials    *credentials);
-dbus_bool_t      _dbus_credentials_are_superset             (DBusCredentials    *credentials,
-                                                             DBusCredentials    *possible_subset);
-dbus_bool_t      _dbus_credentials_are_empty                (DBusCredentials    *credentials);
-dbus_bool_t      _dbus_credentials_are_anonymous            (DBusCredentials    *credentials);
-dbus_bool_t      _dbus_credentials_add_credentials          (DBusCredentials    *credentials,
-                                                             DBusCredentials    *other_credentials);
-/* must silently allow 'which' to not exist */
-dbus_bool_t      _dbus_credentials_add_credential           (DBusCredentials    *credentials,
-                                                             DBusCredentialType  which,
-                                                             DBusCredentials    *other_credentials);
-void             _dbus_credentials_clear                    (DBusCredentials    *credentials);
-DBusCredentials* _dbus_credentials_copy                     (DBusCredentials    *credentials);
-dbus_bool_t      _dbus_credentials_same_user                (DBusCredentials    *credentials,
-                                                             DBusCredentials    *other_credentials);
-dbus_bool_t      _dbus_credentials_to_string_append         (DBusCredentials    *credentials,
-                                                             DBusString         *string);
-
-DBUS_END_DECLS
-
-#endif /* DBUS_CREDENTIALS_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-dataslot.h b/lib-x86-32/include/dbus-1/dbus/dbus-dataslot.h
deleted file mode 100644
index 2e706f72..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-dataslot.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-dataslot.h  storing data on objects
- *
- * Copyright (C) 2003 Red Hat, Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#ifndef DBUS_DATASLOT_H
-#define DBUS_DATASLOT_H
-
-#include <dbus/dbus-internals.h>
-
-DBUS_BEGIN_DECLS
-
-typedef struct DBusDataSlotAllocator DBusDataSlotAllocator;
-typedef struct DBusDataSlotList DBusDataSlotList;
-
-/** Opaque typedef for DBusDataSlot */
-typedef struct DBusDataSlot DBusDataSlot;
-/** DBusDataSlot is used to store application data on the connection */
-struct DBusDataSlot
-{
-  void *data;                      /**< The application data */
-  DBusFreeFunction free_data_func; /**< Free the application data */
-};
-
-typedef struct DBusAllocatedSlot DBusAllocatedSlot;
-
-/** An allocated slot for storing data
- */
-struct DBusAllocatedSlot
-{
-  dbus_int32_t slot_id;  /**< ID of this slot */
-  int          refcount; /**< Number of uses of the slot */
-};
-
-/**
- * An allocator that tracks a set of slot IDs.
- */
-struct DBusDataSlotAllocator
-{
-  DBusAllocatedSlot *allocated_slots; /**< Allocated slots */
-  int  n_allocated_slots; /**< number of slots malloc'd */
-  int  n_used_slots;      /**< number of slots used */
-  DBusMutex **lock_loc;   /**< location of thread lock */
-};
-
-/**
- * Data structure that stores the actual user data set at a given
- * slot.
- */
-struct DBusDataSlotList
-{
-  DBusDataSlot *slots;   /**< Data slots */
-  int           n_slots; /**< Slots we have storage for in data_slots */
-};
-
-dbus_bool_t _dbus_data_slot_allocator_init  (DBusDataSlotAllocator  *allocator);
-dbus_bool_t _dbus_data_slot_allocator_alloc (DBusDataSlotAllocator  *allocator,
-                                             DBusMutex              **mutex_loc,
-                                             int                    *slot_id_p);
-void        _dbus_data_slot_allocator_free  (DBusDataSlotAllocator  *allocator,
-                                             int                    *slot_id_p);
-void        _dbus_data_slot_list_init       (DBusDataSlotList       *list);
-dbus_bool_t _dbus_data_slot_list_set        (DBusDataSlotAllocator  *allocator,
-                                             DBusDataSlotList       *list,
-                                             int                     slot,
-                                             void                   *data,
-                                             DBusFreeFunction        free_data_func,
-                                             DBusFreeFunction       *old_free_func,
-                                             void                  **old_data);
-void*       _dbus_data_slot_list_get        (DBusDataSlotAllocator  *allocator,
-                                             DBusDataSlotList       *list,
-                                             int                     slot);
-void        _dbus_data_slot_list_clear      (DBusDataSlotList       *list);
-void        _dbus_data_slot_list_free       (DBusDataSlotList       *list);
-
-
-DBUS_END_DECLS
-
-#endif /* DBUS_DATASLOT_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-errors.h b/lib-x86-32/include/dbus-1/dbus/dbus-errors.h
deleted file mode 100644
index e63139a0..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-errors.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-errors.h Error reporting
- *
- * Copyright (C) 2002  Red Hat Inc.
- * Copyright (C) 2003  CodeFactory AB
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#if !defined (DBUS_INSIDE_DBUS_H) && !defined (DBUS_COMPILATION)
-#error "Only <dbus/dbus.h> can be included directly, this file may disappear or change contents."
-#endif
-
-#ifndef DBUS_ERROR_H
-#define DBUS_ERROR_H
-
-#include <dbus/dbus-macros.h>
-#include <dbus/dbus-types.h>
-#include <dbus/dbus-protocol.h>
-
-DBUS_BEGIN_DECLS
-
-/**
- * @addtogroup DBusErrors
- * @{
- */
-
-/** Mostly-opaque type representing an error that occurred */
-typedef struct DBusError DBusError;
-
-/**
- * Object representing an exception.
- */
-struct DBusError
-{
-  const char *name;    /**< public error name field */
-  const char *message; /**< public error message field */
-
-  unsigned int dummy1 : 1; /**< placeholder */
-  unsigned int dummy2 : 1; /**< placeholder */
-  unsigned int dummy3 : 1; /**< placeholder */
-  unsigned int dummy4 : 1; /**< placeholder */
-  unsigned int dummy5 : 1; /**< placeholder */
-
-  void *padding1; /**< placeholder */
-};
-
-#define DBUS_ERROR_INIT { NULL, NULL, TRUE, 0, 0, 0, 0, NULL }
-
-DBUS_EXPORT
-void        dbus_error_init      (DBusError       *error);
-DBUS_EXPORT
-void        dbus_error_free      (DBusError       *error);
-DBUS_EXPORT
-void        dbus_set_error       (DBusError       *error,
-                                  const char      *name,
-                                  const char      *message,
-                                  ...);
-DBUS_EXPORT
-void        dbus_set_error_const (DBusError       *error,
-                                  const char      *name,
-                                  const char      *message);
-DBUS_EXPORT
-void        dbus_move_error      (DBusError       *src,
-                                  DBusError       *dest);
-DBUS_EXPORT
-dbus_bool_t dbus_error_has_name  (const DBusError *error,
-                                  const char      *name);
-DBUS_EXPORT
-dbus_bool_t dbus_error_is_set    (const DBusError *error);
-
-/** @} */
-
-DBUS_END_DECLS
-
-#endif /* DBUS_ERROR_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-file.h b/lib-x86-32/include/dbus-1/dbus/dbus-file.h
deleted file mode 100644
index 24837f47..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-file.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-file.h dbus file related stuff (internal to D-Bus implementation)
- * 
- * Copyright (C) 2002, 2003  Red Hat, Inc.
- * Copyright (C) 2003 CodeFactory AB
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef DBUS_FILE_H
-#define DBUS_FILE_H
-
-//#include <dbus/dbus-types.h>
-#include <dbus/dbus-string.h>
-#include <dbus/dbus-errors.h>
-
-DBUS_BEGIN_DECLS
-
-/**
- * @addtogroup DBusFile
- * @{
- */
-
-/**
- * File interface
- */
-dbus_bool_t _dbus_file_exists         (const char       *file);
-dbus_bool_t _dbus_file_get_contents   (DBusString       *str,
-                                       const DBusString *filename,
-                                       DBusError        *error);
-dbus_bool_t _dbus_string_save_to_file (const DBusString *str,
-                                       const DBusString *filename,
-                                       dbus_bool_t       world_readable,
-                                       DBusError        *error);
-
-dbus_bool_t _dbus_make_file_world_readable   (const DBusString *filename,
-                                              DBusError *error);
-
-dbus_bool_t    _dbus_create_file_exclusively (const DBusString *filename,
-                                              DBusError        *error);
-dbus_bool_t    _dbus_delete_file             (const DBusString *filename,
-                                              DBusError        *error);
-                                              
-/** @} */
-
-DBUS_END_DECLS
-
-#endif
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-hash.h b/lib-x86-32/include/dbus-1/dbus/dbus-hash.h
deleted file mode 100644
index d1ca246c..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-hash.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-hash.h Generic hash table utility (internal to D-Bus implementation)
- * 
- * Copyright (C) 2002  Red Hat, Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef DBUS_HASH_H
-#define DBUS_HASH_H
-
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
-
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
-
-#include <dbus/dbus-memory.h>
-#include <dbus/dbus-types.h>
-#include <dbus/dbus-sysdeps.h>
-
-DBUS_BEGIN_DECLS
-
-/**
- * @addtogroup DBusHashTable
- * @{
- */
-
-/** Hash iterator object. The iterator is on the stack, but its real
- * fields are hidden privately.
- */
-struct DBusHashIter
-{
-  void *dummy1; /**< Do not use. */
-  void *dummy2; /**< Do not use. */
-  void *dummy3; /**< Do not use. */
-  void *dummy4; /**< Do not use. */
-  int   dummy5; /**< Do not use. */
-  int   dummy6; /**< Do not use. */
-};
-
-typedef struct DBusHashTable DBusHashTable;
-typedef struct DBusHashIter  DBusHashIter;
-
-/* Allowing an arbitrary function as with GLib
- * would be nicer for a public API, but for
- * an internal API this saves typing, we can add
- * more whenever we feel like it.
- */
-typedef enum
-{
-  DBUS_HASH_STRING,        /**< Hash keys are strings. */
-  DBUS_HASH_TWO_STRINGS,   /**< Hash key is two strings in one memory block, i.e. foo\\0bar\\0 */
-  DBUS_HASH_INT,           /**< Hash keys are integers. */
-  DBUS_HASH_POINTER,       /**< Hash keys are pointers. */
-  DBUS_HASH_UINTPTR        /**< Hash keys are integer capable to hold a pointer. */
-} DBusHashType;
-
-DBusHashTable* _dbus_hash_table_new                (DBusHashType      type,
-                                                    DBusFreeFunction  key_free_function,
-                                                    DBusFreeFunction  value_free_function);
-DBusHashTable* _dbus_hash_table_ref                (DBusHashTable    *table);
-void           _dbus_hash_table_unref              (DBusHashTable    *table);
-void           _dbus_hash_table_remove_all         (DBusHashTable    *table);
-void           _dbus_hash_iter_init                (DBusHashTable    *table,
-                                                    DBusHashIter     *iter);
-dbus_bool_t    _dbus_hash_iter_next                (DBusHashIter     *iter);
-void           _dbus_hash_iter_remove_entry        (DBusHashIter     *iter);
-void*          _dbus_hash_iter_get_value           (DBusHashIter     *iter);
-void           _dbus_hash_iter_set_value           (DBusHashIter     *iter,
-                                                    void             *value);
-int            _dbus_hash_iter_get_int_key         (DBusHashIter     *iter);
-const char*    _dbus_hash_iter_get_string_key      (DBusHashIter     *iter);
-const char*    _dbus_hash_iter_get_two_strings_key (DBusHashIter     *iter);
-uintptr_t      _dbus_hash_iter_get_uintptr_key     (DBusHashIter     *iter);
-dbus_bool_t    _dbus_hash_iter_lookup              (DBusHashTable    *table,
-                                                    void             *key,
-                                                    dbus_bool_t       create_if_not_found,
-                                                    DBusHashIter     *iter);
-void*          _dbus_hash_table_lookup_string      (DBusHashTable    *table,
-                                                    const char       *key);
-void*          _dbus_hash_table_lookup_two_strings (DBusHashTable    *table,
-                                                    const char       *key);
-void*          _dbus_hash_table_lookup_int         (DBusHashTable    *table,
-                                                    int               key);
-void*          _dbus_hash_table_lookup_pointer     (DBusHashTable    *table,
-                                                    void             *key);
-void*          _dbus_hash_table_lookup_uintptr     (DBusHashTable    *table,
-                                                    uintptr_t         key);
-dbus_bool_t    _dbus_hash_table_remove_string      (DBusHashTable    *table,
-                                                    const char       *key);
-dbus_bool_t    _dbus_hash_table_remove_two_strings (DBusHashTable    *table,
-                                                    const char       *key);
-dbus_bool_t    _dbus_hash_table_remove_int         (DBusHashTable    *table,
-                                                    int               key);
-dbus_bool_t    _dbus_hash_table_remove_pointer     (DBusHashTable    *table,
-                                                    void             *key);
-dbus_bool_t    _dbus_hash_table_remove_uintptr     (DBusHashTable    *table,
-                                                    uintptr_t         key);
-dbus_bool_t    _dbus_hash_table_insert_string      (DBusHashTable    *table,
-                                                    char             *key,
-                                                    void             *value);
-dbus_bool_t    _dbus_hash_table_insert_two_strings (DBusHashTable    *table,
-                                                    char             *key,
-                                                    void             *value);
-dbus_bool_t    _dbus_hash_table_insert_int         (DBusHashTable    *table,
-                                                    int               key,
-                                                    void             *value);
-dbus_bool_t    _dbus_hash_table_insert_pointer     (DBusHashTable    *table,
-                                                    void             *key,
-                                                    void             *value);
-dbus_bool_t    _dbus_hash_table_insert_uintptr     (DBusHashTable    *table,
-                                                    uintptr_t         key,
-                                                    void             *value);
-int            _dbus_hash_table_get_n_entries      (DBusHashTable    *table);
-
-/* Preallocation */
-
-/** A preallocated hash entry */
-typedef struct DBusPreallocatedHash DBusPreallocatedHash;
-
-DBusPreallocatedHash *_dbus_hash_table_preallocate_entry          (DBusHashTable        *table);
-void                  _dbus_hash_table_free_preallocated_entry    (DBusHashTable        *table,
-                                                                   DBusPreallocatedHash *preallocated);
-void                  _dbus_hash_table_insert_string_preallocated (DBusHashTable        *table,
-                                                                   DBusPreallocatedHash *preallocated,
-                                                                   char                 *key,
-                                                                   void                 *value);
-
-/** @} */
-
-DBUS_END_DECLS
-
-#endif /* DBUS_HASH_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-internals.h b/lib-x86-32/include/dbus-1/dbus/dbus-internals.h
deleted file mode 100644
index dcef7d7f..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-internals.h
+++ /dev/null
@@ -1,367 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-internals.h  random utility stuff (internal to D-Bus implementation)
- *
- * Copyright (C) 2002, 2003  Red Hat, Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#ifdef DBUS_INSIDE_DBUS_H
-#error "You can't include dbus-internals.h in the public header dbus.h"
-#endif
-
-#ifndef DBUS_INTERNALS_H
-#define DBUS_INTERNALS_H
-
-#include <dbus/dbus-memory.h>
-#include <dbus/dbus-types.h>
-#include <dbus/dbus-errors.h>
-#include <dbus/dbus-sysdeps.h>
-#include <dbus/dbus-threads-internal.h>
-
-DBUS_BEGIN_DECLS
-
-#ifndef DBUS_SESSION_BUS_DEFAULT_ADDRESS
-#define DBUS_SESSION_BUS_DEFAULT_ADDRESS	"autolaunch:"
-#endif
-
-void _dbus_warn               (const char *format,
-                               ...) _DBUS_GNUC_PRINTF (1, 2);
-
-void _dbus_warn_check_failed  (const char *format,
-                               ...) _DBUS_GNUC_PRINTF (1, 2);
-
-
-#if defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
-#define _DBUS_FUNCTION_NAME __func__
-#elif defined(__GNUC__) || defined(_MSC_VER)
-#define _DBUS_FUNCTION_NAME __FUNCTION__
-#else
-#define _DBUS_FUNCTION_NAME "unknown function"
-#endif
-
-/*
- * (code from GLib)
- * 
- * The _DBUS_LIKELY and _DBUS_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 _DBUS_BOOLEAN_EXPR macro is intended to trigger a gcc warning when
- * putting assignments in the macro arg
- */
-#if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__)
-#define _DBUS_BOOLEAN_EXPR(expr)                \
- __extension__ ({                               \
-   int _dbus_boolean_var_;                      \
-   if (expr)                                    \
-      _dbus_boolean_var_ = 1;                   \
-   else                                         \
-      _dbus_boolean_var_ = 0;                   \
-   _dbus_boolean_var_;                          \
-})
-#define _DBUS_LIKELY(expr) (__builtin_expect (_DBUS_BOOLEAN_EXPR(expr), 1))
-#define _DBUS_UNLIKELY(expr) (__builtin_expect (_DBUS_BOOLEAN_EXPR(expr), 0))
-#else
-#define _DBUS_LIKELY(expr) (expr)
-#define _DBUS_UNLIKELY(expr) (expr)
-#endif
-
-#ifdef DBUS_ENABLE_VERBOSE_MODE
-
-/*
- at least gnu cc and msvc compiler are known to 
- have support for variable macro argument lists
- add other compilers is required
-*/
-#if defined(__GNUC__) || defined(_MSC_VER) 
-#define DBUS_CPP_SUPPORTS_VARIABLE_MACRO_ARGUMENTS
-#endif
-
-#ifdef DBUS_CPP_SUPPORTS_VARIABLE_MACRO_ARGUMENTS
-void _dbus_verbose_real       (const char *file, const int line, const char *function, 
-                               const char *format,...) _DBUS_GNUC_PRINTF (4, 5);
-#  define _dbus_verbose(fmt,...) _dbus_verbose_real( __FILE__,__LINE__,__FUNCTION__,fmt, ## __VA_ARGS__)
-#else
-void _dbus_verbose_real       (const char *format,
-                               ...) _DBUS_GNUC_PRINTF (1, 2);
-#  define _dbus_verbose _dbus_verbose_real
-#endif
-void _dbus_verbose_reset_real (void);
-dbus_bool_t _dbus_is_verbose_real (void);
-
-#  define _dbus_verbose_reset _dbus_verbose_reset_real
-#  define _dbus_is_verbose _dbus_is_verbose_real
-#else
-#  ifdef HAVE_ISO_VARARGS
-#    define _dbus_verbose(...)
-#  elif defined (HAVE_GNUC_VARARGS)
-#    define _dbus_verbose(format...)
-#  else
-static void _dbus_verbose(const char * x,...) {;}
-#  endif
-#  define _dbus_verbose_reset()
-#  define _dbus_is_verbose() FALSE 
-#endif /* !DBUS_ENABLE_VERBOSE_MODE */
-
-const char* _dbus_strerror (int error_number);
-
-#ifdef DBUS_DISABLE_ASSERT
-#define _dbus_assert(condition)
-#else
-void _dbus_real_assert (dbus_bool_t  condition,
-                        const char  *condition_text,
-                        const char  *file,
-                        int          line,
-                        const char  *func);
-#define _dbus_assert(condition)                                         \
-  _dbus_real_assert ((condition) != 0, #condition, __FILE__, __LINE__, _DBUS_FUNCTION_NAME)
-#endif /* !DBUS_DISABLE_ASSERT */
-
-#ifdef DBUS_DISABLE_ASSERT
-#define _dbus_assert_not_reached(explanation)
-#else
-void _dbus_real_assert_not_reached (const char *explanation,
-                                    const char *file,
-                                    int         line) _DBUS_GNUC_NORETURN;
-#define _dbus_assert_not_reached(explanation)                                   \
-  _dbus_real_assert_not_reached (explanation, __FILE__, __LINE__)
-#endif /* !DBUS_DISABLE_ASSERT */
-
-#ifdef DBUS_DISABLE_CHECKS
-#define _dbus_return_if_fail(condition)
-#define _dbus_return_val_if_fail(condition, val)
-#else
-
-extern const char *_dbus_return_if_fail_warning_format;
-
-#define _dbus_return_if_fail(condition) do {                                       \
-   _dbus_assert ((*(const char*)_DBUS_FUNCTION_NAME) != '_');                      \
-  if (!(condition)) {                                                              \
-    _dbus_warn_check_failed (_dbus_return_if_fail_warning_format,                  \
-                             _DBUS_FUNCTION_NAME, #condition, __FILE__, __LINE__); \
-    return;                                                                        \
-  } } while (0)
-
-#define _dbus_return_val_if_fail(condition, val) do {                                   \
-   _dbus_assert ((*(const char*)_DBUS_FUNCTION_NAME) != '_');                           \
-  if (!(condition)) {                                                                   \
-    _dbus_warn_check_failed (_dbus_return_if_fail_warning_format,                       \
-                             _DBUS_FUNCTION_NAME, #condition, __FILE__, __LINE__);      \
-    return (val);                                                                       \
-  } } while (0)
-
-#endif /* !DBUS_DISABLE_ASSERT */
-
-#define _DBUS_N_ELEMENTS(array) ((int) (sizeof ((array)) / sizeof ((array)[0])))
-
-#define _DBUS_POINTER_TO_INT(pointer) ((intptr_t)(pointer))
-#define _DBUS_INT_TO_POINTER(integer) ((void*)((intptr_t)(integer)))
-
-#define _DBUS_ZERO(object) (memset (&(object), '\0', sizeof ((object))))
-
-#define _DBUS_STRUCT_OFFSET(struct_type, member)	\
-    ((intptr_t) ((unsigned char*) &((struct_type*) 0)->member))
-
-#ifdef DBUS_DISABLE_CHECKS
-/* this is an assert and not an error, but in the typical --disable-checks case (you're trying
- * to really minimize code size), disabling these assertions makes sense.
- */
-#define _DBUS_ASSERT_ERROR_IS_SET(error)
-#define _DBUS_ASSERT_ERROR_IS_CLEAR(error)
-#else
-#define _DBUS_ASSERT_ERROR_IS_SET(error)   _dbus_assert ((error) == NULL || dbus_error_is_set ((error)))
-#define _DBUS_ASSERT_ERROR_IS_CLEAR(error) _dbus_assert ((error) == NULL || !dbus_error_is_set ((error)))
-#endif
-
-#define _dbus_return_if_error_is_set(error) _dbus_return_if_fail ((error) == NULL || !dbus_error_is_set ((error)))
-#define _dbus_return_val_if_error_is_set(error, val) _dbus_return_val_if_fail ((error) == NULL || !dbus_error_is_set ((error)), (val))
-
-/* This alignment thing is from ORBit2 */
-/* Align a value upward to a boundary, expressed as a number of bytes.
- * E.g. align to an 8-byte boundary with argument of 8.
- */
-
-/*
- *   (this + boundary - 1)
- *          &
- *    ~(boundary - 1)
- */
-
-#define _DBUS_ALIGN_VALUE(this, boundary) \
-  (( ((uintptr_t)(this)) + (((uintptr_t)(boundary)) -1)) & (~(((uintptr_t)(boundary))-1)))
-
-#define _DBUS_ALIGN_ADDRESS(this, boundary) \
-  ((void*)_DBUS_ALIGN_VALUE(this, boundary))
-
-
-char*       _dbus_strdup                (const char  *str);
-void*       _dbus_memdup                (const void  *mem,
-                                         size_t       n_bytes);
-dbus_bool_t _dbus_string_array_contains (const char **array,
-                                         const char  *str);
-char**      _dbus_dup_string_array      (const char **array);
-
-#define _DBUS_INT16_MIN	 ((dbus_int16_t) 0x8000)
-#define _DBUS_INT16_MAX	 ((dbus_int16_t) 0x7fff)
-#define _DBUS_UINT16_MAX ((dbus_uint16_t)0xffff)
-#define _DBUS_INT32_MIN	 ((dbus_int32_t) 0x80000000)
-#define _DBUS_INT32_MAX	 ((dbus_int32_t) 0x7fffffff)
-#define _DBUS_UINT32_MAX ((dbus_uint32_t)0xffffffff)
-/* using 32-bit here is sort of bogus */
-#define _DBUS_INT_MIN	 _DBUS_INT32_MIN
-#define _DBUS_INT_MAX	 _DBUS_INT32_MAX
-#define _DBUS_UINT_MAX	 _DBUS_UINT32_MAX
-#ifdef DBUS_HAVE_INT64
-#define _DBUS_INT64_MAX	 DBUS_INT64_CONSTANT  (0x7fffffffffffffff)
-#define _DBUS_UINT64_MAX DBUS_UINT64_CONSTANT (0xffffffffffffffff)
-#endif
-#define _DBUS_ONE_KILOBYTE 1024
-#define _DBUS_ONE_MEGABYTE 1024 * _DBUS_ONE_KILOBYTE
-#define _DBUS_ONE_HOUR_IN_MILLISECONDS (1000 * 60 * 60)
-#define _DBUS_USEC_PER_SECOND          (1000000)
-
-#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))
-
-#define _DBUS_ISASCII(c) ((c) != '\0' && (((c) & ~0x7f) == 0))
-
-typedef void (* DBusForeachFunction) (void *element,
-                                      void *data);
-
-dbus_bool_t _dbus_set_fd_nonblocking (int             fd,
-                                      DBusError      *error);
-
-void _dbus_verbose_bytes           (const unsigned char *data,
-                                    int                  len,
-                                    int                  offset);
-void _dbus_verbose_bytes_of_string (const DBusString    *str,
-                                    int                  start,
-                                    int                  len);
-
-const char* _dbus_header_field_to_string (int header_field);
-
-extern const char *_dbus_no_memory_message;
-#define _DBUS_SET_OOM(error) dbus_set_error_const ((error), DBUS_ERROR_NO_MEMORY, _dbus_no_memory_message)
-
-#ifdef DBUS_BUILD_TESTS
-/* Memory debugging */
-void        _dbus_set_fail_alloc_counter        (int  until_next_fail);
-int         _dbus_get_fail_alloc_counter        (void);
-void        _dbus_set_fail_alloc_failures       (int  failures_per_failure);
-int         _dbus_get_fail_alloc_failures       (void);
-dbus_bool_t _dbus_decrement_fail_alloc_counter  (void);
-dbus_bool_t _dbus_disable_mem_pools             (void);
-int         _dbus_get_malloc_blocks_outstanding (void);
-
-typedef dbus_bool_t (* DBusTestMemoryFunction)  (void *data);
-dbus_bool_t _dbus_test_oom_handling (const char             *description,
-                                     DBusTestMemoryFunction  func,
-                                     void                   *data);
-#else
-#define _dbus_set_fail_alloc_counter(n)
-#define _dbus_get_fail_alloc_counter _DBUS_INT_MAX
-
-/* These are constant expressions so that blocks
- * they protect should be optimized away
- */
-#define _dbus_decrement_fail_alloc_counter() (FALSE)
-#define _dbus_disable_mem_pools()            (FALSE)
-#define _dbus_get_malloc_blocks_outstanding  (0)
-#endif /* !DBUS_BUILD_TESTS */
-
-typedef void (* DBusShutdownFunction) (void *data);
-dbus_bool_t _dbus_register_shutdown_func (DBusShutdownFunction  function,
-                                          void                 *data);
-
-extern int _dbus_current_generation;
-
-/* Thread initializers */
-#define _DBUS_LOCK_NAME(name)           _dbus_lock_##name
-#define _DBUS_DECLARE_GLOBAL_LOCK(name) extern DBusMutex  *_dbus_lock_##name
-#define _DBUS_DEFINE_GLOBAL_LOCK(name)  DBusMutex         *_dbus_lock_##name  
-#define _DBUS_LOCK(name)                _dbus_mutex_lock   (_dbus_lock_##name)
-#define _DBUS_UNLOCK(name)              _dbus_mutex_unlock (_dbus_lock_##name)
-
-/* 1-5 */
-_DBUS_DECLARE_GLOBAL_LOCK (list);
-_DBUS_DECLARE_GLOBAL_LOCK (connection_slots);
-_DBUS_DECLARE_GLOBAL_LOCK (pending_call_slots);
-_DBUS_DECLARE_GLOBAL_LOCK (server_slots);
-_DBUS_DECLARE_GLOBAL_LOCK (message_slots);
-/* 5-10 */
-_DBUS_DECLARE_GLOBAL_LOCK (bus);
-_DBUS_DECLARE_GLOBAL_LOCK (bus_datas);
-_DBUS_DECLARE_GLOBAL_LOCK (shutdown_funcs);
-_DBUS_DECLARE_GLOBAL_LOCK (system_users);
-_DBUS_DECLARE_GLOBAL_LOCK (message_cache);
-/* 10-14 */
-_DBUS_DECLARE_GLOBAL_LOCK (shared_connections);
-_DBUS_DECLARE_GLOBAL_LOCK (win_fds);
-_DBUS_DECLARE_GLOBAL_LOCK (sid_atom_cache);
-_DBUS_DECLARE_GLOBAL_LOCK (machine_uuid);
-
-#if !DBUS_USE_SYNC
-_DBUS_DECLARE_GLOBAL_LOCK (atomic);
-#define _DBUS_N_GLOBAL_LOCKS (15)
-#else
-#define _DBUS_N_GLOBAL_LOCKS (14)
-#endif
-
-dbus_bool_t _dbus_threads_init_debug (void);
-
-dbus_bool_t   _dbus_address_append_escaped (DBusString       *escaped,
-                                            const DBusString *unescaped);
-
-void          _dbus_set_bad_address        (DBusError         *error,
-                                            const char        *address_problem_type,
-                                            const char        *address_problem_field,
-                                            const char        *address_problem_other);
-
-#define DBUS_UUID_LENGTH_BYTES 16
-#define DBUS_UUID_LENGTH_WORDS (DBUS_UUID_LENGTH_BYTES / 4)
-#define DBUS_UUID_LENGTH_HEX   (DBUS_UUID_LENGTH_BYTES * 2)
-
-/**
- * A globally unique ID ; we have one for each DBusServer, and also one for each
- * machine with libdbus installed on it.
- */
-union DBusGUID
-{
-  dbus_uint32_t as_uint32s[DBUS_UUID_LENGTH_WORDS];     /**< guid as four uint32 values */
-  char as_bytes[DBUS_UUID_LENGTH_BYTES];                /**< guid as 16 single-byte values */
-};
-
-void        _dbus_generate_uuid  (DBusGUID         *uuid);
-dbus_bool_t _dbus_uuid_encode    (const DBusGUID   *uuid,
-                                  DBusString       *encoded);
-dbus_bool_t _dbus_read_uuid_file (const DBusString *filename,
-                                  DBusGUID         *uuid,
-                                  dbus_bool_t       create_if_not_found,
-                                  DBusError        *error);
-
-dbus_bool_t _dbus_get_local_machine_uuid_encoded (DBusString *uuid_str);
-
-DBUS_END_DECLS
-
-#endif /* DBUS_INTERNALS_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-keyring.h b/lib-x86-32/include/dbus-1/dbus/dbus-keyring.h
deleted file mode 100644
index 200e31bc..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-keyring.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-keyring.h Store secret cookies in your homedir
- *
- * Copyright (C) 2003  Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#ifndef DBUS_KEYRING_H
-#define DBUS_KEYRING_H
-
-#include <dbus/dbus-macros.h>
-#include <dbus/dbus-errors.h>
-#include <dbus/dbus-string.h>
-#include <dbus/dbus-credentials.h>
-
-DBUS_BEGIN_DECLS
-
-typedef struct DBusKeyring DBusKeyring;
-
-DBusKeyring* _dbus_keyring_new_for_credentials (DBusCredentials  *credentials,
-                                                const DBusString *context,
-                                                DBusError        *error);
-DBusKeyring* _dbus_keyring_ref                 (DBusKeyring      *keyring);
-void         _dbus_keyring_unref               (DBusKeyring      *keyring);
-dbus_bool_t  _dbus_keyring_validate_context    (const DBusString *context);
-int          _dbus_keyring_get_best_key        (DBusKeyring      *keyring,
-                                                DBusError        *error);
-dbus_bool_t  _dbus_keyring_is_for_credentials  (DBusKeyring      *keyring,
-                                                DBusCredentials  *credentials);
-dbus_bool_t  _dbus_keyring_get_hex_key         (DBusKeyring      *keyring,
-                                                int               key_id,
-                                                DBusString       *hex_key);
-
-
-DBUS_END_DECLS
-
-#endif /* DBUS_KEYRING_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-list.h b/lib-x86-32/include/dbus-1/dbus/dbus-list.h
deleted file mode 100644
index 663ad257..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-list.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-list.h Generic linked list utility (internal to D-Bus implementation)
- * 
- * Copyright (C) 2002, 2003 Red Hat, Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef DBUS_LIST_H
-#define DBUS_LIST_H
-
-#include <dbus/dbus-internals.h>
-#include <dbus/dbus-memory.h>
-#include <dbus/dbus-types.h>
-#include <dbus/dbus-sysdeps.h>
-
-DBUS_BEGIN_DECLS
-
-struct DBusList
-{
-  DBusList *prev; /**< Previous list node. */
-  DBusList *next; /**< Next list node. */
-  void     *data; /**< Data stored at this element. */
-};
-dbus_bool_t _dbus_list_append             (DBusList **list,
-                                           void      *data);
-dbus_bool_t _dbus_list_prepend            (DBusList **list,
-                                           void      *data);
-dbus_bool_t _dbus_list_insert_before      (DBusList **list,
-                                           DBusList  *before_this_link,
-                                           void      *data);
-dbus_bool_t _dbus_list_insert_after       (DBusList **list,
-                                           DBusList  *after_this_link,
-                                           void      *data);
-void        _dbus_list_insert_before_link (DBusList **list,
-                                           DBusList  *before_this_link,
-                                           DBusList  *link);
-void        _dbus_list_insert_after_link  (DBusList **list,
-                                           DBusList  *after_this_link,
-                                           DBusList  *link);
-dbus_bool_t _dbus_list_remove             (DBusList **list,
-                                           void      *data);
-dbus_bool_t _dbus_list_remove_last        (DBusList **list,
-                                           void      *data);
-void        _dbus_list_remove_link        (DBusList **list,
-                                           DBusList  *link);
-DBusList*   _dbus_list_find_last          (DBusList **list,
-                                           void      *data);
-void        _dbus_list_clear              (DBusList **list);
-DBusList*   _dbus_list_get_first_link     (DBusList **list);
-DBusList*   _dbus_list_get_last_link      (DBusList **list);
-void*       _dbus_list_get_last           (DBusList **list);
-void*       _dbus_list_get_first          (DBusList **list);
-void*       _dbus_list_pop_first          (DBusList **list);
-void*       _dbus_list_pop_last           (DBusList **list);
-DBusList*   _dbus_list_pop_first_link     (DBusList **list);
-DBusList*   _dbus_list_pop_last_link      (DBusList **list);
-dbus_bool_t _dbus_list_copy               (DBusList **list,
-                                           DBusList **dest);
-int         _dbus_list_get_length         (DBusList **list);
-DBusList*   _dbus_list_alloc_link         (void      *data);
-void        _dbus_list_free_link          (DBusList  *link);
-void        _dbus_list_unlink             (DBusList **list,
-                                           DBusList  *link);
-void        _dbus_list_append_link        (DBusList **list,
-                                           DBusList  *link);
-void        _dbus_list_prepend_link       (DBusList **list,
-                                           DBusList  *link);
-dbus_bool_t _dbus_list_length_is_one      (DBusList **list);
-
-
-
-
-void _dbus_list_foreach (DBusList            **list,
-                         DBusForeachFunction   function,
-                         void                 *data);
-
-#define _dbus_list_get_next_link(list, link) ((link)->next == *(list) ? NULL : (link)->next)
-#define _dbus_list_get_prev_link(list, link) ((link) == *(list) ? NULL : (link)->prev)
-
-DBUS_END_DECLS
-
-#endif /* DBUS_LIST_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-macros.h b/lib-x86-32/include/dbus-1/dbus/dbus-macros.h
deleted file mode 100644
index d1e40ecb..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-macros.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-macros.h  generic macros
- *
- * Copyright (C) 2002  Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#if !defined (DBUS_INSIDE_DBUS_H) && !defined (DBUS_COMPILATION)
-#error "Only <dbus/dbus.h> can be included directly, this file may disappear or change contents."
-#endif
-
-#ifndef DBUS_MACROS_H
-#define DBUS_MACROS_H
-
-#ifdef  __cplusplus
-#  define DBUS_BEGIN_DECLS  extern "C" {
-#  define DBUS_END_DECLS    }
-#else
-#  define DBUS_BEGIN_DECLS
-#  define DBUS_END_DECLS
-#endif
-
-#ifndef TRUE
-#  define TRUE 1
-#endif
-#ifndef FALSE
-#  define FALSE 0
-#endif
-
-#ifndef NULL
-#  ifdef __cplusplus
-#    define NULL        (0L)
-#  else /* !__cplusplus */
-#    define NULL        ((void*) 0)
-#  endif /* !__cplusplus */
-#endif
-
-#if  __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
-#  define DBUS_DEPRECATED __attribute__ ((__deprecated__))
-#elif defined(_MSC_VER) && (_MSC_VER >= 1300)
-#  define DBUS_DEPRECATED __declspec(deprecated)
-#else
-#  define DBUS_DEPRECATED
-#endif
-
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)
-#  define _DBUS_GNUC_EXTENSION __extension__
-#else
-#  define _DBUS_GNUC_EXTENSION
-#endif
-
-#if     __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
-#define _DBUS_GNUC_PRINTF( format_idx, arg_idx )    \
-  __attribute__((__format__ (__printf__, format_idx, arg_idx)))
-#define _DBUS_GNUC_NORETURN                         \
-  __attribute__((__noreturn__))
-#else   /* !__GNUC__ */
-#define _DBUS_GNUC_PRINTF( format_idx, arg_idx )
-#define _DBUS_GNUC_NORETURN
-#endif  /* !__GNUC__ */
-
-/** @def _DBUS_GNUC_PRINTF
- * used to tell gcc about printf format strings
- */
-/** @def _DBUS_GNUC_NORETURN
- * used to tell gcc about functions that never return, such as _dbus_abort()
- */
-
-
-/* Normally docs are in .c files, but there isn't a .c file for this. */
-/**
- * @defgroup DBusMacros Utility macros
- * @ingroup  DBus
- * @brief #TRUE, #FALSE, #NULL, and so on
- *
- * Utility macros.
- *
- * @{
- */
-
-/**
- * @def DBUS_BEGIN_DECLS
- *
- * Macro used prior to declaring functions in the D-Bus header
- * files. Expands to "extern "C"" when using a C++ compiler,
- * and expands to nothing when using a C compiler.
- *
- * Please don't use this in your own code, consider it
- * D-Bus internal.
- */
-/**
- * @def DBUS_END_DECLS
- *
- * Macro used after declaring functions in the D-Bus header
- * files. Expands to "}" when using a C++ compiler,
- * and expands to nothing when using a C compiler.
- *
- * Please don't use this in your own code, consider it
- * D-Bus internal.
- */
-/**
- * @def TRUE
- *
- * Expands to "1"
- */
-/**
- * @def FALSE
- *
- * Expands to "0"
- */
-/**
- * @def NULL
- *
- * A null pointer, defined appropriately for C or C++.
- */
-/**
- * @def DBUS_DEPRECATED
- *
- * Tells the compiler to warn about a function or type if it's used.
- * Code marked in this way should also be enclosed in
- * @code
- * #ifndef DBUS_DISABLE_DEPRECATED
- *  deprecated stuff here
- * #endif
- * @endcode
- *
- * Please don't use this in your own code, consider it
- * D-Bus internal.
- */
-/**
- * @def _DBUS_GNUC_EXTENSION
- *
- * Tells gcc not to warn about extensions to the C standard in the
- * following expression, even if compiling with -pedantic. Do not use
- * this macro in your own code; please consider it to be internal to libdbus.
- */
-
-/*
- * @def DBUS_EXPORT
- *
- * Declare the following symbol as public.  This is currently a noop on
- * platforms other than Windows.
- */
-
-#if defined(_WIN32)
-#  if defined(DBUS_STATIC_BUILD)
-#  define DBUS_EXPORT
-#  elif defined(dbus_1_EXPORTS)
-#  define DBUS_EXPORT __declspec(dllexport)
-#  else
-#  define DBUS_EXPORT __declspec(dllimport)
-#  endif
-#else
-#define DBUS_EXPORT
-#endif
-
-/** @} */
-
-#endif /* DBUS_MACROS_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-mainloop.h b/lib-x86-32/include/dbus-1/dbus/dbus-mainloop.h
deleted file mode 100644
index 656f8231..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-mainloop.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-mainloop.h  Main loop utility
- *
- * Copyright (C) 2003  Red Hat, Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef DBUS_MAINLOOP_H
-#define DBUS_MAINLOOP_H
-
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
-
-#include <dbus/dbus.h>
-
-typedef struct DBusLoop DBusLoop;
-
-typedef dbus_bool_t (* DBusWatchFunction)   (DBusWatch     *watch,
-                                             unsigned int   condition,
-                                             void          *data);
-typedef void        (* DBusTimeoutFunction) (DBusTimeout   *timeout,
-                                             void          *data);
-
-DBusLoop*   _dbus_loop_new            (void);
-DBusLoop*   _dbus_loop_ref            (DBusLoop            *loop);
-void        _dbus_loop_unref          (DBusLoop            *loop);
-dbus_bool_t _dbus_loop_add_watch      (DBusLoop            *loop,
-                                       DBusWatch           *watch,
-                                       DBusWatchFunction    function,
-                                       void                *data,
-                                       DBusFreeFunction     free_data_func);
-void        _dbus_loop_remove_watch   (DBusLoop            *loop,
-                                       DBusWatch           *watch,
-                                       DBusWatchFunction    function,
-                                       void                *data);
-dbus_bool_t _dbus_loop_add_timeout    (DBusLoop            *loop,
-                                       DBusTimeout         *timeout,
-                                       DBusTimeoutFunction  function,
-                                       void                *data,
-                                       DBusFreeFunction     free_data_func);
-void        _dbus_loop_remove_timeout (DBusLoop            *loop,
-                                       DBusTimeout         *timeout,
-                                       DBusTimeoutFunction  function,
-                                       void                *data);
-
-dbus_bool_t _dbus_loop_queue_dispatch (DBusLoop            *loop,
-                                       DBusConnection      *connection);
-
-void        _dbus_loop_run            (DBusLoop            *loop);
-void        _dbus_loop_quit           (DBusLoop            *loop);
-dbus_bool_t _dbus_loop_iterate        (DBusLoop            *loop,
-                                       dbus_bool_t          block);
-dbus_bool_t _dbus_loop_dispatch       (DBusLoop            *loop);
-
-int  _dbus_get_oom_wait    (void);
-void _dbus_wait_for_memory (void);
-
-#endif /* !DOXYGEN_SHOULD_SKIP_THIS */
-
-#endif /* DBUS_MAINLOOP_H */
-
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-marshal-basic.h b/lib-x86-32/include/dbus-1/dbus/dbus-marshal-basic.h
deleted file mode 100644
index 0c27fc9e..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-marshal-basic.h
+++ /dev/null
@@ -1,273 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-marshal-basic.h  Marshalling routines for basic (primitive) types
- *
- * Copyright (C) 2002  CodeFactory AB
- * Copyright (C) 2004, 2005  Red Hat, Inc.
- *
- * Licensed under the Academic Free License version 2.1
- *
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef DBUS_MARSHAL_BASIC_H
-#define DBUS_MARSHAL_BASIC_H
-
-#ifdef HAVE_BYTESWAP_H
-#include <byteswap.h>
-#endif
-
-#include <dbus/dbus-protocol.h>
-#include <dbus/dbus-types.h>
-#include <dbus/dbus-arch-deps.h>
-#include <dbus/dbus-string.h>
-
-#ifdef WORDS_BIGENDIAN
-#define DBUS_COMPILER_BYTE_ORDER DBUS_BIG_ENDIAN
-#else
-#define DBUS_COMPILER_BYTE_ORDER DBUS_LITTLE_ENDIAN
-#endif
-
-#ifdef HAVE_BYTESWAP_H
-#define DBUS_UINT16_SWAP_LE_BE_CONSTANT(val) bswap_16(val)
-#define DBUS_UINT32_SWAP_LE_BE_CONSTANT(val) bswap_32(val)
-#else /* HAVE_BYTESWAP_H */
-
-#define DBUS_UINT16_SWAP_LE_BE_CONSTANT(val)	((dbus_uint16_t) (      \
-    (dbus_uint16_t) ((dbus_uint16_t) (val) >> 8) |                      \
-    (dbus_uint16_t) ((dbus_uint16_t) (val) << 8)))
-
-#define DBUS_UINT32_SWAP_LE_BE_CONSTANT(val)	((dbus_uint32_t) (      \
-    (((dbus_uint32_t) (val) & (dbus_uint32_t) 0x000000ffU) << 24) |     \
-    (((dbus_uint32_t) (val) & (dbus_uint32_t) 0x0000ff00U) <<  8) |     \
-    (((dbus_uint32_t) (val) & (dbus_uint32_t) 0x00ff0000U) >>  8) |     \
-    (((dbus_uint32_t) (val) & (dbus_uint32_t) 0xff000000U) >> 24)))
-
-#endif /* HAVE_BYTESWAP_H */
-
-#ifdef DBUS_HAVE_INT64
-
-#ifdef HAVE_BYTESWAP_H
-#define DBUS_UINT64_SWAP_LE_BE_CONSTANT(val) bswap_64(val)
-#else /* HAVE_BYTESWAP_H */
-
-#define DBUS_UINT64_SWAP_LE_BE_CONSTANT(val)	((dbus_uint64_t) (              \
-      (((dbus_uint64_t) (val) &                                                 \
-	(dbus_uint64_t) DBUS_UINT64_CONSTANT (0x00000000000000ff)) << 56) |    \
-      (((dbus_uint64_t) (val) &                                                 \
-	(dbus_uint64_t) DBUS_UINT64_CONSTANT (0x000000000000ff00)) << 40) |    \
-      (((dbus_uint64_t) (val) &                                                 \
-	(dbus_uint64_t) DBUS_UINT64_CONSTANT (0x0000000000ff0000)) << 24) |    \
-      (((dbus_uint64_t) (val) &                                                 \
-	(dbus_uint64_t) DBUS_UINT64_CONSTANT (0x00000000ff000000)) <<  8) |    \
-      (((dbus_uint64_t) (val) &                                                 \
-	(dbus_uint64_t) DBUS_UINT64_CONSTANT (0x000000ff00000000)) >>  8) |    \
-      (((dbus_uint64_t) (val) &                                                 \
-	(dbus_uint64_t) DBUS_UINT64_CONSTANT (0x0000ff0000000000)) >> 24) |    \
-      (((dbus_uint64_t) (val) &                                                 \
-	(dbus_uint64_t) DBUS_UINT64_CONSTANT (0x00ff000000000000)) >> 40) |    \
-      (((dbus_uint64_t) (val) &                                                 \
-	(dbus_uint64_t) DBUS_UINT64_CONSTANT (0xff00000000000000)) >> 56)))
-#endif /* DBUS_HAVE_INT64 */
-
-#endif /* HAVE_BYTESWAP_H */
-
-#define DBUS_UINT16_SWAP_LE_BE(val) (DBUS_UINT16_SWAP_LE_BE_CONSTANT (val))
-#define DBUS_INT16_SWAP_LE_BE(val)  ((dbus_int16_t)DBUS_UINT16_SWAP_LE_BE_CONSTANT (val))
-
-#define DBUS_UINT32_SWAP_LE_BE(val) (DBUS_UINT32_SWAP_LE_BE_CONSTANT (val))
-#define DBUS_INT32_SWAP_LE_BE(val)  ((dbus_int32_t)DBUS_UINT32_SWAP_LE_BE_CONSTANT (val))
-
-#ifdef DBUS_HAVE_INT64
-#  define DBUS_UINT64_SWAP_LE_BE(val) (DBUS_UINT64_SWAP_LE_BE_CONSTANT (val))
-#  define DBUS_INT64_SWAP_LE_BE(val)  ((dbus_int64_t)DBUS_UINT64_SWAP_LE_BE_CONSTANT (val))
-#endif /* DBUS_HAVE_INT64 */
-
-#ifdef WORDS_BIGENDIAN
-
-#  define DBUS_INT16_TO_BE(val)	((dbus_int16_t) (val))
-#  define DBUS_UINT16_TO_BE(val)	((dbus_uint16_t) (val))
-#  define DBUS_INT16_TO_LE(val)	(DBUS_INT16_SWAP_LE_BE (val))
-#  define DBUS_UINT16_TO_LE(val)	(DBUS_UINT16_SWAP_LE_BE (val))
-#  define DBUS_INT32_TO_BE(val)	((dbus_int32_t) (val))
-#  define DBUS_UINT32_TO_BE(val)	((dbus_uint32_t) (val))
-#  define DBUS_INT32_TO_LE(val)	(DBUS_INT32_SWAP_LE_BE (val))
-#  define DBUS_UINT32_TO_LE(val)	(DBUS_UINT32_SWAP_LE_BE (val))
-#  ifdef DBUS_HAVE_INT64
-#    define DBUS_INT64_TO_BE(val)	((dbus_int64_t) (val))
-#    define DBUS_UINT64_TO_BE(val)	((dbus_uint64_t) (val))
-#    define DBUS_INT64_TO_LE(val)	(DBUS_INT64_SWAP_LE_BE (val))
-#    define DBUS_UINT64_TO_LE(val)	(DBUS_UINT64_SWAP_LE_BE (val))
-#  endif /* DBUS_HAVE_INT64 */
-
-#else /* WORDS_BIGENDIAN */
-
-#  define DBUS_INT16_TO_LE(val)	((dbus_int16_t) (val))
-#  define DBUS_UINT16_TO_LE(val)	((dbus_uint16_t) (val))
-#  define DBUS_INT16_TO_BE(val)	((dbus_int16_t) DBUS_UINT16_SWAP_LE_BE (val))
-#  define DBUS_UINT16_TO_BE(val)	(DBUS_UINT16_SWAP_LE_BE (val))
-#  define DBUS_INT32_TO_LE(val)	((dbus_int32_t) (val))
-#  define DBUS_UINT32_TO_LE(val)	((dbus_uint32_t) (val))
-#  define DBUS_INT32_TO_BE(val)	((dbus_int32_t) DBUS_UINT32_SWAP_LE_BE (val))
-#  define DBUS_UINT32_TO_BE(val)	(DBUS_UINT32_SWAP_LE_BE (val))
-#  ifdef DBUS_HAVE_INT64
-#    define DBUS_INT64_TO_LE(val)	((dbus_int64_t) (val))
-#    define DBUS_UINT64_TO_LE(val)	((dbus_uint64_t) (val))
-#    define DBUS_INT64_TO_BE(val)	((dbus_int64_t) DBUS_UINT64_SWAP_LE_BE (val))
-#    define DBUS_UINT64_TO_BE(val)	(DBUS_UINT64_SWAP_LE_BE (val))
-#  endif /* DBUS_HAVE_INT64 */
-#endif
-
-/* The transformation is symmetric, so the FROM just maps to the TO. */
-#define DBUS_INT16_FROM_LE(val)	 (DBUS_INT16_TO_LE (val))
-#define DBUS_UINT16_FROM_LE(val) (DBUS_UINT16_TO_LE (val))
-#define DBUS_INT16_FROM_BE(val)	 (DBUS_INT16_TO_BE (val))
-#define DBUS_UINT16_FROM_BE(val) (DBUS_UINT16_TO_BE (val))
-#define DBUS_INT32_FROM_LE(val)	 (DBUS_INT32_TO_LE (val))
-#define DBUS_UINT32_FROM_LE(val) (DBUS_UINT32_TO_LE (val))
-#define DBUS_INT32_FROM_BE(val)	 (DBUS_INT32_TO_BE (val))
-#define DBUS_UINT32_FROM_BE(val) (DBUS_UINT32_TO_BE (val))
-#ifdef DBUS_HAVE_INT64
-#  define DBUS_INT64_FROM_LE(val)	 (DBUS_INT64_TO_LE (val))
-#  define DBUS_UINT64_FROM_LE(val) (DBUS_UINT64_TO_LE (val))
-#  define DBUS_INT64_FROM_BE(val)	 (DBUS_INT64_TO_BE (val))
-#  define DBUS_UINT64_FROM_BE(val) (DBUS_UINT64_TO_BE (val))
-#endif /* DBUS_HAVE_INT64 */
-
-#ifndef DBUS_HAVE_INT64
-/**
- * An 8-byte struct you could use to access int64 without having
- * int64 support
- */
-typedef struct
-{
-  dbus_uint32_t first32;  /**< first 32 bits in the 8 bytes (beware endian issues) */
-  dbus_uint32_t second32; /**< second 32 bits in the 8 bytes (beware endian issues) */
-} DBus8ByteStruct;
-#endif /* DBUS_HAVE_INT64 */
-
-/**
- * A simple 8-byte value union that lets you access 8 bytes as if they
- * were various types; useful when dealing with basic types via
- * void pointers and varargs.
- */
-typedef union
-{
-  dbus_int16_t  i16;   /**< as int16 */
-  dbus_uint16_t u16;   /**< as int16 */
-  dbus_int32_t  i32;   /**< as int32 */
-  dbus_uint32_t u32;   /**< as int32 */
-#ifdef DBUS_HAVE_INT64
-  dbus_int64_t  i64;   /**< as int64 */
-  dbus_uint64_t u64;   /**< as int64 */
-#else
-  DBus8ByteStruct u64; /**< as 8-byte-struct */
-#endif
-  double dbl;          /**< as double */
-  unsigned char byt;   /**< as byte */
-  char *str;           /**< as char* */
-} DBusBasicValue;
-
-#ifdef DBUS_DISABLE_ASSERT
-#define _dbus_unpack_uint16(byte_order, data)           \
-   (((byte_order) == DBUS_LITTLE_ENDIAN) ?              \
-     DBUS_UINT16_FROM_LE (*(dbus_uint16_t*)(data)) :    \
-     DBUS_UINT16_FROM_BE (*(dbus_uint16_t*)(data)))
-
-#define _dbus_unpack_uint32(byte_order, data)           \
-   (((byte_order) == DBUS_LITTLE_ENDIAN) ?              \
-     DBUS_UINT32_FROM_LE (*(dbus_uint32_t*)(data)) :    \
-     DBUS_UINT32_FROM_BE (*(dbus_uint32_t*)(data)))
-#endif
-
-#ifndef _dbus_unpack_uint16
-dbus_uint16_t _dbus_unpack_uint16 (int                  byte_order,
-                                   const unsigned char *data);
-#endif
-
-void          _dbus_pack_uint32   (dbus_uint32_t        value,
-                                   int                  byte_order,
-                                   unsigned char       *data);
-#ifndef _dbus_unpack_uint32
-dbus_uint32_t _dbus_unpack_uint32 (int                  byte_order,
-                                   const unsigned char *data);
-#endif
-
-dbus_bool_t   _dbus_marshal_set_basic         (DBusString       *str,
-                                               int               pos,
-                                               int               type,
-                                               const void       *value,
-                                               int               byte_order,
-                                               int              *old_end_pos,
-                                               int              *new_end_pos);
-dbus_bool_t   _dbus_marshal_write_basic       (DBusString       *str,
-                                               int               insert_at,
-                                               int               type,
-                                               const void       *value,
-                                               int               byte_order,
-                                               int              *pos_after);
-dbus_bool_t   _dbus_marshal_write_fixed_multi (DBusString       *str,
-                                               int               insert_at,
-                                               int               element_type,
-                                               const void       *value,
-                                               int               n_elements,
-                                               int               byte_order,
-                                               int              *pos_after);
-void          _dbus_marshal_read_basic        (const DBusString *str,
-                                               int               pos,
-                                               int               type,
-                                               void             *value,
-                                               int               byte_order,
-                                               int              *new_pos);
-void          _dbus_marshal_read_fixed_multi  (const DBusString *str,
-                                               int               pos,
-                                               int               element_type,
-                                               void             *value,
-                                               int               n_elements,
-                                               int               byte_order,
-                                               int              *new_pos);
-void          _dbus_marshal_skip_basic        (const DBusString *str,
-                                               int               type,
-                                               int               byte_order,
-                                               int              *pos);
-void          _dbus_marshal_skip_array        (const DBusString *str,
-                                               int               element_type,
-                                               int               byte_order,
-                                               int              *pos);
-void          _dbus_marshal_set_uint32        (DBusString       *str,
-                                               int               pos,
-                                               dbus_uint32_t     value,
-                                               int               byte_order);
-dbus_uint32_t _dbus_marshal_read_uint32       (const DBusString *str,
-                                               int               pos,
-                                               int               byte_order,
-                                               int              *new_pos);
-dbus_bool_t   _dbus_type_is_valid             (int               typecode);
-int           _dbus_type_get_alignment        (int               typecode);
-dbus_bool_t   _dbus_type_is_fixed             (int               typecode);
-int           _dbus_type_get_alignment        (int               typecode);
-const char*   _dbus_type_to_string            (int               typecode);
-
-int           _dbus_first_type_in_signature   (const DBusString *str,
-                                               int               pos);
-
-int           _dbus_first_type_in_signature_c_str   (const char       *str,
-						     int               pos);
-
-void _dbus_swap_array (unsigned char *data,
-                       int            n_elements,
-                       int            alignment);
-
-#endif /* DBUS_MARSHAL_BASIC_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-marshal-byteswap.h b/lib-x86-32/include/dbus-1/dbus/dbus-marshal-byteswap.h
deleted file mode 100644
index be2dd758..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-marshal-byteswap.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-marshal-byteswap.h  Swap a block of marshaled data
- *
- * Copyright (C) 2005 Red Hat, Inc.
- *
- * Licensed under the Academic Free License version 2.1
- *
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef DBUS_MARSHAL_BYTESWAP_H
-#define DBUS_MARSHAL_BYTESWAP_H
-
-#include <dbus/dbus-protocol.h>
-#include <dbus/dbus-marshal-recursive.h>
-
-void _dbus_marshal_byteswap (const DBusString *signature,
-                             int               signature_start,
-                             int               old_byte_order,
-                             int               new_byte_order,
-                             DBusString       *value_str,
-                             int               value_pos);
-
-#endif /* DBUS_MARSHAL_BYTESWAP_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-marshal-header.h b/lib-x86-32/include/dbus-1/dbus/dbus-marshal-header.h
deleted file mode 100644
index fd16c5f0..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-marshal-header.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-marshal-header.h  Managing marshaling/demarshaling of message headers
- *
- * Copyright (C) 2005  Red Hat, Inc.
- *
- * Licensed under the Academic Free License version 2.1
- *
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef DBUS_MARSHAL_HEADER_H
-#define DBUS_MARSHAL_HEADER_H
-
-#include <dbus/dbus-marshal-basic.h>
-#include <dbus/dbus-marshal-validate.h>
-
-typedef struct DBusHeader      DBusHeader;
-typedef struct DBusHeaderField DBusHeaderField;
-
-#define _DBUS_HEADER_FIELD_VALUE_UNKNOWN -1
-#define _DBUS_HEADER_FIELD_VALUE_NONEXISTENT -2
-
-/**
- * Cached information about a header field in the message
- */
-struct DBusHeaderField
-{
-  int            value_pos; /**< Position of field value, or -1/-2 */
-};
-
-/**
- * Message header data and some cached details of it.
- */
-struct DBusHeader
-{
-  DBusString data; /**< Header network data, stored
-                    * separately from body so we can
-                    * independently realloc it.
-                    */
-
-  DBusHeaderField fields[DBUS_HEADER_FIELD_LAST + 1]; /**< Track the location
-                                                       * of each field in header
-                                                       */
-
-  dbus_uint32_t padding : 3;        /**< bytes of alignment in header */
-  dbus_uint32_t byte_order : 8;     /**< byte order of header */
-};
-
-dbus_bool_t   _dbus_header_init                   (DBusHeader        *header,
-                                                   int                byte_order);
-void          _dbus_header_free                   (DBusHeader        *header);
-void          _dbus_header_reinit                 (DBusHeader        *header,
-                                                   int                byte_order);
-dbus_bool_t   _dbus_header_create                 (DBusHeader        *header,
-                                                   int                type,
-                                                   const char        *destination,
-                                                   const char        *path,
-                                                   const char        *interface,
-                                                   const char        *member,
-                                                   const char        *error_name);
-dbus_bool_t   _dbus_header_copy                   (const DBusHeader  *header,
-                                                   DBusHeader        *dest);
-int           _dbus_header_get_message_type       (DBusHeader        *header);
-void          _dbus_header_set_serial             (DBusHeader        *header,
-                                                   dbus_uint32_t      serial);
-dbus_uint32_t _dbus_header_get_serial             (DBusHeader        *header);
-void          _dbus_header_update_lengths         (DBusHeader        *header,
-                                                   int                body_len);
-dbus_bool_t   _dbus_header_set_field_basic        (DBusHeader        *header,
-                                                   int                field,
-                                                   int                type,
-                                                   const void        *value);
-dbus_bool_t   _dbus_header_get_field_basic        (DBusHeader        *header,
-                                                   int                field,
-                                                   int                type,
-                                                   void              *value);
-dbus_bool_t   _dbus_header_get_field_raw          (DBusHeader        *header,
-                                                   int                field,
-                                                   const DBusString **str,
-                                                   int               *pos);
-dbus_bool_t   _dbus_header_delete_field           (DBusHeader        *header,
-                                                   int                field);
-void          _dbus_header_toggle_flag            (DBusHeader        *header,
-                                                   dbus_uint32_t      flag,
-                                                   dbus_bool_t        value);
-dbus_bool_t   _dbus_header_get_flag               (DBusHeader        *header,
-                                                   dbus_uint32_t      flag);
-dbus_bool_t   _dbus_header_ensure_signature       (DBusHeader        *header,
-                                                   DBusString       **type_str,
-                                                   int               *type_pos);
-dbus_bool_t   _dbus_header_have_message_untrusted (int                max_message_length,
-                                                   DBusValidity      *validity,
-                                                   int               *byte_order,
-                                                   int               *fields_array_len,
-                                                   int               *header_len,
-                                                   int               *body_len,
-                                                   const DBusString  *str,
-                                                   int                start,
-                                                   int                len);
-dbus_bool_t   _dbus_header_load                   (DBusHeader        *header,
-                                                   DBusValidationMode mode,
-                                                   DBusValidity      *validity,
-                                                   int                byte_order,
-                                                   int                fields_array_len,
-                                                   int                header_len,
-                                                   int                body_len,
-                                                   const DBusString  *str,
-                                                   int                start,
-                                                   int                len);
-void          _dbus_header_byteswap               (DBusHeader        *header,
-                                                   int                new_order);
-
-
-
-#endif /* DBUS_MARSHAL_HEADER_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-marshal-recursive.h b/lib-x86-32/include/dbus-1/dbus/dbus-marshal-recursive.h
deleted file mode 100644
index 97e5466b..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-marshal-recursive.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-marshal-recursive.h  Marshalling routines for recursive types
- *
- * Copyright (C) 2004, 2005 Red Hat, Inc.
- *
- * Licensed under the Academic Free License version 2.1
- *
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef DBUS_MARSHAL_RECURSIVE_H
-#define DBUS_MARSHAL_RECURSIVE_H
-
-#include <dbus/dbus-protocol.h>
-#include <dbus/dbus-list.h>
-
-typedef struct DBusTypeReader      DBusTypeReader;
-typedef struct DBusTypeWriter      DBusTypeWriter;
-typedef struct DBusTypeReaderClass DBusTypeReaderClass;
-typedef struct DBusArrayLenFixup   DBusArrayLenFixup;
-
-/**
- * The type reader is an iterator for reading values from a block of
- * values.
- */
-struct DBusTypeReader
-{
-  dbus_uint32_t byte_order : 8; /**< byte order of the block */
-
-  dbus_uint32_t finished : 1;   /**< marks we're at end iterator for cases
-                                 * where we don't have another way to tell
-                                 */
-  dbus_uint32_t array_len_offset : 3; /**< bytes back from start_pos that len ends */
-  const DBusString *type_str;   /**< string containing signature of block */
-  int type_pos;                 /**< current position in signature */
-  const DBusString *value_str;  /**< string containing values of block */
-  int value_pos;                /**< current position in values */
-
-  const DBusTypeReaderClass *klass; /**< the vtable for the reader */
-  union
-  {
-    struct {
-      int start_pos;                /**< for array readers, the start of the array values */
-    } array;
-  } u; /**< class-specific data */
-};
-
-/**
- * The type writer is an iterator for writing to a block of values.
- */
-struct DBusTypeWriter
-{
-  dbus_uint32_t byte_order : 8;            /**< byte order to write values with */
-
-  dbus_uint32_t container_type : 8;        /**< what are we inside? (e.g. struct, variant, array) */
-
-  dbus_uint32_t type_pos_is_expectation : 1; /**< type_pos can be either an insertion point for or an expected next type */
-
-  dbus_uint32_t enabled : 1; /**< whether to write values */
-
-  DBusString *type_str; /**< where to write typecodes (or read type expectations) */
-  int type_pos;         /**< current pos in type_str */
-  DBusString *value_str; /**< where to write values */
-  int value_pos;         /**< next position to write */
-
-  union
-  {
-    struct {
-      int start_pos; /**< position of first element in the array */
-      int len_pos;   /**< position of length of the array */
-      int element_type_pos; /**< position of array element type in type_str */
-    } array;
-  } u; /**< class-specific data */
-};
-
-/**
- * When modifying an existing block of values, array lengths may need
- * to be adjusted; those adjustments are described by this struct.
- */
-struct DBusArrayLenFixup
-{
-  int len_pos_in_reader; /**< where the length was in the original block */
-  int new_len;           /**< the new value of the length in the written-out block */
-};
-
-void        _dbus_type_reader_init                      (DBusTypeReader        *reader,
-                                                         int                    byte_order,
-                                                         const DBusString      *type_str,
-                                                         int                    type_pos,
-                                                         const DBusString      *value_str,
-                                                         int                    value_pos);
-void        _dbus_type_reader_init_types_only           (DBusTypeReader        *reader,
-                                                         const DBusString      *type_str,
-                                                         int                    type_pos);
-int         _dbus_type_reader_get_current_type          (const DBusTypeReader  *reader);
-int         _dbus_type_reader_get_element_type          (const DBusTypeReader  *reader);
-int         _dbus_type_reader_get_value_pos             (const DBusTypeReader  *reader);
-void        _dbus_type_reader_read_basic                (const DBusTypeReader  *reader,
-                                                         void                  *value);
-int         _dbus_type_reader_get_array_length          (const DBusTypeReader  *reader);
-void        _dbus_type_reader_read_fixed_multi          (const DBusTypeReader  *reader,
-                                                         void                  *value,
-                                                         int                   *n_elements);
-void        _dbus_type_reader_read_raw                  (const DBusTypeReader  *reader,
-                                                         const unsigned char  **value_location);
-void        _dbus_type_reader_recurse                   (DBusTypeReader        *reader,
-                                                         DBusTypeReader        *subreader);
-dbus_bool_t _dbus_type_reader_next                      (DBusTypeReader        *reader);
-dbus_bool_t _dbus_type_reader_has_next                  (const DBusTypeReader  *reader);
-void        _dbus_type_reader_get_signature             (const DBusTypeReader  *reader,
-                                                         const DBusString     **str_p,
-                                                         int                   *start_p,
-                                                         int                   *len_p);
-dbus_bool_t _dbus_type_reader_set_basic                 (DBusTypeReader        *reader,
-                                                         const void            *value,
-                                                         const DBusTypeReader  *realign_root);
-dbus_bool_t _dbus_type_reader_delete                    (DBusTypeReader        *reader,
-                                                         const DBusTypeReader  *realign_root);
-dbus_bool_t _dbus_type_reader_greater_than              (const DBusTypeReader  *lhs,
-                                                         const DBusTypeReader  *rhs);
-
-dbus_bool_t _dbus_type_reader_equal_values              (const DBusTypeReader *lhs,
-                                                         const DBusTypeReader *rhs);
-
-void        _dbus_type_signature_next                   (const char            *signature,
-							 int                   *type_pos);
-
-void        _dbus_type_writer_init                 (DBusTypeWriter        *writer,
-                                                    int                    byte_order,
-                                                    DBusString            *type_str,
-                                                    int                    type_pos,
-                                                    DBusString            *value_str,
-                                                    int                    value_pos);
-void        _dbus_type_writer_init_types_delayed   (DBusTypeWriter        *writer,
-                                                    int                    byte_order,
-                                                    DBusString            *value_str,
-                                                    int                    value_pos);
-void        _dbus_type_writer_add_types            (DBusTypeWriter        *writer,
-                                                    DBusString            *type_str,
-                                                    int                    type_pos);
-void        _dbus_type_writer_remove_types         (DBusTypeWriter        *writer);
-void        _dbus_type_writer_init_values_only     (DBusTypeWriter        *writer,
-                                                    int                    byte_order,
-                                                    const DBusString      *type_str,
-                                                    int                    type_pos,
-                                                    DBusString            *value_str,
-                                                    int                    value_pos);
-dbus_bool_t _dbus_type_writer_write_basic          (DBusTypeWriter        *writer,
-                                                    int                    type,
-                                                    const void            *value);
-dbus_bool_t _dbus_type_writer_write_fixed_multi    (DBusTypeWriter        *writer,
-                                                    int                    element_type,
-                                                    const void            *value,
-                                                    int                    n_elements);
-dbus_bool_t _dbus_type_writer_recurse              (DBusTypeWriter        *writer,
-                                                    int                    container_type,
-                                                    const DBusString      *contained_type,
-                                                    int                    contained_type_start,
-                                                    DBusTypeWriter        *sub);
-dbus_bool_t _dbus_type_writer_unrecurse            (DBusTypeWriter        *writer,
-                                                    DBusTypeWriter        *sub);
-dbus_bool_t _dbus_type_writer_append_array         (DBusTypeWriter        *writer,
-                                                    const DBusString      *contained_type,
-                                                    int                    contained_type_start,
-                                                    DBusTypeWriter        *sub);
-dbus_bool_t _dbus_type_writer_write_reader         (DBusTypeWriter        *writer,
-                                                    DBusTypeReader        *reader);
-dbus_bool_t _dbus_type_writer_write_reader_partial (DBusTypeWriter        *writer,
-                                                    DBusTypeReader        *reader,
-                                                    const DBusTypeReader  *start_after,
-                                                    int                    start_after_new_pos,
-                                                    int                    start_after_new_len,
-                                                    DBusList             **fixups);
-void        _dbus_type_writer_set_enabled          (DBusTypeWriter        *writer,
-                                                    dbus_bool_t            enabled);
-
-
-#endif /* DBUS_MARSHAL_RECURSIVE_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-marshal-validate.h b/lib-x86-32/include/dbus-1/dbus/dbus-marshal-validate.h
deleted file mode 100644
index 5817de32..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-marshal-validate.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-marshal-validate.h  Validation routines for marshaled data
- *
- * Copyright (C) 2005  Red Hat, Inc.
- *
- * Licensed under the Academic Free License version 2.1
- *
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef DBUS_MARSHAL_VALIDATE_H
-#define DBUS_MARSHAL_VALIDATE_H
-
-/**
- * @addtogroup DBusMarshal
- *
- * @{
- */
-
-/**
- * This is used rather than a bool for high visibility
- */
-typedef enum
-{
-  DBUS_VALIDATION_MODE_WE_TRUST_THIS_DATA_ABSOLUTELY,
-  DBUS_VALIDATION_MODE_DATA_IS_UNTRUSTED
-} DBusValidationMode;
-
-/**
- * This is primarily used in unit testing, so we can verify that each
- * invalid message is invalid for the expected reasons. Thus we really
- * want a distinct enum value for every codepath leaving the validator
- * functions. Enum values are specified manually for ease of debugging
- * (so you can see the enum value given a printf)
- */
-typedef enum
-{
-#define _DBUS_NEGATIVE_VALIDITY_COUNT 4
-  DBUS_VALIDITY_UNKNOWN_OOM_ERROR = -4, /**< can't determine validity due to OOM */
-  DBUS_INVALID_FOR_UNKNOWN_REASON = -3,
-  DBUS_VALID_BUT_INCOMPLETE = -2,
-  DBUS_VALIDITY_UNKNOWN = -1,
-  DBUS_VALID = 0, /**< the data is valid */
-  DBUS_INVALID_UNKNOWN_TYPECODE = 1,
-  DBUS_INVALID_MISSING_ARRAY_ELEMENT_TYPE = 2,
-  DBUS_INVALID_SIGNATURE_TOO_LONG = 3, /* this one is impossible right now since
-                                        * you can't put a too-long value in a byte
-                                        */
-  DBUS_INVALID_EXCEEDED_MAXIMUM_ARRAY_RECURSION = 4,
-  DBUS_INVALID_EXCEEDED_MAXIMUM_STRUCT_RECURSION = 5,
-  DBUS_INVALID_STRUCT_ENDED_BUT_NOT_STARTED = 6,
-  DBUS_INVALID_STRUCT_STARTED_BUT_NOT_ENDED = 7,
-  DBUS_INVALID_STRUCT_HAS_NO_FIELDS = 8,
-  DBUS_INVALID_ALIGNMENT_PADDING_NOT_NUL = 9,
-  DBUS_INVALID_BOOLEAN_NOT_ZERO_OR_ONE = 10,
-  DBUS_INVALID_NOT_ENOUGH_DATA = 11,
-  DBUS_INVALID_TOO_MUCH_DATA = 12, /**< trailing junk makes it invalid */
-  DBUS_INVALID_BAD_BYTE_ORDER = 13,
-  DBUS_INVALID_BAD_PROTOCOL_VERSION = 14,
-  DBUS_INVALID_BAD_MESSAGE_TYPE = 15,
-  DBUS_INVALID_BAD_SERIAL = 16,
-  DBUS_INVALID_INSANE_FIELDS_ARRAY_LENGTH = 17,
-  DBUS_INVALID_INSANE_BODY_LENGTH = 18,
-  DBUS_INVALID_MESSAGE_TOO_LONG = 19,
-  DBUS_INVALID_HEADER_FIELD_CODE = 20,
-  DBUS_INVALID_HEADER_FIELD_HAS_WRONG_TYPE = 21,
-  DBUS_INVALID_USES_LOCAL_INTERFACE = 22,
-  DBUS_INVALID_USES_LOCAL_PATH = 23,
-  DBUS_INVALID_HEADER_FIELD_APPEARS_TWICE = 24,
-  DBUS_INVALID_BAD_DESTINATION = 25,
-  DBUS_INVALID_BAD_INTERFACE = 26,
-  DBUS_INVALID_BAD_MEMBER = 27,
-  DBUS_INVALID_BAD_ERROR_NAME = 28,
-  DBUS_INVALID_BAD_SENDER = 29,
-  DBUS_INVALID_MISSING_PATH = 30,
-  DBUS_INVALID_MISSING_INTERFACE = 31,
-  DBUS_INVALID_MISSING_MEMBER = 32,
-  DBUS_INVALID_MISSING_ERROR_NAME = 33,
-  DBUS_INVALID_MISSING_REPLY_SERIAL = 34,
-  DBUS_INVALID_LENGTH_OUT_OF_BOUNDS = 35,
-  DBUS_INVALID_ARRAY_LENGTH_EXCEEDS_MAXIMUM = 36,
-  DBUS_INVALID_BAD_PATH = 37,
-  DBUS_INVALID_SIGNATURE_LENGTH_OUT_OF_BOUNDS = 38,
-  DBUS_INVALID_BAD_UTF8_IN_STRING = 39,
-  DBUS_INVALID_ARRAY_LENGTH_INCORRECT = 40,
-  DBUS_INVALID_VARIANT_SIGNATURE_LENGTH_OUT_OF_BOUNDS = 41,
-  DBUS_INVALID_VARIANT_SIGNATURE_BAD = 42,
-  DBUS_INVALID_VARIANT_SIGNATURE_EMPTY = 43,
-  DBUS_INVALID_VARIANT_SIGNATURE_SPECIFIES_MULTIPLE_VALUES = 44,
-  DBUS_INVALID_VARIANT_SIGNATURE_MISSING_NUL = 45,
-  DBUS_INVALID_STRING_MISSING_NUL = 46,
-  DBUS_INVALID_SIGNATURE_MISSING_NUL = 47,
-  DBUS_INVALID_EXCEEDED_MAXIMUM_DICT_ENTRY_RECURSION = 48,
-  DBUS_INVALID_DICT_ENTRY_ENDED_BUT_NOT_STARTED = 49,
-  DBUS_INVALID_DICT_ENTRY_STARTED_BUT_NOT_ENDED = 50,
-  DBUS_INVALID_DICT_ENTRY_HAS_NO_FIELDS = 51,
-  DBUS_INVALID_DICT_ENTRY_HAS_ONLY_ONE_FIELD = 52,
-  DBUS_INVALID_DICT_ENTRY_HAS_TOO_MANY_FIELDS = 53,
-  DBUS_INVALID_DICT_ENTRY_NOT_INSIDE_ARRAY = 54,
-  DBUS_INVALID_DICT_KEY_MUST_BE_BASIC_TYPE = 55,
-  DBUS_INVALID_MISSING_UNIX_FDS = 56,
-  DBUS_VALIDITY_LAST
-} DBusValidity;
-
-DBusValidity _dbus_validate_signature_with_reason (const DBusString *type_str,
-                                                   int               type_pos,
-                                                   int               len);
-DBusValidity _dbus_validate_body_with_reason      (const DBusString *expected_signature,
-                                                   int               expected_signature_start,
-                                                   int               byte_order,
-                                                   int              *bytes_remaining,
-                                                   const DBusString *value_str,
-                                                   int               value_pos,
-                                                   int               len);
-
-const char *_dbus_validity_to_error_message (DBusValidity validity);
-
-dbus_bool_t _dbus_validate_path       (const DBusString *str,
-                                       int               start,
-                                       int               len);
-dbus_bool_t _dbus_validate_interface  (const DBusString *str,
-                                       int               start,
-                                       int               len);
-dbus_bool_t _dbus_validate_member     (const DBusString *str,
-                                       int               start,
-                                       int               len);
-dbus_bool_t _dbus_validate_error_name (const DBusString *str,
-                                       int               start,
-                                       int               len);
-dbus_bool_t _dbus_validate_bus_name   (const DBusString *str,
-                                       int               start,
-                                       int               len);
-dbus_bool_t _dbus_validate_signature  (const DBusString *str,
-                                       int               start,
-                                       int               len);
-
-#ifdef DBUS_DISABLE_CHECKS
-
-/* Be sure they don't exist, since we don't want to use them outside of checks
- * and so we want the compile failure.
- */
-#define DECLARE_DBUS_NAME_CHECK(what)
-#define DEFINE_DBUS_NAME_CHECK(what)
-
-#else /* !DBUS_DISABLE_CHECKS */
-
-/** A name check is used in _dbus_return_if_fail(), it's not suitable
- * for validating untrusted data. use _dbus_validate_whatever for that.
- */
-#define DECLARE_DBUS_NAME_CHECK(what) \
-dbus_bool_t _dbus_check_is_valid_##what (const char *name)
-
-/** Define a name check to be used in _dbus_return_if_fail() statements.
- */
-#define DEFINE_DBUS_NAME_CHECK(what)                                    \
-dbus_bool_t                                                             \
-_dbus_check_is_valid_##what (const char *name)                          \
-{                                                                       \
-  DBusString str;                                                       \
-                                                                        \
-  if (name == NULL)                                                     \
-    return FALSE;                                                       \
-                                                                        \
-  _dbus_string_init_const (&str, name);                                 \
-  return _dbus_validate_##what (&str, 0,                                \
-                                _dbus_string_get_length (&str));        \
-}
-#endif /* !DBUS_DISABLE_CHECKS */
-
-/** defines _dbus_check_is_valid_path() */
-DECLARE_DBUS_NAME_CHECK(path);
-/** defines _dbus_check_is_valid_interface() */
-DECLARE_DBUS_NAME_CHECK(interface);
-/** defines _dbus_check_is_valid_member() */
-DECLARE_DBUS_NAME_CHECK(member);
-/** defines _dbus_check_is_valid_error_name() */
-DECLARE_DBUS_NAME_CHECK(error_name);
-/** defines _dbus_check_is_valid_bus_name() */
-DECLARE_DBUS_NAME_CHECK(bus_name);
-/** defines _dbus_check_is_valid_signature() */
-DECLARE_DBUS_NAME_CHECK(signature);
-
-/** @} */
-
-#endif /* DBUS_MARSHAL_VALIDATE_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-memory.h b/lib-x86-32/include/dbus-1/dbus/dbus-memory.h
deleted file mode 100644
index ea28423c..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-memory.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-memory.h  D-Bus memory handling
- *
- * Copyright (C) 2002  Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#if !defined (DBUS_INSIDE_DBUS_H) && !defined (DBUS_COMPILATION)
-#error "Only <dbus/dbus.h> can be included directly, this file may disappear or change contents."
-#endif
-
-#ifndef DBUS_MEMORY_H
-#define DBUS_MEMORY_H
-
-#include <dbus/dbus-macros.h>
-#include <stddef.h>
-
-DBUS_BEGIN_DECLS
-
-/**
- * @addtogroup DBusMemory
- * @{
- */
-
-DBUS_EXPORT
-void* dbus_malloc        (size_t bytes);
-DBUS_EXPORT
-void* dbus_malloc0       (size_t bytes);
-DBUS_EXPORT
-void* dbus_realloc       (void  *memory,
-                          size_t bytes);
-DBUS_EXPORT
-void  dbus_free          (void  *memory);
-
-#define dbus_new(type, count)  ((type*)dbus_malloc (sizeof (type) * (count)))
-#define dbus_new0(type, count) ((type*)dbus_malloc0 (sizeof (type) * (count)))
-
-DBUS_EXPORT
-void dbus_free_string_array (char **str_array);
-
-typedef void (* DBusFreeFunction) (void *memory);
-
-DBUS_EXPORT
-void dbus_shutdown (void);
-
-/** @} */
-
-DBUS_END_DECLS
-
-#endif /* DBUS_MEMORY_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-mempool.h b/lib-x86-32/include/dbus-1/dbus/dbus-mempool.h
deleted file mode 100644
index afe52472..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-mempool.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-mempool.h Memory pools
- * 
- * Copyright (C) 2002  Red Hat, Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef DBUS_MEMPOOL_H
-#define DBUS_MEMPOOL_H
-
-#include <dbus/dbus-internals.h>
-#include <dbus/dbus-memory.h>
-#include <dbus/dbus-types.h>
-
-DBUS_BEGIN_DECLS
-
-typedef struct DBusMemPool DBusMemPool;
-
-DBusMemPool* _dbus_mem_pool_new     (int          element_size,
-                                     dbus_bool_t  zero_elements);
-void         _dbus_mem_pool_free    (DBusMemPool *pool);
-void*        _dbus_mem_pool_alloc   (DBusMemPool *pool);
-dbus_bool_t  _dbus_mem_pool_dealloc (DBusMemPool *pool,
-                                     void        *element);
-
-DBUS_END_DECLS
-
-#endif /* DBUS_MEMPOOL_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-message-factory.h b/lib-x86-32/include/dbus-1/dbus/dbus-message-factory.h
deleted file mode 100644
index b0747504..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-message-factory.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-message-factory.h Generator of valid and invalid message data for test suite
- *
- * Copyright (C) 2005 Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef DBUS_MESSAGE_FACTORY_H
-#define DBUS_MESSAGE_FACTORY_H
-
-#ifdef DBUS_BUILD_TESTS
-
-#include <dbus/dbus-string.h>
-#include <dbus/dbus-marshal-basic.h>
-#include <dbus/dbus-marshal-validate.h>
-
-DBUS_BEGIN_DECLS
-
-typedef struct
-{
-  DBusValidity expected_validity;
-  
-  DBusString data;
-
-} DBusMessageData;
-
-#define _DBUS_MESSAGE_DATA_MAX_NESTING 10
-typedef struct
-{
-  int sequence_nos[_DBUS_MESSAGE_DATA_MAX_NESTING];
-  int depth;
-  int count;
-} DBusMessageDataIter;
-
-void        _dbus_message_data_free              (DBusMessageData     *data);
-void        _dbus_message_data_iter_init         (DBusMessageDataIter *iter);
-dbus_bool_t _dbus_message_data_iter_get_and_next (DBusMessageDataIter *iter,
-                                                  DBusMessageData     *data);
-
-
-DBUS_END_DECLS
-
-#endif /* DBUS_BUILD_TESTS */
-
-#endif /* DBUS_MESSAGE_FACTORY_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-message-internal.h b/lib-x86-32/include/dbus-1/dbus/dbus-message-internal.h
deleted file mode 100644
index 870934b9..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-message-internal.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-message-internal.h DBusMessage object internal interfaces
- *
- * Copyright (C) 2002  Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#ifndef DBUS_MESSAGE_INTERNAL_H
-#define DBUS_MESSAGE_INTERNAL_H
-
-#include <dbus/dbus-marshal-validate.h>
-#include <dbus/dbus-message.h>
-#include <dbus/dbus-resources.h>
-#include <dbus/dbus-list.h>
-
-DBUS_BEGIN_DECLS
-
-typedef struct DBusMessageLoader DBusMessageLoader;
-
-void _dbus_message_get_network_data  (DBusMessage       *message,
-				      const DBusString **header,
-				      const DBusString **body);
-void _dbus_message_get_unix_fds      (DBusMessage *message,
-                                      const int **fds,
-                                      unsigned *n_fds);
-
-void        _dbus_message_lock                  (DBusMessage  *message);
-void        _dbus_message_unlock                (DBusMessage  *message);
-dbus_bool_t _dbus_message_add_counter           (DBusMessage  *message,
-                                                 DBusCounter  *counter);
-void        _dbus_message_add_counter_link      (DBusMessage  *message,
-                                                 DBusList     *link);
-void        _dbus_message_remove_counter        (DBusMessage  *message,
-                                                 DBusCounter  *counter,
-                                                 DBusList    **link_return);
-
-DBusMessageLoader* _dbus_message_loader_new                   (void);
-DBusMessageLoader* _dbus_message_loader_ref                   (DBusMessageLoader  *loader);
-void               _dbus_message_loader_unref                 (DBusMessageLoader  *loader);
-
-void               _dbus_message_loader_get_buffer            (DBusMessageLoader  *loader,
-                                                               DBusString        **buffer);
-void               _dbus_message_loader_return_buffer         (DBusMessageLoader  *loader,
-                                                               DBusString         *buffer,
-                                                               int                 bytes_read);
-
-dbus_bool_t        _dbus_message_loader_get_unix_fds          (DBusMessageLoader  *loader,
-                                                               int               **fds,
-                                                               unsigned           *max_n_fds);
-void               _dbus_message_loader_return_unix_fds       (DBusMessageLoader  *loader,
-                                                               int                *fds,
-                                                               unsigned            n_fds);
-
-dbus_bool_t        _dbus_message_loader_queue_messages        (DBusMessageLoader  *loader);
-DBusMessage*       _dbus_message_loader_peek_message          (DBusMessageLoader  *loader);
-DBusMessage*       _dbus_message_loader_pop_message           (DBusMessageLoader  *loader);
-DBusList*          _dbus_message_loader_pop_message_link      (DBusMessageLoader  *loader);
-void               _dbus_message_loader_putback_message_link  (DBusMessageLoader  *loader,
-                                                               DBusList           *link);
-
-dbus_bool_t        _dbus_message_loader_get_is_corrupted      (DBusMessageLoader  *loader);
-DBusValidity       _dbus_message_loader_get_corruption_reason (DBusMessageLoader  *loader);
-
-void               _dbus_message_loader_set_max_message_size  (DBusMessageLoader  *loader,
-                                                               long                size);
-long               _dbus_message_loader_get_max_message_size  (DBusMessageLoader  *loader);
-
-void               _dbus_message_loader_set_max_message_unix_fds(DBusMessageLoader  *loader,
-                                                                 long                n);
-long               _dbus_message_loader_get_max_message_unix_fds(DBusMessageLoader  *loader);
-
-DBUS_END_DECLS
-
-#endif /* DBUS_MESSAGE_INTERNAL_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-message-private.h b/lib-x86-32/include/dbus-1/dbus/dbus-message-private.h
deleted file mode 100644
index 57888fa5..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-message-private.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-message-private.h header shared between dbus-message.c and dbus-message-util.c
- *
- * Copyright (C) 2005  Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#ifndef DBUS_MESSAGE_PRIVATE_H
-#define DBUS_MESSAGE_PRIVATE_H
-
-#include <dbus/dbus-message.h>
-#include <dbus/dbus-message-internal.h>
-#include <dbus/dbus-string.h>
-#include <dbus/dbus-dataslot.h>
-#include <dbus/dbus-marshal-header.h>
-
-DBUS_BEGIN_DECLS
-
-/**
- * @addtogroup DBusMessageInternals
- * @{
- */
-
-/**
- * @typedef DBusMessageLoader
- *
- * The DBusMessageLoader object encapsulates the process of converting
- * a byte stream into a series of DBusMessage. It buffers the incoming
- * bytes as efficiently as possible, and generates a queue of
- * messages. DBusMessageLoader is typically used as part of a
- * DBusTransport implementation. The DBusTransport then hands off
- * the loaded messages to a DBusConnection, making the messages
- * visible to the application.
- *
- * @todo write tests for break-loader that a) randomly delete header
- * fields and b) set string fields to zero-length and other funky
- * values.
- *
- */
-
-/**
- * Implementation details of DBusMessageLoader.
- * All members are private.
- */
-struct DBusMessageLoader
-{
-  int refcount;        /**< Reference count. */
-
-  DBusString data;     /**< Buffered data */
-
-  DBusList *messages;  /**< Complete messages. */
-
-  long max_message_size; /**< Maximum size of a message */
-  long max_message_unix_fds; /**< Maximum unix fds in a message */
-
-  DBusValidity corruption_reason; /**< why we were corrupted */
-
-  unsigned int corrupted : 1; /**< We got broken data, and are no longer working */
-
-  unsigned int buffer_outstanding : 1; /**< Someone is using the buffer to read */
-
-#ifdef HAVE_UNIX_FD_PASSING
-  unsigned int unix_fds_outstanding : 1; /**< Someone is using the unix fd array to read */
-
-  int *unix_fds; /**< File descriptors that have been read from the transport but not yet been handed to any message. Array will be allocated at first use. */
-  unsigned n_unix_fds_allocated; /**< Number of file descriptors this array has space for */
-  unsigned n_unix_fds; /**< Number of valid file descriptors in array */
-#endif
-};
-
-
-/** How many bits are in the changed_stamp used to validate iterators */
-#define CHANGED_STAMP_BITS 21
-
-/**
- * @brief Internals of DBusMessage
- *
- * Object representing a message received from or to be sent to
- * another application. This is an opaque object, all members
- * are private.
- */
-struct DBusMessage
-{
-  DBusAtomic refcount; /**< Reference count */
-
-  DBusHeader header; /**< Header network data and associated cache */
-
-  DBusString body;   /**< Body network data. */
-
-  char byte_order; /**< Message byte order. */
-
-  unsigned int locked : 1; /**< Message being sent, no modifications allowed. */
-
-#ifndef DBUS_DISABLE_CHECKS
-  unsigned int in_cache : 1; /**< Has been "freed" since it's in the cache (this is a debug feature) */
-#endif
-
-  DBusList *counters;   /**< 0-N DBusCounter used to track message size/unix fds. */
-  long size_counter_delta;   /**< Size we incremented the size counters by.   */
-
-  dbus_uint32_t changed_stamp : CHANGED_STAMP_BITS; /**< Incremented when iterators are invalidated. */
-
-  DBusDataSlotList slot_list;   /**< Data stored by allocated integer ID */
-
-#ifndef DBUS_DISABLE_CHECKS
-  int generation; /**< _dbus_current_generation when message was created */
-#endif
-
-#ifdef HAVE_UNIX_FD_PASSING
-  int *unix_fds;
-  /**< Unix file descriptors associated with this message. These are
-     closed when the message is destroyed, hence make sure to dup()
-     them when adding or removing them here. */
-  unsigned n_unix_fds; /**< Number of valid fds in the array */
-  unsigned n_unix_fds_allocated; /**< Allocated size of the array */
-
-  long unix_fd_counter_delta; /**< Size we incremented the unix fd counter by */
-#endif
-};
-
-dbus_bool_t _dbus_message_iter_get_args_valist (DBusMessageIter *iter,
-                                                DBusError       *error,
-                                                int              first_arg_type,
-                                                va_list          var_args);
-
-
-void _dbus_check_fdleaks(void);
-
-/** @} */
-
-DBUS_END_DECLS
-
-#endif /* DBUS_MESSAGE_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-message.h b/lib-x86-32/include/dbus-1/dbus/dbus-message.h
deleted file mode 100644
index 5500492d..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-message.h
+++ /dev/null
@@ -1,309 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-message.h DBusMessage object
- *
- * Copyright (C) 2002, 2003, 2005 Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#if !defined (DBUS_INSIDE_DBUS_H) && !defined (DBUS_COMPILATION)
-#error "Only <dbus/dbus.h> can be included directly, this file may disappear or change contents."
-#endif
-
-#ifndef DBUS_MESSAGE_H
-#define DBUS_MESSAGE_H
-
-#include <dbus/dbus-macros.h>
-#include <dbus/dbus-types.h>
-#include <dbus/dbus-arch-deps.h>
-#include <dbus/dbus-memory.h>
-#include <dbus/dbus-errors.h>
-#include <stdarg.h>
-
-DBUS_BEGIN_DECLS
-
-/**
- * @addtogroup DBusMessage
- * @{
- */
-
-typedef struct DBusMessage DBusMessage;
-/** Opaque type representing a message iterator. Can be copied by value, and contains no allocated memory so never needs to be freed and can be allocated on the stack. */
-typedef struct DBusMessageIter DBusMessageIter;
-
-/**
- * DBusMessageIter struct; contains no public fields. 
- */
-struct DBusMessageIter
-{ 
-  void *dummy1;         /**< Don't use this */
-  void *dummy2;         /**< Don't use this */
-  dbus_uint32_t dummy3; /**< Don't use this */
-  int dummy4;           /**< Don't use this */
-  int dummy5;           /**< Don't use this */
-  int dummy6;           /**< Don't use this */
-  int dummy7;           /**< Don't use this */
-  int dummy8;           /**< Don't use this */
-  int dummy9;           /**< Don't use this */
-  int dummy10;          /**< Don't use this */
-  int dummy11;          /**< Don't use this */
-  int pad1;             /**< Don't use this */
-  int pad2;             /**< Don't use this */
-  void *pad3;           /**< Don't use this */
-};
-
-DBUS_EXPORT
-DBusMessage* dbus_message_new               (int          message_type);
-DBUS_EXPORT
-DBusMessage* dbus_message_new_method_call   (const char  *bus_name,
-                                             const char  *path,
-                                             const char  *interface,
-                                             const char  *method);
-DBUS_EXPORT
-DBusMessage* dbus_message_new_method_return (DBusMessage *method_call);
-DBUS_EXPORT
-DBusMessage* dbus_message_new_signal        (const char  *path,
-                                             const char  *interface,
-                                             const char  *name);
-DBUS_EXPORT
-DBusMessage* dbus_message_new_error         (DBusMessage *reply_to,
-                                             const char  *error_name,
-                                             const char  *error_message);
-DBUS_EXPORT
-DBusMessage* dbus_message_new_error_printf  (DBusMessage *reply_to,
-                                             const char  *error_name,
-                                             const char  *error_format,
-					     ...);
-
-DBUS_EXPORT
-DBusMessage* dbus_message_copy              (const DBusMessage *message);
-
-DBUS_EXPORT
-DBusMessage*  dbus_message_ref              (DBusMessage   *message);
-DBUS_EXPORT
-void          dbus_message_unref            (DBusMessage   *message);
-DBUS_EXPORT
-int           dbus_message_get_type         (DBusMessage   *message);
-DBUS_EXPORT
-dbus_bool_t   dbus_message_set_path         (DBusMessage   *message,
-                                             const char    *object_path);
-DBUS_EXPORT
-const char*   dbus_message_get_path         (DBusMessage   *message);
-DBUS_EXPORT
-dbus_bool_t   dbus_message_has_path         (DBusMessage   *message, 
-                                             const char    *object_path);  
-DBUS_EXPORT
-dbus_bool_t   dbus_message_set_interface    (DBusMessage   *message,
-                                             const char    *interface);       
-DBUS_EXPORT
-const char*   dbus_message_get_interface    (DBusMessage   *message);
-DBUS_EXPORT
-dbus_bool_t   dbus_message_has_interface    (DBusMessage   *message, 
-                                             const char    *interface);
-DBUS_EXPORT
-dbus_bool_t   dbus_message_set_member       (DBusMessage   *message,
-                                             const char    *member);
-DBUS_EXPORT
-const char*   dbus_message_get_member       (DBusMessage   *message);
-DBUS_EXPORT
-dbus_bool_t   dbus_message_has_member       (DBusMessage   *message, 
-                                             const char    *member);
-DBUS_EXPORT
-dbus_bool_t   dbus_message_set_error_name   (DBusMessage   *message,
-                                             const char    *name);
-DBUS_EXPORT
-const char*   dbus_message_get_error_name   (DBusMessage   *message);
-DBUS_EXPORT
-dbus_bool_t   dbus_message_set_destination  (DBusMessage   *message,
-                                             const char    *destination);
-DBUS_EXPORT
-const char*   dbus_message_get_destination  (DBusMessage   *message);
-DBUS_EXPORT
-dbus_bool_t   dbus_message_set_sender       (DBusMessage   *message,
-                                             const char    *sender);
-DBUS_EXPORT
-const char*   dbus_message_get_sender       (DBusMessage   *message);
-DBUS_EXPORT
-const char*   dbus_message_get_signature    (DBusMessage   *message);
-DBUS_EXPORT
-void          dbus_message_set_no_reply     (DBusMessage   *message,
-                                             dbus_bool_t    no_reply);
-DBUS_EXPORT
-dbus_bool_t   dbus_message_get_no_reply     (DBusMessage   *message);
-DBUS_EXPORT
-dbus_bool_t   dbus_message_is_method_call   (DBusMessage   *message,
-                                             const char    *interface,
-                                             const char    *method);
-DBUS_EXPORT
-dbus_bool_t   dbus_message_is_signal        (DBusMessage   *message,
-                                             const char    *interface,
-                                             const char    *signal_name);
-DBUS_EXPORT
-dbus_bool_t   dbus_message_is_error         (DBusMessage   *message,
-                                             const char    *error_name);
-DBUS_EXPORT
-dbus_bool_t   dbus_message_has_destination  (DBusMessage   *message,
-                                             const char    *bus_name);
-DBUS_EXPORT
-dbus_bool_t   dbus_message_has_sender       (DBusMessage   *message,
-                                             const char    *unique_bus_name);
-DBUS_EXPORT
-dbus_bool_t   dbus_message_has_signature    (DBusMessage   *message,
-                                             const char    *signature);
-DBUS_EXPORT
-dbus_uint32_t dbus_message_get_serial       (DBusMessage   *message);
-DBUS_EXPORT
-void          dbus_message_set_serial       (DBusMessage   *message, 
-                                             dbus_uint32_t  serial);
-DBUS_EXPORT
-dbus_bool_t   dbus_message_set_reply_serial (DBusMessage   *message,
-                                             dbus_uint32_t  reply_serial);
-DBUS_EXPORT
-dbus_uint32_t dbus_message_get_reply_serial (DBusMessage   *message);
-
-DBUS_EXPORT
-void          dbus_message_set_auto_start   (DBusMessage   *message,
-                                             dbus_bool_t    auto_start);
-DBUS_EXPORT
-dbus_bool_t   dbus_message_get_auto_start   (DBusMessage   *message);
-
-DBUS_EXPORT
-dbus_bool_t   dbus_message_get_path_decomposed (DBusMessage   *message,
-                                                char        ***path);
-
-DBUS_EXPORT
-dbus_bool_t dbus_message_append_args          (DBusMessage     *message,
-					       int              first_arg_type,
-					       ...);
-DBUS_EXPORT
-dbus_bool_t dbus_message_append_args_valist   (DBusMessage     *message,
-					       int              first_arg_type,
-					       va_list          var_args);
-DBUS_EXPORT
-dbus_bool_t dbus_message_get_args             (DBusMessage     *message,
-					       DBusError       *error,
-					       int              first_arg_type,
-					       ...);
-DBUS_EXPORT
-dbus_bool_t dbus_message_get_args_valist      (DBusMessage     *message,
-					       DBusError       *error,
-					       int              first_arg_type,
-					       va_list          var_args);
-
-DBUS_EXPORT
-dbus_bool_t dbus_message_contains_unix_fds    (DBusMessage *message);
-
-DBUS_EXPORT
-dbus_bool_t dbus_message_iter_init             (DBusMessage     *message,
-                                                DBusMessageIter *iter);
-DBUS_EXPORT
-dbus_bool_t dbus_message_iter_has_next         (DBusMessageIter *iter);
-DBUS_EXPORT
-dbus_bool_t dbus_message_iter_next             (DBusMessageIter *iter);
-DBUS_EXPORT
-char*       dbus_message_iter_get_signature    (DBusMessageIter *iter);
-DBUS_EXPORT
-int         dbus_message_iter_get_arg_type     (DBusMessageIter *iter);
-DBUS_EXPORT
-int         dbus_message_iter_get_element_type (DBusMessageIter *iter);
-DBUS_EXPORT
-void        dbus_message_iter_recurse          (DBusMessageIter *iter,
-                                                DBusMessageIter *sub);
-DBUS_EXPORT
-void        dbus_message_iter_get_basic        (DBusMessageIter *iter,
-                                                void            *value);
-#ifndef DBUS_DISABLE_DEPRECATED
-/* This function returns the wire protocol size of the array in bytes,
- * you do not want to know that probably
- */
-DBUS_EXPORT
-DBUS_DEPRECATED int         dbus_message_iter_get_array_len    (DBusMessageIter *iter);
-#endif
-DBUS_EXPORT
-void        dbus_message_iter_get_fixed_array  (DBusMessageIter *iter,
-                                                void            *value,
-                                                int             *n_elements);
-
-
-DBUS_EXPORT
-void        dbus_message_iter_init_append        (DBusMessage     *message,
-                                                  DBusMessageIter *iter);
-DBUS_EXPORT
-dbus_bool_t dbus_message_iter_append_basic       (DBusMessageIter *iter,
-                                                  int              type,
-                                                  const void      *value);
-DBUS_EXPORT
-dbus_bool_t dbus_message_iter_append_fixed_array (DBusMessageIter *iter,
-                                                  int              element_type,
-                                                  const void      *value,
-                                                  int              n_elements);
-DBUS_EXPORT
-dbus_bool_t dbus_message_iter_open_container     (DBusMessageIter *iter,
-                                                  int              type,
-                                                  const char      *contained_signature,
-                                                  DBusMessageIter *sub);
-DBUS_EXPORT
-dbus_bool_t dbus_message_iter_close_container    (DBusMessageIter *iter,
-                                                  DBusMessageIter *sub);
-DBUS_EXPORT
-void        dbus_message_iter_abandon_container  (DBusMessageIter *iter,
-                                                  DBusMessageIter *sub);
-
-DBUS_EXPORT
-void dbus_message_lock    (DBusMessage  *message);
-
-DBUS_EXPORT
-dbus_bool_t  dbus_set_error_from_message  (DBusError    *error,
-                                           DBusMessage  *message);
-
-
-DBUS_EXPORT
-dbus_bool_t dbus_message_allocate_data_slot (dbus_int32_t     *slot_p);
-DBUS_EXPORT
-void        dbus_message_free_data_slot     (dbus_int32_t     *slot_p);
-DBUS_EXPORT
-dbus_bool_t dbus_message_set_data           (DBusMessage      *message,
-                                             dbus_int32_t      slot,
-                                             void             *data,
-                                             DBusFreeFunction  free_data_func);
-DBUS_EXPORT
-void*       dbus_message_get_data           (DBusMessage      *message,
-                                             dbus_int32_t      slot);
-
-DBUS_EXPORT
-int         dbus_message_type_from_string (const char *type_str);
-DBUS_EXPORT
-const char* dbus_message_type_to_string   (int type);
-
-DBUS_EXPORT
-dbus_bool_t  dbus_message_marshal   (DBusMessage  *msg,
-                                     char        **marshalled_data_p,
-                                     int          *len_p);
-DBUS_EXPORT
-DBusMessage* dbus_message_demarshal (const char *str,
-                                     int         len,
-                                     DBusError  *error);
-
-DBUS_EXPORT
-int          dbus_message_demarshal_bytes_needed (const char *str, 
-                                                  int len);
-
-/** @} */
-
-DBUS_END_DECLS
-
-#endif /* DBUS_MESSAGE_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-misc.h b/lib-x86-32/include/dbus-1/dbus/dbus-misc.h
deleted file mode 100644
index 3504bcaa..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-misc.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-misc.h  A few assorted public functions that don't fit elsewhere
- *
- * Copyright (C) 2006 Red Hat, Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#if !defined (DBUS_INSIDE_DBUS_H) && !defined (DBUS_COMPILATION)
-#error "Only <dbus/dbus.h> can be included directly, this file may disappear or change contents."
-#endif
-
-#ifndef DBUS_MISC_H
-#define DBUS_MISC_H
-
-#include <dbus/dbus-types.h>
-#include <dbus/dbus-errors.h>
-
-DBUS_BEGIN_DECLS
-
-/**
- * @addtogroup DBusMisc
- * @{
- */
-DBUS_EXPORT
-char*       dbus_get_local_machine_id  (void);
-
-DBUS_EXPORT
-void        dbus_get_version           (int *major_version_p,
-                                        int *minor_version_p,
-                                        int *micro_version_p);
-
-/** @} */
-
-DBUS_END_DECLS
-
-#endif /* DBUS_MISC_H */
-
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-nonce.h b/lib-x86-32/include/dbus-1/dbus/dbus-nonce.h
deleted file mode 100644
index 474ea728..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-nonce.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-nonce.h  Nonce handling functions used by nonce-tcp (internal to D-Bus implementation)
- *
- * Copyright (C) 2009 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.net
- *
- * Licensed under the Academic Free License version 2.1
- *
- * 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 of the License, 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
- *
- */
-#ifndef DBUS_NONCE_H
-#define DBUS_NONCE_H
-
-#include <dbus/dbus-macros.h>
-#include <dbus/dbus-types.h>
-#include <dbus/dbus-errors.h>
-#include <dbus/dbus-string.h>
-
-DBUS_BEGIN_DECLS
-
-typedef struct DBusNonceFile DBusNonceFile;
-
-struct DBusNonceFile
-{
-  DBusString path;
-  DBusString dir;
-};
-
-// server
-
-dbus_bool_t _dbus_noncefile_create (DBusNonceFile *noncefile,
-                                    DBusError *error);
-
-dbus_bool_t _dbus_noncefile_delete (DBusNonceFile *noncefile,
-                                    DBusError *error);
-
-dbus_bool_t _dbus_noncefile_check_nonce (int fd,
-                                         const DBusNonceFile *noncefile,
-                                         DBusError *error);
-
-const DBusString* _dbus_noncefile_get_path (const DBusNonceFile *noncefile);
-
-int _dbus_accept_with_noncefile (int listen_fd,
-                                 const DBusNonceFile *noncefile);
-
-// shared
-
-dbus_bool_t _dbus_read_nonce (const DBusString *fname,
-                              DBusString *nonce,
-                              DBusError *error);
-
-// client
-
-dbus_bool_t _dbus_send_nonce (int fd,
-                              const DBusString *noncefile,
-                              DBusError *error);
-
-DBUS_END_DECLS
-
-#endif /* DBUS_NONCE_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-object-tree.h b/lib-x86-32/include/dbus-1/dbus/dbus-object-tree.h
deleted file mode 100644
index 022dd93f..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-object-tree.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-object-tree.h  DBusObjectTree (internals of DBusConnection)
- *
- * Copyright (C) 2003  Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#ifndef DBUS_OBJECT_TREE_H
-#define DBUS_OBJECT_TREE_H
-
-#include <dbus/dbus-connection.h>
-
-DBUS_BEGIN_DECLS
-
-typedef struct DBusObjectTree DBusObjectTree;
-
-DBusObjectTree* _dbus_object_tree_new   (DBusConnection *connection);
-DBusObjectTree* _dbus_object_tree_ref   (DBusObjectTree *tree);
-void            _dbus_object_tree_unref (DBusObjectTree *tree);
-
-dbus_bool_t       _dbus_object_tree_register               (DBusObjectTree              *tree,
-                                                            dbus_bool_t                  fallback,
-                                                            const char                 **path,
-                                                            const DBusObjectPathVTable  *vtable,
-                                                            void                        *user_data,
-                                                            DBusError                   *error);
-void              _dbus_object_tree_unregister_and_unlock  (DBusObjectTree              *tree,
-                                                            const char                 **path);
-DBusHandlerResult _dbus_object_tree_dispatch_and_unlock    (DBusObjectTree              *tree,
-                                                            DBusMessage                 *message);
-void*             _dbus_object_tree_get_user_data_unlocked (DBusObjectTree              *tree,
-                                                            const char                 **path);
-void              _dbus_object_tree_free_all_unlocked      (DBusObjectTree              *tree);
-
-
-dbus_bool_t _dbus_object_tree_list_registered_and_unlock (DBusObjectTree *tree,
-                                                          const char    **parent_path,
-                                                          char         ***child_entries);
-
-dbus_bool_t _dbus_decompose_path (const char   *data,
-                                  int           len,
-                                  char       ***path,
-                                  int          *path_len);
-
-DBUS_END_DECLS
-
-#endif /* DBUS_OBJECT_TREE_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-pending-call-internal.h b/lib-x86-32/include/dbus-1/dbus/dbus-pending-call-internal.h
deleted file mode 100644
index 1875eea8..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-pending-call-internal.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-pending-call-internal.h DBusPendingCall internal interfaces
- *
- * Copyright (C) 2002  Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#ifndef DBUS_PENDING_CALL_INTERNAL_H
-#define DBUS_PENDING_CALL_INTERNAL_H
-
-
-#include <dbus/dbus-internals.h>
-#include <dbus/dbus-message.h>
-#include <dbus/dbus-connection.h>
-#include <dbus/dbus-list.h>
-
-DBUS_BEGIN_DECLS
-
-dbus_bool_t      _dbus_pending_call_is_timeout_added_unlocked    (DBusPendingCall    *pending);
-void             _dbus_pending_call_set_timeout_added_unlocked   (DBusPendingCall    *pending,
-                                                                  dbus_bool_t         is_added);
-DBusTimeout    * _dbus_pending_call_get_timeout_unlocked         (DBusPendingCall    *pending);
-dbus_uint32_t    _dbus_pending_call_get_reply_serial_unlocked    (DBusPendingCall    *pending);
-void             _dbus_pending_call_set_reply_serial_unlocked    (DBusPendingCall    *pending,
-                                                                  dbus_uint32_t       serial);
-DBusConnection * _dbus_pending_call_get_connection_and_lock      (DBusPendingCall    *pending);
-DBusConnection * _dbus_pending_call_get_connection_unlocked      (DBusPendingCall    *pending);
-dbus_bool_t      _dbus_pending_call_get_completed_unlocked       (DBusPendingCall    *pending);
-void             _dbus_pending_call_complete                     (DBusPendingCall    *pending);
-void             _dbus_pending_call_set_reply_unlocked           (DBusPendingCall    *pending,
-                                                                  DBusMessage        *message);
-void             _dbus_pending_call_queue_timeout_error_unlocked (DBusPendingCall    *pending,
-                                                                  DBusConnection     *connection);
-void             _dbus_pending_call_set_reply_serial_unlocked    (DBusPendingCall    *pending,
-                                                                  dbus_uint32_t       serial);
-dbus_bool_t      _dbus_pending_call_set_timeout_error_unlocked   (DBusPendingCall    *pending,
-                                                                  DBusMessage        *message,
-                                                                  dbus_uint32_t       serial);
-DBusPendingCall* _dbus_pending_call_new_unlocked                 (DBusConnection     *connection,
-                                                                  int                 timeout_milliseconds,
-                                                                  DBusTimeoutHandler  timeout_handler);
-DBusPendingCall* _dbus_pending_call_ref_unlocked                 (DBusPendingCall    *pending);
-void             _dbus_pending_call_unref_and_unlock             (DBusPendingCall    *pending);
-dbus_bool_t      _dbus_pending_call_set_data_unlocked            (DBusPendingCall    *pending,
-                                                                  dbus_int32_t        slot,
-                                                                  void               *data,
-                                                                  DBusFreeFunction    free_data_func);
-
-
-DBUS_END_DECLS
-
-#endif /* DBUS_PENDING_CALL_INTERNAL_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-pending-call.h b/lib-x86-32/include/dbus-1/dbus/dbus-pending-call.h
deleted file mode 100644
index 8f64b8be..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-pending-call.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-pending-call.h Object representing a call in progress.
- *
- * Copyright (C) 2002, 2003 Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#if !defined (DBUS_INSIDE_DBUS_H) && !defined (DBUS_COMPILATION)
-#error "Only <dbus/dbus.h> can be included directly, this file may disappear or change contents."
-#endif
-
-#ifndef DBUS_PENDING_CALL_H
-#define DBUS_PENDING_CALL_H
-
-#include <dbus/dbus-macros.h>
-#include <dbus/dbus-types.h>
-#include <dbus/dbus-connection.h>
-
-DBUS_BEGIN_DECLS
-
-/**
- * @addtogroup DBusPendingCall
- * @{
- */
-
-DBUS_EXPORT
-DBusPendingCall* dbus_pending_call_ref       (DBusPendingCall               *pending);
-DBUS_EXPORT
-void         dbus_pending_call_unref         (DBusPendingCall               *pending);
-DBUS_EXPORT
-dbus_bool_t  dbus_pending_call_set_notify    (DBusPendingCall               *pending,
-                                              DBusPendingCallNotifyFunction  function,
-                                              void                          *user_data,
-                                              DBusFreeFunction               free_user_data);
-DBUS_EXPORT
-void         dbus_pending_call_cancel        (DBusPendingCall               *pending);
-DBUS_EXPORT
-dbus_bool_t  dbus_pending_call_get_completed (DBusPendingCall               *pending);
-DBUS_EXPORT
-DBusMessage* dbus_pending_call_steal_reply   (DBusPendingCall               *pending);
-DBUS_EXPORT
-void         dbus_pending_call_block         (DBusPendingCall               *pending);
-
-DBUS_EXPORT
-dbus_bool_t dbus_pending_call_allocate_data_slot (dbus_int32_t     *slot_p);
-DBUS_EXPORT
-void        dbus_pending_call_free_data_slot     (dbus_int32_t     *slot_p);
-DBUS_EXPORT
-dbus_bool_t dbus_pending_call_set_data           (DBusPendingCall  *pending,
-                                                  dbus_int32_t      slot,
-                                                  void             *data,
-                                                  DBusFreeFunction  free_data_func);
-DBUS_EXPORT
-void*       dbus_pending_call_get_data           (DBusPendingCall  *pending,
-                                                  dbus_int32_t      slot);
-
-/** @} */
-
-DBUS_END_DECLS
-
-#endif /* DBUS_PENDING_CALL_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-pipe.h b/lib-x86-32/include/dbus-1/dbus/dbus-pipe.h
deleted file mode 100644
index f6eac5f9..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-pipe.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-sysdeps.h Wrappers around system/libc features (internal to D-Bus implementation)
- * 
- * Copyright (C) 2002, 2003  Red Hat, Inc.
- * Copyright (C) 2003 CodeFactory AB
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef DBUS_PIPE_H
-#define DBUS_PIPE_H
-
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
-
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
-
-#include <dbus/dbus-types.h>
-#include <dbus/dbus-errors.h>
-#include <dbus/dbus-string.h>
-#include <dbus/dbus-sysdeps.h>
-
-struct DBusPipe {
-  intptr_t fd_or_handle;
-};
-
-void        _dbus_pipe_init                (DBusPipe         *pipe,
-                                            intptr_t          fd);
-void        _dbus_pipe_init_stdout         (DBusPipe         *pipe);
-int         _dbus_pipe_write               (DBusPipe         *pipe,
-                                            const DBusString *buffer,
-                                            int               start,
-                                            int               len,
-                                            DBusError        *error);
-int         _dbus_pipe_close               (DBusPipe         *pipe,
-                                            DBusError        *error);
-dbus_bool_t _dbus_pipe_is_valid            (DBusPipe         *pipe);
-void        _dbus_pipe_invalidate          (DBusPipe         *pipe);
-dbus_bool_t _dbus_pipe_is_stdout_or_stderr (DBusPipe         *pipe);
-
-#endif
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-protocol.h b/lib-x86-32/include/dbus-1/dbus/dbus-protocol.h
deleted file mode 100644
index 17798e94..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-protocol.h
+++ /dev/null
@@ -1,462 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-protocol.h  D-Bus protocol constants
- *
- * Copyright (C) 2002, 2003  CodeFactory AB
- * Copyright (C) 2004, 2005 Red Hat, Inc.
- *
- * Licensed under the Academic Free License version 2.1
- *
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef DBUS_PROTOCOL_H
-#define DBUS_PROTOCOL_H
-
-/* Don't include anything in here from anywhere else. It's
- * intended for use by any random library.
- */
-
-#ifdef  __cplusplus
-extern "C" {
-#if 0
-} /* avoids confusing emacs indentation */
-#endif
-#endif
-
-/* Normally docs are in .c files, but there isn't a .c file for this. */
-/**
- * @defgroup DBusProtocol Protocol constants
- * @ingroup  DBus
- *
- * @brief Defines constants which are part of the D-Bus protocol
- *
- * This header is intended for use by any library, not only libdbus.
- *
- * @{
- */
-
-
-/* Message byte order */
-#define DBUS_LITTLE_ENDIAN ('l')  /**< Code marking LSB-first byte order in the wire protocol. */
-#define DBUS_BIG_ENDIAN    ('B')  /**< Code marking MSB-first byte order in the wire protocol. */
-
-/** Protocol version. */
-#define DBUS_MAJOR_PROTOCOL_VERSION 1
-
-/** Type code that is never equal to a legitimate type code */
-#define DBUS_TYPE_INVALID       ((int) '\0')
-/** #DBUS_TYPE_INVALID as a string literal instead of a int literal */
-#define DBUS_TYPE_INVALID_AS_STRING        "\0"
-
-/* Primitive types */
-/** Type code marking an 8-bit unsigned integer */
-#define DBUS_TYPE_BYTE          ((int) 'y')
-/** #DBUS_TYPE_BYTE as a string literal instead of a int literal */
-#define DBUS_TYPE_BYTE_AS_STRING           "y"
-/** Type code marking a boolean */
-#define DBUS_TYPE_BOOLEAN       ((int) 'b')
-/** #DBUS_TYPE_BOOLEAN as a string literal instead of a int literal */
-#define DBUS_TYPE_BOOLEAN_AS_STRING        "b"
-/** Type code marking a 16-bit signed integer */
-#define DBUS_TYPE_INT16         ((int) 'n')
-/** #DBUS_TYPE_INT16 as a string literal instead of a int literal */
-#define DBUS_TYPE_INT16_AS_STRING          "n"
-/** Type code marking a 16-bit unsigned integer */
-#define DBUS_TYPE_UINT16        ((int) 'q')
-/** #DBUS_TYPE_UINT16 as a string literal instead of a int literal */
-#define DBUS_TYPE_UINT16_AS_STRING         "q"
-/** Type code marking a 32-bit signed integer */
-#define DBUS_TYPE_INT32         ((int) 'i')
-/** #DBUS_TYPE_INT32 as a string literal instead of a int literal */
-#define DBUS_TYPE_INT32_AS_STRING          "i"
-/** Type code marking a 32-bit unsigned integer */
-#define DBUS_TYPE_UINT32        ((int) 'u')
-/** #DBUS_TYPE_UINT32 as a string literal instead of a int literal */
-#define DBUS_TYPE_UINT32_AS_STRING         "u"
-/** Type code marking a 64-bit signed integer */
-#define DBUS_TYPE_INT64         ((int) 'x')
-/** #DBUS_TYPE_INT64 as a string literal instead of a int literal */
-#define DBUS_TYPE_INT64_AS_STRING          "x"
-/** Type code marking a 64-bit unsigned integer */
-#define DBUS_TYPE_UINT64        ((int) 't')
-/** #DBUS_TYPE_UINT64 as a string literal instead of a int literal */
-#define DBUS_TYPE_UINT64_AS_STRING         "t"
-/** Type code marking an 8-byte double in IEEE 754 format */
-#define DBUS_TYPE_DOUBLE        ((int) 'd')
-/** #DBUS_TYPE_DOUBLE as a string literal instead of a int literal */
-#define DBUS_TYPE_DOUBLE_AS_STRING         "d"
-/** Type code marking a UTF-8 encoded, nul-terminated Unicode string */
-#define DBUS_TYPE_STRING        ((int) 's')
-/** #DBUS_TYPE_STRING as a string literal instead of a int literal */
-#define DBUS_TYPE_STRING_AS_STRING         "s"
-/** Type code marking a D-Bus object path */
-#define DBUS_TYPE_OBJECT_PATH   ((int) 'o')
-/** #DBUS_TYPE_OBJECT_PATH as a string literal instead of a int literal */
-#define DBUS_TYPE_OBJECT_PATH_AS_STRING    "o"
-/** Type code marking a D-Bus type signature */
-#define DBUS_TYPE_SIGNATURE     ((int) 'g')
-/** #DBUS_TYPE_SIGNATURE as a string literal instead of a int literal */
-#define DBUS_TYPE_SIGNATURE_AS_STRING      "g"
-/** Type code marking a unix file descriptor */
-#define DBUS_TYPE_UNIX_FD      ((int) 'h')
-/** #DBUS_TYPE_UNIX_FD as a string literal instead of a int literal */
-#define DBUS_TYPE_UNIX_FD_AS_STRING        "h"
-
-/* Compound types */
-/** Type code marking a D-Bus array type */
-#define DBUS_TYPE_ARRAY         ((int) 'a')
-/** #DBUS_TYPE_ARRAY as a string literal instead of a int literal */
-#define DBUS_TYPE_ARRAY_AS_STRING          "a"
-/** Type code marking a D-Bus variant type */
-#define DBUS_TYPE_VARIANT       ((int) 'v')
-/** #DBUS_TYPE_VARIANT as a string literal instead of a int literal */
-#define DBUS_TYPE_VARIANT_AS_STRING        "v"
-
-/** STRUCT and DICT_ENTRY are sort of special since their codes can't
- * appear in a type string, instead
- * DBUS_STRUCT_BEGIN_CHAR/DBUS_DICT_ENTRY_BEGIN_CHAR have to appear
- */
-/** Type code used to represent a struct; however, this type code does not appear
- * in type signatures, instead #DBUS_STRUCT_BEGIN_CHAR and #DBUS_STRUCT_END_CHAR will
- * appear in a signature.
- */
-#define DBUS_TYPE_STRUCT        ((int) 'r')
-/** #DBUS_TYPE_STRUCT as a string literal instead of a int literal */
-#define DBUS_TYPE_STRUCT_AS_STRING         "r"
-/** Type code used to represent a dict entry; however, this type code does not appear
- * in type signatures, instead #DBUS_DICT_ENTRY_BEGIN_CHAR and #DBUS_DICT_ENTRY_END_CHAR will
- * appear in a signature.
- */
-#define DBUS_TYPE_DICT_ENTRY    ((int) 'e')
-/** #DBUS_TYPE_DICT_ENTRY as a string literal instead of a int literal */
-#define DBUS_TYPE_DICT_ENTRY_AS_STRING     "e"
-
-/** Does not include #DBUS_TYPE_INVALID, #DBUS_STRUCT_BEGIN_CHAR, #DBUS_STRUCT_END_CHAR,
- * #DBUS_DICT_ENTRY_BEGIN_CHAR, or #DBUS_DICT_ENTRY_END_CHAR - i.e. it is the number of
- * valid types, not the number of distinct characters that may appear in a type signature.
- */
-#define DBUS_NUMBER_OF_TYPES    (16)
-
-/* characters other than typecodes that appear in type signatures */
-
-/** Code marking the start of a struct type in a type signature */
-#define DBUS_STRUCT_BEGIN_CHAR   ((int) '(')
-/** #DBUS_STRUCT_BEGIN_CHAR as a string literal instead of a int literal */
-#define DBUS_STRUCT_BEGIN_CHAR_AS_STRING   "("
-/** Code marking the end of a struct type in a type signature */
-#define DBUS_STRUCT_END_CHAR     ((int) ')')
-/** #DBUS_STRUCT_END_CHAR a string literal instead of a int literal */
-#define DBUS_STRUCT_END_CHAR_AS_STRING     ")"
-/** Code marking the start of a dict entry type in a type signature */
-#define DBUS_DICT_ENTRY_BEGIN_CHAR   ((int) '{')
-/** #DBUS_DICT_ENTRY_BEGIN_CHAR as a string literal instead of a int literal */
-#define DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING   "{"
-/** Code marking the end of a dict entry type in a type signature */
-#define DBUS_DICT_ENTRY_END_CHAR     ((int) '}')
-/** #DBUS_DICT_ENTRY_END_CHAR as a string literal instead of a int literal */
-#define DBUS_DICT_ENTRY_END_CHAR_AS_STRING     "}"
-
-/** Max length in bytes of a bus name, interface, or member (not object
- * path, paths are unlimited). This is limited because lots of stuff
- * is O(n) in this number, plus it would be obnoxious to type in a
- * paragraph-long method name so most likely something like that would
- * be an exploit.
- */
-#define DBUS_MAXIMUM_NAME_LENGTH 255
-
-/** This one is 255 so it fits in a byte */
-#define DBUS_MAXIMUM_SIGNATURE_LENGTH 255
-
-/** Max length of a match rule string; to keep people from hosing the
- * daemon with some huge rule
- */
-#define DBUS_MAXIMUM_MATCH_RULE_LENGTH 1024
-
-/** Max arg number you can match on in a match rule, e.g.
- * arg0='hello' is OK, arg3489720987='hello' is not
- */
-#define DBUS_MAXIMUM_MATCH_RULE_ARG_NUMBER 63
-  
-/** Max length of a marshaled array in bytes (64M, 2^26) We use signed
- * int for lengths so must be INT_MAX or less.  We need something a
- * bit smaller than INT_MAX because the array is inside a message with
- * header info, etc.  so an INT_MAX array wouldn't allow the message
- * overhead.  The 64M number is an attempt at a larger number than
- * we'd reasonably ever use, but small enough that your bus would chew
- * through it fairly quickly without locking up forever. If you have
- * data that's likely to be larger than this, you should probably be
- * sending it in multiple incremental messages anyhow.
- */
-#define DBUS_MAXIMUM_ARRAY_LENGTH (67108864)
-/** Number of bits you need in an unsigned to store the max array size */
-#define DBUS_MAXIMUM_ARRAY_LENGTH_BITS 26
-
-/** The maximum total message size including header and body; similar
- * rationale to max array size.
- */
-#define DBUS_MAXIMUM_MESSAGE_LENGTH (DBUS_MAXIMUM_ARRAY_LENGTH * 2)
-/** Number of bits you need in an unsigned to store the max message size */
-#define DBUS_MAXIMUM_MESSAGE_LENGTH_BITS 27
-
-/** The maximum total number of unix fds in a message. Similar
- * rationale as DBUS_MAXIMUM_MESSAGE_LENGTH. However we divide by four
- * given that one fd is an int and hence at least 32 bits.
- */
-#define DBUS_MAXIMUM_MESSAGE_UNIX_FDS (DBUS_MAXIMUM_MESSAGE_LENGTH/4)
-/** Number of bits you need in an unsigned to store the max message unix fds */
-#define DBUS_MAXIMUM_MESSAGE_UNIX_FDS_BITS (DBUS_MAXIMUM_MESSAGE_LENGTH_BITS-2)
-
-/** Depth of recursion in the type tree. This is automatically limited
- * to DBUS_MAXIMUM_SIGNATURE_LENGTH since you could only have an array
- * of array of array of ... that fit in the max signature.  But that's
- * probably a bit too large.
- */
-#define DBUS_MAXIMUM_TYPE_RECURSION_DEPTH 32
-
-/* Types of message */
-
-/** This value is never a valid message type, see dbus_message_get_type() */
-#define DBUS_MESSAGE_TYPE_INVALID       0
-/** Message type of a method call message, see dbus_message_get_type() */
-#define DBUS_MESSAGE_TYPE_METHOD_CALL   1
-/** Message type of a method return message, see dbus_message_get_type() */
-#define DBUS_MESSAGE_TYPE_METHOD_RETURN 2
-/** Message type of an error reply message, see dbus_message_get_type() */
-#define DBUS_MESSAGE_TYPE_ERROR         3
-/** Message type of a signal message, see dbus_message_get_type() */
-#define DBUS_MESSAGE_TYPE_SIGNAL        4
-
-#define DBUS_NUM_MESSAGE_TYPES          5
-
-/* Header flags */
-
-/** If set, this flag means that the sender of a message does not care about getting
- * a reply, so the recipient need not send one. See dbus_message_set_no_reply().
- */
-#define DBUS_HEADER_FLAG_NO_REPLY_EXPECTED 0x1
-/**
- * If set, this flag means that even if the message bus knows how to start an owner for
- * the destination bus name (see dbus_message_set_destination()), it should not
- * do so. If this flag is not set, the bus may launch a program to process the
- * message.
- */
-#define DBUS_HEADER_FLAG_NO_AUTO_START     0x2
-
-/* Header fields */
-
-/** Not equal to any valid header field code */
-#define DBUS_HEADER_FIELD_INVALID        0
-/** Header field code for the path - the path is the object emitting a signal or the object receiving a method call.
- * See dbus_message_set_path().
- */
-#define DBUS_HEADER_FIELD_PATH           1
-/** Header field code for the interface containing a member (method or signal).
- * See dbus_message_set_interface().
- */
-#define DBUS_HEADER_FIELD_INTERFACE      2
-/** Header field code for a member (method or signal). See dbus_message_set_member(). */
-#define DBUS_HEADER_FIELD_MEMBER         3
-/** Header field code for an error name (found in #DBUS_MESSAGE_TYPE_ERROR messages).
- * See dbus_message_set_error_name().
- */
-#define DBUS_HEADER_FIELD_ERROR_NAME     4
-/** Header field code for a reply serial, used to match a #DBUS_MESSAGE_TYPE_METHOD_RETURN message with the
- * message that it's a reply to. See dbus_message_set_reply_serial().
- */
-#define DBUS_HEADER_FIELD_REPLY_SERIAL   5
-/**
- * Header field code for the destination bus name of a message. See dbus_message_set_destination().
- */
-#define DBUS_HEADER_FIELD_DESTINATION    6
-/**
- * Header field code for the sender of a message; usually initialized by the message bus.
- * See dbus_message_set_sender().
- */
-#define DBUS_HEADER_FIELD_SENDER         7
-/**
- * Header field code for the type signature of a message.
- */
-#define DBUS_HEADER_FIELD_SIGNATURE      8
-/**
- * Header field code for the number of unix file descriptors associated
- * with this message.
- */
-#define DBUS_HEADER_FIELD_UNIX_FDS       9
-
-
-/**
- * Value of the highest-numbered header field code, can be used to determine
- * the size of an array indexed by header field code. Remember though
- * that unknown codes must be ignored, so check for that before
- * indexing the array.
- */
-#define DBUS_HEADER_FIELD_LAST DBUS_HEADER_FIELD_UNIX_FDS
-
-/** Header format is defined as a signature:
- *   byte                            byte order
- *   byte                            message type ID
- *   byte                            flags
- *   byte                            protocol version
- *   uint32                          body length
- *   uint32                          serial
- *   array of struct (byte,variant)  (field name, value)
- *
- * The length of the header can be computed as the
- * fixed size of the initial data, plus the length of
- * the array at the end, plus padding to an 8-boundary.
- */
-#define DBUS_HEADER_SIGNATURE                   \
-     DBUS_TYPE_BYTE_AS_STRING                   \
-     DBUS_TYPE_BYTE_AS_STRING                   \
-     DBUS_TYPE_BYTE_AS_STRING                   \
-     DBUS_TYPE_BYTE_AS_STRING                   \
-     DBUS_TYPE_UINT32_AS_STRING                 \
-     DBUS_TYPE_UINT32_AS_STRING                 \
-     DBUS_TYPE_ARRAY_AS_STRING                  \
-     DBUS_STRUCT_BEGIN_CHAR_AS_STRING           \
-     DBUS_TYPE_BYTE_AS_STRING                   \
-     DBUS_TYPE_VARIANT_AS_STRING                \
-     DBUS_STRUCT_END_CHAR_AS_STRING
-
-
-/**
- * The smallest header size that can occur.  (It won't be valid due to
- * missing required header fields.) This is 4 bytes, two uint32, an
- * array length. This isn't any kind of resource limit, just the
- * necessary/logical outcome of the header signature.
- */
-#define DBUS_MINIMUM_HEADER_SIZE 16
-
-/* Errors */
-/* WARNING these get autoconverted to an enum in dbus-glib.h. Thus,
- * if you change the order it breaks the ABI. Keep them in order.
- * Also, don't change the formatting since that will break the sed
- * script.
- */
-/** A generic error; "something went wrong" - see the error message for more. */
-#define DBUS_ERROR_FAILED                     "org.freedesktop.DBus.Error.Failed"
-/** There was not enough memory to complete an operation. */
-#define DBUS_ERROR_NO_MEMORY                  "org.freedesktop.DBus.Error.NoMemory"
-/** The bus doesn't know how to launch a service to supply the bus name you wanted. */
-#define DBUS_ERROR_SERVICE_UNKNOWN            "org.freedesktop.DBus.Error.ServiceUnknown"
-/** The bus name you referenced doesn't exist (i.e. no application owns it). */
-#define DBUS_ERROR_NAME_HAS_NO_OWNER          "org.freedesktop.DBus.Error.NameHasNoOwner"
-/** No reply to a message expecting one, usually means a timeout occurred. */
-#define DBUS_ERROR_NO_REPLY                   "org.freedesktop.DBus.Error.NoReply"
-/** Something went wrong reading or writing to a socket, for example. */
-#define DBUS_ERROR_IO_ERROR                   "org.freedesktop.DBus.Error.IOError"
-/** A D-Bus bus address was malformed. */
-#define DBUS_ERROR_BAD_ADDRESS                "org.freedesktop.DBus.Error.BadAddress"
-/** Requested operation isn't supported (like ENOSYS on UNIX). */
-#define DBUS_ERROR_NOT_SUPPORTED              "org.freedesktop.DBus.Error.NotSupported"
-/** Some limited resource is exhausted. */
-#define DBUS_ERROR_LIMITS_EXCEEDED            "org.freedesktop.DBus.Error.LimitsExceeded"
-/** Security restrictions don't allow doing what you're trying to do. */
-#define DBUS_ERROR_ACCESS_DENIED              "org.freedesktop.DBus.Error.AccessDenied"
-/** Authentication didn't work. */
-#define DBUS_ERROR_AUTH_FAILED                "org.freedesktop.DBus.Error.AuthFailed"
-/** Unable to connect to server (probably caused by ECONNREFUSED on a socket). */
-#define DBUS_ERROR_NO_SERVER                  "org.freedesktop.DBus.Error.NoServer"
-/** Certain timeout errors, possibly ETIMEDOUT on a socket.
- * Note that #DBUS_ERROR_NO_REPLY is used for message reply timeouts.
- * @warning this is confusingly-named given that #DBUS_ERROR_TIMED_OUT also exists. We can't fix
- * it for compatibility reasons so just be careful.
- */
-#define DBUS_ERROR_TIMEOUT                    "org.freedesktop.DBus.Error.Timeout"
-/** No network access (probably ENETUNREACH on a socket). */
-#define DBUS_ERROR_NO_NETWORK                 "org.freedesktop.DBus.Error.NoNetwork"
-/** Can't bind a socket since its address is in use (i.e. EADDRINUSE). */
-#define DBUS_ERROR_ADDRESS_IN_USE             "org.freedesktop.DBus.Error.AddressInUse"
-/** The connection is disconnected and you're trying to use it. */
-#define DBUS_ERROR_DISCONNECTED               "org.freedesktop.DBus.Error.Disconnected"
-/** Invalid arguments passed to a method call. */
-#define DBUS_ERROR_INVALID_ARGS               "org.freedesktop.DBus.Error.InvalidArgs"
-/** Missing file. */
-#define DBUS_ERROR_FILE_NOT_FOUND             "org.freedesktop.DBus.Error.FileNotFound"
-/** Existing file and the operation you're using does not silently overwrite. */
-#define DBUS_ERROR_FILE_EXISTS                "org.freedesktop.DBus.Error.FileExists"
-/** Method name you invoked isn't known by the object you invoked it on. */
-#define DBUS_ERROR_UNKNOWN_METHOD             "org.freedesktop.DBus.Error.UnknownMethod"
-/** Certain timeout errors, e.g. while starting a service.
- * @warning this is confusingly-named given that #DBUS_ERROR_TIMEOUT also exists. We can't fix
- * it for compatibility reasons so just be careful.
- */
-#define DBUS_ERROR_TIMED_OUT                  "org.freedesktop.DBus.Error.TimedOut"
-/** Tried to remove or modify a match rule that didn't exist. */
-#define DBUS_ERROR_MATCH_RULE_NOT_FOUND       "org.freedesktop.DBus.Error.MatchRuleNotFound"
-/** The match rule isn't syntactically valid. */
-#define DBUS_ERROR_MATCH_RULE_INVALID         "org.freedesktop.DBus.Error.MatchRuleInvalid"
-/** While starting a new process, the exec() call failed. */
-#define DBUS_ERROR_SPAWN_EXEC_FAILED          "org.freedesktop.DBus.Error.Spawn.ExecFailed"
-/** While starting a new process, the fork() call failed. */
-#define DBUS_ERROR_SPAWN_FORK_FAILED          "org.freedesktop.DBus.Error.Spawn.ForkFailed"
-/** While starting a new process, the child exited with a status code. */
-#define DBUS_ERROR_SPAWN_CHILD_EXITED         "org.freedesktop.DBus.Error.Spawn.ChildExited"
-/** While starting a new process, the child exited on a signal. */
-#define DBUS_ERROR_SPAWN_CHILD_SIGNALED       "org.freedesktop.DBus.Error.Spawn.ChildSignaled"
-/** While starting a new process, something went wrong. */
-#define DBUS_ERROR_SPAWN_FAILED               "org.freedesktop.DBus.Error.Spawn.Failed"
-/** We failed to setup the environment correctly. */
-#define DBUS_ERROR_SPAWN_SETUP_FAILED         "org.freedesktop.DBus.Error.Spawn.FailedToSetup"
-/** We failed to setup the config parser correctly. */
-#define DBUS_ERROR_SPAWN_CONFIG_INVALID       "org.freedesktop.DBus.Error.Spawn.ConfigInvalid"
-/** Bus name was not valid. */
-#define DBUS_ERROR_SPAWN_SERVICE_INVALID      "org.freedesktop.DBus.Error.Spawn.ServiceNotValid"
-/** Service file not found in system-services directory. */
-#define DBUS_ERROR_SPAWN_SERVICE_NOT_FOUND    "org.freedesktop.DBus.Error.Spawn.ServiceNotFound"
-/** Permissions are incorrect on the setuid helper. */
-#define DBUS_ERROR_SPAWN_PERMISSIONS_INVALID  "org.freedesktop.DBus.Error.Spawn.PermissionsInvalid"
-/** Service file invalid (Name, User or Exec missing). */
-#define DBUS_ERROR_SPAWN_FILE_INVALID         "org.freedesktop.DBus.Error.Spawn.FileInvalid"
-/** Tried to get a UNIX process ID and it wasn't available. */
-#define DBUS_ERROR_SPAWN_NO_MEMORY            "org.freedesktop.DBus.Error.Spawn.NoMemory"
-/** Tried to get a UNIX process ID and it wasn't available. */
-#define DBUS_ERROR_UNIX_PROCESS_ID_UNKNOWN    "org.freedesktop.DBus.Error.UnixProcessIdUnknown"
-/** A type signature is not valid. */
-#define DBUS_ERROR_INVALID_SIGNATURE          "org.freedesktop.DBus.Error.InvalidSignature"
-/** A file contains invalid syntax or is otherwise broken. */
-#define DBUS_ERROR_INVALID_FILE_CONTENT       "org.freedesktop.DBus.Error.InvalidFileContent"
-/** Asked for SELinux security context and it wasn't available. */
-#define DBUS_ERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN    "org.freedesktop.DBus.Error.SELinuxSecurityContextUnknown"
-/** Asked for ADT audit data and it wasn't available. */
-#define DBUS_ERROR_ADT_AUDIT_DATA_UNKNOWN     "org.freedesktop.DBus.Error.AdtAuditDataUnknown"
-/** There's already an object with the requested object path. */
-#define DBUS_ERROR_OBJECT_PATH_IN_USE         "org.freedesktop.DBus.Error.ObjectPathInUse"
-/** The message meta data does not match the payload. e.g. expected
-    number of file descriptors were not sent over the socket this message was received on. */
-#define DBUS_ERROR_INCONSISTENT_MESSAGE       "org.freedesktop.DBus.Error.InconsistentMessage"
-
-/* XML introspection format */
-
-/** XML namespace of the introspection format version 1.0 */
-#define DBUS_INTROSPECT_1_0_XML_NAMESPACE         "http://www.freedesktop.org/standards/dbus"
-/** XML public identifier of the introspection format version 1.0 */
-#define DBUS_INTROSPECT_1_0_XML_PUBLIC_IDENTIFIER "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
-/** XML system identifier of the introspection format version 1.0 */
-#define DBUS_INTROSPECT_1_0_XML_SYSTEM_IDENTIFIER "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"
-/** XML document type declaration of the introspection format version 1.0 */
-#define DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE "<!DOCTYPE node PUBLIC \""DBUS_INTROSPECT_1_0_XML_PUBLIC_IDENTIFIER"\"\n\""DBUS_INTROSPECT_1_0_XML_SYSTEM_IDENTIFIER"\">\n"
-
-/** @} */
-
-#ifdef __cplusplus
-#if 0
-{ /* avoids confusing emacs indentation */
-#endif
-}
-#endif
-
-#endif /* DBUS_PROTOCOL_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-resources.h b/lib-x86-32/include/dbus-1/dbus/dbus-resources.h
deleted file mode 100644
index 4763a97f..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-resources.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-resources.h Resource tracking/limits
- *
- * Copyright (C) 2003  Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#ifndef DBUS_RESOURCES_H
-#define DBUS_RESOURCES_H
-
-#include <dbus/dbus-macros.h>
-#include <dbus/dbus-errors.h>
-#include <dbus/dbus-connection.h>
-
-DBUS_BEGIN_DECLS
-
-typedef struct DBusCounter DBusCounter;
-
-typedef void (* DBusCounterNotifyFunction) (DBusCounter *counter,
-                                            void        *user_data);
-
-DBusCounter* _dbus_counter_new       (void);
-DBusCounter* _dbus_counter_ref       (DBusCounter *counter);
-void         _dbus_counter_unref     (DBusCounter *counter);
-
-void         _dbus_counter_adjust_size       (DBusCounter *counter,
-                                              long         delta);
-void         _dbus_counter_adjust_unix_fd    (DBusCounter *counter,
-                                              long         delta);
-long         _dbus_counter_get_size_value    (DBusCounter *counter);
-long         _dbus_counter_get_unix_fd_value (DBusCounter *counter);
-
-void _dbus_counter_set_notify    (DBusCounter               *counter,
-                                  long                       size_guard_value,
-                                  long                       unix_fd_guard_value,
-                                  DBusCounterNotifyFunction  function,
-                                  void                      *user_data);
-
-
-DBUS_END_DECLS
-
-#endif /* DBUS_RESOURCES_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-server-debug-pipe.h b/lib-x86-32/include/dbus-1/dbus/dbus-server-debug-pipe.h
deleted file mode 100644
index 4574311d..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-server-debug-pipe.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-server-debug-pipe.h In-proc debug server implementation 
- *
- * Copyright (C) 2003  CodeFactory AB
- * Copyright (C) 2003  Red Hat, Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#ifndef DBUS_SERVER_DEBUG_PIPE_H
-#define DBUS_SERVER_DEBUG_PIPE_H
-
-#include <dbus/dbus-internals.h>
-#include <dbus/dbus-server-protected.h>
-#include <dbus/dbus-transport-protected.h>
-
-DBUS_BEGIN_DECLS
-
-DBusServer*             _dbus_server_debug_pipe_new     (const char        *server_name,
-                                                         DBusError         *error);
-DBusTransport*          _dbus_transport_debug_pipe_new  (const char        *server_name,
-                                                         DBusError         *error);
-DBusServerListenResult  _dbus_server_listen_debug_pipe  (DBusAddressEntry  *entry,
-                                                         DBusServer       **server_p,
-                                                         DBusError         *error);
-DBusTransportOpenResult _dbus_transport_open_debug_pipe (DBusAddressEntry  *entry,
-                                                         DBusTransport    **transport_p,
-                                                         DBusError         *error);
-
-
-DBUS_END_DECLS
-
-#endif /* DBUS_SERVER_DEBUG_PIPE_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-server-protected.h b/lib-x86-32/include/dbus-1/dbus/dbus-server-protected.h
deleted file mode 100644
index cc2de8dd..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-server-protected.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-server-protected.h Used by subclasses of DBusServer object (internal to D-Bus implementation)
- *
- * Copyright (C) 2002  Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#ifndef DBUS_SERVER_PROTECTED_H
-#define DBUS_SERVER_PROTECTED_H
-
-#include <dbus/dbus-internals.h>
-#include <dbus/dbus-threads-internal.h>
-#include <dbus/dbus-server.h>
-#include <dbus/dbus-address.h>
-#include <dbus/dbus-timeout.h>
-#include <dbus/dbus-watch.h>
-#include <dbus/dbus-resources.h>
-#include <dbus/dbus-dataslot.h>
-#include <dbus/dbus-string.h>
-
-DBUS_BEGIN_DECLS
-
-typedef struct DBusServerVTable DBusServerVTable;
-
-/**
- * Virtual table to be implemented by all server "subclasses"
- */
-struct DBusServerVTable
-{
-  void        (* finalize)      (DBusServer *server);
-  /**< The finalize method must free the server. */
-  
-  void        (* disconnect)    (DBusServer *server);
-  /**< Disconnect this server. */
-};
-
-/**
- * Internals of DBusServer object
- */
-struct DBusServer
-{
-  DBusAtomic refcount;                        /**< Reference count. */
-  const DBusServerVTable *vtable;             /**< Virtual methods for this instance. */
-  DBusMutex *mutex;                           /**< Lock on the server object */
-
-  DBusGUID guid;                              /**< Globally unique ID of server */
-
-  DBusString guid_hex;                        /**< Hex-encoded version of GUID */
-  
-  DBusWatchList *watches;                     /**< Our watches */
-  DBusTimeoutList *timeouts;                  /**< Our timeouts */  
-
-  char *address;                              /**< Address this server is listening on. */
-  
-  int max_connections;                        /**< Max number of connections allowed at once. */
-
-  DBusDataSlotList slot_list;   /**< Data stored by allocated integer ID */
-  
-  DBusNewConnectionFunction  new_connection_function;
-  /**< Callback to invoke when a new connection is created. */
-  void *new_connection_data;
-  /**< Data for new connection callback */
-  DBusFreeFunction new_connection_free_data_function;
-  /**< Callback to invoke to free new_connection_data
-   * when server is finalized or data is replaced.
-   */
-
-  char **auth_mechanisms; /**< Array of allowed authentication mechanisms */
-  
-  unsigned int disconnected : 1;              /**< TRUE if we are disconnected. */
-
-#ifndef DBUS_DISABLE_CHECKS
-  unsigned int have_server_lock : 1; /**< Does someone have the server mutex locked */
-#endif
-};
-
-dbus_bool_t _dbus_server_init_base      (DBusServer             *server,
-                                         const DBusServerVTable *vtable,
-                                         const DBusString       *address);
-void        _dbus_server_finalize_base  (DBusServer             *server);
-dbus_bool_t _dbus_server_add_watch      (DBusServer             *server,
-                                         DBusWatch              *watch);
-void        _dbus_server_remove_watch   (DBusServer             *server,
-                                         DBusWatch              *watch);
-void        _dbus_server_toggle_watch   (DBusServer             *server,
-                                         DBusWatch              *watch,
-                                         dbus_bool_t             enabled);
-dbus_bool_t _dbus_server_add_timeout    (DBusServer             *server,
-                                         DBusTimeout            *timeout);
-void        _dbus_server_remove_timeout (DBusServer             *server,
-                                         DBusTimeout            *timeout);
-void        _dbus_server_toggle_timeout (DBusServer             *server,
-                                         DBusTimeout            *timeout,
-                                         dbus_bool_t             enabled);
-
-void        _dbus_server_ref_unlocked   (DBusServer             *server);
-void        _dbus_server_unref_unlocked (DBusServer             *server);
-
-typedef enum
-{
-  DBUS_SERVER_LISTEN_NOT_HANDLED, /**< we aren't in charge of this address type */
-  DBUS_SERVER_LISTEN_OK,          /**< we set up the listen */
-  DBUS_SERVER_LISTEN_BAD_ADDRESS, /**< malformed address */
-  DBUS_SERVER_LISTEN_DID_NOT_CONNECT /**< well-formed address but failed to set it up */
-} DBusServerListenResult;
-
-DBusServerListenResult _dbus_server_listen_platform_specific (DBusAddressEntry  *entry,
-                                                              DBusServer       **server_p,
-                                                              DBusError         *error);
-
-#ifdef DBUS_DISABLE_CHECKS
-#define TOOK_LOCK_CHECK(server)
-#define RELEASING_LOCK_CHECK(server)
-#define HAVE_LOCK_CHECK(server)
-#else
-#define TOOK_LOCK_CHECK(server) do {                \
-    _dbus_assert (!(server)->have_server_lock); \
-    (server)->have_server_lock = TRUE;          \
-  } while (0)
-#define RELEASING_LOCK_CHECK(server) do {            \
-    _dbus_assert ((server)->have_server_lock);   \
-    (server)->have_server_lock = FALSE;          \
-  } while (0)
-#define HAVE_LOCK_CHECK(server)        _dbus_assert ((server)->have_server_lock)
-/* A "DO_NOT_HAVE_LOCK_CHECK" is impossible since we need the lock to check the flag */
-#endif
-
-#define TRACE_LOCKS 0
-
-#define SERVER_LOCK(server)   do {                                              \
-    if (TRACE_LOCKS) { _dbus_verbose ("LOCK\n"); }   \
-    _dbus_mutex_lock ((server)->mutex);                                          \
-    TOOK_LOCK_CHECK (server);                                                   \
-  } while (0)
-
-#define SERVER_UNLOCK(server) do {                                                      \
-    if (TRACE_LOCKS) { _dbus_verbose ("UNLOCK\n");  }        \
-    RELEASING_LOCK_CHECK (server);                                                      \
-    _dbus_mutex_unlock ((server)->mutex);                                                \
-  } while (0)
-
-DBUS_END_DECLS
-
-#endif /* DBUS_SERVER_PROTECTED_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-server-socket.h b/lib-x86-32/include/dbus-1/dbus/dbus-server-socket.h
deleted file mode 100644
index 0a7c7891..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-server-socket.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-server-socket.h Server implementation for sockets
- *
- * Copyright (C) 2002, 2006  Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#ifndef DBUS_SERVER_SOCKET_H
-#define DBUS_SERVER_SOCKET_H
-
-#include <dbus/dbus-internals.h>
-#include <dbus/dbus-server-protected.h>
-#include <dbus/dbus-nonce.h>
-
-DBUS_BEGIN_DECLS
-
-DBusServer* _dbus_server_new_for_socket           (int              *fds,
-                                                   int               n_fds,
-                                                   const DBusString *address,
-                                                   DBusNonceFile    *noncefile);
-DBusServer* _dbus_server_new_for_tcp_socket       (const char       *host,
-                                                   const char       *bind,
-                                                   const char       *port,
-                                                   const char       *family,
-                                                   DBusError        *error,
-                                                   dbus_bool_t      use_nonce);
-DBusServerListenResult _dbus_server_listen_socket (DBusAddressEntry  *entry,
-                                                   DBusServer       **server_p,
-                                                   DBusError         *error);
-
-
-void _dbus_server_socket_own_filename (DBusServer *server,
-                                       char       *filename);
-
-DBUS_END_DECLS
-
-#endif /* DBUS_SERVER_SOCKET_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-server-unix.h b/lib-x86-32/include/dbus-1/dbus/dbus-server-unix.h
deleted file mode 100644
index 92b996ca..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-server-unix.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-server-unix.h Server implementation for Unix network protocols.
- *
- * Copyright (C) 2002  Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#ifndef DBUS_SERVER_UNIX_H
-#define DBUS_SERVER_UNIX_H
-
-#include <dbus/dbus-internals.h>
-#include <dbus/dbus-server-protected.h>
-
-DBUS_BEGIN_DECLS
-
-DBusServer* _dbus_server_new_for_domain_socket (const char       *path,
-                                                dbus_bool_t       abstract,
-                                                DBusError        *error);
-
-DBUS_END_DECLS
-
-#endif /* DBUS_SERVER_UNIX_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-server-win.h b/lib-x86-32/include/dbus-1/dbus/dbus-server-win.h
deleted file mode 100644
index 65c27568..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-server-win.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-server-win.h Server implementation for windows network protocols.
- *
- * Copyright (C) 2002  Red Hat Inc.
- * Copyright (C) 2007  Ralf Habacker <ralf.habacker@freenet.de>
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#ifndef DBUS_SERVER_WIN_H
-#define DBUS_SERVER_WIN_H
-
-#include <dbus/dbus-internals.h>
-#include <dbus/dbus-server-protected.h>
-
-DBUS_BEGIN_DECLS
-
-/* add definitions here */
-
-DBUS_END_DECLS
-
-#endif /* DBUS_SERVER_WIN_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-server.h b/lib-x86-32/include/dbus-1/dbus/dbus-server.h
deleted file mode 100644
index bdbefa0f..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-server.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-server.h DBusServer object
- *
- * Copyright (C) 2002, 2003  Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#if !defined (DBUS_INSIDE_DBUS_H) && !defined (DBUS_COMPILATION)
-#error "Only <dbus/dbus.h> can be included directly, this file may disappear or change contents."
-#endif
-
-#ifndef DBUS_SERVER_H
-#define DBUS_SERVER_H
-
-#include <dbus/dbus-errors.h>
-#include <dbus/dbus-message.h>
-#include <dbus/dbus-connection.h>
-#include <dbus/dbus-protocol.h>
-
-DBUS_BEGIN_DECLS
-
-/**
- * @addtogroup DBusServer
- * @{
- */
-
-typedef struct DBusServer DBusServer;
-
-/** Called when a new connection to the server is available. Must reference and save the new
- * connection, or close the new connection. Set with dbus_server_set_new_connection_function().
- */
-typedef void (* DBusNewConnectionFunction) (DBusServer     *server,
-                                            DBusConnection *new_connection,
-                                            void           *data);
-
-DBUS_EXPORT
-DBusServer* dbus_server_listen           (const char     *address,
-                                          DBusError      *error);
-DBUS_EXPORT
-DBusServer* dbus_server_ref              (DBusServer     *server);
-DBUS_EXPORT
-void        dbus_server_unref            (DBusServer     *server);
-DBUS_EXPORT
-void        dbus_server_disconnect       (DBusServer     *server);
-DBUS_EXPORT
-dbus_bool_t dbus_server_get_is_connected (DBusServer     *server);
-DBUS_EXPORT
-char*       dbus_server_get_address      (DBusServer     *server);
-DBUS_EXPORT
-char*       dbus_server_get_id           (DBusServer     *server);
-DBUS_EXPORT
-void        dbus_server_set_new_connection_function (DBusServer                *server,
-                                                     DBusNewConnectionFunction  function,
-                                                     void                      *data,
-                                                     DBusFreeFunction           free_data_function);
-DBUS_EXPORT
-dbus_bool_t dbus_server_set_watch_functions         (DBusServer                *server,
-                                                     DBusAddWatchFunction       add_function,
-                                                     DBusRemoveWatchFunction    remove_function,
-                                                     DBusWatchToggledFunction   toggled_function,
-                                                     void                      *data,
-                                                     DBusFreeFunction           free_data_function);
-DBUS_EXPORT
-dbus_bool_t dbus_server_set_timeout_functions       (DBusServer                *server,
-                                                     DBusAddTimeoutFunction     add_function,
-                                                     DBusRemoveTimeoutFunction  remove_function,
-                                                     DBusTimeoutToggledFunction toggled_function,
-                                                     void                      *data,
-                                                     DBusFreeFunction           free_data_function);
-DBUS_EXPORT
-dbus_bool_t dbus_server_set_auth_mechanisms         (DBusServer                *server,
-                                                     const char               **mechanisms);
-
-DBUS_EXPORT
-dbus_bool_t dbus_server_allocate_data_slot (dbus_int32_t     *slot_p);
-DBUS_EXPORT
-void        dbus_server_free_data_slot     (dbus_int32_t     *slot_p);
-DBUS_EXPORT
-dbus_bool_t dbus_server_set_data           (DBusServer       *server,
-                                            int               slot,
-                                            void             *data,
-                                            DBusFreeFunction  free_data_func);
-DBUS_EXPORT
-void*       dbus_server_get_data           (DBusServer       *server,
-                                            int               slot);
-
-/** @} */
-
-DBUS_END_DECLS
-
-#endif /* DBUS_SERVER_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-sha.h b/lib-x86-32/include/dbus-1/dbus/dbus-sha.h
deleted file mode 100644
index c48035b9..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-sha.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-sha.h SHA-1 implementation
- *
- * Copyright (C) 2003 Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- *
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#ifndef DBUS_SHA_H
-#define DBUS_SHA_H
-
-#include <dbus/dbus-macros.h>
-#include <dbus/dbus-errors.h>
-#include <dbus/dbus-string.h>
-
-DBUS_BEGIN_DECLS
-
-typedef struct DBusSHAContext DBusSHAContext;
-
-/**
- * Struct storing state of the SHA algorithm
- */
-struct DBusSHAContext
-{
-  dbus_uint32_t  digest[5];         /**< Message digest */
-  dbus_uint32_t  count_lo;          /**< 64-bit bit count */
-  dbus_uint32_t  count_hi;          /**< No clue */
-  dbus_uint32_t  data[16];          /**< SHA data buffer */
-};
-
-void        _dbus_sha_init    (DBusSHAContext   *context);
-void        _dbus_sha_update  (DBusSHAContext   *context,
-                               const DBusString *data);
-dbus_bool_t _dbus_sha_final   (DBusSHAContext   *context,
-                               DBusString       *results);
-dbus_bool_t _dbus_sha_compute (const DBusString *data,
-                               DBusString       *ascii_output);
-
-DBUS_END_DECLS
-
-#endif /* DBUS_SHA_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-shared.h b/lib-x86-32/include/dbus-1/dbus/dbus-shared.h
deleted file mode 100644
index 6a576704..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-shared.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-shared.h  Stuff used by both dbus/dbus.h low-level and C/C++ binding APIs
- *
- * Copyright (C) 2004 Red Hat, Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef DBUS_SHARED_H
-#define DBUS_SHARED_H
-
-/* Don't include anything in here from anywhere else. It's
- * intended for use by any random library.
- */
-
-#ifdef  __cplusplus
-extern "C" {
-#if 0
-} /* avoids confusing emacs indentation */
-#endif
-#endif
-
-/* Normally docs are in .c files, but there isn't a .c file for this. */
-/**
- * @defgroup DBusShared Shared constants 
- * @ingroup  DBus
- *
- * @brief Shared header included by both libdbus and C/C++ bindings such as the GLib bindings.
- *
- * Usually a C/C++ binding such as the GLib or Qt binding won't want to include dbus.h in its
- * public headers. However, a few constants and macros may be useful to include; those are
- * found here and in dbus-protocol.h
- *
- * @{
- */
-
-
-/**
- * Well-known bus types. See dbus_bus_get().
- */
-typedef enum
-{
-  DBUS_BUS_SESSION,    /**< The login session bus */
-  DBUS_BUS_SYSTEM,     /**< The systemwide bus */
-  DBUS_BUS_STARTER     /**< The bus that started us, if any */
-} DBusBusType;
-
-/**
- * Results that a message handler can return.
- */
-typedef enum
-{
-  DBUS_HANDLER_RESULT_HANDLED,         /**< Message has had its effect - no need to run more handlers. */ 
-  DBUS_HANDLER_RESULT_NOT_YET_HANDLED, /**< Message has not had any effect - see if other handlers want it. */
-  DBUS_HANDLER_RESULT_NEED_MEMORY      /**< Need more memory in order to return #DBUS_HANDLER_RESULT_HANDLED or #DBUS_HANDLER_RESULT_NOT_YET_HANDLED. Please try again later with more memory. */
-} DBusHandlerResult;
-
-/* Bus names */
-
-/** The bus name used to talk to the bus itself. */
-#define DBUS_SERVICE_DBUS      "org.freedesktop.DBus"
-
-/* Paths */
-/** The object path used to talk to the bus itself. */
-#define DBUS_PATH_DBUS  "/org/freedesktop/DBus"
-/** The object path used in local/in-process-generated messages. */
-#define DBUS_PATH_LOCAL "/org/freedesktop/DBus/Local"
-
-/* Interfaces, these #define don't do much other than
- * catch typos at compile time
- */
-/** The interface exported by the object with #DBUS_SERVICE_DBUS and #DBUS_PATH_DBUS */
-#define DBUS_INTERFACE_DBUS           "org.freedesktop.DBus"
-/** The interface supported by introspectable objects */
-#define DBUS_INTERFACE_INTROSPECTABLE "org.freedesktop.DBus.Introspectable"
-/** The interface supported by objects with properties */
-#define DBUS_INTERFACE_PROPERTIES     "org.freedesktop.DBus.Properties"
-/** The interface supported by most dbus peers */
-#define DBUS_INTERFACE_PEER           "org.freedesktop.DBus.Peer"
-
-/** This is a special interface whose methods can only be invoked
- * by the local implementation (messages from remote apps aren't
- * allowed to specify this interface).
- */
-#define DBUS_INTERFACE_LOCAL "org.freedesktop.DBus.Local"
-
-/* Owner flags */
-#define DBUS_NAME_FLAG_ALLOW_REPLACEMENT 0x1 /**< Allow another service to become the primary owner if requested */
-#define DBUS_NAME_FLAG_REPLACE_EXISTING  0x2 /**< Request to replace the current primary owner */
-#define DBUS_NAME_FLAG_DO_NOT_QUEUE      0x4 /**< If we can not become the primary owner do not place us in the queue */
-
-/* Replies to request for a name */
-#define DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER  1 /**< Service has become the primary owner of the requested name */
-#define DBUS_REQUEST_NAME_REPLY_IN_QUEUE       2 /**< Service could not become the primary owner and has been placed in the queue */
-#define DBUS_REQUEST_NAME_REPLY_EXISTS         3 /**< Service is already in the queue */
-#define DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER  4 /**< Service is already the primary owner */
-
-/* Replies to releasing a name */
-#define DBUS_RELEASE_NAME_REPLY_RELEASED        1 /**< Service was released from the given name */
-#define DBUS_RELEASE_NAME_REPLY_NON_EXISTENT    2 /**< The given name does not exist on the bus */
-#define DBUS_RELEASE_NAME_REPLY_NOT_OWNER       3 /**< Service is not an owner of the given name */
-
-/* Replies to service starts */
-#define DBUS_START_REPLY_SUCCESS         1 /**< Service was auto started */
-#define DBUS_START_REPLY_ALREADY_RUNNING 2 /**< Service was already running */
-
-/** @} */
-
-#ifdef __cplusplus
-#if 0
-{ /* avoids confusing emacs indentation */
-#endif
-}
-#endif
-
-#endif /* DBUS_SHARED_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-shell.h b/lib-x86-32/include/dbus-1/dbus/dbus-shell.h
deleted file mode 100644
index 06da274e..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-shell.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-shell.h Shell command line utility functions.
- *
- * Copyright (C) 2002, 2003  Red Hat, Inc.
- * Copyright (C) 2003 CodeFactory AB
- *
- * Licensed under the Academic Free License version 2.1
- *
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-
-#ifndef DBUS_SHELL_H
-#define DBUS_SHELL_H
-
-DBUS_BEGIN_DECLS
-
-char*       _dbus_shell_unquote    (const char *quoted_string);
-dbus_bool_t _dbus_shell_parse_argv (const char *command_line,
-                                    int        *argcp,
-                                    char       ***argvp,
-				    DBusError  *error);
-
-DBUS_END_DECLS
-
-#endif /* DBUS_SHELL_H */
-
-
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-signature.h b/lib-x86-32/include/dbus-1/dbus/dbus-signature.h
deleted file mode 100644
index ebf00c1e..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-signature.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-signatures.h utility functions for D-Bus types
- *
- * Copyright (C) 2005 Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#if !defined (DBUS_INSIDE_DBUS_H) && !defined (DBUS_COMPILATION)
-#error "Only <dbus/dbus.h> can be included directly, this file may disappear or change contents."
-#endif
-
-#ifndef DBUS_SIGNATURES_H
-#define DBUS_SIGNATURES_H
-
-#include <dbus/dbus-macros.h>
-#include <dbus/dbus-types.h>
-#include <dbus/dbus-errors.h>
-
-DBUS_BEGIN_DECLS
-
-/**
- * @addtogroup DBusSignature
- * @{
- */
-
-/**
- * DBusSignatureIter struct; contains no public fields 
- */
-typedef struct
-{ 
-  void *dummy1;         /**< Don't use this */
-  void *dummy2;         /**< Don't use this */
-  dbus_uint32_t dummy8; /**< Don't use this */
-  int dummy12;           /**< Don't use this */
-  int dummy17;           /**< Don't use this */
-} DBusSignatureIter;
-
-DBUS_EXPORT
-void            dbus_signature_iter_init             (DBusSignatureIter       *iter,
-						      const char              *signature);
-
-DBUS_EXPORT
-int             dbus_signature_iter_get_current_type (const DBusSignatureIter *iter);
-
-DBUS_EXPORT
-char *          dbus_signature_iter_get_signature    (const DBusSignatureIter *iter);
-
-DBUS_EXPORT
-int             dbus_signature_iter_get_element_type (const DBusSignatureIter *iter);
-
-DBUS_EXPORT
-dbus_bool_t     dbus_signature_iter_next             (DBusSignatureIter       *iter);
-
-DBUS_EXPORT
-void            dbus_signature_iter_recurse          (const DBusSignatureIter *iter,
-						      DBusSignatureIter       *subiter);
-
-DBUS_EXPORT
-dbus_bool_t     dbus_signature_validate              (const char       *signature,
-						      DBusError        *error);
-
-DBUS_EXPORT
-dbus_bool_t     dbus_signature_validate_single       (const char       *signature,
-						      DBusError        *error);
-
-DBUS_EXPORT
-dbus_bool_t     dbus_type_is_basic                   (int            typecode);
-DBUS_EXPORT
-dbus_bool_t     dbus_type_is_container               (int            typecode);
-DBUS_EXPORT
-dbus_bool_t     dbus_type_is_fixed                   (int            typecode);
-
-/** @} */
-
-DBUS_END_DECLS
-
-#endif /* DBUS_SIGNATURE_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-sockets-win.h b/lib-x86-32/include/dbus-1/dbus/dbus-sockets-win.h
deleted file mode 100644
index 5dead058..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-sockets-win.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-sockets.h Wrappers around socket features (internal to D-BUS implementation)
- * 
- * Copyright (C) 2005 Novell, Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef DBUS_SOCKETS_H
-#define DBUS_SOCKETS_H
-
-#if defined(DBUS_WIN) || defined(DBUS_WINCE)
-
-
-
-#ifndef STRICT
-#define STRICT
-#include <winsock2.h>
-#undef STRICT
-#endif
-#include <winsock2.h>
-
-#undef interface
-
-#if HAVE_ERRNO_H
-#include <errno.h>
-#endif
-
-/* Make use of the fact that the WSAE* error codes don't
- * overlap with errno E* codes. Wrapper functions store
- * the return value from WSAGetLastError() in errno.
- */
-#if defined(EPROTONOSUPPORT) || \
-    defined(EAFNOSUPPORT) || \
-    defined(EWOULDBLOCK)
-#error This does not look like Win32 and the Microsoft C library
-#endif
-
-#define DBUS_SOCKET_IS_INVALID(s) ((SOCKET)(s) == INVALID_SOCKET)
-#define DBUS_SOCKET_API_RETURNS_ERROR(n) ((n) == SOCKET_ERROR)
-#define DBUS_SOCKET_SET_ERRNO() (_dbus_win_set_errno (WSAGetLastError()))
-
-#define DBUS_CLOSE_SOCKET(s) closesocket(s)
-
-#else
-
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <errno.h>
-
-#define DBUS_SOCKET_IS_INVALID(s) ((s) < 0)
-#define DBUS_SOCKET_API_RETURNS_ERROR(n) ((n) < 0)
-#define DBUS_SOCKET_SET_ERRNO()	/* empty */
-
-#define DBUS_CLOSE_SOCKET(s) close(s)
-
-#endif /* !Win32 */
-
-#endif /* DBUS_SOCKETS_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-spawn.h b/lib-x86-32/include/dbus-1/dbus/dbus-spawn.h
deleted file mode 100644
index 5af54b72..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-spawn.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-spawn.h Wrapper around fork/exec
- * 
- * Copyright (C) 2002, 2003  Red Hat, Inc.
- * Copyright (C) 2003 CodeFactory AB
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef DBUS_SPAWN_H
-#define DBUS_SPAWN_H
-
-#include <dbus/dbus-string.h>
-#include <dbus/dbus-errors.h>
-#include <dbus/dbus-watch.h>
-
-DBUS_BEGIN_DECLS
-
-typedef void (* DBusSpawnChildSetupFunc) (void *user_data);
-
-typedef struct DBusBabysitter DBusBabysitter;
-
-dbus_bool_t _dbus_spawn_async_with_babysitter     (DBusBabysitter           **sitter_p,
-                                                   char                     **argv,
-                                                   char                     **env,
-                                                   DBusSpawnChildSetupFunc    child_setup,
-                                                   void                      *user_data,
-                                                   DBusError                 *error);
-DBusBabysitter* _dbus_babysitter_ref              (DBusBabysitter            *sitter);
-void        _dbus_babysitter_unref                (DBusBabysitter            *sitter);
-void        _dbus_babysitter_kill_child           (DBusBabysitter            *sitter);
-dbus_bool_t _dbus_babysitter_get_child_exited     (DBusBabysitter            *sitter);
-void        _dbus_babysitter_set_child_exit_error (DBusBabysitter            *sitter,
-                                                   DBusError                 *error);
-dbus_bool_t _dbus_babysitter_get_child_exit_status (DBusBabysitter           *sitter,
-                                                    int                      *status);
-dbus_bool_t _dbus_babysitter_set_watch_functions  (DBusBabysitter            *sitter,
-                                                   DBusAddWatchFunction       add_function,
-                                                   DBusRemoveWatchFunction    remove_function,
-                                                   DBusWatchToggledFunction   toggled_function,
-                                                   void                      *data,
-                                                   DBusFreeFunction           free_data_function);
-
-DBUS_END_DECLS
-
-#endif /* DBUS_SPAWN_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-string-private.h b/lib-x86-32/include/dbus-1/dbus/dbus-string-private.h
deleted file mode 100644
index 365d89a3..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-string-private.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-string-private.h String utility class (internal to D-Bus implementation)
- * 
- * Copyright (C) 2002, 2003  Red Hat, Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef DBUS_STRING_PRIVATE_H
-#define DBUS_STRING_PRIVATE_H
-
-#include <dbus/dbus-memory.h>
-#include <dbus/dbus-types.h>
-
-#ifndef DBUS_CAN_USE_DBUS_STRING_PRIVATE
-#error "Don't go including dbus-string-private.h for no good reason"
-#endif
-
-DBUS_BEGIN_DECLS
-
-/**
- * @brief Internals of DBusString.
- * 
- * DBusString internals. DBusString is an opaque objects, it must be
- * used via accessor functions.
- */
-typedef struct
-{
-  unsigned char *str;            /**< String data, plus nul termination */
-  int            len;            /**< Length without nul */
-  int            allocated;      /**< Allocated size of data */
-  int            max_length;     /**< Max length of this string, without nul byte */
-  unsigned int   constant : 1;   /**< String data is not owned by DBusString */
-  unsigned int   locked : 1;     /**< DBusString has been locked and can't be changed */
-  unsigned int   invalid : 1;    /**< DBusString is invalid (e.g. already freed) */
-  unsigned int   align_offset : 3; /**< str - align_offset is the actual malloc block */
-} DBusRealString;
-
-
-/**
- * @defgroup DBusStringInternals DBusString implementation details
- * @ingroup  DBusInternals
- * @brief DBusString implementation details
- *
- * The guts of DBusString.
- *
- * @{
- */
-
-/**
- * This is the maximum max length (and thus also the maximum length)
- * of a DBusString
- */
-#define _DBUS_STRING_MAX_MAX_LENGTH (_DBUS_INT32_MAX - _DBUS_STRING_ALLOCATION_PADDING)
-
-/**
- * Checks a bunch of assertions about a string object
- *
- * @param real the DBusRealString
- */
-#define DBUS_GENERIC_STRING_PREAMBLE(real) _dbus_assert ((real) != NULL); _dbus_assert (!(real)->invalid); _dbus_assert ((real)->len >= 0); _dbus_assert ((real)->allocated >= 0); _dbus_assert ((real)->max_length >= 0); _dbus_assert ((real)->len <= ((real)->allocated - _DBUS_STRING_ALLOCATION_PADDING)); _dbus_assert ((real)->len <= (real)->max_length)
-
-/**
- * Checks assertions about a string object that needs to be
- * modifiable - may not be locked or const. Also declares
- * the "real" variable pointing to DBusRealString. 
- * @param str the string
- */
-#define DBUS_STRING_PREAMBLE(str) DBusRealString *real = (DBusRealString*) str; \
-  DBUS_GENERIC_STRING_PREAMBLE (real);                                          \
-  _dbus_assert (!(real)->constant);                                             \
-  _dbus_assert (!(real)->locked)
-
-/**
- * Checks assertions about a string object that may be locked but
- * can't be const. i.e. a string object that we can free.  Also
- * declares the "real" variable pointing to DBusRealString.
- *
- * @param str the string
- */
-#define DBUS_LOCKED_STRING_PREAMBLE(str) DBusRealString *real = (DBusRealString*) str; \
-  DBUS_GENERIC_STRING_PREAMBLE (real);                                                 \
-  _dbus_assert (!(real)->constant)
-
-/**
- * Checks assertions about a string that may be const or locked.  Also
- * declares the "real" variable pointing to DBusRealString.
- * @param str the string.
- */
-#define DBUS_CONST_STRING_PREAMBLE(str) const DBusRealString *real = (DBusRealString*) str; \
-  DBUS_GENERIC_STRING_PREAMBLE (real)
-
-/**
- * Checks for ASCII blank byte
- * @param c the byte
- */
-#define DBUS_IS_ASCII_BLANK(c) ((c) == ' ' || (c) == '\t')
-
-/**
- * Checks for ASCII whitespace byte
- * @param c the byte
- */
-#define DBUS_IS_ASCII_WHITE(c) ((c) == ' ' || (c) == '\t' || (c) == '\n' || (c) == '\r')
-
-/** @} */
-
-DBUS_END_DECLS
-
-#endif /* DBUS_STRING_PRIVATE_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-string.h b/lib-x86-32/include/dbus-1/dbus/dbus-string.h
deleted file mode 100644
index 2f1ed31c..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-string.h
+++ /dev/null
@@ -1,332 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-string.h String utility class (internal to D-Bus implementation)
- * 
- * Copyright (C) 2002, 2003 Red Hat, Inc.
- * Copyright (C) 2006 Ralf Habacker <ralf.habacker@freenet.de>
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef DBUS_STRING_H
-#define DBUS_STRING_H
-
-#include <dbus/dbus-macros.h>
-#include <dbus/dbus-types.h>
-#include <dbus/dbus-memory.h>
-
-#include <stdarg.h>
-
-DBUS_BEGIN_DECLS
-
-/**
- * DBusString object
- */
-
-typedef struct DBusString DBusString;
-
-struct DBusString
-{
-#if defined(DBUS_WIN) && defined(_DEBUG)
-  const char *dummy1; /**< placeholder */
-#else
-  const void *dummy1; /**< placeholder */
-#endif
-  int   dummy2;       /**< placeholder */
-  int   dummy3;       /**< placeholder */
-  int   dummy4;       /**< placeholder */
-  unsigned int dummy5 : 1; /**< placeholder */
-  unsigned int dummy6 : 1; /**< placeholder */
-  unsigned int dummy7 : 1; /**< placeholder */
-  unsigned int dummy8 : 3; /**< placeholder */
-};
-
-#ifdef DBUS_DISABLE_ASSERT
-/* Some simple inlining hacks; the current linker is not smart enough
- * to inline non-exported symbols across files in the library.
- * Note that these break type safety (due to the casts)
- */
-#define _dbus_string_get_data(s) ((char*)(((DBusString*)(s))->dummy1))
-#define _dbus_string_get_length(s) (((DBusString*)(s))->dummy2)
-#define _dbus_string_set_byte(s, i, b) ((((unsigned char*)(((DBusString*)(s))->dummy1))[(i)]) = (unsigned char) (b))
-#define _dbus_string_get_byte(s, i) (((const unsigned char*)(((DBusString*)(s))->dummy1))[(i)])
-#define _dbus_string_get_const_data(s) ((const char*)(((DBusString*)(s))->dummy1))
-#define _dbus_string_get_const_data_len(s,start,len) (((const char*)(((DBusString*)(s))->dummy1)) + (start))
-#endif
-
-dbus_bool_t   _dbus_string_init                  (DBusString        *str);
-void          _dbus_string_init_const            (DBusString        *str,
-                                                  const char        *value);
-void          _dbus_string_init_const_len        (DBusString        *str,
-                                                  const char        *value,
-                                                  int                len);
-dbus_bool_t   _dbus_string_init_preallocated     (DBusString        *str,
-                                                  int                allocate_size);
-void          _dbus_string_free                  (DBusString        *str);
-void          _dbus_string_lock                  (DBusString        *str);
-dbus_bool_t   _dbus_string_compact               (DBusString        *str,
-                                                  int                max_waste);
-#ifndef _dbus_string_get_data
-char*         _dbus_string_get_data              (DBusString        *str);
-#endif /* _dbus_string_get_data */
-#ifndef _dbus_string_get_const_data
-const char*   _dbus_string_get_const_data        (const DBusString  *str);
-#endif /* _dbus_string_get_const_data */
-char*         _dbus_string_get_data_len          (DBusString        *str,
-                                                  int                start,
-                                                  int                len);
-#ifndef _dbus_string_get_const_data_len
-const char*   _dbus_string_get_const_data_len    (const DBusString  *str,
-                                                  int                start,
-                                                  int                len);
-#endif
-#ifndef _dbus_string_set_byte
-void          _dbus_string_set_byte              (DBusString        *str,
-                                                  int                i,
-                                                  unsigned char      byte);
-#endif
-#ifndef _dbus_string_get_byte
-unsigned char _dbus_string_get_byte              (const DBusString  *str,
-                                                  int                start);
-#endif /* _dbus_string_get_byte */
-dbus_bool_t   _dbus_string_insert_bytes          (DBusString        *str,
-                                                  int                i,
-						  int                n_bytes,
-                                                  unsigned char      byte);
-dbus_bool_t   _dbus_string_insert_byte           (DBusString        *str,
-                                                  int                i,
-                                                  unsigned char      byte);
-dbus_bool_t   _dbus_string_steal_data            (DBusString        *str,
-                                                  char             **data_return);
-dbus_bool_t   _dbus_string_steal_data_len        (DBusString        *str,
-                                                  char             **data_return,
-                                                  int                start,
-                                                  int                len);
-dbus_bool_t   _dbus_string_copy_data             (const DBusString  *str,
-                                                  char             **data_return);
-dbus_bool_t   _dbus_string_copy_data_len         (const DBusString  *str,
-                                                  char             **data_return,
-                                                  int                start,
-                                                  int                len);
-void          _dbus_string_copy_to_buffer        (const DBusString  *str,
-                                                  char              *buffer,
-						  int                len);
-void          _dbus_string_copy_to_buffer_with_nul (const DBusString  *str,
-                                                    char              *buffer,
-                                                    int                avail_len);
-#ifndef _dbus_string_get_length
-int           _dbus_string_get_length            (const DBusString  *str);
-#endif /* !_dbus_string_get_length */
-
-dbus_bool_t   _dbus_string_lengthen              (DBusString        *str,
-                                                  int                additional_length);
-void          _dbus_string_shorten               (DBusString        *str,
-                                                  int                length_to_remove);
-dbus_bool_t   _dbus_string_set_length            (DBusString        *str,
-                                                  int                length);
-dbus_bool_t   _dbus_string_align_length          (DBusString        *str,
-                                                  int                alignment);
-dbus_bool_t   _dbus_string_alloc_space           (DBusString        *str,
-                                                  int                extra_bytes);
-dbus_bool_t   _dbus_string_append                (DBusString        *str,
-                                                  const char        *buffer);
-dbus_bool_t   _dbus_string_append_len            (DBusString        *str,
-                                                  const char        *buffer,
-                                                  int                len);
-dbus_bool_t   _dbus_string_append_int            (DBusString        *str,
-                                                  long               value);
-dbus_bool_t   _dbus_string_append_uint           (DBusString        *str,
-                                                  unsigned long      value);
-dbus_bool_t   _dbus_string_append_double         (DBusString        *str,
-                                                  double             value);
-dbus_bool_t   _dbus_string_append_byte           (DBusString        *str,
-                                                  unsigned char      byte);
-dbus_bool_t   _dbus_string_append_unichar        (DBusString        *str,
-                                                  dbus_unichar_t     ch);
-dbus_bool_t   _dbus_string_append_4_aligned      (DBusString        *str,
-                                                  const unsigned char octets[4]);
-dbus_bool_t   _dbus_string_append_8_aligned      (DBusString        *str,
-                                                  const unsigned char octets[8]);
-dbus_bool_t   _dbus_string_append_printf         (DBusString        *str,
-                                                  const char        *format,
-                                                  ...) _DBUS_GNUC_PRINTF (2, 3);
-dbus_bool_t   _dbus_string_append_printf_valist  (DBusString        *str,
-                                                  const char        *format,
-                                                  va_list            args);
-dbus_bool_t   _dbus_string_insert_2_aligned      (DBusString        *str,
-                                                  int                insert_at,
-                                                  const unsigned char octets[2]);
-dbus_bool_t   _dbus_string_insert_4_aligned      (DBusString        *str,
-                                                  int                insert_at,
-                                                  const unsigned char octets[4]);
-dbus_bool_t   _dbus_string_insert_8_aligned      (DBusString        *str,
-                                                  int                insert_at,
-                                                  const unsigned char octets[8]);
-dbus_bool_t   _dbus_string_insert_alignment      (DBusString        *str,
-                                                  int               *insert_at,
-                                                  int                alignment);
-void          _dbus_string_delete                (DBusString        *str,
-                                                  int                start,
-                                                  int                len);
-dbus_bool_t   _dbus_string_move                  (DBusString        *source,
-                                                  int                start,
-                                                  DBusString        *dest,
-                                                  int                insert_at);
-dbus_bool_t   _dbus_string_copy                  (const DBusString  *source,
-                                                  int                start,
-                                                  DBusString        *dest,
-                                                  int                insert_at);
-dbus_bool_t   _dbus_string_move_len              (DBusString        *source,
-                                                  int                start,
-                                                  int                len,
-                                                  DBusString        *dest,
-                                                  int                insert_at);
-dbus_bool_t   _dbus_string_copy_len              (const DBusString  *source,
-                                                  int                start,
-                                                  int                len,
-                                                  DBusString        *dest,
-                                                  int                insert_at);
-dbus_bool_t   _dbus_string_replace_len           (const DBusString  *source,
-                                                  int                start,
-                                                  int                len,
-                                                  DBusString        *dest,
-                                                  int                replace_at,
-                                                  int                replace_len);
-dbus_bool_t   _dbus_string_split_on_byte         (DBusString        *source,
-                                                  unsigned char      byte,
-                                                  DBusString        *tail);
-void          _dbus_string_get_unichar           (const DBusString  *str,
-                                                  int                start,
-                                                  dbus_unichar_t    *ch_return,
-                                                  int               *end_return);
-dbus_bool_t   _dbus_string_parse_int             (const DBusString  *str,
-                                                  int                start,
-                                                  long              *value_return,
-                                                  int               *end_return);
-dbus_bool_t   _dbus_string_parse_uint            (const DBusString  *str,
-                                                  int                start,
-                                                  unsigned long     *value_return,
-                                                  int               *end_return);
-dbus_bool_t   _dbus_string_parse_double          (const DBusString  *str,
-                                                  int                start,
-                                                  double            *value,
-                                                  int               *end_return);
-dbus_bool_t   _dbus_string_find                  (const DBusString  *str,
-                                                  int                start,
-                                                  const char        *substr,
-                                                  int               *found);
-dbus_bool_t   _dbus_string_find_eol               (const DBusString *str,
-                                                  int               start,
-                                                  int               *found,
-                                                  int               *found_len);
-dbus_bool_t   _dbus_string_find_to               (const DBusString  *str,
-                                                  int                start,
-                                                  int                end,
-                                                  const char        *substr,
-                                                  int               *found);
-dbus_bool_t   _dbus_string_find_byte_backward    (const DBusString  *str,
-                                                  int                start,
-                                                  unsigned char      byte,
-                                                  int               *found);
-dbus_bool_t   _dbus_string_find_blank            (const DBusString  *str,
-                                                  int                start,
-                                                  int               *found);
-void          _dbus_string_skip_blank            (const DBusString  *str,
-                                                  int                start,
-                                                  int               *end);
-void          _dbus_string_skip_white            (const DBusString  *str,
-                                                  int                start,
-                                                  int               *end);
-void          _dbus_string_skip_white_reverse    (const DBusString  *str,
-                                                  int                end,
-                                                  int               *start);
-dbus_bool_t   _dbus_string_equal                 (const DBusString  *a,
-                                                  const DBusString  *b);
-dbus_bool_t   _dbus_string_equal_c_str           (const DBusString  *a,
-                                                  const char        *c_str);
-dbus_bool_t   _dbus_string_equal_len             (const DBusString  *a,
-                                                  const DBusString  *b,
-                                                  int                len);
-dbus_bool_t   _dbus_string_equal_substring       (const DBusString  *a,
-                                                  int                a_start,
-                                                  int                a_len,
-                                                  const DBusString  *b,
-                                                  int                b_start);
-dbus_bool_t   _dbus_string_starts_with_c_str     (const DBusString  *a,
-                                                  const char        *c_str);
-dbus_bool_t   _dbus_string_ends_with_c_str       (const DBusString  *a,
-                                                  const char        *c_str);
-dbus_bool_t   _dbus_string_pop_line              (DBusString        *source,
-                                                  DBusString        *dest);
-void          _dbus_string_delete_first_word     (DBusString        *str);
-void          _dbus_string_delete_leading_blanks (DBusString        *str);
-void          _dbus_string_chop_white            (DBusString        *str); 
-dbus_bool_t   _dbus_string_append_byte_as_hex    (DBusString        *str,
-                                                  int                byte);
-dbus_bool_t   _dbus_string_hex_encode            (const DBusString  *source,
-                                                  int                start,
-                                                  DBusString        *dest,
-                                                  int                insert_at);
-dbus_bool_t   _dbus_string_hex_decode            (const DBusString  *source,
-                                                  int                start,
-						  int               *end_return,
-                                                  DBusString        *dest,
-                                                  int                insert_at);
-void          _dbus_string_tolower_ascii         (const DBusString  *str,
-                                                  int                start,
-                                                  int                len);
-void          _dbus_string_toupper_ascii         (const DBusString  *str,
-                                                  int                start,
-                                                  int                len);
-dbus_bool_t   _dbus_string_validate_ascii        (const DBusString  *str,
-                                                  int                start,
-                                                  int                len);
-dbus_bool_t   _dbus_string_validate_utf8         (const DBusString  *str,
-                                                  int                start,
-                                                  int                len);
-dbus_bool_t   _dbus_string_validate_nul          (const DBusString  *str,
-                                                  int                start,
-                                                  int                len);
-void          _dbus_string_zero                  (DBusString        *str);
-
-
-/**
- * We allocate 1 byte for nul termination, plus 7 bytes for possible
- * align_offset, so we always need 8 bytes on top of the string's
- * length to be in the allocated block.
- */
-#define _DBUS_STRING_ALLOCATION_PADDING 8
-
-/**
- * Defines a static const variable with type #DBusString called "name"
- * containing the given string literal.
- *
- * @param name the name of the variable
- * @param str the string value
- */
-#define _DBUS_STRING_DEFINE_STATIC(name, str)                           \
-  static const char _dbus_static_string_##name[] = str;                 \
-  static const DBusString name = { _dbus_static_string_##name,          \
-                                   sizeof(_dbus_static_string_##name),  \
-                                   sizeof(_dbus_static_string_##name) + \
-                                   _DBUS_STRING_ALLOCATION_PADDING,     \
-                                   sizeof(_dbus_static_string_##name),  \
-                                   TRUE, TRUE, FALSE, 0 }
-
-DBUS_END_DECLS
-
-#endif /* DBUS_STRING_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-sysdeps-unix.h b/lib-x86-32/include/dbus-1/dbus/dbus-sysdeps-unix.h
deleted file mode 100644
index 807d2cf5..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-sysdeps-unix.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-sysdeps-unix.h UNIX-specific wrappers around system/libc features (internal to D-Bus implementation)
- *
- * Copyright (C) 2002, 2003, 2006  Red Hat, Inc.
- * Copyright (C) 2003 CodeFactory AB
- *
- * Licensed under the Academic Free License version 2.1
- *
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef DBUS_SYSDEPS_UNIX_H
-#define DBUS_SYSDEPS_UNIX_H
-
-#include <dbus/dbus-sysdeps.h>
-
-#ifdef DBUS_WIN
-#error "Don't include this on Windows"
-#endif
-
-DBUS_BEGIN_DECLS
-
-/**
- * @defgroup DBusSysdepsUnix UNIX-specific internal API
- * @ingroup DBusInternals
- * @brief Internal system-dependent API available on UNIX only
- * @{
- */
-
-dbus_bool_t
-_dbus_close     (int               fd,
-                 DBusError        *error);
-int _dbus_dup   (int               fd,
-                 DBusError        *error);
-int
-_dbus_read      (int               fd,
-                 DBusString       *buffer,
-                 int               count);
-int
-_dbus_write     (int               fd,
-                 const DBusString *buffer,
-                 int               start,
-                 int               len);
-int
-_dbus_write_two (int               fd,
-                 const DBusString *buffer1,
-                 int               start1,
-                 int               len1,
-                 const DBusString *buffer2,
-                 int               start2,
-                 int               len2);
-
-dbus_bool_t _dbus_open_unix_socket (int              *fd,
-                                    DBusError        *error);
-int _dbus_connect_unix_socket (const char     *path,
-                               dbus_bool_t     abstract,
-                               DBusError      *error);
-int _dbus_listen_unix_socket  (const char     *path,
-                               dbus_bool_t     abstract,
-                               DBusError      *error);
-
-int _dbus_listen_systemd_sockets (int       **fd,
-                                 DBusError *error);
-
-dbus_bool_t _dbus_read_credentials (int               client_fd,
-                                    DBusCredentials  *credentials,
-                                    DBusError        *error);
-dbus_bool_t _dbus_send_credentials (int              server_fd,
-                                    DBusError       *error);
-
-/** Information about a UNIX user */
-typedef struct DBusUserInfo  DBusUserInfo;
-/** Information about a UNIX group */
-typedef struct DBusGroupInfo DBusGroupInfo;
-
-/**
- * Information about a UNIX user
- */
-struct DBusUserInfo
-{
-  dbus_uid_t  uid;            /**< UID */
-  dbus_gid_t  primary_gid;    /**< GID */
-  dbus_gid_t *group_ids;      /**< Groups IDs, *including* above primary group */
-  int         n_group_ids;    /**< Size of group IDs array */
-  char       *username;       /**< Username */
-  char       *homedir;        /**< Home directory */
-};
-
-/**
- * Information about a UNIX group
- */
-struct DBusGroupInfo
-{
-  dbus_gid_t  gid;            /**< GID */
-  char       *groupname;      /**< Group name */
-};
-
-dbus_bool_t _dbus_user_info_fill     (DBusUserInfo     *info,
-                                      const DBusString *username,
-                                      DBusError        *error);
-dbus_bool_t _dbus_user_info_fill_uid (DBusUserInfo     *info,
-                                      dbus_uid_t        uid,
-                                      DBusError        *error);
-void        _dbus_user_info_free     (DBusUserInfo     *info);
-
-dbus_bool_t _dbus_group_info_fill     (DBusGroupInfo    *info,
-                                       const DBusString *groupname,
-                                       DBusError        *error);
-dbus_bool_t _dbus_group_info_fill_gid (DBusGroupInfo    *info,
-                                       dbus_gid_t        gid,
-                                       DBusError        *error);
-void        _dbus_group_info_free     (DBusGroupInfo    *info);
-
-dbus_uid_t    _dbus_getuid (void);
-dbus_uid_t    _dbus_geteuid (void);
-dbus_gid_t    _dbus_getgid (void);
-
-dbus_bool_t _dbus_parse_uid (const DBusString  *uid_str,
-                             dbus_uid_t        *uid);
-
-/** @} */
-
-DBUS_END_DECLS
-
-#endif /* DBUS_SYSDEPS_UNIX_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-sysdeps-win.h b/lib-x86-32/include/dbus-1/dbus/dbus-sysdeps-win.h
deleted file mode 100644
index a8ff9433..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-sysdeps-win.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-sysdeps.c Wrappers around system/libc features (internal to D-BUS implementation)
- * 
- * Copyright (C) 2002, 2003  Red Hat, Inc.
- * Copyright (C) 2003 CodeFactory AB
- * Copyright (C) 2005 Novell, Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef DBUS_SYSDEPS_WIN_H
-#define DBUS_SYSDEPS_WIN_H
-
-extern void *_dbus_win_get_dll_hmodule (void);
-#define _WINSOCKAPI_
-
-#include "dbus-hash.h"
-#include "dbus-string.h"
-#include <ctype.h>
-#include <malloc.h>
-#include <windows.h>
-#undef interface
-
-#define DBUS_CONSOLE_DIR "/var/run/console/"
-
-
-void _dbus_win_set_errno (int err);
-const char* _dbus_win_error_from_last_error (void);
-
-void _dbus_win_startup_winsock (void);
-void _dbus_win_warn_win_error  (const char *message,
-                                int         code);
-                                
-char * _dbus_win_error_string (int error_number);
-void _dbus_win_free_error_string (char *string);
-
-extern const char* _dbus_lm_strerror  (int error_number);
-
-
-dbus_bool_t _dbus_win_account_to_sid (const wchar_t *waccount,
-                                      void         **ppsid,
-                                      DBusError     *error);
-
-dbus_bool_t
-_dbus_win32_sid_to_name_and_domain (dbus_uid_t  uid,
-                                    wchar_t   **wname,
-                                    wchar_t   **wdomain,
-                                    DBusError  *error);
-
-
-/* Don't define DBUS_CONSOLE_DIR on Win32 */
-
-wchar_t    *_dbus_win_utf8_to_utf16 (const char  *str,
-                                     DBusError   *error);
-char       *_dbus_win_utf16_to_utf8 (const wchar_t *str,
-                                     DBusError *error);
-
-void        _dbus_win_set_error_from_win_error (DBusError *error, int code);
-
-dbus_bool_t
-_dbus_win_sid_to_name_and_domain (dbus_uid_t uid,
-                                  wchar_t  **wname,
-                                  wchar_t  **wdomain,
-                                  DBusError *error);
-
-dbus_bool_t _dbus_file_exists (const char *filename);
-
-dbus_bool_t _dbus_get_config_file_name(DBusString *config_file, 
-                                       char *s);
-
-#endif
-
-/** @} end of sysdeps-win.h */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-sysdeps-wince-glue.h b/lib-x86-32/include/dbus-1/dbus/dbus-sysdeps-wince-glue.h
deleted file mode 100644
index f5ac6c8a..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-sysdeps-wince-glue.h
+++ /dev/null
@@ -1,246 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-sysdeps-wince-glue.h Emulation of system/libc features for Windows CE (internal to D-Bus implementation)
- * 
- * Copyright (C) 2002, 2003  Red Hat, Inc.
- * Copyright (C) 2003 CodeFactory AB
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef DBUS_SYSDEPS_WINCE_GLUE_H
-#define DBUS_SYSDEPS_WINCE_GLUE_H
-
-#include <time.h>
-#include <stdarg.h>
-
-/* For getaddrinfo, configure/cmake defined _WIN32_WCE to something >= 0x0401.  */
-#include <windows.h>
-#undef interface
-
-DBUS_BEGIN_DECLS
-
-/* shlobj.h declares these only for _WIN32_IE that we don't want to define.
-   In any case, with mingw32ce we only get a SHGetSpecialFolderPath.  */
-#define SHGetSpecialFolderPathW SHGetSpecialFolderPath
-BOOL WINAPI SHGetSpecialFolderPathA(HWND,LPSTR,int,BOOL);
-BOOL WINAPI SHGetSpecialFolderPathW(HWND,LPWSTR,int,BOOL);
-
-#ifndef TLS_OUT_OF_INDEXES
-#define TLS_OUT_OF_INDEXES 0xffffffff
-#endif
-
-
-/* Seriously.  Windows CE does not have errno.  Don't you hate it when
-   that happens?  */
-#define errno ((int)GetLastError ())
-
-#define ENOENT          ERROR_FILE_NOT_FOUND
-#define EMFILE          ERROR_TOO_MANY_OPEN_FILES
-#define EACCES          ERROR_ACCESS_DENIED
-#define EBADF           ERROR_INVALID_HANDLE
-#define ENOMEM          ERROR_NOT_ENOUGH_MEMORY
-#define EXDEV           ERROR_NOT_SAME_DEVICE
-#define ENFILE          ERROR_NO_MORE_FILES
-#define EROFS           ERROR_WRITE_PROTECT
-#define ENOLCK          ERROR_SHARING_BUFFER_EXCEEDED
-#define ENOSYS          ERROR_NOT_SUPPORTED
-#define EEXIST          ERROR_FILE_EXISTS
-#define EPERM           ERROR_CANNOT_MAKE
-#define EINVAL          ERROR_INVALID_PARAMETER
-#define EINTR           ERROR_INVALID_AT_INTERRUPT_TIME
-#define EPIPE           ERROR_BROKEN_PIPE
-#define ENOSPC          ERROR_DISK_FULL
-#define ENOTEMPTY       ERROR_DIR_NOT_EMPTY
-#define EBUSY           ERROR_BUSY
-#define ENAMETOOLONG    ERROR_FILENAME_EXCED_RANGE
-#define EAGAIN          ERROR_MORE_DATA
-#define ENOTDIR         ERROR_DIRECTORY
-#define ERANGE          ERROR_ARITHMETIC_OVERFLOW
-#define ENXIO           ERROR_FILE_INVALID
-#define EFAULT          ERROR_PROCESS_ABORTED
-#define EIO             ERROR_IO_DEVICE
-#define EDEADLOCK       ERROR_POSSIBLE_DEADLOCK
-#define ENODEV          ERROR_BAD_DEVICE
-
-/* Windows CE is missing more stuff that is pretty standard.  */
-
-#define strdup _strdup
-#define stricmp _stricmp
-#define strnicmp _strnicmp
-
-#define environ _dbus_wince_environ
-extern char *environ[];
-
-#define getenv _dbus_wince_getenv
-char *getenv (const char *name);
-
-#define putenv _dbus_wince_putenv
-int putenv (char *str);
-
-#define clock _dbus_wince_clock
-clock_t clock (void);
-
-#define abort _dbus_wince_abort
-void abort (void);
-
-#define _S_IFMT         0170000         /* file type mask */
-#define _S_IFDIR        0040000         /* directory */
-#define _S_IFCHR        0020000         /* character special */
-#define _S_IFIFO        0010000         /* pipe */
-#define _S_IFREG        0100000         /* regular */
-#define _S_IREAD        0000400         /* read permission, owner */
-#define _S_IWRITE       0000200         /* write permission, owner */
-#define _S_IEXEC        0000100         /* execute/search permission, owner */
-
-#ifndef __OFF_T_DEFINED
-typedef long off_t;
-#define __OFF_T_DEFINED
-#endif
-#ifndef _INTPTR_T_DEFINED
-typedef int intptr_t;
-#define _INTPTR_T_DEFINED
-#endif
-#ifndef _UINTPTR_T_DEFINED
-typedef unsigned int uintptr_t;
-#define _UINTPTR_T_DEFINED
-#endif
-
-#ifndef _MAX_FNAME
-#define _MAX_FNAME 256
-#endif
-
-#ifndef _IOFBF
-#define _IOFBF	0
-#endif
-#ifndef _IOLBF
-#define _IOLBF	1
-#endif
-#ifndef _IONBF
-#define _IONBF	2
-#endif
-
-
-/* Windows CE is missing some Windows functions that we want.  */
-
-#define GetSystemTimeAsFileTime _dbus_wince_GetSystemTimeAsFileTime
-void GetSystemTimeAsFileTime (LPFILETIME ftp);
-
-#define _mbsrchr _dbus_wince_mbsrchr
-unsigned char* _mbsrchr (const unsigned char*, unsigned int);
-
-#define OpenFileMappingA _dbus_wince_OpenFileMappingA
-HANDLE OpenFileMappingA(DWORD,BOOL,LPCSTR);
-
-#define MoveFileExA _dbus_wince_MoveFileExA
-BOOL MoveFileExA(LPCSTR,LPCSTR,DWORD);
-#ifndef MOVEFILE_REPLACE_EXISTING
-#define MOVEFILE_REPLACE_EXISTING 0x00000001
-#endif
-
-#define SetHandleInformation _dbus_wince_SetHandleInformation
-BOOL SetHandleInformation(HANDLE,DWORD,DWORD);
-#ifndef HANDLE_FLAG_INHERIT
-#define HANDLE_FLAG_INHERIT 0x01
-#endif
-#ifndef HANDLE_FLAG_PROTECT
-#define HANDLE_FLAG_PROTECT_FROM_CLOSE 0x02
-#endif
-
-#define SearchPathA _dbus_wince_SearchPathA
-DWORD SearchPathA(LPCSTR,LPCSTR,LPCSTR,DWORD,LPSTR,LPSTR*);
-
-/* Instead of emulating all functions needed for this, we replace the
-   whole thing.  */
-dbus_bool_t _dbus_getsid(char **sid);
-
-
-#define LookupAccountNameW _dbus_wince_LookupAccountNameW
-BOOL LookupAccountNameW(LPCWSTR,LPCWSTR,PSID,PDWORD,LPWSTR,PDWORD,PSID_NAME_USE);
-
-#define IsValidSid _dbus_wince_IsValidSid
-BOOL IsValidSid(PSID);
-
-
-/* Windows CE does only have the UNICODE interfaces (FooW), but we
-   want to use the ASCII interfaces (FooA).  We implement them
-   here.  */
-
-#define CreateFileA _dbus_wince_CreateFileA
-HANDLE CreateFileA(LPCSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES,DWORD,DWORD,HANDLE);
-
-#define DeleteFileA _dbus_wince_DeleteFileA
-BOOL DeleteFileA(LPCSTR);
-
-#define GetFileAttributesA _dbus_wince_GetFileAttributesA
-DWORD GetFileAttributesA(LPCSTR);
-
-#define GetFileAttributesExA _dbus_wince_GetFileAttributesExA
-BOOL GetFileAttributesExA(LPCSTR,GET_FILEEX_INFO_LEVELS,PVOID);
-
-#define CreateFileMappingA _dbus_wince_CreateFileMappingA
-HANDLE CreateFileMappingA(HANDLE,LPSECURITY_ATTRIBUTES,DWORD,DWORD,DWORD,LPCSTR);
-
-#define CreateDirectoryA _dbus_wince_CreateDirectoryA
-BOOL CreateDirectoryA(LPCSTR,LPSECURITY_ATTRIBUTES);
-
-#define RemoveDirectoryA _dbus_wince_RemoveDirectoryA
-BOOL RemoveDirectoryA(LPCSTR);
-
-#define FindFirstFileA _dbus_wince_FindFirstFileA
-HANDLE FindFirstFileA(LPCSTR,LPWIN32_FIND_DATAA);
-
-#define FindNextFileA _dbus_wince_FindNextFileA
-BOOL FindNextFileA(HANDLE,LPWIN32_FIND_DATAA);
-
-#define CreateMutexA _dbus_wince_CreateMutexA
-HANDLE CreateMutexA(LPSECURITY_ATTRIBUTES,BOOL,LPCSTR);
-
-#define CreateProcessA _dbus_wince_CreateProcessA
-BOOL CreateProcessA(LPCSTR,LPSTR,LPSECURITY_ATTRIBUTES,LPSECURITY_ATTRIBUTES,BOOL,DWORD,PVOID,LPCSTR,LPSTARTUPINFOA,LPPROCESS_INFORMATION);
-#ifndef CREATE_NO_WINDOW
-#define CREATE_NO_WINDOW 0x08000000
-#endif
-
-
-#define RegOpenKeyExA _dbus_wince_RegOpenKeyExA
-LONG RegOpenKeyExA(HKEY,LPCSTR,DWORD,REGSAM,PHKEY);
-
-#define RegQueryValueExA _dbus_wince_RegQueryValueExA
-LONG WINAPI RegQueryValueExA(HKEY,LPCSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
-
-
-#define FormatMessageA _dbus_wince_FormatMessageA
-DWORD FormatMessageA(DWORD,PCVOID,DWORD,DWORD,LPSTR,DWORD,va_list*);
-
-#define GetModuleFileNameA _dbus_wince_GetModuleFileNameA
-DWORD GetModuleFileNameA(HINSTANCE,LPSTR,DWORD);
-
-#define GetTempPathA _dbus_wince_GetTempPathA
-DWORD GetTempPathA(DWORD,LPSTR);
-
-#define SHGetSpecialFolderPathA _dbus_wince_SHGetSpecialFolderPathA
-BOOL SHGetSpecialFolderPathA(HWND,LPSTR,int,BOOL);
-
-
-#define OutputDebugStringA _dbus_wince_OutputDebugStringA
-void OutputDebugStringA(LPCSTR);
-
-
-DBUS_END_DECLS
-
-#endif /* DBUS_SYSDEPS_WINCE_GLUE_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-sysdeps.h b/lib-x86-32/include/dbus-1/dbus/dbus-sysdeps.h
deleted file mode 100644
index c98db36d..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-sysdeps.h
+++ /dev/null
@@ -1,531 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-sysdeps.h Wrappers around system/libc features (internal to D-Bus implementation)
- * 
- * Copyright (C) 2002, 2003  Red Hat, Inc.
- * Copyright (C) 2003 CodeFactory AB
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef DBUS_SYSDEPS_H
-#define DBUS_SYSDEPS_H
-
-#include "config.h"
-
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
-
-#include <dbus/dbus-errors.h>
-#include <dbus/dbus-file.h>
-#include <dbus/dbus-string.h>
-
-/* this is perhaps bogus, but strcmp() etc. are faster if we use the
- * stuff straight out of string.h, so have this here for now.
- */
-#include <string.h>
-#include <stdarg.h>
-
-/* AIX sys/poll.h does #define events reqevents, and other
- * wonderousness, so must include sys/poll before declaring
- * DBusPollFD
- */ 
-#ifdef HAVE_POLL
-#include <sys/poll.h>
-#endif
-
-#ifdef DBUS_WINCE
-/* Windows CE lacks some system functions (such as errno and clock).
-   We bring them in here.  */
-#include "dbus-sysdeps-wince-glue.h"
-#endif
-
-DBUS_BEGIN_DECLS
-
-#ifdef DBUS_WIN
-#define _DBUS_PATH_SEPARATOR ";"
-#else
-#define _DBUS_PATH_SEPARATOR ":"
-#endif
-
-/* Forward declarations */
-
-
-/** An opaque list type */
-typedef struct DBusList DBusList;
-
-/** Object that contains a list of credentials such as UNIX or Windows user ID */
-typedef struct DBusCredentials DBusCredentials;
-
-/** A wrapper around a pipe descriptor or handle */
-typedef struct DBusPipe DBusPipe;
-
-/**
- * @addtogroup DBusSysdeps
- *
- * @{
- */
-
-void _dbus_abort (void) _DBUS_GNUC_NORETURN;
-
-const char* _dbus_getenv (const char *varname);
-dbus_bool_t _dbus_setenv (const char *varname,
-			  const char *value);
-dbus_bool_t _dbus_clearenv (void);
-char **     _dbus_get_environment (void);
-
-/** A process ID */
-typedef unsigned long dbus_pid_t;
-/** A user ID */
-typedef unsigned long dbus_uid_t;
-/** A group ID */
-typedef unsigned long dbus_gid_t;
-
-/** an invalid PID used to represent an uninitialized dbus_pid_t field */
-#define DBUS_PID_UNSET ((dbus_pid_t) -1)
-/** an invalid UID used to represent an uninitialized dbus_uid_t field */
-#define DBUS_UID_UNSET ((dbus_uid_t) -1)
-/** an invalid GID used to represent an uninitialized dbus_gid_t field */
-#define DBUS_GID_UNSET ((dbus_gid_t) -1)
-
-/** an appropriate printf format for dbus_pid_t */
-#define DBUS_PID_FORMAT "%lu"
-/** an appropriate printf format for dbus_uid_t */
-#define DBUS_UID_FORMAT "%lu"
-/** an appropriate printf format for dbus_gid_t */
-#define DBUS_GID_FORMAT "%lu"
-
-
-/**
- * Socket interface
- *
- *  @todo Use for the file descriptors a struct
- *           - struct DBusSocket{ int d; }; -
- *        instead of int to get type-safety which 
- *        will be checked by the compiler.
- * 
- */
-
-dbus_bool_t _dbus_open_tcp_socket  (int              *fd,
-                                    DBusError        *error);
-dbus_bool_t _dbus_close_socket     (int               fd,
-                                    DBusError        *error);
-int         _dbus_read_socket      (int               fd,
-                                    DBusString       *buffer,
-                                    int               count);
-int         _dbus_write_socket     (int               fd,
-                                    const DBusString *buffer,
-                                    int               start,
-                                    int               len);
-int         _dbus_write_socket_two (int               fd,
-                                    const DBusString *buffer1,
-                                    int               start1,
-                                    int               len1,
-                                    const DBusString *buffer2,
-                                    int               start2,
-                                    int               len2);
-
-int _dbus_read_socket_with_unix_fds      (int               fd,
-                                          DBusString       *buffer,
-                                          int               count,
-                                          int              *fds,
-                                          int              *n_fds);
-int _dbus_write_socket_with_unix_fds     (int               fd,
-                                          const DBusString *buffer,
-                                          int               start,
-                                          int               len,
-                                          const int        *fds,
-                                          int               n_fds);
-int _dbus_write_socket_with_unix_fds_two (int               fd,
-                                          const DBusString *buffer1,
-                                          int               start1,
-                                          int               len1,
-                                          const DBusString *buffer2,
-                                          int               start2,
-                                          int               len2,
-                                          const int        *fds,
-                                          int               n_fds);
-
-dbus_bool_t _dbus_socket_is_invalid (int              fd);
-
-int _dbus_connect_tcp_socket  (const char     *host,
-                               const char     *port,
-                               const char     *family,
-                               DBusError      *error);
-int _dbus_connect_tcp_socket_with_nonce  (const char     *host,
-                                          const char     *port,
-                                          const char     *family,
-                                          const char     *noncefile,
-                                          DBusError      *error);
-int _dbus_listen_tcp_socket   (const char     *host,
-                               const char     *port,
-                               const char     *family,
-                               DBusString     *retport,
-                               int           **fds_p,
-                               DBusError      *error);
-int _dbus_accept              (int             listen_fd);
-
-
-dbus_bool_t _dbus_read_credentials_socket (int               client_fd,
-                                           DBusCredentials  *credentials,
-                                           DBusError        *error);
-dbus_bool_t _dbus_send_credentials_socket (int              server_fd,
-                                           DBusError       *error);
-
-dbus_bool_t _dbus_credentials_add_from_user            (DBusCredentials  *credentials,
-                                                        const DBusString *username);
-dbus_bool_t _dbus_credentials_add_from_current_process (DBusCredentials  *credentials);
-dbus_bool_t _dbus_append_user_from_current_process     (DBusString        *str);
-
-dbus_bool_t _dbus_parse_unix_user_from_config   (const DBusString  *username,
-                                                 dbus_uid_t        *uid_p);
-dbus_bool_t _dbus_parse_unix_group_from_config  (const DBusString  *groupname,
-                                                 dbus_gid_t        *gid_p);
-dbus_bool_t _dbus_unix_groups_from_uid          (dbus_uid_t         uid,
-                                                 dbus_gid_t       **group_ids,
-                                                 int               *n_group_ids);
-dbus_bool_t _dbus_unix_user_is_at_console       (dbus_uid_t         uid,
-                                                 DBusError         *error);
-dbus_bool_t _dbus_unix_user_is_process_owner    (dbus_uid_t         uid);
-dbus_bool_t _dbus_windows_user_is_process_owner (const char        *windows_sid);
-
-dbus_bool_t _dbus_append_keyring_directory_for_credentials (DBusString      *directory,
-                                                            DBusCredentials *credentials);
-
-void _dbus_daemon_publish_session_bus_address (const char* address);
-
-void _dbus_daemon_unpublish_session_bus_address (void);
-
-dbus_bool_t _dbus_socket_can_pass_unix_fd(int fd);
-
-/** Opaque type representing an atomically-modifiable integer
- * that can be used from multiple threads.
- */
-typedef struct DBusAtomic DBusAtomic;
-
-/**
- * An atomic integer safe to increment or decrement from multiple threads.
- */
-struct DBusAtomic
-{
-#ifdef DBUS_WIN
-  volatile long value; /**< Value of the atomic integer. */
-#else
-  volatile dbus_int32_t value; /**< Value of the atomic integer. */
-#endif
-};
-
-/* The value we get from autofoo is in the form of a cpp expression;
- * convert that to a conventional defined/undef switch. (We can't get
- * the conventional defined/undef because of multiarch builds only running
- * ./configure once, on Darwin.) */
-#if DBUS_HAVE_ATOMIC_INT_COND
-#   define DBUS_HAVE_ATOMIC_INT 1
-#else
-#   undef DBUS_HAVE_ATOMIC_INT
-#endif
-
-dbus_int32_t _dbus_atomic_inc (DBusAtomic *atomic);
-dbus_int32_t _dbus_atomic_dec (DBusAtomic *atomic);
-
-
-/* AIX uses different values for poll */
-
-#ifdef _AIX
-/** There is data to read */
-#define _DBUS_POLLIN      0x0001
-/** There is urgent data to read */
-#define _DBUS_POLLPRI     0x0004
-/** Writing now will not block */
-#define _DBUS_POLLOUT     0x0002
-/** Error condition */
-#define _DBUS_POLLERR     0x4000
-/** Hung up */
-#define _DBUS_POLLHUP     0x2000
-/** Invalid request: fd not open */
-#define _DBUS_POLLNVAL    0x8000
-#elif defined(__HAIKU__)
-/** There is data to read */
-#define _DBUS_POLLIN      0x0001
-/** Writing now will not block */
-#define _DBUS_POLLOUT     0x0002
-/** Error condition */
-#define _DBUS_POLLERR     0x0004
-/** There is urgent data to read */
-#define _DBUS_POLLPRI     0x0020
-/** Hung up */
-#define _DBUS_POLLHUP     0x0080
-/** Invalid request: fd not open */
-#define _DBUS_POLLNVAL    0x1000
-#else
-/** There is data to read */
-#define _DBUS_POLLIN      0x0001
-/** There is urgent data to read */
-#define _DBUS_POLLPRI     0x0002
-/** Writing now will not block */
-#define _DBUS_POLLOUT     0x0004
-/** Error condition */
-#define _DBUS_POLLERR     0x0008
-/** Hung up */
-#define _DBUS_POLLHUP     0x0010
-/** Invalid request: fd not open */
-#define _DBUS_POLLNVAL    0x0020
-#endif
-
-/**
- * A portable struct pollfd wrapper. 
- */
-typedef struct
-{
-  int fd;            /**< File descriptor */
-  short events;      /**< Events to poll for */
-  short revents;     /**< Events that occurred */
-} DBusPollFD;
-
-int _dbus_poll (DBusPollFD *fds,
-                int         n_fds,
-                int         timeout_milliseconds);
-
-void _dbus_sleep_milliseconds (int milliseconds);
-
-void _dbus_get_current_time (long *tv_sec,
-                             long *tv_usec);
-
-/**
- * directory interface
- */
-dbus_bool_t    _dbus_create_directory        (const DBusString *filename,
-                                              DBusError        *error);
-dbus_bool_t    _dbus_delete_directory        (const DBusString *filename,
-					      DBusError        *error);
-
-dbus_bool_t _dbus_concat_dir_and_file (DBusString       *dir,
-                                       const DBusString *next_component);
-dbus_bool_t _dbus_string_get_dirname  (const DBusString *filename,
-                                       DBusString       *dirname);
-dbus_bool_t _dbus_path_is_absolute    (const DBusString *filename);
-
-dbus_bool_t _dbus_get_standard_session_servicedirs (DBusList **dirs);
-dbus_bool_t _dbus_get_standard_system_servicedirs (DBusList **dirs);
-
-dbus_bool_t _dbus_append_system_config_file  (DBusString *str);
-dbus_bool_t _dbus_append_session_config_file (DBusString *str);
-
-/** Opaque type for reading a directory listing */
-typedef struct DBusDirIter DBusDirIter;
-
-DBusDirIter* _dbus_directory_open          (const DBusString *filename,
-                                            DBusError        *error);
-dbus_bool_t  _dbus_directory_get_next_file (DBusDirIter      *iter,
-                                            DBusString       *filename,
-                                            DBusError        *error);
-void         _dbus_directory_close         (DBusDirIter      *iter);
-
-dbus_bool_t  _dbus_check_dir_is_private_to_user    (DBusString *dir,
-                                                    DBusError *error);
-
-void _dbus_fd_set_close_on_exec (intptr_t fd);
-
-const char* _dbus_get_tmpdir      (void);
-
-/**
- * Random numbers 
- */
-void        _dbus_generate_pseudorandom_bytes_buffer (char *buffer,
-                                                      int   n_bytes);
-void        _dbus_generate_random_bytes_buffer (char       *buffer,
-                                                int         n_bytes);
-dbus_bool_t _dbus_generate_random_bytes        (DBusString *str,
-                                                int         n_bytes);
-dbus_bool_t _dbus_generate_random_ascii        (DBusString *str,
-                                                int         n_bytes);
-
-const char* _dbus_error_from_errno (int error_number);
-const char* _dbus_error_from_system_errno (void);
-
-void        _dbus_set_errno_to_zero                  (void);
-dbus_bool_t _dbus_get_is_errno_nonzero               (void);
-dbus_bool_t _dbus_get_is_errno_eagain_or_ewouldblock (void);
-dbus_bool_t _dbus_get_is_errno_enomem                (void);
-dbus_bool_t _dbus_get_is_errno_eintr                 (void);
-dbus_bool_t _dbus_get_is_errno_epipe                 (void);
-const char* _dbus_strerror_from_errno                (void);
-
-void _dbus_disable_sigpipe (void);
-
-
-void _dbus_exit (int code) _DBUS_GNUC_NORETURN;
-
-int _dbus_printf_string_upper_bound (const char *format,
-                                     va_list args);
-
-
-/**
- * Portable struct with stat() results
- */
-typedef struct
-{
-  unsigned long mode;  /**< File mode */
-  unsigned long nlink; /**< Number of hard links */
-  dbus_uid_t    uid;   /**< User owning file */
-  dbus_gid_t    gid;   /**< Group owning file */
-  unsigned long size;  /**< Size of file */
-  unsigned long atime; /**< Access time */
-  unsigned long mtime; /**< Modify time */
-  unsigned long ctime; /**< Creation time */
-} DBusStat;
-
-dbus_bool_t _dbus_stat             (const DBusString *filename,
-                                    DBusStat         *statbuf,
-                                    DBusError        *error);
-dbus_bool_t _dbus_full_duplex_pipe (int              *fd1,
-                                    int              *fd2,
-                                    dbus_bool_t       blocking,
-                                    DBusError        *error);
-
-void        _dbus_print_backtrace  (void);
-
-dbus_bool_t _dbus_become_daemon   (const DBusString *pidfile,
-                                   DBusPipe         *print_pid_pipe,
-                                   DBusError        *error,
-                                   dbus_bool_t       keep_umask);
-
-dbus_bool_t _dbus_verify_daemon_user    (const char *user);
-dbus_bool_t _dbus_change_to_daemon_user (const char *user,
-                                         DBusError  *error);
-
-dbus_bool_t _dbus_write_pid_to_file_and_pipe (const DBusString *pidfile,
-                                              DBusPipe         *print_pid_pipe,
-                                              dbus_pid_t        pid_to_write,
-                                              DBusError        *error);
-
-dbus_bool_t _dbus_command_for_pid (unsigned long  pid,
-                                   DBusString    *str,
-                                   int            max_len,
-                                   DBusError     *error);
-
-/** A UNIX signal handler */
-typedef void (* DBusSignalHandler) (int sig);
-
-void _dbus_set_signal_handler (int               sig,
-                               DBusSignalHandler handler);
-
-dbus_bool_t _dbus_user_at_console (const char *username,
-                                   DBusError  *error);
-
-void _dbus_init_system_log (void);
-
-typedef enum {
-  DBUS_SYSTEM_LOG_INFO,
-  DBUS_SYSTEM_LOG_SECURITY,
-  DBUS_SYSTEM_LOG_FATAL
-} DBusSystemLogSeverity;
-
-void _dbus_system_log (DBusSystemLogSeverity severity, const char *msg, ...) _DBUS_GNUC_PRINTF (2, 3);
-void _dbus_system_logv (DBusSystemLogSeverity severity, const char *msg, va_list args);
-
-/* Define DBUS_VA_COPY() to do the right thing for copying va_list variables.
- * config.h may have already defined DBUS_VA_COPY as va_copy or __va_copy.
- */
-#if !defined (DBUS_VA_COPY)
-#  if defined (__GNUC__) && defined (__PPC__) && (defined (_CALL_SYSV) || defined (_WIN32))
-#    define DBUS_VA_COPY(ap1, ap2)   (*(ap1) = *(ap2))
-#  elif defined (DBUS_VA_COPY_AS_ARRAY)
-#    define DBUS_VA_COPY(ap1, ap2)   memcpy ((ap1), (ap2), sizeof (va_list))
-#  else /* va_list is a pointer */
-#    define DBUS_VA_COPY(ap1, ap2)   ((ap1) = (ap2))
-#  endif /* va_list is a pointer */
-#endif /* !DBUS_VA_COPY */
-
-
-/**
- * Casts a primitive C type to a byte array and then indexes
- * a particular byte of the array.
- */
-#define _DBUS_BYTE_OF_PRIMITIVE(p, i) \
-    (((const char*)&(p))[(i)])
-/** On x86 there is an 80-bit FPU, and if you do "a == b" it may have a
- * or b in an 80-bit register, thus failing to compare the two 64-bit
- * doubles for bitwise equality. So this macro compares the two doubles
- * bitwise.
- */
-#define _DBUS_DOUBLES_BITWISE_EQUAL(a, b)                                       \
-     (_DBUS_BYTE_OF_PRIMITIVE (a, 0) == _DBUS_BYTE_OF_PRIMITIVE (b, 0) &&       \
-      _DBUS_BYTE_OF_PRIMITIVE (a, 1) == _DBUS_BYTE_OF_PRIMITIVE (b, 1) &&       \
-      _DBUS_BYTE_OF_PRIMITIVE (a, 2) == _DBUS_BYTE_OF_PRIMITIVE (b, 2) &&       \
-      _DBUS_BYTE_OF_PRIMITIVE (a, 3) == _DBUS_BYTE_OF_PRIMITIVE (b, 3) &&       \
-      _DBUS_BYTE_OF_PRIMITIVE (a, 4) == _DBUS_BYTE_OF_PRIMITIVE (b, 4) &&       \
-      _DBUS_BYTE_OF_PRIMITIVE (a, 5) == _DBUS_BYTE_OF_PRIMITIVE (b, 5) &&       \
-      _DBUS_BYTE_OF_PRIMITIVE (a, 6) == _DBUS_BYTE_OF_PRIMITIVE (b, 6) &&       \
-      _DBUS_BYTE_OF_PRIMITIVE (a, 7) == _DBUS_BYTE_OF_PRIMITIVE (b, 7))
-
-dbus_bool_t _dbus_get_autolaunch_address (DBusString *address, 
-					  DBusError *error);
-
-dbus_bool_t _dbus_lookup_session_address (dbus_bool_t *supported,
-                                          DBusString  *address,
-                                          DBusError   *error);
-
-/** Type representing a universally unique ID
- * @todo rename to UUID instead of GUID
- */
-typedef union DBusGUID DBusGUID;
-
-dbus_bool_t _dbus_read_local_machine_uuid   (DBusGUID         *machine_id,
-                                             dbus_bool_t       create_if_not_found,
-                                             DBusError        *error);
-
-/**
- * Initialize threads as in dbus_threads_init_default(), appropriately
- * for the platform.
- * @returns #FALSE if no memory
- */
-dbus_bool_t _dbus_threads_init_platform_specific (void);
-
-dbus_bool_t _dbus_split_paths_and_append (DBusString *dirs, 
-                                          const char *suffix, 
-                                          DBusList **dir_list);
-
-unsigned long _dbus_pid_for_log (void);
-
-/* FIXME move back to dbus-sysdeps-unix.h probably -
- * the PID file handling just needs a little more abstraction
- * in the bus daemon first.
- */
-dbus_pid_t    _dbus_getpid (void);
-
-dbus_bool_t _dbus_change_to_daemon_user (const char *user,
-                                         DBusError  *error);
-
-void _dbus_flush_caches (void);
-
-/*
- * replaces the term DBUS_PREFIX in configure_time_path by the
- * current dbus installation directory. On unix this function is a noop
- *
- * @param configure_time_path
- * @return real path
- */
-const char *
-_dbus_replace_install_prefix (const char *configure_time_path);
-
-/** @} */
-
-DBUS_END_DECLS
-
-#endif /* DBUS_SYSDEPS_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-test.h b/lib-x86-32/include/dbus-1/dbus/dbus-test.h
deleted file mode 100644
index 0238b0ce..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-test.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-test.h  Declarations of test functions.
- *
- * Copyright (C) 2002  Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef DBUS_TEST_H
-#define DBUS_TEST_H
-
-#include <dbus/dbus-types.h>
-#include <dbus/dbus-string.h>
-#include <dbus/dbus-marshal-validate.h>
-
-dbus_bool_t _dbus_hash_test              (void);
-dbus_bool_t _dbus_dict_test              (void);
-dbus_bool_t _dbus_list_test              (void);
-dbus_bool_t _dbus_marshal_test           (void);
-dbus_bool_t _dbus_marshal_recursive_test (void);
-dbus_bool_t _dbus_marshal_byteswap_test  (void);
-dbus_bool_t _dbus_marshal_header_test    (void);
-dbus_bool_t _dbus_marshal_validate_test  (void);
-dbus_bool_t _dbus_misc_test              (void);
-dbus_bool_t _dbus_signature_test         (void);
-dbus_bool_t _dbus_mem_pool_test          (void);
-dbus_bool_t _dbus_string_test            (void);
-dbus_bool_t _dbus_address_test           (void);
-dbus_bool_t _dbus_server_test            (void);
-dbus_bool_t _dbus_message_test           (const char *test_data_dir);
-dbus_bool_t _dbus_auth_test              (const char *test_data_dir);
-dbus_bool_t _dbus_md5_test               (void);
-dbus_bool_t _dbus_sha_test               (const char *test_data_dir);
-dbus_bool_t _dbus_keyring_test           (void);
-dbus_bool_t _dbus_data_slot_test         (void);
-dbus_bool_t _dbus_sysdeps_test           (void);
-dbus_bool_t _dbus_spawn_test             (const char *test_data_dir);
-dbus_bool_t _dbus_userdb_test            (const char *test_data_dir);
-dbus_bool_t _dbus_memory_test            (void);
-dbus_bool_t _dbus_object_tree_test       (void);
-dbus_bool_t _dbus_pending_call_test      (const char *test_data_dir);
-dbus_bool_t _dbus_credentials_test       (const char *test_data_dir);
-
-void        dbus_internal_do_not_use_run_tests         (const char          *test_data_dir,
-							const char          *specific_test);
-dbus_bool_t dbus_internal_do_not_use_try_message_file  (const DBusString    *filename,
-                                                        DBusValidity         expected_validity);
-dbus_bool_t dbus_internal_do_not_use_try_message_data  (const DBusString    *data,
-                                                        DBusValidity         expected_validity);
-dbus_bool_t dbus_internal_do_not_use_load_message_file (const DBusString    *filename,
-                                                        DBusString          *data);
-
-
-/* returns FALSE on fatal failure */
-typedef dbus_bool_t (* DBusForeachMessageFileFunc) (const DBusString   *filename,
-                                                    DBusValidity        expected_validity,
-                                                    void               *data);
-
-dbus_bool_t dbus_internal_do_not_use_foreach_message_file (const char                 *test_data_dir,
-                                                           DBusForeachMessageFileFunc  func,
-                                                           void                       *user_data);
-dbus_bool_t dbus_internal_do_not_use_generate_bodies    (int           sequence,
-                                                         int           byte_order,
-                                                         DBusString   *signature,
-                                                         DBusString   *body);
-
-
-#endif /* DBUS_TEST_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-threads-internal.h b/lib-x86-32/include/dbus-1/dbus/dbus-threads-internal.h
deleted file mode 100644
index 11f9ce20..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-threads-internal.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-threads-internal.h  D-Bus thread primitives
- *
- * Copyright (C) 2002, 2005 Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#ifndef DBUS_THREADS_INTERNAL_H
-#define DBUS_THREADS_INTERNAL_H
-
-#include <dbus/dbus-macros.h>
-#include <dbus/dbus-types.h>
-#include <dbus/dbus-threads.h>
-
-DBUS_BEGIN_DECLS
-
-DBusMutex*   _dbus_mutex_new                 (void);
-void         _dbus_mutex_free                (DBusMutex         *mutex);
-void         _dbus_mutex_lock                (DBusMutex         *mutex);
-void         _dbus_mutex_unlock              (DBusMutex         *mutex);
-void         _dbus_mutex_new_at_location     (DBusMutex        **location_p);
-void         _dbus_mutex_free_at_location    (DBusMutex        **location_p);
-
-DBusCondVar* _dbus_condvar_new               (void);
-void         _dbus_condvar_free              (DBusCondVar       *cond);
-void         _dbus_condvar_wait              (DBusCondVar       *cond,
-                                              DBusMutex         *mutex);
-dbus_bool_t  _dbus_condvar_wait_timeout      (DBusCondVar       *cond,
-                                              DBusMutex         *mutex,
-                                              int                timeout_milliseconds);
-void         _dbus_condvar_wake_one          (DBusCondVar       *cond);
-void         _dbus_condvar_wake_all          (DBusCondVar       *cond);
-void         _dbus_condvar_new_at_location   (DBusCondVar      **location_p);
-void         _dbus_condvar_free_at_location  (DBusCondVar      **location_p);
-
-DBUS_END_DECLS
-
-#endif /* DBUS_THREADS_INTERNAL_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-threads.h b/lib-x86-32/include/dbus-1/dbus/dbus-threads.h
deleted file mode 100644
index ba07ca57..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-threads.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-threads.h  D-Bus threads handling
- *
- * Copyright (C) 2002  Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#if !defined (DBUS_INSIDE_DBUS_H) && !defined (DBUS_COMPILATION)
-#error "Only <dbus/dbus.h> can be included directly, this file may disappear or change contents."
-#endif
-
-#ifndef DBUS_THREADS_H
-#define DBUS_THREADS_H
-
-#include <dbus/dbus-macros.h>
-#include <dbus/dbus-types.h>
-
-DBUS_BEGIN_DECLS
-
-/**
- * @addtogroup DBusThreads
- * @{
- */
-
-/** An opaque mutex type provided by the #DBusThreadFunctions implementation installed by dbus_threads_init(). */
-typedef struct DBusMutex DBusMutex;
-/** An opaque condition variable type provided by the #DBusThreadFunctions implementation installed by dbus_threads_init(). */
-typedef struct DBusCondVar DBusCondVar;
-
-/** Deprecated, provide DBusRecursiveMutexNewFunction instead. */
-typedef DBusMutex*  (* DBusMutexNewFunction)    (void);
-/** Deprecated, provide DBusRecursiveMutexFreeFunction instead. */
-typedef void        (* DBusMutexFreeFunction)   (DBusMutex *mutex);
-/** Deprecated, provide DBusRecursiveMutexLockFunction instead. Return value is lock success, but gets ignored in practice. */
-typedef dbus_bool_t (* DBusMutexLockFunction)   (DBusMutex *mutex);
-/** Deprecated, provide DBusRecursiveMutexUnlockFunction instead. Return value is unlock success, but gets ignored in practice. */
-typedef dbus_bool_t (* DBusMutexUnlockFunction) (DBusMutex *mutex);
-
-/** Creates a new recursively-lockable mutex, or returns #NULL if not
- * enough memory.  Can only fail due to lack of memory.  Found in
- * #DBusThreadFunctions. Do not just use PTHREAD_MUTEX_RECURSIVE for
- * this, because it does not save/restore the recursion count when
- * waiting on a condition. libdbus requires the Java-style behavior
- * where the mutex is fully unlocked to wait on a condition.
- */
-typedef DBusMutex*  (* DBusRecursiveMutexNewFunction)    (void);
-/** Frees a recursively-lockable mutex.  Found in #DBusThreadFunctions.
- */
-typedef void        (* DBusRecursiveMutexFreeFunction)   (DBusMutex *mutex);
-/** Locks a recursively-lockable mutex.  Found in #DBusThreadFunctions.
- * Can only fail due to lack of memory.
- */
-typedef void        (* DBusRecursiveMutexLockFunction)   (DBusMutex *mutex);
-/** Unlocks a recursively-lockable mutex.  Found in #DBusThreadFunctions.
- * Can only fail due to lack of memory.
- */
-typedef void        (* DBusRecursiveMutexUnlockFunction) (DBusMutex *mutex);
-
-/** Creates a new condition variable.  Found in #DBusThreadFunctions.
- * Can only fail (returning #NULL) due to lack of memory.
- */
-typedef DBusCondVar*  (* DBusCondVarNewFunction)         (void);
-/** Frees a condition variable.  Found in #DBusThreadFunctions.
- */
-typedef void          (* DBusCondVarFreeFunction)        (DBusCondVar *cond);
-
-/** Waits on a condition variable.  Found in
- * #DBusThreadFunctions. Must work with either a recursive or
- * nonrecursive mutex, whichever the thread implementation
- * provides. Note that PTHREAD_MUTEX_RECURSIVE does not work with
- * condition variables (does not save/restore the recursion count) so
- * don't try using simply pthread_cond_wait() and a
- * PTHREAD_MUTEX_RECURSIVE to implement this, it won't work right.
- *
- * Has no error conditions. Must succeed if it returns.
- */
-typedef void          (* DBusCondVarWaitFunction)        (DBusCondVar *cond,
-							  DBusMutex   *mutex);
-
-/** Waits on a condition variable with a timeout.  Found in
- *  #DBusThreadFunctions. Returns #TRUE if the wait did not
- *  time out, and #FALSE if it did.
- *
- * Has no error conditions. Must succeed if it returns. 
- */
-typedef dbus_bool_t   (* DBusCondVarWaitTimeoutFunction) (DBusCondVar *cond,
-							  DBusMutex   *mutex,
-							  int          timeout_milliseconds);
-/** Wakes one waiting thread on a condition variable.  Found in #DBusThreadFunctions.
- *
- * Has no error conditions. Must succeed if it returns.
- */
-typedef void          (* DBusCondVarWakeOneFunction) (DBusCondVar *cond);
-
-/** Wakes all waiting threads on a condition variable.  Found in #DBusThreadFunctions.
- *
- * Has no error conditions. Must succeed if it returns.
- */
-typedef void          (* DBusCondVarWakeAllFunction) (DBusCondVar *cond);
-
-/**
- * Flags indicating which functions are present in #DBusThreadFunctions. Used to allow
- * the library to detect older callers of dbus_threads_init() if new possible functions
- * are added to #DBusThreadFunctions.
- */
-typedef enum 
-{
-  DBUS_THREAD_FUNCTIONS_MUTEX_NEW_MASK      = 1 << 0,
-  DBUS_THREAD_FUNCTIONS_MUTEX_FREE_MASK     = 1 << 1,
-  DBUS_THREAD_FUNCTIONS_MUTEX_LOCK_MASK     = 1 << 2,
-  DBUS_THREAD_FUNCTIONS_MUTEX_UNLOCK_MASK   = 1 << 3,
-  DBUS_THREAD_FUNCTIONS_CONDVAR_NEW_MASK    = 1 << 4,
-  DBUS_THREAD_FUNCTIONS_CONDVAR_FREE_MASK   = 1 << 5,
-  DBUS_THREAD_FUNCTIONS_CONDVAR_WAIT_MASK   = 1 << 6,
-  DBUS_THREAD_FUNCTIONS_CONDVAR_WAIT_TIMEOUT_MASK   = 1 << 7,
-  DBUS_THREAD_FUNCTIONS_CONDVAR_WAKE_ONE_MASK = 1 << 8,
-  DBUS_THREAD_FUNCTIONS_CONDVAR_WAKE_ALL_MASK = 1 << 9,
-  DBUS_THREAD_FUNCTIONS_RECURSIVE_MUTEX_NEW_MASK    = 1 << 10,
-  DBUS_THREAD_FUNCTIONS_RECURSIVE_MUTEX_FREE_MASK   = 1 << 11,
-  DBUS_THREAD_FUNCTIONS_RECURSIVE_MUTEX_LOCK_MASK   = 1 << 12,
-  DBUS_THREAD_FUNCTIONS_RECURSIVE_MUTEX_UNLOCK_MASK = 1 << 13,
-  DBUS_THREAD_FUNCTIONS_ALL_MASK     = (1 << 14) - 1
-} DBusThreadFunctionsMask;
-
-/**
- * Functions that must be implemented to make the D-Bus library
- * thread-aware. The recursive mutex functions should be specified
- * rather than the old, deprecated nonrecursive ones.
- *
- * The condition variable functions have to work with recursive
- * mutexes if you provide those, or with nonrecursive mutexes if you
- * provide those.
- *
- * If implementing threads using pthreads, be aware that
- * PTHREAD_MUTEX_RECURSIVE is broken in combination with condition
- * variables. libdbus relies on the Java-style behavior that when
- * waiting on a condition, the recursion count is saved and restored,
- * and the mutex is completely unlocked, not just decremented one
- * level of recursion.
- *
- * Thus with pthreads you probably have to roll your own emulated
- * recursive mutexes, you can't use PTHREAD_MUTEX_RECURSIVE. This is
- * what dbus_threads_init_default() does on platforms that use
- * pthreads.
- */
-typedef struct
-{
-  unsigned int mask; /**< Mask indicating which functions are present. */
-
-  DBusMutexNewFunction mutex_new; /**< Function to create a mutex; optional and deprecated. */
-  DBusMutexFreeFunction mutex_free; /**< Function to free a mutex; optional and deprecated. */
-  DBusMutexLockFunction mutex_lock; /**< Function to lock a mutex; optional and deprecated. */
-  DBusMutexUnlockFunction mutex_unlock; /**< Function to unlock a mutex; optional and deprecated. */
-
-  DBusCondVarNewFunction condvar_new; /**< Function to create a condition variable */
-  DBusCondVarFreeFunction condvar_free; /**< Function to free a condition variable */
-  DBusCondVarWaitFunction condvar_wait; /**< Function to wait on a condition */
-  DBusCondVarWaitTimeoutFunction condvar_wait_timeout; /**< Function to wait on a condition with a timeout */
-  DBusCondVarWakeOneFunction condvar_wake_one; /**< Function to wake one thread waiting on the condition */
-  DBusCondVarWakeAllFunction condvar_wake_all; /**< Function to wake all threads waiting on the condition */
- 
-  DBusRecursiveMutexNewFunction recursive_mutex_new; /**< Function to create a recursive mutex */
-  DBusRecursiveMutexFreeFunction recursive_mutex_free; /**< Function to free a recursive mutex */
-  DBusRecursiveMutexLockFunction recursive_mutex_lock; /**< Function to lock a recursive mutex */
-  DBusRecursiveMutexUnlockFunction recursive_mutex_unlock; /**< Function to unlock a recursive mutex */
-
-  void (* padding1) (void); /**< Reserved for future expansion */
-  void (* padding2) (void); /**< Reserved for future expansion */
-  void (* padding3) (void); /**< Reserved for future expansion */
-  void (* padding4) (void); /**< Reserved for future expansion */
-  
-} DBusThreadFunctions;
-
-DBUS_EXPORT
-dbus_bool_t  dbus_threads_init         (const DBusThreadFunctions *functions);
-DBUS_EXPORT
-dbus_bool_t  dbus_threads_init_default (void);
-
-/** @} */
-
-DBUS_END_DECLS
-
-#endif /* DBUS_THREADS_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-timeout.h b/lib-x86-32/include/dbus-1/dbus/dbus-timeout.h
deleted file mode 100644
index d0a8af4a..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-timeout.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-timeout.h DBusTimeout internal interfaces
- *
- * Copyright (C) 2003  CodeFactory AB
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#ifndef DBUS_TIMEOUT_H
-#define DBUS_TIMEOUT_H
-
-#include <dbus/dbus-connection.h>
-#include <dbus/dbus-internals.h>
-
-DBUS_BEGIN_DECLS
-
-/**
- * @addtogroup DBusTimeoutInternals
- * @{
- */
-
-/* Public methods on DBusTimeout are in dbus-connection.h */
-
-typedef struct DBusTimeoutList DBusTimeoutList;
-
-/** function to run when the timeout is handled */
-typedef dbus_bool_t (* DBusTimeoutHandler) (void *data);
-
-DBusTimeout* _dbus_timeout_new          (int                 interval,
-                                         DBusTimeoutHandler  handler,
-                                         void               *data,
-                                         DBusFreeFunction    free_data_function);
-DBusTimeout* _dbus_timeout_ref          (DBusTimeout        *timeout);
-void         _dbus_timeout_unref        (DBusTimeout        *timeout);
-void         _dbus_timeout_set_interval (DBusTimeout        *timeout,
-                                         int                 interval);
-void         _dbus_timeout_set_enabled  (DBusTimeout        *timeout,
-                                         dbus_bool_t         enabled);
-
-DBusTimeoutList *_dbus_timeout_list_new            (void);
-void             _dbus_timeout_list_free           (DBusTimeoutList           *timeout_list);
-dbus_bool_t      _dbus_timeout_list_set_functions  (DBusTimeoutList           *timeout_list,
-						    DBusAddTimeoutFunction     add_function,
-						    DBusRemoveTimeoutFunction  remove_function,
-                                                    DBusTimeoutToggledFunction toggled_function,
-						    void                      *data,
-						    DBusFreeFunction           free_data_function);
-dbus_bool_t      _dbus_timeout_list_add_timeout    (DBusTimeoutList           *timeout_list,
-						    DBusTimeout               *timeout);
-void             _dbus_timeout_list_remove_timeout (DBusTimeoutList           *timeout_list,
-						    DBusTimeout               *timeout);
-void             _dbus_timeout_list_toggle_timeout (DBusTimeoutList           *timeout_list,
-                                                    DBusTimeout               *timeout,
-                                                    dbus_bool_t                enabled);
-
-
-/** @} */
-
-DBUS_END_DECLS
-
-#endif /* DBUS_TIMEOUT_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-transport-protected.h b/lib-x86-32/include/dbus-1/dbus/dbus-transport-protected.h
deleted file mode 100644
index 44b9d785..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-transport-protected.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-transport-protected.h Used by subclasses of DBusTransport object (internal to D-Bus implementation)
- *
- * Copyright (C) 2002, 2004  Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#ifndef DBUS_TRANSPORT_PROTECTED_H
-#define DBUS_TRANSPORT_PROTECTED_H
-
-#include <dbus/dbus-internals.h>
-#include <dbus/dbus-errors.h>
-#include <dbus/dbus-transport.h>
-#include <dbus/dbus-message-internal.h>
-#include <dbus/dbus-auth.h>
-#include <dbus/dbus-resources.h>
-
-DBUS_BEGIN_DECLS
-
-typedef struct DBusTransportVTable DBusTransportVTable;
-
-/**
- * The virtual table that must be implemented to
- * create a new kind of transport.
- */
-struct DBusTransportVTable
-{
-  void        (* finalize)              (DBusTransport *transport);
-  /**< The finalize method must free the transport. */
-
-  dbus_bool_t (* handle_watch)          (DBusTransport *transport,
-                                         DBusWatch     *watch,
-                                         unsigned int   flags);
-  /**< The handle_watch method handles reading/writing
-   * data as indicated by the flags.
-   */
-
-  void        (* disconnect)            (DBusTransport *transport);
-  /**< Disconnect this transport. */
-
-  dbus_bool_t (* connection_set)        (DBusTransport *transport);
-  /**< Called when transport->connection has been filled in */
-
-  void        (* do_iteration)          (DBusTransport *transport,
-                                         unsigned int   flags,
-                                         int            timeout_milliseconds);
-  /**< Called to do a single "iteration" (block on select/poll
-   * followed by reading or writing data).
-   */
-
-  void        (* live_messages_changed) (DBusTransport *transport);
-  /**< Outstanding messages counter changed */
-
-  dbus_bool_t (* get_socket_fd) (DBusTransport *transport,
-                                 int           *fd_p);
-  /**< Get socket file descriptor */
-};
-
-/**
- * Object representing a transport such as a socket.
- * A transport can shuttle messages from point A to point B,
- * and is the backend for a #DBusConnection.
- *
- */
-struct DBusTransport
-{
-  int refcount;                               /**< Reference count. */
-
-  const DBusTransportVTable *vtable;          /**< Virtual methods for this instance. */
-
-  DBusConnection *connection;                 /**< Connection owning this transport. */
-
-  DBusMessageLoader *loader;                  /**< Message-loading buffer. */
-
-  DBusAuth *auth;                             /**< Authentication conversation */
-
-  DBusCredentials *credentials;               /**< Credentials of other end read from the socket */  
-
-  long max_live_messages_size;                /**< Max total size of received messages. */
-  long max_live_messages_unix_fds;            /**< Max total unix fds of received messages. */
-
-  DBusCounter *live_messages;                 /**< Counter for size/unix fds of all live messages. */
-
-  char *address;                              /**< Address of the server we are connecting to (#NULL for the server side of a transport) */
-
-  char *expected_guid;                        /**< GUID we expect the server to have, #NULL on server side or if we don't have an expectation */
-  
-  DBusAllowUnixUserFunction unix_user_function; /**< Function for checking whether a user is authorized. */
-  void *unix_user_data;                         /**< Data for unix_user_function */
-  
-  DBusFreeFunction free_unix_user_data;         /**< Function to free unix_user_data */
-
-  DBusAllowWindowsUserFunction windows_user_function; /**< Function for checking whether a user is authorized. */
-  void *windows_user_data;                            /**< Data for windows_user_function */
-  
-  DBusFreeFunction free_windows_user_data;            /**< Function to free windows_user_data */
-  
-  unsigned int disconnected : 1;              /**< #TRUE if we are disconnected. */
-  unsigned int authenticated : 1;             /**< Cache of auth state; use _dbus_transport_get_is_authenticated() to query value */
-  unsigned int send_credentials_pending : 1;  /**< #TRUE if we need to send credentials */
-  unsigned int receive_credentials_pending : 1; /**< #TRUE if we need to receive credentials */
-  unsigned int is_server : 1;                 /**< #TRUE if on the server side */
-  unsigned int unused_bytes_recovered : 1;    /**< #TRUE if we've recovered unused bytes from auth */
-  unsigned int allow_anonymous : 1;           /**< #TRUE if an anonymous client can connect */
-};
-
-dbus_bool_t _dbus_transport_init_base     (DBusTransport             *transport,
-                                           const DBusTransportVTable *vtable,
-                                           const DBusString          *server_guid,
-                                           const DBusString          *address);
-void        _dbus_transport_finalize_base (DBusTransport             *transport);
-
-
-typedef enum
-{
-  DBUS_TRANSPORT_OPEN_NOT_HANDLED,    /**< we aren't in charge of this address type */
-  DBUS_TRANSPORT_OPEN_OK,             /**< we set up the listen */
-  DBUS_TRANSPORT_OPEN_BAD_ADDRESS,    /**< malformed address */
-  DBUS_TRANSPORT_OPEN_DID_NOT_CONNECT /**< well-formed address but failed to set it up */
-} DBusTransportOpenResult;
-
-DBusTransportOpenResult _dbus_transport_open_platform_specific (DBusAddressEntry  *entry,
-                                                                DBusTransport    **transport_p,
-                                                                DBusError         *error);
-
-#define DBUS_TRANSPORT_CAN_SEND_UNIX_FD(x)      \
-  _dbus_auth_get_unix_fd_negotiated((x)->auth)
-
-DBUS_END_DECLS
-
-#endif /* DBUS_TRANSPORT_PROTECTED_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-transport-socket.h b/lib-x86-32/include/dbus-1/dbus/dbus-transport-socket.h
deleted file mode 100644
index 8aefae37..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-transport-socket.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-transport-socket.h Socket subclasses of DBusTransport
- *
- * Copyright (C) 2002, 2006  Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#ifndef DBUS_TRANSPORT_SOCKET_H
-#define DBUS_TRANSPORT_SOCKET_H
-
-#include <dbus/dbus-transport-protected.h>
-
-DBUS_BEGIN_DECLS
-
-DBusTransport*          _dbus_transport_new_for_socket     (int                fd,
-                                                            const DBusString  *server_guid,
-                                                            const DBusString  *address);
-DBusTransport*          _dbus_transport_new_for_tcp_socket (const char        *host,
-                                                            const char        *port,
-                                                            const char        *family,
-                                                            const char        *noncefile,
-                                                            DBusError         *error);
-DBusTransportOpenResult _dbus_transport_open_socket        (DBusAddressEntry  *entry,
-                                                            DBusTransport    **transport_p,
-                                                            DBusError         *error);
-
-
-
-DBUS_END_DECLS
-
-#endif /* DBUS_TRANSPORT_SOCKET_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-transport-unix.h b/lib-x86-32/include/dbus-1/dbus/dbus-transport-unix.h
deleted file mode 100644
index 783a8313..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-transport-unix.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-transport-unix.h UNIX socket subclasses of DBusTransport
- *
- * Copyright (C) 2002  Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#ifndef DBUS_TRANSPORT_UNIX_H
-#define DBUS_TRANSPORT_UNIX_H
-
-#include <dbus/dbus-transport.h>
-
-DBUS_BEGIN_DECLS
-
-DBusTransport* _dbus_transport_new_for_domain_socket (const char       *path,
-                                                      dbus_bool_t       abstract,
-                                                      DBusError        *error);
-
-
-DBUS_END_DECLS
-
-#endif /* DBUS_TRANSPORT_UNIX_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-transport-win.h b/lib-x86-32/include/dbus-1/dbus/dbus-transport-win.h
deleted file mode 100644
index af997a27..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-transport-win.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-transport-win.h Windows socket subclasses of DBusTransport
- *
- * Copyright (C) 2002  Red Hat Inc.
- * Copyright (C) 2007 Ralf Habacker <ralf.habacker@freenet.de>
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#ifndef DBUS_TRANSPORT_WIN_H
-#define DBUS_TRANSPORT_WIN_H
-
-#include <dbus/dbus-transport.h>
-
-DBUS_BEGIN_DECLS
-
-DBUS_END_DECLS
-
-#endif /* DBUS_TRANSPORT_WIN_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-transport.h b/lib-x86-32/include/dbus-1/dbus/dbus-transport.h
deleted file mode 100644
index 0db048a2..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-transport.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-transport.h DBusTransport object (internal to D-BUS implementation)
- *
- * Copyright (C) 2002, 2004  Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#ifndef DBUS_TRANSPORT_H
-#define DBUS_TRANSPORT_H
-
-#include <dbus/dbus-internals.h>
-#include <dbus/dbus-connection.h>
-#include <dbus/dbus-protocol.h>
-#include <dbus/dbus-address.h>
-
-DBUS_BEGIN_DECLS
-
-typedef struct DBusTransport DBusTransport;
-
-DBusTransport*     _dbus_transport_open                   (DBusAddressEntry           *entry,
-                                                           DBusError                  *error);
-DBusTransport*     _dbus_transport_ref                    (DBusTransport              *transport);
-void               _dbus_transport_unref                  (DBusTransport              *transport);
-void               _dbus_transport_disconnect             (DBusTransport              *transport);
-dbus_bool_t        _dbus_transport_get_is_connected       (DBusTransport              *transport);
-dbus_bool_t        _dbus_transport_get_is_authenticated   (DBusTransport              *transport);
-dbus_bool_t        _dbus_transport_get_is_anonymous       (DBusTransport              *transport);
-dbus_bool_t        _dbus_transport_can_pass_unix_fd       (DBusTransport              *transport);
-
-const char*        _dbus_transport_get_address            (DBusTransport              *transport);
-const char*        _dbus_transport_get_server_id          (DBusTransport              *transport);
-dbus_bool_t        _dbus_transport_handle_watch           (DBusTransport              *transport,
-                                                           DBusWatch                  *watch,
-                                                           unsigned int                condition);
-dbus_bool_t        _dbus_transport_set_connection         (DBusTransport              *transport,
-                                                           DBusConnection             *connection);
-void               _dbus_transport_do_iteration           (DBusTransport              *transport,
-                                                           unsigned int                flags,
-                                                           int                         timeout_milliseconds);
-DBusDispatchStatus _dbus_transport_get_dispatch_status    (DBusTransport              *transport);
-dbus_bool_t        _dbus_transport_queue_messages         (DBusTransport              *transport);
-
-void               _dbus_transport_set_max_message_size   (DBusTransport              *transport,
-                                                           long                        size);
-long               _dbus_transport_get_max_message_size   (DBusTransport              *transport);
-void               _dbus_transport_set_max_received_size  (DBusTransport              *transport,
-                                                           long                        size);
-long               _dbus_transport_get_max_received_size  (DBusTransport              *transport);
-
-void               _dbus_transport_set_max_message_unix_fds (DBusTransport              *transport,
-                                                             long                        n);
-long               _dbus_transport_get_max_message_unix_fds (DBusTransport              *transport);
-void               _dbus_transport_set_max_received_unix_fds(DBusTransport              *transport,
-                                                             long                        n);
-long               _dbus_transport_get_max_received_unix_fds(DBusTransport              *transport);
-
-dbus_bool_t        _dbus_transport_get_socket_fd          (DBusTransport              *transport,
-                                                           int                        *fd_p);
-dbus_bool_t        _dbus_transport_get_unix_user          (DBusTransport              *transport,
-                                                           unsigned long              *uid);
-dbus_bool_t        _dbus_transport_get_unix_process_id     (DBusTransport              *transport,
-                                                           unsigned long              *pid);
-dbus_bool_t        _dbus_transport_get_adt_audit_session_data (DBusTransport              *transport,
-                                                               void                      **data,
-                                                               int                        *data_size);
-void               _dbus_transport_set_unix_user_function (DBusTransport              *transport,
-                                                           DBusAllowUnixUserFunction   function,
-                                                           void                       *data,
-                                                           DBusFreeFunction            free_data_function,
-                                                           void                      **old_data,
-                                                           DBusFreeFunction           *old_free_data_function);
-dbus_bool_t        _dbus_transport_get_windows_user       (DBusTransport              *transport,
-                                                           char                      **windows_sid_p);
-void               _dbus_transport_set_windows_user_function (DBusTransport              *transport,
-                                                              DBusAllowWindowsUserFunction   function,
-                                                              void                       *data,
-                                                              DBusFreeFunction            free_data_function,
-                                                              void                      **old_data,
-                                                              DBusFreeFunction           *old_free_data_function);
-dbus_bool_t        _dbus_transport_set_auth_mechanisms    (DBusTransport              *transport,
-                                                           const char                **mechanisms);
-void               _dbus_transport_set_allow_anonymous    (DBusTransport              *transport,
-                                                           dbus_bool_t                 value);
-
-
-DBUS_END_DECLS
-
-#endif /* DBUS_TRANSPORT_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-types.h b/lib-x86-32/include/dbus-1/dbus/dbus-types.h
deleted file mode 100644
index 54f348f3..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-types.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-types.h  types such as dbus_bool_t
- *
- * Copyright (C) 2002  Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#if !defined (DBUS_INSIDE_DBUS_H) && !defined (DBUS_COMPILATION)
-#error "Only <dbus/dbus.h> can be included directly, this file may disappear or change contents."
-#endif
-
-#ifndef DBUS_TYPES_H
-#define DBUS_TYPES_H
-
-#include <stddef.h>
-#include <dbus/dbus-arch-deps.h>
-
-typedef dbus_uint32_t  dbus_unichar_t;
-/* boolean size must be fixed at 4 bytes due to wire protocol! */
-typedef dbus_uint32_t  dbus_bool_t;
-
-/* Normally docs are in .c files, but there isn't a .c file for this. */
-/**
- * @defgroup DBusTypes Basic types
- * @ingroup  DBus
- * @brief dbus_bool_t, dbus_int32_t, etc.
- *
- * Typedefs for common primitive types.
- *
- * @{
- */
-
-/**
- * @typedef dbus_bool_t
- *
- * A boolean, valid values are #TRUE and #FALSE.
- */
-
-/**
- * @typedef dbus_uint32_t
- *
- * A 32-bit unsigned integer on all platforms.
- */
-
-/**
- * @typedef dbus_int32_t
- *
- * A 32-bit signed integer on all platforms.
- */
-
-/**
- * @typedef dbus_uint16_t
- *
- * A 16-bit unsigned integer on all platforms.
- */
-
-/**
- * @typedef dbus_int16_t
- *
- * A 16-bit signed integer on all platforms.
- */
-
-
-/**
- * @typedef dbus_uint64_t
- *
- * A 64-bit unsigned integer on all platforms that support it.
- * If supported, #DBUS_HAVE_INT64 will be defined.
- *
- * C99 requires a 64-bit type and most likely all interesting
- * compilers support one. GLib for example flat-out requires
- * a 64-bit type.
- *
- * You probably want to just assume #DBUS_HAVE_INT64 is always defined.
- */
-
-/**
- * @typedef dbus_int64_t
- *
- * A 64-bit signed integer on all platforms that support it.
- * If supported, #DBUS_HAVE_INT64 will be defined.
- *
- * C99 requires a 64-bit type and most likely all interesting
- * compilers support one. GLib for example flat-out requires
- * a 64-bit type.
- * 
- * You probably want to just assume #DBUS_HAVE_INT64 is always defined.
- */
-
-/**
- * @def DBUS_HAVE_INT64
- *
- * Defined if 64-bit integers are available. Will be defined
- * on any platform you care about, unless you care about
- * some truly ancient UNIX, or some bizarre embedded platform.
- *
- * C99 requires a 64-bit type and most likely all interesting
- * compilers support one. GLib for example flat-out requires
- * a 64-bit type.
- *
- * You should feel comfortable ignoring this macro and just using
- * int64 unconditionally.
- * 
- */
-
-/**
- * @def DBUS_INT64_CONSTANT
- *
- * Declare a 64-bit signed integer constant. The macro
- * adds the necessary "LL" or whatever after the integer,
- * giving a literal such as "325145246765LL"
- */
-
-/**
- * @def DBUS_UINT64_CONSTANT
- *
- * Declare a 64-bit unsigned integer constant. The macro
- * adds the necessary "ULL" or whatever after the integer,
- * giving a literal such as "325145246765ULL"
- */
-
-/** @} */
-
-#endif /* DBUS_TYPES_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-userdb.h b/lib-x86-32/include/dbus-1/dbus/dbus-userdb.h
deleted file mode 100644
index cb49d9e7..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-userdb.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-userdb.h User database abstraction
- * 
- * Copyright (C) 2003  Red Hat, Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef DBUS_USERDB_H
-#define DBUS_USERDB_H
-
-#include <dbus/dbus-sysdeps-unix.h>
-
-#ifdef DBUS_WIN
-#error "Don't include this on Windows"
-#endif
-
-DBUS_BEGIN_DECLS
-
-typedef struct DBusUserDatabase DBusUserDatabase;
-
-#ifdef DBUS_USERDB_INCLUDES_PRIVATE
-#include <dbus/dbus-hash.h>
-
-/**
- * Internals of DBusUserDatabase
- */
-struct DBusUserDatabase
-{
-  int refcount; /**< Reference count */
-
-  DBusHashTable *users; /**< Users in the database by UID */
-  DBusHashTable *groups; /**< Groups in the database by GID */
-  DBusHashTable *users_by_name; /**< Users in the database by name */
-  DBusHashTable *groups_by_name; /**< Groups in the database by name */
-
-};
-
-
-DBusUserDatabase* _dbus_user_database_new           (void);
-DBusUserDatabase* _dbus_user_database_ref           (DBusUserDatabase     *db);
-void              _dbus_user_database_flush         (DBusUserDatabase     *db);
-void              _dbus_user_database_unref         (DBusUserDatabase     *db);
-dbus_bool_t       _dbus_user_database_get_uid       (DBusUserDatabase     *db,
-                                                     dbus_uid_t            uid,
-                                                     const DBusUserInfo  **info,
-                                                     DBusError            *error);
-dbus_bool_t       _dbus_user_database_get_gid       (DBusUserDatabase     *db,
-                                                     dbus_gid_t            gid,
-                                                     const DBusGroupInfo **info,
-                                                     DBusError            *error);
-dbus_bool_t       _dbus_user_database_get_username  (DBusUserDatabase     *db,
-                                                     const DBusString     *username,
-                                                     const DBusUserInfo  **info,
-                                                     DBusError            *error);
-dbus_bool_t       _dbus_user_database_get_groupname (DBusUserDatabase     *db,
-                                                     const DBusString     *groupname,
-                                                     const DBusGroupInfo **info,
-                                                     DBusError            *error);
-
-DBusUserInfo*  _dbus_user_database_lookup       (DBusUserDatabase *db,
-                                                 dbus_uid_t        uid,
-                                                 const DBusString *username,
-                                                 DBusError        *error);
-DBusGroupInfo* _dbus_user_database_lookup_group (DBusUserDatabase *db,
-                                                 dbus_gid_t        gid,
-                                                 const DBusString *groupname,
-                                                 DBusError        *error);
-void           _dbus_user_info_free_allocated   (DBusUserInfo     *info);
-void           _dbus_group_info_free_allocated  (DBusGroupInfo    *info);
-#endif /* DBUS_USERDB_INCLUDES_PRIVATE */
-
-DBusUserDatabase* _dbus_user_database_get_system    (void);
-void              _dbus_user_database_lock_system   (void);
-void              _dbus_user_database_unlock_system (void);
-void              _dbus_user_database_flush_system  (void);
-
-dbus_bool_t _dbus_get_user_id                   (const DBusString  *username,
-                                                 dbus_uid_t        *uid);
-dbus_bool_t _dbus_get_group_id                  (const DBusString  *group_name,
-                                                 dbus_gid_t        *gid);
-dbus_bool_t _dbus_get_user_id_and_primary_group (const DBusString  *username,
-                                                 dbus_uid_t        *uid_p,
-                                                 dbus_gid_t        *gid_p);
-dbus_bool_t _dbus_credentials_from_uid          (dbus_uid_t         user_id,
-                                                 DBusCredentials   *credentials);
-dbus_bool_t _dbus_groups_from_uid		(dbus_uid_t            uid,
-                                                 dbus_gid_t          **group_ids,
-                                                 int                  *n_group_ids);
-dbus_bool_t _dbus_is_console_user               (dbus_uid_t         uid,
-                                                 DBusError         *error);
-
-dbus_bool_t _dbus_is_a_number                   (const DBusString *str, 
-                                                 unsigned long    *num);
-
-dbus_bool_t _dbus_username_from_current_process (const DBusString **username);
-dbus_bool_t _dbus_homedir_from_current_process  (const DBusString **homedir);
-dbus_bool_t _dbus_homedir_from_username         (const DBusString  *username,
-                                                 DBusString        *homedir);
-
-dbus_bool_t _dbus_homedir_from_uid              (dbus_uid_t         uid,
-                                                 DBusString        *homedir);
-
-DBUS_END_DECLS
-
-#endif /* DBUS_USERDB_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-uuidgen.h b/lib-x86-32/include/dbus-1/dbus/dbus-uuidgen.h
deleted file mode 100644
index 9c1b8595..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-uuidgen.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-uuidgen.h  The guts of the dbus-uuidgen binary live in libdbus, in this file.
- *
- * Copyright (C) 2006  Red Hat, Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#ifdef DBUS_INSIDE_DBUS_H
-#error "You can't include dbus-uuidgen.h in the public header dbus.h"
-#endif
-
-#ifndef DBUS_UUIDGEN_H
-#define DBUS_UUIDGEN_H
-
-#include <dbus/dbus-types.h>
-#include <dbus/dbus-errors.h>
-
-DBUS_BEGIN_DECLS
-
-dbus_bool_t dbus_internal_do_not_use_get_uuid    (const char *filename,
-                                                  char      **uuid_p,
-                                                  dbus_bool_t create_if_not_found,
-                                                  DBusError  *error);
-dbus_bool_t dbus_internal_do_not_use_ensure_uuid (const char *filename,
-                                                  char      **uuid_p,
-                                                  DBusError  *error);
-dbus_bool_t dbus_internal_do_not_use_create_uuid (char      **uuid_p);
-
-
-DBUS_END_DECLS
-
-#endif /* DBUS_UUIDGEN_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus-watch.h b/lib-x86-32/include/dbus-1/dbus/dbus-watch.h
deleted file mode 100644
index fa953ec1..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus-watch.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-watch.h DBusWatch internal interfaces
- *
- * Copyright (C) 2002  Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#ifndef DBUS_WATCH_H
-#define DBUS_WATCH_H
-
-#include <dbus/dbus-internals.h>
-#include <dbus/dbus-connection.h>
-
-DBUS_BEGIN_DECLS
-
-/**
- * @addtogroup DBusWatchInternals
- * @{
- */
-
-/* Public methods on DBusWatch are in dbus-connection.h */
-
-typedef struct DBusWatchList DBusWatchList;
-
-/** function to run when the watch is handled */
-typedef dbus_bool_t (* DBusWatchHandler) (DBusWatch    *watch,
-                                          unsigned int  flags,
-                                          void         *data);
-
-DBusWatch* _dbus_watch_new                (int               fd,
-                                           unsigned int      flags,
-                                           dbus_bool_t       enabled,
-                                           DBusWatchHandler  handler,
-                                           void             *data,
-                                           DBusFreeFunction  free_data_function);
-DBusWatch* _dbus_watch_ref                (DBusWatch        *watch);
-void       _dbus_watch_unref              (DBusWatch        *watch);
-void       _dbus_watch_invalidate         (DBusWatch        *watch);
-void       _dbus_watch_sanitize_condition (DBusWatch        *watch,
-                                           unsigned int     *condition);
-void       _dbus_watch_set_handler        (DBusWatch        *watch,
-                                           DBusWatchHandler  handler,
-                                           void             *data,
-                                           DBusFreeFunction  free_data_function);
-
-
-DBusWatchList* _dbus_watch_list_new           (void);
-void           _dbus_watch_list_free          (DBusWatchList           *watch_list);
-dbus_bool_t    _dbus_watch_list_set_functions (DBusWatchList           *watch_list,
-                                               DBusAddWatchFunction     add_function,
-                                               DBusRemoveWatchFunction  remove_function,
-                                               DBusWatchToggledFunction toggled_function,
-                                               void                    *data,
-                                               DBusFreeFunction         free_data_function);
-dbus_bool_t    _dbus_watch_list_add_watch     (DBusWatchList           *watch_list,
-                                               DBusWatch               *watch);
-void           _dbus_watch_list_remove_watch  (DBusWatchList           *watch_list,
-                                               DBusWatch               *watch);
-void           _dbus_watch_list_toggle_watch  (DBusWatchList           *watch_list,
-                                               DBusWatch               *watch,
-                                               dbus_bool_t              enabled);
-dbus_bool_t    _dbus_watch_get_enabled        (DBusWatch              *watch);
-
-/** @} */
-
-DBUS_END_DECLS
-
-#endif /* DBUS_WATCH_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/dbus.h b/lib-x86-32/include/dbus-1/dbus/dbus.h
deleted file mode 100644
index 1f099508..00000000
--- a/lib-x86-32/include/dbus-1/dbus/dbus.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus.h  Convenience header including all other headers
- *
- * Copyright (C) 2002, 2003  Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef DBUS_H
-#define DBUS_H
-
-#define DBUS_INSIDE_DBUS_H 1
-
-#include <dbus/dbus-arch-deps.h>
-#include <dbus/dbus-address.h>
-#include <dbus/dbus-bus.h>
-#include <dbus/dbus-connection.h>
-#include <dbus/dbus-errors.h>
-#include <dbus/dbus-macros.h>
-#include <dbus/dbus-message.h>
-#include <dbus/dbus-misc.h>
-#include <dbus/dbus-pending-call.h>
-#include <dbus/dbus-protocol.h>
-#include <dbus/dbus-server.h>
-#include <dbus/dbus-shared.h>
-#include <dbus/dbus-signature.h>
-#include <dbus/dbus-threads.h>
-#include <dbus/dbus-types.h>
-
-#undef DBUS_INSIDE_DBUS_H
-
-/**
- * @defgroup DBus D-Bus low-level public API
- * @brief The low-level public API of the D-Bus library
- *
- * libdbus provides a low-level C API intended primarily for use by
- * bindings to specific object systems and languages.  D-Bus is most
- * convenient when used with the GLib bindings, Python bindings, Qt
- * bindings, Mono bindings, and so forth.  This low-level API has a
- * lot of complexity useful only for bindings.
- * 
- * @{
- */
-
-/** @} */
-
-/**
- * @mainpage
- *
- * This manual documents the <em>low-level</em> D-Bus C API. <b>If you use
- * this low-level API directly, you're signing up for some pain.</b>
- *
- * Caveats aside, you might get started learning the low-level API by reading
- * about @ref DBusConnection and @ref DBusMessage.
- * 
- * There are several other places to look for D-Bus information, such
- * as the tutorial and the specification; those can be found at <a
- * href="http://www.freedesktop.org/wiki/Software/dbus">the D-Bus
- * website</a>. If you're interested in a sysadmin or package
- * maintainer's perspective on the dbus-daemon itself and its
- * configuration, be sure to check out the man pages as well.
- *
- * The low-level API documented in this manual deliberately lacks
- * most convenience functions - those are left up to higher-level libraries
- * based on frameworks such as GLib, Qt, Python, Mono, Java,
- * etc. These higher-level libraries (often called "D-Bus bindings")
- * have features such as object systems and main loops that allow a
- * <em>much</em> more convenient API.
- * 
- * The low-level API also contains plenty of clutter to support
- * integration with arbitrary object systems, languages, main loops,
- * and so forth. These features add a lot of noise to the API that you
- * probably don't care about unless you're coding a binding.
- *
- * This manual also contains docs for @ref DBusInternals "D-Bus internals",
- * so you can use it to get oriented to the D-Bus source code if you're
- * interested in patching the code. You should also read the
- * file HACKING which comes with the source code if you plan to contribute to
- * D-Bus.
- *
- * As you read the code, you can identify internal D-Bus functions
- * because they start with an underscore ('_') character. Also, any
- * identifier or macro that lacks a DBus, dbus_, or DBUS_ namepace
- * prefix is internal, with a couple of exceptions such as #NULL,
- * #TRUE, and #FALSE.
- */
-
-#endif /* DBUS_H */
diff --git a/lib-x86-32/include/dbus-1/dbus/sd-daemon.h b/lib-x86-32/include/dbus-1/dbus/sd-daemon.h
deleted file mode 100644
index c68c96d2..00000000
--- a/lib-x86-32/include/dbus-1/dbus/sd-daemon.h
+++ /dev/null
@@ -1,257 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-#ifndef foosddaemonhfoo
-#define foosddaemonhfoo
-
-/***
-  Copyright 2010 Lennart Poettering
-
-  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.
-***/
-
-#include <sys/types.h>
-#include <inttypes.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-  Reference implementation of a few systemd related interfaces for
-  writing daemons. These interfaces are trivial to implement. To
-  simplify porting we provide this reference implementation.
-  Applications are welcome to reimplement the algorithms described
-  here if they do not want to include these two source files.
-
-  The following functionality is provided:
-
-  - Support for logging with log levels on stderr
-  - File descriptor passing for socket-based activation
-  - Daemon startup and status notification
-  - Detection of systemd boots
-
-  You may compile this with -DDISABLE_SYSTEMD to disable systemd
-  support. This makes all those calls NOPs that are directly related to
-  systemd (i.e. only sd_is_xxx() will stay useful).
-
-  Since this is drop-in code we don't want any of our symbols to be
-  exported in any case. Hence we declare hidden visibility for all of
-  them.
-
-  You may find an up-to-date version of these source files online:
-
-  http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.h
-  http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c
-
-  This should compile on non-Linux systems, too, but with the
-  exception of the sd_is_xxx() calls all functions will become NOPs.
-
-  See sd-daemon(7) for more information.
-*/
-
-#if __GNUC__ >= 4
-#define _sd_printf_attr_(a,b) __attribute__ ((format (printf, a, b)))
-#define _sd_hidden_ __attribute__ ((visibility("hidden")))
-#else
-#define _sd_printf_attr_(a,b)
-#define _sd_hidden_
-#endif
-
-/*
-  Log levels for usage on stderr:
-
-          fprintf(stderr, SD_NOTICE "Hello World!\n");
-
-  This is similar to printk() usage in the kernel.
-*/
-#define SD_EMERG   "<0>"  /* system is unusable */
-#define SD_ALERT   "<1>"  /* action must be taken immediately */
-#define SD_CRIT    "<2>"  /* critical conditions */
-#define SD_ERR     "<3>"  /* error conditions */
-#define SD_WARNING "<4>"  /* warning conditions */
-#define SD_NOTICE  "<5>"  /* normal but significant condition */
-#define SD_INFO    "<6>"  /* informational */
-#define SD_DEBUG   "<7>"  /* debug-level messages */
-
-/* The first passed file descriptor is fd 3 */
-#define SD_LISTEN_FDS_START 3
-
-/*
-  Returns how many file descriptors have been passed, or a negative
-  errno code on failure. Optionally, removes the $LISTEN_FDS and
-  $LISTEN_PID file descriptors from the environment (recommended, but
-  problematic in threaded environments). If r is the return value of
-  this function you'll find the file descriptors passed as fds
-  SD_LISTEN_FDS_START to SD_LISTEN_FDS_START+r-1. Returns a negative
-  errno style error code on failure. This function call ensures that
-  the FD_CLOEXEC flag is set for the passed file descriptors, to make
-  sure they are not passed on to child processes. If FD_CLOEXEC shall
-  not be set, the caller needs to unset it after this call for all file
-  descriptors that are used.
-
-  See sd_listen_fds(3) for more information.
-*/
-int sd_listen_fds(int unset_environment) _sd_hidden_;
-
-/*
-  Helper call for identifying a passed file descriptor. Returns 1 if
-  the file descriptor is a FIFO in the file system stored under the
-  specified path, 0 otherwise. If path is NULL a path name check will
-  not be done and the call only verifies if the file descriptor
-  refers to a FIFO. Returns a negative errno style error code on
-  failure.
-
-  See sd_is_fifo(3) for more information.
-*/
-int sd_is_fifo(int fd, const char *path) _sd_hidden_;
-
-/*
-  Helper call for identifying a passed file descriptor. Returns 1 if
-  the file descriptor is a socket of the specified family (AF_INET,
-  ...) and type (SOCK_DGRAM, SOCK_STREAM, ...), 0 otherwise. If
-  family is 0 a socket family check will not be done. If type is 0 a
-  socket type check will not be done and the call only verifies if
-  the file descriptor refers to a socket. If listening is > 0 it is
-  verified that the socket is in listening mode. (i.e. listen() has
-  been called) If listening is == 0 it is verified that the socket is
-  not in listening mode. If listening is < 0 no listening mode check
-  is done. Returns a negative errno style error code on failure.
-
-  See sd_is_socket(3) for more information.
-*/
-int sd_is_socket(int fd, int family, int type, int listening) _sd_hidden_;
-
-/*
-  Helper call for identifying a passed file descriptor. Returns 1 if
-  the file descriptor is an Internet socket, of the specified family
-  (either AF_INET or AF_INET6) and the specified type (SOCK_DGRAM,
-  SOCK_STREAM, ...), 0 otherwise. If version is 0 a protocol version
-  check is not done. If type is 0 a socket type check will not be
-  done. If port is 0 a socket port check will not be done. The
-  listening flag is used the same way as in sd_is_socket(). Returns a
-  negative errno style error code on failure.
-
-  See sd_is_socket_inet(3) for more information.
-*/
-int sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port) _sd_hidden_;
-
-/*
-  Helper call for identifying a passed file descriptor. Returns 1 if
-  the file descriptor is an AF_UNIX socket of the specified type
-  (SOCK_DGRAM, SOCK_STREAM, ...) and path, 0 otherwise. If type is 0
-  a socket type check will not be done. If path is NULL a socket path
-  check will not be done. For normal AF_UNIX sockets set length to
-  0. For abstract namespace sockets set length to the length of the
-  socket name (including the initial 0 byte), and pass the full
-  socket path in path (including the initial 0 byte). The listening
-  flag is used the same way as in sd_is_socket(). Returns a negative
-  errno style error code on failure.
-
-  See sd_is_socket_unix(3) for more information.
-*/
-int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length) _sd_hidden_;
-
-/*
-  Informs systemd about changed daemon state. This takes a number of
-  newline seperated environment-style variable assignments in a
-  string. The following variables are known:
-
-     READY=1      Tells systemd that daemon startup is finished (only
-                  relevant for services of Type=notify). The passed
-                  argument is a boolean "1" or "0". Since there is
-                  little value in signalling non-readiness the only
-                  value daemons should send is "READY=1".
-
-     STATUS=...   Passes a single-line status string back to systemd
-                  that describes the daemon state. This is free-from
-                  and can be used for various purposes: general state
-                  feedback, fsck-like programs could pass completion
-                  percentages and failing programs could pass a human
-                  readable error message. Example: "STATUS=Completed
-                  66% of file system check..."
-
-     ERRNO=...    If a daemon fails, the errno-style error code,
-                  formatted as string. Example: "ERRNO=2" for ENOENT.
-
-     BUSERROR=... If a daemon fails, the D-Bus error-style error
-                  code. Example: "BUSERROR=org.freedesktop.DBus.Error.TimedOut"
-
-     MAINPID=...  The main pid of a daemon, in case systemd did not
-                  fork off the process itself. Example: "MAINPID=4711"
-
-  Daemons can choose to send additional variables. However, it is
-  recommened to prefix variable names not listed above with X_.
-
-  Returns a negative errno-style error code on failure. Returns > 0
-  if systemd could be notified, 0 if it couldn't possibly because
-  systemd is not running.
-
-  Example: When a daemon finished starting up, it could issue this
-  call to notify systemd about it:
-
-     sd_notify(0, "READY=1");
-
-  See sd_notifyf() for more complete examples.
-
-  See sd_notify(3) for more information.
-*/
-int sd_notify(int unset_environment, const char *state) _sd_hidden_;
-
-/*
-  Similar to sd_notify() but takes a format string.
-
-  Example 1: A daemon could send the following after initialization:
-
-     sd_notifyf(0, "READY=1\n"
-                   "STATUS=Processing requests...\n"
-                   "MAINPID=%lu",
-                   (unsigned long) getpid());
-
-  Example 2: A daemon could send the following shortly before
-  exiting, on failure:
-
-     sd_notifyf(0, "STATUS=Failed to start up: %s\n"
-                   "ERRNO=%i",
-                   strerror(errno),
-                   errno);
-
-  See sd_notifyf(3) for more information.
-*/
-int sd_notifyf(int unset_environment, const char *format, ...) _sd_printf_attr_(2,3) _sd_hidden_;
-
-/*
-  Returns > 0 if the system was booted with systemd. Returns < 0 on
-  error. Returns 0 if the system was not booted with systemd. Note
-  that all of the functions above handle non-systemd boots just
-  fine. You should NOT protect them with a call to this function. Also
-  note that this function checks whether the system, not the user
-  session is controlled by systemd. However the functions above work
-  for both session and system services.
-
-  See sd_booted(3) for more information.
-*/
-int sd_booted(void) _sd_hidden_;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib-x86-32/include/faad.h b/lib-x86-32/include/faad.h
deleted file mode 100644
index 72f40728..00000000
--- a/lib-x86-32/include/faad.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
-** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com
-**  
-** 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 of the License, 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.
-**
-** Any non-GPL usage of this software or parts of this software is strictly
-** forbidden.
-**
-** The "appropriate copyright message" mentioned in section 2c of the GPLv2
-** must read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
-**
-** Commercial non-GPL licensing of this software is possible.
-** For more info contact Nero AG through Mpeg4AAClicense@nero.com.
-**
-** $Id: faad.h,v 1.51 2007/11/01 12:33:29 menno Exp $
-**/
-
-/* warn people for update */
-#pragma message("please update faad2 include filename and function names!")
-
-/* Backwards compatible link */
-#include "neaacdec.h"
diff --git a/lib-x86-32/include/jpegint.h b/lib-x86-32/include/jpegint.h
deleted file mode 100644
index 0c27a4e4..00000000
--- a/lib-x86-32/include/jpegint.h
+++ /dev/null
@@ -1,407 +0,0 @@
-/*
- * jpegint.h
- *
- * Copyright (C) 1991-1997, Thomas G. Lane.
- * Modified 1997-2009 by Guido Vollbeding.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file provides common declarations for the various JPEG modules.
- * These declarations are considered internal to the JPEG library; most
- * applications using the library shouldn't need to include this file.
- */
-
-
-/* Declarations for both compression & decompression */
-
-typedef enum {			/* Operating modes for buffer controllers */
-	JBUF_PASS_THRU,		/* Plain stripwise operation */
-	/* Remaining modes require a full-image buffer to have been created */
-	JBUF_SAVE_SOURCE,	/* Run source subobject only, save output */
-	JBUF_CRANK_DEST,	/* Run dest subobject only, using saved data */
-	JBUF_SAVE_AND_PASS	/* Run both subobjects, save output */
-} J_BUF_MODE;
-
-/* Values of global_state field (jdapi.c has some dependencies on ordering!) */
-#define CSTATE_START	100	/* after create_compress */
-#define CSTATE_SCANNING	101	/* start_compress done, write_scanlines OK */
-#define CSTATE_RAW_OK	102	/* start_compress done, write_raw_data OK */
-#define CSTATE_WRCOEFS	103	/* jpeg_write_coefficients done */
-#define DSTATE_START	200	/* after create_decompress */
-#define DSTATE_INHEADER	201	/* reading header markers, no SOS yet */
-#define DSTATE_READY	202	/* found SOS, ready for start_decompress */
-#define DSTATE_PRELOAD	203	/* reading multiscan file in start_decompress*/
-#define DSTATE_PRESCAN	204	/* performing dummy pass for 2-pass quant */
-#define DSTATE_SCANNING	205	/* start_decompress done, read_scanlines OK */
-#define DSTATE_RAW_OK	206	/* start_decompress done, read_raw_data OK */
-#define DSTATE_BUFIMAGE	207	/* expecting jpeg_start_output */
-#define DSTATE_BUFPOST	208	/* looking for SOS/EOI in jpeg_finish_output */
-#define DSTATE_RDCOEFS	209	/* reading file in jpeg_read_coefficients */
-#define DSTATE_STOPPING	210	/* looking for EOI in jpeg_finish_decompress */
-
-
-/* Declarations for compression modules */
-
-/* Master control module */
-struct jpeg_comp_master {
-  JMETHOD(void, prepare_for_pass, (j_compress_ptr cinfo));
-  JMETHOD(void, pass_startup, (j_compress_ptr cinfo));
-  JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
-
-  /* State variables made visible to other modules */
-  boolean call_pass_startup;	/* True if pass_startup must be called */
-  boolean is_last_pass;		/* True during last pass */
-};
-
-/* Main buffer control (downsampled-data buffer) */
-struct jpeg_c_main_controller {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
-  JMETHOD(void, process_data, (j_compress_ptr cinfo,
-			       JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
-			       JDIMENSION in_rows_avail));
-};
-
-/* Compression preprocessing (downsampling input buffer control) */
-struct jpeg_c_prep_controller {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
-  JMETHOD(void, pre_process_data, (j_compress_ptr cinfo,
-				   JSAMPARRAY input_buf,
-				   JDIMENSION *in_row_ctr,
-				   JDIMENSION in_rows_avail,
-				   JSAMPIMAGE output_buf,
-				   JDIMENSION *out_row_group_ctr,
-				   JDIMENSION out_row_groups_avail));
-};
-
-/* Coefficient buffer control */
-struct jpeg_c_coef_controller {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
-  JMETHOD(boolean, compress_data, (j_compress_ptr cinfo,
-				   JSAMPIMAGE input_buf));
-};
-
-/* Colorspace conversion */
-struct jpeg_color_converter {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
-  JMETHOD(void, color_convert, (j_compress_ptr cinfo,
-				JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
-				JDIMENSION output_row, int num_rows));
-};
-
-/* Downsampling */
-struct jpeg_downsampler {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
-  JMETHOD(void, downsample, (j_compress_ptr cinfo,
-			     JSAMPIMAGE input_buf, JDIMENSION in_row_index,
-			     JSAMPIMAGE output_buf,
-			     JDIMENSION out_row_group_index));
-
-  boolean need_context_rows;	/* TRUE if need rows above & below */
-};
-
-/* Forward DCT (also controls coefficient quantization) */
-typedef JMETHOD(void, forward_DCT_ptr,
-		(j_compress_ptr cinfo, jpeg_component_info * compptr,
-		 JSAMPARRAY sample_data, JBLOCKROW coef_blocks,
-		 JDIMENSION start_row, JDIMENSION start_col,
-		 JDIMENSION num_blocks));
-
-struct jpeg_forward_dct {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
-  /* It is useful to allow each component to have a separate FDCT method. */
-  forward_DCT_ptr forward_DCT[MAX_COMPONENTS];
-};
-
-/* Entropy encoding */
-struct jpeg_entropy_encoder {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo, boolean gather_statistics));
-  JMETHOD(boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data));
-  JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
-};
-
-/* Marker writing */
-struct jpeg_marker_writer {
-  JMETHOD(void, write_file_header, (j_compress_ptr cinfo));
-  JMETHOD(void, write_frame_header, (j_compress_ptr cinfo));
-  JMETHOD(void, write_scan_header, (j_compress_ptr cinfo));
-  JMETHOD(void, write_file_trailer, (j_compress_ptr cinfo));
-  JMETHOD(void, write_tables_only, (j_compress_ptr cinfo));
-  /* These routines are exported to allow insertion of extra markers */
-  /* Probably only COM and APPn markers should be written this way */
-  JMETHOD(void, write_marker_header, (j_compress_ptr cinfo, int marker,
-				      unsigned int datalen));
-  JMETHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val));
-};
-
-
-/* Declarations for decompression modules */
-
-/* Master control module */
-struct jpeg_decomp_master {
-  JMETHOD(void, prepare_for_output_pass, (j_decompress_ptr cinfo));
-  JMETHOD(void, finish_output_pass, (j_decompress_ptr cinfo));
-
-  /* State variables made visible to other modules */
-  boolean is_dummy_pass;	/* True during 1st pass for 2-pass quant */
-};
-
-/* Input control module */
-struct jpeg_input_controller {
-  JMETHOD(int, consume_input, (j_decompress_ptr cinfo));
-  JMETHOD(void, reset_input_controller, (j_decompress_ptr cinfo));
-  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
-  JMETHOD(void, finish_input_pass, (j_decompress_ptr cinfo));
-
-  /* State variables made visible to other modules */
-  boolean has_multiple_scans;	/* True if file has multiple scans */
-  boolean eoi_reached;		/* True when EOI has been consumed */
-};
-
-/* Main buffer control (downsampled-data buffer) */
-struct jpeg_d_main_controller {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
-  JMETHOD(void, process_data, (j_decompress_ptr cinfo,
-			       JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
-			       JDIMENSION out_rows_avail));
-};
-
-/* Coefficient buffer control */
-struct jpeg_d_coef_controller {
-  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
-  JMETHOD(int, consume_data, (j_decompress_ptr cinfo));
-  JMETHOD(void, start_output_pass, (j_decompress_ptr cinfo));
-  JMETHOD(int, decompress_data, (j_decompress_ptr cinfo,
-				 JSAMPIMAGE output_buf));
-  /* Pointer to array of coefficient virtual arrays, or NULL if none */
-  jvirt_barray_ptr *coef_arrays;
-};
-
-/* Decompression postprocessing (color quantization buffer control) */
-struct jpeg_d_post_controller {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
-  JMETHOD(void, post_process_data, (j_decompress_ptr cinfo,
-				    JSAMPIMAGE input_buf,
-				    JDIMENSION *in_row_group_ctr,
-				    JDIMENSION in_row_groups_avail,
-				    JSAMPARRAY output_buf,
-				    JDIMENSION *out_row_ctr,
-				    JDIMENSION out_rows_avail));
-};
-
-/* Marker reading & parsing */
-struct jpeg_marker_reader {
-  JMETHOD(void, reset_marker_reader, (j_decompress_ptr cinfo));
-  /* Read markers until SOS or EOI.
-   * Returns same codes as are defined for jpeg_consume_input:
-   * JPEG_SUSPENDED, JPEG_REACHED_SOS, or JPEG_REACHED_EOI.
-   */
-  JMETHOD(int, read_markers, (j_decompress_ptr cinfo));
-  /* Read a restart marker --- exported for use by entropy decoder only */
-  jpeg_marker_parser_method read_restart_marker;
-
-  /* State of marker reader --- nominally internal, but applications
-   * supplying COM or APPn handlers might like to know the state.
-   */
-  boolean saw_SOI;		/* found SOI? */
-  boolean saw_SOF;		/* found SOF? */
-  int next_restart_num;		/* next restart number expected (0-7) */
-  unsigned int discarded_bytes;	/* # of bytes skipped looking for a marker */
-};
-
-/* Entropy decoding */
-struct jpeg_entropy_decoder {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-  JMETHOD(boolean, decode_mcu, (j_decompress_ptr cinfo,
-				JBLOCKROW *MCU_data));
-};
-
-/* Inverse DCT (also performs dequantization) */
-typedef JMETHOD(void, inverse_DCT_method_ptr,
-		(j_decompress_ptr cinfo, jpeg_component_info * compptr,
-		 JCOEFPTR coef_block,
-		 JSAMPARRAY output_buf, JDIMENSION output_col));
-
-struct jpeg_inverse_dct {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-  /* It is useful to allow each component to have a separate IDCT method. */
-  inverse_DCT_method_ptr inverse_DCT[MAX_COMPONENTS];
-};
-
-/* Upsampling (note that upsampler must also call color converter) */
-struct jpeg_upsampler {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-  JMETHOD(void, upsample, (j_decompress_ptr cinfo,
-			   JSAMPIMAGE input_buf,
-			   JDIMENSION *in_row_group_ctr,
-			   JDIMENSION in_row_groups_avail,
-			   JSAMPARRAY output_buf,
-			   JDIMENSION *out_row_ctr,
-			   JDIMENSION out_rows_avail));
-
-  boolean need_context_rows;	/* TRUE if need rows above & below */
-};
-
-/* Colorspace conversion */
-struct jpeg_color_deconverter {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-  JMETHOD(void, color_convert, (j_decompress_ptr cinfo,
-				JSAMPIMAGE input_buf, JDIMENSION input_row,
-				JSAMPARRAY output_buf, int num_rows));
-};
-
-/* Color quantization or color precision reduction */
-struct jpeg_color_quantizer {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, boolean is_pre_scan));
-  JMETHOD(void, color_quantize, (j_decompress_ptr cinfo,
-				 JSAMPARRAY input_buf, JSAMPARRAY output_buf,
-				 int num_rows));
-  JMETHOD(void, finish_pass, (j_decompress_ptr cinfo));
-  JMETHOD(void, new_color_map, (j_decompress_ptr cinfo));
-};
-
-
-/* Miscellaneous useful macros */
-
-#undef MAX
-#define MAX(a,b)	((a) > (b) ? (a) : (b))
-#undef MIN
-#define MIN(a,b)	((a) < (b) ? (a) : (b))
-
-
-/* We assume that right shift corresponds to signed division by 2 with
- * rounding towards minus infinity.  This is correct for typical "arithmetic
- * shift" instructions that shift in copies of the sign bit.  But some
- * C compilers implement >> with an unsigned shift.  For these machines you
- * must define RIGHT_SHIFT_IS_UNSIGNED.
- * RIGHT_SHIFT provides a proper signed right shift of an INT32 quantity.
- * It is only applied with constant shift counts.  SHIFT_TEMPS must be
- * included in the variables of any routine using RIGHT_SHIFT.
- */
-
-#ifdef RIGHT_SHIFT_IS_UNSIGNED
-#define SHIFT_TEMPS	INT32 shift_temp;
-#define RIGHT_SHIFT(x,shft)  \
-	((shift_temp = (x)) < 0 ? \
-	 (shift_temp >> (shft)) | ((~((INT32) 0)) << (32-(shft))) : \
-	 (shift_temp >> (shft)))
-#else
-#define SHIFT_TEMPS
-#define RIGHT_SHIFT(x,shft)	((x) >> (shft))
-#endif
-
-
-/* Short forms of external names for systems with brain-damaged linkers. */
-
-#ifdef NEED_SHORT_EXTERNAL_NAMES
-#define jinit_compress_master	jICompress
-#define jinit_c_master_control	jICMaster
-#define jinit_c_main_controller	jICMainC
-#define jinit_c_prep_controller	jICPrepC
-#define jinit_c_coef_controller	jICCoefC
-#define jinit_color_converter	jICColor
-#define jinit_downsampler	jIDownsampler
-#define jinit_forward_dct	jIFDCT
-#define jinit_huff_encoder	jIHEncoder
-#define jinit_arith_encoder	jIAEncoder
-#define jinit_marker_writer	jIMWriter
-#define jinit_master_decompress	jIDMaster
-#define jinit_d_main_controller	jIDMainC
-#define jinit_d_coef_controller	jIDCoefC
-#define jinit_d_post_controller	jIDPostC
-#define jinit_input_controller	jIInCtlr
-#define jinit_marker_reader	jIMReader
-#define jinit_huff_decoder	jIHDecoder
-#define jinit_arith_decoder	jIADecoder
-#define jinit_inverse_dct	jIIDCT
-#define jinit_upsampler		jIUpsampler
-#define jinit_color_deconverter	jIDColor
-#define jinit_1pass_quantizer	jI1Quant
-#define jinit_2pass_quantizer	jI2Quant
-#define jinit_merged_upsampler	jIMUpsampler
-#define jinit_memory_mgr	jIMemMgr
-#define jdiv_round_up		jDivRound
-#define jround_up		jRound
-#define jcopy_sample_rows	jCopySamples
-#define jcopy_block_row		jCopyBlocks
-#define jzero_far		jZeroFar
-#define jpeg_zigzag_order	jZIGTable
-#define jpeg_natural_order	jZAGTable
-#define jpeg_natural_order7	jZAGTable7
-#define jpeg_natural_order6	jZAGTable6
-#define jpeg_natural_order5	jZAGTable5
-#define jpeg_natural_order4	jZAGTable4
-#define jpeg_natural_order3	jZAGTable3
-#define jpeg_natural_order2	jZAGTable2
-#define jpeg_aritab		jAriTab
-#endif /* NEED_SHORT_EXTERNAL_NAMES */
-
-
-/* Compression module initialization routines */
-EXTERN(void) jinit_compress_master JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_c_master_control JPP((j_compress_ptr cinfo,
-					 boolean transcode_only));
-EXTERN(void) jinit_c_main_controller JPP((j_compress_ptr cinfo,
-					  boolean need_full_buffer));
-EXTERN(void) jinit_c_prep_controller JPP((j_compress_ptr cinfo,
-					  boolean need_full_buffer));
-EXTERN(void) jinit_c_coef_controller JPP((j_compress_ptr cinfo,
-					  boolean need_full_buffer));
-EXTERN(void) jinit_color_converter JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_downsampler JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_forward_dct JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_huff_encoder JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_arith_encoder JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_marker_writer JPP((j_compress_ptr cinfo));
-/* Decompression module initialization routines */
-EXTERN(void) jinit_master_decompress JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_d_main_controller JPP((j_decompress_ptr cinfo,
-					  boolean need_full_buffer));
-EXTERN(void) jinit_d_coef_controller JPP((j_decompress_ptr cinfo,
-					  boolean need_full_buffer));
-EXTERN(void) jinit_d_post_controller JPP((j_decompress_ptr cinfo,
-					  boolean need_full_buffer));
-EXTERN(void) jinit_input_controller JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_marker_reader JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_huff_decoder JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_arith_decoder JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_inverse_dct JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_upsampler JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_color_deconverter JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_1pass_quantizer JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_2pass_quantizer JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_merged_upsampler JPP((j_decompress_ptr cinfo));
-/* Memory manager initialization */
-EXTERN(void) jinit_memory_mgr JPP((j_common_ptr cinfo));
-
-/* Utility routines in jutils.c */
-EXTERN(long) jdiv_round_up JPP((long a, long b));
-EXTERN(long) jround_up JPP((long a, long b));
-EXTERN(void) jcopy_sample_rows JPP((JSAMPARRAY input_array, int source_row,
-				    JSAMPARRAY output_array, int dest_row,
-				    int num_rows, JDIMENSION num_cols));
-EXTERN(void) jcopy_block_row JPP((JBLOCKROW input_row, JBLOCKROW output_row,
-				  JDIMENSION num_blocks));
-EXTERN(void) jzero_far JPP((void FAR * target, size_t bytestozero));
-/* Constant tables in jutils.c */
-#if 0				/* This table is not actually needed in v6a */
-extern const int jpeg_zigzag_order[]; /* natural coef order to zigzag order */
-#endif
-extern const int jpeg_natural_order[]; /* zigzag coef order to natural order */
-extern const int jpeg_natural_order7[]; /* zz to natural order for 7x7 block */
-extern const int jpeg_natural_order6[]; /* zz to natural order for 6x6 block */
-extern const int jpeg_natural_order5[]; /* zz to natural order for 5x5 block */
-extern const int jpeg_natural_order4[]; /* zz to natural order for 4x4 block */
-extern const int jpeg_natural_order3[]; /* zz to natural order for 3x3 block */
-extern const int jpeg_natural_order2[]; /* zz to natural order for 2x2 block */
-
-/* Arithmetic coding probability estimation tables in jaricom.c */
-extern const INT32 jpeg_aritab[];
-
-/* Suppress undefined-structure complaints if necessary. */
-
-#ifdef INCOMPLETE_TYPES_BROKEN
-#ifndef AM_MEMORY_MANAGER	/* only jmemmgr.c defines these */
-struct jvirt_sarray_control { long dummy; };
-struct jvirt_barray_control { long dummy; };
-#endif
-#endif /* INCOMPLETE_TYPES_BROKEN */
diff --git a/lib-x86-32/include/jpeglib.h b/lib-x86-32/include/jpeglib.h
deleted file mode 100644
index 1eb1fac0..00000000
--- a/lib-x86-32/include/jpeglib.h
+++ /dev/null
@@ -1,1160 +0,0 @@
-/*
- * jpeglib.h
- *
- * Copyright (C) 1991-1998, Thomas G. Lane.
- * Modified 2002-2010 by Guido Vollbeding.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file defines the application interface for the JPEG library.
- * Most applications using the library need only include this file,
- * and perhaps jerror.h if they want to know the exact error codes.
- */
-
-#ifndef JPEGLIB_H
-#define JPEGLIB_H
-
-/*
- * First we include the configuration files that record how this
- * installation of the JPEG library is set up.  jconfig.h can be
- * generated automatically for many systems.  jmorecfg.h contains
- * manual configuration options that most people need not worry about.
- */
-
-#ifndef JCONFIG_INCLUDED	/* in case jinclude.h already did */
-#include "jconfig.h"		/* widely used configuration options */
-#endif
-#include "jmorecfg.h"		/* seldom changed options */
-
-
-#ifdef __cplusplus
-#ifndef DONT_USE_EXTERN_C
-extern "C" {
-#endif
-#endif
-
-/* Version IDs for the JPEG library.
- * Might be useful for tests like "#if JPEG_LIB_VERSION >= 80".
- */
-
-#define JPEG_LIB_VERSION        80	/* Compatibility version 8.0 */
-#define JPEG_LIB_VERSION_MAJOR  8
-#define JPEG_LIB_VERSION_MINOR  3
-
-
-/* Various constants determining the sizes of things.
- * All of these are specified by the JPEG standard, so don't change them
- * if you want to be compatible.
- */
-
-#define DCTSIZE		    8	/* The basic DCT block is 8x8 samples */
-#define DCTSIZE2	    64	/* DCTSIZE squared; # of elements in a block */
-#define NUM_QUANT_TBLS      4	/* Quantization tables are numbered 0..3 */
-#define NUM_HUFF_TBLS       4	/* Huffman tables are numbered 0..3 */
-#define NUM_ARITH_TBLS      16	/* Arith-coding tables are numbered 0..15 */
-#define MAX_COMPS_IN_SCAN   4	/* JPEG limit on # of components in one scan */
-#define MAX_SAMP_FACTOR     4	/* JPEG limit on sampling factors */
-/* Unfortunately, some bozo at Adobe saw no reason to be bound by the standard;
- * the PostScript DCT filter can emit files with many more than 10 blocks/MCU.
- * If you happen to run across such a file, you can up D_MAX_BLOCKS_IN_MCU
- * to handle it.  We even let you do this from the jconfig.h file.  However,
- * we strongly discourage changing C_MAX_BLOCKS_IN_MCU; just because Adobe
- * sometimes emits noncompliant files doesn't mean you should too.
- */
-#define C_MAX_BLOCKS_IN_MCU   10 /* compressor's limit on blocks per MCU */
-#ifndef D_MAX_BLOCKS_IN_MCU
-#define D_MAX_BLOCKS_IN_MCU   10 /* decompressor's limit on blocks per MCU */
-#endif
-
-
-/* Data structures for images (arrays of samples and of DCT coefficients).
- * On 80x86 machines, the image arrays are too big for near pointers,
- * but the pointer arrays can fit in near memory.
- */
-
-typedef JSAMPLE FAR *JSAMPROW;	/* ptr to one image row of pixel samples. */
-typedef JSAMPROW *JSAMPARRAY;	/* ptr to some rows (a 2-D sample array) */
-typedef JSAMPARRAY *JSAMPIMAGE;	/* a 3-D sample array: top index is color */
-
-typedef JCOEF JBLOCK[DCTSIZE2];	/* one block of coefficients */
-typedef JBLOCK FAR *JBLOCKROW;	/* pointer to one row of coefficient blocks */
-typedef JBLOCKROW *JBLOCKARRAY;		/* a 2-D array of coefficient blocks */
-typedef JBLOCKARRAY *JBLOCKIMAGE;	/* a 3-D array of coefficient blocks */
-
-typedef JCOEF FAR *JCOEFPTR;	/* useful in a couple of places */
-
-
-/* Types for JPEG compression parameters and working tables. */
-
-
-/* DCT coefficient quantization tables. */
-
-typedef struct {
-  /* This array gives the coefficient quantizers in natural array order
-   * (not the zigzag order in which they are stored in a JPEG DQT marker).
-   * CAUTION: IJG versions prior to v6a kept this array in zigzag order.
-   */
-  UINT16 quantval[DCTSIZE2];	/* quantization step for each coefficient */
-  /* This field is used only during compression.  It's initialized FALSE when
-   * the table is created, and set TRUE when it's been output to the file.
-   * You could suppress output of a table by setting this to TRUE.
-   * (See jpeg_suppress_tables for an example.)
-   */
-  boolean sent_table;		/* TRUE when table has been output */
-} JQUANT_TBL;
-
-
-/* Huffman coding tables. */
-
-typedef struct {
-  /* These two fields directly represent the contents of a JPEG DHT marker */
-  UINT8 bits[17];		/* bits[k] = # of symbols with codes of */
-				/* length k bits; bits[0] is unused */
-  UINT8 huffval[256];		/* The symbols, in order of incr code length */
-  /* This field is used only during compression.  It's initialized FALSE when
-   * the table is created, and set TRUE when it's been output to the file.
-   * You could suppress output of a table by setting this to TRUE.
-   * (See jpeg_suppress_tables for an example.)
-   */
-  boolean sent_table;		/* TRUE when table has been output */
-} JHUFF_TBL;
-
-
-/* Basic info about one component (color channel). */
-
-typedef struct {
-  /* These values are fixed over the whole image. */
-  /* For compression, they must be supplied by parameter setup; */
-  /* for decompression, they are read from the SOF marker. */
-  int component_id;		/* identifier for this component (0..255) */
-  int component_index;		/* its index in SOF or cinfo->comp_info[] */
-  int h_samp_factor;		/* horizontal sampling factor (1..4) */
-  int v_samp_factor;		/* vertical sampling factor (1..4) */
-  int quant_tbl_no;		/* quantization table selector (0..3) */
-  /* These values may vary between scans. */
-  /* For compression, they must be supplied by parameter setup; */
-  /* for decompression, they are read from the SOS marker. */
-  /* The decompressor output side may not use these variables. */
-  int dc_tbl_no;		/* DC entropy table selector (0..3) */
-  int ac_tbl_no;		/* AC entropy table selector (0..3) */
-  
-  /* Remaining fields should be treated as private by applications. */
-  
-  /* These values are computed during compression or decompression startup: */
-  /* Component's size in DCT blocks.
-   * Any dummy blocks added to complete an MCU are not counted; therefore
-   * these values do not depend on whether a scan is interleaved or not.
-   */
-  JDIMENSION width_in_blocks;
-  JDIMENSION height_in_blocks;
-  /* Size of a DCT block in samples,
-   * reflecting any scaling we choose to apply during the DCT step.
-   * Values from 1 to 16 are supported.
-   * Note that different components may receive different DCT scalings.
-   */
-  int DCT_h_scaled_size;
-  int DCT_v_scaled_size;
-  /* The downsampled dimensions are the component's actual, unpadded number
-   * of samples at the main buffer (preprocessing/compression interface);
-   * DCT scaling is included, so
-   * downsampled_width = ceil(image_width * Hi/Hmax * DCT_h_scaled_size/DCTSIZE)
-   * and similarly for height.
-   */
-  JDIMENSION downsampled_width;	 /* actual width in samples */
-  JDIMENSION downsampled_height; /* actual height in samples */
-  /* This flag is used only for decompression.  In cases where some of the
-   * components will be ignored (eg grayscale output from YCbCr image),
-   * we can skip most computations for the unused components.
-   */
-  boolean component_needed;	/* do we need the value of this component? */
-
-  /* These values are computed before starting a scan of the component. */
-  /* The decompressor output side may not use these variables. */
-  int MCU_width;		/* number of blocks per MCU, horizontally */
-  int MCU_height;		/* number of blocks per MCU, vertically */
-  int MCU_blocks;		/* MCU_width * MCU_height */
-  int MCU_sample_width;	/* MCU width in samples: MCU_width * DCT_h_scaled_size */
-  int last_col_width;		/* # of non-dummy blocks across in last MCU */
-  int last_row_height;		/* # of non-dummy blocks down in last MCU */
-
-  /* Saved quantization table for component; NULL if none yet saved.
-   * See jdinput.c comments about the need for this information.
-   * This field is currently used only for decompression.
-   */
-  JQUANT_TBL * quant_table;
-
-  /* Private per-component storage for DCT or IDCT subsystem. */
-  void * dct_table;
-} jpeg_component_info;
-
-
-/* The script for encoding a multiple-scan file is an array of these: */
-
-typedef struct {
-  int comps_in_scan;		/* number of components encoded in this scan */
-  int component_index[MAX_COMPS_IN_SCAN]; /* their SOF/comp_info[] indexes */
-  int Ss, Se;			/* progressive JPEG spectral selection parms */
-  int Ah, Al;			/* progressive JPEG successive approx. parms */
-} jpeg_scan_info;
-
-/* The decompressor can save APPn and COM markers in a list of these: */
-
-typedef struct jpeg_marker_struct FAR * jpeg_saved_marker_ptr;
-
-struct jpeg_marker_struct {
-  jpeg_saved_marker_ptr next;	/* next in list, or NULL */
-  UINT8 marker;			/* marker code: JPEG_COM, or JPEG_APP0+n */
-  unsigned int original_length;	/* # bytes of data in the file */
-  unsigned int data_length;	/* # bytes of data saved at data[] */
-  JOCTET FAR * data;		/* the data contained in the marker */
-  /* the marker length word is not counted in data_length or original_length */
-};
-
-/* Known color spaces. */
-
-typedef enum {
-	JCS_UNKNOWN,		/* error/unspecified */
-	JCS_GRAYSCALE,		/* monochrome */
-	JCS_RGB,		/* red/green/blue */
-	JCS_YCbCr,		/* Y/Cb/Cr (also known as YUV) */
-	JCS_CMYK,		/* C/M/Y/K */
-	JCS_YCCK		/* Y/Cb/Cr/K */
-} J_COLOR_SPACE;
-
-/* DCT/IDCT algorithm options. */
-
-typedef enum {
-	JDCT_ISLOW,		/* slow but accurate integer algorithm */
-	JDCT_IFAST,		/* faster, less accurate integer method */
-	JDCT_FLOAT		/* floating-point: accurate, fast on fast HW */
-} J_DCT_METHOD;
-
-#ifndef JDCT_DEFAULT		/* may be overridden in jconfig.h */
-#define JDCT_DEFAULT  JDCT_ISLOW
-#endif
-#ifndef JDCT_FASTEST		/* may be overridden in jconfig.h */
-#define JDCT_FASTEST  JDCT_IFAST
-#endif
-
-/* Dithering options for decompression. */
-
-typedef enum {
-	JDITHER_NONE,		/* no dithering */
-	JDITHER_ORDERED,	/* simple ordered dither */
-	JDITHER_FS		/* Floyd-Steinberg error diffusion dither */
-} J_DITHER_MODE;
-
-
-/* Common fields between JPEG compression and decompression master structs. */
-
-#define jpeg_common_fields \
-  struct jpeg_error_mgr * err;	/* Error handler module */\
-  struct jpeg_memory_mgr * mem;	/* Memory manager module */\
-  struct jpeg_progress_mgr * progress; /* Progress monitor, or NULL if none */\
-  void * client_data;		/* Available for use by application */\
-  boolean is_decompressor;	/* So common code can tell which is which */\
-  int global_state		/* For checking call sequence validity */
-
-/* Routines that are to be used by both halves of the library are declared
- * to receive a pointer to this structure.  There are no actual instances of
- * jpeg_common_struct, only of jpeg_compress_struct and jpeg_decompress_struct.
- */
-struct jpeg_common_struct {
-  jpeg_common_fields;		/* Fields common to both master struct types */
-  /* Additional fields follow in an actual jpeg_compress_struct or
-   * jpeg_decompress_struct.  All three structs must agree on these
-   * initial fields!  (This would be a lot cleaner in C++.)
-   */
-};
-
-typedef struct jpeg_common_struct * j_common_ptr;
-typedef struct jpeg_compress_struct * j_compress_ptr;
-typedef struct jpeg_decompress_struct * j_decompress_ptr;
-
-
-/* Master record for a compression instance */
-
-struct jpeg_compress_struct {
-  jpeg_common_fields;		/* Fields shared with jpeg_decompress_struct */
-
-  /* Destination for compressed data */
-  struct jpeg_destination_mgr * dest;
-
-  /* Description of source image --- these fields must be filled in by
-   * outer application before starting compression.  in_color_space must
-   * be correct before you can even call jpeg_set_defaults().
-   */
-
-  JDIMENSION image_width;	/* input image width */
-  JDIMENSION image_height;	/* input image height */
-  int input_components;		/* # of color components in input image */
-  J_COLOR_SPACE in_color_space;	/* colorspace of input image */
-
-  double input_gamma;		/* image gamma of input image */
-
-  /* Compression parameters --- these fields must be set before calling
-   * jpeg_start_compress().  We recommend calling jpeg_set_defaults() to
-   * initialize everything to reasonable defaults, then changing anything
-   * the application specifically wants to change.  That way you won't get
-   * burnt when new parameters are added.  Also note that there are several
-   * helper routines to simplify changing parameters.
-   */
-
-  unsigned int scale_num, scale_denom; /* fraction by which to scale image */
-
-  JDIMENSION jpeg_width;	/* scaled JPEG image width */
-  JDIMENSION jpeg_height;	/* scaled JPEG image height */
-  /* Dimensions of actual JPEG image that will be written to file,
-   * derived from input dimensions by scaling factors above.
-   * These fields are computed by jpeg_start_compress().
-   * You can also use jpeg_calc_jpeg_dimensions() to determine these values
-   * in advance of calling jpeg_start_compress().
-   */
-
-  int data_precision;		/* bits of precision in image data */
-
-  int num_components;		/* # of color components in JPEG image */
-  J_COLOR_SPACE jpeg_color_space; /* colorspace of JPEG image */
-
-  jpeg_component_info * comp_info;
-  /* comp_info[i] describes component that appears i'th in SOF */
-
-  JQUANT_TBL * quant_tbl_ptrs[NUM_QUANT_TBLS];
-  int q_scale_factor[NUM_QUANT_TBLS];
-  /* ptrs to coefficient quantization tables, or NULL if not defined,
-   * and corresponding scale factors (percentage, initialized 100).
-   */
-
-  JHUFF_TBL * dc_huff_tbl_ptrs[NUM_HUFF_TBLS];
-  JHUFF_TBL * ac_huff_tbl_ptrs[NUM_HUFF_TBLS];
-  /* ptrs to Huffman coding tables, or NULL if not defined */
-
-  UINT8 arith_dc_L[NUM_ARITH_TBLS]; /* L values for DC arith-coding tables */
-  UINT8 arith_dc_U[NUM_ARITH_TBLS]; /* U values for DC arith-coding tables */
-  UINT8 arith_ac_K[NUM_ARITH_TBLS]; /* Kx values for AC arith-coding tables */
-
-  int num_scans;		/* # of entries in scan_info array */
-  const jpeg_scan_info * scan_info; /* script for multi-scan file, or NULL */
-  /* The default value of scan_info is NULL, which causes a single-scan
-   * sequential JPEG file to be emitted.  To create a multi-scan file,
-   * set num_scans and scan_info to point to an array of scan definitions.
-   */
-
-  boolean raw_data_in;		/* TRUE=caller supplies downsampled data */
-  boolean arith_code;		/* TRUE=arithmetic coding, FALSE=Huffman */
-  boolean optimize_coding;	/* TRUE=optimize entropy encoding parms */
-  boolean CCIR601_sampling;	/* TRUE=first samples are cosited */
-  boolean do_fancy_downsampling; /* TRUE=apply fancy downsampling */
-  int smoothing_factor;		/* 1..100, or 0 for no input smoothing */
-  J_DCT_METHOD dct_method;	/* DCT algorithm selector */
-
-  /* The restart interval can be specified in absolute MCUs by setting
-   * restart_interval, or in MCU rows by setting restart_in_rows
-   * (in which case the correct restart_interval will be figured
-   * for each scan).
-   */
-  unsigned int restart_interval; /* MCUs per restart, or 0 for no restart */
-  int restart_in_rows;		/* if > 0, MCU rows per restart interval */
-
-  /* Parameters controlling emission of special markers. */
-
-  boolean write_JFIF_header;	/* should a JFIF marker be written? */
-  UINT8 JFIF_major_version;	/* What to write for the JFIF version number */
-  UINT8 JFIF_minor_version;
-  /* These three values are not used by the JPEG code, merely copied */
-  /* into the JFIF APP0 marker.  density_unit can be 0 for unknown, */
-  /* 1 for dots/inch, or 2 for dots/cm.  Note that the pixel aspect */
-  /* ratio is defined by X_density/Y_density even when density_unit=0. */
-  UINT8 density_unit;		/* JFIF code for pixel size units */
-  UINT16 X_density;		/* Horizontal pixel density */
-  UINT16 Y_density;		/* Vertical pixel density */
-  boolean write_Adobe_marker;	/* should an Adobe marker be written? */
-  
-  /* State variable: index of next scanline to be written to
-   * jpeg_write_scanlines().  Application may use this to control its
-   * processing loop, e.g., "while (next_scanline < image_height)".
-   */
-
-  JDIMENSION next_scanline;	/* 0 .. image_height-1  */
-
-  /* Remaining fields are known throughout compressor, but generally
-   * should not be touched by a surrounding application.
-   */
-
-  /*
-   * These fields are computed during compression startup
-   */
-  boolean progressive_mode;	/* TRUE if scan script uses progressive mode */
-  int max_h_samp_factor;	/* largest h_samp_factor */
-  int max_v_samp_factor;	/* largest v_samp_factor */
-
-  int min_DCT_h_scaled_size;	/* smallest DCT_h_scaled_size of any component */
-  int min_DCT_v_scaled_size;	/* smallest DCT_v_scaled_size of any component */
-
-  JDIMENSION total_iMCU_rows;	/* # of iMCU rows to be input to coef ctlr */
-  /* The coefficient controller receives data in units of MCU rows as defined
-   * for fully interleaved scans (whether the JPEG file is interleaved or not).
-   * There are v_samp_factor * DCTSIZE sample rows of each component in an
-   * "iMCU" (interleaved MCU) row.
-   */
-  
-  /*
-   * These fields are valid during any one scan.
-   * They describe the components and MCUs actually appearing in the scan.
-   */
-  int comps_in_scan;		/* # of JPEG components in this scan */
-  jpeg_component_info * cur_comp_info[MAX_COMPS_IN_SCAN];
-  /* *cur_comp_info[i] describes component that appears i'th in SOS */
-  
-  JDIMENSION MCUs_per_row;	/* # of MCUs across the image */
-  JDIMENSION MCU_rows_in_scan;	/* # of MCU rows in the image */
-  
-  int blocks_in_MCU;		/* # of DCT blocks per MCU */
-  int MCU_membership[C_MAX_BLOCKS_IN_MCU];
-  /* MCU_membership[i] is index in cur_comp_info of component owning */
-  /* i'th block in an MCU */
-
-  int Ss, Se, Ah, Al;		/* progressive JPEG parameters for scan */
-
-  int block_size;		/* the basic DCT block size: 1..16 */
-  const int * natural_order;	/* natural-order position array */
-  int lim_Se;			/* min( Se, DCTSIZE2-1 ) */
-
-  /*
-   * Links to compression subobjects (methods and private variables of modules)
-   */
-  struct jpeg_comp_master * master;
-  struct jpeg_c_main_controller * main;
-  struct jpeg_c_prep_controller * prep;
-  struct jpeg_c_coef_controller * coef;
-  struct jpeg_marker_writer * marker;
-  struct jpeg_color_converter * cconvert;
-  struct jpeg_downsampler * downsample;
-  struct jpeg_forward_dct * fdct;
-  struct jpeg_entropy_encoder * entropy;
-  jpeg_scan_info * script_space; /* workspace for jpeg_simple_progression */
-  int script_space_size;
-};
-
-
-/* Master record for a decompression instance */
-
-struct jpeg_decompress_struct {
-  jpeg_common_fields;		/* Fields shared with jpeg_compress_struct */
-
-  /* Source of compressed data */
-  struct jpeg_source_mgr * src;
-
-  /* Basic description of image --- filled in by jpeg_read_header(). */
-  /* Application may inspect these values to decide how to process image. */
-
-  JDIMENSION image_width;	/* nominal image width (from SOF marker) */
-  JDIMENSION image_height;	/* nominal image height */
-  int num_components;		/* # of color components in JPEG image */
-  J_COLOR_SPACE jpeg_color_space; /* colorspace of JPEG image */
-
-  /* Decompression processing parameters --- these fields must be set before
-   * calling jpeg_start_decompress().  Note that jpeg_read_header() initializes
-   * them to default values.
-   */
-
-  J_COLOR_SPACE out_color_space; /* colorspace for output */
-
-  unsigned int scale_num, scale_denom; /* fraction by which to scale image */
-
-  double output_gamma;		/* image gamma wanted in output */
-
-  boolean buffered_image;	/* TRUE=multiple output passes */
-  boolean raw_data_out;		/* TRUE=downsampled data wanted */
-
-  J_DCT_METHOD dct_method;	/* IDCT algorithm selector */
-  boolean do_fancy_upsampling;	/* TRUE=apply fancy upsampling */
-  boolean do_block_smoothing;	/* TRUE=apply interblock smoothing */
-
-  boolean quantize_colors;	/* TRUE=colormapped output wanted */
-  /* the following are ignored if not quantize_colors: */
-  J_DITHER_MODE dither_mode;	/* type of color dithering to use */
-  boolean two_pass_quantize;	/* TRUE=use two-pass color quantization */
-  int desired_number_of_colors;	/* max # colors to use in created colormap */
-  /* these are significant only in buffered-image mode: */
-  boolean enable_1pass_quant;	/* enable future use of 1-pass quantizer */
-  boolean enable_external_quant;/* enable future use of external colormap */
-  boolean enable_2pass_quant;	/* enable future use of 2-pass quantizer */
-
-  /* Description of actual output image that will be returned to application.
-   * These fields are computed by jpeg_start_decompress().
-   * You can also use jpeg_calc_output_dimensions() to determine these values
-   * in advance of calling jpeg_start_decompress().
-   */
-
-  JDIMENSION output_width;	/* scaled image width */
-  JDIMENSION output_height;	/* scaled image height */
-  int out_color_components;	/* # of color components in out_color_space */
-  int output_components;	/* # of color components returned */
-  /* output_components is 1 (a colormap index) when quantizing colors;
-   * otherwise it equals out_color_components.
-   */
-  int rec_outbuf_height;	/* min recommended height of scanline buffer */
-  /* If the buffer passed to jpeg_read_scanlines() is less than this many rows
-   * high, space and time will be wasted due to unnecessary data copying.
-   * Usually rec_outbuf_height will be 1 or 2, at most 4.
-   */
-
-  /* When quantizing colors, the output colormap is described by these fields.
-   * The application can supply a colormap by setting colormap non-NULL before
-   * calling jpeg_start_decompress; otherwise a colormap is created during
-   * jpeg_start_decompress or jpeg_start_output.
-   * The map has out_color_components rows and actual_number_of_colors columns.
-   */
-  int actual_number_of_colors;	/* number of entries in use */
-  JSAMPARRAY colormap;		/* The color map as a 2-D pixel array */
-
-  /* State variables: these variables indicate the progress of decompression.
-   * The application may examine these but must not modify them.
-   */
-
-  /* Row index of next scanline to be read from jpeg_read_scanlines().
-   * Application may use this to control its processing loop, e.g.,
-   * "while (output_scanline < output_height)".
-   */
-  JDIMENSION output_scanline;	/* 0 .. output_height-1  */
-
-  /* Current input scan number and number of iMCU rows completed in scan.
-   * These indicate the progress of the decompressor input side.
-   */
-  int input_scan_number;	/* Number of SOS markers seen so far */
-  JDIMENSION input_iMCU_row;	/* Number of iMCU rows completed */
-
-  /* The "output scan number" is the notional scan being displayed by the
-   * output side.  The decompressor will not allow output scan/row number
-   * to get ahead of input scan/row, but it can fall arbitrarily far behind.
-   */
-  int output_scan_number;	/* Nominal scan number being displayed */
-  JDIMENSION output_iMCU_row;	/* Number of iMCU rows read */
-
-  /* Current progression status.  coef_bits[c][i] indicates the precision
-   * with which component c's DCT coefficient i (in zigzag order) is known.
-   * It is -1 when no data has yet been received, otherwise it is the point
-   * transform (shift) value for the most recent scan of the coefficient
-   * (thus, 0 at completion of the progression).
-   * This pointer is NULL when reading a non-progressive file.
-   */
-  int (*coef_bits)[DCTSIZE2];	/* -1 or current Al value for each coef */
-
-  /* Internal JPEG parameters --- the application usually need not look at
-   * these fields.  Note that the decompressor output side may not use
-   * any parameters that can change between scans.
-   */
-
-  /* Quantization and Huffman tables are carried forward across input
-   * datastreams when processing abbreviated JPEG datastreams.
-   */
-
-  JQUANT_TBL * quant_tbl_ptrs[NUM_QUANT_TBLS];
-  /* ptrs to coefficient quantization tables, or NULL if not defined */
-
-  JHUFF_TBL * dc_huff_tbl_ptrs[NUM_HUFF_TBLS];
-  JHUFF_TBL * ac_huff_tbl_ptrs[NUM_HUFF_TBLS];
-  /* ptrs to Huffman coding tables, or NULL if not defined */
-
-  /* These parameters are never carried across datastreams, since they
-   * are given in SOF/SOS markers or defined to be reset by SOI.
-   */
-
-  int data_precision;		/* bits of precision in image data */
-
-  jpeg_component_info * comp_info;
-  /* comp_info[i] describes component that appears i'th in SOF */
-
-  boolean is_baseline;		/* TRUE if Baseline SOF0 encountered */
-  boolean progressive_mode;	/* TRUE if SOFn specifies progressive mode */
-  boolean arith_code;		/* TRUE=arithmetic coding, FALSE=Huffman */
-
-  UINT8 arith_dc_L[NUM_ARITH_TBLS]; /* L values for DC arith-coding tables */
-  UINT8 arith_dc_U[NUM_ARITH_TBLS]; /* U values for DC arith-coding tables */
-  UINT8 arith_ac_K[NUM_ARITH_TBLS]; /* Kx values for AC arith-coding tables */
-
-  unsigned int restart_interval; /* MCUs per restart interval, or 0 for no restart */
-
-  /* These fields record data obtained from optional markers recognized by
-   * the JPEG library.
-   */
-  boolean saw_JFIF_marker;	/* TRUE iff a JFIF APP0 marker was found */
-  /* Data copied from JFIF marker; only valid if saw_JFIF_marker is TRUE: */
-  UINT8 JFIF_major_version;	/* JFIF version number */
-  UINT8 JFIF_minor_version;
-  UINT8 density_unit;		/* JFIF code for pixel size units */
-  UINT16 X_density;		/* Horizontal pixel density */
-  UINT16 Y_density;		/* Vertical pixel density */
-  boolean saw_Adobe_marker;	/* TRUE iff an Adobe APP14 marker was found */
-  UINT8 Adobe_transform;	/* Color transform code from Adobe marker */
-
-  boolean CCIR601_sampling;	/* TRUE=first samples are cosited */
-
-  /* Aside from the specific data retained from APPn markers known to the
-   * library, the uninterpreted contents of any or all APPn and COM markers
-   * can be saved in a list for examination by the application.
-   */
-  jpeg_saved_marker_ptr marker_list; /* Head of list of saved markers */
-
-  /* Remaining fields are known throughout decompressor, but generally
-   * should not be touched by a surrounding application.
-   */
-
-  /*
-   * These fields are computed during decompression startup
-   */
-  int max_h_samp_factor;	/* largest h_samp_factor */
-  int max_v_samp_factor;	/* largest v_samp_factor */
-
-  int min_DCT_h_scaled_size;	/* smallest DCT_h_scaled_size of any component */
-  int min_DCT_v_scaled_size;	/* smallest DCT_v_scaled_size of any component */
-
-  JDIMENSION total_iMCU_rows;	/* # of iMCU rows in image */
-  /* The coefficient controller's input and output progress is measured in
-   * units of "iMCU" (interleaved MCU) rows.  These are the same as MCU rows
-   * in fully interleaved JPEG scans, but are used whether the scan is
-   * interleaved or not.  We define an iMCU row as v_samp_factor DCT block
-   * rows of each component.  Therefore, the IDCT output contains
-   * v_samp_factor*DCT_v_scaled_size sample rows of a component per iMCU row.
-   */
-
-  JSAMPLE * sample_range_limit; /* table for fast range-limiting */
-
-  /*
-   * These fields are valid during any one scan.
-   * They describe the components and MCUs actually appearing in the scan.
-   * Note that the decompressor output side must not use these fields.
-   */
-  int comps_in_scan;		/* # of JPEG components in this scan */
-  jpeg_component_info * cur_comp_info[MAX_COMPS_IN_SCAN];
-  /* *cur_comp_info[i] describes component that appears i'th in SOS */
-
-  JDIMENSION MCUs_per_row;	/* # of MCUs across the image */
-  JDIMENSION MCU_rows_in_scan;	/* # of MCU rows in the image */
-
-  int blocks_in_MCU;		/* # of DCT blocks per MCU */
-  int MCU_membership[D_MAX_BLOCKS_IN_MCU];
-  /* MCU_membership[i] is index in cur_comp_info of component owning */
-  /* i'th block in an MCU */
-
-  int Ss, Se, Ah, Al;		/* progressive JPEG parameters for scan */
-
-  /* These fields are derived from Se of first SOS marker.
-   */
-  int block_size;		/* the basic DCT block size: 1..16 */
-  const int * natural_order; /* natural-order position array for entropy decode */
-  int lim_Se;			/* min( Se, DCTSIZE2-1 ) for entropy decode */
-
-  /* This field is shared between entropy decoder and marker parser.
-   * It is either zero or the code of a JPEG marker that has been
-   * read from the data source, but has not yet been processed.
-   */
-  int unread_marker;
-
-  /*
-   * Links to decompression subobjects (methods, private variables of modules)
-   */
-  struct jpeg_decomp_master * master;
-  struct jpeg_d_main_controller * main;
-  struct jpeg_d_coef_controller * coef;
-  struct jpeg_d_post_controller * post;
-  struct jpeg_input_controller * inputctl;
-  struct jpeg_marker_reader * marker;
-  struct jpeg_entropy_decoder * entropy;
-  struct jpeg_inverse_dct * idct;
-  struct jpeg_upsampler * upsample;
-  struct jpeg_color_deconverter * cconvert;
-  struct jpeg_color_quantizer * cquantize;
-};
-
-
-/* "Object" declarations for JPEG modules that may be supplied or called
- * directly by the surrounding application.
- * As with all objects in the JPEG library, these structs only define the
- * publicly visible methods and state variables of a module.  Additional
- * private fields may exist after the public ones.
- */
-
-
-/* Error handler object */
-
-struct jpeg_error_mgr {
-  /* Error exit handler: does not return to caller */
-  JMETHOD(void, error_exit, (j_common_ptr cinfo));
-  /* Conditionally emit a trace or warning message */
-  JMETHOD(void, emit_message, (j_common_ptr cinfo, int msg_level));
-  /* Routine that actually outputs a trace or error message */
-  JMETHOD(void, output_message, (j_common_ptr cinfo));
-  /* Format a message string for the most recent JPEG error or message */
-  JMETHOD(void, format_message, (j_common_ptr cinfo, char * buffer));
-#define JMSG_LENGTH_MAX  200	/* recommended size of format_message buffer */
-  /* Reset error state variables at start of a new image */
-  JMETHOD(void, reset_error_mgr, (j_common_ptr cinfo));
-  
-  /* The message ID code and any parameters are saved here.
-   * A message can have one string parameter or up to 8 int parameters.
-   */
-  int msg_code;
-#define JMSG_STR_PARM_MAX  80
-  union {
-    int i[8];
-    char s[JMSG_STR_PARM_MAX];
-  } msg_parm;
-  
-  /* Standard state variables for error facility */
-  
-  int trace_level;		/* max msg_level that will be displayed */
-  
-  /* For recoverable corrupt-data errors, we emit a warning message,
-   * but keep going unless emit_message chooses to abort.  emit_message
-   * should count warnings in num_warnings.  The surrounding application
-   * can check for bad data by seeing if num_warnings is nonzero at the
-   * end of processing.
-   */
-  long num_warnings;		/* number of corrupt-data warnings */
-
-  /* These fields point to the table(s) of error message strings.
-   * An application can change the table pointer to switch to a different
-   * message list (typically, to change the language in which errors are
-   * reported).  Some applications may wish to add additional error codes
-   * that will be handled by the JPEG library error mechanism; the second
-   * table pointer is used for this purpose.
-   *
-   * First table includes all errors generated by JPEG library itself.
-   * Error code 0 is reserved for a "no such error string" message.
-   */
-  const char * const * jpeg_message_table; /* Library errors */
-  int last_jpeg_message;    /* Table contains strings 0..last_jpeg_message */
-  /* Second table can be added by application (see cjpeg/djpeg for example).
-   * It contains strings numbered first_addon_message..last_addon_message.
-   */
-  const char * const * addon_message_table; /* Non-library errors */
-  int first_addon_message;	/* code for first string in addon table */
-  int last_addon_message;	/* code for last string in addon table */
-};
-
-
-/* Progress monitor object */
-
-struct jpeg_progress_mgr {
-  JMETHOD(void, progress_monitor, (j_common_ptr cinfo));
-
-  long pass_counter;		/* work units completed in this pass */
-  long pass_limit;		/* total number of work units in this pass */
-  int completed_passes;		/* passes completed so far */
-  int total_passes;		/* total number of passes expected */
-};
-
-
-/* Data destination object for compression */
-
-struct jpeg_destination_mgr {
-  JOCTET * next_output_byte;	/* => next byte to write in buffer */
-  size_t free_in_buffer;	/* # of byte spaces remaining in buffer */
-
-  JMETHOD(void, init_destination, (j_compress_ptr cinfo));
-  JMETHOD(boolean, empty_output_buffer, (j_compress_ptr cinfo));
-  JMETHOD(void, term_destination, (j_compress_ptr cinfo));
-};
-
-
-/* Data source object for decompression */
-
-struct jpeg_source_mgr {
-  const JOCTET * next_input_byte; /* => next byte to read from buffer */
-  size_t bytes_in_buffer;	/* # of bytes remaining in buffer */
-
-  JMETHOD(void, init_source, (j_decompress_ptr cinfo));
-  JMETHOD(boolean, fill_input_buffer, (j_decompress_ptr cinfo));
-  JMETHOD(void, skip_input_data, (j_decompress_ptr cinfo, long num_bytes));
-  JMETHOD(boolean, resync_to_restart, (j_decompress_ptr cinfo, int desired));
-  JMETHOD(void, term_source, (j_decompress_ptr cinfo));
-};
-
-
-/* Memory manager object.
- * Allocates "small" objects (a few K total), "large" objects (tens of K),
- * and "really big" objects (virtual arrays with backing store if needed).
- * The memory manager does not allow individual objects to be freed; rather,
- * each created object is assigned to a pool, and whole pools can be freed
- * at once.  This is faster and more convenient than remembering exactly what
- * to free, especially where malloc()/free() are not too speedy.
- * NB: alloc routines never return NULL.  They exit to error_exit if not
- * successful.
- */
-
-#define JPOOL_PERMANENT	0	/* lasts until master record is destroyed */
-#define JPOOL_IMAGE	1	/* lasts until done with image/datastream */
-#define JPOOL_NUMPOOLS	2
-
-typedef struct jvirt_sarray_control * jvirt_sarray_ptr;
-typedef struct jvirt_barray_control * jvirt_barray_ptr;
-
-
-struct jpeg_memory_mgr {
-  /* Method pointers */
-  JMETHOD(void *, alloc_small, (j_common_ptr cinfo, int pool_id,
-				size_t sizeofobject));
-  JMETHOD(void FAR *, alloc_large, (j_common_ptr cinfo, int pool_id,
-				     size_t sizeofobject));
-  JMETHOD(JSAMPARRAY, alloc_sarray, (j_common_ptr cinfo, int pool_id,
-				     JDIMENSION samplesperrow,
-				     JDIMENSION numrows));
-  JMETHOD(JBLOCKARRAY, alloc_barray, (j_common_ptr cinfo, int pool_id,
-				      JDIMENSION blocksperrow,
-				      JDIMENSION numrows));
-  JMETHOD(jvirt_sarray_ptr, request_virt_sarray, (j_common_ptr cinfo,
-						  int pool_id,
-						  boolean pre_zero,
-						  JDIMENSION samplesperrow,
-						  JDIMENSION numrows,
-						  JDIMENSION maxaccess));
-  JMETHOD(jvirt_barray_ptr, request_virt_barray, (j_common_ptr cinfo,
-						  int pool_id,
-						  boolean pre_zero,
-						  JDIMENSION blocksperrow,
-						  JDIMENSION numrows,
-						  JDIMENSION maxaccess));
-  JMETHOD(void, realize_virt_arrays, (j_common_ptr cinfo));
-  JMETHOD(JSAMPARRAY, access_virt_sarray, (j_common_ptr cinfo,
-					   jvirt_sarray_ptr ptr,
-					   JDIMENSION start_row,
-					   JDIMENSION num_rows,
-					   boolean writable));
-  JMETHOD(JBLOCKARRAY, access_virt_barray, (j_common_ptr cinfo,
-					    jvirt_barray_ptr ptr,
-					    JDIMENSION start_row,
-					    JDIMENSION num_rows,
-					    boolean writable));
-  JMETHOD(void, free_pool, (j_common_ptr cinfo, int pool_id));
-  JMETHOD(void, self_destruct, (j_common_ptr cinfo));
-
-  /* Limit on memory allocation for this JPEG object.  (Note that this is
-   * merely advisory, not a guaranteed maximum; it only affects the space
-   * used for virtual-array buffers.)  May be changed by outer application
-   * after creating the JPEG object.
-   */
-  long max_memory_to_use;
-
-  /* Maximum allocation request accepted by alloc_large. */
-  long max_alloc_chunk;
-};
-
-
-/* Routine signature for application-supplied marker processing methods.
- * Need not pass marker code since it is stored in cinfo->unread_marker.
- */
-typedef JMETHOD(boolean, jpeg_marker_parser_method, (j_decompress_ptr cinfo));
-
-
-/* Declarations for routines called by application.
- * The JPP macro hides prototype parameters from compilers that can't cope.
- * Note JPP requires double parentheses.
- */
-
-#ifdef HAVE_PROTOTYPES
-#define JPP(arglist)	arglist
-#else
-#define JPP(arglist)	()
-#endif
-
-
-/* Short forms of external names for systems with brain-damaged linkers.
- * We shorten external names to be unique in the first six letters, which
- * is good enough for all known systems.
- * (If your compiler itself needs names to be unique in less than 15 
- * characters, you are out of luck.  Get a better compiler.)
- */
-
-#ifdef NEED_SHORT_EXTERNAL_NAMES
-#define jpeg_std_error		jStdError
-#define jpeg_CreateCompress	jCreaCompress
-#define jpeg_CreateDecompress	jCreaDecompress
-#define jpeg_destroy_compress	jDestCompress
-#define jpeg_destroy_decompress	jDestDecompress
-#define jpeg_stdio_dest		jStdDest
-#define jpeg_stdio_src		jStdSrc
-#define jpeg_mem_dest		jMemDest
-#define jpeg_mem_src		jMemSrc
-#define jpeg_set_defaults	jSetDefaults
-#define jpeg_set_colorspace	jSetColorspace
-#define jpeg_default_colorspace	jDefColorspace
-#define jpeg_set_quality	jSetQuality
-#define jpeg_set_linear_quality	jSetLQuality
-#define jpeg_default_qtables	jDefQTables
-#define jpeg_add_quant_table	jAddQuantTable
-#define jpeg_quality_scaling	jQualityScaling
-#define jpeg_simple_progression	jSimProgress
-#define jpeg_suppress_tables	jSuppressTables
-#define jpeg_alloc_quant_table	jAlcQTable
-#define jpeg_alloc_huff_table	jAlcHTable
-#define jpeg_start_compress	jStrtCompress
-#define jpeg_write_scanlines	jWrtScanlines
-#define jpeg_finish_compress	jFinCompress
-#define jpeg_calc_jpeg_dimensions	jCjpegDimensions
-#define jpeg_write_raw_data	jWrtRawData
-#define jpeg_write_marker	jWrtMarker
-#define jpeg_write_m_header	jWrtMHeader
-#define jpeg_write_m_byte	jWrtMByte
-#define jpeg_write_tables	jWrtTables
-#define jpeg_read_header	jReadHeader
-#define jpeg_start_decompress	jStrtDecompress
-#define jpeg_read_scanlines	jReadScanlines
-#define jpeg_finish_decompress	jFinDecompress
-#define jpeg_read_raw_data	jReadRawData
-#define jpeg_has_multiple_scans	jHasMultScn
-#define jpeg_start_output	jStrtOutput
-#define jpeg_finish_output	jFinOutput
-#define jpeg_input_complete	jInComplete
-#define jpeg_new_colormap	jNewCMap
-#define jpeg_consume_input	jConsumeInput
-#define jpeg_core_output_dimensions	jCoreDimensions
-#define jpeg_calc_output_dimensions	jCalcDimensions
-#define jpeg_save_markers	jSaveMarkers
-#define jpeg_set_marker_processor	jSetMarker
-#define jpeg_read_coefficients	jReadCoefs
-#define jpeg_write_coefficients	jWrtCoefs
-#define jpeg_copy_critical_parameters	jCopyCrit
-#define jpeg_abort_compress	jAbrtCompress
-#define jpeg_abort_decompress	jAbrtDecompress
-#define jpeg_abort		jAbort
-#define jpeg_destroy		jDestroy
-#define jpeg_resync_to_restart	jResyncRestart
-#endif /* NEED_SHORT_EXTERNAL_NAMES */
-
-
-/* Default error-management setup */
-EXTERN(struct jpeg_error_mgr *) jpeg_std_error
-	JPP((struct jpeg_error_mgr * err));
-
-/* Initialization of JPEG compression objects.
- * jpeg_create_compress() and jpeg_create_decompress() are the exported
- * names that applications should call.  These expand to calls on
- * jpeg_CreateCompress and jpeg_CreateDecompress with additional information
- * passed for version mismatch checking.
- * NB: you must set up the error-manager BEFORE calling jpeg_create_xxx.
- */
-#define jpeg_create_compress(cinfo) \
-    jpeg_CreateCompress((cinfo), JPEG_LIB_VERSION, \
-			(size_t) sizeof(struct jpeg_compress_struct))
-#define jpeg_create_decompress(cinfo) \
-    jpeg_CreateDecompress((cinfo), JPEG_LIB_VERSION, \
-			  (size_t) sizeof(struct jpeg_decompress_struct))
-EXTERN(void) jpeg_CreateCompress JPP((j_compress_ptr cinfo,
-				      int version, size_t structsize));
-EXTERN(void) jpeg_CreateDecompress JPP((j_decompress_ptr cinfo,
-					int version, size_t structsize));
-/* Destruction of JPEG compression objects */
-EXTERN(void) jpeg_destroy_compress JPP((j_compress_ptr cinfo));
-EXTERN(void) jpeg_destroy_decompress JPP((j_decompress_ptr cinfo));
-
-/* Standard data source and destination managers: stdio streams. */
-/* Caller is responsible for opening the file before and closing after. */
-EXTERN(void) jpeg_stdio_dest JPP((j_compress_ptr cinfo, FILE * outfile));
-EXTERN(void) jpeg_stdio_src JPP((j_decompress_ptr cinfo, FILE * infile));
-
-/* Data source and destination managers: memory buffers. */
-EXTERN(void) jpeg_mem_dest JPP((j_compress_ptr cinfo,
-			       unsigned char ** outbuffer,
-			       unsigned long * outsize));
-EXTERN(void) jpeg_mem_src JPP((j_decompress_ptr cinfo,
-			      unsigned char * inbuffer,
-			      unsigned long insize));
-
-/* Default parameter setup for compression */
-EXTERN(void) jpeg_set_defaults JPP((j_compress_ptr cinfo));
-/* Compression parameter setup aids */
-EXTERN(void) jpeg_set_colorspace JPP((j_compress_ptr cinfo,
-				      J_COLOR_SPACE colorspace));
-EXTERN(void) jpeg_default_colorspace JPP((j_compress_ptr cinfo));
-EXTERN(void) jpeg_set_quality JPP((j_compress_ptr cinfo, int quality,
-				   boolean force_baseline));
-EXTERN(void) jpeg_set_linear_quality JPP((j_compress_ptr cinfo,
-					  int scale_factor,
-					  boolean force_baseline));
-EXTERN(void) jpeg_default_qtables JPP((j_compress_ptr cinfo,
-				       boolean force_baseline));
-EXTERN(void) jpeg_add_quant_table JPP((j_compress_ptr cinfo, int which_tbl,
-				       const unsigned int *basic_table,
-				       int scale_factor,
-				       boolean force_baseline));
-EXTERN(int) jpeg_quality_scaling JPP((int quality));
-EXTERN(void) jpeg_simple_progression JPP((j_compress_ptr cinfo));
-EXTERN(void) jpeg_suppress_tables JPP((j_compress_ptr cinfo,
-				       boolean suppress));
-EXTERN(JQUANT_TBL *) jpeg_alloc_quant_table JPP((j_common_ptr cinfo));
-EXTERN(JHUFF_TBL *) jpeg_alloc_huff_table JPP((j_common_ptr cinfo));
-
-/* Main entry points for compression */
-EXTERN(void) jpeg_start_compress JPP((j_compress_ptr cinfo,
-				      boolean write_all_tables));
-EXTERN(JDIMENSION) jpeg_write_scanlines JPP((j_compress_ptr cinfo,
-					     JSAMPARRAY scanlines,
-					     JDIMENSION num_lines));
-EXTERN(void) jpeg_finish_compress JPP((j_compress_ptr cinfo));
-
-/* Precalculate JPEG dimensions for current compression parameters. */
-EXTERN(void) jpeg_calc_jpeg_dimensions JPP((j_compress_ptr cinfo));
-
-/* Replaces jpeg_write_scanlines when writing raw downsampled data. */
-EXTERN(JDIMENSION) jpeg_write_raw_data JPP((j_compress_ptr cinfo,
-					    JSAMPIMAGE data,
-					    JDIMENSION num_lines));
-
-/* Write a special marker.  See libjpeg.txt concerning safe usage. */
-EXTERN(void) jpeg_write_marker
-	JPP((j_compress_ptr cinfo, int marker,
-	     const JOCTET * dataptr, unsigned int datalen));
-/* Same, but piecemeal. */
-EXTERN(void) jpeg_write_m_header
-	JPP((j_compress_ptr cinfo, int marker, unsigned int datalen));
-EXTERN(void) jpeg_write_m_byte
-	JPP((j_compress_ptr cinfo, int val));
-
-/* Alternate compression function: just write an abbreviated table file */
-EXTERN(void) jpeg_write_tables JPP((j_compress_ptr cinfo));
-
-/* Decompression startup: read start of JPEG datastream to see what's there */
-EXTERN(int) jpeg_read_header JPP((j_decompress_ptr cinfo,
-				  boolean require_image));
-/* Return value is one of: */
-#define JPEG_SUSPENDED		0 /* Suspended due to lack of input data */
-#define JPEG_HEADER_OK		1 /* Found valid image datastream */
-#define JPEG_HEADER_TABLES_ONLY	2 /* Found valid table-specs-only datastream */
-/* If you pass require_image = TRUE (normal case), you need not check for
- * a TABLES_ONLY return code; an abbreviated file will cause an error exit.
- * JPEG_SUSPENDED is only possible if you use a data source module that can
- * give a suspension return (the stdio source module doesn't).
- */
-
-/* Main entry points for decompression */
-EXTERN(boolean) jpeg_start_decompress JPP((j_decompress_ptr cinfo));
-EXTERN(JDIMENSION) jpeg_read_scanlines JPP((j_decompress_ptr cinfo,
-					    JSAMPARRAY scanlines,
-					    JDIMENSION max_lines));
-EXTERN(boolean) jpeg_finish_decompress JPP((j_decompress_ptr cinfo));
-
-/* Replaces jpeg_read_scanlines when reading raw downsampled data. */
-EXTERN(JDIMENSION) jpeg_read_raw_data JPP((j_decompress_ptr cinfo,
-					   JSAMPIMAGE data,
-					   JDIMENSION max_lines));
-
-/* Additional entry points for buffered-image mode. */
-EXTERN(boolean) jpeg_has_multiple_scans JPP((j_decompress_ptr cinfo));
-EXTERN(boolean) jpeg_start_output JPP((j_decompress_ptr cinfo,
-				       int scan_number));
-EXTERN(boolean) jpeg_finish_output JPP((j_decompress_ptr cinfo));
-EXTERN(boolean) jpeg_input_complete JPP((j_decompress_ptr cinfo));
-EXTERN(void) jpeg_new_colormap JPP((j_decompress_ptr cinfo));
-EXTERN(int) jpeg_consume_input JPP((j_decompress_ptr cinfo));
-/* Return value is one of: */
-/* #define JPEG_SUSPENDED	0    Suspended due to lack of input data */
-#define JPEG_REACHED_SOS	1 /* Reached start of new scan */
-#define JPEG_REACHED_EOI	2 /* Reached end of image */
-#define JPEG_ROW_COMPLETED	3 /* Completed one iMCU row */
-#define JPEG_SCAN_COMPLETED	4 /* Completed last iMCU row of a scan */
-
-/* Precalculate output dimensions for current decompression parameters. */
-EXTERN(void) jpeg_core_output_dimensions JPP((j_decompress_ptr cinfo));
-EXTERN(void) jpeg_calc_output_dimensions JPP((j_decompress_ptr cinfo));
-
-/* Control saving of COM and APPn markers into marker_list. */
-EXTERN(void) jpeg_save_markers
-	JPP((j_decompress_ptr cinfo, int marker_code,
-	     unsigned int length_limit));
-
-/* Install a special processing method for COM or APPn markers. */
-EXTERN(void) jpeg_set_marker_processor
-	JPP((j_decompress_ptr cinfo, int marker_code,
-	     jpeg_marker_parser_method routine));
-
-/* Read or write raw DCT coefficients --- useful for lossless transcoding. */
-EXTERN(jvirt_barray_ptr *) jpeg_read_coefficients JPP((j_decompress_ptr cinfo));
-EXTERN(void) jpeg_write_coefficients JPP((j_compress_ptr cinfo,
-					  jvirt_barray_ptr * coef_arrays));
-EXTERN(void) jpeg_copy_critical_parameters JPP((j_decompress_ptr srcinfo,
-						j_compress_ptr dstinfo));
-
-/* If you choose to abort compression or decompression before completing
- * jpeg_finish_(de)compress, then you need to clean up to release memory,
- * temporary files, etc.  You can just call jpeg_destroy_(de)compress
- * if you're done with the JPEG object, but if you want to clean it up and
- * reuse it, call this:
- */
-EXTERN(void) jpeg_abort_compress JPP((j_compress_ptr cinfo));
-EXTERN(void) jpeg_abort_decompress JPP((j_decompress_ptr cinfo));
-
-/* Generic versions of jpeg_abort and jpeg_destroy that work on either
- * flavor of JPEG object.  These may be more convenient in some places.
- */
-EXTERN(void) jpeg_abort JPP((j_common_ptr cinfo));
-EXTERN(void) jpeg_destroy JPP((j_common_ptr cinfo));
-
-/* Default restart-marker-resync procedure for use by data source modules */
-EXTERN(boolean) jpeg_resync_to_restart JPP((j_decompress_ptr cinfo,
-					    int desired));
-
-
-/* These marker codes are exported since applications and data source modules
- * are likely to want to use them.
- */
-
-#define JPEG_RST0	0xD0	/* RST0 marker code */
-#define JPEG_EOI	0xD9	/* EOI marker code */
-#define JPEG_APP0	0xE0	/* APP0 marker code */
-#define JPEG_COM	0xFE	/* COM marker code */
-
-
-/* If we have a brain-damaged compiler that emits warnings (or worse, errors)
- * for structure definitions that are never filled in, keep it quiet by
- * supplying dummy definitions for the various substructures.
- */
-
-#ifdef INCOMPLETE_TYPES_BROKEN
-#ifndef JPEG_INTERNALS		/* will be defined in jpegint.h */
-struct jvirt_sarray_control { long dummy; };
-struct jvirt_barray_control { long dummy; };
-struct jpeg_comp_master { long dummy; };
-struct jpeg_c_main_controller { long dummy; };
-struct jpeg_c_prep_controller { long dummy; };
-struct jpeg_c_coef_controller { long dummy; };
-struct jpeg_marker_writer { long dummy; };
-struct jpeg_color_converter { long dummy; };
-struct jpeg_downsampler { long dummy; };
-struct jpeg_forward_dct { long dummy; };
-struct jpeg_entropy_encoder { long dummy; };
-struct jpeg_decomp_master { long dummy; };
-struct jpeg_d_main_controller { long dummy; };
-struct jpeg_d_coef_controller { long dummy; };
-struct jpeg_d_post_controller { long dummy; };
-struct jpeg_input_controller { long dummy; };
-struct jpeg_marker_reader { long dummy; };
-struct jpeg_entropy_decoder { long dummy; };
-struct jpeg_inverse_dct { long dummy; };
-struct jpeg_upsampler { long dummy; };
-struct jpeg_color_deconverter { long dummy; };
-struct jpeg_color_quantizer { long dummy; };
-#endif /* JPEG_INTERNALS */
-#endif /* INCOMPLETE_TYPES_BROKEN */
-
-
-/*
- * The JPEG library modules define JPEG_INTERNALS before including this file.
- * The internal structure declarations are read only when that is true.
- * Applications using the library should not include jpegint.h, but may wish
- * to include jerror.h.
- */
-
-#ifdef JPEG_INTERNALS
-#include "jpegint.h"		/* fetch private declarations */
-#include "jerror.h"		/* fetch error codes too */
-#endif
-
-#ifdef __cplusplus
-#ifndef DONT_USE_EXTERN_C
-}
-#endif
-#endif
-
-#endif /* JPEGLIB_H */
diff --git a/lib-x86-32/include/libavcodec/avcodec.h b/lib-x86-32/include/libavcodec/avcodec.h
deleted file mode 100644
index 974e87cc..00000000
--- a/lib-x86-32/include/libavcodec/avcodec.h
+++ /dev/null
@@ -1,3968 +0,0 @@
-/*
- * copyright (c) 2001 Fabrice Bellard
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_AVCODEC_H
-#define AVCODEC_AVCODEC_H
-
-/**
- * @file
- * external API header
- */
-
-#include <errno.h>
-#include "libavutil/avutil.h"
-
-#define LIBAVCODEC_VERSION_MAJOR 52
-#define LIBAVCODEC_VERSION_MINOR 72
-#define LIBAVCODEC_VERSION_MICRO  2
-
-#define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
-                                               LIBAVCODEC_VERSION_MINOR, \
-                                               LIBAVCODEC_VERSION_MICRO)
-#define LIBAVCODEC_VERSION      AV_VERSION(LIBAVCODEC_VERSION_MAJOR,    \
-                                           LIBAVCODEC_VERSION_MINOR,    \
-                                           LIBAVCODEC_VERSION_MICRO)
-#define LIBAVCODEC_BUILD        LIBAVCODEC_VERSION_INT
-
-#define LIBAVCODEC_IDENT        "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
-
-#define AV_NOPTS_VALUE          INT64_C(0x8000000000000000)
-#define AV_TIME_BASE            1000000
-#define AV_TIME_BASE_Q          (AVRational){1, AV_TIME_BASE}
-
-/**
- * Identifies the syntax and semantics of the bitstream.
- * The principle is roughly:
- * Two decoders with the same ID can decode the same streams.
- * Two encoders with the same ID can encode compatible streams.
- * There may be slight deviations from the principle due to implementation
- * details.
- *
- * If you add a codec ID to this list, add it so that
- * 1. no value of a existing codec ID changes (that would break ABI),
- * 2. it is as close as possible to similar codecs.
- */
-enum CodecID {
-    CODEC_ID_NONE,
-
-    /* video codecs */
-    CODEC_ID_MPEG1VIDEO,
-    CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
-    CODEC_ID_MPEG2VIDEO_XVMC,
-    CODEC_ID_H261,
-    CODEC_ID_H263,
-    CODEC_ID_RV10,
-    CODEC_ID_RV20,
-    CODEC_ID_MJPEG,
-    CODEC_ID_MJPEGB,
-    CODEC_ID_LJPEG,
-    CODEC_ID_SP5X,
-    CODEC_ID_JPEGLS,
-    CODEC_ID_MPEG4,
-    CODEC_ID_RAWVIDEO,
-    CODEC_ID_MSMPEG4V1,
-    CODEC_ID_MSMPEG4V2,
-    CODEC_ID_MSMPEG4V3,
-    CODEC_ID_WMV1,
-    CODEC_ID_WMV2,
-    CODEC_ID_H263P,
-    CODEC_ID_H263I,
-    CODEC_ID_FLV1,
-    CODEC_ID_SVQ1,
-    CODEC_ID_SVQ3,
-    CODEC_ID_DVVIDEO,
-    CODEC_ID_HUFFYUV,
-    CODEC_ID_CYUV,
-    CODEC_ID_H264,
-    CODEC_ID_INDEO3,
-    CODEC_ID_VP3,
-    CODEC_ID_THEORA,
-    CODEC_ID_ASV1,
-    CODEC_ID_ASV2,
-    CODEC_ID_FFV1,
-    CODEC_ID_4XM,
-    CODEC_ID_VCR1,
-    CODEC_ID_CLJR,
-    CODEC_ID_MDEC,
-    CODEC_ID_ROQ,
-    CODEC_ID_INTERPLAY_VIDEO,
-    CODEC_ID_XAN_WC3,
-    CODEC_ID_XAN_WC4,
-    CODEC_ID_RPZA,
-    CODEC_ID_CINEPAK,
-    CODEC_ID_WS_VQA,
-    CODEC_ID_MSRLE,
-    CODEC_ID_MSVIDEO1,
-    CODEC_ID_IDCIN,
-    CODEC_ID_8BPS,
-    CODEC_ID_SMC,
-    CODEC_ID_FLIC,
-    CODEC_ID_TRUEMOTION1,
-    CODEC_ID_VMDVIDEO,
-    CODEC_ID_MSZH,
-    CODEC_ID_ZLIB,
-    CODEC_ID_QTRLE,
-    CODEC_ID_SNOW,
-    CODEC_ID_TSCC,
-    CODEC_ID_ULTI,
-    CODEC_ID_QDRAW,
-    CODEC_ID_VIXL,
-    CODEC_ID_QPEG,
-#if LIBAVCODEC_VERSION_MAJOR < 53
-    CODEC_ID_XVID,
-#endif
-    CODEC_ID_PNG,
-    CODEC_ID_PPM,
-    CODEC_ID_PBM,
-    CODEC_ID_PGM,
-    CODEC_ID_PGMYUV,
-    CODEC_ID_PAM,
-    CODEC_ID_FFVHUFF,
-    CODEC_ID_RV30,
-    CODEC_ID_RV40,
-    CODEC_ID_VC1,
-    CODEC_ID_WMV3,
-    CODEC_ID_LOCO,
-    CODEC_ID_WNV1,
-    CODEC_ID_AASC,
-    CODEC_ID_INDEO2,
-    CODEC_ID_FRAPS,
-    CODEC_ID_TRUEMOTION2,
-    CODEC_ID_BMP,
-    CODEC_ID_CSCD,
-    CODEC_ID_MMVIDEO,
-    CODEC_ID_ZMBV,
-    CODEC_ID_AVS,
-    CODEC_ID_SMACKVIDEO,
-    CODEC_ID_NUV,
-    CODEC_ID_KMVC,
-    CODEC_ID_FLASHSV,
-    CODEC_ID_CAVS,
-    CODEC_ID_JPEG2000,
-    CODEC_ID_VMNC,
-    CODEC_ID_VP5,
-    CODEC_ID_VP6,
-    CODEC_ID_VP6F,
-    CODEC_ID_TARGA,
-    CODEC_ID_DSICINVIDEO,
-    CODEC_ID_TIERTEXSEQVIDEO,
-    CODEC_ID_TIFF,
-    CODEC_ID_GIF,
-    CODEC_ID_FFH264,
-    CODEC_ID_DXA,
-    CODEC_ID_DNXHD,
-    CODEC_ID_THP,
-    CODEC_ID_SGI,
-    CODEC_ID_C93,
-    CODEC_ID_BETHSOFTVID,
-    CODEC_ID_PTX,
-    CODEC_ID_TXD,
-    CODEC_ID_VP6A,
-    CODEC_ID_AMV,
-    CODEC_ID_VB,
-    CODEC_ID_PCX,
-    CODEC_ID_SUNRAST,
-    CODEC_ID_INDEO4,
-    CODEC_ID_INDEO5,
-    CODEC_ID_MIMIC,
-    CODEC_ID_RL2,
-    CODEC_ID_8SVX_EXP,
-    CODEC_ID_8SVX_FIB,
-    CODEC_ID_ESCAPE124,
-    CODEC_ID_DIRAC,
-    CODEC_ID_BFI,
-    CODEC_ID_CMV,
-    CODEC_ID_MOTIONPIXELS,
-    CODEC_ID_TGV,
-    CODEC_ID_TGQ,
-    CODEC_ID_TQI,
-    CODEC_ID_AURA,
-    CODEC_ID_AURA2,
-    CODEC_ID_V210X,
-    CODEC_ID_TMV,
-    CODEC_ID_V210,
-    CODEC_ID_DPX,
-    CODEC_ID_MAD,
-    CODEC_ID_FRWU,
-    CODEC_ID_FLASHSV2,
-    CODEC_ID_CDGRAPHICS,
-    CODEC_ID_R210,
-    CODEC_ID_ANM,
-    CODEC_ID_BINKVIDEO,
-    CODEC_ID_IFF_ILBM,
-    CODEC_ID_IFF_BYTERUN1,
-    CODEC_ID_KGV1,
-    CODEC_ID_YOP,
-    CODEC_ID_VP8,
-
-    /* various PCM "codecs" */
-    CODEC_ID_PCM_S16LE= 0x10000,
-    CODEC_ID_PCM_S16BE,
-    CODEC_ID_PCM_U16LE,
-    CODEC_ID_PCM_U16BE,
-    CODEC_ID_PCM_S8,
-    CODEC_ID_PCM_U8,
-    CODEC_ID_PCM_MULAW,
-    CODEC_ID_PCM_ALAW,
-    CODEC_ID_PCM_S32LE,
-    CODEC_ID_PCM_S32BE,
-    CODEC_ID_PCM_U32LE,
-    CODEC_ID_PCM_U32BE,
-    CODEC_ID_PCM_S24LE,
-    CODEC_ID_PCM_S24BE,
-    CODEC_ID_PCM_U24LE,
-    CODEC_ID_PCM_U24BE,
-    CODEC_ID_PCM_S24DAUD,
-    CODEC_ID_PCM_ZORK,
-    CODEC_ID_PCM_S16LE_PLANAR,
-    CODEC_ID_PCM_DVD,
-    CODEC_ID_PCM_F32BE,
-    CODEC_ID_PCM_F32LE,
-    CODEC_ID_PCM_F64BE,
-    CODEC_ID_PCM_F64LE,
-    CODEC_ID_PCM_BLURAY,
-
-    /* various ADPCM codecs */
-    CODEC_ID_ADPCM_IMA_QT= 0x11000,
-    CODEC_ID_ADPCM_IMA_WAV,
-    CODEC_ID_ADPCM_IMA_DK3,
-    CODEC_ID_ADPCM_IMA_DK4,
-    CODEC_ID_ADPCM_IMA_WS,
-    CODEC_ID_ADPCM_IMA_SMJPEG,
-    CODEC_ID_ADPCM_MS,
-    CODEC_ID_ADPCM_4XM,
-    CODEC_ID_ADPCM_XA,
-    CODEC_ID_ADPCM_ADX,
-    CODEC_ID_ADPCM_EA,
-    CODEC_ID_ADPCM_G726,
-    CODEC_ID_ADPCM_CT,
-    CODEC_ID_ADPCM_SWF,
-    CODEC_ID_ADPCM_YAMAHA,
-    CODEC_ID_ADPCM_SBPRO_4,
-    CODEC_ID_ADPCM_SBPRO_3,
-    CODEC_ID_ADPCM_SBPRO_2,
-    CODEC_ID_ADPCM_THP,
-    CODEC_ID_ADPCM_IMA_AMV,
-    CODEC_ID_ADPCM_EA_R1,
-    CODEC_ID_ADPCM_EA_R3,
-    CODEC_ID_ADPCM_EA_R2,
-    CODEC_ID_ADPCM_IMA_EA_SEAD,
-    CODEC_ID_ADPCM_IMA_EA_EACS,
-    CODEC_ID_ADPCM_EA_XAS,
-    CODEC_ID_ADPCM_EA_MAXIS_XA,
-    CODEC_ID_ADPCM_IMA_ISS,
-
-    /* AMR */
-    CODEC_ID_AMR_NB= 0x12000,
-    CODEC_ID_AMR_WB,
-
-    /* RealAudio codecs*/
-    CODEC_ID_RA_144= 0x13000,
-    CODEC_ID_RA_288,
-
-    /* various DPCM codecs */
-    CODEC_ID_ROQ_DPCM= 0x14000,
-    CODEC_ID_INTERPLAY_DPCM,
-    CODEC_ID_XAN_DPCM,
-    CODEC_ID_SOL_DPCM,
-
-    /* audio codecs */
-    CODEC_ID_MP2= 0x15000,
-    CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3
-    CODEC_ID_AAC,
-    CODEC_ID_AC3,
-    CODEC_ID_DTS,
-    CODEC_ID_VORBIS,
-    CODEC_ID_DVAUDIO,
-    CODEC_ID_WMAV1,
-    CODEC_ID_WMAV2,
-    CODEC_ID_MACE3,
-    CODEC_ID_MACE6,
-    CODEC_ID_VMDAUDIO,
-    CODEC_ID_SONIC,
-    CODEC_ID_SONIC_LS,
-    CODEC_ID_FLAC,
-    CODEC_ID_MP3ADU,
-    CODEC_ID_MP3ON4,
-    CODEC_ID_SHORTEN,
-    CODEC_ID_ALAC,
-    CODEC_ID_WESTWOOD_SND1,
-    CODEC_ID_GSM, ///< as in Berlin toast format
-    CODEC_ID_QDM2,
-    CODEC_ID_COOK,
-    CODEC_ID_TRUESPEECH,
-    CODEC_ID_TTA,
-    CODEC_ID_SMACKAUDIO,
-    CODEC_ID_QCELP,
-    CODEC_ID_WAVPACK,
-    CODEC_ID_DSICINAUDIO,
-    CODEC_ID_IMC,
-    CODEC_ID_MUSEPACK7,
-    CODEC_ID_MLP,
-    CODEC_ID_GSM_MS, /* as found in WAV */
-    CODEC_ID_ATRAC3,
-    CODEC_ID_VOXWARE,
-    CODEC_ID_APE,
-    CODEC_ID_NELLYMOSER,
-    CODEC_ID_MUSEPACK8,
-    CODEC_ID_SPEEX,
-    CODEC_ID_WMAVOICE,
-    CODEC_ID_WMAPRO,
-    CODEC_ID_WMALOSSLESS,
-    CODEC_ID_ATRAC3P,
-    CODEC_ID_EAC3,
-    CODEC_ID_SIPR,
-    CODEC_ID_MP1,
-    CODEC_ID_TWINVQ,
-    CODEC_ID_TRUEHD,
-    CODEC_ID_MP4ALS,
-    CODEC_ID_ATRAC1,
-    CODEC_ID_BINKAUDIO_RDFT,
-    CODEC_ID_BINKAUDIO_DCT,
-
-    /* subtitle codecs */
-    CODEC_ID_DVD_SUBTITLE= 0x17000,
-    CODEC_ID_DVB_SUBTITLE,
-    CODEC_ID_TEXT,  ///< raw UTF-8 text
-    CODEC_ID_XSUB,
-    CODEC_ID_SSA,
-    CODEC_ID_MOV_TEXT,
-    CODEC_ID_HDMV_PGS_SUBTITLE,
-    CODEC_ID_DVB_TELETEXT,
-
-    /* other specific kind of codecs (generally used for attachments) */
-    CODEC_ID_TTF= 0x18000,
-
-    CODEC_ID_PROBE= 0x19000, ///< codec_id is not known (like CODEC_ID_NONE) but lavf should attempt to identify it
-
-    CODEC_ID_MPEG2TS= 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS
-                                * stream (only used by libavformat) */
-};
-
-#if LIBAVCODEC_VERSION_MAJOR < 53
-#define CodecType AVMediaType
-
-#define CODEC_TYPE_UNKNOWN    AVMEDIA_TYPE_UNKNOWN
-#define CODEC_TYPE_VIDEO      AVMEDIA_TYPE_VIDEO
-#define CODEC_TYPE_AUDIO      AVMEDIA_TYPE_AUDIO
-#define CODEC_TYPE_DATA       AVMEDIA_TYPE_DATA
-#define CODEC_TYPE_SUBTITLE   AVMEDIA_TYPE_SUBTITLE
-#define CODEC_TYPE_ATTACHMENT AVMEDIA_TYPE_ATTACHMENT
-#define CODEC_TYPE_NB         AVMEDIA_TYPE_NB
-#endif
-
-/**
- * all in native-endian format
- */
-enum SampleFormat {
-    SAMPLE_FMT_NONE = -1,
-    SAMPLE_FMT_U8,              ///< unsigned 8 bits
-    SAMPLE_FMT_S16,             ///< signed 16 bits
-    SAMPLE_FMT_S32,             ///< signed 32 bits
-    SAMPLE_FMT_FLT,             ///< float
-    SAMPLE_FMT_DBL,             ///< double
-    SAMPLE_FMT_NB               ///< Number of sample formats. DO NOT USE if dynamically linking to libavcodec
-};
-
-/* Audio channel masks */
-#define CH_FRONT_LEFT             0x00000001
-#define CH_FRONT_RIGHT            0x00000002
-#define CH_FRONT_CENTER           0x00000004
-#define CH_LOW_FREQUENCY          0x00000008
-#define CH_BACK_LEFT              0x00000010
-#define CH_BACK_RIGHT             0x00000020
-#define CH_FRONT_LEFT_OF_CENTER   0x00000040
-#define CH_FRONT_RIGHT_OF_CENTER  0x00000080
-#define CH_BACK_CENTER            0x00000100
-#define CH_SIDE_LEFT              0x00000200
-#define CH_SIDE_RIGHT             0x00000400
-#define CH_TOP_CENTER             0x00000800
-#define CH_TOP_FRONT_LEFT         0x00001000
-#define CH_TOP_FRONT_CENTER       0x00002000
-#define CH_TOP_FRONT_RIGHT        0x00004000
-#define CH_TOP_BACK_LEFT          0x00008000
-#define CH_TOP_BACK_CENTER        0x00010000
-#define CH_TOP_BACK_RIGHT         0x00020000
-#define CH_STEREO_LEFT            0x20000000  ///< Stereo downmix.
-#define CH_STEREO_RIGHT           0x40000000  ///< See CH_STEREO_LEFT.
-
-/** Channel mask value used for AVCodecContext.request_channel_layout
-    to indicate that the user requests the channel order of the decoder output
-    to be the native codec channel order. */
-#define CH_LAYOUT_NATIVE          0x8000000000000000LL
-
-/* Audio channel convenience macros */
-#define CH_LAYOUT_MONO              (CH_FRONT_CENTER)
-#define CH_LAYOUT_STEREO            (CH_FRONT_LEFT|CH_FRONT_RIGHT)
-#define CH_LAYOUT_2_1               (CH_LAYOUT_STEREO|CH_BACK_CENTER)
-#define CH_LAYOUT_SURROUND          (CH_LAYOUT_STEREO|CH_FRONT_CENTER)
-#define CH_LAYOUT_4POINT0           (CH_LAYOUT_SURROUND|CH_BACK_CENTER)
-#define CH_LAYOUT_2_2               (CH_LAYOUT_STEREO|CH_SIDE_LEFT|CH_SIDE_RIGHT)
-#define CH_LAYOUT_QUAD              (CH_LAYOUT_STEREO|CH_BACK_LEFT|CH_BACK_RIGHT)
-#define CH_LAYOUT_5POINT0           (CH_LAYOUT_SURROUND|CH_SIDE_LEFT|CH_SIDE_RIGHT)
-#define CH_LAYOUT_5POINT1           (CH_LAYOUT_5POINT0|CH_LOW_FREQUENCY)
-#define CH_LAYOUT_5POINT0_BACK      (CH_LAYOUT_SURROUND|CH_BACK_LEFT|CH_BACK_RIGHT)
-#define CH_LAYOUT_5POINT1_BACK      (CH_LAYOUT_5POINT0_BACK|CH_LOW_FREQUENCY)
-#define CH_LAYOUT_7POINT0           (CH_LAYOUT_5POINT0|CH_BACK_LEFT|CH_BACK_RIGHT)
-#define CH_LAYOUT_7POINT1           (CH_LAYOUT_5POINT1|CH_BACK_LEFT|CH_BACK_RIGHT)
-#define CH_LAYOUT_7POINT1_WIDE      (CH_LAYOUT_5POINT1_BACK|\
-                                          CH_FRONT_LEFT_OF_CENTER|CH_FRONT_RIGHT_OF_CENTER)
-#define CH_LAYOUT_STEREO_DOWNMIX    (CH_STEREO_LEFT|CH_STEREO_RIGHT)
-
-/* in bytes */
-#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
-
-/**
- * Required number of additionally allocated bytes at the end of the input bitstream for decoding.
- * This is mainly needed because some optimized bitstream readers read
- * 32 or 64 bit at once and could read over the end.<br>
- * Note: If the first 23 bits of the additional bytes are not 0, then damaged
- * MPEG bitstreams could cause overread and segfault.
- */
-#define FF_INPUT_BUFFER_PADDING_SIZE 8
-
-/**
- * minimum encoding buffer size
- * Used to avoid some checks during header writing.
- */
-#define FF_MIN_BUFFER_SIZE 16384
-
-
-/**
- * motion estimation type.
- */
-enum Motion_Est_ID {
-    ME_ZERO = 1,    ///< no search, that is use 0,0 vector whenever one is needed
-    ME_FULL,
-    ME_LOG,
-    ME_PHODS,
-    ME_EPZS,        ///< enhanced predictive zonal search
-    ME_X1,          ///< reserved for experiments
-    ME_HEX,         ///< hexagon based search
-    ME_UMH,         ///< uneven multi-hexagon search
-    ME_ITER,        ///< iterative search
-    ME_TESA,        ///< transformed exhaustive search algorithm
-};
-
-enum AVDiscard{
-    /* We leave some space between them for extensions (drop some
-     * keyframes for intra-only or drop just some bidir frames). */
-    AVDISCARD_NONE   =-16, ///< discard nothing
-    AVDISCARD_DEFAULT=  0, ///< discard useless packets like 0 size packets in avi
-    AVDISCARD_NONREF =  8, ///< discard all non reference
-    AVDISCARD_BIDIR  = 16, ///< discard all bidirectional frames
-    AVDISCARD_NONKEY = 32, ///< discard all frames except keyframes
-    AVDISCARD_ALL    = 48, ///< discard all
-};
-
-enum AVColorPrimaries{
-    AVCOL_PRI_BT709      =1, ///< also ITU-R BT1361 / IEC 61966-2-4 / SMPTE RP177 Annex B
-    AVCOL_PRI_UNSPECIFIED=2,
-    AVCOL_PRI_BT470M     =4,
-    AVCOL_PRI_BT470BG    =5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM
-    AVCOL_PRI_SMPTE170M  =6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC
-    AVCOL_PRI_SMPTE240M  =7, ///< functionally identical to above
-    AVCOL_PRI_FILM       =8,
-    AVCOL_PRI_NB           , ///< Not part of ABI
-};
-
-enum AVColorTransferCharacteristic{
-    AVCOL_TRC_BT709      =1, ///< also ITU-R BT1361
-    AVCOL_TRC_UNSPECIFIED=2,
-    AVCOL_TRC_GAMMA22    =4, ///< also ITU-R BT470M / ITU-R BT1700 625 PAL & SECAM
-    AVCOL_TRC_GAMMA28    =5, ///< also ITU-R BT470BG
-    AVCOL_TRC_NB           , ///< Not part of ABI
-};
-
-enum AVColorSpace{
-    AVCOL_SPC_RGB        =0,
-    AVCOL_SPC_BT709      =1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B
-    AVCOL_SPC_UNSPECIFIED=2,
-    AVCOL_SPC_FCC        =4,
-    AVCOL_SPC_BT470BG    =5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM / IEC 61966-2-4 xvYCC601
-    AVCOL_SPC_SMPTE170M  =6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC / functionally identical to above
-    AVCOL_SPC_SMPTE240M  =7,
-    AVCOL_SPC_NB           , ///< Not part of ABI
-};
-
-enum AVColorRange{
-    AVCOL_RANGE_UNSPECIFIED=0,
-    AVCOL_RANGE_MPEG       =1, ///< the normal 219*2^(n-8) "MPEG" YUV ranges
-    AVCOL_RANGE_JPEG       =2, ///< the normal     2^n-1   "JPEG" YUV ranges
-    AVCOL_RANGE_NB           , ///< Not part of ABI
-};
-
-/**
- *  X   X      3 4 X      X are luma samples,
- *             1 2        1-6 are possible chroma positions
- *  X   X      5 6 X      0 is undefined/unknown position
- */
-enum AVChromaLocation{
-    AVCHROMA_LOC_UNSPECIFIED=0,
-    AVCHROMA_LOC_LEFT       =1, ///< mpeg2/4, h264 default
-    AVCHROMA_LOC_CENTER     =2, ///< mpeg1, jpeg, h263
-    AVCHROMA_LOC_TOPLEFT    =3, ///< DV
-    AVCHROMA_LOC_TOP        =4,
-    AVCHROMA_LOC_BOTTOMLEFT =5,
-    AVCHROMA_LOC_BOTTOM     =6,
-    AVCHROMA_LOC_NB           , ///< Not part of ABI
-};
-
-typedef struct RcOverride{
-    int start_frame;
-    int end_frame;
-    int qscale; // If this is 0 then quality_factor will be used instead.
-    float quality_factor;
-} RcOverride;
-
-#define FF_MAX_B_FRAMES 16
-
-/* encoding support
-   These flags can be passed in AVCodecContext.flags before initialization.
-   Note: Not everything is supported yet.
-*/
-
-#define CODEC_FLAG_QSCALE 0x0002  ///< Use fixed qscale.
-#define CODEC_FLAG_4MV    0x0004  ///< 4 MV per MB allowed / advanced prediction for H.263.
-#define CODEC_FLAG_QPEL   0x0010  ///< Use qpel MC.
-#define CODEC_FLAG_GMC    0x0020  ///< Use GMC.
-#define CODEC_FLAG_MV0    0x0040  ///< Always try a MB with MV=<0,0>.
-#define CODEC_FLAG_PART   0x0080  ///< Use data partitioning.
-/**
- * The parent program guarantees that the input for B-frames containing
- * streams is not written to for at least s->max_b_frames+1 frames, if
- * this is not set the input will be copied.
- */
-#define CODEC_FLAG_INPUT_PRESERVED 0x0100
-#define CODEC_FLAG_PASS1           0x0200   ///< Use internal 2pass ratecontrol in first pass mode.
-#define CODEC_FLAG_PASS2           0x0400   ///< Use internal 2pass ratecontrol in second pass mode.
-#define CODEC_FLAG_EXTERN_HUFF     0x1000   ///< Use external Huffman table (for MJPEG).
-#define CODEC_FLAG_GRAY            0x2000   ///< Only decode/encode grayscale.
-#define CODEC_FLAG_EMU_EDGE        0x4000   ///< Don't draw edges.
-#define CODEC_FLAG_PSNR            0x8000   ///< error[?] variables will be set during encoding.
-#define CODEC_FLAG_TRUNCATED       0x00010000 /** Input bitstream might be truncated at a random
-                                                  location instead of only at frame boundaries. */
-#define CODEC_FLAG_NORMALIZE_AQP  0x00020000 ///< Normalize adaptive quantization.
-#define CODEC_FLAG_INTERLACED_DCT 0x00040000 ///< Use interlaced DCT.
-#define CODEC_FLAG_LOW_DELAY      0x00080000 ///< Force low delay.
-#define CODEC_FLAG_ALT_SCAN       0x00100000 ///< Use alternate scan.
-#define CODEC_FLAG_GLOBAL_HEADER  0x00400000 ///< Place global headers in extradata instead of every keyframe.
-#define CODEC_FLAG_BITEXACT       0x00800000 ///< Use only bitexact stuff (except (I)DCT).
-/* Fx : Flag for h263+ extra options */
-#define CODEC_FLAG_AC_PRED        0x01000000 ///< H.263 advanced intra coding / MPEG-4 AC prediction
-#define CODEC_FLAG_H263P_UMV      0x02000000 ///< unlimited motion vector
-#define CODEC_FLAG_CBP_RD         0x04000000 ///< Use rate distortion optimization for cbp.
-#define CODEC_FLAG_QP_RD          0x08000000 ///< Use rate distortion optimization for qp selectioon.
-#define CODEC_FLAG_H263P_AIV      0x00000008 ///< H.263 alternative inter VLC
-#define CODEC_FLAG_OBMC           0x00000001 ///< OBMC
-#define CODEC_FLAG_LOOP_FILTER    0x00000800 ///< loop filter
-#define CODEC_FLAG_H263P_SLICE_STRUCT 0x10000000
-#define CODEC_FLAG_INTERLACED_ME  0x20000000 ///< interlaced motion estimation
-#define CODEC_FLAG_SVCD_SCAN_OFFSET 0x40000000 ///< Will reserve space for SVCD scan offset user data.
-#define CODEC_FLAG_CLOSED_GOP     0x80000000
-#define CODEC_FLAG2_FAST          0x00000001 ///< Allow non spec compliant speedup tricks.
-#define CODEC_FLAG2_STRICT_GOP    0x00000002 ///< Strictly enforce GOP size.
-#define CODEC_FLAG2_NO_OUTPUT     0x00000004 ///< Skip bitstream encoding.
-#define CODEC_FLAG2_LOCAL_HEADER  0x00000008 ///< Place global headers at every keyframe instead of in extradata.
-#define CODEC_FLAG2_BPYRAMID      0x00000010 ///< H.264 allow B-frames to be used as references.
-#define CODEC_FLAG2_WPRED         0x00000020 ///< H.264 weighted biprediction for B-frames
-#define CODEC_FLAG2_MIXED_REFS    0x00000040 ///< H.264 one reference per partition, as opposed to one reference per macroblock
-#define CODEC_FLAG2_8X8DCT        0x00000080 ///< H.264 high profile 8x8 transform
-#define CODEC_FLAG2_FASTPSKIP     0x00000100 ///< H.264 fast pskip
-#define CODEC_FLAG2_AUD           0x00000200 ///< H.264 access unit delimiters
-#define CODEC_FLAG2_BRDO          0x00000400 ///< B-frame rate-distortion optimization
-#define CODEC_FLAG2_INTRA_VLC     0x00000800 ///< Use MPEG-2 intra VLC table.
-#define CODEC_FLAG2_MEMC_ONLY     0x00001000 ///< Only do ME/MC (I frames -> ref, P frame -> ME+MC).
-#define CODEC_FLAG2_DROP_FRAME_TIMECODE 0x00002000 ///< timecode is in drop frame format.
-#define CODEC_FLAG2_SKIP_RD       0x00004000 ///< RD optimal MB level residual skipping
-#define CODEC_FLAG2_CHUNKS        0x00008000 ///< Input bitstream might be truncated at a packet boundaries instead of only at frame boundaries.
-#define CODEC_FLAG2_NON_LINEAR_QUANT 0x00010000 ///< Use MPEG-2 nonlinear quantizer.
-#define CODEC_FLAG2_BIT_RESERVOIR 0x00020000 ///< Use a bit reservoir when encoding if possible
-#define CODEC_FLAG2_MBTREE        0x00040000 ///< Use macroblock tree ratecontrol (x264 only)
-#define CODEC_FLAG2_PSY           0x00080000 ///< Use psycho visual optimizations.
-#define CODEC_FLAG2_SSIM          0x00100000 ///< Compute SSIM during encoding, error[] values are undefined.
-
-/* Unsupported options :
- *              Syntax Arithmetic coding (SAC)
- *              Reference Picture Selection
- *              Independent Segment Decoding */
-/* /Fx */
-/* codec capabilities */
-
-#define CODEC_CAP_DRAW_HORIZ_BAND 0x0001 ///< Decoder can use draw_horiz_band callback.
-/**
- * Codec uses get_buffer() for allocating buffers and supports custom allocators.
- * If not set, it might not use get_buffer() at all or use operations that
- * assume the buffer was allocated by avcodec_default_get_buffer.
- */
-#define CODEC_CAP_DR1             0x0002
-/* If 'parse_only' field is true, then avcodec_parse_frame() can be used. */
-#define CODEC_CAP_PARSE_ONLY      0x0004
-#define CODEC_CAP_TRUNCATED       0x0008
-/* Codec can export data for HW decoding (XvMC). */
-#define CODEC_CAP_HWACCEL         0x0010
-/**
- * Codec has a nonzero delay and needs to be fed with NULL at the end to get the delayed data.
- * If this is not set, the codec is guaranteed to never be fed with NULL data.
- */
-#define CODEC_CAP_DELAY           0x0020
-/**
- * Codec can be fed a final frame with a smaller size.
- * This can be used to prevent truncation of the last audio samples.
- */
-#define CODEC_CAP_SMALL_LAST_FRAME 0x0040
-/**
- * Codec can export data for HW decoding (VDPAU).
- */
-#define CODEC_CAP_HWACCEL_VDPAU    0x0080
-/**
- * Codec can output multiple frames per AVPacket
- * Normally demuxers return one frame at a time, demuxers which do not do
- * are connected to a parser to split what they return into proper frames.
- * This flag is reserved to the very rare category of codecs which have a
- * bitstream that cannot be split into frames without timeconsuming
- * operations like full decoding. Demuxers carring such bitstreams thus
- * may return multiple frames in a packet. This has many disadvantages like
- * prohibiting stream copy in many cases thus it should only be considered
- * as a last resort.
- */
-#define CODEC_CAP_SUBFRAMES        0x0100
-/**
- * Codec is experimental and is thus avoided in favor of non experimental
- * encoders
- */
-#define CODEC_CAP_EXPERIMENTAL     0x0200
-
-//The following defines may change, don't expect compatibility if you use them.
-#define MB_TYPE_INTRA4x4   0x0001
-#define MB_TYPE_INTRA16x16 0x0002 //FIXME H.264-specific
-#define MB_TYPE_INTRA_PCM  0x0004 //FIXME H.264-specific
-#define MB_TYPE_16x16      0x0008
-#define MB_TYPE_16x8       0x0010
-#define MB_TYPE_8x16       0x0020
-#define MB_TYPE_8x8        0x0040
-#define MB_TYPE_INTERLACED 0x0080
-#define MB_TYPE_DIRECT2    0x0100 //FIXME
-#define MB_TYPE_ACPRED     0x0200
-#define MB_TYPE_GMC        0x0400
-#define MB_TYPE_SKIP       0x0800
-#define MB_TYPE_P0L0       0x1000
-#define MB_TYPE_P1L0       0x2000
-#define MB_TYPE_P0L1       0x4000
-#define MB_TYPE_P1L1       0x8000
-#define MB_TYPE_L0         (MB_TYPE_P0L0 | MB_TYPE_P1L0)
-#define MB_TYPE_L1         (MB_TYPE_P0L1 | MB_TYPE_P1L1)
-#define MB_TYPE_L0L1       (MB_TYPE_L0   | MB_TYPE_L1)
-#define MB_TYPE_QUANT      0x00010000
-#define MB_TYPE_CBP        0x00020000
-//Note bits 24-31 are reserved for codec specific use (h264 ref0, mpeg1 0mv, ...)
-
-/**
- * Pan Scan area.
- * This specifies the area which should be displayed.
- * Note there may be multiple such areas for one frame.
- */
-typedef struct AVPanScan{
-    /**
-     * id
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    int id;
-
-    /**
-     * width and height in 1/16 pel
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    int width;
-    int height;
-
-    /**
-     * position of the top left corner in 1/16 pel for up to 3 fields/frames
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    int16_t position[3][2];
-}AVPanScan;
-
-#define FF_COMMON_FRAME \
-    /**\
-     * pointer to the picture planes.\
-     * This might be different from the first allocated byte\
-     * - encoding: \
-     * - decoding: \
-     */\
-    uint8_t *data[4];\
-    int linesize[4];\
-    /**\
-     * pointer to the first allocated byte of the picture. Can be used in get_buffer/release_buffer.\
-     * This isn't used by libavcodec unless the default get/release_buffer() is used.\
-     * - encoding: \
-     * - decoding: \
-     */\
-    uint8_t *base[4];\
-    /**\
-     * 1 -> keyframe, 0-> not\
-     * - encoding: Set by libavcodec.\
-     * - decoding: Set by libavcodec.\
-     */\
-    int key_frame;\
-\
-    /**\
-     * Picture type of the frame, see ?_TYPE below.\
-     * - encoding: Set by libavcodec. for coded_picture (and set by user for input).\
-     * - decoding: Set by libavcodec.\
-     */\
-    int pict_type;\
-\
-    /**\
-     * presentation timestamp in time_base units (time when frame should be shown to user)\
-     * If AV_NOPTS_VALUE then frame_rate = 1/time_base will be assumed.\
-     * - encoding: MUST be set by user.\
-     * - decoding: Set by libavcodec.\
-     */\
-    int64_t pts;\
-\
-    /**\
-     * picture number in bitstream order\
-     * - encoding: set by\
-     * - decoding: Set by libavcodec.\
-     */\
-    int coded_picture_number;\
-    /**\
-     * picture number in display order\
-     * - encoding: set by\
-     * - decoding: Set by libavcodec.\
-     */\
-    int display_picture_number;\
-\
-    /**\
-     * quality (between 1 (good) and FF_LAMBDA_MAX (bad)) \
-     * - encoding: Set by libavcodec. for coded_picture (and set by user for input).\
-     * - decoding: Set by libavcodec.\
-     */\
-    int quality; \
-\
-    /**\
-     * buffer age (1->was last buffer and dint change, 2->..., ...).\
-     * Set to INT_MAX if the buffer has not been used yet.\
-     * - encoding: unused\
-     * - decoding: MUST be set by get_buffer().\
-     */\
-    int age;\
-\
-    /**\
-     * is this picture used as reference\
-     * The values for this are the same as the MpegEncContext.picture_structure\
-     * variable, that is 1->top field, 2->bottom field, 3->frame/both fields.\
-     * Set to 4 for delayed, non-reference frames.\
-     * - encoding: unused\
-     * - decoding: Set by libavcodec. (before get_buffer() call)).\
-     */\
-    int reference;\
-\
-    /**\
-     * QP table\
-     * - encoding: unused\
-     * - decoding: Set by libavcodec.\
-     */\
-    int8_t *qscale_table;\
-    /**\
-     * QP store stride\
-     * - encoding: unused\
-     * - decoding: Set by libavcodec.\
-     */\
-    int qstride;\
-\
-    /**\
-     * mbskip_table[mb]>=1 if MB didn't change\
-     * stride= mb_width = (width+15)>>4\
-     * - encoding: unused\
-     * - decoding: Set by libavcodec.\
-     */\
-    uint8_t *mbskip_table;\
-\
-    /**\
-     * motion vector table\
-     * @code\
-     * example:\
-     * int mv_sample_log2= 4 - motion_subsample_log2;\
-     * int mb_width= (width+15)>>4;\
-     * int mv_stride= (mb_width << mv_sample_log2) + 1;\
-     * motion_val[direction][x + y*mv_stride][0->mv_x, 1->mv_y];\
-     * @endcode\
-     * - encoding: Set by user.\
-     * - decoding: Set by libavcodec.\
-     */\
-    int16_t (*motion_val[2])[2];\
-\
-    /**\
-     * macroblock type table\
-     * mb_type_base + mb_width + 2\
-     * - encoding: Set by user.\
-     * - decoding: Set by libavcodec.\
-     */\
-    uint32_t *mb_type;\
-\
-    /**\
-     * log2 of the size of the block which a single vector in motion_val represents: \
-     * (4->16x16, 3->8x8, 2-> 4x4, 1-> 2x2)\
-     * - encoding: unused\
-     * - decoding: Set by libavcodec.\
-     */\
-    uint8_t motion_subsample_log2;\
-\
-    /**\
-     * for some private data of the user\
-     * - encoding: unused\
-     * - decoding: Set by user.\
-     */\
-    void *opaque;\
-\
-    /**\
-     * error\
-     * - encoding: Set by libavcodec. if flags&CODEC_FLAG_PSNR.\
-     * - decoding: unused\
-     */\
-    uint64_t error[4];\
-\
-    /**\
-     * type of the buffer (to keep track of who has to deallocate data[*])\
-     * - encoding: Set by the one who allocates it.\
-     * - decoding: Set by the one who allocates it.\
-     * Note: User allocated (direct rendering) & internal buffers cannot coexist currently.\
-     */\
-    int type;\
-    \
-    /**\
-     * When decoding, this signals how much the picture must be delayed.\
-     * extra_delay = repeat_pict / (2*fps)\
-     * - encoding: unused\
-     * - decoding: Set by libavcodec.\
-     */\
-    int repeat_pict;\
-    \
-    /**\
-     * \
-     */\
-    int qscale_type;\
-    \
-    /**\
-     * The content of the picture is interlaced.\
-     * - encoding: Set by user.\
-     * - decoding: Set by libavcodec. (default 0)\
-     */\
-    int interlaced_frame;\
-    \
-    /**\
-     * If the content is interlaced, is top field displayed first.\
-     * - encoding: Set by user.\
-     * - decoding: Set by libavcodec.\
-     */\
-    int top_field_first;\
-    \
-    /**\
-     * Pan scan.\
-     * - encoding: Set by user.\
-     * - decoding: Set by libavcodec.\
-     */\
-    AVPanScan *pan_scan;\
-    \
-    /**\
-     * Tell user application that palette has changed from previous frame.\
-     * - encoding: ??? (no palette-enabled encoder yet)\
-     * - decoding: Set by libavcodec. (default 0).\
-     */\
-    int palette_has_changed;\
-    \
-    /**\
-     * codec suggestion on buffer type if != 0\
-     * - encoding: unused\
-     * - decoding: Set by libavcodec. (before get_buffer() call)).\
-     */\
-    int buffer_hints;\
-\
-    /**\
-     * DCT coefficients\
-     * - encoding: unused\
-     * - decoding: Set by libavcodec.\
-     */\
-    short *dct_coeff;\
-\
-    /**\
-     * motion reference frame index\
-     * the order in which these are stored can depend on the codec.\
-     * - encoding: Set by user.\
-     * - decoding: Set by libavcodec.\
-     */\
-    int8_t *ref_index[2];\
-\
-    /**\
-     * reordered opaque 64bit number (generally a PTS) from AVCodecContext.reordered_opaque\
-     * output in AVFrame.reordered_opaque\
-     * - encoding: unused\
-     * - decoding: Read by user.\
-     */\
-    int64_t reordered_opaque;\
-\
-    /**\
-     * hardware accelerator private data (FFmpeg allocated)\
-     * - encoding: unused\
-     * - decoding: Set by libavcodec\
-     */\
-    void *hwaccel_picture_private;\
-
-
-#define FF_QSCALE_TYPE_MPEG1 0
-#define FF_QSCALE_TYPE_MPEG2 1
-#define FF_QSCALE_TYPE_H264  2
-#define FF_QSCALE_TYPE_VP56  3
-
-#define FF_BUFFER_TYPE_INTERNAL 1
-#define FF_BUFFER_TYPE_USER     2 ///< direct rendering buffers (image is (de)allocated by user)
-#define FF_BUFFER_TYPE_SHARED   4 ///< Buffer from somewhere else; don't deallocate image (data/base), all other tables are not shared.
-#define FF_BUFFER_TYPE_COPY     8 ///< Just a (modified) copy of some other buffer, don't deallocate anything.
-
-
-#define FF_I_TYPE  1 ///< Intra
-#define FF_P_TYPE  2 ///< Predicted
-#define FF_B_TYPE  3 ///< Bi-dir predicted
-#define FF_S_TYPE  4 ///< S(GMC)-VOP MPEG4
-#define FF_SI_TYPE 5 ///< Switching Intra
-#define FF_SP_TYPE 6 ///< Switching Predicted
-#define FF_BI_TYPE 7
-
-#define FF_BUFFER_HINTS_VALID    0x01 // Buffer hints value is meaningful (if 0 ignore).
-#define FF_BUFFER_HINTS_READABLE 0x02 // Codec will read from buffer.
-#define FF_BUFFER_HINTS_PRESERVE 0x04 // User must not alter buffer content.
-#define FF_BUFFER_HINTS_REUSABLE 0x08 // Codec will reuse the buffer (update).
-
-typedef struct AVPacket {
-    /**
-     * Presentation timestamp in AVStream->time_base units; the time at which
-     * the decompressed packet will be presented to the user.
-     * Can be AV_NOPTS_VALUE if it is not stored in the file.
-     * pts MUST be larger or equal to dts as presentation cannot happen before
-     * decompression, unless one wants to view hex dumps. Some formats misuse
-     * the terms dts and pts/cts to mean something different. Such timestamps
-     * must be converted to true pts/dts before they are stored in AVPacket.
-     */
-    int64_t pts;
-    /**
-     * Decompression timestamp in AVStream->time_base units; the time at which
-     * the packet is decompressed.
-     * Can be AV_NOPTS_VALUE if it is not stored in the file.
-     */
-    int64_t dts;
-    uint8_t *data;
-    int   size;
-    int   stream_index;
-    int   flags;
-    /**
-     * Duration of this packet in AVStream->time_base units, 0 if unknown.
-     * Equals next_pts - this_pts in presentation order.
-     */
-    int   duration;
-    void  (*destruct)(struct AVPacket *);
-    void  *priv;
-    int64_t pos;                            ///< byte position in stream, -1 if unknown
-
-    /**
-     * Time difference in AVStream->time_base units from the pts of this
-     * packet to the point at which the output from the decoder has converged
-     * independent from the availability of previous frames. That is, the
-     * frames are virtually identical no matter if decoding started from
-     * the very first frame or from this keyframe.
-     * Is AV_NOPTS_VALUE if unknown.
-     * This field is not the display duration of the current packet.
-     *
-     * The purpose of this field is to allow seeking in streams that have no
-     * keyframes in the conventional sense. It corresponds to the
-     * recovery point SEI in H.264 and match_time_delta in NUT. It is also
-     * essential for some types of subtitle streams to ensure that all
-     * subtitles are correctly displayed after seeking.
-     */
-    int64_t convergence_duration;
-} AVPacket;
-#define AV_PKT_FLAG_KEY   0x0001
-#if LIBAVCODEC_VERSION_MAJOR < 53
-#define PKT_FLAG_KEY AV_PKT_FLAG_KEY
-#endif
-
-/**
- * Audio Video Frame.
- * New fields can be added to the end of FF_COMMON_FRAME with minor version
- * bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump. No fields should be added into AVFrame before or after
- * FF_COMMON_FRAME!
- * sizeof(AVFrame) must not be used outside libav*.
- */
-typedef struct AVFrame {
-    FF_COMMON_FRAME
-} AVFrame;
-
-/**
- * main external API structure.
- * New fields can be added to the end with minor version bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump.
- * sizeof(AVCodecContext) must not be used outside libav*.
- */
-typedef struct AVCodecContext {
-    /**
-     * information on struct for av_log
-     * - set by avcodec_alloc_context
-     */
-    const AVClass *av_class;
-    /**
-     * the average bitrate
-     * - encoding: Set by user; unused for constant quantizer encoding.
-     * - decoding: Set by libavcodec. 0 or some bitrate if this info is available in the stream.
-     */
-    int bit_rate;
-
-    /**
-     * number of bits the bitstream is allowed to diverge from the reference.
-     *           the reference can be CBR (for CBR pass1) or VBR (for pass2)
-     * - encoding: Set by user; unused for constant quantizer encoding.
-     * - decoding: unused
-     */
-    int bit_rate_tolerance;
-
-    /**
-     * CODEC_FLAG_*.
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int flags;
-
-    /**
-     * Some codecs need additional format info. It is stored here.
-     * If any muxer uses this then ALL demuxers/parsers AND encoders for the
-     * specific codec MUST set it correctly otherwise stream copy breaks.
-     * In general use of this field by muxers is not recommanded.
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by libavcodec. (FIXME: Is this OK?)
-     */
-    int sub_id;
-
-    /**
-     * Motion estimation algorithm used for video coding.
-     * 1 (zero), 2 (full), 3 (log), 4 (phods), 5 (epzs), 6 (x1), 7 (hex),
-     * 8 (umh), 9 (iter), 10 (tesa) [7, 8, 10 are x264 specific, 9 is snow specific]
-     * - encoding: MUST be set by user.
-     * - decoding: unused
-     */
-    int me_method;
-
-    /**
-     * some codecs need / can use extradata like Huffman tables.
-     * mjpeg: Huffman tables
-     * rv10: additional flags
-     * mpeg4: global headers (they can be in the bitstream or here)
-     * The allocated memory should be FF_INPUT_BUFFER_PADDING_SIZE bytes larger
-     * than extradata_size to avoid prolems if it is read with the bitstream reader.
-     * The bytewise contents of extradata must not depend on the architecture or CPU endianness.
-     * - encoding: Set/allocated/freed by libavcodec.
-     * - decoding: Set/allocated/freed by user.
-     */
-    uint8_t *extradata;
-    int extradata_size;
-
-    /**
-     * This is the fundamental unit of time (in seconds) in terms
-     * of which frame timestamps are represented. For fixed-fps content,
-     * timebase should be 1/framerate and timestamp increments should be
-     * identically 1.
-     * - encoding: MUST be set by user.
-     * - decoding: Set by libavcodec.
-     */
-    AVRational time_base;
-
-    /* video only */
-    /**
-     * picture width / height.
-     * - encoding: MUST be set by user.
-     * - decoding: Set by libavcodec.
-     * Note: For compatibility it is possible to set this instead of
-     * coded_width/height before decoding.
-     */
-    int width, height;
-
-#define FF_ASPECT_EXTENDED 15
-
-    /**
-     * the number of pictures in a group of pictures, or 0 for intra_only
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int gop_size;
-
-    /**
-     * Pixel format, see PIX_FMT_xxx.
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    enum PixelFormat pix_fmt;
-
-    /**
-     * Frame rate emulation. If not zero, the lower layer (i.e. format handler)
-     * has to read frames at native frame rate.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int rate_emu;
-
-    /**
-     * If non NULL, 'draw_horiz_band' is called by the libavcodec
-     * decoder to draw a horizontal band. It improves cache usage. Not
-     * all codecs can do that. You must check the codec capabilities
-     * beforehand.
-     * The function is also used by hardware acceleration APIs.
-     * It is called at least once during frame decoding to pass
-     * the data needed for hardware render.
-     * In that mode instead of pixel data, AVFrame points to
-     * a structure specific to the acceleration API. The application
-     * reads the structure and can change some fields to indicate progress
-     * or mark state.
-     * - encoding: unused
-     * - decoding: Set by user.
-     * @param height the height of the slice
-     * @param y the y position of the slice
-     * @param type 1->top field, 2->bottom field, 3->frame
-     * @param offset offset into the AVFrame.data from which the slice should be read
-     */
-    void (*draw_horiz_band)(struct AVCodecContext *s,
-                            const AVFrame *src, int offset[4],
-                            int y, int type, int height);
-
-    /* audio only */
-    int sample_rate; ///< samples per second
-    int channels;    ///< number of audio channels
-
-    /**
-     * audio sample format
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    enum SampleFormat sample_fmt;  ///< sample format
-
-    /* The following data should not be initialized. */
-    /**
-     * Samples per packet, initialized when calling 'init'.
-     */
-    int frame_size;
-    int frame_number;   ///< audio or video frame number
-#if LIBAVCODEC_VERSION_MAJOR < 53
-    int real_pict_num;  ///< Returns the real picture number of previous encoded frame.
-#endif
-
-    /**
-     * Number of frames the decoded output will be delayed relative to
-     * the encoded input.
-     * - encoding: Set by libavcodec.
-     * - decoding: unused
-     */
-    int delay;
-
-    /* - encoding parameters */
-    float qcompress;  ///< amount of qscale change between easy & hard scenes (0.0-1.0)
-    float qblur;      ///< amount of qscale smoothing over time (0.0-1.0)
-
-    /**
-     * minimum quantizer
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int qmin;
-
-    /**
-     * maximum quantizer
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int qmax;
-
-    /**
-     * maximum quantizer difference between frames
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int max_qdiff;
-
-    /**
-     * maximum number of B-frames between non-B-frames
-     * Note: The output will be delayed by max_b_frames+1 relative to the input.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int max_b_frames;
-
-    /**
-     * qscale factor between IP and B-frames
-     * If > 0 then the last P-frame quantizer will be used (q= lastp_q*factor+offset).
-     * If < 0 then normal ratecontrol will be done (q= -normal_q*factor+offset).
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float b_quant_factor;
-
-    /** obsolete FIXME remove */
-    int rc_strategy;
-#define FF_RC_STRATEGY_XVID 1
-
-    int b_frame_strategy;
-
-    /**
-     * hurry up amount
-     * - encoding: unused
-     * - decoding: Set by user. 1-> Skip B-frames, 2-> Skip IDCT/dequant too, 5-> Skip everything except header
-     * @deprecated Deprecated in favor of skip_idct and skip_frame.
-     */
-    int hurry_up;
-
-    struct AVCodec *codec;
-
-    void *priv_data;
-
-    int rtp_payload_size;   /* The size of the RTP payload: the coder will  */
-                            /* do its best to deliver a chunk with size     */
-                            /* below rtp_payload_size, the chunk will start */
-                            /* with a start code on some codecs like H.263. */
-                            /* This doesn't take account of any particular  */
-                            /* headers inside the transmitted RTP payload.  */
-
-
-    /* The RTP callback: This function is called    */
-    /* every time the encoder has a packet to send. */
-    /* It depends on the encoder if the data starts */
-    /* with a Start Code (it should). H.263 does.   */
-    /* mb_nb contains the number of macroblocks     */
-    /* encoded in the RTP payload.                  */
-    void (*rtp_callback)(struct AVCodecContext *avctx, void *data, int size, int mb_nb);
-
-    /* statistics, used for 2-pass encoding */
-    int mv_bits;
-    int header_bits;
-    int i_tex_bits;
-    int p_tex_bits;
-    int i_count;
-    int p_count;
-    int skip_count;
-    int misc_bits;
-
-    /**
-     * number of bits used for the previously encoded frame
-     * - encoding: Set by libavcodec.
-     * - decoding: unused
-     */
-    int frame_bits;
-
-    /**
-     * Private data of the user, can be used to carry app specific stuff.
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    void *opaque;
-
-    char codec_name[32];
-    enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */
-    enum CodecID codec_id; /* see CODEC_ID_xxx */
-
-    /**
-     * fourcc (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').
-     * This is used to work around some encoder bugs.
-     * A demuxer should set this to what is stored in the field used to identify the codec.
-     * If there are multiple such fields in a container then the demuxer should choose the one
-     * which maximizes the information about the used codec.
-     * If the codec tag field in a container is larger then 32 bits then the demuxer should
-     * remap the longer ID to 32 bits with a table or other structure. Alternatively a new
-     * extra_codec_tag + size could be added but for this a clear advantage must be demonstrated
-     * first.
-     * - encoding: Set by user, if not then the default based on codec_id will be used.
-     * - decoding: Set by user, will be converted to uppercase by libavcodec during init.
-     */
-    unsigned int codec_tag;
-
-    /**
-     * Work around bugs in encoders which sometimes cannot be detected automatically.
-     * - encoding: Set by user
-     * - decoding: Set by user
-     */
-    int workaround_bugs;
-#define FF_BUG_AUTODETECT       1  ///< autodetection
-#define FF_BUG_OLD_MSMPEG4      2
-#define FF_BUG_XVID_ILACE       4
-#define FF_BUG_UMP4             8
-#define FF_BUG_NO_PADDING       16
-#define FF_BUG_AMV              32
-#define FF_BUG_AC_VLC           0  ///< Will be removed, libavcodec can now handle these non-compliant files by default.
-#define FF_BUG_QPEL_CHROMA      64
-#define FF_BUG_STD_QPEL         128
-#define FF_BUG_QPEL_CHROMA2     256
-#define FF_BUG_DIRECT_BLOCKSIZE 512
-#define FF_BUG_EDGE             1024
-#define FF_BUG_HPEL_CHROMA      2048
-#define FF_BUG_DC_CLIP          4096
-#define FF_BUG_MS               8192 ///< Work around various bugs in Microsoft's broken decoders.
-#define FF_BUG_TRUNCATED       16384
-//#define FF_BUG_FAKE_SCALABILITY 16 //Autodetection should work 100%.
-
-    /**
-     * luma single coefficient elimination threshold
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int luma_elim_threshold;
-
-    /**
-     * chroma single coeff elimination threshold
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int chroma_elim_threshold;
-
-    /**
-     * strictly follow the standard (MPEG4, ...).
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     * Setting this to STRICT or higher means the encoder and decoder will
-     * generally do stupid things. While setting it to inofficial or lower
-     * will mean the encoder might use things that are not supported by all
-     * spec compliant decoders. Decoders make no difference between normal,
-     * inofficial and experimental, that is they always try to decode things
-     * when they can unless they are explicitly asked to behave stupid
-     * (=strictly conform to the specs)
-     */
-    int strict_std_compliance;
-#define FF_COMPLIANCE_VERY_STRICT   2 ///< Strictly conform to a older more strict version of the spec or reference software.
-#define FF_COMPLIANCE_STRICT        1 ///< Strictly conform to all the things in the spec no matter what consequences.
-#define FF_COMPLIANCE_NORMAL        0
-#define FF_COMPLIANCE_INOFFICIAL   -1 ///< Allow inofficial extensions.
-#define FF_COMPLIANCE_EXPERIMENTAL -2 ///< Allow nonstandardized experimental things.
-
-    /**
-     * qscale offset between IP and B-frames
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float b_quant_offset;
-
-    /**
-     * Error recognization; higher values will detect more errors but may
-     * misdetect some more or less valid parts as errors.
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int error_recognition;
-#define FF_ER_CAREFUL         1
-#define FF_ER_COMPLIANT       2
-#define FF_ER_AGGRESSIVE      3
-#define FF_ER_VERY_AGGRESSIVE 4
-
-    /**
-     * Called at the beginning of each frame to get a buffer for it.
-     * If pic.reference is set then the frame will be read later by libavcodec.
-     * avcodec_align_dimensions2() should be used to find the required width and
-     * height, as they normally need to be rounded up to the next multiple of 16.
-     * if CODEC_CAP_DR1 is not set then get_buffer() must call
-     * avcodec_default_get_buffer() instead of providing buffers allocated by
-     * some other means.
-     * - encoding: unused
-     * - decoding: Set by libavcodec., user can override.
-     */
-    int (*get_buffer)(struct AVCodecContext *c, AVFrame *pic);
-
-    /**
-     * Called to release buffers which were allocated with get_buffer.
-     * A released buffer can be reused in get_buffer().
-     * pic.data[*] must be set to NULL.
-     * - encoding: unused
-     * - decoding: Set by libavcodec., user can override.
-     */
-    void (*release_buffer)(struct AVCodecContext *c, AVFrame *pic);
-
-    /**
-     * Size of the frame reordering buffer in the decoder.
-     * For MPEG-2 it is 1 IPB or 0 low delay IP.
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by libavcodec.
-     */
-    int has_b_frames;
-
-    /**
-     * number of bytes per packet if constant and known or 0
-     * Used by some WAV based audio codecs.
-     */
-    int block_align;
-
-    int parse_only; /* - decoding only: If true, only parsing is done
-                       (function avcodec_parse_frame()). The frame
-                       data is returned. Only MPEG codecs support this now. */
-
-    /**
-     * 0-> h263 quant 1-> mpeg quant
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mpeg_quant;
-
-    /**
-     * pass1 encoding statistics output buffer
-     * - encoding: Set by libavcodec.
-     * - decoding: unused
-     */
-    char *stats_out;
-
-    /**
-     * pass2 encoding statistics input buffer
-     * Concatenated stuff from stats_out of pass1 should be placed here.
-     * - encoding: Allocated/set/freed by user.
-     * - decoding: unused
-     */
-    char *stats_in;
-
-    /**
-     * ratecontrol qmin qmax limiting method
-     * 0-> clipping, 1-> use a nice continous function to limit qscale wthin qmin/qmax.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float rc_qsquish;
-
-    float rc_qmod_amp;
-    int rc_qmod_freq;
-
-    /**
-     * ratecontrol override, see RcOverride
-     * - encoding: Allocated/set/freed by user.
-     * - decoding: unused
-     */
-    RcOverride *rc_override;
-    int rc_override_count;
-
-    /**
-     * rate control equation
-     * - encoding: Set by user
-     * - decoding: unused
-     */
-    const char *rc_eq;
-
-    /**
-     * maximum bitrate
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int rc_max_rate;
-
-    /**
-     * minimum bitrate
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int rc_min_rate;
-
-    /**
-     * decoder bitstream buffer size
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int rc_buffer_size;
-    float rc_buffer_aggressivity;
-
-    /**
-     * qscale factor between P and I-frames
-     * If > 0 then the last p frame quantizer will be used (q= lastp_q*factor+offset).
-     * If < 0 then normal ratecontrol will be done (q= -normal_q*factor+offset).
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float i_quant_factor;
-
-    /**
-     * qscale offset between P and I-frames
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float i_quant_offset;
-
-    /**
-     * initial complexity for pass1 ratecontrol
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float rc_initial_cplx;
-
-    /**
-     * DCT algorithm, see FF_DCT_* below
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int dct_algo;
-#define FF_DCT_AUTO    0
-#define FF_DCT_FASTINT 1
-#define FF_DCT_INT     2
-#define FF_DCT_MMX     3
-#define FF_DCT_MLIB    4
-#define FF_DCT_ALTIVEC 5
-#define FF_DCT_FAAN    6
-
-    /**
-     * luminance masking (0-> disabled)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float lumi_masking;
-
-    /**
-     * temporary complexity masking (0-> disabled)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float temporal_cplx_masking;
-
-    /**
-     * spatial complexity masking (0-> disabled)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float spatial_cplx_masking;
-
-    /**
-     * p block masking (0-> disabled)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float p_masking;
-
-    /**
-     * darkness masking (0-> disabled)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float dark_masking;
-
-    /**
-     * IDCT algorithm, see FF_IDCT_* below.
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int idct_algo;
-#define FF_IDCT_AUTO          0
-#define FF_IDCT_INT           1
-#define FF_IDCT_SIMPLE        2
-#define FF_IDCT_SIMPLEMMX     3
-#define FF_IDCT_LIBMPEG2MMX   4
-#define FF_IDCT_PS2           5
-#define FF_IDCT_MLIB          6
-#define FF_IDCT_ARM           7
-#define FF_IDCT_ALTIVEC       8
-#define FF_IDCT_SH4           9
-#define FF_IDCT_SIMPLEARM     10
-#define FF_IDCT_H264          11
-#define FF_IDCT_VP3           12
-#define FF_IDCT_IPP           13
-#define FF_IDCT_XVIDMMX       14
-#define FF_IDCT_CAVS          15
-#define FF_IDCT_SIMPLEARMV5TE 16
-#define FF_IDCT_SIMPLEARMV6   17
-#define FF_IDCT_SIMPLEVIS     18
-#define FF_IDCT_WMV2          19
-#define FF_IDCT_FAAN          20
-#define FF_IDCT_EA            21
-#define FF_IDCT_SIMPLENEON    22
-#define FF_IDCT_SIMPLEALPHA   23
-#define FF_IDCT_BINK          24
-
-    /**
-     * slice count
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by user (or 0).
-     */
-    int slice_count;
-    /**
-     * slice offsets in the frame in bytes
-     * - encoding: Set/allocated by libavcodec.
-     * - decoding: Set/allocated by user (or NULL).
-     */
-    int *slice_offset;
-
-    /**
-     * error concealment flags
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int error_concealment;
-#define FF_EC_GUESS_MVS   1
-#define FF_EC_DEBLOCK     2
-
-    /**
-     * dsp_mask could be add used to disable unwanted CPU features
-     * CPU features (i.e. MMX, SSE. ...)
-     *
-     * With the FORCE flag you may instead enable given CPU features.
-     * (Dangerous: Usable in case of misdetection, improper usage however will
-     * result into program crash.)
-     */
-    unsigned dsp_mask;
-#define FF_MM_FORCE    0x80000000 /* Force usage of selected flags (OR) */
-    /* lower 16 bits - CPU features */
-#define FF_MM_MMX      0x0001 ///< standard MMX
-#define FF_MM_3DNOW    0x0004 ///< AMD 3DNOW
-#if LIBAVCODEC_VERSION_MAJOR < 53
-#define FF_MM_MMXEXT   0x0002 ///< SSE integer functions or AMD MMX ext
-#endif
-#define FF_MM_MMX2     0x0002 ///< SSE integer functions or AMD MMX ext
-#define FF_MM_SSE      0x0008 ///< SSE functions
-#define FF_MM_SSE2     0x0010 ///< PIV SSE2 functions
-#define FF_MM_3DNOWEXT 0x0020 ///< AMD 3DNowExt
-#define FF_MM_SSE3     0x0040 ///< Prescott SSE3 functions
-#define FF_MM_SSSE3    0x0080 ///< Conroe SSSE3 functions
-#define FF_MM_SSE4     0x0100 ///< Penryn SSE4.1 functions
-#define FF_MM_SSE42    0x0200 ///< Nehalem SSE4.2 functions
-#define FF_MM_IWMMXT   0x0100 ///< XScale IWMMXT
-#define FF_MM_ALTIVEC  0x0001 ///< standard AltiVec
-
-    /**
-     * bits per sample/pixel from the demuxer (needed for huffyuv).
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by user.
-     */
-     int bits_per_coded_sample;
-
-    /**
-     * prediction method (needed for huffyuv)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-     int prediction_method;
-#define FF_PRED_LEFT   0
-#define FF_PRED_PLANE  1
-#define FF_PRED_MEDIAN 2
-
-    /**
-     * sample aspect ratio (0 if unknown)
-     * That is the width of a pixel divided by the height of the pixel.
-     * Numerator and denominator must be relatively prime and smaller than 256 for some video standards.
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    AVRational sample_aspect_ratio;
-
-    /**
-     * the picture in the bitstream
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by libavcodec.
-     */
-    AVFrame *coded_frame;
-
-    /**
-     * debug
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int debug;
-#define FF_DEBUG_PICT_INFO   1
-#define FF_DEBUG_RC          2
-#define FF_DEBUG_BITSTREAM   4
-#define FF_DEBUG_MB_TYPE     8
-#define FF_DEBUG_QP          16
-#define FF_DEBUG_MV          32
-#define FF_DEBUG_DCT_COEFF   0x00000040
-#define FF_DEBUG_SKIP        0x00000080
-#define FF_DEBUG_STARTCODE   0x00000100
-#define FF_DEBUG_PTS         0x00000200
-#define FF_DEBUG_ER          0x00000400
-#define FF_DEBUG_MMCO        0x00000800
-#define FF_DEBUG_BUGS        0x00001000
-#define FF_DEBUG_VIS_QP      0x00002000
-#define FF_DEBUG_VIS_MB_TYPE 0x00004000
-#define FF_DEBUG_BUFFERS     0x00008000
-
-    /**
-     * debug
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int debug_mv;
-#define FF_DEBUG_VIS_MV_P_FOR  0x00000001 //visualize forward predicted MVs of P frames
-#define FF_DEBUG_VIS_MV_B_FOR  0x00000002 //visualize forward predicted MVs of B frames
-#define FF_DEBUG_VIS_MV_B_BACK 0x00000004 //visualize backward predicted MVs of B frames
-
-    /**
-     * error
-     * - encoding: Set by libavcodec if flags&CODEC_FLAG_PSNR.
-     * - decoding: unused
-     */
-    uint64_t error[4];
-
-    /**
-     * minimum MB quantizer
-     * - encoding: unused
-     * - decoding: unused
-     */
-    int mb_qmin;
-
-    /**
-     * maximum MB quantizer
-     * - encoding: unused
-     * - decoding: unused
-     */
-    int mb_qmax;
-
-    /**
-     * motion estimation comparison function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_cmp;
-    /**
-     * subpixel motion estimation comparison function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_sub_cmp;
-    /**
-     * macroblock comparison function (not supported yet)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mb_cmp;
-    /**
-     * interlaced DCT comparison function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int ildct_cmp;
-#define FF_CMP_SAD    0
-#define FF_CMP_SSE    1
-#define FF_CMP_SATD   2
-#define FF_CMP_DCT    3
-#define FF_CMP_PSNR   4
-#define FF_CMP_BIT    5
-#define FF_CMP_RD     6
-#define FF_CMP_ZERO   7
-#define FF_CMP_VSAD   8
-#define FF_CMP_VSSE   9
-#define FF_CMP_NSSE   10
-#define FF_CMP_W53    11
-#define FF_CMP_W97    12
-#define FF_CMP_DCTMAX 13
-#define FF_CMP_DCT264 14
-#define FF_CMP_CHROMA 256
-
-    /**
-     * ME diamond size & shape
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int dia_size;
-
-    /**
-     * amount of previous MV predictors (2a+1 x 2a+1 square)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int last_predictor_count;
-
-    /**
-     * prepass for motion estimation
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int pre_me;
-
-    /**
-     * motion estimation prepass comparison function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_pre_cmp;
-
-    /**
-     * ME prepass diamond size & shape
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int pre_dia_size;
-
-    /**
-     * subpel ME quality
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_subpel_quality;
-
-    /**
-     * callback to negotiate the pixelFormat
-     * @param fmt is the list of formats which are supported by the codec,
-     * it is terminated by -1 as 0 is a valid format, the formats are ordered by quality.
-     * The first is always the native one.
-     * @return the chosen format
-     * - encoding: unused
-     * - decoding: Set by user, if not set the native format will be chosen.
-     */
-    enum PixelFormat (*get_format)(struct AVCodecContext *s, const enum PixelFormat * fmt);
-
-    /**
-     * DTG active format information (additional aspect ratio
-     * information only used in DVB MPEG-2 transport streams)
-     * 0 if not set.
-     *
-     * - encoding: unused
-     * - decoding: Set by decoder.
-     */
-    int dtg_active_format;
-#define FF_DTG_AFD_SAME         8
-#define FF_DTG_AFD_4_3          9
-#define FF_DTG_AFD_16_9         10
-#define FF_DTG_AFD_14_9         11
-#define FF_DTG_AFD_4_3_SP_14_9  13
-#define FF_DTG_AFD_16_9_SP_14_9 14
-#define FF_DTG_AFD_SP_4_3       15
-
-    /**
-     * maximum motion estimation search range in subpel units
-     * If 0 then no limit.
-     *
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_range;
-
-    /**
-     * intra quantizer bias
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int intra_quant_bias;
-#define FF_DEFAULT_QUANT_BIAS 999999
-
-    /**
-     * inter quantizer bias
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int inter_quant_bias;
-
-    /**
-     * color table ID
-     * - encoding: unused
-     * - decoding: Which clrtable should be used for 8bit RGB images.
-     *             Tables have to be stored somewhere. FIXME
-     */
-    int color_table_id;
-
-    /**
-     * internal_buffer count
-     * Don't touch, used by libavcodec default_get_buffer().
-     */
-    int internal_buffer_count;
-
-    /**
-     * internal_buffers
-     * Don't touch, used by libavcodec default_get_buffer().
-     */
-    void *internal_buffer;
-
-#define FF_LAMBDA_SHIFT 7
-#define FF_LAMBDA_SCALE (1<<FF_LAMBDA_SHIFT)
-#define FF_QP2LAMBDA 118 ///< factor to convert from H.263 QP to lambda
-#define FF_LAMBDA_MAX (256*128-1)
-
-#define FF_QUALITY_SCALE FF_LAMBDA_SCALE //FIXME maybe remove
-    /**
-     * Global quality for codecs which cannot change it per frame.
-     * This should be proportional to MPEG-1/2/4 qscale.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int global_quality;
-
-#define FF_CODER_TYPE_VLC       0
-#define FF_CODER_TYPE_AC        1
-#define FF_CODER_TYPE_RAW       2
-#define FF_CODER_TYPE_RLE       3
-#define FF_CODER_TYPE_DEFLATE   4
-    /**
-     * coder type
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int coder_type;
-
-    /**
-     * context model
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int context_model;
-#if 0
-    /**
-     *
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    uint8_t * (*realloc)(struct AVCodecContext *s, uint8_t *buf, int buf_size);
-#endif
-
-    /**
-     * slice flags
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int slice_flags;
-#define SLICE_FLAG_CODED_ORDER    0x0001 ///< draw_horiz_band() is called in coded order instead of display
-#define SLICE_FLAG_ALLOW_FIELD    0x0002 ///< allow draw_horiz_band() with field slices (MPEG2 field pics)
-#define SLICE_FLAG_ALLOW_PLANE    0x0004 ///< allow draw_horiz_band() with 1 component at a time (SVQ1)
-
-    /**
-     * XVideo Motion Acceleration
-     * - encoding: forbidden
-     * - decoding: set by decoder
-     */
-    int xvmc_acceleration;
-
-    /**
-     * macroblock decision mode
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mb_decision;
-#define FF_MB_DECISION_SIMPLE 0        ///< uses mb_cmp
-#define FF_MB_DECISION_BITS   1        ///< chooses the one which needs the fewest bits
-#define FF_MB_DECISION_RD     2        ///< rate distortion
-
-    /**
-     * custom intra quantization matrix
-     * - encoding: Set by user, can be NULL.
-     * - decoding: Set by libavcodec.
-     */
-    uint16_t *intra_matrix;
-
-    /**
-     * custom inter quantization matrix
-     * - encoding: Set by user, can be NULL.
-     * - decoding: Set by libavcodec.
-     */
-    uint16_t *inter_matrix;
-
-    /**
-     * fourcc from the AVI stream header (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').
-     * This is used to work around some encoder bugs.
-     * - encoding: unused
-     * - decoding: Set by user, will be converted to uppercase by libavcodec during init.
-     */
-    unsigned int stream_codec_tag;
-
-    /**
-     * scene change detection threshold
-     * 0 is default, larger means fewer detected scene changes.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int scenechange_threshold;
-
-    /**
-     * minimum Lagrange multipler
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int lmin;
-
-    /**
-     * maximum Lagrange multipler
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int lmax;
-
-    /**
-     * palette control structure
-     * - encoding: ??? (no palette-enabled encoder yet)
-     * - decoding: Set by user.
-     */
-    struct AVPaletteControl *palctrl;
-
-    /**
-     * noise reduction strength
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int noise_reduction;
-
-    /**
-     * Called at the beginning of a frame to get cr buffer for it.
-     * Buffer type (size, hints) must be the same. libavcodec won't check it.
-     * libavcodec will pass previous buffer in pic, function should return
-     * same buffer or new buffer with old frame "painted" into it.
-     * If pic.data[0] == NULL must behave like get_buffer().
-     * if CODEC_CAP_DR1 is not set then reget_buffer() must call
-     * avcodec_default_reget_buffer() instead of providing buffers allocated by
-     * some other means.
-     * - encoding: unused
-     * - decoding: Set by libavcodec., user can override
-     */
-    int (*reget_buffer)(struct AVCodecContext *c, AVFrame *pic);
-
-    /**
-     * Number of bits which should be loaded into the rc buffer before decoding starts.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int rc_initial_buffer_occupancy;
-
-    /**
-     *
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int inter_threshold;
-
-    /**
-     * CODEC_FLAG2_*
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int flags2;
-
-    /**
-     * Simulates errors in the bitstream to test error concealment.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int error_rate;
-
-    /**
-     * MP3 antialias algorithm, see FF_AA_* below.
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int antialias_algo;
-#define FF_AA_AUTO    0
-#define FF_AA_FASTINT 1 //not implemented yet
-#define FF_AA_INT     2
-#define FF_AA_FLOAT   3
-    /**
-     * quantizer noise shaping
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int quantizer_noise_shaping;
-
-    /**
-     * thread count
-     * is used to decide how many independent tasks should be passed to execute()
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int thread_count;
-
-    /**
-     * The codec may call this to execute several independent things.
-     * It will return only after finishing all tasks.
-     * The user may replace this with some multithreaded implementation,
-     * the default implementation will execute the parts serially.
-     * @param count the number of things to execute
-     * - encoding: Set by libavcodec, user can override.
-     * - decoding: Set by libavcodec, user can override.
-     */
-    int (*execute)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg), void *arg2, int *ret, int count, int size);
-
-    /**
-     * thread opaque
-     * Can be used by execute() to store some per AVCodecContext stuff.
-     * - encoding: set by execute()
-     * - decoding: set by execute()
-     */
-    void *thread_opaque;
-
-    /**
-     * Motion estimation threshold below which no motion estimation is
-     * performed, but instead the user specified motion vectors are used.
-     *
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-     int me_threshold;
-
-    /**
-     * Macroblock threshold below which the user specified macroblock types will be used.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-     int mb_threshold;
-
-    /**
-     * precision of the intra DC coefficient - 8
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-     int intra_dc_precision;
-
-    /**
-     * noise vs. sse weight for the nsse comparsion function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-     int nsse_weight;
-
-    /**
-     * Number of macroblock rows at the top which are skipped.
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-     int skip_top;
-
-    /**
-     * Number of macroblock rows at the bottom which are skipped.
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-     int skip_bottom;
-
-    /**
-     * profile
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-     int profile;
-#define FF_PROFILE_UNKNOWN -99
-
-#define FF_PROFILE_AAC_MAIN 0
-#define FF_PROFILE_AAC_LOW  1
-#define FF_PROFILE_AAC_SSR  2
-#define FF_PROFILE_AAC_LTP  3
-
-#define FF_PROFILE_H264_BASELINE    66
-#define FF_PROFILE_H264_MAIN        77
-#define FF_PROFILE_H264_EXTENDED    88
-#define FF_PROFILE_H264_HIGH        100
-#define FF_PROFILE_H264_HIGH_10     110
-#define FF_PROFILE_H264_HIGH_422    122
-#define FF_PROFILE_H264_HIGH_444    244
-#define FF_PROFILE_H264_CAVLC_444   44
-
-    /**
-     * level
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-     int level;
-#define FF_LEVEL_UNKNOWN -99
-
-    /**
-     * low resolution decoding, 1-> 1/2 size, 2->1/4 size
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-     int lowres;
-
-    /**
-     * Bitstream width / height, may be different from width/height if lowres
-     * or other things are used.
-     * - encoding: unused
-     * - decoding: Set by user before init if known. Codec should override / dynamically change if needed.
-     */
-    int coded_width, coded_height;
-
-    /**
-     * frame skip threshold
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int frame_skip_threshold;
-
-    /**
-     * frame skip factor
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int frame_skip_factor;
-
-    /**
-     * frame skip exponent
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int frame_skip_exp;
-
-    /**
-     * frame skip comparison function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int frame_skip_cmp;
-
-    /**
-     * Border processing masking, raises the quantizer for mbs on the borders
-     * of the picture.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float border_masking;
-
-    /**
-     * minimum MB lagrange multipler
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mb_lmin;
-
-    /**
-     * maximum MB lagrange multipler
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mb_lmax;
-
-    /**
-     *
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_penalty_compensation;
-
-    /**
-     *
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    enum AVDiscard skip_loop_filter;
-
-    /**
-     *
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    enum AVDiscard skip_idct;
-
-    /**
-     *
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    enum AVDiscard skip_frame;
-
-    /**
-     *
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int bidir_refine;
-
-    /**
-     *
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int brd_scale;
-
-    /**
-     * constant rate factor - quality-based VBR - values ~correspond to qps
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float crf;
-
-    /**
-     * constant quantization parameter rate control method
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int cqp;
-
-    /**
-     * minimum GOP size
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int keyint_min;
-
-    /**
-     * number of reference frames
-     * - encoding: Set by user.
-     * - decoding: Set by lavc.
-     */
-    int refs;
-
-    /**
-     * chroma qp offset from luma
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int chromaoffset;
-
-    /**
-     * Influences how often B-frames are used.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int bframebias;
-
-    /**
-     * trellis RD quantization
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int trellis;
-
-    /**
-     * Reduce fluctuations in qp (before curve compression).
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float complexityblur;
-
-    /**
-     * in-loop deblocking filter alphac0 parameter
-     * alpha is in the range -6...6
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int deblockalpha;
-
-    /**
-     * in-loop deblocking filter beta parameter
-     * beta is in the range -6...6
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int deblockbeta;
-
-    /**
-     * macroblock subpartition sizes to consider - p8x8, p4x4, b8x8, i8x8, i4x4
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int partitions;
-#define X264_PART_I4X4 0x001  /* Analyze i4x4 */
-#define X264_PART_I8X8 0x002  /* Analyze i8x8 (requires 8x8 transform) */
-#define X264_PART_P8X8 0x010  /* Analyze p16x8, p8x16 and p8x8 */
-#define X264_PART_P4X4 0x020  /* Analyze p8x4, p4x8, p4x4 */
-#define X264_PART_B8X8 0x100  /* Analyze b16x8, b8x16 and b8x8 */
-
-    /**
-     * direct MV prediction mode - 0 (none), 1 (spatial), 2 (temporal), 3 (auto)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int directpred;
-
-    /**
-     * Audio cutoff bandwidth (0 means "automatic")
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int cutoff;
-
-    /**
-     * Multiplied by qscale for each frame and added to scene_change_score.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int scenechange_factor;
-
-    /**
-     *
-     * Note: Value depends upon the compare function used for fullpel ME.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mv0_threshold;
-
-    /**
-     * Adjusts sensitivity of b_frame_strategy 1.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int b_sensitivity;
-
-    /**
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int compression_level;
-#define FF_COMPRESSION_DEFAULT -1
-
-    /**
-     * Sets whether to use LPC mode - used by FLAC encoder.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int use_lpc;
-
-    /**
-     * LPC coefficient precision - used by FLAC encoder
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int lpc_coeff_precision;
-
-    /**
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int min_prediction_order;
-
-    /**
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int max_prediction_order;
-
-    /**
-     * search method for selecting prediction order
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int prediction_order_method;
-
-    /**
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int min_partition_order;
-
-    /**
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int max_partition_order;
-
-    /**
-     * GOP timecode frame start number, in non drop frame format
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int64_t timecode_frame_start;
-
-#if LIBAVCODEC_VERSION_MAJOR < 53
-    /**
-     * Decoder should decode to this many channels if it can (0 for default)
-     * - encoding: unused
-     * - decoding: Set by user.
-     * @deprecated Deprecated in favor of request_channel_layout.
-     */
-    int request_channels;
-#endif
-
-    /**
-     * Percentage of dynamic range compression to be applied by the decoder.
-     * The default value is 1.0, corresponding to full compression.
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    float drc_scale;
-
-    /**
-     * opaque 64bit number (generally a PTS) that will be reordered and
-     * output in AVFrame.reordered_opaque
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int64_t reordered_opaque;
-
-    /**
-     * Bits per sample/pixel of internal libavcodec pixel/sample format.
-     * This field is applicable only when sample_fmt is SAMPLE_FMT_S32.
-     * - encoding: set by user.
-     * - decoding: set by libavcodec.
-     */
-    int bits_per_raw_sample;
-
-    /**
-     * Audio channel layout.
-     * - encoding: set by user.
-     * - decoding: set by libavcodec.
-     */
-    int64_t channel_layout;
-
-    /**
-     * Request decoder to use this channel layout if it can (0 for default)
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int64_t request_channel_layout;
-
-    /**
-     * Ratecontrol attempt to use, at maximum, <value> of what can be used without an underflow.
-     * - encoding: Set by user.
-     * - decoding: unused.
-     */
-    float rc_max_available_vbv_use;
-
-    /**
-     * Ratecontrol attempt to use, at least, <value> times the amount needed to prevent a vbv overflow.
-     * - encoding: Set by user.
-     * - decoding: unused.
-     */
-    float rc_min_vbv_overflow_use;
-
-    /**
-     * Hardware accelerator in use
-     * - encoding: unused.
-     * - decoding: Set by libavcodec
-     */
-    struct AVHWAccel *hwaccel;
-
-    /**
-     * For some codecs, the time base is closer to the field rate than the frame rate.
-     * Most notably, H.264 and MPEG-2 specify time_base as half of frame duration
-     * if no telecine is used ...
-     *
-     * Set to time_base ticks per frame. Default 1, e.g., H.264/MPEG-2 set it to 2.
-     */
-    int ticks_per_frame;
-
-    /**
-     * Hardware accelerator context.
-     * For some hardware accelerators, a global context needs to be
-     * provided by the user. In that case, this holds display-dependent
-     * data FFmpeg cannot instantiate itself. Please refer to the
-     * FFmpeg HW accelerator documentation to know how to fill this
-     * is. e.g. for VA API, this is a struct vaapi_context.
-     * - encoding: unused
-     * - decoding: Set by user
-     */
-    void *hwaccel_context;
-
-    /**
-     * Chromaticity coordinates of the source primaries.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
-     */
-    enum AVColorPrimaries color_primaries;
-
-    /**
-     * Color Transfer Characteristic.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
-     */
-    enum AVColorTransferCharacteristic color_trc;
-
-    /**
-     * YUV colorspace type.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
-     */
-    enum AVColorSpace colorspace;
-
-    /**
-     * MPEG vs JPEG YUV range.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
-     */
-    enum AVColorRange color_range;
-
-    /**
-     * This defines the location of chroma samples.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
-     */
-    enum AVChromaLocation chroma_sample_location;
-
-    /**
-     * The codec may call this to execute several independent things.
-     * It will return only after finishing all tasks.
-     * The user may replace this with some multithreaded implementation,
-     * the default implementation will execute the parts serially.
-     * Also see avcodec_thread_init and e.g. the --enable-pthread configure option.
-     * @param c context passed also to func
-     * @param count the number of things to execute
-     * @param arg2 argument passed unchanged to func
-     * @param ret return values of executed functions, must have space for "count" values. May be NULL.
-     * @param func function that will be called count times, with jobnr from 0 to count-1.
-     *             threadnr will be in the range 0 to c->thread_count-1 < MAX_THREADS and so that no
-     *             two instances of func executing at the same time will have the same threadnr.
-     * @return always 0 currently, but code should handle a future improvement where when any call to func
-     *         returns < 0 no further calls to func may be done and < 0 is returned.
-     * - encoding: Set by libavcodec, user can override.
-     * - decoding: Set by libavcodec, user can override.
-     */
-    int (*execute2)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg, int jobnr, int threadnr), void *arg2, int *ret, int count);
-
-    /**
-     * explicit P-frame weighted prediction analysis method
-     * 0: off
-     * 1: fast blind weighting (one reference duplicate with -1 offset)
-     * 2: smart weighting (full fade detection analysis)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int weighted_p_pred;
-
-    /**
-     * AQ mode
-     * 0: Disabled
-     * 1: Variance AQ (complexity mask)
-     * 2: Auto-variance AQ (experimental)
-     * - encoding: Set by user
-     * - decoding: unused
-     */
-    int aq_mode;
-
-    /**
-     * AQ strength
-     * Reduces blocking and blurring in flat and textured areas.
-     * - encoding: Set by user
-     * - decoding: unused
-     */
-    float aq_strength;
-
-    /**
-     * PSY RD
-     * Strength of psychovisual optimization
-     * - encoding: Set by user
-     * - decoding: unused
-     */
-    float psy_rd;
-
-    /**
-     * PSY trellis
-     * Strength of psychovisual optimization
-     * - encoding: Set by user
-     * - decoding: unused
-     */
-    float psy_trellis;
-
-    /**
-     * RC lookahead
-     * Number of frames for frametype and ratecontrol lookahead
-     * - encoding: Set by user
-     * - decoding: unused
-     */
-    int rc_lookahead;
-} AVCodecContext;
-
-/**
- * AVCodec.
- */
-typedef struct AVCodec {
-    /**
-     * Name of the codec implementation.
-     * The name is globally unique among encoders and among decoders (but an
-     * encoder and a decoder can share the same name).
-     * This is the primary way to find a codec from the user perspective.
-     */
-    const char *name;
-    enum AVMediaType type;
-    enum CodecID id;
-    int priv_data_size;
-    int (*init)(AVCodecContext *);
-    int (*encode)(AVCodecContext *, uint8_t *buf, int buf_size, void *data);
-    int (*close)(AVCodecContext *);
-    int (*decode)(AVCodecContext *, void *outdata, int *outdata_size, AVPacket *avpkt);
-    /**
-     * Codec capabilities.
-     * see CODEC_CAP_*
-     */
-    int capabilities;
-    struct AVCodec *next;
-    /**
-     * Flush buffers.
-     * Will be called when seeking
-     */
-    void (*flush)(AVCodecContext *);
-    const AVRational *supported_framerates; ///< array of supported framerates, or NULL if any, array is terminated by {0,0}
-    const enum PixelFormat *pix_fmts;       ///< array of supported pixel formats, or NULL if unknown, array is terminated by -1
-    /**
-     * Descriptive name for the codec, meant to be more human readable than name.
-     * You should use the NULL_IF_CONFIG_SMALL() macro to define it.
-     */
-    const char *long_name;
-    const int *supported_samplerates;       ///< array of supported audio samplerates, or NULL if unknown, array is terminated by 0
-    const enum SampleFormat *sample_fmts;   ///< array of supported sample formats, or NULL if unknown, array is terminated by -1
-    const int64_t *channel_layouts;         ///< array of support channel layouts, or NULL if unknown. array is terminated by 0
-} AVCodec;
-
-/**
- * AVHWAccel.
- */
-typedef struct AVHWAccel {
-    /**
-     * Name of the hardware accelerated codec.
-     * The name is globally unique among encoders and among decoders (but an
-     * encoder and a decoder can share the same name).
-     */
-    const char *name;
-
-    /**
-     * Type of codec implemented by the hardware accelerator.
-     *
-     * See AVMEDIA_TYPE_xxx
-     */
-    enum AVMediaType type;
-
-    /**
-     * Codec implemented by the hardware accelerator.
-     *
-     * See CODEC_ID_xxx
-     */
-    enum CodecID id;
-
-    /**
-     * Supported pixel format.
-     *
-     * Only hardware accelerated formats are supported here.
-     */
-    enum PixelFormat pix_fmt;
-
-    /**
-     * Hardware accelerated codec capabilities.
-     * see FF_HWACCEL_CODEC_CAP_*
-     */
-    int capabilities;
-
-    struct AVHWAccel *next;
-
-    /**
-     * Called at the beginning of each frame or field picture.
-     *
-     * Meaningful frame information (codec specific) is guaranteed to
-     * be parsed at this point. This function is mandatory.
-     *
-     * Note that buf can be NULL along with buf_size set to 0.
-     * Otherwise, this means the whole frame is available at this point.
-     *
-     * @param avctx the codec context
-     * @param buf the frame data buffer base
-     * @param buf_size the size of the frame in bytes
-     * @return zero if successful, a negative value otherwise
-     */
-    int (*start_frame)(AVCodecContext *avctx, const uint8_t *buf, uint32_t buf_size);
-
-    /**
-     * Callback for each slice.
-     *
-     * Meaningful slice information (codec specific) is guaranteed to
-     * be parsed at this point. This function is mandatory.
-     *
-     * @param avctx the codec context
-     * @param buf the slice data buffer base
-     * @param buf_size the size of the slice in bytes
-     * @return zero if successful, a negative value otherwise
-     */
-    int (*decode_slice)(AVCodecContext *avctx, const uint8_t *buf, uint32_t buf_size);
-
-    /**
-     * Called at the end of each frame or field picture.
-     *
-     * The whole picture is parsed at this point and can now be sent
-     * to the hardware accelerator. This function is mandatory.
-     *
-     * @param avctx the codec context
-     * @return zero if successful, a negative value otherwise
-     */
-    int (*end_frame)(AVCodecContext *avctx);
-
-    /**
-     * Size of HW accelerator private data.
-     *
-     * Private data is allocated with av_mallocz() before
-     * AVCodecContext.get_buffer() and deallocated after
-     * AVCodecContext.release_buffer().
-     */
-    int priv_data_size;
-} AVHWAccel;
-
-/**
- * four components are given, that's all.
- * the last component is alpha
- */
-typedef struct AVPicture {
-    uint8_t *data[4];
-    int linesize[4];       ///< number of bytes per line
-} AVPicture;
-
-#if LIBAVCODEC_VERSION_MAJOR < 53
-/**
- * AVPaletteControl
- * This structure defines a method for communicating palette changes
- * between and demuxer and a decoder.
- *
- * @deprecated Use AVPacket to send palette changes instead.
- * This is totally broken.
- */
-#define AVPALETTE_SIZE 1024
-#define AVPALETTE_COUNT 256
-typedef struct AVPaletteControl {
-
-    /* Demuxer sets this to 1 to indicate the palette has changed;
-     * decoder resets to 0. */
-    int palette_changed;
-
-    /* 4-byte ARGB palette entries, stored in native byte order; note that
-     * the individual palette components should be on a 8-bit scale; if
-     * the palette data comes from an IBM VGA native format, the component
-     * data is probably 6 bits in size and needs to be scaled. */
-    unsigned int palette[AVPALETTE_COUNT];
-
-} AVPaletteControl attribute_deprecated;
-#endif
-
-enum AVSubtitleType {
-    SUBTITLE_NONE,
-
-    SUBTITLE_BITMAP,                ///< A bitmap, pict will be set
-
-    /**
-     * Plain text, the text field must be set by the decoder and is
-     * authoritative. ass and pict fields may contain approximations.
-     */
-    SUBTITLE_TEXT,
-
-    /**
-     * Formatted text, the ass field must be set by the decoder and is
-     * authoritative. pict and text fields may contain approximations.
-     */
-    SUBTITLE_ASS,
-};
-
-typedef struct AVSubtitleRect {
-    int x;         ///< top left corner  of pict, undefined when pict is not set
-    int y;         ///< top left corner  of pict, undefined when pict is not set
-    int w;         ///< width            of pict, undefined when pict is not set
-    int h;         ///< height           of pict, undefined when pict is not set
-    int nb_colors; ///< number of colors in pict, undefined when pict is not set
-
-    /**
-     * data+linesize for the bitmap of this subtitle.
-     * can be set for text/ass as well once they where rendered
-     */
-    AVPicture pict;
-    enum AVSubtitleType type;
-
-    char *text;                     ///< 0 terminated plain UTF-8 text
-
-    /**
-     * 0 terminated ASS/SSA compatible event line.
-     * The pressentation of this is unaffected by the other values in this
-     * struct.
-     */
-    char *ass;
-} AVSubtitleRect;
-
-typedef struct AVSubtitle {
-    uint16_t format; /* 0 = graphics */
-    uint32_t start_display_time; /* relative to packet pts, in ms */
-    uint32_t end_display_time; /* relative to packet pts, in ms */
-    unsigned num_rects;
-    AVSubtitleRect **rects;
-    int64_t pts;    ///< Same as packet pts, in AV_TIME_BASE
-} AVSubtitle;
-
-/* packet functions */
-
-/**
- * @deprecated use NULL instead
- */
-attribute_deprecated void av_destruct_packet_nofree(AVPacket *pkt);
-
-/**
- * Default packet destructor.
- */
-void av_destruct_packet(AVPacket *pkt);
-
-/**
- * Initialize optional fields of a packet with default values.
- *
- * @param pkt packet
- */
-void av_init_packet(AVPacket *pkt);
-
-/**
- * Allocate the payload of a packet and initialize its fields with
- * default values.
- *
- * @param pkt packet
- * @param size wanted payload size
- * @return 0 if OK, AVERROR_xxx otherwise
- */
-int av_new_packet(AVPacket *pkt, int size);
-
-/**
- * Reduce packet size, correctly zeroing padding
- *
- * @param pkt packet
- * @param size new size
- */
-void av_shrink_packet(AVPacket *pkt, int size);
-
-/**
- * @warning This is a hack - the packet memory allocation stuff is broken. The
- * packet is allocated if it was not really allocated.
- */
-int av_dup_packet(AVPacket *pkt);
-
-/**
- * Free a packet.
- *
- * @param pkt packet to free
- */
-void av_free_packet(AVPacket *pkt);
-
-/* resample.c */
-
-struct ReSampleContext;
-struct AVResampleContext;
-
-typedef struct ReSampleContext ReSampleContext;
-
-#if LIBAVCODEC_VERSION_MAJOR < 53
-/**
- * @deprecated Use av_audio_resample_init() instead.
- */
-attribute_deprecated ReSampleContext *audio_resample_init(int output_channels, int input_channels,
-                                                          int output_rate, int input_rate);
-#endif
-/**
- *  Initializes audio resampling context
- *
- * @param output_channels  number of output channels
- * @param input_channels   number of input channels
- * @param output_rate      output sample rate
- * @param input_rate       input sample rate
- * @param sample_fmt_out   requested output sample format
- * @param sample_fmt_in    input sample format
- * @param filter_length    length of each FIR filter in the filterbank relative to the cutoff freq
- * @param log2_phase_count log2 of the number of entries in the polyphase filterbank
- * @param linear           If 1 then the used FIR filter will be linearly interpolated
-                           between the 2 closest, if 0 the closest will be used
- * @param cutoff           cutoff frequency, 1.0 corresponds to half the output sampling rate
- * @return allocated ReSampleContext, NULL if error occured
- */
-ReSampleContext *av_audio_resample_init(int output_channels, int input_channels,
-                                        int output_rate, int input_rate,
-                                        enum SampleFormat sample_fmt_out,
-                                        enum SampleFormat sample_fmt_in,
-                                        int filter_length, int log2_phase_count,
-                                        int linear, double cutoff);
-
-int audio_resample(ReSampleContext *s, short *output, short *input, int nb_samples);
-void audio_resample_close(ReSampleContext *s);
-
-
-/**
- * Initializes an audio resampler.
- * Note, if either rate is not an integer then simply scale both rates up so they are.
- * @param filter_length length of each FIR filter in the filterbank relative to the cutoff freq
- * @param log2_phase_count log2 of the number of entries in the polyphase filterbank
- * @param linear If 1 then the used FIR filter will be linearly interpolated
-                 between the 2 closest, if 0 the closest will be used
- * @param cutoff cutoff frequency, 1.0 corresponds to half the output sampling rate
- */
-struct AVResampleContext *av_resample_init(int out_rate, int in_rate, int filter_length, int log2_phase_count, int linear, double cutoff);
-
-/**
- * resamples.
- * @param src an array of unconsumed samples
- * @param consumed the number of samples of src which have been consumed are returned here
- * @param src_size the number of unconsumed samples available
- * @param dst_size the amount of space in samples available in dst
- * @param update_ctx If this is 0 then the context will not be modified, that way several channels can be resampled with the same context.
- * @return the number of samples written in dst or -1 if an error occurred
- */
-int av_resample(struct AVResampleContext *c, short *dst, short *src, int *consumed, int src_size, int dst_size, int update_ctx);
-
-
-/**
- * Compensates samplerate/timestamp drift. The compensation is done by changing
- * the resampler parameters, so no audible clicks or similar distortions occur
- * @param compensation_distance distance in output samples over which the compensation should be performed
- * @param sample_delta number of output samples which should be output less
- *
- * example: av_resample_compensate(c, 10, 500)
- * here instead of 510 samples only 500 samples would be output
- *
- * note, due to rounding the actual compensation might be slightly different,
- * especially if the compensation_distance is large and the in_rate used during init is small
- */
-void av_resample_compensate(struct AVResampleContext *c, int sample_delta, int compensation_distance);
-void av_resample_close(struct AVResampleContext *c);
-
-/**
- * Allocate memory for a picture.  Call avpicture_free to free it.
- *
- * @param picture the picture to be filled in
- * @param pix_fmt the format of the picture
- * @param width the width of the picture
- * @param height the height of the picture
- * @return zero if successful, a negative value if not
- */
-int avpicture_alloc(AVPicture *picture, enum PixelFormat pix_fmt, int width, int height);
-
-/**
- * Free a picture previously allocated by avpicture_alloc().
- *
- * @param picture the AVPicture to be freed
- */
-void avpicture_free(AVPicture *picture);
-
-/**
- * Fill in the AVPicture fields.
- * The fields of the given AVPicture are filled in by using the 'ptr' address
- * which points to the image data buffer. Depending on the specified picture
- * format, one or multiple image data pointers and line sizes will be set.
- * If a planar format is specified, several pointers will be set pointing to
- * the different picture planes and the line sizes of the different planes
- * will be stored in the lines_sizes array.
- * Call with ptr == NULL to get the required size for the ptr buffer.
- *
- * @param picture AVPicture whose fields are to be filled in
- * @param ptr Buffer which will contain or contains the actual image data
- * @param pix_fmt The format in which the picture data is stored.
- * @param width the width of the image in pixels
- * @param height the height of the image in pixels
- * @return size of the image data in bytes
- */
-int avpicture_fill(AVPicture *picture, uint8_t *ptr,
-                   enum PixelFormat pix_fmt, int width, int height);
-int avpicture_layout(const AVPicture* src, enum PixelFormat pix_fmt, int width, int height,
-                     unsigned char *dest, int dest_size);
-
-/**
- * Calculate the size in bytes that a picture of the given width and height
- * would occupy if stored in the given picture format.
- * Note that this returns the size of a compact representation as generated
- * by avpicture_layout, which can be smaller than the size required for e.g.
- * avpicture_fill.
- *
- * @param pix_fmt the given picture format
- * @param width the width of the image
- * @param height the height of the image
- * @return Image data size in bytes or -1 on error (e.g. too large dimensions).
- */
-int avpicture_get_size(enum PixelFormat pix_fmt, int width, int height);
-void avcodec_get_chroma_sub_sample(enum PixelFormat pix_fmt, int *h_shift, int *v_shift);
-const char *avcodec_get_pix_fmt_name(enum PixelFormat pix_fmt);
-void avcodec_set_dimensions(AVCodecContext *s, int width, int height);
-
-#if LIBAVCODEC_VERSION_MAJOR < 53
-/**
- * Returns the pixel format corresponding to the name name.
- *
- * If there is no pixel format with name name, then looks for a
- * pixel format with the name corresponding to the native endian
- * format of name.
- * For example in a little-endian system, first looks for "gray16",
- * then for "gray16le".
- *
- * Finally if no pixel format has been found, returns PIX_FMT_NONE.
- *
- * @deprecated Deprecated in favor of av_get_pix_fmt().
- */
-attribute_deprecated enum PixelFormat avcodec_get_pix_fmt(const char* name);
-#endif
-
-/**
- * Returns a value representing the fourCC code associated to the
- * pixel format pix_fmt, or 0 if no associated fourCC code can be
- * found.
- */
-unsigned int avcodec_pix_fmt_to_codec_tag(enum PixelFormat pix_fmt);
-
-#define FF_LOSS_RESOLUTION  0x0001 /**< loss due to resolution change */
-#define FF_LOSS_DEPTH       0x0002 /**< loss due to color depth change */
-#define FF_LOSS_COLORSPACE  0x0004 /**< loss due to color space conversion */
-#define FF_LOSS_ALPHA       0x0008 /**< loss of alpha bits */
-#define FF_LOSS_COLORQUANT  0x0010 /**< loss due to color quantization */
-#define FF_LOSS_CHROMA      0x0020 /**< loss of chroma (e.g. RGB to gray conversion) */
-
-/**
- * Computes what kind of losses will occur when converting from one specific
- * pixel format to another.
- * When converting from one pixel format to another, information loss may occur.
- * For example, when converting from RGB24 to GRAY, the color information will
- * be lost. Similarly, other losses occur when converting from some formats to
- * other formats. These losses can involve loss of chroma, but also loss of
- * resolution, loss of color depth, loss due to the color space conversion, loss
- * of the alpha bits or loss due to color quantization.
- * avcodec_get_fix_fmt_loss() informs you about the various types of losses
- * which will occur when converting from one pixel format to another.
- *
- * @param[in] dst_pix_fmt destination pixel format
- * @param[in] src_pix_fmt source pixel format
- * @param[in] has_alpha Whether the source pixel format alpha channel is used.
- * @return Combination of flags informing you what kind of losses will occur.
- */
-int avcodec_get_pix_fmt_loss(enum PixelFormat dst_pix_fmt, enum PixelFormat src_pix_fmt,
-                             int has_alpha);
-
-/**
- * Finds the best pixel format to convert to given a certain source pixel
- * format.  When converting from one pixel format to another, information loss
- * may occur.  For example, when converting from RGB24 to GRAY, the color
- * information will be lost. Similarly, other losses occur when converting from
- * some formats to other formats. avcodec_find_best_pix_fmt() searches which of
- * the given pixel formats should be used to suffer the least amount of loss.
- * The pixel formats from which it chooses one, are determined by the
- * pix_fmt_mask parameter.
- *
- * @code
- * src_pix_fmt = PIX_FMT_YUV420P;
- * pix_fmt_mask = (1 << PIX_FMT_YUV422P) || (1 << PIX_FMT_RGB24);
- * dst_pix_fmt = avcodec_find_best_pix_fmt(pix_fmt_mask, src_pix_fmt, alpha, &loss);
- * @endcode
- *
- * @param[in] pix_fmt_mask bitmask determining which pixel format to choose from
- * @param[in] src_pix_fmt source pixel format
- * @param[in] has_alpha Whether the source pixel format alpha channel is used.
- * @param[out] loss_ptr Combination of flags informing you what kind of losses will occur.
- * @return The best pixel format to convert to or -1 if none was found.
- */
-enum PixelFormat avcodec_find_best_pix_fmt(int64_t pix_fmt_mask, enum PixelFormat src_pix_fmt,
-                              int has_alpha, int *loss_ptr);
-
-
-/**
- * Print in buf the string corresponding to the pixel format with
- * number pix_fmt, or an header if pix_fmt is negative.
- *
- * @param[in] buf the buffer where to write the string
- * @param[in] buf_size the size of buf
- * @param[in] pix_fmt the number of the pixel format to print the corresponding info string, or
- * a negative value to print the corresponding header.
- * Meaningful values for obtaining a pixel format info vary from 0 to PIX_FMT_NB -1.
- */
-void avcodec_pix_fmt_string (char *buf, int buf_size, enum PixelFormat pix_fmt);
-
-#define FF_ALPHA_TRANSP       0x0001 /* image has some totally transparent pixels */
-#define FF_ALPHA_SEMI_TRANSP  0x0002 /* image has some transparent pixels */
-
-/**
- * Tell if an image really has transparent alpha values.
- * @return ored mask of FF_ALPHA_xxx constants
- */
-int img_get_alpha_info(const AVPicture *src,
-                       enum PixelFormat pix_fmt, int width, int height);
-
-/* deinterlace a picture */
-/* deinterlace - if not supported return -1 */
-int avpicture_deinterlace(AVPicture *dst, const AVPicture *src,
-                          enum PixelFormat pix_fmt, int width, int height);
-
-/* external high level API */
-
-/**
- * If c is NULL, returns the first registered codec,
- * if c is non-NULL, returns the next registered codec after c,
- * or NULL if c is the last one.
- */
-AVCodec *av_codec_next(AVCodec *c);
-
-/**
- * Returns the LIBAVCODEC_VERSION_INT constant.
- */
-unsigned avcodec_version(void);
-
-/**
- * Returns the libavcodec build-time configuration.
- */
-const char *avcodec_configuration(void);
-
-/**
- * Returns the libavcodec license.
- */
-const char *avcodec_license(void);
-
-/**
- * Initializes libavcodec.
- *
- * @warning This function must be called before any other libavcodec
- * function.
- */
-void avcodec_init(void);
-
-#if LIBAVCODEC_VERSION_MAJOR < 53
-/**
- * @deprecated Deprecated in favor of avcodec_register().
- */
-attribute_deprecated void register_avcodec(AVCodec *codec);
-#endif
-
-/**
- * Register the codec codec and initialize libavcodec.
- *
- * @see avcodec_init()
- */
-void avcodec_register(AVCodec *codec);
-
-/**
- * Finds a registered encoder with a matching codec ID.
- *
- * @param id CodecID of the requested encoder
- * @return An encoder if one was found, NULL otherwise.
- */
-AVCodec *avcodec_find_encoder(enum CodecID id);
-
-/**
- * Finds a registered encoder with the specified name.
- *
- * @param name name of the requested encoder
- * @return An encoder if one was found, NULL otherwise.
- */
-AVCodec *avcodec_find_encoder_by_name(const char *name);
-
-/**
- * Finds a registered decoder with a matching codec ID.
- *
- * @param id CodecID of the requested decoder
- * @return A decoder if one was found, NULL otherwise.
- */
-AVCodec *avcodec_find_decoder(enum CodecID id);
-
-/**
- * Finds a registered decoder with the specified name.
- *
- * @param name name of the requested decoder
- * @return A decoder if one was found, NULL otherwise.
- */
-AVCodec *avcodec_find_decoder_by_name(const char *name);
-void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode);
-
-/**
- * Sets the fields of the given AVCodecContext to default values.
- *
- * @param s The AVCodecContext of which the fields should be set to default values.
- */
-void avcodec_get_context_defaults(AVCodecContext *s);
-
-/** THIS FUNCTION IS NOT YET PART OF THE PUBLIC API!
- *  we WILL change its arguments and name a few times! */
-void avcodec_get_context_defaults2(AVCodecContext *s, enum AVMediaType);
-
-/**
- * Allocates an AVCodecContext and sets its fields to default values.  The
- * resulting struct can be deallocated by simply calling av_free().
- *
- * @return An AVCodecContext filled with default values or NULL on failure.
- * @see avcodec_get_context_defaults
- */
-AVCodecContext *avcodec_alloc_context(void);
-
-/** THIS FUNCTION IS NOT YET PART OF THE PUBLIC API!
- *  we WILL change its arguments and name a few times! */
-AVCodecContext *avcodec_alloc_context2(enum AVMediaType);
-
-/**
- * Copy the settings of the source AVCodecContext into the destination
- * AVCodecContext. The resulting destination codec context will be
- * unopened, i.e. you are required to call avcodec_open() before you
- * can use this AVCodecContext to decode/encode video/audio data.
- *
- * @param dest target codec context, should be initialized with
- *             avcodec_alloc_context(), but otherwise uninitialized
- * @param src source codec context
- * @return AVERROR() on error (e.g. memory allocation error), 0 on success
- */
-int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src);
-
-/**
- * Sets the fields of the given AVFrame to default values.
- *
- * @param pic The AVFrame of which the fields should be set to default values.
- */
-void avcodec_get_frame_defaults(AVFrame *pic);
-
-/**
- * Allocates an AVFrame and sets its fields to default values.  The resulting
- * struct can be deallocated by simply calling av_free().
- *
- * @return An AVFrame filled with default values or NULL on failure.
- * @see avcodec_get_frame_defaults
- */
-AVFrame *avcodec_alloc_frame(void);
-
-int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic);
-void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic);
-int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic);
-
-/**
- * Returns the amount of padding in pixels which the get_buffer callback must
- * provide around the edge of the image for codecs which do not have the
- * CODEC_FLAG_EMU_EDGE flag.
- *
- * @return Required padding in pixels.
- */
-unsigned avcodec_get_edge_width(void);
-/**
- * Modifies width and height values so that they will result in a memory
- * buffer that is acceptable for the codec if you do not use any horizontal
- * padding.
- *
- * May only be used if a codec with CODEC_CAP_DR1 has been opened.
- * If CODEC_FLAG_EMU_EDGE is not set, the dimensions must have been increased
- * according to avcodec_get_edge_width() before.
- */
-void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height);
-/**
- * Modifies width and height values so that they will result in a memory
- * buffer that is acceptable for the codec if you also ensure that all
- * line sizes are a multiple of the respective linesize_align[i].
- *
- * May only be used if a codec with CODEC_CAP_DR1 has been opened.
- * If CODEC_FLAG_EMU_EDGE is not set, the dimensions must have been increased
- * according to avcodec_get_edge_width() before.
- */
-void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
-                               int linesize_align[4]);
-
-/**
- * Checks if the given dimension of a picture is valid, meaning that all
- * bytes of the picture can be addressed with a signed int.
- *
- * @param[in] w Width of the picture.
- * @param[in] h Height of the picture.
- * @return Zero if valid, a negative value if invalid.
- */
-int avcodec_check_dimensions(void *av_log_ctx, unsigned int w, unsigned int h);
-enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum PixelFormat * fmt);
-
-int avcodec_thread_init(AVCodecContext *s, int thread_count);
-void avcodec_thread_free(AVCodecContext *s);
-int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size);
-int avcodec_default_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2, int, int),void *arg, int *ret, int count);
-//FIXME func typedef
-
-/**
- * Initializes the AVCodecContext to use the given AVCodec. Prior to using this
- * function the context has to be allocated.
- *
- * The functions avcodec_find_decoder_by_name(), avcodec_find_encoder_by_name(),
- * avcodec_find_decoder() and avcodec_find_encoder() provide an easy way for
- * retrieving a codec.
- *
- * @warning This function is not thread safe!
- *
- * @code
- * avcodec_register_all();
- * codec = avcodec_find_decoder(CODEC_ID_H264);
- * if (!codec)
- *     exit(1);
- *
- * context = avcodec_alloc_context();
- *
- * if (avcodec_open(context, codec) < 0)
- *     exit(1);
- * @endcode
- *
- * @param avctx The context which will be set up to use the given codec.
- * @param codec The codec to use within the context.
- * @return zero on success, a negative value on error
- * @see avcodec_alloc_context, avcodec_find_decoder, avcodec_find_encoder
- */
-int avcodec_open(AVCodecContext *avctx, AVCodec *codec);
-
-#if LIBAVCODEC_VERSION_MAJOR < 53
-/**
- * Decodes an audio frame from buf into samples.
- * Wrapper function which calls avcodec_decode_audio3.
- *
- * @deprecated Use avcodec_decode_audio3 instead.
- * @param avctx the codec context
- * @param[out] samples the output buffer
- * @param[in,out] frame_size_ptr the output buffer size in bytes
- * @param[in] buf the input buffer
- * @param[in] buf_size the input buffer size in bytes
- * @return On error a negative value is returned, otherwise the number of bytes
- * used or zero if no frame could be decompressed.
- */
-attribute_deprecated int avcodec_decode_audio2(AVCodecContext *avctx, int16_t *samples,
-                         int *frame_size_ptr,
-                         const uint8_t *buf, int buf_size);
-#endif
-
-/**
- * Decodes the audio frame of size avpkt->size from avpkt->data into samples.
- * Some decoders may support multiple frames in a single AVPacket, such
- * decoders would then just decode the first frame. In this case,
- * avcodec_decode_audio3 has to be called again with an AVPacket that contains
- * the remaining data in order to decode the second frame etc.
- * If no frame
- * could be outputted, frame_size_ptr is zero. Otherwise, it is the
- * decompressed frame size in bytes.
- *
- * @warning You must set frame_size_ptr to the allocated size of the
- * output buffer before calling avcodec_decode_audio3().
- *
- * @warning The input buffer must be FF_INPUT_BUFFER_PADDING_SIZE larger than
- * the actual read bytes because some optimized bitstream readers read 32 or 64
- * bits at once and could read over the end.
- *
- * @warning The end of the input buffer avpkt->data should be set to 0 to ensure that
- * no overreading happens for damaged MPEG streams.
- *
- * @note You might have to align the input buffer avpkt->data and output buffer
- * samples. The alignment requirements depend on the CPU: On some CPUs it isn't
- * necessary at all, on others it won't work at all if not aligned and on others
- * it will work but it will have an impact on performance.
- *
- * In practice, avpkt->data should have 4 byte alignment at minimum and
- * samples should be 16 byte aligned unless the CPU doesn't need it
- * (AltiVec and SSE do).
- *
- * @param avctx the codec context
- * @param[out] samples the output buffer, sample type in avctx->sample_fmt
- * @param[in,out] frame_size_ptr the output buffer size in bytes
- * @param[in] avpkt The input AVPacket containing the input buffer.
- *            You can create such packet with av_init_packet() and by then setting
- *            data and size, some decoders might in addition need other fields.
- *            All decoders are designed to use the least fields possible though.
- * @return On error a negative value is returned, otherwise the number of bytes
- * used or zero if no frame data was decompressed (used) from the input AVPacket.
- */
-int avcodec_decode_audio3(AVCodecContext *avctx, int16_t *samples,
-                         int *frame_size_ptr,
-                         AVPacket *avpkt);
-
-#if LIBAVCODEC_VERSION_MAJOR < 53
-/**
- * Decodes a video frame from buf into picture.
- * Wrapper function which calls avcodec_decode_video2.
- *
- * @deprecated Use avcodec_decode_video2 instead.
- * @param avctx the codec context
- * @param[out] picture The AVFrame in which the decoded video frame will be stored.
- * @param[in] buf the input buffer
- * @param[in] buf_size the size of the input buffer in bytes
- * @param[in,out] got_picture_ptr Zero if no frame could be decompressed, otherwise, it is nonzero.
- * @return On error a negative value is returned, otherwise the number of bytes
- * used or zero if no frame could be decompressed.
- */
-attribute_deprecated int avcodec_decode_video(AVCodecContext *avctx, AVFrame *picture,
-                         int *got_picture_ptr,
-                         const uint8_t *buf, int buf_size);
-#endif
-
-/**
- * Decodes the video frame of size avpkt->size from avpkt->data into picture.
- * Some decoders may support multiple frames in a single AVPacket, such
- * decoders would then just decode the first frame.
- *
- * @warning The input buffer must be FF_INPUT_BUFFER_PADDING_SIZE larger than
- * the actual read bytes because some optimized bitstream readers read 32 or 64
- * bits at once and could read over the end.
- *
- * @warning The end of the input buffer buf should be set to 0 to ensure that
- * no overreading happens for damaged MPEG streams.
- *
- * @note You might have to align the input buffer avpkt->data.
- * The alignment requirements depend on the CPU: on some CPUs it isn't
- * necessary at all, on others it won't work at all if not aligned and on others
- * it will work but it will have an impact on performance.
- *
- * In practice, avpkt->data should have 4 byte alignment at minimum.
- *
- * @note Some codecs have a delay between input and output, these need to be
- * fed with avpkt->data=NULL, avpkt->size=0 at the end to return the remaining frames.
- *
- * @param avctx the codec context
- * @param[out] picture The AVFrame in which the decoded video frame will be stored.
- *             Use avcodec_alloc_frame to get an AVFrame, the codec will
- *             allocate memory for the actual bitmap.
- * @param[in] avpkt The input AVpacket containing the input buffer.
- *            You can create such packet with av_init_packet() and by then setting
- *            data and size, some decoders might in addition need other fields like
- *            flags&AV_PKT_FLAG_KEY. All decoders are designed to use the least
- *            fields possible.
- * @param[in,out] got_picture_ptr Zero if no frame could be decompressed, otherwise, it is nonzero.
- * @return On error a negative value is returned, otherwise the number of bytes
- * used or zero if no frame could be decompressed.
- */
-int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture,
-                         int *got_picture_ptr,
-                         AVPacket *avpkt);
-
-#if LIBAVCODEC_VERSION_MAJOR < 53
-/* Decode a subtitle message. Return -1 if error, otherwise return the
- * number of bytes used. If no subtitle could be decompressed,
- * got_sub_ptr is zero. Otherwise, the subtitle is stored in *sub. */
-attribute_deprecated int avcodec_decode_subtitle(AVCodecContext *avctx, AVSubtitle *sub,
-                            int *got_sub_ptr,
-                            const uint8_t *buf, int buf_size);
-#endif
-
-/**
- * Decodes a subtitle message.
- * Returns a negative value on error, otherwise returns the number of bytes used.
- * If no subtitle could be decompressed, got_sub_ptr is zero.
- * Otherwise, the subtitle is stored in *sub.
- *
- * @param avctx the codec context
- * @param[out] sub The AVSubtitle in which the decoded subtitle will be stored.
- * @param[in,out] got_sub_ptr Zero if no subtitle could be decompressed, otherwise, it is nonzero.
- * @param[in] avpkt The input AVPacket containing the input buffer.
- */
-int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub,
-                            int *got_sub_ptr,
-                            AVPacket *avpkt);
-int avcodec_parse_frame(AVCodecContext *avctx, uint8_t **pdata,
-                        int *data_size_ptr,
-                        uint8_t *buf, int buf_size);
-
-/**
- * Encodes an audio frame from samples into buf.
- *
- * @note The output buffer should be at least FF_MIN_BUFFER_SIZE bytes large.
- * However, for PCM audio the user will know how much space is needed
- * because it depends on the value passed in buf_size as described
- * below. In that case a lower value can be used.
- *
- * @param avctx the codec context
- * @param[out] buf the output buffer
- * @param[in] buf_size the output buffer size
- * @param[in] samples the input buffer containing the samples
- * The number of samples read from this buffer is frame_size*channels,
- * both of which are defined in avctx.
- * For PCM audio the number of samples read from samples is equal to
- * buf_size * input_sample_size / output_sample_size.
- * @return On error a negative value is returned, on success zero or the number
- * of bytes used to encode the data read from the input buffer.
- */
-int avcodec_encode_audio(AVCodecContext *avctx, uint8_t *buf, int buf_size,
-                         const short *samples);
-
-/**
- * Encodes a video frame from pict into buf.
- * The input picture should be
- * stored using a specific format, namely avctx.pix_fmt.
- *
- * @param avctx the codec context
- * @param[out] buf the output buffer for the bitstream of encoded frame
- * @param[in] buf_size the size of the output buffer in bytes
- * @param[in] pict the input picture to encode
- * @return On error a negative value is returned, on success zero or the number
- * of bytes used from the output buffer.
- */
-int avcodec_encode_video(AVCodecContext *avctx, uint8_t *buf, int buf_size,
-                         const AVFrame *pict);
-int avcodec_encode_subtitle(AVCodecContext *avctx, uint8_t *buf, int buf_size,
-                            const AVSubtitle *sub);
-
-int avcodec_close(AVCodecContext *avctx);
-
-/**
- * Register all the codecs, parsers and bitstream filters which were enabled at
- * configuration time. If you do not call this function you can select exactly
- * which formats you want to support, by using the individual registration
- * functions.
- *
- * @see avcodec_register
- * @see av_register_codec_parser
- * @see av_register_bitstream_filter
- */
-void avcodec_register_all(void);
-
-/**
- * Flush buffers, should be called when seeking or when switching to a different stream.
- */
-void avcodec_flush_buffers(AVCodecContext *avctx);
-
-void avcodec_default_free_buffers(AVCodecContext *s);
-
-/* misc useful functions */
-
-/**
- * Returns a single letter to describe the given picture type pict_type.
- *
- * @param[in] pict_type the picture type
- * @return A single character representing the picture type.
- */
-char av_get_pict_type_char(int pict_type);
-
-/**
- * Returns codec bits per sample.
- *
- * @param[in] codec_id the codec
- * @return Number of bits per sample or zero if unknown for the given codec.
- */
-int av_get_bits_per_sample(enum CodecID codec_id);
-
-/**
- * Returns sample format bits per sample.
- *
- * @param[in] sample_fmt the sample format
- * @return Number of bits per sample or zero if unknown for the given sample format.
- */
-int av_get_bits_per_sample_format(enum SampleFormat sample_fmt);
-
-/* frame parsing */
-typedef struct AVCodecParserContext {
-    void *priv_data;
-    struct AVCodecParser *parser;
-    int64_t frame_offset; /* offset of the current frame */
-    int64_t cur_offset; /* current offset
-                           (incremented by each av_parser_parse()) */
-    int64_t next_frame_offset; /* offset of the next frame */
-    /* video info */
-    int pict_type; /* XXX: Put it back in AVCodecContext. */
-    /**
-     * This field is used for proper frame duration computation in lavf.
-     * It signals, how much longer the frame duration of the current frame
-     * is compared to normal frame duration.
-     *
-     * frame_duration = (1 + repeat_pict) * time_base
-     *
-     * It is used by codecs like H.264 to display telecined material.
-     */
-    int repeat_pict; /* XXX: Put it back in AVCodecContext. */
-    int64_t pts;     /* pts of the current frame */
-    int64_t dts;     /* dts of the current frame */
-
-    /* private data */
-    int64_t last_pts;
-    int64_t last_dts;
-    int fetch_timestamp;
-
-#define AV_PARSER_PTS_NB 4
-    int cur_frame_start_index;
-    int64_t cur_frame_offset[AV_PARSER_PTS_NB];
-    int64_t cur_frame_pts[AV_PARSER_PTS_NB];
-    int64_t cur_frame_dts[AV_PARSER_PTS_NB];
-
-    int flags;
-#define PARSER_FLAG_COMPLETE_FRAMES           0x0001
-
-    int64_t offset;      ///< byte offset from starting packet start
-    int64_t cur_frame_end[AV_PARSER_PTS_NB];
-
-    /*!
-     * Set by parser to 1 for key frames and 0 for non-key frames.
-     * It is initialized to -1, so if the parser doesn't set this flag,
-     * old-style fallback using FF_I_TYPE picture type as key frames
-     * will be used.
-     */
-    int key_frame;
-
-    /**
-     * Time difference in stream time base units from the pts of this
-     * packet to the point at which the output from the decoder has converged
-     * independent from the availability of previous frames. That is, the
-     * frames are virtually identical no matter if decoding started from
-     * the very first frame or from this keyframe.
-     * Is AV_NOPTS_VALUE if unknown.
-     * This field is not the display duration of the current frame.
-     *
-     * The purpose of this field is to allow seeking in streams that have no
-     * keyframes in the conventional sense. It corresponds to the
-     * recovery point SEI in H.264 and match_time_delta in NUT. It is also
-     * essential for some types of subtitle streams to ensure that all
-     * subtitles are correctly displayed after seeking.
-     */
-    int64_t convergence_duration;
-
-    // Timestamp generation support:
-    /**
-     * Synchronization point for start of timestamp generation.
-     *
-     * Set to >0 for sync point, 0 for no sync point and <0 for undefined
-     * (default).
-     *
-     * For example, this corresponds to presence of H.264 buffering period
-     * SEI message.
-     */
-    int dts_sync_point;
-
-    /**
-     * Offset of the current timestamp against last timestamp sync point in
-     * units of AVCodecContext.time_base.
-     *
-     * Set to INT_MIN when dts_sync_point unused. Otherwise, it must
-     * contain a valid timestamp offset.
-     *
-     * Note that the timestamp of sync point has usually a nonzero
-     * dts_ref_dts_delta, which refers to the previous sync point. Offset of
-     * the next frame after timestamp sync point will be usually 1.
-     *
-     * For example, this corresponds to H.264 cpb_removal_delay.
-     */
-    int dts_ref_dts_delta;
-
-    /**
-     * Presentation delay of current frame in units of AVCodecContext.time_base.
-     *
-     * Set to INT_MIN when dts_sync_point unused. Otherwise, it must
-     * contain valid non-negative timestamp delta (presentation time of a frame
-     * must not lie in the past).
-     *
-     * This delay represents the difference between decoding and presentation
-     * time of the frame.
-     *
-     * For example, this corresponds to H.264 dpb_output_delay.
-     */
-    int pts_dts_delta;
-
-    /**
-     * Position of the packet in file.
-     *
-     * Analogous to cur_frame_pts/dts
-     */
-    int64_t cur_frame_pos[AV_PARSER_PTS_NB];
-
-    /**
-     * Byte position of currently parsed frame in stream.
-     */
-    int64_t pos;
-
-    /**
-     * Previous frame byte position.
-     */
-    int64_t last_pos;
-} AVCodecParserContext;
-
-typedef struct AVCodecParser {
-    int codec_ids[5]; /* several codec IDs are permitted */
-    int priv_data_size;
-    int (*parser_init)(AVCodecParserContext *s);
-    int (*parser_parse)(AVCodecParserContext *s,
-                        AVCodecContext *avctx,
-                        const uint8_t **poutbuf, int *poutbuf_size,
-                        const uint8_t *buf, int buf_size);
-    void (*parser_close)(AVCodecParserContext *s);
-    int (*split)(AVCodecContext *avctx, const uint8_t *buf, int buf_size);
-    struct AVCodecParser *next;
-} AVCodecParser;
-
-AVCodecParser *av_parser_next(AVCodecParser *c);
-
-void av_register_codec_parser(AVCodecParser *parser);
-AVCodecParserContext *av_parser_init(int codec_id);
-
-#if LIBAVCODEC_VERSION_MAJOR < 53
-attribute_deprecated
-int av_parser_parse(AVCodecParserContext *s,
-                    AVCodecContext *avctx,
-                    uint8_t **poutbuf, int *poutbuf_size,
-                    const uint8_t *buf, int buf_size,
-                    int64_t pts, int64_t dts);
-#endif
-
-/**
- * Parse a packet.
- *
- * @param s             parser context.
- * @param avctx         codec context.
- * @param poutbuf       set to pointer to parsed buffer or NULL if not yet finished.
- * @param poutbuf_size  set to size of parsed buffer or zero if not yet finished.
- * @param buf           input buffer.
- * @param buf_size      input length, to signal EOF, this should be 0 (so that the last frame can be output).
- * @param pts           input presentation timestamp.
- * @param dts           input decoding timestamp.
- * @param pos           input byte position in stream.
- * @return the number of bytes of the input bitstream used.
- *
- * Example:
- * @code
- *   while(in_len){
- *       len = av_parser_parse2(myparser, AVCodecContext, &data, &size,
- *                                        in_data, in_len,
- *                                        pts, dts, pos);
- *       in_data += len;
- *       in_len  -= len;
- *
- *       if(size)
- *          decode_frame(data, size);
- *   }
- * @endcode
- */
-int av_parser_parse2(AVCodecParserContext *s,
-                     AVCodecContext *avctx,
-                     uint8_t **poutbuf, int *poutbuf_size,
-                     const uint8_t *buf, int buf_size,
-                     int64_t pts, int64_t dts,
-                     int64_t pos);
-
-int av_parser_change(AVCodecParserContext *s,
-                     AVCodecContext *avctx,
-                     uint8_t **poutbuf, int *poutbuf_size,
-                     const uint8_t *buf, int buf_size, int keyframe);
-void av_parser_close(AVCodecParserContext *s);
-
-
-typedef struct AVBitStreamFilterContext {
-    void *priv_data;
-    struct AVBitStreamFilter *filter;
-    AVCodecParserContext *parser;
-    struct AVBitStreamFilterContext *next;
-} AVBitStreamFilterContext;
-
-
-typedef struct AVBitStreamFilter {
-    const char *name;
-    int priv_data_size;
-    int (*filter)(AVBitStreamFilterContext *bsfc,
-                  AVCodecContext *avctx, const char *args,
-                  uint8_t **poutbuf, int *poutbuf_size,
-                  const uint8_t *buf, int buf_size, int keyframe);
-    void (*close)(AVBitStreamFilterContext *bsfc);
-    struct AVBitStreamFilter *next;
-} AVBitStreamFilter;
-
-void av_register_bitstream_filter(AVBitStreamFilter *bsf);
-AVBitStreamFilterContext *av_bitstream_filter_init(const char *name);
-int av_bitstream_filter_filter(AVBitStreamFilterContext *bsfc,
-                               AVCodecContext *avctx, const char *args,
-                               uint8_t **poutbuf, int *poutbuf_size,
-                               const uint8_t *buf, int buf_size, int keyframe);
-void av_bitstream_filter_close(AVBitStreamFilterContext *bsf);
-
-AVBitStreamFilter *av_bitstream_filter_next(AVBitStreamFilter *f);
-
-/* memory */
-
-/**
- * Reallocates the given block if it is not large enough, otherwise it
- * does nothing.
- *
- * @see av_realloc
- */
-void *av_fast_realloc(void *ptr, unsigned int *size, unsigned int min_size);
-
-/**
- * Allocates a buffer, reusing the given one if large enough.
- *
- * Contrary to av_fast_realloc the current buffer contents might not be
- * preserved and on error the old buffer is freed, thus no special
- * handling to avoid memleaks is necessary.
- *
- * @param ptr pointer to pointer to already allocated buffer, overwritten with pointer to new buffer
- * @param size size of the buffer *ptr points to
- * @param min_size minimum size of *ptr buffer after returning, *ptr will be NULL and
- *                 *size 0 if an error occurred.
- */
-void av_fast_malloc(void *ptr, unsigned int *size, unsigned int min_size);
-
-/**
- * Copy image 'src' to 'dst'.
- */
-void av_picture_copy(AVPicture *dst, const AVPicture *src,
-                     enum PixelFormat pix_fmt, int width, int height);
-
-/**
- * Crop image top and left side.
- */
-int av_picture_crop(AVPicture *dst, const AVPicture *src,
-                    enum PixelFormat pix_fmt, int top_band, int left_band);
-
-/**
- * Pad image.
- */
-int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, enum PixelFormat pix_fmt,
-            int padtop, int padbottom, int padleft, int padright, int *color);
-
-/**
- * Encodes extradata length to a buffer. Used by xiph codecs.
- *
- * @param s buffer to write to; must be at least (v/255+1) bytes long
- * @param v size of extradata in bytes
- * @return number of bytes written to the buffer.
- */
-unsigned int av_xiphlacing(unsigned char *s, unsigned int v);
-
-/**
- * Parses str and put in width_ptr and height_ptr the detected values.
- *
- * @return 0 in case of a successful parsing, a negative value otherwise
- * @param[in] str the string to parse: it has to be a string in the format
- * <width>x<height> or a valid video frame size abbreviation.
- * @param[in,out] width_ptr pointer to the variable which will contain the detected
- * frame width value
- * @param[in,out] height_ptr pointer to the variable which will contain the detected
- * frame height value
- */
-int av_parse_video_frame_size(int *width_ptr, int *height_ptr, const char *str);
-
-/**
- * Parses str and put in frame_rate the detected values.
- *
- * @return 0 in case of a successful parsing, a negative value otherwise
- * @param[in] str the string to parse: it has to be a string in the format
- * <frame_rate_num>/<frame_rate_den>, a float number or a valid video rate abbreviation
- * @param[in,out] frame_rate pointer to the AVRational which will contain the detected
- * frame rate
- */
-int av_parse_video_frame_rate(AVRational *frame_rate, const char *str);
-
-/**
- * Logs a generic warning message about a missing feature. This function is
- * intended to be used internally by FFmpeg (libavcodec, libavformat, etc.)
- * only, and would normally not be used by applications.
- * @param[in] avc a pointer to an arbitrary struct of which the first field is
- * a pointer to an AVClass struct
- * @param[in] feature string containing the name of the missing feature
- * @param[in] want_sample indicates if samples are wanted which exhibit this feature.
- * If want_sample is non-zero, additional verbage will be added to the log
- * message which tells the user how to report samples to the development
- * mailing list.
- */
-void av_log_missing_feature(void *avc, const char *feature, int want_sample);
-
-/**
- * Logs a generic warning message asking for a sample. This function is
- * intended to be used internally by FFmpeg (libavcodec, libavformat, etc.)
- * only, and would normally not be used by applications.
- * @param[in] avc a pointer to an arbitrary struct of which the first field is
- * a pointer to an AVClass struct
- * @param[in] msg string containing an optional message, or NULL if no message
- */
-void av_log_ask_for_sample(void *avc, const char *msg);
-
-/**
- * Registers the hardware accelerator hwaccel.
- */
-void av_register_hwaccel(AVHWAccel *hwaccel);
-
-/**
- * If hwaccel is NULL, returns the first registered hardware accelerator,
- * if hwaccel is non-NULL, returns the next registered hardware accelerator
- * after hwaccel, or NULL if hwaccel is the last one.
- */
-AVHWAccel *av_hwaccel_next(AVHWAccel *hwaccel);
-
-
-/**
- * Lock operation used by lockmgr
- */
-enum AVLockOp {
-  AV_LOCK_CREATE,  ///< Create a mutex
-  AV_LOCK_OBTAIN,  ///< Lock the mutex
-  AV_LOCK_RELEASE, ///< Unlock the mutex
-  AV_LOCK_DESTROY, ///< Free mutex resources
-};
-
-/**
- * Register a user provided lock manager supporting the operations
- * specified by AVLockOp. mutex points to a (void *) where the
- * lockmgr should store/get a pointer to a user allocated mutex. It's
- * NULL upon AV_LOCK_CREATE and != NULL for all other ops.
- *
- * @param cb User defined callback. Note: FFmpeg may invoke calls to this
- *           callback during the call to av_lockmgr_register().
- *           Thus, the application must be prepared to handle that.
- *           If cb is set to NULL the lockmgr will be unregistered.
- *           Also note that during unregistration the previously registered
- *           lockmgr callback may also be invoked.
- */
-int av_lockmgr_register(int (*cb)(void **mutex, enum AVLockOp op));
-
-#endif /* AVCODEC_AVCODEC_H */
diff --git a/lib-x86-32/include/libavcodec/avfft.h b/lib-x86-32/include/libavcodec/avfft.h
deleted file mode 100644
index 623f0a33..00000000
--- a/lib-x86-32/include/libavcodec/avfft.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_AVFFT_H
-#define AVCODEC_AVFFT_H
-
-typedef float FFTSample;
-
-typedef struct FFTComplex {
-    FFTSample re, im;
-} FFTComplex;
-
-typedef struct FFTContext FFTContext;
-
-/**
- * Set up a complex FFT.
- * @param nbits           log2 of the length of the input array
- * @param inverse         if 0 perform the forward transform, if 1 perform the inverse
- */
-FFTContext *av_fft_init(int nbits, int inverse);
-
-/**
- * Do the permutation needed BEFORE calling ff_fft_calc().
- */
-void av_fft_permute(FFTContext *s, FFTComplex *z);
-
-/**
- * Do a complex FFT with the parameters defined in av_fft_init(). The
- * input data must be permuted before. No 1.0/sqrt(n) normalization is done.
- */
-void av_fft_calc(FFTContext *s, FFTComplex *z);
-
-void av_fft_end(FFTContext *s);
-
-FFTContext *av_mdct_init(int nbits, int inverse, double scale);
-void av_imdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input);
-void av_imdct_half(FFTContext *s, FFTSample *output, const FFTSample *input);
-void av_mdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input);
-void av_mdct_end(FFTContext *s);
-
-/* Real Discrete Fourier Transform */
-
-enum RDFTransformType {
-    DFT_R2C,
-    IDFT_C2R,
-    IDFT_R2C,
-    DFT_C2R,
-};
-
-typedef struct RDFTContext RDFTContext;
-
-/**
- * Set up a real FFT.
- * @param nbits           log2 of the length of the input array
- * @param trans           the type of transform
- */
-RDFTContext *av_rdft_init(int nbits, enum RDFTransformType trans);
-void av_rdft_calc(RDFTContext *s, FFTSample *data);
-void av_rdft_end(RDFTContext *s);
-
-/* Discrete Cosine Transform */
-
-typedef struct DCTContext DCTContext;
-
-enum DCTTransformType {
-    DCT_II = 0,
-    DCT_III,
-    DCT_I,
-    DST_I,
-};
-
-/**
- * Sets up DCT.
- * @param nbits           size of the input array:
- *                        (1 << nbits)     for DCT-II, DCT-III and DST-I
- *                        (1 << nbits) + 1 for DCT-I
- *
- * @note the first element of the input of DST-I is ignored
- */
-DCTContext *av_dct_init(int nbits, enum DCTTransformType type);
-void av_dct_calc(DCTContext *s, FFTSample *data);
-void av_dct_end (DCTContext *s);
-
-#endif /* AVCODEC_AVFFT_H */
diff --git a/lib-x86-32/include/libavcodec/dxva2.h b/lib-x86-32/include/libavcodec/dxva2.h
deleted file mode 100644
index 5c5fe21e..00000000
--- a/lib-x86-32/include/libavcodec/dxva2.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * DXVA2 HW acceleration
- *
- * copyright (c) 2009 Laurent Aimar
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_DXVA_H
-#define AVCODEC_DXVA_H
-
-#include <stdint.h>
-
-#include <dxva2api.h>
-
-/**
- * This structure is used to provides the necessary configurations and data
- * to the DXVA2 FFmpeg HWAccel implementation.
- *
- * The application must make it available as AVCodecContext.hwaccel_context.
- */
-struct dxva_context {
-    /**
-     * DXVA2 decoder object
-     */
-    IDirectXVideoDecoder *decoder;
-
-    /**
-     * DXVA2 configuration used to create the decoder
-     */
-    const DXVA2_ConfigPictureDecode *cfg;
-
-    /**
-     * The number of surface in the surface array
-     */
-    unsigned surface_count;
-
-    /**
-     * The array of Direct3D surfaces used to create the decoder
-     */
-    LPDIRECT3DSURFACE9 *surface;
-
-    /**
-     * A bit field configuring the workarounds needed for using the decoder
-     */
-    uint64_t workaround;
-
-    /**
-     * Private to the FFmpeg AVHWAccel implementation
-     */
-    unsigned report_id;
-};
-
-#endif /* AVCODEC_DXVA_H */
diff --git a/lib-x86-32/include/libavcodec/opt.h b/lib-x86-32/include/libavcodec/opt.h
deleted file mode 100644
index 55ca4ea6..00000000
--- a/lib-x86-32/include/libavcodec/opt.h
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * AVOptions
- * copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_OPT_H
-#define AVCODEC_OPT_H
-
-/**
- * @file
- * AVOptions
- */
-
-#include "libavutil/rational.h"
-#include "avcodec.h"
-
-enum AVOptionType{
-    FF_OPT_TYPE_FLAGS,
-    FF_OPT_TYPE_INT,
-    FF_OPT_TYPE_INT64,
-    FF_OPT_TYPE_DOUBLE,
-    FF_OPT_TYPE_FLOAT,
-    FF_OPT_TYPE_STRING,
-    FF_OPT_TYPE_RATIONAL,
-    FF_OPT_TYPE_BINARY,  ///< offset must point to a pointer immediately followed by an int for the length
-    FF_OPT_TYPE_CONST=128,
-};
-
-/**
- * AVOption
- */
-typedef struct AVOption {
-    const char *name;
-
-    /**
-     * short English help text
-     * @todo What about other languages?
-     */
-    const char *help;
-
-    /**
-     * The offset relative to the context structure where the option
-     * value is stored. It should be 0 for named constants.
-     */
-    int offset;
-    enum AVOptionType type;
-
-    /**
-     * the default value for scalar options
-     */
-    double default_val;
-    double min;                 ///< minimum valid value for the option
-    double max;                 ///< maximum valid value for the option
-
-    int flags;
-#define AV_OPT_FLAG_ENCODING_PARAM  1   ///< a generic parameter which can be set by the user for muxing or encoding
-#define AV_OPT_FLAG_DECODING_PARAM  2   ///< a generic parameter which can be set by the user for demuxing or decoding
-#define AV_OPT_FLAG_METADATA        4   ///< some data extracted or inserted into the file like title, comment, ...
-#define AV_OPT_FLAG_AUDIO_PARAM     8
-#define AV_OPT_FLAG_VIDEO_PARAM     16
-#define AV_OPT_FLAG_SUBTITLE_PARAM  32
-//FIXME think about enc-audio, ... style flags
-
-    /**
-     * The logical unit to which the option belongs. Non-constant
-     * options and corresponding named constants share the same
-     * unit. May be NULL.
-     */
-    const char *unit;
-} AVOption;
-
-/**
- * AVOption2.
- * THIS IS NOT PART OF THE API/ABI YET!
- * This is identical to AVOption except that default_val was replaced by
- * an union, it should be compatible with AVOption on normal platforms.
- */
-typedef struct AVOption2 {
-    const char *name;
-
-    /**
-     * short English help text
-     * @todo What about other languages?
-     */
-    const char *help;
-
-    /**
-     * The offset relative to the context structure where the option
-     * value is stored. It should be 0 for named constants.
-     */
-    int offset;
-    enum AVOptionType type;
-
-    /**
-     * the default value for scalar options
-     */
-    union {
-        double dbl;
-        const char *str;
-    } default_val;
-
-    double min;                 ///< minimum valid value for the option
-    double max;                 ///< maximum valid value for the option
-
-    int flags;
-/*
-#define AV_OPT_FLAG_ENCODING_PARAM  1   ///< a generic parameter which can be set by the user for muxing or encoding
-#define AV_OPT_FLAG_DECODING_PARAM  2   ///< a generic parameter which can be set by the user for demuxing or decoding
-#define AV_OPT_FLAG_METADATA        4   ///< some data extracted or inserted into the file like title, comment, ...
-#define AV_OPT_FLAG_AUDIO_PARAM     8
-#define AV_OPT_FLAG_VIDEO_PARAM     16
-#define AV_OPT_FLAG_SUBTITLE_PARAM  32
-*/
-//FIXME think about enc-audio, ... style flags
-
-    /**
-     * The logical unit to which the option belongs. Non-constant
-     * options and corresponding named constants share the same
-     * unit. May be NULL.
-     */
-    const char *unit;
-} AVOption2;
-
-
-/**
- * Looks for an option in obj. Looks only for the options which
- * have the flags set as specified in mask and flags (that is,
- * for which it is the case that opt->flags & mask == flags).
- *
- * @param[in] obj a pointer to a struct whose first element is a
- * pointer to an AVClass
- * @param[in] name the name of the option to look for
- * @param[in] unit the unit of the option to look for, or any if NULL
- * @return a pointer to the option found, or NULL if no option
- * has been found
- */
-const AVOption *av_find_opt(void *obj, const char *name, const char *unit, int mask, int flags);
-
-#if LIBAVCODEC_VERSION_MAJOR < 53
-/**
- * @see av_set_string2()
- */
-attribute_deprecated const AVOption *av_set_string(void *obj, const char *name, const char *val);
-
-/**
- * @return a pointer to the AVOption corresponding to the field set or
- * NULL if no matching AVOption exists, or if the value val is not
- * valid
- * @see av_set_string3()
- */
-attribute_deprecated const AVOption *av_set_string2(void *obj, const char *name, const char *val, int alloc);
-#endif
-
-/**
- * Sets the field of obj with the given name to value.
- *
- * @param[in] obj A struct whose first element is a pointer to an
- * AVClass.
- * @param[in] name the name of the field to set
- * @param[in] val The value to set. If the field is not of a string
- * type, then the given string is parsed.
- * SI postfixes and some named scalars are supported.
- * If the field is of a numeric type, it has to be a numeric or named
- * scalar. Behavior with more than one scalar and +- infix operators
- * is undefined.
- * If the field is of a flags type, it has to be a sequence of numeric
- * scalars or named flags separated by '+' or '-'. Prefixing a flag
- * with '+' causes it to be set without affecting the other flags;
- * similarly, '-' unsets a flag.
- * @param[out] o_out if non-NULL put here a pointer to the AVOption
- * found
- * @param alloc when 1 then the old value will be av_freed() and the
- *                     new av_strduped()
- *              when 0 then no av_free() nor av_strdup() will be used
- * @return 0 if the value has been set, or an AVERROR code in case of
- * error:
- * AVERROR(ENOENT) if no matching option exists
- * AVERROR(ERANGE) if the value is out of range
- * AVERROR(EINVAL) if the value is not valid
- */
-int av_set_string3(void *obj, const char *name, const char *val, int alloc, const AVOption **o_out);
-
-const AVOption *av_set_double(void *obj, const char *name, double n);
-const AVOption *av_set_q(void *obj, const char *name, AVRational n);
-const AVOption *av_set_int(void *obj, const char *name, int64_t n);
-double av_get_double(void *obj, const char *name, const AVOption **o_out);
-AVRational av_get_q(void *obj, const char *name, const AVOption **o_out);
-int64_t av_get_int(void *obj, const char *name, const AVOption **o_out);
-const char *av_get_string(void *obj, const char *name, const AVOption **o_out, char *buf, int buf_len);
-const AVOption *av_next_option(void *obj, const AVOption *last);
-int av_opt_show(void *obj, void *av_log_obj);
-void av_opt_set_defaults(void *s);
-void av_opt_set_defaults2(void *s, int mask, int flags);
-
-#endif /* AVCODEC_OPT_H */
diff --git a/lib-x86-32/include/libavcodec/vaapi.h b/lib-x86-32/include/libavcodec/vaapi.h
deleted file mode 100644
index 07568a47..00000000
--- a/lib-x86-32/include/libavcodec/vaapi.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Video Acceleration API (shared data between FFmpeg and the video player)
- * HW decode acceleration for MPEG-2, MPEG-4, H.264 and VC-1
- *
- * Copyright (C) 2008-2009 Splitted-Desktop Systems
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_VAAPI_H
-#define AVCODEC_VAAPI_H
-
-#include <stdint.h>
-
-/**
- * \defgroup VAAPI_Decoding VA API Decoding
- * \ingroup Decoder
- * @{
- */
-
-/**
- * This structure is used to share data between the FFmpeg library and
- * the client video application.
- * This shall be zero-allocated and available as
- * AVCodecContext.hwaccel_context. All user members can be set once
- * during initialization or through each AVCodecContext.get_buffer()
- * function call. In any case, they must be valid prior to calling
- * decoding functions.
- */
-struct vaapi_context {
-    /**
-     * Window system dependent data
-     *
-     * - encoding: unused
-     * - decoding: Set by user
-     */
-    void *display;
-
-    /**
-     * Configuration ID
-     *
-     * - encoding: unused
-     * - decoding: Set by user
-     */
-    uint32_t config_id;
-
-    /**
-     * Context ID (video decode pipeline)
-     *
-     * - encoding: unused
-     * - decoding: Set by user
-     */
-    uint32_t context_id;
-
-    /**
-     * VAPictureParameterBuffer ID
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    uint32_t pic_param_buf_id;
-
-    /**
-     * VAIQMatrixBuffer ID
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    uint32_t iq_matrix_buf_id;
-
-    /**
-     * VABitPlaneBuffer ID (for VC-1 decoding)
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    uint32_t bitplane_buf_id;
-
-    /**
-     * Slice parameter/data buffer IDs
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    uint32_t *slice_buf_ids;
-
-    /**
-     * Number of effective slice buffer IDs to send to the HW
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    unsigned int n_slice_buf_ids;
-
-    /**
-     * Size of pre-allocated slice_buf_ids
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    unsigned int slice_buf_ids_alloc;
-
-    /**
-     * Pointer to VASliceParameterBuffers
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    void *slice_params;
-
-    /**
-     * Size of a VASliceParameterBuffer element
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    unsigned int slice_param_size;
-
-    /**
-     * Size of pre-allocated slice_params
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    unsigned int slice_params_alloc;
-
-    /**
-     * Number of slices currently filled in
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    unsigned int slice_count;
-
-    /**
-     * Pointer to slice data buffer base
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    const uint8_t *slice_data;
-
-    /**
-     * Current size of slice data
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    uint32_t slice_data_size;
-};
-
-/* @} */
-
-#endif /* AVCODEC_VAAPI_H */
diff --git a/lib-x86-32/include/libavcodec/vdpau.h b/lib-x86-32/include/libavcodec/vdpau.h
deleted file mode 100644
index a8fa4d38..00000000
--- a/lib-x86-32/include/libavcodec/vdpau.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * The Video Decode and Presentation API for UNIX (VDPAU) is used for
- * hardware-accelerated decoding of MPEG-1/2, H.264 and VC-1.
- *
- * Copyright (C) 2008 NVIDIA
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_VDPAU_H
-#define AVCODEC_VDPAU_H
-
-/**
- * \defgroup Decoder VDPAU Decoder and Renderer
- *
- * VDPAU hardware acceleration has two modules
- * - VDPAU decoding
- * - VDPAU presentation
- *
- * The VDPAU decoding module parses all headers using FFmpeg
- * parsing mechanisms and uses VDPAU for the actual decoding.
- *
- * As per the current implementation, the actual decoding
- * and rendering (API calls) are done as part of the VDPAU
- * presentation (vo_vdpau.c) module.
- *
- * @{
- * \defgroup  VDPAU_Decoding VDPAU Decoding
- * \ingroup Decoder
- * @{
- */
-
-#include <vdpau/vdpau.h>
-#include <vdpau/vdpau_x11.h>
-
-/** \brief The videoSurface is used for rendering. */
-#define FF_VDPAU_STATE_USED_FOR_RENDER 1
-
-/**
- * \brief The videoSurface is needed for reference/prediction.
- * The codec manipulates this.
- */
-#define FF_VDPAU_STATE_USED_FOR_REFERENCE 2
-
-/**
- * \brief This structure is used as a callback between the FFmpeg
- * decoder (vd_) and presentation (vo_) module.
- * This is used for defining a video frame containing surface,
- * picture parameter, bitstream information etc which are passed
- * between the FFmpeg decoder and its clients.
- */
-struct vdpau_render_state {
-    VdpVideoSurface surface; ///< Used as rendered surface, never changed.
-
-    int state; ///< Holds FF_VDPAU_STATE_* values.
-
-    /** picture parameter information for all supported codecs */
-    union VdpPictureInfo {
-        VdpPictureInfoH264        h264;
-        VdpPictureInfoMPEG1Or2    mpeg;
-        VdpPictureInfoVC1          vc1;
-        VdpPictureInfoMPEG4Part2 mpeg4;
-    } info;
-
-    /** Describe size/location of the compressed video data.
-        Set to 0 when freeing bitstream_buffers. */
-    int bitstream_buffers_allocated;
-    int bitstream_buffers_used;
-    /** The user is responsible for freeing this buffer using av_freep(). */
-    VdpBitstreamBuffer *bitstream_buffers;
-};
-
-/* @}*/
-
-#endif /* AVCODEC_VDPAU_H */
diff --git a/lib-x86-32/include/libavcodec/xvmc.h b/lib-x86-32/include/libavcodec/xvmc.h
deleted file mode 100644
index 01f84b28..00000000
--- a/lib-x86-32/include/libavcodec/xvmc.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright (C) 2003 Ivan Kalvachev
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_XVMC_H
-#define AVCODEC_XVMC_H
-
-#include <X11/extensions/XvMC.h>
-
-#include "avcodec.h"
-
-#if LIBAVCODEC_VERSION_MAJOR < 53
-#define AV_XVMC_STATE_DISPLAY_PENDING          1  /**  the surface should be shown, the video driver manipulates this */
-#define AV_XVMC_STATE_PREDICTION               2  /**  the surface is needed for prediction, the codec manipulates this */
-#define AV_XVMC_STATE_OSD_SOURCE               4  /**  the surface is needed for subpicture rendering */
-#endif
-#define AV_XVMC_ID                    0x1DC711C0  /**< special value to ensure that regular pixel routines haven't corrupted the struct
-                                                       the number is 1337 speak for the letters IDCT MCo (motion compensation) */
-
-struct xvmc_pix_fmt {
-    /** The field contains the special constant value AV_XVMC_ID.
-        It is used as a test that the application correctly uses the API,
-        and that there is no corruption caused by pixel routines.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             xvmc_id;
-
-    /** Pointer to the block array allocated by XvMCCreateBlocks().
-        The array has to be freed by XvMCDestroyBlocks().
-        Each group of 64 values represents one data block of differential
-        pixel information (in MoCo mode) or coefficients for IDCT.
-        - application - set the pointer during initialization
-        - libavcodec  - fills coefficients/pixel data into the array
-    */
-    short*          data_blocks;
-
-    /** Pointer to the macroblock description array allocated by
-        XvMCCreateMacroBlocks() and freed by XvMCDestroyMacroBlocks().
-        - application - set the pointer during initialization
-        - libavcodec  - fills description data into the array
-    */
-    XvMCMacroBlock* mv_blocks;
-
-    /** Number of macroblock descriptions that can be stored in the mv_blocks
-        array.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             allocated_mv_blocks;
-
-    /** Number of blocks that can be stored at once in the data_blocks array.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             allocated_data_blocks;
-
-    /** Indicates that the hardware would interpret data_blocks as IDCT
-        coefficients and perform IDCT on them.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             idct;
-
-    /** In MoCo mode it indicates that intra macroblocks are assumed to be in
-        unsigned format; same as the XVMC_INTRA_UNSIGNED flag.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             unsigned_intra;
-
-    /** Pointer to the surface allocated by XvMCCreateSurface().
-        It has to be freed by XvMCDestroySurface() on application exit.
-        It identifies the frame and its state on the video hardware.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    XvMCSurface*    p_surface;
-
-/** Set by the decoder before calling ff_draw_horiz_band(),
-    needed by the XvMCRenderSurface function. */
-//@{
-    /** Pointer to the surface used as past reference
-        - application - unchanged
-        - libavcodec  - set
-    */
-    XvMCSurface*    p_past_surface;
-
-    /** Pointer to the surface used as future reference
-        - application - unchanged
-        - libavcodec  - set
-    */
-    XvMCSurface*    p_future_surface;
-
-    /** top/bottom field or frame
-        - application - unchanged
-        - libavcodec  - set
-    */
-    unsigned int    picture_structure;
-
-    /** XVMC_SECOND_FIELD - 1st or 2nd field in the sequence
-        - application - unchanged
-        - libavcodec  - set
-    */
-    unsigned int    flags;
-//}@
-
-    /** Number of macroblock descriptions in the mv_blocks array
-        that have already been passed to the hardware.
-        - application - zeroes it on get_buffer().
-                        A successful ff_draw_horiz_band() may increment it
-                        with filled_mb_block_num or zero both.
-        - libavcodec  - unchanged
-    */
-    int             start_mv_blocks_num;
-
-    /** Number of new macroblock descriptions in the mv_blocks array (after
-        start_mv_blocks_num) that are filled by libavcodec and have to be
-        passed to the hardware.
-        - application - zeroes it on get_buffer() or after successful
-                        ff_draw_horiz_band().
-        - libavcodec  - increment with one of each stored MB
-    */
-    int             filled_mv_blocks_num;
-
-    /** Number of the the next free data block; one data block consists of
-        64 short values in the data_blocks array.
-        All blocks before this one have already been claimed by placing their
-        position into the corresponding block description structure field,
-        that are part of the mv_blocks array.
-        - application - zeroes it on get_buffer().
-                        A successful ff_draw_horiz_band() may zero it together
-                        with start_mb_blocks_num.
-        - libavcodec  - each decoded macroblock increases it by the number
-                        of coded blocks it contains.
-    */
-    int             next_free_data_block_num;
-
-/** extensions may be placed here */
-#if LIBAVCODEC_VERSION_MAJOR < 53
-//@{
-    /** State flags used to work around limitations in the MPlayer video system.
-        0   - Surface is not used.
-        1   - Surface is still held in application to be displayed or is
-              still visible.
-        2   - Surface is still held in libavcodec buffer for prediction.
-    */
-    int             state;
-
-    /** pointer to the surface where the subpicture is rendered */
-    void*           p_osd_target_surface_render;
-//}@
-#endif
-};
-
-#endif /* AVCODEC_XVMC_H */
diff --git a/lib-x86-32/include/libavformat/avformat.h b/lib-x86-32/include/libavformat/avformat.h
deleted file mode 100644
index dbd22bb8..00000000
--- a/lib-x86-32/include/libavformat/avformat.h
+++ /dev/null
@@ -1,1369 +0,0 @@
-/*
- * copyright (c) 2001 Fabrice Bellard
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVFORMAT_AVFORMAT_H
-#define AVFORMAT_AVFORMAT_H
-
-#define LIBAVFORMAT_VERSION_MAJOR 52
-#define LIBAVFORMAT_VERSION_MINOR 64
-#define LIBAVFORMAT_VERSION_MICRO  2
-
-#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
-                                               LIBAVFORMAT_VERSION_MINOR, \
-                                               LIBAVFORMAT_VERSION_MICRO)
-#define LIBAVFORMAT_VERSION     AV_VERSION(LIBAVFORMAT_VERSION_MAJOR,   \
-                                           LIBAVFORMAT_VERSION_MINOR,   \
-                                           LIBAVFORMAT_VERSION_MICRO)
-#define LIBAVFORMAT_BUILD       LIBAVFORMAT_VERSION_INT
-
-#define LIBAVFORMAT_IDENT       "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
-
-/**
- * I return the LIBAVFORMAT_VERSION_INT constant.  You got
- * a fucking problem with that, douchebag?
- */
-unsigned avformat_version(void);
-
-/**
- * Returns the libavformat build-time configuration.
- */
-const char *avformat_configuration(void);
-
-/**
- * Returns the libavformat license.
- */
-const char *avformat_license(void);
-
-#include <time.h>
-#include <stdio.h>  /* FILE */
-#include "libavcodec/avcodec.h"
-
-#include "avio.h"
-
-struct AVFormatContext;
-
-
-/*
- * Public Metadata API.
- * The metadata API allows libavformat to export metadata tags to a client
- * application using a sequence of key/value pairs. Like all strings in FFmpeg,
- * metadata must be stored as UTF-8 encoded Unicode. Note that metadata
- * exported by demuxers isn't checked to be valid UTF-8 in most cases.
- * Important concepts to keep in mind:
- * 1. Keys are unique; there can never be 2 tags with the same key. This is
- *    also meant semantically, i.e., a demuxer should not knowingly produce
- *    several keys that are literally different but semantically identical.
- *    E.g., key=Author5, key=Author6. In this example, all authors must be
- *    placed in the same tag.
- * 2. Metadata is flat, not hierarchical; there are no subtags. If you
- *    want to store, e.g., the email address of the child of producer Alice
- *    and actor Bob, that could have key=alice_and_bobs_childs_email_address.
- * 3. Several modifiers can be applied to the tag name. This is done by
- *    appending a dash character ('-') and the modifier name in the order
- *    they appear in the list below -- e.g. foo-eng-sort, not foo-sort-eng.
- *    a) language -- a tag whose value is localized for a particular language
- *       is appended with the ISO 639-2/B 3-letter language code.
- *       For example: Author-ger=Michael, Author-eng=Mike
- *       The original/default language is in the unqualified "Author" tag.
- *       A demuxer should set a default if it sets any translated tag.
- *    b) sorting  -- a modified version of a tag that should be used for
- *       sorting will have '-sort' appended. E.g. artist="The Beatles",
- *       artist-sort="Beatles, The".
- *
- * 4. Tag names are normally exported exactly as stored in the container to
- *    allow lossless remuxing to the same format. For container-independent
- *    handling of metadata, av_metadata_conv() can convert it to ffmpeg generic
- *    format. Follows a list of generic tag names:
- *
- * album        -- name of the set this work belongs to
- * album_artist -- main creator of the set/album, if different from artist.
- *                 e.g. "Various Artists" for compilation albums.
- * artist       -- main creator of the work
- * comment      -- any additional description of the file.
- * composer     -- who composed the work, if different from artist.
- * copyright    -- name of copyright holder.
- * date         -- date when the work was created, preferably in ISO 8601.
- * disc         -- number of a subset, e.g. disc in a multi-disc collection.
- * encoder      -- name/settings of the software/hardware that produced the file.
- * encoded_by   -- person/group who created the file.
- * filename     -- original name of the file.
- * genre        -- <self-evident>.
- * language     -- main language in which the work is performed, preferably
- *                 in ISO 639-2 format.
- * performer    -- artist who performed the work, if different from artist.
- *                 E.g for "Also sprach Zarathustra", artist would be "Richard
- *                 Strauss" and performer "London Philharmonic Orchestra".
- * publisher    -- name of the label/publisher.
- * title        -- name of the work.
- * track        -- number of this work in the set, can be in form current/total.
- */
-
-#define AV_METADATA_MATCH_CASE      1
-#define AV_METADATA_IGNORE_SUFFIX   2
-#define AV_METADATA_DONT_STRDUP_KEY 4
-#define AV_METADATA_DONT_STRDUP_VAL 8
-#define AV_METADATA_DONT_OVERWRITE 16   ///< Don't overwrite existing tags.
-
-typedef struct {
-    char *key;
-    char *value;
-}AVMetadataTag;
-
-typedef struct AVMetadata AVMetadata;
-typedef struct AVMetadataConv AVMetadataConv;
-
-/**
- * Gets a metadata element with matching key.
- * @param prev Set to the previous matching element to find the next.
- *             If set to NULL the first matching element is returned.
- * @param flags Allows case as well as suffix-insensitive comparisons.
- * @return Found tag or NULL, changing key or value leads to undefined behavior.
- */
-AVMetadataTag *
-av_metadata_get(AVMetadata *m, const char *key, const AVMetadataTag *prev, int flags);
-
-#if LIBAVFORMAT_VERSION_MAJOR == 52
-/**
- * Sets the given tag in m, overwriting an existing tag.
- * @param key tag key to add to m (will be av_strduped)
- * @param value tag value to add to m (will be av_strduped)
- * @return >= 0 on success otherwise an error code <0
- * @deprecated Use av_metadata_set2() instead.
- */
-attribute_deprecated int av_metadata_set(AVMetadata **pm, const char *key, const char *value);
-#endif
-
-/**
- * Sets the given tag in m, overwriting an existing tag.
- * @param key tag key to add to m (will be av_strduped depending on flags)
- * @param value tag value to add to m (will be av_strduped depending on flags)
- * @return >= 0 on success otherwise an error code <0
- */
-int av_metadata_set2(AVMetadata **pm, const char *key, const char *value, int flags);
-
-/**
- * Converts all the metadata sets from ctx according to the source and
- * destination conversion tables. If one of the tables is NULL, then
- * tags are converted to/from ffmpeg generic tag names.
- * @param d_conv destination tags format conversion table
- * @param s_conv source tags format conversion table
- */
-void av_metadata_conv(struct AVFormatContext *ctx,const AVMetadataConv *d_conv,
-                                                  const AVMetadataConv *s_conv);
-
-/**
- * Frees all the memory allocated for an AVMetadata struct.
- */
-void av_metadata_free(AVMetadata **m);
-
-
-/* packet functions */
-
-
-/**
- * Allocates and reads the payload of a packet and initializes its
- * fields with default values.
- *
- * @param pkt packet
- * @param size desired payload size
- * @return >0 (read size) if OK, AVERROR_xxx otherwise
- */
-int av_get_packet(ByteIOContext *s, AVPacket *pkt, int size);
-
-
-/*************************************************/
-/* fractional numbers for exact pts handling */
-
-/**
- * The exact value of the fractional number is: 'val + num / den'.
- * num is assumed to be 0 <= num < den.
- */
-typedef struct AVFrac {
-    int64_t val, num, den;
-} AVFrac;
-
-/*************************************************/
-/* input/output formats */
-
-struct AVCodecTag;
-
-/** This structure contains the data a format has to probe a file. */
-typedef struct AVProbeData {
-    const char *filename;
-    unsigned char *buf; /**< Buffer must have AVPROBE_PADDING_SIZE of extra allocated bytes filled with zero. */
-    int buf_size;       /**< Size of buf except extra allocated bytes */
-} AVProbeData;
-
-#define AVPROBE_SCORE_MAX 100               ///< maximum score, half of that is used for file-extension-based detection
-#define AVPROBE_PADDING_SIZE 32             ///< extra allocated bytes at the end of the probe buffer
-
-typedef struct AVFormatParameters {
-    AVRational time_base;
-    int sample_rate;
-    int channels;
-    int width;
-    int height;
-    enum PixelFormat pix_fmt;
-    int channel; /**< Used to select DV channel. */
-    const char *standard; /**< TV standard, NTSC, PAL, SECAM */
-    unsigned int mpeg2ts_raw:1;  /**< Force raw MPEG-2 transport stream output, if possible. */
-    unsigned int mpeg2ts_compute_pcr:1; /**< Compute exact PCR for each transport
-                                            stream packet (only meaningful if
-                                            mpeg2ts_raw is TRUE). */
-    unsigned int initial_pause:1;       /**< Do not begin to play the stream
-                                            immediately (RTSP only). */
-    unsigned int prealloced_context:1;
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
-    enum CodecID video_codec_id;
-    enum CodecID audio_codec_id;
-#endif
-} AVFormatParameters;
-
-//! Demuxer will use url_fopen, no opened file should be provided by the caller.
-#define AVFMT_NOFILE        0x0001
-#define AVFMT_NEEDNUMBER    0x0002 /**< Needs '%d' in filename. */
-#define AVFMT_SHOW_IDS      0x0008 /**< Show format stream IDs numbers. */
-#define AVFMT_RAWPICTURE    0x0020 /**< Format wants AVPicture structure for
-                                      raw picture data. */
-#define AVFMT_GLOBALHEADER  0x0040 /**< Format wants global header. */
-#define AVFMT_NOTIMESTAMPS  0x0080 /**< Format does not need / have any timestamps. */
-#define AVFMT_GENERIC_INDEX 0x0100 /**< Use generic index building code. */
-#define AVFMT_TS_DISCONT    0x0200 /**< Format allows timestamp discontinuities. */
-#define AVFMT_VARIABLE_FPS  0x0400 /**< Format allows variable fps. */
-#define AVFMT_NODIMENSIONS  0x0800 /**< Format does not need width/height */
-
-typedef struct AVOutputFormat {
-    const char *name;
-    /**
-     * Descriptive name for the format, meant to be more human-readable
-     * than name. You should use the NULL_IF_CONFIG_SMALL() macro
-     * to define it.
-     */
-    const char *long_name;
-    const char *mime_type;
-    const char *extensions; /**< comma-separated filename extensions */
-    /** size of private data so that it can be allocated in the wrapper */
-    int priv_data_size;
-    /* output support */
-    enum CodecID audio_codec; /**< default audio codec */
-    enum CodecID video_codec; /**< default video codec */
-    int (*write_header)(struct AVFormatContext *);
-    int (*write_packet)(struct AVFormatContext *, AVPacket *pkt);
-    int (*write_trailer)(struct AVFormatContext *);
-    /** can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_GLOBALHEADER */
-    int flags;
-    /** Currently only used to set pixel format if not YUV420P. */
-    int (*set_parameters)(struct AVFormatContext *, AVFormatParameters *);
-    int (*interleave_packet)(struct AVFormatContext *, AVPacket *out,
-                             AVPacket *in, int flush);
-
-    /**
-     * List of supported codec_id-codec_tag pairs, ordered by "better
-     * choice first". The arrays are all terminated by CODEC_ID_NONE.
-     */
-    const struct AVCodecTag * const *codec_tag;
-
-    enum CodecID subtitle_codec; /**< default subtitle codec */
-
-    const AVMetadataConv *metadata_conv;
-
-    /* private fields */
-    struct AVOutputFormat *next;
-} AVOutputFormat;
-
-typedef struct AVInputFormat {
-    const char *name;
-    /**
-     * Descriptive name for the format, meant to be more human-readable
-     * than name. You should use the NULL_IF_CONFIG_SMALL() macro
-     * to define it.
-     */
-    const char *long_name;
-    /** Size of private data so that it can be allocated in the wrapper. */
-    int priv_data_size;
-    /**
-     * Tell if a given file has a chance of being parsed as this format.
-     * The buffer provided is guaranteed to be AVPROBE_PADDING_SIZE bytes
-     * big so you do not have to check for that unless you need more.
-     */
-    int (*read_probe)(AVProbeData *);
-    /** Read the format header and initialize the AVFormatContext
-       structure. Return 0 if OK. 'ap' if non-NULL contains
-       additional parameters. Only used in raw format right
-       now. 'av_new_stream' should be called to create new streams.  */
-    int (*read_header)(struct AVFormatContext *,
-                       AVFormatParameters *ap);
-    /** Read one packet and put it in 'pkt'. pts and flags are also
-       set. 'av_new_stream' can be called only if the flag
-       AVFMTCTX_NOHEADER is used.
-       @return 0 on success, < 0 on error.
-               When returning an error, pkt must not have been allocated
-               or must be freed before returning */
-    int (*read_packet)(struct AVFormatContext *, AVPacket *pkt);
-    /** Close the stream. The AVFormatContext and AVStreams are not
-       freed by this function */
-    int (*read_close)(struct AVFormatContext *);
-
-#if LIBAVFORMAT_VERSION_MAJOR < 53
-    /**
-     * Seek to a given timestamp relative to the frames in
-     * stream component stream_index.
-     * @param stream_index Must not be -1.
-     * @param flags Selects which direction should be preferred if no exact
-     *              match is available.
-     * @return >= 0 on success (but not necessarily the new offset)
-     */
-    int (*read_seek)(struct AVFormatContext *,
-                     int stream_index, int64_t timestamp, int flags);
-#endif
-    /**
-     * Gets the next timestamp in stream[stream_index].time_base units.
-     * @return the timestamp or AV_NOPTS_VALUE if an error occurred
-     */
-    int64_t (*read_timestamp)(struct AVFormatContext *s, int stream_index,
-                              int64_t *pos, int64_t pos_limit);
-    /** Can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER. */
-    int flags;
-    /** If extensions are defined, then no probe is done. You should
-       usually not use extension format guessing because it is not
-       reliable enough */
-    const char *extensions;
-    /** General purpose read-only value that the format can use. */
-    int value;
-
-    /** Starts/resumes playing - only meaningful if using a network-based format
-       (RTSP). */
-    int (*read_play)(struct AVFormatContext *);
-
-    /** Pauses playing - only meaningful if using a network-based format
-       (RTSP). */
-    int (*read_pause)(struct AVFormatContext *);
-
-    const struct AVCodecTag * const *codec_tag;
-
-    /**
-     * Seeks to timestamp ts.
-     * Seeking will be done so that the point from which all active streams
-     * can be presented successfully will be closest to ts and within min/max_ts.
-     * Active streams are all streams that have AVStream.discard < AVDISCARD_ALL.
-     */
-    int (*read_seek2)(struct AVFormatContext *s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags);
-
-    const AVMetadataConv *metadata_conv;
-
-    /* private fields */
-    struct AVInputFormat *next;
-} AVInputFormat;
-
-enum AVStreamParseType {
-    AVSTREAM_PARSE_NONE,
-    AVSTREAM_PARSE_FULL,       /**< full parsing and repack */
-    AVSTREAM_PARSE_HEADERS,    /**< Only parse headers, do not repack. */
-    AVSTREAM_PARSE_TIMESTAMPS, /**< full parsing and interpolation of timestamps for frames not starting on a packet boundary */
-};
-
-typedef struct AVIndexEntry {
-    int64_t pos;
-    int64_t timestamp;
-#define AVINDEX_KEYFRAME 0x0001
-    int flags:2;
-    int size:30; //Yeah, trying to keep the size of this small to reduce memory requirements (it is 24 vs. 32 bytes due to possible 8-byte alignment).
-    int min_distance;         /**< Minimum distance between this and the previous keyframe, used to avoid unneeded searching. */
-} AVIndexEntry;
-
-#define AV_DISPOSITION_DEFAULT   0x0001
-#define AV_DISPOSITION_DUB       0x0002
-#define AV_DISPOSITION_ORIGINAL  0x0004
-#define AV_DISPOSITION_COMMENT   0x0008
-#define AV_DISPOSITION_LYRICS    0x0010
-#define AV_DISPOSITION_KARAOKE   0x0020
-
-/**
- * Stream structure.
- * New fields can be added to the end with minor version bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump.
- * sizeof(AVStream) must not be used outside libav*.
- */
-typedef struct AVStream {
-    int index;    /**< stream index in AVFormatContext */
-    int id;       /**< format-specific stream ID */
-    AVCodecContext *codec; /**< codec context */
-    /**
-     * Real base framerate of the stream.
-     * This is the lowest framerate with which all timestamps can be
-     * represented accurately (it is the least common multiple of all
-     * framerates in the stream). Note, this value is just a guess!
-     * For example, if the time base is 1/90000 and all frames have either
-     * approximately 3600 or 1800 timer ticks, then r_frame_rate will be 50/1.
-     */
-    AVRational r_frame_rate;
-    void *priv_data;
-
-    /* internal data used in av_find_stream_info() */
-    int64_t first_dts;
-    /** encoding: pts generation when outputting stream */
-    struct AVFrac pts;
-
-    /**
-     * This is the fundamental unit of time (in seconds) in terms
-     * of which frame timestamps are represented. For fixed-fps content,
-     * time base should be 1/framerate and timestamp increments should be 1.
-     */
-    AVRational time_base;
-    int pts_wrap_bits; /**< number of bits in pts (used for wrapping control) */
-    /* ffmpeg.c private use */
-    int stream_copy; /**< If set, just copy stream. */
-    enum AVDiscard discard; ///< Selects which packets can be discarded at will and do not need to be demuxed.
-    //FIXME move stuff to a flags field?
-    /** Quality, as it has been removed from AVCodecContext and put in AVVideoFrame.
-     * MN: dunno if that is the right place for it */
-    float quality;
-    /**
-     * Decoding: pts of the first frame of the stream, in stream time base.
-     * Only set this if you are absolutely 100% sure that the value you set
-     * it to really is the pts of the first frame.
-     * This may be undefined (AV_NOPTS_VALUE).
-     * @note The ASF header does NOT contain a correct start_time the ASF
-     * demuxer must NOT set this.
-     */
-    int64_t start_time;
-    /**
-     * Decoding: duration of the stream, in stream time base.
-     * If a source file does not specify a duration, but does specify
-     * a bitrate, this value will be estimated from bitrate and file size.
-     */
-    int64_t duration;
-
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
-    char language[4]; /** ISO 639-2/B 3-letter language code (empty string if undefined) */
-#endif
-
-    /* av_read_frame() support */
-    enum AVStreamParseType need_parsing;
-    struct AVCodecParserContext *parser;
-
-    int64_t cur_dts;
-    int last_IP_duration;
-    int64_t last_IP_pts;
-    /* av_seek_frame() support */
-    AVIndexEntry *index_entries; /**< Only used if the format does not
-                                    support seeking natively. */
-    int nb_index_entries;
-    unsigned int index_entries_allocated_size;
-
-    int64_t nb_frames;                 ///< number of frames in this stream if known or 0
-
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
-    int64_t unused[4+1];
-
-    char *filename; /**< source filename of the stream */
-#endif
-
-    int disposition; /**< AV_DISPOSITION_* bit field */
-
-    AVProbeData probe_data;
-#define MAX_REORDER_DELAY 16
-    int64_t pts_buffer[MAX_REORDER_DELAY+1];
-
-    /**
-     * sample aspect ratio (0 if unknown)
-     * - encoding: Set by user.
-     * - decoding: Set by libavformat.
-     */
-    AVRational sample_aspect_ratio;
-
-    AVMetadata *metadata;
-
-    /* av_read_frame() support */
-    const uint8_t *cur_ptr;
-    int cur_len;
-    AVPacket cur_pkt;
-
-    // Timestamp generation support:
-    /**
-     * Timestamp corresponding to the last dts sync point.
-     *
-     * Initialized when AVCodecParserContext.dts_sync_point >= 0 and
-     * a DTS is received from the underlying container. Otherwise set to
-     * AV_NOPTS_VALUE by default.
-     */
-    int64_t reference_dts;
-
-    /**
-     * Number of packets to buffer for codec probing
-     * NOT PART OF PUBLIC API
-     */
-#define MAX_PROBE_PACKETS 2500
-    int probe_packets;
-
-    /**
-     * last packet in packet_buffer for this stream when muxing.
-     * used internally, NOT PART OF PUBLIC API, dont read or write from outside of libav*
-     */
-    struct AVPacketList *last_in_packet_buffer;
-
-    /**
-     * Average framerate
-     */
-    AVRational avg_frame_rate;
-
-    /**
-     * Number of frames that have been demuxed during av_find_stream_info()
-     */
-    int codec_info_nb_frames;
-} AVStream;
-
-#define AV_PROGRAM_RUNNING 1
-
-/**
- * New fields can be added to the end with minor version bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump.
- * sizeof(AVProgram) must not be used outside libav*.
- */
-typedef struct AVProgram {
-    int            id;
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
-    char           *provider_name; ///< network name for DVB streams
-    char           *name;          ///< service name for DVB streams
-#endif
-    int            flags;
-    enum AVDiscard discard;        ///< selects which program to discard and which to feed to the caller
-    unsigned int   *stream_index;
-    unsigned int   nb_stream_indexes;
-    AVMetadata *metadata;
-} AVProgram;
-
-#define AVFMTCTX_NOHEADER      0x0001 /**< signal that no header is present
-                                         (streams are added dynamically) */
-
-typedef struct AVChapter {
-    int id;                 ///< unique ID to identify the chapter
-    AVRational time_base;   ///< time base in which the start/end timestamps are specified
-    int64_t start, end;     ///< chapter start/end time in time_base units
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
-    char *title;            ///< chapter title
-#endif
-    AVMetadata *metadata;
-} AVChapter;
-
-#if LIBAVFORMAT_VERSION_MAJOR < 53
-#define MAX_STREAMS 20
-#else
-#define MAX_STREAMS 100
-#endif
-
-/**
- * Format I/O context.
- * New fields can be added to the end with minor version bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump.
- * sizeof(AVFormatContext) must not be used outside libav*.
- */
-typedef struct AVFormatContext {
-    const AVClass *av_class; /**< Set by avformat_alloc_context. */
-    /* Can only be iformat or oformat, not both at the same time. */
-    struct AVInputFormat *iformat;
-    struct AVOutputFormat *oformat;
-    void *priv_data;
-    ByteIOContext *pb;
-    unsigned int nb_streams;
-    AVStream *streams[MAX_STREAMS];
-    char filename[1024]; /**< input or output filename */
-    /* stream info */
-    int64_t timestamp;
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
-    char title[512];
-    char author[512];
-    char copyright[512];
-    char comment[512];
-    char album[512];
-    int year;  /**< ID3 year, 0 if none */
-    int track; /**< track number, 0 if none */
-    char genre[32]; /**< ID3 genre */
-#endif
-
-    int ctx_flags; /**< Format-specific flags, see AVFMTCTX_xx */
-    /* private data for pts handling (do not modify directly). */
-    /** This buffer is only needed when packets were already buffered but
-       not decoded, for example to get the codec parameters in MPEG
-       streams. */
-    struct AVPacketList *packet_buffer;
-
-    /** Decoding: position of the first frame of the component, in
-       AV_TIME_BASE fractional seconds. NEVER set this value directly:
-       It is deduced from the AVStream values.  */
-    int64_t start_time;
-    /** Decoding: duration of the stream, in AV_TIME_BASE fractional
-       seconds. Only set this value if you know none of the individual stream
-       durations and also dont set any of them. This is deduced from the
-       AVStream values if not set.  */
-    int64_t duration;
-    /** decoding: total file size, 0 if unknown */
-    int64_t file_size;
-    /** Decoding: total stream bitrate in bit/s, 0 if not
-       available. Never set it directly if the file_size and the
-       duration are known as FFmpeg can compute it automatically. */
-    int bit_rate;
-
-    /* av_read_frame() support */
-    AVStream *cur_st;
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
-    const uint8_t *cur_ptr_deprecated;
-    int cur_len_deprecated;
-    AVPacket cur_pkt_deprecated;
-#endif
-
-    /* av_seek_frame() support */
-    int64_t data_offset; /** offset of the first packet */
-    int index_built;
-
-    int mux_rate;
-    unsigned int packet_size;
-    int preload;
-    int max_delay;
-
-#define AVFMT_NOOUTPUTLOOP -1
-#define AVFMT_INFINITEOUTPUTLOOP 0
-    /** number of times to loop output in formats that support it */
-    int loop_output;
-
-    int flags;
-#define AVFMT_FLAG_GENPTS       0x0001 ///< Generate missing pts even if it requires parsing future frames.
-#define AVFMT_FLAG_IGNIDX       0x0002 ///< Ignore index.
-#define AVFMT_FLAG_NONBLOCK     0x0004 ///< Do not block when reading packets from input.
-#define AVFMT_FLAG_IGNDTS       0x0008 ///< Ignore DTS on frames that contain both DTS & PTS
-#define AVFMT_FLAG_NOFILLIN     0x0010 ///< Do not infer any values from other values, just return what is stored in the container
-#define AVFMT_FLAG_NOPARSE      0x0020 ///< Do not use AVParsers, you also must set AVFMT_FLAG_NOFILLIN as the fillin code works on frames and no parsing -> no frames. Also seeking to frames can not work if parsing to find frame boundaries has been disabled
-#define AVFMT_FLAG_RTP_HINT     0x0040 ///< Add RTP hinting to the output file
-
-    int loop_input;
-    /** decoding: size of data to probe; encoding: unused. */
-    unsigned int probesize;
-
-    /**
-     * Maximum time (in AV_TIME_BASE units) during which the input should
-     * be analyzed in av_find_stream_info().
-     */
-    int max_analyze_duration;
-
-    const uint8_t *key;
-    int keylen;
-
-    unsigned int nb_programs;
-    AVProgram **programs;
-
-    /**
-     * Forced video codec_id.
-     * Demuxing: Set by user.
-     */
-    enum CodecID video_codec_id;
-    /**
-     * Forced audio codec_id.
-     * Demuxing: Set by user.
-     */
-    enum CodecID audio_codec_id;
-    /**
-     * Forced subtitle codec_id.
-     * Demuxing: Set by user.
-     */
-    enum CodecID subtitle_codec_id;
-
-    /**
-     * Maximum amount of memory in bytes to use for the index of each stream.
-     * If the index exceeds this size, entries will be discarded as
-     * needed to maintain a smaller size. This can lead to slower or less
-     * accurate seeking (depends on demuxer).
-     * Demuxers for which a full in-memory index is mandatory will ignore
-     * this.
-     * muxing  : unused
-     * demuxing: set by user
-     */
-    unsigned int max_index_size;
-
-    /**
-     * Maximum amount of memory in bytes to use for buffering frames
-     * obtained from realtime capture devices.
-     */
-    unsigned int max_picture_buffer;
-
-    unsigned int nb_chapters;
-    AVChapter **chapters;
-
-    /**
-     * Flags to enable debugging.
-     */
-    int debug;
-#define FF_FDEBUG_TS        0x0001
-
-    /**
-     * Raw packets from the demuxer, prior to parsing and decoding.
-     * This buffer is used for buffering packets until the codec can
-     * be identified, as parsing cannot be done without knowing the
-     * codec.
-     */
-    struct AVPacketList *raw_packet_buffer;
-    struct AVPacketList *raw_packet_buffer_end;
-
-    struct AVPacketList *packet_buffer_end;
-
-    AVMetadata *metadata;
-
-    /**
-     * Remaining size available for raw_packet_buffer, in bytes.
-     * NOT PART OF PUBLIC API
-     */
-#define RAW_PACKET_BUFFER_SIZE 2500000
-    int raw_packet_buffer_remaining_size;
-
-    /**
-     * Start time of the stream in real world time, in microseconds
-     * since the unix epoch (00:00 1st January 1970). That is, pts=0
-     * in the stream was captured at this real world time.
-     * - encoding: Set by user.
-     * - decoding: Unused.
-     */
-    int64_t start_time_realtime;
-} AVFormatContext;
-
-typedef struct AVPacketList {
-    AVPacket pkt;
-    struct AVPacketList *next;
-} AVPacketList;
-
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
-extern AVInputFormat *first_iformat;
-extern AVOutputFormat *first_oformat;
-#endif
-
-/**
- * If f is NULL, returns the first registered input format,
- * if f is non-NULL, returns the next registered input format after f
- * or NULL if f is the last one.
- */
-AVInputFormat  *av_iformat_next(AVInputFormat  *f);
-
-/**
- * If f is NULL, returns the first registered output format,
- * if f is non-NULL, returns the next registered output format after f
- * or NULL if f is the last one.
- */
-AVOutputFormat *av_oformat_next(AVOutputFormat *f);
-
-enum CodecID av_guess_image2_codec(const char *filename);
-
-/* XXX: Use automatic init with either ELF sections or C file parser */
-/* modules. */
-
-/* utils.c */
-void av_register_input_format(AVInputFormat *format);
-void av_register_output_format(AVOutputFormat *format);
-#if LIBAVFORMAT_VERSION_MAJOR < 53
-attribute_deprecated AVOutputFormat *guess_stream_format(const char *short_name,
-                                    const char *filename,
-                                    const char *mime_type);
-
-/**
- * @deprecated Use av_guess_format() instead.
- */
-attribute_deprecated AVOutputFormat *guess_format(const char *short_name,
-                                                  const char *filename,
-                                                  const char *mime_type);
-#endif
-
-/**
- * Returns the output format in the list of registered output formats
- * which best matches the provided parameters, or returns NULL if
- * there is no match.
- *
- * @param short_name if non-NULL checks if short_name matches with the
- * names of the registered formats
- * @param filename if non-NULL checks if filename terminates with the
- * extensions of the registered formats
- * @param mime_type if non-NULL checks if mime_type matches with the
- * MIME type of the registered formats
- */
-AVOutputFormat *av_guess_format(const char *short_name,
-                                const char *filename,
-                                const char *mime_type);
-
-/**
- * Guesses the codec ID based upon muxer and filename.
- */
-enum CodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name,
-                            const char *filename, const char *mime_type,
-                            enum AVMediaType type);
-
-/**
- * Sends a nice hexadecimal dump of a buffer to the specified file stream.
- *
- * @param f The file stream pointer where the dump should be sent to.
- * @param buf buffer
- * @param size buffer size
- *
- * @see av_hex_dump_log, av_pkt_dump, av_pkt_dump_log
- */
-void av_hex_dump(FILE *f, uint8_t *buf, int size);
-
-/**
- * Sends a nice hexadecimal dump of a buffer to the log.
- *
- * @param avcl A pointer to an arbitrary struct of which the first field is a
- * pointer to an AVClass struct.
- * @param level The importance level of the message, lower values signifying
- * higher importance.
- * @param buf buffer
- * @param size buffer size
- *
- * @see av_hex_dump, av_pkt_dump, av_pkt_dump_log
- */
-void av_hex_dump_log(void *avcl, int level, uint8_t *buf, int size);
-
-/**
- * Sends a nice dump of a packet to the specified file stream.
- *
- * @param f The file stream pointer where the dump should be sent to.
- * @param pkt packet to dump
- * @param dump_payload True if the payload must be displayed, too.
- */
-void av_pkt_dump(FILE *f, AVPacket *pkt, int dump_payload);
-
-/**
- * Sends a nice dump of a packet to the log.
- *
- * @param avcl A pointer to an arbitrary struct of which the first field is a
- * pointer to an AVClass struct.
- * @param level The importance level of the message, lower values signifying
- * higher importance.
- * @param pkt packet to dump
- * @param dump_payload True if the payload must be displayed, too.
- */
-void av_pkt_dump_log(void *avcl, int level, AVPacket *pkt, int dump_payload);
-
-/**
- * Initializes libavformat and registers all the muxers, demuxers and
- * protocols. If you do not call this function, then you can select
- * exactly which formats you want to support.
- *
- * @see av_register_input_format()
- * @see av_register_output_format()
- * @see av_register_protocol()
- */
-void av_register_all(void);
-
-/**
- * Gets the CodecID for the given codec tag tag.
- * If no codec id is found returns CODEC_ID_NONE.
- *
- * @param tags list of supported codec_id-codec_tag pairs, as stored
- * in AVInputFormat.codec_tag and AVOutputFormat.codec_tag
- */
-enum CodecID av_codec_get_id(const struct AVCodecTag * const *tags, unsigned int tag);
-
-/**
- * Gets the codec tag for the given codec id id.
- * If no codec tag is found returns 0.
- *
- * @param tags list of supported codec_id-codec_tag pairs, as stored
- * in AVInputFormat.codec_tag and AVOutputFormat.codec_tag
- */
-unsigned int av_codec_get_tag(const struct AVCodecTag * const *tags, enum CodecID id);
-
-/* media file input */
-
-/**
- * Finds AVInputFormat based on the short name of the input format.
- */
-AVInputFormat *av_find_input_format(const char *short_name);
-
-/**
- * Guesses the file format.
- *
- * @param is_opened Whether the file is already opened; determines whether
- *                  demuxers with or without AVFMT_NOFILE are probed.
- */
-AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened);
-
-/**
- * Guesses the file format.
- *
- * @param is_opened Whether the file is already opened; determines whether
- *                  demuxers with or without AVFMT_NOFILE are probed.
- * @param score_max A probe score larger that this is required to accept a
- *                  detection, the variable is set to the actual detection
- *                  score afterwards.
- *                  If the score is <= AVPROBE_SCORE_MAX / 4 it is recommended
- *                  to retry with a larger probe buffer.
- */
-AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int *score_max);
-
-/**
- * Allocates all the structures needed to read an input stream.
- *        This does not open the needed codecs for decoding the stream[s].
- */
-int av_open_input_stream(AVFormatContext **ic_ptr,
-                         ByteIOContext *pb, const char *filename,
-                         AVInputFormat *fmt, AVFormatParameters *ap);
-
-/**
- * Opens a media file as input. The codecs are not opened. Only the file
- * header (if present) is read.
- *
- * @param ic_ptr The opened media file handle is put here.
- * @param filename filename to open
- * @param fmt If non-NULL, force the file format to use.
- * @param buf_size optional buffer size (zero if default is OK)
- * @param ap Additional parameters needed when opening the file
- *           (NULL if default).
- * @return 0 if OK, AVERROR_xxx otherwise
- */
-int av_open_input_file(AVFormatContext **ic_ptr, const char *filename,
-                       AVInputFormat *fmt,
-                       int buf_size,
-                       AVFormatParameters *ap);
-
-#if LIBAVFORMAT_VERSION_MAJOR < 53
-/**
- * @deprecated Use avformat_alloc_context() instead.
- */
-attribute_deprecated AVFormatContext *av_alloc_format_context(void);
-#endif
-
-/**
- * Allocates an AVFormatContext.
- * Can be freed with av_free() but do not forget to free everything you
- * explicitly allocated as well!
- */
-AVFormatContext *avformat_alloc_context(void);
-
-/**
- * Reads packets of a media file to get stream information. This
- * is useful for file formats with no headers such as MPEG. This
- * function also computes the real framerate in case of MPEG-2 repeat
- * frame mode.
- * The logical file position is not changed by this function;
- * examined packets may be buffered for later processing.
- *
- * @param ic media file handle
- * @return >=0 if OK, AVERROR_xxx on error
- * @todo Let the user decide somehow what information is needed so that
- *       we do not waste time getting stuff the user does not need.
- */
-int av_find_stream_info(AVFormatContext *ic);
-
-/**
- * Reads a transport packet from a media file.
- *
- * This function is obsolete and should never be used.
- * Use av_read_frame() instead.
- *
- * @param s media file handle
- * @param pkt is filled
- * @return 0 if OK, AVERROR_xxx on error
- */
-int av_read_packet(AVFormatContext *s, AVPacket *pkt);
-
-/**
- * Returns the next frame of a stream.
- *
- * The returned packet is valid
- * until the next av_read_frame() or until av_close_input_file() and
- * must be freed with av_free_packet. For video, the packet contains
- * exactly one frame. For audio, it contains an integer number of
- * frames if each frame has a known fixed size (e.g. PCM or ADPCM
- * data). If the audio frames have a variable size (e.g. MPEG audio),
- * then it contains one frame.
- *
- * pkt->pts, pkt->dts and pkt->duration are always set to correct
- * values in AVStream.time_base units (and guessed if the format cannot
- * provide them). pkt->pts can be AV_NOPTS_VALUE if the video format
- * has B-frames, so it is better to rely on pkt->dts if you do not
- * decompress the payload.
- *
- * @return 0 if OK, < 0 on error or end of file
- */
-int av_read_frame(AVFormatContext *s, AVPacket *pkt);
-
-/**
- * Seeks to the keyframe at timestamp.
- * 'timestamp' in 'stream_index'.
- * @param stream_index If stream_index is (-1), a default
- * stream is selected, and timestamp is automatically converted
- * from AV_TIME_BASE units to the stream specific time_base.
- * @param timestamp Timestamp in AVStream.time_base units
- *        or, if no stream is specified, in AV_TIME_BASE units.
- * @param flags flags which select direction and seeking mode
- * @return >= 0 on success
- */
-int av_seek_frame(AVFormatContext *s, int stream_index, int64_t timestamp,
-                  int flags);
-
-/**
- * Seeks to timestamp ts.
- * Seeking will be done so that the point from which all active streams
- * can be presented successfully will be closest to ts and within min/max_ts.
- * Active streams are all streams that have AVStream.discard < AVDISCARD_ALL.
- *
- * If flags contain AVSEEK_FLAG_BYTE, then all timestamps are in bytes and
- * are the file position (this may not be supported by all demuxers).
- * If flags contain AVSEEK_FLAG_FRAME, then all timestamps are in frames
- * in the stream with stream_index (this may not be supported by all demuxers).
- * Otherwise all timestamps are in units of the stream selected by stream_index
- * or if stream_index is -1, in AV_TIME_BASE units.
- * If flags contain AVSEEK_FLAG_ANY, then non-keyframes are treated as
- * keyframes (this may not be supported by all demuxers).
- *
- * @param stream_index index of the stream which is used as time base reference
- * @param min_ts smallest acceptable timestamp
- * @param ts target timestamp
- * @param max_ts largest acceptable timestamp
- * @param flags flags
- * @return >=0 on success, error code otherwise
- *
- * @NOTE This is part of the new seek API which is still under construction.
- *       Thus do not use this yet. It may change at any time, do not expect
- *       ABI compatibility yet!
- */
-int avformat_seek_file(AVFormatContext *s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags);
-
-/**
- * Starts playing a network-based stream (e.g. RTSP stream) at the
- * current position.
- */
-int av_read_play(AVFormatContext *s);
-
-/**
- * Pauses a network-based stream (e.g. RTSP stream).
- *
- * Use av_read_play() to resume it.
- */
-int av_read_pause(AVFormatContext *s);
-
-/**
- * Frees a AVFormatContext allocated by av_open_input_stream.
- * @param s context to free
- */
-void av_close_input_stream(AVFormatContext *s);
-
-/**
- * Closes a media file (but not its codecs).
- *
- * @param s media file handle
- */
-void av_close_input_file(AVFormatContext *s);
-
-/**
- * Adds a new stream to a media file.
- *
- * Can only be called in the read_header() function. If the flag
- * AVFMTCTX_NOHEADER is in the format context, then new streams
- * can be added in read_packet too.
- *
- * @param s media file handle
- * @param id file-format-dependent stream ID
- */
-AVStream *av_new_stream(AVFormatContext *s, int id);
-AVProgram *av_new_program(AVFormatContext *s, int id);
-
-/**
- * Adds a new chapter.
- * This function is NOT part of the public API
- * and should ONLY be used by demuxers.
- *
- * @param s media file handle
- * @param id unique ID for this chapter
- * @param start chapter start time in time_base units
- * @param end chapter end time in time_base units
- * @param title chapter title
- *
- * @return AVChapter or NULL on error
- */
-AVChapter *ff_new_chapter(AVFormatContext *s, int id, AVRational time_base,
-                          int64_t start, int64_t end, const char *title);
-
-/**
- * Sets the pts for a given stream.
- *
- * @param s stream
- * @param pts_wrap_bits number of bits effectively used by the pts
- *        (used for wrap control, 33 is the value for MPEG)
- * @param pts_num numerator to convert to seconds (MPEG: 1)
- * @param pts_den denominator to convert to seconds (MPEG: 90000)
- */
-void av_set_pts_info(AVStream *s, int pts_wrap_bits,
-                     unsigned int pts_num, unsigned int pts_den);
-
-#define AVSEEK_FLAG_BACKWARD 1 ///< seek backward
-#define AVSEEK_FLAG_BYTE     2 ///< seeking based on position in bytes
-#define AVSEEK_FLAG_ANY      4 ///< seek to any frame, even non-keyframes
-#define AVSEEK_FLAG_FRAME    8 ///< seeking based on frame number
-
-int av_find_default_stream_index(AVFormatContext *s);
-
-/**
- * Gets the index for a specific timestamp.
- * @param flags if AVSEEK_FLAG_BACKWARD then the returned index will correspond
- *                 to the timestamp which is <= the requested one, if backward
- *                 is 0, then it will be >=
- *              if AVSEEK_FLAG_ANY seek to any frame, only keyframes otherwise
- * @return < 0 if no such timestamp could be found
- */
-int av_index_search_timestamp(AVStream *st, int64_t timestamp, int flags);
-
-/**
- * Ensures the index uses less memory than the maximum specified in
- * AVFormatContext.max_index_size by discarding entries if it grows
- * too large.
- * This function is not part of the public API and should only be called
- * by demuxers.
- */
-void ff_reduce_index(AVFormatContext *s, int stream_index);
-
-/**
- * Adds an index entry into a sorted list. Updates the entry if the list
- * already contains it.
- *
- * @param timestamp timestamp in the time base of the given stream
- */
-int av_add_index_entry(AVStream *st, int64_t pos, int64_t timestamp,
-                       int size, int distance, int flags);
-
-/**
- * Does a binary search using av_index_search_timestamp() and
- * AVCodec.read_timestamp().
- * This is not supposed to be called directly by a user application,
- * but by demuxers.
- * @param target_ts target timestamp in the time base of the given stream
- * @param stream_index stream number
- */
-int av_seek_frame_binary(AVFormatContext *s, int stream_index,
-                         int64_t target_ts, int flags);
-
-/**
- * Updates cur_dts of all streams based on the given timestamp and AVStream.
- *
- * Stream ref_st unchanged, others set cur_dts in their native time base.
- * Only needed for timestamp wrapping or if (dts not set and pts!=dts).
- * @param timestamp new dts expressed in time_base of param ref_st
- * @param ref_st reference stream giving time_base of param timestamp
- */
-void av_update_cur_dts(AVFormatContext *s, AVStream *ref_st, int64_t timestamp);
-
-/**
- * Does a binary search using read_timestamp().
- * This is not supposed to be called directly by a user application,
- * but by demuxers.
- * @param target_ts target timestamp in the time base of the given stream
- * @param stream_index stream number
- */
-int64_t av_gen_search(AVFormatContext *s, int stream_index,
-                      int64_t target_ts, int64_t pos_min,
-                      int64_t pos_max, int64_t pos_limit,
-                      int64_t ts_min, int64_t ts_max,
-                      int flags, int64_t *ts_ret,
-                      int64_t (*read_timestamp)(struct AVFormatContext *, int , int64_t *, int64_t ));
-
-/** media file output */
-int av_set_parameters(AVFormatContext *s, AVFormatParameters *ap);
-
-/**
- * Allocates the stream private data and writes the stream header to an
- * output media file.
- *
- * @param s media file handle
- * @return 0 if OK, AVERROR_xxx on error
- */
-int av_write_header(AVFormatContext *s);
-
-/**
- * Writes a packet to an output media file.
- *
- * The packet shall contain one audio or video frame.
- * The packet must be correctly interleaved according to the container
- * specification, if not then av_interleaved_write_frame must be used.
- *
- * @param s media file handle
- * @param pkt The packet, which contains the stream_index, buf/buf_size,
-              dts/pts, ...
- * @return < 0 on error, = 0 if OK, 1 if end of stream wanted
- */
-int av_write_frame(AVFormatContext *s, AVPacket *pkt);
-
-/**
- * Writes a packet to an output media file ensuring correct interleaving.
- *
- * The packet must contain one audio or video frame.
- * If the packets are already correctly interleaved, the application should
- * call av_write_frame() instead as it is slightly faster. It is also important
- * to keep in mind that completely non-interleaved input will need huge amounts
- * of memory to interleave with this, so it is preferable to interleave at the
- * demuxer level.
- *
- * @param s media file handle
- * @param pkt The packet, which contains the stream_index, buf/buf_size,
-              dts/pts, ...
- * @return < 0 on error, = 0 if OK, 1 if end of stream wanted
- */
-int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt);
-
-/**
- * Interleaves a packet per dts in an output media file.
- *
- * Packets with pkt->destruct == av_destruct_packet will be freed inside this
- * function, so they cannot be used after it. Note that calling av_free_packet()
- * on them is still safe.
- *
- * @param s media file handle
- * @param out the interleaved packet will be output here
- * @param in the input packet
- * @param flush 1 if no further packets are available as input and all
- *              remaining packets should be output
- * @return 1 if a packet was output, 0 if no packet could be output,
- *         < 0 if an error occurred
- */
-int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out,
-                                 AVPacket *pkt, int flush);
-
-/**
- * Writes the stream trailer to an output media file and frees the
- * file private data.
- *
- * May only be called after a successful call to av_write_header.
- *
- * @param s media file handle
- * @return 0 if OK, AVERROR_xxx on error
- */
-int av_write_trailer(AVFormatContext *s);
-
-void dump_format(AVFormatContext *ic,
-                 int index,
-                 const char *url,
-                 int is_output);
-
-#if LIBAVFORMAT_VERSION_MAJOR < 53
-/**
- * Parses width and height out of string str.
- * @deprecated Use av_parse_video_frame_size instead.
- */
-attribute_deprecated int parse_image_size(int *width_ptr, int *height_ptr,
-                                          const char *str);
-
-/**
- * Converts framerate from a string to a fraction.
- * @deprecated Use av_parse_video_frame_rate instead.
- */
-attribute_deprecated int parse_frame_rate(int *frame_rate, int *frame_rate_base,
-                                          const char *arg);
-#endif
-
-/**
- * Parses datestr and returns a corresponding number of microseconds.
- * @param datestr String representing a date or a duration.
- * - If a date the syntax is:
- * @code
- *  [{YYYY-MM-DD|YYYYMMDD}]{T| }{HH[:MM[:SS[.m...]]][Z]|HH[MM[SS[.m...]]][Z]}
- * @endcode
- * Time is local time unless Z is appended, in which case it is
- * interpreted as UTC.
- * If the year-month-day part is not specified it takes the current
- * year-month-day.
- * Returns the number of microseconds since 1st of January, 1970 up to
- * the time of the parsed date or INT64_MIN if datestr cannot be
- * successfully parsed.
- * - If a duration the syntax is:
- * @code
- *  [-]HH[:MM[:SS[.m...]]]
- *  [-]S+[.m...]
- * @endcode
- * Returns the number of microseconds contained in a time interval
- * with the specified duration or INT64_MIN if datestr cannot be
- * successfully parsed.
- * @param duration Flag which tells how to interpret datestr, if
- * not zero datestr is interpreted as a duration, otherwise as a
- * date.
- */
-int64_t parse_date(const char *datestr, int duration);
-
-/** Gets the current time in microseconds. */
-int64_t av_gettime(void);
-
-/* ffm-specific for ffserver */
-#define FFM_PACKET_SIZE 4096
-int64_t ffm_read_write_index(int fd);
-int ffm_write_write_index(int fd, int64_t pos);
-void ffm_set_write_index(AVFormatContext *s, int64_t pos, int64_t file_size);
-
-/**
- * Attempts to find a specific tag in a URL.
- *
- * syntax: '?tag1=val1&tag2=val2...'. Little URL decoding is done.
- * Return 1 if found.
- */
-int find_info_tag(char *arg, int arg_size, const char *tag1, const char *info);
-
-/**
- * Returns in 'buf' the path with '%d' replaced by a number.
- *
- * Also handles the '%0nd' format where 'n' is the total number
- * of digits and '%%'.
- *
- * @param buf destination buffer
- * @param buf_size destination buffer size
- * @param path numbered sequence string
- * @param number frame number
- * @return 0 if OK, -1 on format error
- */
-int av_get_frame_filename(char *buf, int buf_size,
-                          const char *path, int number);
-
-/**
- * Checks whether filename actually is a numbered sequence generator.
- *
- * @param filename possible numbered sequence string
- * @return 1 if a valid numbered sequence string, 0 otherwise
- */
-int av_filename_number_test(const char *filename);
-
-/**
- * Generates an SDP for an RTP session.
- *
- * @param ac array of AVFormatContexts describing the RTP streams. If the
- *           array is composed by only one context, such context can contain
- *           multiple AVStreams (one AVStream per RTP stream). Otherwise,
- *           all the contexts in the array (an AVCodecContext per RTP stream)
- *           must contain only one AVStream.
- * @param n_files number of AVCodecContexts contained in ac
- * @param buff buffer where the SDP will be stored (must be allocated by
- *             the caller)
- * @param size the size of the buffer
- * @return 0 if OK, AVERROR_xxx on error
- */
-int avf_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size);
-
-/**
- * Returns a positive value if the given filename has one of the given
- * extensions, 0 otherwise.
- *
- * @param extensions a comma-separated list of filename extensions
- */
-int av_match_ext(const char *filename, const char *extensions);
-
-#endif /* AVFORMAT_AVFORMAT_H */
diff --git a/lib-x86-32/include/libavformat/avio.h b/lib-x86-32/include/libavformat/avio.h
deleted file mode 100644
index 9ffe9356..00000000
--- a/lib-x86-32/include/libavformat/avio.h
+++ /dev/null
@@ -1,525 +0,0 @@
-/*
- * copyright (c) 2001 Fabrice Bellard
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-#ifndef AVFORMAT_AVIO_H
-#define AVFORMAT_AVIO_H
-
-/**
- * @file
- * unbuffered I/O operations
- *
- * @warning This file has to be considered an internal but installed
- * header, so it should not be directly included in your projects.
- */
-
-#include <stdint.h>
-
-#include "libavutil/common.h"
-
-/* unbuffered I/O */
-
-/**
- * URL Context.
- * New fields can be added to the end with minor version bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump.
- * sizeof(URLContext) must not be used outside libav*.
- */
-typedef struct URLContext {
-#if LIBAVFORMAT_VERSION_MAJOR >= 53
-    const AVClass *av_class; ///< information for av_log(). Set by url_open().
-#endif
-    struct URLProtocol *prot;
-    int flags;
-    int is_streamed;  /**< true if streamed (no seek possible), default = false */
-    int max_packet_size;  /**< if non zero, the stream is packetized with this max packet size */
-    void *priv_data;
-    char *filename; /**< specified URL */
-} URLContext;
-
-typedef struct URLPollEntry {
-    URLContext *handle;
-    int events;
-    int revents;
-} URLPollEntry;
-
-#define URL_RDONLY 0
-#define URL_WRONLY 1
-#define URL_RDWR   2
-
-typedef int URLInterruptCB(void);
-
-/**
- * Creates an URLContext for accessing to the resource indicated by
- * url, and opens it using the URLProtocol up.
- *
- * @param puc pointer to the location where, in case of success, the
- * function puts the pointer to the created URLContext
- * @param flags flags which control how the resource indicated by url
- * is to be opened
- * @return 0 in case of success, a negative value corresponding to an
- * AVERROR code in case of failure
- */
-int url_open_protocol (URLContext **puc, struct URLProtocol *up,
-                       const char *url, int flags);
-
-/**
- * Creates an URLContext for accessing to the resource indicated by
- * url, and opens it.
- *
- * @param puc pointer to the location where, in case of success, the
- * function puts the pointer to the created URLContext
- * @param flags flags which control how the resource indicated by url
- * is to be opened
- * @return 0 in case of success, a negative value corresponding to an
- * AVERROR code in case of failure
- */
-int url_open(URLContext **h, const char *url, int flags);
-
-/**
- * Reads up to size bytes from the resource accessed by h, and stores
- * the read bytes in buf.
- *
- * @return The number of bytes actually read, or a negative value
- * corresponding to an AVERROR code in case of error. A value of zero
- * indicates that it is not possible to read more from the accessed
- * resource (except if the value of the size argument is also zero).
- */
-int url_read(URLContext *h, unsigned char *buf, int size);
-
-/**
- * Read as many bytes as possible (up to size), calling the
- * read function multiple times if necessary.
- * Will also retry if the read function returns AVERROR(EAGAIN).
- * This makes special short-read handling in applications
- * unnecessary, if the return value is < size then it is
- * certain there was either an error or the end of file was reached.
- */
-int url_read_complete(URLContext *h, unsigned char *buf, int size);
-int url_write(URLContext *h, unsigned char *buf, int size);
-
-/**
- * Changes the position that will be used by the next read/write
- * operation on the resource accessed by h.
- *
- * @param pos specifies the new position to set
- * @param whence specifies how pos should be interpreted, it must be
- * one of SEEK_SET (seek from the beginning), SEEK_CUR (seek from the
- * current position), SEEK_END (seek from the end), or AVSEEK_SIZE
- * (return the filesize of the requested resource, pos is ignored).
- * @return a negative value corresponding to an AVERROR code in case
- * of failure, or the resulting file position, measured in bytes from
- * the beginning of the file. You can use this feature together with
- * SEEK_CUR to read the current file position.
- */
-int64_t url_seek(URLContext *h, int64_t pos, int whence);
-
-/**
- * Closes the resource accessed by the URLContext h, and frees the
- * memory used by it.
- *
- * @return a negative value if an error condition occurred, 0
- * otherwise
- */
-int url_close(URLContext *h);
-
-/**
- * Returns a non-zero value if the resource indicated by url
- * exists, 0 otherwise.
- */
-int url_exist(const char *url);
-
-int64_t url_filesize(URLContext *h);
-
-/**
- * Return the file descriptor associated with this URL. For RTP, this
- * will return only the RTP file descriptor, not the RTCP file descriptor.
- * To get both, use rtp_get_file_handles().
- *
- * @return the file descriptor associated with this URL, or <0 on error.
- */
-int url_get_file_handle(URLContext *h);
-
-/**
- * Return the maximum packet size associated to packetized file
- * handle. If the file is not packetized (stream like HTTP or file on
- * disk), then 0 is returned.
- *
- * @param h file handle
- * @return maximum packet size in bytes
- */
-int url_get_max_packet_size(URLContext *h);
-void url_get_filename(URLContext *h, char *buf, int buf_size);
-
-/**
- * The callback is called in blocking functions to test regulary if
- * asynchronous interruption is needed. AVERROR(EINTR) is returned
- * in this case by the interrupted function. 'NULL' means no interrupt
- * callback is given.
- */
-void url_set_interrupt_cb(URLInterruptCB *interrupt_cb);
-
-/* not implemented */
-int url_poll(URLPollEntry *poll_table, int n, int timeout);
-
-/**
- * Pause and resume playing - only meaningful if using a network streaming
- * protocol (e.g. MMS).
- * @param pause 1 for pause, 0 for resume
- */
-int av_url_read_pause(URLContext *h, int pause);
-
-/**
- * Seek to a given timestamp relative to some component stream.
- * Only meaningful if using a network streaming protocol (e.g. MMS.).
- * @param stream_index The stream index that the timestamp is relative to.
- *        If stream_index is (-1) the timestamp should be in AV_TIME_BASE
- *        units from the beginning of the presentation.
- *        If a stream_index >= 0 is used and the protocol does not support
- *        seeking based on component streams, the call will fail with ENOTSUP.
- * @param timestamp timestamp in AVStream.time_base units
- *        or if there is no stream specified then in AV_TIME_BASE units.
- * @param flags Optional combination of AVSEEK_FLAG_BACKWARD, AVSEEK_FLAG_BYTE
- *        and AVSEEK_FLAG_ANY. The protocol may silently ignore
- *        AVSEEK_FLAG_BACKWARD and AVSEEK_FLAG_ANY, but AVSEEK_FLAG_BYTE will
- *        fail with ENOTSUP if used and not supported.
- * @return >= 0 on success
- * @see AVInputFormat::read_seek
- */
-int64_t av_url_read_seek(URLContext *h, int stream_index,
-                         int64_t timestamp, int flags);
-
-/**
- * Passing this as the "whence" parameter to a seek function causes it to
- * return the filesize without seeking anywhere. Supporting this is optional.
- * If it is not supported then the seek function will return <0.
- */
-#define AVSEEK_SIZE 0x10000
-
-/**
- * Oring this flag as into the "whence" parameter to a seek function causes it to
- * seek by any means (like reopening and linear reading) or other normally unreasonble
- * means that can be extreemly slow.
- * This may be ignored by the seek code.
- */
-#define AVSEEK_FORCE 0x20000
-
-typedef struct URLProtocol {
-    const char *name;
-    int (*url_open)(URLContext *h, const char *url, int flags);
-    int (*url_read)(URLContext *h, unsigned char *buf, int size);
-    int (*url_write)(URLContext *h, unsigned char *buf, int size);
-    int64_t (*url_seek)(URLContext *h, int64_t pos, int whence);
-    int (*url_close)(URLContext *h);
-    struct URLProtocol *next;
-    int (*url_read_pause)(URLContext *h, int pause);
-    int64_t (*url_read_seek)(URLContext *h, int stream_index,
-                             int64_t timestamp, int flags);
-    int (*url_get_file_handle)(URLContext *h);
-} URLProtocol;
-
-#if LIBAVFORMAT_VERSION_MAJOR < 53
-extern URLProtocol *first_protocol;
-#endif
-
-extern URLInterruptCB *url_interrupt_cb;
-
-/**
- * If protocol is NULL, returns the first registered protocol,
- * if protocol is non-NULL, returns the next registered protocol after protocol,
- * or NULL if protocol is the last one.
- */
-URLProtocol *av_protocol_next(URLProtocol *p);
-
-#if LIBAVFORMAT_VERSION_MAJOR < 53
-/**
- * @deprecated Use av_register_protocol() instead.
- */
-attribute_deprecated int register_protocol(URLProtocol *protocol);
-#endif
-
-/**
- * Registers the URLProtocol protocol.
- */
-int av_register_protocol(URLProtocol *protocol);
-
-/**
- * Bytestream IO Context.
- * New fields can be added to the end with minor version bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump.
- * sizeof(ByteIOContext) must not be used outside libav*.
- */
-typedef struct {
-    unsigned char *buffer;
-    int buffer_size;
-    unsigned char *buf_ptr, *buf_end;
-    void *opaque;
-    int (*read_packet)(void *opaque, uint8_t *buf, int buf_size);
-    int (*write_packet)(void *opaque, uint8_t *buf, int buf_size);
-    int64_t (*seek)(void *opaque, int64_t offset, int whence);
-    int64_t pos; /**< position in the file of the current buffer */
-    int must_flush; /**< true if the next seek should flush */
-    int eof_reached; /**< true if eof reached */
-    int write_flag;  /**< true if open for writing */
-    int is_streamed;
-    int max_packet_size;
-    unsigned long checksum;
-    unsigned char *checksum_ptr;
-    unsigned long (*update_checksum)(unsigned long checksum, const uint8_t *buf, unsigned int size);
-    int error;         ///< contains the error code or 0 if no error happened
-    int (*read_pause)(void *opaque, int pause);
-    int64_t (*read_seek)(void *opaque, int stream_index,
-                         int64_t timestamp, int flags);
-} ByteIOContext;
-
-int init_put_byte(ByteIOContext *s,
-                  unsigned char *buffer,
-                  int buffer_size,
-                  int write_flag,
-                  void *opaque,
-                  int (*read_packet)(void *opaque, uint8_t *buf, int buf_size),
-                  int (*write_packet)(void *opaque, uint8_t *buf, int buf_size),
-                  int64_t (*seek)(void *opaque, int64_t offset, int whence));
-ByteIOContext *av_alloc_put_byte(
-                  unsigned char *buffer,
-                  int buffer_size,
-                  int write_flag,
-                  void *opaque,
-                  int (*read_packet)(void *opaque, uint8_t *buf, int buf_size),
-                  int (*write_packet)(void *opaque, uint8_t *buf, int buf_size),
-                  int64_t (*seek)(void *opaque, int64_t offset, int whence));
-
-void put_byte(ByteIOContext *s, int b);
-void put_buffer(ByteIOContext *s, const unsigned char *buf, int size);
-void put_le64(ByteIOContext *s, uint64_t val);
-void put_be64(ByteIOContext *s, uint64_t val);
-void put_le32(ByteIOContext *s, unsigned int val);
-void put_be32(ByteIOContext *s, unsigned int val);
-void put_le24(ByteIOContext *s, unsigned int val);
-void put_be24(ByteIOContext *s, unsigned int val);
-void put_le16(ByteIOContext *s, unsigned int val);
-void put_be16(ByteIOContext *s, unsigned int val);
-void put_tag(ByteIOContext *s, const char *tag);
-
-void put_strz(ByteIOContext *s, const char *buf);
-
-/**
- * fseek() equivalent for ByteIOContext.
- * @return new position or AVERROR.
- */
-int64_t url_fseek(ByteIOContext *s, int64_t offset, int whence);
-
-/**
- * Skip given number of bytes forward.
- * @param offset number of bytes
- */
-void url_fskip(ByteIOContext *s, int64_t offset);
-
-/**
- * ftell() equivalent for ByteIOContext.
- * @return position or AVERROR.
- */
-int64_t url_ftell(ByteIOContext *s);
-
-/**
- * Gets the filesize.
- * @return filesize or AVERROR
- */
-int64_t url_fsize(ByteIOContext *s);
-
-/**
- * feof() equivalent for ByteIOContext.
- * @return non zero if and only if end of file
- */
-int url_feof(ByteIOContext *s);
-
-int url_ferror(ByteIOContext *s);
-
-int av_url_read_fpause(ByteIOContext *h, int pause);
-int64_t av_url_read_fseek(ByteIOContext *h, int stream_index,
-                          int64_t timestamp, int flags);
-
-#define URL_EOF (-1)
-/** @note return URL_EOF (-1) if EOF */
-int url_fgetc(ByteIOContext *s);
-
-/** @warning currently size is limited */
-#ifdef __GNUC__
-int url_fprintf(ByteIOContext *s, const char *fmt, ...) __attribute__ ((__format__ (__printf__, 2, 3)));
-#else
-int url_fprintf(ByteIOContext *s, const char *fmt, ...);
-#endif
-
-/** @note unlike fgets, the EOL character is not returned and a whole
-    line is parsed. return NULL if first char read was EOF */
-char *url_fgets(ByteIOContext *s, char *buf, int buf_size);
-
-void put_flush_packet(ByteIOContext *s);
-
-
-/**
- * Reads size bytes from ByteIOContext into buf.
- * @return number of bytes read or AVERROR
- */
-int get_buffer(ByteIOContext *s, unsigned char *buf, int size);
-
-/**
- * Reads size bytes from ByteIOContext into buf.
- * This reads at most 1 packet. If that is not enough fewer bytes will be
- * returned.
- * @return number of bytes read or AVERROR
- */
-int get_partial_buffer(ByteIOContext *s, unsigned char *buf, int size);
-
-/** @note return 0 if EOF, so you cannot use it if EOF handling is
-    necessary */
-int get_byte(ByteIOContext *s);
-unsigned int get_le24(ByteIOContext *s);
-unsigned int get_le32(ByteIOContext *s);
-uint64_t get_le64(ByteIOContext *s);
-unsigned int get_le16(ByteIOContext *s);
-
-char *get_strz(ByteIOContext *s, char *buf, int maxlen);
-unsigned int get_be16(ByteIOContext *s);
-unsigned int get_be24(ByteIOContext *s);
-unsigned int get_be32(ByteIOContext *s);
-uint64_t get_be64(ByteIOContext *s);
-
-uint64_t ff_get_v(ByteIOContext *bc);
-
-static inline int url_is_streamed(ByteIOContext *s)
-{
-    return s->is_streamed;
-}
-
-/**
- * Creates and initializes a ByteIOContext for accessing the
- * resource referenced by the URLContext h.
- * @note When the URLContext h has been opened in read+write mode, the
- * ByteIOContext can be used only for writing.
- *
- * @param s Used to return the pointer to the created ByteIOContext.
- * In case of failure the pointed to value is set to NULL.
- * @return 0 in case of success, a negative value corresponding to an
- * AVERROR code in case of failure
- */
-int url_fdopen(ByteIOContext **s, URLContext *h);
-
-/** @warning must be called before any I/O */
-int url_setbufsize(ByteIOContext *s, int buf_size);
-#if LIBAVFORMAT_VERSION_MAJOR < 53
-/** Reset the buffer for reading or writing.
- * @note Will drop any data currently in the buffer without transmitting it.
- * @param flags URL_RDONLY to set up the buffer for reading, or URL_WRONLY
- *        to set up the buffer for writing. */
-int url_resetbuf(ByteIOContext *s, int flags);
-#endif
-
-/**
- * Rewinds the ByteIOContext using the specified buffer containing the first buf_size bytes of the file.
- * Used after probing to avoid seeking.
- * Joins buf and s->buffer, taking any overlap into consideration.
- * @note s->buffer must overlap with buf or they can't be joined and the function fails
- * @note This function is NOT part of the public API
- *
- * @param s The read-only ByteIOContext to rewind
- * @param buf The probe buffer containing the first buf_size bytes of the file
- * @param buf_size The size of buf
- * @return 0 in case of success, a negative value corresponding to an
- * AVERROR code in case of failure
- */
-int ff_rewind_with_probe_data(ByteIOContext *s, unsigned char *buf, int buf_size);
-
-/**
- * Creates and initializes a ByteIOContext for accessing the
- * resource indicated by url.
- * @note When the resource indicated by url has been opened in
- * read+write mode, the ByteIOContext can be used only for writing.
- *
- * @param s Used to return the pointer to the created ByteIOContext.
- * In case of failure the pointed to value is set to NULL.
- * @param flags flags which control how the resource indicated by url
- * is to be opened
- * @return 0 in case of success, a negative value corresponding to an
- * AVERROR code in case of failure
- */
-int url_fopen(ByteIOContext **s, const char *url, int flags);
-
-int url_fclose(ByteIOContext *s);
-URLContext *url_fileno(ByteIOContext *s);
-
-/**
- * Return the maximum packet size associated to packetized buffered file
- * handle. If the file is not packetized (stream like http or file on
- * disk), then 0 is returned.
- *
- * @param s buffered file handle
- * @return maximum packet size in bytes
- */
-int url_fget_max_packet_size(ByteIOContext *s);
-
-int url_open_buf(ByteIOContext **s, uint8_t *buf, int buf_size, int flags);
-
-/** return the written or read size */
-int url_close_buf(ByteIOContext *s);
-
-/**
- * Open a write only memory stream.
- *
- * @param s new IO context
- * @return zero if no error.
- */
-int url_open_dyn_buf(ByteIOContext **s);
-
-/**
- * Open a write only packetized memory stream with a maximum packet
- * size of 'max_packet_size'.  The stream is stored in a memory buffer
- * with a big endian 4 byte header giving the packet size in bytes.
- *
- * @param s new IO context
- * @param max_packet_size maximum packet size (must be > 0)
- * @return zero if no error.
- */
-int url_open_dyn_packet_buf(ByteIOContext **s, int max_packet_size);
-
-/**
- * Return the written size and a pointer to the buffer. The buffer
- *  must be freed with av_free().
- * @param s IO context
- * @param pbuffer pointer to a byte buffer
- * @return the length of the byte buffer
- */
-int url_close_dyn_buf(ByteIOContext *s, uint8_t **pbuffer);
-
-unsigned long ff_crc04C11DB7_update(unsigned long checksum, const uint8_t *buf,
-                                    unsigned int len);
-unsigned long get_checksum(ByteIOContext *s);
-void init_checksum(ByteIOContext *s,
-                   unsigned long (*update_checksum)(unsigned long c, const uint8_t *p, unsigned int len),
-                   unsigned long checksum);
-
-/* udp.c */
-int udp_set_remote_url(URLContext *h, const char *uri);
-int udp_get_local_port(URLContext *h);
-#if (LIBAVFORMAT_VERSION_MAJOR <= 52)
-int udp_get_file_handle(URLContext *h);
-#endif
-
-#endif /* AVFORMAT_AVIO_H */
diff --git a/lib-x86-32/include/libavutil/adler32.h b/lib-x86-32/include/libavutil/adler32.h
deleted file mode 100644
index 9626c805..00000000
--- a/lib-x86-32/include/libavutil/adler32.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * copyright (c) 2006 Mans Rullgard
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_ADLER32_H
-#define AVUTIL_ADLER32_H
-
-#include <stdint.h>
-#include "attributes.h"
-
-unsigned long av_adler32_update(unsigned long adler, const uint8_t *buf,
-                                unsigned int len) av_pure;
-
-#endif /* AVUTIL_ADLER32_H */
diff --git a/lib-x86-32/include/libavutil/attributes.h b/lib-x86-32/include/libavutil/attributes.h
deleted file mode 100644
index da45234c..00000000
--- a/lib-x86-32/include/libavutil/attributes.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * Macro definitions for various function/variable attributes
- */
-
-#ifndef AVUTIL_ATTRIBUTES_H
-#define AVUTIL_ATTRIBUTES_H
-
-#ifdef __GNUC__
-#    define AV_GCC_VERSION_AT_LEAST(x,y) (__GNUC__ > x || __GNUC__ == x && __GNUC_MINOR__ >= y)
-#else
-#    define AV_GCC_VERSION_AT_LEAST(x,y) 0
-#endif
-
-#ifndef av_always_inline
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-#    define av_always_inline __attribute__((always_inline)) inline
-#else
-#    define av_always_inline inline
-#endif
-#endif
-
-#ifndef av_noinline
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-#    define av_noinline __attribute__((noinline))
-#else
-#    define av_noinline
-#endif
-#endif
-
-#ifndef av_pure
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-#    define av_pure __attribute__((pure))
-#else
-#    define av_pure
-#endif
-#endif
-
-#ifndef av_const
-#if AV_GCC_VERSION_AT_LEAST(2,6)
-#    define av_const __attribute__((const))
-#else
-#    define av_const
-#endif
-#endif
-
-#ifndef av_cold
-#if (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(4,3)
-#    define av_cold __attribute__((cold))
-#else
-#    define av_cold
-#endif
-#endif
-
-#ifndef av_flatten
-#if (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(4,1)
-#    define av_flatten __attribute__((flatten))
-#else
-#    define av_flatten
-#endif
-#endif
-
-#ifndef attribute_deprecated
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-#    define attribute_deprecated __attribute__((deprecated))
-#else
-#    define attribute_deprecated
-#endif
-#endif
-
-#ifndef av_unused
-#if defined(__GNUC__)
-#    define av_unused __attribute__((unused))
-#else
-#    define av_unused
-#endif
-#endif
-
-#ifndef av_uninit
-#if defined(__GNUC__) && !defined(__ICC)
-#    define av_uninit(x) x=x
-#else
-#    define av_uninit(x) x
-#endif
-#endif
-
-#ifdef __GNUC__
-#    define av_builtin_constant_p __builtin_constant_p
-#else
-#    define av_builtin_constant_p(x) 0
-#endif
-
-#endif /* AVUTIL_ATTRIBUTES_H */
diff --git a/lib-x86-32/include/libavutil/avconfig.h b/lib-x86-32/include/libavutil/avconfig.h
deleted file mode 100644
index b028bb4f..00000000
--- a/lib-x86-32/include/libavutil/avconfig.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* Generated by ffconf */
-#ifndef AVUTIL_AVCONFIG_H
-#define AVUTIL_AVCONFIG_H
-#define AV_HAVE_BIGENDIAN 0
-#endif /* AVUTIL_AVCONFIG_H */
diff --git a/lib-x86-32/include/libavutil/avstring.h b/lib-x86-32/include/libavutil/avstring.h
deleted file mode 100644
index 01c2391b..00000000
--- a/lib-x86-32/include/libavutil/avstring.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 2007 Mans Rullgard
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_AVSTRING_H
-#define AVUTIL_AVSTRING_H
-
-#include <stddef.h>
-
-/**
- * Return non-zero if pfx is a prefix of str. If it is, *ptr is set to
- * the address of the first character in str after the prefix.
- *
- * @param str input string
- * @param pfx prefix to test
- * @param ptr updated if the prefix is matched inside str
- * @return non-zero if the prefix matches, zero otherwise
- */
-int av_strstart(const char *str, const char *pfx, const char **ptr);
-
-/**
- * Return non-zero if pfx is a prefix of str independent of case. If
- * it is, *ptr is set to the address of the first character in str
- * after the prefix.
- *
- * @param str input string
- * @param pfx prefix to test
- * @param ptr updated if the prefix is matched inside str
- * @return non-zero if the prefix matches, zero otherwise
- */
-int av_stristart(const char *str, const char *pfx, const char **ptr);
-
-/**
- * Locate the first case-independent occurrence in the string haystack
- * of the string needle.  A zero-length string needle is considered to
- * match at the start of haystack.
- *
- * This function is a case-insensitive version of the standard strstr().
- *
- * @param haystack string to search in
- * @param needle   string to search for
- * @return         pointer to the located match within haystack
- *                 or a null pointer if no match
- */
-char *av_stristr(const char *haystack, const char *needle);
-
-/**
- * Copy the string src to dst, but no more than size - 1 bytes, and
- * null-terminate dst.
- *
- * This function is the same as BSD strlcpy().
- *
- * @param dst destination buffer
- * @param src source string
- * @param size size of destination buffer
- * @return the length of src
- *
- * WARNING: since the return value is the length of src, src absolutely
- * _must_ be a properly 0-terminated string, otherwise this will read beyond
- * the end of the buffer and possibly crash.
- */
-size_t av_strlcpy(char *dst, const char *src, size_t size);
-
-/**
- * Append the string src to the string dst, but to a total length of
- * no more than size - 1 bytes, and null-terminate dst.
- *
- * This function is similar to BSD strlcat(), but differs when
- * size <= strlen(dst).
- *
- * @param dst destination buffer
- * @param src source string
- * @param size size of destination buffer
- * @return the total length of src and dst
- *
- * WARNING: since the return value use the length of src and dst, these absolutely
- * _must_ be a properly 0-terminated strings, otherwise this will read beyond
- * the end of the buffer and possibly crash.
- */
-size_t av_strlcat(char *dst, const char *src, size_t size);
-
-/**
- * Append output to a string, according to a format. Never write out of
- * the destination buffer, and always put a terminating 0 within
- * the buffer.
- * @param dst destination buffer (string to which the output is
- *  appended)
- * @param size total size of the destination buffer
- * @param fmt printf-compatible format string, specifying how the
- *  following parameters are used
- * @return the length of the string that would have been generated
- *  if enough space had been available
- */
-size_t av_strlcatf(char *dst, size_t size, const char *fmt, ...);
-
-/**
- * Convert a number to a av_malloced string.
- */
-char *av_d2str(double d);
-
-#endif /* AVUTIL_AVSTRING_H */
diff --git a/lib-x86-32/include/libavutil/avutil.h b/lib-x86-32/include/libavutil/avutil.h
deleted file mode 100644
index e9e07b92..00000000
--- a/lib-x86-32/include/libavutil/avutil.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_AVUTIL_H
-#define AVUTIL_AVUTIL_H
-
-/**
- * @file
- * external API header
- */
-
-
-#define AV_STRINGIFY(s)         AV_TOSTRING(s)
-#define AV_TOSTRING(s) #s
-
-#define AV_GLUE(a, b) a ## b
-#define AV_JOIN(a, b) AV_GLUE(a, b)
-
-#define AV_PRAGMA(s) _Pragma(#s)
-
-#define AV_VERSION_INT(a, b, c) (a<<16 | b<<8 | c)
-#define AV_VERSION_DOT(a, b, c) a ##.## b ##.## c
-#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
-
-#define LIBAVUTIL_VERSION_MAJOR 50
-#define LIBAVUTIL_VERSION_MINOR 15
-#define LIBAVUTIL_VERSION_MICRO  1
-
-#define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
-                                               LIBAVUTIL_VERSION_MINOR, \
-                                               LIBAVUTIL_VERSION_MICRO)
-#define LIBAVUTIL_VERSION       AV_VERSION(LIBAVUTIL_VERSION_MAJOR,     \
-                                           LIBAVUTIL_VERSION_MINOR,     \
-                                           LIBAVUTIL_VERSION_MICRO)
-#define LIBAVUTIL_BUILD         LIBAVUTIL_VERSION_INT
-
-#define LIBAVUTIL_IDENT         "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
-
-/**
- * Returns the LIBAVUTIL_VERSION_INT constant.
- */
-unsigned avutil_version(void);
-
-/**
- * Returns the libavutil build-time configuration.
- */
-const char *avutil_configuration(void);
-
-/**
- * Returns the libavutil license.
- */
-const char *avutil_license(void);
-
-enum AVMediaType {
-    AVMEDIA_TYPE_UNKNOWN = -1,
-    AVMEDIA_TYPE_VIDEO,
-    AVMEDIA_TYPE_AUDIO,
-    AVMEDIA_TYPE_DATA,
-    AVMEDIA_TYPE_SUBTITLE,
-    AVMEDIA_TYPE_ATTACHMENT,
-    AVMEDIA_TYPE_NB
-};
-
-#include "common.h"
-#include "error.h"
-#include "mathematics.h"
-#include "rational.h"
-#include "intfloat_readwrite.h"
-#include "log.h"
-#include "pixfmt.h"
-
-#endif /* AVUTIL_AVUTIL_H */
diff --git a/lib-x86-32/include/libavutil/base64.h b/lib-x86-32/include/libavutil/base64.h
deleted file mode 100644
index 103860ef..00000000
--- a/lib-x86-32/include/libavutil/base64.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2006 Ryan Martell. (rdm4@martellventures.com)
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_BASE64_H
-#define AVUTIL_BASE64_H
-
-#include <stdint.h>
-
-/**
- * Decodes the base64-encoded string in in and puts the decoded
- * data in out.
- *
- * @param out_size size in bytes of the out buffer, it should be at
- * least 3/4 of the length of in
- * @return the number of bytes written, or a negative value in case of
- * error
- */
-int av_base64_decode(uint8_t *out, const char *in, int out_size);
-
-/**
- * Encodes in base64 the data in in and puts the resulting string
- * in out.
- *
- * @param out_size size in bytes of the out string, it should be at
- * least ((in_size + 2) / 3) * 4 + 1
- * @param in_size size in bytes of the in buffer
- * @return the string containing the encoded data, or NULL in case of
- * error
- */
-char *av_base64_encode(char *out, int out_size, const uint8_t *in, int in_size);
-
-#endif /* AVUTIL_BASE64_H */
diff --git a/lib-x86-32/include/libavutil/common.h b/lib-x86-32/include/libavutil/common.h
deleted file mode 100644
index 4aa00a99..00000000
--- a/lib-x86-32/include/libavutil/common.h
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * common internal and external API header
- */
-
-#ifndef AVUTIL_COMMON_H
-#define AVUTIL_COMMON_H
-
-#include <ctype.h>
-#include <errno.h>
-#include <inttypes.h>
-#include <limits.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "attributes.h"
-
-//rounded division & shift
-#define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b))
-/* assume b>0 */
-#define ROUNDED_DIV(a,b) (((a)>0 ? (a) + ((b)>>1) : (a) - ((b)>>1))/(b))
-#define FFABS(a) ((a) >= 0 ? (a) : (-(a)))
-#define FFSIGN(a) ((a) > 0 ? 1 : -1)
-
-#define FFMAX(a,b) ((a) > (b) ? (a) : (b))
-#define FFMAX3(a,b,c) FFMAX(FFMAX(a,b),c)
-#define FFMIN(a,b) ((a) > (b) ? (b) : (a))
-#define FFMIN3(a,b,c) FFMIN(FFMIN(a,b),c)
-
-#define FFSWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0)
-#define FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0]))
-#define FFALIGN(x, a) (((x)+(a)-1)&~((a)-1))
-
-/* misc math functions */
-extern const uint8_t ff_log2_tab[256];
-
-extern const uint8_t av_reverse[256];
-
-static inline av_const int av_log2_c(unsigned int v)
-{
-    int n = 0;
-    if (v & 0xffff0000) {
-        v >>= 16;
-        n += 16;
-    }
-    if (v & 0xff00) {
-        v >>= 8;
-        n += 8;
-    }
-    n += ff_log2_tab[v];
-
-    return n;
-}
-
-static inline av_const int av_log2_16bit_c(unsigned int v)
-{
-    int n = 0;
-    if (v & 0xff00) {
-        v >>= 8;
-        n += 8;
-    }
-    n += ff_log2_tab[v];
-
-    return n;
-}
-
-#ifdef HAVE_AV_CONFIG_H
-#   include "config.h"
-#   include "intmath.h"
-#endif
-
-#ifndef av_log2
-#   define av_log2       av_log2_c
-#endif
-#ifndef av_log2_16bit
-#   define av_log2_16bit av_log2_16bit_c
-#endif
-
-/**
- * Clips a signed integer value into the amin-amax range.
- * @param a value to clip
- * @param amin minimum value of the clip range
- * @param amax maximum value of the clip range
- * @return clipped value
- */
-static inline av_const int av_clip(int a, int amin, int amax)
-{
-    if      (a < amin) return amin;
-    else if (a > amax) return amax;
-    else               return a;
-}
-
-/**
- * Clips a signed integer value into the 0-255 range.
- * @param a value to clip
- * @return clipped value
- */
-static inline av_const uint8_t av_clip_uint8(int a)
-{
-    if (a&(~0xFF)) return (-a)>>31;
-    else           return a;
-}
-
-/**
- * Clips a signed integer value into the 0-65535 range.
- * @param a value to clip
- * @return clipped value
- */
-static inline av_const uint16_t av_clip_uint16(int a)
-{
-    if (a&(~0xFFFF)) return (-a)>>31;
-    else             return a;
-}
-
-/**
- * Clips a signed integer value into the -32768,32767 range.
- * @param a value to clip
- * @return clipped value
- */
-static inline av_const int16_t av_clip_int16(int a)
-{
-    if ((a+0x8000) & ~0xFFFF) return (a>>31) ^ 0x7FFF;
-    else                      return a;
-}
-
-/**
- * Clips a signed 64-bit integer value into the -2147483648,2147483647 range.
- * @param a value to clip
- * @return clipped value
- */
-static inline av_const int32_t av_clipl_int32(int64_t a)
-{
-    if ((a+0x80000000u) & ~UINT64_C(0xFFFFFFFF)) return (a>>63) ^ 0x7FFFFFFF;
-    else                                         return a;
-}
-
-/**
- * Clips a float value into the amin-amax range.
- * @param a value to clip
- * @param amin minimum value of the clip range
- * @param amax maximum value of the clip range
- * @return clipped value
- */
-static inline av_const float av_clipf(float a, float amin, float amax)
-{
-    if      (a < amin) return amin;
-    else if (a > amax) return amax;
-    else               return a;
-}
-
-/** Computes ceil(log2(x)).
- * @param x value used to compute ceil(log2(x))
- * @return computed ceiling of log2(x)
- */
-static inline av_const int av_ceil_log2(int x)
-{
-    return av_log2((x - 1) << 1);
-}
-
-#define MKTAG(a,b,c,d) (a | (b << 8) | (c << 16) | (d << 24))
-#define MKBETAG(a,b,c,d) (d | (c << 8) | (b << 16) | (a << 24))
-
-/*!
- * \def GET_UTF8(val, GET_BYTE, ERROR)
- * Converts a UTF-8 character (up to 4 bytes long) to its 32-bit UCS-4 encoded form
- * \param val is the output and should be of type uint32_t. It holds the converted
- * UCS-4 character and should be a left value.
- * \param GET_BYTE gets UTF-8 encoded bytes from any proper source. It can be
- * a function or a statement whose return value or evaluated value is of type
- * uint8_t. It will be executed up to 4 times for values in the valid UTF-8 range,
- * and up to 7 times in the general case.
- * \param ERROR action that should be taken when an invalid UTF-8 byte is returned
- * from GET_BYTE. It should be a statement that jumps out of the macro,
- * like exit(), goto, return, break, or continue.
- */
-#define GET_UTF8(val, GET_BYTE, ERROR)\
-    val= GET_BYTE;\
-    {\
-        int ones= 7 - av_log2(val ^ 255);\
-        if(ones==1)\
-            ERROR\
-        val&= 127>>ones;\
-        while(--ones > 0){\
-            int tmp= GET_BYTE - 128;\
-            if(tmp>>6)\
-                ERROR\
-            val= (val<<6) + tmp;\
-        }\
-    }
-
-/*!
- * \def GET_UTF16(val, GET_16BIT, ERROR)
- * Converts a UTF-16 character (2 or 4 bytes) to its 32-bit UCS-4 encoded form
- * \param val is the output and should be of type uint32_t. It holds the converted
- * UCS-4 character and should be a left value.
- * \param GET_16BIT gets two bytes of UTF-16 encoded data converted to native endianness.
- * It can be a function or a statement whose return value or evaluated value is of type
- * uint16_t. It will be executed up to 2 times.
- * \param ERROR action that should be taken when an invalid UTF-16 surrogate is
- * returned from GET_BYTE. It should be a statement that jumps out of the macro,
- * like exit(), goto, return, break, or continue.
- */
-#define GET_UTF16(val, GET_16BIT, ERROR)\
-    val = GET_16BIT;\
-    {\
-        unsigned int hi = val - 0xD800;\
-        if (hi < 0x800) {\
-            val = GET_16BIT - 0xDC00;\
-            if (val > 0x3FFU || hi > 0x3FFU)\
-                ERROR\
-            val += (hi<<10) + 0x10000;\
-        }\
-    }\
-
-/*!
- * \def PUT_UTF8(val, tmp, PUT_BYTE)
- * Converts a 32-bit Unicode character to its UTF-8 encoded form (up to 4 bytes long).
- * \param val is an input-only argument and should be of type uint32_t. It holds
- * a UCS-4 encoded Unicode character that is to be converted to UTF-8. If
- * val is given as a function it is executed only once.
- * \param tmp is a temporary variable and should be of type uint8_t. It
- * represents an intermediate value during conversion that is to be
- * output by PUT_BYTE.
- * \param PUT_BYTE writes the converted UTF-8 bytes to any proper destination.
- * It could be a function or a statement, and uses tmp as the input byte.
- * For example, PUT_BYTE could be "*output++ = tmp;" PUT_BYTE will be
- * executed up to 4 times for values in the valid UTF-8 range and up to
- * 7 times in the general case, depending on the length of the converted
- * Unicode character.
- */
-#define PUT_UTF8(val, tmp, PUT_BYTE)\
-    {\
-        int bytes, shift;\
-        uint32_t in = val;\
-        if (in < 0x80) {\
-            tmp = in;\
-            PUT_BYTE\
-        } else {\
-            bytes = (av_log2(in) + 4) / 5;\
-            shift = (bytes - 1) * 6;\
-            tmp = (256 - (256 >> bytes)) | (in >> shift);\
-            PUT_BYTE\
-            while (shift >= 6) {\
-                shift -= 6;\
-                tmp = 0x80 | ((in >> shift) & 0x3f);\
-                PUT_BYTE\
-            }\
-        }\
-    }
-
-/*!
- * \def PUT_UTF16(val, tmp, PUT_16BIT)
- * Converts a 32-bit Unicode character to its UTF-16 encoded form (2 or 4 bytes).
- * \param val is an input-only argument and should be of type uint32_t. It holds
- * a UCS-4 encoded Unicode character that is to be converted to UTF-16. If
- * val is given as a function it is executed only once.
- * \param tmp is a temporary variable and should be of type uint16_t. It
- * represents an intermediate value during conversion that is to be
- * output by PUT_16BIT.
- * \param PUT_16BIT writes the converted UTF-16 data to any proper destination
- * in desired endianness. It could be a function or a statement, and uses tmp
- * as the input byte.  For example, PUT_BYTE could be "*output++ = tmp;"
- * PUT_BYTE will be executed 1 or 2 times depending on input character.
- */
-#define PUT_UTF16(val, tmp, PUT_16BIT)\
-    {\
-        uint32_t in = val;\
-        if (in < 0x10000) {\
-            tmp = in;\
-            PUT_16BIT\
-        } else {\
-            tmp = 0xD800 | ((in - 0x10000) >> 10);\
-            PUT_16BIT\
-            tmp = 0xDC00 | ((in - 0x10000) & 0x3FF);\
-            PUT_16BIT\
-        }\
-    }\
-
-
-
-#include "mem.h"
-
-#ifdef HAVE_AV_CONFIG_H
-#    include "internal.h"
-#endif /* HAVE_AV_CONFIG_H */
-
-#endif /* AVUTIL_COMMON_H */
diff --git a/lib-x86-32/include/libavutil/crc.h b/lib-x86-32/include/libavutil/crc.h
deleted file mode 100644
index 6c0baab5..00000000
--- a/lib-x86-32/include/libavutil/crc.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_CRC_H
-#define AVUTIL_CRC_H
-
-#include <stdint.h>
-#include <stddef.h>
-#include "attributes.h"
-
-typedef uint32_t AVCRC;
-
-typedef enum {
-    AV_CRC_8_ATM,
-    AV_CRC_16_ANSI,
-    AV_CRC_16_CCITT,
-    AV_CRC_32_IEEE,
-    AV_CRC_32_IEEE_LE,  /*< reversed bitorder version of AV_CRC_32_IEEE */
-    AV_CRC_MAX,         /*< Not part of public API! Do not use outside libavutil. */
-}AVCRCId;
-
-int av_crc_init(AVCRC *ctx, int le, int bits, uint32_t poly, int ctx_size);
-const AVCRC *av_crc_get_table(AVCRCId crc_id);
-uint32_t av_crc(const AVCRC *ctx, uint32_t start_crc, const uint8_t *buffer, size_t length) av_pure;
-
-#endif /* AVUTIL_CRC_H */
-
diff --git a/lib-x86-32/include/libavutil/error.h b/lib-x86-32/include/libavutil/error.h
deleted file mode 100644
index 13a9a359..00000000
--- a/lib-x86-32/include/libavutil/error.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * error code definitions
- */
-
-#ifndef AVUTIL_ERROR_H
-#define AVUTIL_ERROR_H
-
-#include <errno.h>
-#include "avutil.h"
-
-/* error handling */
-#if EDOM > 0
-#define AVERROR(e) (-(e))   ///< Returns a negative error code from a POSIX error code, to return from library functions.
-#define AVUNERROR(e) (-(e)) ///< Returns a POSIX error code from a library function error return value.
-#else
-/* Some platforms have E* and errno already negated. */
-#define AVERROR(e) (e)
-#define AVUNERROR(e) (e)
-#endif
-
-#if LIBAVUTIL_VERSION_MAJOR < 51
-#define AVERROR_INVALIDDATA AVERROR(EINVAL)  ///< Invalid data found when processing input
-#define AVERROR_IO          AVERROR(EIO)     ///< I/O error
-#define AVERROR_NOENT       AVERROR(ENOENT)  ///< No such file or directory
-#define AVERROR_NOFMT       AVERROR(EILSEQ)  ///< Unknown format
-#define AVERROR_NOMEM       AVERROR(ENOMEM)  ///< Not enough memory
-#define AVERROR_NOTSUPP     AVERROR(ENOSYS)  ///< Operation not supported
-#define AVERROR_NUMEXPECTED AVERROR(EDOM)    ///< Number syntax expected in filename
-#define AVERROR_UNKNOWN     AVERROR(EINVAL)  ///< Unknown error
-#endif
-
-#define AVERROR_EOF         AVERROR(EPIPE)   ///< End of file
-
-#define AVERROR_PATCHWELCOME    (-MKTAG('P','A','W','E')) ///< Not yet implemented in FFmpeg, patches welcome
-
-#if LIBAVUTIL_VERSION_MAJOR > 50
-#define AVERROR_INVALIDDATA     (-MKTAG('I','N','D','A')) ///< Invalid data found when processing input
-#define AVERROR_NUMEXPECTED     (-MKTAG('N','U','E','X')) ///< Number syntax expected in filename
-#endif
-
-/**
- * Puts a description of the AVERROR code errnum in errbuf.
- * In case of failure the global variable errno is set to indicate the
- * error. Even in case of failure av_strerror() will print a generic
- * error message indicating the errnum provided to errbuf.
- *
- * @param errbuf_size the size in bytes of errbuf
- * @return 0 on success, a negative value if a description for errnum
- * cannot be found
- */
-int av_strerror(int errnum, char *errbuf, size_t errbuf_size);
-
-#endif /* AVUTIL_ERROR_H */
diff --git a/lib-x86-32/include/libavutil/fifo.h b/lib-x86-32/include/libavutil/fifo.h
deleted file mode 100644
index fb1ed47f..00000000
--- a/lib-x86-32/include/libavutil/fifo.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * a very simple circular buffer FIFO implementation
- */
-
-#ifndef AVUTIL_FIFO_H
-#define AVUTIL_FIFO_H
-
-#include <stdint.h>
-
-typedef struct AVFifoBuffer {
-    uint8_t *buffer;
-    uint8_t *rptr, *wptr, *end;
-    uint32_t rndx, wndx;
-} AVFifoBuffer;
-
-/**
- * Initializes an AVFifoBuffer.
- * @param size of FIFO
- * @return AVFifoBuffer or NULL in case of memory allocation failure
- */
-AVFifoBuffer *av_fifo_alloc(unsigned int size);
-
-/**
- * Frees an AVFifoBuffer.
- * @param *f AVFifoBuffer to free
- */
-void av_fifo_free(AVFifoBuffer *f);
-
-/**
- * Resets the AVFifoBuffer to the state right after av_fifo_alloc, in particular it is emptied.
- * @param *f AVFifoBuffer to reset
- */
-void av_fifo_reset(AVFifoBuffer *f);
-
-/**
- * Returns the amount of data in bytes in the AVFifoBuffer, that is the
- * amount of data you can read from it.
- * @param *f AVFifoBuffer to read from
- * @return size
- */
-int av_fifo_size(AVFifoBuffer *f);
-
-/**
- * Returns the amount of space in bytes in the AVFifoBuffer, that is the
- * amount of data you can write into it.
- * @param *f AVFifoBuffer to write into
- * @return size
- */
-int av_fifo_space(AVFifoBuffer *f);
-
-/**
- * Feeds data from an AVFifoBuffer to a user-supplied callback.
- * @param *f AVFifoBuffer to read from
- * @param buf_size number of bytes to read
- * @param *func generic read function
- * @param *dest data destination
- */
-int av_fifo_generic_read(AVFifoBuffer *f, void *dest, int buf_size, void (*func)(void*, void*, int));
-
-/**
- * Feeds data from a user-supplied callback to an AVFifoBuffer.
- * @param *f AVFifoBuffer to write to
- * @param *src data source; non-const since it may be used as a
- * modifiable context by the function defined in func
- * @param size number of bytes to write
- * @param *func generic write function; the first parameter is src,
- * the second is dest_buf, the third is dest_buf_size.
- * func must return the number of bytes written to dest_buf, or <= 0 to
- * indicate no more data available to write.
- * If func is NULL, src is interpreted as a simple byte array for source data.
- * @return the number of bytes written to the FIFO
- */
-int av_fifo_generic_write(AVFifoBuffer *f, void *src, int size, int (*func)(void*, void*, int));
-
-/**
- * Resizes an AVFifoBuffer.
- * @param *f AVFifoBuffer to resize
- * @param size new AVFifoBuffer size in bytes
- * @return <0 for failure, >=0 otherwise
- */
-int av_fifo_realloc2(AVFifoBuffer *f, unsigned int size);
-
-/**
- * Reads and discards the specified amount of data from an AVFifoBuffer.
- * @param *f AVFifoBuffer to read from
- * @param size amount of data to read in bytes
- */
-void av_fifo_drain(AVFifoBuffer *f, int size);
-
-static inline uint8_t av_fifo_peek(AVFifoBuffer *f, int offs)
-{
-    uint8_t *ptr = f->rptr + offs;
-    if (ptr >= f->end)
-        ptr -= f->end - f->buffer;
-    return *ptr;
-}
-#endif /* AVUTIL_FIFO_H */
diff --git a/lib-x86-32/include/libavutil/intfloat_readwrite.h b/lib-x86-32/include/libavutil/intfloat_readwrite.h
deleted file mode 100644
index 1b80fc6e..00000000
--- a/lib-x86-32/include/libavutil/intfloat_readwrite.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_INTFLOAT_READWRITE_H
-#define AVUTIL_INTFLOAT_READWRITE_H
-
-#include <stdint.h>
-#include "attributes.h"
-
-/* IEEE 80 bits extended float */
-typedef struct AVExtFloat  {
-    uint8_t exponent[2];
-    uint8_t mantissa[8];
-} AVExtFloat;
-
-double av_int2dbl(int64_t v) av_const;
-float av_int2flt(int32_t v) av_const;
-double av_ext2dbl(const AVExtFloat ext) av_const;
-int64_t av_dbl2int(double d) av_const;
-int32_t av_flt2int(float d) av_const;
-AVExtFloat av_dbl2ext(double d) av_const;
-
-#endif /* AVUTIL_INTFLOAT_READWRITE_H */
diff --git a/lib-x86-32/include/libavutil/log.h b/lib-x86-32/include/libavutil/log.h
deleted file mode 100644
index 1c3e4901..00000000
--- a/lib-x86-32/include/libavutil/log.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_LOG_H
-#define AVUTIL_LOG_H
-
-#include <stdarg.h>
-#include "avutil.h"
-
-/**
- * Describes the class of an AVClass context structure. That is an
- * arbitrary struct of which the first field is a pointer to an
- * AVClass struct (e.g. AVCodecContext, AVFormatContext etc.).
- */
-typedef struct {
-    /**
-     * The name of the class; usually it is the same name as the
-     * context structure type to which the AVClass is associated.
-     */
-    const char* class_name;
-
-    /**
-     * A pointer to a function which returns the name of a context
-     * instance ctx associated with the class.
-     */
-    const char* (*item_name)(void* ctx);
-
-    /**
-     * a pointer to the first option specified in the class if any or NULL
-     *
-     * @see av_set_default_options()
-     */
-    const struct AVOption *option;
-
-    /**
-     * LIBAVUTIL_VERSION with which this structure was created.
-     * This is used to allow fields to be added without requiring major
-     * version bumps everywhere.
-     */
-
-    int version;
-} AVClass;
-
-/* av_log API */
-
-#define AV_LOG_QUIET    -8
-
-/**
- * Something went really wrong and we will crash now.
- */
-#define AV_LOG_PANIC     0
-
-/**
- * Something went wrong and recovery is not possible.
- * For example, no header was found for a format which depends
- * on headers or an illegal combination of parameters is used.
- */
-#define AV_LOG_FATAL     8
-
-/**
- * Something went wrong and cannot losslessly be recovered.
- * However, not all future data is affected.
- */
-#define AV_LOG_ERROR    16
-
-/**
- * Something somehow does not look correct. This may or may not
- * lead to problems. An example would be the use of '-vstrict -2'.
- */
-#define AV_LOG_WARNING  24
-
-#define AV_LOG_INFO     32
-#define AV_LOG_VERBOSE  40
-
-/**
- * Stuff which is only useful for libav* developers.
- */
-#define AV_LOG_DEBUG    48
-
-/**
- * Sends the specified message to the log if the level is less than or equal
- * to the current av_log_level. By default, all logging messages are sent to
- * stderr. This behavior can be altered by setting a different av_vlog callback
- * function.
- *
- * @param avcl A pointer to an arbitrary struct of which the first field is a
- * pointer to an AVClass struct.
- * @param level The importance level of the message, lower values signifying
- * higher importance.
- * @param fmt The format string (printf-compatible) that specifies how
- * subsequent arguments are converted to output.
- * @see av_vlog
- */
-#ifdef __GNUC__
-void av_log(void*, int level, const char *fmt, ...) __attribute__ ((__format__ (__printf__, 3, 4)));
-#else
-void av_log(void*, int level, const char *fmt, ...);
-#endif
-
-void av_vlog(void*, int level, const char *fmt, va_list);
-int av_log_get_level(void);
-void av_log_set_level(int);
-void av_log_set_callback(void (*)(void*, int, const char*, va_list));
-void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl);
-
-#endif /* AVUTIL_LOG_H */
diff --git a/lib-x86-32/include/libavutil/lzo.h b/lib-x86-32/include/libavutil/lzo.h
deleted file mode 100644
index 6788054b..00000000
--- a/lib-x86-32/include/libavutil/lzo.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * LZO 1x decompression
- * copyright (c) 2006 Reimar Doeffinger
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_LZO_H
-#define AVUTIL_LZO_H
-
-#include <stdint.h>
-
-/** \defgroup errflags Error flags returned by av_lzo1x_decode
-  * \{ */
-//! end of the input buffer reached before decoding finished
-#define AV_LZO_INPUT_DEPLETED 1
-//! decoded data did not fit into output buffer
-#define AV_LZO_OUTPUT_FULL 2
-//! a reference to previously decoded data was wrong
-#define AV_LZO_INVALID_BACKPTR 4
-//! a non-specific error in the compressed bitstream
-#define AV_LZO_ERROR 8
-/** \} */
-
-#define AV_LZO_INPUT_PADDING 8
-#define AV_LZO_OUTPUT_PADDING 12
-
-/**
- * \brief Decodes LZO 1x compressed data.
- * \param out output buffer
- * \param outlen size of output buffer, number of bytes left are returned here
- * \param in input buffer
- * \param inlen size of input buffer, number of bytes left are returned here
- * \return 0 on success, otherwise a combination of the error flags above
- *
- * Make sure all buffers are appropriately padded, in must provide
- * AV_LZO_INPUT_PADDING, out must provide AV_LZO_OUTPUT_PADDING additional bytes.
- */
-int av_lzo1x_decode(void *out, int *outlen, const void *in, int *inlen);
-
-/**
- * \brief deliberately overlapping memcpy implementation
- * \param dst destination buffer; must be padded with 12 additional bytes
- * \param back how many bytes back we start (the initial size of the overlapping window)
- * \param cnt number of bytes to copy, must be >= 0
- *
- * cnt > back is valid, this will copy the bytes we just copied,
- * thus creating a repeating pattern with a period length of back.
- */
-void av_memcpy_backptr(uint8_t *dst, int back, int cnt);
-
-#endif /* AVUTIL_LZO_H */
diff --git a/lib-x86-32/include/libavutil/mathematics.h b/lib-x86-32/include/libavutil/mathematics.h
deleted file mode 100644
index e198aef8..00000000
--- a/lib-x86-32/include/libavutil/mathematics.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_MATHEMATICS_H
-#define AVUTIL_MATHEMATICS_H
-
-#include <stdint.h>
-#include <math.h>
-#include "attributes.h"
-#include "rational.h"
-
-#ifndef M_E
-#define M_E            2.7182818284590452354   /* e */
-#endif
-#ifndef M_LN2
-#define M_LN2          0.69314718055994530942  /* log_e 2 */
-#endif
-#ifndef M_LN10
-#define M_LN10         2.30258509299404568402  /* log_e 10 */
-#endif
-#ifndef M_LOG2_10
-#define M_LOG2_10      3.32192809488736234787  /* log_2 10 */
-#endif
-#ifndef M_PI
-#define M_PI           3.14159265358979323846  /* pi */
-#endif
-#ifndef M_SQRT1_2
-#define M_SQRT1_2      0.70710678118654752440  /* 1/sqrt(2) */
-#endif
-#ifndef M_SQRT2
-#define M_SQRT2        1.41421356237309504880  /* sqrt(2) */
-#endif
-#ifndef NAN
-#define NAN            (0.0/0.0)
-#endif
-#ifndef INFINITY
-#define INFINITY       (1.0/0.0)
-#endif
-
-enum AVRounding {
-    AV_ROUND_ZERO     = 0, ///< Round toward zero.
-    AV_ROUND_INF      = 1, ///< Round away from zero.
-    AV_ROUND_DOWN     = 2, ///< Round toward -infinity.
-    AV_ROUND_UP       = 3, ///< Round toward +infinity.
-    AV_ROUND_NEAR_INF = 5, ///< Round to nearest and halfway cases away from zero.
-};
-
-/**
- * Returns the greatest common divisor of a and b.
- * If both a and b are 0 or either or both are <0 then behavior is
- * undefined.
- */
-int64_t av_const av_gcd(int64_t a, int64_t b);
-
-/**
- * Rescales a 64-bit integer with rounding to nearest.
- * A simple a*b/c isn't possible as it can overflow.
- */
-int64_t av_rescale(int64_t a, int64_t b, int64_t c) av_const;
-
-/**
- * Rescales a 64-bit integer with specified rounding.
- * A simple a*b/c isn't possible as it can overflow.
- */
-int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum AVRounding) av_const;
-
-/**
- * Rescales a 64-bit integer by 2 rational numbers.
- */
-int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq) av_const;
-
-/**
- * Compares 2 timestamps each in its own timebases.
- * The result of the function is undefined if one of the timestamps
- * is outside the int64_t range when represented in the others timebase.
- * @return -1 if ts_a is before ts_b, 1 if ts_a is after ts_b or 0 if they represent the same position
- */
-int av_compare_ts(int64_t ts_a, AVRational tb_a, int64_t ts_b, AVRational tb_b);
-
-
-#endif /* AVUTIL_MATHEMATICS_H */
diff --git a/lib-x86-32/include/libavutil/md5.h b/lib-x86-32/include/libavutil/md5.h
deleted file mode 100644
index 969202a8..00000000
--- a/lib-x86-32/include/libavutil/md5.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_MD5_H
-#define AVUTIL_MD5_H
-
-#include <stdint.h>
-
-extern const int av_md5_size;
-
-struct AVMD5;
-
-void av_md5_init(struct AVMD5 *ctx);
-void av_md5_update(struct AVMD5 *ctx, const uint8_t *src, const int len);
-void av_md5_final(struct AVMD5 *ctx, uint8_t *dst);
-void av_md5_sum(uint8_t *dst, const uint8_t *src, const int len);
-
-#endif /* AVUTIL_MD5_H */
-
diff --git a/lib-x86-32/include/libavutil/mem.h b/lib-x86-32/include/libavutil/mem.h
deleted file mode 100644
index 14887927..00000000
--- a/lib-x86-32/include/libavutil/mem.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * memory handling functions
- */
-
-#ifndef AVUTIL_MEM_H
-#define AVUTIL_MEM_H
-
-#include "attributes.h"
-
-#if defined(__ICC) || defined(__SUNPRO_C)
-    #define DECLARE_ALIGNED(n,t,v)      t __attribute__ ((aligned (n))) v
-    #define DECLARE_ASM_CONST(n,t,v)    const t __attribute__ ((aligned (n))) v
-#elif defined(__TI_COMPILER_VERSION__)
-    #define DECLARE_ALIGNED(n,t,v)                      \
-        AV_PRAGMA(DATA_ALIGN(v,n))                      \
-        t __attribute__((aligned(n))) v
-    #define DECLARE_ASM_CONST(n,t,v)                    \
-        AV_PRAGMA(DATA_ALIGN(v,n))                      \
-        static const t __attribute__((aligned(n))) v
-#elif defined(__GNUC__)
-    #define DECLARE_ALIGNED(n,t,v)      t __attribute__ ((aligned (n))) v
-    #define DECLARE_ASM_CONST(n,t,v)    static const t attribute_used __attribute__ ((aligned (n))) v
-#elif defined(_MSC_VER)
-    #define DECLARE_ALIGNED(n,t,v)      __declspec(align(n)) t v
-    #define DECLARE_ASM_CONST(n,t,v)    __declspec(align(n)) static const t v
-#else
-    #define DECLARE_ALIGNED(n,t,v)      t v
-    #define DECLARE_ASM_CONST(n,t,v)    static const t v
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-    #define av_malloc_attrib __attribute__((__malloc__))
-#else
-    #define av_malloc_attrib
-#endif
-
-#if (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(4,3)
-    #define av_alloc_size(n) __attribute__((alloc_size(n)))
-#else
-    #define av_alloc_size(n)
-#endif
-
-/**
- * Allocates a block of size bytes with alignment suitable for all
- * memory accesses (including vectors if available on the CPU).
- * @param size Size in bytes for the memory block to be allocated.
- * @return Pointer to the allocated block, NULL if the block cannot
- * be allocated.
- * @see av_mallocz()
- */
-void *av_malloc(unsigned int size) av_malloc_attrib av_alloc_size(1);
-
-/**
- * Allocates or reallocates a block of memory.
- * If ptr is NULL and size > 0, allocates a new block. If
- * size is zero, frees the memory block pointed to by ptr.
- * @param size Size in bytes for the memory block to be allocated or
- * reallocated.
- * @param ptr Pointer to a memory block already allocated with
- * av_malloc(z)() or av_realloc() or NULL.
- * @return Pointer to a newly reallocated block or NULL if the block
- * cannot be reallocated or the function is used to free the memory block.
- * @see av_fast_realloc()
- */
-void *av_realloc(void *ptr, unsigned int size) av_alloc_size(2);
-
-/**
- * Frees a memory block which has been allocated with av_malloc(z)() or
- * av_realloc().
- * @param ptr Pointer to the memory block which should be freed.
- * @note ptr = NULL is explicitly allowed.
- * @note It is recommended that you use av_freep() instead.
- * @see av_freep()
- */
-void av_free(void *ptr);
-
-/**
- * Allocates a block of size bytes with alignment suitable for all
- * memory accesses (including vectors if available on the CPU) and
- * zeroes all the bytes of the block.
- * @param size Size in bytes for the memory block to be allocated.
- * @return Pointer to the allocated block, NULL if it cannot be allocated.
- * @see av_malloc()
- */
-void *av_mallocz(unsigned int size) av_malloc_attrib av_alloc_size(1);
-
-/**
- * Duplicates the string s.
- * @param s string to be duplicated
- * @return Pointer to a newly allocated string containing a
- * copy of s or NULL if the string cannot be allocated.
- */
-char *av_strdup(const char *s) av_malloc_attrib;
-
-/**
- * Frees a memory block which has been allocated with av_malloc(z)() or
- * av_realloc() and set the pointer pointing to it to NULL.
- * @param ptr Pointer to the pointer to the memory block which should
- * be freed.
- * @see av_free()
- */
-void av_freep(void *ptr);
-
-#endif /* AVUTIL_MEM_H */
diff --git a/lib-x86-32/include/libavutil/pixdesc.h b/lib-x86-32/include/libavutil/pixdesc.h
deleted file mode 100644
index 8e4c85d7..00000000
--- a/lib-x86-32/include/libavutil/pixdesc.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * pixel format descriptor
- * Copyright (c) 2009 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_PIXDESC_H
-#define AVUTIL_PIXDESC_H
-
-#include <inttypes.h>
-
-typedef struct AVComponentDescriptor{
-    uint16_t plane        :2;            ///< which of the 4 planes contains the component
-
-    /**
-     * Number of elements between 2 horizontally consecutive pixels minus 1.
-     * Elements are bits for bitstream formats, bytes otherwise.
-     */
-    uint16_t step_minus1  :3;
-
-    /**
-     * Number of elements before the component of the first pixel plus 1.
-     * Elements are bits for bitstream formats, bytes otherwise.
-     */
-    uint16_t offset_plus1 :3;
-    uint16_t shift        :3;            ///< number of least significant bits that must be shifted away to get the value
-    uint16_t depth_minus1 :4;            ///< number of bits in the component minus 1
-}AVComponentDescriptor;
-
-/**
- * Descriptor that unambiguously describes how the bits of a pixel are
- * stored in the up to 4 data planes of an image. It also stores the
- * subsampling factors and number of components.
- *
- * @note This is separate of the colorspace (RGB, YCbCr, YPbPr, JPEG-style YUV
- *       and all the YUV variants) AVPixFmtDescriptor just stores how values
- *       are stored not what these values represent.
- */
-typedef struct AVPixFmtDescriptor{
-    const char *name;
-    uint8_t nb_components;      ///< The number of components each pixel has, (1-4)
-
-    /**
-     * Amount to shift the luma width right to find the chroma width.
-     * For YV12 this is 1 for example.
-     * chroma_width = -((-luma_width) >> log2_chroma_w)
-     * The note above is needed to ensure rounding up.
-     * This value only refers to the chroma components.
-     */
-    uint8_t log2_chroma_w;      ///< chroma_width = -((-luma_width )>>log2_chroma_w)
-
-    /**
-     * Amount to shift the luma height right to find the chroma height.
-     * For YV12 this is 1 for example.
-     * chroma_height= -((-luma_height) >> log2_chroma_h)
-     * The note above is needed to ensure rounding up.
-     * This value only refers to the chroma components.
-     */
-    uint8_t log2_chroma_h;
-    uint8_t flags;
-
-    /**
-     * Parameters that describe how pixels are packed. If the format
-     * has chroma components, they must be stored in comp[1] and
-     * comp[2].
-     */
-    AVComponentDescriptor comp[4];
-}AVPixFmtDescriptor;
-
-#define PIX_FMT_BE        1 ///< Pixel format is big-endian.
-#define PIX_FMT_PAL       2 ///< Pixel format has a palette in data[1], values are indexes in this palette.
-#define PIX_FMT_BITSTREAM 4 ///< All values of a component are bit-wise packed end to end.
-#define PIX_FMT_HWACCEL   8 ///< Pixel format is an HW accelerated format.
-
-/**
- * The array of all the pixel format descriptors.
- */
-extern const AVPixFmtDescriptor av_pix_fmt_descriptors[];
-
-/**
- * Reads a line from an image, and writes the values of the
- * pixel format component c to dst.
- *
- * @param data the array containing the pointers to the planes of the image
- * @param linesizes the array containing the linesizes of the image
- * @param desc the pixel format descriptor for the image
- * @param x the horizontal coordinate of the first pixel to read
- * @param y the vertical coordinate of the first pixel to read
- * @param w the width of the line to read, that is the number of
- * values to write to dst
- * @param read_pal_component if not zero and the format is a paletted
- * format writes the values corresponding to the palette
- * component c in data[1] to dst, rather than the palette indexes in
- * data[0]. The behavior is undefined if the format is not paletted.
- */
-void read_line(uint16_t *dst, const uint8_t *data[4], const int linesize[4],
-               const AVPixFmtDescriptor *desc, int x, int y, int c, int w, int read_pal_component);
-
-/**
- * Writes the values from src to the pixel format component c of an
- * image line.
- *
- * @param src array containing the values to write
- * @param data the array containing the pointers to the planes of the
- * image to write into. It is supposed to be zeroed.
- * @param linesizes the array containing the linesizes of the image
- * @param desc the pixel format descriptor for the image
- * @param x the horizontal coordinate of the first pixel to write
- * @param y the vertical coordinate of the first pixel to write
- * @param w the width of the line to write, that is the number of
- * values to write to the image line
- */
-void write_line(const uint16_t *src, uint8_t *data[4], const int linesize[4],
-                const AVPixFmtDescriptor *desc, int x, int y, int c, int w);
-
-/**
- * Returns the pixel format corresponding to name.
- *
- * If there is no pixel format with name name, then looks for a
- * pixel format with the name corresponding to the native endian
- * format of name.
- * For example in a little-endian system, first looks for "gray16",
- * then for "gray16le".
- *
- * Finally if no pixel format has been found, returns PIX_FMT_NONE.
- */
-enum PixelFormat av_get_pix_fmt(const char *name);
-
-/**
- * Returns the number of bits per pixel used by the pixel format
- * described by pixdesc.
- *
- * The returned number of bits refers to the number of bits actually
- * used for storing the pixel information, that is padding bits are
- * not counted.
- */
-int av_get_bits_per_pixel(const AVPixFmtDescriptor *pixdesc);
-
-#endif /* AVUTIL_PIXDESC_H */
diff --git a/lib-x86-32/include/libavutil/pixfmt.h b/lib-x86-32/include/libavutil/pixfmt.h
deleted file mode 100644
index d976f343..00000000
--- a/lib-x86-32/include/libavutil/pixfmt.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_PIXFMT_H
-#define AVUTIL_PIXFMT_H
-
-/**
- * @file
- * pixel format definitions
- *
- * @warning This file has to be considered an internal but installed
- * header, so it should not be directly included in your projects.
- */
-
-#include "libavutil/avconfig.h"
-
-/**
- * Pixel format. Notes:
- *
- * PIX_FMT_RGB32 is handled in an endian-specific manner. An RGBA
- * color is put together as:
- *  (A << 24) | (R << 16) | (G << 8) | B
- * This is stored as BGRA on little-endian CPU architectures and ARGB on
- * big-endian CPUs.
- *
- * When the pixel format is palettized RGB (PIX_FMT_PAL8), the palettized
- * image data is stored in AVFrame.data[0]. The palette is transported in
- * AVFrame.data[1], is 1024 bytes long (256 4-byte entries) and is
- * formatted the same as in PIX_FMT_RGB32 described above (i.e., it is
- * also endian-specific). Note also that the individual RGB palette
- * components stored in AVFrame.data[1] should be in the range 0..255.
- * This is important as many custom PAL8 video codecs that were designed
- * to run on the IBM VGA graphics adapter use 6-bit palette components.
- *
- * For all the 8bit per pixel formats, an RGB32 palette is in data[1] like
- * for pal8. This palette is filled in automatically by the function
- * allocating the picture.
- *
- * Note, make sure that all newly added big endian formats have pix_fmt&1==1
- *       and that all newly added little endian formats have pix_fmt&1==0
- *       this allows simpler detection of big vs little endian.
- */
-enum PixelFormat {
-    PIX_FMT_NONE= -1,
-    PIX_FMT_YUV420P,   ///< planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y samples)
-    PIX_FMT_YUYV422,   ///< packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr
-    PIX_FMT_RGB24,     ///< packed RGB 8:8:8, 24bpp, RGBRGB...
-    PIX_FMT_BGR24,     ///< packed RGB 8:8:8, 24bpp, BGRBGR...
-    PIX_FMT_YUV422P,   ///< planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
-    PIX_FMT_YUV444P,   ///< planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y samples)
-    PIX_FMT_YUV410P,   ///< planar YUV 4:1:0,  9bpp, (1 Cr & Cb sample per 4x4 Y samples)
-    PIX_FMT_YUV411P,   ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples)
-    PIX_FMT_GRAY8,     ///<        Y        ,  8bpp
-    PIX_FMT_MONOWHITE, ///<        Y        ,  1bpp, 0 is white, 1 is black, in each byte pixels are ordered from the msb to the lsb
-    PIX_FMT_MONOBLACK, ///<        Y        ,  1bpp, 0 is black, 1 is white, in each byte pixels are ordered from the msb to the lsb
-    PIX_FMT_PAL8,      ///< 8 bit with PIX_FMT_RGB32 palette
-    PIX_FMT_YUVJ420P,  ///< planar YUV 4:2:0, 12bpp, full scale (JPEG)
-    PIX_FMT_YUVJ422P,  ///< planar YUV 4:2:2, 16bpp, full scale (JPEG)
-    PIX_FMT_YUVJ444P,  ///< planar YUV 4:4:4, 24bpp, full scale (JPEG)
-    PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing
-    PIX_FMT_XVMC_MPEG2_IDCT,
-    PIX_FMT_UYVY422,   ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
-    PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
-    PIX_FMT_BGR8,      ///< packed RGB 3:3:2,  8bpp, (msb)2B 3G 3R(lsb)
-    PIX_FMT_BGR4,      ///< packed RGB 1:2:1 bitstream,  4bpp, (msb)1B 2G 1R(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
-    PIX_FMT_BGR4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1B 2G 1R(lsb)
-    PIX_FMT_RGB8,      ///< packed RGB 3:3:2,  8bpp, (msb)2R 3G 3B(lsb)
-    PIX_FMT_RGB4,      ///< packed RGB 1:2:1 bitstream,  4bpp, (msb)1R 2G 1B(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
-    PIX_FMT_RGB4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1R 2G 1B(lsb)
-    PIX_FMT_NV12,      ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 plane for the UV components, which are interleaved (first byte U and the following byte V)
-    PIX_FMT_NV21,      ///< as above, but U and V bytes are swapped
-
-    PIX_FMT_ARGB,      ///< packed ARGB 8:8:8:8, 32bpp, ARGBARGB...
-    PIX_FMT_RGBA,      ///< packed RGBA 8:8:8:8, 32bpp, RGBARGBA...
-    PIX_FMT_ABGR,      ///< packed ABGR 8:8:8:8, 32bpp, ABGRABGR...
-    PIX_FMT_BGRA,      ///< packed BGRA 8:8:8:8, 32bpp, BGRABGRA...
-
-    PIX_FMT_GRAY16BE,  ///<        Y        , 16bpp, big-endian
-    PIX_FMT_GRAY16LE,  ///<        Y        , 16bpp, little-endian
-    PIX_FMT_YUV440P,   ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
-    PIX_FMT_YUVJ440P,  ///< planar YUV 4:4:0 full scale (JPEG)
-    PIX_FMT_YUVA420P,  ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples)
-    PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_RGB48BE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian
-    PIX_FMT_RGB48LE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian
-
-    PIX_FMT_RGB565BE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), big-endian
-    PIX_FMT_RGB565LE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), little-endian
-    PIX_FMT_RGB555BE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), big-endian, most significant bit to 0
-    PIX_FMT_RGB555LE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), little-endian, most significant bit to 0
-
-    PIX_FMT_BGR565BE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), big-endian
-    PIX_FMT_BGR565LE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), little-endian
-    PIX_FMT_BGR555BE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), big-endian, most significant bit to 1
-    PIX_FMT_BGR555LE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), little-endian, most significant bit to 1
-
-    PIX_FMT_VAAPI_MOCO, ///< HW acceleration through VA API at motion compensation entry-point, Picture.data[3] contains a vaapi_render_state struct which contains macroblocks as well as various fields extracted from headers
-    PIX_FMT_VAAPI_IDCT, ///< HW acceleration through VA API at IDCT entry-point, Picture.data[3] contains a vaapi_render_state struct which contains fields extracted from headers
-    PIX_FMT_VAAPI_VLD,  ///< HW decoding through VA API, Picture.data[3] contains a vaapi_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-
-    PIX_FMT_YUV420P16LE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    PIX_FMT_YUV420P16BE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    PIX_FMT_YUV422P16LE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    PIX_FMT_YUV422P16BE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    PIX_FMT_YUV444P16LE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    PIX_FMT_YUV444P16BE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-    PIX_FMT_VDPAU_MPEG4,  ///< MPEG4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_DXVA2_VLD,    ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer
-
-    PIX_FMT_RGB444BE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), big-endian, most significant bits to 0
-    PIX_FMT_RGB444LE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), little-endian, most significant bits to 0
-    PIX_FMT_BGR444BE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), big-endian, most significant bits to 1
-    PIX_FMT_BGR444LE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), little-endian, most significant bits to 1
-    PIX_FMT_Y400A,     ///< 8bit gray, 8bit alpha
-    PIX_FMT_NB,        ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
-};
-
-#if AV_HAVE_BIGENDIAN
-#   define PIX_FMT_NE(be, le) PIX_FMT_##be
-#else
-#   define PIX_FMT_NE(be, le) PIX_FMT_##le
-#endif
-
-#define PIX_FMT_RGB32   PIX_FMT_NE(ARGB, BGRA)
-#define PIX_FMT_RGB32_1 PIX_FMT_NE(RGBA, ABGR)
-#define PIX_FMT_BGR32   PIX_FMT_NE(ABGR, RGBA)
-#define PIX_FMT_BGR32_1 PIX_FMT_NE(BGRA, ARGB)
-
-#define PIX_FMT_GRAY16 PIX_FMT_NE(GRAY16BE, GRAY16LE)
-#define PIX_FMT_RGB48  PIX_FMT_NE(RGB48BE,  RGB48LE)
-#define PIX_FMT_RGB565 PIX_FMT_NE(RGB565BE, RGB565LE)
-#define PIX_FMT_RGB555 PIX_FMT_NE(RGB555BE, RGB555LE)
-#define PIX_FMT_RGB444 PIX_FMT_NE(RGB444BE, RGB444LE)
-#define PIX_FMT_BGR565 PIX_FMT_NE(BGR565BE, BGR565LE)
-#define PIX_FMT_BGR555 PIX_FMT_NE(BGR555BE, BGR555LE)
-#define PIX_FMT_BGR444 PIX_FMT_NE(BGR444BE, BGR444LE)
-
-#define PIX_FMT_YUV420P16 PIX_FMT_NE(YUV420P16BE, YUV420P16LE)
-#define PIX_FMT_YUV422P16 PIX_FMT_NE(YUV422P16BE, YUV422P16LE)
-#define PIX_FMT_YUV444P16 PIX_FMT_NE(YUV444P16BE, YUV444P16LE)
-
-#endif /* AVUTIL_PIXFMT_H */
diff --git a/lib-x86-32/include/libavutil/rational.h b/lib-x86-32/include/libavutil/rational.h
deleted file mode 100644
index 4d91f7ba..00000000
--- a/lib-x86-32/include/libavutil/rational.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * rational numbers
- * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * rational numbers
- * @author Michael Niedermayer <michaelni@gmx.at>
- */
-
-#ifndef AVUTIL_RATIONAL_H
-#define AVUTIL_RATIONAL_H
-
-#include <stdint.h>
-#include "attributes.h"
-
-/**
- * rational number numerator/denominator
- */
-typedef struct AVRational{
-    int num; ///< numerator
-    int den; ///< denominator
-} AVRational;
-
-/**
- * Compares two rationals.
- * @param a first rational
- * @param b second rational
- * @return 0 if a==b, 1 if a>b and -1 if a<b
- */
-static inline int av_cmp_q(AVRational a, AVRational b){
-    const int64_t tmp= a.num * (int64_t)b.den - b.num * (int64_t)a.den;
-
-    if(tmp) return (tmp>>63)|1;
-    else    return 0;
-}
-
-/**
- * Converts rational to double.
- * @param a rational to convert
- * @return (double) a
- */
-static inline double av_q2d(AVRational a){
-    return a.num / (double) a.den;
-}
-
-/**
- * Reduces a fraction.
- * This is useful for framerate calculations.
- * @param dst_num destination numerator
- * @param dst_den destination denominator
- * @param num source numerator
- * @param den source denominator
- * @param max the maximum allowed for dst_num & dst_den
- * @return 1 if exact, 0 otherwise
- */
-int av_reduce(int *dst_num, int *dst_den, int64_t num, int64_t den, int64_t max);
-
-/**
- * Multiplies two rationals.
- * @param b first rational
- * @param c second rational
- * @return b*c
- */
-AVRational av_mul_q(AVRational b, AVRational c) av_const;
-
-/**
- * Divides one rational by another.
- * @param b first rational
- * @param c second rational
- * @return b/c
- */
-AVRational av_div_q(AVRational b, AVRational c) av_const;
-
-/**
- * Adds two rationals.
- * @param b first rational
- * @param c second rational
- * @return b+c
- */
-AVRational av_add_q(AVRational b, AVRational c) av_const;
-
-/**
- * Subtracts one rational from another.
- * @param b first rational
- * @param c second rational
- * @return b-c
- */
-AVRational av_sub_q(AVRational b, AVRational c) av_const;
-
-/**
- * Converts a double precision floating point number to a rational.
- * @param d double to convert
- * @param max the maximum allowed numerator and denominator
- * @return (AVRational) d
- */
-AVRational av_d2q(double d, int max) av_const;
-
-/**
- * @return 1 if q1 is nearer to q than q2, -1 if q2 is nearer
- * than q1, 0 if they have the same distance.
- */
-int av_nearer_q(AVRational q, AVRational q1, AVRational q2);
-
-/**
- * Finds the nearest value in q_list to q.
- * @param q_list an array of rationals terminated by {0, 0}
- * @return the index of the nearest value found in the array
- */
-int av_find_nearest_q_idx(AVRational q, const AVRational* q_list);
-
-#endif /* AVUTIL_RATIONAL_H */
diff --git a/lib-x86-32/include/libavutil/sha1.h b/lib-x86-32/include/libavutil/sha1.h
deleted file mode 100644
index cf7c4a65..00000000
--- a/lib-x86-32/include/libavutil/sha1.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2007 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_SHA1_H
-#define AVUTIL_SHA1_H
-
-#include <stdint.h>
-
-extern const int av_sha1_size;
-
-struct AVSHA1;
-
-/**
- * Initializes SHA-1 hashing.
- *
- * @param context pointer to the function context (of size av_sha_size)
- * @deprecated use av_sha_init() instead
- */
-void av_sha1_init(struct AVSHA1* context);
-
-/**
- * Updates hash value.
- *
- * @param context hash function context
- * @param data    input data to update hash with
- * @param len     input data length
- * @deprecated use av_sha_update() instead
- */
-void av_sha1_update(struct AVSHA1* context, const uint8_t* data, unsigned int len);
-
-/**
- * Finishes hashing and output digest value.
- *
- * @param context hash function context
- * @param digest  buffer where output digest value is stored
- * @deprecated use av_sha_final() instead
- */
-void av_sha1_final(struct AVSHA1* context, uint8_t digest[20]);
-
-#endif /* AVUTIL_SHA1_H */
diff --git a/lib-x86-32/include/mad.h b/lib-x86-32/include/mad.h
deleted file mode 100644
index 9ef6cc8f..00000000
--- a/lib-x86-32/include/mad.h
+++ /dev/null
@@ -1,964 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, 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 of the License, 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
- *
- * If you would like to negotiate alternate licensing terms, you may do
- * so by contacting: Underbit Technologies, Inc. <info@underbit.com>
- */
-
-# ifdef __cplusplus
-extern "C" {
-# endif
-
-# define FPM_INTEL
-
-
-
-# define SIZEOF_INT 4
-# define SIZEOF_LONG 4
-# define SIZEOF_LONG_LONG 8
-
-
-/* Id: version.h,v 1.26 2004/01/23 09:41:33 rob Exp */
-
-# ifndef LIBMAD_VERSION_H
-# define LIBMAD_VERSION_H
-
-# define MAD_VERSION_MAJOR	0
-# define MAD_VERSION_MINOR	15
-# define MAD_VERSION_PATCH	1
-# define MAD_VERSION_EXTRA	" (beta)"
-
-# define MAD_VERSION_STRINGIZE(str)	#str
-# define MAD_VERSION_STRING(num)	MAD_VERSION_STRINGIZE(num)
-
-# define MAD_VERSION		MAD_VERSION_STRING(MAD_VERSION_MAJOR) "."  \
-				MAD_VERSION_STRING(MAD_VERSION_MINOR) "."  \
-				MAD_VERSION_STRING(MAD_VERSION_PATCH)  \
-				MAD_VERSION_EXTRA
-
-# define MAD_PUBLISHYEAR	"2000-2004"
-# define MAD_AUTHOR		"Underbit Technologies, Inc."
-# define MAD_EMAIL		"info@underbit.com"
-
-extern char const mad_version[];
-extern char const mad_copyright[];
-extern char const mad_author[];
-extern char const mad_build[];
-
-# endif
-
-/* Id: fixed.h,v 1.38 2004/02/17 02:02:03 rob Exp */
-
-# ifndef LIBMAD_FIXED_H
-# define LIBMAD_FIXED_H
-
-# if SIZEOF_INT >= 4
-typedef   signed int mad_fixed_t;
-
-typedef   signed int mad_fixed64hi_t;
-typedef unsigned int mad_fixed64lo_t;
-# else
-typedef   signed long mad_fixed_t;
-
-typedef   signed long mad_fixed64hi_t;
-typedef unsigned long mad_fixed64lo_t;
-# endif
-
-# if defined(_MSC_VER)
-#  define mad_fixed64_t  signed __int64
-# elif 1 || defined(__GNUC__)
-#  define mad_fixed64_t  signed long long
-# endif
-
-# if defined(FPM_FLOAT)
-typedef double mad_sample_t;
-# else
-typedef mad_fixed_t mad_sample_t;
-# endif
-
-/*
- * Fixed-point format: 0xABBBBBBB
- * A == whole part      (sign + 3 bits)
- * B == fractional part (28 bits)
- *
- * Values are signed two's complement, so the effective range is:
- * 0x80000000 to 0x7fffffff
- *       -8.0 to +7.9999999962747097015380859375
- *
- * The smallest representable value is:
- * 0x00000001 == 0.0000000037252902984619140625 (i.e. about 3.725e-9)
- *
- * 28 bits of fractional accuracy represent about
- * 8.6 digits of decimal accuracy.
- *
- * Fixed-point numbers can be added or subtracted as normal
- * integers, but multiplication requires shifting the 64-bit result
- * from 56 fractional bits back to 28 (and rounding.)
- *
- * Changing the definition of MAD_F_FRACBITS is only partially
- * supported, and must be done with care.
- */
-
-# define MAD_F_FRACBITS		28
-
-# if MAD_F_FRACBITS == 28
-#  define MAD_F(x)		((mad_fixed_t) (x##L))
-# else
-#  if MAD_F_FRACBITS < 28
-#   warning "MAD_F_FRACBITS < 28"
-#   define MAD_F(x)		((mad_fixed_t)  \
-				 (((x##L) +  \
-				   (1L << (28 - MAD_F_FRACBITS - 1))) >>  \
-				  (28 - MAD_F_FRACBITS)))
-#  elif MAD_F_FRACBITS > 28
-#   error "MAD_F_FRACBITS > 28 not currently supported"
-#   define MAD_F(x)		((mad_fixed_t)  \
-				 ((x##L) << (MAD_F_FRACBITS - 28)))
-#  endif
-# endif
-
-# define MAD_F_MIN		((mad_fixed_t) -0x80000000L)
-# define MAD_F_MAX		((mad_fixed_t) +0x7fffffffL)
-
-# define MAD_F_ONE		MAD_F(0x10000000)
-
-# define mad_f_tofixed(x)	((mad_fixed_t)  \
-				 ((x) * (double) (1L << MAD_F_FRACBITS) + 0.5))
-# define mad_f_todouble(x)	((double)  \
-				 ((x) / (double) (1L << MAD_F_FRACBITS)))
-
-# define mad_f_intpart(x)	((x) >> MAD_F_FRACBITS)
-# define mad_f_fracpart(x)	((x) & ((1L << MAD_F_FRACBITS) - 1))
-				/* (x should be positive) */
-
-# define mad_f_fromint(x)	((x) << MAD_F_FRACBITS)
-
-# define mad_f_add(x, y)	((x) + (y))
-# define mad_f_sub(x, y)	((x) - (y))
-
-# if defined(FPM_FLOAT)
-#  error "FPM_FLOAT not yet supported"
-
-#  undef MAD_F
-#  define MAD_F(x)		mad_f_todouble(x)
-
-#  define mad_f_mul(x, y)	((x) * (y))
-#  define mad_f_scale64
-
-#  undef ASO_ZEROCHECK
-
-# elif defined(FPM_64BIT)
-
-/*
- * This version should be the most accurate if 64-bit types are supported by
- * the compiler, although it may not be the most efficient.
- */
-#  if defined(OPT_ACCURACY)
-#   define mad_f_mul(x, y)  \
-    ((mad_fixed_t)  \
-     ((((mad_fixed64_t) (x) * (y)) +  \
-       (1L << (MAD_F_SCALEBITS - 1))) >> MAD_F_SCALEBITS))
-#  else
-#   define mad_f_mul(x, y)  \
-    ((mad_fixed_t) (((mad_fixed64_t) (x) * (y)) >> MAD_F_SCALEBITS))
-#  endif
-
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-
-/* --- Intel --------------------------------------------------------------- */
-
-# elif defined(FPM_INTEL)
-
-#  if defined(_MSC_VER)
-#   pragma warning(push)
-#   pragma warning(disable: 4035)  /* no return value */
-static __forceinline
-mad_fixed_t mad_f_mul_inline(mad_fixed_t x, mad_fixed_t y)
-{
-  enum {
-    fracbits = MAD_F_FRACBITS
-  };
-
-  __asm {
-    mov eax, x
-    imul y
-    shrd eax, edx, fracbits
-  }
-
-  /* implicit return of eax */
-}
-#   pragma warning(pop)
-
-#   define mad_f_mul		mad_f_mul_inline
-#   define mad_f_scale64
-#  else
-/*
- * This Intel version is fast and accurate; the disposition of the least
- * significant bit depends on OPT_ACCURACY via mad_f_scale64().
- */
-#   define MAD_F_MLX(hi, lo, x, y)  \
-    asm ("imull %3"  \
-	 : "=a" (lo), "=d" (hi)  \
-	 : "%a" (x), "rm" (y)  \
-	 : "cc")
-
-#   if defined(OPT_ACCURACY)
-/*
- * This gives best accuracy but is not very fast.
- */
-#    define MAD_F_MLA(hi, lo, x, y)  \
-    ({ mad_fixed64hi_t __hi;  \
-       mad_fixed64lo_t __lo;  \
-       MAD_F_MLX(__hi, __lo, (x), (y));  \
-       asm ("addl %2,%0\n\t"  \
-	    "adcl %3,%1"  \
-	    : "=rm" (lo), "=rm" (hi)  \
-	    : "r" (__lo), "r" (__hi), "0" (lo), "1" (hi)  \
-	    : "cc");  \
-    })
-#   endif  /* OPT_ACCURACY */
-
-#   if defined(OPT_ACCURACY)
-/*
- * Surprisingly, this is faster than SHRD followed by ADC.
- */
-#    define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed64hi_t __hi_;  \
-       mad_fixed64lo_t __lo_;  \
-       mad_fixed_t __result;  \
-       asm ("addl %4,%2\n\t"  \
-	    "adcl %5,%3"  \
-	    : "=rm" (__lo_), "=rm" (__hi_)  \
-	    : "0" (lo), "1" (hi),  \
-	      "ir" (1L << (MAD_F_SCALEBITS - 1)), "ir" (0)  \
-	    : "cc");  \
-       asm ("shrdl %3,%2,%1"  \
-	    : "=rm" (__result)  \
-	    : "0" (__lo_), "r" (__hi_), "I" (MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       __result;  \
-    })
-#   elif defined(OPT_INTEL)
-/*
- * Alternate Intel scaling that may or may not perform better.
- */
-#    define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result;  \
-       asm ("shrl %3,%1\n\t"  \
-	    "shll %4,%2\n\t"  \
-	    "orl %2,%1"  \
-	    : "=rm" (__result)  \
-	    : "0" (lo), "r" (hi),  \
-	      "I" (MAD_F_SCALEBITS), "I" (32 - MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       __result;  \
-    })
-#   else
-#    define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result;  \
-       asm ("shrdl %3,%2,%1"  \
-	    : "=rm" (__result)  \
-	    : "0" (lo), "r" (hi), "I" (MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       __result;  \
-    })
-#   endif  /* OPT_ACCURACY */
-
-#   define MAD_F_SCALEBITS  MAD_F_FRACBITS
-#  endif
-
-/* --- ARM ----------------------------------------------------------------- */
-
-# elif defined(FPM_ARM)
-
-/* 
- * This ARM V4 version is as accurate as FPM_64BIT but much faster. The
- * least significant bit is properly rounded at no CPU cycle cost!
- */
-# if 1
-/*
- * This is faster than the default implementation via MAD_F_MLX() and
- * mad_f_scale64().
- */
-#  define mad_f_mul(x, y)  \
-    ({ mad_fixed64hi_t __hi;  \
-       mad_fixed64lo_t __lo;  \
-       mad_fixed_t __result;  \
-       asm ("smull	%0, %1, %3, %4\n\t"  \
-	    "movs	%0, %0, lsr %5\n\t"  \
-	    "adc	%2, %0, %1, lsl %6"  \
-	    : "=&r" (__lo), "=&r" (__hi), "=r" (__result)  \
-	    : "%r" (x), "r" (y),  \
-	      "M" (MAD_F_SCALEBITS), "M" (32 - MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       __result;  \
-    })
-# endif
-
-#  define MAD_F_MLX(hi, lo, x, y)  \
-    asm ("smull	%0, %1, %2, %3"  \
-	 : "=&r" (lo), "=&r" (hi)  \
-	 : "%r" (x), "r" (y))
-
-#  define MAD_F_MLA(hi, lo, x, y)  \
-    asm ("smlal	%0, %1, %2, %3"  \
-	 : "+r" (lo), "+r" (hi)  \
-	 : "%r" (x), "r" (y))
-
-#  define MAD_F_MLN(hi, lo)  \
-    asm ("rsbs	%0, %2, #0\n\t"  \
-	 "rsc	%1, %3, #0"  \
-	 : "=r" (lo), "=r" (hi)  \
-	 : "0" (lo), "1" (hi)  \
-	 : "cc")
-
-#  define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result;  \
-       asm ("movs	%0, %1, lsr %3\n\t"  \
-	    "adc	%0, %0, %2, lsl %4"  \
-	    : "=&r" (__result)  \
-	    : "r" (lo), "r" (hi),  \
-	      "M" (MAD_F_SCALEBITS), "M" (32 - MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       __result;  \
-    })
-
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-
-/* --- MIPS ---------------------------------------------------------------- */
-
-# elif defined(FPM_MIPS)
-
-/*
- * This MIPS version is fast and accurate; the disposition of the least
- * significant bit depends on OPT_ACCURACY via mad_f_scale64().
- */
-#  define MAD_F_MLX(hi, lo, x, y)  \
-    asm ("mult	%2,%3"  \
-	 : "=l" (lo), "=h" (hi)  \
-	 : "%r" (x), "r" (y))
-
-# if defined(HAVE_MADD_ASM)
-#  define MAD_F_MLA(hi, lo, x, y)  \
-    asm ("madd	%2,%3"  \
-	 : "+l" (lo), "+h" (hi)  \
-	 : "%r" (x), "r" (y))
-# elif defined(HAVE_MADD16_ASM)
-/*
- * This loses significant accuracy due to the 16-bit integer limit in the
- * multiply/accumulate instruction.
- */
-#  define MAD_F_ML0(hi, lo, x, y)  \
-    asm ("mult	%2,%3"  \
-	 : "=l" (lo), "=h" (hi)  \
-	 : "%r" ((x) >> 12), "r" ((y) >> 16))
-#  define MAD_F_MLA(hi, lo, x, y)  \
-    asm ("madd16	%2,%3"  \
-	 : "+l" (lo), "+h" (hi)  \
-	 : "%r" ((x) >> 12), "r" ((y) >> 16))
-#  define MAD_F_MLZ(hi, lo)  ((mad_fixed_t) (lo))
-# endif
-
-# if defined(OPT_SPEED)
-#  define mad_f_scale64(hi, lo)  \
-    ((mad_fixed_t) ((hi) << (32 - MAD_F_SCALEBITS)))
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-# endif
-
-/* --- SPARC --------------------------------------------------------------- */
-
-# elif defined(FPM_SPARC)
-
-/*
- * This SPARC V8 version is fast and accurate; the disposition of the least
- * significant bit depends on OPT_ACCURACY via mad_f_scale64().
- */
-#  define MAD_F_MLX(hi, lo, x, y)  \
-    asm ("smul %2, %3, %0\n\t"  \
-	 "rd %%y, %1"  \
-	 : "=r" (lo), "=r" (hi)  \
-	 : "%r" (x), "rI" (y))
-
-/* --- PowerPC ------------------------------------------------------------- */
-
-# elif defined(FPM_PPC)
-
-/*
- * This PowerPC version is fast and accurate; the disposition of the least
- * significant bit depends on OPT_ACCURACY via mad_f_scale64().
- */
-#  define MAD_F_MLX(hi, lo, x, y)  \
-    do {  \
-      asm ("mullw %0,%1,%2"  \
-	   : "=r" (lo)  \
-	   : "%r" (x), "r" (y));  \
-      asm ("mulhw %0,%1,%2"  \
-	   : "=r" (hi)  \
-	   : "%r" (x), "r" (y));  \
-    }  \
-    while (0)
-
-#  if defined(OPT_ACCURACY)
-/*
- * This gives best accuracy but is not very fast.
- */
-#   define MAD_F_MLA(hi, lo, x, y)  \
-    ({ mad_fixed64hi_t __hi;  \
-       mad_fixed64lo_t __lo;  \
-       MAD_F_MLX(__hi, __lo, (x), (y));  \
-       asm ("addc %0,%2,%3\n\t"  \
-	    "adde %1,%4,%5"  \
-	    : "=r" (lo), "=r" (hi)  \
-	    : "%r" (lo), "r" (__lo),  \
-	      "%r" (hi), "r" (__hi)  \
-	    : "xer");  \
-    })
-#  endif
-
-#  if defined(OPT_ACCURACY)
-/*
- * This is slower than the truncating version below it.
- */
-#   define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result, __round;  \
-       asm ("rotrwi %0,%1,%2"  \
-	    : "=r" (__result)  \
-	    : "r" (lo), "i" (MAD_F_SCALEBITS));  \
-       asm ("extrwi %0,%1,1,0"  \
-	    : "=r" (__round)  \
-	    : "r" (__result));  \
-       asm ("insrwi %0,%1,%2,0"  \
-	    : "+r" (__result)  \
-	    : "r" (hi), "i" (MAD_F_SCALEBITS));  \
-       asm ("add %0,%1,%2"  \
-	    : "=r" (__result)  \
-	    : "%r" (__result), "r" (__round));  \
-       __result;  \
-    })
-#  else
-#   define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result;  \
-       asm ("rotrwi %0,%1,%2"  \
-	    : "=r" (__result)  \
-	    : "r" (lo), "i" (MAD_F_SCALEBITS));  \
-       asm ("insrwi %0,%1,%2,0"  \
-	    : "+r" (__result)  \
-	    : "r" (hi), "i" (MAD_F_SCALEBITS));  \
-       __result;  \
-    })
-#  endif
-
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-
-/* --- Default ------------------------------------------------------------- */
-
-# elif defined(FPM_DEFAULT)
-
-/*
- * This version is the most portable but it loses significant accuracy.
- * Furthermore, accuracy is biased against the second argument, so care
- * should be taken when ordering operands.
- *
- * The scale factors are constant as this is not used with SSO.
- *
- * Pre-rounding is required to stay within the limits of compliance.
- */
-#  if defined(OPT_SPEED)
-#   define mad_f_mul(x, y)	(((x) >> 12) * ((y) >> 16))
-#  else
-#   define mad_f_mul(x, y)	((((x) + (1L << 11)) >> 12) *  \
-				 (((y) + (1L << 15)) >> 16))
-#  endif
-
-/* ------------------------------------------------------------------------- */
-
-# else
-#  error "no FPM selected"
-# endif
-
-/* default implementations */
-
-# if !defined(mad_f_mul)
-#  define mad_f_mul(x, y)  \
-    ({ register mad_fixed64hi_t __hi;  \
-       register mad_fixed64lo_t __lo;  \
-       MAD_F_MLX(__hi, __lo, (x), (y));  \
-       mad_f_scale64(__hi, __lo);  \
-    })
-# endif
-
-# if !defined(MAD_F_MLA)
-#  define MAD_F_ML0(hi, lo, x, y)	((lo)  = mad_f_mul((x), (y)))
-#  define MAD_F_MLA(hi, lo, x, y)	((lo) += mad_f_mul((x), (y)))
-#  define MAD_F_MLN(hi, lo)		((lo)  = -(lo))
-#  define MAD_F_MLZ(hi, lo)		((void) (hi), (mad_fixed_t) (lo))
-# endif
-
-# if !defined(MAD_F_ML0)
-#  define MAD_F_ML0(hi, lo, x, y)	MAD_F_MLX((hi), (lo), (x), (y))
-# endif
-
-# if !defined(MAD_F_MLN)
-#  define MAD_F_MLN(hi, lo)		((hi) = ((lo) = -(lo)) ? ~(hi) : -(hi))
-# endif
-
-# if !defined(MAD_F_MLZ)
-#  define MAD_F_MLZ(hi, lo)		mad_f_scale64((hi), (lo))
-# endif
-
-# if !defined(mad_f_scale64)
-#  if defined(OPT_ACCURACY)
-#   define mad_f_scale64(hi, lo)  \
-    ((((mad_fixed_t)  \
-       (((hi) << (32 - (MAD_F_SCALEBITS - 1))) |  \
-	((lo) >> (MAD_F_SCALEBITS - 1)))) + 1) >> 1)
-#  else
-#   define mad_f_scale64(hi, lo)  \
-    ((mad_fixed_t)  \
-     (((hi) << (32 - MAD_F_SCALEBITS)) |  \
-      ((lo) >> MAD_F_SCALEBITS)))
-#  endif
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-# endif
-
-/* C routines */
-
-mad_fixed_t mad_f_abs(mad_fixed_t);
-mad_fixed_t mad_f_div(mad_fixed_t, mad_fixed_t);
-
-# endif
-
-/* Id: bit.h,v 1.12 2004/01/23 09:41:32 rob Exp */
-
-# ifndef LIBMAD_BIT_H
-# define LIBMAD_BIT_H
-
-struct mad_bitptr {
-  unsigned char const *byte;
-  unsigned short cache;
-  unsigned short left;
-};
-
-void mad_bit_init(struct mad_bitptr *, unsigned char const *);
-
-# define mad_bit_finish(bitptr)		/* nothing */
-
-unsigned int mad_bit_length(struct mad_bitptr const *,
-			    struct mad_bitptr const *);
-
-# define mad_bit_bitsleft(bitptr)  ((bitptr)->left)
-unsigned char const *mad_bit_nextbyte(struct mad_bitptr const *);
-
-void mad_bit_skip(struct mad_bitptr *, unsigned int);
-unsigned long mad_bit_read(struct mad_bitptr *, unsigned int);
-void mad_bit_write(struct mad_bitptr *, unsigned int, unsigned long);
-
-unsigned short mad_bit_crc(struct mad_bitptr, unsigned int, unsigned short);
-
-# endif
-
-/* Id: timer.h,v 1.16 2004/01/23 09:41:33 rob Exp */
-
-# ifndef LIBMAD_TIMER_H
-# define LIBMAD_TIMER_H
-
-typedef struct {
-  signed long seconds;		/* whole seconds */
-  unsigned long fraction;	/* 1/MAD_TIMER_RESOLUTION seconds */
-} mad_timer_t;
-
-extern mad_timer_t const mad_timer_zero;
-
-# define MAD_TIMER_RESOLUTION	352800000UL
-
-enum mad_units {
-  MAD_UNITS_HOURS	 =    -2,
-  MAD_UNITS_MINUTES	 =    -1,
-  MAD_UNITS_SECONDS	 =     0,
-
-  /* metric units */
-
-  MAD_UNITS_DECISECONDS	 =    10,
-  MAD_UNITS_CENTISECONDS =   100,
-  MAD_UNITS_MILLISECONDS =  1000,
-
-  /* audio sample units */
-
-  MAD_UNITS_8000_HZ	 =  8000,
-  MAD_UNITS_11025_HZ	 = 11025,
-  MAD_UNITS_12000_HZ	 = 12000,
-
-  MAD_UNITS_16000_HZ	 = 16000,
-  MAD_UNITS_22050_HZ	 = 22050,
-  MAD_UNITS_24000_HZ	 = 24000,
-
-  MAD_UNITS_32000_HZ	 = 32000,
-  MAD_UNITS_44100_HZ	 = 44100,
-  MAD_UNITS_48000_HZ	 = 48000,
-
-  /* video frame/field units */
-
-  MAD_UNITS_24_FPS	 =    24,
-  MAD_UNITS_25_FPS	 =    25,
-  MAD_UNITS_30_FPS	 =    30,
-  MAD_UNITS_48_FPS	 =    48,
-  MAD_UNITS_50_FPS	 =    50,
-  MAD_UNITS_60_FPS	 =    60,
-
-  /* CD audio frames */
-
-  MAD_UNITS_75_FPS	 =    75,
-
-  /* video drop-frame units */
-
-  MAD_UNITS_23_976_FPS	 =   -24,
-  MAD_UNITS_24_975_FPS	 =   -25,
-  MAD_UNITS_29_97_FPS	 =   -30,
-  MAD_UNITS_47_952_FPS	 =   -48,
-  MAD_UNITS_49_95_FPS	 =   -50,
-  MAD_UNITS_59_94_FPS	 =   -60
-};
-
-# define mad_timer_reset(timer)	((void) (*(timer) = mad_timer_zero))
-
-int mad_timer_compare(mad_timer_t, mad_timer_t);
-
-# define mad_timer_sign(timer)	mad_timer_compare((timer), mad_timer_zero)
-
-void mad_timer_negate(mad_timer_t *);
-mad_timer_t mad_timer_abs(mad_timer_t);
-
-void mad_timer_set(mad_timer_t *, unsigned long, unsigned long, unsigned long);
-void mad_timer_add(mad_timer_t *, mad_timer_t);
-void mad_timer_multiply(mad_timer_t *, signed long);
-
-signed long mad_timer_count(mad_timer_t, enum mad_units);
-unsigned long mad_timer_fraction(mad_timer_t, unsigned long);
-void mad_timer_string(mad_timer_t, char *, char const *,
-		      enum mad_units, enum mad_units, unsigned long);
-
-# endif
-
-/* Id: stream.h,v 1.20 2004/02/05 09:02:39 rob Exp */
-
-# ifndef LIBMAD_STREAM_H
-# define LIBMAD_STREAM_H
-
-
-# define MAD_BUFFER_GUARD	8
-# define MAD_BUFFER_MDLEN	(511 + 2048 + MAD_BUFFER_GUARD)
-
-enum mad_error {
-  MAD_ERROR_NONE	   = 0x0000,	/* no error */
-
-  MAD_ERROR_BUFLEN	   = 0x0001,	/* input buffer too small (or EOF) */
-  MAD_ERROR_BUFPTR	   = 0x0002,	/* invalid (null) buffer pointer */
-
-  MAD_ERROR_NOMEM	   = 0x0031,	/* not enough memory */
-
-  MAD_ERROR_LOSTSYNC	   = 0x0101,	/* lost synchronization */
-  MAD_ERROR_BADLAYER	   = 0x0102,	/* reserved header layer value */
-  MAD_ERROR_BADBITRATE	   = 0x0103,	/* forbidden bitrate value */
-  MAD_ERROR_BADSAMPLERATE  = 0x0104,	/* reserved sample frequency value */
-  MAD_ERROR_BADEMPHASIS	   = 0x0105,	/* reserved emphasis value */
-
-  MAD_ERROR_BADCRC	   = 0x0201,	/* CRC check failed */
-  MAD_ERROR_BADBITALLOC	   = 0x0211,	/* forbidden bit allocation value */
-  MAD_ERROR_BADSCALEFACTOR = 0x0221,	/* bad scalefactor index */
-  MAD_ERROR_BADMODE        = 0x0222,	/* bad bitrate/mode combination */
-  MAD_ERROR_BADFRAMELEN	   = 0x0231,	/* bad frame length */
-  MAD_ERROR_BADBIGVALUES   = 0x0232,	/* bad big_values count */
-  MAD_ERROR_BADBLOCKTYPE   = 0x0233,	/* reserved block_type */
-  MAD_ERROR_BADSCFSI	   = 0x0234,	/* bad scalefactor selection info */
-  MAD_ERROR_BADDATAPTR	   = 0x0235,	/* bad main_data_begin pointer */
-  MAD_ERROR_BADPART3LEN	   = 0x0236,	/* bad audio data length */
-  MAD_ERROR_BADHUFFTABLE   = 0x0237,	/* bad Huffman table select */
-  MAD_ERROR_BADHUFFDATA	   = 0x0238,	/* Huffman data overrun */
-  MAD_ERROR_BADSTEREO	   = 0x0239	/* incompatible block_type for JS */
-};
-
-# define MAD_RECOVERABLE(error)	((error) & 0xff00)
-
-struct mad_stream {
-  unsigned char const *buffer;		/* input bitstream buffer */
-  unsigned char const *bufend;		/* end of buffer */
-  unsigned long skiplen;		/* bytes to skip before next frame */
-
-  int sync;				/* stream sync found */
-  unsigned long freerate;		/* free bitrate (fixed) */
-
-  unsigned char const *this_frame;	/* start of current frame */
-  unsigned char const *next_frame;	/* start of next frame */
-  struct mad_bitptr ptr;		/* current processing bit pointer */
-
-  struct mad_bitptr anc_ptr;		/* ancillary bits pointer */
-  unsigned int anc_bitlen;		/* number of ancillary bits */
-
-  unsigned char (*main_data)[MAD_BUFFER_MDLEN];
-					/* Layer III main_data() */
-  unsigned int md_len;			/* bytes in main_data */
-
-  int options;				/* decoding options (see below) */
-  enum mad_error error;			/* error code (see above) */
-};
-
-enum {
-  MAD_OPTION_IGNORECRC      = 0x0001,	/* ignore CRC errors */
-  MAD_OPTION_HALFSAMPLERATE = 0x0002	/* generate PCM at 1/2 sample rate */
-# if 0  /* not yet implemented */
-  MAD_OPTION_LEFTCHANNEL    = 0x0010,	/* decode left channel only */
-  MAD_OPTION_RIGHTCHANNEL   = 0x0020,	/* decode right channel only */
-  MAD_OPTION_SINGLECHANNEL  = 0x0030	/* combine channels */
-# endif
-};
-
-void mad_stream_init(struct mad_stream *);
-void mad_stream_finish(struct mad_stream *);
-
-# define mad_stream_options(stream, opts)  \
-    ((void) ((stream)->options = (opts)))
-
-void mad_stream_buffer(struct mad_stream *,
-		       unsigned char const *, unsigned long);
-void mad_stream_skip(struct mad_stream *, unsigned long);
-
-int mad_stream_sync(struct mad_stream *);
-
-char const *mad_stream_errorstr(struct mad_stream const *);
-
-# endif
-
-/* Id: frame.h,v 1.20 2004/01/23 09:41:32 rob Exp */
-
-# ifndef LIBMAD_FRAME_H
-# define LIBMAD_FRAME_H
-
-
-enum mad_layer {
-  MAD_LAYER_I   = 1,			/* Layer I */
-  MAD_LAYER_II  = 2,			/* Layer II */
-  MAD_LAYER_III = 3			/* Layer III */
-};
-
-enum mad_mode {
-  MAD_MODE_SINGLE_CHANNEL = 0,		/* single channel */
-  MAD_MODE_DUAL_CHANNEL	  = 1,		/* dual channel */
-  MAD_MODE_JOINT_STEREO	  = 2,		/* joint (MS/intensity) stereo */
-  MAD_MODE_STEREO	  = 3		/* normal LR stereo */
-};
-
-enum mad_emphasis {
-  MAD_EMPHASIS_NONE	  = 0,		/* no emphasis */
-  MAD_EMPHASIS_50_15_US	  = 1,		/* 50/15 microseconds emphasis */
-  MAD_EMPHASIS_CCITT_J_17 = 3,		/* CCITT J.17 emphasis */
-  MAD_EMPHASIS_RESERVED   = 2		/* unknown emphasis */
-};
-
-struct mad_header {
-  enum mad_layer layer;			/* audio layer (1, 2, or 3) */
-  enum mad_mode mode;			/* channel mode (see above) */
-  int mode_extension;			/* additional mode info */
-  enum mad_emphasis emphasis;		/* de-emphasis to use (see above) */
-
-  unsigned long bitrate;		/* stream bitrate (bps) */
-  unsigned int samplerate;		/* sampling frequency (Hz) */
-
-  unsigned short crc_check;		/* frame CRC accumulator */
-  unsigned short crc_target;		/* final target CRC checksum */
-
-  int flags;				/* flags (see below) */
-  int private_bits;			/* private bits (see below) */
-
-  mad_timer_t duration;			/* audio playing time of frame */
-};
-
-struct mad_frame {
-  struct mad_header header;		/* MPEG audio header */
-
-  int options;				/* decoding options (from stream) */
-
-  mad_fixed_t sbsample[2][36][32];	/* synthesis subband filter samples */
-  mad_fixed_t (*overlap)[2][32][18];	/* Layer III block overlap data */
-};
-
-# define MAD_NCHANNELS(header)		((header)->mode ? 2 : 1)
-# define MAD_NSBSAMPLES(header)  \
-  ((header)->layer == MAD_LAYER_I ? 12 :  \
-   (((header)->layer == MAD_LAYER_III &&  \
-     ((header)->flags & MAD_FLAG_LSF_EXT)) ? 18 : 36))
-
-enum {
-  MAD_FLAG_NPRIVATE_III	= 0x0007,	/* number of Layer III private bits */
-  MAD_FLAG_INCOMPLETE	= 0x0008,	/* header but not data is decoded */
-
-  MAD_FLAG_PROTECTION	= 0x0010,	/* frame has CRC protection */
-  MAD_FLAG_COPYRIGHT	= 0x0020,	/* frame is copyright */
-  MAD_FLAG_ORIGINAL	= 0x0040,	/* frame is original (else copy) */
-  MAD_FLAG_PADDING	= 0x0080,	/* frame has additional slot */
-
-  MAD_FLAG_I_STEREO	= 0x0100,	/* uses intensity joint stereo */
-  MAD_FLAG_MS_STEREO	= 0x0200,	/* uses middle/side joint stereo */
-  MAD_FLAG_FREEFORMAT	= 0x0400,	/* uses free format bitrate */
-
-  MAD_FLAG_LSF_EXT	= 0x1000,	/* lower sampling freq. extension */
-  MAD_FLAG_MC_EXT	= 0x2000,	/* multichannel audio extension */
-  MAD_FLAG_MPEG_2_5_EXT	= 0x4000	/* MPEG 2.5 (unofficial) extension */
-};
-
-enum {
-  MAD_PRIVATE_HEADER	= 0x0100,	/* header private bit */
-  MAD_PRIVATE_III	= 0x001f	/* Layer III private bits (up to 5) */
-};
-
-void mad_header_init(struct mad_header *);
-
-# define mad_header_finish(header)  /* nothing */
-
-int mad_header_decode(struct mad_header *, struct mad_stream *);
-
-void mad_frame_init(struct mad_frame *);
-void mad_frame_finish(struct mad_frame *);
-
-int mad_frame_decode(struct mad_frame *, struct mad_stream *);
-
-void mad_frame_mute(struct mad_frame *);
-
-# endif
-
-/* Id: synth.h,v 1.15 2004/01/23 09:41:33 rob Exp */
-
-# ifndef LIBMAD_SYNTH_H
-# define LIBMAD_SYNTH_H
-
-
-struct mad_pcm {
-  unsigned int samplerate;		/* sampling frequency (Hz) */
-  unsigned short channels;		/* number of channels */
-  unsigned short length;		/* number of samples per channel */
-  mad_fixed_t samples[2][1152];		/* PCM output samples [ch][sample] */
-};
-
-struct mad_synth {
-  mad_fixed_t filter[2][2][2][16][8];	/* polyphase filterbank outputs */
-  					/* [ch][eo][peo][s][v] */
-
-  unsigned int phase;			/* current processing phase */
-
-  struct mad_pcm pcm;			/* PCM output */
-};
-
-/* single channel PCM selector */
-enum {
-  MAD_PCM_CHANNEL_SINGLE = 0
-};
-
-/* dual channel PCM selector */
-enum {
-  MAD_PCM_CHANNEL_DUAL_1 = 0,
-  MAD_PCM_CHANNEL_DUAL_2 = 1
-};
-
-/* stereo PCM selector */
-enum {
-  MAD_PCM_CHANNEL_STEREO_LEFT  = 0,
-  MAD_PCM_CHANNEL_STEREO_RIGHT = 1
-};
-
-void mad_synth_init(struct mad_synth *);
-
-# define mad_synth_finish(synth)  /* nothing */
-
-void mad_synth_mute(struct mad_synth *);
-
-void mad_synth_frame(struct mad_synth *, struct mad_frame const *);
-
-# endif
-
-/* Id: decoder.h,v 1.17 2004/01/23 09:41:32 rob Exp */
-
-# ifndef LIBMAD_DECODER_H
-# define LIBMAD_DECODER_H
-
-
-enum mad_decoder_mode {
-  MAD_DECODER_MODE_SYNC  = 0,
-  MAD_DECODER_MODE_ASYNC
-};
-
-enum mad_flow {
-  MAD_FLOW_CONTINUE = 0x0000,	/* continue normally */
-  MAD_FLOW_STOP     = 0x0010,	/* stop decoding normally */
-  MAD_FLOW_BREAK    = 0x0011,	/* stop decoding and signal an error */
-  MAD_FLOW_IGNORE   = 0x0020	/* ignore the current frame */
-};
-
-struct mad_decoder {
-  enum mad_decoder_mode mode;
-
-  int options;
-
-  struct {
-    long pid;
-    int in;
-    int out;
-  } async;
-
-  struct {
-    struct mad_stream stream;
-    struct mad_frame frame;
-    struct mad_synth synth;
-  } *sync;
-
-  void *cb_data;
-
-  enum mad_flow (*input_func)(void *, struct mad_stream *);
-  enum mad_flow (*header_func)(void *, struct mad_header const *);
-  enum mad_flow (*filter_func)(void *,
-			       struct mad_stream const *, struct mad_frame *);
-  enum mad_flow (*output_func)(void *,
-			       struct mad_header const *, struct mad_pcm *);
-  enum mad_flow (*error_func)(void *, struct mad_stream *, struct mad_frame *);
-  enum mad_flow (*message_func)(void *, void *, unsigned int *);
-};
-
-void mad_decoder_init(struct mad_decoder *, void *,
-		      enum mad_flow (*)(void *, struct mad_stream *),
-		      enum mad_flow (*)(void *, struct mad_header const *),
-		      enum mad_flow (*)(void *,
-					struct mad_stream const *,
-					struct mad_frame *),
-		      enum mad_flow (*)(void *,
-					struct mad_header const *,
-					struct mad_pcm *),
-		      enum mad_flow (*)(void *,
-					struct mad_stream *,
-					struct mad_frame *),
-		      enum mad_flow (*)(void *, void *, unsigned int *));
-int mad_decoder_finish(struct mad_decoder *);
-
-# define mad_decoder_options(decoder, opts)  \
-    ((void) ((decoder)->options = (opts)))
-
-int mad_decoder_run(struct mad_decoder *, enum mad_decoder_mode);
-int mad_decoder_message(struct mad_decoder *, void *, unsigned int *);
-
-# endif
-
-# ifdef __cplusplus
-}
-# endif
diff --git a/lib-x86-32/include/neaacdec.h b/lib-x86-32/include/neaacdec.h
deleted file mode 100644
index a45f1d09..00000000
--- a/lib-x86-32/include/neaacdec.h
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
-** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
-** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com
-**  
-** 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 of the License, 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.
-**
-** Any non-GPL usage of this software or parts of this software is strictly
-** forbidden.
-**
-** The "appropriate copyright message" mentioned in section 2c of the GPLv2
-** must read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
-**
-** Commercial non-GPL licensing of this software is possible.
-** For more info contact Nero AG through Mpeg4AAClicense@nero.com.
-**
-** $Id: neaacdec.h,v 1.13 2009/01/26 23:51:15 menno Exp $
-**/
-
-#ifndef __NEAACDEC_H__
-#define __NEAACDEC_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-#if 1
-/* MACROS FOR BACKWARDS COMPATIBILITY */
-/* structs */
-#define faacDecHandle                  NeAACDecHandle
-#define faacDecConfiguration           NeAACDecConfiguration
-#define faacDecConfigurationPtr        NeAACDecConfigurationPtr
-#define faacDecFrameInfo               NeAACDecFrameInfo
-/* functions */
-#define faacDecGetErrorMessage         NeAACDecGetErrorMessage
-#define faacDecSetConfiguration        NeAACDecSetConfiguration
-#define faacDecGetCurrentConfiguration NeAACDecGetCurrentConfiguration
-#define faacDecInit                    NeAACDecInit
-#define faacDecInit2                   NeAACDecInit2
-#define faacDecInitDRM                 NeAACDecInitDRM
-#define faacDecPostSeekReset           NeAACDecPostSeekReset
-#define faacDecOpen                    NeAACDecOpen
-#define faacDecClose                   NeAACDecClose
-#define faacDecDecode                  NeAACDecDecode
-#define AudioSpecificConfig            NeAACDecAudioSpecificConfig
-#endif
-
-
-#ifdef _WIN32
-  #pragma pack(push, 8)
-  #ifndef NEAACDECAPI
-    #define NEAACDECAPI __cdecl
-  #endif
-#else
-  #ifndef NEAACDECAPI
-    #define NEAACDECAPI
-  #endif
-#endif
-
-#define FAAD2_VERSION "2.7"
-
-/* object types for AAC */
-#define MAIN       1
-#define LC         2
-#define SSR        3
-#define LTP        4
-#define HE_AAC     5
-#define ER_LC     17
-#define ER_LTP    19
-#define LD        23
-#define DRM_ER_LC 27 /* special object type for DRM */
-
-/* header types */
-#define RAW        0
-#define ADIF       1
-#define ADTS       2
-#define LATM       3
-
-/* SBR signalling */
-#define NO_SBR           0
-#define SBR_UPSAMPLED    1
-#define SBR_DOWNSAMPLED  2
-#define NO_SBR_UPSAMPLED 3
-
-/* library output formats */
-#define FAAD_FMT_16BIT  1
-#define FAAD_FMT_24BIT  2
-#define FAAD_FMT_32BIT  3
-#define FAAD_FMT_FLOAT  4
-#define FAAD_FMT_FIXED  FAAD_FMT_FLOAT
-#define FAAD_FMT_DOUBLE 5
-
-/* Capabilities */
-#define LC_DEC_CAP           (1<<0) /* Can decode LC */
-#define MAIN_DEC_CAP         (1<<1) /* Can decode MAIN */
-#define LTP_DEC_CAP          (1<<2) /* Can decode LTP */
-#define LD_DEC_CAP           (1<<3) /* Can decode LD */
-#define ERROR_RESILIENCE_CAP (1<<4) /* Can decode ER */
-#define FIXED_POINT_CAP      (1<<5) /* Fixed point */
-
-/* Channel definitions */
-#define FRONT_CHANNEL_CENTER (1)
-#define FRONT_CHANNEL_LEFT   (2)
-#define FRONT_CHANNEL_RIGHT  (3)
-#define SIDE_CHANNEL_LEFT    (4)
-#define SIDE_CHANNEL_RIGHT   (5)
-#define BACK_CHANNEL_LEFT    (6)
-#define BACK_CHANNEL_RIGHT   (7)
-#define BACK_CHANNEL_CENTER  (8)
-#define LFE_CHANNEL          (9)
-#define UNKNOWN_CHANNEL      (0)
-
-/* DRM channel definitions */
-#define DRMCH_MONO          1
-#define DRMCH_STEREO        2
-#define DRMCH_SBR_MONO      3
-#define DRMCH_SBR_STEREO    4
-#define DRMCH_SBR_PS_STEREO 5
-
-
-/* A decode call can eat up to FAAD_MIN_STREAMSIZE bytes per decoded channel,
-   so at least so much bytes per channel should be available in this stream */
-#define FAAD_MIN_STREAMSIZE 768 /* 6144 bits/channel */
-
-
-typedef void *NeAACDecHandle;
-
-typedef struct mp4AudioSpecificConfig
-{
-    /* Audio Specific Info */
-    unsigned char objectTypeIndex;
-    unsigned char samplingFrequencyIndex;
-    unsigned long samplingFrequency;
-    unsigned char channelsConfiguration;
-
-    /* GA Specific Info */
-    unsigned char frameLengthFlag;
-    unsigned char dependsOnCoreCoder;
-    unsigned short coreCoderDelay;
-    unsigned char extensionFlag;
-    unsigned char aacSectionDataResilienceFlag;
-    unsigned char aacScalefactorDataResilienceFlag;
-    unsigned char aacSpectralDataResilienceFlag;
-    unsigned char epConfig;
-
-    char sbr_present_flag;
-    char forceUpSampling;
-    char downSampledSBR;
-} mp4AudioSpecificConfig;
-
-typedef struct NeAACDecConfiguration
-{
-    unsigned char defObjectType;
-    unsigned long defSampleRate;
-    unsigned char outputFormat;
-    unsigned char downMatrix;
-    unsigned char useOldADTSFormat;
-    unsigned char dontUpSampleImplicitSBR;
-} NeAACDecConfiguration, *NeAACDecConfigurationPtr;
-
-typedef struct NeAACDecFrameInfo
-{
-    unsigned long bytesconsumed;
-    unsigned long samples;
-    unsigned char channels;
-    unsigned char error;
-    unsigned long samplerate;
-
-    /* SBR: 0: off, 1: on; upsample, 2: on; downsampled, 3: off; upsampled */
-    unsigned char sbr;
-
-    /* MPEG-4 ObjectType */
-    unsigned char object_type;
-
-    /* AAC header type; MP4 will be signalled as RAW also */
-    unsigned char header_type;
-
-    /* multichannel configuration */
-    unsigned char num_front_channels;
-    unsigned char num_side_channels;
-    unsigned char num_back_channels;
-    unsigned char num_lfe_channels;
-    unsigned char channel_position[64];
-
-    /* PS: 0: off, 1: on */
-    unsigned char ps;
-} NeAACDecFrameInfo;
-
-char* NEAACDECAPI NeAACDecGetErrorMessage(unsigned char errcode);
-
-unsigned long NEAACDECAPI NeAACDecGetCapabilities(void);
-
-NeAACDecHandle NEAACDECAPI NeAACDecOpen(void);
-
-NeAACDecConfigurationPtr NEAACDECAPI NeAACDecGetCurrentConfiguration(NeAACDecHandle hDecoder);
-
-unsigned char NEAACDECAPI NeAACDecSetConfiguration(NeAACDecHandle hDecoder,
-                                                   NeAACDecConfigurationPtr config);
-
-/* Init the library based on info from the AAC file (ADTS/ADIF) */
-long NEAACDECAPI NeAACDecInit(NeAACDecHandle hDecoder,
-                              unsigned char *buffer,
-                              unsigned long buffer_size,
-                              unsigned long *samplerate,
-                              unsigned char *channels);
-
-/* Init the library using a DecoderSpecificInfo */
-char NEAACDECAPI NeAACDecInit2(NeAACDecHandle hDecoder,
-                               unsigned char *pBuffer,
-                               unsigned long SizeOfDecoderSpecificInfo,
-                               unsigned long *samplerate,
-                               unsigned char *channels);
-
-/* Init the library for DRM */
-char NEAACDECAPI NeAACDecInitDRM(NeAACDecHandle *hDecoder, unsigned long samplerate,
-                                 unsigned char channels);
-
-void NEAACDECAPI NeAACDecPostSeekReset(NeAACDecHandle hDecoder, long frame);
-
-void NEAACDECAPI NeAACDecClose(NeAACDecHandle hDecoder);
-
-void* NEAACDECAPI NeAACDecDecode(NeAACDecHandle hDecoder,
-                                 NeAACDecFrameInfo *hInfo,
-                                 unsigned char *buffer,
-                                 unsigned long buffer_size);
-
-void* NEAACDECAPI NeAACDecDecode2(NeAACDecHandle hDecoder,
-                                  NeAACDecFrameInfo *hInfo,
-                                  unsigned char *buffer,
-                                  unsigned long buffer_size,
-                                  void **sample_buffer,
-                                  unsigned long sample_buffer_size);
-
-char NEAACDECAPI NeAACDecAudioSpecificConfig(unsigned char *pBuffer,
-                                             unsigned long buffer_size,
-                                             mp4AudioSpecificConfig *mp4ASC);
-
-#ifdef _WIN32
-  #pragma pack(pop)
-#endif
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
diff --git a/lib-x86-32/include/ogg/Makefile.am b/lib-x86-32/include/ogg/Makefile.am
deleted file mode 100644
index 142699d3..00000000
--- a/lib-x86-32/include/ogg/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-oggincludedir = $(includedir)/ogg
-
-ogginclude_HEADERS = ogg.h os_types.h
-nodist_ogginclude_HEADERS = config_types.h
diff --git a/lib-x86-32/include/ogg/config_types.h b/lib-x86-32/include/ogg/config_types.h
deleted file mode 100644
index 496e900f..00000000
--- a/lib-x86-32/include/ogg/config_types.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef __CONFIG_TYPES_H__
-#define __CONFIG_TYPES_H__
-
-/* these are filled in by configure */
-typedef int16_t ogg_int16_t;
-typedef u_int16_t ogg_uint16_t;
-typedef int32_t ogg_int32_t;
-typedef u_int32_t ogg_uint32_t;
-typedef int64_t ogg_int64_t;
-
-#endif
diff --git a/lib-x86-32/include/ogg/config_types.h.in b/lib-x86-32/include/ogg/config_types.h.in
deleted file mode 100644
index 568a001f..00000000
--- a/lib-x86-32/include/ogg/config_types.h.in
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef __CONFIG_TYPES_H__
-#define __CONFIG_TYPES_H__
-
-/* these are filled in by configure */
-typedef @SIZE16@ ogg_int16_t;
-typedef @USIZE16@ ogg_uint16_t;
-typedef @SIZE32@ ogg_int32_t;
-typedef @USIZE32@ ogg_uint32_t;
-typedef @SIZE64@ ogg_int64_t;
-
-#endif
diff --git a/lib-x86-32/include/ogg/ogg.h b/lib-x86-32/include/ogg/ogg.h
deleted file mode 100644
index ae0cfd53..00000000
--- a/lib-x86-32/include/ogg/ogg.h
+++ /dev/null
@@ -1,208 +0,0 @@
-/********************************************************************
- *                                                                  *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
- *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
- *                                                                  *
- ********************************************************************
-
- function: toplevel libogg include
- last mod: $Id: ogg.h 16051 2009-05-27 05:00:06Z xiphmont $
-
- ********************************************************************/
-#ifndef _OGG_H
-#define _OGG_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stddef.h>
-#include <ogg/os_types.h>
-
-typedef struct {
-  void *iov_base;
-  size_t iov_len;
-} ogg_iovec_t;
-
-typedef struct {
-  long endbyte;
-  int  endbit;
-
-  unsigned char *buffer;
-  unsigned char *ptr;
-  long storage;
-} oggpack_buffer;
-
-/* ogg_page is used to encapsulate the data in one Ogg bitstream page *****/
-
-typedef struct {
-  unsigned char *header;
-  long header_len;
-  unsigned char *body;
-  long body_len;
-} ogg_page;
-
-/* ogg_stream_state contains the current encode/decode state of a logical
-   Ogg bitstream **********************************************************/
-
-typedef struct {
-  unsigned char   *body_data;    /* bytes from packet bodies */
-  long    body_storage;          /* storage elements allocated */
-  long    body_fill;             /* elements stored; fill mark */
-  long    body_returned;         /* elements of fill returned */
-
-
-  int     *lacing_vals;      /* The values that will go to the segment table */
-  ogg_int64_t *granule_vals; /* granulepos values for headers. Not compact
-                                this way, but it is simple coupled to the
-                                lacing fifo */
-  long    lacing_storage;
-  long    lacing_fill;
-  long    lacing_packet;
-  long    lacing_returned;
-
-  unsigned char    header[282];      /* working space for header encode */
-  int              header_fill;
-
-  int     e_o_s;          /* set when we have buffered the last packet in the
-                             logical bitstream */
-  int     b_o_s;          /* set after we've written the initial page
-                             of a logical bitstream */
-  long    serialno;
-  long    pageno;
-  ogg_int64_t  packetno;  /* sequence number for decode; the framing
-                             knows where there's a hole in the data,
-                             but we need coupling so that the codec
-                             (which is in a seperate abstraction
-                             layer) also knows about the gap */
-  ogg_int64_t   granulepos;
-
-} ogg_stream_state;
-
-/* ogg_packet is used to encapsulate the data and metadata belonging
-   to a single raw Ogg/Vorbis packet *************************************/
-
-typedef struct {
-  unsigned char *packet;
-  long  bytes;
-  long  b_o_s;
-  long  e_o_s;
-
-  ogg_int64_t  granulepos;
-
-  ogg_int64_t  packetno;     /* sequence number for decode; the framing
-                                knows where there's a hole in the data,
-                                but we need coupling so that the codec
-                                (which is in a seperate abstraction
-                                layer) also knows about the gap */
-} ogg_packet;
-
-typedef struct {
-  unsigned char *data;
-  int storage;
-  int fill;
-  int returned;
-
-  int unsynced;
-  int headerbytes;
-  int bodybytes;
-} ogg_sync_state;
-
-/* Ogg BITSTREAM PRIMITIVES: bitstream ************************/
-
-extern void  oggpack_writeinit(oggpack_buffer *b);
-extern int   oggpack_writecheck(oggpack_buffer *b);
-extern void  oggpack_writetrunc(oggpack_buffer *b,long bits);
-extern void  oggpack_writealign(oggpack_buffer *b);
-extern void  oggpack_writecopy(oggpack_buffer *b,void *source,long bits);
-extern void  oggpack_reset(oggpack_buffer *b);
-extern void  oggpack_writeclear(oggpack_buffer *b);
-extern void  oggpack_readinit(oggpack_buffer *b,unsigned char *buf,int bytes);
-extern void  oggpack_write(oggpack_buffer *b,unsigned long value,int bits);
-extern long  oggpack_look(oggpack_buffer *b,int bits);
-extern long  oggpack_look1(oggpack_buffer *b);
-extern void  oggpack_adv(oggpack_buffer *b,int bits);
-extern void  oggpack_adv1(oggpack_buffer *b);
-extern long  oggpack_read(oggpack_buffer *b,int bits);
-extern long  oggpack_read1(oggpack_buffer *b);
-extern long  oggpack_bytes(oggpack_buffer *b);
-extern long  oggpack_bits(oggpack_buffer *b);
-extern unsigned char *oggpack_get_buffer(oggpack_buffer *b);
-
-extern void  oggpackB_writeinit(oggpack_buffer *b);
-extern int   oggpackB_writecheck(oggpack_buffer *b);
-extern void  oggpackB_writetrunc(oggpack_buffer *b,long bits);
-extern void  oggpackB_writealign(oggpack_buffer *b);
-extern void  oggpackB_writecopy(oggpack_buffer *b,void *source,long bits);
-extern void  oggpackB_reset(oggpack_buffer *b);
-extern void  oggpackB_writeclear(oggpack_buffer *b);
-extern void  oggpackB_readinit(oggpack_buffer *b,unsigned char *buf,int bytes);
-extern void  oggpackB_write(oggpack_buffer *b,unsigned long value,int bits);
-extern long  oggpackB_look(oggpack_buffer *b,int bits);
-extern long  oggpackB_look1(oggpack_buffer *b);
-extern void  oggpackB_adv(oggpack_buffer *b,int bits);
-extern void  oggpackB_adv1(oggpack_buffer *b);
-extern long  oggpackB_read(oggpack_buffer *b,int bits);
-extern long  oggpackB_read1(oggpack_buffer *b);
-extern long  oggpackB_bytes(oggpack_buffer *b);
-extern long  oggpackB_bits(oggpack_buffer *b);
-extern unsigned char *oggpackB_get_buffer(oggpack_buffer *b);
-
-/* Ogg BITSTREAM PRIMITIVES: encoding **************************/
-
-extern int      ogg_stream_packetin(ogg_stream_state *os, ogg_packet *op);
-extern int      ogg_stream_iovecin(ogg_stream_state *os, ogg_iovec_t *iov,
-                                   int count, long e_o_s, ogg_int64_t granulepos);
-extern int      ogg_stream_pageout(ogg_stream_state *os, ogg_page *og);
-extern int      ogg_stream_flush(ogg_stream_state *os, ogg_page *og);
-
-/* Ogg BITSTREAM PRIMITIVES: decoding **************************/
-
-extern int      ogg_sync_init(ogg_sync_state *oy);
-extern int      ogg_sync_clear(ogg_sync_state *oy);
-extern int      ogg_sync_reset(ogg_sync_state *oy);
-extern int      ogg_sync_destroy(ogg_sync_state *oy);
-extern int      ogg_sync_check(ogg_sync_state *oy);
-
-extern char    *ogg_sync_buffer(ogg_sync_state *oy, long size);
-extern int      ogg_sync_wrote(ogg_sync_state *oy, long bytes);
-extern long     ogg_sync_pageseek(ogg_sync_state *oy,ogg_page *og);
-extern int      ogg_sync_pageout(ogg_sync_state *oy, ogg_page *og);
-extern int      ogg_stream_pagein(ogg_stream_state *os, ogg_page *og);
-extern int      ogg_stream_packetout(ogg_stream_state *os,ogg_packet *op);
-extern int      ogg_stream_packetpeek(ogg_stream_state *os,ogg_packet *op);
-
-/* Ogg BITSTREAM PRIMITIVES: general ***************************/
-
-extern int      ogg_stream_init(ogg_stream_state *os,int serialno);
-extern int      ogg_stream_clear(ogg_stream_state *os);
-extern int      ogg_stream_reset(ogg_stream_state *os);
-extern int      ogg_stream_reset_serialno(ogg_stream_state *os,int serialno);
-extern int      ogg_stream_destroy(ogg_stream_state *os);
-extern int      ogg_stream_check(ogg_stream_state *os);
-extern int      ogg_stream_eos(ogg_stream_state *os);
-
-extern void     ogg_page_checksum_set(ogg_page *og);
-
-extern int      ogg_page_version(const ogg_page *og);
-extern int      ogg_page_continued(const ogg_page *og);
-extern int      ogg_page_bos(const ogg_page *og);
-extern int      ogg_page_eos(const ogg_page *og);
-extern ogg_int64_t  ogg_page_granulepos(const ogg_page *og);
-extern int      ogg_page_serialno(const ogg_page *og);
-extern long     ogg_page_pageno(const ogg_page *og);
-extern int      ogg_page_packets(const ogg_page *og);
-
-extern void     ogg_packet_clear(ogg_packet *op);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* _OGG_H */
diff --git a/lib-x86-32/include/ogg/os_types.h b/lib-x86-32/include/ogg/os_types.h
deleted file mode 100644
index f6f8b381..00000000
--- a/lib-x86-32/include/ogg/os_types.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/********************************************************************
- *                                                                  *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
- *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2002             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
- *                                                                  *
- ********************************************************************
-
- function: #ifdef jail to whip a few platforms into the UNIX ideal.
- last mod: $Id: os_types.h 16649 2009-10-25 00:49:58Z ds $
-
- ********************************************************************/
-#ifndef _OS_TYPES_H
-#define _OS_TYPES_H
-
-/* make it easy on the folks that want to compile the libs with a
-   different malloc than stdlib */
-#define _ogg_malloc  malloc
-#define _ogg_calloc  calloc
-#define _ogg_realloc realloc
-#define _ogg_free    free
-
-#if defined(_WIN32) 
-
-#  if defined(__CYGWIN__)
-#    include <stdint.h>
-     typedef int16_t ogg_int16_t;
-     typedef uint16_t ogg_uint16_t;
-     typedef int32_t ogg_int32_t;
-     typedef uint32_t ogg_uint32_t;
-     typedef int64_t ogg_int64_t;
-     typedef uint64_t ogg_uint64_t;
-#  elif defined(__MINGW32__)
-#    include <sys/types.h>
-     typedef short ogg_int16_t;
-     typedef unsigned short ogg_uint16_t;
-     typedef int ogg_int32_t;
-     typedef unsigned int ogg_uint32_t;
-     typedef long long ogg_int64_t;
-     typedef unsigned long long ogg_uint64_t;
-#  elif defined(__MWERKS__)
-     typedef long long ogg_int64_t;
-     typedef int ogg_int32_t;
-     typedef unsigned int ogg_uint32_t;
-     typedef short ogg_int16_t;
-     typedef unsigned short ogg_uint16_t;
-#  else
-     /* MSVC/Borland */
-     typedef __int64 ogg_int64_t;
-     typedef __int32 ogg_int32_t;
-     typedef unsigned __int32 ogg_uint32_t;
-     typedef __int16 ogg_int16_t;
-     typedef unsigned __int16 ogg_uint16_t;
-#  endif
-
-#elif defined(__MACOS__)
-
-#  include <sys/types.h>
-   typedef SInt16 ogg_int16_t;
-   typedef UInt16 ogg_uint16_t;
-   typedef SInt32 ogg_int32_t;
-   typedef UInt32 ogg_uint32_t;
-   typedef SInt64 ogg_int64_t;
-
-#elif (defined(__APPLE__) && defined(__MACH__)) /* MacOS X Framework build */
-
-#  include <sys/types.h>
-   typedef int16_t ogg_int16_t;
-   typedef u_int16_t ogg_uint16_t;
-   typedef int32_t ogg_int32_t;
-   typedef u_int32_t ogg_uint32_t;
-   typedef int64_t ogg_int64_t;
-
-#elif defined(__HAIKU__)
-
-  /* Haiku */
-#  include <sys/types.h>
-   typedef short ogg_int16_t;
-   typedef unsigned short ogg_uint16_t;
-   typedef int ogg_int32_t;
-   typedef unsigned int ogg_uint32_t;
-   typedef long long ogg_int64_t;
-
-#elif defined(__BEOS__)
-
-   /* Be */
-#  include <inttypes.h>
-   typedef int16_t ogg_int16_t;
-   typedef u_int16_t ogg_uint16_t;
-   typedef int32_t ogg_int32_t;
-   typedef u_int32_t ogg_uint32_t;
-   typedef int64_t ogg_int64_t;
-
-#elif defined (__EMX__)
-
-   /* OS/2 GCC */
-   typedef short ogg_int16_t;
-   typedef unsigned short ogg_uint16_t;
-   typedef int ogg_int32_t;
-   typedef unsigned int ogg_uint32_t;
-   typedef long long ogg_int64_t;
-
-#elif defined (DJGPP)
-
-   /* DJGPP */
-   typedef short ogg_int16_t;
-   typedef int ogg_int32_t;
-   typedef unsigned int ogg_uint32_t;
-   typedef long long ogg_int64_t;
-
-#elif defined(R5900)
-
-   /* PS2 EE */
-   typedef long ogg_int64_t;
-   typedef int ogg_int32_t;
-   typedef unsigned ogg_uint32_t;
-   typedef short ogg_int16_t;
-
-#elif defined(__SYMBIAN32__)
-
-   /* Symbian GCC */
-   typedef signed short ogg_int16_t;
-   typedef unsigned short ogg_uint16_t;
-   typedef signed int ogg_int32_t;
-   typedef unsigned int ogg_uint32_t;
-   typedef long long int ogg_int64_t;
-
-#elif defined(__TMS320C6X__)
-
-   /* TI C64x compiler */
-   typedef signed short ogg_int16_t;
-   typedef unsigned short ogg_uint16_t;
-   typedef signed int ogg_int32_t;
-   typedef unsigned int ogg_uint32_t;
-   typedef long long int ogg_int64_t;
-
-#else
-
-#  include <sys/types.h>
-#  include <ogg/config_types.h>
-
-#endif
-
-#endif  /* _OS_TYPES_H */
diff --git a/lib-x86-32/include/png.h b/lib-x86-32/include/png.h
deleted file mode 100644
index 0af42b17..00000000
--- a/lib-x86-32/include/png.h
+++ /dev/null
@@ -1,2309 +0,0 @@
-
-/* png.h - header file for PNG reference library
- *
- * libpng version 1.5.2 - March 31, 2011
- * Copyright (c) 1998-2011 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.5.2 - March 31, 2011: 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]
- *
- *   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 "rcN".
- *
- *   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.5.2, March 31, 2011, are
- * Copyright (c) 2004, 2006-2011 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:
- * =========================
- *
- *    March 31, 2011
- *
- *    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.5.2 are Y2K compliant.  It is my belief that
- *    earlier versions were also Y2K compliant.
- *
- *    Libpng only has three year fields.  One is a 2-byte unsigned integer
- *    that will hold years up to 65535.  The other two hold the date in text
- *    format, and will hold years up to 9999.
- *
- *    The integer is
- *        "png_uint_16 year" in png_time_struct.
- *
- *    The strings are
- *        "png_charp time_buffer" in png_struct and
- *        "near_time_buffer", which is a local character string in png.c.
- *
- *    There are seven time-related functions:
- *        png.c: png_convert_to_rfc_1123() in png.c
- *          (formerly png_convert_to_rfc_1152() in error)
- *        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 applications using
- *    libpng are not passing 4-digit years into the png_convert_to_rfc_1123()
- *    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.
- */
-
-/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.5.2"
-#define PNG_HEADER_VERSION_STRING \
-     " libpng version 1.5.2 - March 31, 2011\n"
-
-#define PNG_LIBPNG_VER_SONUM   15
-#define PNG_LIBPNG_VER_DLLNUM  15
-
-/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
-#define PNG_LIBPNG_VER_MAJOR   1
-#define PNG_LIBPNG_VER_MINOR   5
-#define PNG_LIBPNG_VER_RELEASE 2
-/* 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_BETA
-
-/* 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 10502 /* 1.5.2 */
-
-/* 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
-#  ifndef PNG_BUILDING_SYMBOL_TABLE
-  /*
-   *   Standard header files (not needed for the version info or while
-   *   building symbol table -- see scripts/pnglibconf.dfa)
-   */
-#    ifdef PNG_SETJMP_SUPPORTED
-#      include <setjmp.h>
-#    endif
-
-    /* Need the time information for converting tIME chunks, it
-     * defines struct tm:
-     */
-#    ifdef PNG_CONVERT_tIME_SUPPORTED
-       /* "time.h" functions are not supported on all operating systems */
-#      include <time.h>
-#    endif
-#  endif
-
-/* 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.
- *
- * 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_5_2;
-
-/* 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 FAR * png_colorp;
-typedef PNG_CONST png_color FAR * png_const_colorp;
-typedef png_color FAR * FAR * 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 FAR * png_color_16p;
-typedef PNG_CONST png_color_16 FAR * png_const_color_16p;
-typedef png_color_16 FAR * FAR * 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 FAR * png_color_8p;
-typedef PNG_CONST png_color_8 FAR * png_const_color_8p;
-typedef png_color_8 FAR * FAR * 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 FAR * png_sPLT_entryp;
-typedef PNG_CONST png_sPLT_entry FAR * png_const_sPLT_entryp;
-typedef png_sPLT_entry FAR * FAR * 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 FAR * png_sPLT_tp;
-typedef PNG_CONST png_sPLT_t FAR * png_const_sPLT_tp;
-typedef png_sPLT_t FAR * FAR * 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", "lang", and
- * "lang_key" fields can be regular C strings, empty strings, or NULL pointers.
- * However, the * structure returned by png_get_text() will always contain
- * regular zero-terminated C strings (possibly empty), never NULL pointers,
- * so they can be safely used in printf() and other string-handling functions.
- */
-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 FAR * png_textp;
-typedef PNG_CONST png_text FAR * png_const_textp;
-typedef png_text FAR * FAR * 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 FAR * png_timep;
-typedef PNG_CONST png_time FAR * png_const_timep;
-typedef png_time FAR * FAR * png_timepp;
-
-#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED) || \
-    defined(PNG_HANDLE_AS_UNKNOWN_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.
- */
-typedef struct png_unknown_chunk_t
-{
-    png_byte name[5];
-    png_byte *data;
-    png_size_t size;
-
-    /* libpng-using applications should NOT directly modify this byte. */
-    png_byte location; /* mode of operation at read time */
-}
-png_unknown_chunk;
-typedef png_unknown_chunk FAR * png_unknown_chunkp;
-typedef PNG_CONST png_unknown_chunk FAR * png_const_unknown_chunkp;
-typedef png_unknown_chunk FAR * FAR * png_unknown_chunkpp;
-#endif
-
-typedef struct png_info_def png_info;
-typedef png_info FAR * png_infop;
-typedef PNG_CONST png_info FAR * png_const_infop;
-typedef png_info FAR * FAR * png_infopp;
-
-/* 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
-
-/* 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 0x8000L  /* 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 FAR * png_row_infop;
-typedef png_row_info FAR * FAR * 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 struct png_struct_def png_struct;
-typedef PNG_CONST png_struct FAR * png_const_structp;
-typedef png_struct FAR * png_structp;
-
-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
-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.  (Note that
- * PNG_PTR_NORETURN is used here because current versions of the Microsoft
- * C compiler do not support the PNG_NORETURN attribute on a pointer.)
- *
- * If you get a type warning from the compiler when linking against this line
- * then your compiler has 'longjmp' that does not match the requirements of the
- * compiler that built libpng.  You will have to write a wrapper function for
- * your compiler's longjmp and call png_set_longjmp_fn directly (not via the
- * png_jmpbuf macro.)
- *
- * If you get a warning here while building the library you will 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!
- */
-typedef PNG_FUNCTION(void, (PNGCAPI *png_longjmp_ptr), PNGARG((jmp_buf, int)),
-   PNG_PTR_NORETURN);
-#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 */
-
-/* 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));
-
-typedef png_struct FAR * FAR * png_structpp;
-
-/* 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_structp 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_structp png_ptr));
-
-PNG_EXPORT(7, void, png_set_compression_buffer_size, (png_structp 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_structp 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_structp png_ptr, int val),
-    PNG_NORETURN);
-
-#ifdef PNG_READ_SUPPORTED
-/* Reset the compression stream */
-PNG_EXPORT(10, int, png_reset_zstream, (png_structp png_ptr));
-#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_structp png_ptr));
-
-/* Write a PNG chunk - size, type, (optional) data, CRC. */
-PNG_EXPORT(14, void, png_write_chunk, (png_structp 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_structp 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_structp 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_structp png_ptr));
-
-/* Allocate and initialize the info structure */
-PNG_EXPORTA(18, png_infop, png_create_info_struct, (png_structp png_ptr),
-    PNG_ALLOCATED);
-
-PNG_EXPORT(19, void, png_info_init_3, (png_infopp info_ptr,
-    png_size_t png_info_struct_size));
-
-/* Writes all the PNG information before the image. */
-PNG_EXPORT(20, void, png_write_info_before_PLTE,
-    (png_structp png_ptr, png_infop info_ptr));
-PNG_EXPORT(21, void, png_write_info,
-    (png_structp png_ptr, png_infop info_ptr));
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read the information before the actual image data. */
-PNG_EXPORT(22, void, png_read_info,
-    (png_structp png_ptr, png_infop info_ptr));
-#endif
-
-#ifdef PNG_TIME_RFC1123_SUPPORTED
-PNG_EXPORT(23, png_const_charp, png_convert_to_rfc1123,
-    (png_structp png_ptr,
-    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,
-    PNG_CONST struct tm FAR * 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 /* PNG_CONVERT_tIME_SUPPORTED */
-
-#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_structp png_ptr));
-PNG_EXPORT(27, void, png_set_expand_gray_1_2_4_to_8, (png_structp png_ptr));
-PNG_EXPORT(28, void, png_set_palette_to_rgb, (png_structp png_ptr));
-PNG_EXPORT(29, void, png_set_tRNS_to_alpha, (png_structp 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_structp 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_structp 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_structp png_ptr));
-#endif
-
-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-/* Reduce RGB to grayscale. */
-PNG_FP_EXPORT(32, void, png_set_rgb_to_gray, (png_structp png_ptr,
-    int error_action, double red, double green));
-PNG_FIXED_EXPORT(33, void, png_set_rgb_to_gray_fixed, (png_structp 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_structp
-    png_ptr));
-#endif
-
-PNG_EXPORT(35, void, png_build_grayscale_palette, (int bit_depth,
-    png_colorp palette));
-
-#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
-PNG_EXPORT(36, void, png_set_strip_alpha, (png_structp 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_structp 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_structp 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_structp 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_structp png_ptr, png_uint_32 filler,
-    int flags));
-#endif /* PNG_READ_FILLER_SUPPORTED || PNG_WRITE_FILLER_SUPPORTED */
-
-#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_structp 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_structp 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_structp 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_structp 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_structp 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_structp png_ptr));
-#endif
-
-#ifdef PNG_READ_BACKGROUND_SUPPORTED
-/* Handle alpha and tRNS by replacing with a background color. */
-PNG_FP_EXPORT(47, void, png_set_background, (png_structp 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_structp 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_16_TO_8_SUPPORTED
-/* Strip the second byte of information from a 16-bit depth file. */
-PNG_EXPORT(48, void, png_set_strip_16, (png_structp 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_structp 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) */
-PNG_FP_EXPORT(50, void, png_set_gamma,
-    (png_structp png_ptr, double screen_gamma,
-    double default_file_gamma));
-PNG_FIXED_EXPORT(208, void, png_set_gamma_fixed, (png_structp png_ptr,
-    png_fixed_point screen_gamma, png_fixed_point default_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_structp png_ptr, int nrows));
-/* Flush the current PNG output buffer */
-PNG_EXPORT(52, void, png_write_flush, (png_structp png_ptr));
-#endif
-
-/* Optional update palette with requested transformations */
-PNG_EXPORT(53, void, png_start_read_image, (png_structp png_ptr));
-
-/* Optional call to update the users info structure */
-PNG_EXPORT(54, void, png_read_update_info,
-    (png_structp png_ptr, png_infop info_ptr));
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read one or more rows of image data. */
-PNG_EXPORT(55, void, png_read_rows, (png_structp 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_structp 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_structp png_ptr, png_bytepp image));
-#endif
-
-/* Write a row of image data */
-PNG_EXPORT(58, void, png_write_row,
-    (png_structp 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_structp png_ptr, png_bytepp row,
-    png_uint_32 num_rows));
-
-/* Write the image data */
-PNG_EXPORT(60, void, png_write_image,
-    (png_structp png_ptr, png_bytepp image));
-
-/* Write the end of the PNG file. */
-PNG_EXPORT(61, void, png_write_end,
-    (png_structp png_ptr, png_infop info_ptr));
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read the end of the PNG file. */
-PNG_EXPORT(62, void, png_read_end, (png_structp png_ptr, png_infop info_ptr));
-#endif
-
-/* Free any memory associated with the png_info_struct */
-PNG_EXPORT(63, void, png_destroy_info_struct, (png_structp 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_structp 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_structp 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_structp 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_structp png_ptr,
-    int heuristic_method, int num_weights, png_const_fixed_point_p
-    filter_weights, png_const_fixed_point_p filter_costs));
-#endif /*  PNG_WRITE_WEIGHTED_FILTER_SUPPORTED */
-
-/* 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 */
-
-/* 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_structp png_ptr, int level));
-
-PNG_EXPORT(70, void, png_set_compression_mem_level, (png_structp png_ptr,
-    int mem_level));
-
-PNG_EXPORT(71, void, png_set_compression_strategy, (png_structp png_ptr,
-    int strategy));
-
-PNG_EXPORT(72, void, png_set_compression_window_bits, (png_structp png_ptr,
-    int window_bits));
-
-PNG_EXPORT(73, void, png_set_compression_method, (png_structp png_ptr,
-    int method));
-
-/* 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_structp 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_structp 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_structp 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_structp 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_structp 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_structp png_ptr));
-
-PNG_EXPORT(80, void, png_set_read_status_fn, (png_structp png_ptr,
-    png_read_status_ptr read_row_fn));
-
-PNG_EXPORT(81, void, png_set_write_status_fn, (png_structp 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_structp 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_structp png_ptr));
-#endif
-
-#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
-PNG_EXPORT(84, void, png_set_read_user_transform_fn, (png_structp 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_structp 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_structp 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_structp 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_structp));
-PNG_EXPORT(218, png_byte, png_get_current_pass_number, (png_const_structp));
-#endif
-
-#ifdef PNG_USER_CHUNKS_SUPPORTED
-PNG_EXPORT(88, void, png_set_read_user_chunk_fn, (png_structp png_ptr,
-    png_voidp user_chunk_ptr, png_user_chunk_ptr read_user_chunk_fn));
-PNG_EXPORT(89, png_voidp, png_get_user_chunk_ptr, (png_const_structp 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_structp 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_structp png_ptr));
-
-/* Function to be called when data becomes available */
-PNG_EXPORT(92, void, png_process_data,
-    (png_structp png_ptr, png_infop 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_structp, 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_structp));
-
-/* 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_structp png_ptr,
-    png_bytep old_row, png_const_bytep new_row));
-#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
-
-PNG_EXPORTA(94, png_voidp, png_malloc,
-    (png_structp png_ptr, png_alloc_size_t size),
-    PNG_ALLOCATED);
-/* Added at libpng version 1.4.0 */
-PNG_EXPORTA(95, png_voidp, png_calloc,
-    (png_structp 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_structp png_ptr,
-    png_alloc_size_t size), PNG_ALLOCATED);
-
-/* Frees a pointer allocated by png_malloc() */
-PNG_EXPORT(97, void, png_free, (png_structp png_ptr, png_voidp ptr));
-
-/* Free data that was allocated internally */
-PNG_EXPORT(98, void, png_free_data,
-    (png_structp png_ptr, png_infop info_ptr, png_uint_32 free_me, int num));
-
-/* Reassign responsibility for freeing existing data, whether allocated
- * by libpng or by the application */
-PNG_EXPORT(99, void, png_data_freer,
-    (png_structp png_ptr, png_infop 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
-#define PNG_FREE_UNKN 0x0200
-#define PNG_FREE_LIST 0x0400
-#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_structp png_ptr,
-    png_alloc_size_t size), PNG_ALLOCATED);
-PNG_EXPORT(101, void, png_free_default, (png_structp png_ptr, png_voidp ptr));
-#endif
-
-#ifdef PNG_ERROR_TEXT_SUPPORTED
-/* Fatal error in PNG image of libpng - can't continue */
-PNG_EXPORTA(102, void, png_error,
-    (png_structp 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_structp 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_structp png_ptr), PNG_NORETURN);
-#endif
-
-/* Non-fatal error in libpng.  Can continue, but may have a problem. */
-PNG_EXPORT(105, void, png_warning, (png_structp 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_structp png_ptr,
-    png_const_charp warning_message));
-
-#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. */
-#  undef png_benign_error
-PNG_EXPORT(107, void, png_benign_error, (png_structp png_ptr,
-    png_const_charp warning_message));
-
-/* Same, chunk name is prepended to message. */
-#  undef png_chunk_benign_error
-PNG_EXPORT(108, void, png_chunk_benign_error, (png_structp png_ptr,
-    png_const_charp warning_message));
-
-PNG_EXPORT(109, void, png_set_benign_errors,
-    (png_structp 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_structp png_ptr, png_const_infop 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_structp png_ptr,
-    png_const_infop 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_structp png_ptr, png_const_infop 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_structp png_ptr,
-    png_infop info_ptr, png_bytepp row_pointers));
-#endif
-
-/* Returns number of color channels in image. */
-PNG_EXPORT(114, png_byte, png_get_channels,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-
-#ifdef PNG_EASY_ACCESS_SUPPORTED
-/* Returns image width in pixels. */
-PNG_EXPORT(115, png_uint_32, png_get_image_width, (png_const_structp png_ptr,
-    png_const_infop info_ptr));
-
-/* Returns image height in pixels. */
-PNG_EXPORT(116, png_uint_32, png_get_image_height, (png_const_structp png_ptr,
-    png_const_infop info_ptr));
-
-/* Returns image bit_depth. */
-PNG_EXPORT(117, png_byte, png_get_bit_depth,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-
-/* Returns image color_type. */
-PNG_EXPORT(118, png_byte, png_get_color_type, (png_const_structp png_ptr,
-    png_const_infop info_ptr));
-
-/* Returns image filter_type. */
-PNG_EXPORT(119, png_byte, png_get_filter_type, (png_const_structp png_ptr,
-    png_const_infop info_ptr));
-
-/* Returns image interlace_type. */
-PNG_EXPORT(120, png_byte, png_get_interlace_type, (png_const_structp png_ptr,
-    png_const_infop info_ptr));
-
-/* Returns image compression_type. */
-PNG_EXPORT(121, png_byte, png_get_compression_type, (png_const_structp png_ptr,
-    png_const_infop 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_structp png_ptr, png_const_infop info_ptr));
-PNG_EXPORT(123, png_uint_32, png_get_x_pixels_per_meter,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-PNG_EXPORT(124, png_uint_32, png_get_y_pixels_per_meter,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-
-/* Returns pixel aspect ratio, computed from pHYs chunk data.  */
-PNG_FP_EXPORT(125, float, png_get_pixel_aspect_ratio,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-PNG_FIXED_EXPORT(210, png_fixed_point, png_get_pixel_aspect_ratio_fixed,
-    (png_const_structp png_ptr, png_const_infop 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_structp png_ptr, png_const_infop info_ptr));
-PNG_EXPORT(127, png_int_32, png_get_y_offset_pixels,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-PNG_EXPORT(128, png_int_32, png_get_x_offset_microns,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-PNG_EXPORT(129, png_int_32, png_get_y_offset_microns,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-
-#endif /* PNG_EASY_ACCESS_SUPPORTED */
-
-/* Returns pointer to signature string read from PNG header */
-PNG_EXPORT(130, png_const_bytep, png_get_signature,
-    (png_const_structp png_ptr, png_infop info_ptr));
-
-#ifdef PNG_bKGD_SUPPORTED
-PNG_EXPORT(131, png_uint_32, png_get_bKGD,
-    (png_const_structp png_ptr, png_infop info_ptr,
-    png_color_16p *background));
-#endif
-
-#ifdef PNG_bKGD_SUPPORTED
-PNG_EXPORT(132, void, png_set_bKGD, (png_structp png_ptr, png_infop info_ptr,
-    png_const_color_16p background));
-#endif
-
-#ifdef PNG_cHRM_SUPPORTED
-PNG_FP_EXPORT(133, png_uint_32, png_get_cHRM, (png_const_structp png_ptr,
-   png_const_infop 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));
-#ifdef PNG_FIXED_POINT_SUPPORTED /* Otherwise not implemented */
-PNG_FIXED_EXPORT(134, png_uint_32, png_get_cHRM_fixed,
-    (png_const_structp png_ptr,
-    png_const_infop 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));
-#endif
-#endif
-
-#ifdef PNG_cHRM_SUPPORTED
-PNG_FP_EXPORT(135, void, png_set_cHRM,
-    (png_structp png_ptr, png_infop 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_FIXED_EXPORT(136, void, png_set_cHRM_fixed, (png_structp png_ptr,
-    png_infop 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));
-#endif
-
-#ifdef PNG_gAMA_SUPPORTED
-PNG_FP_EXPORT(137, png_uint_32, png_get_gAMA,
-    (png_const_structp png_ptr, png_const_infop info_ptr,
-    double *file_gamma));
-PNG_FIXED_EXPORT(138, png_uint_32, png_get_gAMA_fixed,
-    (png_const_structp png_ptr, png_const_infop info_ptr,
-    png_fixed_point *int_file_gamma));
-#endif
-
-#ifdef PNG_gAMA_SUPPORTED
-PNG_FP_EXPORT(139, void, png_set_gAMA, (png_structp png_ptr,
-    png_infop info_ptr, double file_gamma));
-PNG_FIXED_EXPORT(140, void, png_set_gAMA_fixed, (png_structp png_ptr,
-    png_infop info_ptr, png_fixed_point int_file_gamma));
-#endif
-
-#ifdef PNG_hIST_SUPPORTED
-PNG_EXPORT(141, png_uint_32, png_get_hIST,
-    (png_const_structp png_ptr, png_const_infop info_ptr,
-    png_uint_16p *hist));
-#endif
-
-#ifdef PNG_hIST_SUPPORTED
-PNG_EXPORT(142, void, png_set_hIST, (png_structp png_ptr,
-    png_infop info_ptr, png_const_uint_16p hist));
-#endif
-
-PNG_EXPORT(143, png_uint_32, png_get_IHDR,
-    (png_structp png_ptr, png_infop 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_structp png_ptr, png_infop 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_structp png_ptr, png_const_infop 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_structp png_ptr, png_infop 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_structp png_ptr, png_const_infop 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_structp png_ptr,
-    png_infop 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_structp png_ptr, png_const_infop 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_structp png_ptr, png_infop 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_structp png_ptr, png_const_infop info_ptr,
-    png_colorp *palette, int *num_palette));
-
-PNG_EXPORT(152, void, png_set_PLTE,
-    (png_structp png_ptr, png_infop info_ptr,
-    png_const_colorp palette, int num_palette));
-
-#ifdef PNG_sBIT_SUPPORTED
-PNG_EXPORT(153, png_uint_32, png_get_sBIT,
-    (png_const_structp png_ptr, png_infop info_ptr,
-    png_color_8p *sig_bit));
-#endif
-
-#ifdef PNG_sBIT_SUPPORTED
-PNG_EXPORT(154, void, png_set_sBIT,
-    (png_structp png_ptr, png_infop info_ptr, png_const_color_8p sig_bit));
-#endif
-
-#ifdef PNG_sRGB_SUPPORTED
-PNG_EXPORT(155, png_uint_32, png_get_sRGB, (png_const_structp png_ptr,
-    png_const_infop info_ptr, int *file_srgb_intent));
-#endif
-
-#ifdef PNG_sRGB_SUPPORTED
-PNG_EXPORT(156, void, png_set_sRGB,
-    (png_structp png_ptr, png_infop info_ptr, int srgb_intent));
-PNG_EXPORT(157, void, png_set_sRGB_gAMA_and_cHRM, (png_structp png_ptr,
-    png_infop info_ptr, int srgb_intent));
-#endif
-
-#ifdef PNG_iCCP_SUPPORTED
-PNG_EXPORT(158, png_uint_32, png_get_iCCP,
-    (png_const_structp png_ptr, png_const_infop 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_structp png_ptr, png_infop 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, png_uint_32, png_get_sPLT,
-    (png_const_structp png_ptr, png_const_infop info_ptr,
-    png_sPLT_tpp entries));
-#endif
-
-#ifdef PNG_sPLT_SUPPORTED
-PNG_EXPORT(161, void, png_set_sPLT,
-    (png_structp png_ptr, png_infop 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, png_uint_32, png_get_text,
-    (png_const_structp png_ptr, png_const_infop 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_structp png_ptr, png_infop 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_structp png_ptr, png_infop info_ptr, png_timep *mod_time));
-#endif
-
-#ifdef PNG_tIME_SUPPORTED
-PNG_EXPORT(165, void, png_set_tIME,
-    (png_structp png_ptr, png_infop info_ptr, png_const_timep mod_time));
-#endif
-
-#ifdef PNG_tRNS_SUPPORTED
-PNG_EXPORT(166, png_uint_32, png_get_tRNS,
-    (png_const_structp png_ptr, png_infop 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_structp png_ptr, png_infop 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_structp png_ptr, png_const_infop info_ptr,
-    int *unit, double *width, double *height));
-#ifdef PNG_FLOATING_ARITHMETIC_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_structp png_ptr, png_const_infop 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_structp png_ptr, png_const_infop info_ptr,
-    int *unit, png_charpp swidth, png_charpp sheight));
-
-PNG_FP_EXPORT(170, void, png_set_sCAL,
-    (png_structp png_ptr, png_infop info_ptr,
-    int unit, double width, double height));
-PNG_FIXED_EXPORT(213, void, png_set_sCAL_fixed, (png_structp png_ptr,
-   png_infop info_ptr, int unit, png_fixed_point width,
-   png_fixed_point height));
-PNG_EXPORT(171, void, png_set_sCAL_s,
-    (png_structp png_ptr, png_infop info_ptr,
-    int unit, png_const_charp swidth, png_const_charp sheight));
-#endif /* PNG_sCAL_SUPPORTED */
-
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-/* Provide a list of chunks and how they are to be handled, if the built-in
-   handling or default unknown chunk handling is not desired.  Any chunks not
-   listed will be handled in the default manner.  The IHDR and IEND chunks
-   must not be listed.
-      keep = 0: follow default behaviour
-           = 1: do not keep
-           = 2: keep only if safe-to-copy
-           = 3: keep even if unsafe-to-copy
-*/
-PNG_EXPORT(172, void, png_set_keep_unknown_chunks,
-    (png_structp png_ptr, int keep,
-    png_const_bytep chunk_list, int num_chunks));
-PNG_EXPORT(173, int, png_handle_as_unknown, (png_structp png_ptr,
-    png_const_bytep chunk_name));
-#endif
-#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
-PNG_EXPORT(174, void, png_set_unknown_chunks, (png_structp png_ptr,
-    png_infop info_ptr, png_const_unknown_chunkp unknowns,
-    int num_unknowns));
-PNG_EXPORT(175, void, png_set_unknown_chunk_location,
-    (png_structp png_ptr, png_infop info_ptr, int chunk, int location));
-PNG_EXPORT(176, int, png_get_unknown_chunks, (png_const_structp png_ptr,
-    png_const_infop 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_structp png_ptr, png_infop info_ptr, int mask));
-
-#ifdef PNG_INFO_IMAGE_SUPPORTED
-/* The "params" pointer is currently not used and is for future expansion. */
-PNG_EXPORT(178, void, png_read_png, (png_structp png_ptr, png_infop info_ptr,
-    int transforms, png_voidp params));
-PNG_EXPORT(179, void, png_write_png, (png_structp png_ptr, png_infop info_ptr,
-    int transforms, png_voidp params));
-#endif
-
-PNG_EXPORT(180, png_const_charp, png_get_copyright,
-    (png_const_structp png_ptr));
-PNG_EXPORT(181, png_const_charp, png_get_header_ver,
-    (png_const_structp png_ptr));
-PNG_EXPORT(182, png_const_charp, png_get_header_version,
-    (png_const_structp png_ptr));
-PNG_EXPORT(183, png_const_charp, png_get_libpng_ver,
-    (png_const_structp png_ptr));
-
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-PNG_EXPORT(184, png_uint_32, png_permit_mng_features, (png_structp 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
-
-/* 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_structp 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_structp 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_structp png_ptr));
-PNG_EXPORT(188, png_uint_32, png_get_user_height_max,
-    (png_const_structp png_ptr));
-/* Added in libpng-1.4.0 */
-PNG_EXPORT(189, void, png_set_chunk_cache_max, (png_structp png_ptr,
-    png_uint_32 user_chunk_cache_max));
-PNG_EXPORT(190, png_uint_32, png_get_chunk_cache_max,
-    (png_const_structp png_ptr));
-/* Added in libpng-1.4.1 */
-PNG_EXPORT(191, void, png_set_chunk_malloc_max, (png_structp png_ptr,
-    png_alloc_size_t user_chunk_cache_max));
-PNG_EXPORT(192, png_alloc_size_t, png_get_chunk_malloc_max,
-    (png_const_structp png_ptr));
-#endif
-
-#if defined(PNG_INCH_CONVERSIONS_SUPPORTED)
-PNG_EXPORT(193, png_uint_32, png_get_pixels_per_inch,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-
-PNG_EXPORT(194, png_uint_32, png_get_x_pixels_per_inch,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-
-PNG_EXPORT(195, png_uint_32, png_get_y_pixels_per_inch,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-
-PNG_FP_EXPORT(196, float, png_get_x_offset_inches,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-#ifdef PNG_FIXED_POINT_SUPPORTED /* otherwise not implemented. */
-PNG_FIXED_EXPORT(211, png_fixed_point, png_get_x_offset_inches_fixed,
-    (png_structp png_ptr, png_const_infop info_ptr));
-#endif
-
-PNG_FP_EXPORT(197, float, png_get_y_offset_inches, (png_const_structp png_ptr,
-    png_const_infop info_ptr));
-#ifdef PNG_FIXED_POINT_SUPPORTED /* otherwise not implemented. */
-PNG_FIXED_EXPORT(212, png_fixed_point, png_get_y_offset_inches_fixed,
-    (png_structp png_ptr, png_const_infop info_ptr));
-#endif
-
-#  ifdef PNG_pHYs_SUPPORTED
-PNG_EXPORT(198, png_uint_32, png_get_pHYs_dpi, (png_const_structp png_ptr,
-    png_const_infop info_ptr, png_uint_32 *res_x, png_uint_32 *res_y,
-    int *unit_type));
-#  endif /* PNG_pHYs_SUPPORTED */
-#endif  /* PNG_INCH_CONVERSIONS_SUPPORTED */
-
-/* Added in libpng-1.4.0 */
-#ifdef PNG_IO_STATE_SUPPORTED
-PNG_EXPORT(199, png_uint_32, png_get_io_state, (png_structp png_ptr));
-
-PNG_EXPORTA(200, png_const_bytep, png_get_io_chunk_name,
-    (png_structp png_ptr), PNG_DEPRECATED);
-PNG_EXPORT(216, png_uint_32, png_get_io_chunk_type,
-    (png_const_structp 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 /* ?PNG_IO_STATE_SUPPORTED */
-
-/* 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) (((1U&~(pass))<<(3-((pass)>>1)))&7)
-#define PNG_PASS_START_COL(pass) (((1U& (pass))<<(3-(((pass)+1)>>1)))&7)
-
-/* 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(yIn, pass) \
-   (((yIn)<<PNG_PASS_ROW_SHIFT(pass))+PNG_PASS_START_ROW(pass))
-#define PNG_COL_FROM_PASS_COL(xIn, pass) \
-   (((xIn)<<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) ( \
-   ((0x110145AFU>>(((7-(off))-(pass))<<2)) & 0xFU) | \
-   ((0x01145AF0U>>(((7-(off))-(pass))<<2)) & 0xF0U))
-
-#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)) + (png_uint_16)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)*(png_uint_32)(65535L        \
-           - (png_uint_32)(alpha)) + (png_uint_32)32768L); \
-       (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)) +       \
-     (png_uint_16)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)(65535L - (png_uint_32)(alpha)) +        \
-     (png_uint_32)32767) / (png_uint_32)65535L)
-#endif /* PNG_READ_COMPOSITE_NODIV_SUPPORTED */
-
-#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_structp 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)))
-#endif
-
-/* Maintainer: Put new public prototypes here ^, in libpng.3, and project
- * defs
- */
-
-/* The last ordinal number (this is the *last* one already used; the next
- * one to use is one more than this.)  Maintainer, remember to add an entry to
- * scripts/symbols.def as well.
- */
-#ifdef PNG_EXPORT_LAST_ORDINAL
-  PNG_EXPORT_LAST_ORDINAL(221);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* PNG_VERSION_INFO_ONLY */
-/* Do not put anything past this line */
-#endif /* PNG_H */
diff --git a/lib-x86-32/include/pngconf.h b/lib-x86-32/include/pngconf.h
deleted file mode 100644
index c82fa586..00000000
--- a/lib-x86-32/include/pngconf.h
+++ /dev/null
@@ -1,649 +0,0 @@
-
-/* pngconf.h - machine configurable file for libpng
- *
- * libpng version 1.5.2 - March 31, 2011
- *
- * Copyright (c) 1998-2011 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
-
-#ifndef PNG_BUILDING_SYMBOL_TABLE
-/* PNG_NO_LIMITS_H may be used to turn off the use of the standard C
- * definition file for  machine specific limits, this may impact the
- * correctness of the definitons below (see uses of INT_MAX).
- */
-#  ifndef PNG_NO_LIMITS_H
-#    include <limits.h>
-#  endif
-
-/* For the memory copy APIs (i.e. the standard definitions of these),
- * because this file defines png_memcpy and so on the base APIs must
- * be defined here.
- */
-#  ifdef BSD
-#    include <strings.h>
-#  else
-#    include <string.h>
-#  endif
-
-/* For png_FILE_p - this provides the standard definition of a
- * FILE
- */
-#  ifdef PNG_STDIO_SUPPORTED
-#    include <stdio.h>
-#  endif
-#endif
-
-/* 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 to 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 protects us against machines that don't have function
- * prototypes (ie K&R style headers).  If your compiler does not handle
- * function prototypes, define this macro and use the included ansi2knr.
- * I've always been able to use _NO_PROTO as the indicator, but you may
- * need to drag the empty declaration out in front of here, or change the
- * ifdef to suit your own needs.
- */
-#ifndef PNGARG
-
-#  ifdef OF /* zlib prototype munger */
-#    define PNGARG(arglist) OF(arglist)
-#  else
-
-#    ifdef _NO_PROTO
-#      define PNGARG(arglist) ()
-#    else
-#      define PNGARG(arglist) arglist
-#    endif /* _NO_PROTO */
-
-#  endif /* OF */
-
-#endif /* PNGARG */
-
-/* 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.
- *
- * 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/x86 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__) ) &&\
-    ( defined(_X86_) || defined(_X64_) || defined(_M_IX86) ||\
-      defined(_M_X64) || defined(_M_IA64) )
-  /* Windows system (DOS doesn't support DLLs) running on x86/x64.  Includes
-   * builds under Cygwin or MinGW.  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
-#      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/x86 */
-#  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
-
-/* The default for PNG_IMPEXP depends on whether the library is
- * being built or used.
- */
-#ifndef PNG_IMPEXP
-#  ifdef PNGLIB_BUILD
-    /* Building the library */
-#    if (defined(DLL_EXPORT)/*from libtool*/ ||\
-        defined(_WINDLL) || defined(_DLL) || defined(__DLL__) ||\
-        defined(_USRDLL) ||\
-        defined(PNG_BUILD_DLL)) && defined(PNG_DLL_EXPORT)
-      /* Building a DLL. */
-#      define PNG_IMPEXP PNG_DLL_EXPORT
-#    endif /* DLL */
-#  else
-    /* Using the library */
-#    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
-#  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.
-   */
-#  if defined(__GNUC__)
-#    ifndef PNG_USE_RESULT
-#      define PNG_USE_RESULT __attribute__((__warn_unused_result__))
-#    endif
-#    ifndef PNG_NORETURN
-#      define PNG_NORETURN   __attribute__((__noreturn__))
-#    endif
-#    ifndef PNG_PTR_NORETURN
-       /* It's not enough to have the compiler be the correct compiler at
-        * this point - it's necessary for the library (which defines
-        * the type of the library longjmp) to also be the GNU library.
-        * This is because many systems use the GNU compiler with a
-        * non-GNU libc implementation.  Min/GW headers are also compatible
-        * with GCC as well as uclibc, so it seems best to exclude known
-        * problem libcs here rather than just including known libcs.
-        *
-        * NOTE: this relies on the only use of PNG_PTR_NORETURN being with
-        * the system longjmp.  If the same type is used elsewhere then this
-        * will need to be changed.
-        */
-#      if !defined(__CYGWIN__)
-#         define PNG_PTR_NORETURN   __attribute__((__noreturn__))
-#      endif
-#    endif
-#    ifndef PNG_ALLOCATED
-#      define PNG_ALLOCATED  __attribute__((__malloc__))
-#    endif
-
-    /* This specifically protects structure members that should only be
-     * accessed from within the library, therefore should be empty during
-     * a library build.
-     */
-#    ifndef PNGLIB_BUILD
-#      ifndef PNG_DEPRECATED
-#        define PNG_DEPRECATED __attribute__((__deprecated__))
-#      endif
-#      ifndef PNG_DEPSTRUCT
-#        define PNG_DEPSTRUCT  __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
-#    endif /* PNGLIB_BUILD */
-#  endif /* __GNUC__ */
-
-#  if 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_PTR_NORETURN
-#      define PNG_PTR_NORETURN /* not supported */
-#    endif
-#    ifndef PNG_ALLOCATED
-#      define PNG_ALLOCATED __declspec(restrict)
-#    endif
-
-    /* This specifically protects structure members that should only be
-     * accessed from within the library, therefore should be empty during
-     * a library build.
-     */
-#    ifndef PNGLIB_BUILD
-#      ifndef PNG_DEPRECATED
-#        define PNG_DEPRECATED __declspec(deprecated)
-#      endif
-#      ifndef PNG_DEPSTRUCT
-#        define PNG_DEPSTRUCT  __declspec(deprecated)
-#      endif
-#      ifndef PNG_PRIVATE
-#        define PNG_PRIVATE __declspec(deprecated)
-#      endif
-#    endif /* PNGLIB_BUILD */
-#  endif /* _MSC_VER */
-#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_PTR_NORETURN
-#  define PNG_PTR_NORETURN /* This function does not return */
-#endif
-#ifndef PNG_ALLOCATED
-#  define PNG_ALLOCATED   /* The result of the function is new memory */
-#endif
-#ifndef PNG_DEPSTRUCT
-#  define PNG_DEPSTRUCT   /* Access to this struct member is deprecated */
-#endif
-#ifndef PNG_PRIVATE
-#  define PNG_PRIVATE     /* This is a private libpng function */
-#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
-
-/* The following uses const char * instead of char * for error
- * and warning message functions, so some compilers won't complain.
- * If you do not want to use const, define PNG_NO_CONST here.
- *
- * This should not change how the APIs are called, so it can be done
- * on a per-file basis in the application.
- */
-#ifndef PNG_CONST
-#  ifndef PNG_NO_CONST
-#    define PNG_CONST const
-#  else
-#    define PNG_CONST
-#  endif
-#endif
-
-/* Some typedefs to get us started.  These should be safe on most of the
- * common platforms.  The typedefs should be at least as large as the
- * numbers suggest (a png_uint_32 must be at least 32 bits long), but they
- * don't have to be exactly that size.  Some compilers dislike passing
- * unsigned shorts as function parameters, so you may be better off using
- * unsigned int for png_uint_16.
- */
-
-#if defined(INT_MAX) && (INT_MAX > 0x7ffffffeL)
-typedef unsigned int png_uint_32;
-typedef int png_int_32;
-#else
-typedef unsigned long png_uint_32;
-typedef long png_int_32;
-#endif
-typedef unsigned short png_uint_16;
-typedef short png_int_16;
-typedef unsigned char png_byte;
-
-#ifdef PNG_NO_SIZE_T
-typedef unsigned int png_size_t;
-#else
-typedef size_t png_size_t;
-#endif
-#define png_sizeof(x) (sizeof (x))
-
-/* The following is needed for medium model support.  It cannot be in the
- * pngpriv.h header.  Needs modification for other compilers besides
- * MSC.  Model independent support declares all arrays and pointers to be
- * large using the far keyword.  The zlib version used must also support
- * model independent data.  As of version zlib 1.0.4, the necessary changes
- * have been made in zlib.  The USE_FAR_KEYWORD define triggers other
- * changes that are needed. (Tim Wegner)
- */
-
-/* Separate compiler dependencies (problem here is that zlib.h always
- * defines FAR. (SJT)
- */
-#ifdef __BORLANDC__
-#  if defined(__LARGE__) || defined(__HUGE__) || defined(__COMPACT__)
-#    define LDATA 1
-#  else
-#    define LDATA 0
-#  endif
-  /* GRR:  why is Cygwin in here?  Cygwin is not Borland C... */
-#  if !defined(__WIN32__) && !defined(__FLAT__) && !defined(__CYGWIN__)
-#    define PNG_MAX_MALLOC_64K /* only used in build */
-#    if (LDATA != 1)
-#      ifndef FAR
-#        define FAR __far
-#      endif
-#      define USE_FAR_KEYWORD
-#    endif   /* LDATA != 1 */
-         /* Possibly useful for moving data out of default segment.
-          * Uncomment it if you want. Could also define FARDATA as
-          * const if your compiler supports it. (SJT)
-#        define FARDATA FAR
-          */
-#  endif  /* __WIN32__, __FLAT__, __CYGWIN__ */
-#endif   /* __BORLANDC__ */
-
-
-/* Suggest testing for specific compiler first before testing for
- * FAR.  The Watcom compiler defines both __MEDIUM__ and M_I86MM,
- * making reliance oncertain keywords suspect. (SJT)
- */
-
-/* MSC Medium model */
-#ifdef FAR
-#  ifdef M_I86MM
-#    define USE_FAR_KEYWORD
-#    define FARDATA FAR
-#    include <dos.h>
-#  endif
-#endif
-
-/* SJT: default case */
-#ifndef FAR
-#  define FAR
-#endif
-
-/* At this point FAR is always defined */
-#ifndef FARDATA
-#  define FARDATA
-#endif
-
-/* 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                      FAR * png_voidp;
-typedef PNG_CONST void            FAR * png_const_voidp;
-typedef png_byte                  FAR * png_bytep;
-typedef PNG_CONST png_byte        FAR * png_const_bytep;
-typedef png_uint_32               FAR * png_uint_32p;
-typedef PNG_CONST png_uint_32     FAR * png_const_uint_32p;
-typedef png_int_32                FAR * png_int_32p;
-typedef PNG_CONST png_int_32      FAR * png_const_int_32p;
-typedef png_uint_16               FAR * png_uint_16p;
-typedef PNG_CONST png_uint_16     FAR * png_const_uint_16p;
-typedef png_int_16                FAR * png_int_16p;
-typedef PNG_CONST png_int_16      FAR * png_const_int_16p;
-typedef char                      FAR * png_charp;
-typedef PNG_CONST char            FAR * png_const_charp;
-typedef png_fixed_point           FAR * png_fixed_point_p;
-typedef PNG_CONST png_fixed_point FAR * png_const_fixed_point_p;
-typedef png_size_t                FAR * png_size_tp;
-typedef PNG_CONST png_size_t      FAR * png_const_size_tp;
-
-#ifdef PNG_STDIO_SUPPORTED
-typedef FILE            * png_FILE_p;
-#endif
-
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-typedef double           FAR * png_doublep;
-typedef PNG_CONST double FAR * png_const_doublep;
-#endif
-
-/* Pointers to pointers; i.e. arrays */
-typedef png_byte        FAR * FAR * png_bytepp;
-typedef png_uint_32     FAR * FAR * png_uint_32pp;
-typedef png_int_32      FAR * FAR * png_int_32pp;
-typedef png_uint_16     FAR * FAR * png_uint_16pp;
-typedef png_int_16      FAR * FAR * png_int_16pp;
-typedef PNG_CONST char  FAR * FAR * png_const_charpp;
-typedef char            FAR * FAR * png_charpp;
-typedef png_fixed_point FAR * FAR * png_fixed_point_pp;
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-typedef double          FAR * FAR * png_doublepp;
-#endif
-
-/* Pointers to pointers to pointers; i.e., pointer to array */
-typedef char            FAR * FAR * FAR * png_charppp;
-
-/* 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.
- */
-#if defined(__TURBOC__) && !defined(__FLAT__)
-   typedef unsigned long png_alloc_size_t;
-#else
-#  if defined(_MSC_VER) && defined(MAXSEG_64K)
-     typedef unsigned long    png_alloc_size_t;
-#  else
-     /* This is an attempt to detect an old Windows system where (int) is
-      * actually 16 bits, in that case png_malloc must have an argument with a
-      * bigger size to accomodate the requirements of the library.
-      */
-#    if (defined(_Windows) || defined(_WINDOWS) || defined(_WINDOWS_)) && \
-        (!defined(INT_MAX) || INT_MAX <= 0x7ffffffeL)
-       typedef DWORD         png_alloc_size_t;
-#    else
-       typedef png_size_t    png_alloc_size_t;
-#    endif
-#  endif
-#endif
-
-#endif /* PNGCONF_H */
diff --git a/lib-x86-32/include/pnglibconf.h b/lib-x86-32/include/pnglibconf.h
deleted file mode 100644
index cd203f88..00000000
--- a/lib-x86-32/include/pnglibconf.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/* pnglibconf.h - library build configuration */
-
-/* libpng version 1.5.0 - January 6, 2011 */
-
-/* Copyright (c) 1998-2011 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
-/* settings */
-#define PNG_MAX_GAMMA_8 11
-#define PNG_CALLOC_SUPPORTED
-#define PNG_QUANTIZE_RED_BITS 5
-#define PNG_USER_WIDTH_MAX 1000000L
-#define PNG_QUANTIZE_GREEN_BITS 5
-#define PNG_API_RULE 0
-#define PNG_QUANTIZE_BLUE_BITS 5
-#define PNG_USER_CHUNK_CACHE_MAX 0
-#define PNG_USER_HEIGHT_MAX 1000000L
-#define PNG_sCAL_PRECISION 5
-#define PNG_COST_SHIFT 3
-#define PNG_WEIGHT_SHIFT 8
-#define PNG_USER_CHUNK_MALLOC_MAX 0
-#define PNG_DEFAULT_READ_MACROS 1
-#define PNG_ZBUF_SIZE 8192
-#define PNG_GAMMA_THRESHOLD_FIXED 5000
-/* end of settings */
-/* options */
-#define PNG_INFO_IMAGE_SUPPORTED
-#define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-#define PNG_POINTER_INDEXING_SUPPORTED
-#define PNG_WARNINGS_SUPPORTED
-#define PNG_FLOATING_ARITHMETIC_SUPPORTED
-#define PNG_WRITE_SUPPORTED
-#define PNG_WRITE_INTERLACING_SUPPORTED
-#define PNG_WRITE_16BIT_SUPPORTED
-#define PNG_EASY_ACCESS_SUPPORTED
-#define PNG_ALIGN_MEMORY_SUPPORTED
-#define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-#define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_USER_LIMITS_SUPPORTED
-#define PNG_FIXED_POINT_SUPPORTED
-/*#undef PNG_ERROR_NUMBERS_SUPPORTED*/
-#define PNG_ERROR_TEXT_SUPPORTED
-#define PNG_READ_SUPPORTED
-/*#undef PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED*/
-#define PNG_BENIGN_ERRORS_SUPPORTED
-#define PNG_SETJMP_SUPPORTED
-#define PNG_WRITE_FLUSH_SUPPORTED
-#define PNG_MNG_FEATURES_SUPPORTED
-#define PNG_FLOATING_POINT_SUPPORTED
-#define PNG_INCH_CONVERSIONS_SUPPORTED
-#define PNG_STDIO_SUPPORTED
-#define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_USER_MEM_SUPPORTED
-#define PNG_IO_STATE_SUPPORTED
-#define PNG_SET_USER_LIMITS_SUPPORTED
-#define PNG_READ_ANCILLARY_CHUNKS_SUPPORTED
-#define PNG_WRITE_INT_FUNCTIONS_SUPPORTED
-#define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED
-#define PNG_WRITE_FILTER_SUPPORTED
-#define PNG_SET_CHUNK_CACHE_LIMIT_SUPPORTED
-#define PNG_WRITE_iCCP_SUPPORTED
-#define PNG_READ_TRANSFORMS_SUPPORTED
-#define PNG_READ_GAMMA_SUPPORTED
-#define PNG_READ_bKGD_SUPPORTED
-#define PNG_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_READ_sCAL_SUPPORTED
-#define PNG_WRITE_hIST_SUPPORTED
-#define PNG_READ_OPT_PLTE_SUPPORTED
-#define PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED
-#define PNG_WRITE_gAMA_SUPPORTED
-#define PNG_READ_GRAY_TO_RGB_SUPPORTED
-#define PNG_WRITE_pCAL_SUPPORTED
-#define PNG_READ_INVERT_ALPHA_SUPPORTED
-#define PNG_WRITE_TRANSFORMS_SUPPORTED
-#define PNG_READ_sBIT_SUPPORTED
-#define PNG_READ_PACK_SUPPORTED
-#define PNG_WRITE_SWAP_SUPPORTED
-#define PNG_READ_cHRM_SUPPORTED
-#define PNG_WRITE_tIME_SUPPORTED
-#define PNG_READ_INTERLACING_SUPPORTED
-#define PNG_READ_tRNS_SUPPORTED
-#define PNG_WRITE_pHYs_SUPPORTED
-#define PNG_WRITE_INVERT_SUPPORTED
-#define PNG_READ_RGB_TO_GRAY_SUPPORTED
-#define PNG_WRITE_sRGB_SUPPORTED
-#define PNG_READ_oFFs_SUPPORTED
-#define PNG_WRITE_FILLER_SUPPORTED
-#define PNG_WRITE_TEXT_SUPPORTED
-#define PNG_WRITE_SHIFT_SUPPORTED
-#define PNG_PROGRESSIVE_READ_SUPPORTED
-#define PNG_READ_SHIFT_SUPPORTED
-#define PNG_CONVERT_tIME_SUPPORTED
-#define PNG_READ_USER_TRANSFORM_SUPPORTED
-#define PNG_READ_INT_FUNCTIONS_SUPPORTED
-#define PNG_READ_USER_CHUNKS_SUPPORTED
-#define PNG_READ_hIST_SUPPORTED
-#define PNG_READ_16BIT_SUPPORTED
-#define PNG_READ_SWAP_ALPHA_SUPPORTED
-#define PNG_READ_COMPOSITE_NODIV_SUPPORTED
-#define PNG_SEQUENTIAL_READ_SUPPORTED
-#define PNG_READ_BACKGROUND_SUPPORTED
-#define PNG_READ_QUANTIZE_SUPPORTED
-#define PNG_READ_iCCP_SUPPORTED
-#define PNG_READ_STRIP_ALPHA_SUPPORTED
-#define PNG_READ_PACKSWAP_SUPPORTED
-#define PNG_READ_sRGB_SUPPORTED
-#define PNG_WRITE_tEXt_SUPPORTED
-#define PNG_READ_gAMA_SUPPORTED
-#define PNG_READ_pCAL_SUPPORTED
-#define PNG_WRITE_sPLT_SUPPORTED
-#define PNG_READ_SWAP_SUPPORTED
-#define PNG_READ_tIME_SUPPORTED
-#define PNG_READ_pHYs_SUPPORTED
-#define PNG_WRITE_SWAP_ALPHA_SUPPORTED
-#define PNG_TIME_RFC1123_SUPPORTED
-#define PNG_READ_TEXT_SUPPORTED
-#define PNG_WRITE_BGR_SUPPORTED
-#define PNG_USER_CHUNKS_SUPPORTED
-#define PNG_CONSOLE_IO_SUPPORTED
-#define PNG_WRITE_PACK_SUPPORTED
-#define PNG_READ_FILLER_SUPPORTED
-#define PNG_WRITE_bKGD_SUPPORTED
-#define PNG_WRITE_tRNS_SUPPORTED
-#define PNG_READ_sPLT_SUPPORTED
-#define PNG_WRITE_sCAL_SUPPORTED
-#define PNG_WRITE_oFFs_SUPPORTED
-#define PNG_READ_tEXt_SUPPORTED
-#define PNG_WRITE_sBIT_SUPPORTED
-#define PNG_READ_INVERT_SUPPORTED
-#define PNG_READ_16_TO_8_SUPPORTED
-#define PNG_WRITE_cHRM_SUPPORTED
-#define PNG_16BIT_SUPPORTED
-#define PNG_WRITE_USER_TRANSFORM_SUPPORTED
-#define PNG_READ_BGR_SUPPORTED
-#define PNG_WRITE_PACKSWAP_SUPPORTED
-#define PNG_WRITE_INVERT_ALPHA_SUPPORTED
-#define PNG_sCAL_SUPPORTED
-#define PNG_WRITE_zTXt_SUPPORTED
-#define PNG_USER_TRANSFORM_INFO_SUPPORTED
-#define PNG_sBIT_SUPPORTED
-#define PNG_cHRM_SUPPORTED
-#define PNG_bKGD_SUPPORTED
-#define PNG_tRNS_SUPPORTED
-#define PNG_WRITE_iTXt_SUPPORTED
-#define PNG_oFFs_SUPPORTED
-#define PNG_READ_EXPAND_16_SUPPORTED
-#define PNG_USER_TRANSFORM_PTR_SUPPORTED
-#define PNG_hIST_SUPPORTED
-#define PNG_iCCP_SUPPORTED
-#define PNG_sRGB_SUPPORTED
-#define PNG_READ_zTXt_SUPPORTED
-#define PNG_gAMA_SUPPORTED
-#define PNG_pCAL_SUPPORTED
-#define PNG_CHECK_cHRM_SUPPORTED
-#define PNG_tIME_SUPPORTED
-#define PNG_READ_EXPAND_SUPPORTED
-#define PNG_pHYs_SUPPORTED
-#define PNG_READ_iTXt_SUPPORTED
-#define PNG_TEXT_SUPPORTED
-#define PNG_SAVE_INT_32_SUPPORTED
-#define PNG_sPLT_SUPPORTED
-#define PNG_tEXt_SUPPORTED
-#define PNG_zTXt_SUPPORTED
-#define PNG_iTXt_SUPPORTED
-/* end of options */
-#endif /* PNGLCONF_H */
diff --git a/lib-x86-32/include/samplerate.h b/lib-x86-32/include/samplerate.h
deleted file mode 100644
index 9651e635..00000000
--- a/lib-x86-32/include/samplerate.h
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
-** Copyright (C) 2002-2008 Erik de Castro Lopo <erikd@mega-nerd.com>
-**
-** 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 of the License, 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.
-*/
-
-/*
-** This code is part of Secret Rabibt Code aka libsamplerate. A commercial
-** use license for this code is available, please see:
-**		http://www.mega-nerd.com/SRC/procedure.html
-*/
-
-/*
-** API documentation is available here:
-**     http://www.mega-nerd.com/SRC/api.html
-*/
-
-#ifndef SAMPLERATE_H
-#define SAMPLERATE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif	/* __cplusplus */
-
-
-/* Opaque data type SRC_STATE. */
-typedef struct SRC_STATE_tag SRC_STATE ;
-
-/* SRC_DATA is used to pass data to src_simple() and src_process(). */
-typedef struct
-{	float	*data_in, *data_out ;
-
-	long	input_frames, output_frames ;
-	long	input_frames_used, output_frames_gen ;
-
-	int		end_of_input ;
-
-	double	src_ratio ;
-} SRC_DATA ;
-
-/* SRC_CB_DATA is used with callback based API. */
-typedef struct
-{	long	frames ;
-	float	*data_in ;
-} SRC_CB_DATA ;
-
-/*
-** User supplied callback function type for use with src_callback_new()
-** and src_callback_read(). First parameter is the same pointer that was
-** passed into src_callback_new(). Second parameter is pointer to a
-** pointer. The user supplied callback function must modify *data to
-** point to the start of the user supplied float array. The user supplied
-** function must return the number of frames that **data points to.
-*/
-
-typedef long (*src_callback_t) (void *cb_data, float **data) ;
-
-/*
-**	Standard initialisation function : return an anonymous pointer to the
-**	internal state of the converter. Choose a converter from the enums below.
-**	Error returned in *error.
-*/
-
-SRC_STATE* src_new (int converter_type, int channels, int *error) ;
-
-/*
-**	Initilisation for callback based API : return an anonymous pointer to the
-**	internal state of the converter. Choose a converter from the enums below.
-**	The cb_data pointer can point to any data or be set to NULL. Whatever the
-**	value, when processing, user supplied function "func" gets called with
-**	cb_data as first parameter.
-*/
-
-SRC_STATE* src_callback_new (src_callback_t func, int converter_type, int channels,
-				int *error, void* cb_data) ;
-
-/*
-**	Cleanup all internal allocations.
-**	Always returns NULL.
-*/
-
-SRC_STATE* src_delete (SRC_STATE *state) ;
-
-/*
-**	Standard processing function.
-**	Returns non zero on error.
-*/
-
-int src_process (SRC_STATE *state, SRC_DATA *data) ;
-
-/*
-**	Callback based processing function. Read up to frames worth of data from
-**	the converter int *data and return frames read or -1 on error.
-*/
-long src_callback_read (SRC_STATE *state, double src_ratio, long frames, float *data) ;
-
-/*
-**	Simple interface for performing a single conversion from input buffer to
-**	output buffer at a fixed conversion ratio.
-**	Simple interface does not require initialisation as it can only operate on
-**	a single buffer worth of audio.
-*/
-
-int src_simple (SRC_DATA *data, int converter_type, int channels) ;
-
-/*
-** This library contains a number of different sample rate converters,
-** numbered 0 through N.
-**
-** Return a string giving either a name or a more full description of each
-** sample rate converter or NULL if no sample rate converter exists for
-** the given value. The converters are sequentially numbered from 0 to N.
-*/
-
-const char *src_get_name (int converter_type) ;
-const char *src_get_description (int converter_type) ;
-const char *src_get_version (void) ;
-
-/*
-**	Set a new SRC ratio. This allows step responses
-**	in the conversion ratio.
-**	Returns non zero on error.
-*/
-
-int src_set_ratio (SRC_STATE *state, double new_ratio) ;
-
-/*
-**	Reset the internal SRC state.
-**	Does not modify the quality settings.
-**	Does not free any memory allocations.
-**	Returns non zero on error.
-*/
-
-int src_reset (SRC_STATE *state) ;
-
-/*
-** Return TRUE if ratio is a valid conversion ratio, FALSE
-** otherwise.
-*/
-
-int src_is_valid_ratio (double ratio) ;
-
-/*
-**	Return an error number.
-*/
-
-int src_error (SRC_STATE *state) ;
-
-/*
-**	Convert the error number into a string.
-*/
-const char* src_strerror (int error) ;
-
-/*
-** The following enums can be used to set the interpolator type
-** using the function src_set_converter().
-*/
-
-enum
-{
-	SRC_SINC_BEST_QUALITY		= 0,
-	SRC_SINC_MEDIUM_QUALITY		= 1,
-	SRC_SINC_FASTEST			= 2,
-	SRC_ZERO_ORDER_HOLD			= 3,
-	SRC_LINEAR					= 4,
-} ;
-
-/*
-** Extra helper functions for converting from short to float and
-** back again.
-*/
-
-void src_short_to_float_array (const short *in, float *out, int len) ;
-void src_float_to_short_array (const float *in, short *out, int len) ;
-
-void src_int_to_float_array (const int *in, float *out, int len) ;
-void src_float_to_int_array (const float *in, int *out, int len) ;
-
-
-#ifdef __cplusplus
-}		/* extern "C" */
-#endif	/* __cplusplus */
-
-#endif	/* SAMPLERATE_H */
-
diff --git a/lib-x86-32/include/sndfile.h b/lib-x86-32/include/sndfile.h
deleted file mode 100644
index 1b7e1f99..00000000
--- a/lib-x86-32/include/sndfile.h
+++ /dev/null
@@ -1,665 +0,0 @@
-/*
-** Copyright (C) 1999-2010 Erik de Castro Lopo <erikd@mega-nerd.com>
-**
-** 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.1 of the License, 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 Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser 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.
-*/
-
-/*
-** sndfile.h -- system-wide definitions
-**
-** API documentation is in the doc/ directory of the source code tarball
-** and at http://www.mega-nerd.com/libsndfile/api.html.
-*/
-
-#ifndef SNDFILE_H
-#define SNDFILE_H
-
-/* This is the version 1.0.X header file. */
-#define	SNDFILE_1
-
-#include <stdio.h>
-#include <sys/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif	/* __cplusplus */
-
-/* The following file types can be read and written.
-** A file type would consist of a major type (ie SF_FORMAT_WAV) bitwise
-** ORed with a minor type (ie SF_FORMAT_PCM). SF_FORMAT_TYPEMASK and
-** SF_FORMAT_SUBMASK can be used to separate the major and minor file
-** types.
-*/
-
-enum
-{	/* Major formats. */
-	SF_FORMAT_WAV			= 0x010000,		/* Microsoft WAV format (little endian default). */
-	SF_FORMAT_AIFF			= 0x020000,		/* Apple/SGI AIFF format (big endian). */
-	SF_FORMAT_AU			= 0x030000,		/* Sun/NeXT AU format (big endian). */
-	SF_FORMAT_RAW			= 0x040000,		/* RAW PCM data. */
-	SF_FORMAT_PAF			= 0x050000,		/* Ensoniq PARIS file format. */
-	SF_FORMAT_SVX			= 0x060000,		/* Amiga IFF / SVX8 / SV16 format. */
-	SF_FORMAT_NIST			= 0x070000,		/* Sphere NIST format. */
-	SF_FORMAT_VOC			= 0x080000,		/* VOC files. */
-	SF_FORMAT_IRCAM			= 0x0A0000,		/* Berkeley/IRCAM/CARL */
-	SF_FORMAT_W64			= 0x0B0000,		/* Sonic Foundry's 64 bit RIFF/WAV */
-	SF_FORMAT_MAT4			= 0x0C0000,		/* Matlab (tm) V4.2 / GNU Octave 2.0 */
-	SF_FORMAT_MAT5			= 0x0D0000,		/* Matlab (tm) V5.0 / GNU Octave 2.1 */
-	SF_FORMAT_PVF			= 0x0E0000,		/* Portable Voice Format */
-	SF_FORMAT_XI			= 0x0F0000,		/* Fasttracker 2 Extended Instrument */
-	SF_FORMAT_HTK			= 0x100000,		/* HMM Tool Kit format */
-	SF_FORMAT_SDS			= 0x110000,		/* Midi Sample Dump Standard */
-	SF_FORMAT_AVR			= 0x120000,		/* Audio Visual Research */
-	SF_FORMAT_WAVEX			= 0x130000,		/* MS WAVE with WAVEFORMATEX */
-	SF_FORMAT_SD2			= 0x160000,		/* Sound Designer 2 */
-	SF_FORMAT_FLAC			= 0x170000,		/* FLAC lossless file format */
-	SF_FORMAT_CAF			= 0x180000,		/* Core Audio File format */
-	SF_FORMAT_WVE			= 0x190000,		/* Psion WVE format */
-	SF_FORMAT_OGG			= 0x200000,		/* Xiph OGG container */
-	SF_FORMAT_MPC2K			= 0x210000,		/* Akai MPC 2000 sampler */
-	SF_FORMAT_RF64			= 0x220000,		/* RF64 WAV file */
-
-	/* Subtypes from here on. */
-
-	SF_FORMAT_PCM_S8		= 0x0001,		/* Signed 8 bit data */
-	SF_FORMAT_PCM_16		= 0x0002,		/* Signed 16 bit data */
-	SF_FORMAT_PCM_24		= 0x0003,		/* Signed 24 bit data */
-	SF_FORMAT_PCM_32		= 0x0004,		/* Signed 32 bit data */
-
-	SF_FORMAT_PCM_U8		= 0x0005,		/* Unsigned 8 bit data (WAV and RAW only) */
-
-	SF_FORMAT_FLOAT			= 0x0006,		/* 32 bit float data */
-	SF_FORMAT_DOUBLE		= 0x0007,		/* 64 bit float data */
-
-	SF_FORMAT_ULAW			= 0x0010,		/* U-Law encoded. */
-	SF_FORMAT_ALAW			= 0x0011,		/* A-Law encoded. */
-	SF_FORMAT_IMA_ADPCM		= 0x0012,		/* IMA ADPCM. */
-	SF_FORMAT_MS_ADPCM		= 0x0013,		/* Microsoft ADPCM. */
-
-	SF_FORMAT_GSM610		= 0x0020,		/* GSM 6.10 encoding. */
-	SF_FORMAT_VOX_ADPCM		= 0x0021,		/* OKI / Dialogix ADPCM */
-
-	SF_FORMAT_G721_32		= 0x0030,		/* 32kbs G721 ADPCM encoding. */
-	SF_FORMAT_G723_24		= 0x0031,		/* 24kbs G723 ADPCM encoding. */
-	SF_FORMAT_G723_40		= 0x0032,		/* 40kbs G723 ADPCM encoding. */
-
-	SF_FORMAT_DWVW_12		= 0x0040, 		/* 12 bit Delta Width Variable Word encoding. */
-	SF_FORMAT_DWVW_16		= 0x0041, 		/* 16 bit Delta Width Variable Word encoding. */
-	SF_FORMAT_DWVW_24		= 0x0042, 		/* 24 bit Delta Width Variable Word encoding. */
-	SF_FORMAT_DWVW_N		= 0x0043, 		/* N bit Delta Width Variable Word encoding. */
-
-	SF_FORMAT_DPCM_8		= 0x0050,		/* 8 bit differential PCM (XI only) */
-	SF_FORMAT_DPCM_16		= 0x0051,		/* 16 bit differential PCM (XI only) */
-
-	SF_FORMAT_VORBIS		= 0x0060,		/* Xiph Vorbis encoding. */
-
-	/* Endian-ness options. */
-
-	SF_ENDIAN_FILE			= 0x00000000,	/* Default file endian-ness. */
-	SF_ENDIAN_LITTLE		= 0x10000000,	/* Force little endian-ness. */
-	SF_ENDIAN_BIG			= 0x20000000,	/* Force big endian-ness. */
-	SF_ENDIAN_CPU			= 0x30000000,	/* Force CPU endian-ness. */
-
-	SF_FORMAT_SUBMASK		= 0x0000FFFF,
-	SF_FORMAT_TYPEMASK		= 0x0FFF0000,
-	SF_FORMAT_ENDMASK		= 0x30000000
-} ;
-
-/*
-** The following are the valid command numbers for the sf_command()
-** interface.  The use of these commands is documented in the file
-** command.html in the doc directory of the source code distribution.
-*/
-
-enum
-{	SFC_GET_LIB_VERSION				= 0x1000,
-	SFC_GET_LOG_INFO				= 0x1001,
-	SFC_GET_CURRENT_SF_INFO			= 0x1002,
-
-
-	SFC_GET_NORM_DOUBLE				= 0x1010,
-	SFC_GET_NORM_FLOAT				= 0x1011,
-	SFC_SET_NORM_DOUBLE				= 0x1012,
-	SFC_SET_NORM_FLOAT				= 0x1013,
-	SFC_SET_SCALE_FLOAT_INT_READ	= 0x1014,
-	SFC_SET_SCALE_INT_FLOAT_WRITE	= 0x1015,
-
-	SFC_GET_SIMPLE_FORMAT_COUNT		= 0x1020,
-	SFC_GET_SIMPLE_FORMAT			= 0x1021,
-
-	SFC_GET_FORMAT_INFO				= 0x1028,
-
-	SFC_GET_FORMAT_MAJOR_COUNT		= 0x1030,
-	SFC_GET_FORMAT_MAJOR			= 0x1031,
-	SFC_GET_FORMAT_SUBTYPE_COUNT	= 0x1032,
-	SFC_GET_FORMAT_SUBTYPE			= 0x1033,
-
-	SFC_CALC_SIGNAL_MAX				= 0x1040,
-	SFC_CALC_NORM_SIGNAL_MAX		= 0x1041,
-	SFC_CALC_MAX_ALL_CHANNELS		= 0x1042,
-	SFC_CALC_NORM_MAX_ALL_CHANNELS	= 0x1043,
-	SFC_GET_SIGNAL_MAX				= 0x1044,
-	SFC_GET_MAX_ALL_CHANNELS		= 0x1045,
-
-	SFC_SET_ADD_PEAK_CHUNK			= 0x1050,
-	SFC_SET_ADD_HEADER_PAD_CHUNK	= 0x1051,
-
-	SFC_UPDATE_HEADER_NOW			= 0x1060,
-	SFC_SET_UPDATE_HEADER_AUTO		= 0x1061,
-
-	SFC_FILE_TRUNCATE				= 0x1080,
-
-	SFC_SET_RAW_START_OFFSET		= 0x1090,
-
-	SFC_SET_DITHER_ON_WRITE			= 0x10A0,
-	SFC_SET_DITHER_ON_READ			= 0x10A1,
-
-	SFC_GET_DITHER_INFO_COUNT		= 0x10A2,
-	SFC_GET_DITHER_INFO				= 0x10A3,
-
-	SFC_GET_EMBED_FILE_INFO			= 0x10B0,
-
-	SFC_SET_CLIPPING				= 0x10C0,
-	SFC_GET_CLIPPING				= 0x10C1,
-
-	SFC_GET_INSTRUMENT				= 0x10D0,
-	SFC_SET_INSTRUMENT				= 0x10D1,
-
-	SFC_GET_LOOP_INFO				= 0x10E0,
-
-	SFC_GET_BROADCAST_INFO			= 0x10F0,
-	SFC_SET_BROADCAST_INFO			= 0x10F1,
-
-	SFC_GET_CHANNEL_MAP_INFO		= 0x1100,
-	SFC_SET_CHANNEL_MAP_INFO		= 0x1101,
-
-	SFC_RAW_DATA_NEEDS_ENDSWAP		= 0x1110,
-
-	/* Support for Wavex Ambisonics Format */
-	SFC_WAVEX_SET_AMBISONIC			= 0x1200,
-	SFC_WAVEX_GET_AMBISONIC			= 0x1201,
-
-	SFC_SET_VBR_ENCODING_QUALITY	= 0x1300,
-
-	/* Following commands for testing only. */
-	SFC_TEST_IEEE_FLOAT_REPLACE		= 0x6001,
-
-	/*
-	** SFC_SET_ADD_* values are deprecated and will disappear at some
-	** time in the future. They are guaranteed to be here up to and
-	** including version 1.0.8 to avoid breakage of existng software.
-	** They currently do nothing and will continue to do nothing.
-	*/
-	SFC_SET_ADD_DITHER_ON_WRITE		= 0x1070,
-	SFC_SET_ADD_DITHER_ON_READ		= 0x1071
-} ;
-
-
-/*
-** String types that can be set and read from files. Not all file types
-** support this and even the file types which support one, may not support
-** all string types.
-*/
-
-enum
-{	SF_STR_TITLE					= 0x01,
-	SF_STR_COPYRIGHT				= 0x02,
-	SF_STR_SOFTWARE					= 0x03,
-	SF_STR_ARTIST					= 0x04,
-	SF_STR_COMMENT					= 0x05,
-	SF_STR_DATE						= 0x06,
-	SF_STR_ALBUM					= 0x07,
-	SF_STR_LICENSE					= 0x08,
-	SF_STR_TRACKNUMBER				= 0x09,
-	SF_STR_GENRE					= 0x10
-} ;
-
-/*
-** Use the following as the start and end index when doing metadata
-** transcoding.
-*/
-
-#define	SF_STR_FIRST	SF_STR_TITLE
-#define	SF_STR_LAST		SF_STR_LICENSE
-
-enum
-{	/* True and false */
-	SF_FALSE	= 0,
-	SF_TRUE		= 1,
-
-	/* Modes for opening files. */
-	SFM_READ	= 0x10,
-	SFM_WRITE	= 0x20,
-	SFM_RDWR	= 0x30,
-
-	SF_AMBISONIC_NONE		= 0x40,
-	SF_AMBISONIC_B_FORMAT	= 0x41
-} ;
-
-/* Public error values. These are guaranteed to remain unchanged for the duration
-** of the library major version number.
-** There are also a large number of private error numbers which are internal to
-** the library which can change at any time.
-*/
-
-enum
-{	SF_ERR_NO_ERROR				= 0,
-	SF_ERR_UNRECOGNISED_FORMAT	= 1,
-	SF_ERR_SYSTEM				= 2,
-	SF_ERR_MALFORMED_FILE		= 3,
-	SF_ERR_UNSUPPORTED_ENCODING	= 4
-} ;
-
-
-/* Channel map values (used with SFC_SET/GET_CHANNEL_MAP).
-*/
-
-enum
-{	SF_CHANNEL_MAP_INVALID = 0,
-	SF_CHANNEL_MAP_MONO = 1,
-	SF_CHANNEL_MAP_LEFT,					/* Apple calls this 'Left' */
-	SF_CHANNEL_MAP_RIGHT,					/* Apple calls this 'Right' */
-	SF_CHANNEL_MAP_CENTER,					/* Apple calls this 'Center' */
-	SF_CHANNEL_MAP_FRONT_LEFT,
-	SF_CHANNEL_MAP_FRONT_RIGHT,
-	SF_CHANNEL_MAP_FRONT_CENTER,
-	SF_CHANNEL_MAP_REAR_CENTER,				/* Apple calls this 'Center Surround', Msft calls this 'Back Center' */
-	SF_CHANNEL_MAP_REAR_LEFT,				/* Apple calls this 'Left Surround', Msft calls this 'Back Left' */
-	SF_CHANNEL_MAP_REAR_RIGHT,				/* Apple calls this 'Right Surround', Msft calls this 'Back Right' */
-	SF_CHANNEL_MAP_LFE,						/* Apple calls this 'LFEScreen', Msft calls this 'Low Frequency'  */
-	SF_CHANNEL_MAP_FRONT_LEFT_OF_CENTER,	/* Apple calls this 'Left Center' */
-	SF_CHANNEL_MAP_FRONT_RIGHT_OF_CENTER,	/* Apple calls this 'Right Center */
-	SF_CHANNEL_MAP_SIDE_LEFT,				/* Apple calls this 'Left Surround Direct' */
-	SF_CHANNEL_MAP_SIDE_RIGHT,				/* Apple calls this 'Right Surround Direct' */
-	SF_CHANNEL_MAP_TOP_CENTER,				/* Apple calls this 'Top Center Surround' */
-	SF_CHANNEL_MAP_TOP_FRONT_LEFT,			/* Apple calls this 'Vertical Height Left' */
-	SF_CHANNEL_MAP_TOP_FRONT_RIGHT,			/* Apple calls this 'Vertical Height Right' */
-	SF_CHANNEL_MAP_TOP_FRONT_CENTER,		/* Apple calls this 'Vertical Height Center' */
-	SF_CHANNEL_MAP_TOP_REAR_LEFT,			/* Apple and MS call this 'Top Back Left' */
-	SF_CHANNEL_MAP_TOP_REAR_RIGHT,			/* Apple and MS call this 'Top Back Right' */
-	SF_CHANNEL_MAP_TOP_REAR_CENTER,			/* Apple and MS call this 'Top Back Center' */
-
-	SF_CHANNEL_MAP_AMBISONIC_B_W,
-	SF_CHANNEL_MAP_AMBISONIC_B_X,
-	SF_CHANNEL_MAP_AMBISONIC_B_Y,
-	SF_CHANNEL_MAP_AMBISONIC_B_Z,
-
-	SF_CHANNEL_MAP_MAX
-} ;
-
-
-/* A SNDFILE* pointer can be passed around much like stdio.h's FILE* pointer. */
-
-typedef	struct SNDFILE_tag	SNDFILE ;
-
-/* The following typedef is system specific and is defined when libsndfile is
-** compiled. sf_count_t can be one of loff_t (Linux), off_t (*BSD), off64_t
-** (Solaris), __int64 (Win32) etc. On windows, we need to allow the same
-** header file to be compiler by both GCC and the microsoft compiler.
-*/
-
-#if (defined (_MSCVER) || defined (_MSC_VER))
-typedef __int64		sf_count_t ;
-#define SF_COUNT_MAX		0x7fffffffffffffffi64
-#else
-typedef loff_t	sf_count_t ;
-#define SF_COUNT_MAX		0x7FFFFFFFFFFFFFFFLL
-#endif
-
-
-/* A pointer to a SF_INFO structure is passed to sf_open () and filled in.
-** On write, the SF_INFO structure is filled in by the user and passed into
-** sf_open ().
-*/
-
-struct SF_INFO
-{	sf_count_t	frames ;		/* Used to be called samples.  Changed to avoid confusion. */
-	int			samplerate ;
-	int			channels ;
-	int			format ;
-	int			sections ;
-	int			seekable ;
-} ;
-
-typedef	struct SF_INFO SF_INFO ;
-
-/* The SF_FORMAT_INFO struct is used to retrieve information about the sound
-** file formats libsndfile supports using the sf_command () interface.
-**
-** Using this interface will allow applications to support new file formats
-** and encoding types when libsndfile is upgraded, without requiring
-** re-compilation of the application.
-**
-** Please consult the libsndfile documentation (particularly the information
-** on the sf_command () interface) for examples of its use.
-*/
-
-typedef struct
-{	int			format ;
-	const char	*name ;
-	const char	*extension ;
-} SF_FORMAT_INFO ;
-
-/*
-** Enums and typedefs for adding dither on read and write.
-** See the html documentation for sf_command(), SFC_SET_DITHER_ON_WRITE
-** and SFC_SET_DITHER_ON_READ.
-*/
-
-enum
-{	SFD_DEFAULT_LEVEL	= 0,
-	SFD_CUSTOM_LEVEL	= 0x40000000,
-
-	SFD_NO_DITHER		= 500,
-	SFD_WHITE			= 501,
-	SFD_TRIANGULAR_PDF	= 502
-} ;
-
-typedef struct
-{	int			type ;
-	double		level ;
-	const char	*name ;
-} SF_DITHER_INFO ;
-
-/* Struct used to retrieve information about a file embedded within a
-** larger file. See SFC_GET_EMBED_FILE_INFO.
-*/
-
-typedef struct
-{	sf_count_t	offset ;
-	sf_count_t	length ;
-} SF_EMBED_FILE_INFO ;
-
-/*
-**	Structs used to retrieve music sample information from a file.
-*/
-
-enum
-{	/*
-	**	The loop mode field in SF_INSTRUMENT will be one of the following.
-	*/
-	SF_LOOP_NONE = 800,
-	SF_LOOP_FORWARD,
-	SF_LOOP_BACKWARD,
-	SF_LOOP_ALTERNATING
-} ;
-
-typedef struct
-{	int gain ;
-	char basenote, detune ;
-	char velocity_lo, velocity_hi ;
-	char key_lo, key_hi ;
-	int loop_count ;
-
-	struct
-	{	int mode ;
-		unsigned int start ;
-		unsigned int end ;
-		unsigned int count ;
-	} loops [16] ; /* make variable in a sensible way */
-} SF_INSTRUMENT ;
-
-
-
-/* Struct used to retrieve loop information from a file.*/
-typedef struct
-{
-	short	time_sig_num ;	/* any positive integer    > 0  */
-	short	time_sig_den ;	/* any positive power of 2 > 0  */
-	int		loop_mode ;		/* see SF_LOOP enum             */
-
-	int		num_beats ;		/* this is NOT the amount of quarter notes !!!*/
-							/* a full bar of 4/4 is 4 beats */
-							/* a full bar of 7/8 is 7 beats */
-
-	float	bpm ;			/* suggestion, as it can be calculated using other fields:*/
-							/* file's lenght, file's sampleRate and our time_sig_den*/
-							/* -> bpms are always the amount of _quarter notes_ per minute */
-
-	int	root_key ;			/* MIDI note, or -1 for None */
-	int future [6] ;
-} SF_LOOP_INFO ;
-
-
-/*	Struct used to retrieve broadcast (EBU) information from a file.
-**	Strongly (!) based on EBU "bext" chunk format used in Broadcast WAVE.
-*/
-#define	SF_BROADCAST_INFO_VAR(coding_hist_size) \
-			struct \
-			{	char			description [256] ; \
-				char			originator [32] ; \
-				char			originator_reference [32] ; \
-				char			origination_date [10] ; \
-				char			origination_time [8] ; \
-				unsigned int	time_reference_low ; \
-				unsigned int	time_reference_high ; \
-				short			version ; \
-				char			umid [64] ; \
-				char			reserved [190] ; \
-				unsigned int	coding_history_size ; \
-				char			coding_history [coding_hist_size] ; \
-			}
-
-/* SF_BROADCAST_INFO is the above struct with coding_history field of 256 bytes. */
-typedef SF_BROADCAST_INFO_VAR (256) SF_BROADCAST_INFO ;
-
-
-/*	Virtual I/O functionality. */
-
-typedef sf_count_t		(*sf_vio_get_filelen)	(void *user_data) ;
-typedef sf_count_t		(*sf_vio_seek)		(sf_count_t offset, int whence, void *user_data) ;
-typedef sf_count_t		(*sf_vio_read)		(void *ptr, sf_count_t count, void *user_data) ;
-typedef sf_count_t		(*sf_vio_write)		(const void *ptr, sf_count_t count, void *user_data) ;
-typedef sf_count_t		(*sf_vio_tell)		(void *user_data) ;
-
-struct SF_VIRTUAL_IO
-{	sf_vio_get_filelen	get_filelen ;
-	sf_vio_seek			seek ;
-	sf_vio_read			read ;
-	sf_vio_write		write ;
-	sf_vio_tell			tell ;
-} ;
-
-typedef	struct SF_VIRTUAL_IO SF_VIRTUAL_IO ;
-
-
-/* Open the specified file for read, write or both. On error, this will
-** return a NULL pointer. To find the error number, pass a NULL SNDFILE
-** to sf_strerror ().
-** All calls to sf_open() should be matched with a call to sf_close().
-*/
-
-SNDFILE* 	sf_open		(const char *path, int mode, SF_INFO *sfinfo) ;
-
-
-/* Use the existing file descriptor to create a SNDFILE object. If close_desc
-** is TRUE, the file descriptor will be closed when sf_close() is called. If
-** it is FALSE, the descritor will not be closed.
-** When passed a descriptor like this, the library will assume that the start
-** of file header is at the current file offset. This allows sound files within
-** larger container files to be read and/or written.
-** On error, this will return a NULL pointer. To find the error number, pass a
-** NULL SNDFILE to sf_strerror ().
-** All calls to sf_open_fd() should be matched with a call to sf_close().
-
-*/
-
-SNDFILE* 	sf_open_fd	(int fd, int mode, SF_INFO *sfinfo, int close_desc) ;
-
-SNDFILE* 	sf_open_virtual	(SF_VIRTUAL_IO *sfvirtual, int mode, SF_INFO *sfinfo, void *user_data) ;
-
-
-/* sf_error () returns a error number which can be translated to a text
-** string using sf_error_number().
-*/
-
-int		sf_error		(SNDFILE *sndfile) ;
-
-
-/* sf_strerror () returns to the caller a pointer to the current error message for
-** the given SNDFILE.
-*/
-
-const char* sf_strerror (SNDFILE *sndfile) ;
-
-
-/* sf_error_number () allows the retrieval of the error string for each internal
-** error number.
-**
-*/
-
-const char*	sf_error_number	(int errnum) ;
-
-
-/* The following two error functions are deprecated but they will remain in the
-** library for the forseeable future. The function sf_strerror() should be used
-** in their place.
-*/
-
-int		sf_perror		(SNDFILE *sndfile) ;
-int		sf_error_str	(SNDFILE *sndfile, char* str, size_t len) ;
-
-
-/* Return TRUE if fields of the SF_INFO struct are a valid combination of values. */
-
-int		sf_command	(SNDFILE *sndfile, int command, void *data, int datasize) ;
-
-
-/* Return TRUE if fields of the SF_INFO struct are a valid combination of values. */
-
-int		sf_format_check	(const SF_INFO *info) ;
-
-
-/* Seek within the waveform data chunk of the SNDFILE. sf_seek () uses
-** the same values for whence (SEEK_SET, SEEK_CUR and SEEK_END) as
-** stdio.h function fseek ().
-** An offset of zero with whence set to SEEK_SET will position the
-** read / write pointer to the first data sample.
-** On success sf_seek returns the current position in (multi-channel)
-** samples from the start of the file.
-** Please see the libsndfile documentation for moving the read pointer
-** separately from the write pointer on files open in mode SFM_RDWR.
-** On error all of these functions return -1.
-*/
-
-sf_count_t	sf_seek 		(SNDFILE *sndfile, sf_count_t frames, int whence) ;
-
-
-/* Functions for retrieving and setting string data within sound files.
-** Not all file types support this features; AIFF and WAV do. For both
-** functions, the str_type parameter must be one of the SF_STR_* values
-** defined above.
-** On error, sf_set_string() returns non-zero while sf_get_string()
-** returns NULL.
-*/
-
-int sf_set_string (SNDFILE *sndfile, int str_type, const char* str) ;
-
-const char* sf_get_string (SNDFILE *sndfile, int str_type) ;
-
-
-/* Return the library version string. */
-
-const char * sf_version_string (void) ;
-
-
-/* Functions for reading/writing the waveform data of a sound file.
-*/
-
-sf_count_t	sf_read_raw		(SNDFILE *sndfile, void *ptr, sf_count_t bytes) ;
-sf_count_t	sf_write_raw 	(SNDFILE *sndfile, const void *ptr, sf_count_t bytes) ;
-
-
-/* Functions for reading and writing the data chunk in terms of frames.
-** The number of items actually read/written = frames * number of channels.
-**     sf_xxxx_raw		read/writes the raw data bytes from/to the file
-**     sf_xxxx_short	passes data in the native short format
-**     sf_xxxx_int		passes data in the native int format
-**     sf_xxxx_float	passes data in the native float format
-**     sf_xxxx_double	passes data in the native double format
-** All of these read/write function return number of frames read/written.
-*/
-
-sf_count_t	sf_readf_short	(SNDFILE *sndfile, short *ptr, sf_count_t frames) ;
-sf_count_t	sf_writef_short	(SNDFILE *sndfile, const short *ptr, sf_count_t frames) ;
-
-sf_count_t	sf_readf_int	(SNDFILE *sndfile, int *ptr, sf_count_t frames) ;
-sf_count_t	sf_writef_int 	(SNDFILE *sndfile, const int *ptr, sf_count_t frames) ;
-
-sf_count_t	sf_readf_float	(SNDFILE *sndfile, float *ptr, sf_count_t frames) ;
-sf_count_t	sf_writef_float	(SNDFILE *sndfile, const float *ptr, sf_count_t frames) ;
-
-sf_count_t	sf_readf_double		(SNDFILE *sndfile, double *ptr, sf_count_t frames) ;
-sf_count_t	sf_writef_double	(SNDFILE *sndfile, const double *ptr, sf_count_t frames) ;
-
-
-/* Functions for reading and writing the data chunk in terms of items.
-** Otherwise similar to above.
-** All of these read/write function return number of items read/written.
-*/
-
-sf_count_t	sf_read_short	(SNDFILE *sndfile, short *ptr, sf_count_t items) ;
-sf_count_t	sf_write_short	(SNDFILE *sndfile, const short *ptr, sf_count_t items) ;
-
-sf_count_t	sf_read_int		(SNDFILE *sndfile, int *ptr, sf_count_t items) ;
-sf_count_t	sf_write_int 	(SNDFILE *sndfile, const int *ptr, sf_count_t items) ;
-
-sf_count_t	sf_read_float	(SNDFILE *sndfile, float *ptr, sf_count_t items) ;
-sf_count_t	sf_write_float	(SNDFILE *sndfile, const float *ptr, sf_count_t items) ;
-
-sf_count_t	sf_read_double	(SNDFILE *sndfile, double *ptr, sf_count_t items) ;
-sf_count_t	sf_write_double	(SNDFILE *sndfile, const double *ptr, sf_count_t items) ;
-
-
-/* Close the SNDFILE and clean up all memory allocations associated with this
-** file.
-** Returns 0 on success, or an error number.
-*/
-
-int		sf_close		(SNDFILE *sndfile) ;
-
-
-/* If the file is opened SFM_WRITE or SFM_RDWR, call fsync() on the file
-** to force the writing of data to disk. If the file is opened SFM_READ
-** no action is taken.
-*/
-
-void	sf_write_sync	(SNDFILE *sndfile) ;
-
-
-
-/* The function sf_wchar_open() is Windows Only!
-** Open a file passing in a Windows Unicode filename. Otherwise, this is
-** the same as sf_open().
-**
-** In order for this to work, you need to do the following:
-**
-**		#include <windows.h>
-**		#define ENABLE_SNDFILE_WINDOWS_PROTOTYPES 1
-**		#including <sndfile.h>
-*/
-
-#if ENABLE_SNDFILE_WINDOWS_PROTOTYPES
-SNDFILE* sf_wchar_open (LPCWSTR wpath, int mode, SF_INFO *sfinfo) ;
-#endif
-
-
-
-#ifdef __cplusplus
-}		/* extern "C" */
-#endif	/* __cplusplus */
-
-#endif	/* SNDFILE_H */
-
diff --git a/lib-x86-32/include/vorbis/Makefile.am b/lib-x86-32/include/vorbis/Makefile.am
deleted file mode 100644
index dbba34e5..00000000
--- a/lib-x86-32/include/vorbis/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-vorbisincludedir = $(includedir)/vorbis
-
-vorbisinclude_HEADERS = codec.h vorbisfile.h vorbisenc.h
-
-
diff --git a/lib-x86-32/include/vorbis/codec.h b/lib-x86-32/include/vorbis/codec.h
deleted file mode 100644
index 999aa335..00000000
--- a/lib-x86-32/include/vorbis/codec.h
+++ /dev/null
@@ -1,243 +0,0 @@
-/********************************************************************
- *                                                                  *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
- *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
-
- ********************************************************************
-
- function: libvorbis codec headers
- last mod: $Id: codec.h 17021 2010-03-24 09:29:41Z xiphmont $
-
- ********************************************************************/
-
-#ifndef _vorbis_codec_h_
-#define _vorbis_codec_h_
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#include <ogg/ogg.h>
-
-typedef struct vorbis_info{
-  int version;
-  int channels;
-  long rate;
-
-  /* The below bitrate declarations are *hints*.
-     Combinations of the three values carry the following implications:
-
-     all three set to the same value:
-       implies a fixed rate bitstream
-     only nominal set:
-       implies a VBR stream that averages the nominal bitrate.  No hard
-       upper/lower limit
-     upper and or lower set:
-       implies a VBR bitstream that obeys the bitrate limits. nominal
-       may also be set to give a nominal rate.
-     none set:
-       the coder does not care to speculate.
-  */
-
-  long bitrate_upper;
-  long bitrate_nominal;
-  long bitrate_lower;
-  long bitrate_window;
-
-  void *codec_setup;
-} vorbis_info;
-
-/* vorbis_dsp_state buffers the current vorbis audio
-   analysis/synthesis state.  The DSP state belongs to a specific
-   logical bitstream ****************************************************/
-typedef struct vorbis_dsp_state{
-  int analysisp;
-  vorbis_info *vi;
-
-  float **pcm;
-  float **pcmret;
-  int      pcm_storage;
-  int      pcm_current;
-  int      pcm_returned;
-
-  int  preextrapolate;
-  int  eofflag;
-
-  long lW;
-  long W;
-  long nW;
-  long centerW;
-
-  ogg_int64_t granulepos;
-  ogg_int64_t sequence;
-
-  ogg_int64_t glue_bits;
-  ogg_int64_t time_bits;
-  ogg_int64_t floor_bits;
-  ogg_int64_t res_bits;
-
-  void       *backend_state;
-} vorbis_dsp_state;
-
-typedef struct vorbis_block{
-  /* necessary stream state for linking to the framing abstraction */
-  float  **pcm;       /* this is a pointer into local storage */
-  oggpack_buffer opb;
-
-  long  lW;
-  long  W;
-  long  nW;
-  int   pcmend;
-  int   mode;
-
-  int         eofflag;
-  ogg_int64_t granulepos;
-  ogg_int64_t sequence;
-  vorbis_dsp_state *vd; /* For read-only access of configuration */
-
-  /* local storage to avoid remallocing; it's up to the mapping to
-     structure it */
-  void               *localstore;
-  long                localtop;
-  long                localalloc;
-  long                totaluse;
-  struct alloc_chain *reap;
-
-  /* bitmetrics for the frame */
-  long glue_bits;
-  long time_bits;
-  long floor_bits;
-  long res_bits;
-
-  void *internal;
-
-} vorbis_block;
-
-/* vorbis_block is a single block of data to be processed as part of
-the analysis/synthesis stream; it belongs to a specific logical
-bitstream, but is independent from other vorbis_blocks belonging to
-that logical bitstream. *************************************************/
-
-struct alloc_chain{
-  void *ptr;
-  struct alloc_chain *next;
-};
-
-/* vorbis_info contains all the setup information specific to the
-   specific compression/decompression mode in progress (eg,
-   psychoacoustic settings, channel setup, options, codebook
-   etc). vorbis_info and substructures are in backends.h.
-*********************************************************************/
-
-/* the comments are not part of vorbis_info so that vorbis_info can be
-   static storage */
-typedef struct vorbis_comment{
-  /* unlimited user comment fields.  libvorbis writes 'libvorbis'
-     whatever vendor is set to in encode */
-  char **user_comments;
-  int   *comment_lengths;
-  int    comments;
-  char  *vendor;
-
-} vorbis_comment;
-
-
-/* libvorbis encodes in two abstraction layers; first we perform DSP
-   and produce a packet (see docs/analysis.txt).  The packet is then
-   coded into a framed OggSquish bitstream by the second layer (see
-   docs/framing.txt).  Decode is the reverse process; we sync/frame
-   the bitstream and extract individual packets, then decode the
-   packet back into PCM audio.
-
-   The extra framing/packetizing is used in streaming formats, such as
-   files.  Over the net (such as with UDP), the framing and
-   packetization aren't necessary as they're provided by the transport
-   and the streaming layer is not used */
-
-/* Vorbis PRIMITIVES: general ***************************************/
-
-extern void     vorbis_info_init(vorbis_info *vi);
-extern void     vorbis_info_clear(vorbis_info *vi);
-extern int      vorbis_info_blocksize(vorbis_info *vi,int zo);
-extern void     vorbis_comment_init(vorbis_comment *vc);
-extern void     vorbis_comment_add(vorbis_comment *vc, const char *comment);
-extern void     vorbis_comment_add_tag(vorbis_comment *vc,
-                                       const char *tag, const char *contents);
-extern char    *vorbis_comment_query(vorbis_comment *vc, const char *tag, int count);
-extern int      vorbis_comment_query_count(vorbis_comment *vc, const char *tag);
-extern void     vorbis_comment_clear(vorbis_comment *vc);
-
-extern int      vorbis_block_init(vorbis_dsp_state *v, vorbis_block *vb);
-extern int      vorbis_block_clear(vorbis_block *vb);
-extern void     vorbis_dsp_clear(vorbis_dsp_state *v);
-extern double   vorbis_granule_time(vorbis_dsp_state *v,
-                                    ogg_int64_t granulepos);
-
-extern const char *vorbis_version_string(void);
-
-/* Vorbis PRIMITIVES: analysis/DSP layer ****************************/
-
-extern int      vorbis_analysis_init(vorbis_dsp_state *v,vorbis_info *vi);
-extern int      vorbis_commentheader_out(vorbis_comment *vc, ogg_packet *op);
-extern int      vorbis_analysis_headerout(vorbis_dsp_state *v,
-                                          vorbis_comment *vc,
-                                          ogg_packet *op,
-                                          ogg_packet *op_comm,
-                                          ogg_packet *op_code);
-extern float  **vorbis_analysis_buffer(vorbis_dsp_state *v,int vals);
-extern int      vorbis_analysis_wrote(vorbis_dsp_state *v,int vals);
-extern int      vorbis_analysis_blockout(vorbis_dsp_state *v,vorbis_block *vb);
-extern int      vorbis_analysis(vorbis_block *vb,ogg_packet *op);
-
-extern int      vorbis_bitrate_addblock(vorbis_block *vb);
-extern int      vorbis_bitrate_flushpacket(vorbis_dsp_state *vd,
-                                           ogg_packet *op);
-
-/* Vorbis PRIMITIVES: synthesis layer *******************************/
-extern int      vorbis_synthesis_idheader(ogg_packet *op);
-extern int      vorbis_synthesis_headerin(vorbis_info *vi,vorbis_comment *vc,
-                                          ogg_packet *op);
-
-extern int      vorbis_synthesis_init(vorbis_dsp_state *v,vorbis_info *vi);
-extern int      vorbis_synthesis_restart(vorbis_dsp_state *v);
-extern int      vorbis_synthesis(vorbis_block *vb,ogg_packet *op);
-extern int      vorbis_synthesis_trackonly(vorbis_block *vb,ogg_packet *op);
-extern int      vorbis_synthesis_blockin(vorbis_dsp_state *v,vorbis_block *vb);
-extern int      vorbis_synthesis_pcmout(vorbis_dsp_state *v,float ***pcm);
-extern int      vorbis_synthesis_lapout(vorbis_dsp_state *v,float ***pcm);
-extern int      vorbis_synthesis_read(vorbis_dsp_state *v,int samples);
-extern long     vorbis_packet_blocksize(vorbis_info *vi,ogg_packet *op);
-
-extern int      vorbis_synthesis_halfrate(vorbis_info *v,int flag);
-extern int      vorbis_synthesis_halfrate_p(vorbis_info *v);
-
-/* Vorbis ERRORS and return codes ***********************************/
-
-#define OV_FALSE      -1
-#define OV_EOF        -2
-#define OV_HOLE       -3
-
-#define OV_EREAD      -128
-#define OV_EFAULT     -129
-#define OV_EIMPL      -130
-#define OV_EINVAL     -131
-#define OV_ENOTVORBIS -132
-#define OV_EBADHEADER -133
-#define OV_EVERSION   -134
-#define OV_ENOTAUDIO  -135
-#define OV_EBADPACKET -136
-#define OV_EBADLINK   -137
-#define OV_ENOSEEK    -138
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
-
diff --git a/lib-x86-32/include/vorbis/vorbisenc.h b/lib-x86-32/include/vorbis/vorbisenc.h
deleted file mode 100644
index 02332b50..00000000
--- a/lib-x86-32/include/vorbis/vorbisenc.h
+++ /dev/null
@@ -1,436 +0,0 @@
-/********************************************************************
- *                                                                  *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
- *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
- *                                                                  *
- ********************************************************************
-
- function: vorbis encode-engine setup
- last mod: $Id: vorbisenc.h 17021 2010-03-24 09:29:41Z xiphmont $
-
- ********************************************************************/
-
-/** \file
- * Libvorbisenc is a convenient API for setting up an encoding
- * environment using libvorbis. Libvorbisenc encapsulates the
- * actions needed to set up the encoder properly.
- */
-
-#ifndef _OV_ENC_H_
-#define _OV_ENC_H_
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#include "codec.h"
-
-/**
- * This is the primary function within libvorbisenc for setting up managed
- * bitrate modes.
- *
- * Before this function is called, the \ref vorbis_info
- * struct should be initialized by using vorbis_info_init() from the libvorbis
- * API.  After encoding, vorbis_info_clear() should be called.
- *
- * The max_bitrate, nominal_bitrate, and min_bitrate settings are used to set
- * constraints for the encoded file.  This function uses these settings to
- * select the appropriate encoding mode and set it up.
- *
- * \param vi               Pointer to an initialized \ref vorbis_info struct.
- * \param channels         The number of channels to be encoded.
- * \param rate             The sampling rate of the source audio.
- * \param max_bitrate      Desired maximum bitrate (limit). -1 indicates unset.
- * \param nominal_bitrate  Desired average, or central, bitrate. -1 indicates unset.
- * \param min_bitrate      Desired minimum bitrate. -1 indicates unset.
- *
- * \return Zero for success, and negative values for failure.
- *
- * \retval 0          Success.
- * \retval OV_EFAULT  Internal logic fault; indicates a bug or heap/stack corruption.
- * \retval OV_EINVAL  Invalid setup request, eg, out of range argument.
- * \retval OV_EIMPL   Unimplemented mode; unable to comply with bitrate request.
- */
-extern int vorbis_encode_init(vorbis_info *vi,
-                              long channels,
-                              long rate,
-
-                              long max_bitrate,
-                              long nominal_bitrate,
-                              long min_bitrate);
-
-/**
- * This function performs step-one of a three-step bitrate-managed encode
- * setup.  It functions similarly to the one-step setup performed by \ref
- * vorbis_encode_init but allows an application to make further encode setup
- * tweaks using \ref vorbis_encode_ctl before finally calling \ref
- * vorbis_encode_setup_init to complete the setup process.
- *
- * Before this function is called, the \ref vorbis_info struct should be
- * initialized by using vorbis_info_init() from the libvorbis API.  After
- * encoding, vorbis_info_clear() should be called.
- *
- * The max_bitrate, nominal_bitrate, and min_bitrate settings are used to set
- * constraints for the encoded file.  This function uses these settings to
- * select the appropriate encoding mode and set it up.
- *
- * \param vi                Pointer to an initialized vorbis_info struct.
- * \param channels          The number of channels to be encoded.
- * \param rate              The sampling rate of the source audio.
- * \param max_bitrate       Desired maximum bitrate (limit). -1 indicates unset.
- * \param nominal_bitrate   Desired average, or central, bitrate. -1 indicates unset.
- * \param min_bitrate       Desired minimum bitrate. -1 indicates unset.
- *
- * \return Zero for success, and negative for failure.
- *
- * \retval 0           Success
- * \retval OV_EFAULT   Internal logic fault; indicates a bug or heap/stack corruption.
- * \retval OV_EINVAL   Invalid setup request, eg, out of range argument.
- * \retval OV_EIMPL    Unimplemented mode; unable to comply with bitrate request.
- */
-extern int vorbis_encode_setup_managed(vorbis_info *vi,
-                                       long channels,
-                                       long rate,
-
-                                       long max_bitrate,
-                                       long nominal_bitrate,
-                                       long min_bitrate);
-
-/**
- * This function performs step-one of a three-step variable bitrate
- * (quality-based) encode setup.  It functions similarly to the one-step setup
- * performed by \ref vorbis_encode_init_vbr() but allows an application to
- * make further encode setup tweaks using \ref vorbis_encode_ctl() before
- * finally calling \ref vorbis_encode_setup_init to complete the setup
- * process.
- *
- * Before this function is called, the \ref vorbis_info struct should be
- * initialized by using \ref vorbis_info_init() from the libvorbis API.  After
- * encoding, vorbis_info_clear() should be called.
- *
- * \param vi        Pointer to an initialized vorbis_info struct.
- * \param channels  The number of channels to be encoded.
- * \param rate      The sampling rate of the source audio.
- * \param quality   Desired quality level, currently from -0.1 to 1.0 (lo to hi).
- *
- * \return Zero for success, and negative values for failure.
- *
- * \retval  0          Success
- * \retval  OV_EFAULT  Internal logic fault; indicates a bug or heap/stack corruption.
- * \retval  OV_EINVAL  Invalid setup request, eg, out of range argument.
- * \retval  OV_EIMPL   Unimplemented mode; unable to comply with quality level request.
- */
-extern int vorbis_encode_setup_vbr(vorbis_info *vi,
-                                  long channels,
-                                  long rate,
-
-                                  float quality
-                                  );
-
-/**
- * This is the primary function within libvorbisenc for setting up variable
- * bitrate ("quality" based) modes.
- *
- *
- * Before this function is called, the vorbis_info struct should be
- * initialized by using vorbis_info_init() from the libvorbis API. After
- * encoding, vorbis_info_clear() should be called.
- *
- * \param vi           Pointer to an initialized vorbis_info struct.
- * \param channels     The number of channels to be encoded.
- * \param rate         The sampling rate of the source audio.
- * \param base_quality Desired quality level, currently from -0.1 to 1.0 (lo to hi).
- *
- *
- * \return Zero for success, or a negative number for failure.
- *
- * \retval 0           Success
- * \retval OV_EFAULT   Internal logic fault; indicates a bug or heap/stack corruption.
- * \retval OV_EINVAL   Invalid setup request, eg, out of range argument.
- * \retval OV_EIMPL    Unimplemented mode; unable to comply with quality level request.
- */
-extern int vorbis_encode_init_vbr(vorbis_info *vi,
-                                  long channels,
-                                  long rate,
-
-                                  float base_quality
-                                  );
-
-/**
- * This function performs the last stage of three-step encoding setup, as
- * described in the API overview under managed bitrate modes.
- *
- * Before this function is called, the \ref vorbis_info struct should be
- * initialized by using vorbis_info_init() from the libvorbis API, one of
- * \ref vorbis_encode_setup_managed() or \ref vorbis_encode_setup_vbr() called to
- * initialize the high-level encoding setup, and \ref vorbis_encode_ctl()
- * called if necessary to make encoding setup changes.
- * vorbis_encode_setup_init() finalizes the highlevel encoding structure into
- * a complete encoding setup after which the application may make no further
- * setup changes.
- *
- * After encoding, vorbis_info_clear() should be called.
- *
- * \param vi Pointer to an initialized \ref vorbis_info struct.
- *
- * \return Zero for success, and negative values for failure.
- *
- * \retval  0           Success.
- * \retval  OV_EFAULT  Internal logic fault; indicates a bug or heap/stack corruption.
- *
- * \retval OV_EINVAL   Attempt to use vorbis_encode_setup_init() without first
- * calling one of vorbis_encode_setup_managed() or vorbis_encode_setup_vbr() to
- * initialize the high-level encoding setup
- *
- */
-extern int vorbis_encode_setup_init(vorbis_info *vi);
-
-/**
- * This function implements a generic interface to miscellaneous encoder
- * settings similar to the classic UNIX 'ioctl()' system call.  Applications
- * may use vorbis_encode_ctl() to query or set bitrate management or quality
- * mode details by using one of several \e request arguments detailed below.
- * vorbis_encode_ctl() must be called after one of
- * vorbis_encode_setup_managed() or vorbis_encode_setup_vbr().  When used
- * to modify settings, \ref vorbis_encode_ctl() must be called before \ref
- * vorbis_encode_setup_init().
- *
- * \param vi      Pointer to an initialized vorbis_info struct.
- *
- * \param number Specifies the desired action; See \ref encctlcodes "the list
- * of available requests".
- *
- * \param arg void * pointing to a data structure matching the request
- * argument.
- *
- * \retval 0          Success. Any further return information (such as the result of a
- * query) is placed into the storage pointed to by *arg.
- *
- * \retval OV_EINVAL  Invalid argument, or an attempt to modify a setting after
- * calling vorbis_encode_setup_init().
- *
- * \retval OV_EIMPL   Unimplemented or unknown request
- */
-extern int vorbis_encode_ctl(vorbis_info *vi,int number,void *arg);
-
-/**
- * \deprecated This is a deprecated interface. Please use vorbis_encode_ctl()
- * with the \ref ovectl_ratemanage2_arg struct and \ref
- * OV_ECTL_RATEMANAGE2_GET and \ref OV_ECTL_RATEMANAGE2_SET calls in new code.
- *
- * The \ref ovectl_ratemanage_arg structure is used with vorbis_encode_ctl()
- * and the \ref OV_ECTL_RATEMANAGE_GET, \ref OV_ECTL_RATEMANAGE_SET, \ref
- * OV_ECTL_RATEMANAGE_AVG, \ref OV_ECTL_RATEMANAGE_HARD calls in order to
- * query and modify specifics of the encoder's bitrate management
- * configuration.
-*/
-struct ovectl_ratemanage_arg {
-  int    management_active; /**< nonzero if bitrate management is active*/
-/** hard lower limit (in kilobits per second) below which the stream bitrate
-    will never be allowed for any given bitrate_hard_window seconds of time.*/
-  long   bitrate_hard_min;
-/** hard upper limit (in kilobits per second) above which the stream bitrate
-    will never be allowed for any given bitrate_hard_window seconds of time.*/
-  long   bitrate_hard_max;
-/** the window period (in seconds) used to regulate the hard bitrate minimum
-    and maximum*/
-  double bitrate_hard_window;
-/** soft lower limit (in kilobits per second) below which the average bitrate
-    tracker will start nudging the bitrate higher.*/
-  long   bitrate_av_lo;
-/** soft upper limit (in kilobits per second) above which the average bitrate
-    tracker will start nudging the bitrate lower.*/
-  long   bitrate_av_hi;
-/** the window period (in seconds) used to regulate the average bitrate
-    minimum and maximum.*/
-  double bitrate_av_window;
-/** Regulates the relative centering of the average and hard windows; in
-    libvorbis 1.0 and 1.0.1, the hard window regulation overlapped but
-    followed the average window regulation. In libvorbis 1.1 a bit-reservoir
-    interface replaces the old windowing interface; the older windowing
-    interface is simulated and this field has no effect.*/
-  double bitrate_av_window_center;
-};
-
-/**
- * \name struct ovectl_ratemanage2_arg
- *
- * The ovectl_ratemanage2_arg structure is used with vorbis_encode_ctl() and
- * the OV_ECTL_RATEMANAGE2_GET and OV_ECTL_RATEMANAGE2_SET calls in order to
- * query and modify specifics of the encoder's bitrate management
- * configuration.
- *
-*/
-struct ovectl_ratemanage2_arg {
-  int    management_active; /**< nonzero if bitrate management is active */
-/** Lower allowed bitrate limit in kilobits per second */
-  long   bitrate_limit_min_kbps;
-/** Upper allowed bitrate limit in kilobits per second */
-  long   bitrate_limit_max_kbps;
-  long   bitrate_limit_reservoir_bits; /**<Size of the bitrate reservoir in bits */
-/** Regulates the bitrate reservoir's preferred fill level in a range from 0.0
- * to 1.0; 0.0 tries to bank bits to buffer against future bitrate spikes, 1.0
- * buffers against future sudden drops in instantaneous bitrate. Default is
- * 0.1
- */
-  double bitrate_limit_reservoir_bias;
-/** Average bitrate setting in kilobits per second */
-  long   bitrate_average_kbps;
-/** Slew rate limit setting for average bitrate adjustment; sets the minimum
- *  time in seconds the bitrate tracker may swing from one extreme to the
- *  other when boosting or damping average bitrate.
- */
-  double bitrate_average_damping;
-};
-
-
-/**
- * \name vorbis_encode_ctl() codes
- *
- * \anchor encctlcodes
- *
- * These values are passed as the \c number parameter of vorbis_encode_ctl().
- * The type of the referent of that function's \c arg pointer depends on these
- * codes.
- */
-/*@{*/
-
-/**
- * Query the current encoder bitrate management setting.
- *
- *Argument: <tt>struct ovectl_ratemanage2_arg *</tt>
- *
- * Used to query the current encoder bitrate management setting. Also used to
- * initialize fields of an ovectl_ratemanage2_arg structure for use with
- * \ref OV_ECTL_RATEMANAGE2_SET.
- */
-#define OV_ECTL_RATEMANAGE2_GET      0x14
-
-/**
- * Set the current encoder bitrate management settings.
- *
- * Argument: <tt>struct ovectl_ratemanage2_arg *</tt>
- *
- * Used to set the current encoder bitrate management settings to the values
- * listed in the ovectl_ratemanage2_arg. Passing a NULL pointer will disable
- * bitrate management.
-*/
-#define OV_ECTL_RATEMANAGE2_SET      0x15
-
-/**
- * Returns the current encoder hard-lowpass setting (kHz) in the double
- * pointed to by arg.
- *
- * Argument: <tt>double *</tt>
-*/
-#define OV_ECTL_LOWPASS_GET          0x20
-
-/**
- *  Sets the encoder hard-lowpass to the value (kHz) pointed to by arg. Valid
- *  lowpass settings range from 2 to 99.
- *
- * Argument: <tt>double *</tt>
-*/
-#define OV_ECTL_LOWPASS_SET          0x21
-
-/**
- *  Returns the current encoder impulse block setting in the double pointed
- *  to by arg.
- *
- * Argument: <tt>double *</tt>
-*/
-#define OV_ECTL_IBLOCK_GET           0x30
-
-/**
- *  Sets the impulse block bias to the the value pointed to by arg.
- *
- * Argument: <tt>double *</tt>
- *
- *  Valid range is -15.0 to 0.0 [default]. A negative impulse block bias will
- *  direct to encoder to use more bits when incoding short blocks that contain
- *  strong impulses, thus improving the accuracy of impulse encoding.
- */
-#define OV_ECTL_IBLOCK_SET           0x31
-
-/**
- *  Returns the current encoder coupling setting in the int pointed
- *  to by arg.
- *
- * Argument: <tt>int *</tt>
-*/
-#define OV_ECTL_COUPLING_GET         0x40
-
-/**
- *  Enables/disables channel coupling in multichannel encoding according to arg.
- *
- * Argument: <tt>int *</tt>
- *
- *  Zero disables channel coupling for multichannel inputs, nonzer enables
- *  channel coupling.  Setting has no effect on monophonic encoding or
- *  multichannel counts that do not offer coupling.  At present, coupling is
- *  available for stereo and 5.1 encoding.
- */
-#define OV_ECTL_COUPLING_SET         0x41
-
-  /* deprecated rate management supported only for compatibility */
-
-/**
- * Old interface to querying bitrate management settings.
- *
- * Deprecated after move to bit-reservoir style management in 1.1 rendered
- * this interface partially obsolete.
-
- * \deprecated Please use \ref OV_ECTL_RATEMANAGE2_GET instead.
- *
- * Argument: <tt>struct ovectl_ratemanage_arg *</tt>
- */
-#define OV_ECTL_RATEMANAGE_GET       0x10
-/**
- * Old interface to modifying bitrate management settings.
- *
- *  deprecated after move to bit-reservoir style management in 1.1 rendered
- *  this interface partially obsolete.
- *
- * \deprecated Please use \ref OV_ECTL_RATEMANAGE2_SET instead.
- *
- * Argument: <tt>struct ovectl_ratemanage_arg *</tt>
- */
-#define OV_ECTL_RATEMANAGE_SET       0x11
-/**
- * Old interface to setting average-bitrate encoding mode.
- *
- * Deprecated after move to bit-reservoir style management in 1.1 rendered
- * this interface partially obsolete.
- *
- *  \deprecated Please use \ref OV_ECTL_RATEMANAGE2_SET instead.
- *
- * Argument: <tt>struct ovectl_ratemanage_arg *</tt>
- */
-#define OV_ECTL_RATEMANAGE_AVG       0x12
-/**
- * Old interface to setting bounded-bitrate encoding modes.
- *
- * deprecated after move to bit-reservoir style management in 1.1 rendered
- * this interface partially obsolete.
- *
- *  \deprecated Please use \ref OV_ECTL_RATEMANAGE2_SET instead.
- *
- * Argument: <tt>struct ovectl_ratemanage_arg *</tt>
- */
-#define OV_ECTL_RATEMANAGE_HARD      0x13
-
-/*@}*/
-
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
diff --git a/lib-x86-32/include/vorbis/vorbisfile.h b/lib-x86-32/include/vorbis/vorbisfile.h
deleted file mode 100644
index a865cd09..00000000
--- a/lib-x86-32/include/vorbis/vorbisfile.h
+++ /dev/null
@@ -1,206 +0,0 @@
-/********************************************************************
- *                                                                  *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
- *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
- *                                                                  *
- ********************************************************************
-
- function: stdio-based convenience library for opening/seeking/decoding
- last mod: $Id: vorbisfile.h 17021 2010-03-24 09:29:41Z xiphmont $
-
- ********************************************************************/
-
-#ifndef _OV_FILE_H_
-#define _OV_FILE_H_
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#include <stdio.h>
-#include "codec.h"
-
-/* The function prototypes for the callbacks are basically the same as for
- * the stdio functions fread, fseek, fclose, ftell.
- * The one difference is that the FILE * arguments have been replaced with
- * a void * - this is to be used as a pointer to whatever internal data these
- * functions might need. In the stdio case, it's just a FILE * cast to a void *
- *
- * If you use other functions, check the docs for these functions and return
- * the right values. For seek_func(), you *MUST* return -1 if the stream is
- * unseekable
- */
-typedef struct {
-  size_t (*read_func)  (void *ptr, size_t size, size_t nmemb, void *datasource);
-  int    (*seek_func)  (void *datasource, ogg_int64_t offset, int whence);
-  int    (*close_func) (void *datasource);
-  long   (*tell_func)  (void *datasource);
-} ov_callbacks;
-
-#ifndef OV_EXCLUDE_STATIC_CALLBACKS
-
-/* a few sets of convenient callbacks, especially for use under
- * Windows where ov_open_callbacks() should always be used instead of
- * ov_open() to avoid problems with incompatible crt.o version linking
- * issues. */
-
-static int _ov_header_fseek_wrap(FILE *f,ogg_int64_t off,int whence){
-  if(f==NULL)return(-1);
-
-#ifdef __MINGW32__
-  return fseeko64(f,off,whence);
-#elif defined (_WIN32)
-  return _fseeki64(f,off,whence);
-#else
-  return fseek(f,off,whence);
-#endif
-}
-
-/* These structs below (OV_CALLBACKS_DEFAULT etc) are defined here as
- * static data. That means that every file which includes this header
- * will get its own copy of these structs whether it uses them or
- * not unless it #defines OV_EXCLUDE_STATIC_CALLBACKS.
- * These static symbols are essential on platforms such as Windows on
- * which several different versions of stdio support may be linked to
- * by different DLLs, and we need to be certain we know which one
- * we're using (the same one as the main application).
- */
-
-static ov_callbacks OV_CALLBACKS_DEFAULT = {
-  (size_t (*)(void *, size_t, size_t, void *))  fread,
-  (int (*)(void *, ogg_int64_t, int))           _ov_header_fseek_wrap,
-  (int (*)(void *))                             fclose,
-  (long (*)(void *))                            ftell
-};
-
-static ov_callbacks OV_CALLBACKS_NOCLOSE = {
-  (size_t (*)(void *, size_t, size_t, void *))  fread,
-  (int (*)(void *, ogg_int64_t, int))           _ov_header_fseek_wrap,
-  (int (*)(void *))                             NULL,
-  (long (*)(void *))                            ftell
-};
-
-static ov_callbacks OV_CALLBACKS_STREAMONLY = {
-  (size_t (*)(void *, size_t, size_t, void *))  fread,
-  (int (*)(void *, ogg_int64_t, int))           NULL,
-  (int (*)(void *))                             fclose,
-  (long (*)(void *))                            NULL
-};
-
-static ov_callbacks OV_CALLBACKS_STREAMONLY_NOCLOSE = {
-  (size_t (*)(void *, size_t, size_t, void *))  fread,
-  (int (*)(void *, ogg_int64_t, int))           NULL,
-  (int (*)(void *))                             NULL,
-  (long (*)(void *))                            NULL
-};
-
-#endif
-
-#define  NOTOPEN   0
-#define  PARTOPEN  1
-#define  OPENED    2
-#define  STREAMSET 3
-#define  INITSET   4
-
-typedef struct OggVorbis_File {
-  void            *datasource; /* Pointer to a FILE *, etc. */
-  int              seekable;
-  ogg_int64_t      offset;
-  ogg_int64_t      end;
-  ogg_sync_state   oy;
-
-  /* If the FILE handle isn't seekable (eg, a pipe), only the current
-     stream appears */
-  int              links;
-  ogg_int64_t     *offsets;
-  ogg_int64_t     *dataoffsets;
-  long            *serialnos;
-  ogg_int64_t     *pcmlengths; /* overloaded to maintain binary
-                                  compatibility; x2 size, stores both
-                                  beginning and end values */
-  vorbis_info     *vi;
-  vorbis_comment  *vc;
-
-  /* Decoding working state local storage */
-  ogg_int64_t      pcm_offset;
-  int              ready_state;
-  long             current_serialno;
-  int              current_link;
-
-  double           bittrack;
-  double           samptrack;
-
-  ogg_stream_state os; /* take physical pages, weld into a logical
-                          stream of packets */
-  vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */
-  vorbis_block     vb; /* local working space for packet->PCM decode */
-
-  ov_callbacks callbacks;
-
-} OggVorbis_File;
-
-
-extern int ov_clear(OggVorbis_File *vf);
-extern int ov_fopen(char *path,OggVorbis_File *vf);
-extern int ov_open(FILE *f,OggVorbis_File *vf,char *initial,long ibytes);
-extern int ov_open_callbacks(void *datasource, OggVorbis_File *vf,
-                char *initial, long ibytes, ov_callbacks callbacks);
-
-extern int ov_test(FILE *f,OggVorbis_File *vf,char *initial,long ibytes);
-extern int ov_test_callbacks(void *datasource, OggVorbis_File *vf,
-                char *initial, long ibytes, ov_callbacks callbacks);
-extern int ov_test_open(OggVorbis_File *vf);
-
-extern long ov_bitrate(OggVorbis_File *vf,int i);
-extern long ov_bitrate_instant(OggVorbis_File *vf);
-extern long ov_streams(OggVorbis_File *vf);
-extern long ov_seekable(OggVorbis_File *vf);
-extern long ov_serialnumber(OggVorbis_File *vf,int i);
-
-extern ogg_int64_t ov_raw_total(OggVorbis_File *vf,int i);
-extern ogg_int64_t ov_pcm_total(OggVorbis_File *vf,int i);
-extern double ov_time_total(OggVorbis_File *vf,int i);
-
-extern int ov_raw_seek(OggVorbis_File *vf,ogg_int64_t pos);
-extern int ov_pcm_seek(OggVorbis_File *vf,ogg_int64_t pos);
-extern int ov_pcm_seek_page(OggVorbis_File *vf,ogg_int64_t pos);
-extern int ov_time_seek(OggVorbis_File *vf,double pos);
-extern int ov_time_seek_page(OggVorbis_File *vf,double pos);
-
-extern int ov_raw_seek_lap(OggVorbis_File *vf,ogg_int64_t pos);
-extern int ov_pcm_seek_lap(OggVorbis_File *vf,ogg_int64_t pos);
-extern int ov_pcm_seek_page_lap(OggVorbis_File *vf,ogg_int64_t pos);
-extern int ov_time_seek_lap(OggVorbis_File *vf,double pos);
-extern int ov_time_seek_page_lap(OggVorbis_File *vf,double pos);
-
-extern ogg_int64_t ov_raw_tell(OggVorbis_File *vf);
-extern ogg_int64_t ov_pcm_tell(OggVorbis_File *vf);
-extern double ov_time_tell(OggVorbis_File *vf);
-
-extern vorbis_info *ov_info(OggVorbis_File *vf,int link);
-extern vorbis_comment *ov_comment(OggVorbis_File *vf,int link);
-
-extern long ov_read_float(OggVorbis_File *vf,float ***pcm_channels,int samples,
-                          int *bitstream);
-extern long ov_read_filter(OggVorbis_File *vf,char *buffer,int length,
-                          int bigendianp,int word,int sgned,int *bitstream,
-                          void (*filter)(float **pcm,long channels,long samples,void *filter_param),void *filter_param);
-extern long ov_read(OggVorbis_File *vf,char *buffer,int length,
-                    int bigendianp,int word,int sgned,int *bitstream);
-extern int ov_crosslap(OggVorbis_File *vf1,OggVorbis_File *vf2);
-
-extern int ov_halfrate(OggVorbis_File *vf,int flag);
-extern int ov_halfrate_p(OggVorbis_File *vf);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
-
diff --git a/lib-x86-32/include/wavpack.h b/lib-x86-32/include/wavpack.h
deleted file mode 100644
index fe66dcbc..00000000
--- a/lib-x86-32/include/wavpack.h
+++ /dev/null
@@ -1,302 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-//                           **** WAVPACK ****                            //
-//                  Hybrid Lossless Wavefile Compressor                   //
-//              Copyright (c) 1998 - 2006 Conifer Software.               //
-//                          All Rights Reserved.                          //
-//      Distributed under the BSD Software License (see license.txt)      //
-////////////////////////////////////////////////////////////////////////////
-
-// wavpack.h
-
-#ifndef WAVPACK_H
-#define WAVPACK_H
-
-// This header file contains all the definitions required to use the
-// functions in "wputils.c" to read and write WavPack files and streams.
-
-#include <sys/types.h>
-
-#if defined(_WIN32) && !defined(__MINGW32__)
-#include <stdlib.h>
-typedef unsigned __int64 uint64_t;
-typedef unsigned __int32 uint32_t;
-typedef unsigned __int16 uint16_t;
-typedef unsigned __int8 uint8_t;
-typedef __int64 int64_t;
-typedef __int32 int32_t;
-typedef __int16 int16_t;
-typedef __int8  int8_t;
-typedef float float32_t;
-#else
-#include <inttypes.h>
-#endif
-
-// RIFF / wav header formats (these occur at the beginning of both wav files
-// and pre-4.0 WavPack files that are not in the "raw" mode). Generally, an
-// application using the library to read or write WavPack files will not be
-// concerned with any of these.
-
-typedef struct {
-    char ckID [4];
-    uint32_t ckSize;
-    char formType [4];
-} RiffChunkHeader;
-
-typedef struct {
-    char ckID [4];
-    uint32_t ckSize;
-} ChunkHeader;
-
-#define ChunkHeaderFormat "4L"
-
-typedef struct {
-    unsigned short FormatTag, NumChannels;
-    uint32_t SampleRate, BytesPerSecond;
-    unsigned short BlockAlign, BitsPerSample;
-    unsigned short cbSize, ValidBitsPerSample;
-    int32_t ChannelMask;
-    unsigned short SubFormat;
-    char GUID [14];
-} WaveHeader;
-
-#define WaveHeaderFormat "SSLLSSSSLS"
-
-// This is the ONLY structure that occurs in WavPack files (as of version
-// 4.0), and is the preamble to every block in both the .wv and .wvc
-// files (in little-endian format). Normally, this structure has no use
-// to an application using the library to read or write WavPack files,
-// but if an application needs to manually parse WavPack files then this
-// would be used (with appropriate endian correction).
-
-typedef struct {
-    char ckID [4];
-    uint32_t ckSize;
-    short version;
-    unsigned char track_no, index_no;
-    uint32_t total_samples, block_index, block_samples, flags, crc;
-} WavpackHeader;
-
-#define WavpackHeaderFormat "4LS2LLLLL"
-
-// or-values for WavpackHeader.flags
-#define BYTES_STORED    3       // 1-4 bytes/sample
-#define MONO_FLAG       4       // not stereo
-#define HYBRID_FLAG     8       // hybrid mode
-#define JOINT_STEREO    0x10    // joint stereo
-#define CROSS_DECORR    0x20    // no-delay cross decorrelation
-#define HYBRID_SHAPE    0x40    // noise shape (hybrid mode only)
-#define FLOAT_DATA      0x80    // ieee 32-bit floating point data
-
-#define INT32_DATA      0x100   // special extended int handling
-#define HYBRID_BITRATE  0x200   // bitrate noise (hybrid mode only)
-#define HYBRID_BALANCE  0x400   // balance noise (hybrid stereo mode only)
-
-#define INITIAL_BLOCK   0x800   // initial block of multichannel segment
-#define FINAL_BLOCK     0x1000  // final block of multichannel segment
-
-#define SHIFT_LSB       13
-#define SHIFT_MASK      (0x1fL << SHIFT_LSB)
-
-#define MAG_LSB         18
-#define MAG_MASK        (0x1fL << MAG_LSB)
-
-#define SRATE_LSB       23
-#define SRATE_MASK      (0xfL << SRATE_LSB)
-
-#define FALSE_STEREO    0x40000000      // block is stereo, but data is mono
-
-#define IGNORED_FLAGS   0x18000000      // reserved, but ignore if encountered
-#define NEW_SHAPING     0x20000000      // use IIR filter for negative shaping
-#define UNKNOWN_FLAGS   0x80000000      // also reserved, but refuse decode if
-                                        //  encountered
-
-#define MONO_DATA (MONO_FLAG | FALSE_STEREO)
-
-#define MIN_STREAM_VERS     0x402       // lowest stream version we'll decode
-#define MAX_STREAM_VERS     0x410       // highest stream version we'll decode or encode
-#define CUR_STREAM_VERS     0x407       // stream version we are writing now
-
-// These are the mask bit definitions for the metadata chunk id byte (see format.txt)
-
-#define ID_UNIQUE               0x3f
-#define ID_OPTIONAL_DATA        0x20
-#define ID_ODD_SIZE             0x40
-#define ID_LARGE                0x80
-
-#define ID_DUMMY                0x0
-#define ID_ENCODER_INFO         0x1
-#define ID_DECORR_TERMS         0x2
-#define ID_DECORR_WEIGHTS       0x3
-#define ID_DECORR_SAMPLES       0x4
-#define ID_ENTROPY_VARS         0x5
-#define ID_HYBRID_PROFILE       0x6
-#define ID_SHAPING_WEIGHTS      0x7
-#define ID_FLOAT_INFO           0x8
-#define ID_INT32_INFO           0x9
-#define ID_WV_BITSTREAM         0xa
-#define ID_WVC_BITSTREAM        0xb
-#define ID_WVX_BITSTREAM        0xc
-#define ID_CHANNEL_INFO         0xd
-
-#define ID_RIFF_HEADER          (ID_OPTIONAL_DATA | 0x1)
-#define ID_RIFF_TRAILER         (ID_OPTIONAL_DATA | 0x2)
-#define ID_REPLAY_GAIN          (ID_OPTIONAL_DATA | 0x3)    // never used (APEv2)
-#define ID_CUESHEET             (ID_OPTIONAL_DATA | 0x4)    // never used (APEv2)
-#define ID_CONFIG_BLOCK         (ID_OPTIONAL_DATA | 0x5)
-#define ID_MD5_CHECKSUM         (ID_OPTIONAL_DATA | 0x6)
-#define ID_SAMPLE_RATE          (ID_OPTIONAL_DATA | 0x7)
-
-///////////////////////// WavPack Configuration ///////////////////////////////
-
-// This external structure is used during encode to provide configuration to
-// the encoding engine and during decoding to provide fle information back to
-// the higher level functions. Not all fields are used in both modes.
-
-typedef struct {
-    float bitrate, shaping_weight;
-    int bits_per_sample, bytes_per_sample;
-    int qmode, flags, xmode, num_channels, float_norm_exp;
-    int32_t block_samples, extra_flags, sample_rate, channel_mask;
-    unsigned char md5_checksum [16], md5_read;
-    int num_tag_strings;
-    char **tag_strings;
-} WavpackConfig;
-
-#define CONFIG_HYBRID_FLAG      8       // hybrid mode
-#define CONFIG_JOINT_STEREO     0x10    // joint stereo
-#define CONFIG_HYBRID_SHAPE     0x40    // noise shape (hybrid mode only)
-#define CONFIG_FAST_FLAG        0x200   // fast mode
-#define CONFIG_HIGH_FLAG        0x800   // high quality mode
-#define CONFIG_VERY_HIGH_FLAG   0x1000  // very high
-#define CONFIG_BITRATE_KBPS     0x2000  // bitrate is kbps, not bits / sample
-#define CONFIG_SHAPE_OVERRIDE   0x8000  // shaping mode specified
-#define CONFIG_JOINT_OVERRIDE   0x10000 // joint-stereo mode specified
-#define CONFIG_DYNAMIC_SHAPING  0x20000 // dynamic noise shaping
-#define CONFIG_CREATE_EXE       0x40000 // create executable
-#define CONFIG_CREATE_WVC       0x80000 // create correction file
-#define CONFIG_OPTIMIZE_WVC     0x100000 // maximize bybrid compression
-#define CONFIG_CALC_NOISE       0x800000 // calc noise in hybrid mode
-#define CONFIG_EXTRA_MODE       0x2000000 // extra processing mode
-#define CONFIG_SKIP_WVX         0x4000000 // no wvx stream w/ floats & big ints
-#define CONFIG_MD5_CHECKSUM     0x8000000 // store MD5 signature
-#define CONFIG_MERGE_BLOCKS     0x10000000 // merge blocks of equal redundancy (for lossyWAV)
-#define CONFIG_PAIR_UNDEF_CHANS 0x20000000 // encode undefined channels in stereo pairs
-#define CONFIG_OPTIMIZE_MONO    0x80000000 // optimize for mono streams posing as stereo
-
-////////////// Callbacks used for reading & writing WavPack streams //////////
-
-typedef struct {
-    int32_t (*read_bytes)(void *id, void *data, int32_t bcount);
-    uint32_t (*get_pos)(void *id);
-    int (*set_pos_abs)(void *id, uint32_t pos);
-    int (*set_pos_rel)(void *id, int32_t delta, int mode);
-    int (*push_back_byte)(void *id, int c);
-    uint32_t (*get_length)(void *id);
-    int (*can_seek)(void *id);
-
-    // this callback is for writing edited tags only
-    int32_t (*write_bytes)(void *id, void *data, int32_t bcount);
-} WavpackStreamReader;
-
-typedef int (*WavpackBlockOutput)(void *id, void *data, int32_t bcount);
-
-//////////////////////////// function prototypes /////////////////////////////
-
-// Note: See wputils.c sourcecode for descriptions for using these functions.
-
-typedef void WavpackContext;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-WavpackContext *WavpackOpenFileInputEx (WavpackStreamReader *reader, void *wv_id, void *wvc_id, char *error, int flags, int norm_offset);
-WavpackContext *WavpackOpenFileInput (const char *infilename, char *error, int flags, int norm_offset);
-
-#define OPEN_WVC        0x1     // open/read "correction" file
-#define OPEN_TAGS       0x2     // read ID3v1 / APEv2 tags (seekable file)
-#define OPEN_WRAPPER    0x4     // make audio wrapper available (i.e. RIFF)
-#define OPEN_2CH_MAX    0x8     // open multichannel as stereo (no downmix)
-#define OPEN_NORMALIZE  0x10    // normalize floating point data to +/- 1.0
-#define OPEN_STREAMING  0x20    // "streaming" mode blindly unpacks blocks
-                                // w/o regard to header file position info
-#define OPEN_EDIT_TAGS  0x40    // allow editing of tags
-
-int WavpackGetMode (WavpackContext *wpc);
-
-#define MODE_WVC        0x1
-#define MODE_LOSSLESS   0x2
-#define MODE_HYBRID     0x4
-#define MODE_FLOAT      0x8
-#define MODE_VALID_TAG  0x10
-#define MODE_HIGH       0x20
-#define MODE_FAST       0x40
-#define MODE_EXTRA      0x80    // extra mode used, see MODE_XMODE for possible level
-#define MODE_APETAG     0x100
-#define MODE_SFX        0x200
-#define MODE_VERY_HIGH  0x400
-#define MODE_MD5        0x800
-#define MODE_XMODE      0x7000  // mask for extra level (1-6, 0=unknown)
-#define MODE_DNS        0x8000
-
-char *WavpackGetErrorMessage (WavpackContext *wpc);
-int WavpackGetVersion (WavpackContext *wpc);
-uint32_t WavpackUnpackSamples (WavpackContext *wpc, int32_t *buffer, uint32_t samples);
-uint32_t WavpackGetNumSamples (WavpackContext *wpc);
-uint32_t WavpackGetSampleIndex (WavpackContext *wpc);
-int WavpackGetNumErrors (WavpackContext *wpc);
-int WavpackLossyBlocks (WavpackContext *wpc);
-int WavpackSeekSample (WavpackContext *wpc, uint32_t sample);
-WavpackContext *WavpackCloseFile (WavpackContext *wpc);
-uint32_t WavpackGetSampleRate (WavpackContext *wpc);
-int WavpackGetBitsPerSample (WavpackContext *wpc);
-int WavpackGetBytesPerSample (WavpackContext *wpc);
-int WavpackGetNumChannels (WavpackContext *wpc);
-int WavpackGetChannelMask (WavpackContext *wpc);
-int WavpackGetReducedChannels (WavpackContext *wpc);
-int WavpackGetFloatNormExp (WavpackContext *wpc);
-int WavpackGetMD5Sum (WavpackContext *wpc, unsigned char data [16]);
-uint32_t WavpackGetWrapperBytes (WavpackContext *wpc);
-unsigned char *WavpackGetWrapperData (WavpackContext *wpc);
-void WavpackFreeWrapper (WavpackContext *wpc);
-void WavpackSeekTrailingWrapper (WavpackContext *wpc);
-double WavpackGetProgress (WavpackContext *wpc);
-uint32_t WavpackGetFileSize (WavpackContext *wpc);
-double WavpackGetRatio (WavpackContext *wpc);
-double WavpackGetAverageBitrate (WavpackContext *wpc, int count_wvc);
-double WavpackGetInstantBitrate (WavpackContext *wpc);
-int WavpackGetNumTagItems (WavpackContext *wpc);
-int WavpackGetTagItem (WavpackContext *wpc, const char *item, char *value, int size);
-int WavpackGetTagItemIndexed (WavpackContext *wpc, int index, char *item, int size);
-int WavpackGetNumBinaryTagItems (WavpackContext *wpc);
-int WavpackGetBinaryTagItem (WavpackContext *wpc, const char *item, char *value, int size);
-int WavpackGetBinaryTagItemIndexed (WavpackContext *wpc, int index, char *item, int size);
-int WavpackAppendTagItem (WavpackContext *wpc, const char *item, const char *value, int vsize);
-int WavpackAppendBinaryTagItem (WavpackContext *wpc, const char *item, const char *value, int vsize);
-int WavpackDeleteTagItem (WavpackContext *wpc, const char *item);
-int WavpackWriteTag (WavpackContext *wpc);
-
-WavpackContext *WavpackOpenFileOutput (WavpackBlockOutput blockout, void *wv_id, void *wvc_id);
-int WavpackSetConfiguration (WavpackContext *wpc, WavpackConfig *config, uint32_t total_samples);
-int WavpackAddWrapper (WavpackContext *wpc, void *data, uint32_t bcount);
-int WavpackStoreMD5Sum (WavpackContext *wpc, unsigned char data [16]);
-int WavpackPackInit (WavpackContext *wpc);
-int WavpackPackSamples (WavpackContext *wpc, int32_t *sample_buffer, uint32_t sample_count);
-int WavpackFlushSamples (WavpackContext *wpc);
-void WavpackUpdateNumSamples (WavpackContext *wpc, void *first_block);
-void *WavpackGetWrapperLocation (void *first_block, uint32_t *size);
-double WavpackGetEncodedNoise (WavpackContext *wpc, double *peak);
-
-void WavpackFloatNormalize (int32_t *values, int32_t num_values, int delta_exp);
-
-void WavpackLittleEndianToNative (void *data, char *format);
-void WavpackNativeToLittleEndian (void *data, char *format);
-
-uint32_t WavpackGetLibraryVersion (void);
-const char *WavpackGetLibraryVersionString (void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib-x86-32/include/zconf.h b/lib-x86-32/include/zconf.h
deleted file mode 100644
index b2343874..00000000
--- a/lib-x86-32/include/zconf.h
+++ /dev/null
@@ -1,428 +0,0 @@
-/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2010 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 */
-
-/* all linked symbols */
-#  define _dist_code            z__dist_code
-#  define _length_code          z__length_code
-#  define _tr_align             z__tr_align
-#  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
-#  define compress              z_compress
-#  define compress2             z_compress2
-#  define compressBound         z_compressBound
-#  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 deflatePrime          z_deflatePrime
-#  define deflateReset          z_deflateReset
-#  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
-#  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 gzgets                z_gzgets
-#  define gzoffset              z_gzoffset
-#  define gzoffset64            z_gzoffset64
-#  define gzopen                z_gzopen
-#  define gzopen64              z_gzopen64
-#  define gzprintf              z_gzprintf
-#  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
-#  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 inflateSync           z_inflateSync
-#  define inflateSyncPoint      z_inflateSyncPoint
-#  define inflateUndermine      z_inflateUndermine
-#  define inflate_copyright     z_inflate_copyright
-#  define inflate_fast          z_inflate_fast
-#  define inflate_table         z_inflate_table
-#  define uncompress            z_uncompress
-#  define zError                z_zError
-#  define zcalloc               z_zcalloc
-#  define zcfree                z_zcfree
-#  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
-#  define gzFile                z_gzFile
-#  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
-
-/* 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
-
-/* 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 1    /* was set to #if 1 by ./configure */
-#  define Z_HAVE_UNISTD_H
-#endif
-
-#ifdef STDC
-#  include <sys/types.h>    /* for off_t */
-#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 -_LARGEFILE64_SOURCE - -1 == 1
-#  undef _LARGEFILE64_SOURCE
-#endif
-
-#if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
-#  include <unistd.h>       /* for SEEK_* and off_t */
-#  ifdef VMS
-#    include <unixio.h>     /* for off_t */
-#  endif
-#  ifndef z_off_t
-#    define z_off_t off_t
-#  endif
-#endif
-
-#ifndef SEEK_SET
-#  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(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
-#  define z_off64_t off64_t
-#else
-#  define z_off64_t z_off_t
-#endif
-
-#if defined(__OS400__)
-#  define NO_vsnprintf
-#endif
-
-#if defined(__MVS__)
-#  define NO_vsnprintf
-#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/lib-x86-32/include/zip.h b/lib-x86-32/include/zip.h
deleted file mode 100644
index f8b55ac0..00000000
--- a/lib-x86-32/include/zip.h
+++ /dev/null
@@ -1,274 +0,0 @@
-#ifndef _HAD_ZIP_H
-#define _HAD_ZIP_H
-
-/*
-  zip.h -- exported declarations.
-  Copyright (C) 1999-2011 Dieter Baron and Thomas Klausner
-
-  This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <libzip@nih.at>
-
-  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.
-  3. The names of the authors may not be used to endorse or promote
-     products derived from this software without specific prior
-     written permission.
- 
-  THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``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 AUTHORS 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 ZIP_EXTERN
-#ifdef _WIN32
-#define ZIP_EXTERN __declspec(dllimport)
-#else
-#define ZIP_EXTERN
-#endif
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <zipconf.h>
-
-#include <sys/types.h>
-#include <stdio.h>
-#include <time.h>
-
-/* flags for zip_open */
-
-#define ZIP_CREATE           1
-#define ZIP_EXCL             2
-#define ZIP_CHECKCONS        4
-
-
-/* flags for zip_name_locate, zip_fopen, zip_stat, ... */
-
-#define ZIP_FL_NOCASE		1 /* ignore case on name lookup */
-#define ZIP_FL_NODIR		2 /* ignore directory component */
-#define ZIP_FL_COMPRESSED	4 /* read compressed data */
-#define ZIP_FL_UNCHANGED	8 /* use original data, ignoring changes */
-#define ZIP_FL_RECOMPRESS      16 /* force recompression of data */
-#define ZIP_FL_ENCRYPTED       32 /* read encrypted data
-				     (implies ZIP_FL_COMPRESSED) */
-
-/* archive global flags flags */
-
-#define ZIP_AFL_TORRENT		1 /* torrent zipped */
-#define ZIP_AFL_RDONLY		2 /* read only -- cannot be cleared */
-
-
-/* flags for compression and encryption sources */
-
-#define ZIP_CODEC_ENCODE	1 /* compress/encrypt */
-
-
-/* libzip error codes */
-
-#define ZIP_ER_OK             0  /* N No error */
-#define ZIP_ER_MULTIDISK      1  /* N Multi-disk zip archives not supported */
-#define ZIP_ER_RENAME         2  /* S Renaming temporary file failed */
-#define ZIP_ER_CLOSE          3  /* S Closing zip archive failed */
-#define ZIP_ER_SEEK           4  /* S Seek error */
-#define ZIP_ER_READ           5  /* S Read error */
-#define ZIP_ER_WRITE          6  /* S Write error */
-#define ZIP_ER_CRC            7  /* N CRC error */
-#define ZIP_ER_ZIPCLOSED      8  /* N Containing zip archive was closed */
-#define ZIP_ER_NOENT          9  /* N No such file */
-#define ZIP_ER_EXISTS        10  /* N File already exists */
-#define ZIP_ER_OPEN          11  /* S Can't open file */
-#define ZIP_ER_TMPOPEN       12  /* S Failure to create temporary file */
-#define ZIP_ER_ZLIB          13  /* Z Zlib error */
-#define ZIP_ER_MEMORY        14  /* N Malloc failure */
-#define ZIP_ER_CHANGED       15  /* N Entry has been changed */
-#define ZIP_ER_COMPNOTSUPP   16  /* N Compression method not supported */
-#define ZIP_ER_EOF           17  /* N Premature EOF */
-#define ZIP_ER_INVAL         18  /* N Invalid argument */
-#define ZIP_ER_NOZIP         19  /* N Not a zip archive */
-#define ZIP_ER_INTERNAL      20  /* N Internal error */
-#define ZIP_ER_INCONS        21  /* N Zip archive inconsistent */
-#define ZIP_ER_REMOVE        22  /* S Can't remove file */
-#define ZIP_ER_DELETED       23  /* N Entry has been deleted */
-#define ZIP_ER_ENCRNOTSUPP   24  /* N Encryption method not supported */
-#define ZIP_ER_RDONLY        25  /* N Read-only archive */ 
-#define ZIP_ER_NOPASSWD      26  /* N No password provided */
-#define ZIP_ER_WRONGPASSWD   27  /* N Wrong password provided */
-
-/* type of system error value */
-
-#define ZIP_ET_NONE	      0  /* sys_err unused */
-#define ZIP_ET_SYS	      1  /* sys_err is errno */
-#define ZIP_ET_ZLIB	      2  /* sys_err is zlib error code */
-
-/* compression methods */
-
-#define ZIP_CM_DEFAULT	      -1  /* better of deflate or store */
-#define ZIP_CM_STORE	       0  /* stored (uncompressed) */
-#define ZIP_CM_SHRINK	       1  /* shrunk */
-#define ZIP_CM_REDUCE_1	       2  /* reduced with factor 1 */
-#define ZIP_CM_REDUCE_2	       3  /* reduced with factor 2 */
-#define ZIP_CM_REDUCE_3	       4  /* reduced with factor 3 */
-#define ZIP_CM_REDUCE_4	       5  /* reduced with factor 4 */
-#define ZIP_CM_IMPLODE	       6  /* imploded */
-/* 7 - Reserved for Tokenizing compression algorithm */
-#define ZIP_CM_DEFLATE	       8  /* deflated */
-#define ZIP_CM_DEFLATE64       9  /* deflate64 */
-#define ZIP_CM_PKWARE_IMPLODE 10  /* PKWARE imploding */
-/* 11 - Reserved by PKWARE */
-#define ZIP_CM_BZIP2          12  /* compressed using BZIP2 algorithm */
-/* 13 - Reserved by PKWARE */
-#define ZIP_CM_LZMA	      14  /* LZMA (EFS) */
-/* 15-17 - Reserved by PKWARE */
-#define ZIP_CM_TERSE	      18  /* compressed using IBM TERSE (new) */
-#define ZIP_CM_LZ77           19  /* IBM LZ77 z Architecture (PFS) */
-#define ZIP_CM_WAVPACK	      97  /* WavPack compressed data */
-#define ZIP_CM_PPMD	      98  /* PPMd version I, Rev 1 */
-
-/* encryption methods */
-
-#define ZIP_EM_NONE	       0  /* not encrypted */
-#define ZIP_EM_TRAD_PKWARE     1  /* traditional PKWARE encryption */
-#if 0 /* Strong Encryption Header not parsed yet */
-#define ZIP_EM_DES        0x6601  /* strong encryption: DES */
-#define ZIP_EM_RC2_OLD    0x6602  /* strong encryption: RC2, version < 5.2 */
-#define ZIP_EM_3DES_168   0x6603
-#define ZIP_EM_3DES_112   0x6609
-#define ZIP_EM_AES_128    0x660e
-#define ZIP_EM_AES_192    0x660f
-#define ZIP_EM_AES_256    0x6610
-#define ZIP_EM_RC2        0x6702  /* strong encryption: RC2, version >= 5.2 */
-#define ZIP_EM_RC4        0x6801
-#endif
-#define ZIP_EM_UNKNOWN    0xffff  /* unknown algorithm */
-
-
-
-enum zip_source_cmd {
-    ZIP_SOURCE_OPEN,	/* prepare for reading */
-    ZIP_SOURCE_READ, 	/* read data */
-    ZIP_SOURCE_CLOSE,	/* reading is done */
-    ZIP_SOURCE_STAT,	/* get meta information */
-    ZIP_SOURCE_ERROR,	/* get error information */
-    ZIP_SOURCE_FREE	/* cleanup and free resources */
-};
-
-#define ZIP_SOURCE_ERR_LOWER	-2
-
-#define ZIP_STAT_NAME			0x0001
-#define ZIP_STAT_INDEX			0x0002
-#define ZIP_STAT_SIZE			0x0004
-#define ZIP_STAT_COMP_SIZE		0x0008
-#define ZIP_STAT_MTIME			0x0010
-#define ZIP_STAT_CRC			0x0020
-#define ZIP_STAT_COMP_METHOD		0x0040
-#define ZIP_STAT_ENCRYPTION_METHOD	0x0080
-#define ZIP_STAT_FLAGS			0x0100
-
-struct zip_stat {
-    zip_uint64_t valid;			/* which fields have valid values */
-    const char *name;			/* name of the file */
-    zip_uint64_t index;			/* index within archive */
-    zip_uint64_t size;			/* size of file (uncompressed) */
-    zip_uint64_t comp_size;		/* size of file (compressed) */
-    time_t mtime;			/* modification time */
-    zip_uint32_t crc;			/* crc of file data */
-    zip_uint16_t comp_method;		/* compression method used */
-    zip_uint16_t encryption_method;	/* encryption method used */
-    zip_uint32_t flags;			/* reserved for future use */
-};
-
-struct zip;
-struct zip_file;
-struct zip_source;
-
-typedef zip_int64_t (*zip_source_callback)(void *, void *, zip_uint64_t,
-					   enum zip_source_cmd);
-
-
-
-ZIP_EXTERN zip_int64_t zip_add(struct zip *, const char *, struct zip_source *);
-ZIP_EXTERN zip_int64_t zip_add_dir(struct zip *, const char *);
-ZIP_EXTERN int zip_close(struct zip *);
-ZIP_EXTERN int zip_delete(struct zip *, zip_uint64_t);
-ZIP_EXTERN void zip_error_clear(struct zip *);
-ZIP_EXTERN void zip_error_get(struct zip *, int *, int *);
-ZIP_EXTERN int zip_error_get_sys_type(int);
-ZIP_EXTERN int zip_error_to_str(char *, zip_uint64_t, int, int);
-ZIP_EXTERN int zip_fclose(struct zip_file *);
-ZIP_EXTERN struct zip *zip_fdopen(int, int, int *);
-ZIP_EXTERN void zip_file_error_clear(struct zip_file *);
-ZIP_EXTERN void zip_file_error_get(struct zip_file *, int *, int *);
-ZIP_EXTERN const char *zip_file_strerror(struct zip_file *);
-ZIP_EXTERN struct zip_file *zip_fopen(struct zip *, const char *, int);
-ZIP_EXTERN struct zip_file *zip_fopen_encrypted(struct zip *, const char *,
-						int, const char *);
-ZIP_EXTERN struct zip_file *zip_fopen_index(struct zip *, zip_uint64_t, int);
-ZIP_EXTERN struct zip_file *zip_fopen_index_encrypted(struct zip *,
-						      zip_uint64_t, int,
-						      const char *);
-ZIP_EXTERN zip_int64_t zip_fread(struct zip_file *, void *, zip_uint64_t);
-ZIP_EXTERN const char *zip_get_archive_comment(struct zip *, int *, int);
-ZIP_EXTERN int zip_get_archive_flag(struct zip *, int, int);
-ZIP_EXTERN const char *zip_get_file_comment(struct zip *, zip_uint64_t,
-					    int *, int);
-ZIP_EXTERN const char *zip_get_file_extra(struct zip *, zip_uint64_t,
-					  int *, int);
-ZIP_EXTERN const char *zip_get_name(struct zip *, zip_uint64_t, int);
-ZIP_EXTERN zip_uint64_t zip_get_num_entries(struct zip *, int);
-ZIP_EXTERN int zip_get_num_files(struct zip *);  /* deprecated, use zip_get_num_entries instead */
-ZIP_EXTERN int zip_name_locate(struct zip *, const char *, int);
-ZIP_EXTERN struct zip *zip_open(const char *, int, int *);
-ZIP_EXTERN int zip_rename(struct zip *, zip_uint64_t, const char *);
-ZIP_EXTERN int zip_replace(struct zip *, zip_uint64_t, struct zip_source *);
-ZIP_EXTERN int zip_set_archive_comment(struct zip *, const char *, int);
-ZIP_EXTERN int zip_set_archive_flag(struct zip *, int, int);
-ZIP_EXTERN int zip_set_default_password(struct zip *, const char *);
-ZIP_EXTERN int zip_set_file_comment(struct zip *, zip_uint64_t,
-				    const char *, int);
-ZIP_EXTERN int zip_set_file_extra(struct zip *, zip_uint64_t,
-				  const char *, int);
-ZIP_EXTERN struct zip_source *zip_source_buffer(struct zip *, const void *,
-						zip_uint64_t, int);
-ZIP_EXTERN struct zip_source *zip_source_file(struct zip *, const char *,
-					      zip_uint64_t, zip_int64_t);
-ZIP_EXTERN struct zip_source *zip_source_filep(struct zip *, FILE *,
-					       zip_uint64_t, zip_int64_t);
-ZIP_EXTERN void zip_source_free(struct zip_source *);
-ZIP_EXTERN struct zip_source *zip_source_function(struct zip *,
-						  zip_source_callback, void *);
-ZIP_EXTERN struct zip_source *zip_source_zip(struct zip *, struct zip *,
-					     zip_uint64_t, int,
-					     zip_uint64_t, zip_int64_t);
-ZIP_EXTERN int zip_stat(struct zip *, const char *, int, struct zip_stat *);
-ZIP_EXTERN int zip_stat_index(struct zip *, zip_uint64_t, int,
-			      struct zip_stat *);
-ZIP_EXTERN void zip_stat_init(struct zip_stat *);
-ZIP_EXTERN const char *zip_strerror(struct zip *);
-ZIP_EXTERN int zip_unchange(struct zip *, zip_uint64_t);
-ZIP_EXTERN int zip_unchange_all(struct zip *);
-ZIP_EXTERN int zip_unchange_archive(struct zip *);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _HAD_ZIP_H */
diff --git a/lib-x86-32/include/zipconf.h b/lib-x86-32/include/zipconf.h
deleted file mode 100644
index 95960941..00000000
--- a/lib-x86-32/include/zipconf.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef _HAD_ZIPCONF_H
-#define _HAD_ZIPCONF_H
-
-/*
-   zipconf.h -- platform specific include file
-
-   This file was generated automatically by ./make_zipconf.sh
-   based on ../config.h.
- */
-
-#define LIBZIP_VERSION "0.10"
-#define LIBZIP_VERSION_MAJOR 0
-#define LIBZIP_VERSION_MINOR 10
-#define LIBZIP_VERSION_MICRO 0
-
-#include <inttypes.h>
-
-typedef int8_t zip_int8_t;
-#define ZIP_INT8_MIN INT8_MIN
-#define ZIP_INT8_MAX INT8_MAX
-
-typedef uint8_t zip_uint8_t;
-#define ZIP_UINT8_MAX UINT8_MAX
-
-typedef int16_t zip_int16_t;
-#define ZIP_INT16_MIN INT16_MIN
-#define ZIP_INT16_MAX INT16_MAX
-
-typedef uint16_t zip_uint16_t;
-#define ZIP_UINT16_MAX UINT16_MAX
-
-typedef int32_t zip_int32_t;
-#define ZIP_INT32_MIN INT32_MIN
-#define ZIP_INT32_MAX INT32_MAX
-
-typedef uint32_t zip_uint32_t;
-#define ZIP_UINT32_MAX UINT32_MAX
-
-typedef int64_t zip_int64_t;
-#define ZIP_INT64_MIN INT64_MIN
-#define ZIP_INT64_MAX INT64_MAX
-
-typedef uint64_t zip_uint64_t;
-#define ZIP_UINT64_MAX UINT64_MAX
-
-
-#endif /* zipconf.h */
diff --git a/lib-x86-32/include/zlib.h b/lib-x86-32/include/zlib.h
deleted file mode 100644
index bfbba83e..00000000
--- a/lib-x86-32/include/zlib.h
+++ /dev/null
@@ -1,1613 +0,0 @@
-/* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.5, April 19th, 2010
-
-  Copyright (C) 1995-2010 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://www.ietf.org/rfc/rfc1950.txt
-  (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
-*/
-
-#ifndef ZLIB_H
-#define ZLIB_H
-
-#include "zconf.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define ZLIB_VERSION "1.2.5"
-#define ZLIB_VERNUM 0x1250
-#define ZLIB_VER_MAJOR 1
-#define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 5
-#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 {
-    Bytef    *next_in;  /* next input byte */
-    uInt     avail_in;  /* number of bytes available at next_in */
-    uLong    total_in;  /* total nb 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 nb of bytes output so far */
-
-    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).  If deflate does not return
-  Z_STREAM_END, then 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 the uncompressed data.  (The size
-  of the uncompressed data may have been saved by the compressor for this
-  purpose.) The next operation on this stream must be inflateEnd to deallocate
-  the decompression state.  The use of Z_FINISH is never required, but can be
-  used to inform inflate that a faster approach may be used for the single
-  inflate() call.
-
-     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 only effect of the flush parameter in this implementation
-  is on the return value of inflate(), as noted below, or when it returns early
-  because Z_BLOCK or Z_TREES is used.
-
-     If a preset dictionary is needed after this call (see inflateSetDictionary
-  below), inflate sets strm->adler to the adler32 checksum of the dictionary
-  chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
-  strm->adler to the adler32 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.
-
-    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.  This function must be called
-   immediately after deflateInit, deflateInit2 or deflateReset, before any call
-   of deflate.  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 the compression method is bsort).  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().
-*/
-
-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, 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
-   immediately after inflateInit2() or inflateReset() and before any call of
-   inflate() to set the dictionary.  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 inflateSync OF((z_streamp strm));
-/*
-     Skips invalid compressed data until a full flush point (see above the
-   description of deflate with Z_FULL_FLUSH) can be found, or until all
-   available input is skipped.  No output is provided.
-
-     inflateSync returns Z_OK if a 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 paramaters 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 *, 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 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.  This
-   function 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)
- */
-
-
-                        /* 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.
-*/
-
-
-                        /* 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 voidp gzFile;       /* 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.) Also "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.
-
-     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.
-
-     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.
-
-     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 was not in gzip format, gzread copies the given number of
-   bytes into the buffer.
-
-     After reaching the end of a gzip stream in the input, gzread will continue
-   to read, looking for another gzip stream, or failing that, reading the rest
-   of the input file directly without decompression.  The entire input file
-   will be read if gzread is called until it returns less than the requested
-   len.
-
-     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 OF((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.
-*/
-
-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.  This state can change from
-   false to true while reading the input file if the end of a gzip stream is
-   reached, but is followed by data that is not another gzip stream.
-
-     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().
-*/
-
-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, 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.
-*/
-
-
-                        /* 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.
-*/
-
-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 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, sizeof(z_stream))
-#define inflateInit(strm) \
-        inflateInit_((strm),                ZLIB_VERSION, sizeof(z_stream))
-#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
-        deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-                      (strategy),           ZLIB_VERSION, sizeof(z_stream))
-#define inflateInit2(strm, windowBits) \
-        inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
-#define inflateBackInit(strm, windowBits, window) \
-        inflateBackInit_((strm), (windowBits), (window), \
-                                            ZLIB_VERSION, sizeof(z_stream))
-
-/* 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
- */
-#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
-   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) && _FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0
-#  define gzopen gzopen64
-#  define gzseek gzseek64
-#  define gztell gztell64
-#  define gzoffset gzoffset64
-#  define adler32_combine adler32_combine64
-#  define crc32_combine crc32_combine64
-#  ifdef _LARGEFILE64_SOURCE
-     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
-
-/* 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 uLongf * ZEXPORT get_crc_table    OF((void));
-ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ZLIB_H */
diff --git a/lib-x86-32/lib/libFLAC.a b/lib-x86-32/lib/libFLAC.a
deleted file mode 100644
index f9329aee..00000000
--- a/lib-x86-32/lib/libFLAC.a
+++ /dev/null
diff --git a/lib-x86-32/lib/libavcodec.a b/lib-x86-32/lib/libavcodec.a
deleted file mode 100644
index 6e429f4a..00000000
--- a/lib-x86-32/lib/libavcodec.a
+++ /dev/null
diff --git a/lib-x86-32/lib/libavcore.a b/lib-x86-32/lib/libavcore.a
deleted file mode 100644
index 650b57ed..00000000
--- a/lib-x86-32/lib/libavcore.a
+++ /dev/null
diff --git a/lib-x86-32/lib/libavformat.a b/lib-x86-32/lib/libavformat.a
deleted file mode 100644
index a7adafee..00000000
--- a/lib-x86-32/lib/libavformat.a
+++ /dev/null
diff --git a/lib-x86-32/lib/libavutil.a b/lib-x86-32/lib/libavutil.a
deleted file mode 100644
index e53d807c..00000000
--- a/lib-x86-32/lib/libavutil.a
+++ /dev/null
diff --git a/lib-x86-32/lib/libcddb.a b/lib-x86-32/lib/libcddb.a
deleted file mode 100644
index fed07ff6..00000000
--- a/lib-x86-32/lib/libcddb.a
+++ /dev/null
diff --git a/lib-x86-32/lib/libcdio.a b/lib-x86-32/lib/libcdio.a
deleted file mode 100644
index c491a18e..00000000
--- a/lib-x86-32/lib/libcdio.a
+++ /dev/null
diff --git a/lib-x86-32/lib/libcurl.a b/lib-x86-32/lib/libcurl.a
deleted file mode 100644
index 94a7d5a7..00000000
--- a/lib-x86-32/lib/libcurl.a
+++ /dev/null
diff --git a/lib-x86-32/lib/libdbus-1.a b/lib-x86-32/lib/libdbus-1.a
deleted file mode 100644
index 956ae037..00000000
--- a/lib-x86-32/lib/libdbus-1.a
+++ /dev/null
diff --git a/lib-x86-32/lib/libexpat.a b/lib-x86-32/lib/libexpat.a
deleted file mode 100644
index 7ce1fecc..00000000
--- a/lib-x86-32/lib/libexpat.a
+++ /dev/null
diff --git a/lib-x86-32/lib/libfaad.a b/lib-x86-32/lib/libfaad.a
deleted file mode 100644
index 7f9543f7..00000000
--- a/lib-x86-32/lib/libfaad.a
+++ /dev/null
diff --git a/lib-x86-32/lib/libidn.a b/lib-x86-32/lib/libidn.a
deleted file mode 100644
index a0829f79..00000000
--- a/lib-x86-32/lib/libidn.a
+++ /dev/null
diff --git a/lib-x86-32/lib/libiso9660.a b/lib-x86-32/lib/libiso9660.a
deleted file mode 100644
index 3259699e..00000000
--- a/lib-x86-32/lib/libiso9660.a
+++ /dev/null
diff --git a/lib-x86-32/lib/libjpeg.a b/lib-x86-32/lib/libjpeg.a
deleted file mode 100644
index ed8baf7c..00000000
--- a/lib-x86-32/lib/libjpeg.a
+++ /dev/null
diff --git a/lib-x86-32/lib/libmad.a b/lib-x86-32/lib/libmad.a
deleted file mode 100644
index b9b86f27..00000000
--- a/lib-x86-32/lib/libmad.a
+++ /dev/null
diff --git a/lib-x86-32/lib/libogg.a b/lib-x86-32/lib/libogg.a
deleted file mode 100644
index 99bf4df0..00000000
--- a/lib-x86-32/lib/libogg.a
+++ /dev/null
diff --git a/lib-x86-32/lib/libopencore-amrnb.a b/lib-x86-32/lib/libopencore-amrnb.a
deleted file mode 100644
index 7ce4236c..00000000
--- a/lib-x86-32/lib/libopencore-amrnb.a
+++ /dev/null
diff --git a/lib-x86-32/lib/libopencore-amrwb.a b/lib-x86-32/lib/libopencore-amrwb.a
deleted file mode 100644
index 64cef81b..00000000
--- a/lib-x86-32/lib/libopencore-amrwb.a
+++ /dev/null
diff --git a/lib-x86-32/lib/libpng.a b/lib-x86-32/lib/libpng.a
deleted file mode 100644
index ce09367f..00000000
--- a/lib-x86-32/lib/libpng.a
+++ /dev/null
diff --git a/lib-x86-32/lib/libsamplerate.a b/lib-x86-32/lib/libsamplerate.a
deleted file mode 100644
index 9a1e284c..00000000
--- a/lib-x86-32/lib/libsamplerate.a
+++ /dev/null
diff --git a/lib-x86-32/lib/libsndfile.a b/lib-x86-32/lib/libsndfile.a
deleted file mode 100644
index 855328d2..00000000
--- a/lib-x86-32/lib/libsndfile.a
+++ /dev/null
diff --git a/lib-x86-32/lib/libudf.a b/lib-x86-32/lib/libudf.a
deleted file mode 100644
index f76f210e..00000000
--- a/lib-x86-32/lib/libudf.a
+++ /dev/null
diff --git a/lib-x86-32/lib/libvorbis.a b/lib-x86-32/lib/libvorbis.a
deleted file mode 100644
index 5b54022a..00000000
--- a/lib-x86-32/lib/libvorbis.a
+++ /dev/null
diff --git a/lib-x86-32/lib/libvorbisenc.a b/lib-x86-32/lib/libvorbisenc.a
deleted file mode 100644
index c4ef087e..00000000
--- a/lib-x86-32/lib/libvorbisenc.a
+++ /dev/null
diff --git a/lib-x86-32/lib/libvorbisfile.a b/lib-x86-32/lib/libvorbisfile.a
deleted file mode 100644
index 70315863..00000000
--- a/lib-x86-32/lib/libvorbisfile.a
+++ /dev/null
diff --git a/lib-x86-32/lib/libwavpack.a b/lib-x86-32/lib/libwavpack.a
deleted file mode 100644
index a18683f0..00000000
--- a/lib-x86-32/lib/libwavpack.a
+++ /dev/null
diff --git a/lib-x86-32/lib/libz.a b/lib-x86-32/lib/libz.a
deleted file mode 100644
index 00810f6e..00000000
--- a/lib-x86-32/lib/libz.a
+++ /dev/null
diff --git a/lib-x86-32/lib/libzip.a b/lib-x86-32/lib/libzip.a
deleted file mode 100644
index a28776be..00000000
--- a/lib-x86-32/lib/libzip.a
+++ /dev/null
diff --git a/lib-x86-64/.gitignore b/lib-x86-64/.gitignore
deleted file mode 100644
index c00df136..00000000
--- a/lib-x86-64/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.deb
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atk-enum-types.h b/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atk-enum-types.h
deleted file mode 100644
index f95e70a6..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atk-enum-types.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-/* Generated data (by glib-mkenums) */
-
-#ifndef __ATK_ENUM_TYPES_H__
-#define __ATK_ENUM_TYPES_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-/* enumerations from "atkhyperlink.h" */
-GType atk_hyperlink_state_flags_get_type (void);
-#define ATK_TYPE_HYPERLINK_STATE_FLAGS (atk_hyperlink_state_flags_get_type())
-/* enumerations from "atkobject.h" */
-GType atk_role_get_type (void);
-#define ATK_TYPE_ROLE (atk_role_get_type())
-GType atk_layer_get_type (void);
-#define ATK_TYPE_LAYER (atk_layer_get_type())
-/* enumerations from "atkrelationtype.h" */
-GType atk_relation_type_get_type (void);
-#define ATK_TYPE_RELATION_TYPE (atk_relation_type_get_type())
-/* enumerations from "atkstate.h" */
-GType atk_state_type_get_type (void);
-#define ATK_TYPE_STATE_TYPE (atk_state_type_get_type())
-/* enumerations from "atktext.h" */
-GType atk_text_attribute_get_type (void);
-#define ATK_TYPE_TEXT_ATTRIBUTE (atk_text_attribute_get_type())
-GType atk_text_boundary_get_type (void);
-#define ATK_TYPE_TEXT_BOUNDARY (atk_text_boundary_get_type())
-GType atk_text_clip_type_get_type (void);
-#define ATK_TYPE_TEXT_CLIP_TYPE (atk_text_clip_type_get_type())
-/* enumerations from "atkutil.h" */
-GType atk_key_event_type_get_type (void);
-#define ATK_TYPE_KEY_EVENT_TYPE (atk_key_event_type_get_type())
-GType atk_coord_type_get_type (void);
-#define ATK_TYPE_COORD_TYPE (atk_coord_type_get_type())
-G_END_DECLS
-
-#endif /* __ATK_ENUM_TYPES_H__ */
-
-/* Generated data ends here */
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atk.h b/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atk.h
deleted file mode 100644
index 04d95390..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atk.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_H__
-#define __ATK_H__
-
-#include <atk/atkobject.h>
-#include <atk/atkaction.h>
-#include <atk/atkcomponent.h>
-#include <atk/atkdocument.h>
-#include <atk/atkeditabletext.h>
-#include <atk/atkgobjectaccessible.h>
-#include <atk/atkhyperlink.h>
-#include <atk/atkhyperlinkimpl.h>
-#include <atk/atkhypertext.h>
-#include <atk/atkimage.h>
-#include <atk/atknoopobject.h>
-#include <atk/atknoopobjectfactory.h>
-#include <atk/atkobjectfactory.h>
-#include <atk/atkregistry.h>
-#include <atk/atkrelation.h>
-#include <atk/atkrelationset.h>
-#include <atk/atkrelationtype.h>
-#include <atk/atkselection.h>
-#include <atk/atkstate.h>
-#include <atk/atkstateset.h>
-#include <atk/atkstreamablecontent.h>
-#include <atk/atktable.h>
-#include <atk/atktext.h>
-#include <atk/atkutil.h>
-#include <atk/atkmisc.h>
-#include <atk/atkvalue.h>
-
-#endif /* __ATK_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkaction.h b/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkaction.h
deleted file mode 100644
index 8dfee9fe..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkaction.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_ACTION_H__
-#define __ATK_ACTION_H__
-
-#include <atk/atkobject.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * The interface AtkAction should be supported by any object that can 
- * perform one or more actions. The interface provides the standard 
- * mechanism for an assistive technology to determine what those actions 
- * are as well as tell the object to perform them. Any object that can 
- * be manipulated should support this interface.
- */
-
-
-#define ATK_TYPE_ACTION                    (atk_action_get_type ())
-#define ATK_IS_ACTION(obj)                 G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_ACTION)
-#define ATK_ACTION(obj)                    G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_ACTION, AtkAction)
-#define ATK_ACTION_GET_IFACE(obj)          (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_ACTION, AtkActionIface))
-
-#ifndef _TYPEDEF_ATK_ACTION_
-#define _TYPEDEF_ATK_ACTION_
-typedef struct _AtkAction AtkAction;
-#endif
-typedef struct _AtkActionIface AtkActionIface;
-
-struct _AtkActionIface
-{
-  GTypeInterface parent;
-
-  gboolean                (*do_action)         (AtkAction         *action,
-                                                gint              i);
-  gint                    (*get_n_actions)     (AtkAction         *action);
-  G_CONST_RETURN gchar*   (*get_description)   (AtkAction         *action,
-                                                gint              i);
-  G_CONST_RETURN gchar*   (*get_name)          (AtkAction         *action,
-                                                gint              i);
-  G_CONST_RETURN gchar*   (*get_keybinding)    (AtkAction         *action,
-                                                gint              i);
-  gboolean                (*set_description)   (AtkAction         *action,
-                                                gint              i,
-                                                const gchar       *desc);
-  G_CONST_RETURN gchar*   (*get_localized_name)(AtkAction         *action,
-						gint              i);
-  AtkFunction             pad2;
-};
-
-GType atk_action_get_type (void);
-
-/*
- * These are the function which would be called by an application with
- * the argument being a AtkObject object cast to (AtkAction).
- *
- * The function will just check that * the corresponding
- * function pointer is not NULL and will call it.
- *
- * The "real" implementation of the function for accessible will be
- * provided in a support library
- */
-
-gboolean   atk_action_do_action                (AtkAction         *action,
-                                            gint              i);
-gint   atk_action_get_n_actions            (AtkAction *action);
-G_CONST_RETURN gchar* atk_action_get_description  (AtkAction         *action,
-                                                   gint              i);
-G_CONST_RETURN gchar* atk_action_get_name         (AtkAction         *action,
-                                                   gint              i);
-G_CONST_RETURN gchar* atk_action_get_keybinding   (AtkAction         *action,
-                                                   gint              i);
-gboolean              atk_action_set_description  (AtkAction         *action,
-                                                   gint              i,
-                                                   const gchar       *desc);
-
-/* NEW in ATK 1.1: */
-
-G_CONST_RETURN gchar* atk_action_get_localized_name (AtkAction       *action,
-						     gint            i);
-
-/*
- * Additional GObject properties exported by AtkAction:
- *    "accessible_action"
- *       (an accessible action, or the list of actions, has changed)
- */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __ATK_ACTION_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkcomponent.h b/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkcomponent.h
deleted file mode 100644
index c72a7283..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkcomponent.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_COMPONENT_H__
-#define __ATK_COMPONENT_H__
-
-#include <atk/atkobject.h>
-#include <atk/atkutil.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * The AtkComponent interface should be supported by any object that is 
- * rendered on the screen. The interface provides the standard mechanism 
- * for an assistive technology to determine and set the graphical
- * representation of an object.
- */
-
-#define ATK_TYPE_COMPONENT                    (atk_component_get_type ())
-#define ATK_IS_COMPONENT(obj)                 G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_COMPONENT)
-#define ATK_COMPONENT(obj)                    G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_COMPONENT, AtkComponent)
-#define ATK_COMPONENT_GET_IFACE(obj)          (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_COMPONENT, AtkComponentIface))
-
-#ifndef _TYPEDEF_ATK_COMPONENT_
-#define _TYPEDEF_ATK_COMPONENT_
-typedef struct _AtkComponent AtkComponent;
-#endif
-typedef struct _AtkComponentIface  AtkComponentIface;
-
-typedef void (*AtkFocusHandler) (AtkObject*, gboolean);
-
-typedef struct _AtkRectangle       AtkRectangle;
-
-struct _AtkRectangle
-{
-  gint x;
-  gint y;
-  gint width;
-  gint height;
-};
-
-GType atk_rectangle_get_type (void);
-
-#define ATK_TYPE_RECTANGLE (atk_rectangle_get_type ())
-struct _AtkComponentIface
-{
-  GTypeInterface parent;
-
-  guint          (* add_focus_handler)  (AtkComponent          *component,
-                                         AtkFocusHandler        handler);
-
-  gboolean       (* contains)           (AtkComponent          *component,
-                                         gint                   x,
-                                         gint                   y,
-                                         AtkCoordType           coord_type);
-
-  AtkObject*    (* ref_accessible_at_point)  (AtkComponent     *component,
-                                         gint                   x,
-                                         gint                   y,
-                                         AtkCoordType           coord_type);
-  void          (* get_extents)         (AtkComponent          *component,
-                                         gint                  *x,
-                                         gint                  *y,
-                                         gint                  *width,
-                                         gint                  *height,
-                                         AtkCoordType          coord_type);
-  void                     (* get_position)     (AtkComponent   *component,
-                                                 gint           *x,
-                                                 gint           *y,
-                                                 AtkCoordType   coord_type);
-  void                     (* get_size)                 (AtkComponent   *component,
-                                                         gint           *width,
-                                                         gint           *height);
-  gboolean                 (* grab_focus)               (AtkComponent   *component);
-  void                     (* remove_focus_handler)      (AtkComponent  *component,
-                                                          guint         handler_id);
-  gboolean                 (* set_extents)      (AtkComponent   *component,
-                                                 gint           x,
-                                                 gint           y,
-                                                 gint           width,
-                                                 gint           height,
-                                                 AtkCoordType   coord_type);
-  gboolean                 (* set_position)     (AtkComponent   *component,
-                                                 gint           x,
-                                                 gint           y,
-                                                 AtkCoordType   coord_type);
-  gboolean                 (* set_size)         (AtkComponent   *component,
-                                                 gint           width,
-                                                 gint           height);
-  	
-  AtkLayer                 (* get_layer)        (AtkComponent   *component);
-  gint                     (* get_mdi_zorder)   (AtkComponent   *component);
-
-  /*
-   * signal handlers
-   */
-  void                     (* bounds_changed)   (AtkComponent   *component,
-                                                 AtkRectangle   *bounds);
-  gdouble                  (* get_alpha)        (AtkComponent   *component);
-};
-
-GType atk_component_get_type (void);
-
-/* convenience functions */
-
-guint                atk_component_add_focus_handler      (AtkComponent    *component,
-                                                           AtkFocusHandler handler);
-gboolean              atk_component_contains               (AtkComponent    *component,
-                                                            gint            x,
-                                                            gint            y,
-                                                            AtkCoordType    coord_type);
-AtkObject*            atk_component_ref_accessible_at_point(AtkComponent    *component,
-                                                            gint            x,
-                                                            gint            y,
-                                                            AtkCoordType    coord_type);
-void                  atk_component_get_extents            (AtkComponent    *component,
-                                                            gint            *x,
-                                                            gint            *y,
-                                                            gint            *width,
-                                                            gint            *height,
-                                                            AtkCoordType    coord_type);
-void                  atk_component_get_position           (AtkComponent    *component,
-                                                            gint            *x,
-                                                            gint            *y,
-                                                            AtkCoordType    coord_type);
-void                  atk_component_get_size               (AtkComponent    *component,
-                                                            gint            *width,
-                                                            gint            *height);
-AtkLayer              atk_component_get_layer              (AtkComponent    *component);
-gint                  atk_component_get_mdi_zorder         (AtkComponent    *component);
-gboolean              atk_component_grab_focus             (AtkComponent    *component);
-void                  atk_component_remove_focus_handler   (AtkComponent    *component,
-                                                            guint           handler_id);
-gboolean              atk_component_set_extents            (AtkComponent    *component,
-                                                            gint            x,
-                                                            gint            y,
-                                                            gint            width,
-                                                            gint            height,
-                                                            AtkCoordType    coord_type);
-gboolean              atk_component_set_position           (AtkComponent    *component,
-                                                            gint            x,
-                                                            gint            y,
-                                                            AtkCoordType    coord_type);
-gboolean              atk_component_set_size               (AtkComponent    *component,
-                                                            gint            width,
-                                                            gint            height);
-gdouble               atk_component_get_alpha              (AtkComponent    *component);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __ATK_COMPONENT_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkdocument.h b/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkdocument.h
deleted file mode 100644
index 202cbef0..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkdocument.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_DOCUMENT_H__
-#define __ATK_DOCUMENT_H__
-
-#include <atk/atkobject.h>
-#include <atk/atkutil.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * The AtkDocument interface should be supported by any object that is a container
- * for 'document content' as opposed to a collection of user interface elements.
- *
- */
-
-#define ATK_TYPE_DOCUMENT                   (atk_document_get_type ())
-#define ATK_IS_DOCUMENT(obj)                G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_DOCUMENT)
-#define ATK_DOCUMENT(obj)                   G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_DOCUMENT, AtkDocument)
-#define ATK_DOCUMENT_GET_IFACE(obj)         (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_DOCUMENT, AtkDocumentIface))
-
-#ifndef _TYPEDEF_ATK_DOCUMENT_
-#define _TYPEDEF_ATK_DOCUMENT_
-typedef struct _AtkDocument AtkDocument;
-#endif
-typedef struct _AtkDocumentIface AtkDocumentIface;
-
-struct _AtkDocumentIface
-{
-  GTypeInterface parent;
-  G_CONST_RETURN gchar* ( *get_document_type) (AtkDocument              *document);
-  gpointer              ( *get_document)      (AtkDocument              *document);
-
-  G_CONST_RETURN gchar* ( *get_document_locale) (AtkDocument              *document);
-  AtkAttributeSet *     ( *get_document_attributes) (AtkDocument        *document);
-  G_CONST_RETURN gchar* ( *get_document_attribute_value) (AtkDocument   *document,
-                                                          const gchar   *attribute_name);
-  gboolean              ( *set_document_attribute) (AtkDocument         *document,
-                                                    const gchar         *attribute_name,
-                                                    const gchar         *attribute_value);
-  
-  AtkFunction pad1;
-  AtkFunction pad2;
-  AtkFunction pad3;
-  AtkFunction pad4;
-};
-
-GType  atk_document_get_type             (void);
-
-G_CONST_RETURN gchar* atk_document_get_document_type (AtkDocument   *document);
-gpointer atk_document_get_document (AtkDocument   *document);
-G_CONST_RETURN gchar* atk_document_get_locale (AtkDocument *document);
-AtkAttributeSet*      atk_document_get_attributes (AtkDocument *document);
-G_CONST_RETURN gchar* atk_document_get_attribute_value (AtkDocument *document, 
-                                                        const gchar *attribute_name);
-gboolean              atk_document_set_attribute_value (AtkDocument *document,
-                                                        const gchar *attribute_name,
-                                                        const gchar *attribute_value);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* __ATK_DOCUMENT_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkeditabletext.h b/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkeditabletext.h
deleted file mode 100644
index 02937ff8..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkeditabletext.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_EDITABLE_TEXT_H__
-#define __ATK_EDITABLE_TEXT_H__
-
-#include <atk/atkobject.h>
-#include <atk/atktext.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * AtkEditableText is used to support access in an "accessibility" context
- * to editing features of editable text widgets.
- */
-
-#define ATK_TYPE_EDITABLE_TEXT                    (atk_editable_text_get_type ())
-#define ATK_IS_EDITABLE_TEXT(obj)                 G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_EDITABLE_TEXT)
-#define ATK_EDITABLE_TEXT(obj)                    G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_EDITABLE_TEXT, AtkEditableText)
-#define ATK_EDITABLE_TEXT_GET_IFACE(obj)          (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_EDITABLE_TEXT, AtkEditableTextIface))
-
-#ifndef _TYPEDEF_ATK_EDITABLE_TEXT_
-#define _TYPEDEF_ATK_EDITABLE_TEXT_
-typedef struct _AtkEditableText AtkEditableText;
-#endif
-typedef struct _AtkEditableTextIface AtkEditableTextIface;
-
-struct _AtkEditableTextIface
-{
-  GTypeInterface parent_interface;
-
-  gboolean (* set_run_attributes) (AtkEditableText  *text,
-                                   AtkAttributeSet  *attrib_set,
-                                   gint		    start_offset,
- 				   gint		    end_offset);
-  void   (* set_text_contents)    (AtkEditableText  *text,
-                                   const gchar      *string);
-  void   (* insert_text)          (AtkEditableText  *text,
-                                   const gchar      *string,
-                                   gint             length,
-                                   gint             *position);
-  void   (* copy_text)            (AtkEditableText  *text,
-                                   gint             start_pos,
-                                   gint             end_pos);
-  void   (* cut_text)             (AtkEditableText  *text,
-                                   gint             start_pos,
-                                   gint             end_pos);
-  void   (* delete_text)          (AtkEditableText  *text,
-                                   gint             start_pos,
-                                   gint             end_pos);
-  void   (* paste_text)           (AtkEditableText  *text,
-                                   gint             position);
-
-  AtkFunction                     pad1;
-  AtkFunction                     pad2;
-};
-GType atk_editable_text_get_type (void);
-
-
-gboolean atk_editable_text_set_run_attributes (AtkEditableText          *text,
-                                               AtkAttributeSet  *attrib_set,
-                                               gint    	        start_offset,
- 					       gint	        end_offset);
-void atk_editable_text_set_text_contents    (AtkEditableText  *text,
-                                             const gchar      *string);
-void atk_editable_text_insert_text          (AtkEditableText  *text,
-                                             const gchar      *string,
-                                             gint             length,
-                                             gint             *position);
-void atk_editable_text_copy_text            (AtkEditableText  *text,
-                                             gint             start_pos,
-                                             gint             end_pos);
-void atk_editable_text_cut_text             (AtkEditableText  *text,
-                                             gint             start_pos,
-                                             gint             end_pos);
-void atk_editable_text_delete_text          (AtkEditableText  *text,
-                                             gint             start_pos,
-                                             gint             end_pos);
-void atk_editable_text_paste_text           (AtkEditableText  *text,
-                                             gint             position);
- 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __ATK_EDITABLE_TEXT_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkgobjectaccessible.h b/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkgobjectaccessible.h
deleted file mode 100644
index adb46cd9..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkgobjectaccessible.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ATK - Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_GOBJECT_ACCESSIBLE_H__
-#define __ATK_GOBJECT_ACCESSIBLE_H__
-
-#include <atk/atk.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * The AtkGObjectAccessible class is provided as a basis for implementing
- * accessibility support for objects which are not GTK+ widgets
- */
-#define ATK_TYPE_GOBJECT_ACCESSIBLE            (atk_gobject_accessible_get_type ())
-#define ATK_GOBJECT_ACCESSIBLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_GOBJECT_ACCESSIBLE, AtkGObjectAccessible))
-#define ATK_GOBJECT_ACCESSIBLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_GOBJECT_ACCESSIBLE, AtkGObjectAccessibleClass))
-#define ATK_IS_GOBJECT_ACCESSIBLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_GOBJECT_ACCESSIBLE))
-#define ATK_IS_GOBJECT_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_GOBJECT_ACCESSIBLE))
-#define ATK_GOBJECT_ACCESSIBLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_GOBJECT_ACCESSIBLE, AtkGObjectAccessibleClass))
-
-typedef struct _AtkGObjectAccessible                AtkGObjectAccessible;
-typedef struct _AtkGObjectAccessibleClass           AtkGObjectAccessibleClass;
-
-struct _AtkGObjectAccessible
-{
-  AtkObject parent;
-};
-
-GType atk_gobject_accessible_get_type (void);
-
-struct _AtkGObjectAccessibleClass
-{
-  AtkObjectClass parent_class;
-
-  AtkFunction pad1;
-  AtkFunction pad2;
-};
-
-AtkObject *atk_gobject_accessible_for_object      (GObject           *obj);
-GObject   *atk_gobject_accessible_get_object      (AtkGObjectAccessible *obj);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __ATK_GOBJECT_ACCESSIBLE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkhyperlink.h b/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkhyperlink.h
deleted file mode 100644
index a5d3716f..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkhyperlink.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_HYPERLINK_H__
-#define __ATK_HYPERLINK_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include <atk/atkaction.h>
-
-/*
- * AtkHyperlink encapsulates a link or set of links in a hypertext document.
- *
- * It implements the AtkAction interface.
- */
-
-/**
- *AtkHyperlinkStateFlags
- *@ATK_HYPERLINK_IS_INLINE: Link is inline
- *
- *Describes the type of link
- **/ 
-typedef enum 
-{
-  ATK_HYPERLINK_IS_INLINE = 1 << 0
-} AtkHyperlinkStateFlags;
-
-#define ATK_TYPE_HYPERLINK                        (atk_hyperlink_get_type ())
-#define ATK_HYPERLINK(obj)                        (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_HYPERLINK, AtkHyperlink))
-#define ATK_HYPERLINK_CLASS(klass)                (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_HYPERLINK, AtkHyperlinkClass))
-#define ATK_IS_HYPERLINK(obj)                     (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_HYPERLINK))
-#define ATK_IS_HYPERLINK_CLASS(klass)             (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_HYPERLINK))
-#define ATK_HYPERLINK_GET_CLASS(obj)              (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_HYPERLINK, AtkHyperlinkClass))
-
-typedef struct _AtkHyperlink                      AtkHyperlink;
-typedef struct _AtkHyperlinkClass                 AtkHyperlinkClass;
-
-struct _AtkHyperlink
-{
-  GObject parent;
-};
-
-struct _AtkHyperlinkClass
-{
-  GObjectClass parent;
-
-  gchar*           (* get_uri)             (AtkHyperlink     *link_,
-                                            gint             i);
-  AtkObject*       (* get_object)          (AtkHyperlink     *link_,
-                                            gint             i);
-  gint             (* get_end_index)       (AtkHyperlink     *link_);
-  gint             (* get_start_index)     (AtkHyperlink     *link_);
-  gboolean         (* is_valid)            (AtkHyperlink     *link_);
-  gint	           (* get_n_anchors)	   (AtkHyperlink     *link_);
-  guint	           (* link_state)	   (AtkHyperlink     *link_);
-  gboolean         (* is_selected_link)    (AtkHyperlink     *link_);
-
-  /* Signals */
-  void             ( *link_activated)      (AtkHyperlink     *link_);
-  AtkFunction      pad1;
-};
-
-GType            atk_hyperlink_get_type             (void);
-
-gchar*           atk_hyperlink_get_uri              (AtkHyperlink     *link_,
-                                                     gint             i);
-
-AtkObject*       atk_hyperlink_get_object           (AtkHyperlink     *link_,
-                                                     gint             i);
-
-gint             atk_hyperlink_get_end_index        (AtkHyperlink     *link_);
-
-gint             atk_hyperlink_get_start_index      (AtkHyperlink     *link_);
-
-gboolean         atk_hyperlink_is_valid             (AtkHyperlink     *link_);
-
-gboolean         atk_hyperlink_is_inline             (AtkHyperlink     *link_);
-
-gint		 atk_hyperlink_get_n_anchors        (AtkHyperlink     *link_);
-gboolean         atk_hyperlink_is_selected_link     (AtkHyperlink     *link_);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __ATK_HYPERLINK_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkhyperlinkimpl.h b/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkhyperlinkimpl.h
deleted file mode 100644
index b08a1d53..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkhyperlinkimpl.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_HYPERLINK_IMPL_H__
-#define __ATK_HYPERLINK_IMPL_H__
-
-#include <atk/atkobject.h>
-#include <atk/atkhyperlink.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * The AtkHyperlinkImpl interface should be supported by objects
- * exposed within the hierarchy as children of an AtkHypertext container
- * which correspond to "links" or embedded content within the text.
- * HTML anchors are not, for instance, normally exposed this way,
- * but embedded images and components which appear inline in the
- * content of a text object are. The AtkHyperlinkIface interface
- * allows a means of determining which children are hyperlinks in this
- * sense of the word, and for obtaining their corresponding AtkHyperlink 
- * object, from which the embedding range, URI, etc. can be obtained.
- *
- * To some extent this interface exists because, for historical 
- * reasons, AtkHyperlink was defined as an object type, not an interface.
- * Thus, in order to interact with AtkObjects via AtkHyperlink semantics,
- * a new interface was required.
- */
-
-#define ATK_TYPE_HYPERLINK_IMPL          (atk_hyperlink_impl_get_type ())
-#define ATK_IS_HYPERLINK_IMPL(obj)       G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_HYPERLINK_IMPL)
-#define ATK_HYPERLINK_IMPL(obj)             G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_HYPERLINK_IMPL, AtkHyperlinkImpl)
-#define ATK_HYPERLINK_IMPL_GET_IFACE(obj)   G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_HYPERLINK_IMPL, AtkHyperlinkImplIface)
-
-#ifndef _TYPEDEF_ATK_HYPERLINK_IMPL_
-#define _TYPEDEF_ATK_HYPERLINK_IMPL__
-typedef struct _AtkHyperlinkImpl AtkHyperlinkImpl;
-#endif
-typedef struct _AtkHyperlinkImplIface AtkHyperlinkImplIface;
-
-struct _AtkHyperlinkImplIface
-{
-  GTypeInterface parent;
-    
-  AtkHyperlink*  (* get_hyperlink) (AtkHyperlinkImpl *impl);
-
-  AtkFunction pad1;
-};
-
-GType            atk_hyperlink_impl_get_type (void);
-
-AtkHyperlink    *atk_hyperlink_impl_get_hyperlink (AtkHyperlinkImpl *obj);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __ATK_HYPERLINK_IMPL_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkhypertext.h b/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkhypertext.h
deleted file mode 100644
index 18464d9f..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkhypertext.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_HYPERTEXT_H__
-#define __ATK_HYPERTEXT_H__
-
-#include <atk/atkobject.h>
-#include <atk/atkhyperlink.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * The AtkHypertext interface provides standard  mechanisms for manipulating 
- * hyperlinks.
- */
-
-#define ATK_TYPE_HYPERTEXT                    (atk_hypertext_get_type ())
-#define ATK_IS_HYPERTEXT(obj)                 G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_HYPERTEXT)
-#define ATK_HYPERTEXT(obj)                    G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_HYPERTEXT, AtkHypertext)
-#define ATK_HYPERTEXT_GET_IFACE(obj)          (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_HYPERTEXT, AtkHypertextIface))
-
-#ifndef _TYPEDEF_ATK_HYPERTEXT_
-#define _TYPEDEF_ATK_HYPERTEXT_
-typedef struct _AtkHypertext AtkHypertext;
-#endif
-typedef struct _AtkHypertextIface AtkHypertextIface;
-
-struct _AtkHypertextIface
-{
-  GTypeInterface parent;
-
-  AtkHyperlink*(* get_link)                 (AtkHypertext       *hypertext,
-                                             gint               link_index);
-  gint         (* get_n_links)              (AtkHypertext       *hypertext);
-  gint         (* get_link_index)           (AtkHypertext       *hypertext,
-                                             gint               char_index);
-
-  /*
-   * signal handlers
-   */
-  void         (* link_selected)            (AtkHypertext       *hypertext,
-                                             gint               link_index);
-
-  AtkFunction pad1;
-  AtkFunction pad2;
-  AtkFunction pad3;
-};
-GType atk_hypertext_get_type (void);
-
-AtkHyperlink* atk_hypertext_get_link       (AtkHypertext *hypertext,
-                                            gint          link_index);
-gint          atk_hypertext_get_n_links    (AtkHypertext *hypertext);
-gint          atk_hypertext_get_link_index (AtkHypertext *hypertext,
-                                            gint          char_index);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __ATK_HYPERTEXT_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkimage.h b/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkimage.h
deleted file mode 100644
index 7e60c818..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkimage.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_IMAGE_H__
-#define __ATK_IMAGE_H__
-
-#include <atk/atkobject.h>
-#include <atk/atkutil.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * The AtkImage interface should be supported by any object that has an 
- * associated image. This interface provides the standard mechanism for 
- * an assistive technology to get descriptive information about images.
- */
-
-#define ATK_TYPE_IMAGE                   (atk_image_get_type ())
-#define ATK_IS_IMAGE(obj)                G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_IMAGE)
-#define ATK_IMAGE(obj)                   G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_IMAGE, AtkImage)
-#define ATK_IMAGE_GET_IFACE(obj)         (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_IMAGE, AtkImageIface))
-
-#ifndef _TYPEDEF_ATK_IMAGE_
-#define _TYPEDEF_ATK_IMAGE_
-typedef struct _AtkImage AtkImage;
-#endif
-typedef struct _AtkImageIface AtkImageIface;
-
-struct _AtkImageIface
-{
-  GTypeInterface parent;
-  void          	( *get_image_position)    (AtkImage		 *image,
-                                                   gint                  *x,
-				                   gint	                 *y,
-    			                           AtkCoordType	         coord_type);
-  G_CONST_RETURN gchar* ( *get_image_description) (AtkImage              *image);
-  void                  ( *get_image_size)        (AtkImage              *image,
-                                                   gint                  *width,
-                                                   gint                  *height);
-  gboolean              ( *set_image_description) (AtkImage              *image,
-                                                   const gchar           *description);
-  G_CONST_RETURN gchar* ( *get_image_locale)      (AtkImage              *image);
-
-  AtkFunction           pad1;
-	
-};
-
-GType  atk_image_get_type             (void);
-
-G_CONST_RETURN gchar* atk_image_get_image_description (AtkImage   *image);
-
-void     atk_image_get_image_size        (AtkImage           *image,
-                                          gint               *width,
-                                          gint               *height);
-
-gboolean atk_image_set_image_description (AtkImage           *image,
-                                          const gchar       *description);
-void     atk_image_get_image_position    (AtkImage	     *image,
-                                          gint               *x,
-					  gint	             *y,
-    					  AtkCoordType	     coord_type);
-
-G_CONST_RETURN gchar* atk_image_get_image_locale (AtkImage   *image);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* __ATK_IMAGE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkmisc.h b/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkmisc.h
deleted file mode 100644
index d750e2d0..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkmisc.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2007 Sun Microsystems 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 __ATK_MISC_H__
-#define __ATK_MISC_H__
-
-#include <glib-object.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define ATK_TYPE_MISC                   (atk_misc_get_type ())
-#define ATK_IS_MISC(obj)                G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_MISC)
-#define ATK_MISC(obj)                   G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_MISC, AtkMisc)
-#define ATK_MISC_CLASS(klass)                   (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_MISC, AtkMiscClass))
-#define ATK_IS_MISC_CLASS(klass)                (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_MISC))
-#define ATK_MISC_GET_CLASS(obj)                 (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_MISC, AtkMiscClass))
-
-
-#ifndef _TYPEDEF_ATK_MISC_
-#define _TYPEDEF_ATK_MISC_
-typedef struct _AtkMisc      AtkMisc;
-typedef struct _AtkMiscClass AtkMiscClass;
-#endif
-
-struct _AtkMisc
-{
-  GObject parent;
-};
-
-/*
- * Singleton instance - only the ATK implementation layer for
- * a given GUI toolkit/application instance should touch this
- * symbol directly.
- */
-extern AtkMisc *atk_misc_instance;
-
-struct _AtkMiscClass
-{
-   GObjectClass parent;
-   void   (* threads_enter)                     (AtkMisc *misc);
-   void   (* threads_leave)                     (AtkMisc *misc);
-   gpointer vfuncs[32]; /* future bincompat */
-};
-GType atk_misc_get_type (void);
-
-/*
- * Wrapper for thread lock, i.e. take the thread mutex for the GUI toolkit, 
- * if one exists.  
- * (This method is implemented by the toolkit ATK implementation layer;
- *  for instance, for GTK+, GAIL implements this via GDK_THREADS_ENTER).
- */
-void     atk_misc_threads_enter  (AtkMisc *misc);
-
-/*
- * Wrapper for thread lock, i.e. release the thread mutex for the GUI toolkit, 
- * if one exists.  
- * (This method is implemented by the toolkit ATK implementation layer;
- *  for instance, for GTK+, GAIL implements this via GDK_THREADS_LEAVE).
- */
-void     atk_misc_threads_leave  (AtkMisc *misc);
-
-/*
- * Obtain (singleton) instance of AtkMisc.
- */
-const AtkMisc *atk_misc_get_instance (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __ATK_MISC_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atknoopobject.h b/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atknoopobject.h
deleted file mode 100644
index 3c4e432a..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atknoopobject.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_NO_OP_OBJECT_H__
-#define __ATK_NO_OP_OBJECT_H__
-
-G_BEGIN_DECLS
-
-#define ATK_TYPE_NO_OP_OBJECT                (atk_no_op_object_get_type ())
-#define ATK_NO_OP_OBJECT(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_NO_OP_OBJECT, AtkNoOpObject))
-#define ATK_NO_OP_OBJECT_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_NO_OP_OBJECT, AtkNoOpObjectClass))
-#define ATK_IS_NO_OP_OBJECT(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_NO_OP_OBJECT))
-#define ATK_IS_NO_OP_OBJECT_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_NO_OP_OBJECT))
-#define ATK_NO_OP_OBJECT_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_NO_OP_OBJECT, AtkNoOpObjectClass))
-
-typedef struct _AtkNoOpObject                   AtkNoOpObject;
-typedef struct _AtkNoOpObjectClass              AtkNoOpObjectClass;
-
-struct _AtkNoOpObject
-{
-  AtkObject     parent;
-};
-
-GType atk_no_op_object_get_type (void);
-
-struct _AtkNoOpObjectClass
-{
-  AtkObjectClass parent_class;
-};
-
-AtkObject *atk_no_op_object_new (GObject  *obj);
-
-G_END_DECLS
-
-#endif /* __ATK_NO_OP_OBJECT_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atknoopobjectfactory.h b/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atknoopobjectfactory.h
deleted file mode 100644
index c3245313..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atknoopobjectfactory.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* ATK - Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_NO_OP_OBJECT_FACTORY_H__
-#define __ATK_NO_OP_OBJECT_FACTORY_H__
-
-#include <atk/atkobjectfactory.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define ATK_TYPE_NO_OP_OBJECT_FACTORY                (atk_no_op_object_factory_get_type ())
-#define ATK_NO_OP_OBJECT_FACTORY(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_NO_OP_OBJECT_FACTORY, AtkNoOpObjectFactory))
-#define ATK_NO_OP_OBJECT_FACTORY_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_NO_OP_OBJECT_FACTORY, AtkNoOpObjectFactoryClass))
-#define ATK_IS_NO_OP_OBJECT_FACTORY(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_NO_OP_OBJECT_FACTORY))
-#define ATK_IS_NO_OP_OBJECT_FACTORY_CLASS(klass)    (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_NO_OP_OBJECT_FACTORY))
-#define ATK_NO_OP_OBJECT_FACTORY_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ( (obj), ATK_TYPE_NO_OP_OBJECT_FACTORY, AtkNoOpObjectFactoryClass))
-
-typedef struct _AtkNoOpObjectFactory                 AtkNoOpObjectFactory;
-typedef struct _AtkNoOpObjectFactoryClass            AtkNoOpObjectFactoryClass;
-
-struct _AtkNoOpObjectFactory
-{
-  AtkObjectFactory parent;
-};
-
-struct _AtkNoOpObjectFactoryClass
-{
-  AtkObjectFactoryClass parent_class;
-};
-
-GType atk_no_op_object_factory_get_type(void);
-
-AtkObjectFactory *atk_no_op_object_factory_new(void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __ATK_NO_OP_OBJECT_FACTORY_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkobject.h b/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkobject.h
deleted file mode 100644
index bb9b55a0..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkobject.h
+++ /dev/null
@@ -1,648 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_OBJECT_H__
-#define __ATK_OBJECT_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include <glib-object.h>
-#include <atk/atkstate.h>
-#include <atk/atkrelationtype.h>
-
-/*
- * AtkObject represents the minimum information all accessible objects
- * return. This information includes accessible name, accessible
- * description, role and state of the object, as well information about
- * its parent and children. It is also possible to obtain more specific
- * accessibility information about a component if it supports one or more
- * of the following interfaces:
- */
-
-
-/**
- *AtkRole:
- *@ATK_ROLE_INVALID: Invalid role
- *@ATK_ROLE_ACCEL_LABEL: A label which represents an accelerator
- *@ATK_ROLE_ALERT: An object which is an alert to the user. Assistive Technologies typically respond to ATK_ROLE_ALERT by reading the entire onscreen contents of containers advertising this role.  Should be used for warning dialogs, etc.
- *@ATK_ROLE_ANIMATION: An object which is an animated image
- *@ATK_ROLE_ARROW: An arrow in one of the four cardinal directions
- *@ATK_ROLE_CALENDAR:  An object that displays a calendar and allows the user to select a date
- *@ATK_ROLE_CANVAS: An object that can be drawn into and is used to trap events
- *@ATK_ROLE_CHECK_BOX: A choice that can be checked or unchecked and provides a separate indicator for the current state
- *@ATK_ROLE_CHECK_MENU_ITEM: A menu item with a check box
- *@ATK_ROLE_COLOR_CHOOSER: A specialized dialog that lets the user choose a color
- *@ATK_ROLE_COLUMN_HEADER: The header for a column of data
- *@ATK_ROLE_COMBO_BOX: A list of choices the user can select from
- *@ATK_ROLE_DATE_EDITOR: An object whose purpose is to allow a user to edit a date
- *@ATK_ROLE_DESKTOP_ICON: An inconifed internal frame within a DESKTOP_PANE
- *@ATK_ROLE_DESKTOP_FRAME: A pane that supports internal frames and iconified versions of those internal frames
- *@ATK_ROLE_DIAL: An object whose purpose is to allow a user to set a value
- *@ATK_ROLE_DIALOG: A top level window with title bar and a border
- *@ATK_ROLE_DIRECTORY_PANE: A pane that allows the user to navigate through and select the contents of a directory
- *@ATK_ROLE_DRAWING_AREA: An object used for drawing custom user interface elements
- *@ATK_ROLE_FILE_CHOOSER: A specialized dialog that lets the user choose a file
- *@ATK_ROLE_FILLER: A object that fills up space in a user interface
- *@ATK_ROLE_FONT_CHOOSER: A specialized dialog that lets the user choose a font
- *@ATK_ROLE_FRAME: A top level window with a title bar, border, menubar, etc.
- *@ATK_ROLE_GLASS_PANE: A pane that is guaranteed to be painted on top of all panes beneath it
- *@ATK_ROLE_HTML_CONTAINER: A document container for HTML, whose children represent the document content
- *@ATK_ROLE_ICON: A small fixed size picture, typically used to decorate components
- *@ATK_ROLE_IMAGE: An object whose primary purpose is to display an image
- *@ATK_ROLE_INTERNAL_FRAME: A frame-like object that is clipped by a desktop pane
- *@ATK_ROLE_LABEL: An object used to present an icon or short string in an interface
- *@ATK_ROLE_LAYERED_PANE: A specialized pane that allows its children to be drawn in layers, providing a form of stacking order
- *@ATK_ROLE_LIST: An object that presents a list of objects to the user and allows the user to select one or more of them 
- *@ATK_ROLE_LIST_ITEM: An object that represents an element of a list 
- *@ATK_ROLE_MENU: An object usually found inside a menu bar that contains a list of actions the user can choose from
- *@ATK_ROLE_MENU_BAR: An object usually drawn at the top of the primary dialog box of an application that contains a list of menus the user can choose from 
- *@ATK_ROLE_MENU_ITEM: An object usually contained in a menu that presents an action the user can choose
- *@ATK_ROLE_OPTION_PANE: A specialized pane whose primary use is inside a DIALOG
- *@ATK_ROLE_PAGE_TAB: An object that is a child of a page tab list
- *@ATK_ROLE_PAGE_TAB_LIST: An object that presents a series of panels (or page tabs), one at a time, through some mechanism provided by the object 
- *@ATK_ROLE_PANEL: A generic container that is often used to group objects
- *@ATK_ROLE_PASSWORD_TEXT: A text object uses for passwords, or other places where the text content is not shown visibly to the user
- *@ATK_ROLE_POPUP_MENU: A temporary window that is usually used to offer the user a list of choices, and then hides when the user selects one of those choices
- *@ATK_ROLE_PROGRESS_BAR: An object used to indicate how much of a task has been completed
- *@ATK_ROLE_PUSH_BUTTON: An object the user can manipulate to tell the application to do something
- *@ATK_ROLE_RADIO_BUTTON: A specialized check box that will cause other radio buttons in the same group to become unchecked when this one is checked
- *@ATK_ROLE_RADIO_MENU_ITEM: A check menu item which belongs to a group. At each instant exactly one of the radio menu items from a group is selected
- *@ATK_ROLE_ROOT_PANE: A specialized pane that has a glass pane and a layered pane as its children
- *@ATK_ROLE_ROW_HEADER: The header for a row of data
- *@ATK_ROLE_SCROLL_BAR: An object usually used to allow a user to incrementally view a large amount of data.
- *@ATK_ROLE_SCROLL_PANE: An object that allows a user to incrementally view a large amount of information
- *@ATK_ROLE_SEPARATOR: An object usually contained in a menu to provide a visible and logical separation of the contents in a menu
- *@ATK_ROLE_SLIDER: An object that allows the user to select from a bounded range
- *@ATK_ROLE_SPLIT_PANE: A specialized panel that presents two other panels at the same time
- *@ATK_ROLE_SPIN_BUTTON: An object used to get an integer or floating point number from the user
- *@ATK_ROLE_STATUSBAR: An object which reports messages of minor importance to the user
- *@ATK_ROLE_TABLE: An object used to represent information in terms of rows and columns
- *@ATK_ROLE_TABLE_CELL: A cell in a table
- *@ATK_ROLE_TABLE_COLUMN_HEADER: The header for a column of a table
- *@ATK_ROLE_TABLE_ROW_HEADER: The header for a row of a table
- *@ATK_ROLE_TEAR_OFF_MENU_ITEM: A menu item used to tear off and reattach its menu
- *@ATK_ROLE_TERMINAL: An object that represents an accessible terminal.  @Since: ATK-0.6
- *@ATK_ROLE_TEXT: An object that presents text to the user
- *@ATK_ROLE_TOGGLE_BUTTON: A specialized push button that can be checked or unchecked, but does not provide a separate indicator for the current state
- *@ATK_ROLE_TOOL_BAR: A bar or palette usually composed of push buttons or toggle buttons
- *@ATK_ROLE_TOOL_TIP: An object that provides information about another object
- *@ATK_ROLE_TREE: An object used to represent hierarchical information to the user
- *@ATK_ROLE_TREE_TABLE: An object capable of expanding and collapsing rows as well as showing multiple columns of data.   @Since: ATK-0.7
- *@ATK_ROLE_UNKNOWN: The object contains some Accessible information, but its role is not known
- *@ATK_ROLE_VIEWPORT: An object usually used in a scroll pane
- *@ATK_ROLE_WINDOW: A top level window with no title or border.
- *@ATK_ROLE_HEADER: An object that serves as a document header. @Since:ATK 1.1.1
- *@ATK_ROLE_FOOTER: An object that serves as a document footer.  @Since: ATK-1.1.1
- *@ATK_ROLE_PARAGRAPH: An object which is contains a paragraph of text content.   @Since: ATK-1.1.1
- *@ATK_ROLE_RULER: An object which describes margins and tab stops, etc. for text objects which it controls (should have CONTROLLER_FOR relation to such).   @Since: ATK-1.1.1
- *@ATK_ROLE_APPLICATION: The object is an application object, which may contain @ATK_ROLE_FRAME objects or other types of accessibles.  The root accessible of any application's ATK hierarchy should have ATK_ROLE_APPLICATION.   @Since: ATK-1.1.4
- *@ATK_ROLE_AUTOCOMPLETE: The object is a dialog or list containing items for insertion into an entry widget, for instance a list of words for completion of a text entry.   @Since: ATK-1.3
- *@ATK_ROLE_EDITBAR: The object is an editable text object in a toolbar.  @Since: ATK-1.5
- *@ATK_ROLE_EMBEDDED: The object is an embedded container within a document or panel.  This role is a grouping "hint" indicating that the contained objects share a context.  @Since: ATK-1.7.2
- *@ATK_ROLE_ENTRY: The object is a component whose textual content may be entered or modified by the user, provided @ATK_STATE_EDITABLE is present.   @Since: ATK-1.11
- *@ATK_ROLE_CHART: The object is a graphical depiction of quantitative data. It may contain multiple subelements whose attributes and/or description may be queried to obtain both the quantitative data and information about how the data is being presented. The LABELLED_BY relation is particularly important in interpreting objects of this type, as is the accessible-description property.  @Since: ATK-1.11
- *@ATK_ROLE_CAPTION: The object contains descriptive information, usually textual, about another user interface element such as a table, chart, or image.  @Since: ATK-1.11
- *@ATK_ROLE_DOCUMENT_FRAME: The object is a visual frame or container which contains a view of document content. Document frames may occur within another Document instance, in which case the second document may be said to be embedded in the containing instance. HTML frames are often ROLE_DOCUMENT_FRAME. Either this object, or a singleton descendant, should implement the Document interface.  @Since: ATK-1.11
- *@ATK_ROLE_HEADING: The object serves as a heading for content which follows it in a document. The 'heading level' of the heading, if availabe, may be obtained by querying the object's attributes.
- *@ATK_ROLE_PAGE: The object is a containing instance which encapsulates a page of information. @ATK_ROLE_PAGE is used in documents and content which support a paginated navigation model.  @Since: ATK-1.11
- *@ATK_ROLE_SECTION: The object is a containing instance of document content which constitutes a particular 'logical' section of the document. The type of content within a section, and the nature of the section division itself, may be obtained by querying the object's attributes. Sections may be nested. @Since: ATK-1.11
- *@ATK_ROLE_REDUNDANT_OBJECT: The object is redundant with another object in the hierarchy, and is exposed for purely technical reasons.  Objects of this role should normally be ignored by clients. @Since: ATK-1.11
- *@ATK_ROLE_FORM: The object is a container for form controls, for instance as part of a 
- * web form or user-input form within a document.  This role is primarily a tag/convenience for 
- * clients when navigating complex documents, it is not expected that ordinary GUI containers will 
- * always have ATK_ROLE_FORM. @Since: ATK-1.12.0
- *@ATK_ROLE_LINK: The object is a hypertext anchor, i.e. a "link" in a
- * hypertext document.  Such objects are distinct from 'inline'
- * content which may also use the Hypertext/Hyperlink interfaces
- * to indicate the range/location within a text object where
- * an inline or embedded object lies.  @Since: ATK-1.12.1
- *@ATK_ROLE_INPUT_METHOD_WINDOW: The object is a window or similar viewport 
- * which is used to allow composition or input of a 'complex character',
- * in other words it is an "input method window." @Since: ATK-1.12.1
- *@ATK_ROLE_LAST_DEFINED: not a valid role, used for finding end of the enumeration
- * 
- * Describes the role of an object
- *
- * These are the built-in enumerated roles that UI components can have in
- * ATK.  Other roles may be added at runtime, so an AtkRole >=
- * ATK_ROLE_LAST_DEFINED is not necessarily an error.
- **/
-typedef enum
-{
-  ATK_ROLE_INVALID = 0, 
-  ATK_ROLE_ACCEL_LABEL,
-  ATK_ROLE_ALERT,
-  ATK_ROLE_ANIMATION,
-  ATK_ROLE_ARROW,
-  ATK_ROLE_CALENDAR,
-  ATK_ROLE_CANVAS,
-  ATK_ROLE_CHECK_BOX,
-  ATK_ROLE_CHECK_MENU_ITEM,
-  ATK_ROLE_COLOR_CHOOSER,
-  ATK_ROLE_COLUMN_HEADER,
-  ATK_ROLE_COMBO_BOX,
-  ATK_ROLE_DATE_EDITOR,
-  ATK_ROLE_DESKTOP_ICON,
-  ATK_ROLE_DESKTOP_FRAME,
-  ATK_ROLE_DIAL,
-  ATK_ROLE_DIALOG,
-  ATK_ROLE_DIRECTORY_PANE,
-  ATK_ROLE_DRAWING_AREA,
-  ATK_ROLE_FILE_CHOOSER,
-  ATK_ROLE_FILLER,
-  ATK_ROLE_FONT_CHOOSER,
-  ATK_ROLE_FRAME,
-  ATK_ROLE_GLASS_PANE,
-  ATK_ROLE_HTML_CONTAINER,
-  ATK_ROLE_ICON,
-  ATK_ROLE_IMAGE,
-  ATK_ROLE_INTERNAL_FRAME,
-  ATK_ROLE_LABEL,
-  ATK_ROLE_LAYERED_PANE,
-  ATK_ROLE_LIST,
-  ATK_ROLE_LIST_ITEM,
-  ATK_ROLE_MENU,
-  ATK_ROLE_MENU_BAR,
-  ATK_ROLE_MENU_ITEM,
-  ATK_ROLE_OPTION_PANE,
-  ATK_ROLE_PAGE_TAB,
-  ATK_ROLE_PAGE_TAB_LIST,
-  ATK_ROLE_PANEL,
-  ATK_ROLE_PASSWORD_TEXT,
-  ATK_ROLE_POPUP_MENU,
-  ATK_ROLE_PROGRESS_BAR,
-  ATK_ROLE_PUSH_BUTTON,
-  ATK_ROLE_RADIO_BUTTON,
-  ATK_ROLE_RADIO_MENU_ITEM,
-  ATK_ROLE_ROOT_PANE,
-  ATK_ROLE_ROW_HEADER,
-  ATK_ROLE_SCROLL_BAR,
-  ATK_ROLE_SCROLL_PANE,
-  ATK_ROLE_SEPARATOR,
-  ATK_ROLE_SLIDER,
-  ATK_ROLE_SPLIT_PANE,
-  ATK_ROLE_SPIN_BUTTON,
-  ATK_ROLE_STATUSBAR,
-  ATK_ROLE_TABLE,
-  ATK_ROLE_TABLE_CELL,
-  ATK_ROLE_TABLE_COLUMN_HEADER,
-  ATK_ROLE_TABLE_ROW_HEADER,
-  ATK_ROLE_TEAR_OFF_MENU_ITEM,
-  ATK_ROLE_TERMINAL,
-  ATK_ROLE_TEXT,
-  ATK_ROLE_TOGGLE_BUTTON,
-  ATK_ROLE_TOOL_BAR,
-  ATK_ROLE_TOOL_TIP,
-  ATK_ROLE_TREE,
-  ATK_ROLE_TREE_TABLE,
-  ATK_ROLE_UNKNOWN,
-  ATK_ROLE_VIEWPORT,
-  ATK_ROLE_WINDOW,
-  ATK_ROLE_HEADER,
-  ATK_ROLE_FOOTER,
-  ATK_ROLE_PARAGRAPH,
-  ATK_ROLE_RULER,
-  ATK_ROLE_APPLICATION,
-  ATK_ROLE_AUTOCOMPLETE,
-  ATK_ROLE_EDITBAR,
-  ATK_ROLE_EMBEDDED,
-  ATK_ROLE_ENTRY,
-  ATK_ROLE_CHART,
-  ATK_ROLE_CAPTION,
-  ATK_ROLE_DOCUMENT_FRAME,
-  ATK_ROLE_HEADING,
-  ATK_ROLE_PAGE,
-  ATK_ROLE_SECTION,
-  ATK_ROLE_REDUNDANT_OBJECT,
-  ATK_ROLE_FORM,
-  ATK_ROLE_LINK,
-  ATK_ROLE_INPUT_METHOD_WINDOW,
-  ATK_ROLE_LAST_DEFINED
-} AtkRole;
-
-AtkRole                  atk_role_register        (const gchar *name);
-
-/**
- *AtkLayer:
- *@ATK_LAYER_INVALID: The object does not have a layer
- *@ATK_LAYER_BACKGROUND: This layer is reserved for the desktop background
- *@ATK_LAYER_CANVAS: This layer is used for Canvas components
- *@ATK_LAYER_WIDGET: This layer is normally used for components
- *@ATK_LAYER_MDI: This layer is used for layered components
- *@ATK_LAYER_POPUP: This layer is used for popup components, such as menus
- *@ATK_LAYER_OVERLAY: This layer is reserved for future use.
- *@ATK_LAYER_WINDOW: This layer is used for toplevel windows.
- *
- * Describes the layer of a component
- *
- * These enumerated "layer values" are used when determining which UI
- * rendering layer a component is drawn into, which can help in making
- * determinations of when components occlude one another.
- **/
-typedef enum
-{
-  ATK_LAYER_INVALID,
-  ATK_LAYER_BACKGROUND,
-  ATK_LAYER_CANVAS,
-  ATK_LAYER_WIDGET,
-  ATK_LAYER_MDI,
-  ATK_LAYER_POPUP,
-  ATK_LAYER_OVERLAY,
-  ATK_LAYER_WINDOW
-} AtkLayer;
-
-/**
- * AtkAttributeSet:
- *
- * This is a singly-linked list (a #GSList) of #AtkAttribute. It is
- * used by atk_text_get_run_attributes(), atk_text_get_default_attributes()
- * and atk_editable_text_set_run_attributes()
- **/
-typedef GSList AtkAttributeSet;
-
-/**
- * AtkAttribute:
- * @name: The attribute name. Call atk_text_attr_get_name()
- * @value: the value of the attribute, represented as a string. 
- * Call atk_text_attr_get_value() for those which are strings.
- * For values which are numbers, the string representation of the number 
- * is in value.
- *
- * A string name/value pair representing a text attribute. 
- **/
-typedef struct _AtkAttribute AtkAttribute;
-
-struct _AtkAttribute {
-  gchar* name;
-  gchar* value;
-};
-
-#define ATK_TYPE_OBJECT                           (atk_object_get_type ())
-#define ATK_OBJECT(obj)                           (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_OBJECT, AtkObject))
-#define ATK_OBJECT_CLASS(klass)                   (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_OBJECT, AtkObjectClass))
-#define ATK_IS_OBJECT(obj)                        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_OBJECT))
-#define ATK_IS_OBJECT_CLASS(klass)                (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_OBJECT))
-#define ATK_OBJECT_GET_CLASS(obj)                 (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_OBJECT, AtkObjectClass))
-
-#define ATK_TYPE_IMPLEMENTOR                      (atk_implementor_get_type ())
-#define ATK_IS_IMPLEMENTOR(obj)                   G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_IMPLEMENTOR)
-#define ATK_IMPLEMENTOR(obj)                      G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_IMPLEMENTOR, AtkImplementor)
-#define ATK_IMPLEMENTOR_GET_IFACE(obj)            (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_IMPLEMENTOR, AtkImplementorIface))
-
-
-typedef struct _AtkImplementor            AtkImplementor; /* dummy typedef */
-typedef struct _AtkImplementorIface       AtkImplementorIface;
-
-
-typedef struct _AtkObject                 AtkObject;
-typedef struct _AtkObjectClass            AtkObjectClass;
-typedef struct _AtkRelationSet            AtkRelationSet;
-typedef struct _AtkStateSet               AtkStateSet;
-
-/**
- * AtkPropertyValues:
- * @property_name: The name of the ATK property which is being presented or which has been changed.
- * @old_value: The old property value, NULL; in some contexts this value is undefined (see note below).
- * @new_value: The new value of the named property.
- *
- * @note: For most properties the old_value field of AtkPropertyValues will
- * not contain a valid value.
- *
- * Currently, the only property for which old_value is used is
- * accessible-state; for instance if there is a focus state the
- * property change handler will be called for the object which lost the focus
- * with the old_value containing an AtkState value corresponding to focused
- * and the property change handler will be called for the object which
- * received the focus with the new_value containing an AtkState value
- * corresponding to focused.
- *
- **/
-struct _AtkPropertyValues
-{
-  const gchar  *property_name;
-  GValue old_value;
-  GValue new_value;
-};
-
-typedef struct _AtkPropertyValues        AtkPropertyValues;
-
-typedef gboolean (*AtkFunction)          (gpointer data); 
-/*
- * For most properties the old_value field of AtkPropertyValues will
- * not contain a valid value.
- *
- * Currently, the only property for which old_value is used is
- * accessible-state; for instance if there is a focus state the
- * property change handler will be called for the object which lost the focus
- * with the old_value containing an AtkState value corresponding to focused
- * and the property change handler will be called for the object which
- * received the focus with the new_value containing an AtkState value
- * corresponding to focused.
- */
-typedef void (*AtkPropertyChangeHandler) (AtkObject*, AtkPropertyValues*);
-
-
-struct _AtkObject
-{
-  GObject parent;
-
-  gchar *description;
-  gchar *name;
-  AtkObject *accessible_parent;
-  AtkRole role;
-  AtkRelationSet *relation_set;
-  AtkLayer layer;
-};
-
-struct _AtkObjectClass
-{
-  GObjectClass parent;
-
-  /*
-   * Gets the accessible name of the object
-   */
-  G_CONST_RETURN gchar*    (* get_name)            (AtkObject                *accessible);
-  /*
-   * Gets the accessible description of the object
-   */
-  G_CONST_RETURN gchar*    (* get_description)     (AtkObject                *accessible);
-  /*
-   * Gets the accessible parent of the object
-   */
-  AtkObject*               (*get_parent)           (AtkObject                *accessible);
-
-  /*
-   * Gets the number of accessible children of the object
-   */
-  gint                    (* get_n_children)       (AtkObject                *accessible);
-  /*
-   * Returns a reference to the specified accessible child of the object.
-   * The accessible children are 0-based so the first accessible child is
-   * at index 0, the second at index 1 and so on.
-   */
-  AtkObject*              (* ref_child)            (AtkObject                *accessible,
-                                                    gint                      i);
-  /*
-   * Gets the 0-based index of this object in its parent; returns -1 if the
-   * object does not have an accessible parent.
-   */
-  gint                    (* get_index_in_parent) (AtkObject                 *accessible);
-  /*
-   * Gets the RelationSet associated with the object
-   */
-  AtkRelationSet*         (* ref_relation_set)    (AtkObject                 *accessible);
-  /*
-   * Gets the role of the object
-   */
-  AtkRole                 (* get_role)            (AtkObject                 *accessible);
-  AtkLayer                (* get_layer)           (AtkObject                 *accessible);
-  gint                    (* get_mdi_zorder)      (AtkObject                 *accessible);
-  /*
-   * Gets the state set of the object
-   */
-  AtkStateSet*            (* ref_state_set)       (AtkObject                 *accessible);
-  /*
-   * Sets the accessible name of the object
-   */
-  void                    (* set_name)            (AtkObject                 *accessible,
-                                                   const gchar               *name);
-  /*
-   * Sets the accessible description of the object
-   */
-  void                    (* set_description)     (AtkObject                 *accessible,
-                                                   const gchar               *description);
-  /*
-   * Sets the accessible parent of the object
-   */
-  void                    (* set_parent)          (AtkObject                 *accessible,
-                                                   AtkObject                 *parent);
-  /*
-   * Sets the accessible role of the object
-   */
-  void                    (* set_role)            (AtkObject                 *accessible,
-                                                   AtkRole                   role);
-  /*
-   * Specifies a function to be called when a property changes value
-   */
-guint                     (* connect_property_change_handler)    (AtkObject
-                 *accessible,
-                                                                  AtkPropertyChangeHandler       *handler);
-  /*
-   * Removes a property change handler which was specified using
-   * connect_property_change_handler
-   */
-void                      (* remove_property_change_handler)     (AtkObject
-                *accessible,
-                                                                  guint
-                handler_id);
-void                      (* initialize)                         (AtkObject                     *accessible,
-                                                                  gpointer                      data);
-  /*
-   * The signal handler which is executed when there is a change in the
-   * children of the object
-   */
-  void                    (* children_changed)    (AtkObject                  *accessible,
-                                                   guint                      change_index,
-                                                   gpointer                   changed_child);
-  /*
-   * The signal handler which is executed  when there is a focus event
-   * for an object.
-   */
-  void                    (* focus_event)         (AtkObject                  *accessible,
-                                                   gboolean                   focus_in);
-  /*
-   * The signal handler which is executed  when there is a property_change 
-   * signal for an object.
-   */
-  void                    (* property_change)     (AtkObject                  *accessible,
-                                                   AtkPropertyValues          *values);
-  /*
-   * The signal handler which is executed  when there is a state_change 
-   * signal for an object.
-   */
-  void                    (* state_change)        (AtkObject                  *accessible,
-                                                   const gchar                *name,
-                                                   gboolean                   state_set);
-  /*
-   * The signal handler which is executed when there is a change in the
-   * visible data for an object
-   */
-  void                    (*visible_data_changed) (AtkObject                  *accessible);
-
-  /*
-   * The signal handler which is executed when there is a change in the
-   * 'active' child or children of the object, for instance when 
-   * interior focus changes in a table or list.  This signal should be emitted
-   * by objects whose state includes ATK_STATE_MANAGES_DESCENDANTS.
-   */
-  void                    (*active_descendant_changed) (AtkObject                  *accessible,
-                                                        gpointer                   *child);
-
-  /*    	
-   * Gets a list of properties applied to this object as a whole, as an #AtkAttributeSet consisting of name-value pairs. 
-   * Since ATK 1.12
-   */
-  AtkAttributeSet* 	  (*get_attributes)            (AtkObject                  *accessible);
-  AtkFunction             pad1;
-  AtkFunction             pad2;
-};
-
-GType            atk_object_get_type   (void);
-
-struct _AtkImplementorIface
-{
-  GTypeInterface parent;
-
-  AtkObject*   (*ref_accessible) (AtkImplementor *implementor);
-};
-GType atk_implementor_get_type (void);
-
-/*
- * This method uses the ref_accessible method in AtkImplementorIface,
- * if the object's class implements AtkImplementorIface.
- * Otherwise it returns %NULL.
- *
- * IMPORTANT:
- * Note also that because this method may return flyweight objects,
- * it increments the returned AtkObject's reference count.
- * Therefore it is the responsibility of the calling
- * program to unreference the object when no longer needed.
- * (c.f. gtk_widget_get_accessible() where this is not the case).
- */
-AtkObject*              atk_implementor_ref_accessible            (AtkImplementor *implementor);
-
-/*
- * Properties directly supported by AtkObject
- */
-
-G_CONST_RETURN gchar*   atk_object_get_name                       (AtkObject *accessible);
-G_CONST_RETURN gchar*   atk_object_get_description                (AtkObject *accessible);
-AtkObject*              atk_object_get_parent                     (AtkObject *accessible);
-gint                    atk_object_get_n_accessible_children      (AtkObject *accessible);
-AtkObject*              atk_object_ref_accessible_child           (AtkObject *accessible,
-                                                                   gint        i);
-AtkRelationSet*         atk_object_ref_relation_set               (AtkObject *accessible);
-AtkRole                 atk_object_get_role                       (AtkObject *accessible);
-AtkLayer                atk_object_get_layer                      (AtkObject *accessible);
-gint                    atk_object_get_mdi_zorder                 (AtkObject *accessible);
-AtkAttributeSet*        atk_object_get_attributes                 (AtkObject *accessible);
-AtkStateSet*            atk_object_ref_state_set                  (AtkObject *accessible);
-gint                    atk_object_get_index_in_parent            (AtkObject *accessible);
-void                    atk_object_set_name                       (AtkObject *accessible,
-                                                                   const gchar *name);
-void                    atk_object_set_description                (AtkObject *accessible,
-                                                                   const gchar *description);
-void                    atk_object_set_parent                     (AtkObject *accessible,
-                                                                   AtkObject *parent);
-void                    atk_object_set_role                       (AtkObject *accessible,
-                                                                   AtkRole   role);
-
-
-guint                atk_object_connect_property_change_handler  (AtkObject                      *accessible,
-                                                                  AtkPropertyChangeHandler       *handler);
-void                 atk_object_remove_property_change_handler   (AtkObject                      *accessible,
-                                                                  guint                          handler_id);
-
-void                 atk_object_notify_state_change              (AtkObject                      *accessible,
-                                                                  AtkState                       state,
-                                                                  gboolean                       value);
-void                 atk_object_initialize                       (AtkObject                     *accessible,
-                                                                  gpointer                      data);
-                                    
-G_CONST_RETURN gchar* atk_role_get_name      (AtkRole         role);
-AtkRole               atk_role_for_name      (const gchar     *name);
-
-
-/* NEW in 1.1: convenience API */
-gboolean              atk_object_add_relationship              (AtkObject      *object,
-								AtkRelationType relationship,
-								AtkObject      *target);
-gboolean              atk_object_remove_relationship           (AtkObject      *object,
-								AtkRelationType relationship,
-								AtkObject      *target);
-G_CONST_RETURN gchar* atk_role_get_localized_name              (AtkRole     role);
-
-/* */
-
-
-/*
- * Note: the properties which are registered with the GType
- *   property registry, for type ATK_TYPE_OBJECT, are as follows:
- *
- *   "accessible-name"
- *   "accessible-description"
- *   "accessible-parent"
- *   "accessible-role"
- *   "accessible-value"
- *   "accessible-component-layer"
- *   "accessible-component-zorder"
- *   "accessible-table-caption"
- *   "accessible-table-column-description"
- *   "accessible-table-column-header"
- *   "accessible-table-row-description"
- *   "accessible-table-row-header"
- *   "accessible-table-summary"
- *   "accessible-model"
- *
- * accessibility property change listeners should use the
- *   normal GObject property interfaces and "property-change"
- *   signal handler semantics to interpret the property change
- *   information relayed from AtkObject.
- *   (AtkObject instances will connect to the "notify"
- *   signal in their host objects, and relay the signals when appropriate).
- */
-
-/* For other signals, see related interfaces
- *
- *    AtkActionIface,
- *    AtkComponentIface,
- *    AtkHypertextIface,
- *    AtkImageIface,
- *    AtkSelectionIface,
- *    AtkTableIface,
- *    AtkTextIface,
- *    AtkValueIface.
- *
- *  The usage model for obtaining these interface instances is:
- *    ATK_<interfacename>_GET_IFACE(GObject *accessible),
- *    where accessible, though specified as a GObject, is
- *    the AtkObject instance being queried.
- *  More usually, the interface will be used via a cast to the
- *    interface's corresponding "type":
- *
- *    AtkText textImpl = ATK_TEXT(accessible);
- *    if (textImpl)
- *      {
- *        cpos = atk_text_get_caret_position(textImpl);
- *      }
- *
- *  If it's known in advance that accessible implements AtkTextIface,
- *    this is shortened to:
- *
- *    cpos = atk_text_get_caret_position (ATK_TEXT (accessible));
- */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __ATK_OBJECT_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkobjectfactory.h b/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkobjectfactory.h
deleted file mode 100644
index fb163adb..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkobjectfactory.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_OBJECT_FACTORY_H__
-#define __ATK_OBJECT_FACTORY_H__
-
-#include <glib-object.h>
-#include <atk/atkobject.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define ATK_TYPE_OBJECT_FACTORY                     (atk_object_factory_get_type ())
-#define ATK_OBJECT_FACTORY(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_OBJECT_FACTORY, AtkObjectFactory))
-#define ATK_OBJECT_FACTORY_CLASS(klass)             (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_OBJECT_FACTORY, AtkObjectFactoryClass))
-#define ATK_IS_OBJECT_FACTORY(obj)                  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_OBJECT_FACTORY))
-#define ATK_IS_OBJECT_FACTORY_CLASS(klass)          (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_OBJECT_FACTORY))
-#define ATK_OBJECT_FACTORY_GET_CLASS(obj)           (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_OBJECT_FACTORY, AtkObjectFactoryClass))
-
-typedef struct _AtkObjectFactory                AtkObjectFactory;
-typedef struct _AtkObjectFactoryClass           AtkObjectFactoryClass;
-
-struct _AtkObjectFactory
-{
-  GObject parent;
-};
-
-struct _AtkObjectFactoryClass
-{
-  GObjectClass parent_class;
-
-  AtkObject* (* create_accessible) (GObject          *obj);
-  void       (* invalidate)        (AtkObjectFactory *factory);
-  GType      (* get_accessible_type)    (void);
-
-  AtkFunction pad1;
-  AtkFunction pad2;
-};
-
-GType atk_object_factory_get_type(void);
-
-AtkObject* atk_object_factory_create_accessible (AtkObjectFactory *factory, GObject *obj);
-void       atk_object_factory_invalidate (AtkObjectFactory *factory);
-GType      atk_object_factory_get_accessible_type (AtkObjectFactory *factory);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __GTK_OBJECT_FACTORY_H__ */
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkregistry.h b/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkregistry.h
deleted file mode 100644
index 3ab0414a..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkregistry.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ATK - Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_REGISTRY_H__
-#define __ATK_REGISTRY_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include <glib-object.h>
-#include "atkobjectfactory.h"
-
-#define ATK_TYPE_REGISTRY                (atk_registry_get_type ())
-#define ATK_REGISTRY(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_REGISTRY, AtkRegistry))
-#define ATK_REGISTRY_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_REGISTRY, AtkRegistryClass))
-#define ATK_IS_REGISTRY(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_REGISTRY))
-#define ATK_IS_REGISTRY_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_REGISTRY))
-#define ATK_REGISTRY_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_REGISTRY, AtkRegistryClass))
-
-struct _AtkRegistry
-{
-  GObject    parent;
-  GHashTable *factory_type_registry;
-  GHashTable *factory_singleton_cache;
-};
-
-struct _AtkRegistryClass
-{
-  GObjectClass    parent_class;
-};
-
-typedef struct _AtkRegistry             AtkRegistry;
-typedef struct _AtkRegistryClass        AtkRegistryClass;
-
-
-GType             atk_registry_get_type         (void);
-void              atk_registry_set_factory_type (AtkRegistry *registry,
-                                                 GType type,
-                                                 GType factory_type);
-GType             atk_registry_get_factory_type (AtkRegistry *registry,
-						 GType type);
-AtkObjectFactory* atk_registry_get_factory      (AtkRegistry *registry,
-                                                 GType type);
-
-AtkRegistry*      atk_get_default_registry      (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __ATK_REGISTRY_H__ */
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkrelation.h b/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkrelation.h
deleted file mode 100644
index 08b0708f..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkrelation.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_RELATION_H__
-#define __ATK_RELATION_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include <glib-object.h>
-#include <atk/atkrelationtype.h>
-
-/*
- * An AtkRelation describes a relation between the object and one or more 
- * other objects. The actual relations that an object has with other objects
- * are defined as an AtkRelationSet, which is a set of AtkRelations. 
- */
-
-#define ATK_TYPE_RELATION                         (atk_relation_get_type ())
-#define ATK_RELATION(obj)                         (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_RELATION, AtkRelation))
-#define ATK_RELATION_CLASS(klass)                 (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_RELATION, AtkRelationClass))
-#define ATK_IS_RELATION(obj)                      (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_RELATION))
-#define ATK_IS_RELATION_CLASS(klass)              (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_RELATION))
-#define ATK_RELATION_GET_CLASS(obj)               (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_RELATION, AtkRelationClass))
-
-typedef struct _AtkRelation            AtkRelation;
-typedef struct _AtkRelationClass       AtkRelationClass;
-
-struct _AtkRelation
-{
-  GObject parent;
-
-  GPtrArray       *target;
-  AtkRelationType relationship;
-};
-
-struct _AtkRelationClass
-{
-  GObjectClass parent;
-};
-
-GType atk_relation_get_type (void);
-
-AtkRelationType       atk_relation_type_register      (const gchar     *name);
-G_CONST_RETURN gchar* atk_relation_type_get_name      (AtkRelationType type);
-AtkRelationType       atk_relation_type_for_name      (const gchar     *name);
-
-/*
- * Create a new relation for the specified key and the specified list
- * of targets.
- */
-AtkRelation*          atk_relation_new                (AtkObject       **targets,
-                                                       gint            n_targets,
-                                                       AtkRelationType relationship);
-/*
- * Returns the type of a relation.
- */
-AtkRelationType       atk_relation_get_relation_type  (AtkRelation     *relation);
-/*
- * Returns the target list of a relation.
- */
-GPtrArray*            atk_relation_get_target         (AtkRelation     *relation);
-void                  atk_relation_add_target         (AtkRelation     *relation,
-                                                       AtkObject       *target);
-                
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __ATK_RELATION_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkrelationset.h b/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkrelationset.h
deleted file mode 100644
index 2225baf9..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkrelationset.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_RELATION_SET_H__
-#define __ATK_RELATION_SET_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include <glib-object.h>
-#include <atk/atkobject.h>
-#include <atk/atkrelation.h>
-
-#define ATK_TYPE_RELATION_SET                     (atk_relation_set_get_type ())
-#define ATK_RELATION_SET(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_RELATION_SET, AtkRelationSet))
-#define ATK_RELATION_SET_CLASS(klass)             (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_RELATION_SET, AtkRelationSetClass))
-#define ATK_IS_RELATION_SET(obj)                  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_RELATION_SET))
-#define ATK_IS_RELATION_SET_CLASS(klass)          (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_RELATION_SET))
-#define ATK_RELATION_SET_GET_CLASS(obj)           (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_RELATION_SET, AtkRelationSetClass))
-
-typedef struct _AtkRelationSetClass       AtkRelationSetClass;
-
-
-struct _AtkRelationSet
-{
-  GObject parent;
-
-  GPtrArray *relations;
-};
-
-struct _AtkRelationSetClass
-{
-  GObjectClass parent;
-
-  AtkFunction pad1;
-  AtkFunction pad2;
-};
-
-GType atk_relation_set_get_type (void);
-
-AtkRelationSet* atk_relation_set_new                  (void);
-gboolean        atk_relation_set_contains             (AtkRelationSet  *set,
-                                                       AtkRelationType relationship);
-void            atk_relation_set_remove               (AtkRelationSet  *set,
-                                                       AtkRelation     *relation);
-void            atk_relation_set_add                  (AtkRelationSet  *set,
-                                                       AtkRelation     *relation);
-gint            atk_relation_set_get_n_relations      (AtkRelationSet  *set);
-AtkRelation*    atk_relation_set_get_relation         (AtkRelationSet  *set,
-                                                       gint            i);
-AtkRelation*    atk_relation_set_get_relation_by_type (AtkRelationSet  *set,
-                                                       AtkRelationType relationship);
-void            atk_relation_set_add_relation_by_type (AtkRelationSet  *set,
-                                                       AtkRelationType relationship,
-                                                       AtkObject       *target);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __ATK_RELATION_SET_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkrelationtype.h b/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkrelationtype.h
deleted file mode 100644
index 665c675c..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkrelationtype.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2002 Sun Microsystems 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 __ATK_RELATION_TYPE_H__
-#define __ATK_RELATION_TYPE_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/**
- *AtkRelationType:
- *@ATK_RELATION_NULL: Not used, represens "no relationship" or an error condition.
- *@ATK_RELATION_CONTROLLED_BY: Indicates an object controlled by one or more target objects.
- *@ATK_RELATION_CONTROLLER_FOR: Indicates an object is an controller for one or more target objects.
- *@ATK_RELATION_LABEL_FOR: Indicates an object is a label for one or more target objects.
- *@ATK_RELATION_LABELLED_BY: Indicates an object is labelled by one or more target objects.
- *@ATK_RELATION_MEMBER_OF: Indicates an object is a member of a group of one or more target objects.
- *@ATK_RELATION_NODE_CHILD_OF: Indicates an object is a cell in a treetable which is displayed because a cell in the same column is expanded and identifies that cell.
- *@ATK_RELATION_FLOWS_TO: Indicates that the object has content that flows logically to another
- *  AtkObject in a sequential way, (for instance text-flow).
- *@ATK_RELATION_FLOWS_FROM: Indicates that the object has content that flows logically from
- *  another AtkObject in a sequential way, (for instance text-flow).
- *@ATK_RELATION_SUBWINDOW_OF: Indicates a subwindow attached to a component but otherwise has no connection in  the UI heirarchy to that component.
- *@ATK_RELATION_EMBEDS: Indicates that the object visually embeds 
- *  another object's content, i.e. this object's content flows around 
- *  another's content.
- *@ATK_RELATION_EMBEDDED_BY: Inverse of %ATK_RELATION_EMBEDS, indicates that
- *  this object's content is visualy embedded in another object.
- *@ATK_RELATION_POPUP_FOR: Indicates that an object is a popup for another object.
- *@ATK_RELATION_PARENT_WINDOW_OF: Indicates that an object is a parent window of another object.
- *@ATK_RELATION_DESCRIBED_BY: Indicates that another object provides descriptive information about this object; more verbose than ATK_RELATION_LABELLED_BY.
- *@ATK_RELATION_DESCRIPTION_FOR: Indicates that an object provides descriptive information about another object; more verbose than ATK_RELATION_LABEL_FOR.
- *@ATK_RELATION_LAST_DEFINED: Not used, this value indicates the end of the enumeration.
- * 
- *Describes the type of the relation
- **/
-typedef enum
-{
-  ATK_RELATION_NULL = 0,
-  ATK_RELATION_CONTROLLED_BY,
-  ATK_RELATION_CONTROLLER_FOR,
-  ATK_RELATION_LABEL_FOR,
-  ATK_RELATION_LABELLED_BY,
-  ATK_RELATION_MEMBER_OF,
-  ATK_RELATION_NODE_CHILD_OF,
-  ATK_RELATION_FLOWS_TO,
-  ATK_RELATION_FLOWS_FROM,
-  ATK_RELATION_SUBWINDOW_OF, 
-  ATK_RELATION_EMBEDS, 
-  ATK_RELATION_EMBEDDED_BY, 
-  ATK_RELATION_POPUP_FOR, 
-  ATK_RELATION_PARENT_WINDOW_OF, 
-  ATK_RELATION_DESCRIBED_BY,
-  ATK_RELATION_DESCRIPTION_FOR,
-  ATK_RELATION_LAST_DEFINED
-} AtkRelationType;
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __ATK_RELATION_TYPE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkselection.h b/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkselection.h
deleted file mode 100644
index 7b16930c..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkselection.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_SELECTION_H__
-#define __ATK_SELECTION_H__
-
-#include <atk/atkobject.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * This AtkSelection interface provides the standard mechanism for an 
- * assistive technology to determine what the current selected children are, 
- * as well as modify the selection set. Any object that has children that 
- * can be selected should support the AtkSelection interface.
- */
-
-#define ATK_TYPE_SELECTION                        (atk_selection_get_type ())
-#define ATK_IS_SELECTION(obj)                     G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_SELECTION)
-#define ATK_SELECTION(obj)                        G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_SELECTION, AtkSelection)
-#define ATK_SELECTION_GET_IFACE(obj)              (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_SELECTION, AtkSelectionIface))
-
-#ifndef _TYPEDEF_ATK_SELECTION_
-#define _TYPEDEF_ATK_SELECTION_
-typedef struct _AtkSelection AtkSelection;
-#endif
-typedef struct _AtkSelectionIface AtkSelectionIface;
-
-struct _AtkSelectionIface
-{
-  GTypeInterface parent;
-
-  gboolean     (* add_selection)        (AtkSelection   *selection,
-                                         gint           i);
-  gboolean     (* clear_selection)      (AtkSelection   *selection);
-  AtkObject*   (* ref_selection)        (AtkSelection   *selection,
-                                         gint           i);
-  gint         (* get_selection_count)  (AtkSelection   *selection);
-  gboolean     (* is_child_selected)    (AtkSelection   *selection,
-                                         gint           i);
-  gboolean     (* remove_selection)     (AtkSelection   *selection,
-                                         gint           i);
-  gboolean     (* select_all_selection) (AtkSelection   *selection);
-
-  /* signal handlers */
-  
-  void         (*selection_changed)     (AtkSelection   *selection);
-
-  AtkFunction  pad1;
-  AtkFunction  pad2;
-};
-
-GType atk_selection_get_type (void);
-
-gboolean     atk_selection_add_selection        (AtkSelection   *selection,
-                                                 gint           i);
-
-gboolean     atk_selection_clear_selection      (AtkSelection   *selection);
-
-AtkObject*   atk_selection_ref_selection        (AtkSelection   *selection,
-                                                 gint           i);
-
-gint         atk_selection_get_selection_count  (AtkSelection   *selection);
-
-gboolean     atk_selection_is_child_selected    (AtkSelection   *selection,
-                                                 gint           i);
-
-gboolean     atk_selection_remove_selection     (AtkSelection   *selection,
-                                                 gint           i);
-
-gboolean     atk_selection_select_all_selection (AtkSelection   *selection);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __ATK_SELECTION_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkstate.h b/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkstate.h
deleted file mode 100644
index 3317346a..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkstate.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_STATE_H__
-#define __ATK_STATE_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include <glib-object.h>
-
-/**
- *AtkStateType:
- *@ATK_STATE_INVALID: Indicates an invalid state - probably an error condition.
- *@ATK_STATE_ACTIVE: Indicates a window is currently the active window, or is an active subelement within a container or table
- *@ATK_STATE_ARMED: Indicates that the object is 'armed', i.e. will be activated by if a pointer button-release event occurs within its bounds.  Buttons often enter this state when a pointer click occurs within their bounds, as a precursor to activation.
- *@ATK_STATE_BUSY:  Indicates the current object is busy, i.e. onscreen representation is in the process of changing, or the object is temporarily unavailable for interaction due to activity already in progress.  This state may be used by implementors of Document to indicate that content loading is underway.  It also may indicate other 'pending' conditions; clients may wish to interrogate this object when the ATK_STATE_BUSY flag is removed.
- *@ATK_STATE_CHECKED: Indicates this object is currently checked, for instance a checkbox is 'non-empty'.
- *@ATK_STATE_DEFUNCT: Indicates that this object no longer has a valid backing widget (for instance, if its peer object has been destroyed)
- *@ATK_STATE_EDITABLE: Indicates the user can change the contents of this object
- *@ATK_STATE_ENABLED: 	Indicates that this object is enabled, i.e. that it currently reflects some application state. Objects that are "greyed out" may lack this state, and may lack the STATE_SENSITIVE if direct user interaction cannot cause them to acquire STATE_ENABLED. See also: ATK_STATE_SENSITIVE
- *@ATK_STATE_EXPANDABLE: Indicates this object allows progressive disclosure of its children
- *@ATK_STATE_EXPANDED: Indicates this object its expanded - see ATK_STATE_EXPANDABLE above
- *@ATK_STATE_FOCUSABLE: Indicates this object can accept keyboard focus, which means all events resulting from typing on the keyboard will normally be passed to it when it has focus
- *@ATK_STATE_FOCUSED: Indicates this object currently has the keyboard focus
- *@ATK_STATE_HORIZONTAL: Indicates the orientation of this object is horizontal; used, for instance, by objects of ATK_ROLE_SCROLL_BAR.  For objects where vertical/horizontal orientation is especially meaningful.
- *@ATK_STATE_ICONIFIED: Indicates this object is minimized and is represented only by an icon
- *@ATK_STATE_MODAL: Indicates something must be done with this object before the user can interact with an object in a different window
- *@ATK_STATE_MULTI_LINE: Indicates this (text) object can contain multiple lines of text
- *@ATK_STATE_MULTISELECTABLE: Indicates this object allows more than one of its children to be selected at the same time, or in the case of text objects, that the object supports non-contiguous text selections.
- *@ATK_STATE_OPAQUE: Indicates this object paints every pixel within its rectangular region.
- *@ATK_STATE_PRESSED: Indicates this object is currently pressed; c.f. ATK_STATE_ARMED
- *@ATK_STATE_RESIZABLE: Indicates the size of this object is not fixed
- *@ATK_STATE_SELECTABLE: Indicates this object is the child of an object that allows its children to be selected and that this child is one of those children that can be selected
- *@ATK_STATE_SELECTED: Indicates this object is the child of an object that allows its children to be selected and that this child is one of those children that has been selected
- *@ATK_STATE_SENSITIVE: Indicates this object is sensitive, e.g. to user interaction. 
- * STATE_SENSITIVE usually accompanies STATE_ENABLED for user-actionable controls,
- * but may be found in the absence of STATE_ENABLED if the current visible state of the 
- * control is "disconnected" from the application state.  In such cases, direct user interaction
- * can often result in the object gaining STATE_SENSITIVE, for instance if a user makes 
- * an explicit selection using an object whose current state is ambiguous or undefined.
- * @see STATE_ENABLED, STATE_INDETERMINATE.
- *@ATK_STATE_SHOWING: Indicates this object, the object's parent, the object's parent's parent, and so on, 
- * are all 'shown' to the end-user, i.e. subject to "exposure" if blocking or obscuring objects do not interpose
- * between this object and the top of the window stack.
- *@ATK_STATE_SINGLE_LINE: Indicates this (text) object can contain only a single line of text
- *@ATK_STATE_STALE: Indicates that the information returned for this object may no longer be
- * synchronized with the application state.  This is implied if the object has STATE_TRANSIENT,
- * and can also occur towards the end of the object peer's lifecycle. It can also be used to indicate that 
- * the index associated with this object has changed since the user accessed the object (in lieu of
- * "index-in-parent-changed" events).
- *@ATK_STATE_TRANSIENT: Indicates this object is transient, i.e. a snapshot which may not emit events when its
- * state changes.  Data from objects with ATK_STATE_TRANSIENT should not be cached, since there may be no
- * notification given when the cached data becomes obsolete.
- *@ATK_STATE_VERTICAL: Indicates the orientation of this object is vertical
- *@ATK_STATE_VISIBLE: Indicates this object is visible, e.g. has been explicitly marked for exposure to the user.
- * @note: STATE_VISIBLE is no guarantee that the object is actually unobscured on the screen, only
- * that it is 'potentially' visible, barring obstruction, being scrolled or clipped out of the 
- * field of view, or having an ancestor container that has not yet made visible.
- * A widget is potentially onscreen if it has both STATE_VISIBLE and STATE_SHOWING.
- * The absence of STATE_VISIBLE and STATE_SHOWING is semantically equivalent to saying 
- * that an object is 'hidden'.  See also STATE_TRUNCATED, which applies if a VISIBLE and SHOWING object
- * lies within a viewport which means that its contents are clipped, e.g. a truncated spreadsheet cell or
- * an image within a scrolling viewport.  Mostly useful for screen-review and magnification algorithms.
- *@ATK_STATE_MANAGES_DESCENDANTS: Indicates that "active-descendant-changed" event
- * is sent when children become 'active' (i.e. are selected or navigated to onscreen).
- * Used to prevent need to enumerate all children in very large containers, like tables.
- * The presence of STATE_MANAGES_DESCENDANTS is an indication to the client.
- * that the children should not, and need not, be enumerated by the client.
- * Objects implementing this state are expected to provide relevant state
- * notifications to listening clients, for instance notifications of visibility
- * changes and activation of their contained child objects, without the client 
- * having previously requested references to those children.
- *@ATK_STATE_INDETERMINATE: Indicates that a check box is in a state other than checked or not checked.
- * This usually means that the boolean value reflected or 
- * controlled by the object does not apply consistently to the entire current context.
- * For example, a checkbox for the "Bold" attribute of text may have STATE_INDETERMINATE
- * if the currently selected text contains a mixture of weight attributes.  
- * In many cases interacting with a STATE_INDETERMINATE object will cause 
- * the context's corresponding boolean attribute to be homogenized, whereupon the object
- * will lose STATE_INDETERMINATE and a corresponding state-changed event will be fired.
- *@ATK_STATE_TRUNCATED: Indicates that an object is truncated, e.g. a text value in a speradsheet cell.
- *@ATK_STATE_REQUIRED: Indicates that explicit user interaction with an object is required by the user interface, e.g. a required field in a "web-form" interface.
- *@ATK_STATE_INVALID_ENTRY: Indicates that the object has encountered an error condition due to failure of input validation. For instance, a form control may acquire this state in response to invalid or malformed user input.
- *@ATK_STATE_SUPPORTS_AUTOCOMPLETION:  Indicates that the object in question implements some form of ¨typeahead¨ or 
- * pre-selection behavior whereby entering the first character of one or more sub-elements
- * causes those elements to scroll into view or become selected.  Subsequent character input
- * may narrow the selection further as long as one or more sub-elements match the string.
- * This state is normally only useful and encountered on objects that implement Selection.
- * In some cases the typeahead behavior may result in full or partial ¨completion¨ of 
- * the data in the input field, in which case these input events may trigger text-changed
- * events from the AtkText interface.  This state supplants @ATK_ROLE_AUTOCOMPLETE.
- *@ATK_STATE_SELECTABLE_TEXT:Indicates that the object in question supports text selection. It should only be exposed on objects which implement the Text interface, in order to distinguish this state from @ATK_STATE_SELECTABLE, which infers that the object in question is a selectable child of an object which implements Selection. While similar, text selection and subelement selection are distinct operations.
- *@ATK_STATE_DEFAULT: Indicates that the object is the "default" active component, i.e. the object which is activated by an end-user press of the "Enter" or "Return" key.  Typically a "close" or "submit" button.
- *@ATK_STATE_ANIMATED: Indicates that the object changes its appearance dynamically as an inherent part of its presentation.  This state may come and go if an object is only temporarily animated on the way to a 'final' onscreen presentation.
- * @note some applications, notably content viewers, may not be able to detect
- * all kinds of animated content.  Therefore the absence of this state should not
- * be taken as definitive evidence that the object's visual representation is
- * static; this state is advisory.
- *@ATK_STATE_VISITED: Indicates that the object (typically a hyperlink) has already been 'activated', and/or its backing data has already been downloaded, rendered, or otherwise "visited".
- *@ATK_STATE_LAST_DEFINED: Not a valid state, used for finding end of enumeration
- *
- *The possible types of states of an object
- **/ 
-typedef enum
-{
-  ATK_STATE_INVALID,
-  ATK_STATE_ACTIVE,
-  ATK_STATE_ARMED,
-  ATK_STATE_BUSY,
-  ATK_STATE_CHECKED,
-  ATK_STATE_DEFUNCT,
-  ATK_STATE_EDITABLE,
-  ATK_STATE_ENABLED,
-  ATK_STATE_EXPANDABLE,
-  ATK_STATE_EXPANDED,
-  ATK_STATE_FOCUSABLE,
-  ATK_STATE_FOCUSED,
-  ATK_STATE_HORIZONTAL,
-  ATK_STATE_ICONIFIED,
-  ATK_STATE_MODAL,
-  ATK_STATE_MULTI_LINE,
-  ATK_STATE_MULTISELECTABLE,
-  ATK_STATE_OPAQUE,
-  ATK_STATE_PRESSED,
-  ATK_STATE_RESIZABLE,
-  ATK_STATE_SELECTABLE,
-  ATK_STATE_SELECTED,
-  ATK_STATE_SENSITIVE,
-  ATK_STATE_SHOWING,
-  ATK_STATE_SINGLE_LINE,
-  ATK_STATE_STALE,
-  ATK_STATE_TRANSIENT,
-  ATK_STATE_VERTICAL,
-  ATK_STATE_VISIBLE,
-  ATK_STATE_MANAGES_DESCENDANTS,
-  ATK_STATE_INDETERMINATE,
-  ATK_STATE_TRUNCATED,
-  ATK_STATE_REQUIRED,
-  ATK_STATE_INVALID_ENTRY,
-  ATK_STATE_SUPPORTS_AUTOCOMPLETION,
-  ATK_STATE_SELECTABLE_TEXT,
-  ATK_STATE_DEFAULT,
-  ATK_STATE_ANIMATED,
-  ATK_STATE_VISITED,
-	
-  ATK_STATE_LAST_DEFINED
-} AtkStateType;
-
-typedef guint64      AtkState;
-
-AtkStateType atk_state_type_register            (const gchar *name);
-
-G_CONST_RETURN gchar* atk_state_type_get_name   (AtkStateType type);
-AtkStateType          atk_state_type_for_name   (const gchar  *name);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __ATK_STATE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkstateset.h b/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkstateset.h
deleted file mode 100644
index 43c3ea3d..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkstateset.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_STATE_SET_H__
-#define __ATK_STATE_SET_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include <glib-object.h>
-#include <atk/atkobject.h>
-#include <atk/atkstate.h>
-
-#define ATK_TYPE_STATE_SET                        (atk_state_set_get_type ())
-#define ATK_STATE_SET(obj)                        (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_STATE_SET, AtkStateSet))
-#define ATK_STATE_SET_CLASS(klass)                (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_STATE_SET, AtkStateSetClass))
-#define ATK_IS_STATE_SET(obj)                     (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_STATE_SET))
-#define ATK_IS_STATE_SET_CLASS(klass)             (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_STATE_SET))
-#define ATK_STATE_SET_GET_CLASS(obj)              (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_STATE_SET, AtkStateSetClass))
-
-typedef struct _AtkStateSetClass       AtkStateSetClass;
-
-
-struct _AtkStateSet
-{
-  GObject parent;
-
-};
-
-struct _AtkStateSetClass
-{
-  GObjectClass parent;
-};
-
-GType atk_state_set_get_type (void);
-
-AtkStateSet*    atk_state_set_new               (void);
-gboolean        atk_state_set_is_empty          (AtkStateSet  *set);
-gboolean        atk_state_set_add_state         (AtkStateSet  *set,
-                                                 AtkStateType type);
-void            atk_state_set_add_states        (AtkStateSet  *set,
-                                                 AtkStateType *types,
-                                                 gint         n_types);
-void            atk_state_set_clear_states      (AtkStateSet  *set);
-gboolean        atk_state_set_contains_state    (AtkStateSet  *set,
-                                                 AtkStateType type);
-gboolean        atk_state_set_contains_states   (AtkStateSet  *set,
-                                                 AtkStateType *types,
-                                                 gint         n_types);
-gboolean        atk_state_set_remove_state      (AtkStateSet  *set,
-                                                 AtkStateType type);
-AtkStateSet*    atk_state_set_and_sets          (AtkStateSet  *set,
-                                                 AtkStateSet  *compare_set);
-AtkStateSet*    atk_state_set_or_sets           (AtkStateSet  *set,
-                                                 AtkStateSet  *compare_set);
-AtkStateSet*    atk_state_set_xor_sets          (AtkStateSet  *set,
-                                                 AtkStateSet  *compare_set);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __ATK_STATE_SET_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkstreamablecontent.h b/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkstreamablecontent.h
deleted file mode 100644
index abdbfa95..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkstreamablecontent.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_STREAMABLE_CONTENT_H__
-#define __ATK_STREAMABLE_CONTENT_H__
-
-#include <atk/atkobject.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define ATK_TYPE_STREAMABLE_CONTENT           (atk_streamable_content_get_type ())
-#define ATK_IS_STREAMABLE_CONTENT(obj)        G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_STREAMABLE_CONTENT)
-#define ATK_STREAMABLE_CONTENT(obj)           G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_STREAMABLE_CONTENT, AtkStreamableContent)
-#define ATK_STREAMABLE_CONTENT_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_STREAMABLE_CONTENT, AtkStreamableContentIface))
-
-#ifndef _TYPEDEF_ATK_STREAMABLE_CONTENT
-#define _TYPEDEF_ATK_STREAMABLE_CONTENT
-typedef struct _AtkStreamableContent AtkStreamableContent;
-#endif
-typedef struct _AtkStreamableContentIface AtkStreamableContentIface;
-
-struct _AtkStreamableContentIface
-{
-  GTypeInterface parent;
-
-  /*
-   * Get the number of mime types supported by this object
-   */
-  gint                      (* get_n_mime_types)  (AtkStreamableContent     *streamable);
-  /*
-   * Gets the specified mime type supported by this object.
-   * The mime types are 0-based so the first mime type is 
-   * at index 0, the second at index 1 and so on.  The mime-type
-   * at index 0 should be considered the "default" data type for the stream.
-   *
-   * This assumes that the strings for the mime types are stored in the
-   * AtkStreamableContent. Alternatively the G_CONST_RETURN could be removed
-   * and the caller would be responsible for calling g_free() on the
-   * returned value.
-   */
-  G_CONST_RETURN gchar*     (* get_mime_type)     (AtkStreamableContent     *streamable,
-                                                   gint                     i);
-  /*
-   * One possible implementation for this method is that it constructs the
-   * content appropriate for the mime type and then creates a temporary
-   * file containing the content, opens the file and then calls
-   * g_io_channel_unix_new_fd().
-   */
-  GIOChannel*               (* get_stream)        (AtkStreamableContent     *streamable,
-                                                   const gchar              *mime_type);
-
-/*
- * Returns a string representing a URI in IETF standard format
- * (see http://www.ietf.org/rfc/rfc2396.txt) from which the object's content
- * may be streamed in the specified mime-type.
- * If mime_type is NULL, the URI for the default (and possibly only) mime-type is
- * returned.
- *
- * returns NULL if the mime-type is not supported, or if no URI can be 
- * constructed.  Note that it is possible for get_uri to return NULL but for
- * get_stream to work nonetheless, since not all GIOChannels connect to URIs.
- */
-    G_CONST_RETURN  gchar*  (* get_uri)           (AtkStreamableContent     *streamable,
-                                                   const gchar              *mime_type);
-
-
-  AtkFunction               pad1;
-  AtkFunction               pad2;
-  AtkFunction               pad3;
-};
-GType                  atk_streamable_content_get_type (void);
-
-gint                   atk_streamable_content_get_n_mime_types (AtkStreamableContent     *streamable);
-                                                       
-G_CONST_RETURN gchar*  atk_streamable_content_get_mime_type    (AtkStreamableContent     *streamable,
-                                                                gint                     i);
-GIOChannel*             atk_streamable_content_get_stream       (AtkStreamableContent     *streamable,
-                                                                 const gchar              *mime_type);
-
-gchar*                  atk_streamable_content_get_uri          (AtkStreamableContent     *streamable,
-                                                                 const gchar              *mime_type);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __ATK_STREAMABLE_CONTENT_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atktable.h b/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atktable.h
deleted file mode 100644
index 790fbb44..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atktable.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_TABLE_H__
-#define __ATK_TABLE_H__
-
-#include <atk/atkobject.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * AtkTable describes a user-interface component that presents data in
- * two-dimensional table format.
- */
-
-
-#define ATK_TYPE_TABLE                    (atk_table_get_type ())
-#define ATK_IS_TABLE(obj)                 G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_TABLE)
-#define ATK_TABLE(obj)                    G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_TABLE, AtkTable)
-#define ATK_TABLE_GET_IFACE(obj)          (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_TABLE, AtkTableIface))
-
-#ifndef _TYPEDEF_ATK_TABLE_
-#define _TYPEDEF_ATK_TABLE_
-typedef struct _AtkTable AtkTable;
-#endif
-typedef struct _AtkTableIface AtkTableIface;
-
-struct _AtkTableIface
-{
-  GTypeInterface parent;
-
-  AtkObject*        (* ref_at)                   (AtkTable      *table,
-                                                  gint          row,
-                                                  gint          column);
-  gint              (* get_index_at)             (AtkTable      *table,
-                                                  gint          row,
-                                                  gint          column);
-  gint              (* get_column_at_index)      (AtkTable      *table,
-                                                  gint          index_);
-  gint              (* get_row_at_index)         (AtkTable      *table,
-                                                  gint          index_);
-  gint              (* get_n_columns)           (AtkTable      *table);
-  gint              (* get_n_rows)               (AtkTable      *table);
-  gint              (* get_column_extent_at)     (AtkTable      *table,
-                                                  gint          row,
-                                                  gint          column);
-  gint              (* get_row_extent_at)        (AtkTable      *table,
-                                                  gint          row,
-                                                  gint          column);
-  AtkObject*
-                    (* get_caption)              (AtkTable      *table);
-  G_CONST_RETURN gchar*
-                    (* get_column_description)   (AtkTable      *table,
-                                                  gint          column);
-  AtkObject*        (* get_column_header)        (AtkTable      *table,
-						  gint		column);
-  G_CONST_RETURN gchar*
-                    (* get_row_description)      (AtkTable      *table,
-                                                  gint          row);
-  AtkObject*        (* get_row_header)           (AtkTable      *table,
-						  gint		row);
-  AtkObject*        (* get_summary)              (AtkTable      *table);
-  void              (* set_caption)              (AtkTable      *table,
-                                                  AtkObject     *caption);
-  void              (* set_column_description)   (AtkTable      *table,
-                                                  gint          column,
-                                                  const gchar   *description);
-  void              (* set_column_header)        (AtkTable      *table,
-                                                  gint          column,
-                                                  AtkObject     *header);
-  void              (* set_row_description)      (AtkTable      *table,
-                                                  gint          row,
-                                                  const gchar   *description);
-  void              (* set_row_header)           (AtkTable      *table,
-                                                  gint          row,
-                                                  AtkObject     *header);
-  void              (* set_summary)              (AtkTable      *table,
-                                                  AtkObject     *accessible);
-  gint              (* get_selected_columns)     (AtkTable      *table,
-                                                  gint          **selected);
-  gint              (* get_selected_rows)        (AtkTable      *table,
-                                                  gint          **selected);
-  gboolean          (* is_column_selected)       (AtkTable      *table,
-                                                  gint          column);
-  gboolean          (* is_row_selected)          (AtkTable      *table,
-                                                  gint          row);
-  gboolean          (* is_selected)              (AtkTable      *table,
-                                                  gint          row,
-                                                  gint          column);
-  gboolean          (* add_row_selection)        (AtkTable      *table,
-                                                  gint          row);
-  gboolean          (* remove_row_selection)     (AtkTable      *table,
-                                                  gint          row);
-  gboolean          (* add_column_selection)     (AtkTable      *table,
-                                                  gint          column);
-  gboolean          (* remove_column_selection)  (AtkTable      *table,
-                                                  gint          column);
-
-  /*
-   * signal handlers
-   */
-  void              (* row_inserted)             (AtkTable      *table,
-                                                  gint          row,
-                                                  gint          num_inserted);
-  void              (* column_inserted)          (AtkTable      *table,
-                                                  gint          column,
-                                                  gint          num_inserted);
-  void              (* row_deleted)              (AtkTable      *table,
-                                                  gint          row,
-                                                  gint          num_deleted);
-  void              (* column_deleted)           (AtkTable      *table,
-                                                  gint          column,
-                                                  gint          num_deleted);
-  void              (* row_reordered)            (AtkTable      *table);
-  void              (* column_reordered)         (AtkTable      *table);
-  void              (* model_changed)            (AtkTable      *table);
-
-  AtkFunction       pad1;
-  AtkFunction       pad2;
-  AtkFunction       pad3;
-  AtkFunction       pad4;
-};
-
-GType atk_table_get_type (void);
-
-AtkObject*        atk_table_ref_at               (AtkTable         *table,
-                                                  gint             row,
-                                                  gint             column);
-gint              atk_table_get_index_at         (AtkTable         *table,
-                                                  gint             row,
-                                                  gint             column);
-gint              atk_table_get_column_at_index  (AtkTable         *table,
-                                                  gint             index_);
-gint              atk_table_get_row_at_index     (AtkTable         *table,
-                                                  gint             index_);
-gint              atk_table_get_n_columns        (AtkTable         *table);
-gint              atk_table_get_n_rows           (AtkTable         *table);
-gint              atk_table_get_column_extent_at (AtkTable         *table,
-                                                  gint             row,
-                                                  gint             column);
-gint              atk_table_get_row_extent_at    (AtkTable         *table,
-                                                  gint             row,
-                                                  gint             column);
-AtkObject*
-                  atk_table_get_caption          (AtkTable         *table);
-G_CONST_RETURN gchar*
-                  atk_table_get_column_description (AtkTable         *table,
-                                                  gint             column);
-AtkObject*        atk_table_get_column_header    (AtkTable         *table,
-						  gint		   column);
-G_CONST_RETURN gchar*
-                  atk_table_get_row_description  (AtkTable         *table,
-                                                  gint             row);
-AtkObject*        atk_table_get_row_header       (AtkTable         *table,
-						  gint		   row);
-AtkObject*        atk_table_get_summary          (AtkTable         *table);
-void              atk_table_set_caption          (AtkTable         *table,
-                                                  AtkObject        *caption);
-void              atk_table_set_column_description 
-                                                 (AtkTable         *table,
-                                                  gint             column,
-                                                  const gchar      *description);
-void              atk_table_set_column_header    (AtkTable         *table,
-                                                  gint             column,
-                                                  AtkObject        *header);
-void              atk_table_set_row_description  (AtkTable         *table,
-                                                  gint             row,
-                                                  const gchar      *description);
-void              atk_table_set_row_header       (AtkTable         *table,
-                                                  gint             row,
-                                                  AtkObject        *header);
-void              atk_table_set_summary          (AtkTable         *table,
-                                                  AtkObject        *accessible);
-gint              atk_table_get_selected_columns (AtkTable         *table,
-                                                  gint             **selected);
-gint              atk_table_get_selected_rows    (AtkTable         *table,
-                                                  gint             **selected);
-gboolean          atk_table_is_column_selected   (AtkTable         *table,
-                                                  gint             column);
-gboolean          atk_table_is_row_selected      (AtkTable         *table,
-                                                  gint             row);
-gboolean          atk_table_is_selected          (AtkTable         *table,
-                                                  gint             row,
-                                                  gint             column);
-gboolean          atk_table_add_row_selection    (AtkTable         *table,
-                                                  gint             row);
-gboolean          atk_table_remove_row_selection (AtkTable         *table,
-                                                  gint             row);
-gboolean          atk_table_add_column_selection (AtkTable         *table,
-                                                  gint             column);
-gboolean          atk_table_remove_column_selection  
-                                                 (AtkTable         *table,
-                                                  gint             column);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __ATK_TABLE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atktext.h b/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atktext.h
deleted file mode 100644
index 191e231f..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atktext.h
+++ /dev/null
@@ -1,367 +0,0 @@
-/* ATK - The Accessibility Toolkit for GTK+
- * Copyright 2001 Sun Microsystems 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 __ATK_TEXT_H__
-#define __ATK_TEXT_H__
-
-#include <glib-object.h>
-#include <atk/atkobject.h>
-#include <atk/atkutil.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/**
- *AtkTextAttribute
- *@ATK_TEXT_ATTR_INVALID: Invalid attribute
- *@ATK_TEXT_ATTR_LEFT_MARGIN: The pixel width of the left margin
- *@ATK_TEXT_ATTR_RIGHT_MARGIN: The pixel width of the right margin
- *@ATK_TEXT_ATTR_INDENT: The number of pixels that the text is indented
- *@ATK_TEXT_ATTR_INVISIBLE: Either "true" or "false" indicating whether text is visible or not
- *@ATK_TEXT_ATTR_EDITABLE: Either "true" or "false" indicating whether text is editable or not
- *@ATK_TEXT_ATTR_PIXELS_ABOVE_LINES: Pixels of blank space to leave above each newline-terminated line. 
- *@ATK_TEXT_ATTR_PIXELS_BELOW_LINES: Pixels of blank space to leave below each newline-terminated line.
- *@ATK_TEXT_ATTR_PIXELS_INSIDE_WRAP: Pixels of blank space to leave between wrapped lines inside the same newline-terminated line (paragraph).
- *@ATK_TEXT_ATTR_BG_FULL_HEIGHT: "true" or "false" whether to make the background color for each character the height of the highest font used on the current line, or the height of the font used for the current character.
- *@ATK_TEXT_ATTR_RISE: Number of pixels that the characters are risen above the baseline
- *@ATK_TEXT_ATTR_UNDERLINE: "none", "single", "double" or "low"
- *@ATK_TEXT_ATTR_STRIKETHROUGH: "true" or "false" whether the text is strikethrough 
- *@ATK_TEXT_ATTR_SIZE: The size of the characters. 
- *@ATK_TEXT_ATTR_SCALE: The scale of the characters. The value is a string representation of a double 
- *@ATK_TEXT_ATTR_WEIGHT: The weight of the characters.
- *@ATK_TEXT_ATTR_LANGUAGE: The language used
- *@ATK_TEXT_ATTR_FAMILY_NAME: The font family name
- *@ATK_TEXT_ATTR_BG_COLOR: The background color. The value is an RGB value of the format "%u,%u,%u"
- *@ATK_TEXT_ATTR_FG_COLOR:The foreground color. The value is an RGB value of the format "%u,%u,%u"
- *@ATK_TEXT_ATTR_BG_STIPPLE: "true" if a #GdkBitmap is set for stippling the background color.
- *@ATK_TEXT_ATTR_FG_STIPPLE: "true" if a #GdkBitmap is set for stippling the foreground color.
- *@ATK_TEXT_ATTR_WRAP_MODE: The wrap mode of the text, if any. Values are "none", "char" or "word" 
- *@ATK_TEXT_ATTR_DIRECTION: The direction of the text, if set. Values are "none", "ltr" or "rtl" 
- *@ATK_TEXT_ATTR_JUSTIFICATION: The justification of the text, if set. Values are "left", "right", "center" or "fill" 
- *@ATK_TEXT_ATTR_STRETCH: The stretch of the text, if set. Values are "ultra_condensed", "extra_condensed", "condensed", "semi_condensed", "normal", "semi_expanded", "expanded", "extra_expanded" or "ultra_expanded"
- *@ATK_TEXT_ATTR_VARIANT: The capitalization variant of the text, if set. Values are "normal" or "small_caps"
- *@ATK_TEXT_ATTR_STYLE: The slant style of the text, if set. Values are "normal", "oblique" or "italic"
- *@ATK_TEXT_ATTR_LAST_DEFINED: not a valid text attribute, used for finding end of enumeration
- *
- * Describes the text attributes supported
- **/
-typedef enum
-{
-  ATK_TEXT_ATTR_INVALID = 0,
-  ATK_TEXT_ATTR_LEFT_MARGIN,
-  ATK_TEXT_ATTR_RIGHT_MARGIN,
-  ATK_TEXT_ATTR_INDENT,
-  ATK_TEXT_ATTR_INVISIBLE,
-  ATK_TEXT_ATTR_EDITABLE,
-  ATK_TEXT_ATTR_PIXELS_ABOVE_LINES,
-  ATK_TEXT_ATTR_PIXELS_BELOW_LINES,
-  ATK_TEXT_ATTR_PIXELS_INSIDE_WRAP,
-  ATK_TEXT_ATTR_BG_FULL_HEIGHT,
-  ATK_TEXT_ATTR_RISE,
-  ATK_TEXT_ATTR_UNDERLINE,
-  ATK_TEXT_ATTR_STRIKETHROUGH,
-  ATK_TEXT_ATTR_SIZE,
-  ATK_TEXT_ATTR_SCALE,
-  ATK_TEXT_ATTR_WEIGHT,
-  ATK_TEXT_ATTR_LANGUAGE,
-  ATK_TEXT_ATTR_FAMILY_NAME,
-  ATK_TEXT_ATTR_BG_COLOR,
-  ATK_TEXT_ATTR_FG_COLOR,
-  ATK_TEXT_ATTR_BG_STIPPLE,
-  ATK_TEXT_ATTR_FG_STIPPLE,
-  ATK_TEXT_ATTR_WRAP_MODE,
-  ATK_TEXT_ATTR_DIRECTION,
-  ATK_TEXT_ATTR_JUSTIFICATION,
-  ATK_TEXT_ATTR_STRETCH,
-  ATK_TEXT_ATTR_VARIANT,
-  ATK_TEXT_ATTR_STYLE,
-  ATK_TEXT_ATTR_LAST_DEFINED
-} AtkTextAttribute;
-
-AtkTextAttribute         atk_text_attribute_register   (const gchar *name);
-
-
-#define ATK_TYPE_TEXT                    (atk_text_get_type ())
-#define ATK_IS_TEXT(obj)                 G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_TEXT)
-#define ATK_TEXT(obj)                    G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_TEXT, AtkText)
-#define ATK_TEXT_GET_IFACE(obj)          (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_TEXT, AtkTextIface))
-
-#ifndef _TYPEDEF_ATK_TEXT_
-#define _TYPEDEF_ATK_TEXT_
-typedef struct _AtkText AtkText;
-#endif
-typedef struct _AtkTextIface AtkTextIface;
-
-/**
- *AtkTextBoundary:
- *@ATK_TEXT_BOUNDARY_CHAR: Boundary is the boundary between characters 
- * (including non-printing characters)
- *@ATK_TEXT_BOUNDARY_WORD_START: Boundary is the start (i.e. first character) of a word. 
- *@ATK_TEXT_BOUNDARY_WORD_END: Boundary is the end (i.e. last character) of a word.
- *@ATK_TEXT_BOUNDARY_SENTENCE_START: Boundary is the first character in a sentence.
- *@ATK_TEXT_BOUNDARY_SENTENCE_END: Boundary is the last (terminal) character in a sentence; 
- * in languages which use "sentence stop" punctuation such as English, the boundary is thus the
- * '.', '?', or similar terminal punctuation character.
- *@ATK_TEXT_BOUNDARY_LINE_START: Boundary is the initial character of the content or a 
- * character immediately following a newline, linefeed, or return character.
- *@ATK_TEXT_BOUNDARY_LINE_END: Boundary is the linefeed, or return character.
- *
- *Text boundary types used for specifying boundaries for regions of text
- **/
-typedef enum {
-  ATK_TEXT_BOUNDARY_CHAR,
-  ATK_TEXT_BOUNDARY_WORD_START,
-  ATK_TEXT_BOUNDARY_WORD_END,
-  ATK_TEXT_BOUNDARY_SENTENCE_START,
-  ATK_TEXT_BOUNDARY_SENTENCE_END,
-  ATK_TEXT_BOUNDARY_LINE_START,
-  ATK_TEXT_BOUNDARY_LINE_END
-} AtkTextBoundary;
-
-/**
- * AtkTextRectangle:
- * @x: The horizontal coordinate of a rectangle
- * @y: The vertical coordinate of a rectangle
- * @width: The width of a rectangle
- * @height: The height of a rectangle
- *
- * A structure used to store a rectangle used by AtkText.
- **/
-
-typedef struct _AtkTextRectangle AtkTextRectangle;
-
-struct _AtkTextRectangle {
-  gint x;
-  gint y;
-  gint width;
-  gint height;
-};
-
-/**
- * AtkTextRange:
- * @bounds: A rectangle giving the bounds of the text range
- * @start_offset: The start offset of a AtkTextRange
- * @end_offset: The end offset of a AtkTextRange
- * @content: The text in the text range
- *
- * A structure used to describe a text range.
- **/
-typedef struct _AtkTextRange AtkTextRange;
-
-struct _AtkTextRange {
-  AtkTextRectangle bounds;
-  gint start_offset;
-  gint end_offset;
-  gchar* content;
-};
-
-/**
- *AtkTextClipType
- *@ATK_TEXT_CLIP_NONE: No clipping to be done
- *@ATK_TEXT_CLIP_MIN: Text clipped by min coordinate is omitted
- *@ATK_TEXT_CLIP_MAX: Text clipped by max coordinate is omitted
- *@ATK_TEXT_CLIP_BOTH: Only text fully within mix/max bound is retained
- *
- *Describes the type of clipping required.
- **/
-typedef enum {
-    ATK_TEXT_CLIP_NONE,
-    ATK_TEXT_CLIP_MIN,
-    ATK_TEXT_CLIP_MAX,
-    ATK_TEXT_CLIP_BOTH
-} AtkTextClipType;
-
-struct _AtkTextIface
-{
-  GTypeInterface parent;
-
-  gchar*         (* get_text)                     (AtkText          *text,
-                                                   gint             start_offset,
-                                                   gint             end_offset);
-  gchar*         (* get_text_after_offset)        (AtkText          *text,
-                                                   gint             offset,
-                                                   AtkTextBoundary  boundary_type,
-						   gint             *start_offset,
-						   gint             *end_offset);
-  gchar*         (* get_text_at_offset)           (AtkText          *text,
-                                                   gint             offset,
-                                                   AtkTextBoundary  boundary_type,
-						   gint             *start_offset,
-						   gint             *end_offset);
-  gunichar       (* get_character_at_offset)      (AtkText          *text,
-                                                   gint             offset);
-  gchar*         (* get_text_before_offset)       (AtkText          *text,
-                                                   gint             offset,
-                                                   AtkTextBoundary  boundary_type,
- 						   gint             *start_offset,
-						   gint             *end_offset);
-  gint           (* get_caret_offset)             (AtkText          *text);
-  AtkAttributeSet* (* get_run_attributes)         (AtkText	    *text,
-						   gint	  	    offset,
-						   gint             *start_offset,
-						   gint	 	    *end_offset);
-  AtkAttributeSet* (* get_default_attributes)     (AtkText	    *text);
-  void           (* get_character_extents)        (AtkText          *text,
-                                                   gint             offset,
-                                                   gint             *x,
-                                                   gint             *y,
-                                                   gint             *width,
-                                                   gint             *height,
-                                                   AtkCoordType	    coords);
-  gint           (* get_character_count)          (AtkText          *text);
-  gint           (* get_offset_at_point)          (AtkText          *text,
-                                                   gint             x,
-                                                   gint             y,
-                                                   AtkCoordType	    coords);
-  gint		 (* get_n_selections)		  (AtkText          *text);
-  gchar*         (* get_selection)	          (AtkText          *text,
-						   gint		    selection_num,
-						   gint		    *start_offset,
-						   gint		    *end_offset);
-  gboolean       (* add_selection)		  (AtkText          *text,
-						   gint		    start_offset,
-						   gint		    end_offset);
-  gboolean       (* remove_selection)		  (AtkText          *text,
-						   gint             selection_num);
-  gboolean       (* set_selection)		  (AtkText          *text,
-						   gint		    selection_num,
-						   gint		    start_offset,
-						   gint		    end_offset);
-  gboolean       (* set_caret_offset)             (AtkText          *text,
-                                                   gint             offset);
-
-  /*
-   * signal handlers
-   */
-  void		 (* text_changed)                 (AtkText          *text,
-                                                   gint             position,
-                                                   gint             length);
-  void           (* text_caret_moved)             (AtkText          *text,
-                                                   gint             location);
-  void           (* text_selection_changed)       (AtkText          *text);
-
-  void           (* text_attributes_changed)      (AtkText          *text);
-
-
-  void           (* get_range_extents)            (AtkText          *text,
-                                                   gint             start_offset,
-                                                   gint             end_offset,
-                                                   AtkCoordType     coord_type,
-                                                   AtkTextRectangle *rect);
-
-  AtkTextRange** (* get_bounded_ranges)           (AtkText          *text,
-                                                   AtkTextRectangle *rect,
-                                                   AtkCoordType     coord_type,
-                                                   AtkTextClipType  x_clip_type,
-                                                   AtkTextClipType  y_clip_type);
- 
-
-  AtkFunction    pad4;
-};
-
-GType            atk_text_get_type (void);
-
-
-/*
- * Additional AtkObject properties used by AtkText:
- *    "accessible_text" (accessible text has changed)
- *    "accessible_caret" (accessible text cursor position changed:
- *                         editable text only)
- */
-
-gchar*        atk_text_get_text                           (AtkText          *text,
-                                                           gint             start_offset,
-                                                           gint             end_offset);
-gunichar      atk_text_get_character_at_offset            (AtkText          *text,
-                                                           gint             offset);
-gchar*        atk_text_get_text_after_offset              (AtkText          *text,
-                                                           gint             offset,
-                                                           AtkTextBoundary  boundary_type,
-							   gint             *start_offset,
-							   gint	            *end_offset);
-gchar*        atk_text_get_text_at_offset                 (AtkText          *text,
-                                                           gint             offset,
-                                                           AtkTextBoundary  boundary_type,
-							   gint             *start_offset,
-							   gint             *end_offset);
-gchar*        atk_text_get_text_before_offset             (AtkText          *text,
-                                                           gint             offset,
-                                                           AtkTextBoundary  boundary_type,
-							   gint             *start_offset,
-							   gint	            *end_offset);
-gint          atk_text_get_caret_offset                   (AtkText          *text);
-void          atk_text_get_character_extents              (AtkText          *text,
-                                                           gint             offset,
-                                                           gint             *x,
-                                                           gint             *y,
-                                                           gint             *width,
-                                                           gint             *height,
-                                                           AtkCoordType	    coords);
-AtkAttributeSet* atk_text_get_run_attributes              (AtkText	    *text,
-						           gint	  	    offset,
-						           gint             *start_offset,
-						           gint	 	    *end_offset);
-AtkAttributeSet* atk_text_get_default_attributes          (AtkText	    *text);
-gint          atk_text_get_character_count                (AtkText          *text);
-gint          atk_text_get_offset_at_point                (AtkText          *text,
-                                                           gint             x,
-                                                           gint             y,
-                                                           AtkCoordType	    coords);
-gint          atk_text_get_n_selections			  (AtkText          *text);
-gchar*        atk_text_get_selection			  (AtkText          *text,
-							   gint		    selection_num,
-							   gint             *start_offset,
-							   gint             *end_offset);
-gboolean      atk_text_add_selection                      (AtkText          *text,
-							   gint             start_offset,
-							   gint             end_offset);
-gboolean      atk_text_remove_selection                   (AtkText          *text,
-							   gint		    selection_num);
-gboolean      atk_text_set_selection                      (AtkText          *text,
-							   gint		    selection_num,
-							   gint             start_offset,
-							   gint             end_offset);
-gboolean      atk_text_set_caret_offset                   (AtkText          *text,
-                                                           gint             offset);
-void          atk_text_get_range_extents                  (AtkText          *text,
-
-                                                           gint             start_offset,
-                                                           gint             end_offset,
-                                                           AtkCoordType     coord_type,
-                                                           AtkTextRectangle *rect);
-AtkTextRange**  atk_text_get_bounded_ranges               (AtkText          *text,
-                                                           AtkTextRectangle *rect,
-                                                           AtkCoordType     coord_type,
-                                                           AtkTextClipType  x_clip_type,
-                                                           AtkTextClipType  y_clip_type);
-void          atk_text_free_ranges                        (AtkTextRange     **ranges);
-void 	      atk_attribute_set_free                      (AtkAttributeSet  *attrib_set);
-G_CONST_RETURN gchar*  atk_text_attribute_get_name        (AtkTextAttribute attr);
-AtkTextAttribute       atk_text_attribute_for_name        (const gchar      *name);
-G_CONST_RETURN gchar*  atk_text_attribute_get_value       (AtkTextAttribute attr,
-                                                           gint             index_);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __ATK_TEXT_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkutil.h b/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkutil.h
deleted file mode 100644
index e96eb649..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkutil.h
+++ /dev/null
@@ -1,315 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_UTIL_H__
-#define __ATK_UTIL_H__
-
-#include <atk/atkobject.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define ATK_TYPE_UTIL                   (atk_util_get_type ())
-#define ATK_IS_UTIL(obj)                G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_UTIL)
-#define ATK_UTIL(obj)                   G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_UTIL, AtkUtil)
-#define ATK_UTIL_CLASS(klass)                   (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_UTIL, AtkUtilClass))
-#define ATK_IS_UTIL_CLASS(klass)                (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_UTIL))
-#define ATK_UTIL_GET_CLASS(obj)                 (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_UTIL, AtkUtilClass))
-
-
-#ifndef _TYPEDEF_ATK_UTIL_
-#define _TYPEDEF_ATK_UTIL_
-typedef struct _AtkUtil      AtkUtil;
-typedef struct _AtkUtilClass AtkUtilClass;
-typedef struct _AtkKeyEventStruct AtkKeyEventStruct;
-#endif
-
-/**
- * AtkEventListener: 
- * @obj: An #AtkObject instance for whom the callback will be called when
- * the specified event (e.g. 'focus:') takes place.
- *
- * A function which is called when an object emits a matching event,
- * as used in #atk_add_focus_tracker.
- * Currently the only events for which object-specific handlers are
- * supported are events of type "focus:".  Most clients of ATK will prefer to 
- * attach signal handlers for the various ATK signals instead.
- *
- * @see: atk_add_focus_tracker.
- **/
-typedef void  (*AtkEventListener) (AtkObject* obj);
-/**
- * AtkEventListenerInit:
- *
- * An #AtkEventListenerInit function is a special function that is
- * called in order to initialize the per-object event registration system
- * used by #AtkEventListener, if any preparation is required.  
- *
- * @see: atk_focus_tracker_init.
- **/
-typedef void  (*AtkEventListenerInit) (void);
-/**
- * AtkKeySnoopFunc:
- * @event: an AtkKeyEventStruct containing information about the key event for which
- * notification is being given.
- * @func_data: a block of data which will be passed to the event listener, on notification.
- *
- * An #AtkKeySnoopFunc is a type of callback which is called whenever a key event occurs, 
- * if registered via atk_add_key_event_listener.  It allows for pre-emptive 
- * interception of key events via the return code as described below.
- *
- * Returns: TRUE (nonzero) if the event emission should be stopped and the event 
- * discarded without being passed to the normal GUI recipient; FALSE (zero) if the 
- * event dispatch to the client application should proceed as normal.
- *
- * @see: atk_add_key_event_listener.
- **/
-typedef gint  (*AtkKeySnoopFunc)  (AtkKeyEventStruct *event,
-				   gpointer func_data);
-
-/**
- * AtkKeyEventStruct:
- * @type: An AtkKeyEventType, generally one of ATK_KEY_EVENT_PRESS or ATK_KEY_EVENT_RELEASE
- * @state: A bitmask representing the state of the modifier keys immediately after the event takes place.   
- * The meaning of the bits is currently defined to match the bitmask used by GDK in
- * GdkEventType.state, see 
- * http://developer.gnome.org/doc/API/2.0/gdk/gdk-Event-Structures.html#GdkEventKey
- * @keyval: A guint representing a keysym value corresponding to those used by GDK and X11: see
- * /usr/X11/include/keysymdef.h.
- * @length: The length of member #string.
- * @string: A string containing one of the following: either a string approximating the text that would 
- * result from this keypress, if the key is a control or graphic character, or a symbolic name for this keypress.
- * Alphanumeric and printable keys will have the symbolic key name in this string member, for instance "A". "0", 
- * "semicolon", "aacute".  Keypad keys have the prefix "KP".
- * @keycode: The raw hardware code that generated the key event.  This field is raraly useful.
- * @timestamp: A timestamp in milliseconds indicating when the event occurred.  
- * These timestamps are relative to a starting point which should be considered arbitrary, 
- * and only used to compare the dispatch times of events to one another.
- *
- * Encapsulates information about a key event.
- **/
-struct _AtkKeyEventStruct {
-  gint type;
-  guint state;
-  guint keyval;
-  gint length;
-  gchar *string;
-  guint16 keycode;
-  guint32 timestamp;	
-};
-
-/**
- *AtkKeyEventType:
- *@ATK_KEY_EVENT_PRESS: specifies a key press event
- *@ATK_KEY_EVENT_RELEASE: specifies a key release event
- *@ATK_KEY_EVENT_LAST_DEFINED: Not a valid value; specifies end of enumeration
- *
- *Specifies the type of a keyboard evemt.
- **/
-typedef enum
-{
-  ATK_KEY_EVENT_PRESS,
-  ATK_KEY_EVENT_RELEASE,
-  ATK_KEY_EVENT_LAST_DEFINED
-} AtkKeyEventType;
-
-struct _AtkUtil
-{
-  GObject parent;
-};
-
-struct _AtkUtilClass
-{
-   GObjectClass parent;
-   guint        (* add_global_event_listener)    (GSignalEmissionHook listener,
-						  const gchar        *event_type);
-   void         (* remove_global_event_listener) (guint               listener_id);
-   guint	(* add_key_event_listener) 	 (AtkKeySnoopFunc     listener,
-						  gpointer data);
-   void         (* remove_key_event_listener)    (guint               listener_id);
-   AtkObject*   (* get_root)                     (void);
-   G_CONST_RETURN gchar* (* get_toolkit_name)    (void);
-   G_CONST_RETURN gchar* (* get_toolkit_version) (void);
-};
-GType atk_util_get_type (void);
-
-/**
- *AtkCoordType:
- *@ATK_XY_SCREEN: specifies xy coordinates relative to the screen
- *@ATK_XY_WINDOW: specifies xy coordinates relative to the widget's 
- * top-level window
- *
- *Specifies how xy coordinates are to be interpreted. Used by functions such
- *as atk_component_get_position() and atk_text_get_character_extents() 
- **/
-typedef enum {
-  ATK_XY_SCREEN,
-  ATK_XY_WINDOW
-}AtkCoordType;
-
-/*
- * Adds the specified function to the list of functions to be called
- * when an object receives focus.
- */
-guint    atk_add_focus_tracker     (AtkEventListener      focus_tracker);
-
-/*
- * Removes the specified focus tracker from the list of function
- * to be called when any object receives focus
- */
-void     atk_remove_focus_tracker  (guint                tracker_id);
-
-/*
- * atk_focus_tracker_init:
- * @init: An #AtkEventListenerInit function to be called
- * prior to any focus-tracking requests.
- *
- * Specifies the function to be called for focus tracker initialization.
- * removal. This function should be called by an implementation of the
- * ATK interface if any specific work needs to be done to enable
- * focus tracking.
- */
-void     atk_focus_tracker_init    (AtkEventListenerInit  init);
-
-/*
- * Cause the focus tracker functions which have been specified to be
- * executed for the object.
- */
-void     atk_focus_tracker_notify  (AtkObject            *object);
-
-/*
- * Adds the specified function to the list of functions to be called
- * when an event of type event_type occurs.
- */
-guint	atk_add_global_event_listener (GSignalEmissionHook listener,
-				       const gchar        *event_type);
-
-/*
- * Removes the specified event listener
- */
-void	atk_remove_global_event_listener (guint listener_id);
-
-/*
- * Adds the specified function to the list of functions to be called
- * when an keyboard event occurs.
- */
-guint	atk_add_key_event_listener (AtkKeySnoopFunc listener, gpointer data);
-
-/*
- * Removes the specified event listener
- */
-void	atk_remove_key_event_listener (guint listener_id);
-
-/*
- * Returns the root accessible container for the current application.
- */
-AtkObject* atk_get_root(void);
-
-AtkObject* atk_get_focus_object (void);
-
-/*
- * Returns name string for the GUI toolkit.
- */
-G_CONST_RETURN gchar *atk_get_toolkit_name (void);
-
-/*
- * Returns version string for the GUI toolkit.
- */
-G_CONST_RETURN gchar *atk_get_toolkit_version (void);
-
-/*
- * Gets the current version of ATK
- */
-G_CONST_RETURN gchar *atk_get_version (void);
-
-/* --- GType boilerplate --- */
-/* convenience macros for atk type implementations, which for a type GtkGadgetAccessible will:
- * - prototype: static void     gtk_gadget_accessible_class_init (GtkGadgetClass *klass);
- * - prototype: static void     gtk_gadget_accessible_init       (GtkGadget      *self);
- * - define:    static gpointer gtk_gadget_accessible_parent_class = NULL;
- *   gtk_gadget_accessible_parent_class is initialized prior to calling gtk_gadget_class_init()
- * - implement: GType           gtk_gadget_accessible_get_type (void) { ... }
- * - support custom code in gtk_gadget_accessible_get_type() after the type is registered.
- *
- * macro arguments: TypeName, type_name, TYPE_PARENT, CODE
- * example: ATK_DEFINE_TYPE_WITH_CODE (GtkGadgetAccessible, gtk_gadget_accessible, GTK_TYPE_GADGET,
- *                                     G_IMPLEMENT_INTERFACE (ATK_TYPE_TABLE, gtk_gadget_accessible_table_iface_init))
- */
-
-#define ATK_DEFINE_TYPE(TN, t_n, T_P)			       ATK_DEFINE_TYPE_EXTENDED (TN, t_n, T_P, 0, {})
-#define ATK_DEFINE_TYPE_WITH_CODE(TN, t_n, T_P, _C_)	      _ATK_DEFINE_TYPE_EXTENDED_BEGIN (TN, t_n, T_P, 0) {_C_;} _ATK_DEFINE_TYPE_EXTENDED_END()
-#define ATK_DEFINE_ABSTRACT_TYPE(TN, t_n, T_P)		       ATK_DEFINE_TYPE_EXTENDED (TN, t_n, T_P, G_TYPE_FLAG_ABSTRACT, {})
-#define ATK_DEFINE_ABSTRACT_TYPE_WITH_CODE(TN, t_n, T_P, _C_) _ATK_DEFINE_TYPE_EXTENDED_BEGIN (TN, t_n, T_P, G_TYPE_FLAG_ABSTRACT) {_C_;} _ATK_DEFINE_TYPE_EXTENDED_END()
-#define ATK_DEFINE_TYPE_EXTENDED(TN, t_n, T_P, _f_, _C_)      _ATK_DEFINE_TYPE_EXTENDED_BEGIN (TN, t_n, T_P, _f_) {_C_;} _ATK_DEFINE_TYPE_EXTENDED_END()
-
-#define _ATK_DEFINE_TYPE_EXTENDED_BEGIN(TypeName, type_name, TYPE, 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 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); \
-} \
-\
-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))  \
-    { \
-      AtkObjectFactory *factory; \
-      GType derived_type; \
-      GTypeQuery query; \
-      GType derived_atk_type; \
-      GType g_define_type_id; \
-\
-      /* Figure out the size of the class and instance we are deriving from */ \
-      derived_type = g_type_parent (TYPE); \
-      factory = atk_registry_get_factory (atk_get_default_registry (), \
-                                          derived_type); \
-      derived_atk_type = atk_object_factory_get_accessible_type (factory); \
-      g_type_query (derived_atk_type, &query); \
-\
-      g_define_type_id = \
-        g_type_register_static_simple (derived_atk_type, \
-                                       g_intern_static_string (#TypeName), \
-                                       query.class_size, \
-                                       (GClassInitFunc) type_name##_class_intern_init, \
-                                       query.instance_size, \
-                                       (GInstanceInitFunc) type_name##_init, \
-                                       (GTypeFlags) flags); \
-      { /* custom code follows */
-#define _ATK_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() */
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __ATK_UTIL_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkvalue.h b/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkvalue.h
deleted file mode 100644
index f66c0152..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/atk-1.0/atk/atkvalue.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems 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 __ATK_VALUE_H__
-#define __ATK_VALUE_H__
-
-#include <atk/atkobject.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * The AtkValue interface should be supported by any object that 
- * supports a numerical value (e.g., a scroll bar). This interface 
- * provides the standard mechanism for an assistive technology to 
- * determine and set the numerical value as well as get the minimum 
- * and maximum values.
- */
-
-#define ATK_TYPE_VALUE                    (atk_value_get_type ())
-#define ATK_IS_VALUE(obj)                 G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_VALUE)
-#define ATK_VALUE(obj)                    G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_VALUE, AtkValue)
-#define ATK_VALUE_GET_IFACE(obj)          (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_VALUE, AtkValueIface))
-
-#ifndef _TYPEDEF_ATK_VALUE_
-#define _TYPEDEF_ATK_VALUE__
-typedef struct _AtkValue AtkValue;
-#endif
-typedef struct _AtkValueIface AtkValueIface;
-
-struct _AtkValueIface
-{
-  GTypeInterface parent;
-
-  void     (* get_current_value) (AtkValue     *obj,
-                                  GValue       *value);
-  void     (* get_maximum_value) (AtkValue     *obj,
-                                  GValue       *value);
-  void     (* get_minimum_value) (AtkValue     *obj,
-                                  GValue       *value);
-  gboolean (* set_current_value) (AtkValue     *obj,
-                                  const GValue *value);
-  void     (* get_minimum_increment) (AtkValue   *obj,
-				      GValue     *value);
-  AtkFunction pad1;
-};
-
-GType            atk_value_get_type (void);
-
-void      atk_value_get_current_value (AtkValue     *obj,
-                                       GValue       *value);
-
-
-void     atk_value_get_maximum_value  (AtkValue     *obj,
-                                       GValue       *value);
-
-void     atk_value_get_minimum_value  (AtkValue     *obj,
-                                       GValue       *value);
-
-gboolean atk_value_set_current_value  (AtkValue     *obj,
-                                       const GValue *value);
-
-void     atk_value_get_minimum_increment  (AtkValue     *obj,
-					   GValue       *value);
-
-/*
- * Additional GObject properties exported by GaccessibleValue:
- *    "accessible_value"
- *       (the accessible value has changed)
- */
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __ATK_VALUE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/cairo/cairo-deprecated.h b/lib-x86-64/gtk-2.12.12/usr/include/cairo/cairo-deprecated.h
deleted file mode 100644
index c73d2b78..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/cairo/cairo-deprecated.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/* cairo - a vector graphics library with display and print output
- *
- * Copyright © 2006 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it either under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation
- * (the "LGPL") or, at your option, under the terms of the Mozilla
- * Public License Version 1.1 (the "MPL"). If you do not alter this
- * notice, a recipient may use your version of this file under either
- * the MPL or the LGPL.
- *
- * You should have received a copy of the LGPL along with this library
- * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- * You should have received a copy of the MPL along with this library
- * in the file COPYING-MPL-1.1
- *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
- * OF ANY KIND, either express or implied. See the LGPL or the MPL for
- * the specific language governing rights and limitations.
- *
- * The Original Code is the cairo graphics library.
- *
- * The Initial Developer of the Original Code is Red Hat, Inc.
- *
- * Contributor(s):
- *	Carl D. Worth <cworth@cworth.org>
- */
-
-#ifndef CAIRO_DEPRECATED_H
-#define CAIRO_DEPRECATED_H
-
-/* The %CAIRO_FORMAT_RGB16_565 value was added in cairo 1.2.0 as part
- * of fixing cairo's xlib backend to work with X servers advertising a
- * 16-bit, 565 visual. But as it turned out, adding this format to
- * #cairo_format_t was not necessary, and was a mistake, (cairo's xlib
- * backend can work fine with 16-bit visuals in the same way it works
- * with BGR visuals without any BGR formats in
- * #cairo_format_t).
- *
- * Additionally, the support for the RGB16_565 format was never
- * completely implemented. So while this format value is currently
- * deprecated, it may eventually acquire complete support in the future.
- */
-#define CAIRO_FORMAT_RGB16_565 4
-
-#define CAIRO_FONT_TYPE_ATSUI CAIRO_FONT_TYPE_QUARTZ
-
-#ifndef _CAIROINT_H_
-
-/* Obsolete functions. These definitions exist to coerce the compiler
- * into providing a little bit of guidance with its error
- * messages. The idea is to help users port their old code without
- * having to dig through lots of documentation.
- *
- * The first set of REPLACED_BY functions is for functions whose names
- * have just been changed. So fixing these up is mechanical, (and
- * automated by means of the cairo/util/cairo-api-update script.
- *
- * The second set of DEPRECATED_BY functions is for functions where
- * the replacement is used in a different way, (ie. different
- * arguments, multiple functions instead of one, etc). Fixing these up
- * will require a bit more work on the user's part, (and hopefully we
- * can get cairo-api-update to find these and print some guiding
- * information).
- */
-#define cairo_current_font_extents   cairo_current_font_extents_REPLACED_BY_cairo_font_extents
-#define cairo_get_font_extents       cairo_get_font_extents_REPLACED_BY_cairo_font_extents
-#define cairo_current_operator       cairo_current_operator_REPLACED_BY_cairo_get_operator
-#define cairo_current_tolerance	     cairo_current_tolerance_REPLACED_BY_cairo_get_tolerance
-#define cairo_current_point	     cairo_current_point_REPLACED_BY_cairo_get_current_point
-#define cairo_current_fill_rule	     cairo_current_fill_rule_REPLACED_BY_cairo_get_fill_rule
-#define cairo_current_line_width     cairo_current_line_width_REPLACED_BY_cairo_get_line_width
-#define cairo_current_line_cap       cairo_current_line_cap_REPLACED_BY_cairo_get_line_cap
-#define cairo_current_line_join      cairo_current_line_join_REPLACED_BY_cairo_get_line_join
-#define cairo_current_miter_limit    cairo_current_miter_limit_REPLACED_BY_cairo_get_miter_limit
-#define cairo_current_matrix         cairo_current_matrix_REPLACED_BY_cairo_get_matrix
-#define cairo_current_target_surface cairo_current_target_surface_REPLACED_BY_cairo_get_target
-#define cairo_get_status             cairo_get_status_REPLACED_BY_cairo_status
-#define cairo_concat_matrix		 cairo_concat_matrix_REPLACED_BY_cairo_transform
-#define cairo_scale_font                 cairo_scale_font_REPLACED_BY_cairo_set_font_size
-#define cairo_select_font                cairo_select_font_REPLACED_BY_cairo_select_font_face
-#define cairo_transform_font             cairo_transform_font_REPLACED_BY_cairo_set_font_matrix
-#define cairo_transform_point		 cairo_transform_point_REPLACED_BY_cairo_user_to_device
-#define cairo_transform_distance	 cairo_transform_distance_REPLACED_BY_cairo_user_to_device_distance
-#define cairo_inverse_transform_point	 cairo_inverse_transform_point_REPLACED_BY_cairo_device_to_user
-#define cairo_inverse_transform_distance cairo_inverse_transform_distance_REPLACED_BY_cairo_device_to_user_distance
-#define cairo_init_clip			 cairo_init_clip_REPLACED_BY_cairo_reset_clip
-#define cairo_surface_create_for_image	 cairo_surface_create_for_image_REPLACED_BY_cairo_image_surface_create_for_data
-#define cairo_default_matrix		 cairo_default_matrix_REPLACED_BY_cairo_identity_matrix
-#define cairo_matrix_set_affine		 cairo_matrix_set_affine_REPLACED_BY_cairo_matrix_init
-#define cairo_matrix_set_identity	 cairo_matrix_set_identity_REPLACED_BY_cairo_matrix_init_identity
-#define cairo_pattern_add_color_stop	 cairo_pattern_add_color_stop_REPLACED_BY_cairo_pattern_add_color_stop_rgba
-#define cairo_set_rgb_color		 cairo_set_rgb_color_REPLACED_BY_cairo_set_source_rgb
-#define cairo_set_pattern		 cairo_set_pattern_REPLACED_BY_cairo_set_source
-#define cairo_xlib_surface_create_for_pixmap_with_visual	cairo_xlib_surface_create_for_pixmap_with_visual_REPLACED_BY_cairo_xlib_surface_create
-#define cairo_xlib_surface_create_for_window_with_visual	cairo_xlib_surface_create_for_window_with_visual_REPLACED_BY_cairo_xlib_surface_create
-#define cairo_xcb_surface_create_for_pixmap_with_visual	cairo_xcb_surface_create_for_pixmap_with_visual_REPLACED_BY_cairo_xcb_surface_create
-#define cairo_xcb_surface_create_for_window_with_visual	cairo_xcb_surface_create_for_window_with_visual_REPLACED_BY_cairo_xcb_surface_create
-#define cairo_ps_surface_set_dpi	cairo_ps_surface_set_dpi_REPLACED_BY_cairo_surface_set_fallback_resolution
-#define cairo_pdf_surface_set_dpi	cairo_pdf_surface_set_dpi_REPLACED_BY_cairo_surface_set_fallback_resolution
-#define cairo_svg_surface_set_dpi	cairo_svg_surface_set_dpi_REPLACED_BY_cairo_surface_set_fallback_resolution
-#define cairo_atsui_font_face_create_for_atsu_font_id  cairo_atsui_font_face_create_for_atsu_font_id_REPLACED_BY_cairo_quartz_font_face_create_for_atsu_font_id
-
-#define cairo_current_path	     cairo_current_path_DEPRECATED_BY_cairo_copy_path
-#define cairo_current_path_flat	     cairo_current_path_flat_DEPRECATED_BY_cairo_copy_path_flat
-#define cairo_get_path		     cairo_get_path_DEPRECATED_BY_cairo_copy_path
-#define cairo_get_path_flat	     cairo_get_path_flat_DEPRECATED_BY_cairo_get_path_flat
-#define cairo_set_alpha		     cairo_set_alpha_DEPRECATED_BY_cairo_set_source_rgba_OR_cairo_paint_with_alpha
-#define cairo_show_surface	     cairo_show_surface_DEPRECATED_BY_cairo_set_source_surface_AND_cairo_paint
-#define cairo_copy		     cairo_copy_DEPRECATED_BY_cairo_create_AND_MANY_INDIVIDUAL_FUNCTIONS
-#define cairo_surface_set_repeat	cairo_surface_set_repeat_DEPRECATED_BY_cairo_pattern_set_extend
-#define cairo_surface_set_matrix	cairo_surface_set_matrix_DEPRECATED_BY_cairo_pattern_set_matrix
-#define cairo_surface_get_matrix	cairo_surface_get_matrix_DEPRECATED_BY_cairo_pattern_get_matrix
-#define cairo_surface_set_filter	cairo_surface_set_filter_DEPRECATED_BY_cairo_pattern_set_filter
-#define cairo_surface_get_filter	cairo_surface_get_filter_DEPRECATED_BY_cairo_pattern_get_filter
-#define cairo_matrix_create		cairo_matrix_create_DEPRECATED_BY_cairo_matrix_t
-#define cairo_matrix_destroy		cairo_matrix_destroy_DEPRECATED_BY_cairo_matrix_t
-#define cairo_matrix_copy		cairo_matrix_copy_DEPRECATED_BY_cairo_matrix_t
-#define cairo_matrix_get_affine		cairo_matrix_get_affine_DEPRECATED_BY_cairo_matrix_t
-#define cairo_set_target_surface	cairo_set_target_surface_DEPRECATED_BY_cairo_create
-#define cairo_set_target_glitz		cairo_set_target_glitz_DEPRECATED_BY_cairo_glitz_surface_create
-#define cairo_set_target_image		cairo_set_target_image_DEPRECATED_BY_cairo_image_surface_create_for_data
-#define cairo_set_target_pdf		cairo_set_target_pdf_DEPRECATED_BY_cairo_pdf_surface_create
-#define cairo_set_target_png		cairo_set_target_png_DEPRECATED_BY_cairo_surface_write_to_png
-#define cairo_set_target_ps		cairo_set_target_ps_DEPRECATED_BY_cairo_ps_surface_create
-#define cairo_set_target_quartz		cairo_set_target_quartz_DEPRECATED_BY_cairo_quartz_surface_create
-#define cairo_set_target_win32		cairo_set_target_win32_DEPRECATED_BY_cairo_win32_surface_create
-#define cairo_set_target_xcb		cairo_set_target_xcb_DEPRECATED_BY_cairo_xcb_surface_create
-#define cairo_set_target_drawable	cairo_set_target_drawable_DEPRECATED_BY_cairo_xlib_surface_create
-#define cairo_get_status_string		cairo_get_status_string_DEPRECATED_BY_cairo_status_AND_cairo_status_to_string
-#define cairo_status_string		cairo_status_string_DEPRECATED_BY_cairo_status_AND_cairo_status_to_string
-
-#endif
-
-#endif /* CAIRO_DEPRECATED_H */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/cairo/cairo-directfb.h b/lib-x86-64/gtk-2.12.12/usr/include/cairo/cairo-directfb.h
deleted file mode 100644
index 21005e1f..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/cairo/cairo-directfb.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* cairo - a vector graphics library with display and print output
- *
- * Copyright © 2003 University of Southern California
- *
- * This library is free software; you can redistribute it and/or
- * modify it either under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation
- * (the "LGPL") or, at your option, under the terms of the Mozilla
- * Public License Version 1.1 (the "MPL"). If you do not alter this
- * notice, a recipient may use your version of this file under either
- * the MPL or the LGPL.
- *
- * You should have received a copy of the LGPL along with this library
- * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- * You should have received a copy of the MPL along with this library
- * in the file COPYING-MPL-1.1
- *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
- * OF ANY KIND, either express or implied. See the LGPL or the MPL for
- * the specific language governing rights and limitations.
- *
- * The Original Code is the cairo graphics library.
- *
- * The Initial Developer of the Original Code is University of Southern
- * California.
- *
- * Contributor(s):
- *	Carl D. Worth <cworth@isi.edu>
- */
-
-/*
- * Environment variables affecting the backend:
- *
- *  %CAIRO_DIRECTFB_NO_ACCEL (boolean)
- *      if found, disables acceleration at all
- *
- *  %CAIRO_DIRECTFB_ARGB_FONT (boolean)
- *      if found, enables using ARGB fonts instead of A8
- */
-
-#ifndef CAIRO_DIRECTFB_H
-#define CAIRO_DIRECTFB_H
-
-#include <cairo.h>
-
-#ifdef  CAIRO_HAS_DIRECTFB_SURFACE
-
-#include <directfb.h>
-
-CAIRO_BEGIN_DECLS
-
-cairo_public cairo_surface_t *
-cairo_directfb_surface_create (IDirectFB *dfb, IDirectFBSurface *surface);
-
-CAIRO_END_DECLS
-
-#else  /*CAIRO_HAS_DIRECTFB_SURFACE*/
-# error Cairo was not compiled with support for the directfb backend
-#endif /*CAIRO_HAS_DIRECTFB_SURFACE*/
-
-#endif /*CAIRO_DIRECTFB_H*/
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/cairo/cairo-features.h b/lib-x86-64/gtk-2.12.12/usr/include/cairo/cairo-features.h
deleted file mode 100644
index 7bf2ab8b..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/cairo/cairo-features.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Generated by configure.  Do not edit */
-#ifndef CAIRO_FEATURES_H
-#define CAIRO_FEATURES_H
-
-#ifdef  __cplusplus
-# define CAIRO_BEGIN_DECLS  extern "C" {
-# define CAIRO_END_DECLS    }
-#else
-# define CAIRO_BEGIN_DECLS
-# define CAIRO_END_DECLS
-#endif
-
-#ifndef cairo_public
-# define cairo_public
-#endif
-
-#define CAIRO_VERSION_MAJOR 1
-#define CAIRO_VERSION_MINOR 6
-#define CAIRO_VERSION_MICRO 4
-
-#define CAIRO_VERSION_STRING "1.6.4"
-
-#define CAIRO_HAS_SVG_SURFACE 1
-#define CAIRO_HAS_PDF_SURFACE 1
-#define CAIRO_HAS_PS_SURFACE 1
-#define CAIRO_HAS_FT_FONT 1
-#define CAIRO_HAS_DIRECTFB_SURFACE 1
-#define CAIRO_HAS_PNG_FUNCTIONS 1
-#define CAIRO_HAS_XCB_SURFACE 1
-#define CAIRO_HAS_XLIB_XRENDER_SURFACE 1
-#define CAIRO_HAS_XLIB_SURFACE 1
-
-/*#undef CAIRO_HAS_WIN32_FONT */
-/*#undef CAIRO_HAS_WIN32_SURFACE */
-/*#undef CAIRO_HAS_QUARTZ_FONT */
-/*#undef CAIRO_HAS_QUARTZ_SURFACE */
-
-#endif
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/cairo/cairo-ft.h b/lib-x86-64/gtk-2.12.12/usr/include/cairo/cairo-ft.h
deleted file mode 100644
index b59435fe..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/cairo/cairo-ft.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* cairo - a vector graphics library with display and print output
- *
- * Copyright © 2005 Red Hat, Inc
- *
- * This library is free software; you can redistribute it and/or
- * modify it either under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation
- * (the "LGPL") or, at your option, under the terms of the Mozilla
- * Public License Version 1.1 (the "MPL"). If you do not alter this
- * notice, a recipient may use your version of this file under either
- * the MPL or the LGPL.
- *
- * You should have received a copy of the LGPL along with this library
- * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- * You should have received a copy of the MPL along with this library
- * in the file COPYING-MPL-1.1
- *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
- * OF ANY KIND, either express or implied. See the LGPL or the MPL for
- * the specific language governing rights and limitations.
- *
- * The Original Code is the cairo graphics library.
- *
- * The Initial Developer of the Original Code is Red Hat, Inc.
- *
- * Contributor(s):
- *      Graydon Hoare <graydon@redhat.com>
- *	Owen Taylor <otaylor@redhat.com>
- */
-
-#ifndef CAIRO_FT_H
-#define CAIRO_FT_H
-
-#include <cairo.h>
-
-#if CAIRO_HAS_FT_FONT
-
-/* Fontconfig/Freetype platform-specific font interface */
-
-#include <fontconfig/fontconfig.h>
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-CAIRO_BEGIN_DECLS
-
-cairo_public cairo_font_face_t *
-cairo_ft_font_face_create_for_pattern (FcPattern *pattern);
-
-cairo_public void
-cairo_ft_font_options_substitute (const cairo_font_options_t *options,
-				  FcPattern                  *pattern);
-
-cairo_public cairo_font_face_t *
-cairo_ft_font_face_create_for_ft_face (FT_Face         face,
-				       int             load_flags);
-
-cairo_public FT_Face
-cairo_ft_scaled_font_lock_face (cairo_scaled_font_t *scaled_font);
-
-cairo_public void
-cairo_ft_scaled_font_unlock_face (cairo_scaled_font_t *scaled_font);
-
-CAIRO_END_DECLS
-
-#else  /* CAIRO_HAS_FT_FONT */
-# error Cairo was not compiled with support for the freetype font backend
-#endif /* CAIRO_HAS_FT_FONT */
-
-#endif /* CAIRO_FT_H */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/cairo/cairo-pdf.h b/lib-x86-64/gtk-2.12.12/usr/include/cairo/cairo-pdf.h
deleted file mode 100644
index 52a89740..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/cairo/cairo-pdf.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* cairo - a vector graphics library with display and print output
- *
- * Copyright © 2002 University of Southern California
- *
- * This library is free software; you can redistribute it and/or
- * modify it either under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation
- * (the "LGPL") or, at your option, under the terms of the Mozilla
- * Public License Version 1.1 (the "MPL"). If you do not alter this
- * notice, a recipient may use your version of this file under either
- * the MPL or the LGPL.
- *
- * You should have received a copy of the LGPL along with this library
- * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- * You should have received a copy of the MPL along with this library
- * in the file COPYING-MPL-1.1
- *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
- * OF ANY KIND, either express or implied. See the LGPL or the MPL for
- * the specific language governing rights and limitations.
- *
- * The Original Code is the cairo graphics library.
- *
- * The Initial Developer of the Original Code is University of Southern
- * California.
- *
- * Contributor(s):
- *	Carl D. Worth <cworth@cworth.org>
- */
-
-#ifndef CAIRO_PDF_H
-#define CAIRO_PDF_H
-
-#include <cairo.h>
-
-#if CAIRO_HAS_PDF_SURFACE
-
-CAIRO_BEGIN_DECLS
-
-cairo_public cairo_surface_t *
-cairo_pdf_surface_create (const char		*filename,
-			  double		 width_in_points,
-			  double		 height_in_points);
-
-cairo_public cairo_surface_t *
-cairo_pdf_surface_create_for_stream (cairo_write_func_t	write_func,
-				     void	       *closure,
-				     double		width_in_points,
-				     double		height_in_points);
-
-cairo_public void
-cairo_pdf_surface_set_size (cairo_surface_t	*surface,
-			    double		 width_in_points,
-			    double		 height_in_points);
-
-CAIRO_END_DECLS
-
-#else  /* CAIRO_HAS_PDF_SURFACE */
-# error Cairo was not compiled with support for the pdf backend
-#endif /* CAIRO_HAS_PDF_SURFACE */
-
-#endif /* CAIRO_PDF_H */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/cairo/cairo-ps.h b/lib-x86-64/gtk-2.12.12/usr/include/cairo/cairo-ps.h
deleted file mode 100644
index 720b1b76..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/cairo/cairo-ps.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* cairo - a vector graphics library with display and print output
- *
- * Copyright © 2002 University of Southern California
- *
- * This library is free software; you can redistribute it and/or
- * modify it either under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation
- * (the "LGPL") or, at your option, under the terms of the Mozilla
- * Public License Version 1.1 (the "MPL"). If you do not alter this
- * notice, a recipient may use your version of this file under either
- * the MPL or the LGPL.
- *
- * You should have received a copy of the LGPL along with this library
- * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- * You should have received a copy of the MPL along with this library
- * in the file COPYING-MPL-1.1
- *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
- * OF ANY KIND, either express or implied. See the LGPL or the MPL for
- * the specific language governing rights and limitations.
- *
- * The Original Code is the cairo graphics library.
- *
- * The Initial Developer of the Original Code is University of Southern
- * California.
- *
- * Contributor(s):
- *	Carl D. Worth <cworth@cworth.org>
- */
-
-#ifndef CAIRO_PS_H
-#define CAIRO_PS_H
-
-#include <cairo.h>
-
-#if CAIRO_HAS_PS_SURFACE
-
-#include <stdio.h>
-
-CAIRO_BEGIN_DECLS
-
-/* PS-surface functions */
-
-/**
- * cairo_ps_level_t:
- * @CAIRO_PS_LEVEL_2: The language level 2 of the PostScript specification.
- * @CAIRO_PS_LEVEL_3: The language level 3 of the PostScript specification.
- *
- * #cairo_ps_level_t is used to describe the language level of the
- * PostScript Language Reference that a generated PostScript file will
- * conform to.
- */
-typedef enum _cairo_ps_level {
-    CAIRO_PS_LEVEL_2,
-    CAIRO_PS_LEVEL_3
-} cairo_ps_level_t;
-
-cairo_public cairo_surface_t *
-cairo_ps_surface_create (const char		*filename,
-			 double			 width_in_points,
-			 double			 height_in_points);
-
-cairo_public cairo_surface_t *
-cairo_ps_surface_create_for_stream (cairo_write_func_t	write_func,
-				    void	       *closure,
-				    double		width_in_points,
-				    double		height_in_points);
-
-cairo_public void
-cairo_ps_surface_restrict_to_level (cairo_surface_t    *surface,
-                                    cairo_ps_level_t    level);
-
-cairo_public void
-cairo_ps_get_levels (cairo_ps_level_t const  **levels,
-                     int                      *num_levels);
-
-cairo_public const char *
-cairo_ps_level_to_string (cairo_ps_level_t level);
-
-cairo_public void
-cairo_ps_surface_set_eps (cairo_surface_t	*surface,
-			  cairo_bool_t           eps);
-
-cairo_public cairo_bool_t
-cairo_ps_surface_get_eps (cairo_surface_t	*surface);
-
-cairo_public void
-cairo_ps_surface_set_size (cairo_surface_t	*surface,
-			   double		 width_in_points,
-			   double		 height_in_points);
-
-cairo_public void
-cairo_ps_surface_dsc_comment (cairo_surface_t	*surface,
-			      const char	*comment);
-
-cairo_public void
-cairo_ps_surface_dsc_begin_setup (cairo_surface_t *surface);
-
-cairo_public void
-cairo_ps_surface_dsc_begin_page_setup (cairo_surface_t *surface);
-
-CAIRO_END_DECLS
-
-#else  /* CAIRO_HAS_PS_SURFACE */
-# error Cairo was not compiled with support for the ps backend
-#endif /* CAIRO_HAS_PS_SURFACE */
-
-#endif /* CAIRO_PS_H */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/cairo/cairo-svg.h b/lib-x86-64/gtk-2.12.12/usr/include/cairo/cairo-svg.h
deleted file mode 100644
index 5d18c643..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/cairo/cairo-svg.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* cairo - a vector graphics library with display and print output
- *
- * cairo-svg.h
- *
- * Copyright © 2005 Emmanuel Pacaud <emmanuel.pacaud@univ-poitiers.fr>
- *
- * This library is free software; you can redistribute it and/or
- * modify it either under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation
- * (the "LGPL") or, at your option, under the terms of the Mozilla
- * Public License Version 1.1 (the "MPL"). If you do not alter this
- * notice, a recipient may use your version of this file under either
- * the MPL or the LGPL.
- *
- * You should have received a copy of the LGPL along with this library
- * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- * You should have received a copy of the MPL along with this library
- * in the file COPYING-MPL-1.1
- *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
- * OF ANY KIND, either express or implied. See the LGPL or the MPL for
- * the specific language governing rights and limitations.
- *
- */
-
-#ifndef CAIRO_SVG_H
-#define CAIRO_SVG_H
-
-#include <cairo.h>
-
-#if CAIRO_HAS_SVG_SURFACE
-
-CAIRO_BEGIN_DECLS
-
-/**
- * cairo_svg_version_t:
- * @CAIRO_SVG_VERSION_1_1: The version 1.1 of the SVG specification.
- * @CAIRO_SVG_VERSION_1_2: The version 1.2 of the SVG specification.
- *
- * #cairo_svg_version_t is used to describe the version number of the SVG
- * specification that a generated SVG file will conform to.
- */
-typedef enum _cairo_svg_version {
-    CAIRO_SVG_VERSION_1_1,
-    CAIRO_SVG_VERSION_1_2
-} cairo_svg_version_t;
-
-cairo_public cairo_surface_t *
-cairo_svg_surface_create (const char   *filename,
-			  double	width_in_points,
-			  double	height_in_points);
-
-cairo_public cairo_surface_t *
-cairo_svg_surface_create_for_stream (cairo_write_func_t	write_func,
-				     void	       *closure,
-				     double		width_in_points,
-				     double		height_in_points);
-
-cairo_public void
-cairo_svg_surface_restrict_to_version (cairo_surface_t 		*surface,
-				       cairo_svg_version_t  	 version);
-
-cairo_public void
-cairo_svg_get_versions (cairo_svg_version_t const	**versions,
-                        int                      	 *num_versions);
-
-cairo_public const char *
-cairo_svg_version_to_string (cairo_svg_version_t version);
-
-CAIRO_END_DECLS
-
-#else  /* CAIRO_HAS_SVG_SURFACE */
-# error Cairo was not compiled with support for the svg backend
-#endif /* CAIRO_HAS_SVG_SURFACE */
-
-#endif /* CAIRO_SVG_H */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/cairo/cairo-xcb-xrender.h b/lib-x86-64/gtk-2.12.12/usr/include/cairo/cairo-xcb-xrender.h
deleted file mode 100644
index 9df68567..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/cairo/cairo-xcb-xrender.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* cairo - a vector graphics library with display and print output
- *
- * Copyright © 2002 University of Southern California
- *
- * This library is free software; you can redistribute it and/or
- * modify it either under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation
- * (the "LGPL") or, at your option, under the terms of the Mozilla
- * Public License Version 1.1 (the "MPL"). If you do not alter this
- * notice, a recipient may use your version of this file under either
- * the MPL or the LGPL.
- *
- * You should have received a copy of the LGPL along with this library
- * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- * You should have received a copy of the MPL along with this library
- * in the file COPYING-MPL-1.1
- *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
- * OF ANY KIND, either express or implied. See the LGPL or the MPL for
- * the specific language governing rights and limitations.
- *
- * The Original Code is the cairo graphics library.
- *
- * The Initial Developer of the Original Code is University of Southern
- * California.
- *
- * Contributor(s):
- *	Carl D. Worth <cworth@cworth.org>
- */
-
-#ifndef CAIRO_XCB_XRENDER_H
-#define CAIRO_XCB_XRENDER_H
-
-#include <cairo.h>
-
-#if CAIRO_HAS_XCB_SURFACE
-
-#include <xcb/xcb.h>
-#include <xcb/render.h>
-
-CAIRO_BEGIN_DECLS
-
-cairo_public cairo_surface_t *
-cairo_xcb_surface_create_with_xrender_format (xcb_connection_t	    *c,
-					      xcb_drawable_t	     drawable,
-					      xcb_screen_t		    *screen,
-					      xcb_render_pictforminfo_t *format,
-					      int		     width,
-					      int		     height);
-
-CAIRO_END_DECLS
-
-#else  /* CAIRO_HAS_XCB_SURFACE */
-# error Cairo was not compiled with support for the xcb backend
-#endif /* CAIRO_HAS_XCB_SURFACE */
-
-#endif /* CAIRO_XCB_XRENDER_H */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/cairo/cairo-xcb.h b/lib-x86-64/gtk-2.12.12/usr/include/cairo/cairo-xcb.h
deleted file mode 100644
index e180bb6a..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/cairo/cairo-xcb.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* cairo - a vector graphics library with display and print output
- *
- * Copyright © 2002 University of Southern California
- *
- * This library is free software; you can redistribute it and/or
- * modify it either under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation
- * (the "LGPL") or, at your option, under the terms of the Mozilla
- * Public License Version 1.1 (the "MPL"). If you do not alter this
- * notice, a recipient may use your version of this file under either
- * the MPL or the LGPL.
- *
- * You should have received a copy of the LGPL along with this library
- * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- * You should have received a copy of the MPL along with this library
- * in the file COPYING-MPL-1.1
- *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
- * OF ANY KIND, either express or implied. See the LGPL or the MPL for
- * the specific language governing rights and limitations.
- *
- * The Original Code is the cairo graphics library.
- *
- * The Initial Developer of the Original Code is University of Southern
- * California.
- *
- * Contributor(s):
- *	Carl D. Worth <cworth@cworth.org>
- */
-
-#ifndef CAIRO_XCB_H
-#define CAIRO_XCB_H
-
-#include <cairo.h>
-
-#if CAIRO_HAS_XCB_SURFACE
-
-#include <xcb/xcb.h>
-
-CAIRO_BEGIN_DECLS
-
-cairo_public cairo_surface_t *
-cairo_xcb_surface_create (xcb_connection_t *c,
-			  xcb_drawable_t	 drawable,
-			  xcb_visualtype_t *visual,
-			  int		 width,
-			  int		 height);
-
-cairo_public cairo_surface_t *
-cairo_xcb_surface_create_for_bitmap (xcb_connection_t *c,
-				     xcb_pixmap_t	    bitmap,
-				     xcb_screen_t	   *screen,
-				     int	    width,
-				     int	    height);
-
-cairo_public void
-cairo_xcb_surface_set_size (cairo_surface_t *surface,
-			    int		     width,
-			    int		     height);
-
-CAIRO_END_DECLS
-
-#else  /* CAIRO_HAS_XCB_SURFACE */
-# error Cairo was not compiled with support for the xcb backend
-#endif /* CAIRO_HAS_XCB_SURFACE */
-
-#endif /* CAIRO_XCB_H */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/cairo/cairo-xlib-xrender.h b/lib-x86-64/gtk-2.12.12/usr/include/cairo/cairo-xlib-xrender.h
deleted file mode 100644
index 6dd584fc..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/cairo/cairo-xlib-xrender.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* cairo - a vector graphics library with display and print output
- *
- * Copyright © 2002 University of Southern California
- *
- * This library is free software; you can redistribute it and/or
- * modify it either under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation
- * (the "LGPL") or, at your option, under the terms of the Mozilla
- * Public License Version 1.1 (the "MPL"). If you do not alter this
- * notice, a recipient may use your version of this file under either
- * the MPL or the LGPL.
- *
- * You should have received a copy of the LGPL along with this library
- * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- * You should have received a copy of the MPL along with this library
- * in the file COPYING-MPL-1.1
- *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
- * OF ANY KIND, either express or implied. See the LGPL or the MPL for
- * the specific language governing rights and limitations.
- *
- * The Original Code is the cairo graphics library.
- *
- * The Initial Developer of the Original Code is University of Southern
- * California.
- *
- * Contributor(s):
- *	Carl D. Worth <cworth@cworth.org>
- */
-
-#ifndef CAIRO_XLIB_XRENDER_H
-#define CAIRO_XLIB_XRENDER_H
-
-#include <cairo.h>
-
-#if CAIRO_HAS_XLIB_XRENDER_SURFACE
-
-#include <X11/Xlib.h>
-#include <X11/extensions/Xrender.h>
-
-CAIRO_BEGIN_DECLS
-
-cairo_public cairo_surface_t *
-cairo_xlib_surface_create_with_xrender_format (Display		 *dpy,
-                                               Drawable		  drawable,
-					       Screen		 *screen,
-                                               XRenderPictFormat *format,
-                                               int		  width,
-                                               int		  height);
-
-cairo_public XRenderPictFormat *
-cairo_xlib_surface_get_xrender_format (cairo_surface_t *surface);
-
-CAIRO_END_DECLS
-
-#else  /* CAIRO_HAS_XLIB_XRENDER_SURFACE */
-# error Cairo was not compiled with support for the xlib XRender backend
-#endif /* CAIRO_HAS_XLIB_XRENDER_SURFACE */
-
-#endif /* CAIRO_XLIB_XRENDER_H */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/cairo/cairo-xlib.h b/lib-x86-64/gtk-2.12.12/usr/include/cairo/cairo-xlib.h
deleted file mode 100644
index ad92b39e..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/cairo/cairo-xlib.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* cairo - a vector graphics library with display and print output
- *
- * Copyright © 2002 University of Southern California
- *
- * This library is free software; you can redistribute it and/or
- * modify it either under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation
- * (the "LGPL") or, at your option, under the terms of the Mozilla
- * Public License Version 1.1 (the "MPL"). If you do not alter this
- * notice, a recipient may use your version of this file under either
- * the MPL or the LGPL.
- *
- * You should have received a copy of the LGPL along with this library
- * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- * You should have received a copy of the MPL along with this library
- * in the file COPYING-MPL-1.1
- *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
- * OF ANY KIND, either express or implied. See the LGPL or the MPL for
- * the specific language governing rights and limitations.
- *
- * The Original Code is the cairo graphics library.
- *
- * The Initial Developer of the Original Code is University of Southern
- * California.
- *
- * Contributor(s):
- *	Carl D. Worth <cworth@cworth.org>
- */
-
-#ifndef CAIRO_XLIB_H
-#define CAIRO_XLIB_H
-
-#include <cairo.h>
-
-#if CAIRO_HAS_XLIB_SURFACE
-
-#include <X11/Xlib.h>
-
-CAIRO_BEGIN_DECLS
-
-cairo_public cairo_surface_t *
-cairo_xlib_surface_create (Display     *dpy,
-			   Drawable	drawable,
-			   Visual      *visual,
-			   int		width,
-			   int		height);
-
-cairo_public cairo_surface_t *
-cairo_xlib_surface_create_for_bitmap (Display  *dpy,
-				      Pixmap	bitmap,
-				      Screen	*screen,
-				      int	width,
-				      int	height);
-
-cairo_public void
-cairo_xlib_surface_set_size (cairo_surface_t *surface,
-			     int              width,
-			     int              height);
-
-cairo_public void
-cairo_xlib_surface_set_drawable (cairo_surface_t *surface,
-				 Drawable	  drawable,
-				 int              width,
-				 int              height);
-
-cairo_public Display *
-cairo_xlib_surface_get_display (cairo_surface_t *surface);
-
-cairo_public Drawable
-cairo_xlib_surface_get_drawable (cairo_surface_t *surface);
-
-cairo_public Screen *
-cairo_xlib_surface_get_screen (cairo_surface_t *surface);
-
-cairo_public Visual *
-cairo_xlib_surface_get_visual (cairo_surface_t *surface);
-
-cairo_public int
-cairo_xlib_surface_get_depth (cairo_surface_t *surface);
-
-cairo_public int
-cairo_xlib_surface_get_width (cairo_surface_t *surface);
-
-cairo_public int
-cairo_xlib_surface_get_height (cairo_surface_t *surface);
-
-CAIRO_END_DECLS
-
-#else  /* CAIRO_HAS_XLIB_SURFACE */
-# error Cairo was not compiled with support for the xlib backend
-#endif /* CAIRO_HAS_XLIB_SURFACE */
-
-#endif /* CAIRO_XLIB_H */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/cairo/cairo.h b/lib-x86-64/gtk-2.12.12/usr/include/cairo/cairo.h
deleted file mode 100644
index 4a3a773d..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/cairo/cairo.h
+++ /dev/null
@@ -1,1945 +0,0 @@
-/* cairo - a vector graphics library with display and print output
- *
- * Copyright © 2002 University of Southern California
- * Copyright © 2005 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it either under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation
- * (the "LGPL") or, at your option, under the terms of the Mozilla
- * Public License Version 1.1 (the "MPL"). If you do not alter this
- * notice, a recipient may use your version of this file under either
- * the MPL or the LGPL.
- *
- * You should have received a copy of the LGPL along with this library
- * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- * You should have received a copy of the MPL along with this library
- * in the file COPYING-MPL-1.1
- *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
- * OF ANY KIND, either express or implied. See the LGPL or the MPL for
- * the specific language governing rights and limitations.
- *
- * The Original Code is the cairo graphics library.
- *
- * The Initial Developer of the Original Code is University of Southern
- * California.
- *
- * Contributor(s):
- *	Carl D. Worth <cworth@cworth.org>
- */
-
-#ifndef CAIRO_H
-#define CAIRO_H
-
-#include <cairo-features.h>
-#include <cairo-deprecated.h>
-
-CAIRO_BEGIN_DECLS
-
-#define CAIRO_VERSION_ENCODE(major, minor, micro) (     \
-	  ((major) * 10000)                             \
-	+ ((minor) *   100)                             \
-	+ ((micro) *     1))
-
-#define CAIRO_VERSION CAIRO_VERSION_ENCODE(     \
-	CAIRO_VERSION_MAJOR,                    \
-	CAIRO_VERSION_MINOR,                    \
-	CAIRO_VERSION_MICRO)
-
-cairo_public int
-cairo_version (void);
-
-cairo_public const char*
-cairo_version_string (void);
-
-/**
- * cairo_bool_t:
- *
- * #cairo_bool_t is used for boolean values. Returns of type
- * #cairo_bool_t will always be either 0 or 1, but testing against
- * these values explicitly is not encouraged; just use the
- * value as a boolean condition.
- *
- * <informalexample><programlisting>
- *  if (cairo_in_stroke (cr, x, y)) {
- *      /<!-- -->* do something *<!-- -->/
- *  }
- * </programlisting></informalexample>
- **/
-typedef int cairo_bool_t;
-
-/**
- * cairo_t:
- *
- * A #cairo_t contains the current state of the rendering device,
- * including coordinates of yet to be drawn shapes.
- *
- * Cairo contexts, as #cairo_t objects are named, are central to
- * cairo and all drawing with cairo is always done to a #cairo_t
- * object.
- *
- * Memory management of #cairo_t is done with
- * cairo_reference() and cairo_destroy().
- **/
-typedef struct _cairo cairo_t;
-
-/**
- * cairo_surface_t:
- *
- * A #cairo_surface_t represents an image, either as the destination
- * of a drawing operation or as source when drawing onto another
- * surface.  To draw to a #cairo_surface_t, create a cairo context
- * with the surface as the target, using cairo_create().
- *
- * There are different subtypes of #cairo_surface_t for
- * different drawing backends; for example, cairo_image_surface_create()
- * creates a bitmap image in memory.
- * The type of a surface can be queried with cairo_surface_get_type().
- *
- * Memory management of #cairo_surface_t is done with
- * cairo_surface_reference() and cairo_surface_destroy().
- **/
-typedef struct _cairo_surface cairo_surface_t;
-
-/**
- * cairo_matrix_t:
- * @xx: xx component of the affine transformation
- * @yx: yx component of the affine transformation
- * @xy: xy component of the affine transformation
- * @yy: yy component of the affine transformation
- * @x0: X translation component of the affine transformation
- * @y0: Y translation component of the affine transformation
- *
- * A #cairo_matrix_t holds an affine transformation, such as a scale,
- * rotation, shear, or a combination of those. The transformation of
- * a point (x, y) is given by:
- * <programlisting>
- *     x_new = xx * x + xy * y + x0;
- *     y_new = yx * x + yy * y + y0;
- * </programlisting>
- **/
-typedef struct _cairo_matrix {
-    double xx; double yx;
-    double xy; double yy;
-    double x0; double y0;
-} cairo_matrix_t;
-
-/**
- * cairo_pattern_t:
- *
- * A #cairo_pattern_t represents a source when drawing onto a
- * surface. There are different subtypes of #cairo_pattern_t,
- * for different types of sources; for example,
- * cairo_pattern_create_rgb() creates a pattern for a solid
- * opaque color.
- *
- * Other than various cairo_pattern_create_<emphasis>type</emphasis>()
- * functions, some of the pattern types can be implicitly created
- * using various cairo_set_source_<emphasis>type</emphasis>() functions;
- * for example cairo_set_source_rgb().
- *
- * The type of a pattern can be queried with cairo_pattern_get_type().
- *
- * Memory management of #cairo_pattern_t is done with
- * cairo_pattern_reference() and cairo_pattern_destroy().
- **/
-typedef struct _cairo_pattern cairo_pattern_t;
-
-/**
- * cairo_destroy_func_t:
- * @data: The data element being destroyed.
- *
- * #cairo_destroy_func_t the type of function which is called when a
- * data element is destroyed. It is passed the pointer to the data
- * element and should free any memory and resources allocated for it.
- **/
-typedef void (*cairo_destroy_func_t) (void *data);
-
-/**
- * cairo_user_data_key_t:
- * @unused: not used; ignore.
- *
- * #cairo_user_data_key_t is used for attaching user data to cairo
- * data structures.  The actual contents of the struct is never used,
- * and there is no need to initialize the object; only the unique
- * address of a #cairo_data_key_t object is used.  Typically, you
- * would just use the address of a static #cairo_data_key_t object.
- **/
-typedef struct _cairo_user_data_key {
-    int unused;
-} cairo_user_data_key_t;
-
-/**
- * cairo_status_t:
- * @CAIRO_STATUS_SUCCESS: no error has occurred
- * @CAIRO_STATUS_NO_MEMORY: out of memory
- * @CAIRO_STATUS_INVALID_RESTORE: cairo_restore() called without matching cairo_save()
- * @CAIRO_STATUS_INVALID_POP_GROUP: no saved group to pop
- * @CAIRO_STATUS_NO_CURRENT_POINT: no current point defined
- * @CAIRO_STATUS_INVALID_MATRIX: invalid matrix (not invertible)
- * @CAIRO_STATUS_INVALID_STATUS: invalid value for an input #cairo_status_t
- * @CAIRO_STATUS_NULL_POINTER: %NULL pointer
- * @CAIRO_STATUS_INVALID_STRING: input string not valid UTF-8
- * @CAIRO_STATUS_INVALID_PATH_DATA: input path data not valid
- * @CAIRO_STATUS_READ_ERROR: error while reading from input stream
- * @CAIRO_STATUS_WRITE_ERROR: error while writing to output stream
- * @CAIRO_STATUS_SURFACE_FINISHED: target surface has been finished
- * @CAIRO_STATUS_SURFACE_TYPE_MISMATCH: the surface type is not appropriate for the operation
- * @CAIRO_STATUS_PATTERN_TYPE_MISMATCH: the pattern type is not appropriate for the operation
- * @CAIRO_STATUS_INVALID_CONTENT: invalid value for an input #cairo_content_t
- * @CAIRO_STATUS_INVALID_FORMAT: invalid value for an input #cairo_format_t
- * @CAIRO_STATUS_INVALID_VISUAL: invalid value for an input Visual*
- * @CAIRO_STATUS_FILE_NOT_FOUND: file not found
- * @CAIRO_STATUS_INVALID_DASH: invalid value for a dash setting
- * @CAIRO_STATUS_INVALID_DSC_COMMENT: invalid value for a DSC comment (Since 1.2)
- * @CAIRO_STATUS_INVALID_INDEX: invalid index passed to getter (Since 1.4)
- * @CAIRO_STATUS_CLIP_NOT_REPRESENTABLE: clip region not representable in desired format (Since 1.4)
- * @CAIRO_STATUS_TEMP_FILE_ERROR: error creating or writing to a temporary file (Since 1.6)
- * @CAIRO_STATUS_INVALID_STRIDE: invalid value for stride (Since 1.6)
- *
- * #cairo_status_t is used to indicate errors that can occur when
- * using Cairo. In some cases it is returned directly by functions.
- * but when using #cairo_t, the last error, if any, is stored in
- * the context and can be retrieved with cairo_status().
- *
- * New entries may be added in future versions.  Use cairo_status_to_string()
- * to get a human-readable representation of an error message.
- **/
-typedef enum _cairo_status {
-    CAIRO_STATUS_SUCCESS = 0,
-    CAIRO_STATUS_NO_MEMORY,
-    CAIRO_STATUS_INVALID_RESTORE,
-    CAIRO_STATUS_INVALID_POP_GROUP,
-    CAIRO_STATUS_NO_CURRENT_POINT,
-    CAIRO_STATUS_INVALID_MATRIX,
-    CAIRO_STATUS_INVALID_STATUS,
-    CAIRO_STATUS_NULL_POINTER,
-    CAIRO_STATUS_INVALID_STRING,
-    CAIRO_STATUS_INVALID_PATH_DATA,
-    CAIRO_STATUS_READ_ERROR,
-    CAIRO_STATUS_WRITE_ERROR,
-    CAIRO_STATUS_SURFACE_FINISHED,
-    CAIRO_STATUS_SURFACE_TYPE_MISMATCH,
-    CAIRO_STATUS_PATTERN_TYPE_MISMATCH,
-    CAIRO_STATUS_INVALID_CONTENT,
-    CAIRO_STATUS_INVALID_FORMAT,
-    CAIRO_STATUS_INVALID_VISUAL,
-    CAIRO_STATUS_FILE_NOT_FOUND,
-    CAIRO_STATUS_INVALID_DASH,
-    CAIRO_STATUS_INVALID_DSC_COMMENT,
-    CAIRO_STATUS_INVALID_INDEX,
-    CAIRO_STATUS_CLIP_NOT_REPRESENTABLE,
-    CAIRO_STATUS_TEMP_FILE_ERROR,
-    CAIRO_STATUS_INVALID_STRIDE
-    /* after adding a new error: update CAIRO_STATUS_LAST_STATUS in cairoint.h */
-} cairo_status_t;
-
-/**
- * cairo_content_t:
- * @CAIRO_CONTENT_COLOR: The surface will hold color content only.
- * @CAIRO_CONTENT_ALPHA: The surface will hold alpha content only.
- * @CAIRO_CONTENT_COLOR_ALPHA: The surface will hold color and alpha content.
- *
- * #cairo_content_t is used to describe the content that a surface will
- * contain, whether color information, alpha information (translucence
- * vs. opacity), or both.
- *
- * Note: The large values here are designed to keep #cairo_content_t
- * values distinct from #cairo_format_t values so that the
- * implementation can detect the error if users confuse the two types.
- **/
-typedef enum _cairo_content {
-    CAIRO_CONTENT_COLOR		= 0x1000,
-    CAIRO_CONTENT_ALPHA		= 0x2000,
-    CAIRO_CONTENT_COLOR_ALPHA	= 0x3000
-} cairo_content_t;
-
-/**
- * cairo_write_func_t:
- * @closure: the output closure
- * @data: the buffer containing the data to write
- * @length: the amount of data to write
- *
- * #cairo_write_func_t is the type of function which is called when a
- * backend needs to write data to an output stream.  It is passed the
- * closure which was specified by the user at the time the write
- * function was registered, the data to write and the length of the
- * data in bytes.  The write function should return
- * CAIRO_STATUS_SUCCESS if all the data was successfully written,
- * CAIRO_STATUS_WRITE_ERROR otherwise.
- *
- * Returns: the status code of the write operation
- **/
-typedef cairo_status_t (*cairo_write_func_t) (void		  *closure,
-					      const unsigned char *data,
-					      unsigned int	   length);
-
-/**
- * cairo_read_func_t:
- * @closure: the input closure
- * @data: the buffer into which to read the data
- * @length: the amount of data to read
- *
- * #cairo_read_func_t is the type of function which is called when a
- * backend needs to read data from an input stream.  It is passed the
- * closure which was specified by the user at the time the read
- * function was registered, the buffer to read the data into and the
- * length of the data in bytes.  The read function should return
- * CAIRO_STATUS_SUCCESS if all the data was successfully read,
- * CAIRO_STATUS_READ_ERROR otherwise.
- *
- * Returns: the status code of the read operation
- **/
-typedef cairo_status_t (*cairo_read_func_t) (void		*closure,
-					     unsigned char	*data,
-					     unsigned int	length);
-
-/* Functions for manipulating state objects */
-cairo_public cairo_t *
-cairo_create (cairo_surface_t *target);
-
-cairo_public cairo_t *
-cairo_reference (cairo_t *cr);
-
-cairo_public void
-cairo_destroy (cairo_t *cr);
-
-cairo_public unsigned int
-cairo_get_reference_count (cairo_t *cr);
-
-cairo_public void *
-cairo_get_user_data (cairo_t			 *cr,
-		     const cairo_user_data_key_t *key);
-
-cairo_public cairo_status_t
-cairo_set_user_data (cairo_t			 *cr,
-		     const cairo_user_data_key_t *key,
-		     void			 *user_data,
-		     cairo_destroy_func_t	  destroy);
-
-cairo_public void
-cairo_save (cairo_t *cr);
-
-cairo_public void
-cairo_restore (cairo_t *cr);
-
-cairo_public void
-cairo_push_group (cairo_t *cr);
-
-cairo_public void
-cairo_push_group_with_content (cairo_t *cr, cairo_content_t content);
-
-cairo_public cairo_pattern_t *
-cairo_pop_group (cairo_t *cr);
-
-cairo_public void
-cairo_pop_group_to_source (cairo_t *cr);
-
-/* Modify state */
-
-/**
- * cairo_operator_t:
- * @CAIRO_OPERATOR_CLEAR: clear destination layer (bounded)
- * @CAIRO_OPERATOR_SOURCE: replace destination layer (bounded)
- * @CAIRO_OPERATOR_OVER: draw source layer on top of destination layer
- * (bounded)
- * @CAIRO_OPERATOR_IN: draw source where there was destination content
- * (unbounded)
- * @CAIRO_OPERATOR_OUT: draw source where there was no destination
- * content (unbounded)
- * @CAIRO_OPERATOR_ATOP: draw source on top of destination content and
- * only there
- * @CAIRO_OPERATOR_DEST: ignore the source
- * @CAIRO_OPERATOR_DEST_OVER: draw destination on top of source
- * @CAIRO_OPERATOR_DEST_IN: leave destination only where there was
- * source content (unbounded)
- * @CAIRO_OPERATOR_DEST_OUT: leave destination only where there was no
- * source content
- * @CAIRO_OPERATOR_DEST_ATOP: leave destination on top of source content
- * and only there (unbounded)
- * @CAIRO_OPERATOR_XOR: source and destination are shown where there is only
- * one of them
- * @CAIRO_OPERATOR_ADD: source and destination layers are accumulated
- * @CAIRO_OPERATOR_SATURATE: like over, but assuming source and dest are
- * disjoint geometries
- *
- * #cairo_operator_t is used to set the compositing operator for all cairo
- * drawing operations.
- *
- * The default operator is %CAIRO_OPERATOR_OVER.
- *
- * The operators marked as <firstterm>unbounded</firstterm> modify their
- * destination even outside of the mask layer (that is, their effect is not
- * bound by the mask layer).  However, their effect can still be limited by
- * way of clipping.
- *
- * To keep things simple, the operator descriptions here
- * document the behavior for when both source and destination are either fully
- * transparent or fully opaque.  The actual implementation works for
- * translucent layers too.
- * For a more detailed explanation of the effects of each operator, including
- * the mathematical definitions, see
- * <ulink url="http://cairographics.org/operators/">http://cairographics.org/operators/</ulink>.
- **/
-typedef enum _cairo_operator {
-    CAIRO_OPERATOR_CLEAR,
-
-    CAIRO_OPERATOR_SOURCE,
-    CAIRO_OPERATOR_OVER,
-    CAIRO_OPERATOR_IN,
-    CAIRO_OPERATOR_OUT,
-    CAIRO_OPERATOR_ATOP,
-
-    CAIRO_OPERATOR_DEST,
-    CAIRO_OPERATOR_DEST_OVER,
-    CAIRO_OPERATOR_DEST_IN,
-    CAIRO_OPERATOR_DEST_OUT,
-    CAIRO_OPERATOR_DEST_ATOP,
-
-    CAIRO_OPERATOR_XOR,
-    CAIRO_OPERATOR_ADD,
-    CAIRO_OPERATOR_SATURATE
-} cairo_operator_t;
-
-cairo_public void
-cairo_set_operator (cairo_t *cr, cairo_operator_t op);
-
-cairo_public void
-cairo_set_source (cairo_t *cr, cairo_pattern_t *source);
-
-cairo_public void
-cairo_set_source_rgb (cairo_t *cr, double red, double green, double blue);
-
-cairo_public void
-cairo_set_source_rgba (cairo_t *cr,
-		       double red, double green, double blue,
-		       double alpha);
-
-cairo_public void
-cairo_set_source_surface (cairo_t	  *cr,
-			  cairo_surface_t *surface,
-			  double	   x,
-			  double	   y);
-
-cairo_public void
-cairo_set_tolerance (cairo_t *cr, double tolerance);
-
-/**
- * cairo_antialias_t:
- * @CAIRO_ANTIALIAS_DEFAULT: Use the default antialiasing for
- *   the subsystem and target device
- * @CAIRO_ANTIALIAS_NONE: Use a bilevel alpha mask
- * @CAIRO_ANTIALIAS_GRAY: Perform single-color antialiasing (using
- *  shades of gray for black text on a white background, for example).
- * @CAIRO_ANTIALIAS_SUBPIXEL: Perform antialiasing by taking
- *  advantage of the order of subpixel elements on devices
- *  such as LCD panels
- *
- * Specifies the type of antialiasing to do when rendering text or shapes.
- **/
-typedef enum _cairo_antialias {
-    CAIRO_ANTIALIAS_DEFAULT,
-    CAIRO_ANTIALIAS_NONE,
-    CAIRO_ANTIALIAS_GRAY,
-    CAIRO_ANTIALIAS_SUBPIXEL
-} cairo_antialias_t;
-
-cairo_public void
-cairo_set_antialias (cairo_t *cr, cairo_antialias_t antialias);
-
-/**
- * cairo_fill_rule_t:
- * @CAIRO_FILL_RULE_WINDING: If the path crosses the ray from
- * left-to-right, counts +1. If the path crosses the ray
- * from right to left, counts -1. (Left and right are determined
- * from the perspective of looking along the ray from the starting
- * point.) If the total count is non-zero, the point will be filled.
- * @CAIRO_FILL_RULE_EVEN_ODD: Counts the total number of
- * intersections, without regard to the orientation of the contour. If
- * the total number of intersections is odd, the point will be
- * filled.
- *
- * #cairo_fill_rule_t is used to select how paths are filled. For both
- * fill rules, whether or not a point is included in the fill is
- * determined by taking a ray from that point to infinity and looking
- * at intersections with the path. The ray can be in any direction,
- * as long as it doesn't pass through the end point of a segment
- * or have a tricky intersection such as intersecting tangent to the path.
- * (Note that filling is not actually implemented in this way. This
- * is just a description of the rule that is applied.)
- *
- * The default fill rule is %CAIRO_FILL_RULE_WINDING.
- *
- * New entries may be added in future versions.
- **/
-typedef enum _cairo_fill_rule {
-    CAIRO_FILL_RULE_WINDING,
-    CAIRO_FILL_RULE_EVEN_ODD
-} cairo_fill_rule_t;
-
-cairo_public void
-cairo_set_fill_rule (cairo_t *cr, cairo_fill_rule_t fill_rule);
-
-cairo_public void
-cairo_set_line_width (cairo_t *cr, double width);
-
-/**
- * cairo_line_cap_t:
- * @CAIRO_LINE_CAP_BUTT: start(stop) the line exactly at the start(end) point
- * @CAIRO_LINE_CAP_ROUND: use a round ending, the center of the circle is the end point
- * @CAIRO_LINE_CAP_SQUARE: use squared ending, the center of the square is the end point
- *
- * Specifies how to render the endpoints of the path when stroking.
- *
- * The default line cap style is %CAIRO_LINE_CAP_BUTT.
- **/
-typedef enum _cairo_line_cap {
-    CAIRO_LINE_CAP_BUTT,
-    CAIRO_LINE_CAP_ROUND,
-    CAIRO_LINE_CAP_SQUARE
-} cairo_line_cap_t;
-
-cairo_public void
-cairo_set_line_cap (cairo_t *cr, cairo_line_cap_t line_cap);
-
-/**
- * cairo_line_join_t:
- * @CAIRO_LINE_JOIN_MITER: use a sharp (angled) corner, see
- * cairo_set_miter_limit()
- * @CAIRO_LINE_JOIN_ROUND: use a rounded join, the center of the circle is the
- * joint point
- * @CAIRO_LINE_JOIN_BEVEL: use a cut-off join, the join is cut off at half
- * the line width from the joint point
- *
- * Specifies how to render the junction of two lines when stroking.
- *
- * The default line join style is %CAIRO_LINE_JOIN_MITER.
- **/
-typedef enum _cairo_line_join {
-    CAIRO_LINE_JOIN_MITER,
-    CAIRO_LINE_JOIN_ROUND,
-    CAIRO_LINE_JOIN_BEVEL
-} cairo_line_join_t;
-
-cairo_public void
-cairo_set_line_join (cairo_t *cr, cairo_line_join_t line_join);
-
-cairo_public void
-cairo_set_dash (cairo_t      *cr,
-		const double *dashes,
-		int	      num_dashes,
-		double	      offset);
-
-cairo_public void
-cairo_set_miter_limit (cairo_t *cr, double limit);
-
-cairo_public void
-cairo_translate (cairo_t *cr, double tx, double ty);
-
-cairo_public void
-cairo_scale (cairo_t *cr, double sx, double sy);
-
-cairo_public void
-cairo_rotate (cairo_t *cr, double angle);
-
-cairo_public void
-cairo_transform (cairo_t	      *cr,
-		 const cairo_matrix_t *matrix);
-
-cairo_public void
-cairo_set_matrix (cairo_t	       *cr,
-		  const cairo_matrix_t *matrix);
-
-cairo_public void
-cairo_identity_matrix (cairo_t *cr);
-
-cairo_public void
-cairo_user_to_device (cairo_t *cr, double *x, double *y);
-
-cairo_public void
-cairo_user_to_device_distance (cairo_t *cr, double *dx, double *dy);
-
-cairo_public void
-cairo_device_to_user (cairo_t *cr, double *x, double *y);
-
-cairo_public void
-cairo_device_to_user_distance (cairo_t *cr, double *dx, double *dy);
-
-/* Path creation functions */
-cairo_public void
-cairo_new_path (cairo_t *cr);
-
-cairo_public void
-cairo_move_to (cairo_t *cr, double x, double y);
-
-cairo_public void
-cairo_new_sub_path (cairo_t *cr);
-
-cairo_public void
-cairo_line_to (cairo_t *cr, double x, double y);
-
-cairo_public void
-cairo_curve_to (cairo_t *cr,
-		double x1, double y1,
-		double x2, double y2,
-		double x3, double y3);
-
-cairo_public void
-cairo_arc (cairo_t *cr,
-	   double xc, double yc,
-	   double radius,
-	   double angle1, double angle2);
-
-cairo_public void
-cairo_arc_negative (cairo_t *cr,
-		    double xc, double yc,
-		    double radius,
-		    double angle1, double angle2);
-
-/* XXX: NYI
-cairo_public void
-cairo_arc_to (cairo_t *cr,
-	      double x1, double y1,
-	      double x2, double y2,
-	      double radius);
-*/
-
-cairo_public void
-cairo_rel_move_to (cairo_t *cr, double dx, double dy);
-
-cairo_public void
-cairo_rel_line_to (cairo_t *cr, double dx, double dy);
-
-cairo_public void
-cairo_rel_curve_to (cairo_t *cr,
-		    double dx1, double dy1,
-		    double dx2, double dy2,
-		    double dx3, double dy3);
-
-cairo_public void
-cairo_rectangle (cairo_t *cr,
-		 double x, double y,
-		 double width, double height);
-
-/* XXX: NYI
-cairo_public void
-cairo_stroke_to_path (cairo_t *cr);
-*/
-
-cairo_public void
-cairo_close_path (cairo_t *cr);
-
-cairo_public void
-cairo_path_extents (cairo_t *cr,
-		    double *x1, double *y1,
-		    double *x2, double *y2);
-
-/* Painting functions */
-cairo_public void
-cairo_paint (cairo_t *cr);
-
-cairo_public void
-cairo_paint_with_alpha (cairo_t *cr,
-			double   alpha);
-
-cairo_public void
-cairo_mask (cairo_t         *cr,
-	    cairo_pattern_t *pattern);
-
-cairo_public void
-cairo_mask_surface (cairo_t         *cr,
-		    cairo_surface_t *surface,
-		    double           surface_x,
-		    double           surface_y);
-
-cairo_public void
-cairo_stroke (cairo_t *cr);
-
-cairo_public void
-cairo_stroke_preserve (cairo_t *cr);
-
-cairo_public void
-cairo_fill (cairo_t *cr);
-
-cairo_public void
-cairo_fill_preserve (cairo_t *cr);
-
-cairo_public void
-cairo_copy_page (cairo_t *cr);
-
-cairo_public void
-cairo_show_page (cairo_t *cr);
-
-/* Insideness testing */
-cairo_public cairo_bool_t
-cairo_in_stroke (cairo_t *cr, double x, double y);
-
-cairo_public cairo_bool_t
-cairo_in_fill (cairo_t *cr, double x, double y);
-
-/* Rectangular extents */
-cairo_public void
-cairo_stroke_extents (cairo_t *cr,
-		      double *x1, double *y1,
-		      double *x2, double *y2);
-
-cairo_public void
-cairo_fill_extents (cairo_t *cr,
-		    double *x1, double *y1,
-		    double *x2, double *y2);
-
-/* Clipping */
-cairo_public void
-cairo_reset_clip (cairo_t *cr);
-
-cairo_public void
-cairo_clip (cairo_t *cr);
-
-cairo_public void
-cairo_clip_preserve (cairo_t *cr);
-
-cairo_public void
-cairo_clip_extents (cairo_t *cr,
-		    double *x1, double *y1,
-		    double *x2, double *y2);
-
-/**
- * cairo_rectangle_t:
- * @x: X coordinate of the left side of the rectangle
- * @y: Y coordinate of the the top side of the rectangle
- * @width: width of the rectangle
- * @height: height of the rectangle
- *
- * A data structure for holding a rectangle.
- *
- * Since: 1.4
- **/
-typedef struct _cairo_rectangle {
-    double x, y, width, height;
-} cairo_rectangle_t;
-
-/**
- * cairo_rectangle_list_t:
- * @status: Error status of the rectangle list
- * @rectangles: Array containing the rectangles
- * @num_rectangles: Number of rectangles in this list
- * 
- * A data structure for holding a dynamically allocated
- * array of rectangles.
- *
- * Since: 1.4
- **/
-typedef struct _cairo_rectangle_list {
-    cairo_status_t     status;
-    cairo_rectangle_t *rectangles;
-    int                num_rectangles;
-} cairo_rectangle_list_t;
-
-cairo_public cairo_rectangle_list_t *
-cairo_copy_clip_rectangle_list (cairo_t *cr);
-
-cairo_public void
-cairo_rectangle_list_destroy (cairo_rectangle_list_t *rectangle_list);
-
-/* Font/Text functions */
-
-/**
- * cairo_scaled_font_t:
- *
- * A #cairo_scaled_font_t is a font scaled to a particular size and device
- * resolution. A #cairo_scaled_font_t is most useful for low-level font
- * usage where a library or application wants to cache a reference
- * to a scaled font to speed up the computation of metrics.
- *
- * There are various types of scaled fonts, depending on the
- * <firstterm>font backend</firstterm> they use. The type of a
- * scaled font can be queried using cairo_scaled_font_get_type().
- *
- * Memory management of #cairo_scaled_font_t is done with
- * cairo_scaled_font_reference() and cairo_scaled_font_destroy().
- **/
-typedef struct _cairo_scaled_font cairo_scaled_font_t;
-
-/**
- * cairo_font_face_t:
- *
- * A #cairo_font_face_t specifies all aspects of a font other
- * than the size or font matrix (a font matrix is used to distort
- * a font by sheering it or scaling it unequally in the two
- * directions) . A font face can be set on a #cairo_t by using
- * cairo_set_font_face(); the size and font matrix are set with
- * cairo_set_font_size() and cairo_set_font_matrix().
- *
- * There are various types of font faces, depending on the
- * <firstterm>font backend</firstterm> they use. The type of a
- * font face can be queried using cairo_font_face_get_type().
- *
- * Memory management of #cairo_font_face_t is done with
- * cairo_font_face_reference() and cairo_font_face_destroy().
- **/
-typedef struct _cairo_font_face cairo_font_face_t;
-
-/**
- * cairo_glyph_t:
- * @index: glyph index in the font. The exact interpretation of the
- *      glyph index depends on the font technology being used.
- * @x: the offset in the X direction between the origin used for
- *     drawing or measuring the string and the origin of this glyph.
- * @y: the offset in the Y direction between the origin used for
- *     drawing or measuring the string and the origin of this glyph.
- *
- * The #cairo_glyph_t structure holds information about a single glyph
- * when drawing or measuring text. A font is (in simple terms) a
- * collection of shapes used to draw text. A glyph is one of these
- * shapes. There can be multiple glyphs for a single character
- * (alternates to be used in different contexts, for example), or a
- * glyph can be a <firstterm>ligature</firstterm> of multiple
- * characters. Cairo doesn't expose any way of converting input text
- * into glyphs, so in order to use the Cairo interfaces that take
- * arrays of glyphs, you must directly access the appropriate
- * underlying font system.
- *
- * Note that the offsets given by @x and @y are not cumulative. When
- * drawing or measuring text, each glyph is individually positioned
- * with respect to the overall origin
- **/
-typedef struct {
-  unsigned long        index;
-  double               x;
-  double               y;
-} cairo_glyph_t;
-
-/**
- * cairo_text_extents_t:
- * @x_bearing: the horizontal distance from the origin to the
- *   leftmost part of the glyphs as drawn. Positive if the
- *   glyphs lie entirely to the right of the origin.
- * @y_bearing: the vertical distance from the origin to the
- *   topmost part of the glyphs as drawn. Positive only if the
- *   glyphs lie completely below the origin; will usually be
- *   negative.
- * @width: width of the glyphs as drawn
- * @height: height of the glyphs as drawn
- * @x_advance:distance to advance in the X direction
- *    after drawing these glyphs
- * @y_advance: distance to advance in the Y direction
- *   after drawing these glyphs. Will typically be zero except
- *   for vertical text layout as found in East-Asian languages.
- *
- * The #cairo_text_extents_t structure stores the extents of a single
- * glyph or a string of glyphs in user-space coordinates. Because text
- * extents are in user-space coordinates, they are mostly, but not
- * entirely, independent of the current transformation matrix. If you call
- * <literal>cairo_scale(cr, 2.0, 2.0)</literal>, text will
- * be drawn twice as big, but the reported text extents will not be
- * doubled. They will change slightly due to hinting (so you can't
- * assume that metrics are independent of the transformation matrix),
- * but otherwise will remain unchanged.
- **/
-typedef struct {
-    double x_bearing;
-    double y_bearing;
-    double width;
-    double height;
-    double x_advance;
-    double y_advance;
-} cairo_text_extents_t;
-
-/**
- * cairo_font_extents_t:
- * @ascent: the distance that the font extends above the baseline.
- *          Note that this is not always exactly equal to the maximum
- *          of the extents of all the glyphs in the font, but rather
- *          is picked to express the font designer's intent as to
- *          how the font should align with elements above it.
- * @descent: the distance that the font extends below the baseline.
- *           This value is positive for typical fonts that include
- *           portions below the baseline. Note that this is not always
- *           exactly equal to the maximum of the extents of all the
- *           glyphs in the font, but rather is picked to express the
- *           font designer's intent as to how the the font should
- *           align with elements below it.
- * @height: the recommended vertical distance between baselines when
- *          setting consecutive lines of text with the font. This
- *          is greater than @ascent+@descent by a
- *          quantity known as the <firstterm>line spacing</firstterm>
- *          or <firstterm>external leading</firstterm>. When space
- *          is at a premium, most fonts can be set with only
- *          a distance of @ascent+@descent between lines.
- * @max_x_advance: the maximum distance in the X direction that
- *         the the origin is advanced for any glyph in the font.
- * @max_y_advance: the maximum distance in the Y direction that
- *         the the origin is advanced for any glyph in the font.
- *         this will be zero for normal fonts used for horizontal
- *         writing. (The scripts of East Asia are sometimes written
- *         vertically.)
- *
- * The #cairo_font_extents_t structure stores metric information for
- * a font. Values are given in the current user-space coordinate
- * system.
- *
- * Because font metrics are in user-space coordinates, they are
- * mostly, but not entirely, independent of the current transformation
- * matrix. If you call <literal>cairo_scale(cr, 2.0, 2.0)</literal>,
- * text will be drawn twice as big, but the reported text extents will
- * not be doubled. They will change slightly due to hinting (so you
- * can't assume that metrics are independent of the transformation
- * matrix), but otherwise will remain unchanged.
- **/
-typedef struct {
-    double ascent;
-    double descent;
-    double height;
-    double max_x_advance;
-    double max_y_advance;
-} cairo_font_extents_t;
-
-/**
- * cairo_font_slant_t:
- * @CAIRO_FONT_SLANT_NORMAL: Upright font style
- * @CAIRO_FONT_SLANT_ITALIC: Italic font style
- * @CAIRO_FONT_SLANT_OBLIQUE: Oblique font style
- *
- * Specifies variants of a font face based on their slant.
- **/
-typedef enum _cairo_font_slant {
-  CAIRO_FONT_SLANT_NORMAL,
-  CAIRO_FONT_SLANT_ITALIC,
-  CAIRO_FONT_SLANT_OBLIQUE
-} cairo_font_slant_t;
-
-/**
- * cairo_font_weight_t:
- * @CAIRO_FONT_WEIGHT_NORMAL: Normal font weight
- * @CAIRO_FONT_WEIGHT_BOLD: Bold font weight
- *
- * Specifies variants of a font face based on their weight.
- **/
-typedef enum _cairo_font_weight {
-  CAIRO_FONT_WEIGHT_NORMAL,
-  CAIRO_FONT_WEIGHT_BOLD
-} cairo_font_weight_t;
-
-/**
- * cairo_subpixel_order_t:
- * @CAIRO_SUBPIXEL_ORDER_DEFAULT: Use the default subpixel order for
- *   for the target device
- * @CAIRO_SUBPIXEL_ORDER_RGB: Subpixel elements are arranged horizontally
- *   with red at the left
- * @CAIRO_SUBPIXEL_ORDER_BGR:  Subpixel elements are arranged horizontally
- *   with blue at the left
- * @CAIRO_SUBPIXEL_ORDER_VRGB: Subpixel elements are arranged vertically
- *   with red at the top
- * @CAIRO_SUBPIXEL_ORDER_VBGR: Subpixel elements are arranged vertically
- *   with blue at the top
- *
- * The subpixel order specifies the order of color elements within
- * each pixel on the display device when rendering with an
- * antialiasing mode of %CAIRO_ANTIALIAS_SUBPIXEL.
- **/
-typedef enum _cairo_subpixel_order {
-    CAIRO_SUBPIXEL_ORDER_DEFAULT,
-    CAIRO_SUBPIXEL_ORDER_RGB,
-    CAIRO_SUBPIXEL_ORDER_BGR,
-    CAIRO_SUBPIXEL_ORDER_VRGB,
-    CAIRO_SUBPIXEL_ORDER_VBGR
-} cairo_subpixel_order_t;
-
-/**
- * cairo_hint_style_t:
- * @CAIRO_HINT_STYLE_DEFAULT: Use the default hint style for
- *   font backend and target device
- * @CAIRO_HINT_STYLE_NONE: Do not hint outlines
- * @CAIRO_HINT_STYLE_SLIGHT: Hint outlines slightly to improve
- *   contrast while retaining good fidelity to the original
- *   shapes.
- * @CAIRO_HINT_STYLE_MEDIUM: Hint outlines with medium strength
- *   giving a compromise between fidelity to the original shapes
- *   and contrast
- * @CAIRO_HINT_STYLE_FULL: Hint outlines to maximize contrast
- *
- * Specifies the type of hinting to do on font outlines. Hinting
- * is the process of fitting outlines to the pixel grid in order
- * to improve the appearance of the result. Since hinting outlines
- * involves distorting them, it also reduces the faithfulness
- * to the original outline shapes. Not all of the outline hinting
- * styles are supported by all font backends.
- *
- * New entries may be added in future versions.
- **/
-typedef enum _cairo_hint_style {
-    CAIRO_HINT_STYLE_DEFAULT,
-    CAIRO_HINT_STYLE_NONE,
-    CAIRO_HINT_STYLE_SLIGHT,
-    CAIRO_HINT_STYLE_MEDIUM,
-    CAIRO_HINT_STYLE_FULL
-} cairo_hint_style_t;
-
-/**
- * cairo_hint_metrics_t:
- * @CAIRO_HINT_METRICS_DEFAULT: Hint metrics in the default
- *  manner for the font backend and target device
- * @CAIRO_HINT_METRICS_OFF: Do not hint font metrics
- * @CAIRO_HINT_METRICS_ON: Hint font metrics
- *
- * Specifies whether to hint font metrics; hinting font metrics
- * means quantizing them so that they are integer values in
- * device space. Doing this improves the consistency of
- * letter and line spacing, however it also means that text
- * will be laid out differently at different zoom factors.
- **/
-typedef enum _cairo_hint_metrics {
-    CAIRO_HINT_METRICS_DEFAULT,
-    CAIRO_HINT_METRICS_OFF,
-    CAIRO_HINT_METRICS_ON
-} cairo_hint_metrics_t;
-
-/**
- * cairo_font_options_t:
- *
- * An opaque structure holding all options that are used when
- * rendering fonts.
- *
- * Individual features of a #cairo_font_options_t can be set or
- * accessed using functions named
- * cairo_font_options_set_<emphasis>feature_name</emphasis> and
- * cairo_font_options_get_<emphasis>feature_name</emphasis>, like
- * cairo_font_options_set_antialias() and
- * cairo_font_options_get_antialias().
- *
- * New features may be added to a #cairo_font_options_t in the
- * future.  For this reason, cairo_font_options_copy(),
- * cairo_font_options_equal(), cairo_font_options_merge(), and
- * cairo_font_options_hash() should be used to copy, check
- * for equality, merge, or compute a hash value of
- * #cairo_font_options_t objects.
- **/
-typedef struct _cairo_font_options cairo_font_options_t;
-
-cairo_public cairo_font_options_t *
-cairo_font_options_create (void);
-
-cairo_public cairo_font_options_t *
-cairo_font_options_copy (const cairo_font_options_t *original);
-
-cairo_public void
-cairo_font_options_destroy (cairo_font_options_t *options);
-
-cairo_public cairo_status_t
-cairo_font_options_status (cairo_font_options_t *options);
-
-cairo_public void
-cairo_font_options_merge (cairo_font_options_t       *options,
-			  const cairo_font_options_t *other);
-cairo_public cairo_bool_t
-cairo_font_options_equal (const cairo_font_options_t *options,
-			  const cairo_font_options_t *other);
-
-cairo_public unsigned long
-cairo_font_options_hash (const cairo_font_options_t *options);
-
-cairo_public void
-cairo_font_options_set_antialias (cairo_font_options_t *options,
-				  cairo_antialias_t     antialias);
-cairo_public cairo_antialias_t
-cairo_font_options_get_antialias (const cairo_font_options_t *options);
-
-cairo_public void
-cairo_font_options_set_subpixel_order (cairo_font_options_t   *options,
-				       cairo_subpixel_order_t  subpixel_order);
-cairo_public cairo_subpixel_order_t
-cairo_font_options_get_subpixel_order (const cairo_font_options_t *options);
-
-cairo_public void
-cairo_font_options_set_hint_style (cairo_font_options_t *options,
-				   cairo_hint_style_t     hint_style);
-cairo_public cairo_hint_style_t
-cairo_font_options_get_hint_style (const cairo_font_options_t *options);
-
-cairo_public void
-cairo_font_options_set_hint_metrics (cairo_font_options_t *options,
-				     cairo_hint_metrics_t  hint_metrics);
-cairo_public cairo_hint_metrics_t
-cairo_font_options_get_hint_metrics (const cairo_font_options_t *options);
-
-/* This interface is for dealing with text as text, not caring about the
-   font object inside the the cairo_t. */
-
-cairo_public void
-cairo_select_font_face (cairo_t              *cr,
-			const char           *family,
-			cairo_font_slant_t   slant,
-			cairo_font_weight_t  weight);
-
-cairo_public void
-cairo_set_font_size (cairo_t *cr, double size);
-
-cairo_public void
-cairo_set_font_matrix (cairo_t		    *cr,
-		       const cairo_matrix_t *matrix);
-
-cairo_public void
-cairo_get_font_matrix (cairo_t *cr,
-		       cairo_matrix_t *matrix);
-
-cairo_public void
-cairo_set_font_options (cairo_t                    *cr,
-			const cairo_font_options_t *options);
-
-cairo_public void
-cairo_get_font_options (cairo_t              *cr,
-			cairo_font_options_t *options);
-
-cairo_public void
-cairo_set_font_face (cairo_t *cr, cairo_font_face_t *font_face);
-
-cairo_public cairo_font_face_t *
-cairo_get_font_face (cairo_t *cr);
-
-cairo_public void
-cairo_set_scaled_font (cairo_t                   *cr,
-		       const cairo_scaled_font_t *scaled_font);
-
-cairo_public cairo_scaled_font_t *
-cairo_get_scaled_font (cairo_t *cr);
-
-cairo_public void
-cairo_show_text (cairo_t *cr, const char *utf8);
-
-cairo_public void
-cairo_show_glyphs (cairo_t *cr, const cairo_glyph_t *glyphs, int num_glyphs);
-
-cairo_public void
-cairo_text_path  (cairo_t *cr, const char *utf8);
-
-cairo_public void
-cairo_glyph_path (cairo_t *cr, const cairo_glyph_t *glyphs, int num_glyphs);
-
-cairo_public void
-cairo_text_extents (cairo_t              *cr,
-		    const char    	 *utf8,
-		    cairo_text_extents_t *extents);
-
-cairo_public void
-cairo_glyph_extents (cairo_t               *cr,
-		     const cairo_glyph_t   *glyphs,
-		     int                   num_glyphs,
-		     cairo_text_extents_t  *extents);
-
-cairo_public void
-cairo_font_extents (cairo_t              *cr,
-		    cairo_font_extents_t *extents);
-
-/* Generic identifier for a font style */
-
-cairo_public cairo_font_face_t *
-cairo_font_face_reference (cairo_font_face_t *font_face);
-
-cairo_public void
-cairo_font_face_destroy (cairo_font_face_t *font_face);
-
-cairo_public unsigned int
-cairo_font_face_get_reference_count (cairo_font_face_t *font_face);
-
-cairo_public cairo_status_t
-cairo_font_face_status (cairo_font_face_t *font_face);
-
-/**
- * cairo_font_type_t:
- * @CAIRO_FONT_TYPE_TOY: The font was created using cairo's toy font api
- * @CAIRO_FONT_TYPE_FT: The font is of type FreeType
- * @CAIRO_FONT_TYPE_WIN32: The font is of type Win32
- * @CAIRO_FONT_TYPE_QUARTZ: The font is of type Quartz (Since: 1.6)
- *
- * #cairo_font_type_t is used to describe the type of a given font
- * face or scaled font. The font types are also known as "font
- * backends" within cairo.
- *
- * The type of a font face is determined by the function used to
- * create it, which will generally be of the form
- * cairo_<emphasis>type</emphasis>_font_face_create. The font face type can be queried
- * with cairo_font_face_get_type()
- *
- * The various #cairo_font_face_t functions can be used with a font face
- * of any type.
- *
- * The type of a scaled font is determined by the type of the font
- * face passed to cairo_scaled_font_create(). The scaled font type can
- * be queried with cairo_scaled_font_get_type()
- *
- * The various #cairo_scaled_font_t functions can be used with scaled
- * fonts of any type, but some font backends also provide
- * type-specific functions that must only be called with a scaled font
- * of the appropriate type. These functions have names that begin with
- * cairo_<emphasis>type</emphasis>_scaled_font such as cairo_ft_scaled_font_lock_face().
- *
- * The behavior of calling a type-specific function with a scaled font
- * of the wrong type is undefined.
- *
- * New entries may be added in future versions.
- *
- * Since: 1.2
- **/
-typedef enum _cairo_font_type {
-    CAIRO_FONT_TYPE_TOY,
-    CAIRO_FONT_TYPE_FT,
-    CAIRO_FONT_TYPE_WIN32,
-    CAIRO_FONT_TYPE_QUARTZ
-} cairo_font_type_t;
-
-cairo_public cairo_font_type_t
-cairo_font_face_get_type (cairo_font_face_t *font_face);
-
-cairo_public void *
-cairo_font_face_get_user_data (cairo_font_face_t	   *font_face,
-			       const cairo_user_data_key_t *key);
-
-cairo_public cairo_status_t
-cairo_font_face_set_user_data (cairo_font_face_t	   *font_face,
-			       const cairo_user_data_key_t *key,
-			       void			   *user_data,
-			       cairo_destroy_func_t	    destroy);
-
-/* Portable interface to general font features. */
-
-cairo_public cairo_scaled_font_t *
-cairo_scaled_font_create (cairo_font_face_t          *font_face,
-			  const cairo_matrix_t       *font_matrix,
-			  const cairo_matrix_t       *ctm,
-			  const cairo_font_options_t *options);
-
-cairo_public cairo_scaled_font_t *
-cairo_scaled_font_reference (cairo_scaled_font_t *scaled_font);
-
-cairo_public void
-cairo_scaled_font_destroy (cairo_scaled_font_t *scaled_font);
-
-cairo_public unsigned int
-cairo_scaled_font_get_reference_count (cairo_scaled_font_t *scaled_font);
-
-cairo_public cairo_status_t
-cairo_scaled_font_status (cairo_scaled_font_t *scaled_font);
-
-cairo_public cairo_font_type_t
-cairo_scaled_font_get_type (cairo_scaled_font_t *scaled_font);
-
-cairo_public void *
-cairo_scaled_font_get_user_data (cairo_scaled_font_t         *scaled_font,
-				 const cairo_user_data_key_t *key);
-
-cairo_public cairo_status_t
-cairo_scaled_font_set_user_data (cairo_scaled_font_t         *scaled_font,
-				 const cairo_user_data_key_t *key,
-				 void                        *user_data,
-				 cairo_destroy_func_t	      destroy);
-
-cairo_public void
-cairo_scaled_font_extents (cairo_scaled_font_t  *scaled_font,
-			   cairo_font_extents_t *extents);
-
-cairo_public void
-cairo_scaled_font_text_extents (cairo_scaled_font_t  *scaled_font,
-				const char  	     *utf8,
-				cairo_text_extents_t *extents);
-
-cairo_public void
-cairo_scaled_font_glyph_extents (cairo_scaled_font_t   *scaled_font,
-				 const cairo_glyph_t   *glyphs,
-				 int                   num_glyphs,
-				 cairo_text_extents_t  *extents);
-
-cairo_public cairo_font_face_t *
-cairo_scaled_font_get_font_face (cairo_scaled_font_t *scaled_font);
-
-cairo_public void
-cairo_scaled_font_get_font_matrix (cairo_scaled_font_t	*scaled_font,
-				   cairo_matrix_t	*font_matrix);
-
-cairo_public void
-cairo_scaled_font_get_ctm (cairo_scaled_font_t	*scaled_font,
-			   cairo_matrix_t	*ctm);
-
-cairo_public void
-cairo_scaled_font_get_font_options (cairo_scaled_font_t		*scaled_font,
-				    cairo_font_options_t	*options);
-
-/* Query functions */
-
-cairo_public cairo_operator_t
-cairo_get_operator (cairo_t *cr);
-
-cairo_public cairo_pattern_t *
-cairo_get_source (cairo_t *cr);
-
-cairo_public double
-cairo_get_tolerance (cairo_t *cr);
-
-cairo_public cairo_antialias_t
-cairo_get_antialias (cairo_t *cr);
-
-cairo_public cairo_bool_t
-cairo_has_current_point (cairo_t *cr);
-
-cairo_public void
-cairo_get_current_point (cairo_t *cr, double *x, double *y);
-
-cairo_public cairo_fill_rule_t
-cairo_get_fill_rule (cairo_t *cr);
-
-cairo_public double
-cairo_get_line_width (cairo_t *cr);
-
-cairo_public cairo_line_cap_t
-cairo_get_line_cap (cairo_t *cr);
-
-cairo_public cairo_line_join_t
-cairo_get_line_join (cairo_t *cr);
-
-cairo_public double
-cairo_get_miter_limit (cairo_t *cr);
-
-cairo_public int
-cairo_get_dash_count (cairo_t *cr);
-
-cairo_public void
-cairo_get_dash (cairo_t *cr, double *dashes, double *offset);
-
-cairo_public void
-cairo_get_matrix (cairo_t *cr, cairo_matrix_t *matrix);
-
-cairo_public cairo_surface_t *
-cairo_get_target (cairo_t *cr);
-
-cairo_public cairo_surface_t *
-cairo_get_group_target (cairo_t *cr);
-
-/**
- * cairo_path_data_type_t:
- * @CAIRO_PATH_MOVE_TO: A move-to operation
- * @CAIRO_PATH_LINE_TO: A line-to operation
- * @CAIRO_PATH_CURVE_TO: A curve-to operation
- * @CAIRO_PATH_CLOSE_PATH: A close-path operation
- *
- * #cairo_path_data_t is used to describe the type of one portion
- * of a path when represented as a #cairo_path_t.
- * See #cairo_path_data_t for details.
- **/
-typedef enum _cairo_path_data_type {
-    CAIRO_PATH_MOVE_TO,
-    CAIRO_PATH_LINE_TO,
-    CAIRO_PATH_CURVE_TO,
-    CAIRO_PATH_CLOSE_PATH
-} cairo_path_data_type_t;
-
-/**
- * cairo_path_data_t:
- *
- * #cairo_path_data_t is used to represent the path data inside a
- * #cairo_path_t.
- *
- * The data structure is designed to try to balance the demands of
- * efficiency and ease-of-use. A path is represented as an array of
- * #cairo_path_data_t, which is a union of headers and points.
- *
- * Each portion of the path is represented by one or more elements in
- * the array, (one header followed by 0 or more points). The length
- * value of the header is the number of array elements for the current
- * portion including the header, (ie. length == 1 + # of points), and
- * where the number of points for each element type is as follows:
- *
- * <programlisting>
- *     %CAIRO_PATH_MOVE_TO:     1 point
- *     %CAIRO_PATH_LINE_TO:     1 point
- *     %CAIRO_PATH_CURVE_TO:    3 points
- *     %CAIRO_PATH_CLOSE_PATH:  0 points
- * </programlisting>
- *
- * The semantics and ordering of the coordinate values are consistent
- * with cairo_move_to(), cairo_line_to(), cairo_curve_to(), and
- * cairo_close_path().
- *
- * Here is sample code for iterating through a #cairo_path_t:
- *
- * <informalexample><programlisting>
- *      int i;
- *      #cairo_path_t *path;
- *      #cairo_path_data_t *data;
- * &nbsp;
- *      path = cairo_copy_path (cr);
- * &nbsp;
- *      for (i=0; i < path->num_data; i += path->data[i].header.length) {
- *          data = &amp;path->data[i];
- *          switch (data->header.type) {
- *          case %CAIRO_PATH_MOVE_TO:
- *              do_move_to_things (data[1].point.x, data[1].point.y);
- *              break;
- *          case %CAIRO_PATH_LINE_TO:
- *              do_line_to_things (data[1].point.x, data[1].point.y);
- *              break;
- *          case %CAIRO_PATH_CURVE_TO:
- *              do_curve_to_things (data[1].point.x, data[1].point.y,
- *                                  data[2].point.x, data[2].point.y,
- *                                  data[3].point.x, data[3].point.y);
- *              break;
- *          case %CAIRO_PATH_CLOSE_PATH:
- *              do_close_path_things ();
- *              break;
- *          }
- *      }
- *      cairo_path_destroy (path);
- * </programlisting></informalexample>
- *
- * As of cairo 1.4, cairo does not mind if there are more elements in
- * a portion of the path than needed.  Such elements can be used by
- * users of the cairo API to hold extra values in the path data
- * structure.  For this reason, it is recommended that applications
- * always use <literal>data->header.length</literal> to
- * iterate over the path data, instead of hardcoding the number of
- * elements for each element type.
- **/
-typedef union _cairo_path_data_t cairo_path_data_t;
-union _cairo_path_data_t {
-    struct {
-	cairo_path_data_type_t type;
-	int length;
-    } header;
-    struct {
-	double x, y;
-    } point;
-};
-
-/**
- * cairo_path_t:
- * @status: the current error status
- * @data: the elements in the path
- * @num_data: the number of elements in the data array
- *
- * A data structure for holding a path. This data structure serves as
- * the return value for cairo_copy_path() and
- * cairo_copy_path_flat() as well the input value for
- * cairo_append_path().
- *
- * See #cairo_path_data_t for hints on how to iterate over the
- * actual data within the path.
- *
- * The num_data member gives the number of elements in the data
- * array. This number is larger than the number of independent path
- * portions (defined in #cairo_path_data_type_t), since the data
- * includes both headers and coordinates for each portion.
- **/
-typedef struct cairo_path {
-    cairo_status_t status;
-    cairo_path_data_t *data;
-    int num_data;
-} cairo_path_t;
-
-cairo_public cairo_path_t *
-cairo_copy_path (cairo_t *cr);
-
-cairo_public cairo_path_t *
-cairo_copy_path_flat (cairo_t *cr);
-
-cairo_public void
-cairo_append_path (cairo_t		*cr,
-		   const cairo_path_t	*path);
-
-cairo_public void
-cairo_path_destroy (cairo_path_t *path);
-
-/* Error status queries */
-
-cairo_public cairo_status_t
-cairo_status (cairo_t *cr);
-
-cairo_public const char *
-cairo_status_to_string (cairo_status_t status);
-
-/* Surface manipulation */
-
-cairo_public cairo_surface_t *
-cairo_surface_create_similar (cairo_surface_t  *other,
-			      cairo_content_t	content,
-			      int		width,
-			      int		height);
-
-cairo_public cairo_surface_t *
-cairo_surface_reference (cairo_surface_t *surface);
-
-cairo_public void
-cairo_surface_finish (cairo_surface_t *surface);
-
-cairo_public void
-cairo_surface_destroy (cairo_surface_t *surface);
-
-cairo_public unsigned int
-cairo_surface_get_reference_count (cairo_surface_t *surface);
-
-cairo_public cairo_status_t
-cairo_surface_status (cairo_surface_t *surface);
-
-/**
- * cairo_surface_type_t:
- * @CAIRO_SURFACE_TYPE_IMAGE: The surface is of type image
- * @CAIRO_SURFACE_TYPE_PDF: The surface is of type pdf
- * @CAIRO_SURFACE_TYPE_PS: The surface is of type ps
- * @CAIRO_SURFACE_TYPE_XLIB: The surface is of type xlib
- * @CAIRO_SURFACE_TYPE_XCB: The surface is of type xcb
- * @CAIRO_SURFACE_TYPE_GLITZ: The surface is of type glitz
- * @CAIRO_SURFACE_TYPE_QUARTZ: The surface is of type quartz
- * @CAIRO_SURFACE_TYPE_WIN32: The surface is of type win32
- * @CAIRO_SURFACE_TYPE_BEOS: The surface is of type beos
- * @CAIRO_SURFACE_TYPE_DIRECTFB: The surface is of type directfb
- * @CAIRO_SURFACE_TYPE_SVG: The surface is of type svg
- * @CAIRO_SURFACE_TYPE_OS2: The surface is of type os2
- * @CAIRO_SURFACE_TYPE_WIN32_PRINTING: The surface is a win32 printing surface
- * @CAIRO_SURFACE_TYPE_QUARTZ_IMAGE: The surface is of type quartz_image
- *
- * #cairo_surface_type_t is used to describe the type of a given
- * surface. The surface types are also known as "backends" or "surface
- * backends" within cairo.
- *
- * The type of a surface is determined by the function used to create
- * it, which will generally be of the form cairo_<emphasis>type</emphasis>_surface_create(),
- * (though see cairo_surface_create_similar() as well).
- *
- * The surface type can be queried with cairo_surface_get_type()
- *
- * The various #cairo_surface_t functions can be used with surfaces of
- * any type, but some backends also provide type-specific functions
- * that must only be called with a surface of the appropriate
- * type. These functions have names that begin with
- * cairo_<emphasis>type</emphasis>_surface such as cairo_image_surface_get_width().
- *
- * The behavior of calling a type-specific function with a surface of
- * the wrong type is undefined.
- *
- * New entries may be added in future versions.
- *
- * Since: 1.2
- **/
-typedef enum _cairo_surface_type {
-    CAIRO_SURFACE_TYPE_IMAGE,
-    CAIRO_SURFACE_TYPE_PDF,
-    CAIRO_SURFACE_TYPE_PS,
-    CAIRO_SURFACE_TYPE_XLIB,
-    CAIRO_SURFACE_TYPE_XCB,
-    CAIRO_SURFACE_TYPE_GLITZ,
-    CAIRO_SURFACE_TYPE_QUARTZ,
-    CAIRO_SURFACE_TYPE_WIN32,
-    CAIRO_SURFACE_TYPE_BEOS,
-    CAIRO_SURFACE_TYPE_DIRECTFB,
-    CAIRO_SURFACE_TYPE_SVG,
-    CAIRO_SURFACE_TYPE_OS2,
-    CAIRO_SURFACE_TYPE_WIN32_PRINTING,
-    CAIRO_SURFACE_TYPE_QUARTZ_IMAGE
-} cairo_surface_type_t;
-
-cairo_public cairo_surface_type_t
-cairo_surface_get_type (cairo_surface_t *surface);
-
-cairo_public cairo_content_t
-cairo_surface_get_content (cairo_surface_t *surface);
-
-#if CAIRO_HAS_PNG_FUNCTIONS
-
-cairo_public cairo_status_t
-cairo_surface_write_to_png (cairo_surface_t	*surface,
-			    const char		*filename);
-
-cairo_public cairo_status_t
-cairo_surface_write_to_png_stream (cairo_surface_t	*surface,
-				   cairo_write_func_t	write_func,
-				   void			*closure);
-
-#endif
-
-cairo_public void *
-cairo_surface_get_user_data (cairo_surface_t		 *surface,
-			     const cairo_user_data_key_t *key);
-
-cairo_public cairo_status_t
-cairo_surface_set_user_data (cairo_surface_t		 *surface,
-			     const cairo_user_data_key_t *key,
-			     void			 *user_data,
-			     cairo_destroy_func_t	 destroy);
-
-cairo_public void
-cairo_surface_get_font_options (cairo_surface_t      *surface,
-				cairo_font_options_t *options);
-
-cairo_public void
-cairo_surface_flush (cairo_surface_t *surface);
-
-cairo_public void
-cairo_surface_mark_dirty (cairo_surface_t *surface);
-
-cairo_public void
-cairo_surface_mark_dirty_rectangle (cairo_surface_t *surface,
-				    int              x,
-				    int              y,
-				    int              width,
-				    int              height);
-
-cairo_public void
-cairo_surface_set_device_offset (cairo_surface_t *surface,
-				 double           x_offset,
-				 double           y_offset);
-
-cairo_public void
-cairo_surface_get_device_offset (cairo_surface_t *surface,
-				 double          *x_offset,
-				 double          *y_offset);
-
-cairo_public void
-cairo_surface_set_fallback_resolution (cairo_surface_t	*surface,
-				       double		 x_pixels_per_inch,
-				       double		 y_pixels_per_inch);
-
-cairo_public void
-cairo_surface_copy_page (cairo_surface_t *surface);
-
-cairo_public void
-cairo_surface_show_page (cairo_surface_t *surface);
-
-/* Image-surface functions */
-
-/**
- * cairo_format_t:
- * @CAIRO_FORMAT_ARGB32: each pixel is a 32-bit quantity, with
- *   alpha in the upper 8 bits, then red, then green, then blue.
- *   The 32-bit quantities are stored native-endian. Pre-multiplied
- *   alpha is used. (That is, 50% transparent red is 0x80800000,
- *   not 0x80ff0000.)
- * @CAIRO_FORMAT_RGB24: each pixel is a 32-bit quantity, with
- *   the upper 8 bits unused. Red, Green, and Blue are stored
- *   in the remaining 24 bits in that order.
- * @CAIRO_FORMAT_A8: each pixel is a 8-bit quantity holding
- *   an alpha value.
- * @CAIRO_FORMAT_A1: each pixel is a 1-bit quantity holding
- *   an alpha value. Pixels are packed together into 32-bit
- *   quantities. The ordering of the bits matches the
- *   endianess of the platform. On a big-endian machine, the
- *   first pixel is in the uppermost bit, on a little-endian
- *   machine the first pixel is in the least-significant bit.
- * @CAIRO_FORMAT_RGB16_565: This format value is deprecated. It has
- *   never been properly implemented in cairo and should not be used
- *   by applications. (since 1.2)
- *
- * #cairo_format_t is used to identify the memory format of
- * image data.
- *
- * New entries may be added in future versions.
- **/
-typedef enum _cairo_format {
-    CAIRO_FORMAT_ARGB32,
-    CAIRO_FORMAT_RGB24,
-    CAIRO_FORMAT_A8,
-    CAIRO_FORMAT_A1
-    /* The value of 4 is reserved by a deprecated enum value.
-     * The next format added must have an explicit value of 5.
-    CAIRO_FORMAT_RGB16_565 = 4,
-    */
-} cairo_format_t;
-
-cairo_public cairo_surface_t *
-cairo_image_surface_create (cairo_format_t	format,
-			    int			width,
-			    int			height);
-
-cairo_public int
-cairo_format_stride_for_width (cairo_format_t	format,
-			       int		width);
-
-cairo_public cairo_surface_t *
-cairo_image_surface_create_for_data (unsigned char	       *data,
-				     cairo_format_t		format,
-				     int			width,
-				     int			height,
-				     int			stride);
-
-cairo_public unsigned char *
-cairo_image_surface_get_data (cairo_surface_t *surface);
-
-cairo_public cairo_format_t
-cairo_image_surface_get_format (cairo_surface_t *surface);
-
-cairo_public int
-cairo_image_surface_get_width (cairo_surface_t *surface);
-
-cairo_public int
-cairo_image_surface_get_height (cairo_surface_t *surface);
-
-cairo_public int
-cairo_image_surface_get_stride (cairo_surface_t *surface);
-
-#if CAIRO_HAS_PNG_FUNCTIONS
-
-cairo_public cairo_surface_t *
-cairo_image_surface_create_from_png (const char	*filename);
-
-cairo_public cairo_surface_t *
-cairo_image_surface_create_from_png_stream (cairo_read_func_t	read_func,
-					    void		*closure);
-
-#endif
-
-/* Pattern creation functions */
-
-cairo_public cairo_pattern_t *
-cairo_pattern_create_rgb (double red, double green, double blue);
-
-cairo_public cairo_pattern_t *
-cairo_pattern_create_rgba (double red, double green, double blue,
-			   double alpha);
-
-cairo_public cairo_pattern_t *
-cairo_pattern_create_for_surface (cairo_surface_t *surface);
-
-cairo_public cairo_pattern_t *
-cairo_pattern_create_linear (double x0, double y0,
-			     double x1, double y1);
-
-cairo_public cairo_pattern_t *
-cairo_pattern_create_radial (double cx0, double cy0, double radius0,
-			     double cx1, double cy1, double radius1);
-
-cairo_public cairo_pattern_t *
-cairo_pattern_reference (cairo_pattern_t *pattern);
-
-cairo_public void
-cairo_pattern_destroy (cairo_pattern_t *pattern);
-
-cairo_public unsigned int
-cairo_pattern_get_reference_count (cairo_pattern_t *pattern);
-
-cairo_public cairo_status_t
-cairo_pattern_status (cairo_pattern_t *pattern);
-
-cairo_public void *
-cairo_pattern_get_user_data (cairo_pattern_t		 *pattern,
-			     const cairo_user_data_key_t *key);
-
-cairo_public cairo_status_t
-cairo_pattern_set_user_data (cairo_pattern_t		 *pattern,
-			     const cairo_user_data_key_t *key,
-			     void			 *user_data,
-			     cairo_destroy_func_t	  destroy);
-
-/**
- * cairo_pattern_type_t:
- * @CAIRO_PATTERN_TYPE_SOLID: The pattern is a solid (uniform)
- * color. It may be opaque or translucent.
- * @CAIRO_PATTERN_TYPE_SURFACE: The pattern is a based on a surface (an image).
- * @CAIRO_PATTERN_TYPE_LINEAR: The pattern is a linear gradient.
- * @CAIRO_PATTERN_TYPE_RADIAL: The pattern is a radial gradient.
- *
- * #cairo_pattern_type_t is used to describe the type of a given pattern.
- *
- * The type of a pattern is determined by the function used to create
- * it. The cairo_pattern_create_rgb() and cairo_pattern_create_rgba()
- * functions create SOLID patterns. The remaining
- * cairo_pattern_create functions map to pattern types in obvious
- * ways.
- *
- * The pattern type can be queried with cairo_pattern_get_type()
- *
- * Most #cairo_pattern_t functions can be called with a pattern of any
- * type, (though trying to change the extend or filter for a solid
- * pattern will have no effect). A notable exception is
- * cairo_pattern_add_color_stop_rgb() and
- * cairo_pattern_add_color_stop_rgba() which must only be called with
- * gradient patterns (either LINEAR or RADIAL). Otherwise the pattern
- * will be shutdown and put into an error state.
- *
- * New entries may be added in future versions.
- *
- * Since: 1.2
- **/
-typedef enum _cairo_pattern_type {
-    CAIRO_PATTERN_TYPE_SOLID,
-    CAIRO_PATTERN_TYPE_SURFACE,
-    CAIRO_PATTERN_TYPE_LINEAR,
-    CAIRO_PATTERN_TYPE_RADIAL
-} cairo_pattern_type_t;
-
-cairo_public cairo_pattern_type_t
-cairo_pattern_get_type (cairo_pattern_t *pattern);
-
-cairo_public void
-cairo_pattern_add_color_stop_rgb (cairo_pattern_t *pattern,
-				  double offset,
-				  double red, double green, double blue);
-
-cairo_public void
-cairo_pattern_add_color_stop_rgba (cairo_pattern_t *pattern,
-				   double offset,
-				   double red, double green, double blue,
-				   double alpha);
-
-cairo_public void
-cairo_pattern_set_matrix (cairo_pattern_t      *pattern,
-			  const cairo_matrix_t *matrix);
-
-cairo_public void
-cairo_pattern_get_matrix (cairo_pattern_t *pattern,
-			  cairo_matrix_t  *matrix);
-
-/**
- * cairo_extend_t:
- * @CAIRO_EXTEND_NONE: pixels outside of the source pattern
- *   are fully transparent
- * @CAIRO_EXTEND_REPEAT: the pattern is tiled by repeating
- * @CAIRO_EXTEND_REFLECT: the pattern is tiled by reflecting
- *   at the edges (Implemented for surface patterns since 1.6)
- * @CAIRO_EXTEND_PAD: pixels outside of the pattern copy
- *   the closest pixel from the source (Since 1.2; but only
- *   implemented for surface patterns since 1.6)
- *
- * #cairo_extend_t is used to describe how pattern color/alpha will be
- * determined for areas "outside" the pattern's natural area, (for
- * example, outside the surface bounds or outside the gradient
- * geometry).
- *
- * The default extend mode is %CAIRO_EXTEND_NONE for surface patterns
- * and %CAIRO_EXTEND_PAD for gradient patterns.
- *
- * New entries may be added in future versions.
- **/
-typedef enum _cairo_extend {
-    CAIRO_EXTEND_NONE,
-    CAIRO_EXTEND_REPEAT,
-    CAIRO_EXTEND_REFLECT,
-    CAIRO_EXTEND_PAD
-} cairo_extend_t;
-
-cairo_public void
-cairo_pattern_set_extend (cairo_pattern_t *pattern, cairo_extend_t extend);
-
-cairo_public cairo_extend_t
-cairo_pattern_get_extend (cairo_pattern_t *pattern);
-
-/**
- * cairo_filter_t:
- * @CAIRO_FILTER_FAST: A high-performance filter, with quality similar
- *     to %CAIRO_FILTER_NEAREST
- * @CAIRO_FILTER_GOOD: A reasonable-performance filter, with quality
- *     similar to %CAIRO_FILTER_BILINEAR
- * @CAIRO_FILTER_BEST: The highest-quality available, performance may
- *     not be suitable for interactive use.
- * @CAIRO_FILTER_NEAREST: Nearest-neighbor filtering
- * @CAIRO_FILTER_BILINEAR: Linear interpolation in two dimensions
- * @CAIRO_FILTER_GAUSSIAN: This filter value is currently
- *     unimplemented, and should not be used in current code.
- *
- * #cairo_filter_t is used to indicate what filtering should be
- * applied when reading pixel values from patterns. See
- * cairo_pattern_set_source() for indicating the desired filter to be
- * used with a particular pattern.
- */
-typedef enum _cairo_filter {
-    CAIRO_FILTER_FAST,
-    CAIRO_FILTER_GOOD,
-    CAIRO_FILTER_BEST,
-    CAIRO_FILTER_NEAREST,
-    CAIRO_FILTER_BILINEAR,
-    CAIRO_FILTER_GAUSSIAN
-} cairo_filter_t;
-
-cairo_public void
-cairo_pattern_set_filter (cairo_pattern_t *pattern, cairo_filter_t filter);
-
-cairo_public cairo_filter_t
-cairo_pattern_get_filter (cairo_pattern_t *pattern);
-
-cairo_public cairo_status_t
-cairo_pattern_get_rgba (cairo_pattern_t *pattern,
-			double *red, double *green,
-			double *blue, double *alpha);
-
-cairo_public cairo_status_t
-cairo_pattern_get_surface (cairo_pattern_t *pattern,
-			   cairo_surface_t **surface);
-
-
-cairo_public cairo_status_t
-cairo_pattern_get_color_stop_rgba (cairo_pattern_t *pattern,
-				   int index, double *offset,
-				   double *red, double *green,
-				   double *blue, double *alpha);
-
-cairo_public cairo_status_t
-cairo_pattern_get_color_stop_count (cairo_pattern_t *pattern,
-				    int *count);
-
-cairo_public cairo_status_t
-cairo_pattern_get_linear_points (cairo_pattern_t *pattern,
-				 double *x0, double *y0,
-				 double *x1, double *y1);
-
-cairo_public cairo_status_t
-cairo_pattern_get_radial_circles (cairo_pattern_t *pattern,
-				  double *x0, double *y0, double *r0,
-				  double *x1, double *y1, double *r1);
-
-/* Matrix functions */
-
-cairo_public void
-cairo_matrix_init (cairo_matrix_t *matrix,
-		   double  xx, double  yx,
-		   double  xy, double  yy,
-		   double  x0, double  y0);
-
-cairo_public void
-cairo_matrix_init_identity (cairo_matrix_t *matrix);
-
-cairo_public void
-cairo_matrix_init_translate (cairo_matrix_t *matrix,
-			     double tx, double ty);
-
-cairo_public void
-cairo_matrix_init_scale (cairo_matrix_t *matrix,
-			 double sx, double sy);
-
-cairo_public void
-cairo_matrix_init_rotate (cairo_matrix_t *matrix,
-			  double radians);
-
-cairo_public void
-cairo_matrix_translate (cairo_matrix_t *matrix, double tx, double ty);
-
-cairo_public void
-cairo_matrix_scale (cairo_matrix_t *matrix, double sx, double sy);
-
-cairo_public void
-cairo_matrix_rotate (cairo_matrix_t *matrix, double radians);
-
-cairo_public cairo_status_t
-cairo_matrix_invert (cairo_matrix_t *matrix);
-
-cairo_public void
-cairo_matrix_multiply (cairo_matrix_t	    *result,
-		       const cairo_matrix_t *a,
-		       const cairo_matrix_t *b);
-
-cairo_public void
-cairo_matrix_transform_distance (const cairo_matrix_t *matrix,
-				 double *dx, double *dy);
-
-cairo_public void
-cairo_matrix_transform_point (const cairo_matrix_t *matrix,
-			      double *x, double *y);
-
-/* Functions to be used while debugging (not intended for use in production code) */
-cairo_public void
-cairo_debug_reset_static_data (void);
-
-CAIRO_END_DECLS
-
-#endif /* CAIRO_H */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gio-unix-2.0/gio/gdesktopappinfo.h b/lib-x86-64/gtk-2.12.12/usr/include/gio-unix-2.0/gio/gdesktopappinfo.h
deleted file mode 100644
index ea13a42a..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gio-unix-2.0/gio/gdesktopappinfo.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: 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;
-};
-
-
-GType g_desktop_app_info_get_type (void) G_GNUC_CONST;
-  
-GDesktopAppInfo *g_desktop_app_info_new_from_filename (const char      *filename);
-GDesktopAppInfo *g_desktop_app_info_new               (const char      *desktop_id);
-gboolean         g_desktop_app_info_get_is_hidden     (GDesktopAppInfo *info);
-
-void             g_desktop_app_info_set_desktop_env   (const char *desktop_env);
-
-
-#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="gio-extension-points">Extending GIO</link>.
- */
-#define G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME "gio-desktop-app-info-lookup"
-
-/**
- * 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);
-};
-
-GType     g_desktop_app_info_lookup_get_type (void) G_GNUC_CONST;
-GAppInfo *g_desktop_app_info_lookup_get_default_for_uri_scheme (GDesktopAppInfoLookup *lookup,
-								const char  *uri_scheme);
-
-G_END_DECLS
-
-
-#endif /* __G_DESKTOP_APP_INFO_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gio-unix-2.0/gio/gunixinputstream.h b/lib-x86-64/gtk-2.12.12/usr/include/gio-unix-2.0/gio/gunixinputstream.h
deleted file mode 100644
index 7bb7cd96..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gio-unix-2.0/gio/gunixinputstream.h
+++ /dev/null
@@ -1,74 +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);
-};
-
-GType g_unix_input_stream_get_type (void) G_GNUC_CONST;
-
-GInputStream *g_unix_input_stream_new (int fd,
-				       gboolean close_fd_at_close);
-
-G_END_DECLS
-
-#endif /* __G_UNIX_INPUT_STREAM_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gio-unix-2.0/gio/gunixmounts.h b/lib-x86-64/gtk-2.12.12/usr/include/gio-unix-2.0/gio/gunixmounts.h
deleted file mode 100644
index 6147f122..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gio-unix-2.0/gio/gunixmounts.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_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))
-
-void           g_unix_mount_free                    (GUnixMountEntry    *mount_entry);
-void           g_unix_mount_point_free              (GUnixMountPoint    *mount_point);
-gint           g_unix_mount_compare                 (GUnixMountEntry    *mount1,
-						     GUnixMountEntry    *mount2);
-const char *   g_unix_mount_get_mount_path          (GUnixMountEntry    *mount_entry);
-const char *   g_unix_mount_get_device_path         (GUnixMountEntry    *mount_entry);
-const char *   g_unix_mount_get_fs_type             (GUnixMountEntry    *mount_entry);
-gboolean       g_unix_mount_is_readonly             (GUnixMountEntry    *mount_entry);
-gboolean       g_unix_mount_is_system_internal      (GUnixMountEntry    *mount_entry);
-gboolean       g_unix_mount_guess_can_eject         (GUnixMountEntry    *mount_entry);
-gboolean       g_unix_mount_guess_should_display    (GUnixMountEntry    *mount_entry);
-char *         g_unix_mount_guess_name              (GUnixMountEntry    *mount_entry);
-GIcon *        g_unix_mount_guess_icon              (GUnixMountEntry    *mount_entry);
-
-gint           g_unix_mount_point_compare           (GUnixMountPoint    *mount1,
-						     GUnixMountPoint    *mount2);
-const char *   g_unix_mount_point_get_mount_path    (GUnixMountPoint    *mount_point);
-const char *   g_unix_mount_point_get_device_path   (GUnixMountPoint    *mount_point);
-const char *   g_unix_mount_point_get_fs_type       (GUnixMountPoint    *mount_point);
-gboolean       g_unix_mount_point_is_readonly       (GUnixMountPoint    *mount_point);
-gboolean       g_unix_mount_point_is_user_mountable (GUnixMountPoint    *mount_point);
-gboolean       g_unix_mount_point_is_loopback       (GUnixMountPoint    *mount_point);
-gboolean       g_unix_mount_point_guess_can_eject   (GUnixMountPoint    *mount_point);
-char *         g_unix_mount_point_guess_name        (GUnixMountPoint    *mount_point);
-GIcon *        g_unix_mount_point_guess_icon        (GUnixMountPoint    *mount_point);
-
-GList *        g_unix_mount_points_get              (guint64            *time_read);
-GList *        g_unix_mounts_get                    (guint64            *time_read);
-GUnixMountEntry *g_unix_mount_at                    (const char         *mount_path,
-						     guint64            *time_read);
-gboolean       g_unix_mounts_changed_since          (guint64             time);
-gboolean       g_unix_mount_points_changed_since    (guint64             time);
-
-GType              g_unix_mount_monitor_get_type (void) G_GNUC_CONST;
-GUnixMountMonitor *g_unix_mount_monitor_new      (void);
-
-gboolean g_unix_is_mount_path_system_internal (const char *mount_path);
-
-G_END_DECLS
-
-#endif /* __G_UNIX_MOUNTS_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gio-unix-2.0/gio/gunixoutputstream.h b/lib-x86-64/gtk-2.12.12/usr/include/gio-unix-2.0/gio/gunixoutputstream.h
deleted file mode 100644
index bfcf614d..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gio-unix-2.0/gio/gunixoutputstream.h
+++ /dev/null
@@ -1,74 +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);
-};
-
-GType g_unix_output_stream_get_type (void) G_GNUC_CONST;
-
-GOutputStream *g_unix_output_stream_new (int fd,
-					 gboolean close_fd_at_close);
-
-G_END_DECLS
-
-#endif /* __G_UNIX_OUTPUT_STREAM_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gappinfo.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gappinfo.h
deleted file mode 100644
index d0fddf75..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gappinfo.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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_APP_INFO_H__
-#define __G_APP_INFO_H__
-
-#include <glib-object.h>
-#include <gio/gicon.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))
-
-/**
- * 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.
- * 
- * 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 >*/
-} GAppInfoCreateFlags;
-
-typedef struct _GAppLaunchContext        GAppLaunchContext;
-typedef struct _GAppLaunchContextClass   GAppLaunchContextClass;
-typedef struct _GAppLaunchContextPrivate GAppLaunchContextPrivate;
-
-/**
- * GAppInfo:
- * 
- * Information about an installed application and methods to launch
- * it (with file arguments).
- */
-typedef struct _GAppInfo         GAppInfo; /* Dummy typedef */
-
-/**
- * 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 execuable 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 extention.
- * @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.
- * 
- * 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                   *filenames,
-					     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);
-};
-
-GType g_app_info_get_type (void) G_GNUC_CONST;
-GType g_app_launch_context_get_type (void) G_GNUC_CONST;
-
-GAppInfo *  g_app_info_create_from_commandline      (const char           *commandline,
-						     const char           *application_name,
-						     GAppInfoCreateFlags   flags,
-						     GError              **error);
-GAppInfo *  g_app_info_dup                          (GAppInfo             *appinfo);
-gboolean    g_app_info_equal                        (GAppInfo             *appinfo1,
-						     GAppInfo             *appinfo2);
-const char *g_app_info_get_id                       (GAppInfo             *appinfo);
-const char *g_app_info_get_name                     (GAppInfo             *appinfo);
-const char *g_app_info_get_description              (GAppInfo             *appinfo);
-const char *g_app_info_get_executable               (GAppInfo             *appinfo);
-GIcon *     g_app_info_get_icon                     (GAppInfo             *appinfo);
-gboolean    g_app_info_launch                       (GAppInfo             *appinfo,
-						     GList                *files,
-						     GAppLaunchContext    *launch_context,
-						     GError              **error);
-gboolean    g_app_info_supports_uris                (GAppInfo             *appinfo);
-gboolean    g_app_info_supports_files               (GAppInfo             *appinfo);
-gboolean    g_app_info_launch_uris                  (GAppInfo             *appinfo,
-						     GList                *uris,
-						     GAppLaunchContext    *launch_context,
-						     GError              **error);
-gboolean    g_app_info_should_show                  (GAppInfo             *appinfo);
-
-gboolean    g_app_info_set_as_default_for_type      (GAppInfo             *appinfo,
-						     const char           *content_type,
-						     GError              **error);
-gboolean    g_app_info_set_as_default_for_extension (GAppInfo             *appinfo,
-						     const char           *extension,
-						     GError              **error);
-gboolean    g_app_info_add_supports_type            (GAppInfo             *appinfo,
-						     const char           *content_type,
-						     GError              **error);
-gboolean    g_app_info_can_remove_supports_type     (GAppInfo             *appinfo);
-gboolean    g_app_info_remove_supports_type         (GAppInfo             *appinfo,
-						     const char           *content_type,
-						     GError              **error);
-
-GList *   g_app_info_get_all                     (void);
-GList *   g_app_info_get_all_for_type            (const char  *content_type);
-GAppInfo *g_app_info_get_default_for_type        (const char  *content_type,
-						  gboolean     must_support_uris);
-GAppInfo *g_app_info_get_default_for_uri_scheme  (const char  *uri_scheme);
-
-gboolean  g_app_info_launch_default_for_uri      (const char              *uri,
-					          GAppLaunchContext       *launch_context,
-					          GError                 **error);
-
-/**
- * GAppLaunchContext:
- * @parent_instance: The parent instance.
- * 
- * 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);
-
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-GAppLaunchContext *g_app_launch_context_new                   (void);
-char *             g_app_launch_context_get_display           (GAppLaunchContext *context,
-							       GAppInfo          *info,
-							       GList             *files);
-char *             g_app_launch_context_get_startup_notify_id (GAppLaunchContext *context,
-							       GAppInfo          *info,
-							       GList             *files);
-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/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gasyncresult.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gasyncresult.h
deleted file mode 100644
index 640d6111..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gasyncresult.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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_ASYNC_RESULT_H__
-#define __G_ASYNC_RESULT_H__
-
-#include <glib-object.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 _GAsyncResult         GAsyncResult; /* Dummy typedef */
-typedef struct _GAsyncResultIface    GAsyncResultIface;
-
-/**
- * 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);
-
-/**
- * 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.
- *
- * Interface definition for #GAsyncResult.
- **/
-struct _GAsyncResultIface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-
-  gpointer   (*get_user_data)      (GAsyncResult                *async_result);
-  GObject *  (*get_source_object)  (GAsyncResult                *async_result);
-};
-
-GType g_async_result_get_type (void) G_GNUC_CONST;
-
-gpointer g_async_result_get_user_data     (GAsyncResult *res);
-GObject *g_async_result_get_source_object (GAsyncResult *res);
-
-G_END_DECLS
-
-#endif /* __G_ASYNC_RESULT_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gbufferedinputstream.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gbufferedinputstream.h
deleted file mode 100644
index 3eea4f9b..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gbufferedinputstream.h
+++ /dev/null
@@ -1,126 +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> 
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_BUFFERED_INPUT_STREAM_H__
-#define __G_BUFFERED_INPUT_STREAM_H__
-
-#include <glib-object.h>
-#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 _GBufferedInputStream         GBufferedInputStream;
-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);
-};
-
-
-GType         g_buffered_input_stream_get_type        (void) G_GNUC_CONST;
-GInputStream* g_buffered_input_stream_new             (GInputStream          *base_stream);
-GInputStream* g_buffered_input_stream_new_sized       (GInputStream          *base_stream,
-						       gsize                  size);
-
-gsize         g_buffered_input_stream_get_buffer_size (GBufferedInputStream  *stream);
-void          g_buffered_input_stream_set_buffer_size (GBufferedInputStream  *stream,
-						       gsize                  size);
-gsize         g_buffered_input_stream_get_available   (GBufferedInputStream  *stream);
-gsize         g_buffered_input_stream_peek            (GBufferedInputStream  *stream,
-						       void                  *buffer,
-						       gsize                  offset,
-						       gsize                  count);
-const void*   g_buffered_input_stream_peek_buffer     (GBufferedInputStream  *stream,
-						       gsize                 *count);
-
-gssize        g_buffered_input_stream_fill            (GBufferedInputStream  *stream,
-						       gssize                 count,
-						       GCancellable          *cancellable,
-						       GError               **error);
-void          g_buffered_input_stream_fill_async      (GBufferedInputStream  *stream,
-						       gssize                 count,
-						       int                    io_priority,
-						       GCancellable          *cancellable,
-						       GAsyncReadyCallback    callback,
-						       gpointer               user_data);
-gssize        g_buffered_input_stream_fill_finish     (GBufferedInputStream  *stream,
-						       GAsyncResult          *result,
-						       GError               **error);
-
-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/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gbufferedoutputstream.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gbufferedoutputstream.h
deleted file mode 100644
index 5adce9e1..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gbufferedoutputstream.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: Christian Kellner <gicmo@gnome.org> 
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_BUFFERED_OUTPUT_STREAM_H__
-#define __G_BUFFERED_OUTPUT_STREAM_H__
-
-#include <glib-object.h>
-#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:
- * @parent_class: The parent class.
- * 
- * An implementation of #GFilterOutputStream with a sized buffer.
- **/
-typedef struct _GBufferedOutputStream         GBufferedOutputStream;
-typedef struct _GBufferedOutputStreamClass    GBufferedOutputStreamClass;
-typedef struct _GBufferedOutputStreamPrivate  GBufferedOutputStreamPrivate;
-
-struct _GBufferedOutputStream
-{
-  GFilterOutputStream parent_instance;
-
-  /*< protected >*/
-  GBufferedOutputStreamPrivate *priv;
-};
-
-struct _GBufferedOutputStreamClass
-{
- 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);
-};
-
-
-GType           g_buffered_output_stream_get_type  (void) G_GNUC_CONST;
-GOutputStream* g_buffered_output_stream_new             (GOutputStream         *base_stream);
-GOutputStream* g_buffered_output_stream_new_sized       (GOutputStream         *base_stream,
-							 gsize                  size);
-gsize          g_buffered_output_stream_get_buffer_size (GBufferedOutputStream *stream);
-void           g_buffered_output_stream_set_buffer_size (GBufferedOutputStream *stream,
-							 gsize                  size);
-gboolean       g_buffered_output_stream_get_auto_grow   (GBufferedOutputStream *stream);
-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/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gcancellable.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gcancellable.h
deleted file mode 100644
index 7c890be9..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gcancellable.h
+++ /dev/null
@@ -1,84 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_CANCELLABLE_H__
-#define __G_CANCELLABLE_H__
-
-#include <glib-object.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 _GCancellable        GCancellable;
-typedef struct _GCancellableClass   GCancellableClass;
-
-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);
-};
-
-GType g_cancellable_get_type (void) G_GNUC_CONST;
-
-GCancellable *g_cancellable_new          (void);
-
-/* These are only safe to call inside a cancellable op */
-gboolean      g_cancellable_is_cancelled           (GCancellable  *cancellable);
-gboolean      g_cancellable_set_error_if_cancelled (GCancellable  *cancellable,
-						    GError       **error);
-int           g_cancellable_get_fd                 (GCancellable  *cancellable);
-GCancellable *g_cancellable_get_current            (void);
-void          g_cancellable_push_current           (GCancellable  *cancellable);
-void          g_cancellable_pop_current            (GCancellable  *cancellable);
-void          g_cancellable_reset                  (GCancellable  *cancellable);
-
-
-/* This is safe to call from another thread */
-void          g_cancellable_cancel       (GCancellable  *cancellable);
-
-G_END_DECLS
-
-#endif /* __G_CANCELLABLE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gcontenttype.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gcontenttype.h
deleted file mode 100644
index 9dcbf149..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gcontenttype.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: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_CONTENT_TYPE_H__
-#define __G_CONTENT_TYPE_H__
-
-#include <glib.h>
-#include <gio/gicon.h>
-
-G_BEGIN_DECLS
-
-gboolean g_content_type_equals            (const char   *type1,
-					   const char   *type2);
-gboolean g_content_type_is_a              (const char   *type,
-					   const char   *supertype);
-gboolean g_content_type_is_unknown        (const char   *type);
-char *   g_content_type_get_description   (const char   *type);
-char *   g_content_type_get_mime_type     (const char   *type);
-GIcon *  g_content_type_get_icon          (const char   *type);
-gboolean g_content_type_can_be_executable (const char   *type);
-
-char *   g_content_type_guess             (const char   *filename,
-					   const guchar *data,
-					   gsize         data_size,
-					   gboolean     *result_uncertain );
-
-GList *  g_content_types_get_registered   (void);
-
-G_END_DECLS
-
-#endif /* __G_CONTENT_TYPE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gdatainputstream.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gdatainputstream.h
deleted file mode 100644
index 0ecd14f5..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gdatainputstream.h
+++ /dev/null
@@ -1,147 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_DATA_INPUT_STREAM_H__
-#define __G_DATA_INPUT_STREAM_H__
-
-#include <glib-object.h>
-#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:
- * @parent: a #GBufferedInputStream.
- *
- * An implementation of #GBufferedInputStream that allows for high-level 
- * data manipulation of arbitrary data (including binary operations).
- **/
-typedef struct _GDataInputStream         GDataInputStream;
-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);
-};
-
-/**
- * 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;
-
-GType          g_data_input_stream_get_type   (void) G_GNUC_CONST;
-GDataInputStream*  g_data_input_stream_new        (GInputStream *base_stream);
-
-void                   g_data_input_stream_set_byte_order   (GDataInputStream        *stream,
-							     GDataStreamByteOrder     order);
-GDataStreamByteOrder   g_data_input_stream_get_byte_order   (GDataInputStream        *stream);
-void                   g_data_input_stream_set_newline_type (GDataInputStream        *stream,
-							     GDataStreamNewlineType   type);
-GDataStreamNewlineType g_data_input_stream_get_newline_type (GDataInputStream        *stream);
-guchar                 g_data_input_stream_read_byte        (GDataInputStream        *stream,
-							     GCancellable            *cancellable,
-							     GError                 **error);
-gint16                 g_data_input_stream_read_int16       (GDataInputStream        *stream,
-							     GCancellable            *cancellable,
-							     GError                 **error);
-guint16                g_data_input_stream_read_uint16      (GDataInputStream        *stream,
-							     GCancellable            *cancellable,
-							     GError                 **error);
-gint32                 g_data_input_stream_read_int32       (GDataInputStream        *stream,
-							     GCancellable            *cancellable,
-							     GError                 **error);
-guint32                g_data_input_stream_read_uint32      (GDataInputStream        *stream,
-							     GCancellable            *cancellable,
-							     GError                 **error);
-gint64                 g_data_input_stream_read_int64       (GDataInputStream        *stream,
-							     GCancellable            *cancellable,
-							     GError                 **error);
-guint64                g_data_input_stream_read_uint64      (GDataInputStream        *stream,
-							     GCancellable            *cancellable,
-							     GError                 **error);
-char *                 g_data_input_stream_read_line        (GDataInputStream        *stream,
-							     gsize                   *length,
-							     GCancellable            *cancellable,
-							     GError                 **error);
-char *                 g_data_input_stream_read_until       (GDataInputStream        *stream,
-							     const gchar             *stop_chars,
-							     gsize                   *length,
-							     GCancellable            *cancellable,
-							     GError                 **error);
-
-G_END_DECLS
-
-#endif /* __G_DATA_INPUT_STREAM_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gdataoutputstream.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gdataoutputstream.h
deleted file mode 100644
index 7a4e4055..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gdataoutputstream.h
+++ /dev/null
@@ -1,117 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_DATA_OUTPUT_STREAM_H__
-#define __G_DATA_OUTPUT_STREAM_H__
-
-#include <glib-object.h>
-#include <gio/gfilteroutputstream.h>
-#include <gio/gdatainputstream.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:
- * @parent_instance: a #GBufferedOutputStream.
- *
- * 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);
-};
-
-
-GType          g_data_output_stream_get_type   (void) G_GNUC_CONST;
-GDataOutputStream*  g_data_output_stream_new        (GOutputStream *base_stream);
-
-void                 g_data_output_stream_set_byte_order (GDataOutputStream     *stream,
-							  GDataStreamByteOrder   order);
-GDataStreamByteOrder g_data_output_stream_get_byte_order (GDataOutputStream     *stream);
-
-gboolean             g_data_output_stream_put_byte       (GDataOutputStream     *stream,
-							  guchar                 data,
-							  GCancellable          *cancellable,
-							  GError               **error);
-gboolean             g_data_output_stream_put_int16      (GDataOutputStream     *stream,
-							  gint16                 data,
-							  GCancellable          *cancellable,
-							  GError               **error);
-gboolean             g_data_output_stream_put_uint16     (GDataOutputStream     *stream,
-							  guint16                data,
-							  GCancellable          *cancellable,
-							  GError               **error);
-gboolean             g_data_output_stream_put_int32      (GDataOutputStream     *stream,
-							  gint32                 data,
-							  GCancellable          *cancellable,
-							  GError               **error);
-gboolean             g_data_output_stream_put_uint32     (GDataOutputStream     *stream,
-							  guint32                data,
-							  GCancellable          *cancellable,
-							  GError               **error);
-gboolean             g_data_output_stream_put_int64      (GDataOutputStream     *stream,
-							  gint64                 data,
-							  GCancellable          *cancellable,
-							  GError               **error);
-gboolean             g_data_output_stream_put_uint64     (GDataOutputStream     *stream,
-							  guint64                data,
-							  GCancellable          *cancellable,
-							  GError               **error);
-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/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gdrive.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gdrive.h
deleted file mode 100644
index 26671b91..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gdrive.h
+++ /dev/null
@@ -1,144 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_DRIVE_H__
-#define __G_DRIVE_H__
-
-#include <glib-object.h>
-#include <gio/gmount.h>
-#include <gio/gvolume.h>
-#include <gio/gmountoperation.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.
- *
- * 
- * 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);
-};
-
-GType g_drive_get_type                    (void) G_GNUC_CONST;
-
-char *   g_drive_get_name                 (GDrive               *drive);
-GIcon *  g_drive_get_icon                 (GDrive               *drive);
-gboolean g_drive_has_volumes              (GDrive               *drive);
-GList *  g_drive_get_volumes              (GDrive               *drive);
-gboolean g_drive_is_media_removable       (GDrive               *drive);
-gboolean g_drive_has_media                (GDrive               *drive);
-gboolean g_drive_is_media_check_automatic (GDrive               *drive);
-gboolean g_drive_can_poll_for_media       (GDrive               *drive);
-gboolean g_drive_can_eject                (GDrive               *drive);
-void     g_drive_eject                    (GDrive               *drive,
-					   GMountUnmountFlags    flags,
-                                           GCancellable         *cancellable,
-                                           GAsyncReadyCallback   callback,
-                                           gpointer              user_data);
-gboolean g_drive_eject_finish             (GDrive               *drive,
-                                           GAsyncResult         *result,
-                                           GError              **error);
-void     g_drive_poll_for_media           (GDrive               *drive,
-                                           GCancellable         *cancellable,
-                                           GAsyncReadyCallback   callback,
-                                           gpointer              user_data);
-gboolean g_drive_poll_for_media_finish    (GDrive               *drive,
-                                           GAsyncResult         *result,
-                                           GError              **error);
-char *   g_drive_get_identifier           (GDrive              *drive,
-					   const char          *kind);
-char **  g_drive_enumerate_identifiers    (GDrive              *drive);
-
-G_END_DECLS
-
-#endif /* __G_DRIVE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gfile.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gfile.h
deleted file mode 100644
index a67b72eb..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gfile.h
+++ /dev/null
@@ -1,929 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILE_H__
-#define __G_FILE_H__
-
-#include <glib-object.h>
-#include <gio/gfileinfo.h>
-#include <gio/gfileenumerator.h>
-#include <gio/gfileinputstream.h>
-#include <gio/gfileoutputstream.h>
-#include <gio/gmountoperation.h>
-#include <gio/gappinfo.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))
-
-/**
- * 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.
- * 
- * Flags used when an operation may create a file.
- */
-typedef enum  {
-  G_FILE_CREATE_NONE = 0,
-  G_FILE_CREATE_PRIVATE = (1<<0)
-} GFileCreateFlags;
-
-
-/**
- * GMountMountFlags:
- * @G_MOUNT_MOUNT_NONE: No flags set.
- * 
- * Flags used when mounting a mount.
- */
-typedef enum  {
-  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;
-
-/**
- * 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.
- *
- * 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)
-} GFileCopyFlags;
-
-/**
- * GFileMonitorFlags:
- * @G_FILE_MONITOR_NONE: No flags set.
- * @G_FILE_MONITOR_WATCH_MOUNTS: Watch for mount events. 
- *
- * Flags used to set what a #GFileMonitor will watch for. 
- */
-typedef enum  {
-  G_FILE_MONITOR_NONE = 0,
-  G_FILE_MONITOR_WATCH_MOUNTS = (1<<0)
-} GFileMonitorFlags;
-
-/**
- * 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 _GFileIface    		GFileIface;
-typedef struct _GFileMonitor            GFileMonitor;
-
-/**
- * GMount:
- * 
- * A handle to an object implementing the #GMountIface interface.
- **/
-typedef struct _GMount         GMount; /* Dummy typedef */
-
-/**
- * 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_read_partial_contents(), 
- * 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);
-
-/**
- * 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.
- * 
- * 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) (void);
-  void                (*_delete_file_finish) (void);
-  
-  gboolean            (*trash)              (GFile                *file,
-					     GCancellable         *cancellable,
-					     GError              **error);
-  void                (*_trash_async) (void);
-  void                (*_trash_finish) (void);
-  
-  gboolean            (*make_directory)     (GFile                *file,
-					     GCancellable         *cancellable,
-					     GError              **error);
-  void                (*_make_directory_async) (void);
-  void                (*_make_directory_finish) (void);
-  
-  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);
-
-};
-
-GType g_file_get_type (void) G_GNUC_CONST;
-
-GFile *                 g_file_new_for_path               (const char                 *path);
-GFile *                 g_file_new_for_uri                (const char                 *uri);
-GFile *                 g_file_new_for_commandline_arg    (const char                 *arg);
-GFile *                 g_file_parse_name                 (const char                 *parse_name);
-GFile *                 g_file_dup                        (GFile                      *file);
-guint                   g_file_hash                       (gconstpointer               file);
-gboolean                g_file_equal                      (GFile                      *file1,
-							   GFile                      *file2);
-char *                  g_file_get_basename               (GFile                      *file);
-char *                  g_file_get_path                   (GFile                      *file);
-char *                  g_file_get_uri                    (GFile                      *file);
-char *                  g_file_get_parse_name             (GFile                      *file);
-GFile *                 g_file_get_parent                 (GFile                      *file);
-GFile *                 g_file_get_child                  (GFile                      *file,
-							   const char                 *name);
-GFile *                 g_file_get_child_for_display_name (GFile                      *file,
-							   const char                 *display_name,
-							   GError                    **error);
-gboolean                g_file_has_prefix                 (GFile                      *file,
-							   GFile                      *prefix);
-char *                  g_file_get_relative_path          (GFile                      *parent,
-							   GFile                      *descendant);
-GFile *                 g_file_resolve_relative_path      (GFile                      *file,
-							   const char                 *relative_path);
-gboolean                g_file_is_native                  (GFile                      *file);
-gboolean                g_file_has_uri_scheme             (GFile                      *file,
-							   const char                 *uri_scheme);
-char *                  g_file_get_uri_scheme             (GFile                      *file);
-GFileInputStream *      g_file_read                       (GFile                      *file,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-void                    g_file_read_async                 (GFile                      *file,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFileInputStream *      g_file_read_finish                (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-GFileOutputStream *     g_file_append_to                  (GFile                      *file,
-							   GFileCreateFlags             flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-GFileOutputStream *     g_file_create                     (GFile                      *file,
-							   GFileCreateFlags             flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-GFileOutputStream *     g_file_replace                    (GFile                      *file,
-							   const char                 *etag,
-							   gboolean                    make_backup,
-							   GFileCreateFlags            flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-void                    g_file_append_to_async            (GFile                      *file,
-							   GFileCreateFlags            flags,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFileOutputStream *     g_file_append_to_finish           (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-void                    g_file_create_async               (GFile                      *file,
-							   GFileCreateFlags            flags,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFileOutputStream *     g_file_create_finish              (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-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);
-GFileOutputStream *     g_file_replace_finish             (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-gboolean                g_file_query_exists               (GFile                      *file,
-							   GCancellable               *cancellable);
-GFileInfo *             g_file_query_info                 (GFile                      *file,
-							   const char                 *attributes,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-void                    g_file_query_info_async           (GFile                      *file,
-							   const char                 *attributes,
-							   GFileQueryInfoFlags         flags,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFileInfo *             g_file_query_info_finish          (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-GFileInfo *             g_file_query_filesystem_info      (GFile                      *file,
-							   const char                 *attributes,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-void                    g_file_query_filesystem_info_async (GFile                      *file,
-							   const char                 *attributes,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFileInfo *             g_file_query_filesystem_info_finish (GFile                      *file,
-                                                           GAsyncResult               *res,
-							   GError                    **error);
-GMount *                g_file_find_enclosing_mount       (GFile                      *file,
-                                                           GCancellable               *cancellable,
-                                                           GError                    **error);
-void                    g_file_find_enclosing_mount_async (GFile                      *file,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GMount *                g_file_find_enclosing_mount_finish (GFile                     *file,
-							    GAsyncResult              *res,
-							    GError                   **error);
-GFileEnumerator *       g_file_enumerate_children         (GFile                      *file,
-							   const char                 *attributes,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-void                    g_file_enumerate_children_async   (GFile                      *file,
-							   const char                 *attributes,
-							   GFileQueryInfoFlags         flags,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFileEnumerator *       g_file_enumerate_children_finish  (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-GFile *                 g_file_set_display_name           (GFile                      *file,
-							   const char                 *display_name,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-void                    g_file_set_display_name_async     (GFile                      *file,
-							   const char                 *display_name,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFile *                 g_file_set_display_name_finish    (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-gboolean                g_file_delete                     (GFile                      *file,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-gboolean                g_file_trash                      (GFile                      *file,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-gboolean                g_file_copy                       (GFile                      *source,
-							   GFile                      *destination,
-							   GFileCopyFlags              flags,
-							   GCancellable               *cancellable,
-							   GFileProgressCallback       progress_callback,
-							   gpointer                    progress_callback_data,
-							   GError                    **error);
-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);
-gboolean                g_file_copy_finish                (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-gboolean                g_file_move                       (GFile                      *source,
-							   GFile                      *destination,
-							   GFileCopyFlags              flags,
-							   GCancellable               *cancellable,
-							   GFileProgressCallback       progress_callback,
-							   gpointer                    progress_callback_data,
-							   GError                    **error);
-gboolean                g_file_make_directory             (GFile                      *file,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-gboolean                g_file_make_symbolic_link         (GFile                      *file,
-							   const char                 *symlink_value,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-GFileAttributeInfoList *g_file_query_settable_attributes  (GFile                      *file,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-GFileAttributeInfoList *g_file_query_writable_namespaces  (GFile                      *file,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-gboolean                g_file_set_attribute              (GFile                      *file,
-							   const char                 *attribute,
-							   GFileAttributeType          type,
-							   gpointer                    value_p,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-gboolean                g_file_set_attributes_from_info   (GFile                      *file,
-							   GFileInfo                  *info,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-void                    g_file_set_attributes_async       (GFile                      *file,
-							   GFileInfo                  *info,
-							   GFileQueryInfoFlags         flags,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-gboolean                g_file_set_attributes_finish      (GFile                      *file,
-							   GAsyncResult               *result,
-							   GFileInfo                 **info,
-							   GError                    **error);
-gboolean                g_file_set_attribute_string       (GFile                      *file,
-							   const char                 *attribute,
-							   const char                 *value,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-gboolean                g_file_set_attribute_byte_string  (GFile                      *file,
-							   const char                 *attribute,
-							   const char                 *value,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-gboolean                g_file_set_attribute_uint32       (GFile                      *file,
-							   const char                 *attribute,
-							   guint32                     value,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-gboolean                g_file_set_attribute_int32        (GFile                      *file,
-							   const char                 *attribute,
-							   gint32                      value,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-gboolean                g_file_set_attribute_uint64       (GFile                      *file,
-							   const char                 *attribute,
-							   guint64                     value,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-gboolean                g_file_set_attribute_int64        (GFile                      *file,
-							   const char                 *attribute,
-							   gint64                      value,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-void                    g_file_mount_enclosing_volume     (GFile                      *location,
-							   GMountMountFlags            flags,
-							   GMountOperation            *mount_operation,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-gboolean                g_file_mount_enclosing_volume_finish (GFile                      *location,
-							   GAsyncResult               *result,
-							   GError                    **error);
-void                    g_file_mount_mountable            (GFile                      *file,
-							   GMountMountFlags            flags,
-							   GMountOperation            *mount_operation,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFile *                 g_file_mount_mountable_finish     (GFile                      *file,
-							   GAsyncResult               *result,
-							   GError                    **error);
-void                    g_file_unmount_mountable          (GFile                      *file,
-							   GMountUnmountFlags          flags,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-gboolean                g_file_unmount_mountable_finish   (GFile                      *file,
-							   GAsyncResult               *result,
-							   GError                    **error);
-void                    g_file_eject_mountable            (GFile                      *file,
-							   GMountUnmountFlags          flags,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-gboolean                g_file_eject_mountable_finish     (GFile                      *file,
-							   GAsyncResult               *result,
-							   GError                    **error);
-
-gboolean                g_file_copy_attributes            (GFile                      *source,
-							   GFile                      *destination,
-							   GFileCopyFlags              flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-
-
-GFileMonitor*           g_file_monitor_directory          (GFile                  *file,
-							   GFileMonitorFlags       flags,
-							   GCancellable           *cancellable,
-							   GError                **error);
-GFileMonitor*           g_file_monitor_file               (GFile                  *file,
-							   GFileMonitorFlags       flags,
-							   GCancellable           *cancellable,
-							   GError                **error);
-
-
-/* Utilities */
-
-GAppInfo *g_file_query_default_handler       (GFile                  *file,
-					      GCancellable           *cancellable,
-					      GError                **error);
-gboolean g_file_load_contents                (GFile                  *file,
-					      GCancellable           *cancellable,
-					      char                  **contents,
-					      gsize                  *length,
-					      char                  **etag_out,
-					      GError                **error);
-void     g_file_load_contents_async          (GFile                  *file,
-					      GCancellable           *cancellable,
-					      GAsyncReadyCallback     callback,
-					      gpointer                user_data);
-gboolean g_file_load_contents_finish         (GFile                  *file,
-					      GAsyncResult           *res,
-					      char                  **contents,
-					      gsize                  *length,
-					      char                  **etag_out,
-					      GError                **error);
-void     g_file_load_partial_contents_async  (GFile                  *file,
-					      GCancellable           *cancellable,
-					      GFileReadMoreCallback   read_more_callback,
-					      GAsyncReadyCallback     callback,
-					      gpointer                user_data);
-gboolean g_file_load_partial_contents_finish (GFile                  *file,
-					      GAsyncResult           *res,
-					      char                  **contents,
-					      gsize                  *length,
-					      char                  **etag_out,
-					      GError                **error);
-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);
-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);
-gboolean g_file_replace_contents_finish      (GFile                  *file,
-					      GAsyncResult           *res,
-					      char                  **new_etag,
-					      GError                **error);
-
-G_END_DECLS
-
-#endif /* __G_FILE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gfileattribute.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gfileattribute.h
deleted file mode 100644
index 758fe9b6..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gfileattribute.h
+++ /dev/null
@@ -1,129 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILE_ATTRIBUTE_H__
-#define __G_FILE_ATTRIBUTE_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/**
- * 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.
- * 
- * 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
-} 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;
-
-/**
- * GFileAttributeInfo:
- * @name: the name of the attribute.
- * @type: the #GFileAttributeType type of the attribute.
- * @flags: a set of #GFileAttributeInfoFlags.
- * 
- * Information about a specific attribute. 
- **/
-typedef struct {
-  char *name;
-  GFileAttributeType type;
-  GFileAttributeInfoFlags flags;
-} GFileAttributeInfo;
-
-/**
- * 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.
- **/
-typedef struct {
-  GFileAttributeInfo *infos;
-  int n_infos;
-} GFileAttributeInfoList;
-
-GFileAttributeInfoList *  g_file_attribute_info_list_new    (void);
-GFileAttributeInfoList *  g_file_attribute_info_list_ref    (GFileAttributeInfoList *list);
-void                      g_file_attribute_info_list_unref  (GFileAttributeInfoList *list);
-GFileAttributeInfoList *  g_file_attribute_info_list_dup    (GFileAttributeInfoList *list);
-const GFileAttributeInfo *g_file_attribute_info_list_lookup (GFileAttributeInfoList *list,
-							     const char             *name);
-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/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gfileenumerator.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gfileenumerator.h
deleted file mode 100644
index 11d04fc4..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gfileenumerator.h
+++ /dev/null
@@ -1,139 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILE_ENUMERATOR_H__
-#define __G_FILE_ENUMERATOR_H__
-
-#include <glib-object.h>
-#include <gio/gioerror.h>
-#include <gio/gcancellable.h>
-#include <gio/gfileinfo.h>
-#include <gio/gasyncresult.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:
- * @parent_instance: The parent class.
- * 
- * A per matched file iterator.
- **/
-typedef struct _GFileEnumerator         GFileEnumerator;
-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                   *res,
-				   GError                        **error);
-  void       (*close_async)       (GFileEnumerator                *enumerator,
-				   int                             io_priority,
-				   GCancellable                   *cancellable,
-				   GAsyncReadyCallback             callback,
-				   gpointer                        user_data);
-  gboolean   (*close_finish)      (GFileEnumerator                *enumerator,
-				   GAsyncResult                   *res,
-				   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);
-};
-
-GType g_file_enumerator_get_type (void) G_GNUC_CONST;
-
-GFileInfo *g_file_enumerator_next_file         (GFileEnumerator      *enumerator,
-						GCancellable         *cancellable,
-						GError              **error);
-gboolean   g_file_enumerator_close             (GFileEnumerator      *enumerator,
-						GCancellable         *cancellable,
-						GError              **error);
-void       g_file_enumerator_next_files_async  (GFileEnumerator      *enumerator,
-						int                   num_files,
-						int                   io_priority,
-						GCancellable         *cancellable,
-						GAsyncReadyCallback   callback,
-						gpointer              user_data);
-GList *    g_file_enumerator_next_files_finish (GFileEnumerator      *enumerator,
-						GAsyncResult         *result,
-						GError              **error);
-void       g_file_enumerator_close_async       (GFileEnumerator      *enumerator,
-						int                   io_priority,
-						GCancellable         *cancellable,
-						GAsyncReadyCallback   callback,
-						gpointer              user_data);
-gboolean   g_file_enumerator_close_finish      (GFileEnumerator      *enumerator,
-						GAsyncResult         *result,
-						GError              **error);
-gboolean   g_file_enumerator_is_closed         (GFileEnumerator      *enumerator);
-gboolean   g_file_enumerator_has_pending       (GFileEnumerator      *enumerator);
-void       g_file_enumerator_set_pending       (GFileEnumerator      *enumerator,
-						gboolean              pending);
-
-G_END_DECLS
-
-#endif /* __G_FILE_ENUMERATOR_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gfileicon.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gfileicon.h
deleted file mode 100644
index 18d73d0d..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gfileicon.h
+++ /dev/null
@@ -1,58 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILE_ICON_H__
-#define __G_FILE_ICON_H__
-
-#include <gio/gloadableicon.h>
-#include <gio/gfile.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 _GFileIcon        GFileIcon;
-typedef struct _GFileIconClass   GFileIconClass;
-
-GType g_file_icon_get_type (void) G_GNUC_CONST;
-  
-GIcon *g_file_icon_new (GFile *file);
-
-GFile *g_file_icon_get_file (GFileIcon *icon);
-
-G_END_DECLS
-
-#endif /* __G_FILE_ICON_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gfileinfo.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gfileinfo.h
deleted file mode 100644
index 93d74a35..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gfileinfo.h
+++ /dev/null
@@ -1,868 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILE_INFO_H__
-#define __G_FILE_INFO_H__
-
-#include <glib-object.h>
-#include <glib/gfileutils.h>
-#include <gio/gfileattribute.h>
-#include <gio/gicon.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 _GFileInfo        GFileInfo;
-typedef struct _GFileInfoClass   GFileInfoClass;
-
-/**
- * GFileAttributeMatcher:
- * 
- * Determines if a string matches a file attribute.
- **/
-typedef struct _GFileAttributeMatcher GFileAttributeMatcher;
-
-/**
- * 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;
-
-/* 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 availible its 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_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_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_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 */
-
-/* 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 */
-
-/* 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_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 */
-
-GType g_file_info_get_type (void) G_GNUC_CONST;
-
-GFileInfo *        g_file_info_new                       (void);
-GFileInfo *        g_file_info_dup                       (GFileInfo  *other);
-void               g_file_info_copy_into                 (GFileInfo  *src_info,
-							  GFileInfo  *dest_info);
-gboolean           g_file_info_has_attribute             (GFileInfo  *info,
-							  const char *attribute);
-char **            g_file_info_list_attributes           (GFileInfo  *info,
-							  const char *name_space);
-gboolean           g_file_info_get_attribute_data        (GFileInfo  *info,
-							  const char *attribute,
-							  GFileAttributeType *type,
-							  gpointer   *value_pp,
-							  GFileAttributeStatus *status);
-GFileAttributeType g_file_info_get_attribute_type        (GFileInfo  *info,
-							  const char *attribute);
-void               g_file_info_remove_attribute          (GFileInfo  *info,
-							  const char *attribute);
-GFileAttributeStatus g_file_info_get_attribute_status    (GFileInfo  *info,
-							  const char *attribute);
-char *             g_file_info_get_attribute_as_string   (GFileInfo  *info,
-							  const char *attribute);
-const char *       g_file_info_get_attribute_string      (GFileInfo  *info,
-							  const char *attribute);
-const char *       g_file_info_get_attribute_byte_string (GFileInfo  *info,
-							  const char *attribute);
-gboolean           g_file_info_get_attribute_boolean     (GFileInfo  *info,
-							  const char *attribute);
-guint32            g_file_info_get_attribute_uint32      (GFileInfo  *info,
-							  const char *attribute);
-gint32             g_file_info_get_attribute_int32       (GFileInfo  *info,
-							  const char *attribute);
-guint64            g_file_info_get_attribute_uint64      (GFileInfo  *info,
-							  const char *attribute);
-gint64             g_file_info_get_attribute_int64       (GFileInfo  *info,
-							  const char *attribute);
-GObject *          g_file_info_get_attribute_object      (GFileInfo  *info,
-							  const char *attribute);
-
-void               g_file_info_set_attribute             (GFileInfo  *info,
-							  const char *attribute,
-							  GFileAttributeType type,
-							  gpointer    value_p);
-void               g_file_info_set_attribute_string      (GFileInfo  *info,
-							  const char *attribute,
-							  const char *attr_value);
-void               g_file_info_set_attribute_byte_string (GFileInfo  *info,
-							  const char *attribute,
-							  const char *attr_value);
-void               g_file_info_set_attribute_boolean     (GFileInfo  *info,
-							  const char *attribute,
-							  gboolean    attr_value);
-void               g_file_info_set_attribute_uint32      (GFileInfo  *info,
-							  const char *attribute,
-							  guint32     attr_value);
-void               g_file_info_set_attribute_int32       (GFileInfo  *info,
-							  const char *attribute,
-							  gint32      attr_value);
-void               g_file_info_set_attribute_uint64      (GFileInfo  *info,
-							  const char *attribute,
-							  guint64     attr_value);
-void               g_file_info_set_attribute_int64       (GFileInfo  *info,
-							  const char *attribute,
-							  gint64      attr_value);
-void               g_file_info_set_attribute_object      (GFileInfo  *info,
-							  const char *attribute,
-							  GObject    *attr_value);
-
-void               g_file_info_clear_status              (GFileInfo  *info);
-
-/* Helper getters: */
-GFileType         g_file_info_get_file_type          (GFileInfo         *info);
-gboolean          g_file_info_get_is_hidden          (GFileInfo         *info);
-gboolean          g_file_info_get_is_backup          (GFileInfo         *info);
-gboolean          g_file_info_get_is_symlink         (GFileInfo         *info);
-const char *      g_file_info_get_name               (GFileInfo         *info);
-const char *      g_file_info_get_display_name       (GFileInfo         *info);
-const char *      g_file_info_get_edit_name          (GFileInfo         *info);
-GIcon *           g_file_info_get_icon               (GFileInfo         *info);
-const char *      g_file_info_get_content_type       (GFileInfo         *info);
-goffset           g_file_info_get_size               (GFileInfo         *info);
-void              g_file_info_get_modification_time  (GFileInfo         *info,
-						      GTimeVal          *result);
-const char *      g_file_info_get_symlink_target     (GFileInfo         *info);
-const char *      g_file_info_get_etag               (GFileInfo         *info);
-gint32            g_file_info_get_sort_order         (GFileInfo         *info);
-
-void              g_file_info_set_attribute_mask     (GFileInfo         *info,
-						      GFileAttributeMatcher *mask);
-void              g_file_info_unset_attribute_mask   (GFileInfo         *info);
-
-/* Helper setters: */
-void              g_file_info_set_file_type          (GFileInfo         *info,
-						      GFileType          type);
-void              g_file_info_set_is_hidden          (GFileInfo         *info,
-						      gboolean           is_hidden);
-void              g_file_info_set_is_symlink         (GFileInfo         *info,
-						      gboolean           is_symlink);
-void              g_file_info_set_name               (GFileInfo         *info,
-						      const char        *name);
-void              g_file_info_set_display_name       (GFileInfo         *info,
-						      const char        *display_name);
-void              g_file_info_set_edit_name          (GFileInfo         *info,
-						      const char        *edit_name);
-void              g_file_info_set_icon               (GFileInfo         *info,
-						      GIcon             *icon);
-void              g_file_info_set_content_type       (GFileInfo         *info,
-						      const char        *content_type);
-void              g_file_info_set_size               (GFileInfo         *info,
-						      goffset            size);
-void              g_file_info_set_modification_time  (GFileInfo         *info,
-						      GTimeVal          *mtime);
-void              g_file_info_set_symlink_target     (GFileInfo         *info,
-						      const char        *symlink_target);
-void              g_file_info_set_sort_order         (GFileInfo         *info,
-						      gint32             sort_order);
-
-GFileAttributeMatcher *g_file_attribute_matcher_new            (const char            *attributes);
-GFileAttributeMatcher *g_file_attribute_matcher_ref            (GFileAttributeMatcher *matcher);
-void                   g_file_attribute_matcher_unref          (GFileAttributeMatcher *matcher);
-gboolean               g_file_attribute_matcher_matches        (GFileAttributeMatcher *matcher,
-								const char            *attribute);
-gboolean               g_file_attribute_matcher_matches_only   (GFileAttributeMatcher *matcher,
-								const char            *attribute);
-gboolean               g_file_attribute_matcher_enumerate_namespace (GFileAttributeMatcher *matcher,
-								     const char            *ns);
-const char *           g_file_attribute_matcher_enumerate_next (GFileAttributeMatcher *matcher);
-
-G_END_DECLS
-
-
-#endif /* __G_FILE_INFO_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gfileinputstream.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gfileinputstream.h
deleted file mode 100644
index 1abc46eb..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gfileinputstream.h
+++ /dev/null
@@ -1,114 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILE_INPUT_STREAM_H__
-#define __G_FILE_INPUT_STREAM_H__
-
-#include <gio/ginputstream.h>
-#include <gio/gfileinfo.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 _GFileInputStream         GFileInputStream;
-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,
-			       char                 *attributes,
-			       GCancellable         *cancellable,
-			       GError              **error);
-  void       (*query_info_async)  (GFileInputStream     *stream,
-				   char                 *attributes,
-				   int                   io_priority,
-				   GCancellable         *cancellable,
-				   GAsyncReadyCallback   callback,
-				   gpointer              user_data);
-  GFileInfo *(*query_info_finish) (GFileInputStream     *stream,
-				   GAsyncResult         *res,
-				   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);
-};
-
-GType g_file_input_stream_get_type (void) G_GNUC_CONST;
-
-GFileInfo *g_file_input_stream_query_info        (GFileInputStream     *stream,
-						  char                 *attributes,
-						  GCancellable         *cancellable,
-						  GError              **error);
-void       g_file_input_stream_query_info_async  (GFileInputStream     *stream,
-						  char                 *attributes,
-						  int                   io_priority,
-						  GCancellable         *cancellable,
-						  GAsyncReadyCallback   callback,
-						  gpointer              user_data);
-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/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gfilemonitor.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gfilemonitor.h
deleted file mode 100644
index dfc3e26d..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gfilemonitor.h
+++ /dev/null
@@ -1,118 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILE_MONITOR_H__
-#define __G_FILE_MONITOR_H__
-
-#include <glib-object.h>
-#include <gio/gfile.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))
-
-/**
- * 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.
- * 
- * 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
-} GFileMonitorEvent;
-
-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);
-};
-
-GType g_file_monitor_get_type (void) G_GNUC_CONST;
-
-gboolean g_file_monitor_cancel         (GFileMonitor *monitor);
-gboolean g_file_monitor_is_cancelled   (GFileMonitor *monitor);
-void     g_file_monitor_set_rate_limit (GFileMonitor *monitor,
-					int           limit_msecs);
-
-
-/* For implementations */
-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/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gfilenamecompleter.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gfilenamecompleter.h
deleted file mode 100644
index c7fd3835..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gfilenamecompleter.h
+++ /dev/null
@@ -1,76 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILENAME_COMPLETER_H__
-#define __G_FILENAME_COMPLETER_H__
-
-#include <glib-object.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 _GFilenameCompleter GFilenameCompleter;
-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);
-};
-
-GType g_filename_completer_get_type (void) G_GNUC_CONST;
-
-GFilenameCompleter *g_filename_completer_new                   (void);
-
-char *              g_filename_completer_get_completion_suffix (GFilenameCompleter *completer,
-								const char *initial_text);
-char **             g_filename_completer_get_completions       (GFilenameCompleter *completer,
-								const char *initial_text);
-void                g_filename_completer_set_dirs_only         (GFilenameCompleter *completer,
-								gboolean dirs_only);
-
-G_END_DECLS
-
-#endif /* __G_FILENAME_COMPLETER_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gfileoutputstream.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gfileoutputstream.h
deleted file mode 100644
index aebb3c24..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gfileoutputstream.h
+++ /dev/null
@@ -1,121 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILE_OUTPUT_STREAM_H__
-#define __G_FILE_OUTPUT_STREAM_H__
-
-#include <gio/goutputstream.h>
-#include <gio/gfileinfo.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 _GFileOutputStream         GFileOutputStream;
-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,
-			       char                 *attributes,
-			       GCancellable         *cancellable,
-			       GError              **error);
-  void       (*query_info_async)  (GFileOutputStream     *stream,
-				   char                 *attributes,
-				   int                   io_priority,
-				   GCancellable         *cancellable,
-				   GAsyncReadyCallback   callback,
-				   gpointer              user_data);
-  GFileInfo *(*query_info_finish) (GFileOutputStream     *stream,
-				   GAsyncResult         *res,
-				   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);
-};
-
-GType g_file_output_stream_get_type (void) G_GNUC_CONST;
-
-
-GFileInfo *g_file_output_stream_query_info (GFileOutputStream  *stream,
-					    char               *attributes,
-					    GCancellable       *cancellable,
-					    GError            **error);
-void       g_file_output_stream_query_info_async  (GFileOutputStream     *stream,
-						   char                 *attributes,
-						   int                   io_priority,
-						   GCancellable         *cancellable,
-						   GAsyncReadyCallback   callback,
-						   gpointer              user_data);
-GFileInfo *g_file_output_stream_query_info_finish (GFileOutputStream     *stream,
-						   GAsyncResult         *result,
-						   GError              **error);
-char *     g_file_output_stream_get_etag      (GFileOutputStream  *stream);
-
-G_END_DECLS
-
-#endif /* __G_FILE_FILE_OUTPUT_STREAM_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gfilterinputstream.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gfilterinputstream.h
deleted file mode 100644
index ee6d9152..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gfilterinputstream.h
+++ /dev/null
@@ -1,75 +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> 
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILTER_INPUT_STREAM_H__
-#define __G_FILTER_INPUT_STREAM_H__
-
-#include <glib-object.h>
-#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 _GFilterInputStream         GFilterInputStream;
-typedef struct _GFilterInputStreamClass    GFilterInputStreamClass;
-typedef struct _GFilterInputStreamPrivate  GFilterInputStreamPrivate;
-
-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);
-};
-
-
-GType          g_filter_input_stream_get_type  (void) G_GNUC_CONST;
-GInputStream  *g_filter_input_stream_get_base_stream (GFilterInputStream *stream);
-G_END_DECLS
-
-#endif /* __G_FILTER_INPUT_STREAM_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gfilteroutputstream.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gfilteroutputstream.h
deleted file mode 100644
index ba2d968e..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gfilteroutputstream.h
+++ /dev/null
@@ -1,75 +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> 
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILTER_OUTPUT_STREAM_H__
-#define __G_FILTER_OUTPUT_STREAM_H__
-
-#include <glib-object.h>
-#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 _GFilterOutputStream         GFilterOutputStream;
-typedef struct _GFilterOutputStreamClass    GFilterOutputStreamClass;
-typedef struct _GFilterOutputStreamPrivate  GFilterOutputStreamPrivate;
-
-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);
-};
-
-
-GType           g_filter_output_stream_get_type  (void) G_GNUC_CONST;
-GOutputStream  *g_filter_output_stream_get_base_stream (GFilterOutputStream *stream);
-G_END_DECLS
-
-#endif /* __G_FILTER_OUTPUT_STREAM_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gicon.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gicon.h
deleted file mode 100644
index dd028899..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gicon.h
+++ /dev/null
@@ -1,76 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_ICON_H__
-#define __G_ICON_H__
-
-#include <glib-object.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 _GIcon         		GIcon; /* Dummy typedef */
-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.
- *
- * 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);
-};
-
-GType g_icon_get_type (void) G_GNUC_CONST;
-
-guint    g_icon_hash  (gconstpointer  icon);
-gboolean g_icon_equal (GIcon         *icon1,
-		       GIcon         *icon2);
-
-G_END_DECLS
-
-#endif /* __G_ICON_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/ginputstream.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/ginputstream.h
deleted file mode 100644
index 3759fec7..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/ginputstream.h
+++ /dev/null
@@ -1,176 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_INPUT_STREAM_H__
-#define __G_INPUT_STREAM_H__
-
-#include <glib-object.h>
-#include <gio/gioerror.h>
-#include <gio/gcancellable.h>
-#include <gio/gasyncresult.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 _GInputStream         GInputStream;
-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);
-};
-
-GType g_input_stream_get_type (void) G_GNUC_CONST;
-
-gssize   g_input_stream_read          (GInputStream          *stream,
-				       void                  *buffer,
-				       gsize                  count,
-				       GCancellable          *cancellable,
-				       GError               **error);
-gboolean g_input_stream_read_all      (GInputStream          *stream,
-				       void                  *buffer,
-				       gsize                  count,
-				       gsize                 *bytes_read,
-				       GCancellable          *cancellable,
-				       GError               **error);
-gssize   g_input_stream_skip          (GInputStream          *stream,
-				       gsize                  count,
-				       GCancellable          *cancellable,
-				       GError               **error);
-gboolean g_input_stream_close         (GInputStream          *stream,
-				       GCancellable          *cancellable,
-				       GError               **error);
-void     g_input_stream_read_async    (GInputStream          *stream,
-				       void                  *buffer,
-				       gsize                  count,
-				       int                    io_priority,
-				       GCancellable          *cancellable,
-				       GAsyncReadyCallback    callback,
-				       gpointer               user_data);
-gssize   g_input_stream_read_finish   (GInputStream          *stream,
-				       GAsyncResult          *result,
-				       GError               **error);
-void     g_input_stream_skip_async    (GInputStream          *stream,
-				       gsize                  count,
-				       int                    io_priority,
-				       GCancellable          *cancellable,
-				       GAsyncReadyCallback    callback,
-				       gpointer               user_data);
-gssize   g_input_stream_skip_finish   (GInputStream          *stream,
-				       GAsyncResult          *result,
-				       GError               **error);
-void     g_input_stream_close_async   (GInputStream          *stream,
-				       int                    io_priority,
-				       GCancellable          *cancellable,
-				       GAsyncReadyCallback    callback,
-				       gpointer               user_data);
-gboolean g_input_stream_close_finish  (GInputStream          *stream,
-				       GAsyncResult          *result,
-				       GError               **error);
-
-/* For implementations: */
-
-gboolean g_input_stream_is_closed     (GInputStream          *stream);
-gboolean g_input_stream_has_pending   (GInputStream          *stream);
-gboolean g_input_stream_set_pending   (GInputStream          *stream,
-				       GError               **error);
-void     g_input_stream_clear_pending (GInputStream          *stream);
-
-G_END_DECLS
-
-#endif /* __G_INPUT_STREAM_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gio.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gio.h
deleted file mode 100644
index a81e17fe..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gio.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_H__
-#define __G_IO_H__
-
-#define __GIO_GIO_H_INSIDE__
-
-#include <gio/gvfs.h>
-#include <gio/gfile.h>
-#include <gio/gvolumemonitor.h>
-#include <gio/gcontenttype.h>
-#include <gio/gappinfo.h>
-#include <gio/gicon.h>
-#include <gio/gfileicon.h>
-#include <gio/gloadableicon.h>
-#include <gio/gthemedicon.h>
-#include <gio/gseekable.h>
-#include <gio/gfilemonitor.h>
-#include <gio/gbufferedinputstream.h>
-#include <gio/gbufferedoutputstream.h>
-#include <gio/gdatainputstream.h>
-#include <gio/gdataoutputstream.h>
-#include <gio/gfilenamecompleter.h>
-#include <gio/gfilterinputstream.h>
-#include <gio/gfilteroutputstream.h>
-#include <gio/giomodule.h>
-#include <gio/gioscheduler.h>
-#include <gio/gmemoryinputstream.h>
-#include <gio/gmemoryoutputstream.h>
-#include <gio/gsimpleasyncresult.h>
-#include <gio/gioenumtypes.h>
-#include <gio/gnativevolumemonitor.h>
-
-#undef __GIO_GIO_H_INSIDE__
-
-#endif /* __G_IO_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gioenumtypes.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gioenumtypes.h
deleted file mode 100644
index ef64328f..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gioenumtypes.h
+++ /dev/null
@@ -1,73 +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 "gappinfo.h" */
-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 ())
-
-/* enumerations from "gdatainputstream.h" */
-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 ())
-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 ())
-
-/* enumerations from "gfile.h" */
-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 ())
-GType g_file_create_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_CREATE_FLAGS (g_file_create_flags_get_type ())
-GType g_mount_mount_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_MOUNT_MOUNT_FLAGS (g_mount_mount_flags_get_type ())
-GType g_mount_unmount_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_MOUNT_UNMOUNT_FLAGS (g_mount_unmount_flags_get_type ())
-GType g_file_copy_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_COPY_FLAGS (g_file_copy_flags_get_type ())
-GType g_file_monitor_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_MONITOR_FLAGS (g_file_monitor_flags_get_type ())
-
-/* enumerations from "gfileattribute.h" */
-GType g_file_attribute_type_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_ATTRIBUTE_TYPE (g_file_attribute_type_get_type ())
-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 ())
-GType g_file_attribute_status_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_ATTRIBUTE_STATUS (g_file_attribute_status_get_type ())
-
-/* enumerations from "gfileinfo.h" */
-GType g_file_type_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_TYPE (g_file_type_get_type ())
-GType g_filesystem_preview_type_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILESYSTEM_PREVIEW_TYPE (g_filesystem_preview_type_get_type ())
-
-/* enumerations from "gfilemonitor.h" */
-GType g_file_monitor_event_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_MONITOR_EVENT (g_file_monitor_event_get_type ())
-
-/* enumerations from "gioerror.h" */
-GType g_io_error_enum_get_type (void) G_GNUC_CONST;
-#define G_TYPE_IO_ERROR_ENUM (g_io_error_enum_get_type ())
-
-/* enumerations from "gmountoperation.h" */
-GType g_ask_password_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_ASK_PASSWORD_FLAGS (g_ask_password_flags_get_type ())
-GType g_password_save_get_type (void) G_GNUC_CONST;
-#define G_TYPE_PASSWORD_SAVE (g_password_save_get_type ())
-GType g_mount_operation_result_get_type (void) G_GNUC_CONST;
-#define G_TYPE_MOUNT_OPERATION_RESULT (g_mount_operation_result_get_type ())
-
-/* enumerations from "goutputstream.h" */
-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 ())
-G_END_DECLS
-
-#endif /* __GIO_ENUM_TYPES_H__ */
-
-/* Generated data ends here */
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gioerror.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gioerror.h
deleted file mode 100644
index 01a1ae29..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gioerror.h
+++ /dev/null
@@ -1,126 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_IO_ERROR_H__
-#define __G_IO_ERROR_H__
-
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-GQuark          g_io_error_quark      (void);
-
-/**
- * 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()
-
-/* 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 error.
- * @G_IO_ERROR_EXISTS: File already exists error.
- * @G_IO_ERROR_IS_DIRECTORY: File is a directory error.
- * @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.
- *
- * 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
-} GIOErrorEnum;
-
-GIOErrorEnum g_io_error_from_errno (gint err_no);
-
-G_END_DECLS
-
-#endif /* __G_IO_ERROR_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/giomodule.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/giomodule.h
deleted file mode 100644
index 2801d773..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/giomodule.h
+++ /dev/null
@@ -1,99 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_IO_MODULE_H__
-#define __G_IO_MODULE_H__
-
-#include <glib-object.h>
-#include <gmodule.h>
-
-G_BEGIN_DECLS
-
-#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 _GIOModule GIOModule;
-typedef struct _GIOModuleClass GIOModuleClass;
-
-typedef struct _GIOExtensionPoint GIOExtensionPoint;
-typedef struct _GIOExtension GIOExtension;
-
-GType      g_io_module_get_type (void) G_GNUC_CONST;
-GIOModule *g_io_module_new      (const gchar *filename);
-
-GList *g_io_modules_load_all_in_directory            (const char *dirname);
-
-GIOExtensionPoint *g_io_extension_point_register              (const char        *name);
-GIOExtensionPoint *g_io_extension_point_lookup                (const char        *name);
-void               g_io_extension_point_set_required_type     (GIOExtensionPoint *extension_point,
-							       GType              type);
-GType              g_io_extension_point_get_required_type     (GIOExtensionPoint *extension_point);
-GList             *g_io_extension_point_get_extensions        (GIOExtensionPoint *extension_point);
-GIOExtension *     g_io_extension_point_get_extension_by_name (GIOExtensionPoint *extension_point,
-							       const char        *name);
-GIOExtension *     g_io_extension_point_implement             (const char        *extension_point_name,
-							       GType              type,
-							       const char        *extension_name,
-							       gint               priority);
-
-GType                   g_io_extension_get_type     (GIOExtension *extension);
-const char *            g_io_extension_get_name     (GIOExtension *extension);
-gint                    g_io_extension_get_priority (GIOExtension *extension);
-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.
- **/
-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.
- **/
-void        g_io_module_unload   (GIOModule   *module);
-
-G_END_DECLS
-
-#endif /* __G_IO_MODULE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gioscheduler.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gioscheduler.h
deleted file mode 100644
index 03c7f94f..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gioscheduler.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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_IO_SCHEDULER_H__
-#define __G_IO_SCHEDULER_H__
-
-#include <glib.h>
-#include <gio/gcancellable.h>
-
-G_BEGIN_DECLS
-
-/**
- * GIOSchedulerJob:
- * 
- * Opaque class for definining and scheduling IO jobs.
- **/
-typedef struct _GIOSchedulerJob GIOSchedulerJob;
-
-/**
- * GIOSchedulerJobFunc:
- * @job: a #GIOSchedulerJob.
- * @cancellable: optional #GCancellable object, %NULL to ignore.
- * @user_data: the data to pass to callback function
- * 
- * I/O Job function. 
- *
- * Note that depending on whether threads are available, the 
- * #GIOScheduler may run jobs in separate threads or in an idle 
- * in the mainloop. 
- *
- * 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);
-
-void     g_io_scheduler_push_job                   (GIOSchedulerJobFunc  job_func,
-						    gpointer             user_data,
-						    GDestroyNotify       notify,
-						    gint                 io_priority,
-						    GCancellable        *cancellable);
-void     g_io_scheduler_cancel_all_jobs            (void);
-gboolean g_io_scheduler_job_send_to_mainloop       (GIOSchedulerJob     *job,
-						    GSourceFunc          func,
-						    gpointer             user_data,
-						    GDestroyNotify       notify);
-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/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gloadableicon.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gloadableicon.h
deleted file mode 100644
index 3973f74d..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_LOADABLE_ICON_H__
-#define __G_LOADABLE_ICON_H__
-
-#include <glib-object.h>
-#include <gio/gicon.h>
-#include <gio/ginputstream.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 _GLoadableIcon         		GLoadableIcon; /* Dummy typedef */
-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);
-};
-
-GType g_loadable_icon_get_type (void) G_GNUC_CONST;
-
-
-GInputStream *g_loadable_icon_load        (GLoadableIcon        *icon,
-					   int                   size,
-					   char                **type,
-					   GCancellable         *cancellable,
-					   GError              **error);
-void          g_loadable_icon_load_async  (GLoadableIcon        *icon,
-					   int                   size,
-					   GCancellable         *cancellable,
-					   GAsyncReadyCallback   callback,
-					   gpointer              user_data);
-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/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gmemoryinputstream.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gmemoryinputstream.h
deleted file mode 100644
index 0e3e43f2..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gmemoryinputstream.h
+++ /dev/null
@@ -1,84 +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> 
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_MEMORY_INPUT_STREAM_H__
-#define __G_MEMORY_INPUT_STREAM_H__
-
-#include <glib-object.h>
-#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 _GMemoryInputStream         GMemoryInputStream;
-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);
-};
-
-
-GType          g_memory_input_stream_get_type  (void) G_GNUC_CONST;
-GInputStream * g_memory_input_stream_new               (void);
-GInputStream * g_memory_input_stream_new_from_data     (const void     *data,
-					  	   	gssize          len,
-						    	GDestroyNotify  destroy);
-void           g_memory_input_stream_add_data          (GMemoryInputStream *stream,
-                                                        const void         *data,
-                                                        gssize              len,
-                                                        GDestroyNotify      destroy);
-
-G_END_DECLS
-
-#endif /* __G_MEMORY_INPUT_STREAM_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gmemoryoutputstream.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gmemoryoutputstream.h
deleted file mode 100644
index 99fd8c2e..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gmemoryoutputstream.h
+++ /dev/null
@@ -1,97 +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> 
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_MEMORY_OUTPUT_STREAM_H__
-#define __G_MEMORY_OUTPUT_STREAM_H__
-
-#include <glib-object.h>
-#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 _GMemoryOutputStream         GMemoryOutputStream;
-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);
-
-GType          g_memory_output_stream_get_type (void) G_GNUC_CONST;
-
-GOutputStream *g_memory_output_stream_new      (gpointer             data,
-                                                gsize                len,
-                                                GReallocFunc         realloc_fn,
-                                                GDestroyNotify       destroy);
-gpointer       g_memory_output_stream_get_data (GMemoryOutputStream *ostream);
-gsize          g_memory_output_stream_get_size (GMemoryOutputStream *ostream);
-
-G_END_DECLS
-
-#endif /* __G_MEMORY_OUTPUT_STREAM_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gmount.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gmount.h
deleted file mode 100644
index c2474d56..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gmount.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>
- *         David Zeuthen <davidz@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_MOUNT_H__
-#define __G_MOUNT_H__
-
-#include <glib-object.h>
-#include <gio/gfile.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))
-
-/* GMount typedef is in gfile.h due to include order issues */
-/**
- * GVolume:
- * 
- * Opaque mountable volume object.
- **/
-typedef struct _GVolume GVolume; /* Dummy typedef */
-
-/**
- * GDrive:
- * 
- * Opaque drive object.
- **/
-typedef struct _GDrive          GDrive; /* Dummy typedef */
-
-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.
- * @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.
- * 
- * 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);
-};
-
-GType g_mount_get_type (void) G_GNUC_CONST;
-
-GFile *            g_mount_get_root             (GMount              *mount);
-char *             g_mount_get_name             (GMount              *mount);
-GIcon *            g_mount_get_icon             (GMount              *mount);
-char *             g_mount_get_uuid             (GMount              *mount);
-GVolume *          g_mount_get_volume           (GMount              *mount);
-GDrive *           g_mount_get_drive            (GMount              *mount);
-gboolean           g_mount_can_unmount          (GMount              *mount);
-gboolean           g_mount_can_eject            (GMount              *mount);
-void               g_mount_unmount              (GMount              *mount,
-						 GMountUnmountFlags   flags,
-                                                 GCancellable        *cancellable,
-                                                 GAsyncReadyCallback  callback,
-                                                 gpointer             user_data);
-gboolean           g_mount_unmount_finish       (GMount              *mount,
-                                                 GAsyncResult        *result,
-                                                 GError             **error);
-void               g_mount_eject                (GMount              *mount,
-						 GMountUnmountFlags   flags,
-                                                 GCancellable        *cancellable,
-                                                 GAsyncReadyCallback  callback,
-                                                 gpointer             user_data);
-gboolean           g_mount_eject_finish         (GMount              *mount,
-                                                 GAsyncResult        *result,
-                                                 GError             **error);
-void               g_mount_remount              (GMount              *mount,
-						 GMountMountFlags     flags,
-						 GMountOperation     *mount_operation,
-                                                 GCancellable        *cancellable,
-                                                 GAsyncReadyCallback  callback,
-                                                 gpointer             user_data);
-gboolean           g_mount_remount_finish       (GMount              *mount,
-                                                 GAsyncResult        *result,
-                                                 GError             **error);
-
-G_END_DECLS
-
-#endif /* __G_MOUNT_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gmountoperation.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gmountoperation.h
deleted file mode 100644
index a220d954..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gmountoperation.h
+++ /dev/null
@@ -1,172 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_MOUNT_OPERATION_H__
-#define __G_MOUNT_OPERATION_H__
-
-#include <sys/stat.h>
-
-#include <glib-object.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 _GMountOperation        GMountOperation;
-typedef struct _GMountOperationClass   GMountOperationClass;
-typedef struct _GMountOperationPrivate GMountOperationPrivate;
-
-struct _GMountOperation
-{
-  GObject parent_instance;
-
-  GMountOperationPrivate *priv;
-};
-
-/**
- * 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.
- **/ 
-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 availible
- * @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;
-
-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);
-  
-  /*< 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);
-  void (*_g_reserved11) (void);
-  void (*_g_reserved12) (void);
-};
-
-GType g_mount_operation_get_type (void) G_GNUC_CONST;
-  
-GMountOperation *  g_mount_operation_new (void);
-
-const char *  g_mount_operation_get_username      (GMountOperation *op);
-void          g_mount_operation_set_username      (GMountOperation *op,
-						   const char      *username);
-const char *  g_mount_operation_get_password      (GMountOperation *op);
-void          g_mount_operation_set_password      (GMountOperation *op,
-						   const char      *password);
-gboolean      g_mount_operation_get_anonymous     (GMountOperation *op);
-void          g_mount_operation_set_anonymous     (GMountOperation *op,
-						   gboolean         anonymous);
-const char *  g_mount_operation_get_domain        (GMountOperation *op);
-void          g_mount_operation_set_domain        (GMountOperation *op,
-						   const char      *domain);
-GPasswordSave g_mount_operation_get_password_save (GMountOperation *op);
-void          g_mount_operation_set_password_save (GMountOperation *op,
-						   GPasswordSave    save);
-int           g_mount_operation_get_choice        (GMountOperation *op);
-void          g_mount_operation_set_choice        (GMountOperation *op,
-						   int              choice);
-void          g_mount_operation_reply             (GMountOperation *op,
-						   GMountOperationResult result);
-
-G_END_DECLS
-
-#endif /* __G_MOUNT_OPERATION_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gnativevolumemonitor.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gnativevolumemonitor.h
deleted file mode 100644
index 3face1b2..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gnativevolumemonitor.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef __G_NATIVE_VOLUME_MONITOR_H__
-#define __G_NATIVE_VOLUME_MONITOR_H__
-
-#include <glib-object.h>
-#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);
-};
-
-GType g_native_volume_monitor_get_type (void) G_GNUC_CONST;
-
-
-G_END_DECLS
-
-#endif /* __G_NATIVE_VOLUME_MONITOR_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/goutputstream.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/goutputstream.h
deleted file mode 100644
index 263e6e6d..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/goutputstream.h
+++ /dev/null
@@ -1,225 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_OUTPUT_STREAM_H__
-#define __G_OUTPUT_STREAM_H__
-
-#include <glib-object.h>
-#include <gio/gioerror.h>
-#include <gio/gasyncresult.h>
-#include <gio/gcancellable.h>
-#include <gio/ginputstream.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))
-
-/**
- * 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;
-
-/**
- * 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 _GOutputStream         GOutputStream;
-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             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);
-};
-
-GType g_output_stream_get_type (void) G_GNUC_CONST;
-  
-gssize   g_output_stream_write         (GOutputStream             *stream,
-					const void                *buffer,
-					gsize                      count,
-					GCancellable              *cancellable,
-					GError                   **error);
-gboolean g_output_stream_write_all     (GOutputStream             *stream,
-					const void                *buffer,
-					gsize                      count,
-					gsize                     *bytes_written,
-					GCancellable              *cancellable,
-					GError                   **error);
-gssize   g_output_stream_splice        (GOutputStream             *stream,
-					GInputStream              *source,
-					GOutputStreamSpliceFlags   flags,
-					GCancellable              *cancellable,
-					GError                   **error);
-gboolean g_output_stream_flush         (GOutputStream             *stream,
-					GCancellable              *cancellable,
-					GError                   **error);
-gboolean g_output_stream_close         (GOutputStream             *stream,
-					GCancellable              *cancellable,
-					GError                   **error);
-void     g_output_stream_write_async   (GOutputStream             *stream,
-					const void                *buffer,
-					gsize                      count,
-					int                        io_priority,
-					GCancellable              *cancellable,
-					GAsyncReadyCallback        callback,
-					gpointer                   user_data);
-gssize   g_output_stream_write_finish  (GOutputStream             *stream,
-					GAsyncResult              *result,
-					GError                   **error);
-void     g_output_stream_splice_async  (GOutputStream             *stream,
-					GInputStream              *source,
-					GOutputStreamSpliceFlags   flags,
-					int                        io_priority,
-					GCancellable              *cancellable,
-					GAsyncReadyCallback        callback,
-					gpointer                   user_data);
-gssize   g_output_stream_splice_finish (GOutputStream             *stream,
-					GAsyncResult              *result,
-					GError                   **error);
-void     g_output_stream_flush_async   (GOutputStream             *stream,
-					int                        io_priority,
-					GCancellable              *cancellable,
-					GAsyncReadyCallback        callback,
-					gpointer                   user_data);
-gboolean g_output_stream_flush_finish  (GOutputStream             *stream,
-					GAsyncResult              *result,
-					GError                   **error);
-void     g_output_stream_close_async   (GOutputStream             *stream,
-					int                        io_priority,
-					GCancellable              *cancellable,
-					GAsyncReadyCallback        callback,
-					gpointer                   user_data);
-gboolean g_output_stream_close_finish  (GOutputStream             *stream,
-					GAsyncResult              *result,
-					GError                   **error);
-
-gboolean g_output_stream_is_closed     (GOutputStream             *stream);
-gboolean g_output_stream_has_pending   (GOutputStream             *stream);
-gboolean g_output_stream_set_pending   (GOutputStream             *stream,
-					GError                   **error);
-void     g_output_stream_clear_pending (GOutputStream             *stream);
-
-
-G_END_DECLS
-
-#endif /* __G_OUTPUT_STREAM_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gseekable.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gseekable.h
deleted file mode 100644
index 78b8998c..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gseekable.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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_SEEKABLE_H__
-#define __G_SEEKABLE_H__
-
-#include <glib-object.h>
-#include <gio/gcancellable.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 _GSeekable        GSeekable;
-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: Chekcs if truncation is suppored 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 */
-};
-
-GType g_seekable_get_type (void) G_GNUC_CONST;
-
-goffset  g_seekable_tell         (GSeekable     *seekable);
-gboolean g_seekable_can_seek     (GSeekable     *seekable);
-gboolean g_seekable_seek         (GSeekable     *seekable,
-				  goffset        offset,
-				  GSeekType      type,
-				  GCancellable  *cancellable,
-				  GError       **error);
-gboolean g_seekable_can_truncate (GSeekable     *seekable);
-gboolean g_seekable_truncate     (GSeekable     *seekable,
-				  goffset        offset,
-				  GCancellable  *cancellable,
-				  GError       **error);
-
-G_END_DECLS
-
-
-#endif /* __G_SEEKABLE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gsimpleasyncresult.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gsimpleasyncresult.h
deleted file mode 100644
index f2f9b36d..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gsimpleasyncresult.h
+++ /dev/null
@@ -1,137 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_SIMPLE_ASYNC_RESULT_H__
-#define __G_SIMPLE_ASYNC_RESULT_H__
-
-#include <gio/gasyncresult.h>
-#include <gio/gcancellable.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 _GSimpleAsyncResult        GSimpleAsyncResult;
-typedef struct _GSimpleAsyncResultClass   GSimpleAsyncResultClass;
-
-/**
- * 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);
-
-
-GType g_simple_async_result_get_type (void) G_GNUC_CONST;
-  
-GSimpleAsyncResult *g_simple_async_result_new              (GObject                 *source_object,
-							    GAsyncReadyCallback      callback,
-							    gpointer                 user_data,
-							    gpointer                 source_tag);
-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);
-GSimpleAsyncResult *g_simple_async_result_new_from_error   (GObject                 *source_object,
-							    GAsyncReadyCallback      callback,
-							    gpointer                 user_data,
-							    GError                  *error);
-
-void                g_simple_async_result_set_op_res_gpointer (GSimpleAsyncResult      *simple,
-                                                               gpointer                 op_res,
-                                                               GDestroyNotify           destroy_op_res);
-gpointer            g_simple_async_result_get_op_res_gpointer (GSimpleAsyncResult      *simple);
-
-void                g_simple_async_result_set_op_res_gssize   (GSimpleAsyncResult      *simple,
-                                                               gssize                   op_res);
-gssize              g_simple_async_result_get_op_res_gssize   (GSimpleAsyncResult      *simple);
-
-void                g_simple_async_result_set_op_res_gboolean (GSimpleAsyncResult      *simple,
-                                                               gboolean                 op_res);
-gboolean            g_simple_async_result_get_op_res_gboolean (GSimpleAsyncResult      *simple);
-
-
-
-gpointer            g_simple_async_result_get_source_tag   (GSimpleAsyncResult      *simple);
-void                g_simple_async_result_set_handle_cancellation (GSimpleAsyncResult      *simple,
-								   gboolean          handle_cancellation);
-void                g_simple_async_result_complete         (GSimpleAsyncResult      *simple);
-void                g_simple_async_result_complete_in_idle (GSimpleAsyncResult      *simple);
-void                g_simple_async_result_run_in_thread    (GSimpleAsyncResult      *simple,
-							    GSimpleAsyncThreadFunc   func,
-							    int                      io_priority,
-							    GCancellable            *cancellable);
-void                g_simple_async_result_set_from_error   (GSimpleAsyncResult      *simple,
-							    GError                  *error);
-gboolean            g_simple_async_result_propagate_error  (GSimpleAsyncResult      *simple,
-							    GError                 **dest);
-void                g_simple_async_result_set_error        (GSimpleAsyncResult      *simple,
-							    GQuark                   domain,
-							    gint                     code,
-							    const char              *format,
-							    ...) G_GNUC_PRINTF (4, 5);
-void                g_simple_async_result_set_error_va     (GSimpleAsyncResult      *simple,
-							    GQuark                   domain,
-							    gint                     code,
-							    const char              *format,
-							    va_list                  args);
-
-void g_simple_async_report_error_in_idle  (GObject *object,
-					   GAsyncReadyCallback callback,
-					   gpointer user_data,
-					   GQuark         domain,
-					   gint           code,
-					   const char    *format,
-					   ...);
-void g_simple_async_report_gerror_in_idle (GObject *object,
-					   GAsyncReadyCallback callback,
-					   gpointer user_data,
-					   GError *error);
-
-G_END_DECLS
-
-
-  
-#endif /* __G_SIMPLE_ASYNC_RESULT_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gthemedicon.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gthemedicon.h
deleted file mode 100644
index 5fb8a6b4..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gthemedicon.h
+++ /dev/null
@@ -1,60 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_THEMED_ICON_H__
-#define __G_THEMED_ICON_H__
-
-#include <gio/gicon.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 _GThemedIcon        GThemedIcon;
-typedef struct _GThemedIconClass   GThemedIconClass;
-
-GType g_themed_icon_get_type (void) G_GNUC_CONST;
-  
-GIcon *g_themed_icon_new (const char *iconname);
-GIcon *g_themed_icon_new_with_default_fallbacks (const char *iconname);
-GIcon *g_themed_icon_new_from_names (char **iconnames, int len);
-void   g_themed_icon_append_name (GThemedIcon *icon, const char *iconname);
-
-const char * const *g_themed_icon_get_names (GThemedIcon *icon);
-
-G_END_DECLS
-
-#endif /* __G_THEMED_ICON_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gvfs.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gvfs.h
deleted file mode 100644
index 9c513468..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gvfs.h
+++ /dev/null
@@ -1,112 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_VFS_H__
-#define __G_VFS_H__
-
-#include <glib-object.h>
-#include <gio/gfile.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="gio-extension-points">Extending GIO</link>.
- */
-#define G_VFS_EXTENSION_POINT_NAME "gio-vfs"
-
-/**
- * GVfs:
- * 
- * Virtual File System object.
- **/
-typedef struct _GVfs         GVfs; /* Dummy typedef */
-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 >*/
-  /* 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);
-  void (*_g_reserved11) (void);
-  void (*_g_reserved12) (void);
-  
-};
-
-GType g_vfs_get_type (void) G_GNUC_CONST;
-
-gboolean              g_vfs_is_active                 (GVfs       *vfs);
-GFile *               g_vfs_get_file_for_path         (GVfs       *vfs,
-				                       const char *path);
-GFile *               g_vfs_get_file_for_uri          (GVfs       *vfs,
-				                       const char *uri);
-const gchar * const * g_vfs_get_supported_uri_schemes (GVfs *vfs);
-
-GFile *               g_vfs_parse_name                (GVfs       *vfs,
-				                       const char *parse_name);
-
-GVfs *                g_vfs_get_default               (void);
-GVfs *                g_vfs_get_local                 (void);
-
-G_END_DECLS
-
-#endif /* __G_VFS_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gvolume.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gvolume.h
deleted file mode 100644
index f1ec0f5f..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gvolume.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>
- *         David Zeuthen <davidz@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_VOLUME_H__
-#define __G_VOLUME_H__
-
-#include <glib-object.h>
-#include <gio/gfile.h>
-#include <gio/gdrive.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"
-
-
-#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.
- * @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.
- * 
- * 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);
-  
-};
-
-GType     g_volume_get_type       (void) G_GNUC_CONST;
-
-char *   g_volume_get_name              (GVolume              *volume);
-GIcon *  g_volume_get_icon              (GVolume              *volume);
-char *   g_volume_get_uuid              (GVolume              *volume);
-GDrive * g_volume_get_drive             (GVolume              *volume);
-GMount * g_volume_get_mount             (GVolume              *volume);
-gboolean g_volume_can_mount             (GVolume              *volume);
-gboolean g_volume_can_eject             (GVolume              *volume);
-gboolean g_volume_should_automount      (GVolume              *volume);
-void     g_volume_mount                 (GVolume              *volume,
-					 GMountMountFlags      flags,
-					 GMountOperation      *mount_operation,
-					 GCancellable         *cancellable,
-					 GAsyncReadyCallback   callback,
-					 gpointer              user_data);
-gboolean g_volume_mount_finish          (GVolume              *volume,
-					 GAsyncResult         *result,
-					 GError              **error);
-void     g_volume_eject                 (GVolume              *volume,
-					 GMountUnmountFlags    flags,
-					 GCancellable         *cancellable,
-					 GAsyncReadyCallback   callback,
-					 gpointer              user_data);
-gboolean g_volume_eject_finish          (GVolume              *volume,
-					 GAsyncResult         *result,
-					 GError              **error);
-char *   g_volume_get_identifier        (GVolume              *volume,
-					 const char           *kind);
-char **  g_volume_enumerate_identifiers (GVolume              *volume);
-
-
-G_END_DECLS
-
-#endif /* __G_VOLUME_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gvolumemonitor.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gvolumemonitor.h
deleted file mode 100644
index 9d32ceab..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gio/gvolumemonitor.h
+++ /dev/null
@@ -1,145 +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>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_VOLUME_MONITOR_H__
-#define __G_VOLUME_MONITOR_H__
-
-#include <glib-object.h>
-#include <gio/gmount.h>
-#include <gio/gvolume.h>
-#include <gio/gdrive.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="gio-extension-points">Extending GIO</link>.
- */
-#define G_VOLUME_MONITOR_EXTENSION_POINT_NAME "gio-volume-monitor"
-
-/**
- * GVolumeMonitor:
- * @parent_instance: The parent instance.
- *
- * A Volume Monitor that watches for volume events.
- **/
-typedef struct _GVolumeMonitor GVolumeMonitor;
-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) */
-  GVolume * (*adopt_orphan_mount)   (GMount          *mount,
-                                     GVolumeMonitor  *volume_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);
-  void (*_g_reserved6) (void);
-  void (*_g_reserved7) (void);
-  void (*_g_reserved8) (void);
-};
-
-GType g_volume_monitor_get_type (void) G_GNUC_CONST;
-
-GVolumeMonitor *g_volume_monitor_get                     (void);
-GList *         g_volume_monitor_get_connected_drives    (GVolumeMonitor  *volume_monitor);
-GList *         g_volume_monitor_get_volumes             (GVolumeMonitor  *volume_monitor);
-GList *         g_volume_monitor_get_mounts              (GVolumeMonitor  *volume_monitor);
-GVolume *       g_volume_monitor_get_volume_for_uuid     (GVolumeMonitor  *volume_monitor,
-                                                          const char      *uuid);
-GMount *        g_volume_monitor_get_mount_for_uuid      (GVolumeMonitor  *volume_monitor,
-                                                          const char      *uuid);
-
-GVolume *       g_volume_monitor_adopt_orphan_mount      (GMount *mount);
-
-G_END_DECLS
-
-#endif /* __G_VOLUME_MONITOR_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib-object.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib-object.h
deleted file mode 100644
index 8687ef1f..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib-object.h
+++ /dev/null
@@ -1,41 +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/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/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib.h
deleted file mode 100644
index 529c831e..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib.h
+++ /dev/null
@@ -1,87 +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__
-
-#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/gbookmarkfile.h>
-#include <glib/gcache.h>
-#include <glib/gchecksum.h>
-#include <glib/gcompletion.h>
-#include <glib/gconvert.h>
-#include <glib/gdataset.h>
-#include <glib/gdate.h>
-#include <glib/gdir.h>
-#include <glib/gerror.h>
-#include <glib/gfileutils.h>
-#include <glib/ghash.h>
-#include <glib/ghook.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/gprimes.h>
-#include <glib/gqsort.h>
-#include <glib/gquark.h>
-#include <glib/gqueue.h>
-#include <glib/grand.h>
-#include <glib/grel.h>
-#include <glib/gregex.h>
-#include <glib/gscanner.h>
-#include <glib/gsequence.h>
-#include <glib/gshell.h>
-#include <glib/gslist.h>
-#include <glib/gspawn.h>
-#include <glib/gstrfuncs.h>
-#include <glib/gstring.h>
-#include <glib/gtestutils.h>
-#include <glib/gthread.h>
-#include <glib/gthreadpool.h>
-#include <glib/gtimer.h>
-#include <glib/gtree.h>
-#include <glib/gtypes.h>
-#include <glib/gunicode.h>
-#include <glib/gurifuncs.h>
-#include <glib/gutils.h>
-#ifdef G_PLATFORM_WIN32
-#include <glib/gwin32.h>
-#endif
-
-#endif /* __G_LIB_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/galloca.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/galloca.h
deleted file mode 100644
index baf80096..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/galloca.h
+++ /dev/null
@@ -1,60 +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__
-
-#include <glib/gtypes.h>
-
-#ifdef  __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 */
-
-#define g_alloca(size)		 alloca (size)
-#define g_newa(struct_type, n_structs)	((struct_type*) g_alloca (sizeof (struct_type) * (gsize) (n_structs)))
-
-
-#endif /* __G_ALLOCA_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/garray.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/garray.h
deleted file mode 100644
index 7858e395..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/garray.h
+++ /dev/null
@@ -1,167 +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__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-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)])
-
-GArray* g_array_new               (gboolean          zero_terminated,
-				   gboolean          clear_,
-				   guint             element_size);
-GArray* g_array_sized_new         (gboolean          zero_terminated,
-				   gboolean          clear_,
-				   guint             element_size,
-				   guint             reserved_size);
-gchar*  g_array_free              (GArray           *array,
-				   gboolean          free_segment);
-GArray* g_array_append_vals       (GArray           *array,
-				   gconstpointer     data,
-				   guint             len);
-GArray* g_array_prepend_vals      (GArray           *array,
-				   gconstpointer     data,
-				   guint             len);
-GArray* g_array_insert_vals       (GArray           *array,
-				   guint             index_,
-				   gconstpointer     data,
-				   guint             len);
-GArray* g_array_set_size          (GArray           *array,
-				   guint             length);
-GArray* g_array_remove_index      (GArray           *array,
-				   guint             index_);
-GArray* g_array_remove_index_fast (GArray           *array,
-				   guint             index_);
-GArray* g_array_remove_range      (GArray           *array,
-				   guint             index_,
-				   guint             length);
-void    g_array_sort              (GArray           *array,
-				   GCompareFunc      compare_func);
-void    g_array_sort_with_data    (GArray           *array,
-				   GCompareDataFunc  compare_func,
-				   gpointer          user_data);
-
-/* 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_]
-GPtrArray* g_ptr_array_new                (void);
-GPtrArray* g_ptr_array_sized_new          (guint             reserved_size);
-gpointer*  g_ptr_array_free               (GPtrArray        *array,
-					   gboolean          free_seg);
-void       g_ptr_array_set_size           (GPtrArray        *array,
-					   gint              length);
-gpointer   g_ptr_array_remove_index       (GPtrArray        *array,
-					   guint             index_);
-gpointer   g_ptr_array_remove_index_fast  (GPtrArray        *array,
-					   guint             index_);
-gboolean   g_ptr_array_remove             (GPtrArray        *array,
-					   gpointer          data);
-gboolean   g_ptr_array_remove_fast        (GPtrArray        *array,
-					   gpointer          data);
-void       g_ptr_array_remove_range       (GPtrArray        *array,
-					   guint             index_,
-					   guint             length);
-void       g_ptr_array_add                (GPtrArray        *array,
-					   gpointer          data);
-void       g_ptr_array_sort               (GPtrArray        *array,
-					   GCompareFunc      compare_func);
-void       g_ptr_array_sort_with_data     (GPtrArray        *array,
-					   GCompareDataFunc  compare_func,
-					   gpointer          user_data);
-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.
- */
-
-GByteArray* g_byte_array_new               (void);
-GByteArray* g_byte_array_sized_new         (guint             reserved_size);
-guint8*     g_byte_array_free              (GByteArray       *array,
-					    gboolean          free_segment);
-GByteArray* g_byte_array_append            (GByteArray       *array,
-					    const guint8     *data,
-					    guint             len);
-GByteArray* g_byte_array_prepend           (GByteArray       *array,
-					    const guint8     *data,
-					    guint             len);
-GByteArray* g_byte_array_set_size          (GByteArray       *array,
-					    guint             length);
-GByteArray* g_byte_array_remove_index      (GByteArray       *array,
-					    guint             index_);
-GByteArray* g_byte_array_remove_index_fast (GByteArray       *array,
-					    guint             index_);
-GByteArray* g_byte_array_remove_range      (GByteArray       *array,
-					    guint             index_,
-					    guint             length);
-void        g_byte_array_sort              (GByteArray       *array,
-					    GCompareFunc      compare_func);
-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/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gasyncqueue.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gasyncqueue.h
deleted file mode 100644
index 7c860e85..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gasyncqueue.h
+++ /dev/null
@@ -1,117 +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__
-
-#include <glib/gthread.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GAsyncQueue GAsyncQueue;
-
-/* Asyncronous Queues, can be used to communicate between threads */
-
-/* Get a new GAsyncQueue with the ref_count 1 */
-GAsyncQueue*  g_async_queue_new                 (void);
-
-GAsyncQueue*  g_async_queue_new_full            (GDestroyNotify item_free_func);
-
-/* Lock and unlock a GAsyncQueue. All functions lock the queue for
- * themselves, but in certain cirumstances you want to hold the lock longer,
- * thus you lock the queue, call the *_unlocked functions and unlock it again.
- */
-void         g_async_queue_lock                 (GAsyncQueue      *queue);
-void         g_async_queue_unlock               (GAsyncQueue      *queue);
-
-/* Ref and unref the GAsyncQueue. */
-GAsyncQueue* g_async_queue_ref                  (GAsyncQueue      *queue);
-void         g_async_queue_unref                (GAsyncQueue      *queue);
-
-#ifndef G_DISABLE_DEPRECATED
-/* You don't have to hold the lock for calling *_ref and *_unref anymore. */
-void         g_async_queue_ref_unlocked         (GAsyncQueue      *queue);
-void         g_async_queue_unref_and_unlock     (GAsyncQueue      *queue);
-#endif /* !G_DISABLE_DEPRECATED */
-
-/* Push data into the async queue. Must not be NULL. */
-void         g_async_queue_push                 (GAsyncQueue      *queue,
-						 gpointer          data);
-void         g_async_queue_push_unlocked        (GAsyncQueue      *queue,
-						 gpointer          data);
-
-void         g_async_queue_push_sorted          (GAsyncQueue      *queue,
-						 gpointer          data,
-						 GCompareDataFunc  func,
-						 gpointer          user_data);
-void         g_async_queue_push_sorted_unlocked (GAsyncQueue      *queue,
-						 gpointer          data,
-						 GCompareDataFunc  func,
-						 gpointer          user_data);
-
-/* Pop data from the async queue. When no data is there, the thread is blocked
- * until data arrives.
- */
-gpointer     g_async_queue_pop                  (GAsyncQueue      *queue);
-gpointer     g_async_queue_pop_unlocked         (GAsyncQueue      *queue);
-
-/* Try to pop data. NULL is returned in case of empty queue. */
-gpointer     g_async_queue_try_pop              (GAsyncQueue      *queue);
-gpointer     g_async_queue_try_pop_unlocked     (GAsyncQueue      *queue);
-
-
-
-/* Wait for data until at maximum until end_time is reached. NULL is returned
- * in case of empty queue. 
- */
-gpointer     g_async_queue_timed_pop            (GAsyncQueue      *queue,
-						 GTimeVal         *end_time);
-gpointer     g_async_queue_timed_pop_unlocked   (GAsyncQueue      *queue,
-						 GTimeVal         *end_time);
-
-/* Return the length of the queue. Negative values mean that threads
- * are waiting, positve values mean that there are entries in the
- * queue. Actually this function returns the length of the queue minus
- * the number of waiting threads, g_async_queue_length == 0 could also
- * mean 'n' entries in the queue and 'n' thread waiting. Such can
- * happen due to locking of the queue or due to scheduling. 
- */
-gint         g_async_queue_length               (GAsyncQueue      *queue);
-gint         g_async_queue_length_unlocked      (GAsyncQueue      *queue);
-void         g_async_queue_sort                 (GAsyncQueue      *queue,
-						 GCompareDataFunc  func,
-						 gpointer          user_data);
-void         g_async_queue_sort_unlocked        (GAsyncQueue      *queue,
-						 GCompareDataFunc  func,
-						 gpointer          user_data);
-
-/* Private API */
-GMutex*      _g_async_queue_get_mutex           (GAsyncQueue      *queue);
-
-G_END_DECLS
-
-#endif /* __G_ASYNCQUEUE_H__ */
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gatomic.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gatomic.h
deleted file mode 100644
index fefe2aff..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gatomic.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * g_atomic_*: atomic operations.
- * Copyright (C) 2003 Sebastian Wilhelmi
- *
- * 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_ATOMIC_H__
-#define __G_ATOMIC_H__
- 
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
- 
-gint     g_atomic_int_exchange_and_add         (volatile gint	  *atomic,
-						gint      	   val);
-void     g_atomic_int_add                      (volatile gint	  *atomic,
-						gint      	   val);
-gboolean g_atomic_int_compare_and_exchange     (volatile gint	  *atomic,
-						gint      	   oldval,
-						gint      	   newval);
-gboolean g_atomic_pointer_compare_and_exchange (volatile gpointer *atomic, 
-						gpointer  	   oldval, 
-						gpointer  	   newval);
-
-gint     g_atomic_int_get                      (volatile gint  	  *atomic);
-void     g_atomic_int_set                      (volatile gint  	  *atomic,
-						gint               newval);
-gpointer g_atomic_pointer_get                  (volatile gpointer *atomic);
-void     g_atomic_pointer_set                  (volatile gpointer *atomic,
-						gpointer           newval);
-
-#ifndef G_ATOMIC_OP_MEMORY_BARRIER_NEEDED
-# define g_atomic_int_get(atomic) 		(*(atomic))
-# define g_atomic_int_set(atomic, newval) 	((void) (*(atomic) = (newval)))
-# define g_atomic_pointer_get(atomic) 		(*(atomic))
-# define g_atomic_pointer_set(atomic, newval)	((void) (*(atomic) = (newval)))
-#endif /* G_ATOMIC_OP_MEMORY_BARRIER_NEEDED */
-
-#define g_atomic_int_inc(atomic) (g_atomic_int_add ((atomic), 1))
-#define g_atomic_int_dec_and_test(atomic)				\
-  (g_atomic_int_exchange_and_add ((atomic), -1) == 1)
-
-G_END_DECLS
- 
-#endif /* __G_ATOMIC_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gbacktrace.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gbacktrace.h
deleted file mode 100644
index 836264ea..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gbacktrace.h
+++ /dev/null
@@ -1,61 +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__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/* Fatal error handlers.
- * g_on_error_query() will prompt the user to either
- * [E]xit, [H]alt, [P]roceed or show [S]tack trace.
- * g_on_error_stack_trace() invokes gdb, which attaches to the current
- * process and shows a stack trace.
- * These function may cause different actions on non-unix platforms.
- * The prg_name arg is required by gdb to find the executable, if it is
- * passed as NULL, g_on_error_query() will try g_get_prgname().
- */
-void g_on_error_query (const gchar *prg_name);
-void g_on_error_stack_trace (const gchar *prg_name);
-
-/* Hacker macro to place breakpoints for selected machines.
- * Actual use is strongly discouraged of course ;)
- */
-#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 (__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/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gbase64.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gbase64.h
deleted file mode 100644
index 6637984e..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gbase64.h
+++ /dev/null
@@ -1,50 +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__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-gsize   g_base64_encode_step  (const guchar *in,
-			       gsize         len,
-			       gboolean      break_lines,
-			       gchar        *out,
-			       gint         *state,
-			       gint         *save);
-gsize   g_base64_encode_close (gboolean      break_lines,
-			       gchar        *out,
-			       gint         *state,
-			       gint         *save);
-gchar*  g_base64_encode       (const guchar *data,
-			       gsize         len) G_GNUC_MALLOC;
-gsize   g_base64_decode_step  (const gchar  *in,
-			       gsize         len,
-			       guchar       *out,
-			       gint         *state,
-			       guint        *save);
-guchar *g_base64_decode       (const gchar  *text,
-			       gsize        *out_len) G_GNUC_MALLOC;
-
-G_END_DECLS
-
-#endif /* __G_BASE64_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gbookmarkfile.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gbookmarkfile.h
deleted file mode 100644
index 2448e4a3..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gbookmarkfile.h
+++ /dev/null
@@ -1,187 +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__
-
-#include <glib/gerror.h>
-#include <time.h>
-
-G_BEGIN_DECLS
-
-/* GError enumeration
- */
-#define G_BOOKMARK_FILE_ERROR	(g_bookmark_file_error_quark ())
-
-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;
-
-GQuark g_bookmark_file_error_quark (void);
-
-/*
- * GBookmarkFile
- */
-typedef struct _GBookmarkFile GBookmarkFile;
-
-GBookmarkFile *g_bookmark_file_new                 (void);
-void           g_bookmark_file_free                (GBookmarkFile  *bookmark);
-
-gboolean       g_bookmark_file_load_from_file      (GBookmarkFile  *bookmark,
-						    const gchar    *filename,
-						    GError        **error);
-gboolean       g_bookmark_file_load_from_data      (GBookmarkFile  *bookmark,
-						    const gchar    *data,
-						    gsize           length,
-						    GError        **error);
-gboolean       g_bookmark_file_load_from_data_dirs (GBookmarkFile  *bookmark,
-						    const gchar    *file,
-						    gchar         **full_path,
-						    GError        **error);
-gchar *        g_bookmark_file_to_data             (GBookmarkFile  *bookmark,
-						    gsize          *length,
-						    GError        **error) G_GNUC_MALLOC;
-gboolean       g_bookmark_file_to_file             (GBookmarkFile  *bookmark,
-						    const gchar    *filename,
-						    GError        **error);
-
-void           g_bookmark_file_set_title           (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *title);
-gchar *        g_bookmark_file_get_title           (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error) G_GNUC_MALLOC;
-void           g_bookmark_file_set_description     (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *description);
-gchar *        g_bookmark_file_get_description     (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error) G_GNUC_MALLOC;
-void           g_bookmark_file_set_mime_type       (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *mime_type);
-gchar *        g_bookmark_file_get_mime_type       (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error) G_GNUC_MALLOC;
-void           g_bookmark_file_set_groups          (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar   **groups,
-						    gsize           length);
-void           g_bookmark_file_add_group           (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *group);
-gboolean       g_bookmark_file_has_group           (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *group,
-						    GError        **error);
-gchar **       g_bookmark_file_get_groups          (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    gsize          *length,
-						    GError        **error) G_GNUC_MALLOC;
-void           g_bookmark_file_add_application     (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *name,
-						    const gchar    *exec);
-gboolean       g_bookmark_file_has_application     (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *name,
-						    GError        **error);
-gchar **       g_bookmark_file_get_applications    (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    gsize          *length,
-						    GError        **error) G_GNUC_MALLOC;
-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);
-gboolean       g_bookmark_file_get_app_info        (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *name,
-						    gchar         **exec,
-						    guint          *count,
-						    time_t         *stamp,
-						    GError        **error);
-void           g_bookmark_file_set_is_private      (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    gboolean        is_private);
-gboolean       g_bookmark_file_get_is_private      (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error);
-void           g_bookmark_file_set_icon            (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *href,
-						    const gchar    *mime_type);
-gboolean       g_bookmark_file_get_icon            (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    gchar         **href,
-						    gchar         **mime_type,
-						    GError        **error);
-void           g_bookmark_file_set_added           (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    time_t          added);
-time_t         g_bookmark_file_get_added           (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error);
-void           g_bookmark_file_set_modified        (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    time_t          modified);
-time_t         g_bookmark_file_get_modified        (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error);
-void           g_bookmark_file_set_visited         (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    time_t          visited);
-time_t         g_bookmark_file_get_visited         (GBookmarkFile  *bookmark,
-						    const gchar    *uri, 
-						    GError        **error);
-gboolean       g_bookmark_file_has_item            (GBookmarkFile  *bookmark,
-						    const gchar    *uri);
-gint           g_bookmark_file_get_size            (GBookmarkFile  *bookmark);
-gchar **       g_bookmark_file_get_uris            (GBookmarkFile  *bookmark,
-						    gsize          *length) G_GNUC_MALLOC;
-gboolean       g_bookmark_file_remove_group        (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *group,
-						    GError        **error);
-gboolean       g_bookmark_file_remove_application  (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *name,
-						    GError        **error);
-gboolean       g_bookmark_file_remove_item         (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error);
-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/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gcache.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gcache.h
deleted file mode 100644
index 93341b87..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gcache.h
+++ /dev/null
@@ -1,68 +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__
-
-#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
- */
-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);
-void     g_cache_destroy       (GCache            *cache);
-gpointer g_cache_insert        (GCache            *cache,
-                                gpointer           key);
-void     g_cache_remove        (GCache            *cache,
-                                gconstpointer      value);
-void     g_cache_key_foreach   (GCache            *cache,
-                                GHFunc             func,
-                                gpointer           user_data);
-#ifndef G_DISABLE_DEPRECATED
-void     g_cache_value_foreach (GCache            *cache,
-                                GHFunc             func,
-                                gpointer           user_data);
-#endif
-
-G_END_DECLS
-
-#endif /* __G_CACHE_H__ */
-
-
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gchecksum.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gchecksum.h
deleted file mode 100644
index 8f7d8082..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gchecksum.h
+++ /dev/null
@@ -1,72 +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__
-
-#include <glib/gtypes.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
- *
- * 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
-} GChecksumType;
-
-typedef struct _GChecksum       GChecksum;
-
-gssize                g_checksum_type_get_length (GChecksumType checksum_type);
-
-GChecksum *           g_checksum_new        (GChecksumType     checksum_type);
-GChecksum *           g_checksum_copy       (const GChecksum  *checksum);
-void                  g_checksum_free       (GChecksum        *checksum);
-void                  g_checksum_update     (GChecksum        *checksum,
-                                             const guchar     *data,
-                                             gssize            length);
-G_CONST_RETURN gchar *g_checksum_get_string (GChecksum        *checksum);
-void                  g_checksum_get_digest (GChecksum        *checksum,
-                                             guint8           *buffer,
-                                             gsize            *digest_len);
-
-gchar *g_compute_checksum_for_data   (GChecksumType  checksum_type,
-                                      const guchar  *data,
-                                      gsize          length);
-gchar *g_compute_checksum_for_string (GChecksumType  checksum_type,
-                                      const gchar   *str,
-                                      gssize         length);
-
-G_END_DECLS
-
-#endif /* __G_CHECKSUM_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gcompletion.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gcompletion.h
deleted file mode 100644
index 8adb2313..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gcompletion.h
+++ /dev/null
@@ -1,74 +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__
-
-#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;
-};
-
-GCompletion* g_completion_new           (GCompletionFunc func);
-void         g_completion_add_items     (GCompletion*    cmp,
-                                         GList*          items);
-void         g_completion_remove_items  (GCompletion*    cmp,
-                                         GList*          items);
-void         g_completion_clear_items   (GCompletion*    cmp);
-GList*       g_completion_complete      (GCompletion*    cmp,
-                                         const gchar*    prefix,
-                                         gchar**         new_prefix);
-GList*       g_completion_complete_utf8 (GCompletion  *cmp,
-                                         const gchar*    prefix,
-                                         gchar**         new_prefix);
-void         g_completion_set_compare   (GCompletion *cmp,
-				         GCompletionStrncmpFunc strncmp_func);
-void         g_completion_free          (GCompletion*    cmp);
-
-G_END_DECLS
-
-#endif /* __G_COMPLETION_H__ */
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gconvert.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gconvert.h
deleted file mode 100644
index 9e6ca650..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gconvert.h
+++ /dev/null
@@ -1,134 +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__
-
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-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;
-
-#define G_CONVERT_ERROR g_convert_error_quark()
-GQuark g_convert_error_quark (void);
-
-/* Thin wrappers around iconv
- */
-typedef struct _GIConv *GIConv;
-
-GIConv g_iconv_open   (const gchar  *to_codeset,
-		       const gchar  *from_codeset);
-gsize  g_iconv        (GIConv        converter,
-		       gchar       **inbuf,
-		       gsize        *inbytes_left,
-		       gchar       **outbuf,
-		       gsize        *outbytes_left);
-gint   g_iconv_close  (GIConv        converter);
-
-
-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;
-gchar* g_convert_with_iconv    (const gchar  *str,
-				gssize        len,
-				GIConv        converter,
-				gsize        *bytes_read,     
-				gsize        *bytes_written,  
-				GError      **error) G_GNUC_MALLOC;
-gchar* g_convert_with_fallback (const gchar  *str,
-				gssize        len,            
-				const gchar  *to_codeset,
-				const gchar  *from_codeset,
-				gchar        *fallback,
-				gsize        *bytes_read,     
-				gsize        *bytes_written,  
-				GError      **error) G_GNUC_MALLOC;
-
-
-/* Convert between libc's idea of strings and UTF-8.
- */
-gchar* g_locale_to_utf8   (const gchar  *opsysstring,
-			   gssize        len,            
-			   gsize        *bytes_read,     
-			   gsize        *bytes_written,  
-			   GError      **error) G_GNUC_MALLOC;
-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.
- */
-#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 
-#endif
-
-gchar* g_filename_to_utf8   (const gchar  *opsysstring,
-			     gssize        len,            
-			     gsize        *bytes_read,     
-			     gsize        *bytes_written,  
-			     GError      **error) G_GNUC_MALLOC;
-gchar* g_filename_from_utf8 (const gchar  *utf8string,
-			     gssize        len,            
-			     gsize        *bytes_read,     
-			     gsize        *bytes_written,  
-			     GError      **error) G_GNUC_MALLOC;
-
-gchar *g_filename_from_uri (const gchar *uri,
-			    gchar      **hostname,
-			    GError     **error) G_GNUC_MALLOC;
-  
-gchar *g_filename_to_uri   (const gchar *filename,
-			    const gchar *hostname,
-			    GError     **error) G_GNUC_MALLOC;
-gchar *g_filename_display_name (const gchar *filename) G_GNUC_MALLOC;
-gboolean g_get_filename_charsets (G_CONST_RETURN gchar ***charsets);
-
-gchar *g_filename_display_basename (const gchar *filename) G_GNUC_MALLOC;
-
-gchar **g_uri_list_extract_uris (const gchar *uri_list) G_GNUC_MALLOC;
-
-G_END_DECLS
-
-#endif /* __G_CONVERT_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gdataset.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gdataset.h
deleted file mode 100644
index 0376cac9..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gdataset.h
+++ /dev/null
@@ -1,122 +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__
-
-#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
- */
-void     g_datalist_init                (GData            **datalist);
-void     g_datalist_clear               (GData            **datalist);
-gpointer g_datalist_id_get_data         (GData            **datalist,
-					 GQuark             key_id);
-void     g_datalist_id_set_data_full    (GData            **datalist,
-					 GQuark             key_id,
-					 gpointer           data,
-					 GDestroyNotify     destroy_func);
-gpointer g_datalist_id_remove_no_notify (GData            **datalist,
-					 GQuark             key_id);
-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
-
-void     g_datalist_set_flags           (GData            **datalist,
-					 guint              flags);
-void     g_datalist_unset_flags         (GData            **datalist,
-					 guint              flags);
-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_get_data(dl, k)            \
-     (g_datalist_id_get_data ((dl), g_quark_try_string (k)))
-#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
- */
-void      g_dataset_destroy             (gconstpointer    dataset_location);
-gpointer  g_dataset_id_get_data         (gconstpointer    dataset_location,
-                                         GQuark           key_id);
-void      g_dataset_id_set_data_full    (gconstpointer    dataset_location,
-                                         GQuark           key_id,
-                                         gpointer         data,
-                                         GDestroyNotify   destroy_func);
-gpointer  g_dataset_id_remove_no_notify (gconstpointer    dataset_location,
-                                         GQuark           key_id);
-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/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gdate.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gdate.h
deleted file mode 100644
index 8ec02afc..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gdate.h
+++ /dev/null
@@ -1,260 +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__
-
-#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.
- */
-GDate*       g_date_new                   (void);
-GDate*       g_date_new_dmy               (GDateDay     day,
-                                           GDateMonth   month,
-                                           GDateYear    year);
-GDate*       g_date_new_julian            (guint32      julian_day);
-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).
- */
-gboolean     g_date_valid                 (const GDate *date);
-gboolean     g_date_valid_day             (GDateDay     day) G_GNUC_CONST;
-gboolean     g_date_valid_month           (GDateMonth month) G_GNUC_CONST;
-gboolean     g_date_valid_year            (GDateYear  year) G_GNUC_CONST;
-gboolean     g_date_valid_weekday         (GDateWeekday weekday) G_GNUC_CONST;
-gboolean     g_date_valid_julian          (guint32 julian_date) G_GNUC_CONST;
-gboolean     g_date_valid_dmy             (GDateDay     day,
-                                           GDateMonth   month,
-                                           GDateYear    year) G_GNUC_CONST;
-
-GDateWeekday g_date_get_weekday           (const GDate *date);
-GDateMonth   g_date_get_month             (const GDate *date);
-GDateYear    g_date_get_year              (const GDate *date);
-GDateDay     g_date_get_day               (const GDate *date);
-guint32      g_date_get_julian            (const GDate *date);
-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
- */
-guint        g_date_get_monday_week_of_year (const GDate *date);
-guint        g_date_get_sunday_week_of_year (const GDate *date);
-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.
- */
-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.
- */
-void         g_date_set_parse             (GDate       *date,
-                                           const gchar *str);
-void         g_date_set_time_t            (GDate       *date,
-					   time_t       timet);
-void         g_date_set_time_val          (GDate       *date,
-					   GTimeVal    *timeval);
-#ifndef G_DISABLE_DEPRECATED
-void         g_date_set_time              (GDate       *date,
-                                           GTime        time_);
-#endif
-void         g_date_set_month             (GDate       *date,
-                                           GDateMonth   month);
-void         g_date_set_day               (GDate       *date,
-                                           GDateDay     day);
-void         g_date_set_year              (GDate       *date,
-                                           GDateYear    year);
-void         g_date_set_dmy               (GDate       *date,
-                                           GDateDay     day,
-                                           GDateMonth   month,
-                                           GDateYear    y);
-void         g_date_set_julian            (GDate       *date,
-                                           guint32      julian_date);
-gboolean     g_date_is_first_of_month     (const GDate *date);
-gboolean     g_date_is_last_of_month      (const GDate *date);
-
-/* To go forward by some number of weeks just go forward weeks*7 days */
-void         g_date_add_days              (GDate       *date,
-                                           guint        n_days);
-void         g_date_subtract_days         (GDate       *date,
-                                           guint        n_days);
-
-/* If you add/sub months while day > 28, the day might change */
-void         g_date_add_months            (GDate       *date,
-                                           guint        n_months);
-void         g_date_subtract_months       (GDate       *date,
-                                           guint        n_months);
-
-/* If it's feb 29, changing years can move you to the 28th */
-void         g_date_add_years             (GDate       *date,
-                                           guint        n_years);
-void         g_date_subtract_years        (GDate       *date,
-                                           guint        n_years);
-gboolean     g_date_is_leap_year          (GDateYear    year) G_GNUC_CONST;
-guint8       g_date_get_days_in_month     (GDateMonth   month,
-                                           GDateYear    year) G_GNUC_CONST;
-guint8       g_date_get_monday_weeks_in_year  (GDateYear    year) G_GNUC_CONST;
-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. */
-gint         g_date_days_between          (const GDate *date1,
-					   const GDate *date2);
-
-/* qsort-friendly (with a cast...) */
-gint         g_date_compare               (const GDate *lhs,
-                                           const GDate *rhs);
-void         g_date_to_struct_tm          (const GDate *date,
-                                           struct tm   *tm);
-
-void         g_date_clamp                 (GDate *date,
-					   const GDate *min_date,
-					   const GDate *max_date);
-
-/* Swap date1 and date2's values if date1 > date2. */
-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.
- */
-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/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gdir.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gdir.h
deleted file mode 100644
index 011174eb..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gdir.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
- *
- * 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__
-
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GDir GDir;
-
-#ifdef G_OS_WIN32
-/* For DLL ABI stability, keep old names for old (non-UTF-8) functionality. */
-#define g_dir_open g_dir_open_utf8
-#define g_dir_read_name g_dir_read_name_utf8
-#endif
-
-GDir    *                g_dir_open           (const gchar  *path,
-					       guint         flags,
-					       GError      **error);
-G_CONST_RETURN gchar    *g_dir_read_name      (GDir         *dir);
-void                     g_dir_rewind         (GDir         *dir);
-void                     g_dir_close          (GDir         *dir);
-
-G_END_DECLS
-
-#endif /* __G_DIR_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gerror.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gerror.h
deleted file mode 100644
index 7fa8ef0f..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gerror.h
+++ /dev/null
@@ -1,84 +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__
-
-#include <glib/gquark.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GError GError;
-
-struct _GError
-{
-  GQuark       domain;
-  gint         code;
-  gchar       *message;
-};
-
-GError*  g_error_new           (GQuark         domain,
-                                gint           code,
-                                const gchar   *format,
-                                ...) G_GNUC_PRINTF (3, 4);
-
-GError*  g_error_new_literal   (GQuark         domain,
-                                gint           code,
-                                const gchar   *message);
-
-void     g_error_free          (GError        *error);
-GError*  g_error_copy          (const GError  *error);
-
-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.
- */
-void     g_set_error           (GError       **err,
-                                GQuark         domain,
-                                gint           code,
-                                const gchar   *format,
-                                ...) G_GNUC_PRINTF (4, 5);
-
-/* if (dest) *dest = src; also has some sanity checks.
- */
-void     g_propagate_error     (GError       **dest,
-				GError        *src);
-
-/* if (err && *err) { g_error_free(*err); *err = NULL; } */
-void     g_clear_error         (GError       **err);
-
-/* if (err) prefix the formatted string to the ->message */
-void     g_prefix_error               (GError       **err,
-                                       const gchar   *format,
-                                       ...) G_GNUC_PRINTF (2, 3);
-
-/* g_propagate_error then g_error_prefix on dest */
-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/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gfileutils.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gfileutils.h
deleted file mode 100644
index 58f2d23a..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gfileutils.h
+++ /dev/null
@@ -1,121 +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__
-
-#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;
-
-GQuark     g_file_error_quark      (void);
-/* So other code can generate a GFileError */
-GFileError g_file_error_from_errno (gint err_no);
-
-#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
-#endif
-
-gboolean g_file_test         (const gchar  *filename,
-                              GFileTest     test);
-gboolean g_file_get_contents (const gchar  *filename,
-                              gchar       **contents,
-                              gsize        *length,    
-                              GError      **error);
-gboolean g_file_set_contents (const gchar *filename,
-			      const gchar *contents,
-			      gssize	     length,
-			      GError	   **error);
-gchar   *g_file_read_link    (const gchar  *filename,
-			      GError      **error);
-
-/* Wrapper / workalike for mkstemp() */
-gint    g_mkstemp            (gchar        *tmpl);
-
-/* Wrapper for g_mkstemp */
-gint    g_file_open_tmp      (const gchar  *tmpl,
-			      gchar       **name_used,
-			      GError      **error);
-
-char *g_format_size_for_display (goffset size);
-
-gchar *g_build_path     (const gchar *separator,
-			 const gchar *first_element,
-			 ...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
-gchar *g_build_pathv    (const gchar  *separator,
-			 gchar       **args) G_GNUC_MALLOC;
-
-gchar *g_build_filename (const gchar *first_element,
-			 ...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
-gchar *g_build_filenamev (gchar      **args) G_GNUC_MALLOC;
-
-int    g_mkdir_with_parents (const gchar *pathname,
-			     int          mode);
-
-G_END_DECLS
-
-#endif /* __G_FILEUTILS_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/ghash.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/ghash.h
deleted file mode 100644
index 17ca7de6..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/ghash.h
+++ /dev/null
@@ -1,142 +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__
-
-#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;
-};
-
-/* Hash tables
- */
-GHashTable* g_hash_table_new		   (GHashFunc	    hash_func,
-					    GEqualFunc	    key_equal_func);
-GHashTable* g_hash_table_new_full      	   (GHashFunc	    hash_func,
-					    GEqualFunc	    key_equal_func,
-					    GDestroyNotify  key_destroy_func,
-					    GDestroyNotify  value_destroy_func);
-void	    g_hash_table_destroy	   (GHashTable	   *hash_table);
-void	    g_hash_table_insert		   (GHashTable	   *hash_table,
-					    gpointer	    key,
-					    gpointer	    value);
-void        g_hash_table_replace           (GHashTable     *hash_table,
-					    gpointer	    key,
-					    gpointer	    value);
-gboolean    g_hash_table_remove		   (GHashTable	   *hash_table,
-					    gconstpointer   key);
-void        g_hash_table_remove_all        (GHashTable     *hash_table);
-gboolean    g_hash_table_steal             (GHashTable     *hash_table,
-					    gconstpointer   key);
-void        g_hash_table_steal_all         (GHashTable     *hash_table);
-gpointer    g_hash_table_lookup		   (GHashTable	   *hash_table,
-					    gconstpointer   key);
-gboolean    g_hash_table_lookup_extended   (GHashTable	   *hash_table,
-					    gconstpointer   lookup_key,
-					    gpointer	   *orig_key,
-					    gpointer	   *value);
-void	    g_hash_table_foreach	   (GHashTable	   *hash_table,
-					    GHFunc	    func,
-					    gpointer	    user_data);
-gpointer    g_hash_table_find	           (GHashTable	   *hash_table,
-					    GHRFunc	    predicate,
-					    gpointer	    user_data);
-guint	    g_hash_table_foreach_remove	   (GHashTable	   *hash_table,
-					    GHRFunc	    func,
-					    gpointer	    user_data);
-guint	    g_hash_table_foreach_steal	   (GHashTable	   *hash_table,
-					    GHRFunc	    func,
-					    gpointer	    user_data);
-guint	    g_hash_table_size		   (GHashTable	   *hash_table);
-GList *     g_hash_table_get_keys          (GHashTable     *hash_table);
-GList *     g_hash_table_get_values        (GHashTable     *hash_table);
-
-void        g_hash_table_iter_init         (GHashTableIter *iter,
-					    GHashTable     *hash_table);
-gboolean    g_hash_table_iter_next         (GHashTableIter *iter,
-					    gpointer       *key,
-					    gpointer       *value);
-GHashTable* g_hash_table_iter_get_hash_table (GHashTableIter *iter);
-void        g_hash_table_iter_remove       (GHashTableIter *iter);
-void        g_hash_table_iter_steal        (GHashTableIter *iter);
-
-/* keeping hash tables alive */
-GHashTable* g_hash_table_ref   		   (GHashTable 	   *hash_table);
-void        g_hash_table_unref             (GHashTable     *hash_table);
-
-#ifndef G_DISABLE_DEPRECATED
-
-/* The following two functions are deprecated and will be removed in
- * the next major release. They do no good. */
-#define g_hash_table_freeze(hash_table) ((void)0)
-#define g_hash_table_thaw(hash_table) ((void)0)
-
-#endif /* G_DISABLE_DEPRECATED */
-
-/* Hash Functions
- */
-gboolean g_str_equal (gconstpointer  v1,
-                      gconstpointer  v2);
-guint    g_str_hash  (gconstpointer  v);
-
-gboolean g_int_equal (gconstpointer  v1,
-                      gconstpointer  v2);
-guint    g_int_hash  (gconstpointer  v);
-
-/* This "hash" function will just return the key's address as an
- * unsigned integer. Useful for hashing on plain addresses or
- * simple integer values.
- * Passing NULL into g_hash_table_new() as GHashFunc has the
- * same effect as passing g_direct_hash().
- */
-guint    g_direct_hash  (gconstpointer  v) G_GNUC_CONST;
-gboolean g_direct_equal (gconstpointer  v1,
-                         gconstpointer  v2) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __G_HASH_H__ */
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/ghook.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/ghook.h
deleted file mode 100644
index cb4f8e1c..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/ghook.h
+++ /dev/null
@@ -1,178 +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__
-
-#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 */
-void	 g_hook_list_init		(GHookList		*hook_list,
-					 guint			 hook_size);
-void	 g_hook_list_clear		(GHookList		*hook_list);
-GHook*	 g_hook_alloc			(GHookList		*hook_list);
-void	 g_hook_free			(GHookList		*hook_list,
-					 GHook			*hook);
-GHook *	 g_hook_ref			(GHookList		*hook_list,
-					 GHook			*hook);
-void	 g_hook_unref			(GHookList		*hook_list,
-					 GHook			*hook);
-gboolean g_hook_destroy			(GHookList		*hook_list,
-					 gulong			 hook_id);
-void	 g_hook_destroy_link		(GHookList		*hook_list,
-					 GHook			*hook);
-void	 g_hook_prepend			(GHookList		*hook_list,
-					 GHook			*hook);
-void	 g_hook_insert_before		(GHookList		*hook_list,
-					 GHook			*sibling,
-					 GHook			*hook);
-void	 g_hook_insert_sorted		(GHookList		*hook_list,
-					 GHook			*hook,
-					 GHookCompareFunc	 func);
-GHook*	 g_hook_get			(GHookList		*hook_list,
-					 gulong			 hook_id);
-GHook*	 g_hook_find			(GHookList		*hook_list,
-					 gboolean		 need_valids,
-					 GHookFindFunc		 func,
-					 gpointer		 data);
-GHook*	 g_hook_find_data		(GHookList		*hook_list,
-					 gboolean		 need_valids,
-					 gpointer		 data);
-GHook*	 g_hook_find_func		(GHookList		*hook_list,
-					 gboolean		 need_valids,
-					 gpointer		 func);
-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 */
-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
- */
-GHook*	 g_hook_next_valid		(GHookList		*hook_list,
-					 GHook			*hook,
-					 gboolean		 may_be_in_call);
-/* GHookCompareFunc implementation to insert hooks sorted by their id */
-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.
- */
-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.
- */
-void	 g_hook_list_invoke_check	(GHookList		*hook_list,
-					 gboolean		 may_recurse);
-/* invoke a marshaller on all valid hooks.
- */
-void	 g_hook_list_marshal		(GHookList		*hook_list,
-					 gboolean		 may_recurse,
-					 GHookMarshaller	 marshaller,
-					 gpointer		 marshal_data);
-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/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gi18n-lib.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gi18n-lib.h
deleted file mode 100644
index 674466e4..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gi18n-lib.h
+++ /dev/null
@@ -1,37 +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/gstrfuncs.h>
-
-#include <libintl.h>
-#include <string.h>
-
-#ifndef GETTEXT_PACKAGE
-#error You must define GETTEXT_PACKAGE before including gi18n-lib.h.
-#endif
-
-#define  _(String) 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)
-
-
-#endif  /* __G_I18N_LIB_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gi18n.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gi18n.h
deleted file mode 100644
index c94e8c13..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gi18n.h
+++ /dev/null
@@ -1,34 +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/gstrfuncs.h>
-#include <libintl.h>
-#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)
-
-
-#endif  /* __G_I18N_H__ */
-
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/giochannel.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/giochannel.h
deleted file mode 100644
index 846c9ba4..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/giochannel.h
+++ /dev/null
@@ -1,354 +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__
-
-#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_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;
-
-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_WRITEABLE = 1 << 3,	/* Read only flag */
-  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);
-};
-
-void        g_io_channel_init   (GIOChannel    *channel);
-GIOChannel *g_io_channel_ref    (GIOChannel    *channel);
-void        g_io_channel_unref  (GIOChannel    *channel);
-
-#ifndef G_DISABLE_DEPRECATED
-GIOError    g_io_channel_read   (GIOChannel    *channel, 
-			         gchar         *buf, 
-			         gsize          count,
-			         gsize         *bytes_read);
-GIOError  g_io_channel_write    (GIOChannel    *channel, 
-			         const gchar   *buf, 
-			         gsize          count,
-			         gsize         *bytes_written);
-GIOError  g_io_channel_seek     (GIOChannel    *channel,
-			         gint64         offset, 
-			         GSeekType      type);
-void      g_io_channel_close    (GIOChannel    *channel);
-#endif /* G_DISABLE_DEPRECATED */
-
-GIOStatus g_io_channel_shutdown (GIOChannel      *channel,
-				 gboolean         flush,
-				 GError         **err);
-guint     g_io_add_watch_full   (GIOChannel      *channel,
-				 gint             priority,
-				 GIOCondition     condition,
-				 GIOFunc          func,
-				 gpointer         user_data,
-				 GDestroyNotify   notify);
-GSource * g_io_create_watch     (GIOChannel      *channel,
-				 GIOCondition     condition);
-guint     g_io_add_watch        (GIOChannel      *channel,
-				 GIOCondition     condition,
-				 GIOFunc          func,
-				 gpointer         user_data);
-
-/* character encoding conversion involved functions.
- */
-
-void                  g_io_channel_set_buffer_size      (GIOChannel   *channel,
-							 gsize         size);
-gsize                 g_io_channel_get_buffer_size      (GIOChannel   *channel);
-GIOCondition          g_io_channel_get_buffer_condition (GIOChannel   *channel);
-GIOStatus             g_io_channel_set_flags            (GIOChannel   *channel,
-							 GIOFlags      flags,
-							 GError      **error);
-GIOFlags              g_io_channel_get_flags            (GIOChannel   *channel);
-void                  g_io_channel_set_line_term        (GIOChannel   *channel,
-							 const gchar  *line_term,
-							 gint          length);
-G_CONST_RETURN gchar* g_io_channel_get_line_term        (GIOChannel   *channel,
-							 gint         *length);
-void		      g_io_channel_set_buffered		(GIOChannel   *channel,
-							 gboolean      buffered);
-gboolean	      g_io_channel_get_buffered		(GIOChannel   *channel);
-GIOStatus             g_io_channel_set_encoding         (GIOChannel   *channel,
-							 const gchar  *encoding,
-							 GError      **error);
-G_CONST_RETURN gchar* g_io_channel_get_encoding         (GIOChannel   *channel);
-void                  g_io_channel_set_close_on_unref	(GIOChannel   *channel,
-							 gboolean      do_close);
-gboolean              g_io_channel_get_close_on_unref	(GIOChannel   *channel);
-
-
-GIOStatus   g_io_channel_flush            (GIOChannel   *channel,
-					   GError      **error);
-GIOStatus   g_io_channel_read_line        (GIOChannel   *channel,
-					   gchar       **str_return,
-					   gsize        *length,
-					   gsize        *terminator_pos,
-					   GError      **error);
-GIOStatus   g_io_channel_read_line_string (GIOChannel   *channel,
-					   GString      *buffer,
-					   gsize        *terminator_pos,
-					   GError      **error);
-GIOStatus   g_io_channel_read_to_end      (GIOChannel   *channel,
-					   gchar       **str_return,
-					   gsize        *length,
-					   GError      **error);
-GIOStatus   g_io_channel_read_chars       (GIOChannel   *channel,
-					   gchar        *buf,
-					   gsize         count,
-					   gsize        *bytes_read,
-					   GError      **error);
-GIOStatus   g_io_channel_read_unichar     (GIOChannel   *channel,
-					   gunichar     *thechar,
-					   GError      **error);
-GIOStatus   g_io_channel_write_chars      (GIOChannel   *channel,
-					   const gchar  *buf,
-					   gssize        count,
-					   gsize        *bytes_written,
-					   GError      **error);
-GIOStatus   g_io_channel_write_unichar    (GIOChannel   *channel,
-					   gunichar      thechar,
-					   GError      **error);
-GIOStatus   g_io_channel_seek_position    (GIOChannel   *channel,
-					   gint64        offset,
-					   GSeekType     type,
-					   GError      **error);
-#ifdef G_OS_WIN32
-#define g_io_channel_new_file g_io_channel_new_file_utf8
-#endif
-
-GIOChannel* g_io_channel_new_file         (const gchar  *filename,
-					   const gchar  *mode,
-					   GError      **error);
-
-/* Error handling */
-
-GQuark          g_io_channel_error_quark      (void);
-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.
- */
-GIOChannel* g_io_channel_unix_new    (int         fd);
-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().
- */
-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.
- */
-gint        g_io_channel_win32_poll   (GPollFD    *fds,
-				       gint        n_fds,
-				       gint        timeout_);
-
-/* Create an IO channel for Windows messages for window handle hwnd. */
-GIOChannel *g_io_channel_win32_new_messages (guint hwnd);
-
-/* 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().
- */
-GIOChannel* g_io_channel_win32_new_fd (gint         fd);
-
-/* Get the C runtime file descriptor of a channel. */
-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.
- */
-GIOChannel *g_io_channel_win32_new_socket (gint socket);
-
-#endif
-
-G_END_DECLS
-
-#endif /* __G_IOCHANNEL_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gkeyfile.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gkeyfile.h
deleted file mode 100644
index e7eadc68..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gkeyfile.h
+++ /dev/null
@@ -1,246 +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__
-
-#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()
-
-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;
-
-GKeyFile *g_key_file_new                    (void);
-void      g_key_file_free                   (GKeyFile             *key_file);
-void      g_key_file_set_list_separator     (GKeyFile             *key_file,
-					     gchar                 separator);
-gboolean  g_key_file_load_from_file         (GKeyFile             *key_file,
-					     const gchar          *file,
-					     GKeyFileFlags         flags,
-					     GError              **error);
-gboolean  g_key_file_load_from_data         (GKeyFile             *key_file,
-					     const gchar          *data,
-					     gsize                 length,
-					     GKeyFileFlags         flags,
-					     GError              **error);
-gboolean g_key_file_load_from_dirs          (GKeyFile             *key_file,
-					     const gchar	  *file,
-					     const gchar	 **search_dirs,
-					     gchar		 **full_path,
-					     GKeyFileFlags         flags,
-					     GError              **error);
-gboolean g_key_file_load_from_data_dirs     (GKeyFile             *key_file,
-					     const gchar          *file,
-					     gchar               **full_path,
-					     GKeyFileFlags         flags,
-					     GError              **error);
-gchar    *g_key_file_to_data                (GKeyFile             *key_file,
-					     gsize                *length,
-					     GError              **error) G_GNUC_MALLOC;
-gchar    *g_key_file_get_start_group        (GKeyFile             *key_file) G_GNUC_MALLOC;
-gchar   **g_key_file_get_groups             (GKeyFile             *key_file,
-					     gsize                *length) G_GNUC_MALLOC;
-gchar   **g_key_file_get_keys               (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     gsize                *length,
-					     GError              **error) G_GNUC_MALLOC;
-gboolean  g_key_file_has_group              (GKeyFile             *key_file,
-					     const gchar          *group_name);
-gboolean  g_key_file_has_key                (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error);
-gchar    *g_key_file_get_value              (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error) G_GNUC_MALLOC;
-void      g_key_file_set_value              (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     const gchar          *value);
-gchar    *g_key_file_get_string             (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error) G_GNUC_MALLOC;
-void      g_key_file_set_string             (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     const gchar          *string);
-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;
-void      g_key_file_set_locale_string      (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     const gchar          *locale,
-					     const gchar          *string);
-gboolean  g_key_file_get_boolean            (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error);
-void      g_key_file_set_boolean            (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gboolean              value);
-gint      g_key_file_get_integer            (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error);
-void      g_key_file_set_integer            (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gint                  value);
-gdouble   g_key_file_get_double             (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-                                             GError              **error);
-void      g_key_file_set_double             (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-                                             gdouble               value);
-gchar   **g_key_file_get_string_list        (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gsize                *length,
-					     GError              **error) G_GNUC_MALLOC;
-void      g_key_file_set_string_list        (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     const gchar * const   list[],
-					     gsize                 length);
-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;
-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);
-gboolean *g_key_file_get_boolean_list       (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gsize                *length,
-					     GError              **error) G_GNUC_MALLOC;
-void      g_key_file_set_boolean_list       (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gboolean              list[],
-					     gsize                 length);
-gint     *g_key_file_get_integer_list       (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gsize                *length,
-					     GError              **error) G_GNUC_MALLOC;
-void      g_key_file_set_double_list        (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-                                             gdouble               list[],
-                                             gsize                 length);
-gdouble  *g_key_file_get_double_list        (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-                                             gsize                *length,
-                                             GError              **error) G_GNUC_MALLOC;
-void      g_key_file_set_integer_list       (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gint                  list[],
-					     gsize                 length);
-gboolean  g_key_file_set_comment            (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-                                             const gchar          *comment,
-                                             GError              **error);
-gchar    *g_key_file_get_comment            (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-                                             GError              **error) G_GNUC_MALLOC;
-
-gboolean  g_key_file_remove_comment         (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-					     GError              **error);
-gboolean  g_key_file_remove_key             (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error);
-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_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/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/glist.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/glist.h
deleted file mode 100644
index 258dcd1e..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/glist.h
+++ /dev/null
@@ -1,116 +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__
-
-#include <glib/gmem.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GList GList;
-
-struct _GList
-{
-  gpointer data;
-  GList *next;
-  GList *prev;
-};
-
-/* Doubly linked lists
- */
-GList*   g_list_alloc                   (void) G_GNUC_WARN_UNUSED_RESULT;
-void     g_list_free                    (GList            *list);
-void     g_list_free_1                  (GList            *list);
-#define  g_list_free1                   g_list_free_1
-GList*   g_list_append                  (GList            *list,
-					 gpointer          data) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_prepend                 (GList            *list,
-					 gpointer          data) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_insert                  (GList            *list,
-					 gpointer          data,
-					 gint              position) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_insert_sorted           (GList            *list,
-					 gpointer          data,
-					 GCompareFunc      func) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_insert_sorted_with_data (GList            *list,
-					 gpointer          data,
-					 GCompareDataFunc  func,
-					 gpointer          user_data) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_insert_before           (GList            *list,
-					 GList            *sibling,
-					 gpointer          data) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_concat                  (GList            *list1,
-					 GList            *list2) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_remove                  (GList            *list,
-					 gconstpointer     data) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_remove_all              (GList            *list,
-					 gconstpointer     data) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_remove_link             (GList            *list,
-					 GList            *llink) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_delete_link             (GList            *list,
-					 GList            *link_) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_reverse                 (GList            *list) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_copy                    (GList            *list) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_nth                     (GList            *list,
-					 guint             n);
-GList*   g_list_nth_prev                (GList            *list,
-					 guint             n);
-GList*   g_list_find                    (GList            *list,
-					 gconstpointer     data);
-GList*   g_list_find_custom             (GList            *list,
-					 gconstpointer     data,
-					 GCompareFunc      func);
-gint     g_list_position                (GList            *list,
-					 GList            *llink);
-gint     g_list_index                   (GList            *list,
-					 gconstpointer     data);
-GList*   g_list_last                    (GList            *list);
-GList*   g_list_first                   (GList            *list);
-guint    g_list_length                  (GList            *list);
-void     g_list_foreach                 (GList            *list,
-					 GFunc             func,
-					 gpointer          user_data);
-GList*   g_list_sort                    (GList            *list,
-					 GCompareFunc      compare_func) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_sort_with_data          (GList            *list,
-					 GCompareDataFunc  compare_func,
-					 gpointer          user_data)  G_GNUC_WARN_UNUSED_RESULT;
-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)
-
-#ifndef G_DISABLE_DEPRECATED
-void     g_list_push_allocator          (gpointer          allocator);
-void     g_list_pop_allocator           (void);
-#endif
-G_END_DECLS
-
-#endif /* __G_LIST_H__ */
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gmacros.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gmacros.h
deleted file mode 100644
index eb6b02c5..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gmacros.h
+++ /dev/null
@@ -1,269 +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__
-
-/* 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__ > 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__ > 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 */
-
-#define G_STRINGIFY(macro_or_string)	G_STRINGIFY_ARG (macro_or_string)
-#define	G_STRINGIFY_ARG(contents)	#contents
-
-/* 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__)
-#  define G_STRFUNC     ((const char*) (__PRETTY_FUNCTION__))
-#elif defined (G_HAVE_ISO_VARARGS)
-#  define G_STRFUNC     ((const char*) (__func__))
-#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.
- */
-#define G_STRUCT_OFFSET(struct_type, member)	\
-    ((glong) ((guint8*) &((struct_type*) 0)->member))
-#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 (adapted from Perl):
- *  G_STMT_START { statements; } G_STMT_END;
- *  can be used as a single statement, as in
- *  if (x) G_STMT_START { ... } G_STMT_END; else ...
- *
- *  When GCC is compiling C code in non-ANSI mode, it will use the
- *  compiler __extension__ to wrap the statements wihin `({' and '})' braces.
- *  When compiling on platforms where configure has defined
- *  HAVE_DOWHILE_MACROS, statements will be wrapped with `do' and `while (0)'.
- *  For any other platforms (SunOS4 is known to have this issue), wrap the
- *  statements with `if (1)' and `else (void) 0'.
- */
-#if !(defined (G_STMT_START) && defined (G_STMT_END))
-# if defined (__GNUC__) && !defined (__STRICT_ANSI__) && !defined (__cplusplus)
-#  define G_STMT_START (void) __extension__ (
-#  define G_STMT_END )
-# else /* !(__GNUC__ && !__STRICT_ANSI__ && !__cplusplus) */
-#  if defined (HAVE_DOWHILE_MACROS)
-#   define G_STMT_START do
-#   define G_STMT_END while (0)
-#  else /* !HAVE_DOWHILE_MACROS */
-#   define G_STMT_START if (1)
-#   define G_STMT_END else (void) 0
-#  endif /* !HAVE_DOWHILE_MACROS */
-# endif /* !(__GNUC__ && !__STRICT_ANSI__ && !__cplusplus) */
-#endif
-
-/* Allow the app programmer to select whether or not return values
- * (usually char*) are const or not.  Don't try using this feature for
- * functions with C++ linkage.
- */
-#ifdef G_DISABLE_CONST_RETURNS
-#define G_CONST_RETURN
-#else
-#define G_CONST_RETURN const
-#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)                   \
- __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
-
-#endif /* __G_MACROS_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gmain.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gmain.h
deleted file mode 100644
index 67250da4..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gmain.h
+++ /dev/null
@@ -1,337 +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__
-
-#include <glib/gslist.h>
-#include <glib/gthread.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GMainContext	        GMainContext;	/* Opaque */
-typedef struct _GMainLoop	        GMainLoop;	/* Opaque */
-typedef struct _GSource	                GSource;
-typedef struct _GSourceCallbackFuncs	GSourceCallbackFuncs;
-typedef struct _GSourceFuncs	        GSourceFuncs;
-
-typedef gboolean (*GSourceFunc)       (gpointer data);
-typedef void     (*GChildWatchFunc)   (GPid     pid,
-				       gint     status,
-				       gpointer data);
-struct _GSource
-{
-  /*< private >*/
-  gpointer callback_data;
-  GSourceCallbackFuncs *callback_funcs;
-
-  GSourceFuncs *source_funcs;
-  guint ref_count;
-
-  GMainContext *context;
-
-  gint priority;
-  guint flags;
-  guint source_id;
-
-  GSList *poll_fds;
-  
-  GSource *prev;
-  GSource *next;
-
-  gpointer reserved1;
-  gpointer reserved2;
-};
-
-struct _GSourceCallbackFuncs
-{
-  void (*ref)   (gpointer     cb_data);
-  void (*unref) (gpointer     cb_data);
-  void (*get)   (gpointer     cb_data,
-		 GSource     *source, 
-		 GSourceFunc *func,
-		 gpointer    *data);
-};
-
-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 */
-
-  /* For use by g_source_set_closure */
-  GSourceFunc     closure_callback;	   
-  GSourceDummyMarshal closure_marshal; /* Really is of type GClosureMarshal */
-};
-
-/* 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.
- *
- *
- * 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
- * Win32. It's really only written for the GIMP's needs so
- * far.
- */
-typedef struct _GPollFD GPollFD;
-typedef gint	(*GPollFunc)	(GPollFD *ufds,
-				 guint	  nfsd,
-				 gint     timeout_);
-
-struct _GPollFD
-{
-#if defined (G_OS_WIN32) && GLIB_SIZEOF_VOID_P == 8
-  gint64	fd;
-#else
-  gint		fd;
-#endif
-  gushort 	events;
-  gushort 	revents;
-};
-
-/* Standard priorities */
-
-#define G_PRIORITY_HIGH            -100
-#define G_PRIORITY_DEFAULT          0
-#define G_PRIORITY_HIGH_IDLE        100
-#define G_PRIORITY_DEFAULT_IDLE     200
-#define G_PRIORITY_LOW	            300
-
-/* GMainContext: */
-
-GMainContext *g_main_context_new       (void);
-GMainContext *g_main_context_ref       (GMainContext *context);
-void          g_main_context_unref     (GMainContext *context);
-GMainContext *g_main_context_default   (void);
-
-gboolean      g_main_context_iteration (GMainContext *context,
-					gboolean      may_block);
-gboolean      g_main_context_pending   (GMainContext *context);
-
-/* For implementation of legacy interfaces
- */
-GSource      *g_main_context_find_source_by_id              (GMainContext *context,
-							     guint         source_id);
-GSource      *g_main_context_find_source_by_user_data       (GMainContext *context,
-							     gpointer      user_data);
-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.
- */
-void     g_main_context_wakeup  (GMainContext *context);
-gboolean g_main_context_acquire (GMainContext *context);
-void     g_main_context_release (GMainContext *context);
-gboolean g_main_context_is_owner (GMainContext *context);
-gboolean g_main_context_wait    (GMainContext *context,
-				 GCond        *cond,
-				 GMutex       *mutex);
-
-gboolean g_main_context_prepare  (GMainContext *context,
-				  gint         *priority);
-gint     g_main_context_query    (GMainContext *context,
-				  gint          max_priority,
-				  gint         *timeout_,
-				  GPollFD      *fds,
-				  gint          n_fds);
-gint     g_main_context_check    (GMainContext *context,
-				  gint          max_priority,
-				  GPollFD      *fds,
-				  gint          n_fds);
-void     g_main_context_dispatch (GMainContext *context);
-
-void     g_main_context_set_poll_func (GMainContext *context,
-				       GPollFunc     func);
-GPollFunc g_main_context_get_poll_func (GMainContext *context);
-
-/* Low level functions for use by source implementations
- */
-void     g_main_context_add_poll    (GMainContext *context,
-				     GPollFD      *fd,
-				     gint          priority);
-void     g_main_context_remove_poll (GMainContext *context,
-				     GPollFD      *fd);
-
-gint     g_main_depth               (void);
-GSource *g_main_current_source      (void);
-
-
-/* GMainLoop: */
-
-GMainLoop *g_main_loop_new        (GMainContext *context,
-			    	   gboolean      is_running);
-void       g_main_loop_run        (GMainLoop    *loop);
-void       g_main_loop_quit       (GMainLoop    *loop);
-GMainLoop *g_main_loop_ref        (GMainLoop    *loop);
-void       g_main_loop_unref      (GMainLoop    *loop);
-gboolean   g_main_loop_is_running (GMainLoop    *loop);
-GMainContext *g_main_loop_get_context (GMainLoop    *loop);
-
-/* GSource: */
-
-GSource *g_source_new             (GSourceFuncs   *source_funcs,
-				   guint           struct_size);
-GSource *g_source_ref             (GSource        *source);
-void     g_source_unref           (GSource        *source);
-
-guint    g_source_attach          (GSource        *source,
-				   GMainContext   *context);
-void     g_source_destroy         (GSource        *source);
-
-void     g_source_set_priority    (GSource        *source,
-				   gint            priority);
-gint     g_source_get_priority    (GSource        *source);
-void     g_source_set_can_recurse (GSource        *source,
-				   gboolean        can_recurse);
-gboolean g_source_get_can_recurse (GSource        *source);
-guint    g_source_get_id          (GSource        *source);
-
-GMainContext *g_source_get_context (GSource       *source);
-
-void     g_source_set_callback    (GSource        *source,
-				   GSourceFunc     func,
-				   gpointer        data,
-				   GDestroyNotify  notify);
-
-void     g_source_set_funcs       (GSource        *source,
-                                   GSourceFuncs   *funcs);
-gboolean g_source_is_destroyed    (GSource        *source);
-
-/* Used to implement g_source_connect_closure and internally*/
-void g_source_set_callback_indirect (GSource              *source,
-				     gpointer              callback_data,
-				     GSourceCallbackFuncs *callback_funcs);
-
-void     g_source_add_poll         (GSource        *source,
-				    GPollFD        *fd);
-void     g_source_remove_poll      (GSource        *source,
-				    GPollFD        *fd);
-
-void     g_source_get_current_time (GSource        *source,
-				    GTimeVal       *timeval);
-
- /* void g_source_connect_closure (GSource        *source,
-                                  GClosure       *closure);
- */
-
-/* Specific source types
- */
-GSource *g_idle_source_new        (void);
-GSource *g_child_watch_source_new (GPid pid);
-GSource *g_timeout_source_new     (guint interval);
-GSource *g_timeout_source_new_seconds (guint interval);
-
-/* Miscellaneous functions
- */
-void g_get_current_time		        (GTimeVal	*result);
-
-/* ============== Compat main loop stuff ================== */
-
-#ifndef G_DISABLE_DEPRECATED
-
-/* Legacy names for GMainLoop functions
- */
-#define 	g_main_new(is_running)	g_main_loop_new (NULL, is_running);
-#define         g_main_run(loop)        g_main_loop_run(loop)
-#define         g_main_quit(loop)       g_main_loop_quit(loop)
-#define         g_main_destroy(loop)    g_main_loop_unref(loop)
-#define         g_main_is_running(loop) g_main_loop_is_running(loop)
-
-/* Functions to manipulate the default main loop
- */
-
-#define	g_main_iteration(may_block) g_main_context_iteration      (NULL, may_block)
-#define g_main_pending()            g_main_context_pending        (NULL)
-
-#define g_main_set_poll_func(func)   g_main_context_set_poll_func (NULL, func)
-
-#endif /* G_DISABLE_DEPRECATED */
-
-/* Source manipulation by ID */
-gboolean g_source_remove                     (guint          tag);
-gboolean g_source_remove_by_user_data        (gpointer       user_data);
-gboolean g_source_remove_by_funcs_user_data  (GSourceFuncs  *funcs,
-					      gpointer       user_data);
-
-/* Idles, child watchers and timeouts */
-guint    g_timeout_add_full         (gint            priority,
-				     guint           interval,
-				     GSourceFunc     function,
-				     gpointer        data,
-				     GDestroyNotify  notify);
-guint    g_timeout_add              (guint           interval,
-				     GSourceFunc     function,
-				     gpointer        data);
-guint    g_timeout_add_seconds_full (gint            priority,
-                                     guint           interval,
-                                     GSourceFunc     function,
-                                     gpointer        data,
-                                     GDestroyNotify  notify);
-guint    g_timeout_add_seconds      (guint           interval,
-				     GSourceFunc     function,
-				     gpointer        data);
-guint    g_child_watch_add_full     (gint            priority,
-				     GPid            pid,
-				     GChildWatchFunc function,
-				     gpointer        data,
-				     GDestroyNotify  notify);
-guint    g_child_watch_add          (GPid            pid,
-				     GChildWatchFunc function,
-				     gpointer        data);
-guint    g_idle_add                 (GSourceFunc     function,
-				     gpointer        data);
-guint    g_idle_add_full            (gint            priority,
-				     GSourceFunc     function,
-				     gpointer        data,
-				     GDestroyNotify  notify);
-gboolean g_idle_remove_by_data      (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;
-
-G_END_DECLS
-
-#endif /* __G_MAIN_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gmappedfile.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gmappedfile.h
deleted file mode 100644
index 123bc6af..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gmappedfile.h
+++ /dev/null
@@ -1,39 +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__
-
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GMappedFile GMappedFile;
-
-GMappedFile *g_mapped_file_new          (const gchar  *filename,
-				         gboolean      writable,
-				         GError      **error) G_GNUC_MALLOC;
-gsize        g_mapped_file_get_length   (GMappedFile  *file);
-gchar       *g_mapped_file_get_contents (GMappedFile  *file);
-void         g_mapped_file_free         (GMappedFile  *file);
-
-G_END_DECLS
-
-#endif /* __G_MAPPED_FILE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gmarkup.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gmarkup.h
deleted file mode 100644
index 340a2181..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gmarkup.h
+++ /dev/null
@@ -1,155 +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__
-
-#include <stdarg.h>
-
-#include <glib/gerror.h>
-#include <glib/gslist.h>
-
-G_BEGIN_DECLS
-
-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;
-
-#define G_MARKUP_ERROR g_markup_error_quark ()
-
-GQuark g_markup_error_quark (void);
-
-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;
-
-typedef struct _GMarkupParseContext GMarkupParseContext;
-typedef struct _GMarkupParser GMarkupParser;
-
-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);
-};
-
-GMarkupParseContext *g_markup_parse_context_new   (const GMarkupParser *parser,
-                                                   GMarkupParseFlags    flags,
-                                                   gpointer             user_data,
-                                                   GDestroyNotify       user_data_dnotify);
-void                 g_markup_parse_context_free  (GMarkupParseContext *context);
-gboolean             g_markup_parse_context_parse (GMarkupParseContext *context,
-                                                   const gchar         *text,
-                                                   gssize               text_len,  
-                                                   GError             **error);
-                                                   
-gboolean             g_markup_parse_context_end_parse (GMarkupParseContext *context,
-                                                       GError             **error);
-G_CONST_RETURN gchar *g_markup_parse_context_get_element (GMarkupParseContext *context);
-G_CONST_RETURN GSList *g_markup_parse_context_get_element_stack (GMarkupParseContext *context);
-
-/* For user-constructed error messages, has no precise semantics */
-void                 g_markup_parse_context_get_position (GMarkupParseContext *context,
-                                                          gint                *line_number,
-                                                          gint                *char_number);
-
-/* useful when saving */
-gchar* g_markup_escape_text (const gchar *text,
-                             gssize       length);  
-
-gchar *g_markup_printf_escaped (const char *format,
-				...) G_GNUC_PRINTF (1, 2);
-gchar *g_markup_vprintf_escaped (const char *format,
-				 va_list     args);
-
-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 */
-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/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gmem.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gmem.h
deleted file mode 100644
index 69a0befc..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gmem.h
+++ /dev/null
@@ -1,148 +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__
-
-#include <glib/gslice.h>
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GMemVTable GMemVTable;
-
-
-#if GLIB_SIZEOF_VOID_P > GLIB_SIZEOF_LONG
-#  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
- */
-gpointer g_malloc         (gsize	 n_bytes) G_GNUC_MALLOC;
-gpointer g_malloc0        (gsize	 n_bytes) G_GNUC_MALLOC;
-gpointer g_realloc        (gpointer	 mem,
-			   gsize	 n_bytes) G_GNUC_WARN_UNUSED_RESULT;
-void	 g_free	          (gpointer	 mem);
-gpointer g_try_malloc     (gsize	 n_bytes) G_GNUC_MALLOC;
-gpointer g_try_malloc0    (gsize	 n_bytes) G_GNUC_MALLOC;
-gpointer g_try_realloc    (gpointer	 mem,
-			   gsize	 n_bytes) G_GNUC_WARN_UNUSED_RESULT;
-
-
-/* Convenience memory allocators
- */
-#define g_new(struct_type, n_structs)		\
-    ((struct_type *) g_malloc (((gsize) sizeof (struct_type)) * ((gsize) (n_structs))))
-#define g_new0(struct_type, n_structs)		\
-    ((struct_type *) g_malloc0 (((gsize) sizeof (struct_type)) * ((gsize) (n_structs))))
-#define g_renew(struct_type, mem, n_structs)	\
-    ((struct_type *) g_realloc ((mem), ((gsize) sizeof (struct_type)) * ((gsize) (n_structs))))
-
-#define g_try_new(struct_type, n_structs)		\
-    ((struct_type *) g_try_malloc (((gsize) sizeof (struct_type)) * ((gsize) (n_structs))))
-#define g_try_new0(struct_type, n_structs)		\
-    ((struct_type *) g_try_malloc0 (((gsize) sizeof (struct_type)) * ((gsize) (n_structs))))
-#define g_try_renew(struct_type, mem, n_structs)	\
-    ((struct_type *) g_try_realloc ((mem), ((gsize) sizeof (struct_type)) * ((gsize) (n_structs))))
-
-
-/* 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);
-};
-void	 g_mem_set_vtable (GMemVTable	*vtable);
-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;
-void	g_mem_profile	(void);
-
-
-/* deprecated memchunks and allocators */
-#if !defined (G_DISABLE_DEPRECATED) || defined (GTK_COMPILATION) || defined (GDK_COMPILATION)
-typedef struct _GAllocator GAllocator;
-typedef struct _GMemChunk  GMemChunk;
-#define g_mem_chunk_create(type, pre_alloc, alloc_type)	( \
-  g_mem_chunk_new (#type " mem chunks (" #pre_alloc ")", \
-		   sizeof (type), \
-		   sizeof (type) * (pre_alloc), \
-		   (alloc_type)) \
-)
-#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_STMT_START { \
-  g_mem_chunk_free ((mem_chunk), (mem)); \
-} G_STMT_END
-#define G_ALLOC_ONLY	  1
-#define G_ALLOC_AND_FREE  2
-GMemChunk* g_mem_chunk_new     (const gchar *name,
-				gint         atom_size,
-				gsize        area_size,
-				gint         type);
-void       g_mem_chunk_destroy (GMemChunk   *mem_chunk);
-gpointer   g_mem_chunk_alloc   (GMemChunk   *mem_chunk);
-gpointer   g_mem_chunk_alloc0  (GMemChunk   *mem_chunk);
-void       g_mem_chunk_free    (GMemChunk   *mem_chunk,
-				gpointer     mem);
-void       g_mem_chunk_clean   (GMemChunk   *mem_chunk);
-void       g_mem_chunk_reset   (GMemChunk   *mem_chunk);
-void       g_mem_chunk_print   (GMemChunk   *mem_chunk);
-void       g_mem_chunk_info    (void);
-void	   g_blow_chunks       (void);
-GAllocator*g_allocator_new     (const gchar  *name,
-				guint         n_preallocs);
-void       g_allocator_free    (GAllocator   *allocator);
-#define	G_ALLOCATOR_LIST       (1)
-#define	G_ALLOCATOR_SLIST      (2)
-#define	G_ALLOCATOR_NODE       (3)
-#endif /* G_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __G_MEM_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gmessages.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gmessages.h
deleted file mode 100644
index eb2ca8f9..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gmessages.h
+++ /dev/null
@@ -1,338 +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__
-
-#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.
- */
-gsize	g_printf_string_upper_bound (const gchar* format,
-				     va_list	  args);
-
-/* 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
- */
-guint           g_log_set_handler       (const gchar    *log_domain,
-                                         GLogLevelFlags  log_levels,
-                                         GLogFunc        log_func,
-                                         gpointer        user_data);
-void            g_log_remove_handler    (const gchar    *log_domain,
-                                         guint           handler_id);
-void            g_log_default_handler   (const gchar    *log_domain,
-                                         GLogLevelFlags  log_level,
-                                         const gchar    *message,
-                                         gpointer        unused_data);
-GLogFunc        g_log_set_default_handler (GLogFunc      log_func,
-					   gpointer      user_data);
-void            g_log                   (const gchar    *log_domain,
-                                         GLogLevelFlags  log_level,
-                                         const gchar    *format,
-                                         ...) G_GNUC_PRINTF (3, 4);
-void            g_logv                  (const gchar    *log_domain,
-                                         GLogLevelFlags  log_level,
-                                         const gchar    *format,
-                                         va_list         args);
-GLogLevelFlags  g_log_set_fatal_mask    (const gchar    *log_domain,
-                                         GLogLevelFlags  fatal_mask);
-GLogLevelFlags  g_log_set_always_fatal  (GLogLevelFlags  fatal_mask);
-
-/* internal */
-G_GNUC_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 */
-void g_return_if_fail_warning (const char *log_domain,
-			       const char *pretty_function,
-			       const char *expression);
-void g_warn_message           (const char     *domain,
-                               const char     *file,
-                               int             line,
-                               const char     *func,
-                               const char     *warnexpr);
-#ifndef G_DISABLE_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;
-#endif /* !G_DISABLE_DEPRECATED */
-
-
-#ifndef G_LOG_DOMAIN
-#define G_LOG_DOMAIN    ((gchar*) 0)
-#endif  /* G_LOG_DOMAIN */
-#ifdef G_HAVE_ISO_VARARGS
-/* for(;;); so that GCC knows that control doesn't go past g_error() */
-#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)
-#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,
-         ...)
-{
-  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__ */
-
-typedef void    (*GPrintFunc)           (const gchar    *string);
-void            g_print                 (const gchar    *format,
-                                         ...) G_GNUC_PRINTF (1, 2);
-GPrintFunc      g_set_print_handler     (GPrintFunc      func);
-void            g_printerr              (const gchar    *format,
-                                         ...) G_GNUC_PRINTF (1, 2);
-GPrintFunc      g_set_printerr_handler  (GPrintFunc      func);
-
-
-/* Provide macros for graceful error handling.
- * The "return" macros will return from the current function.
- * Two different definitions are given for the macros in
- * order to support gcc's __PRETTY_FUNCTION__ capability.
- */
-
-#define g_warn_if_reached()     do { g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, NULL); } while (0)
-#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
-
-#define g_return_if_fail(expr)			G_STMT_START{ (void)0; }G_STMT_END
-#define g_return_val_if_fail(expr,val)		G_STMT_START{ (void)0; }G_STMT_END
-#define g_return_if_reached()			G_STMT_START{ return; }G_STMT_END
-#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/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gnode.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gnode.h
deleted file mode 100644
index e5b7ebc8..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gnode.h
+++ /dev/null
@@ -1,283 +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__
-
-#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)
-
-GNode*	 g_node_new		(gpointer	   data);
-void	 g_node_destroy		(GNode		  *root);
-void	 g_node_unlink		(GNode		  *node);
-GNode*   g_node_copy_deep       (GNode            *node,
-				 GCopyFunc         copy_func,
-				 gpointer          data);
-GNode*   g_node_copy            (GNode            *node);
-GNode*	 g_node_insert		(GNode		  *parent,
-				 gint		   position,
-				 GNode		  *node);
-GNode*	 g_node_insert_before	(GNode		  *parent,
-				 GNode		  *sibling,
-				 GNode		  *node);
-GNode*   g_node_insert_after    (GNode            *parent,
-				 GNode            *sibling,
-				 GNode            *node); 
-GNode*	 g_node_prepend		(GNode		  *parent,
-				 GNode		  *node);
-guint	 g_node_n_nodes		(GNode		  *root,
-				 GTraverseFlags	   flags);
-GNode*	 g_node_get_root	(GNode		  *node);
-gboolean g_node_is_ancestor	(GNode		  *node,
-				 GNode		  *descendant);
-guint	 g_node_depth		(GNode		  *node);
-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_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.
- */
-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.
- */
-guint	 g_node_max_height	 (GNode *root);
-
-void	 g_node_children_foreach (GNode		  *node,
-				  GTraverseFlags   flags,
-				  GNodeForeachFunc func,
-				  gpointer	   data);
-void	 g_node_reverse_children (GNode		  *node);
-guint	 g_node_n_children	 (GNode		  *node);
-GNode*	 g_node_nth_child	 (GNode		  *node,
-				  guint		   n);
-GNode*	 g_node_last_child	 (GNode		  *node);
-GNode*	 g_node_find_child	 (GNode		  *node,
-				  GTraverseFlags   flags,
-				  gpointer	   data);
-gint	 g_node_child_position	 (GNode		  *node,
-				  GNode		  *child);
-gint	 g_node_child_index	 (GNode		  *node,
-				  gpointer	   data);
-
-GNode*	 g_node_first_sibling	 (GNode		  *node);
-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 %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 %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)
-
-#ifndef G_DISABLE_DEPRECATED
-void     g_node_push_allocator  (gpointer          dummy);
-void     g_node_pop_allocator   (void);
-#endif
-G_END_DECLS
-
-#endif /* __G_NODE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/goption.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/goption.h
deleted file mode 100644
index 908e5319..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/goption.h
+++ /dev/null
@@ -1,160 +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__
-
-#include <glib/gerror.h>
-#include <glib/gquark.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GOptionContext GOptionContext;
-typedef struct _GOptionGroup   GOptionGroup;
-typedef struct _GOptionEntry   GOptionEntry;
-
-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;
-
-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;
-
-typedef gboolean (*GOptionArgFunc) (const gchar    *option_name,
-				    const gchar    *value,
-				    gpointer        data,
-				    GError        **error);
-
-typedef gboolean (*GOptionParseFunc) (GOptionContext *context,
-				      GOptionGroup   *group,
-				      gpointer	      data,
-				      GError        **error);
-
-typedef void (*GOptionErrorFunc) (GOptionContext *context,
-				  GOptionGroup   *group,
-				  gpointer        data,
-				  GError        **error);
-
-#define G_OPTION_ERROR (g_option_error_quark ())
-
-typedef enum
-{
-  G_OPTION_ERROR_UNKNOWN_OPTION,
-  G_OPTION_ERROR_BAD_VALUE,
-  G_OPTION_ERROR_FAILED
-} GOptionError;
-
-GQuark g_option_error_quark (void);
-
-
-struct _GOptionEntry
-{
-  const gchar *long_name;
-  gchar        short_name;
-  gint         flags;
-
-  GOptionArg   arg;
-  gpointer     arg_data;
-  
-  const gchar *description;
-  const gchar *arg_description;
-};
-
-#define G_OPTION_REMAINING ""
-
-GOptionContext *g_option_context_new              (const gchar         *parameter_string);
-void            g_option_context_set_summary      (GOptionContext      *context,
-                                                   const gchar         *summary);
-G_CONST_RETURN gchar *g_option_context_get_summary (GOptionContext     *context);
-void            g_option_context_set_description  (GOptionContext      *context,
-                                                   const gchar         *description);
-G_CONST_RETURN gchar *g_option_context_get_description (GOptionContext     *context);
-void            g_option_context_free             (GOptionContext      *context);
-void		g_option_context_set_help_enabled (GOptionContext      *context,
-						   gboolean		help_enabled);
-gboolean	g_option_context_get_help_enabled (GOptionContext      *context);
-void		g_option_context_set_ignore_unknown_options (GOptionContext *context,
-							     gboolean	     ignore_unknown);
-gboolean        g_option_context_get_ignore_unknown_options (GOptionContext *context);
-
-void            g_option_context_add_main_entries (GOptionContext      *context,
-						   const GOptionEntry  *entries,
-						   const gchar         *translation_domain);
-gboolean        g_option_context_parse            (GOptionContext      *context,
-						   gint                *argc,
-						   gchar             ***argv,
-						   GError             **error);
-void            g_option_context_set_translate_func (GOptionContext     *context,
-						     GTranslateFunc      func,
-						     gpointer            data,
-						     GDestroyNotify      destroy_notify);
-void            g_option_context_set_translation_domain (GOptionContext  *context,
-							 const gchar     *domain);
-
-void            g_option_context_add_group      (GOptionContext *context,
-						 GOptionGroup   *group);
-void          g_option_context_set_main_group (GOptionContext *context,
-					       GOptionGroup   *group);
-GOptionGroup *g_option_context_get_main_group (GOptionContext *context);
-gchar        *g_option_context_get_help       (GOptionContext *context,
-                                               gboolean        main_help,
-                                               GOptionGroup   *group);
-
-GOptionGroup *g_option_group_new                    (const gchar        *name,
-						     const gchar        *description,
-						     const gchar        *help_description,
-						     gpointer            user_data,
-						     GDestroyNotify      destroy);
-void	      g_option_group_set_parse_hooks	    (GOptionGroup       *group,
-						     GOptionParseFunc    pre_parse_func,
-						     GOptionParseFunc	 post_parse_func);
-void	      g_option_group_set_error_hook	    (GOptionGroup       *group,
-						     GOptionErrorFunc	 error_func);
-void          g_option_group_free                   (GOptionGroup       *group);
-void          g_option_group_add_entries            (GOptionGroup       *group,
-						     const GOptionEntry *entries);
-void          g_option_group_set_translate_func     (GOptionGroup       *group,
-						     GTranslateFunc      func,
-						     gpointer            data,
-						     GDestroyNotify      destroy_notify);
-void          g_option_group_set_translation_domain (GOptionGroup       *group,
-						     const gchar        *domain);
-
-
-G_END_DECLS
-
-#endif /* __G_OPTION_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gpattern.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gpattern.h
deleted file mode 100644
index 5c896687..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gpattern.h
+++ /dev/null
@@ -1,44 +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__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-
-typedef struct _GPatternSpec    GPatternSpec;
-
-GPatternSpec* g_pattern_spec_new       (const gchar  *pattern);
-void          g_pattern_spec_free      (GPatternSpec *pspec);
-gboolean      g_pattern_spec_equal     (GPatternSpec *pspec1,
-					GPatternSpec *pspec2);
-gboolean      g_pattern_match          (GPatternSpec *pspec,
-					guint         string_length,
-					const gchar  *string,
-					const gchar  *string_reversed);
-gboolean      g_pattern_match_string   (GPatternSpec *pspec,
-					const gchar  *string);
-gboolean      g_pattern_match_simple   (const gchar  *pattern,
-					const gchar  *string);
-
-G_END_DECLS
-
-#endif /* __G_PATTERN_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gprimes.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gprimes.h
deleted file mode 100644
index 0f1740cb..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gprimes.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_PRIMES_H__
-#define __G_PRIMES_H__
-
-#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.
- */
-guint	   g_spaced_primes_closest (guint num) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __G_PRIMES_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gprintf.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gprintf.h
deleted file mode 100644
index aa542b3d..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gprintf.h
+++ /dev/null
@@ -1,54 +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/gtypes.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-G_BEGIN_DECLS
-
-gint                  g_printf    (gchar const *format,
-                                   ...) G_GNUC_PRINTF (1, 2);            
-gint                  g_fprintf   (FILE        *file,
-				   gchar const *format,
-				   ...) G_GNUC_PRINTF (2, 3);
-gint                  g_sprintf   (gchar       *string,
-				   gchar const *format,
-				   ...) G_GNUC_PRINTF (2, 3);
-
-gint                  g_vprintf   (gchar const *format,
-                                   va_list      args);            
-gint                  g_vfprintf  (FILE        *file,
-				   gchar const *format,
-				   va_list      args);
-gint                  g_vsprintf  (gchar       *string,
-				   gchar const *format,
-				   va_list      args);
-gint                  g_vasprintf (gchar      **string,
-				   gchar const *format,
-				   va_list      args);
-
-G_END_DECLS
-
-#endif /* __G_PRINTF_H__ */
-
-
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gqsort.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gqsort.h
deleted file mode 100644
index d0ff46a4..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gqsort.h
+++ /dev/null
@@ -1,44 +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__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-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/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gquark.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gquark.h
deleted file mode 100644
index fc3006ff..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gquark.h
+++ /dev/null
@@ -1,50 +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__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-typedef guint32 GQuark;
-
-/* Quarks (string<->id association)
- */
-GQuark                g_quark_try_string         (const gchar *string);
-GQuark                g_quark_from_static_string (const gchar *string);
-GQuark                g_quark_from_string        (const gchar *string);
-G_CONST_RETURN gchar* g_quark_to_string          (GQuark       quark) G_GNUC_CONST;
-
-G_CONST_RETURN gchar* g_intern_string            (const gchar *string);
-G_CONST_RETURN gchar* g_intern_static_string     (const gchar *string);
-
-
-G_END_DECLS
-
-#endif /* __G_QUARK_H__ */
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gqueue.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gqueue.h
deleted file mode 100644
index c4004514..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gqueue.h
+++ /dev/null
@@ -1,123 +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__
-
-#include <glib/glist.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GQueue		GQueue;
-
-struct _GQueue
-{
-  GList *head;
-  GList *tail;
-  guint  length;
-};
-
-#define G_QUEUE_INIT { NULL, NULL, 0 }
-
-/* Queues
- */
-GQueue*  g_queue_new            (void);
-void     g_queue_free           (GQueue           *queue);
-void     g_queue_init           (GQueue           *queue);
-void     g_queue_clear          (GQueue           *queue);
-gboolean g_queue_is_empty       (GQueue           *queue);
-guint    g_queue_get_length     (GQueue           *queue);
-void     g_queue_reverse        (GQueue           *queue);
-GQueue * g_queue_copy           (GQueue           *queue);
-void     g_queue_foreach        (GQueue           *queue,
-				 GFunc             func,
-				 gpointer          user_data);
-GList *  g_queue_find           (GQueue           *queue,
-				 gconstpointer     data);
-GList *  g_queue_find_custom    (GQueue           *queue,
-				 gconstpointer     data,
-				 GCompareFunc      func);
-void     g_queue_sort           (GQueue           *queue,
-				 GCompareDataFunc  compare_func,
-				 gpointer          user_data);
-
-void     g_queue_push_head      (GQueue           *queue,
-				 gpointer          data);
-void     g_queue_push_tail      (GQueue           *queue,
-				 gpointer          data);
-void     g_queue_push_nth       (GQueue           *queue,
-				 gpointer          data,
-				 gint              n);
-gpointer g_queue_pop_head       (GQueue           *queue);
-gpointer g_queue_pop_tail       (GQueue           *queue);
-gpointer g_queue_pop_nth        (GQueue           *queue,
-				 guint             n);
-gpointer g_queue_peek_head      (GQueue           *queue);
-gpointer g_queue_peek_tail      (GQueue           *queue);
-gpointer g_queue_peek_nth       (GQueue           *queue,
-				 guint             n);
-gint     g_queue_index          (GQueue           *queue,
-				 gconstpointer     data);
-void     g_queue_remove         (GQueue           *queue,
-				 gconstpointer     data);
-void     g_queue_remove_all     (GQueue           *queue,
-				 gconstpointer     data);
-void     g_queue_insert_before  (GQueue           *queue,
-				 GList            *sibling,
-				 gpointer          data);
-void     g_queue_insert_after   (GQueue           *queue,
-				 GList            *sibling,
-				 gpointer          data);
-void     g_queue_insert_sorted  (GQueue           *queue,
-				 gpointer          data,
-				 GCompareDataFunc  func,
-				 gpointer          user_data);
-
-void     g_queue_push_head_link (GQueue           *queue,
-				 GList            *link_);
-void     g_queue_push_tail_link (GQueue           *queue,
-				 GList            *link_);
-void     g_queue_push_nth_link  (GQueue           *queue,
-				 gint              n,
-				 GList            *link_);
-GList*   g_queue_pop_head_link  (GQueue           *queue);
-GList*   g_queue_pop_tail_link  (GQueue           *queue);
-GList*   g_queue_pop_nth_link   (GQueue           *queue,
-				 guint             n);
-GList*   g_queue_peek_head_link (GQueue           *queue);
-GList*   g_queue_peek_tail_link (GQueue           *queue);
-GList*   g_queue_peek_nth_link  (GQueue           *queue,
-				 guint             n);
-gint     g_queue_link_index     (GQueue           *queue,
-				 GList            *link_);
-void     g_queue_unlink         (GQueue           *queue,
-				 GList            *link_);
-void     g_queue_delete_link    (GQueue           *queue,
-				 GList            *link_);
-
-G_END_DECLS
-
-#endif /* __G_QUEUE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/grand.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/grand.h
deleted file mode 100644
index cb6887bc..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/grand.h
+++ /dev/null
@@ -1,87 +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__
-
-#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.keio.ac.jp/~matumoto/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)
- */
-
-GRand*  g_rand_new_with_seed  (guint32  seed);
-GRand*  g_rand_new_with_seed_array (const guint32 *seed,
-				    guint seed_length);
-GRand*  g_rand_new            (void);
-void    g_rand_free           (GRand   *rand_);
-GRand*  g_rand_copy           (GRand   *rand_);
-void    g_rand_set_seed       (GRand   *rand_,
-			       guint32  seed);
-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)
-
-guint32 g_rand_int            (GRand   *rand_);
-gint32  g_rand_int_range      (GRand   *rand_,
-			       gint32   begin,
-			       gint32   end);
-gdouble g_rand_double         (GRand   *rand_);
-gdouble g_rand_double_range   (GRand   *rand_,
-			       gdouble  begin,
-			       gdouble  end);
-void    g_random_set_seed     (guint32  seed);
-
-#define g_random_boolean() ((g_random_int () & (1 << 15)) != 0)
-
-guint32 g_random_int          (void);
-gint32  g_random_int_range    (gint32   begin,
-			       gint32   end);
-gdouble g_random_double       (void);
-gdouble g_random_double_range (gdouble  begin,
-			       gdouble  end);
-
-
-G_END_DECLS
-
-#endif /* __G_RAND_H__ */
-
-
-
-
-
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gregex.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gregex.h
deleted file mode 100644
index c60b447f..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gregex.h
+++ /dev/null
@@ -1,240 +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__
-
-#include <glib/gerror.h>
-#include <glib/gstring.h>
-
-G_BEGIN_DECLS
-
-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
-} GRegexError;
-
-#define G_REGEX_ERROR g_regex_error_quark ()
-
-GQuark g_regex_error_quark (void);
-
-/* 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_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
-} GRegexCompileFlags;
-
-/* 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
-} GRegexMatchFlags;
-
-typedef struct _GRegex		GRegex;
-typedef struct _GMatchInfo	GMatchInfo;
-
-typedef gboolean (*GRegexEvalCallback)		(const GMatchInfo *match_info,
-						 GString          *result,
-						 gpointer          user_data);
-
-
-GRegex		 *g_regex_new			(const gchar         *pattern,
-						 GRegexCompileFlags   compile_options,
-						 GRegexMatchFlags     match_options,
-						 GError             **error);
-GRegex           *g_regex_ref			(GRegex              *regex);
-void		  g_regex_unref			(GRegex              *regex);
-const gchar	 *g_regex_get_pattern		(const GRegex        *regex);
-gint		  g_regex_get_max_backref	(const GRegex        *regex);
-gint		  g_regex_get_capture_count	(const GRegex        *regex);
-gint		  g_regex_get_string_number	(const GRegex        *regex, 
-						 const gchar         *name);
-gchar		 *g_regex_escape_string		(const gchar         *string,
-						 gint                 length);
-
-/* Matching. */
-gboolean	  g_regex_match_simple		(const gchar         *pattern,
-						 const gchar         *string,
-						 GRegexCompileFlags   compile_options,
-						 GRegexMatchFlags     match_options);
-gboolean	  g_regex_match			(const GRegex        *regex,
-						 const gchar         *string,
-						 GRegexMatchFlags     match_options,
-						 GMatchInfo         **match_info);
-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);
-gboolean	  g_regex_match_all		(const GRegex        *regex,
-						 const gchar         *string,
-						 GRegexMatchFlags     match_options,
-						 GMatchInfo         **match_info);
-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. */
-gchar		**g_regex_split_simple		(const gchar         *pattern,
-						 const gchar         *string,
-						 GRegexCompileFlags   compile_options,
-						 GRegexMatchFlags     match_options);
-gchar		**g_regex_split			(const GRegex        *regex,
-						 const gchar         *string,
-						 GRegexMatchFlags     match_options);
-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. */
-gchar		 *g_regex_replace		(const GRegex        *regex,
-						 const gchar         *string,
-						 gssize               string_len,
-						 gint                 start_position,
-						 const gchar         *replacement,
-						 GRegexMatchFlags     match_options,
-						 GError             **error);
-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);
-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);
-gboolean	  g_regex_check_replacement	(const gchar         *replacement,
-						 gboolean            *has_references,
-						 GError             **error);
-
-/* Match info */
-GRegex		 *g_match_info_get_regex	(const GMatchInfo    *match_info);
-const gchar      *g_match_info_get_string       (const GMatchInfo    *match_info);
-
-void		  g_match_info_free		(GMatchInfo          *match_info);
-gboolean	  g_match_info_next		(GMatchInfo          *match_info,
-						 GError             **error);
-gboolean	  g_match_info_matches		(const GMatchInfo    *match_info);
-gint		  g_match_info_get_match_count	(const GMatchInfo    *match_info);
-gboolean	  g_match_info_is_partial_match	(const GMatchInfo    *match_info);
-gchar		 *g_match_info_expand_references(const GMatchInfo    *match_info,
-						 const gchar         *string_to_expand,
-						 GError             **error);
-gchar		 *g_match_info_fetch		(const GMatchInfo    *match_info,
-						 gint                 match_num);
-gboolean	  g_match_info_fetch_pos	(const GMatchInfo    *match_info,
-						 gint                 match_num,
-						 gint                *start_pos,
-						 gint                *end_pos);
-gchar		 *g_match_info_fetch_named	(const GMatchInfo    *match_info,
-						 const gchar         *name);
-gboolean	  g_match_info_fetch_named_pos	(const GMatchInfo    *match_info,
-						 const gchar         *name,
-						 gint                *start_pos,
-						 gint                *end_pos);
-gchar		**g_match_info_fetch_all	(const GMatchInfo    *match_info);
-
-G_END_DECLS
-
-
-#endif  /*  __G_REGEX_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/grel.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/grel.h
deleted file mode 100644
index 275f0549..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/grel.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_REL_H__
-#define __G_REL_H__
-
-#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 ...
- */
-
-GRelation* g_relation_new     (gint         fields);
-void       g_relation_destroy (GRelation   *relation);
-void       g_relation_index   (GRelation   *relation,
-                               gint         field,
-                               GHashFunc    hash_func,
-                               GEqualFunc   key_equal_func);
-void       g_relation_insert  (GRelation   *relation,
-                               ...);
-gint       g_relation_delete  (GRelation   *relation,
-                               gconstpointer  key,
-                               gint         field);
-GTuples*   g_relation_select  (GRelation   *relation,
-                               gconstpointer  key,
-                               gint         field);
-gint       g_relation_count   (GRelation   *relation,
-                               gconstpointer  key,
-                               gint         field);
-gboolean   g_relation_exists  (GRelation   *relation,
-                               ...);
-void       g_relation_print   (GRelation   *relation);
-
-void       g_tuples_destroy   (GTuples     *tuples);
-gpointer   g_tuples_index     (GTuples     *tuples,
-                               gint         index_,
-                               gint         field);
-
-G_END_DECLS
-
-#endif /* __G_REL_H__ */
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gscanner.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gscanner.h
deleted file mode 100644
index a61c0a5b..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gscanner.h
+++ /dev/null
@@ -1,275 +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__
-
-#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,
-  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 */
-  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;
-  
-  /* to be considered private */
-  GHashTable		*symbol_table;
-  gint			input_fd;
-  const gchar		*text;
-  const gchar		*text_end;
-  gchar			*buffer;
-  guint			scope_id;
-  
-  /* handler function for _warn and _error */
-  GScannerMsgFunc	msg_handler;
-};
-
-GScanner*	g_scanner_new			(const GScannerConfig *config_templ);
-void		g_scanner_destroy		(GScanner	*scanner);
-void		g_scanner_input_file		(GScanner	*scanner,
-						 gint		input_fd);
-void		g_scanner_sync_file_offset	(GScanner	*scanner);
-void		g_scanner_input_text		(GScanner	*scanner,
-						 const	gchar	*text,
-						 guint		text_len);
-GTokenType	g_scanner_get_next_token	(GScanner	*scanner);
-GTokenType	g_scanner_peek_next_token	(GScanner	*scanner);
-GTokenType	g_scanner_cur_token		(GScanner	*scanner);
-GTokenValue	g_scanner_cur_value		(GScanner	*scanner);
-guint		g_scanner_cur_line		(GScanner	*scanner);
-guint		g_scanner_cur_position		(GScanner	*scanner);
-gboolean	g_scanner_eof			(GScanner	*scanner);
-guint		g_scanner_set_scope		(GScanner	*scanner,
-						 guint		 scope_id);
-void		g_scanner_scope_add_symbol	(GScanner	*scanner,
-						 guint		 scope_id,
-						 const gchar	*symbol,
-						 gpointer	value);
-void		g_scanner_scope_remove_symbol	(GScanner	*scanner,
-						 guint		 scope_id,
-						 const gchar	*symbol);
-gpointer	g_scanner_scope_lookup_symbol	(GScanner	*scanner,
-						 guint		 scope_id,
-						 const gchar	*symbol);
-void		g_scanner_scope_foreach_symbol	(GScanner	*scanner,
-						 guint		 scope_id,
-						 GHFunc		 func,
-						 gpointer	 user_data);
-gpointer	g_scanner_lookup_symbol		(GScanner	*scanner,
-						 const gchar	*symbol);
-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);
-void		g_scanner_error			(GScanner	*scanner,
-						 const gchar	*format,
-						 ...) G_GNUC_PRINTF (2,3);
-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/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gsequence.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gsequence.h
deleted file mode 100644
index ffac6c62..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gsequence.h
+++ /dev/null
@@ -1,121 +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.
- */
-
-#include <glib/gtypes.h>
-
-#ifndef __G_SEQUENCE_H__
-#define __G_SEQUENCE_H__
-
-typedef struct _GSequence      GSequence;
-typedef struct _GSequenceNode  GSequenceIter;
-
-typedef gint (* GSequenceIterCompareFunc) (GSequenceIter *a,
-                                           GSequenceIter *b,
-                                           gpointer       data);
-
-
-/* GSequence */
-GSequence *    g_sequence_new                (GDestroyNotify            data_destroy);
-void           g_sequence_free               (GSequence                *seq);
-gint           g_sequence_get_length         (GSequence                *seq);
-void           g_sequence_foreach            (GSequence                *seq,
-                                              GFunc                     func,
-                                              gpointer                  user_data);
-void           g_sequence_foreach_range      (GSequenceIter            *begin,
-                                              GSequenceIter            *end,
-                                              GFunc                     func,
-                                              gpointer                  user_data);
-void           g_sequence_sort               (GSequence                *seq,
-                                              GCompareDataFunc          cmp_func,
-                                              gpointer                  cmp_data);
-void           g_sequence_sort_iter          (GSequence                *seq,
-                                              GSequenceIterCompareFunc  cmp_func,
-                                              gpointer                  cmp_data);
-
-
-/* Getting iters */
-GSequenceIter *g_sequence_get_begin_iter     (GSequence                *seq);
-GSequenceIter *g_sequence_get_end_iter       (GSequence                *seq);
-GSequenceIter *g_sequence_get_iter_at_pos    (GSequence                *seq,
-                                              gint                      pos);
-GSequenceIter *g_sequence_append             (GSequence                *seq,
-                                              gpointer                  data);
-GSequenceIter *g_sequence_prepend            (GSequence                *seq,
-                                              gpointer                  data);
-GSequenceIter *g_sequence_insert_before      (GSequenceIter            *iter,
-                                              gpointer                  data);
-void           g_sequence_move               (GSequenceIter            *src,
-                                              GSequenceIter            *dest);
-void           g_sequence_swap               (GSequenceIter            *a,
-                                              GSequenceIter            *b);
-GSequenceIter *g_sequence_insert_sorted      (GSequence                *seq,
-                                              gpointer                  data,
-                                              GCompareDataFunc          cmp_func,
-                                              gpointer                  cmp_data);
-GSequenceIter *g_sequence_insert_sorted_iter (GSequence                *seq,
-                                              gpointer                  data,
-                                              GSequenceIterCompareFunc  iter_cmp,
-                                              gpointer                  cmp_data);
-void           g_sequence_sort_changed       (GSequenceIter            *iter,
-                                              GCompareDataFunc          cmp_func,
-                                              gpointer                  cmp_data);
-void           g_sequence_sort_changed_iter  (GSequenceIter            *iter,
-                                              GSequenceIterCompareFunc  iter_cmp,
-                                              gpointer                  cmp_data);
-void           g_sequence_remove             (GSequenceIter            *iter);
-void           g_sequence_remove_range       (GSequenceIter            *begin,
-                                              GSequenceIter            *end);
-void           g_sequence_move_range         (GSequenceIter            *dest,
-                                              GSequenceIter            *begin,
-                                              GSequenceIter            *end);
-GSequenceIter *g_sequence_search             (GSequence                *seq,
-                                              gpointer                  data,
-                                              GCompareDataFunc          cmp_func,
-                                              gpointer                  cmp_data);
-GSequenceIter *g_sequence_search_iter        (GSequence                *seq,
-                                              gpointer                  data,
-                                              GSequenceIterCompareFunc  iter_cmp,
-                                              gpointer                  cmp_data);
-
-
-/* Dereferencing */
-gpointer       g_sequence_get                (GSequenceIter            *iter);
-void           g_sequence_set                (GSequenceIter            *iter,
-                                              gpointer                  data);
-
-/* Operations on GSequenceIter * */
-gboolean       g_sequence_iter_is_begin      (GSequenceIter            *iter);
-gboolean       g_sequence_iter_is_end        (GSequenceIter            *iter);
-GSequenceIter *g_sequence_iter_next          (GSequenceIter            *iter);
-GSequenceIter *g_sequence_iter_prev          (GSequenceIter            *iter);
-gint           g_sequence_iter_get_position  (GSequenceIter            *iter);
-GSequenceIter *g_sequence_iter_move          (GSequenceIter            *iter,
-                                              gint                      delta);
-GSequence *    g_sequence_iter_get_sequence  (GSequenceIter            *iter);
-
-
-/* Search */
-gint           g_sequence_iter_compare       (GSequenceIter            *a,
-                                              GSequenceIter            *b);
-GSequenceIter *g_sequence_range_get_midpoint (GSequenceIter            *begin,
-                                              GSequenceIter            *end);
-
-
-#endif /* __G_SEQUENCE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gshell.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gshell.h
deleted file mode 100644
index b3f9d914..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gshell.h
+++ /dev/null
@@ -1,53 +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__
-
-#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;
-
-GQuark g_shell_error_quark (void);
-
-gchar*   g_shell_quote      (const gchar   *unquoted_string);
-gchar*   g_shell_unquote    (const gchar   *quoted_string,
-                             GError       **error);
-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/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gslice.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gslice.h
deleted file mode 100644
index 9b46da7e..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gslice.h
+++ /dev/null
@@ -1,85 +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__
-
-#ifndef __G_MEM_H__
-#error Include <glib.h> instead of <gslice.h>
-#endif
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/* slices - fast allocation/release of small memory blocks
- */
-gpointer g_slice_alloc          	(gsize	       block_size) G_GNUC_MALLOC;
-gpointer g_slice_alloc0         	(gsize         block_size) G_GNUC_MALLOC;
-gpointer g_slice_copy                   (gsize         block_size,
-                                         gconstpointer mem_block) G_GNUC_MALLOC;
-void     g_slice_free1          	(gsize         block_size,
-					 gpointer      mem_block);
-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;
-void     g_slice_set_config	   (GSliceConfig ckey, gint64 value);
-gint64   g_slice_get_config	   (GSliceConfig ckey);
-gint64*  g_slice_get_config_state  (GSliceConfig ckey, gint64 address, guint *n_values);
-
-G_END_DECLS
-
-#endif /* __G_SLICE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gslist.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gslist.h
deleted file mode 100644
index 8ef54088..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gslist.h
+++ /dev/null
@@ -1,110 +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__
-
-#include <glib/gmem.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GSList GSList;
-
-struct _GSList
-{
-  gpointer data;
-  GSList *next;
-};
-
-/* Singly linked lists
- */
-GSList*  g_slist_alloc                   (void) G_GNUC_WARN_UNUSED_RESULT;
-void     g_slist_free                    (GSList           *list);
-void     g_slist_free_1                  (GSList           *list);
-#define	 g_slist_free1		         g_slist_free_1
-GSList*  g_slist_append                  (GSList           *list,
-					  gpointer          data) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_prepend                 (GSList           *list,
-					  gpointer          data) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_insert                  (GSList           *list,
-					  gpointer          data,
-					  gint              position) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_insert_sorted           (GSList           *list,
-					  gpointer          data,
-					  GCompareFunc      func) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_insert_sorted_with_data (GSList           *list,
-					  gpointer          data,
-					  GCompareDataFunc  func,
-					  gpointer          user_data) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_insert_before           (GSList           *slist,
-					  GSList           *sibling,
-					  gpointer          data) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_concat                  (GSList           *list1,
-					  GSList           *list2) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_remove                  (GSList           *list,
-					  gconstpointer     data) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_remove_all              (GSList           *list,
-					  gconstpointer     data) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_remove_link             (GSList           *list,
-					  GSList           *link_) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_delete_link             (GSList           *list,
-					  GSList           *link_) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_reverse                 (GSList           *list) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_copy                    (GSList           *list) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_nth                     (GSList           *list,
-					  guint             n);
-GSList*  g_slist_find                    (GSList           *list,
-					  gconstpointer     data);
-GSList*  g_slist_find_custom             (GSList           *list,
-					  gconstpointer     data,
-					  GCompareFunc      func);
-gint     g_slist_position                (GSList           *list,
-					  GSList           *llink);
-gint     g_slist_index                   (GSList           *list,
-					  gconstpointer     data);
-GSList*  g_slist_last                    (GSList           *list);
-guint    g_slist_length                  (GSList           *list);
-void     g_slist_foreach                 (GSList           *list,
-					  GFunc             func,
-					  gpointer          user_data);
-GSList*  g_slist_sort                    (GSList           *list,
-					  GCompareFunc      compare_func) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_sort_with_data          (GSList           *list,
-					  GCompareDataFunc  compare_func,
-					  gpointer          user_data) G_GNUC_WARN_UNUSED_RESULT;
-gpointer g_slist_nth_data                (GSList           *list,
-					  guint             n);
-
-#define  g_slist_next(slist)	         ((slist) ? (((GSList *)(slist))->next) : NULL)
-
-#ifndef G_DISABLE_DEPRECATED
-void     g_slist_push_allocator          (gpointer	   dummy);
-void     g_slist_pop_allocator           (void);
-#endif
-G_END_DECLS
-
-#endif /* __G_SLIST_H__ */
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gspawn.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gspawn.h
deleted file mode 100644
index adb67417..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gspawn.h
+++ /dev/null
@@ -1,138 +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__
-
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-/* I'm not sure I remember our proposed naming convention here. */
-#define G_SPAWN_ERROR g_spawn_error_quark ()
-
-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_2BIG,   /* execv() returned E2BIG */
-  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;
-
-typedef void (* GSpawnChildSetupFunc) (gpointer user_data);
-
-typedef enum
-{
-  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
-} GSpawnFlags;
-
-GQuark g_spawn_error_quark (void);
-
-#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
-#endif
-
-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.
- */
-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.
- */
-
-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);
-
-gboolean g_spawn_command_line_sync  (const gchar          *command_line,
-                                     gchar               **standard_output,
-                                     gchar               **standard_error,
-                                     gint                 *exit_status,
-                                     GError              **error);
-gboolean g_spawn_command_line_async (const gchar          *command_line,
-                                     GError              **error);
-
-void g_spawn_close_pid (GPid pid);
-
-
-G_END_DECLS
-
-#endif /* __G_SPAWN_H__ */
-
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gstdio.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gstdio.h
deleted file mode 100644
index dd9e82ad..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gstdio.h
+++ /dev/null
@@ -1,114 +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(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.
- */
-
-#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
-
-int g_access (const gchar *filename,
-	      int          mode);
-
-int g_chdir  (const gchar *path);
-
-int g_unlink (const gchar *filename);
-
-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, preferrably 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.
- */
-
-int g_access    (const gchar *filename,
-		 int          mode);
-
-int g_chmod     (const gchar *filename,
-		 int          mode);
-
-int g_open      (const gchar *filename,
-                 int          flags,
-                 int          mode);
-
-int g_creat     (const gchar *filename,
-                 int          mode);
-
-int g_rename    (const gchar *oldfilename,
-                 const gchar *newfilename);
-
-int g_mkdir     (const gchar *filename,
-                 int          mode);
-
-int g_chdir     (const gchar *path);
-
-int g_stat      (const gchar *filename,
-                 struct stat *buf);
-
-int g_lstat     (const gchar *filename,
-                 struct stat *buf);
-
-int g_unlink    (const gchar *filename);
-
-int g_remove    (const gchar *filename);
-
-int g_rmdir     (const gchar *filename);
-
-FILE *g_fopen   (const gchar *filename,
-                 const gchar *mode);
-
-FILE *g_freopen (const gchar *filename,
-                 const gchar *mode,
-                 FILE        *stream);
-
-#endif /* G_OS_UNIX */
-
-G_END_DECLS
-
-#endif /* __G_STDIO_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gstrfuncs.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gstrfuncs.h
deleted file mode 100644
index bf35326f..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gstrfuncs.h
+++ /dev/null
@@ -1,252 +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__
-
-#include <stdarg.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)
-
-gchar                 g_ascii_tolower  (gchar        c) G_GNUC_CONST;
-gchar                 g_ascii_toupper  (gchar        c) G_GNUC_CONST;
-
-gint                  g_ascii_digit_value  (gchar    c) G_GNUC_CONST;
-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	"_-|> <."
-gchar*	              g_strdelimit     (gchar	     *string,
-					const gchar  *delimiters,
-					gchar	      new_delimiter);
-gchar*	              g_strcanon       (gchar        *string,
-					const gchar  *valid_chars,
-					gchar         substitutor);
-G_CONST_RETURN gchar* g_strerror       (gint	      errnum) G_GNUC_CONST;
-G_CONST_RETURN gchar* g_strsignal      (gint	      signum) G_GNUC_CONST;
-gchar*	              g_strreverse     (gchar	     *string);
-gsize	              g_strlcpy	       (gchar	     *dest,
-					const gchar  *src,
-					gsize         dest_size);
-gsize	              g_strlcat        (gchar	     *dest,
-					const gchar  *src,
-					gsize         dest_size);
-gchar *               g_strstr_len     (const gchar  *haystack,
-					gssize        haystack_len,
-					const gchar  *needle);
-gchar *               g_strrstr        (const gchar  *haystack,
-					const gchar  *needle);
-gchar *               g_strrstr_len    (const gchar  *haystack,
-					gssize        haystack_len,
-					const gchar  *needle);
-
-gboolean              g_str_has_suffix (const gchar  *str,
-					const gchar  *suffix);
-gboolean              g_str_has_prefix (const gchar  *str,
-					const gchar  *prefix);
-
-/* String to/from double conversion functions */
-
-gdouble	              g_strtod         (const gchar  *nptr,
-					gchar	    **endptr);
-gdouble	              g_ascii_strtod   (const gchar  *nptr,
-					gchar	    **endptr);
-guint64		      g_ascii_strtoull (const gchar *nptr,
-					gchar      **endptr,
-					guint        base);
-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)
-gchar *               g_ascii_dtostr   (gchar        *buffer,
-					gint          buf_len,
-					gdouble       d);
-gchar *               g_ascii_formatd  (gchar        *buffer,
-					gint          buf_len,
-					const gchar  *format,
-					gdouble       d);
-
-/* removes leading spaces */
-gchar*                g_strchug        (gchar        *string);
-/* removes trailing spaces */
-gchar*                g_strchomp       (gchar        *string);
-/* removes leading & trailing spaces */
-#define g_strstrip( string )	g_strchomp (g_strchug (string))
-
-gint                  g_ascii_strcasecmp  (const gchar *s1,
-					   const gchar *s2);
-gint                  g_ascii_strncasecmp (const gchar *s1,
-					   const gchar *s2,
-					   gsize        n);
-gchar*                g_ascii_strdown     (const gchar *str,
-					   gssize       len) G_GNUC_MALLOC;
-gchar*                g_ascii_strup       (const gchar *str,
-					   gssize       len) G_GNUC_MALLOC;
-
-#ifndef G_DISABLE_DEPRECATED
-
-/* The following four functions are deprecated and will be removed in
- * the next major release. They use the locale-specific tolower and
- * toupper, which is almost never the right thing.
- */
-
-gint	              g_strcasecmp     (const gchar *s1,
-					const gchar *s2);
-gint	              g_strncasecmp    (const gchar *s1,
-					const gchar *s2,
-					guint        n);
-gchar*	              g_strdown	       (gchar	     *string);
-gchar*	              g_strup	       (gchar	     *string);
-
-#endif /* G_DISABLE_DEPRECATED */
-
-/* String utility functions that return a newly allocated string which
- * ought to be freed with g_free from the caller at some point.
- */
-gchar*	              g_strdup	       (const gchar *str) G_GNUC_MALLOC;
-gchar*	              g_strdup_printf  (const gchar *format,
-					...) G_GNUC_PRINTF (1, 2) G_GNUC_MALLOC;
-gchar*	              g_strdup_vprintf (const gchar *format,
-					va_list      args) G_GNUC_MALLOC;
-gchar*	              g_strndup	       (const gchar *str,
-					gsize        n) G_GNUC_MALLOC;  
-gchar*	              g_strnfill       (gsize        length,  
-					gchar        fill_char) G_GNUC_MALLOC;
-gchar*	              g_strconcat      (const gchar *string1,
-					...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
-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.
- */
-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.
- */
-gchar*                g_strescape      (const gchar *source,
-					const gchar *exceptions) G_GNUC_MALLOC;
-
-gpointer              g_memdup	       (gconstpointer mem,
-					guint	       byte_size) G_GNUC_MALLOC;
-
-/* 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
- */
-gchar**	              g_strsplit       (const gchar  *string,
-					const gchar  *delimiter,
-					gint          max_tokens) G_GNUC_MALLOC;
-gchar **	      g_strsplit_set   (const gchar *string,
-					const gchar *delimiters,
-					gint         max_tokens) G_GNUC_MALLOC;
-gchar*                g_strjoinv       (const gchar  *separator,
-					gchar       **str_array) G_GNUC_MALLOC;
-void                  g_strfreev       (gchar       **str_array);
-gchar**               g_strdupv        (gchar       **str_array) G_GNUC_MALLOC;
-guint                 g_strv_length    (gchar       **str_array);
-
-gchar*                g_stpcpy         (gchar        *dest,
-                                        const char   *src);
-
-G_CONST_RETURN gchar *g_strip_context  (const gchar *msgid, 
-					const gchar *msgval);
-
-G_CONST_RETURN gchar *g_dpgettext      (const gchar *domain,
-                                        const gchar *msgctxtid,
-                                        gsize        msgidoffset);
-
-G_END_DECLS
-
-#endif /* __G_STRFUNCS_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gstring.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gstring.h
deleted file mode 100644
index 427b56ee..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gstring.h
+++ /dev/null
@@ -1,175 +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__
-
-#include <glib/gtypes.h>
-#include <glib/gunicode.h>
-#include <glib/gutils.h>  /* for G_CAN_INLINE */
-
-G_BEGIN_DECLS
-
-typedef struct _GString		GString;
-typedef struct _GStringChunk	GStringChunk;
-
-struct _GString
-{
-  gchar  *str;
-  gsize len;    
-  gsize allocated_len;
-};
-
-/* String Chunks
- */
-GStringChunk* g_string_chunk_new	   (gsize size);  
-void	      g_string_chunk_free	   (GStringChunk *chunk);
-void	      g_string_chunk_clear	   (GStringChunk *chunk);
-gchar*	      g_string_chunk_insert	   (GStringChunk *chunk,
-					    const gchar	 *string);
-gchar*	      g_string_chunk_insert_len	   (GStringChunk *chunk,
-					    const gchar	 *string,
-					    gssize        len);
-gchar*	      g_string_chunk_insert_const  (GStringChunk *chunk,
-					    const gchar	 *string);
-
-
-/* Strings
- */
-GString*     g_string_new	        (const gchar	 *init);
-GString*     g_string_new_len           (const gchar     *init,
-                                         gssize           len);   
-GString*     g_string_sized_new         (gsize            dfl_size);  
-gchar*	     g_string_free	        (GString	 *string,
-					 gboolean	  free_segment);
-gboolean     g_string_equal             (const GString	 *v,
-					 const GString 	 *v2);
-guint        g_string_hash              (const GString   *str);
-GString*     g_string_assign            (GString	 *string,
-					 const gchar	 *rval);
-GString*     g_string_truncate          (GString	 *string,
-					 gsize		  len);    
-GString*     g_string_set_size          (GString         *string,
-					 gsize            len);
-GString*     g_string_insert_len        (GString         *string,
-                                         gssize           pos,   
-                                         const gchar     *val,
-                                         gssize           len);  
-GString*     g_string_append            (GString	 *string,
-			                 const gchar	 *val);
-GString*     g_string_append_len        (GString	 *string,
-			                 const gchar	 *val,
-                                         gssize           len);  
-GString*     g_string_append_c          (GString	 *string,
-					 gchar		  c);
-GString*     g_string_append_unichar    (GString	 *string,
-					 gunichar	  wc);
-GString*     g_string_prepend           (GString	 *string,
-					 const gchar	 *val);
-GString*     g_string_prepend_c         (GString	 *string,
-					 gchar		  c);
-GString*     g_string_prepend_unichar   (GString	 *string,
-					 gunichar	  wc);
-GString*     g_string_prepend_len       (GString	 *string,
-			                 const gchar	 *val,
-                                         gssize           len);  
-GString*     g_string_insert            (GString	 *string,
-					 gssize		  pos,    
-					 const gchar	 *val);
-GString*     g_string_insert_c          (GString	 *string,
-					 gssize		  pos,    
-					 gchar		  c);
-GString*     g_string_insert_unichar    (GString	 *string,
-					 gssize		  pos,    
-					 gunichar	  wc);
-GString*     g_string_overwrite         (GString	 *string,
-					 gsize		  pos,    
-					 const gchar	 *val);
-GString*     g_string_overwrite_len     (GString	 *string,
-					 gsize		  pos,    
-					 const gchar	 *val,
-					 gssize           len);
-GString*     g_string_erase	        (GString	 *string,
-					 gssize		  pos,
-					 gssize		  len);
-GString*     g_string_ascii_down        (GString	 *string);
-GString*     g_string_ascii_up          (GString	 *string);
-void         g_string_vprintf           (GString	 *string,
-					 const gchar	 *format,
-					 va_list          args);
-void         g_string_printf            (GString	 *string,
-					 const gchar	 *format,
-					 ...) G_GNUC_PRINTF (2, 3);
-void         g_string_append_vprintf    (GString	 *string,
-					 const gchar	 *format,
-					 va_list          args);
-void         g_string_append_printf     (GString	 *string,
-					 const gchar	 *format,
-					 ...) G_GNUC_PRINTF (2, 3);
-GString *    g_string_append_uri_escaped(GString         *string,
-					 const char      *unescaped,
-					 const char      *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 */
-
-
-#ifndef G_DISABLE_DEPRECATED
-
-/* The following two functions are deprecated and will be removed in
- * the next major release. They use the locale-specific tolower and
- * toupper, which is almost never the right thing.
- */
-
-GString*     g_string_down              (GString	 *string);
-GString*     g_string_up                (GString	 *string);
-
-/* These aliases are included for compatibility. */
-#define	g_string_sprintf	g_string_printf
-#define	g_string_sprintfa	g_string_append_printf
-
-#endif /* G_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __G_STRING_H__ */
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gtestutils.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gtestutils.h
deleted file mode 100644
index 7deb2a38..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gtestutils.h
+++ /dev/null
@@ -1,248 +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__
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-typedef struct GTestCase  GTestCase;
-typedef struct GTestSuite GTestSuite;
-
-/* 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)
-#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 (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 */
-
-int     g_strcmp0                       (const char     *str1,
-                                         const char     *str2);
-
-/* report performance results */
-void    g_test_minimized_result         (double          minimized_quantity,
-                                         const char     *format,
-                                         ...) G_GNUC_PRINTF (2, 3);
-void    g_test_maximized_result         (double          maximized_quantity,
-                                         const char     *format,
-                                         ...) G_GNUC_PRINTF (2, 3);
-
-/* initialize testing framework */
-void    g_test_init                     (int            *argc,
-                                         char         ***argv,
-                                         ...);
-/* query testing framework config */
-#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)
-/* run all tests under toplevel suite (path: /) */
-int     g_test_run                      (void);
-/* hook up a test functions under test path */
-void    g_test_add_func                 (const char     *testpath,
-                                         void          (*test_func) (void));
-void    g_test_add_data_func            (const char     *testpath,
-                                         gconstpointer   test_data,
-                                         void          (*test_func) (gconstpointer));
-/* 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 */
-void    g_test_message                  (const char *format,
-                                         ...) G_GNUC_PRINTF (1, 2);
-void    g_test_bug_base                 (const char *uri_pattern);
-void    g_test_bug                      (const char *bug_uri_snippet);
-/* measure test timings */
-void    g_test_timer_start              (void);
-double  g_test_timer_elapsed            (void); /* elapsed seconds */
-double  g_test_timer_last               (void); /* repeat last elapsed() result */
-
-/* automatically g_free or g_object_unref upon teardown */
-void    g_test_queue_free               (gpointer gfree_pointer);
-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)
-
-/* test traps are guards used around forked tests */
-typedef enum {
-  G_TEST_TRAP_SILENCE_STDOUT    = 1 << 7,
-  G_TEST_TRAP_SILENCE_STDERR    = 1 << 8,
-  G_TEST_TRAP_INHERIT_STDIN     = 1 << 9
-} GTestTrapFlags;
-gboolean g_test_trap_fork               (guint64              usec_timeout,
-                                         GTestTrapFlags       test_trap_flags);
-gboolean g_test_trap_has_passed         (void);
-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)))
-gint32   g_test_rand_int                (void);
-gint32   g_test_rand_int_range          (gint32          begin,
-                                         gint32          end);
-double   g_test_rand_double             (void);
-double   g_test_rand_double_range       (double          range_start,
-                                         double          range_end);
-
-/* semi-internal API */
-GTestCase*    g_test_create_case        (const char     *test_name,
-                                         gsize           data_size,
-                                         gconstpointer   test_data,
-                                         void          (*data_setup) (void),
-                                         void          (*data_test) (void),
-                                         void          (*data_teardown) (void));
-GTestSuite*   g_test_create_suite       (const char     *suite_name);
-GTestSuite*   g_test_get_root           (void);
-void          g_test_suite_add          (GTestSuite     *suite,
-                                         GTestCase      *test_case);
-void          g_test_suite_add_suite    (GTestSuite     *suite,
-                                         GTestSuite     *nestedsuite);
-int           g_test_run_suite          (GTestSuite     *suite);
-
-/* internal ABI */
-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);
-void    g_assertion_message             (const char     *domain,
-                                         const char     *file,
-                                         int             line,
-                                         const char     *func,
-                                         const char     *message) G_GNUC_NORETURN;
-void    g_assertion_message_expr        (const char     *domain,
-                                         const char     *file,
-                                         int             line,
-                                         const char     *func,
-                                         const char     *expr) G_GNUC_NORETURN;
-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) G_GNUC_NORETURN;
-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) G_GNUC_NORETURN;
-void    g_test_add_vtable               (const char     *testpath,
-                                         gsize           data_size,
-                                         gconstpointer   test_data,
-                                         void          (*data_setup)    (void),
-                                         void          (*data_test)     (void),
-                                         void          (*data_teardown) (void));
-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 */
-} 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 */
-} 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;
-
-const char*     g_test_log_type_name    (GTestLogType    log_type);
-GTestLogBuffer* g_test_log_buffer_new   (void);
-void            g_test_log_buffer_free  (GTestLogBuffer *tbuffer);
-void            g_test_log_buffer_push  (GTestLogBuffer *tbuffer,
-                                         guint           n_bytes,
-                                         const guint8   *bytes);
-GTestLogMsg*    g_test_log_buffer_pop   (GTestLogBuffer *tbuffer);
-void            g_test_log_msg_free     (GTestLogMsg    *tmsg);
-
-G_END_DECLS
-
-#endif /* __G_TEST_UTILS_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gthread.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gthread.h
deleted file mode 100644
index 032507c2..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gthread.h
+++ /dev/null
@@ -1,396 +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_THREAD_H__
-#define __G_THREAD_H__
-
-#include <glib/gerror.h>
-#include <glib/gtypes.h>
-#include <glib/gutils.h>        /* for G_INLINE_FUNC */
-#include <glib/gatomic.h>       /* for g_atomic_pointer_get */
-
-G_BEGIN_DECLS
-
-/* GLib Thread support
- */
-
-extern GQuark g_thread_error_quark (void);
-#define G_THREAD_ERROR g_thread_error_quark ()
-
-typedef enum
-{
-  G_THREAD_ERROR_AGAIN /* Resource temporarily unavailable */
-} GThreadError;
-
-typedef gpointer (*GThreadFunc) (gpointer data);
-
-typedef enum
-{
-  G_THREAD_PRIORITY_LOW,
-  G_THREAD_PRIORITY_NORMAL,
-  G_THREAD_PRIORITY_HIGH,
-  G_THREAD_PRIORITY_URGENT
-} GThreadPriority;
-
-typedef struct _GThread         GThread;
-struct  _GThread
-{
-  /*< private >*/
-  GThreadFunc func;
-  gpointer data;
-  gboolean joinable;
-  GThreadPriority priority;
-};
-
-typedef struct _GMutex          GMutex;
-typedef struct _GCond           GCond;
-typedef struct _GPrivate        GPrivate;
-typedef struct _GStaticPrivate  GStaticPrivate;
-
-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 gboolean               g_threads_got_initialized;
-
-GLIB_VAR guint64   (*g_thread_gettime) (void);
-
-/* initializes the mutex/cond/private implementation for glib, might
- * only be called once, and must not be called directly or indirectly
- * from another glib-function, e.g. as a callback.
- */
-void    g_thread_init   (GThreadFunctions       *vtable);
-
-/* Errorcheck mutexes. If you define G_ERRORCHECK_MUTEXES, then all
- * mutexes will check for re-locking and re-unlocking */
-
-/* Initialize thread system with errorcheck mutexes. vtable must be
- * NULL. Do not call directly. Use #define G_ERRORCHECK_MUTEXES
- * instead.
- */
-void    g_thread_init_with_errorcheck_mutexes (GThreadFunctions* vtable);
-
-/* A random number to recognize debug calls to g_mutex_... */
-#define G_MUTEX_DEBUG_MAGIC 0xf8e18ad7
-
-#ifdef G_ERRORCHECK_MUTEXES
-#define g_thread_init(vtable) g_thread_init_with_errorcheck_mutexes (vtable)
-#endif
-
-/* internal function for fallback static mutex implementation */
-GMutex* g_static_mutex_get_mutex_impl   (GMutex **mutex);
-
-#define g_static_mutex_get_mutex_impl_shortcut(mutex) \
-  (g_atomic_pointer_get ((gpointer*)(void*)mutex) ? *(mutex) : \
-   g_static_mutex_get_mutex_impl (mutex))
-
-/* shorthands for conditional and unconditional function calls */
-
-#define G_THREAD_UF(op, arglist)					\
-    (*g_thread_functions_for_glib_use . op) arglist
-#define G_THREAD_CF(op, fail, arg)					\
-    (g_thread_supported () ? G_THREAD_UF (op, arg) : (fail))
-#define G_THREAD_ECF(op, fail, mutex, type)				\
-    (g_thread_supported () ? 						\
-      ((type(*)(GMutex*, const gulong, gchar const*))			\
-      (*g_thread_functions_for_glib_use . op))				\
-     (mutex, G_MUTEX_DEBUG_MAGIC, G_STRLOC) : (fail))
-
-#ifndef G_ERRORCHECK_MUTEXES
-# define g_mutex_lock(mutex)						\
-    G_THREAD_CF (mutex_lock,     (void)0, (mutex))
-# define g_mutex_trylock(mutex)						\
-    G_THREAD_CF (mutex_trylock,  TRUE,    (mutex))
-# define g_mutex_unlock(mutex)						\
-    G_THREAD_CF (mutex_unlock,   (void)0, (mutex))
-# define g_mutex_free(mutex)						\
-    G_THREAD_CF (mutex_free,     (void)0, (mutex))
-# define g_cond_wait(cond, mutex)					\
-    G_THREAD_CF (cond_wait,      (void)0, (cond, mutex))
-# define g_cond_timed_wait(cond, mutex, abs_time)			\
-    G_THREAD_CF (cond_timed_wait, TRUE,   (cond, mutex, abs_time))
-#else /* G_ERRORCHECK_MUTEXES */
-# define g_mutex_lock(mutex)						\
-    G_THREAD_ECF (mutex_lock,    (void)0, (mutex), void)
-# define g_mutex_trylock(mutex)						\
-    G_THREAD_ECF (mutex_trylock, TRUE,    (mutex), gboolean)
-# define g_mutex_unlock(mutex)						\
-    G_THREAD_ECF (mutex_unlock,  (void)0, (mutex), void)
-# define g_mutex_free(mutex)						\
-    G_THREAD_ECF (mutex_free,    (void)0, (mutex), void)
-# define g_cond_wait(cond, mutex)					\
-    (g_thread_supported () ? ((void(*)(GCond*, GMutex*, gulong, gchar*))\
-      g_thread_functions_for_glib_use.cond_wait)			\
-        (cond, mutex, G_MUTEX_DEBUG_MAGIC, G_STRLOC) : (void) 0)
-# define g_cond_timed_wait(cond, mutex, abs_time)			\
-    (g_thread_supported () ?						\
-      ((gboolean(*)(GCond*, GMutex*, GTimeVal*, gulong, gchar*))	\
-        g_thread_functions_for_glib_use.cond_timed_wait)		\
-          (cond, mutex, abs_time, G_MUTEX_DEBUG_MAGIC, G_STRLOC) : TRUE)
-#endif /* G_ERRORCHECK_MUTEXES */
-
-#define g_thread_supported()    (g_threads_got_initialized)
-#define g_mutex_new()            G_THREAD_UF (mutex_new,      ())
-#define g_cond_new()             G_THREAD_UF (cond_new,       ())
-#define g_cond_signal(cond)      G_THREAD_CF (cond_signal,    (void)0, (cond))
-#define g_cond_broadcast(cond)   G_THREAD_CF (cond_broadcast, (void)0, (cond))
-#define g_cond_free(cond)        G_THREAD_CF (cond_free,      (void)0, (cond))
-#define g_private_new(destructor) G_THREAD_UF (private_new, (destructor))
-#define g_private_get(private_key) G_THREAD_CF (private_get, \
-                                                ((gpointer)private_key), \
-                                                (private_key))
-#define g_private_set(private_key, value) G_THREAD_CF (private_set, \
-                                                       (void) (private_key = \
-                                                        (GPrivate*) (value)), \
-                                                       (private_key, value))
-#define g_thread_yield()              G_THREAD_CF (thread_yield, (void)0, ())
-
-#define g_thread_create(func, data, joinable, error)			\
-  (g_thread_create_full (func, data, 0, joinable, FALSE, 		\
-                         G_THREAD_PRIORITY_NORMAL, error))
-
-GThread* g_thread_create_full  (GThreadFunc            func,
-                                gpointer               data,
-                                gulong                 stack_size,
-                                gboolean               joinable,
-                                gboolean               bound,
-                                GThreadPriority        priority,
-                                GError               **error);
-GThread* g_thread_self         (void);
-void     g_thread_exit         (gpointer               retval);
-gpointer g_thread_join         (GThread               *thread);
-
-void     g_thread_set_priority (GThread               *thread,
-                                GThreadPriority        priority);
-
-/* GStaticMutexes can be statically initialized with the value
- * G_STATIC_MUTEX_INIT, and then they can directly be used, that is
- * much easier, than having to explicitly allocate the mutex before
- * use
- */
-#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))
-void g_static_mutex_init (GStaticMutex *mutex);
-void g_static_mutex_free (GStaticMutex *mutex);
-
-struct _GStaticPrivate
-{
-  /*< private >*/
-  guint index;
-};
-#define G_STATIC_PRIVATE_INIT { 0 }
-void     g_static_private_init           (GStaticPrivate   *private_key);
-gpointer g_static_private_get            (GStaticPrivate   *private_key);
-void     g_static_private_set            (GStaticPrivate   *private_key,
-					  gpointer          data,
-					  GDestroyNotify    notify);
-void     g_static_private_free           (GStaticPrivate   *private_key);
-
-typedef struct _GStaticRecMutex GStaticRecMutex;
-struct _GStaticRecMutex
-{
-  /*< private >*/
-  GStaticMutex mutex;
-  guint depth;
-  GSystemThread owner;
-};
-
-#define G_STATIC_REC_MUTEX_INIT { G_STATIC_MUTEX_INIT }
-void     g_static_rec_mutex_init        (GStaticRecMutex *mutex);
-void     g_static_rec_mutex_lock        (GStaticRecMutex *mutex);
-gboolean g_static_rec_mutex_trylock     (GStaticRecMutex *mutex);
-void     g_static_rec_mutex_unlock      (GStaticRecMutex *mutex);
-void     g_static_rec_mutex_lock_full   (GStaticRecMutex *mutex,
-                                         guint            depth);
-guint    g_static_rec_mutex_unlock_full (GStaticRecMutex *mutex);
-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 }
-
-void      g_static_rw_lock_init           (GStaticRWLock* lock);
-void      g_static_rw_lock_reader_lock    (GStaticRWLock* lock);
-gboolean  g_static_rw_lock_reader_trylock (GStaticRWLock* lock);
-void      g_static_rw_lock_reader_unlock  (GStaticRWLock* lock);
-void      g_static_rw_lock_writer_lock    (GStaticRWLock* lock);
-gboolean  g_static_rw_lock_writer_trylock (GStaticRWLock* lock);
-void      g_static_rw_lock_writer_unlock  (GStaticRWLock* lock);
-void      g_static_rw_lock_free           (GStaticRWLock* lock);
-
-void	  g_thread_foreach         	  (GFunc    	  thread_func,
-					   gpointer 	  user_data);
-
-typedef enum
-{
-  G_ONCE_STATUS_NOTCALLED,
-  G_ONCE_STATUS_PROGRESS,
-  G_ONCE_STATUS_READY  
-} GOnceStatus;
-
-typedef struct _GOnce GOnce;
-struct _GOnce
-{
-  volatile GOnceStatus status;
-  volatile gpointer retval;
-};
-
-#define G_ONCE_INIT { G_ONCE_STATUS_NOTCALLED, NULL }
-
-gpointer g_once_impl (GOnce *once, GThreadFunc func, gpointer arg);
-
-#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 */
-
-/* initialize-once guards, keyed by value_location */
-G_INLINE_FUNC gboolean  g_once_init_enter       (volatile gsize *value_location);
-gboolean                g_once_init_enter_impl  (volatile gsize *value_location);
-void                    g_once_init_leave       (volatile gsize *value_location,
-                                                 gsize           initialization_value);
-#if defined (G_CAN_INLINE) || defined (__G_THREAD_C__)
-G_INLINE_FUNC gboolean
-g_once_init_enter (volatile gsize *value_location)
-{
-  if G_LIKELY (g_atomic_pointer_get ((void*volatile*) value_location) != NULL)
-    return FALSE;
-  else
-    return g_once_init_enter_impl (value_location);
-}
-#endif /* G_CAN_INLINE || __G_THREAD_C__ */
-
-/* these are some convenience macros that expand to nothing if GLib
- * was configured with --disable-threads. for using StaticMutexes,
- * you define them with G_LOCK_DEFINE_STATIC (name) or G_LOCK_DEFINE (name)
- * if you need to export the mutex. With G_LOCK_EXTERN (name) you can
- * declare such an globally defined lock. name is a unique identifier
- * for the protected varibale or code portion. locking, testing and
- * unlocking of such mutexes can be done with G_LOCK(), G_UNLOCK() and
- * G_TRYLOCK() respectively.
- */
-extern void glib_dummy_decl (void);
-#define G_LOCK_NAME(name)               g__ ## name ## _lock
-#ifdef  G_THREADS_ENABLED
-#  define G_LOCK_DEFINE_STATIC(name)    static G_LOCK_DEFINE (name)
-#  define G_LOCK_DEFINE(name)           \
-    GStaticMutex G_LOCK_NAME (name) = G_STATIC_MUTEX_INIT
-#  define G_LOCK_EXTERN(name)           extern GStaticMutex 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_static_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_static_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_static_mutex_trylock (&G_LOCK_NAME (name)))
-#  else  /* !G_DEBUG_LOCKS */
-#    define G_LOCK(name) g_static_mutex_lock       (&G_LOCK_NAME (name))
-#    define G_UNLOCK(name) g_static_mutex_unlock   (&G_LOCK_NAME (name))
-#    define G_TRYLOCK(name) g_static_mutex_trylock (&G_LOCK_NAME (name))
-#  endif /* !G_DEBUG_LOCKS */
-#else   /* !G_THREADS_ENABLED */
-#  define G_LOCK_DEFINE_STATIC(name)    extern void glib_dummy_decl (void)
-#  define G_LOCK_DEFINE(name)           extern void glib_dummy_decl (void)
-#  define G_LOCK_EXTERN(name)           extern void glib_dummy_decl (void)
-#  define G_LOCK(name)
-#  define G_UNLOCK(name)
-#  define G_TRYLOCK(name)               (TRUE)
-#endif  /* !G_THREADS_ENABLED */
-
-
-G_END_DECLS
-
-#endif /* __G_THREAD_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gthreadpool.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gthreadpool.h
deleted file mode 100644
index 91a02d6a..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gthreadpool.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_THREADPOOL_H__
-#define __G_THREADPOOL_H__
-
-#include <glib/gthread.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GThreadPool     GThreadPool;
-
-/* Thread Pools
- */
-
-/* The real GThreadPool is bigger, so you may only create a thread
- * pool with the constructor function */
-struct _GThreadPool
-{
-  GFunc func;
-  gpointer user_data;
-  gboolean exclusive;
-};
-
-/* Get a thread pool with the function func, at most max_threads may
- * run at a time (max_threads == -1 means no limit), exclusive == TRUE
- * means, that the threads shouldn't be shared and that they will be
- * prestarted (otherwise they are started as needed) user_data is the
- * 2nd argument to the func */
-GThreadPool*    g_thread_pool_new             (GFunc            func,
-                                               gpointer         user_data,
-                                               gint             max_threads,
-                                               gboolean         exclusive,
-                                               GError         **error);
-
-/* Push new data into the thread pool. This task is assigned to a thread later
- * (when the maximal number of threads is reached for that pool) or now
- * (otherwise). If necessary a new thread will be started. The function
- * returns immediatly */
-void            g_thread_pool_push            (GThreadPool     *pool,
-                                               gpointer         data,
-                                               GError         **error);
-
-/* Set the number of threads, which can run concurrently for that pool, -1
- * means no limit. 0 means has the effect, that the pool won't process
- * requests until the limit is set higher again */
-void            g_thread_pool_set_max_threads (GThreadPool     *pool,
-                                               gint             max_threads,
-                                               GError         **error);
-gint            g_thread_pool_get_max_threads (GThreadPool     *pool);
-
-/* Get the number of threads assigned to that pool. This number doesn't
- * necessarily represent the number of working threads in that pool */
-guint           g_thread_pool_get_num_threads (GThreadPool     *pool);
-
-/* Get the number of unprocessed items in the pool */
-guint           g_thread_pool_unprocessed     (GThreadPool     *pool);
-
-/* Free the pool, immediate means, that all unprocessed items in the queue
- * wont be processed, wait means, that the function doesn't return immediatly,
- * but after all threads in the pool are ready processing items. immediate
- * does however not mean, that threads are killed. */
-void            g_thread_pool_free            (GThreadPool     *pool,
-                                               gboolean         immediate,
-                                               gboolean         wait_);
-
-/* Set the maximal number of unused threads before threads will be stopped by
- * GLib, -1 means no limit */
-void            g_thread_pool_set_max_unused_threads (gint      max_threads);
-gint            g_thread_pool_get_max_unused_threads (void);
-guint           g_thread_pool_get_num_unused_threads (void);
-
-/* Stop all currently unused threads, but leave the limit untouched */
-void            g_thread_pool_stop_unused_threads    (void);
-
-/* Set sort function for priority threading */
-void            g_thread_pool_set_sort_function      (GThreadPool      *pool,
-		                                      GCompareDataFunc  func,
-						      gpointer          user_data);
-
-/* Set maximum time a thread can be idle in the pool before it is stopped */
-void            g_thread_pool_set_max_idle_time      (guint             interval);
-guint           g_thread_pool_get_max_idle_time      (void);
-
-G_END_DECLS
-
-#endif /* __G_THREADPOOL_H__ */
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gtimer.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gtimer.h
deleted file mode 100644
index d602ae1b..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gtimer.h
+++ /dev/null
@@ -1,61 +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__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/* Timer
- */
-
-/* microseconds per second */
-typedef struct _GTimer		GTimer;
-
-#define G_USEC_PER_SEC 1000000
-
-GTimer*  g_timer_new	         (void);
-void	 g_timer_destroy         (GTimer      *timer);
-void	 g_timer_start	         (GTimer      *timer);
-void	 g_timer_stop	         (GTimer      *timer);
-void	 g_timer_reset	         (GTimer      *timer);
-void	 g_timer_continue        (GTimer      *timer);
-gdouble  g_timer_elapsed         (GTimer      *timer,
-				  gulong      *microseconds);
-
-void     g_usleep                (gulong       microseconds);
-
-void     g_time_val_add          (GTimeVal    *time_, 
-                                  glong        microseconds);
-gboolean g_time_val_from_iso8601 (const gchar *iso_date,
-				  GTimeVal    *time_);
-gchar*   g_time_val_to_iso8601   (GTimeVal    *time_) G_GNUC_MALLOC;
-
-G_END_DECLS
-
-#endif /* __G_TIMER_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gtree.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gtree.h
deleted file mode 100644
index bab71279..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gtree.h
+++ /dev/null
@@ -1,88 +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__
-
-#include <glib/gnode.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GTree  GTree;
-
-typedef gboolean (*GTraverseFunc) (gpointer  key,
-                                   gpointer  value,
-                                   gpointer  data);
-
-/* Balanced binary trees
- */
-GTree*   g_tree_new             (GCompareFunc      key_compare_func);
-GTree*   g_tree_new_with_data   (GCompareDataFunc  key_compare_func,
-                                 gpointer          key_compare_data);
-GTree*   g_tree_new_full        (GCompareDataFunc  key_compare_func,
-                                 gpointer          key_compare_data,
-                                 GDestroyNotify    key_destroy_func,
-                                 GDestroyNotify    value_destroy_func);
-void     g_tree_destroy         (GTree            *tree);
-void     g_tree_insert          (GTree            *tree,
-                                 gpointer          key,
-                                 gpointer          value);
-void     g_tree_replace         (GTree            *tree,
-                                 gpointer          key,
-                                 gpointer          value);
-gboolean g_tree_remove          (GTree            *tree,
-                                 gconstpointer     key);
-gboolean g_tree_steal           (GTree            *tree,
-                                 gconstpointer     key);
-gpointer g_tree_lookup          (GTree            *tree,
-                                 gconstpointer     key);
-gboolean g_tree_lookup_extended (GTree            *tree,
-                                 gconstpointer     lookup_key,
-                                 gpointer         *orig_key,
-                                 gpointer         *value);
-void     g_tree_foreach         (GTree            *tree,
-                                 GTraverseFunc	   func,
-                                 gpointer	   user_data);
-
-#ifndef G_DISABLE_DEPRECATED
-void     g_tree_traverse        (GTree            *tree,
-                                 GTraverseFunc     traverse_func,
-                                 GTraverseType     traverse_type,
-                                 gpointer          user_data);
-#endif /* G_DISABLE_DEPRECATED */
-
-gpointer g_tree_search          (GTree            *tree,
-                                 GCompareFunc      search_func,
-                                 gconstpointer     user_data);
-gint     g_tree_height          (GTree            *tree);
-gint     g_tree_nnodes          (GTree            *tree);
-
-
-
-G_END_DECLS
-
-#endif /* __G_TREE_H__ */
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gtypes.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gtypes.h
deleted file mode 100644
index eaeabd2a..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gtypes.h
+++ /dev/null
@@ -1,429 +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__
-
-#include <glibconfig.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);
-typedef void            (*GFreeFunc)            (gpointer       data);
-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 defined (__i386__)
-#    define GUINT16_SWAP_LE_BE_IA32(val) \
-       (__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) \
-	  (__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) \
-	  (__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) \
-       (__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))
-#    define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_IA32 (val))
-#    define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_IA32 (val))
-#  elif defined (__ia64__)
-#    define GUINT16_SWAP_LE_BE_IA64(val) \
-       (__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) \
-       (__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) \
-       (__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))
-#    define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_IA64 (val))
-#    define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_IA64 (val))
-#  elif defined (__x86_64__)
-#    define GUINT32_SWAP_LE_BE_X86_64(val) \
-       (__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) \
-       (__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))
-#    define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_X86_64 (val))
-#    define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_X86_64 (val))
-#  else /* generic gcc */
-#    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
-#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))
-
-
-/* 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 extern
-#  endif /* !G_PLATFORM_WIN32 */
-#endif /* GLIB_VAR */
-
-#endif /* __G_TYPES_H__ */
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gunicode.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gunicode.h
deleted file mode 100644
index d27878cb..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gunicode.h
+++ /dev/null
@@ -1,401 +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__
-
-#include <glib/gerror.h>
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-typedef guint32 gunichar;
-typedef guint16 gunichar2;
-
-/* These are the possible character classifications.
- * See http://www.unicode.org/Public/UNIDATA/UCD.html#General_Category_Values
- */
-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_COMBINING_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;
-
-/* These are the possible line break classifications.
- * Note that new types may be added in the future.
- * Implementations may regard unknown values like G_UNICODE_BREAK_UNKNOWN
- * See http://www.unicode.org/unicode/reports/tr14/
- */
-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
-} GUnicodeBreakType;
-
-typedef enum 
-{                         /* ISO 15924 code */
-  G_UNICODE_SCRIPT_INVALID_CODE = -1,
-  G_UNICODE_SCRIPT_COMMON       = 0,   /* Zyyy */
-  G_UNICODE_SCRIPT_INHERITED,          /* 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,             /* 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,
-  G_UNICODE_SCRIPT_LEPCHA,
-  G_UNICODE_SCRIPT_REJANG,
-  G_UNICODE_SCRIPT_SUNDANESE,
-  G_UNICODE_SCRIPT_SAURASHTRA,
-  G_UNICODE_SCRIPT_CHAM,
-  G_UNICODE_SCRIPT_OL_CHIKI,
-  G_UNICODE_SCRIPT_VAI,
-  G_UNICODE_SCRIPT_CARIAN,
-  G_UNICODE_SCRIPT_LYCIAN,
-  G_UNICODE_SCRIPT_LYDIAN
-} GUnicodeScript;
-
-/* Returns TRUE if current locale uses UTF-8 charset.  If CHARSET is
- * not null, sets *CHARSET to the name of the current locale's
- * charset.  This value is statically allocated, and should be copied
- * in case the locale's charset will be changed later using setlocale()
- * or in some other way.
- */
-gboolean g_get_charset (G_CONST_RETURN char **charset);
-
-/* These are all analogs of the <ctype.h> functions.
- */
-gboolean g_unichar_isalnum   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isalpha   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_iscntrl   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isdigit   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isgraph   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_islower   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isprint   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_ispunct   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isspace   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isupper   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isxdigit  (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_istitle   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isdefined (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_iswide    (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_iswide_cjk(gunichar c) G_GNUC_CONST;
-gboolean g_unichar_iszerowidth(gunichar c) G_GNUC_CONST;
-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.  */
-gunichar g_unichar_toupper (gunichar c) G_GNUC_CONST;
-gunichar g_unichar_tolower (gunichar c) G_GNUC_CONST;
-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.  */
-gint g_unichar_digit_value (gunichar c) G_GNUC_CONST;
-
-gint g_unichar_xdigit_value (gunichar c) G_GNUC_CONST;
-
-/* Return the Unicode character type of a given character.  */
-GUnicodeType g_unichar_type (gunichar c) G_GNUC_CONST;
-
-/* Return the line break property for a given character */
-GUnicodeBreakType g_unichar_break_type (gunichar c) G_GNUC_CONST;
-
-/* Returns the combining class for a given character */
-gint g_unichar_combining_class (gunichar uc) G_GNUC_CONST;
-
-
-/* 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.  */
-void g_unicode_canonical_ordering (gunichar *string,
-				   gsize     len);
-
-/* Compute canonical decomposition of a character.  Returns g_malloc()d
-   string of Unicode characters.  RESULT_LEN is set to the resulting
-   length of the string.  */
-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;
-
-#define g_utf8_next_char(p) (char *)((p) + g_utf8_skip[*(const guchar *)(p)])
-
-gunichar g_utf8_get_char           (const gchar  *p) G_GNUC_PURE;
-gunichar g_utf8_get_char_validated (const  gchar *p,
-				    gssize        max_len) G_GNUC_PURE;
-
-gchar*   g_utf8_offset_to_pointer (const gchar *str,
-                                   glong        offset) G_GNUC_PURE;
-glong    g_utf8_pointer_to_offset (const gchar *str,      
-				   const gchar *pos) G_GNUC_PURE;
-gchar*   g_utf8_prev_char         (const gchar *p) G_GNUC_PURE;
-gchar*   g_utf8_find_next_char    (const gchar *p,
-				   const gchar *end) G_GNUC_PURE;
-gchar*   g_utf8_find_prev_char    (const gchar *str,
-				   const gchar *p) G_GNUC_PURE;
-
-glong g_utf8_strlen (const gchar *p,  
-		     gssize       max) G_GNUC_PURE;
-
-/* Copies n characters from src to dest */
-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 */
-gchar* g_utf8_strchr  (const gchar *p,
-		       gssize       len,
-		       gunichar     c);
-gchar* g_utf8_strrchr (const gchar *p,
-		       gssize       len,
-		       gunichar     c);
-gchar* g_utf8_strreverse (const gchar *str,
-			  gssize len);
-
-gunichar2 *g_utf8_to_utf16     (const gchar      *str,
-				glong             len,            
-				glong            *items_read,     
-				glong            *items_written,  
-				GError          **error) G_GNUC_MALLOC;
-gunichar * g_utf8_to_ucs4      (const gchar      *str,
-				glong             len,            
-				glong            *items_read,     
-				glong            *items_written,  
-				GError          **error) G_GNUC_MALLOC;
-gunichar * g_utf8_to_ucs4_fast (const gchar      *str,
-				glong             len,            
-				glong            *items_written) G_GNUC_MALLOC; 
-gunichar * g_utf16_to_ucs4     (const gunichar2  *str,
-				glong             len,            
-				glong            *items_read,     
-				glong            *items_written,  
-				GError          **error) G_GNUC_MALLOC;
-gchar*     g_utf16_to_utf8     (const gunichar2  *str,
-				glong             len,            
-				glong            *items_read,     
-				glong            *items_written,  
-				GError          **error) G_GNUC_MALLOC;
-gunichar2 *g_ucs4_to_utf16     (const gunichar   *str,
-				glong             len,            
-				glong            *items_read,     
-				glong            *items_written,  
-				GError          **error) G_GNUC_MALLOC;
-gchar*     g_ucs4_to_utf8      (const gunichar   *str,
-				glong             len,            
-				glong            *items_read,     
-				glong            *items_written,  
-				GError          **error) G_GNUC_MALLOC;
-
-/* Convert a single character into UTF-8. outbuf must have at
- * least 6 bytes of space. Returns the number of bytes in the
- * result.
- */
-gint      g_unichar_to_utf8 (gunichar    c,
-			     gchar      *outbuf);
-
-/* Validate a UTF8 string, return TRUE if valid, put pointer to
- * first invalid char in **end
- */
-
-gboolean g_utf8_validate (const gchar  *str,
-                          gssize        max_len,  
-                          const gchar **end);
-
-/* Validate a Unicode character */
-gboolean g_unichar_validate (gunichar ch) G_GNUC_CONST;
-
-gchar *g_utf8_strup   (const gchar *str,
-		       gssize       len) G_GNUC_MALLOC;
-gchar *g_utf8_strdown (const gchar *str,
-		       gssize       len) G_GNUC_MALLOC;
-gchar *g_utf8_casefold (const gchar *str,
-			gssize       len) G_GNUC_MALLOC;
-
-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;
-
-gchar *g_utf8_normalize (const gchar   *str,
-			 gssize         len,
-			 GNormalizeMode mode) G_GNUC_MALLOC;
-
-gint   g_utf8_collate     (const gchar *str1,
-			   const gchar *str2) G_GNUC_PURE;
-gchar *g_utf8_collate_key (const gchar *str,
-			   gssize       len) G_GNUC_MALLOC;
-gchar *g_utf8_collate_key_for_filename (const gchar *str,
-			                gssize       len) G_GNUC_MALLOC;
-
-gboolean g_unichar_get_mirror_char (gunichar ch,
-                                    gunichar *mirrored_ch);
-
-GUnicodeScript g_unichar_get_script (gunichar ch) G_GNUC_CONST;
-
-
-/* private */
-
-gchar *_g_utf8_make_valid (const gchar *name);
-
-
-G_END_DECLS
-
-#endif /* __G_UNICODE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gurifuncs.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gurifuncs.h
deleted file mode 100644
index 62f1dd28..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gurifuncs.h
+++ /dev/null
@@ -1,77 +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__
-
-#include <glib.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 ":"
-
-char *   g_uri_unescape_string       (const char *escaped_string,
-				      const char *illegal_characters);
-char *   g_uri_unescape_segment      (const char *escaped_string,
-				      const char *escaped_string_end,
-				      const char *illegal_characters);
-char *   g_uri_parse_scheme          (const char *uri);
-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/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gutils.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gutils.h
deleted file mode 100644
index 7685809f..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gutils.h
+++ /dev/null
@@ -1,477 +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__
-
-#include <glib/gtypes.h>
-#include <stdarg.h>
-
-G_BEGIN_DECLS
-
-#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 */
-
-/* Unix */
-
-#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 */
-
-/* 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
-#  undef  G_CAN_INLINE
-#elif defined (__GNUC__) 
-#  if defined (__GNUC_STDC_INLINE__) || defined (__GNUC_GNU_INLINE__)
-#   define G_INLINE_FUNC extern inline __attribute__ ((__gnu_inline__))
-#  else
-#   define G_INLINE_FUNC extern inline
-#  endif
-#elif defined (G_CAN_INLINE) 
-#  define G_INLINE_FUNC static inline
-#else /* can't inline */
-#  define G_INLINE_FUNC
-#endif /* !G_INLINE_FUNC */
-
-/* Retrive static string info
- */
-#ifdef G_OS_WIN32
-#define g_get_user_name g_get_user_name_utf8
-#define g_get_real_name g_get_real_name_utf8
-#define g_get_home_dir g_get_home_dir_utf8
-#define g_get_tmp_dir g_get_tmp_dir_utf8
-#endif
-
-G_CONST_RETURN gchar* g_get_user_name        (void);
-G_CONST_RETURN gchar* g_get_real_name        (void);
-G_CONST_RETURN gchar* g_get_home_dir         (void);
-G_CONST_RETURN gchar* g_get_tmp_dir          (void);
-G_CONST_RETURN gchar* g_get_host_name	     (void);
-gchar*                g_get_prgname          (void);
-void                  g_set_prgname          (const gchar *prgname);
-G_CONST_RETURN gchar* g_get_application_name (void);
-void                  g_set_application_name (const gchar *application_name);
-
-G_CONST_RETURN gchar*    g_get_user_data_dir      (void);
-G_CONST_RETURN gchar*    g_get_user_config_dir    (void);
-G_CONST_RETURN gchar*    g_get_user_cache_dir     (void);
-G_CONST_RETURN gchar* G_CONST_RETURN * g_get_system_data_dirs   (void);
-
-#ifdef G_OS_WIN32
-G_CONST_RETURN gchar* G_CONST_RETURN * g_win32_get_system_data_dirs_for_module (gconstpointer address);
-#endif
-
-#if defined (G_OS_WIN32) && defined (G_CAN_INLINE) && !defined (__cplusplus)
-static inline G_CONST_RETURN gchar * G_CONST_RETURN *
-g_win32_get_system_data_dirs (void)
-{
-  return g_win32_get_system_data_dirs_for_module ((gconstpointer) &g_win32_get_system_data_dirs);
-}
-#define g_get_system_data_dirs g_win32_get_system_data_dirs
-#endif
-
-G_CONST_RETURN gchar* G_CONST_RETURN * g_get_system_config_dirs (void);
-
-G_CONST_RETURN gchar* G_CONST_RETURN * g_get_language_names (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;
-
-G_CONST_RETURN gchar* g_get_user_special_dir (GUserDirectory directory);
-
-typedef struct _GDebugKey	GDebugKey;
-struct _GDebugKey
-{
-  gchar *key;
-  guint	 value;
-};
-
-/* Miscellaneous utility functions
- */
-guint                 g_parse_debug_string (const gchar     *string,
-					    const GDebugKey *keys,
-					    guint            nkeys);
-
-gint                  g_snprintf           (gchar       *string,
-					    gulong       n,
-					    gchar const *format,
-					    ...) G_GNUC_PRINTF (3, 4);
-gint                  g_vsnprintf          (gchar       *string,
-					    gulong       n,
-					    gchar const *format,
-					    va_list      args);
-
-/* Check if a file name is an absolute path */
-gboolean              g_path_is_absolute   (const gchar *file_name);
-
-/* In case of absolute paths, skip the root part */
-G_CONST_RETURN gchar* g_path_skip_root     (const gchar *file_name);
-
-#ifndef G_DISABLE_DEPRECATED
-
-/* These two functions are deprecated and will be removed in the next
- * major release of GLib. Use g_path_get_dirname/g_path_get_basename
- * instead. Whatch out! The string returned by g_path_get_basename
- * must be g_freed, while the string returned by g_basename must not.*/
-G_CONST_RETURN gchar* g_basename           (const gchar *file_name);
-#define g_dirname g_path_get_dirname
-
-#endif /* G_DISABLE_DEPRECATED */
-
-#ifdef G_OS_WIN32
-#define g_get_current_dir g_get_current_dir_utf8
-#endif
-
-/* The returned strings are newly allocated with g_malloc() */
-gchar*                g_get_current_dir    (void);
-gchar*                g_path_get_basename  (const gchar *file_name) G_GNUC_MALLOC;
-gchar*                g_path_get_dirname   (const gchar *file_name) G_GNUC_MALLOC;
-
-/* Set the pointer at the specified location to NULL */
-void                  g_nullify_pointer    (gpointer    *nullify_location);
-
-/* return the environment string for the variable. The returned memory
- * must not be freed. */
-#ifdef G_OS_WIN32
-#define g_getenv g_getenv_utf8
-#define g_setenv g_setenv_utf8
-#define g_unsetenv g_unsetenv_utf8
-#define g_find_program_in_path g_find_program_in_path_utf8
-#endif
-
-G_CONST_RETURN gchar* g_getenv             (const gchar *variable);
-gboolean              g_setenv             (const gchar *variable,
-					    const gchar *value,
-					    gboolean     overwrite);
-void                  g_unsetenv           (const gchar *variable);
-gchar**               g_listenv            (void);
-
-/* private */
-const gchar*	     _g_getenv_nomalloc	   (const gchar	*variable,
-					    gchar        buffer[1024]);
-
-/* we try to provide a useful equivalent for ATEXIT if it is
- * not defined, but use is actually abandoned. people should
- * use g_atexit() instead.
- */
-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.
- */
-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).
- */
-int atexit (void (*)(void));
-#define g_atexit(func) atexit(func)
-#endif
-
-/* Look for an executable in PATH, following execvp() rules */
-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;
-
-/* Trash Stacks
- * elements need to be >= sizeof (gpointer)
- */
-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);
-
-/* 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 * 8 - 1) ^ __builtin_clzl(number)) + 1 : 1;
-#else
-  register guint n_bits = 0;
-  
-  do
-    {
-      n_bits++;
-      number >>= 1;
-    }
-  while (number);
-  return n_bits;
-#endif
-}
-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_UTILS_C__ */
-
-/* Glib version.
- * we prefix variable declarations so they can
- * properly get exported in windows dlls.
- */
-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;
-
-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
-
-/*
- * This macro will be deprecated in the future. This DllMain() is too
- * complex. It is recommended to have a DLlMain() that just saves the
- * handle to the DLL and then use that handle in normal code 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_PLATFORM_WIN32 */
-
-#endif /* __G_UTILS_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gwin32.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gwin32.h
deleted file mode 100644
index 7b6aa141..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/glib/gwin32.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_WIN32_H__
-#define __G_WIN32_H__
-
-#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:
- */
-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().
- */
-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().
- */
-gchar*          g_win32_error_message (gint error);
-
-#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
-
-gchar*          g_win32_get_package_installation_directory (const gchar *package,
-							    const gchar *dll_name);
-
-gchar*          g_win32_get_package_installation_subdirectory (const gchar *package,
-							       const gchar *dll_name,
-							       const gchar *subdir);
-
-gchar*          g_win32_get_package_installation_directory_of_module (gpointer hmodule);
-
-guint		g_win32_get_windows_version (void);
-
-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 */
-
-#endif /* __G_WIN32_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gmodule.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gmodule.h
deleted file mode 100644
index ae7f8e54..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gmodule.h
+++ /dev/null
@@ -1,101 +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);
-
-#ifdef G_OS_WIN32
-#define g_module_open g_module_open_utf8
-#define g_module_name g_module_name_utf8
-#endif
-
-/* return TRUE if dynamic module loading is supported */
-gboolean	g_module_supported	   (void) G_GNUC_CONST;
-
-/* open a module `file_name' and return handle, which is NULL on error */
-GModule*              g_module_open          (const gchar  *file_name,
-					      GModuleFlags  flags);
-
-/* close a previously opened module, returns TRUE on success */
-gboolean              g_module_close         (GModule      *module);
-
-/* make a module resident so g_module_close on it will be ignored */
-void                  g_module_make_resident (GModule      *module);
-
-/* query the last module error as a string */
-G_CONST_RETURN gchar* g_module_error         (void);
-
-/* retrieve a symbol pointer from `module', returns TRUE on success */
-gboolean              g_module_symbol        (GModule      *module,
-					      const gchar  *symbol_name,
-					      gpointer     *symbol);
-
-/* retrieve the file name from an existing module */
-G_CONST_RETURN 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 accoring 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.
- */
-gchar*                g_module_build_path    (const gchar  *directory,
-					      const gchar  *module_name);
-
-
-G_END_DECLS
-
-#endif /* __GMODULE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gboxed.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gboxed.h
deleted file mode 100644
index 622b1e76..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gboxed.h
+++ /dev/null
@@ -1,89 +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.
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_BOXED_H__
-#define __G_BOXED_H__
-
-#include        <gobject/gtype.h>
-
-G_BEGIN_DECLS
-
-/* --- type macros --- */
-#define G_TYPE_IS_BOXED(type)	   (G_TYPE_FUNDAMENTAL (type) == G_TYPE_BOXED)
-#define G_VALUE_HOLDS_BOXED(value) (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_BOXED))
-
-
-/* --- typedefs --- */
-typedef gpointer (*GBoxedCopyFunc)	(gpointer	 boxed);
-typedef void     (*GBoxedFreeFunc)	(gpointer	 boxed);
-
-
-/* --- prototypes --- */
-gpointer	g_boxed_copy			(GType		 boxed_type,
-						 gconstpointer	 src_boxed);
-void		g_boxed_free			(GType		 boxed_type,
-						 gpointer	 boxed);
-void		g_value_set_boxed		(GValue		*value,
-						 gconstpointer	 v_boxed);
-void		g_value_set_static_boxed	(GValue		*value,
-						 gconstpointer	 v_boxed);
-gpointer	g_value_get_boxed		(const GValue	*value);
-gpointer	g_value_dup_boxed		(const GValue	*value);
-
-
-/* --- convenience --- */
-GType	g_boxed_type_register_static		(const gchar	*name,
-						 GBoxedCopyFunc	 boxed_copy,
-						 GBoxedFreeFunc	 boxed_free);
-
-
-/* --- GLib boxed types --- */
-#define	G_TYPE_CLOSURE		(g_closure_get_type ())
-#define	G_TYPE_VALUE		(g_value_get_type ())
-#define	G_TYPE_VALUE_ARRAY	(g_value_array_get_type ())
-#define	G_TYPE_DATE	        (g_date_get_type ())
-#define	G_TYPE_STRV	        (g_strv_get_type ())
-#define	G_TYPE_GSTRING		(g_gstring_get_type ())
-#define	G_TYPE_HASH_TABLE	(g_hash_table_get_type ())
-#define	G_TYPE_REGEX		(g_regex_get_type ())
-
-
-void    g_value_take_boxed      (GValue		*value,
-				 gconstpointer	 v_boxed);
-#ifndef G_DISABLE_DEPRECATED
-void	g_value_set_boxed_take_ownership	(GValue		*value,
-						 gconstpointer	 v_boxed);
-#endif
-GType	g_closure_get_type	(void)	G_GNUC_CONST;
-GType	g_value_get_type	(void)	G_GNUC_CONST;
-GType	g_value_array_get_type	(void)	G_GNUC_CONST;
-GType	g_date_get_type	        (void)	G_GNUC_CONST;
-GType	g_strv_get_type	        (void)	G_GNUC_CONST;
-GType	g_gstring_get_type      (void)	G_GNUC_CONST;
-GType   g_hash_table_get_type   (void)  G_GNUC_CONST;
-GType   g_regex_get_type        (void)  G_GNUC_CONST;
-
-typedef gchar** GStrv;
-     
-G_END_DECLS
-
-#endif	/* __G_BOXED_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gclosure.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gclosure.h
deleted file mode 100644
index c4b6208b..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gclosure.h
+++ /dev/null
@@ -1,166 +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.
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_CLOSURE_H__
-#define __G_CLOSURE_H__
-
-#include        <gobject/gtype.h>
-
-G_BEGIN_DECLS
-
-/* --- defines --- */
-#define	G_CLOSURE_NEEDS_MARSHAL(closure) (((GClosure*) (closure))->marshal == NULL)
-#define	G_CLOSURE_N_NOTIFIERS(cl)	 ((cl)->meta_marshal + ((cl)->n_guards << 1L) + \
-                                          (cl)->n_fnotifiers + (cl)->n_inotifiers)
-#define	G_CCLOSURE_SWAP_DATA(cclosure)	 (((GClosure*) (cclosure))->derivative_flag)
-#define	G_CALLBACK(f)			 ((GCallback) (f))
-
-
-/* -- typedefs --- */
-typedef struct _GClosure		 GClosure;
-typedef struct _GClosureNotifyData	 GClosureNotifyData;
-typedef void  (*GCallback)              (void);
-typedef void  (*GClosureNotify)		(gpointer	 data,
-					 GClosure	*closure);
-typedef void  (*GClosureMarshal)	(GClosure	*closure,
-					 GValue         *return_value,
-					 guint           n_param_values,
-					 const GValue   *param_values,
-					 gpointer        invocation_hint,
-					 gpointer	 marshal_data);
-typedef struct _GCClosure		 GCClosure;
-
-
-/* --- structures --- */
-struct _GClosureNotifyData
-{
-  gpointer       data;
-  GClosureNotify notify;
-};
-struct _GClosure
-{
-  /*< private >*/
-  volatile      	guint	 ref_count : 15;
-  volatile       	guint	 meta_marshal : 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 --- */
-GClosure* g_cclosure_new			(GCallback	callback_func,
-						 gpointer	user_data,
-						 GClosureNotify destroy_data);
-GClosure* g_cclosure_new_swap			(GCallback	callback_func,
-						 gpointer	user_data,
-						 GClosureNotify destroy_data);
-GClosure* g_signal_type_cclosure_new		(GType          itype,
-						 guint          struct_offset);
-
-
-/* --- prototypes --- */
-GClosure* g_closure_ref				(GClosure	*closure);
-void	  g_closure_sink			(GClosure	*closure);
-void	  g_closure_unref			(GClosure	*closure);
-/* intimidating */
-GClosure* g_closure_new_simple			(guint		 sizeof_closure,
-						 gpointer	 data);
-void	  g_closure_add_finalize_notifier	(GClosure       *closure,
-						 gpointer	 notify_data,
-						 GClosureNotify	 notify_func);
-void	  g_closure_remove_finalize_notifier	(GClosure       *closure,
-						 gpointer	 notify_data,
-						 GClosureNotify	 notify_func);
-void	  g_closure_add_invalidate_notifier	(GClosure       *closure,
-						 gpointer	 notify_data,
-						 GClosureNotify	 notify_func);
-void	  g_closure_remove_invalidate_notifier	(GClosure       *closure,
-						 gpointer	 notify_data,
-						 GClosureNotify	 notify_func);
-void	  g_closure_add_marshal_guards		(GClosure	*closure,
-						 gpointer        pre_marshal_data,
-						 GClosureNotify	 pre_marshal_notify,
-						 gpointer        post_marshal_data,
-						 GClosureNotify	 post_marshal_notify);
-void	  g_closure_set_marshal			(GClosure	*closure,
-						 GClosureMarshal marshal);
-void	  g_closure_set_meta_marshal		(GClosure       *closure,
-						 gpointer	 marshal_data,
-						 GClosureMarshal meta_marshal);
-void	  g_closure_invalidate			(GClosure	*closure);
-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
-*/
-
-G_END_DECLS
-
-#endif /* __G_CLOSURE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/genums.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/genums.h
deleted file mode 100644
index 5d16c53c..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/genums.h
+++ /dev/null
@@ -1,125 +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.
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_ENUMS_H__
-#define __G_ENUMS_H__
-
-#include <gobject/gtype.h>
-
-G_BEGIN_DECLS
-
-/* --- type macros --- */
-#define G_TYPE_IS_ENUM(type)	       (G_TYPE_FUNDAMENTAL (type) == G_TYPE_ENUM)
-#define G_ENUM_CLASS(class)	       (G_TYPE_CHECK_CLASS_CAST ((class), G_TYPE_ENUM, GEnumClass))
-#define G_IS_ENUM_CLASS(class)	       (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_ENUM))
-#define G_ENUM_CLASS_TYPE(class)       (G_TYPE_FROM_CLASS (class))
-#define G_ENUM_CLASS_TYPE_NAME(class)  (g_type_name (G_ENUM_CLASS_TYPE (class)))
-#define G_TYPE_IS_FLAGS(type)	       (G_TYPE_FUNDAMENTAL (type) == G_TYPE_FLAGS)
-#define G_FLAGS_CLASS(class)	       (G_TYPE_CHECK_CLASS_CAST ((class), G_TYPE_FLAGS, GFlagsClass))
-#define G_IS_FLAGS_CLASS(class)        (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_FLAGS))
-#define G_FLAGS_CLASS_TYPE(class)      (G_TYPE_FROM_CLASS (class))
-#define G_FLAGS_CLASS_TYPE_NAME(class) (g_type_name (G_FLAGS_CLASS_TYPE (class)))
-#define G_VALUE_HOLDS_ENUM(value)      (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_ENUM))
-#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;
-struct	_GEnumClass
-{
-  GTypeClass  g_type_class;
-
-  /*< public >*/  
-  gint	      minimum;
-  gint	      maximum;
-  guint	      n_values;
-  GEnumValue *values;
-};
-struct	_GFlagsClass
-{
-  GTypeClass   g_type_class;
-  
-  /*< public >*/  
-  guint	       mask;
-  guint	       n_values;
-  GFlagsValue *values;
-};
-struct _GEnumValue
-{
-  gint	 value;
-  const gchar *value_name;
-  const gchar *value_nick;
-};
-struct _GFlagsValue
-{
-  guint	 value;
-  const gchar *value_name;
-  const gchar *value_nick;
-};
-
-
-/* --- prototypes --- */
-GEnumValue*	g_enum_get_value		(GEnumClass	*enum_class,
-						 gint		 value);
-GEnumValue*	g_enum_get_value_by_name	(GEnumClass	*enum_class,
-						 const gchar	*name);
-GEnumValue*	g_enum_get_value_by_nick	(GEnumClass	*enum_class,
-						 const gchar	*nick);
-GFlagsValue*	g_flags_get_first_value		(GFlagsClass	*flags_class,
-						 guint		 value);
-GFlagsValue*	g_flags_get_value_by_name	(GFlagsClass	*flags_class,
-						 const gchar	*name);
-GFlagsValue*	g_flags_get_value_by_nick	(GFlagsClass	*flags_class,
-						 const gchar	*nick);
-void            g_value_set_enum        	(GValue         *value,
-						 gint            v_enum);
-gint            g_value_get_enum        	(const GValue   *value);
-void            g_value_set_flags       	(GValue         *value,
-						 guint           v_flags);
-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!
- */
-GType	g_enum_register_static	   (const gchar	      *name,
-				    const GEnumValue  *const_static_values);
-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
- */
-void	g_enum_complete_type_info  (GType	       g_enum_type,
-				    GTypeInfo	      *info,
-				    const GEnumValue  *const_values);
-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/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gmarshal.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gmarshal.h
deleted file mode 100644
index d095fd0a..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gmarshal.h
+++ /dev/null
@@ -1,169 +0,0 @@
-#ifndef __G_MARSHAL_H__
-#define __G_MARSHAL_H__
-
-G_BEGIN_DECLS
-
-/* VOID:VOID (/home/joss/deb/pkg-gnome/desktop/lenny/build-area/glib2.0-2.16.6/gobject/gmarshal.list:26) */
-extern 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);
-
-/* VOID:BOOLEAN (/home/joss/deb/pkg-gnome/desktop/lenny/build-area/glib2.0-2.16.6/gobject/gmarshal.list:27) */
-extern 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);
-
-/* VOID:CHAR (/home/joss/deb/pkg-gnome/desktop/lenny/build-area/glib2.0-2.16.6/gobject/gmarshal.list:28) */
-extern 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);
-
-/* VOID:UCHAR (/home/joss/deb/pkg-gnome/desktop/lenny/build-area/glib2.0-2.16.6/gobject/gmarshal.list:29) */
-extern 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);
-
-/* VOID:INT (/home/joss/deb/pkg-gnome/desktop/lenny/build-area/glib2.0-2.16.6/gobject/gmarshal.list:30) */
-extern 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);
-
-/* VOID:UINT (/home/joss/deb/pkg-gnome/desktop/lenny/build-area/glib2.0-2.16.6/gobject/gmarshal.list:31) */
-extern 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);
-
-/* VOID:LONG (/home/joss/deb/pkg-gnome/desktop/lenny/build-area/glib2.0-2.16.6/gobject/gmarshal.list:32) */
-extern 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);
-
-/* VOID:ULONG (/home/joss/deb/pkg-gnome/desktop/lenny/build-area/glib2.0-2.16.6/gobject/gmarshal.list:33) */
-extern 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);
-
-/* VOID:ENUM (/home/joss/deb/pkg-gnome/desktop/lenny/build-area/glib2.0-2.16.6/gobject/gmarshal.list:34) */
-extern 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);
-
-/* VOID:FLAGS (/home/joss/deb/pkg-gnome/desktop/lenny/build-area/glib2.0-2.16.6/gobject/gmarshal.list:35) */
-extern 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);
-
-/* VOID:FLOAT (/home/joss/deb/pkg-gnome/desktop/lenny/build-area/glib2.0-2.16.6/gobject/gmarshal.list:36) */
-extern 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);
-
-/* VOID:DOUBLE (/home/joss/deb/pkg-gnome/desktop/lenny/build-area/glib2.0-2.16.6/gobject/gmarshal.list:37) */
-extern 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);
-
-/* VOID:STRING (/home/joss/deb/pkg-gnome/desktop/lenny/build-area/glib2.0-2.16.6/gobject/gmarshal.list:38) */
-extern 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);
-
-/* VOID:PARAM (/home/joss/deb/pkg-gnome/desktop/lenny/build-area/glib2.0-2.16.6/gobject/gmarshal.list:39) */
-extern 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);
-
-/* VOID:BOXED (/home/joss/deb/pkg-gnome/desktop/lenny/build-area/glib2.0-2.16.6/gobject/gmarshal.list:40) */
-extern 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);
-
-/* VOID:POINTER (/home/joss/deb/pkg-gnome/desktop/lenny/build-area/glib2.0-2.16.6/gobject/gmarshal.list:41) */
-extern 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);
-
-/* VOID:OBJECT (/home/joss/deb/pkg-gnome/desktop/lenny/build-area/glib2.0-2.16.6/gobject/gmarshal.list:42) */
-extern 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);
-
-/* VOID:UINT,POINTER (/home/joss/deb/pkg-gnome/desktop/lenny/build-area/glib2.0-2.16.6/gobject/gmarshal.list:45) */
-extern 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);
-
-/* BOOL:FLAGS (/home/joss/deb/pkg-gnome/desktop/lenny/build-area/glib2.0-2.16.6/gobject/gmarshal.list:46) */
-extern 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);
-#define g_cclosure_marshal_BOOL__FLAGS	g_cclosure_marshal_BOOLEAN__FLAGS
-
-/* STRING:OBJECT,POINTER (/home/joss/deb/pkg-gnome/desktop/lenny/build-area/glib2.0-2.16.6/gobject/gmarshal.list:47) */
-extern 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);
-
-G_END_DECLS
-
-#endif /* __G_MARSHAL_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gobject.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gobject.h
deleted file mode 100644
index 4f7ef570..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gobject.h
+++ /dev/null
@@ -1,286 +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.
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_OBJECT_H__
-#define __G_OBJECT_H__
-
-#include        <gobject/gtype.h>
-#include        <gobject/gvalue.h>
-#include        <gobject/gparam.h>
-#include        <gobject/gclosure.h>
-#include        <gobject/gsignal.h>
-
-G_BEGIN_DECLS
-
-/* --- type macros --- */
-#define G_TYPE_IS_OBJECT(type)      (G_TYPE_FUNDAMENTAL (type) == G_TYPE_OBJECT)
-#define G_OBJECT(object)            (G_TYPE_CHECK_INSTANCE_CAST ((object), G_TYPE_OBJECT, GObject))
-#define G_OBJECT_CLASS(class)       (G_TYPE_CHECK_CLASS_CAST ((class), G_TYPE_OBJECT, GObjectClass))
-#define G_IS_OBJECT(object)         (G_TYPE_CHECK_INSTANCE_TYPE ((object), G_TYPE_OBJECT))
-#define G_IS_OBJECT_CLASS(class)    (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_OBJECT))
-#define G_OBJECT_GET_CLASS(object)  (G_TYPE_INSTANCE_GET_CLASS ((object), G_TYPE_OBJECT, GObjectClass))
-#define G_OBJECT_TYPE(object)       (G_TYPE_FROM_INSTANCE (object))
-#define G_OBJECT_TYPE_NAME(object)  (g_type_name (G_OBJECT_TYPE (object)))
-#define G_OBJECT_CLASS_TYPE(class)  (G_TYPE_FROM_CLASS (class))
-#define G_OBJECT_CLASS_NAME(class)  (g_type_name (G_OBJECT_CLASS_TYPE (class)))
-#define G_VALUE_HOLDS_OBJECT(value) (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_OBJECT))
-
-/* --- type macros --- */
-#define G_TYPE_INITIALLY_UNOWNED	      (g_initially_unowned_get_type())
-#define G_INITIALLY_UNOWNED(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), G_TYPE_INITIALLY_UNOWNED, GInitiallyUnowned))
-#define G_INITIALLY_UNOWNED_CLASS(class)      (G_TYPE_CHECK_CLASS_CAST ((class), G_TYPE_INITIALLY_UNOWNED, GInitiallyUnownedClass))
-#define G_IS_INITIALLY_UNOWNED(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), G_TYPE_INITIALLY_UNOWNED))
-#define G_IS_INITIALLY_UNOWNED_CLASS(class)   (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_INITIALLY_UNOWNED))
-#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;
-typedef void (*GObjectGetPropertyFunc)  (GObject      *object,
-                                         guint         property_id,
-                                         GValue       *value,
-                                         GParamSpec   *pspec);
-typedef void (*GObjectSetPropertyFunc)  (GObject      *object,
-                                         guint         property_id,
-                                         const GValue *value,
-                                         GParamSpec   *pspec);
-typedef void (*GObjectFinalizeFunc)     (GObject      *object);
-typedef void (*GWeakNotify)		(gpointer      data,
-					 GObject      *where_the_object_was);
-struct  _GObject
-{
-  GTypeInstance  g_type_instance;
-  
-  /*< private >*/
-  volatile guint ref_count;
-  GData         *qdata;
-};
-struct  _GObjectClass
-{
-  GTypeClass   g_type_class;
-
-  /*< private >*/
-  GSList      *construct_properties;
-
-  /*< public >*/
-  /* seldomly 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);
-  /* seldomly 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 >*/
-  /* padding */
-  gpointer	pdummy[7];
-};
-struct _GObjectConstructParam
-{
-  GParamSpec *pspec;
-  GValue     *value;
-};
-
-
-/* --- prototypes --- */
-GType       g_initially_unowned_get_type      (void);
-void        g_object_class_install_property   (GObjectClass   *oclass,
-					       guint           property_id,
-					       GParamSpec     *pspec);
-GParamSpec* g_object_class_find_property      (GObjectClass   *oclass,
-					       const gchar    *property_name);
-GParamSpec**g_object_class_list_properties    (GObjectClass   *oclass,
-					       guint	      *n_properties);
-void        g_object_class_override_property  (GObjectClass   *oclass,
-					       guint           property_id,
-					       const gchar    *name);
-
-void        g_object_interface_install_property (gpointer     g_iface,
-						 GParamSpec  *pspec);
-GParamSpec* g_object_interface_find_property    (gpointer     g_iface,
-						 const gchar *property_name);
-GParamSpec**g_object_interface_list_properties  (gpointer     g_iface,
-						 guint       *n_properties_p);
-
-gpointer    g_object_new                      (GType           object_type,
-					       const gchar    *first_property_name,
-					       ...);
-gpointer    g_object_newv		      (GType           object_type,
-					       guint	       n_parameters,
-					       GParameter     *parameters);
-GObject*    g_object_new_valist               (GType           object_type,
-					       const gchar    *first_property_name,
-					       va_list         var_args);
-void	    g_object_set                      (gpointer	       object,
-					       const gchar    *first_property_name,
-					       ...) G_GNUC_NULL_TERMINATED;
-void        g_object_get                      (gpointer        object,
-					       const gchar    *first_property_name,
-					       ...) G_GNUC_NULL_TERMINATED;
-gpointer    g_object_connect                  (gpointer	       object,
-					       const gchar    *signal_spec,
-					       ...) G_GNUC_NULL_TERMINATED;
-void	    g_object_disconnect               (gpointer	       object,
-					       const gchar    *signal_spec,
-					       ...) G_GNUC_NULL_TERMINATED;
-void        g_object_set_valist               (GObject        *object,
-					       const gchar    *first_property_name,
-					       va_list         var_args);
-void        g_object_get_valist               (GObject        *object,
-					       const gchar    *first_property_name,
-					       va_list         var_args);
-void        g_object_set_property             (GObject        *object,
-					       const gchar    *property_name,
-					       const GValue   *value);
-void        g_object_get_property             (GObject        *object,
-					       const gchar    *property_name,
-					       GValue         *value);
-void        g_object_freeze_notify            (GObject        *object);
-void        g_object_notify                   (GObject        *object,
-					       const gchar    *property_name);
-void        g_object_thaw_notify              (GObject        *object);
-gboolean    g_object_is_floating    	      (gpointer        object);
-gpointer    g_object_ref_sink       	      (gpointer	       object);
-gpointer    g_object_ref                      (gpointer        object);
-void        g_object_unref                    (gpointer        object);
-void	    g_object_weak_ref		      (GObject	      *object,
-					       GWeakNotify     notify,
-					       gpointer	       data);
-void	    g_object_weak_unref		      (GObject	      *object,
-					       GWeakNotify     notify,
-					       gpointer	       data);
-void        g_object_add_weak_pointer         (GObject        *object, 
-                                               gpointer       *weak_pointer_location);
-void        g_object_remove_weak_pointer      (GObject        *object, 
-                                               gpointer       *weak_pointer_location);
-
-typedef void (*GToggleNotify) (gpointer      data,
-			       GObject      *object,
-			       gboolean      is_last_ref);
-
-void g_object_add_toggle_ref    (GObject       *object,
-				 GToggleNotify  notify,
-				 gpointer       data);
-void g_object_remove_toggle_ref (GObject       *object,
-				 GToggleNotify  notify,
-				 gpointer       data);
-
-gpointer    g_object_get_qdata                (GObject        *object,
-					       GQuark          quark);
-void        g_object_set_qdata                (GObject        *object,
-					       GQuark          quark,
-					       gpointer        data);
-void        g_object_set_qdata_full           (GObject        *object,
-					       GQuark          quark,
-					       gpointer        data,
-					       GDestroyNotify  destroy);
-gpointer    g_object_steal_qdata              (GObject        *object,
-					       GQuark          quark);
-gpointer    g_object_get_data                 (GObject        *object,
-					       const gchar    *key);
-void        g_object_set_data                 (GObject        *object,
-					       const gchar    *key,
-					       gpointer        data);
-void        g_object_set_data_full            (GObject        *object,
-					       const gchar    *key,
-					       gpointer        data,
-					       GDestroyNotify  destroy);
-gpointer    g_object_steal_data               (GObject        *object,
-					       const gchar    *key);
-void        g_object_watch_closure            (GObject        *object,
-					       GClosure       *closure);
-GClosure*   g_cclosure_new_object             (GCallback       callback_func,
-					       GObject	      *object);
-GClosure*   g_cclosure_new_object_swap        (GCallback       callback_func,
-					       GObject	      *object);
-GClosure*   g_closure_new_object              (guint           sizeof_closure,
-					       GObject        *object);
-void        g_value_set_object                (GValue         *value,
-					       gpointer        v_object);
-gpointer    g_value_get_object                (const GValue   *value);
-gpointer    g_value_dup_object                (const GValue   *value);
-gulong	    g_signal_connect_object           (gpointer	       instance,
-					       const gchar    *detailed_signal,
-					       GCallback       c_handler,
-					       gpointer	       gobject,
-					       GConnectFlags   connect_flags);
-
-/*< protected >*/
-void        g_object_force_floating           (GObject        *object);
-void        g_object_run_dispose	      (GObject	      *object);
-
-
-void        g_value_take_object               (GValue         *value,
-					       gpointer        v_object);
-#ifndef G_DISABLE_DEPRECATED
-void        g_value_set_object_take_ownership (GValue         *value,
-					       gpointer        v_object);
-#endif
-
-#if !defined(G_DISABLE_DEPRECATED) || defined(GTK_COMPILATION)
-gsize	    g_object_compat_control	      (gsize	       what,
-					       gpointer	       data);
-#endif
-
-/* --- implementation macros --- */
-#define G_OBJECT_WARN_INVALID_PSPEC(object, pname, property_id, pspec) \
-G_STMT_START { \
-  GObject *_object = (GObject*) (object); \
-  GParamSpec *_pspec = (GParamSpec*) (pspec); \
-  guint _property_id = (property_id); \
-  g_warning ("%s: invalid %s id %u for \"%s\" of type `%s' in `%s'", \
-             G_STRLOC, \
-             (pname), \
-             _property_id, \
-             _pspec->name, \
-             g_type_name (G_PARAM_SPEC_TYPE (_pspec)), \
-             G_OBJECT_TYPE_NAME (_object)); \
-} G_STMT_END
-#define G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec) \
-    G_OBJECT_WARN_INVALID_PSPEC ((object), "property", (property_id), (pspec))
-
-G_END_DECLS
-
-#endif /* __G_OBJECT_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gobjectnotifyqueue.c b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gobjectnotifyqueue.c
deleted file mode 100644
index 60c1c280..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gobjectnotifyqueue.c
+++ /dev/null
@@ -1,169 +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_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;
-  /* currently, this structure abuses the GList allocation chain and thus
-   * must be <= sizeof (GList)
-   */
-};
-
-
-/* --- functions --- */
-static void
-g_object_notify_queue_free (gpointer data)
-{
-  GObjectNotifyQueue *nqueue = data;
-
-  g_slist_free (nqueue->pspecs);
-  g_list_free_1 ((void*) nqueue);
-}
-
-static inline GObjectNotifyQueue*
-g_object_notify_queue_freeze (GObject		   *object,
-			      GObjectNotifyContext *context)
-{
-  GObjectNotifyQueue *nqueue;
-
-  nqueue = g_datalist_id_get_data (&object->qdata, context->quark_notify_queue);
-  if (!nqueue)
-    {
-      nqueue = (void*) g_list_alloc ();
-      memset (nqueue, 0, sizeof (*nqueue));
-      nqueue->context = context;
-      g_datalist_id_set_data_full (&object->qdata, context->quark_notify_queue,
-				   nqueue, g_object_notify_queue_free);
-    }
-
-  g_return_val_if_fail (nqueue->freeze_count < 65535, nqueue);
-  nqueue->freeze_count++;
-
-  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);
-
-  nqueue->freeze_count--;
-  if (nqueue->freeze_count)
-    return;
-  g_return_if_fail (object->ref_count > 0);
-
-  pspecs = nqueue->n_pspecs > 16 ? free_me = g_new (GParamSpec*, nqueue->n_pspecs) : pspecs_mem;
-  /* set first entry to NULL since it's checked unconditionally */
-  pspecs[0] = NULL;
-  for (slist = nqueue->pspecs; slist; slist = slist->next)
-    {
-      GParamSpec *pspec = slist->data;
-      guint i = 0;
-
-      /* dedup, make pspecs in the list unique */
-    redo_dedup_check:
-      if (pspecs[i] == pspec)
-	continue;
-      if (++i < n_pspecs)
-	goto redo_dedup_check;
-
-      pspecs[n_pspecs++] = pspec;
-    }
-  g_datalist_id_set_data (&object->qdata, context->quark_notify_queue, NULL);
-
-  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_slist_free (nqueue->pspecs);
-  nqueue->pspecs = NULL;
-  nqueue->n_pspecs = 0;
-}
-
-static inline void
-g_object_notify_queue_add (GObject            *object,
-			   GObjectNotifyQueue *nqueue,
-			   GParamSpec	      *pspec)
-{
-  if (pspec->flags & G_PARAM_READABLE)
-    {
-      GParamSpec *redirect;
-
-      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 */
-      nqueue->pspecs = g_slist_prepend (nqueue->pspecs, pspec);
-      nqueue->n_pspecs++;
-    }
-}
-
-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/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gparam.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gparam.h
deleted file mode 100644
index 3790712e..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gparam.h
+++ /dev/null
@@ -1,235 +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
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_PARAM_H__
-#define __G_PARAM_H__
-
-#include	<gobject/gvalue.h>
-
-G_BEGIN_DECLS
-
-/* --- standard type macros --- */
-#define G_TYPE_IS_PARAM(type)		(G_TYPE_FUNDAMENTAL (type) == G_TYPE_PARAM)
-#define G_PARAM_SPEC(pspec)		(G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM, GParamSpec))
-#define G_IS_PARAM_SPEC(pspec)		(G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM))
-#define G_PARAM_SPEC_CLASS(pclass)      (G_TYPE_CHECK_CLASS_CAST ((pclass), G_TYPE_PARAM, GParamSpecClass))
-#define G_IS_PARAM_SPEC_CLASS(pclass)   (G_TYPE_CHECK_CLASS_TYPE ((pclass), G_TYPE_PARAM))
-#define G_PARAM_SPEC_GET_CLASS(pspec)	(G_TYPE_INSTANCE_GET_CLASS ((pspec), G_TYPE_PARAM, GParamSpecClass))
-
-
-/* --- convenience macros --- */
-#define G_PARAM_SPEC_TYPE(pspec)	(G_TYPE_FROM_INSTANCE (pspec))
-#define G_PARAM_SPEC_TYPE_NAME(pspec)	(g_type_name (G_PARAM_SPEC_TYPE (pspec)))
-#define	G_PARAM_SPEC_VALUE_TYPE(pspec)	(G_PARAM_SPEC (pspec)->value_type)
-#define G_VALUE_HOLDS_PARAM(value)	(G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_PARAM))
-       
-
-/* --- flags --- */
-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
-} GParamFlags;
-#define	G_PARAM_READWRITE	(G_PARAM_READABLE | G_PARAM_WRITABLE)
-#define	G_PARAM_STATIC_STRINGS (G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)
-#define	G_PARAM_MASK		(0x000000ff)
-/* bits in the range 0xffffff00 are reserved for 3rd party usage */
-#define	G_PARAM_USER_SHIFT	(8)
-
-
-/* --- typedefs & structures --- */
-typedef struct _GParamSpec      GParamSpec;
-typedef struct _GParamSpecClass GParamSpecClass;
-typedef struct _GParameter	GParameter;
-typedef struct _GParamSpecPool  GParamSpecPool;
-struct _GParamSpec
-{
-  GTypeInstance  g_type_instance;
-
-  gchar         *name;
-  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 */
-};
-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];
-};
-struct _GParameter /* auxillary structure for _setv() variants */
-{
-  const gchar *name;
-  GValue       value;
-};
-
-
-/* --- prototypes --- */
-GParamSpec*	g_param_spec_ref		(GParamSpec    *pspec);
-void		g_param_spec_unref		(GParamSpec    *pspec);
-void		g_param_spec_sink		(GParamSpec    *pspec);
-GParamSpec*	g_param_spec_ref_sink   	(GParamSpec    *pspec);
-gpointer        g_param_spec_get_qdata		(GParamSpec    *pspec,
-						 GQuark         quark);
-void            g_param_spec_set_qdata		(GParamSpec    *pspec,
-						 GQuark         quark,
-						 gpointer       data);
-void            g_param_spec_set_qdata_full	(GParamSpec    *pspec,
-						 GQuark         quark,
-						 gpointer       data,
-						 GDestroyNotify destroy);
-gpointer        g_param_spec_steal_qdata	(GParamSpec    *pspec,
-						 GQuark         quark);
-GParamSpec*     g_param_spec_get_redirect_target (GParamSpec   *pspec);
-
-void		g_param_value_set_default	(GParamSpec    *pspec,
-						 GValue	       *value);
-gboolean	g_param_value_defaults		(GParamSpec    *pspec,
-						 GValue	       *value);
-gboolean	g_param_value_validate		(GParamSpec    *pspec,
-						 GValue	       *value);
-gboolean	g_param_value_convert		(GParamSpec    *pspec,
-						 const GValue  *src_value,
-						 GValue	       *dest_value,
-						 gboolean	strict_validation);
-gint		g_param_values_cmp		(GParamSpec    *pspec,
-						 const GValue  *value1,
-						 const GValue  *value2);
-G_CONST_RETURN gchar*	g_param_spec_get_name	(GParamSpec    *pspec);
-G_CONST_RETURN gchar*	g_param_spec_get_nick	(GParamSpec    *pspec);
-G_CONST_RETURN gchar*	g_param_spec_get_blurb	(GParamSpec    *pspec);
-void            g_value_set_param               (GValue	       *value,
-						 GParamSpec    *param);
-GParamSpec*     g_value_get_param               (const GValue  *value);
-GParamSpec*     g_value_dup_param               (const GValue  *value);
-
-
-void           g_value_take_param               (GValue        *value,
-					         GParamSpec    *param);
-#ifndef G_DISABLE_DEPRECATED
-void           g_value_set_param_take_ownership (GValue        *value,
-					         GParamSpec    *param);
-#endif
-
-/* --- convenience functions --- */
-typedef struct _GParamSpecTypeInfo GParamSpecTypeInfo;
-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);
-};
-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 --- */
-gpointer	g_param_spec_internal		(GType	        param_type,
-						 const gchar   *name,
-						 const gchar   *nick,
-						 const gchar   *blurb,
-						 GParamFlags    flags);
-GParamSpecPool* g_param_spec_pool_new		(gboolean	type_prefixing);
-void		g_param_spec_pool_insert	(GParamSpecPool	*pool,
-						 GParamSpec	*pspec,
-						 GType		 owner_type);
-void		g_param_spec_pool_remove	(GParamSpecPool	*pool,
-						 GParamSpec	*pspec);
-GParamSpec*	g_param_spec_pool_lookup	(GParamSpecPool	*pool,
-						 const gchar	*param_name,
-						 GType		 owner_type,
-						 gboolean	 walk_ancestors);
-GList*		g_param_spec_pool_list_owned	(GParamSpecPool	*pool,
-						 GType		 owner_type);
-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/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gparamspecs.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gparamspecs.h
deleted file mode 100644
index b6add1cb..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gparamspecs.h
+++ /dev/null
@@ -1,439 +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
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_PARAMSPECS_H__
-#define __G_PARAMSPECS_H__
-
-#include        <gobject/gvalue.h>
-#include        <gobject/genums.h>
-#include        <gobject/gboxed.h>
-#include        <gobject/gobject.h>
-
-G_BEGIN_DECLS
-
-/* --- type macros --- */
-#define	G_TYPE_PARAM_CHAR		   (g_param_spec_types[0])
-#define G_IS_PARAM_SPEC_CHAR(pspec)        (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_CHAR))
-#define G_PARAM_SPEC_CHAR(pspec)           (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_CHAR, GParamSpecChar))
-#define	G_TYPE_PARAM_UCHAR		   (g_param_spec_types[1])
-#define G_IS_PARAM_SPEC_UCHAR(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_UCHAR))
-#define G_PARAM_SPEC_UCHAR(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_UCHAR, GParamSpecUChar))
-#define	G_TYPE_PARAM_BOOLEAN		   (g_param_spec_types[2])
-#define G_IS_PARAM_SPEC_BOOLEAN(pspec)     (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_BOOLEAN))
-#define G_PARAM_SPEC_BOOLEAN(pspec)        (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_BOOLEAN, GParamSpecBoolean))
-#define	G_TYPE_PARAM_INT		   (g_param_spec_types[3])
-#define G_IS_PARAM_SPEC_INT(pspec)         (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_INT))
-#define G_PARAM_SPEC_INT(pspec)            (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_INT, GParamSpecInt))
-#define	G_TYPE_PARAM_UINT		   (g_param_spec_types[4])
-#define G_IS_PARAM_SPEC_UINT(pspec)        (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_UINT))
-#define G_PARAM_SPEC_UINT(pspec)           (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_UINT, GParamSpecUInt))
-#define	G_TYPE_PARAM_LONG		   (g_param_spec_types[5])
-#define G_IS_PARAM_SPEC_LONG(pspec)        (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_LONG))
-#define G_PARAM_SPEC_LONG(pspec)           (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_LONG, GParamSpecLong))
-#define	G_TYPE_PARAM_ULONG		   (g_param_spec_types[6])
-#define G_IS_PARAM_SPEC_ULONG(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_ULONG))
-#define G_PARAM_SPEC_ULONG(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_ULONG, GParamSpecULong))
-#define	G_TYPE_PARAM_INT64		   (g_param_spec_types[7])
-#define G_IS_PARAM_SPEC_INT64(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_INT64))
-#define G_PARAM_SPEC_INT64(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_INT64, GParamSpecInt64))
-#define	G_TYPE_PARAM_UINT64		   (g_param_spec_types[8])
-#define G_IS_PARAM_SPEC_UINT64(pspec)      (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_UINT64))
-#define G_PARAM_SPEC_UINT64(pspec)         (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_UINT64, GParamSpecUInt64))
-#define	G_TYPE_PARAM_UNICHAR		   (g_param_spec_types[9])
-#define G_PARAM_SPEC_UNICHAR(pspec)        (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_UNICHAR, GParamSpecUnichar))
-#define G_IS_PARAM_SPEC_UNICHAR(pspec)     (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_UNICHAR))
-#define	G_TYPE_PARAM_ENUM		   (g_param_spec_types[10])
-#define G_IS_PARAM_SPEC_ENUM(pspec)        (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_ENUM))
-#define G_PARAM_SPEC_ENUM(pspec)           (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_ENUM, GParamSpecEnum))
-#define	G_TYPE_PARAM_FLAGS		   (g_param_spec_types[11])
-#define G_IS_PARAM_SPEC_FLAGS(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_FLAGS))
-#define G_PARAM_SPEC_FLAGS(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_FLAGS, GParamSpecFlags))
-#define	G_TYPE_PARAM_FLOAT		   (g_param_spec_types[12])
-#define G_IS_PARAM_SPEC_FLOAT(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_FLOAT))
-#define G_PARAM_SPEC_FLOAT(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_FLOAT, GParamSpecFloat))
-#define	G_TYPE_PARAM_DOUBLE		   (g_param_spec_types[13])
-#define G_IS_PARAM_SPEC_DOUBLE(pspec)      (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_DOUBLE))
-#define G_PARAM_SPEC_DOUBLE(pspec)         (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_DOUBLE, GParamSpecDouble))
-#define	G_TYPE_PARAM_STRING		   (g_param_spec_types[14])
-#define G_IS_PARAM_SPEC_STRING(pspec)      (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_STRING))
-#define G_PARAM_SPEC_STRING(pspec)         (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_STRING, GParamSpecString))
-#define	G_TYPE_PARAM_PARAM		   (g_param_spec_types[15])
-#define G_IS_PARAM_SPEC_PARAM(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_PARAM))
-#define G_PARAM_SPEC_PARAM(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_PARAM, GParamSpecParam))
-#define	G_TYPE_PARAM_BOXED		   (g_param_spec_types[16])
-#define G_IS_PARAM_SPEC_BOXED(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_BOXED))
-#define G_PARAM_SPEC_BOXED(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_BOXED, GParamSpecBoxed))
-#define	G_TYPE_PARAM_POINTER		   (g_param_spec_types[17])
-#define G_IS_PARAM_SPEC_POINTER(pspec)     (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_POINTER))
-#define G_PARAM_SPEC_POINTER(pspec)        (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_POINTER, GParamSpecPointer))
-#define	G_TYPE_PARAM_VALUE_ARRAY	   (g_param_spec_types[18])
-#define G_IS_PARAM_SPEC_VALUE_ARRAY(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_VALUE_ARRAY))
-#define G_PARAM_SPEC_VALUE_ARRAY(pspec)    (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_VALUE_ARRAY, GParamSpecValueArray))
-#define	G_TYPE_PARAM_OBJECT		   (g_param_spec_types[19])
-#define G_IS_PARAM_SPEC_OBJECT(pspec)      (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_OBJECT))
-#define G_PARAM_SPEC_OBJECT(pspec)         (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_OBJECT, GParamSpecObject))
-#define	G_TYPE_PARAM_OVERRIDE		   (g_param_spec_types[20])
-#define G_IS_PARAM_SPEC_OVERRIDE(pspec)    (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_OVERRIDE))
-#define G_PARAM_SPEC_OVERRIDE(pspec)       (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_OVERRIDE, GParamSpecOverride))
-#define	G_TYPE_PARAM_GTYPE		   (g_param_spec_types[21])
-#define G_IS_PARAM_SPEC_GTYPE(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_GTYPE))
-#define G_PARAM_SPEC_GTYPE(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_GTYPE, GParamSpecGType))
-
-
-/* --- 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;
-
-struct _GParamSpecChar
-{
-  GParamSpec    parent_instance;
-  
-  gint8         minimum;
-  gint8         maximum;
-  gint8         default_value;
-};
-struct _GParamSpecUChar
-{
-  GParamSpec    parent_instance;
-  
-  guint8        minimum;
-  guint8        maximum;
-  guint8        default_value;
-};
-struct _GParamSpecBoolean
-{
-  GParamSpec    parent_instance;
-  
-  gboolean      default_value;
-};
-struct _GParamSpecInt
-{
-  GParamSpec    parent_instance;
-  
-  gint          minimum;
-  gint          maximum;
-  gint          default_value;
-};
-struct _GParamSpecUInt
-{
-  GParamSpec    parent_instance;
-  
-  guint         minimum;
-  guint         maximum;
-  guint         default_value;
-};
-struct _GParamSpecLong
-{
-  GParamSpec    parent_instance;
-  
-  glong         minimum;
-  glong         maximum;
-  glong         default_value;
-};
-struct _GParamSpecULong
-{
-  GParamSpec    parent_instance;
-  
-  gulong        minimum;
-  gulong        maximum;
-  gulong        default_value;
-};
-struct _GParamSpecInt64
-{
-  GParamSpec    parent_instance;
-  
-  gint64        minimum;
-  gint64        maximum;
-  gint64        default_value;
-};
-struct _GParamSpecUInt64
-{
-  GParamSpec    parent_instance;
-  
-  guint64       minimum;
-  guint64       maximum;
-  guint64       default_value;
-};
-struct _GParamSpecUnichar
-{
-  GParamSpec    parent_instance;
-  
-  gunichar      default_value;
-};
-struct _GParamSpecEnum
-{
-  GParamSpec    parent_instance;
-  
-  GEnumClass   *enum_class;
-  gint          default_value;
-};
-struct _GParamSpecFlags
-{
-  GParamSpec    parent_instance;
-  
-  GFlagsClass  *flags_class;
-  guint         default_value;
-};
-struct _GParamSpecFloat
-{
-  GParamSpec    parent_instance;
-  
-  gfloat        minimum;
-  gfloat        maximum;
-  gfloat        default_value;
-  gfloat        epsilon;
-};
-struct _GParamSpecDouble
-{
-  GParamSpec    parent_instance;
-  
-  gdouble       minimum;
-  gdouble       maximum;
-  gdouble       default_value;
-  gdouble       epsilon;
-};
-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;
-};
-struct _GParamSpecParam
-{
-  GParamSpec    parent_instance;
-};
-struct _GParamSpecBoxed
-{
-  GParamSpec    parent_instance;
-};
-struct _GParamSpecPointer
-{
-  GParamSpec    parent_instance;
-};
-struct _GParamSpecValueArray
-{
-  GParamSpec    parent_instance;
-  GParamSpec   *element_spec;
-  guint		fixed_n_elements;
-};
-struct _GParamSpecObject
-{
-  GParamSpec    parent_instance;
-};
-struct _GParamSpecOverride
-{
-  /*< private >*/
-  GParamSpec    parent_instance;
-  GParamSpec   *overridden;
-};
-struct _GParamSpecGType
-{
-  GParamSpec    parent_instance;
-  GType         is_a_type;
-};
-
-/* --- GParamSpec prototypes --- */
-GParamSpec*	g_param_spec_char	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  gint8		  minimum,
-					  gint8		  maximum,
-					  gint8		  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_uchar	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  guint8	  minimum,
-					  guint8	  maximum,
-					  guint8	  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_boolean	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  gboolean	  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_int	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  gint		  minimum,
-					  gint		  maximum,
-					  gint		  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_uint	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  guint		  minimum,
-					  guint		  maximum,
-					  guint		  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_long	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  glong		  minimum,
-					  glong		  maximum,
-					  glong		  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_ulong	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  gulong	  minimum,
-					  gulong	  maximum,
-					  gulong	  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_int64	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  gint64       	  minimum,
-					  gint64       	  maximum,
-					  gint64       	  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_uint64	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  guint64	  minimum,
-					  guint64	  maximum,
-					  guint64	  default_value,
-					  GParamFlags	  flags);
-GParamSpec*    g_param_spec_unichar      (const gchar    *name,
-				          const gchar    *nick,
-				          const gchar    *blurb,
-				          gunichar	  default_value,
-				          GParamFlags     flags);
-GParamSpec*	g_param_spec_enum	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GType		  enum_type,
-					  gint		  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_flags	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GType		  flags_type,
-					  guint		  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_float	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  gfloat	  minimum,
-					  gfloat	  maximum,
-					  gfloat	  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_double	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  gdouble	  minimum,
-					  gdouble	  maximum,
-					  gdouble	  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_string	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  const gchar	 *default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_param	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GType		  param_type,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_boxed	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GType		  boxed_type,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_pointer	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_value_array (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GParamSpec	 *element_spec,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_object	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GType		  object_type,
-					  GParamFlags	  flags);
-GParamSpec*     g_param_spec_override    (const gchar    *name,
-					  GParamSpec     *overridden);
-GParamSpec*	g_param_spec_gtype	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GType           is_a_type,
-					  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 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/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gsignal.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gsignal.h
deleted file mode 100644
index 61345dcb..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gsignal.h
+++ /dev/null
@@ -1,270 +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.
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_SIGNAL_H__
-#define __G_SIGNAL_H__
-
-#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;
-typedef GClosureMarshal			 GSignalCMarshaller;
-typedef gboolean (*GSignalEmissionHook) (GSignalInvocationHint *ihint,
-					 guint			n_param_values,
-					 const GValue	       *param_values,
-					 gpointer		data);
-typedef gboolean (*GSignalAccumulator)	(GSignalInvocationHint *ihint,
-					 GValue		       *return_accu,
-					 const GValue	       *handler_return,
-					 gpointer               data);
-
-
-/* --- run, match and connect types --- */
-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
-} GSignalFlags;
-#define G_SIGNAL_FLAGS_MASK  0x7f
-typedef enum
-{
-  G_CONNECT_AFTER	= 1 << 0,
-  G_CONNECT_SWAPPED	= 1 << 1
-} GConnectFlags;
-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;
-#define G_SIGNAL_MATCH_MASK  0x3f
-#define	G_SIGNAL_TYPE_STATIC_SCOPE (G_TYPE_FLAG_RESERVED_ID_BIT)
-
-
-/* --- signal information --- */
-struct _GSignalInvocationHint
-{
-  guint		signal_id;
-  GQuark	detail;
-  GSignalFlags	run_type;
-};
-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 --- */
-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);
-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);
-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,
-					     ...);
-void                  g_signal_emitv        (const GValue       *instance_and_params,
-					     guint               signal_id,
-					     GQuark              detail,
-					     GValue             *return_value);
-void                  g_signal_emit_valist  (gpointer            instance,
-					     guint               signal_id,
-					     GQuark              detail,
-					     va_list             var_args);
-void                  g_signal_emit         (gpointer            instance,
-					     guint               signal_id,
-					     GQuark              detail,
-					     ...);
-void                  g_signal_emit_by_name (gpointer            instance,
-					     const gchar        *detailed_signal,
-					     ...);
-guint                 g_signal_lookup       (const gchar        *name,
-					     GType               itype);
-G_CONST_RETURN gchar* g_signal_name         (guint               signal_id);
-void                  g_signal_query        (guint               signal_id,
-					     GSignalQuery       *query);
-guint*                g_signal_list_ids     (GType               itype,
-					     guint              *n_ids);
-gboolean	      g_signal_parse_name   (const gchar	*detailed_signal,
-					     GType		 itype,
-					     guint		*signal_id_p,
-					     GQuark		*detail_p,
-					     gboolean		 force_detail_quark);
-GSignalInvocationHint* g_signal_get_invocation_hint (gpointer    instance);
-
-
-/* --- signal emissions --- */
-void	g_signal_stop_emission		    (gpointer		  instance,
-					     guint		  signal_id,
-					     GQuark		  detail);
-void	g_signal_stop_emission_by_name	    (gpointer		  instance,
-					     const gchar	 *detailed_signal);
-gulong	g_signal_add_emission_hook	    (guint		  signal_id,
-					     GQuark		  detail,
-					     GSignalEmissionHook  hook_func,
-					     gpointer	       	  hook_data,
-					     GDestroyNotify	  data_destroy);
-void	g_signal_remove_emission_hook	    (guint		  signal_id,
-					     gulong		  hook_id);
-
-
-/* --- signal handlers --- */
-gboolean g_signal_has_handler_pending	      (gpointer		  instance,
-					       guint		  signal_id,
-					       GQuark		  detail,
-					       gboolean		  may_be_blocked);
-gulong	 g_signal_connect_closure_by_id	      (gpointer		  instance,
-					       guint		  signal_id,
-					       GQuark		  detail,
-					       GClosure		 *closure,
-					       gboolean		  after);
-gulong	 g_signal_connect_closure	      (gpointer		  instance,
-					       const gchar       *detailed_signal,
-					       GClosure		 *closure,
-					       gboolean		  after);
-gulong	 g_signal_connect_data		      (gpointer		  instance,
-					       const gchar	 *detailed_signal,
-					       GCallback	  c_handler,
-					       gpointer		  data,
-					       GClosureNotify	  destroy_data,
-					       GConnectFlags	  connect_flags);
-void	 g_signal_handler_block		      (gpointer		  instance,
-					       gulong		  handler_id);
-void	 g_signal_handler_unblock	      (gpointer		  instance,
-					       gulong		  handler_id);
-void	 g_signal_handler_disconnect	      (gpointer		  instance,
-					       gulong		  handler_id);
-gboolean g_signal_handler_is_connected	      (gpointer		  instance,
-					       gulong		  handler_id);
-gulong	 g_signal_handler_find		      (gpointer		  instance,
-					       GSignalMatchType	  mask,
-					       guint		  signal_id,
-					       GQuark		  detail,
-					       GClosure		 *closure,
-					       gpointer		  func,
-					       gpointer		  data);
-guint	 g_signal_handlers_block_matched      (gpointer		  instance,
-					       GSignalMatchType	  mask,
-					       guint		  signal_id,
-					       GQuark		  detail,
-					       GClosure		 *closure,
-					       gpointer		  func,
-					       gpointer		  data);
-guint	 g_signal_handlers_unblock_matched    (gpointer		  instance,
-					       GSignalMatchType	  mask,
-					       guint		  signal_id,
-					       GQuark		  detail,
-					       GClosure		 *closure,
-					       gpointer		  func,
-					       gpointer		  data);
-guint	 g_signal_handlers_disconnect_matched (gpointer		  instance,
-					       GSignalMatchType	  mask,
-					       guint		  signal_id,
-					       GQuark		  detail,
-					       GClosure		 *closure,
-					       gpointer		  func,
-					       gpointer		  data);
-
-
-/* --- chaining for language bindings --- */
-void	g_signal_override_class_closure	      (guint		  signal_id,
-					       GType		  instance_type,
-					       GClosure		 *class_closure);
-void	g_signal_chain_from_overridden	      (const GValue      *instance_and_params,
-					       GValue            *return_value);
-
-
-/* --- convenience --- */
-#define g_signal_connect(instance, detailed_signal, c_handler, data) \
-    g_signal_connect_data ((instance), (detailed_signal), (c_handler), (data), NULL, (GConnectFlags) 0)
-#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)
-#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)
-#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))
-#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))
-#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))
-
-
-gboolean g_signal_accumulator_true_handled (GSignalInvocationHint *ihint,
-					    GValue                *return_accu,
-					    const GValue          *handler_return,
-					    gpointer               dummy);
-
-/*< private >*/
-void	 g_signal_handlers_destroy	      (gpointer		  instance);
-void	 _g_signals_destroy		      (GType		  itype);
-
-G_END_DECLS
-
-#endif /* __G_SIGNAL_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gsourceclosure.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gsourceclosure.h
deleted file mode 100644
index e371235a..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gsourceclosure.h
+++ /dev/null
@@ -1,41 +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.
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_SOURCECLOSURE_H__
-#define __G_SOURCECLOSURE_H__
-
-#include <gobject/gclosure.h>
-
-G_BEGIN_DECLS
-
-void g_source_set_closure (GSource  *source,
-			   GClosure *closure);
-
-GType g_io_channel_get_type   (void);
-GType g_io_condition_get_type (void);
-
-#define G_TYPE_IO_CHANNEL (g_io_channel_get_type ())
-#define G_TYPE_IO_CONDITION (g_io_condition_get_type ())
-
-G_END_DECLS
-
-#endif /* __G_SOURCECLOSURE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gtype.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gtype.h
deleted file mode 100644
index 5fa98606..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gtype.h
+++ /dev/null
@@ -1,499 +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.
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_TYPE_H__
-#define __G_TYPE_H__
-
-#include        <glib.h>
-
-G_BEGIN_DECLS
-
-/* Basic Type Macros
- */
-#define G_TYPE_FUNDAMENTAL(type)	(g_type_fundamental (type))
-#define	G_TYPE_FUNDAMENTAL_MAX		(255 << G_TYPE_FUNDAMENTAL_SHIFT)
-
-/* Constant fundamental types,
- * introduced by g_type_init().
- */
-#define G_TYPE_INVALID			G_TYPE_MAKE_FUNDAMENTAL (0)
-#define G_TYPE_NONE			G_TYPE_MAKE_FUNDAMENTAL (1)
-#define G_TYPE_INTERFACE		G_TYPE_MAKE_FUNDAMENTAL (2)
-#define G_TYPE_CHAR			G_TYPE_MAKE_FUNDAMENTAL (3)
-#define G_TYPE_UCHAR			G_TYPE_MAKE_FUNDAMENTAL (4)
-#define G_TYPE_BOOLEAN			G_TYPE_MAKE_FUNDAMENTAL (5)
-#define G_TYPE_INT			G_TYPE_MAKE_FUNDAMENTAL (6)
-#define G_TYPE_UINT			G_TYPE_MAKE_FUNDAMENTAL (7)
-#define G_TYPE_LONG			G_TYPE_MAKE_FUNDAMENTAL (8)
-#define G_TYPE_ULONG			G_TYPE_MAKE_FUNDAMENTAL (9)
-#define G_TYPE_INT64			G_TYPE_MAKE_FUNDAMENTAL (10)
-#define G_TYPE_UINT64			G_TYPE_MAKE_FUNDAMENTAL (11)
-#define G_TYPE_ENUM			G_TYPE_MAKE_FUNDAMENTAL (12)
-#define G_TYPE_FLAGS			G_TYPE_MAKE_FUNDAMENTAL (13)
-#define G_TYPE_FLOAT			G_TYPE_MAKE_FUNDAMENTAL (14)
-#define G_TYPE_DOUBLE			G_TYPE_MAKE_FUNDAMENTAL (15)
-#define G_TYPE_STRING			G_TYPE_MAKE_FUNDAMENTAL (16)
-#define G_TYPE_POINTER			G_TYPE_MAKE_FUNDAMENTAL (17)
-#define G_TYPE_BOXED			G_TYPE_MAKE_FUNDAMENTAL (18)
-#define G_TYPE_PARAM			G_TYPE_MAKE_FUNDAMENTAL (19)
-#define G_TYPE_OBJECT			G_TYPE_MAKE_FUNDAMENTAL (20)
-
-
-/* Reserved fundamental type numbers to create new fundamental
- * type IDs with G_TYPE_MAKE_FUNDAMENTAL().
- * Send email to gtk-devel-list@redhat.com for reservations.
- */
-#define	G_TYPE_FUNDAMENTAL_SHIFT	(2)
-#define	G_TYPE_MAKE_FUNDAMENTAL(x)	((GType) ((x) << G_TYPE_FUNDAMENTAL_SHIFT))
-#define G_TYPE_RESERVED_GLIB_FIRST	(21)
-#define G_TYPE_RESERVED_GLIB_LAST	(31)
-#define G_TYPE_RESERVED_BSE_FIRST	(32)
-#define G_TYPE_RESERVED_BSE_LAST	(48)
-#define G_TYPE_RESERVED_USER_FIRST	(49)
-
-
-/* Type Checking Macros
- */
-#define G_TYPE_IS_FUNDAMENTAL(type)             ((type) <= G_TYPE_FUNDAMENTAL_MAX)
-#define G_TYPE_IS_DERIVED(type)                 ((type) > G_TYPE_FUNDAMENTAL_MAX)
-#define G_TYPE_IS_INTERFACE(type)               (G_TYPE_FUNDAMENTAL (type) == G_TYPE_INTERFACE)
-#define G_TYPE_IS_CLASSED(type)                 (g_type_test_flags ((type), G_TYPE_FLAG_CLASSED))
-#define G_TYPE_IS_INSTANTIATABLE(type)          (g_type_test_flags ((type), G_TYPE_FLAG_INSTANTIATABLE))
-#define G_TYPE_IS_DERIVABLE(type)               (g_type_test_flags ((type), G_TYPE_FLAG_DERIVABLE))
-#define G_TYPE_IS_DEEP_DERIVABLE(type)          (g_type_test_flags ((type), G_TYPE_FLAG_DEEP_DERIVABLE))
-#define G_TYPE_IS_ABSTRACT(type)                (g_type_test_flags ((type), G_TYPE_FLAG_ABSTRACT))
-#define G_TYPE_IS_VALUE_ABSTRACT(type)          (g_type_test_flags ((type), G_TYPE_FLAG_VALUE_ABSTRACT))
-#define G_TYPE_IS_VALUE_TYPE(type)              (g_type_check_is_value_type (type))
-#define G_TYPE_HAS_VALUE_TABLE(type)            (g_type_value_table_peek (type) != NULL)
-
-
-/* Typedefs
- */
-#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
- */
-struct _GTypeClass
-{
-  /*< private >*/
-  GType g_type;
-};
-struct _GTypeInstance
-{
-  /*< private >*/
-  GTypeClass *g_class;
-};
-struct _GTypeInterface
-{
-  /*< private >*/
-  GType g_type;         /* iface type */
-  GType g_instance_type;
-};
-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 >*/
-#define G_TYPE_CHECK_INSTANCE(instance)				(_G_TYPE_CHI ((GTypeInstance*) (instance)))
-#define G_TYPE_CHECK_INSTANCE_CAST(instance, g_type, c_type)    (_G_TYPE_CIC ((instance), (g_type), c_type))
-#define G_TYPE_CHECK_INSTANCE_TYPE(instance, g_type)            (_G_TYPE_CIT ((instance), (g_type)))
-#define G_TYPE_INSTANCE_GET_CLASS(instance, g_type, c_type)     (_G_TYPE_IGC ((instance), (g_type), c_type))
-#define G_TYPE_INSTANCE_GET_INTERFACE(instance, g_type, c_type) (_G_TYPE_IGI ((instance), (g_type), c_type))
-#define G_TYPE_CHECK_CLASS_CAST(g_class, g_type, c_type)        (_G_TYPE_CCC ((g_class), (g_type), c_type))
-#define G_TYPE_CHECK_CLASS_TYPE(g_class, g_type)                (_G_TYPE_CCT ((g_class), (g_type)))
-#define G_TYPE_CHECK_VALUE(value)				(_G_TYPE_CHV ((value)))
-#define G_TYPE_CHECK_VALUE_TYPE(value, g_type)			(_G_TYPE_CVH ((value), (g_type)))
-#define G_TYPE_FROM_INSTANCE(instance)                          (G_TYPE_FROM_CLASS (((GTypeInstance*) (instance))->g_class))
-#define G_TYPE_FROM_CLASS(g_class)                              (((GTypeClass*) (g_class))->g_type)
-#define G_TYPE_FROM_INTERFACE(g_iface)                          (((GTypeInterface*) (g_iface))->g_type)
-
-#define G_TYPE_INSTANCE_GET_PRIVATE(instance, g_type, c_type)   ((c_type*) g_type_instance_get_private ((GTypeInstance*) (instance), (g_type)))
-
-
-/* debug flags for g_type_init_with_debug_flags() */
-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 --- */
-void                  g_type_init                    (void);
-void                  g_type_init_with_debug_flags   (GTypeDebugFlags  debug_flags);
-G_CONST_RETURN gchar* g_type_name                    (GType            type);
-GQuark                g_type_qname                   (GType            type);
-GType                 g_type_from_name               (const gchar     *name);
-GType                 g_type_parent                  (GType            type);
-guint                 g_type_depth                   (GType            type);
-GType                 g_type_next_base               (GType            leaf_type,
-						      GType            root_type);
-gboolean              g_type_is_a                    (GType            type,
-						      GType            is_a_type);
-gpointer              g_type_class_ref               (GType            type);
-gpointer              g_type_class_peek              (GType            type);
-gpointer              g_type_class_peek_static       (GType            type);
-void                  g_type_class_unref             (gpointer         g_class);
-gpointer              g_type_class_peek_parent       (gpointer         g_class);
-gpointer              g_type_interface_peek          (gpointer         instance_class,
-						      GType            iface_type);
-gpointer              g_type_interface_peek_parent   (gpointer         g_iface);
-
-gpointer              g_type_default_interface_ref   (GType            g_type);
-gpointer              g_type_default_interface_peek  (GType            g_type);
-void                  g_type_default_interface_unref (gpointer         g_iface);
-
-/* g_free() the returned arrays */
-GType*                g_type_children                (GType            type,
-						      guint           *n_children);
-GType*                g_type_interfaces              (GType            type,
-						      guint           *n_interfaces);
-
-/* per-type _static_ data */
-void                  g_type_set_qdata               (GType            type,
-						      GQuark           quark,
-						      gpointer         data);
-gpointer              g_type_get_qdata               (GType            type,
-						      GQuark           quark);
-void		      g_type_query		     (GType	       type,
-						      GTypeQuery      *query);
-
-
-/* --- type registration --- */
-typedef void   (*GBaseInitFunc)              (gpointer         g_class);
-typedef void   (*GBaseFinalizeFunc)          (gpointer         g_class);
-typedef void   (*GClassInitFunc)             (gpointer         g_class,
-					      gpointer         class_data);
-typedef void   (*GClassFinalizeFunc)         (gpointer         g_class,
-					      gpointer         class_data);
-typedef void   (*GInstanceInitFunc)          (GTypeInstance   *instance,
-					      gpointer         g_class);
-typedef void   (*GInterfaceInitFunc)         (gpointer         g_iface,
-					      gpointer         iface_data);
-typedef void   (*GInterfaceFinalizeFunc)     (gpointer         g_iface,
-					      gpointer         iface_data);
-typedef gboolean (*GTypeClassCacheFunc)	     (gpointer	       cache_data,
-					      GTypeClass      *g_class);
-typedef void     (*GTypeInterfaceCheckFunc)  (gpointer	       check_data,
-					      gpointer         g_iface);
-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;
-typedef enum    /*< skip >*/
-{
-  G_TYPE_FLAG_ABSTRACT		= (1 << 4),
-  G_TYPE_FLAG_VALUE_ABSTRACT	= (1 << 5)
-} GTypeFlags;
-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;
-};
-struct _GTypeFundamentalInfo
-{
-  GTypeFundamentalFlags  type_flags;
-};
-struct _GInterfaceInfo
-{
-  GInterfaceInitFunc     interface_init;
-  GInterfaceFinalizeFunc interface_finalize;
-  gpointer               interface_data;
-};
-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);
-  gchar	    *collect_format;
-  gchar*   (*collect_value)      (GValue       *value,
-				  guint         n_collect_values,
-				  GTypeCValue  *collect_values,
-				  guint		collect_flags);
-  gchar	    *lcopy_format;
-  gchar*   (*lcopy_value)        (const GValue *value,
-				  guint         n_collect_values,
-				  GTypeCValue  *collect_values,
-				  guint		collect_flags);
-};
-GType g_type_register_static		(GType			     parent_type,
-					 const gchar		    *type_name,
-					 const GTypeInfo	    *info,
-					 GTypeFlags		     flags);
-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);
-  
-GType g_type_register_dynamic		(GType			     parent_type,
-					 const gchar		    *type_name,
-					 GTypePlugin		    *plugin,
-					 GTypeFlags		     flags);
-GType g_type_register_fundamental	(GType			     type_id,
-					 const gchar		    *type_name,
-					 const GTypeInfo	    *info,
-					 const GTypeFundamentalInfo *finfo,
-					 GTypeFlags		     flags);
-void  g_type_add_interface_static	(GType			     instance_type,
-					 GType			     interface_type,
-					 const GInterfaceInfo	    *info);
-void  g_type_add_interface_dynamic	(GType			     instance_type,
-					 GType			     interface_type,
-					 GTypePlugin		    *plugin);
-void  g_type_interface_add_prerequisite (GType			     interface_type,
-					 GType			     prerequisite_type);
-GType*g_type_interface_prerequisites    (GType                       interface_type,
-					 guint                      *n_prerequisites);
-void     g_type_class_add_private       (gpointer                    g_class,
-                                         gsize                       private_size);
-gpointer g_type_instance_get_private    (GTypeInstance              *instance,
-                                         GType                       private_type);
-
-
-/* --- GType boilerplate --- */
-/* convenience macros for type implementations, which for a type GtkGadget will:
- * - prototype: static void     gtk_gadget_class_init (GtkGadgetClass *klass);
- * - prototype: static void     gtk_gadget_init       (GtkGadget      *self);
- * - define:    static gpointer gtk_gadget_parent_class = NULL;
- *   gtk_gadget_parent_class is initialized prior to calling gtk_gadget_class_init()
- * - implement: GType           gtk_gadget_get_type (void) { ... }
- * - support custom code in gtk_gadget_get_type() after the type is registered.
- *
- * macro arguments: TypeName, type_name, TYPE_PARENT, CODE
- * example: G_DEFINE_TYPE_WITH_CODE (GtkGadget, gtk_gadget, GTK_TYPE_WIDGET,
- *                                   g_print ("GtkGadget-id: %lu\n", g_define_type_id));
- */
-#define G_DEFINE_TYPE(TN, t_n, T_P)			    G_DEFINE_TYPE_EXTENDED (TN, t_n, T_P, 0, {})
-#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()
-#define G_DEFINE_ABSTRACT_TYPE(TN, t_n, T_P)		    G_DEFINE_TYPE_EXTENDED (TN, t_n, T_P, G_TYPE_FLAG_ABSTRACT, {})
-#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()
-#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()
-
-/* convenience macro to ease interface addition in the CODE
- * section of G_DEFINE_TYPE_WITH_CODE() (this macro relies on
- * the g_define_type_id present within G_DEFINE_TYPE_WITH_CODE()).
- * usage example:
- * G_DEFINE_TYPE_WITH_CODE (GtkTreeStore, gtk_tree_store, G_TYPE_OBJECT,
- *                          G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_MODEL,
- *                                                 gtk_tree_store_tree_model_init));
- */
-#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); \
-}
-
-#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 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); \
-} \
-\
-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() */
-
-
-/* --- protected (for fundamental type implementations) --- */
-GTypePlugin*	 g_type_get_plugin		(GType		     type);
-GTypePlugin*	 g_type_interface_get_plugin	(GType		     instance_type,
-						 GType               interface_type);
-GType		 g_type_fundamental_next	(void);
-GType		 g_type_fundamental		(GType		     type_id);
-GTypeInstance*   g_type_create_instance         (GType               type);
-void             g_type_free_instance           (GTypeInstance      *instance);
-
-void		 g_type_add_class_cache_func    (gpointer	     cache_data,
-						 GTypeClassCacheFunc cache_func);
-void		 g_type_remove_class_cache_func (gpointer	     cache_data,
-						 GTypeClassCacheFunc cache_func);
-void             g_type_class_unref_uncached    (gpointer            g_class);
-
-void             g_type_add_interface_check     (gpointer	         check_data,
-						 GTypeInterfaceCheckFunc check_func);
-void             g_type_remove_interface_check  (gpointer	         check_data,
-						 GTypeInterfaceCheckFunc check_func);
-
-GTypeValueTable* g_type_value_table_peek        (GType		     type);
-
-
-/*< private >*/
-gboolean	 g_type_check_instance          (GTypeInstance      *instance) G_GNUC_PURE;
-GTypeInstance*   g_type_check_instance_cast     (GTypeInstance      *instance,
-						 GType               iface_type);
-gboolean         g_type_check_instance_is_a	(GTypeInstance      *instance,
-						 GType               iface_type) G_GNUC_PURE;
-GTypeClass*      g_type_check_class_cast        (GTypeClass         *g_class,
-						 GType               is_a_type);
-gboolean         g_type_check_class_is_a        (GTypeClass         *g_class,
-						 GType               is_a_type) G_GNUC_PURE;
-gboolean	 g_type_check_is_value_type     (GType		     type) G_GNUC_CONST;
-gboolean	 g_type_check_value             (GValue		    *value) G_GNUC_PURE;
-gboolean	 g_type_check_value_holds	(GValue		    *value,
-						 GType		     type) G_GNUC_PURE;
-gboolean         g_type_test_flags              (GType               type,
-						 guint               flags) G_GNUC_CONST;
-
-
-/* --- debugging functions --- */
-G_CONST_RETURN gchar* g_type_name_from_instance	(GTypeInstance	*instance);
-G_CONST_RETURN gchar* g_type_name_from_class	(GTypeClass	*g_class);
-
-
-/* --- internal functions --- */
-G_GNUC_INTERNAL void    g_value_c_init          (void); /* sync with gvalue.c */
-G_GNUC_INTERNAL void    g_value_types_init      (void); /* sync with gvaluetypes.c */
-G_GNUC_INTERNAL void    g_enum_types_init       (void); /* sync with genums.c */
-G_GNUC_INTERNAL void    g_param_type_init       (void); /* sync with gparam.c */
-G_GNUC_INTERNAL void    g_boxed_type_init       (void); /* sync with gboxed.c */
-G_GNUC_INTERNAL void    g_object_type_init      (void); /* sync with gobject.c */
-G_GNUC_INTERNAL void    g_param_spec_types_init (void); /* sync with gparamspecs.c */
-G_GNUC_INTERNAL void    g_value_transforms_init (void); /* sync with gvaluetransform.c */
-G_GNUC_INTERNAL void    g_signal_init           (void); /* sync with gsignal.c */
-
-
-/* --- 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 && __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 && __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 && __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__ */
-#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/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gtypemodule.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gtypemodule.h
deleted file mode 100644
index 46858f59..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gtypemodule.h
+++ /dev/null
@@ -1,135 +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.
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_TYPE_MODULE_H__
-#define __G_TYPE_MODULE_H__
-
-#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))
-
-struct _GTypeModule 
-{
-  GObject parent_instance;
-
-  guint use_count;
-  GSList *type_infos;
-  GSList *interface_infos;
-
-  /*< public >*/
-  gchar *name;
-};
-
-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);
-};
-
-#define G_DEFINE_DYNAMIC_TYPE(TN, t_n, T_P)          G_DEFINE_DYNAMIC_TYPE_EXTENDED (TN, t_n, T_P, 0, {})
-#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 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); \
-} \
-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; \
-  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 ; } \
-}
-
-
-GType    g_type_module_get_type       (void) G_GNUC_CONST;
-gboolean g_type_module_use            (GTypeModule          *module);
-void     g_type_module_unuse          (GTypeModule          *module);
-void     g_type_module_set_name       (GTypeModule          *module,
-                                       const gchar          *name);
-GType    g_type_module_register_type  (GTypeModule          *module,
-                                       GType                 parent_type,
-                                       const gchar          *type_name,
-                                       const GTypeInfo      *type_info,
-                                       GTypeFlags            flags);
-void     g_type_module_add_interface  (GTypeModule          *module,
-                                       GType                 instance_type,
-                                       GType                 interface_type,
-                                       const GInterfaceInfo *interface_info);
-GType    g_type_module_register_enum  (GTypeModule          *module,
-                                       const gchar          *name,
-                                       const GEnumValue     *const_static_values);
-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/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gtypeplugin.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gtypeplugin.h
deleted file mode 100644
index a8e9803d..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gtypeplugin.h
+++ /dev/null
@@ -1,79 +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.
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_TYPE_PLUGIN_H__
-#define __G_TYPE_PLUGIN_H__
-
-#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;
-typedef void  (*GTypePluginUse)			  (GTypePlugin     *plugin);
-typedef void  (*GTypePluginUnuse)		  (GTypePlugin     *plugin);
-typedef void  (*GTypePluginCompleteTypeInfo)	  (GTypePlugin     *plugin,
-						   GType            g_type,
-						   GTypeInfo       *info,
-						   GTypeValueTable *value_table);
-typedef void  (*GTypePluginCompleteInterfaceInfo) (GTypePlugin     *plugin,
-						   GType            instance_type,
-						   GType            interface_type,
-						   GInterfaceInfo  *info);
-struct _GTypePluginClass
-{
-  /*< private >*/
-  GTypeInterface		   base_iface;
-  
-  /*< public >*/
-  GTypePluginUse		   use_plugin;
-  GTypePluginUnuse		   unuse_plugin;
-  GTypePluginCompleteTypeInfo	   complete_type_info;
-  GTypePluginCompleteInterfaceInfo complete_interface_info;
-};
-
-
-/* --- prototypes --- */
-GType	g_type_plugin_get_type			(void)	G_GNUC_CONST;
-void	g_type_plugin_use			(GTypePlugin	 *plugin);
-void	g_type_plugin_unuse			(GTypePlugin	 *plugin);
-void	g_type_plugin_complete_type_info	(GTypePlugin     *plugin,
-						 GType            g_type,
-						 GTypeInfo       *info,
-						 GTypeValueTable *value_table);
-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/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gvalue.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gvalue.h
deleted file mode 100644
index b93e1e9d..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gvalue.h
+++ /dev/null
@@ -1,94 +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
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_VALUE_H__
-#define __G_VALUE_H__
-
-#include	<gobject/gtype.h>
-
-G_BEGIN_DECLS
-
-/* --- type macros --- */
-#define	G_TYPE_IS_VALUE(type)		(g_type_check_is_value_type (type))
-#define	G_IS_VALUE(value)		(G_TYPE_CHECK_VALUE (value))
-#define	G_VALUE_TYPE(value)		(((GValue*) (value))->g_type)
-#define	G_VALUE_TYPE_NAME(value)	(g_type_name (G_VALUE_TYPE (value)))
-#define G_VALUE_HOLDS(value,type)	(G_TYPE_CHECK_VALUE_TYPE ((value), (type)))
-
-
-/* --- typedefs & structures --- */
-typedef void (*GValueTransform) (const GValue *src_value,
-				 GValue       *dest_value);
-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 --- */
-GValue*         g_value_init	   	(GValue       *value,
-					 GType         g_type);
-void            g_value_copy    	(const GValue *src_value,
-					 GValue       *dest_value);
-GValue*         g_value_reset   	(GValue       *value);
-void            g_value_unset   	(GValue       *value);
-void		g_value_set_instance	(GValue	      *value,
-					 gpointer      instance);
-
-
-/* --- private --- */
-gboolean	g_value_fits_pointer	(const GValue *value);
-gpointer	g_value_peek_pointer	(const GValue *value);
-
-
-/* --- implementation details --- */
-gboolean g_value_type_compatible	(GType		 src_type,
-					 GType		 dest_type);
-gboolean g_value_type_transformable	(GType           src_type,
-					 GType           dest_type);
-gboolean g_value_transform		(const GValue   *src_value,
-					 GValue         *dest_value);
-void	g_value_register_transform_func	(GType		 src_type,
-					 GType		 dest_type,
-					 GValueTransform transform_func);
-#define G_VALUE_NOCOPY_CONTENTS		(1 << 27)
-
-
-G_END_DECLS
-
-#endif /* __G_VALUE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gvaluearray.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gvaluearray.h
deleted file mode 100644
index d6897148..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gvaluearray.h
+++ /dev/null
@@ -1,70 +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
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_VALUE_ARRAY_H__
-#define __G_VALUE_ARRAY_H__
-
-#include	<gobject/gvalue.h>
-
-
-G_BEGIN_DECLS
-
-
-/* --- typedefs & structs --- */
-typedef struct _GValueArray GValueArray;
-struct _GValueArray
-{
-  guint   n_values;
-  GValue *values;
-
-  /*< private >*/
-  guint   n_prealloced;
-};
-
-
-/* --- prototypes --- */
-GValue*		g_value_array_get_nth	     (GValueArray	*value_array,
-					      guint		 index_);
-GValueArray*	g_value_array_new	     (guint		 n_prealloced);
-void		g_value_array_free	     (GValueArray	*value_array);
-GValueArray*	g_value_array_copy	     (const GValueArray *value_array);
-GValueArray*	g_value_array_prepend	     (GValueArray	*value_array,
-					      const GValue	*value);
-GValueArray*	g_value_array_append	     (GValueArray	*value_array,
-					      const GValue	*value);
-GValueArray*	g_value_array_insert	     (GValueArray	*value_array,
-					      guint		 index_,
-					      const GValue	*value);
-GValueArray*	g_value_array_remove	     (GValueArray	*value_array,
-					      guint		 index_);
-GValueArray*	g_value_array_sort	     (GValueArray	*value_array,
-					      GCompareFunc	 compare_func);
-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/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gvaluecollector.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gvaluecollector.h
deleted file mode 100644
index e9379968..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gvaluecollector.h
+++ /dev/null
@@ -1,160 +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
- */
-#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 actuall values collected
- */
-union _GTypeCValue
-{
-  gint     v_int;
-  glong    v_long;
-  gint64   v_int64;
-  gdouble  v_double;
-  gpointer v_pointer;
-};
-
-
-/* G_VALUE_COLLECT() 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.
- * value is supposed to be initialized according to the value
- * type to be collected.
- * var_args is the va_list variable and may be evaluated multiple times.
- * __error is a gchar** variable that will be modified to hold a g_new()
- * allocated error messages if something fails.
- */
-#define G_VALUE_COLLECT(value, var_args, flags, __error)				\
-G_STMT_START {										\
-  GValue *_value = (value);								\
-  guint _flags = (flags);								\
-  GType _value_type = G_VALUE_TYPE (_value);						\
-  GTypeValueTable *_vtable = g_type_value_table_peek (_value_type);			\
-  gchar *_collect_format = _vtable->collect_format;					\
-  GTypeCValue _cvalues[G_VALUE_COLLECT_FORMAT_MAX_LENGTH] = { { 0, }, };		\
-  guint _n_values = 0;									\
-                                                                                        \
-  if (_vtable->value_free)								\
-    _vtable->value_free (_value);							\
-  _value->g_type = _value_type;		/* value_meminit() from gvalue.c */		\
-  memset (_value->data, 0, sizeof (_value->data));					\
-  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) = _vtable->collect_value (_value,						\
-				       _n_values,					\
-				       _cvalues,					\
-				       _flags);						\
-} G_STMT_END
-
-
-/* G_VALUE_LCOPY() 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);			\
-  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
-
-
-#define	G_VALUE_COLLECT_FORMAT_MAX_LENGTH	(8)
-
-G_END_DECLS
-
-#endif /* __G_VALUE_COLLECTOR_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gvaluetypes.h b/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gvaluetypes.h
deleted file mode 100644
index 2931cdaa..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/glib-2.0/gobject/gvaluetypes.h
+++ /dev/null
@@ -1,120 +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
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_VALUETYPES_H__
-#define __G_VALUETYPES_H__
-
-#include	<gobject/gvalue.h>
-
-G_BEGIN_DECLS
-
-/* --- type macros --- */
-#define G_VALUE_HOLDS_CHAR(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_CHAR))
-#define G_VALUE_HOLDS_UCHAR(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_UCHAR))
-#define G_VALUE_HOLDS_BOOLEAN(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_BOOLEAN))
-#define G_VALUE_HOLDS_INT(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_INT))
-#define G_VALUE_HOLDS_UINT(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_UINT))
-#define G_VALUE_HOLDS_LONG(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_LONG))
-#define G_VALUE_HOLDS_ULONG(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_ULONG))
-#define G_VALUE_HOLDS_INT64(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_INT64))
-#define G_VALUE_HOLDS_UINT64(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_UINT64))
-#define G_VALUE_HOLDS_FLOAT(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_FLOAT))
-#define G_VALUE_HOLDS_DOUBLE(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_DOUBLE))
-#define G_VALUE_HOLDS_STRING(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_STRING))
-#define G_VALUE_HOLDS_POINTER(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_POINTER))
-#define	G_TYPE_GTYPE			 (g_gtype_get_type())
-#define G_VALUE_HOLDS_GTYPE(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_GTYPE))
-
-
-/* --- prototypes --- */
-void		      g_value_set_char		(GValue	      *value,
-						 gchar	       v_char);
-gchar		      g_value_get_char		(const GValue *value);
-void		      g_value_set_uchar		(GValue	      *value,
-						 guchar	       v_uchar);
-guchar		      g_value_get_uchar		(const GValue *value);
-void		      g_value_set_boolean	(GValue	      *value,
-						 gboolean      v_boolean);
-gboolean	      g_value_get_boolean	(const GValue *value);
-void		      g_value_set_int		(GValue	      *value,
-						 gint	       v_int);
-gint		      g_value_get_int		(const GValue *value);
-void		      g_value_set_uint		(GValue	      *value,
-						 guint	       v_uint);
-guint		      g_value_get_uint		(const GValue *value);
-void		      g_value_set_long		(GValue	      *value,
-						 glong	       v_long);
-glong		      g_value_get_long		(const GValue *value);
-void		      g_value_set_ulong		(GValue	      *value,
-						 gulong	       v_ulong);
-gulong		      g_value_get_ulong		(const GValue *value);
-void		      g_value_set_int64		(GValue	      *value,
-						 gint64	       v_int64);
-gint64		      g_value_get_int64		(const GValue *value);
-void		      g_value_set_uint64	(GValue	      *value,
-						 guint64      v_uint64);
-guint64		      g_value_get_uint64	(const GValue *value);
-void		      g_value_set_float		(GValue	      *value,
-						 gfloat	       v_float);
-gfloat		      g_value_get_float		(const GValue *value);
-void		      g_value_set_double	(GValue	      *value,
-						 gdouble       v_double);
-gdouble		      g_value_get_double	(const GValue *value);
-void		      g_value_set_string	(GValue	      *value,
-						 const gchar  *v_string);
-void		      g_value_set_static_string (GValue	      *value,
-						 const gchar  *v_string);
-G_CONST_RETURN gchar* g_value_get_string	(const GValue *value);
-gchar*		      g_value_dup_string	(const GValue *value);
-void		      g_value_set_pointer	(GValue	      *value,
-						 gpointer      v_pointer);
-gpointer	      g_value_get_pointer	(const GValue *value);
-GType		      g_gtype_get_type		(void);
-void		      g_value_set_gtype	        (GValue	      *value,
-						 GType         v_gtype);
-GType	              g_value_get_gtype	        (const GValue *value);
-
-
-/* Convenience for registering new pointer types */
-GType                 g_pointer_type_register_static (const gchar *name);
-
-/* debugging aid, describe value contents as string */
-gchar*                g_strdup_value_contents   (const GValue *value);
-
-
-void g_value_take_string		        (GValue		   *value,
-						 gchar		   *v_string);
-#ifndef G_DISABLE_DEPRECATED
-void g_value_set_string_take_ownership		(GValue		   *value,
-						 gchar		   *v_string);
-#endif
-
-
-/* humpf, need a C representable type name for G_TYPE_STRING */
-typedef gchar* gchararray;
-
-
-G_END_DECLS
-
-#endif /* __G_VALUETYPES_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
deleted file mode 100644
index 04f573e7..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* GdkPixbuf library - Xlib header file
- *
- * Authors: John Harper <john@dcs.warwick.ac.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 GDK_PIXBUF_XLIB_H
-#define GDK_PIXBUF_XLIB_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h>
-#include <X11/Xlib.h>
-
-
-
-/* init */
-
-void gdk_pixbuf_xlib_init (Display *display, int screen_num);
-
-void gdk_pixbuf_xlib_init_with_depth (Display *display, int screen_num,
-				      int prefDepth);
-
-
-
-/* render */
-
-void gdk_pixbuf_xlib_render_threshold_alpha (GdkPixbuf *pixbuf, Pixmap bitmap,
-					     int src_x, int src_y,
-					     int dest_x, int dest_y,
-					     int width, int height,
-					     int alpha_threshold);
-
-void gdk_pixbuf_xlib_render_to_drawable (GdkPixbuf *pixbuf,
-					 Drawable drawable, GC gc,
-					 int src_x, int src_y,
-					 int dest_x, int dest_y,
-					 int width, int height,
-					 XlibRgbDither dither,
-					 int x_dither, int y_dither);
-
-
-void gdk_pixbuf_xlib_render_to_drawable_alpha (GdkPixbuf *pixbuf,
-					       Drawable drawable,
-					       int src_x, int src_y,
-					       int dest_x, int dest_y,
-					       int width, int height,
-					       GdkPixbufAlphaMode alpha_mode,
-					       int alpha_threshold,
-					       XlibRgbDither dither,
-					       int x_dither, int y_dither);
-
-void gdk_pixbuf_xlib_render_pixmap_and_mask (GdkPixbuf *pixbuf,
-					     Pixmap *pixmap_return,
-					     Pixmap *mask_return,
-					     int alpha_threshold);
-
-
-
-/* drawable */
-
-GdkPixbuf *gdk_pixbuf_xlib_get_from_drawable (GdkPixbuf *dest,
-					      Drawable src,
-					      Colormap cmap, Visual *visual,
-					      int src_x, int src_y,
-					      int dest_x, int dest_y,
-					      int width, int height);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* GDK_PIXBUF_XLIB_H */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
deleted file mode 100644
index c94e746f..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "MPL"); you may not use this file except in
- * compliance with the MPL.  You may obtain a copy of the MPL at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the MPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the MPL
- * for the specific language governing rights and limitations under the
- * MPL.
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU Library General Public License (the "LGPL"), in
- * which case the provisions of the LGPL are applicable instead of
- * those above.  If you wish to allow use of your version of this file
- * only under the terms of the LGPL and not to allow others to use
- * your version of this file under the MPL, indicate your decision by
- * deleting the provisions above and replace them with the notice and
- * other provisions required by the LGPL.  If you do not delete the
- * provisions above, a recipient may use your version of this file
- * under either the MPL or the LGPL.
- */
-
-/*
- * This code is derived from GdkRgb.
- * For more information on GdkRgb, see http://www.levien.com/gdkrgb/
- * Raph Levien <raph@acm.org>
- */
-
-/* Ported by Christopher Blizzard to Xlib.  With permission from the
- * original authors of this file, the contents of this file are also
- * redistributable under the terms of the Mozilla Public license.  For
- * information about the Mozilla Public License, please see the
- * license information at http://www.mozilla.org/MPL/
- */
-
-/* This code is copyright the following authors:
- * Raph Levien          <raph@acm.org>
- * Manish Singh         <manish@gtk.org>
- * Tim Janik            <timj@gtk.org>
- * Peter Mattis         <petm@xcf.berkeley.edu>
- * Spencer Kimball      <spencer@xcf.berkeley.edu>
- * Josh MacDonald       <jmacd@xcf.berkeley.edu>
- * Christopher Blizzard <blizzard@redhat.com>
- * Owen Taylor          <otaylor@redhat.com>
- * Shawn T. Amundson    <amundson@gtk.org>
-*/
-
-
-#ifndef __XLIB_RGB_H__
-#define __XLIB_RGB_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-
-#include <glib.h>
-
-typedef struct _XlibRgbCmap XlibRgbCmap;
-
-struct _XlibRgbCmap {
-  unsigned int colors[256];
-  unsigned char lut[256]; /* for 8-bit modes */
-};
-
-void
-xlib_rgb_init (Display *display, Screen *screen);
-void
-xlib_rgb_init_with_depth (Display *display, Screen *screen, int prefDepth);
-
-unsigned long
-xlib_rgb_xpixel_from_rgb (guint32 rgb);
-
-void
-xlib_rgb_gc_set_foreground (GC gc, guint32 rgb);
-
-void
-xlib_rgb_gc_set_background (GC gc, guint32 rgb);
-
-typedef enum
-{
-  XLIB_RGB_DITHER_NONE,
-  XLIB_RGB_DITHER_NORMAL,
-  XLIB_RGB_DITHER_MAX
-} XlibRgbDither;
-
-void
-xlib_draw_rgb_image (Drawable drawable,
-		     GC gc,
-		     int x,
-		     int y,
-		     int width,
-		     int height,
-		     XlibRgbDither dith,
-		     unsigned char *rgb_buf,
-		     int rowstride);
-
-void
-xlib_draw_rgb_image_dithalign (Drawable drawable,
-			       GC gc,
-			       int x,
-			       int y,
-			       int width,
-			       int height,
-			       XlibRgbDither dith,
-			       unsigned char *rgb_buf,
-			       int rowstride,
-			       int xdith,
-			       int ydith);
-
-void
-xlib_draw_rgb_32_image (Drawable drawable,
-			GC gc,
-			int x,
-			int y,
-			int width,
-			int height,
-			XlibRgbDither dith,
-			unsigned char *buf,
-			int rowstride);
-
-void
-xlib_draw_gray_image (Drawable drawable,
-		      GC gc,
-		      int x,
-		      int y,
-		      int width,
-		      int height,
-		      XlibRgbDither dith,
-		      unsigned char *buf,
-		      int rowstride);
-
-XlibRgbCmap *
-xlib_rgb_cmap_new (guint32 *colors, int n_colors);
-
-void
-xlib_rgb_cmap_free (XlibRgbCmap *cmap);
-
-void
-xlib_draw_indexed_image (Drawable drawable,
-                         GC gc,
-                         int x,
-                         int y,
-                         int width,
-                         int height,
-                         XlibRgbDither dith,
-                         unsigned char *buf,
-                         int rowstride,
-                         XlibRgbCmap *cmap);
-
-/* Below are some functions which are primarily useful for debugging
-   and experimentation. */
-Bool
-xlib_rgb_ditherable (void);
-
-void
-xlib_rgb_set_verbose (Bool verbose);
-
-/* experimental colormap stuff */
-void
-xlib_rgb_set_install (Bool install);
-
-void
-xlib_rgb_set_min_colors (int min_colors);
-
-Colormap
-xlib_rgb_get_cmap (void);
-
-Visual *
-xlib_rgb_get_visual (void);
-
-XVisualInfo *
-xlib_rgb_get_visual_info (void);
-
-int
-xlib_rgb_get_depth (void);
-
-Display *
-xlib_rgb_get_display (void);
-
-Screen *
-xlib_rgb_get_screen (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __XLIB_RGB_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h
deleted file mode 100644
index 43347de6..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
-/* GdkPixbuf library - Animation support
- *
- * Copyright (C) 1999 The Free Software Foundation
- *
- * Authors: Mark Crichton <crichton@gimp.org>
- *          Miguel de Icaza <miguel@gnu.org>
- *          Federico Mena-Quintero <federico@gimp.org>
- *          Havoc Pennington <hp@redhat.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 GDK_PIXBUF_ANIMATION_H
-#define GDK_PIXBUF_ANIMATION_H
-
-#include <glib.h>
-#include <glib-object.h>
-#include <gdk-pixbuf/gdk-pixbuf-core.h>
-
-G_BEGIN_DECLS
-
-/* Animation support */
-
-typedef struct _GdkPixbufAnimation GdkPixbufAnimation;
-typedef struct _GdkPixbufAnimationIter GdkPixbufAnimationIter;
-
-#define GDK_TYPE_PIXBUF_ANIMATION              (gdk_pixbuf_animation_get_type ())
-#define GDK_PIXBUF_ANIMATION(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_PIXBUF_ANIMATION, GdkPixbufAnimation))
-#define GDK_IS_PIXBUF_ANIMATION(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_PIXBUF_ANIMATION))
-
-#define GDK_TYPE_PIXBUF_ANIMATION_ITER              (gdk_pixbuf_animation_iter_get_type ())
-#define GDK_PIXBUF_ANIMATION_ITER(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_PIXBUF_ANIMATION_ITER, GdkPixbufAnimationIter))
-#define GDK_IS_PIXBUF_ANIMATION_ITER(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_PIXBUF_ANIMATION_ITER))
-
-GType               gdk_pixbuf_animation_get_type        (void) G_GNUC_CONST;
-
-#ifdef G_OS_WIN32
-#define gdk_pixbuf_animation_new_from_file gdk_pixbuf_animation_new_from_file_utf8
-#endif
-
-GdkPixbufAnimation *gdk_pixbuf_animation_new_from_file   (const char         *filename,
-                                                          GError            **error);
-
-#ifndef GDK_PIXBUF_DISABLE_DEPRECATED
-GdkPixbufAnimation *gdk_pixbuf_animation_ref             (GdkPixbufAnimation *animation);
-void                gdk_pixbuf_animation_unref           (GdkPixbufAnimation *animation);
-#endif
-
-int                 gdk_pixbuf_animation_get_width       (GdkPixbufAnimation *animation);
-int                 gdk_pixbuf_animation_get_height      (GdkPixbufAnimation *animation);
-gboolean            gdk_pixbuf_animation_is_static_image  (GdkPixbufAnimation *animation);
-GdkPixbuf          *gdk_pixbuf_animation_get_static_image (GdkPixbufAnimation *animation);
-
-GdkPixbufAnimationIter *gdk_pixbuf_animation_get_iter                        (GdkPixbufAnimation     *animation,
-                                                                              const GTimeVal         *start_time);
-GType                   gdk_pixbuf_animation_iter_get_type                   (void) G_GNUC_CONST;
-int                     gdk_pixbuf_animation_iter_get_delay_time             (GdkPixbufAnimationIter *iter);
-GdkPixbuf              *gdk_pixbuf_animation_iter_get_pixbuf                 (GdkPixbufAnimationIter *iter);
-gboolean                gdk_pixbuf_animation_iter_on_currently_loading_frame (GdkPixbufAnimationIter *iter);
-gboolean                gdk_pixbuf_animation_iter_advance                    (GdkPixbufAnimationIter *iter,
-                                                                              const GTimeVal         *current_time);
-
-
-#ifdef GDK_PIXBUF_ENABLE_BACKEND
-
-
-
-typedef struct _GdkPixbufAnimationClass GdkPixbufAnimationClass;
-
-#define GDK_PIXBUF_ANIMATION_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_PIXBUF_ANIMATION, GdkPixbufAnimationClass))
-#define GDK_IS_PIXBUF_ANIMATION_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_PIXBUF_ANIMATION))
-#define GDK_PIXBUF_ANIMATION_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_PIXBUF_ANIMATION, GdkPixbufAnimationClass))
-
-/* Private part of the GdkPixbufAnimation structure */
-struct _GdkPixbufAnimation {
-        GObject parent_instance;
-
-};
-
-struct _GdkPixbufAnimationClass {
-        GObjectClass parent_class;
-
-        /*< public >*/
-
-        gboolean                (*is_static_image)  (GdkPixbufAnimation *anim);
-
-        GdkPixbuf*              (*get_static_image) (GdkPixbufAnimation *anim);
-        
-        void                    (*get_size) (GdkPixbufAnimation *anim,
-                                             int                 *width,
-                                             int                 *height);
-        
-        GdkPixbufAnimationIter* (*get_iter) (GdkPixbufAnimation *anim,
-                                             const GTimeVal     *start_time);
-
-};
-
-
-
-typedef struct _GdkPixbufAnimationIterClass GdkPixbufAnimationIterClass;
-
-#define GDK_PIXBUF_ANIMATION_ITER_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_PIXBUF_ANIMATION_ITER, GdkPixbufAnimationIterClass))
-#define GDK_IS_PIXBUF_ANIMATION_ITER_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_PIXBUF_ANIMATION_ITER))
-#define GDK_PIXBUF_ANIMATION_ITER_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_PIXBUF_ANIMATION_ITER, GdkPixbufAnimationIterClass))
-
-struct _GdkPixbufAnimationIter {
-        GObject parent_instance;
-
-};
-
-struct _GdkPixbufAnimationIterClass {
-        GObjectClass parent_class;
-
-        /*< public >*/
-
-        int        (*get_delay_time)   (GdkPixbufAnimationIter *iter);
-
-        GdkPixbuf* (*get_pixbuf)       (GdkPixbufAnimationIter *iter);
-
-        gboolean   (*on_currently_loading_frame) (GdkPixbufAnimationIter *iter);
-
-        gboolean   (*advance)          (GdkPixbufAnimationIter *iter,
-                                        const GTimeVal         *current_time);
-};
-      
-
-GdkPixbufAnimation* gdk_pixbuf_non_anim_new (GdkPixbuf *pixbuf);
-
-#endif /* GDK_PIXBUF_ENABLE_BACKEND */
-
-G_END_DECLS
-
-#endif /* GDK_PIXBUF_ANIMATION_H */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-core.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-core.h
deleted file mode 100644
index 4ae58952..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-core.h
+++ /dev/null
@@ -1,244 +0,0 @@
-/* GdkPixbuf library - GdkPixbuf data structure
- *
- * Copyright (C) 2003 The Free Software Foundation
- *
- * Authors: Mark Crichton <crichton@gimp.org>
- *          Miguel de Icaza <miguel@gnu.org>
- *          Federico Mena-Quintero <federico@gimp.org>
- *          Havoc Pennington <hp@redhat.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 GDK_PIXBUF_CORE_H
-#define GDK_PIXBUF_CORE_H
-
-#include <glib.h>
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/* Alpha compositing mode */
-typedef enum
-{
-        GDK_PIXBUF_ALPHA_BILEVEL,
-        GDK_PIXBUF_ALPHA_FULL
-} GdkPixbufAlphaMode;
-
-/* Color spaces; right now only RGB is supported.
- * Note that these values are encoded in inline pixbufs
- * as ints, so don't reorder them
- */
-typedef enum {
-	GDK_COLORSPACE_RGB
-} GdkColorspace;
-
-/* All of these are opaque structures */
-typedef struct _GdkPixbuf GdkPixbuf;
-
-#define GDK_TYPE_PIXBUF              (gdk_pixbuf_get_type ())
-#define GDK_PIXBUF(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_PIXBUF, GdkPixbuf))
-#define GDK_IS_PIXBUF(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_PIXBUF))
-
-
-/* Handler that must free the pixel array */
-typedef void (* GdkPixbufDestroyNotify) (guchar *pixels, gpointer data);
-
-#define GDK_PIXBUF_ERROR gdk_pixbuf_error_quark ()
-
-typedef enum {
-        /* image data hosed */
-        GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
-        /* no mem to load image */
-        GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
-        /* bad option passed to save routine */
-        GDK_PIXBUF_ERROR_BAD_OPTION,
-        /* unsupported image type (sort of an ENOSYS) */
-        GDK_PIXBUF_ERROR_UNKNOWN_TYPE,
-        /* unsupported operation (load, save) for image type */
-        GDK_PIXBUF_ERROR_UNSUPPORTED_OPERATION,
-        GDK_PIXBUF_ERROR_FAILED
-} GdkPixbufError;
-
-GQuark gdk_pixbuf_error_quark (void);
-
-
-
-GType gdk_pixbuf_get_type (void) G_GNUC_CONST;
-
-/* Reference counting */
-
-#ifndef GDK_PIXBUF_DISABLE_DEPRECATED
-GdkPixbuf *gdk_pixbuf_ref      (GdkPixbuf *pixbuf);
-void       gdk_pixbuf_unref    (GdkPixbuf *pixbuf);
-#endif
-
-/* GdkPixbuf accessors */
-
-GdkColorspace gdk_pixbuf_get_colorspace      (const GdkPixbuf *pixbuf);
-int           gdk_pixbuf_get_n_channels      (const GdkPixbuf *pixbuf);
-gboolean      gdk_pixbuf_get_has_alpha       (const GdkPixbuf *pixbuf);
-int           gdk_pixbuf_get_bits_per_sample (const GdkPixbuf *pixbuf);
-guchar       *gdk_pixbuf_get_pixels          (const GdkPixbuf *pixbuf);
-int           gdk_pixbuf_get_width           (const GdkPixbuf *pixbuf);
-int           gdk_pixbuf_get_height          (const GdkPixbuf *pixbuf);
-int           gdk_pixbuf_get_rowstride       (const GdkPixbuf *pixbuf);
-
-
-
-/* Create a blank pixbuf with an optimal rowstride and a new buffer */
-GdkPixbuf *gdk_pixbuf_new (GdkColorspace colorspace, gboolean has_alpha, int bits_per_sample,
-			   int width, int height);
-
-/* Copy a pixbuf */
-
-GdkPixbuf *gdk_pixbuf_copy (const GdkPixbuf *pixbuf);
-
-/* Create a pixbuf which points to the pixels of another pixbuf */
-GdkPixbuf *gdk_pixbuf_new_subpixbuf (GdkPixbuf *src_pixbuf,
-                                     int        src_x,
-                                     int        src_y,
-                                     int        width,
-                                     int        height);
-
-/* Simple loading */
-
-#ifdef G_OS_WIN32
-/* DLL ABI stability hack. */
-#define gdk_pixbuf_new_from_file gdk_pixbuf_new_from_file_utf8
-#define gdk_pixbuf_new_from_file_at_size gdk_pixbuf_new_from_file_at_size_utf8
-#define gdk_pixbuf_new_from_file_at_scale gdk_pixbuf_new_from_file_at_scale_utf8
-#endif
-
-GdkPixbuf *gdk_pixbuf_new_from_file (const char *filename,
-                                     GError    **error);
-GdkPixbuf *gdk_pixbuf_new_from_file_at_size (const char *filename,
-					     int         width, 
-					     int         height,
-					     GError    **error);
-GdkPixbuf *gdk_pixbuf_new_from_file_at_scale (const char *filename,
-					      int         width, 
-					      int         height,
-					      gboolean    preserve_aspect_ratio,
-					      GError    **error);
-
-GdkPixbuf *gdk_pixbuf_new_from_data (const guchar *data,
-				     GdkColorspace colorspace,
-				     gboolean has_alpha,
-				     int bits_per_sample,
-				     int width, int height,
-				     int rowstride,
-				     GdkPixbufDestroyNotify destroy_fn,
-				     gpointer destroy_fn_data);
-
-GdkPixbuf *gdk_pixbuf_new_from_xpm_data (const char **data);
-GdkPixbuf* gdk_pixbuf_new_from_inline	(gint          data_length,
-					 const guint8 *data,
-					 gboolean      copy_pixels,
-					 GError      **error);
-       
-/* Mutations */
-void       gdk_pixbuf_fill              (GdkPixbuf    *pixbuf,
-                                         guint32       pixel);
-
-/* Saving */
-
-#ifdef G_OS_WIN32
-/* DLL ABI stability hack. */
-#define gdk_pixbuf_save gdk_pixbuf_save_utf8
-#define gdk_pixbuf_savev gdk_pixbuf_savev_utf8
-#endif
-
-gboolean gdk_pixbuf_save           (GdkPixbuf  *pixbuf, 
-                                    const char *filename, 
-                                    const char *type, 
-                                    GError    **error,
-                                    ...) G_GNUC_NULL_TERMINATED;
-
-gboolean gdk_pixbuf_savev          (GdkPixbuf  *pixbuf, 
-                                    const char *filename, 
-                                    const char *type,
-                                    char      **option_keys,
-                                    char      **option_values,
-                                    GError    **error);
-
-/* Saving to a callback function */
-
-typedef gboolean (*GdkPixbufSaveFunc)   (const gchar *buf,
-					 gsize count,
-					 GError **error,
-					 gpointer data);
-
-gboolean gdk_pixbuf_save_to_callback    (GdkPixbuf  *pixbuf,
-					 GdkPixbufSaveFunc save_func,
-					 gpointer user_data,
-					 const char *type, 
-					 GError    **error,
-					 ...) G_GNUC_NULL_TERMINATED;
-
-gboolean gdk_pixbuf_save_to_callbackv   (GdkPixbuf  *pixbuf, 
-					 GdkPixbufSaveFunc save_func,
-					 gpointer user_data,
-					 const char *type,
-					 char      **option_keys,
-					 char      **option_values,
-					 GError    **error);
-
-/* Saving into a newly allocated char array */
-
-gboolean gdk_pixbuf_save_to_buffer      (GdkPixbuf  *pixbuf,
-					 gchar     **buffer,
-					 gsize      *buffer_size,
-					 const char *type, 
-					 GError    **error,
-					 ...) G_GNUC_NULL_TERMINATED;
-
-gboolean gdk_pixbuf_save_to_bufferv     (GdkPixbuf  *pixbuf,
-					 gchar     **buffer,
-					 gsize      *buffer_size,
-					 const char *type, 
-					 char      **option_keys,
-					 char      **option_values,
-					 GError    **error);
-
-/* Adding an alpha channel */
-GdkPixbuf *gdk_pixbuf_add_alpha (const GdkPixbuf *pixbuf, gboolean substitute_color,
-				 guchar r, guchar g, guchar b);
-
-/* Copy an area of a pixbuf onto another one */
-void gdk_pixbuf_copy_area (const GdkPixbuf *src_pixbuf,
-			   int src_x, int src_y,
-			   int width, int height,
-			   GdkPixbuf *dest_pixbuf,
-			   int dest_x, int dest_y);
-
-/* Brighten/darken and optionally make it pixelated-looking */
-void gdk_pixbuf_saturate_and_pixelate (const GdkPixbuf *src,
-                                       GdkPixbuf       *dest,
-                                       gfloat           saturation,
-                                       gboolean         pixelate);
-
-/* Transform an image to agree with its embedded orientation option / tag */
-GdkPixbuf *gdk_pixbuf_apply_embedded_orientation (GdkPixbuf *src);
-
-G_CONST_RETURN gchar * gdk_pixbuf_get_option (GdkPixbuf   *pixbuf,
-                                              const gchar *key);
-
-
-G_END_DECLS
-
-
-#endif /* GDK_PIXBUF_CORE_H */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h
deleted file mode 100644
index f2199cc3..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-/* Generated data (by glib-mkenums) */
-
-#ifndef __GDK_PIXBUF_ENUM_TYPES_H__
-#define __GDK_PIXBUF_ENUM_TYPES_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-/* enumerations from "gdk-pixbuf-core.h" */
-GType gdk_pixbuf_alpha_mode_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_PIXBUF_ALPHA_MODE (gdk_pixbuf_alpha_mode_get_type())
-GType gdk_colorspace_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_COLORSPACE (gdk_colorspace_get_type())
-GType gdk_pixbuf_error_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_PIXBUF_ERROR (gdk_pixbuf_error_get_type())
-/* enumerations from "gdk-pixbuf-transform.h" */
-GType gdk_interp_type_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_INTERP_TYPE (gdk_interp_type_get_type())
-GType gdk_pixbuf_rotation_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_PIXBUF_ROTATION (gdk_pixbuf_rotation_get_type())
-G_END_DECLS
-
-#endif /* __GDK_PIXBUF_ENUM_TYPES_H__ */
-
-/* Generated data ends here */
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h
deleted file mode 100644
index 794ba221..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef GDK_PIXBUF_FEATURES_H
-#define GDK_PIXBUF_FEATURES_H 1
-
-#define GDK_PIXBUF_MAJOR (2)
-#define GDK_PIXBUF_MINOR (12)
-#define GDK_PIXBUF_MICRO (12)
-#define GDK_PIXBUF_VERSION "2.12.12"
-
-/* We prefix variable declarations so they can
- * properly get exported/imported from Windows DLLs.
- */
-#ifndef GDK_PIXBUF_VAR
-#  ifdef G_PLATFORM_WIN32
-#    ifdef GDK_PIXBUF_STATIC_COMPILATION
-#      define GDK_PIXBUF_VAR extern
-#    else /* !GDK_PIXBUF_STATIC_COMPILATION */
-#      ifdef GDK_PIXBUF_COMPILATION
-#        ifdef DLL_EXPORT
-#          define GDK_PIXBUF_VAR __declspec(dllexport)
-#        else /* !DLL_EXPORT */
-#          define GDK_PIXBUF_VAR extern
-#        endif /* !DLL_EXPORT */
-#      else /* !GDK_PIXBUF_COMPILATION */
-#        define GDK_PIXBUF_VAR extern __declspec(dllimport)
-#      endif /* !GDK_PIXBUF_COMPILATION */
-#    endif /* !GDK_PIXBUF_STATIC_COMPILATION */
-#  else /* !G_PLATFORM_WIN32 */
-#    ifndef GDK_PIXBUF_COMPILATION
-#      define GDK_PIXBUF_VAR extern
-#    else
-#      define GDK_PIXBUF_VAR
-#    endif /* !GDK_PIXBUF_COMPILATION */
-#  endif /* !G_PLATFORM_WIN32 */
-#endif /* GDK_PIXBUF_VAR */
-
-GDK_PIXBUF_VAR const guint gdk_pixbuf_major_version;
-GDK_PIXBUF_VAR const guint gdk_pixbuf_minor_version;
-GDK_PIXBUF_VAR const guint gdk_pixbuf_micro_version;
-GDK_PIXBUF_VAR const char *gdk_pixbuf_version;
-
-#endif
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h
deleted file mode 100644
index 3fe9226c..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/* GdkPixbuf library - Io handling.  This is an internal header for 
- * GdkPixbuf. You should never use it unless you are doing development for 
- * GdkPixbuf itself.
- *
- * Copyright (C) 1999 The Free Software Foundation
- *
- * Authors: Mark Crichton <crichton@gimp.org>
- *          Miguel de Icaza <miguel@gnu.org>
- *          Federico Mena-Quintero <federico@gimp.org>
- *          Jonathan Blandford <jrb@redhat.com>
- *          Michael Fulbright <drmike@redhat.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 GDK_PIXBUF_IO_H
-#define GDK_PIXBUF_IO_H
-
-#include <stdio.h>
-#include <glib.h>
-#include <gmodule.h>
-#include <gdk-pixbuf/gdk-pixbuf-core.h>
-#include <gdk-pixbuf/gdk-pixbuf-animation.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GdkPixbufFormat GdkPixbufFormat;
- 
-GSList    *gdk_pixbuf_get_formats            (void);
-gchar     *gdk_pixbuf_format_get_name        (GdkPixbufFormat *format);
-gchar     *gdk_pixbuf_format_get_description (GdkPixbufFormat *format);
-gchar    **gdk_pixbuf_format_get_mime_types  (GdkPixbufFormat *format);
-gchar    **gdk_pixbuf_format_get_extensions  (GdkPixbufFormat *format);
-gboolean   gdk_pixbuf_format_is_writable     (GdkPixbufFormat *format);
-gboolean   gdk_pixbuf_format_is_scalable     (GdkPixbufFormat *format);
-gboolean   gdk_pixbuf_format_is_disabled     (GdkPixbufFormat *format);
-void       gdk_pixbuf_format_set_disabled    (GdkPixbufFormat *format,
-					      gboolean         disabled);
-gchar     *gdk_pixbuf_format_get_license     (GdkPixbufFormat *format);
-
-GdkPixbufFormat *gdk_pixbuf_get_file_info    (const gchar     *filename,
-					      gint            *width, 
-					      gint            *height);
-
-#ifdef GDK_PIXBUF_ENABLE_BACKEND
-
-
-
-typedef void (* GdkPixbufModuleSizeFunc)           (gint *width, 
-						    gint *height, 
-						    gpointer user_data);
-
-typedef void (* GdkPixbufModulePreparedFunc) (GdkPixbuf          *pixbuf,
-					      GdkPixbufAnimation *anim,
-					      gpointer            user_data);
-typedef void (* GdkPixbufModuleUpdatedFunc)  (GdkPixbuf *pixbuf,
-					      int        x,
-					      int        y,
-					      int        width,
-					      int        height,
-					      gpointer   user_data);
-
-typedef struct _GdkPixbufModulePattern GdkPixbufModulePattern;
-struct _GdkPixbufModulePattern {
-	char *prefix;
-	char *mask;
-	int relevance;
-};
-
-typedef struct _GdkPixbufModule GdkPixbufModule;
-struct _GdkPixbufModule {
-	char *module_name;
-	char *module_path;
-	GModule *module;
-	GdkPixbufFormat *info;
-	
-        GdkPixbuf *(* load) (FILE    *f,
-                             GError **error);
-        GdkPixbuf *(* load_xpm_data) (const char **data);
-
-        /* Incremental loading */
-
-        gpointer (* begin_load)     (GdkPixbufModuleSizeFunc size_func,
-                                     GdkPixbufModulePreparedFunc prepare_func,
-                                     GdkPixbufModuleUpdatedFunc update_func,
-                                     gpointer user_data,
-                                     GError **error);
-        gboolean (* stop_load)      (gpointer context,
-                                     GError **error);
-        gboolean (* load_increment) (gpointer      context,
-                                     const guchar *buf,
-                                     guint         size,
-                                     GError      **error);
-
-	/* Animation loading */
-	GdkPixbufAnimation *(* load_animation) (FILE    *f,
-                                                GError **error);
-
-        /* Saving */
-        gboolean (* save) (FILE      *f,
-                           GdkPixbuf *pixbuf,
-                           gchar    **param_keys,
-                           gchar    **param_values,
-                           GError   **error);
-
-        gboolean (*save_to_callback) (GdkPixbufSaveFunc save_func,
-				      gpointer user_data,
-				      GdkPixbuf *pixbuf,
-				      gchar **option_keys,
-				      gchar **option_values,
-				      GError **error);
-  
-  /*< private >*/
-	void (*_reserved1) (void); 
-	void (*_reserved2) (void); 
-	void (*_reserved3) (void); 
-	void (*_reserved4) (void); 
-	void (*_reserved5) (void); 
-
-};
-
-typedef void (* GdkPixbufModuleFillVtableFunc) (GdkPixbufModule *module);
-typedef void (* GdkPixbufModuleFillInfoFunc) (GdkPixbufFormat *info);
-
-/*  key/value pairs that can be attached by the pixbuf loader  */
-
-gboolean gdk_pixbuf_set_option  (GdkPixbuf   *pixbuf,
-                                 const gchar *key,
-                                 const gchar *value);
-
-typedef enum /*< skip >*/
-{
-  GDK_PIXBUF_FORMAT_WRITABLE = 1 << 0,
-  GDK_PIXBUF_FORMAT_SCALABLE = 1 << 1,
-  GDK_PIXBUF_FORMAT_THREADSAFE = 1 << 2
-} GdkPixbufFormatFlags;
-
-struct _GdkPixbufFormat {
-  gchar *name;
-  GdkPixbufModulePattern *signature;
-  gchar *domain;
-  gchar *description;
-  gchar **mime_types;
-  gchar **extensions;
-  guint32 flags;
-  gboolean disabled;
-  gchar *license;
-};
-
-
-#endif /* GDK_PIXBUF_ENABLE_BACKEND */
-
-G_END_DECLS
-
-#endif /* GDK_PIXBUF_IO_H */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h
deleted file mode 100644
index d9b2b7dc..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* GdkPixbuf library - Progressive loader object
- *
- * Copyright (C) 1999 The Free Software Foundation
- *
- * Authors: Mark Crichton <crichton@gimp.org>
- *          Miguel de Icaza <miguel@gnu.org>
- *          Federico Mena-Quintero <federico@gimp.org>
- *          Jonathan Blandford <jrb@redhat.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 GDK_PIXBUF_LOADER_H
-#define GDK_PIXBUF_LOADER_H
-
-#include <glib.h>
-#include <glib-object.h>
-#include <gdk-pixbuf/gdk-pixbuf-core.h>
-#include <gdk-pixbuf/gdk-pixbuf-animation.h>
-#include <gdk-pixbuf/gdk-pixbuf-io.h>
-
-G_BEGIN_DECLS
-
-#define GDK_TYPE_PIXBUF_LOADER		   (gdk_pixbuf_loader_get_type ())
-#define GDK_PIXBUF_LOADER(obj)		   (G_TYPE_CHECK_INSTANCE_CAST ((obj), GDK_TYPE_PIXBUF_LOADER, GdkPixbufLoader))
-#define GDK_PIXBUF_LOADER_CLASS(klass)	   (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_PIXBUF_LOADER, GdkPixbufLoaderClass))
-#define GDK_IS_PIXBUF_LOADER(obj)	   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GDK_TYPE_PIXBUF_LOADER))
-#define GDK_IS_PIXBUF_LOADER_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_PIXBUF_LOADER))
-#define GDK_PIXBUF_LOADER_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_PIXBUF_LOADER, GdkPixbufLoaderClass))
-
-
-typedef struct _GdkPixbufLoader GdkPixbufLoader;
-struct _GdkPixbufLoader
-{
-  GObject parent_instance;
-  
-  /*< private >*/
-  gpointer priv;
-};
-
-typedef struct _GdkPixbufLoaderClass GdkPixbufLoaderClass;
-struct _GdkPixbufLoaderClass
-{
-  GObjectClass parent_class;
-
-  void (*size_prepared)      (GdkPixbufLoader *loader, 
-			      int              width,
-			      int              height);
-
-  void (*area_prepared)      (GdkPixbufLoader *loader);
-
-  /* Last known frame needs a redraw for x, y, width, height */
-  void (*area_updated)       (GdkPixbufLoader *loader,
-                              int              x,
-                              int              y,
-			      int              width,
-			      int              height);
-
-  void (*closed)             (GdkPixbufLoader *loader);
-};
-
-GType                gdk_pixbuf_loader_get_type      (void) G_GNUC_CONST;
-GdkPixbufLoader *    gdk_pixbuf_loader_new           (void);
-GdkPixbufLoader *    gdk_pixbuf_loader_new_with_type (const char *image_type,
-                                                      GError    **error);
-GdkPixbufLoader *    gdk_pixbuf_loader_new_with_mime_type (const char *mime_type,
-							   GError    **error);
-void                 gdk_pixbuf_loader_set_size (GdkPixbufLoader  *loader,
-                                                 int               width,
-						 int               height);
-gboolean             gdk_pixbuf_loader_write         (GdkPixbufLoader *loader,
-						      const guchar    *buf,
-						      gsize            count,
-                                                      GError         **error);
-GdkPixbuf *          gdk_pixbuf_loader_get_pixbuf    (GdkPixbufLoader *loader);
-GdkPixbufAnimation * gdk_pixbuf_loader_get_animation (GdkPixbufLoader *loader);
-gboolean             gdk_pixbuf_loader_close         (GdkPixbufLoader *loader,
-                                                      GError         **error);
-GdkPixbufFormat     *gdk_pixbuf_loader_get_format    (GdkPixbufLoader *loader);
-
-G_END_DECLS
-
-#endif
-
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-marshal.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-marshal.h
deleted file mode 100644
index ed19e3dd..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-marshal.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-#ifndef ___gdk_pixbuf_marshal_MARSHAL_H__
-#define ___gdk_pixbuf_marshal_MARSHAL_H__
-
-#include	<glib-object.h>
-
-G_BEGIN_DECLS
-
-/* VOID:VOID (/tmp/buildd/gtk+2.0-2.12.12/gdk-pixbuf/gdk-pixbuf-marshal.list:25) */
-#define _gdk_pixbuf_marshal_VOID__VOID	g_cclosure_marshal_VOID__VOID
-
-/* VOID:INT,INT,INT,INT (/tmp/buildd/gtk+2.0-2.12.12/gdk-pixbuf/gdk-pixbuf-marshal.list:26) */
-extern void _gdk_pixbuf_marshal_VOID__INT_INT_INT_INT (GClosure     *closure,
-                                                       GValue       *return_value,
-                                                       guint         n_param_values,
-                                                       const GValue *param_values,
-                                                       gpointer      invocation_hint,
-                                                       gpointer      marshal_data);
-
-/* VOID:POINTER (/tmp/buildd/gtk+2.0-2.12.12/gdk-pixbuf/gdk-pixbuf-marshal.list:27) */
-#define _gdk_pixbuf_marshal_VOID__POINTER	g_cclosure_marshal_VOID__POINTER
-
-/* VOID:INT,INT (/tmp/buildd/gtk+2.0-2.12.12/gdk-pixbuf/gdk-pixbuf-marshal.list:28) */
-extern void _gdk_pixbuf_marshal_VOID__INT_INT (GClosure     *closure,
-                                               GValue       *return_value,
-                                               guint         n_param_values,
-                                               const GValue *param_values,
-                                               gpointer      invocation_hint,
-                                               gpointer      marshal_data);
-
-G_END_DECLS
-
-#endif /* ___gdk_pixbuf_marshal_MARSHAL_H__ */
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h
deleted file mode 100644
index d2624042..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
-/* GdkPixbuf library - Simple frame-based animations
- *
- * Copyright (C) 2004 Dom Lachowicz
- *
- * Authors: Dom Lachowicz <cinamod@hotmail.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 GDK_PIXBUF_SIMPLE_ANIM_H
-#define GDK_PIXBUF_SIMPLE_ANIM_H
-
-#include <gdk-pixbuf/gdk-pixbuf-animation.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GdkPixbufSimpleAnim GdkPixbufSimpleAnim;
-typedef struct _GdkPixbufSimpleAnimClass GdkPixbufSimpleAnimClass;
-
-#define GDK_TYPE_PIXBUF_SIMPLE_ANIM              (gdk_pixbuf_simple_anim_get_type ())
-#define GDK_PIXBUF_SIMPLE_ANIM(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_PIXBUF_SIMPLE_ANIM, GdkPixbufSimpleAnim))
-#define GDK_IS_PIXBUF_SIMPLE_ANIM(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_PIXBUF_SIMPLE_ANIM))
-
-#define GDK_PIXBUF_SIMPLE_ANIM_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_PIXBUF_SIMPLE_ANIM, GdkPixbufSimpleAnimClass))
-#define GDK_IS_PIXBUF_SIMPLE_ANIM_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_PIXBUF_SIMPLE_ANIM))
-#define GDK_PIXBUF_SIMPLE_ANIM_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_PIXBUF_SIMPLE_ANIM, GdkPixbufSimpleAnimClass))
-
-GType gdk_pixbuf_simple_anim_get_type (void) G_GNUC_CONST;
-GType gdk_pixbuf_simple_anim_iter_get_type (void) G_GNUC_CONST;
-
-GdkPixbufSimpleAnim *gdk_pixbuf_simple_anim_new           (gint   width, 
-                                                           gint   height,
-                                                           gfloat rate);
-void                 gdk_pixbuf_simple_anim_add_frame     (GdkPixbufSimpleAnim *animation,
-                                                           GdkPixbuf           *pixbuf);
-
-G_END_DECLS
-
-
-#endif  /* GDK_PIXBUF_SIMPLE_ANIM_H */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-transform.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-transform.h
deleted file mode 100644
index 6a1bb1e5..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-transform.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* GdkPixbuf library - transformations
- *
- * Copyright (C) 2003 The Free Software Foundation
- *
- * Authors: Mark Crichton <crichton@gimp.org>
- *          Miguel de Icaza <miguel@gnu.org>
- *          Federico Mena-Quintero <federico@gimp.org>
- *          Havoc Pennington <hp@redhat.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 GDK_PIXBUF_TRANSFORM_H
-#define GDK_PIXBUF_TRANSFORM_H
-
-#include <glib.h>
-#include <gdk-pixbuf/gdk-pixbuf-core.h>
-
-
-G_BEGIN_DECLS
-
-/* Scaling */
-
-/* Interpolation modes */
-typedef enum {
-	GDK_INTERP_NEAREST,
-	GDK_INTERP_TILES,
-	GDK_INTERP_BILINEAR,
-	GDK_INTERP_HYPER
-} GdkInterpType;
-
-typedef enum {
-	GDK_PIXBUF_ROTATE_NONE             =   0,
-	GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE =  90,
-	GDK_PIXBUF_ROTATE_UPSIDEDOWN       = 180,
-	GDK_PIXBUF_ROTATE_CLOCKWISE        = 270
-} GdkPixbufRotation;
-
-void gdk_pixbuf_scale           (const GdkPixbuf *src,
-				 GdkPixbuf       *dest,
-				 int              dest_x,
-				 int              dest_y,
-				 int              dest_width,
-				 int              dest_height,
-				 double           offset_x,
-				 double           offset_y,
-				 double           scale_x,
-				 double           scale_y,
-				 GdkInterpType    interp_type);
-void gdk_pixbuf_composite       (const GdkPixbuf *src,
-				 GdkPixbuf       *dest,
-				 int              dest_x,
-				 int              dest_y,
-				 int              dest_width,
-				 int              dest_height,
-				 double           offset_x,
-				 double           offset_y,
-				 double           scale_x,
-				 double           scale_y,
-				 GdkInterpType    interp_type,
-				 int              overall_alpha);
-void gdk_pixbuf_composite_color (const GdkPixbuf *src,
-				 GdkPixbuf       *dest,
-				 int              dest_x,
-				 int              dest_y,
-				 int              dest_width,
-				 int              dest_height,
-				 double           offset_x,
-				 double           offset_y,
-				 double           scale_x,
-				 double           scale_y,
-				 GdkInterpType    interp_type,
-				 int              overall_alpha,
-				 int              check_x,
-				 int              check_y,
-				 int              check_size,
-				 guint32          color1,
-				 guint32          color2);
-
-GdkPixbuf *gdk_pixbuf_scale_simple           (const GdkPixbuf *src,
-					      int              dest_width,
-					      int              dest_height,
-					      GdkInterpType    interp_type);
-
-GdkPixbuf *gdk_pixbuf_composite_color_simple (const GdkPixbuf *src,
-					      int              dest_width,
-					      int              dest_height,
-					      GdkInterpType    interp_type,
-					      int              overall_alpha,
-					      int              check_size,
-					      guint32          color1,
-					      guint32          color2);
-
-GdkPixbuf *gdk_pixbuf_rotate_simple          (const GdkPixbuf   *src,
-				              GdkPixbufRotation  angle);
-GdkPixbuf *gdk_pixbuf_flip                   (const GdkPixbuf   *src,
-				              gboolean           horizontal);
-				     
-G_END_DECLS
-
-
-#endif  /* GDK_PIXBUF_TRANSFORM_H */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h
deleted file mode 100644
index 0d77b2bf..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* GdkPixbuf library - Main header file
- *
- * Copyright (C) 1999 The Free Software Foundation
- *
- * Authors: Mark Crichton <crichton@gimp.org>
- *          Miguel de Icaza <miguel@gnu.org>
- *          Federico Mena-Quintero <federico@gimp.org>
- *          Havoc Pennington <hp@redhat.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 GDK_PIXBUF_H
-#define GDK_PIXBUF_H
-
-#include <glib.h>
-#include <gdk-pixbuf/gdk-pixbuf-features.h>
-#include <glib-object.h>
-
-#include <gdk-pixbuf/gdk-pixbuf-core.h>
-#include <gdk-pixbuf/gdk-pixbuf-transform.h>
-#include <gdk-pixbuf/gdk-pixbuf-animation.h>
-#include <gdk-pixbuf/gdk-pixbuf-simple-anim.h>
-#include <gdk-pixbuf/gdk-pixbuf-io.h>
-#include <gdk-pixbuf/gdk-pixbuf-loader.h>
-#include <gdk-pixbuf/gdk-pixbuf-enum-types.h>
-
-
-#endif  /* GDK_PIXBUF_H */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h
deleted file mode 100644
index eb85034b..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/* GdkPixbuf library - GdkPixdata - functions for inlined pixbuf handling
- * Copyright (C) 1999, 2001 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 __GDK_PIXDATA_H__
-#define __GDK_PIXDATA_H__
-
-#include        <gdk-pixbuf/gdk-pixbuf.h>
-
-G_BEGIN_DECLS
-
-/**
- * GDK_PIXBUF_MAGIC_NUMBER:
- *
- * Magic number for #GdkPixdata structures.
- **/
-#define GDK_PIXBUF_MAGIC_NUMBER (0x47646b50)    /* 'GdkP' */
-
-/**
- * GdkPixdataType:
- * @GDK_PIXDATA_COLOR_TYPE_RGB:  each pixel has red, green and blue samples.
- * @GDK_PIXDATA_COLOR_TYPE_RGBA: each pixel has red, green and blue samples 
- *    and an alpha value.
- * @GDK_PIXDATA_COLOR_TYPE_MASK: mask for the colortype flags of the enum.
- * @GDK_PIXDATA_SAMPLE_WIDTH_8: each sample has 8 bits.
- * @GDK_PIXDATA_SAMPLE_WIDTH_MASK: mask for the sample width flags of the enum.
- * @GDK_PIXDATA_ENCODING_RAW: the pixel data is in raw form. 
- * @GDK_PIXDATA_ENCODING_RLE: the pixel data is run-length encoded. Runs may 
- *    be up to 127 bytes long; their length is stored in a single byte 
- *    preceding the pixel data for the run. If a run is constant, its length
- *    byte has the high bit set and the pixel data consists of a single pixel
- *    which must be repeated. 
- * @GDK_PIXDATA_ENCODING_MASK: mask for the encoding flags of the enum.
- *
- * An enumeration containing three sets of flags for a #GdkPixdata struct: 
- * one for the used colorspace, one for the width of the samples and one 
- * for the encoding of the pixel data.  
- **/
-typedef enum
-{
-  /* colorspace + alpha */
-  GDK_PIXDATA_COLOR_TYPE_RGB    = 0x01,
-  GDK_PIXDATA_COLOR_TYPE_RGBA   = 0x02,
-  GDK_PIXDATA_COLOR_TYPE_MASK   = 0xff,
-  /* width, support 8bits only currently */
-  GDK_PIXDATA_SAMPLE_WIDTH_8    = 0x01 << 16,
-  GDK_PIXDATA_SAMPLE_WIDTH_MASK = 0x0f << 16,
-  /* encoding */
-  GDK_PIXDATA_ENCODING_RAW      = 0x01 << 24,
-  GDK_PIXDATA_ENCODING_RLE      = 0x02 << 24,
-  GDK_PIXDATA_ENCODING_MASK     = 0x0f << 24
-} GdkPixdataType;
-
-/**
- * GdkPixdata:
- * @magic: magic number. A valid #GdkPixdata structure must have 
- *    #GDK_PIXBUF_MAGIC_NUMBER here.
- * @length: less than 1 to disable length checks, otherwise 
- *    #GDK_PIXDATA_HEADER_LENGTH + length of @pixel_data. 
- * @pixdata_type: information about colorspace, sample width and 
- *    encoding, in a #GdkPixdataType. 
- * @rowstride: Distance in bytes between rows.
- * @width: Width of the image in pixels.
- * @height: Height of the image in pixels.
- * @pixel_data: @width x @height pixels, encoded according to @pixdata_type
- *   and @rowstride.
- *
- * A #GdkPixdata contains pixbuf information in a form suitable for 
- * serialization and streaming.
- **/
-typedef struct _GdkPixdata GdkPixdata;
-struct _GdkPixdata
-{
-  guint32 magic;        /* GDK_PIXBUF_MAGIC_NUMBER */
-  gint32  length;       /* <1 to disable length checks, otherwise:
-			 * GDK_PIXDATA_HEADER_LENGTH + pixel_data length
-			 */
-  guint32 pixdata_type; /* GdkPixdataType */
-  guint32 rowstride;
-  guint32 width;
-  guint32 height;
-  guint8 *pixel_data;
-};
-
-/**
- * GDK_PIXDATA_HEADER_LENGTH:
- *
- * The length of a #GdkPixdata structure without the @pixel_data pointer.
- **/
-#define	GDK_PIXDATA_HEADER_LENGTH	(4 + 4 + 4 + 4 + 4 + 4)
-
-/* the returned stream is plain htonl of GdkPixdata members + pixel_data */
-guint8*		gdk_pixdata_serialize	(const GdkPixdata	*pixdata,
-					 guint			*stream_length_p);
-gboolean	gdk_pixdata_deserialize	(GdkPixdata		*pixdata,
-					 guint			 stream_length,
-					 const guint8		*stream,
-					 GError		       **error);
-gpointer	gdk_pixdata_from_pixbuf	(GdkPixdata		*pixdata,
-					 const GdkPixbuf	*pixbuf,
-					 gboolean		 use_rle);
-GdkPixbuf*	gdk_pixbuf_from_pixdata	(const GdkPixdata	*pixdata,
-					 gboolean		 copy_pixels,
-					 GError		       **error);
-/** 
- * GdkPixdataDumpType:
- * @GDK_PIXDATA_DUMP_PIXDATA_STREAM: Generate pixbuf data stream (a single 
- *    string containing a serialized #GdkPixdata structure in network byte 
- *    order).
- * @GDK_PIXDATA_DUMP_PIXDATA_STRUCT: Generate #GdkPixdata structure (needs 
- *    the #GdkPixdata structure definition from gdk-pixdata.h).
- * @GDK_PIXDATA_DUMP_MACROS: Generate <function>*_ROWSTRIDE</function>,     
- *    <function>*_WIDTH</function>, <function>*_HEIGHT</function>,
- *    <function>*_BYTES_PER_PIXEL</function> and 
- *    <function>*_RLE_PIXEL_DATA</function> or <function>*_PIXEL_DATA</function>
- *    macro definitions for the image.
- * @GDK_PIXDATA_DUMP_GTYPES: Generate GLib data types instead of 
- *    standard C data types.
- * @GDK_PIXDATA_DUMP_CTYPES: Generate standard C data types instead of 
- *    GLib data types.
- * @GDK_PIXDATA_DUMP_STATIC: Generate static symbols.
- * @GDK_PIXDATA_DUMP_CONST: Generate const symbols.
- * @GDK_PIXDATA_DUMP_RLE_DECODER: Provide a <function>*_RUN_LENGTH_DECODE(image_buf, rle_data, size, bpp)</function> 
- *    macro definition  to  decode  run-length encoded image data.
- *  
- * An enumeration which is used by gdk_pixdata_to_csource() to
- * determine the form of C source to be generated. The three values
- * @GDK_PIXDATA_DUMP_PIXDATA_STREAM, @GDK_PIXDATA_DUMP_PIXDATA_STRUCT
- * and @GDK_PIXDATA_DUMP_MACROS are mutually exclusive, as are
- * @GDK_PIXBUF_DUMP_GTYPES and @GDK_PIXBUF_DUMP_CTYPES. The remaining
- * elements are optional flags that can be freely added. 
- **/
-typedef enum
-{
-  /* type of source to save */
-  GDK_PIXDATA_DUMP_PIXDATA_STREAM	= 0,
-  GDK_PIXDATA_DUMP_PIXDATA_STRUCT	= 1,
-  GDK_PIXDATA_DUMP_MACROS		= 2,
-  /* type of variables to use */
-  GDK_PIXDATA_DUMP_GTYPES		= 0,
-  GDK_PIXDATA_DUMP_CTYPES		= 1 << 8,
-  GDK_PIXDATA_DUMP_STATIC		= 1 << 9,
-  GDK_PIXDATA_DUMP_CONST		= 1 << 10,
-  /* save RLE decoder macro? */
-  GDK_PIXDATA_DUMP_RLE_DECODER		= 1 << 16
-} GdkPixdataDumpType;
-  
-
-GString*	gdk_pixdata_to_csource	(GdkPixdata		*pixdata,
-					 const gchar		*name,
-					 GdkPixdataDumpType	 dump_type);
-
-
-G_END_DECLS
-
-#endif /* __GDK_PIXDATA_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdk.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdk.h
deleted file mode 100644
index d84d304a..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdk.h
+++ /dev/null
@@ -1,230 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_H__
-#define __GDK_H__
-
-#include <gdk/gdkcairo.h>
-#include <gdk/gdkcolor.h>
-#include <gdk/gdkcursor.h>
-#include <gdk/gdkdisplay.h>
-#include <gdk/gdkdnd.h>
-#include <gdk/gdkdrawable.h>
-#include <gdk/gdkenumtypes.h>
-#include <gdk/gdkevents.h>
-#include <gdk/gdkfont.h>
-#include <gdk/gdkgc.h>
-#include <gdk/gdkimage.h>
-#include <gdk/gdkinput.h>
-#include <gdk/gdkkeys.h>
-#include <gdk/gdkdisplaymanager.h>
-#include <gdk/gdkpango.h>
-#include <gdk/gdkpixbuf.h>
-#include <gdk/gdkpixmap.h>
-#include <gdk/gdkproperty.h>
-#include <gdk/gdkregion.h>
-#include <gdk/gdkrgb.h>
-#include <gdk/gdkscreen.h>
-#include <gdk/gdkselection.h>
-#include <gdk/gdkspawn.h>
-#include <gdk/gdktypes.h>
-#include <gdk/gdkvisual.h>
-#include <gdk/gdkwindow.h>
-
-G_BEGIN_DECLS
-
-
-/* Initialization, exit and events
- */
-#define	  GDK_PRIORITY_EVENTS		(G_PRIORITY_DEFAULT)
-void 	  gdk_parse_args	   	(gint	   	*argc,
-					 gchar        ***argv);
-void 	  gdk_init		   	(gint	   	*argc,
-					 gchar        ***argv);
-gboolean  gdk_init_check   	        (gint	   	*argc,
-					 gchar        ***argv);
-void gdk_add_option_entries_libgtk_only (GOptionGroup *group);
-void gdk_pre_parse_libgtk_only          (void);
-
-#ifndef GDK_DISABLE_DEPRECATED
-void  	  gdk_exit		   	(gint	    	 error_code);
-#endif /* GDK_DISABLE_DEPRECATED */
-gchar*	  gdk_set_locale	   	(void);
-
-G_CONST_RETURN char *gdk_get_program_class (void);
-void                 gdk_set_program_class (const char *program_class);
-
-/* Push and pop error handlers for X errors
- */
-void      gdk_error_trap_push           (void);
-gint      gdk_error_trap_pop            (void);
-
-#ifndef GDK_DISABLE_DEPRECATED
-void	  gdk_set_use_xshm		(gboolean	 use_xshm);
-gboolean  gdk_get_use_xshm		(void);
-#endif /* GDK_DISABLE_DEPRECATED */
-
-gchar*	                  gdk_get_display		(void);
-G_CONST_RETURN gchar*	  gdk_get_display_arg_name	(void);
-
-#if !defined (GDK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
-/* Used by gtk_input_add_full () */
-gint gdk_input_add_full	  (gint		     source,
-			   GdkInputCondition condition,
-			   GdkInputFunction  function,
-			   gpointer	     data,
-			   GdkDestroyNotify  destroy);
-#endif /* !GDK_DISABLE_DEPRECATED || GTK_COMPILATION */
-#ifndef GDK_DISABLE_DEPRECATED
-gint gdk_input_add	  (gint		     source,
-			   GdkInputCondition condition,
-			   GdkInputFunction  function,
-			   gpointer	     data);
-void gdk_input_remove	  (gint		     tag);
-#endif /* GDK_DISABLE_DEPRECATED */
-
-GdkGrabStatus gdk_pointer_grab       (GdkWindow    *window,
-				      gboolean      owner_events,
-				      GdkEventMask  event_mask,
-				      GdkWindow    *confine_to,
-				      GdkCursor    *cursor,
-				      guint32       time_);
-GdkGrabStatus gdk_keyboard_grab      (GdkWindow    *window,
-				      gboolean      owner_events,
-				      guint32       time_);
-
-gboolean gdk_pointer_grab_info_libgtk_only (GdkDisplay *display,
-					    GdkWindow **grab_window,
-					    gboolean   *owner_events);
-gboolean gdk_keyboard_grab_info_libgtk_only (GdkDisplay *display,
-					     GdkWindow **grab_window,
-					     gboolean   *owner_events);
-
-#ifndef GDK_MULTIHEAD_SAFE
-void          gdk_pointer_ungrab     (guint32       time_);
-void          gdk_keyboard_ungrab    (guint32       time_);
-gboolean      gdk_pointer_is_grabbed (void);
-
-gint gdk_screen_width  (void) G_GNUC_CONST;
-gint gdk_screen_height (void) G_GNUC_CONST;
-
-gint gdk_screen_width_mm  (void) G_GNUC_CONST;
-gint gdk_screen_height_mm (void) G_GNUC_CONST;
-
-void gdk_beep (void);
-#endif /* GDK_MULTIHEAD_SAFE */
-
-void gdk_flush (void);
-
-#ifndef GDK_MULTIHEAD_SAFE
-void gdk_set_double_click_time             (guint       msec);
-#endif
-
-/* Rectangle utilities
- */
-gboolean gdk_rectangle_intersect (GdkRectangle *src1,
-				  GdkRectangle *src2,
-				  GdkRectangle *dest);
-void     gdk_rectangle_union     (GdkRectangle *src1,
-				  GdkRectangle *src2,
-				  GdkRectangle *dest);
-
-GType gdk_rectangle_get_type (void) G_GNUC_CONST;
-
-#define GDK_TYPE_RECTANGLE (gdk_rectangle_get_type ())
-
-/* Conversion functions between wide char and multibyte strings. 
- */
-#ifndef GDK_DISABLE_DEPRECATED
-gchar     *gdk_wcstombs          (const GdkWChar   *src);
-gint       gdk_mbstowcs          (GdkWChar         *dest,
-				  const gchar      *src,
-				  gint              dest_max);
-#endif
-
-/* Miscellaneous */
-#ifndef GDK_MULTIHEAD_SAFE
-gboolean gdk_event_send_client_message      (GdkEvent       *event,
-					     GdkNativeWindow winid);
-void     gdk_event_send_clientmessage_toall (GdkEvent  *event);
-#endif
-gboolean gdk_event_send_client_message_for_display (GdkDisplay *display,
-						    GdkEvent       *event,
-						    GdkNativeWindow winid);
-
-void gdk_notify_startup_complete (void);
-
-void gdk_notify_startup_complete_with_id (const gchar* startup_id);
-
-/* Threading
- */
-
-#if !defined (GDK_DISABLE_DEPRECATED) || defined (GDK_COMPILATION)
-GDKVAR GMutex *gdk_threads_mutex; /* private */
-#endif
-
-GDKVAR GCallback gdk_threads_lock;
-GDKVAR GCallback gdk_threads_unlock;
-
-void     gdk_threads_enter                (void);
-void     gdk_threads_leave                (void);
-void     gdk_threads_init                 (void);
-void     gdk_threads_set_lock_functions   (GCallback enter_fn,
-					   GCallback leave_fn);
-
-guint    gdk_threads_add_idle_full        (gint           priority,
-		                           GSourceFunc    function,
-		                           gpointer       data,
-		                           GDestroyNotify notify);
-guint    gdk_threads_add_idle             (GSourceFunc    function,
-		                           gpointer       data);
-guint    gdk_threads_add_timeout_full     (gint           priority,
-                                           guint          interval,
-                                           GSourceFunc    function,
-                                           gpointer       data,
-                                           GDestroyNotify notify);
-guint    gdk_threads_add_timeout          (guint          interval,
-                                           GSourceFunc    function,
-                                           gpointer       data);
-
-#ifdef	G_THREADS_ENABLED
-#  define GDK_THREADS_ENTER()	G_STMT_START {	\
-      if (gdk_threads_lock)                 	\
-        (*gdk_threads_lock) ();			\
-   } G_STMT_END
-#  define GDK_THREADS_LEAVE()	G_STMT_START { 	\
-      if (gdk_threads_unlock)                 	\
-        (*gdk_threads_unlock) ();		\
-   } G_STMT_END
-#else	/* !G_THREADS_ENABLED */
-#  define GDK_THREADS_ENTER()
-#  define GDK_THREADS_LEAVE()
-#endif	/* !G_THREADS_ENABLED */
-
-G_END_DECLS
-
-
-#endif /* __GDK_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkalias.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkalias.h
deleted file mode 100644
index a3b907ac..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkalias.h
+++ /dev/null
@@ -1,2524 +0,0 @@
-/* Generated by makegdkalias.pl */
-
-#ifndef DISABLE_VISIBILITY
-
-#include <glib.h>
-
-#ifdef G_HAVE_GNUC_VISIBILITY
-
-#define IN_FILE(x) 1
-#define IN_HEADER defined
-
-#if IN_HEADER(__GDK_EVENTS_H__)
-#if IN_FILE(__GDK_EVENTS_X11_C__)
-extern __typeof (gdk_add_client_message_filter) IA__gdk_add_client_message_filter __attribute((visibility("hidden")));
-#define gdk_add_client_message_filter IA__gdk_add_client_message_filter
-
-extern __typeof (gdk_event_get_graphics_expose) IA__gdk_event_get_graphics_expose __attribute((visibility("hidden")));
-#define gdk_event_get_graphics_expose IA__gdk_event_get_graphics_expose
-
-extern __typeof (gdk_events_pending) IA__gdk_events_pending __attribute((visibility("hidden")));
-#define gdk_events_pending IA__gdk_events_pending
-
-#endif
-#endif
-#if IN_HEADER(__GDK_EVENTS_H__)
-#if IN_FILE(__GDK_EVENTS_C__)
-extern __typeof (gdk_event_copy) IA__gdk_event_copy __attribute((visibility("hidden")));
-#define gdk_event_copy IA__gdk_event_copy
-
-extern __typeof (gdk_event_free) IA__gdk_event_free __attribute((visibility("hidden")));
-#define gdk_event_free IA__gdk_event_free
-
-extern __typeof (gdk_event_get) IA__gdk_event_get __attribute((visibility("hidden")));
-#define gdk_event_get IA__gdk_event_get
-
-extern __typeof (gdk_event_get_axis) IA__gdk_event_get_axis __attribute((visibility("hidden")));
-#define gdk_event_get_axis IA__gdk_event_get_axis
-
-extern __typeof (gdk_event_get_coords) IA__gdk_event_get_coords __attribute((visibility("hidden")));
-#define gdk_event_get_coords IA__gdk_event_get_coords
-
-extern __typeof (gdk_event_get_root_coords) IA__gdk_event_get_root_coords __attribute((visibility("hidden")));
-#define gdk_event_get_root_coords IA__gdk_event_get_root_coords
-
-extern __typeof (gdk_event_get_screen) IA__gdk_event_get_screen __attribute((visibility("hidden")));
-#define gdk_event_get_screen IA__gdk_event_get_screen
-
-extern __typeof (gdk_event_get_state) IA__gdk_event_get_state __attribute((visibility("hidden")));
-#define gdk_event_get_state IA__gdk_event_get_state
-
-extern __typeof (gdk_event_get_time) IA__gdk_event_get_time __attribute((visibility("hidden")));
-#define gdk_event_get_time IA__gdk_event_get_time
-
-extern __typeof (gdk_event_get_type) IA__gdk_event_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_event_get_type IA__gdk_event_get_type
-
-extern __typeof (gdk_event_handler_set) IA__gdk_event_handler_set __attribute((visibility("hidden")));
-#define gdk_event_handler_set IA__gdk_event_handler_set
-
-extern __typeof (gdk_event_new) IA__gdk_event_new __attribute((visibility("hidden")));
-#define gdk_event_new IA__gdk_event_new
-
-extern __typeof (gdk_event_peek) IA__gdk_event_peek __attribute((visibility("hidden")));
-#define gdk_event_peek IA__gdk_event_peek
-
-extern __typeof (gdk_event_put) IA__gdk_event_put __attribute((visibility("hidden")));
-#define gdk_event_put IA__gdk_event_put
-
-extern __typeof (gdk_event_request_motions) IA__gdk_event_request_motions __attribute((visibility("hidden")));
-#define gdk_event_request_motions IA__gdk_event_request_motions
-
-extern __typeof (gdk_event_set_screen) IA__gdk_event_set_screen __attribute((visibility("hidden")));
-#define gdk_event_set_screen IA__gdk_event_set_screen
-
-extern __typeof (gdk_get_show_events) IA__gdk_get_show_events __attribute((visibility("hidden")));
-#define gdk_get_show_events IA__gdk_get_show_events
-
-extern __typeof (gdk_set_show_events) IA__gdk_set_show_events __attribute((visibility("hidden")));
-#define gdk_set_show_events IA__gdk_set_show_events
-
-extern __typeof (gdk_setting_get) IA__gdk_setting_get __attribute((visibility("hidden")));
-#define gdk_setting_get IA__gdk_setting_get
-
-#endif
-#endif
-#if IN_HEADER(__GDK_H__)
-#if IN_FILE(__GDK_MAIN_X11_C__)
-extern __typeof (gdk_error_trap_pop) IA__gdk_error_trap_pop __attribute((visibility("hidden")));
-#define gdk_error_trap_pop IA__gdk_error_trap_pop
-
-extern __typeof (gdk_error_trap_push) IA__gdk_error_trap_push __attribute((visibility("hidden")));
-#define gdk_error_trap_push IA__gdk_error_trap_push
-
-extern __typeof (gdk_get_display) IA__gdk_get_display __attribute((visibility("hidden")));
-#define gdk_get_display IA__gdk_get_display
-
-#ifndef GDK_DISABLE_DEPRECATED
-extern __typeof (gdk_get_use_xshm) IA__gdk_get_use_xshm __attribute((visibility("hidden")));
-#define gdk_get_use_xshm IA__gdk_get_use_xshm
-
-extern __typeof (gdk_set_use_xshm) IA__gdk_set_use_xshm __attribute((visibility("hidden")));
-#define gdk_set_use_xshm IA__gdk_set_use_xshm
-
-#endif
-extern __typeof (gdk_keyboard_grab) IA__gdk_keyboard_grab __attribute((visibility("hidden")));
-#define gdk_keyboard_grab IA__gdk_keyboard_grab
-
-extern __typeof (gdk_keyboard_grab_info_libgtk_only) IA__gdk_keyboard_grab_info_libgtk_only __attribute((visibility("hidden")));
-#define gdk_keyboard_grab_info_libgtk_only IA__gdk_keyboard_grab_info_libgtk_only
-
-extern __typeof (gdk_pointer_grab) IA__gdk_pointer_grab __attribute((visibility("hidden")));
-#define gdk_pointer_grab IA__gdk_pointer_grab
-
-extern __typeof (gdk_pointer_grab_info_libgtk_only) IA__gdk_pointer_grab_info_libgtk_only __attribute((visibility("hidden")));
-#define gdk_pointer_grab_info_libgtk_only IA__gdk_pointer_grab_info_libgtk_only
-
-#endif
-#endif
-#if IN_HEADER(__GDK_H__)
-#if IN_FILE(__GDK_DISPLAY_C__)
-extern __typeof (gdk_beep) IA__gdk_beep __attribute((visibility("hidden")));
-#define gdk_beep IA__gdk_beep
-
-extern __typeof (gdk_set_pointer_hooks) IA__gdk_set_pointer_hooks __attribute((visibility("hidden")));
-#define gdk_set_pointer_hooks IA__gdk_set_pointer_hooks
-
-extern __typeof (gdk_keyboard_ungrab) IA__gdk_keyboard_ungrab __attribute((visibility("hidden")));
-#define gdk_keyboard_ungrab IA__gdk_keyboard_ungrab
-
-extern __typeof (gdk_pointer_is_grabbed) IA__gdk_pointer_is_grabbed __attribute((visibility("hidden")));
-#define gdk_pointer_is_grabbed IA__gdk_pointer_is_grabbed
-
-extern __typeof (gdk_pointer_ungrab) IA__gdk_pointer_ungrab __attribute((visibility("hidden")));
-#define gdk_pointer_ungrab IA__gdk_pointer_ungrab
-
-extern __typeof (gdk_event_send_client_message) IA__gdk_event_send_client_message __attribute((visibility("hidden")));
-#define gdk_event_send_client_message IA__gdk_event_send_client_message
-
-extern __typeof (gdk_event_send_clientmessage_toall) IA__gdk_event_send_clientmessage_toall __attribute((visibility("hidden")));
-#define gdk_event_send_clientmessage_toall IA__gdk_event_send_clientmessage_toall
-
-#endif
-#endif
-#if IN_HEADER(__GDK_H__)
-#if IN_FILE(__GDK_IM_X11_C__)
-#ifndef GDK_DISABLE_DEPRECATED
-extern __typeof (gdk_mbstowcs) IA__gdk_mbstowcs __attribute((visibility("hidden")));
-#define gdk_mbstowcs IA__gdk_mbstowcs
-
-extern __typeof (gdk_wcstombs) IA__gdk_wcstombs __attribute((visibility("hidden")));
-#define gdk_wcstombs IA__gdk_wcstombs
-
-#endif
-extern __typeof (gdk_set_locale) IA__gdk_set_locale __attribute((visibility("hidden")));
-#define gdk_set_locale IA__gdk_set_locale
-
-#endif
-#endif
-#if IN_HEADER(__GDK_H__)
-#if IN_FILE(__GDK_EVENTS_X11_C__)
-extern __typeof (gdk_event_send_client_message_for_display) IA__gdk_event_send_client_message_for_display __attribute((visibility("hidden")));
-#define gdk_event_send_client_message_for_display IA__gdk_event_send_client_message_for_display
-
-extern __typeof (gdk_flush) IA__gdk_flush __attribute((visibility("hidden")));
-#define gdk_flush IA__gdk_flush
-
-#endif
-#endif
-#if IN_HEADER(__GDK_H__)
-#if IN_FILE(__GDK_DISPLAY_X11_C__)
-extern __typeof (gdk_notify_startup_complete) IA__gdk_notify_startup_complete __attribute((visibility("hidden")));
-#define gdk_notify_startup_complete IA__gdk_notify_startup_complete
-
-extern __typeof (gdk_notify_startup_complete_with_id) IA__gdk_notify_startup_complete_with_id __attribute((visibility("hidden")));
-#define gdk_notify_startup_complete_with_id IA__gdk_notify_startup_complete_with_id
-
-#endif
-#endif
-#if IN_HEADER(__GDK_H__)
-#if IN_FILE(__GDK_RECTANGLE_C__)
-extern __typeof (gdk_rectangle_get_type) IA__gdk_rectangle_get_type __attribute((visibility("hidden")));
-#define gdk_rectangle_get_type IA__gdk_rectangle_get_type
-
-extern __typeof (gdk_rectangle_intersect) IA__gdk_rectangle_intersect __attribute((visibility("hidden")));
-#define gdk_rectangle_intersect IA__gdk_rectangle_intersect
-
-extern __typeof (gdk_rectangle_union) IA__gdk_rectangle_union __attribute((visibility("hidden")));
-#define gdk_rectangle_union IA__gdk_rectangle_union
-
-#endif
-#endif
-#if IN_HEADER(__GDK_H__)
-#if IN_FILE(__GDK_EVENTS_C__)
-extern __typeof (gdk_set_double_click_time) IA__gdk_set_double_click_time __attribute((visibility("hidden")));
-#define gdk_set_double_click_time IA__gdk_set_double_click_time
-
-#endif
-#endif
-#if IN_HEADER(__GDK_H__)
-#if IN_FILE(__GDK_C__)
-extern __typeof (gdk_add_option_entries_libgtk_only) IA__gdk_add_option_entries_libgtk_only __attribute((visibility("hidden")));
-#define gdk_add_option_entries_libgtk_only IA__gdk_add_option_entries_libgtk_only
-
-extern __typeof (gdk_get_display_arg_name) IA__gdk_get_display_arg_name __attribute((visibility("hidden")));
-#define gdk_get_display_arg_name IA__gdk_get_display_arg_name
-
-extern __typeof (gdk_get_program_class) IA__gdk_get_program_class __attribute((visibility("hidden")));
-#define gdk_get_program_class IA__gdk_get_program_class
-
-extern __typeof (gdk_init) IA__gdk_init __attribute((visibility("hidden")));
-#define gdk_init IA__gdk_init
-
-extern __typeof (gdk_init_check) IA__gdk_init_check __attribute((visibility("hidden")));
-#define gdk_init_check IA__gdk_init_check
-
-#ifndef GDK_DISABLE_DEPRECATED
-extern __typeof (gdk_exit) IA__gdk_exit __attribute((visibility("hidden")));
-#define gdk_exit IA__gdk_exit
-
-#endif
-extern __typeof (gdk_pre_parse_libgtk_only) IA__gdk_pre_parse_libgtk_only __attribute((visibility("hidden")));
-#define gdk_pre_parse_libgtk_only IA__gdk_pre_parse_libgtk_only
-
-extern __typeof (gdk_parse_args) IA__gdk_parse_args __attribute((visibility("hidden")));
-#define gdk_parse_args IA__gdk_parse_args
-
-extern __typeof (gdk_set_program_class) IA__gdk_set_program_class __attribute((visibility("hidden")));
-#define gdk_set_program_class IA__gdk_set_program_class
-
-extern __typeof (gdk_threads_enter) IA__gdk_threads_enter __attribute((visibility("hidden")));
-#define gdk_threads_enter IA__gdk_threads_enter
-
-extern __typeof (gdk_threads_init) IA__gdk_threads_init __attribute((visibility("hidden")));
-#define gdk_threads_init IA__gdk_threads_init
-
-extern __typeof (gdk_threads_leave) IA__gdk_threads_leave __attribute((visibility("hidden")));
-#define gdk_threads_leave IA__gdk_threads_leave
-
-extern __typeof (gdk_threads_set_lock_functions) IA__gdk_threads_set_lock_functions __attribute((visibility("hidden")));
-#define gdk_threads_set_lock_functions IA__gdk_threads_set_lock_functions
-
-extern __typeof (gdk_threads_add_idle) IA__gdk_threads_add_idle __attribute((visibility("hidden")));
-#define gdk_threads_add_idle IA__gdk_threads_add_idle
-
-extern __typeof (gdk_threads_add_idle_full) IA__gdk_threads_add_idle_full __attribute((visibility("hidden")));
-#define gdk_threads_add_idle_full IA__gdk_threads_add_idle_full
-
-extern __typeof (gdk_threads_add_timeout) IA__gdk_threads_add_timeout __attribute((visibility("hidden")));
-#define gdk_threads_add_timeout IA__gdk_threads_add_timeout
-
-extern __typeof (gdk_threads_add_timeout_full) IA__gdk_threads_add_timeout_full __attribute((visibility("hidden")));
-#define gdk_threads_add_timeout_full IA__gdk_threads_add_timeout_full
-
-#endif
-#endif
-#if IN_HEADER(__GDK_H__)
-#if IN_FILE(__GDK_EVENTS_C__)
-#ifndef GDK_DISABLE_DEPRECATED
-extern __typeof (gdk_input_add) IA__gdk_input_add __attribute((visibility("hidden")));
-#define gdk_input_add IA__gdk_input_add
-
-extern __typeof (gdk_input_remove) IA__gdk_input_remove __attribute((visibility("hidden")));
-#define gdk_input_remove IA__gdk_input_remove
-
-extern __typeof (gdk_input_add_full) IA__gdk_input_add_full __attribute((visibility("hidden")));
-#define gdk_input_add_full IA__gdk_input_add_full
-
-#endif
-#endif
-#endif
-#if IN_HEADER(__GDK_H__)
-#if IN_FILE(__GDK_SCREEN_C__)
-extern __typeof (gdk_screen_width) IA__gdk_screen_width __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_screen_width IA__gdk_screen_width
-
-extern __typeof (gdk_screen_width_mm) IA__gdk_screen_width_mm __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_screen_width_mm IA__gdk_screen_width_mm
-
-extern __typeof (gdk_screen_height) IA__gdk_screen_height __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_screen_height IA__gdk_screen_height
-
-extern __typeof (gdk_screen_height_mm) IA__gdk_screen_height_mm __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_screen_height_mm IA__gdk_screen_height_mm
-
-#endif
-#endif
-#if IN_HEADER(__GDK_PROPERTY_H__)
-#if IN_FILE(__GDK_SELECTION_C__)
-extern __typeof (gdk_string_to_compound_text) IA__gdk_string_to_compound_text __attribute((visibility("hidden")));
-#define gdk_string_to_compound_text IA__gdk_string_to_compound_text
-
-extern __typeof (gdk_text_property_to_text_list) IA__gdk_text_property_to_text_list __attribute((visibility("hidden")));
-#define gdk_text_property_to_text_list IA__gdk_text_property_to_text_list
-
-extern __typeof (gdk_text_property_to_utf8_list) IA__gdk_text_property_to_utf8_list __attribute((visibility("hidden")));
-#define gdk_text_property_to_utf8_list IA__gdk_text_property_to_utf8_list
-
-extern __typeof (gdk_utf8_to_compound_text) IA__gdk_utf8_to_compound_text __attribute((visibility("hidden")));
-#define gdk_utf8_to_compound_text IA__gdk_utf8_to_compound_text
-
-#endif
-#endif
-#if IN_HEADER(__GDK_PROPERTY_H__)
-#if IN_FILE(__GDK_PROPERTY_X11_C__)
-extern __typeof (gdk_atom_intern) IA__gdk_atom_intern __attribute((visibility("hidden")));
-#define gdk_atom_intern IA__gdk_atom_intern
-
-extern __typeof (gdk_atom_intern_static_string) IA__gdk_atom_intern_static_string __attribute((visibility("hidden")));
-#define gdk_atom_intern_static_string IA__gdk_atom_intern_static_string
-
-extern __typeof (gdk_atom_name) IA__gdk_atom_name __attribute((visibility("hidden")));
-#define gdk_atom_name IA__gdk_atom_name
-
-extern __typeof (gdk_property_change) IA__gdk_property_change __attribute((visibility("hidden")));
-#define gdk_property_change IA__gdk_property_change
-
-extern __typeof (gdk_property_delete) IA__gdk_property_delete __attribute((visibility("hidden")));
-#define gdk_property_delete IA__gdk_property_delete
-
-extern __typeof (gdk_property_get) IA__gdk_property_get __attribute((visibility("hidden")));
-#define gdk_property_get IA__gdk_property_get
-
-#endif
-#endif
-#if IN_HEADER(__GDK_PROPERTY_H__)
-#if IN_FILE(__GDK_SELECTION_X11_C__)
-extern __typeof (gdk_free_compound_text) IA__gdk_free_compound_text __attribute((visibility("hidden")));
-#define gdk_free_compound_text IA__gdk_free_compound_text
-
-extern __typeof (gdk_free_text_list) IA__gdk_free_text_list __attribute((visibility("hidden")));
-#define gdk_free_text_list IA__gdk_free_text_list
-
-extern __typeof (gdk_string_to_compound_text_for_display) IA__gdk_string_to_compound_text_for_display __attribute((visibility("hidden")));
-#define gdk_string_to_compound_text_for_display IA__gdk_string_to_compound_text_for_display
-
-extern __typeof (gdk_text_property_to_text_list_for_display) IA__gdk_text_property_to_text_list_for_display __attribute((visibility("hidden")));
-#define gdk_text_property_to_text_list_for_display IA__gdk_text_property_to_text_list_for_display
-
-extern __typeof (gdk_text_property_to_utf8_list_for_display) IA__gdk_text_property_to_utf8_list_for_display __attribute((visibility("hidden")));
-#define gdk_text_property_to_utf8_list_for_display IA__gdk_text_property_to_utf8_list_for_display
-
-extern __typeof (gdk_utf8_to_string_target) IA__gdk_utf8_to_string_target __attribute((visibility("hidden")));
-#define gdk_utf8_to_string_target IA__gdk_utf8_to_string_target
-
-extern __typeof (gdk_utf8_to_compound_text_for_display) IA__gdk_utf8_to_compound_text_for_display __attribute((visibility("hidden")));
-#define gdk_utf8_to_compound_text_for_display IA__gdk_utf8_to_compound_text_for_display
-
-#endif
-#endif
-#if IN_HEADER(__GDK_ENUM_TYPES_H__)
-#if IN_FILE(__GDK_ENUM_TYPES_C__)
-extern __typeof (gdk_rgb_dither_get_type) IA__gdk_rgb_dither_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_rgb_dither_get_type IA__gdk_rgb_dither_get_type
-
-extern __typeof (gdk_drag_protocol_get_type) IA__gdk_drag_protocol_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_drag_protocol_get_type IA__gdk_drag_protocol_get_type
-
-extern __typeof (gdk_input_source_get_type) IA__gdk_input_source_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_input_source_get_type IA__gdk_input_source_get_type
-
-extern __typeof (gdk_input_condition_get_type) IA__gdk_input_condition_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_input_condition_get_type IA__gdk_input_condition_get_type
-
-extern __typeof (gdk_input_mode_get_type) IA__gdk_input_mode_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_input_mode_get_type IA__gdk_input_mode_get_type
-
-extern __typeof (gdk_axis_use_get_type) IA__gdk_axis_use_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_axis_use_get_type IA__gdk_axis_use_get_type
-
-extern __typeof (gdk_byte_order_get_type) IA__gdk_byte_order_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_byte_order_get_type IA__gdk_byte_order_get_type
-
-extern __typeof (gdk_cap_style_get_type) IA__gdk_cap_style_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_cap_style_get_type IA__gdk_cap_style_get_type
-
-extern __typeof (gdk_crossing_mode_get_type) IA__gdk_crossing_mode_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_crossing_mode_get_type IA__gdk_crossing_mode_get_type
-
-extern __typeof (gdk_extension_mode_get_type) IA__gdk_extension_mode_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_extension_mode_get_type IA__gdk_extension_mode_get_type
-
-extern __typeof (gdk_event_mask_get_type) IA__gdk_event_mask_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_event_mask_get_type IA__gdk_event_mask_get_type
-
-extern __typeof (gdk_event_type_get_type) IA__gdk_event_type_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_event_type_get_type IA__gdk_event_type_get_type
-
-extern __typeof (gdk_fill_get_type) IA__gdk_fill_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_fill_get_type IA__gdk_fill_get_type
-
-extern __typeof (gdk_fill_rule_get_type) IA__gdk_fill_rule_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_fill_rule_get_type IA__gdk_fill_rule_get_type
-
-extern __typeof (gdk_filter_return_get_type) IA__gdk_filter_return_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_filter_return_get_type IA__gdk_filter_return_get_type
-
-extern __typeof (gdk_function_get_type) IA__gdk_function_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_function_get_type IA__gdk_function_get_type
-
-extern __typeof (gdk_grab_status_get_type) IA__gdk_grab_status_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_grab_status_get_type IA__gdk_grab_status_get_type
-
-extern __typeof (gdk_gravity_get_type) IA__gdk_gravity_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_gravity_get_type IA__gdk_gravity_get_type
-
-extern __typeof (gdk_join_style_get_type) IA__gdk_join_style_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_join_style_get_type IA__gdk_join_style_get_type
-
-extern __typeof (gdk_line_style_get_type) IA__gdk_line_style_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_line_style_get_type IA__gdk_line_style_get_type
-
-extern __typeof (gdk_modifier_type_get_type) IA__gdk_modifier_type_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_modifier_type_get_type IA__gdk_modifier_type_get_type
-
-extern __typeof (gdk_notify_type_get_type) IA__gdk_notify_type_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_notify_type_get_type IA__gdk_notify_type_get_type
-
-extern __typeof (gdk_overlap_type_get_type) IA__gdk_overlap_type_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_overlap_type_get_type IA__gdk_overlap_type_get_type
-
-extern __typeof (gdk_owner_change_get_type) IA__gdk_owner_change_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_owner_change_get_type IA__gdk_owner_change_get_type
-
-extern __typeof (gdk_property_state_get_type) IA__gdk_property_state_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_property_state_get_type IA__gdk_property_state_get_type
-
-extern __typeof (gdk_prop_mode_get_type) IA__gdk_prop_mode_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_prop_mode_get_type IA__gdk_prop_mode_get_type
-
-extern __typeof (gdk_scroll_direction_get_type) IA__gdk_scroll_direction_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_scroll_direction_get_type IA__gdk_scroll_direction_get_type
-
-extern __typeof (gdk_setting_action_get_type) IA__gdk_setting_action_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_setting_action_get_type IA__gdk_setting_action_get_type
-
-extern __typeof (gdk_status_get_type) IA__gdk_status_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_status_get_type IA__gdk_status_get_type
-
-extern __typeof (gdk_subwindow_mode_get_type) IA__gdk_subwindow_mode_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_subwindow_mode_get_type IA__gdk_subwindow_mode_get_type
-
-extern __typeof (gdk_visibility_state_get_type) IA__gdk_visibility_state_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_visibility_state_get_type IA__gdk_visibility_state_get_type
-
-extern __typeof (gdk_wm_decoration_get_type) IA__gdk_wm_decoration_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_wm_decoration_get_type IA__gdk_wm_decoration_get_type
-
-extern __typeof (gdk_wm_function_get_type) IA__gdk_wm_function_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_wm_function_get_type IA__gdk_wm_function_get_type
-
-extern __typeof (gdk_font_type_get_type) IA__gdk_font_type_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_font_type_get_type IA__gdk_font_type_get_type
-
-extern __typeof (gdk_cursor_type_get_type) IA__gdk_cursor_type_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_cursor_type_get_type IA__gdk_cursor_type_get_type
-
-extern __typeof (gdk_drag_action_get_type) IA__gdk_drag_action_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_drag_action_get_type IA__gdk_drag_action_get_type
-
-extern __typeof (gdk_gc_values_mask_get_type) IA__gdk_gc_values_mask_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_gc_values_mask_get_type IA__gdk_gc_values_mask_get_type
-
-extern __typeof (gdk_window_attributes_type_get_type) IA__gdk_window_attributes_type_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_window_attributes_type_get_type IA__gdk_window_attributes_type_get_type
-
-extern __typeof (gdk_window_class_get_type) IA__gdk_window_class_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_window_class_get_type IA__gdk_window_class_get_type
-
-extern __typeof (gdk_window_edge_get_type) IA__gdk_window_edge_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_window_edge_get_type IA__gdk_window_edge_get_type
-
-extern __typeof (gdk_window_hints_get_type) IA__gdk_window_hints_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_window_hints_get_type IA__gdk_window_hints_get_type
-
-extern __typeof (gdk_window_state_get_type) IA__gdk_window_state_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_window_state_get_type IA__gdk_window_state_get_type
-
-extern __typeof (gdk_window_type_get_type) IA__gdk_window_type_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_window_type_get_type IA__gdk_window_type_get_type
-
-extern __typeof (gdk_window_type_hint_get_type) IA__gdk_window_type_hint_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_window_type_hint_get_type IA__gdk_window_type_hint_get_type
-
-extern __typeof (gdk_image_type_get_type) IA__gdk_image_type_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_image_type_get_type IA__gdk_image_type_get_type
-
-extern __typeof (gdk_visual_type_get_type) IA__gdk_visual_type_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_visual_type_get_type IA__gdk_visual_type_get_type
-
-#endif
-#endif
-#if IN_HEADER(__GDK_PIXMAP_H__)
-#if IN_FILE(__GDK_PIXMAP_X11_C__)
-extern __typeof (gdk_bitmap_create_from_data) IA__gdk_bitmap_create_from_data __attribute((visibility("hidden")));
-#define gdk_bitmap_create_from_data IA__gdk_bitmap_create_from_data
-
-#endif
-#endif
-#if IN_HEADER(__GDK_FONT_H__)
-#if IN_FILE(__GDK_FONT_C__)
-#ifndef GDK_DISABLE_DEPRECATED
-extern __typeof (gdk_font_from_description) IA__gdk_font_from_description __attribute((visibility("hidden")));
-#define gdk_font_from_description IA__gdk_font_from_description
-
-#endif
-extern __typeof (gdk_font_get_type) IA__gdk_font_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_font_get_type IA__gdk_font_get_type
-
-extern __typeof (gdk_font_ref) IA__gdk_font_ref __attribute((visibility("hidden")));
-#define gdk_font_ref IA__gdk_font_ref
-
-extern __typeof (gdk_font_unref) IA__gdk_font_unref __attribute((visibility("hidden")));
-#define gdk_font_unref IA__gdk_font_unref
-
-#ifndef GDK_DISABLE_DEPRECATED
-extern __typeof (gdk_font_load) IA__gdk_font_load __attribute((visibility("hidden")));
-#define gdk_font_load IA__gdk_font_load
-
-extern __typeof (gdk_string_width) IA__gdk_string_width __attribute((visibility("hidden")));
-#define gdk_string_width IA__gdk_string_width
-
-extern __typeof (gdk_char_width) IA__gdk_char_width __attribute((visibility("hidden")));
-#define gdk_char_width IA__gdk_char_width
-
-extern __typeof (gdk_char_width_wc) IA__gdk_char_width_wc __attribute((visibility("hidden")));
-#define gdk_char_width_wc IA__gdk_char_width_wc
-
-extern __typeof (gdk_string_measure) IA__gdk_string_measure __attribute((visibility("hidden")));
-#define gdk_string_measure IA__gdk_string_measure
-
-extern __typeof (gdk_text_measure) IA__gdk_text_measure __attribute((visibility("hidden")));
-#define gdk_text_measure IA__gdk_text_measure
-
-extern __typeof (gdk_char_measure) IA__gdk_char_measure __attribute((visibility("hidden")));
-#define gdk_char_measure IA__gdk_char_measure
-
-extern __typeof (gdk_string_height) IA__gdk_string_height __attribute((visibility("hidden")));
-#define gdk_string_height IA__gdk_string_height
-
-extern __typeof (gdk_text_height) IA__gdk_text_height __attribute((visibility("hidden")));
-#define gdk_text_height IA__gdk_text_height
-
-extern __typeof (gdk_char_height) IA__gdk_char_height __attribute((visibility("hidden")));
-#define gdk_char_height IA__gdk_char_height
-
-extern __typeof (gdk_string_extents) IA__gdk_string_extents __attribute((visibility("hidden")));
-#define gdk_string_extents IA__gdk_string_extents
-
-#endif
-#endif
-#endif
-#if IN_HEADER(__GDK_FONT_H__)
-#if IN_FILE(__GDK_FONT_X11_C__)
-#ifndef GDK_DISABLE_DEPRECATED
-extern __typeof (gdk_text_extents) IA__gdk_text_extents __attribute((visibility("hidden")));
-#define gdk_text_extents IA__gdk_text_extents
-
-extern __typeof (gdk_text_extents_wc) IA__gdk_text_extents_wc __attribute((visibility("hidden")));
-#define gdk_text_extents_wc IA__gdk_text_extents_wc
-
-extern __typeof (gdk_text_width) IA__gdk_text_width __attribute((visibility("hidden")));
-#define gdk_text_width IA__gdk_text_width
-
-extern __typeof (gdk_text_width_wc) IA__gdk_text_width_wc __attribute((visibility("hidden")));
-#define gdk_text_width_wc IA__gdk_text_width_wc
-
-extern __typeof (gdk_font_get_display) IA__gdk_font_get_display __attribute((visibility("hidden")));
-#define gdk_font_get_display IA__gdk_font_get_display
-
-extern __typeof (gdk_fontset_load) IA__gdk_fontset_load __attribute((visibility("hidden")));
-#define gdk_fontset_load IA__gdk_fontset_load
-
-#endif
-extern __typeof (gdk_font_id) IA__gdk_font_id __attribute((visibility("hidden")));
-#define gdk_font_id IA__gdk_font_id
-
-extern __typeof (gdk_font_equal) IA__gdk_font_equal __attribute((visibility("hidden")));
-#define gdk_font_equal IA__gdk_font_equal
-
-extern __typeof (gdk_font_load_for_display) IA__gdk_font_load_for_display __attribute((visibility("hidden")));
-#define gdk_font_load_for_display IA__gdk_font_load_for_display
-
-extern __typeof (gdk_font_from_description_for_display) IA__gdk_font_from_description_for_display __attribute((visibility("hidden")));
-#define gdk_font_from_description_for_display IA__gdk_font_from_description_for_display
-
-extern __typeof (gdk_fontset_load_for_display) IA__gdk_fontset_load_for_display __attribute((visibility("hidden")));
-#define gdk_fontset_load_for_display IA__gdk_fontset_load_for_display
-
-#endif
-#endif
-#if IN_HEADER(__GDK_CAIRO_H__)
-#if IN_FILE(__GDK_CAIRO_C__)
-extern __typeof (gdk_cairo_create) IA__gdk_cairo_create __attribute((visibility("hidden")));
-#define gdk_cairo_create IA__gdk_cairo_create
-
-extern __typeof (gdk_cairo_set_source_color) IA__gdk_cairo_set_source_color __attribute((visibility("hidden")));
-#define gdk_cairo_set_source_color IA__gdk_cairo_set_source_color
-
-extern __typeof (gdk_cairo_set_source_pixbuf) IA__gdk_cairo_set_source_pixbuf __attribute((visibility("hidden")));
-#define gdk_cairo_set_source_pixbuf IA__gdk_cairo_set_source_pixbuf
-
-extern __typeof (gdk_cairo_set_source_pixmap) IA__gdk_cairo_set_source_pixmap __attribute((visibility("hidden")));
-#define gdk_cairo_set_source_pixmap IA__gdk_cairo_set_source_pixmap
-
-extern __typeof (gdk_cairo_rectangle) IA__gdk_cairo_rectangle __attribute((visibility("hidden")));
-#define gdk_cairo_rectangle IA__gdk_cairo_rectangle
-
-extern __typeof (gdk_cairo_region) IA__gdk_cairo_region __attribute((visibility("hidden")));
-#define gdk_cairo_region IA__gdk_cairo_region
-
-#endif
-#endif
-#if IN_HEADER(__GDK_COLOR_H__)
-#if IN_FILE(__GDK_COLOR_C__)
-#ifndef GDK_DISABLE_DEPRECATED
-extern __typeof (gdk_colors_store) IA__gdk_colors_store __attribute((visibility("hidden")));
-#define gdk_colors_store IA__gdk_colors_store
-
-extern __typeof (gdk_color_white) IA__gdk_color_white __attribute((visibility("hidden")));
-#define gdk_color_white IA__gdk_color_white
-
-extern __typeof (gdk_color_black) IA__gdk_color_black __attribute((visibility("hidden")));
-#define gdk_color_black IA__gdk_color_black
-
-extern __typeof (gdk_color_alloc) IA__gdk_color_alloc __attribute((visibility("hidden")));
-#define gdk_color_alloc IA__gdk_color_alloc
-
-#endif
-extern __typeof (gdk_color_copy) IA__gdk_color_copy __attribute((visibility("hidden")));
-#define gdk_color_copy IA__gdk_color_copy
-
-extern __typeof (gdk_color_equal) IA__gdk_color_equal __attribute((visibility("hidden")));
-#define gdk_color_equal IA__gdk_color_equal
-
-extern __typeof (gdk_color_free) IA__gdk_color_free __attribute((visibility("hidden")));
-#define gdk_color_free IA__gdk_color_free
-
-extern __typeof (gdk_color_get_type) IA__gdk_color_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_color_get_type IA__gdk_color_get_type
-
-extern __typeof (gdk_color_hash) IA__gdk_color_hash __attribute((visibility("hidden")));
-#define gdk_color_hash IA__gdk_color_hash
-
-extern __typeof (gdk_colormap_alloc_color) IA__gdk_colormap_alloc_color __attribute((visibility("hidden")));
-#define gdk_colormap_alloc_color IA__gdk_colormap_alloc_color
-
-extern __typeof (gdk_colormap_get_system) IA__gdk_colormap_get_system __attribute((visibility("hidden")));
-#define gdk_colormap_get_system IA__gdk_colormap_get_system
-
-extern __typeof (gdk_colormap_get_visual) IA__gdk_colormap_get_visual __attribute((visibility("hidden")));
-#define gdk_colormap_get_visual IA__gdk_colormap_get_visual
-
-#ifndef GDK_DISABLE_DEPRECATED
-extern __typeof (gdk_colormap_ref) IA__gdk_colormap_ref __attribute((visibility("hidden")));
-#define gdk_colormap_ref IA__gdk_colormap_ref
-
-extern __typeof (gdk_colormap_unref) IA__gdk_colormap_unref __attribute((visibility("hidden")));
-#define gdk_colormap_unref IA__gdk_colormap_unref
-
-#endif
-extern __typeof (gdk_color_parse) IA__gdk_color_parse __attribute((visibility("hidden")));
-#define gdk_color_parse IA__gdk_color_parse
-
-extern __typeof (gdk_color_to_string) IA__gdk_color_to_string __attribute((visibility("hidden")));
-#define gdk_color_to_string IA__gdk_color_to_string
-
-#endif
-#endif
-#if IN_HEADER(__GDK_COLOR_H__)
-#if IN_FILE(__GDK_COLOR_X11_C__)
-extern __typeof (gdk_colormap_new) IA__gdk_colormap_new __attribute((visibility("hidden")));
-#define gdk_colormap_new IA__gdk_colormap_new
-
-extern __typeof (gdk_colormap_get_type) IA__gdk_colormap_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_colormap_get_type IA__gdk_colormap_get_type
-
-#ifndef GDK_DISABLE_DEPRECATED
-extern __typeof (gdk_colormap_change) IA__gdk_colormap_change __attribute((visibility("hidden")));
-#define gdk_colormap_change IA__gdk_colormap_change
-
-extern __typeof (gdk_colors_alloc) IA__gdk_colors_alloc __attribute((visibility("hidden")));
-#define gdk_colors_alloc IA__gdk_colors_alloc
-
-extern __typeof (gdk_colors_free) IA__gdk_colors_free __attribute((visibility("hidden")));
-#define gdk_colors_free IA__gdk_colors_free
-
-extern __typeof (gdk_colormap_get_system_size) IA__gdk_colormap_get_system_size __attribute((visibility("hidden")));
-#define gdk_colormap_get_system_size IA__gdk_colormap_get_system_size
-
-extern __typeof (gdk_color_change) IA__gdk_color_change __attribute((visibility("hidden")));
-#define gdk_color_change IA__gdk_color_change
-
-#endif
-extern __typeof (gdk_colormap_alloc_colors) IA__gdk_colormap_alloc_colors __attribute((visibility("hidden")));
-#define gdk_colormap_alloc_colors IA__gdk_colormap_alloc_colors
-
-extern __typeof (gdk_colormap_free_colors) IA__gdk_colormap_free_colors __attribute((visibility("hidden")));
-#define gdk_colormap_free_colors IA__gdk_colormap_free_colors
-
-extern __typeof (gdk_colormap_query_color) IA__gdk_colormap_query_color __attribute((visibility("hidden")));
-#define gdk_colormap_query_color IA__gdk_colormap_query_color
-
-extern __typeof (gdk_colormap_get_screen) IA__gdk_colormap_get_screen __attribute((visibility("hidden")));
-#define gdk_colormap_get_screen IA__gdk_colormap_get_screen
-
-#endif
-#endif
-#if IN_HEADER(__GDK_CURSOR_H__)
-#if IN_FILE(__GDK_CURSOR_C__)
-extern __typeof (gdk_cursor_get_type) IA__gdk_cursor_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_cursor_get_type IA__gdk_cursor_get_type
-
-extern __typeof (gdk_cursor_new) IA__gdk_cursor_new __attribute((visibility("hidden")));
-#define gdk_cursor_new IA__gdk_cursor_new
-
-extern __typeof (gdk_cursor_ref) IA__gdk_cursor_ref __attribute((visibility("hidden")));
-#define gdk_cursor_ref IA__gdk_cursor_ref
-
-extern __typeof (gdk_cursor_unref) IA__gdk_cursor_unref __attribute((visibility("hidden")));
-#define gdk_cursor_unref IA__gdk_cursor_unref
-
-#endif
-#endif
-#if IN_HEADER(__GDK_CURSOR_H__)
-#if IN_FILE(__GDK_CURSOR_X11_C__)
-extern __typeof (gdk_cursor_get_display) IA__gdk_cursor_get_display __attribute((visibility("hidden")));
-#define gdk_cursor_get_display IA__gdk_cursor_get_display
-
-extern __typeof (gdk_cursor_new_for_display) IA__gdk_cursor_new_for_display __attribute((visibility("hidden")));
-#define gdk_cursor_new_for_display IA__gdk_cursor_new_for_display
-
-extern __typeof (gdk_cursor_new_from_pixbuf) IA__gdk_cursor_new_from_pixbuf __attribute((visibility("hidden")));
-#define gdk_cursor_new_from_pixbuf IA__gdk_cursor_new_from_pixbuf
-
-extern __typeof (gdk_cursor_new_from_pixmap) IA__gdk_cursor_new_from_pixmap __attribute((visibility("hidden")));
-#define gdk_cursor_new_from_pixmap IA__gdk_cursor_new_from_pixmap
-
-extern __typeof (gdk_cursor_new_from_name) IA__gdk_cursor_new_from_name __attribute((visibility("hidden")));
-#define gdk_cursor_new_from_name IA__gdk_cursor_new_from_name
-
-extern __typeof (gdk_cursor_get_image) IA__gdk_cursor_get_image __attribute((visibility("hidden")));
-#define gdk_cursor_get_image IA__gdk_cursor_get_image
-
-#endif
-#endif
-#if IN_HEADER(__GDK_INPUT_H__)
-#if IN_FILE(__GDK_INPUT_C__)
-extern __typeof (gdk_device_free_history) IA__gdk_device_free_history __attribute((visibility("hidden")));
-#define gdk_device_free_history IA__gdk_device_free_history
-
-extern __typeof (gdk_device_get_axis) IA__gdk_device_get_axis __attribute((visibility("hidden")));
-#define gdk_device_get_axis IA__gdk_device_get_axis
-
-extern __typeof (gdk_device_get_history) IA__gdk_device_get_history __attribute((visibility("hidden")));
-#define gdk_device_get_history IA__gdk_device_get_history
-
-extern __typeof (gdk_device_get_type) IA__gdk_device_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_device_get_type IA__gdk_device_get_type
-
-extern __typeof (gdk_device_set_axis_use) IA__gdk_device_set_axis_use __attribute((visibility("hidden")));
-#define gdk_device_set_axis_use IA__gdk_device_set_axis_use
-
-extern __typeof (gdk_device_set_key) IA__gdk_device_set_key __attribute((visibility("hidden")));
-#define gdk_device_set_key IA__gdk_device_set_key
-
-extern __typeof (gdk_device_set_source) IA__gdk_device_set_source __attribute((visibility("hidden")));
-#define gdk_device_set_source IA__gdk_device_set_source
-
-extern __typeof (gdk_devices_list) IA__gdk_devices_list __attribute((visibility("hidden")));
-#define gdk_devices_list IA__gdk_devices_list
-
-extern __typeof (gdk_input_set_extension_events) IA__gdk_input_set_extension_events __attribute((visibility("hidden")));
-#define gdk_input_set_extension_events IA__gdk_input_set_extension_events
-
-#endif
-#endif
-#if IN_HEADER(__GDK_INPUT_H__)
-#if IN_FILE(__GDK_DISPLAY_C__)
-extern __typeof (gdk_device_get_core_pointer) IA__gdk_device_get_core_pointer __attribute((visibility("hidden")));
-#define gdk_device_get_core_pointer IA__gdk_device_get_core_pointer
-
-#endif
-#endif
-#if IN_HEADER(__GDK_INPUT_H__)
-#if IN_FILE(__GDK_INPUT_X11_C__)
-extern __typeof (gdk_device_get_state) IA__gdk_device_get_state __attribute((visibility("hidden")));
-#define gdk_device_get_state IA__gdk_device_get_state
-
-#endif
-#endif
-#if IN_HEADER(__GDK_INPUT_H__)
-#if IN_FILE(__GDK_INPUT_XFREE_C__)
-extern __typeof (gdk_device_set_mode) IA__gdk_device_set_mode __attribute((visibility("hidden")));
-#define gdk_device_set_mode IA__gdk_device_set_mode
-
-#endif
-#endif
-#if IN_HEADER(__GDK_INPUT_H__)
-#if IN_FILE(__GDK_INPUT_NONE_C__)
-extern __typeof (gdk_device_get_state) IA__gdk_device_get_state __attribute((visibility("hidden")));
-#define gdk_device_get_state IA__gdk_device_get_state
-
-extern __typeof (gdk_device_set_mode) IA__gdk_device_set_mode __attribute((visibility("hidden")));
-#define gdk_device_set_mode IA__gdk_device_set_mode
-
-#endif
-#endif
-#if IN_HEADER(__GDK_DISPLAY_H__)
-#if IN_FILE(__GDK_EVENTS_X11_C__)
-extern __typeof (gdk_display_add_client_message_filter) IA__gdk_display_add_client_message_filter __attribute((visibility("hidden")));
-#define gdk_display_add_client_message_filter IA__gdk_display_add_client_message_filter
-
-#endif
-#endif
-#if IN_HEADER(__GDK_DISPLAY_H__)
-#if IN_FILE(__GDK_DISPLAY_C__)
-extern __typeof (gdk_display_close) IA__gdk_display_close __attribute((visibility("hidden")));
-#define gdk_display_close IA__gdk_display_close
-
-extern __typeof (gdk_display_get_core_pointer) IA__gdk_display_get_core_pointer __attribute((visibility("hidden")));
-#define gdk_display_get_core_pointer IA__gdk_display_get_core_pointer
-
-extern __typeof (gdk_display_get_event) IA__gdk_display_get_event __attribute((visibility("hidden")));
-#define gdk_display_get_event IA__gdk_display_get_event
-
-extern __typeof (gdk_display_get_pointer) IA__gdk_display_get_pointer __attribute((visibility("hidden")));
-#define gdk_display_get_pointer IA__gdk_display_get_pointer
-
-extern __typeof (gdk_display_get_type) IA__gdk_display_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_display_get_type IA__gdk_display_get_type
-
-extern __typeof (gdk_display_get_window_at_pointer) IA__gdk_display_get_window_at_pointer __attribute((visibility("hidden")));
-#define gdk_display_get_window_at_pointer IA__gdk_display_get_window_at_pointer
-
-extern __typeof (gdk_display_peek_event) IA__gdk_display_peek_event __attribute((visibility("hidden")));
-#define gdk_display_peek_event IA__gdk_display_peek_event
-
-extern __typeof (gdk_display_put_event) IA__gdk_display_put_event __attribute((visibility("hidden")));
-#define gdk_display_put_event IA__gdk_display_put_event
-
-extern __typeof (gdk_display_set_pointer_hooks) IA__gdk_display_set_pointer_hooks __attribute((visibility("hidden")));
-#define gdk_display_set_pointer_hooks IA__gdk_display_set_pointer_hooks
-
-#endif
-#endif
-#if IN_HEADER(__GDK_DISPLAY_H__)
-#if IN_FILE(__GDK_WINDOW_X11_C__)
-extern __typeof (gdk_display_warp_pointer) IA__gdk_display_warp_pointer __attribute((visibility("hidden")));
-#define gdk_display_warp_pointer IA__gdk_display_warp_pointer
-
-#endif
-#endif
-#if IN_HEADER(__GDK_DISPLAY_H__)
-#if IN_FILE(__GDK_DISPLAY_MANAGER_C__)
-extern __typeof (gdk_display_get_default) IA__gdk_display_get_default __attribute((visibility("hidden")));
-#define gdk_display_get_default IA__gdk_display_get_default
-
-#endif
-#endif
-#if IN_HEADER(__GDK_DISPLAY_H__)
-#if IN_FILE(__GDK_CURSOR_X11_C__)
-extern __typeof (gdk_display_get_default_cursor_size) IA__gdk_display_get_default_cursor_size __attribute((visibility("hidden")));
-#define gdk_display_get_default_cursor_size IA__gdk_display_get_default_cursor_size
-
-extern __typeof (gdk_display_get_maximal_cursor_size) IA__gdk_display_get_maximal_cursor_size __attribute((visibility("hidden")));
-#define gdk_display_get_maximal_cursor_size IA__gdk_display_get_maximal_cursor_size
-
-extern __typeof (gdk_display_supports_cursor_alpha) IA__gdk_display_supports_cursor_alpha __attribute((visibility("hidden")));
-#define gdk_display_supports_cursor_alpha IA__gdk_display_supports_cursor_alpha
-
-extern __typeof (gdk_display_supports_cursor_color) IA__gdk_display_supports_cursor_color __attribute((visibility("hidden")));
-#define gdk_display_supports_cursor_color IA__gdk_display_supports_cursor_color
-
-#endif
-#endif
-#if IN_HEADER(__GDK_DISPLAY_H__)
-#if IN_FILE(__GDK_DISPLAY_X11_C__)
-extern __typeof (gdk_display_beep) IA__gdk_display_beep __attribute((visibility("hidden")));
-#define gdk_display_beep IA__gdk_display_beep
-
-extern __typeof (gdk_display_sync) IA__gdk_display_sync __attribute((visibility("hidden")));
-#define gdk_display_sync IA__gdk_display_sync
-
-extern __typeof (gdk_display_flush) IA__gdk_display_flush __attribute((visibility("hidden")));
-#define gdk_display_flush IA__gdk_display_flush
-
-extern __typeof (gdk_display_get_default_group) IA__gdk_display_get_default_group __attribute((visibility("hidden")));
-#define gdk_display_get_default_group IA__gdk_display_get_default_group
-
-extern __typeof (gdk_display_get_default_screen) IA__gdk_display_get_default_screen __attribute((visibility("hidden")));
-#define gdk_display_get_default_screen IA__gdk_display_get_default_screen
-
-extern __typeof (gdk_display_get_name) IA__gdk_display_get_name __attribute((visibility("hidden")));
-#define gdk_display_get_name IA__gdk_display_get_name
-
-extern __typeof (gdk_display_get_n_screens) IA__gdk_display_get_n_screens __attribute((visibility("hidden")));
-#define gdk_display_get_n_screens IA__gdk_display_get_n_screens
-
-extern __typeof (gdk_display_get_screen) IA__gdk_display_get_screen __attribute((visibility("hidden")));
-#define gdk_display_get_screen IA__gdk_display_get_screen
-
-extern __typeof (gdk_display_pointer_is_grabbed) IA__gdk_display_pointer_is_grabbed __attribute((visibility("hidden")));
-#define gdk_display_pointer_is_grabbed IA__gdk_display_pointer_is_grabbed
-
-extern __typeof (gdk_display_pointer_ungrab) IA__gdk_display_pointer_ungrab __attribute((visibility("hidden")));
-#define gdk_display_pointer_ungrab IA__gdk_display_pointer_ungrab
-
-extern __typeof (gdk_display_keyboard_ungrab) IA__gdk_display_keyboard_ungrab __attribute((visibility("hidden")));
-#define gdk_display_keyboard_ungrab IA__gdk_display_keyboard_ungrab
-
-extern __typeof (gdk_display_open) IA__gdk_display_open __attribute((visibility("hidden")));
-#define gdk_display_open IA__gdk_display_open
-
-extern __typeof (gdk_display_request_selection_notification) IA__gdk_display_request_selection_notification __attribute((visibility("hidden")));
-#define gdk_display_request_selection_notification IA__gdk_display_request_selection_notification
-
-extern __typeof (gdk_display_store_clipboard) IA__gdk_display_store_clipboard __attribute((visibility("hidden")));
-#define gdk_display_store_clipboard IA__gdk_display_store_clipboard
-
-extern __typeof (gdk_display_supports_clipboard_persistence) IA__gdk_display_supports_clipboard_persistence __attribute((visibility("hidden")));
-#define gdk_display_supports_clipboard_persistence IA__gdk_display_supports_clipboard_persistence
-
-extern __typeof (gdk_display_supports_selection_notification) IA__gdk_display_supports_selection_notification __attribute((visibility("hidden")));
-#define gdk_display_supports_selection_notification IA__gdk_display_supports_selection_notification
-
-extern __typeof (gdk_display_supports_shapes) IA__gdk_display_supports_shapes __attribute((visibility("hidden")));
-#define gdk_display_supports_shapes IA__gdk_display_supports_shapes
-
-extern __typeof (gdk_display_supports_input_shapes) IA__gdk_display_supports_input_shapes __attribute((visibility("hidden")));
-#define gdk_display_supports_input_shapes IA__gdk_display_supports_input_shapes
-
-extern __typeof (gdk_display_supports_composite) IA__gdk_display_supports_composite __attribute((visibility("hidden")));
-#define gdk_display_supports_composite IA__gdk_display_supports_composite
-
-#endif
-#endif
-#if IN_HEADER(__GDK_DISPLAY_H__)
-#if IN_FILE(__GDK_INPUT_C__)
-extern __typeof (gdk_display_list_devices) IA__gdk_display_list_devices __attribute((visibility("hidden")));
-#define gdk_display_list_devices IA__gdk_display_list_devices
-
-#endif
-#endif
-#if IN_HEADER(__GDK_DISPLAY_H__)
-#if IN_FILE(__GDK_C__)
-extern __typeof (gdk_display_open_default_libgtk_only) IA__gdk_display_open_default_libgtk_only __attribute((visibility("hidden")));
-#define gdk_display_open_default_libgtk_only IA__gdk_display_open_default_libgtk_only
-
-#endif
-#endif
-#if IN_HEADER(__GDK_DISPLAY_H__)
-#if IN_FILE(__GDK_EVENTS_C__)
-extern __typeof (gdk_display_set_double_click_distance) IA__gdk_display_set_double_click_distance __attribute((visibility("hidden")));
-#define gdk_display_set_double_click_distance IA__gdk_display_set_double_click_distance
-
-extern __typeof (gdk_display_set_double_click_time) IA__gdk_display_set_double_click_time __attribute((visibility("hidden")));
-#define gdk_display_set_double_click_time IA__gdk_display_set_double_click_time
-
-#endif
-#endif
-#if IN_HEADER(__GDK_DISPLAY_MANAGER_H__)
-#if IN_FILE(__GDK_DISPLAY_MANAGER_C__)
-extern __typeof (gdk_display_manager_get) IA__gdk_display_manager_get __attribute((visibility("hidden")));
-#define gdk_display_manager_get IA__gdk_display_manager_get
-
-extern __typeof (gdk_display_manager_get_type) IA__gdk_display_manager_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_display_manager_get_type IA__gdk_display_manager_get_type
-
-extern __typeof (gdk_display_manager_list_displays) IA__gdk_display_manager_list_displays __attribute((visibility("hidden")));
-#define gdk_display_manager_list_displays IA__gdk_display_manager_list_displays
-
-extern __typeof (gdk_display_manager_set_default_display) IA__gdk_display_manager_set_default_display __attribute((visibility("hidden")));
-#define gdk_display_manager_set_default_display IA__gdk_display_manager_set_default_display
-
-extern __typeof (gdk_display_manager_get_default_display) IA__gdk_display_manager_get_default_display __attribute((visibility("hidden")));
-#define gdk_display_manager_get_default_display IA__gdk_display_manager_get_default_display
-
-#endif
-#endif
-#if IN_HEADER(__GDK_DND_H__)
-#if IN_FILE(__GDK_DND_X11_C__)
-extern __typeof (gdk_drag_abort) IA__gdk_drag_abort __attribute((visibility("hidden")));
-#define gdk_drag_abort IA__gdk_drag_abort
-
-extern __typeof (gdk_drag_begin) IA__gdk_drag_begin __attribute((visibility("hidden")));
-#define gdk_drag_begin IA__gdk_drag_begin
-
-extern __typeof (gdk_drag_context_get_type) IA__gdk_drag_context_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_drag_context_get_type IA__gdk_drag_context_get_type
-
-extern __typeof (gdk_drag_context_new) IA__gdk_drag_context_new __attribute((visibility("hidden")));
-#define gdk_drag_context_new IA__gdk_drag_context_new
-
-#ifndef GDK_DISABLE_DEPRECATED
-extern __typeof (gdk_drag_context_ref) IA__gdk_drag_context_ref __attribute((visibility("hidden")));
-#define gdk_drag_context_ref IA__gdk_drag_context_ref
-
-extern __typeof (gdk_drag_context_unref) IA__gdk_drag_context_unref __attribute((visibility("hidden")));
-#define gdk_drag_context_unref IA__gdk_drag_context_unref
-
-#endif
-extern __typeof (gdk_drag_drop) IA__gdk_drag_drop __attribute((visibility("hidden")));
-#define gdk_drag_drop IA__gdk_drag_drop
-
-extern __typeof (gdk_drag_drop_succeeded) IA__gdk_drag_drop_succeeded __attribute((visibility("hidden")));
-#define gdk_drag_drop_succeeded IA__gdk_drag_drop_succeeded
-
-extern __typeof (gdk_drag_find_window_for_screen) IA__gdk_drag_find_window_for_screen __attribute((visibility("hidden")));
-#define gdk_drag_find_window_for_screen IA__gdk_drag_find_window_for_screen
-
-extern __typeof (gdk_drag_get_protocol_for_display) IA__gdk_drag_get_protocol_for_display __attribute((visibility("hidden")));
-#define gdk_drag_get_protocol_for_display IA__gdk_drag_get_protocol_for_display
-
-extern __typeof (gdk_drag_get_selection) IA__gdk_drag_get_selection __attribute((visibility("hidden")));
-#define gdk_drag_get_selection IA__gdk_drag_get_selection
-
-extern __typeof (gdk_drag_motion) IA__gdk_drag_motion __attribute((visibility("hidden")));
-#define gdk_drag_motion IA__gdk_drag_motion
-
-extern __typeof (gdk_drag_status) IA__gdk_drag_status __attribute((visibility("hidden")));
-#define gdk_drag_status IA__gdk_drag_status
-
-extern __typeof (gdk_drop_finish) IA__gdk_drop_finish __attribute((visibility("hidden")));
-#define gdk_drop_finish IA__gdk_drop_finish
-
-extern __typeof (gdk_drop_reply) IA__gdk_drop_reply __attribute((visibility("hidden")));
-#define gdk_drop_reply IA__gdk_drop_reply
-
-#endif
-#endif
-#if IN_HEADER(__GDK_DND_H__)
-#if IN_FILE(__GDK_DND_C__)
-extern __typeof (gdk_drag_find_window) IA__gdk_drag_find_window __attribute((visibility("hidden")));
-#define gdk_drag_find_window IA__gdk_drag_find_window
-
-extern __typeof (gdk_drag_get_protocol) IA__gdk_drag_get_protocol __attribute((visibility("hidden")));
-#define gdk_drag_get_protocol IA__gdk_drag_get_protocol
-
-#endif
-#endif
-#if IN_HEADER(__GDK_DRAWABLE_H__)
-#if IN_FILE(__GDK_DRAW_C__)
-extern __typeof (gdk_drawable_copy_to_image) IA__gdk_drawable_copy_to_image __attribute((visibility("hidden")));
-#define gdk_drawable_copy_to_image IA__gdk_drawable_copy_to_image
-
-extern __typeof (gdk_drawable_get_clip_region) IA__gdk_drawable_get_clip_region __attribute((visibility("hidden")));
-#define gdk_drawable_get_clip_region IA__gdk_drawable_get_clip_region
-
-extern __typeof (gdk_drawable_get_colormap) IA__gdk_drawable_get_colormap __attribute((visibility("hidden")));
-#define gdk_drawable_get_colormap IA__gdk_drawable_get_colormap
-
-#ifndef GDK_DISABLE_DEPRECATED
-extern __typeof (gdk_drawable_get_data) IA__gdk_drawable_get_data __attribute((visibility("hidden")));
-#define gdk_drawable_get_data IA__gdk_drawable_get_data
-
-extern __typeof (gdk_drawable_set_data) IA__gdk_drawable_set_data __attribute((visibility("hidden")));
-#define gdk_drawable_set_data IA__gdk_drawable_set_data
-
-extern __typeof (gdk_drawable_ref) IA__gdk_drawable_ref __attribute((visibility("hidden")));
-#define gdk_drawable_ref IA__gdk_drawable_ref
-
-extern __typeof (gdk_drawable_unref) IA__gdk_drawable_unref __attribute((visibility("hidden")));
-#define gdk_drawable_unref IA__gdk_drawable_unref
-
-extern __typeof (gdk_draw_string) IA__gdk_draw_string __attribute((visibility("hidden")));
-#define gdk_draw_string IA__gdk_draw_string
-
-extern __typeof (gdk_draw_text) IA__gdk_draw_text __attribute((visibility("hidden")));
-#define gdk_draw_text IA__gdk_draw_text
-
-extern __typeof (gdk_draw_text_wc) IA__gdk_draw_text_wc __attribute((visibility("hidden")));
-#define gdk_draw_text_wc IA__gdk_draw_text_wc
-
-#endif
-extern __typeof (gdk_drawable_get_depth) IA__gdk_drawable_get_depth __attribute((visibility("hidden")));
-#define gdk_drawable_get_depth IA__gdk_drawable_get_depth
-
-extern __typeof (gdk_drawable_get_display) IA__gdk_drawable_get_display __attribute((visibility("hidden")));
-#define gdk_drawable_get_display IA__gdk_drawable_get_display
-
-extern __typeof (gdk_drawable_get_image) IA__gdk_drawable_get_image __attribute((visibility("hidden")));
-#define gdk_drawable_get_image IA__gdk_drawable_get_image
-
-extern __typeof (gdk_drawable_get_screen) IA__gdk_drawable_get_screen __attribute((visibility("hidden")));
-#define gdk_drawable_get_screen IA__gdk_drawable_get_screen
-
-extern __typeof (gdk_drawable_get_size) IA__gdk_drawable_get_size __attribute((visibility("hidden")));
-#define gdk_drawable_get_size IA__gdk_drawable_get_size
-
-extern __typeof (gdk_drawable_get_type) IA__gdk_drawable_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_drawable_get_type IA__gdk_drawable_get_type
-
-extern __typeof (gdk_drawable_get_visible_region) IA__gdk_drawable_get_visible_region __attribute((visibility("hidden")));
-#define gdk_drawable_get_visible_region IA__gdk_drawable_get_visible_region
-
-extern __typeof (gdk_drawable_get_visual) IA__gdk_drawable_get_visual __attribute((visibility("hidden")));
-#define gdk_drawable_get_visual IA__gdk_drawable_get_visual
-
-extern __typeof (gdk_drawable_set_colormap) IA__gdk_drawable_set_colormap __attribute((visibility("hidden")));
-#define gdk_drawable_set_colormap IA__gdk_drawable_set_colormap
-
-extern __typeof (gdk_draw_arc) IA__gdk_draw_arc __attribute((visibility("hidden")));
-#define gdk_draw_arc IA__gdk_draw_arc
-
-extern __typeof (gdk_draw_drawable) IA__gdk_draw_drawable __attribute((visibility("hidden")));
-#define gdk_draw_drawable IA__gdk_draw_drawable
-
-extern __typeof (gdk_draw_glyphs) IA__gdk_draw_glyphs __attribute((visibility("hidden")));
-#define gdk_draw_glyphs IA__gdk_draw_glyphs
-
-extern __typeof (gdk_draw_glyphs_transformed) IA__gdk_draw_glyphs_transformed __attribute((visibility("hidden")));
-#define gdk_draw_glyphs_transformed IA__gdk_draw_glyphs_transformed
-
-extern __typeof (gdk_draw_image) IA__gdk_draw_image __attribute((visibility("hidden")));
-#define gdk_draw_image IA__gdk_draw_image
-
-extern __typeof (gdk_draw_line) IA__gdk_draw_line __attribute((visibility("hidden")));
-#define gdk_draw_line IA__gdk_draw_line
-
-extern __typeof (gdk_draw_lines) IA__gdk_draw_lines __attribute((visibility("hidden")));
-#define gdk_draw_lines IA__gdk_draw_lines
-
-extern __typeof (gdk_draw_pixbuf) IA__gdk_draw_pixbuf __attribute((visibility("hidden")));
-#define gdk_draw_pixbuf IA__gdk_draw_pixbuf
-
-extern __typeof (gdk_draw_point) IA__gdk_draw_point __attribute((visibility("hidden")));
-#define gdk_draw_point IA__gdk_draw_point
-
-extern __typeof (gdk_draw_points) IA__gdk_draw_points __attribute((visibility("hidden")));
-#define gdk_draw_points IA__gdk_draw_points
-
-extern __typeof (gdk_draw_polygon) IA__gdk_draw_polygon __attribute((visibility("hidden")));
-#define gdk_draw_polygon IA__gdk_draw_polygon
-
-extern __typeof (gdk_draw_rectangle) IA__gdk_draw_rectangle __attribute((visibility("hidden")));
-#define gdk_draw_rectangle IA__gdk_draw_rectangle
-
-extern __typeof (gdk_draw_segments) IA__gdk_draw_segments __attribute((visibility("hidden")));
-#define gdk_draw_segments IA__gdk_draw_segments
-
-extern __typeof (gdk_draw_trapezoids) IA__gdk_draw_trapezoids __attribute((visibility("hidden")));
-#define gdk_draw_trapezoids IA__gdk_draw_trapezoids
-
-#endif
-#endif
-#if IN_HEADER(__GDK_DRAWABLE_H__)
-#if IN_FILE(__GDK_PANGO_C__)
-extern __typeof (gdk_draw_layout) IA__gdk_draw_layout __attribute((visibility("hidden")));
-#define gdk_draw_layout IA__gdk_draw_layout
-
-extern __typeof (gdk_draw_layout_line) IA__gdk_draw_layout_line __attribute((visibility("hidden")));
-#define gdk_draw_layout_line IA__gdk_draw_layout_line
-
-extern __typeof (gdk_draw_layout_line_with_colors) IA__gdk_draw_layout_line_with_colors __attribute((visibility("hidden")));
-#define gdk_draw_layout_line_with_colors IA__gdk_draw_layout_line_with_colors
-
-extern __typeof (gdk_draw_layout_with_colors) IA__gdk_draw_layout_with_colors __attribute((visibility("hidden")));
-#define gdk_draw_layout_with_colors IA__gdk_draw_layout_with_colors
-
-#endif
-#endif
-#if IN_HEADER(__GDK_GC_H__)
-#if IN_FILE(__GDK_GC_C__)
-extern __typeof (gdk_gc_new) IA__gdk_gc_new __attribute((visibility("hidden")));
-#define gdk_gc_new IA__gdk_gc_new
-
-extern __typeof (gdk_gc_get_type) IA__gdk_gc_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_gc_get_type IA__gdk_gc_get_type
-
-extern __typeof (gdk_gc_new_with_values) IA__gdk_gc_new_with_values __attribute((visibility("hidden")));
-#define gdk_gc_new_with_values IA__gdk_gc_new_with_values
-
-#ifndef GDK_DISABLE_DEPRECATED
-extern __typeof (gdk_gc_ref) IA__gdk_gc_ref __attribute((visibility("hidden")));
-#define gdk_gc_ref IA__gdk_gc_ref
-
-extern __typeof (gdk_gc_unref) IA__gdk_gc_unref __attribute((visibility("hidden")));
-#define gdk_gc_unref IA__gdk_gc_unref
-
-extern __typeof (gdk_gc_set_font) IA__gdk_gc_set_font __attribute((visibility("hidden")));
-#define gdk_gc_set_font IA__gdk_gc_set_font
-
-#endif
-extern __typeof (gdk_gc_get_values) IA__gdk_gc_get_values __attribute((visibility("hidden")));
-#define gdk_gc_get_values IA__gdk_gc_get_values
-
-extern __typeof (gdk_gc_set_values) IA__gdk_gc_set_values __attribute((visibility("hidden")));
-#define gdk_gc_set_values IA__gdk_gc_set_values
-
-extern __typeof (gdk_gc_set_foreground) IA__gdk_gc_set_foreground __attribute((visibility("hidden")));
-#define gdk_gc_set_foreground IA__gdk_gc_set_foreground
-
-extern __typeof (gdk_gc_set_background) IA__gdk_gc_set_background __attribute((visibility("hidden")));
-#define gdk_gc_set_background IA__gdk_gc_set_background
-
-extern __typeof (gdk_gc_set_function) IA__gdk_gc_set_function __attribute((visibility("hidden")));
-#define gdk_gc_set_function IA__gdk_gc_set_function
-
-extern __typeof (gdk_gc_set_fill) IA__gdk_gc_set_fill __attribute((visibility("hidden")));
-#define gdk_gc_set_fill IA__gdk_gc_set_fill
-
-extern __typeof (gdk_gc_set_tile) IA__gdk_gc_set_tile __attribute((visibility("hidden")));
-#define gdk_gc_set_tile IA__gdk_gc_set_tile
-
-extern __typeof (gdk_gc_set_stipple) IA__gdk_gc_set_stipple __attribute((visibility("hidden")));
-#define gdk_gc_set_stipple IA__gdk_gc_set_stipple
-
-extern __typeof (gdk_gc_set_ts_origin) IA__gdk_gc_set_ts_origin __attribute((visibility("hidden")));
-#define gdk_gc_set_ts_origin IA__gdk_gc_set_ts_origin
-
-extern __typeof (gdk_gc_set_clip_origin) IA__gdk_gc_set_clip_origin __attribute((visibility("hidden")));
-#define gdk_gc_set_clip_origin IA__gdk_gc_set_clip_origin
-
-extern __typeof (gdk_gc_set_clip_mask) IA__gdk_gc_set_clip_mask __attribute((visibility("hidden")));
-#define gdk_gc_set_clip_mask IA__gdk_gc_set_clip_mask
-
-extern __typeof (gdk_gc_set_clip_rectangle) IA__gdk_gc_set_clip_rectangle __attribute((visibility("hidden")));
-#define gdk_gc_set_clip_rectangle IA__gdk_gc_set_clip_rectangle
-
-extern __typeof (gdk_gc_set_clip_region) IA__gdk_gc_set_clip_region __attribute((visibility("hidden")));
-#define gdk_gc_set_clip_region IA__gdk_gc_set_clip_region
-
-extern __typeof (gdk_gc_set_subwindow) IA__gdk_gc_set_subwindow __attribute((visibility("hidden")));
-#define gdk_gc_set_subwindow IA__gdk_gc_set_subwindow
-
-extern __typeof (gdk_gc_set_exposures) IA__gdk_gc_set_exposures __attribute((visibility("hidden")));
-#define gdk_gc_set_exposures IA__gdk_gc_set_exposures
-
-extern __typeof (gdk_gc_set_line_attributes) IA__gdk_gc_set_line_attributes __attribute((visibility("hidden")));
-#define gdk_gc_set_line_attributes IA__gdk_gc_set_line_attributes
-
-extern __typeof (gdk_gc_set_dashes) IA__gdk_gc_set_dashes __attribute((visibility("hidden")));
-#define gdk_gc_set_dashes IA__gdk_gc_set_dashes
-
-extern __typeof (gdk_gc_offset) IA__gdk_gc_offset __attribute((visibility("hidden")));
-#define gdk_gc_offset IA__gdk_gc_offset
-
-extern __typeof (gdk_gc_copy) IA__gdk_gc_copy __attribute((visibility("hidden")));
-#define gdk_gc_copy IA__gdk_gc_copy
-
-extern __typeof (gdk_gc_get_colormap) IA__gdk_gc_get_colormap __attribute((visibility("hidden")));
-#define gdk_gc_get_colormap IA__gdk_gc_get_colormap
-
-extern __typeof (gdk_gc_set_colormap) IA__gdk_gc_set_colormap __attribute((visibility("hidden")));
-#define gdk_gc_set_colormap IA__gdk_gc_set_colormap
-
-extern __typeof (gdk_gc_set_rgb_bg_color) IA__gdk_gc_set_rgb_bg_color __attribute((visibility("hidden")));
-#define gdk_gc_set_rgb_bg_color IA__gdk_gc_set_rgb_bg_color
-
-extern __typeof (gdk_gc_set_rgb_fg_color) IA__gdk_gc_set_rgb_fg_color __attribute((visibility("hidden")));
-#define gdk_gc_set_rgb_fg_color IA__gdk_gc_set_rgb_fg_color
-
-#endif
-#endif
-#if IN_HEADER(__GDK_GC_H__)
-#if IN_FILE(__GDK_GC_X11_C__)
-extern __typeof (gdk_gc_get_screen) IA__gdk_gc_get_screen __attribute((visibility("hidden")));
-#define gdk_gc_get_screen IA__gdk_gc_get_screen
-
-#endif
-#endif
-#if IN_HEADER(__GDK_PIXMAP_X11_H__)
-#if IN_FILE(__GDK_PIXMAP_X11_C__)
-#ifdef GDK_WINDOWING_X11
-extern __typeof (gdk_pixmap_impl_x11_get_type) IA__gdk_pixmap_impl_x11_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_pixmap_impl_x11_get_type IA__gdk_pixmap_impl_x11_get_type
-
-#endif
-#endif
-#endif
-#if IN_HEADER(__GDK_WINDOW_X11_H__)
-#if IN_FILE(__GDK_WINDOW_X11_C__)
-#ifdef GDK_WINDOWING_X11
-extern __typeof (gdk_window_impl_x11_get_type) IA__gdk_window_impl_x11_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_window_impl_x11_get_type IA__gdk_window_impl_x11_get_type
-
-#endif
-#endif
-#endif
-#if IN_HEADER(__GDK_WINDOW_H__)
-#if IN_FILE(__GDK_WINDOW_C__)
-extern __typeof (gdk_get_default_root_window) IA__gdk_get_default_root_window __attribute((visibility("hidden")));
-#define gdk_get_default_root_window IA__gdk_get_default_root_window
-
-extern __typeof (gdk_window_add_filter) IA__gdk_window_add_filter __attribute((visibility("hidden")));
-#define gdk_window_add_filter IA__gdk_window_add_filter
-
-extern __typeof (gdk_window_at_pointer) IA__gdk_window_at_pointer __attribute((visibility("hidden")));
-#define gdk_window_at_pointer IA__gdk_window_at_pointer
-
-extern __typeof (gdk_window_begin_paint_rect) IA__gdk_window_begin_paint_rect __attribute((visibility("hidden")));
-#define gdk_window_begin_paint_rect IA__gdk_window_begin_paint_rect
-
-extern __typeof (gdk_window_begin_paint_region) IA__gdk_window_begin_paint_region __attribute((visibility("hidden")));
-#define gdk_window_begin_paint_region IA__gdk_window_begin_paint_region
-
-extern __typeof (gdk_window_clear) IA__gdk_window_clear __attribute((visibility("hidden")));
-#define gdk_window_clear IA__gdk_window_clear
-
-extern __typeof (gdk_window_clear_area) IA__gdk_window_clear_area __attribute((visibility("hidden")));
-#define gdk_window_clear_area IA__gdk_window_clear_area
-
-extern __typeof (gdk_window_clear_area_e) IA__gdk_window_clear_area_e __attribute((visibility("hidden")));
-#define gdk_window_clear_area_e IA__gdk_window_clear_area_e
-
-extern __typeof (gdk_window_constrain_size) IA__gdk_window_constrain_size __attribute((visibility("hidden")));
-#define gdk_window_constrain_size IA__gdk_window_constrain_size
-
-extern __typeof (gdk_window_destroy) IA__gdk_window_destroy __attribute((visibility("hidden")));
-#define gdk_window_destroy IA__gdk_window_destroy
-
-extern __typeof (gdk_window_end_paint) IA__gdk_window_end_paint __attribute((visibility("hidden")));
-#define gdk_window_end_paint IA__gdk_window_end_paint
-
-extern __typeof (gdk_window_foreign_new) IA__gdk_window_foreign_new __attribute((visibility("hidden")));
-#define gdk_window_foreign_new IA__gdk_window_foreign_new
-
-extern __typeof (gdk_window_freeze_toplevel_updates_libgtk_only) IA__gdk_window_freeze_toplevel_updates_libgtk_only __attribute((visibility("hidden")));
-#define gdk_window_freeze_toplevel_updates_libgtk_only IA__gdk_window_freeze_toplevel_updates_libgtk_only
-
-extern __typeof (gdk_window_freeze_updates) IA__gdk_window_freeze_updates __attribute((visibility("hidden")));
-#define gdk_window_freeze_updates IA__gdk_window_freeze_updates
-
-extern __typeof (gdk_window_get_children) IA__gdk_window_get_children __attribute((visibility("hidden")));
-#define gdk_window_get_children IA__gdk_window_get_children
-
-extern __typeof (gdk_window_get_internal_paint_info) IA__gdk_window_get_internal_paint_info __attribute((visibility("hidden")));
-#define gdk_window_get_internal_paint_info IA__gdk_window_get_internal_paint_info
-
-extern __typeof (gdk_window_get_parent) IA__gdk_window_get_parent __attribute((visibility("hidden")));
-#define gdk_window_get_parent IA__gdk_window_get_parent
-
-extern __typeof (gdk_window_get_pointer) IA__gdk_window_get_pointer __attribute((visibility("hidden")));
-#define gdk_window_get_pointer IA__gdk_window_get_pointer
-
-extern __typeof (gdk_window_get_position) IA__gdk_window_get_position __attribute((visibility("hidden")));
-#define gdk_window_get_position IA__gdk_window_get_position
-
-extern __typeof (gdk_window_get_state) IA__gdk_window_get_state __attribute((visibility("hidden")));
-#define gdk_window_get_state IA__gdk_window_get_state
-
-extern __typeof (gdk_window_get_toplevel) IA__gdk_window_get_toplevel __attribute((visibility("hidden")));
-#define gdk_window_get_toplevel IA__gdk_window_get_toplevel
-
-extern __typeof (gdk_window_get_toplevels) IA__gdk_window_get_toplevels __attribute((visibility("hidden")));
-#define gdk_window_get_toplevels IA__gdk_window_get_toplevels
-
-extern __typeof (gdk_window_get_update_area) IA__gdk_window_get_update_area __attribute((visibility("hidden")));
-#define gdk_window_get_update_area IA__gdk_window_get_update_area
-
-extern __typeof (gdk_window_get_user_data) IA__gdk_window_get_user_data __attribute((visibility("hidden")));
-#define gdk_window_get_user_data IA__gdk_window_get_user_data
-
-extern __typeof (gdk_window_get_window_type) IA__gdk_window_get_window_type __attribute((visibility("hidden")));
-#define gdk_window_get_window_type IA__gdk_window_get_window_type
-
-extern __typeof (gdk_window_invalidate_maybe_recurse) IA__gdk_window_invalidate_maybe_recurse __attribute((visibility("hidden")));
-#define gdk_window_invalidate_maybe_recurse IA__gdk_window_invalidate_maybe_recurse
-
-extern __typeof (gdk_window_invalidate_rect) IA__gdk_window_invalidate_rect __attribute((visibility("hidden")));
-#define gdk_window_invalidate_rect IA__gdk_window_invalidate_rect
-
-extern __typeof (gdk_window_invalidate_region) IA__gdk_window_invalidate_region __attribute((visibility("hidden")));
-#define gdk_window_invalidate_region IA__gdk_window_invalidate_region
-
-extern __typeof (gdk_window_is_viewable) IA__gdk_window_is_viewable __attribute((visibility("hidden")));
-#define gdk_window_is_viewable IA__gdk_window_is_viewable
-
-extern __typeof (gdk_window_is_visible) IA__gdk_window_is_visible __attribute((visibility("hidden")));
-#define gdk_window_is_visible IA__gdk_window_is_visible
-
-extern __typeof (gdk_window_object_get_type) IA__gdk_window_object_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_window_object_get_type IA__gdk_window_object_get_type
-
-extern __typeof (gdk_window_peek_children) IA__gdk_window_peek_children __attribute((visibility("hidden")));
-#define gdk_window_peek_children IA__gdk_window_peek_children
-
-extern __typeof (gdk_window_process_all_updates) IA__gdk_window_process_all_updates __attribute((visibility("hidden")));
-#define gdk_window_process_all_updates IA__gdk_window_process_all_updates
-
-extern __typeof (gdk_window_process_updates) IA__gdk_window_process_updates __attribute((visibility("hidden")));
-#define gdk_window_process_updates IA__gdk_window_process_updates
-
-extern __typeof (gdk_window_remove_filter) IA__gdk_window_remove_filter __attribute((visibility("hidden")));
-#define gdk_window_remove_filter IA__gdk_window_remove_filter
-
-extern __typeof (gdk_window_set_debug_updates) IA__gdk_window_set_debug_updates __attribute((visibility("hidden")));
-#define gdk_window_set_debug_updates IA__gdk_window_set_debug_updates
-
-extern __typeof (gdk_window_set_user_data) IA__gdk_window_set_user_data __attribute((visibility("hidden")));
-#define gdk_window_set_user_data IA__gdk_window_set_user_data
-
-extern __typeof (gdk_window_thaw_toplevel_updates_libgtk_only) IA__gdk_window_thaw_toplevel_updates_libgtk_only __attribute((visibility("hidden")));
-#define gdk_window_thaw_toplevel_updates_libgtk_only IA__gdk_window_thaw_toplevel_updates_libgtk_only
-
-extern __typeof (gdk_window_thaw_updates) IA__gdk_window_thaw_updates __attribute((visibility("hidden")));
-#define gdk_window_thaw_updates IA__gdk_window_thaw_updates
-
-extern __typeof (gdk_window_set_composited) IA__gdk_window_set_composited __attribute((visibility("hidden")));
-#define gdk_window_set_composited IA__gdk_window_set_composited
-
-#endif
-#endif
-#if IN_HEADER(__GDK_WINDOW_H__)
-#if IN_FILE(__GDK_DND_X11_C__)
-extern __typeof (gdk_window_register_dnd) IA__gdk_window_register_dnd __attribute((visibility("hidden")));
-#define gdk_window_register_dnd IA__gdk_window_register_dnd
-
-#endif
-#endif
-#if IN_HEADER(__GDK_WINDOW_H__)
-#if IN_FILE(__GDK_GEOMETRY_X11_C__)
-extern __typeof (gdk_window_scroll) IA__gdk_window_scroll __attribute((visibility("hidden")));
-#define gdk_window_scroll IA__gdk_window_scroll
-
-extern __typeof (gdk_window_move_region) IA__gdk_window_move_region __attribute((visibility("hidden")));
-#define gdk_window_move_region IA__gdk_window_move_region
-
-#endif
-#endif
-#if IN_HEADER(__GDK_WINDOW_H__)
-#if IN_FILE(__GDK_WINDOW_X11_C__)
-extern __typeof (gdk_window_new) IA__gdk_window_new __attribute((visibility("hidden")));
-#define gdk_window_new IA__gdk_window_new
-
-extern __typeof (gdk_window_foreign_new_for_display) IA__gdk_window_foreign_new_for_display __attribute((visibility("hidden")));
-#define gdk_window_foreign_new_for_display IA__gdk_window_foreign_new_for_display
-
-extern __typeof (gdk_window_lookup) IA__gdk_window_lookup __attribute((visibility("hidden")));
-#define gdk_window_lookup IA__gdk_window_lookup
-
-extern __typeof (gdk_window_lookup_for_display) IA__gdk_window_lookup_for_display __attribute((visibility("hidden")));
-#define gdk_window_lookup_for_display IA__gdk_window_lookup_for_display
-
-extern __typeof (gdk_window_show_unraised) IA__gdk_window_show_unraised __attribute((visibility("hidden")));
-#define gdk_window_show_unraised IA__gdk_window_show_unraised
-
-extern __typeof (gdk_window_show) IA__gdk_window_show __attribute((visibility("hidden")));
-#define gdk_window_show IA__gdk_window_show
-
-extern __typeof (gdk_window_hide) IA__gdk_window_hide __attribute((visibility("hidden")));
-#define gdk_window_hide IA__gdk_window_hide
-
-extern __typeof (gdk_window_withdraw) IA__gdk_window_withdraw __attribute((visibility("hidden")));
-#define gdk_window_withdraw IA__gdk_window_withdraw
-
-extern __typeof (gdk_window_move) IA__gdk_window_move __attribute((visibility("hidden")));
-#define gdk_window_move IA__gdk_window_move
-
-extern __typeof (gdk_window_resize) IA__gdk_window_resize __attribute((visibility("hidden")));
-#define gdk_window_resize IA__gdk_window_resize
-
-extern __typeof (gdk_window_move_resize) IA__gdk_window_move_resize __attribute((visibility("hidden")));
-#define gdk_window_move_resize IA__gdk_window_move_resize
-
-extern __typeof (gdk_window_reparent) IA__gdk_window_reparent __attribute((visibility("hidden")));
-#define gdk_window_reparent IA__gdk_window_reparent
-
-extern __typeof (gdk_window_raise) IA__gdk_window_raise __attribute((visibility("hidden")));
-#define gdk_window_raise IA__gdk_window_raise
-
-extern __typeof (gdk_window_lower) IA__gdk_window_lower __attribute((visibility("hidden")));
-#define gdk_window_lower IA__gdk_window_lower
-
-extern __typeof (gdk_window_focus) IA__gdk_window_focus __attribute((visibility("hidden")));
-#define gdk_window_focus IA__gdk_window_focus
-
-#ifndef GDK_DISABLE_DEPRECATED
-extern __typeof (gdk_window_set_hints) IA__gdk_window_set_hints __attribute((visibility("hidden")));
-#define gdk_window_set_hints IA__gdk_window_set_hints
-
-extern __typeof (gdk_window_get_deskrelative_origin) IA__gdk_window_get_deskrelative_origin __attribute((visibility("hidden")));
-#define gdk_window_get_deskrelative_origin IA__gdk_window_get_deskrelative_origin
-
-#endif
-extern __typeof (gdk_window_get_type_hint) IA__gdk_window_get_type_hint __attribute((visibility("hidden")));
-#define gdk_window_get_type_hint IA__gdk_window_get_type_hint
-
-extern __typeof (gdk_window_set_type_hint) IA__gdk_window_set_type_hint __attribute((visibility("hidden")));
-#define gdk_window_set_type_hint IA__gdk_window_set_type_hint
-
-extern __typeof (gdk_window_set_modal_hint) IA__gdk_window_set_modal_hint __attribute((visibility("hidden")));
-#define gdk_window_set_modal_hint IA__gdk_window_set_modal_hint
-
-extern __typeof (gdk_window_set_skip_taskbar_hint) IA__gdk_window_set_skip_taskbar_hint __attribute((visibility("hidden")));
-#define gdk_window_set_skip_taskbar_hint IA__gdk_window_set_skip_taskbar_hint
-
-extern __typeof (gdk_window_set_skip_pager_hint) IA__gdk_window_set_skip_pager_hint __attribute((visibility("hidden")));
-#define gdk_window_set_skip_pager_hint IA__gdk_window_set_skip_pager_hint
-
-extern __typeof (gdk_window_set_urgency_hint) IA__gdk_window_set_urgency_hint __attribute((visibility("hidden")));
-#define gdk_window_set_urgency_hint IA__gdk_window_set_urgency_hint
-
-extern __typeof (gdk_window_set_geometry_hints) IA__gdk_window_set_geometry_hints __attribute((visibility("hidden")));
-#define gdk_window_set_geometry_hints IA__gdk_window_set_geometry_hints
-
-extern __typeof (gdk_window_set_title) IA__gdk_window_set_title __attribute((visibility("hidden")));
-#define gdk_window_set_title IA__gdk_window_set_title
-
-extern __typeof (gdk_window_set_role) IA__gdk_window_set_role __attribute((visibility("hidden")));
-#define gdk_window_set_role IA__gdk_window_set_role
-
-extern __typeof (gdk_window_set_startup_id) IA__gdk_window_set_startup_id __attribute((visibility("hidden")));
-#define gdk_window_set_startup_id IA__gdk_window_set_startup_id
-
-extern __typeof (gdk_window_set_transient_for) IA__gdk_window_set_transient_for __attribute((visibility("hidden")));
-#define gdk_window_set_transient_for IA__gdk_window_set_transient_for
-
-extern __typeof (gdk_window_set_background) IA__gdk_window_set_background __attribute((visibility("hidden")));
-#define gdk_window_set_background IA__gdk_window_set_background
-
-extern __typeof (gdk_window_set_back_pixmap) IA__gdk_window_set_back_pixmap __attribute((visibility("hidden")));
-#define gdk_window_set_back_pixmap IA__gdk_window_set_back_pixmap
-
-extern __typeof (gdk_window_set_cursor) IA__gdk_window_set_cursor __attribute((visibility("hidden")));
-#define gdk_window_set_cursor IA__gdk_window_set_cursor
-
-extern __typeof (gdk_window_get_geometry) IA__gdk_window_get_geometry __attribute((visibility("hidden")));
-#define gdk_window_get_geometry IA__gdk_window_get_geometry
-
-extern __typeof (gdk_window_get_origin) IA__gdk_window_get_origin __attribute((visibility("hidden")));
-#define gdk_window_get_origin IA__gdk_window_get_origin
-
-extern __typeof (gdk_window_get_root_origin) IA__gdk_window_get_root_origin __attribute((visibility("hidden")));
-#define gdk_window_get_root_origin IA__gdk_window_get_root_origin
-
-extern __typeof (gdk_window_get_frame_extents) IA__gdk_window_get_frame_extents __attribute((visibility("hidden")));
-#define gdk_window_get_frame_extents IA__gdk_window_get_frame_extents
-
-extern __typeof (gdk_window_get_events) IA__gdk_window_get_events __attribute((visibility("hidden")));
-#define gdk_window_get_events IA__gdk_window_get_events
-
-extern __typeof (gdk_window_set_events) IA__gdk_window_set_events __attribute((visibility("hidden")));
-#define gdk_window_set_events IA__gdk_window_set_events
-
-extern __typeof (gdk_window_shape_combine_mask) IA__gdk_window_shape_combine_mask __attribute((visibility("hidden")));
-#define gdk_window_shape_combine_mask IA__gdk_window_shape_combine_mask
-
-extern __typeof (gdk_window_shape_combine_region) IA__gdk_window_shape_combine_region __attribute((visibility("hidden")));
-#define gdk_window_shape_combine_region IA__gdk_window_shape_combine_region
-
-extern __typeof (gdk_window_input_shape_combine_mask) IA__gdk_window_input_shape_combine_mask __attribute((visibility("hidden")));
-#define gdk_window_input_shape_combine_mask IA__gdk_window_input_shape_combine_mask
-
-extern __typeof (gdk_window_input_shape_combine_region) IA__gdk_window_input_shape_combine_region __attribute((visibility("hidden")));
-#define gdk_window_input_shape_combine_region IA__gdk_window_input_shape_combine_region
-
-extern __typeof (gdk_window_set_override_redirect) IA__gdk_window_set_override_redirect __attribute((visibility("hidden")));
-#define gdk_window_set_override_redirect IA__gdk_window_set_override_redirect
-
-extern __typeof (gdk_window_set_accept_focus) IA__gdk_window_set_accept_focus __attribute((visibility("hidden")));
-#define gdk_window_set_accept_focus IA__gdk_window_set_accept_focus
-
-extern __typeof (gdk_window_set_focus_on_map) IA__gdk_window_set_focus_on_map __attribute((visibility("hidden")));
-#define gdk_window_set_focus_on_map IA__gdk_window_set_focus_on_map
-
-extern __typeof (gdk_window_set_icon_list) IA__gdk_window_set_icon_list __attribute((visibility("hidden")));
-#define gdk_window_set_icon_list IA__gdk_window_set_icon_list
-
-extern __typeof (gdk_window_set_icon) IA__gdk_window_set_icon __attribute((visibility("hidden")));
-#define gdk_window_set_icon IA__gdk_window_set_icon
-
-extern __typeof (gdk_window_set_icon_name) IA__gdk_window_set_icon_name __attribute((visibility("hidden")));
-#define gdk_window_set_icon_name IA__gdk_window_set_icon_name
-
-extern __typeof (gdk_window_beep) IA__gdk_window_beep __attribute((visibility("hidden")));
-#define gdk_window_beep IA__gdk_window_beep
-
-extern __typeof (gdk_window_set_opacity) IA__gdk_window_set_opacity __attribute((visibility("hidden")));
-#define gdk_window_set_opacity IA__gdk_window_set_opacity
-
-extern __typeof (gdk_window_iconify) IA__gdk_window_iconify __attribute((visibility("hidden")));
-#define gdk_window_iconify IA__gdk_window_iconify
-
-extern __typeof (gdk_window_deiconify) IA__gdk_window_deiconify __attribute((visibility("hidden")));
-#define gdk_window_deiconify IA__gdk_window_deiconify
-
-extern __typeof (gdk_window_stick) IA__gdk_window_stick __attribute((visibility("hidden")));
-#define gdk_window_stick IA__gdk_window_stick
-
-extern __typeof (gdk_window_unstick) IA__gdk_window_unstick __attribute((visibility("hidden")));
-#define gdk_window_unstick IA__gdk_window_unstick
-
-extern __typeof (gdk_window_maximize) IA__gdk_window_maximize __attribute((visibility("hidden")));
-#define gdk_window_maximize IA__gdk_window_maximize
-
-extern __typeof (gdk_window_unmaximize) IA__gdk_window_unmaximize __attribute((visibility("hidden")));
-#define gdk_window_unmaximize IA__gdk_window_unmaximize
-
-extern __typeof (gdk_window_fullscreen) IA__gdk_window_fullscreen __attribute((visibility("hidden")));
-#define gdk_window_fullscreen IA__gdk_window_fullscreen
-
-extern __typeof (gdk_window_unfullscreen) IA__gdk_window_unfullscreen __attribute((visibility("hidden")));
-#define gdk_window_unfullscreen IA__gdk_window_unfullscreen
-
-extern __typeof (gdk_window_set_keep_above) IA__gdk_window_set_keep_above __attribute((visibility("hidden")));
-#define gdk_window_set_keep_above IA__gdk_window_set_keep_above
-
-extern __typeof (gdk_window_set_keep_below) IA__gdk_window_set_keep_below __attribute((visibility("hidden")));
-#define gdk_window_set_keep_below IA__gdk_window_set_keep_below
-
-extern __typeof (gdk_window_get_group) IA__gdk_window_get_group __attribute((visibility("hidden")));
-#define gdk_window_get_group IA__gdk_window_get_group
-
-extern __typeof (gdk_window_set_group) IA__gdk_window_set_group __attribute((visibility("hidden")));
-#define gdk_window_set_group IA__gdk_window_set_group
-
-extern __typeof (gdk_window_get_decorations) IA__gdk_window_get_decorations __attribute((visibility("hidden")));
-#define gdk_window_get_decorations IA__gdk_window_get_decorations
-
-extern __typeof (gdk_window_set_decorations) IA__gdk_window_set_decorations __attribute((visibility("hidden")));
-#define gdk_window_set_decorations IA__gdk_window_set_decorations
-
-extern __typeof (gdk_window_set_functions) IA__gdk_window_set_functions __attribute((visibility("hidden")));
-#define gdk_window_set_functions IA__gdk_window_set_functions
-
-extern __typeof (gdk_window_set_child_shapes) IA__gdk_window_set_child_shapes __attribute((visibility("hidden")));
-#define gdk_window_set_child_shapes IA__gdk_window_set_child_shapes
-
-extern __typeof (gdk_window_merge_child_shapes) IA__gdk_window_merge_child_shapes __attribute((visibility("hidden")));
-#define gdk_window_merge_child_shapes IA__gdk_window_merge_child_shapes
-
-extern __typeof (gdk_window_set_child_input_shapes) IA__gdk_window_set_child_input_shapes __attribute((visibility("hidden")));
-#define gdk_window_set_child_input_shapes IA__gdk_window_set_child_input_shapes
-
-extern __typeof (gdk_window_merge_child_input_shapes) IA__gdk_window_merge_child_input_shapes __attribute((visibility("hidden")));
-#define gdk_window_merge_child_input_shapes IA__gdk_window_merge_child_input_shapes
-
-extern __typeof (gdk_window_set_static_gravities) IA__gdk_window_set_static_gravities __attribute((visibility("hidden")));
-#define gdk_window_set_static_gravities IA__gdk_window_set_static_gravities
-
-extern __typeof (gdk_window_begin_move_drag) IA__gdk_window_begin_move_drag __attribute((visibility("hidden")));
-#define gdk_window_begin_move_drag IA__gdk_window_begin_move_drag
-
-extern __typeof (gdk_window_begin_resize_drag) IA__gdk_window_begin_resize_drag __attribute((visibility("hidden")));
-#define gdk_window_begin_resize_drag IA__gdk_window_begin_resize_drag
-
-extern __typeof (gdk_window_enable_synchronized_configure) IA__gdk_window_enable_synchronized_configure __attribute((visibility("hidden")));
-#define gdk_window_enable_synchronized_configure IA__gdk_window_enable_synchronized_configure
-
-extern __typeof (gdk_window_configure_finished) IA__gdk_window_configure_finished __attribute((visibility("hidden")));
-#define gdk_window_configure_finished IA__gdk_window_configure_finished
-
-#endif
-#endif
-#if IN_HEADER(__GDK_IMAGE_H__)
-#if IN_FILE(__GDK_IMAGE_C__)
-#ifndef GDK_DISABLE_DEPRECATED
-extern __typeof (gdk_image_ref) IA__gdk_image_ref __attribute((visibility("hidden")));
-#define gdk_image_ref IA__gdk_image_ref
-
-extern __typeof (gdk_image_unref) IA__gdk_image_unref __attribute((visibility("hidden")));
-#define gdk_image_unref IA__gdk_image_unref
-
-extern __typeof (gdk_image_get) IA__gdk_image_get __attribute((visibility("hidden")));
-#define gdk_image_get IA__gdk_image_get
-
-#endif
-extern __typeof (gdk_image_set_colormap) IA__gdk_image_set_colormap __attribute((visibility("hidden")));
-#define gdk_image_set_colormap IA__gdk_image_set_colormap
-
-extern __typeof (gdk_image_get_colormap) IA__gdk_image_get_colormap __attribute((visibility("hidden")));
-#define gdk_image_get_colormap IA__gdk_image_get_colormap
-
-extern __typeof (gdk_image_new) IA__gdk_image_new __attribute((visibility("hidden")));
-#define gdk_image_new IA__gdk_image_new
-
-#endif
-#endif
-#if IN_HEADER(__GDK_IMAGE_H__)
-#if IN_FILE(__GDK_IMAGE_X11_C__)
-#ifdef GDK_ENABLE_BROKEN
-extern __typeof (gdk_image_new_bitmap) IA__gdk_image_new_bitmap __attribute((visibility("hidden")));
-#define gdk_image_new_bitmap IA__gdk_image_new_bitmap
-
-#endif
-extern __typeof (gdk_image_get_pixel) IA__gdk_image_get_pixel __attribute((visibility("hidden")));
-#define gdk_image_get_pixel IA__gdk_image_get_pixel
-
-extern __typeof (gdk_image_put_pixel) IA__gdk_image_put_pixel __attribute((visibility("hidden")));
-#define gdk_image_put_pixel IA__gdk_image_put_pixel
-
-extern __typeof (gdk_image_get_type) IA__gdk_image_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_image_get_type IA__gdk_image_get_type
-
-#endif
-#endif
-#if IN_HEADER(__GDK_KEYS_H__)
-#if IN_FILE(__GDK_KEYS_C__)
-extern __typeof (gdk_keymap_get_default) IA__gdk_keymap_get_default __attribute((visibility("hidden")));
-#define gdk_keymap_get_default IA__gdk_keymap_get_default
-
-extern __typeof (gdk_keymap_get_type) IA__gdk_keymap_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_keymap_get_type IA__gdk_keymap_get_type
-
-extern __typeof (gdk_keyval_is_lower) IA__gdk_keyval_is_lower __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_keyval_is_lower IA__gdk_keyval_is_lower
-
-extern __typeof (gdk_keyval_is_upper) IA__gdk_keyval_is_upper __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_keyval_is_upper IA__gdk_keyval_is_upper
-
-extern __typeof (gdk_keyval_to_lower) IA__gdk_keyval_to_lower __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_keyval_to_lower IA__gdk_keyval_to_lower
-
-extern __typeof (gdk_keyval_to_upper) IA__gdk_keyval_to_upper __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_keyval_to_upper IA__gdk_keyval_to_upper
-
-#endif
-#endif
-#if IN_HEADER(__GDK_KEYS_H__)
-#if IN_FILE(__GDK_KEYUNI_C__)
-extern __typeof (gdk_keyval_to_unicode) IA__gdk_keyval_to_unicode __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_keyval_to_unicode IA__gdk_keyval_to_unicode
-
-extern __typeof (gdk_unicode_to_keyval) IA__gdk_unicode_to_keyval __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_unicode_to_keyval IA__gdk_unicode_to_keyval
-
-#endif
-#endif
-#if IN_HEADER(__GDK_KEYS_H__)
-#if IN_FILE(__GDK_KEYS_X11_C__)
-extern __typeof (gdk_keymap_get_direction) IA__gdk_keymap_get_direction __attribute((visibility("hidden")));
-#define gdk_keymap_get_direction IA__gdk_keymap_get_direction
-
-extern __typeof (gdk_keymap_get_entries_for_keycode) IA__gdk_keymap_get_entries_for_keycode __attribute((visibility("hidden")));
-#define gdk_keymap_get_entries_for_keycode IA__gdk_keymap_get_entries_for_keycode
-
-extern __typeof (gdk_keymap_get_entries_for_keyval) IA__gdk_keymap_get_entries_for_keyval __attribute((visibility("hidden")));
-#define gdk_keymap_get_entries_for_keyval IA__gdk_keymap_get_entries_for_keyval
-
-extern __typeof (gdk_keymap_get_for_display) IA__gdk_keymap_get_for_display __attribute((visibility("hidden")));
-#define gdk_keymap_get_for_display IA__gdk_keymap_get_for_display
-
-extern __typeof (gdk_keymap_have_bidi_layouts) IA__gdk_keymap_have_bidi_layouts __attribute((visibility("hidden")));
-#define gdk_keymap_have_bidi_layouts IA__gdk_keymap_have_bidi_layouts
-
-extern __typeof (gdk_keymap_lookup_key) IA__gdk_keymap_lookup_key __attribute((visibility("hidden")));
-#define gdk_keymap_lookup_key IA__gdk_keymap_lookup_key
-
-extern __typeof (gdk_keymap_translate_keyboard_state) IA__gdk_keymap_translate_keyboard_state __attribute((visibility("hidden")));
-#define gdk_keymap_translate_keyboard_state IA__gdk_keymap_translate_keyboard_state
-
-extern __typeof (gdk_keyval_convert_case) IA__gdk_keyval_convert_case __attribute((visibility("hidden")));
-#define gdk_keyval_convert_case IA__gdk_keyval_convert_case
-
-extern __typeof (gdk_keyval_from_name) IA__gdk_keyval_from_name __attribute((visibility("hidden")));
-#define gdk_keyval_from_name IA__gdk_keyval_from_name
-
-extern __typeof (gdk_keyval_name) IA__gdk_keyval_name __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_keyval_name IA__gdk_keyval_name
-
-#endif
-#endif
-#if IN_HEADER(__GDK_KEYS_H__)
-#if IN_FILE(__GDK_KEYS_DIRECTFB_C__)
-extern __typeof (gdk_keymap_get_direction) IA__gdk_keymap_get_direction __attribute((visibility("hidden")));
-#define gdk_keymap_get_direction IA__gdk_keymap_get_direction
-
-extern __typeof (gdk_keymap_get_entries_for_keycode) IA__gdk_keymap_get_entries_for_keycode __attribute((visibility("hidden")));
-#define gdk_keymap_get_entries_for_keycode IA__gdk_keymap_get_entries_for_keycode
-
-extern __typeof (gdk_keymap_get_entries_for_keyval) IA__gdk_keymap_get_entries_for_keyval __attribute((visibility("hidden")));
-#define gdk_keymap_get_entries_for_keyval IA__gdk_keymap_get_entries_for_keyval
-
-extern __typeof (gdk_keymap_get_for_display) IA__gdk_keymap_get_for_display __attribute((visibility("hidden")));
-#define gdk_keymap_get_for_display IA__gdk_keymap_get_for_display
-
-extern __typeof (gdk_keymap_lookup_key) IA__gdk_keymap_lookup_key __attribute((visibility("hidden")));
-#define gdk_keymap_lookup_key IA__gdk_keymap_lookup_key
-
-extern __typeof (gdk_keymap_translate_keyboard_state) IA__gdk_keymap_translate_keyboard_state __attribute((visibility("hidden")));
-#define gdk_keymap_translate_keyboard_state IA__gdk_keymap_translate_keyboard_state
-
-extern __typeof (gdk_keyval_from_name) IA__gdk_keyval_from_name __attribute((visibility("hidden")));
-#define gdk_keyval_from_name IA__gdk_keyval_from_name
-
-extern __typeof (gdk_keyval_name) IA__gdk_keyval_name __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_keyval_name IA__gdk_keyval_name
-
-#endif
-#endif
-#if IN_HEADER(__GDK_VISUAL_H__)
-#if IN_FILE(__GDK_VISUAL_C__)
-extern __typeof (gdk_list_visuals) IA__gdk_list_visuals __attribute((visibility("hidden")));
-#define gdk_list_visuals IA__gdk_list_visuals
-
-extern __typeof (gdk_visual_get_system) IA__gdk_visual_get_system __attribute((visibility("hidden")));
-#define gdk_visual_get_system IA__gdk_visual_get_system
-
-#endif
-#endif
-#if IN_HEADER(__GDK_VISUAL_H__)
-#if IN_FILE(__GDK_VISUAL_X11_C__)
-extern __typeof (gdk_query_depths) IA__gdk_query_depths __attribute((visibility("hidden")));
-#define gdk_query_depths IA__gdk_query_depths
-
-extern __typeof (gdk_query_visual_types) IA__gdk_query_visual_types __attribute((visibility("hidden")));
-#define gdk_query_visual_types IA__gdk_query_visual_types
-
-extern __typeof (gdk_visual_get_best) IA__gdk_visual_get_best __attribute((visibility("hidden")));
-#define gdk_visual_get_best IA__gdk_visual_get_best
-
-extern __typeof (gdk_visual_get_best_depth) IA__gdk_visual_get_best_depth __attribute((visibility("hidden")));
-#define gdk_visual_get_best_depth IA__gdk_visual_get_best_depth
-
-extern __typeof (gdk_visual_get_best_type) IA__gdk_visual_get_best_type __attribute((visibility("hidden")));
-#define gdk_visual_get_best_type IA__gdk_visual_get_best_type
-
-extern __typeof (gdk_visual_get_best_with_both) IA__gdk_visual_get_best_with_both __attribute((visibility("hidden")));
-#define gdk_visual_get_best_with_both IA__gdk_visual_get_best_with_both
-
-extern __typeof (gdk_visual_get_best_with_depth) IA__gdk_visual_get_best_with_depth __attribute((visibility("hidden")));
-#define gdk_visual_get_best_with_depth IA__gdk_visual_get_best_with_depth
-
-extern __typeof (gdk_visual_get_best_with_type) IA__gdk_visual_get_best_with_type __attribute((visibility("hidden")));
-#define gdk_visual_get_best_with_type IA__gdk_visual_get_best_with_type
-
-extern __typeof (gdk_visual_get_screen) IA__gdk_visual_get_screen __attribute((visibility("hidden")));
-#define gdk_visual_get_screen IA__gdk_visual_get_screen
-
-extern __typeof (gdk_visual_get_type) IA__gdk_visual_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_visual_get_type IA__gdk_visual_get_type
-
-#endif
-#endif
-#if IN_HEADER(__GDK_X_H__)
-#if IN_FILE(__GDK_EVENTS_X11_C__)
-extern __typeof (gdk_net_wm_supports) IA__gdk_net_wm_supports __attribute((visibility("hidden")));
-#define gdk_net_wm_supports IA__gdk_net_wm_supports
-
-#endif
-#endif
-#if IN_HEADER(__GDK_PANGO_H__)
-#if IN_FILE(__GDK_PANGO_C__)
-extern __typeof (gdk_pango_attr_emboss_color_new) IA__gdk_pango_attr_emboss_color_new __attribute((visibility("hidden")));
-#define gdk_pango_attr_emboss_color_new IA__gdk_pango_attr_emboss_color_new
-
-extern __typeof (gdk_pango_attr_embossed_new) IA__gdk_pango_attr_embossed_new __attribute((visibility("hidden")));
-#define gdk_pango_attr_embossed_new IA__gdk_pango_attr_embossed_new
-
-extern __typeof (gdk_pango_attr_stipple_new) IA__gdk_pango_attr_stipple_new __attribute((visibility("hidden")));
-#define gdk_pango_attr_stipple_new IA__gdk_pango_attr_stipple_new
-
-extern __typeof (gdk_pango_context_get) IA__gdk_pango_context_get __attribute((visibility("hidden")));
-#define gdk_pango_context_get IA__gdk_pango_context_get
-
-extern __typeof (gdk_pango_context_get_for_screen) IA__gdk_pango_context_get_for_screen __attribute((visibility("hidden")));
-#define gdk_pango_context_get_for_screen IA__gdk_pango_context_get_for_screen
-
-#ifndef GDK_DISABLE_DEPRECATED
-extern __typeof (gdk_pango_context_set_colormap) IA__gdk_pango_context_set_colormap __attribute((visibility("hidden")));
-#define gdk_pango_context_set_colormap IA__gdk_pango_context_set_colormap
-
-#endif
-extern __typeof (gdk_pango_layout_get_clip_region) IA__gdk_pango_layout_get_clip_region __attribute((visibility("hidden")));
-#define gdk_pango_layout_get_clip_region IA__gdk_pango_layout_get_clip_region
-
-extern __typeof (gdk_pango_layout_line_get_clip_region) IA__gdk_pango_layout_line_get_clip_region __attribute((visibility("hidden")));
-#define gdk_pango_layout_line_get_clip_region IA__gdk_pango_layout_line_get_clip_region
-
-extern __typeof (gdk_pango_renderer_get_default) IA__gdk_pango_renderer_get_default __attribute((visibility("hidden")));
-#define gdk_pango_renderer_get_default IA__gdk_pango_renderer_get_default
-
-extern __typeof (gdk_pango_renderer_get_type) IA__gdk_pango_renderer_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_pango_renderer_get_type IA__gdk_pango_renderer_get_type
-
-extern __typeof (gdk_pango_renderer_new) IA__gdk_pango_renderer_new __attribute((visibility("hidden")));
-#define gdk_pango_renderer_new IA__gdk_pango_renderer_new
-
-extern __typeof (gdk_pango_renderer_set_drawable) IA__gdk_pango_renderer_set_drawable __attribute((visibility("hidden")));
-#define gdk_pango_renderer_set_drawable IA__gdk_pango_renderer_set_drawable
-
-extern __typeof (gdk_pango_renderer_set_gc) IA__gdk_pango_renderer_set_gc __attribute((visibility("hidden")));
-#define gdk_pango_renderer_set_gc IA__gdk_pango_renderer_set_gc
-
-extern __typeof (gdk_pango_renderer_set_override_color) IA__gdk_pango_renderer_set_override_color __attribute((visibility("hidden")));
-#define gdk_pango_renderer_set_override_color IA__gdk_pango_renderer_set_override_color
-
-extern __typeof (gdk_pango_renderer_set_stipple) IA__gdk_pango_renderer_set_stipple __attribute((visibility("hidden")));
-#define gdk_pango_renderer_set_stipple IA__gdk_pango_renderer_set_stipple
-
-#endif
-#endif
-#if IN_HEADER(__GDK_PIXBUF_H__)
-#if IN_FILE(__GDK_PIXBUF_DRAWABLE_C__)
-extern __typeof (gdk_pixbuf_get_from_drawable) IA__gdk_pixbuf_get_from_drawable __attribute((visibility("hidden")));
-#define gdk_pixbuf_get_from_drawable IA__gdk_pixbuf_get_from_drawable
-
-extern __typeof (gdk_pixbuf_get_from_image) IA__gdk_pixbuf_get_from_image __attribute((visibility("hidden")));
-#define gdk_pixbuf_get_from_image IA__gdk_pixbuf_get_from_image
-
-#endif
-#endif
-#if IN_HEADER(__GDK_PIXBUF_H__)
-#if IN_FILE(__GDK_PIXBUF_RENDER_C__)
-extern __typeof (gdk_pixbuf_render_pixmap_and_mask) IA__gdk_pixbuf_render_pixmap_and_mask __attribute((visibility("hidden")));
-#define gdk_pixbuf_render_pixmap_and_mask IA__gdk_pixbuf_render_pixmap_and_mask
-
-extern __typeof (gdk_pixbuf_render_pixmap_and_mask_for_colormap) IA__gdk_pixbuf_render_pixmap_and_mask_for_colormap __attribute((visibility("hidden")));
-#define gdk_pixbuf_render_pixmap_and_mask_for_colormap IA__gdk_pixbuf_render_pixmap_and_mask_for_colormap
-
-extern __typeof (gdk_pixbuf_render_threshold_alpha) IA__gdk_pixbuf_render_threshold_alpha __attribute((visibility("hidden")));
-#define gdk_pixbuf_render_threshold_alpha IA__gdk_pixbuf_render_threshold_alpha
-
-#ifndef GDK_DISABLE_DEPRECATED
-extern __typeof (gdk_pixbuf_render_to_drawable) IA__gdk_pixbuf_render_to_drawable __attribute((visibility("hidden")));
-#define gdk_pixbuf_render_to_drawable IA__gdk_pixbuf_render_to_drawable
-
-extern __typeof (gdk_pixbuf_render_to_drawable_alpha) IA__gdk_pixbuf_render_to_drawable_alpha __attribute((visibility("hidden")));
-#define gdk_pixbuf_render_to_drawable_alpha IA__gdk_pixbuf_render_to_drawable_alpha
-
-#endif
-#endif
-#endif
-#if IN_HEADER(__GDK_PIXMAP_H__)
-#if IN_FILE(__GDK_PIXMAP_C__)
-extern __typeof (gdk_pixmap_colormap_create_from_xpm) IA__gdk_pixmap_colormap_create_from_xpm __attribute((visibility("hidden")));
-#define gdk_pixmap_colormap_create_from_xpm IA__gdk_pixmap_colormap_create_from_xpm
-
-extern __typeof (gdk_pixmap_create_from_xpm) IA__gdk_pixmap_create_from_xpm __attribute((visibility("hidden")));
-#define gdk_pixmap_create_from_xpm IA__gdk_pixmap_create_from_xpm
-
-extern __typeof (gdk_pixmap_colormap_create_from_xpm_d) IA__gdk_pixmap_colormap_create_from_xpm_d __attribute((visibility("hidden")));
-#define gdk_pixmap_colormap_create_from_xpm_d IA__gdk_pixmap_colormap_create_from_xpm_d
-
-extern __typeof (gdk_pixmap_create_from_xpm_d) IA__gdk_pixmap_create_from_xpm_d __attribute((visibility("hidden")));
-#define gdk_pixmap_create_from_xpm_d IA__gdk_pixmap_create_from_xpm_d
-
-extern __typeof (gdk_pixmap_get_type) IA__gdk_pixmap_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_pixmap_get_type IA__gdk_pixmap_get_type
-
-#endif
-#endif
-#if IN_HEADER(__GDK_PIXMAP_H__)
-#if IN_FILE(__GDK_PIXMAP_X11_C__)
-extern __typeof (gdk_pixmap_create_from_data) IA__gdk_pixmap_create_from_data __attribute((visibility("hidden")));
-#define gdk_pixmap_create_from_data IA__gdk_pixmap_create_from_data
-
-extern __typeof (gdk_pixmap_foreign_new) IA__gdk_pixmap_foreign_new __attribute((visibility("hidden")));
-#define gdk_pixmap_foreign_new IA__gdk_pixmap_foreign_new
-
-extern __typeof (gdk_pixmap_foreign_new_for_display) IA__gdk_pixmap_foreign_new_for_display __attribute((visibility("hidden")));
-#define gdk_pixmap_foreign_new_for_display IA__gdk_pixmap_foreign_new_for_display
-
-extern __typeof (gdk_pixmap_foreign_new_for_screen) IA__gdk_pixmap_foreign_new_for_screen __attribute((visibility("hidden")));
-#define gdk_pixmap_foreign_new_for_screen IA__gdk_pixmap_foreign_new_for_screen
-
-extern __typeof (gdk_pixmap_lookup) IA__gdk_pixmap_lookup __attribute((visibility("hidden")));
-#define gdk_pixmap_lookup IA__gdk_pixmap_lookup
-
-extern __typeof (gdk_pixmap_lookup_for_display) IA__gdk_pixmap_lookup_for_display __attribute((visibility("hidden")));
-#define gdk_pixmap_lookup_for_display IA__gdk_pixmap_lookup_for_display
-
-extern __typeof (gdk_pixmap_new) IA__gdk_pixmap_new __attribute((visibility("hidden")));
-#define gdk_pixmap_new IA__gdk_pixmap_new
-
-#endif
-#endif
-#if IN_HEADER(__GDK_REGION_H__)
-#if IN_FILE(__GDK_REGION_GENERIC_C__)
-extern __typeof (gdk_region_copy) IA__gdk_region_copy __attribute((visibility("hidden")));
-#define gdk_region_copy IA__gdk_region_copy
-
-extern __typeof (gdk_region_destroy) IA__gdk_region_destroy __attribute((visibility("hidden")));
-#define gdk_region_destroy IA__gdk_region_destroy
-
-extern __typeof (gdk_region_empty) IA__gdk_region_empty __attribute((visibility("hidden")));
-#define gdk_region_empty IA__gdk_region_empty
-
-extern __typeof (gdk_region_equal) IA__gdk_region_equal __attribute((visibility("hidden")));
-#define gdk_region_equal IA__gdk_region_equal
-
-extern __typeof (gdk_region_get_clipbox) IA__gdk_region_get_clipbox __attribute((visibility("hidden")));
-#define gdk_region_get_clipbox IA__gdk_region_get_clipbox
-
-extern __typeof (gdk_region_get_rectangles) IA__gdk_region_get_rectangles __attribute((visibility("hidden")));
-#define gdk_region_get_rectangles IA__gdk_region_get_rectangles
-
-extern __typeof (gdk_region_intersect) IA__gdk_region_intersect __attribute((visibility("hidden")));
-#define gdk_region_intersect IA__gdk_region_intersect
-
-extern __typeof (gdk_region_new) IA__gdk_region_new __attribute((visibility("hidden")));
-#define gdk_region_new IA__gdk_region_new
-
-extern __typeof (gdk_region_offset) IA__gdk_region_offset __attribute((visibility("hidden")));
-#define gdk_region_offset IA__gdk_region_offset
-
-extern __typeof (gdk_region_point_in) IA__gdk_region_point_in __attribute((visibility("hidden")));
-#define gdk_region_point_in IA__gdk_region_point_in
-
-extern __typeof (gdk_region_rectangle) IA__gdk_region_rectangle __attribute((visibility("hidden")));
-#define gdk_region_rectangle IA__gdk_region_rectangle
-
-extern __typeof (gdk_region_rect_in) IA__gdk_region_rect_in __attribute((visibility("hidden")));
-#define gdk_region_rect_in IA__gdk_region_rect_in
-
-extern __typeof (gdk_region_shrink) IA__gdk_region_shrink __attribute((visibility("hidden")));
-#define gdk_region_shrink IA__gdk_region_shrink
-
-extern __typeof (gdk_region_spans_intersect_foreach) IA__gdk_region_spans_intersect_foreach __attribute((visibility("hidden")));
-#define gdk_region_spans_intersect_foreach IA__gdk_region_spans_intersect_foreach
-
-extern __typeof (gdk_region_subtract) IA__gdk_region_subtract __attribute((visibility("hidden")));
-#define gdk_region_subtract IA__gdk_region_subtract
-
-extern __typeof (gdk_region_union) IA__gdk_region_union __attribute((visibility("hidden")));
-#define gdk_region_union IA__gdk_region_union
-
-extern __typeof (gdk_region_union_with_rect) IA__gdk_region_union_with_rect __attribute((visibility("hidden")));
-#define gdk_region_union_with_rect IA__gdk_region_union_with_rect
-
-extern __typeof (gdk_region_xor) IA__gdk_region_xor __attribute((visibility("hidden")));
-#define gdk_region_xor IA__gdk_region_xor
-
-#endif
-#endif
-#if IN_HEADER(__GDK_REGION_H__)
-#if IN_FILE(__GDK_POLYREG_GENERIC_C__)
-extern __typeof (gdk_region_polygon) IA__gdk_region_polygon __attribute((visibility("hidden")));
-#define gdk_region_polygon IA__gdk_region_polygon
-
-#endif
-#endif
-#if IN_HEADER(__GDK_RGB_H__)
-#if IN_FILE(__GDK_RGB_C__)
-extern __typeof (gdk_rgb_cmap_free) IA__gdk_rgb_cmap_free __attribute((visibility("hidden")));
-#define gdk_rgb_cmap_free IA__gdk_rgb_cmap_free
-
-extern __typeof (gdk_rgb_cmap_new) IA__gdk_rgb_cmap_new __attribute((visibility("hidden")));
-#define gdk_rgb_cmap_new IA__gdk_rgb_cmap_new
-
-extern __typeof (gdk_rgb_colormap_ditherable) IA__gdk_rgb_colormap_ditherable __attribute((visibility("hidden")));
-#define gdk_rgb_colormap_ditherable IA__gdk_rgb_colormap_ditherable
-
-extern __typeof (gdk_rgb_ditherable) IA__gdk_rgb_ditherable __attribute((visibility("hidden")));
-#define gdk_rgb_ditherable IA__gdk_rgb_ditherable
-
-extern __typeof (gdk_rgb_find_color) IA__gdk_rgb_find_color __attribute((visibility("hidden")));
-#define gdk_rgb_find_color IA__gdk_rgb_find_color
-
-extern __typeof (gdk_rgb_get_colormap) IA__gdk_rgb_get_colormap __attribute((visibility("hidden")));
-#define gdk_rgb_get_colormap IA__gdk_rgb_get_colormap
-
-extern __typeof (gdk_rgb_get_visual) IA__gdk_rgb_get_visual __attribute((visibility("hidden")));
-#define gdk_rgb_get_visual IA__gdk_rgb_get_visual
-
-#ifndef GDK_DISABLE_DEPRECATED
-extern __typeof (gdk_rgb_init) IA__gdk_rgb_init __attribute((visibility("hidden")));
-#define gdk_rgb_init IA__gdk_rgb_init
-
-extern __typeof (gdk_rgb_xpixel_from_rgb) IA__gdk_rgb_xpixel_from_rgb __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_rgb_xpixel_from_rgb IA__gdk_rgb_xpixel_from_rgb
-
-extern __typeof (gdk_rgb_gc_set_background) IA__gdk_rgb_gc_set_background __attribute((visibility("hidden")));
-#define gdk_rgb_gc_set_background IA__gdk_rgb_gc_set_background
-
-extern __typeof (gdk_rgb_gc_set_foreground) IA__gdk_rgb_gc_set_foreground __attribute((visibility("hidden")));
-#define gdk_rgb_gc_set_foreground IA__gdk_rgb_gc_set_foreground
-
-#endif
-extern __typeof (gdk_rgb_set_install) IA__gdk_rgb_set_install __attribute((visibility("hidden")));
-#define gdk_rgb_set_install IA__gdk_rgb_set_install
-
-extern __typeof (gdk_rgb_set_min_colors) IA__gdk_rgb_set_min_colors __attribute((visibility("hidden")));
-#define gdk_rgb_set_min_colors IA__gdk_rgb_set_min_colors
-
-extern __typeof (gdk_rgb_set_verbose) IA__gdk_rgb_set_verbose __attribute((visibility("hidden")));
-#define gdk_rgb_set_verbose IA__gdk_rgb_set_verbose
-
-extern __typeof (gdk_draw_gray_image) IA__gdk_draw_gray_image __attribute((visibility("hidden")));
-#define gdk_draw_gray_image IA__gdk_draw_gray_image
-
-extern __typeof (gdk_draw_indexed_image) IA__gdk_draw_indexed_image __attribute((visibility("hidden")));
-#define gdk_draw_indexed_image IA__gdk_draw_indexed_image
-
-extern __typeof (gdk_draw_rgb_32_image) IA__gdk_draw_rgb_32_image __attribute((visibility("hidden")));
-#define gdk_draw_rgb_32_image IA__gdk_draw_rgb_32_image
-
-extern __typeof (gdk_draw_rgb_32_image_dithalign) IA__gdk_draw_rgb_32_image_dithalign __attribute((visibility("hidden")));
-#define gdk_draw_rgb_32_image_dithalign IA__gdk_draw_rgb_32_image_dithalign
-
-extern __typeof (gdk_draw_rgb_image) IA__gdk_draw_rgb_image __attribute((visibility("hidden")));
-#define gdk_draw_rgb_image IA__gdk_draw_rgb_image
-
-extern __typeof (gdk_draw_rgb_image_dithalign) IA__gdk_draw_rgb_image_dithalign __attribute((visibility("hidden")));
-#define gdk_draw_rgb_image_dithalign IA__gdk_draw_rgb_image_dithalign
-
-#endif
-#endif
-#if IN_HEADER(__GDK_SCREEN_H__)
-#if IN_FILE(__GDK_SCREEN_C__)
-extern __typeof (gdk_screen_get_type) IA__gdk_screen_get_type __attribute((visibility("hidden"))) G_GNUC_CONST;
-#define gdk_screen_get_type IA__gdk_screen_get_type
-
-extern __typeof (gdk_screen_get_monitor_at_point) IA__gdk_screen_get_monitor_at_point __attribute((visibility("hidden")));
-#define gdk_screen_get_monitor_at_point IA__gdk_screen_get_monitor_at_point
-
-extern __typeof (gdk_screen_get_monitor_at_window) IA__gdk_screen_get_monitor_at_window __attribute((visibility("hidden")));
-#define gdk_screen_get_monitor_at_window IA__gdk_screen_get_monitor_at_window
-
-extern __typeof (gdk_screen_set_font_options) IA__gdk_screen_set_font_options __attribute((visibility("hidden")));
-#define gdk_screen_set_font_options IA__gdk_screen_set_font_options
-
-extern __typeof (gdk_screen_get_font_options) IA__gdk_screen_get_font_options __attribute((visibility("hidden")));
-#define gdk_screen_get_font_options IA__gdk_screen_get_font_options
-
-extern __typeof (gdk_screen_set_resolution) IA__gdk_screen_set_resolution __attribute((visibility("hidden")));
-#define gdk_screen_set_resolution IA__gdk_screen_set_resolution
-
-extern __typeof (gdk_screen_get_resolution) IA__gdk_screen_get_resolution __attribute((visibility("hidden")));
-#define gdk_screen_get_resolution IA__gdk_screen_get_resolution
-
-#endif
-#endif
-#if IN_HEADER(__GDK_SCREEN_H__)
-#if IN_FILE(__GDK_DISPLAY_MANAGER_C__)
-extern __typeof (gdk_screen_get_default) IA__gdk_screen_get_default __attribute((visibility("hidden")));
-#define gdk_screen_get_default IA__gdk_screen_get_default
-
-#endif
-#endif
-#if IN_HEADER(__GDK_SCREEN_H__)
-#if IN_FILE(__GDK_RGB_C__)
-extern __typeof (gdk_screen_get_rgb_colormap) IA__gdk_screen_get_rgb_colormap __attribute((visibility("hidden")));
-#define gdk_screen_get_rgb_colormap IA__gdk_screen_get_rgb_colormap
-
-extern __typeof (gdk_screen_get_rgb_visual) IA__gdk_screen_get_rgb_visual __attribute((visibility("hidden")));
-#define gdk_screen_get_rgb_visual IA__gdk_screen_get_rgb_visual
-
-#endif
-#endif
-#if IN_HEADER(__GDK_SCREEN_H__)
-#if IN_FILE(__GDK_EVENTS_X11_C__)
-extern __typeof (gdk_screen_get_setting) IA__gdk_screen_get_setting __attribute((visibility("hidden")));
-#define gdk_screen_get_setting IA__gdk_screen_get_setting
-
-extern __typeof (gdk_screen_broadcast_client_message) IA__gdk_screen_broadcast_client_message __attribute((visibility("hidden")));
-#define gdk_screen_broadcast_client_message IA__gdk_screen_broadcast_client_message
-
-#endif
-#endif
-#if IN_HEADER(__GDK_SCREEN_H__)
-#if IN_FILE(__GDK_VISUAL_X11_C__)
-extern __typeof (gdk_screen_get_system_visual) IA__gdk_screen_get_system_visual __attribute((visibility("hidden")));
-#define gdk_screen_get_system_visual IA__gdk_screen_get_system_visual
-
-extern __typeof (gdk_screen_list_visuals) IA__gdk_screen_list_visuals __attribute((visibility("hidden")));
-#define gdk_screen_list_visuals IA__gdk_screen_list_visuals
-
-#endif
-#endif
-#if IN_HEADER(__GDK_SCREEN_H__)
-#if IN_FILE(__GDK_WINDOW_C__)
-extern __typeof (gdk_screen_get_toplevel_windows) IA__gdk_screen_get_toplevel_windows __attribute((visibility("hidden")));
-#define gdk_screen_get_toplevel_windows IA__gdk_screen_get_toplevel_windows
-
-#endif
-#endif
-#if IN_HEADER(__GDK_SCREEN_H__)
-#if IN_FILE(__GDK_SCREEN_X11_C__)
-extern __typeof (gdk_screen_get_display) IA__gdk_screen_get_display __attribute((visibility("hidden")));
-#define gdk_screen_get_display IA__gdk_screen_get_display
-
-extern __typeof (gdk_screen_get_width) IA__gdk_screen_get_width __attribute((visibility("hidden")));
-#define gdk_screen_get_width IA__gdk_screen_get_width
-
-extern __typeof (gdk_screen_get_width_mm) IA__gdk_screen_get_width_mm __attribute((visibility("hidden")));
-#define gdk_screen_get_width_mm IA__gdk_screen_get_width_mm
-
-extern __typeof (gdk_screen_get_height) IA__gdk_screen_get_height __attribute((visibility("hidden")));
-#define gdk_screen_get_height IA__gdk_screen_get_height
-
-extern __typeof (gdk_screen_get_height_mm) IA__gdk_screen_get_height_mm __attribute((visibility("hidden")));
-#define gdk_screen_get_height_mm IA__gdk_screen_get_height_mm
-
-extern __typeof (gdk_screen_get_number) IA__gdk_screen_get_number __attribute((visibility("hidden")));
-#define gdk_screen_get_number IA__gdk_screen_get_number
-
-extern __typeof (gdk_screen_get_root_window) IA__gdk_screen_get_root_window __attribute((visibility("hidden")));
-#define gdk_screen_get_root_window IA__gdk_screen_get_root_window
-
-extern __typeof (gdk_screen_get_default_colormap) IA__gdk_screen_get_default_colormap __attribute((visibility("hidden")));
-#define gdk_screen_get_default_colormap IA__gdk_screen_get_default_colormap
-
-extern __typeof (gdk_screen_set_default_colormap) IA__gdk_screen_set_default_colormap __attribute((visibility("hidden")));
-#define gdk_screen_set_default_colormap IA__gdk_screen_set_default_colormap
-
-extern __typeof (gdk_screen_get_n_monitors) IA__gdk_screen_get_n_monitors __attribute((visibility("hidden")));
-#define gdk_screen_get_n_monitors IA__gdk_screen_get_n_monitors
-
-extern __typeof (gdk_screen_get_monitor_geometry) IA__gdk_screen_get_monitor_geometry __attribute((visibility("hidden")));
-#define gdk_screen_get_monitor_geometry IA__gdk_screen_get_monitor_geometry
-
-extern __typeof (gdk_screen_get_rgba_colormap) IA__gdk_screen_get_rgba_colormap __attribute((visibility("hidden")));
-#define gdk_screen_get_rgba_colormap IA__gdk_screen_get_rgba_colormap
-
-extern __typeof (gdk_screen_get_rgba_visual) IA__gdk_screen_get_rgba_visual __attribute((visibility("hidden")));
-#define gdk_screen_get_rgba_visual IA__gdk_screen_get_rgba_visual
-
-extern __typeof (gdk_screen_get_active_window) IA__gdk_screen_get_active_window __attribute((visibility("hidden")));
-#define gdk_screen_get_active_window IA__gdk_screen_get_active_window
-
-extern __typeof (gdk_screen_get_window_stack) IA__gdk_screen_get_window_stack __attribute((visibility("hidden")));
-#define gdk_screen_get_window_stack IA__gdk_screen_get_window_stack
-
-extern __typeof (gdk_screen_is_composited) IA__gdk_screen_is_composited __attribute((visibility("hidden")));
-#define gdk_screen_is_composited IA__gdk_screen_is_composited
-
-extern __typeof (gdk_screen_make_display_name) IA__gdk_screen_make_display_name __attribute((visibility("hidden")));
-#define gdk_screen_make_display_name IA__gdk_screen_make_display_name
-
-#endif
-#endif
-#if IN_HEADER(__GDK_SCREEN_H__)
-#if IN_FILE(__GDK_COLOR_X11_C__)
-extern __typeof (gdk_screen_get_system_colormap) IA__gdk_screen_get_system_colormap __attribute((visibility("hidden")));
-#define gdk_screen_get_system_colormap IA__gdk_screen_get_system_colormap
-
-#endif
-#endif
-#if IN_HEADER(__GDK_SELECTION_H__)
-#if IN_FILE(__GDK_SELECTION_C__)
-extern __typeof (gdk_selection_owner_set) IA__gdk_selection_owner_set __attribute((visibility("hidden")));
-#define gdk_selection_owner_set IA__gdk_selection_owner_set
-
-extern __typeof (gdk_selection_owner_get) IA__gdk_selection_owner_get __attribute((visibility("hidden")));
-#define gdk_selection_owner_get IA__gdk_selection_owner_get
-
-extern __typeof (gdk_selection_send_notify) IA__gdk_selection_send_notify __attribute((visibility("hidden")));
-#define gdk_selection_send_notify IA__gdk_selection_send_notify
-
-#endif
-#endif
-#if IN_HEADER(__GDK_SELECTION_H__)
-#if IN_FILE(__GDK_SELECTION_X11_C__)
-extern __typeof (gdk_selection_convert) IA__gdk_selection_convert __attribute((visibility("hidden")));
-#define gdk_selection_convert IA__gdk_selection_convert
-
-extern __typeof (gdk_selection_owner_get_for_display) IA__gdk_selection_owner_get_for_display __attribute((visibility("hidden")));
-#define gdk_selection_owner_get_for_display IA__gdk_selection_owner_get_for_display
-
-extern __typeof (gdk_selection_owner_set_for_display) IA__gdk_selection_owner_set_for_display __attribute((visibility("hidden")));
-#define gdk_selection_owner_set_for_display IA__gdk_selection_owner_set_for_display
-
-extern __typeof (gdk_selection_property_get) IA__gdk_selection_property_get __attribute((visibility("hidden")));
-#define gdk_selection_property_get IA__gdk_selection_property_get
-
-extern __typeof (gdk_selection_send_notify_for_display) IA__gdk_selection_send_notify_for_display __attribute((visibility("hidden")));
-#define gdk_selection_send_notify_for_display IA__gdk_selection_send_notify_for_display
-
-#endif
-#endif
-#if IN_HEADER(__GDK_WINDOW_H__)
-#if IN_FILE(__GDK_DISPLAY_C__)
-extern __typeof (gdk_set_sm_client_id) IA__gdk_set_sm_client_id __attribute((visibility("hidden")));
-#define gdk_set_sm_client_id IA__gdk_set_sm_client_id
-
-#endif
-#endif
-#if IN_HEADER(__GDK_SPAWN_H__)
-#if IN_FILE(__GDK_SPAWN_X11_C__)
-extern __typeof (gdk_spawn_command_line_on_screen) IA__gdk_spawn_command_line_on_screen __attribute((visibility("hidden")));
-#define gdk_spawn_command_line_on_screen IA__gdk_spawn_command_line_on_screen
-
-extern __typeof (gdk_spawn_on_screen) IA__gdk_spawn_on_screen __attribute((visibility("hidden")));
-#define gdk_spawn_on_screen IA__gdk_spawn_on_screen
-
-extern __typeof (gdk_spawn_on_screen_with_pipes) IA__gdk_spawn_on_screen_with_pipes __attribute((visibility("hidden")));
-#define gdk_spawn_on_screen_with_pipes IA__gdk_spawn_on_screen_with_pipes
-
-#endif
-#endif
-#if IN_HEADER(__GDK_PRIVATE_H__)
-#if IN_FILE(__GDK_EVENTS_C__)
-extern __typeof (gdk_synthesize_window_state) IA__gdk_synthesize_window_state __attribute((visibility("hidden")));
-#define gdk_synthesize_window_state IA__gdk_synthesize_window_state
-
-#endif
-#endif
-#if IN_HEADER(__GDK_PRIVATE_H__)
-#if IN_FILE(__GDK_WINDOW_X11_C__)
-extern __typeof (gdk_window_destroy_notify) IA__gdk_window_destroy_notify __attribute((visibility("hidden")));
-#define gdk_window_destroy_notify IA__gdk_window_destroy_notify
-
-#endif
-#endif
-#ifdef GDK_WINDOWING_WIN32
-#if IN_HEADER(__GDK_WIN32_H__)
-#if IN_FILE(__GDK_WIN32ID_C__)
-extern __typeof (gdk_win32_handle_table_lookup) IA__gdk_win32_handle_table_lookup __attribute((visibility("hidden")));
-#define gdk_win32_handle_table_lookup IA__gdk_win32_handle_table_lookup
-
-#endif
-#endif
-#if IN_HEADER(__GDK_WIN32_H__)
-#if IN_FILE(__GDK_CURSOR_WIN32_C__)
-extern __typeof (gdk_win32_icon_to_pixbuf_libgtk_only) IA__gdk_win32_icon_to_pixbuf_libgtk_only __attribute((visibility("hidden")));
-#define gdk_win32_icon_to_pixbuf_libgtk_only IA__gdk_win32_icon_to_pixbuf_libgtk_only
-
-extern __typeof (gdk_win32_pixbuf_to_hicon_libgtk_only) IA__gdk_win32_pixbuf_to_hicon_libgtk_only __attribute((visibility("hidden")));
-#define gdk_win32_pixbuf_to_hicon_libgtk_only IA__gdk_win32_pixbuf_to_hicon_libgtk_only
-
-#endif
-#endif
-#if IN_HEADER(__GDK_WIN32_H__)
-#if IN_FILE(__GDK_DRAWABLE_WIN32_C__)
-extern __typeof (gdk_win32_drawable_get_handle) IA__gdk_win32_drawable_get_handle __attribute((visibility("hidden")));
-#define gdk_win32_drawable_get_handle IA__gdk_win32_drawable_get_handle
-
-#endif
-#endif
-#if IN_HEADER(__GDK_WIN32_H__)
-#if IN_FILE(__GDK_EVENTS_WIN32_C__)
-extern __typeof (gdk_win32_set_modal_dialog_libgtk_only) IA__gdk_win32_set_modal_dialog_libgtk_only __attribute((visibility("hidden")));
-#define gdk_win32_set_modal_dialog_libgtk_only IA__gdk_win32_set_modal_dialog_libgtk_only
-
-#endif
-#endif
-#if IN_HEADER(__GDK_WIN32_H__)
-#if IN_FILE(__GDK_GC_WIN32_C__)
-extern __typeof (gdk_win32_hdc_get) IA__gdk_win32_hdc_get __attribute((visibility("hidden")));
-#define gdk_win32_hdc_get IA__gdk_win32_hdc_get
-
-extern __typeof (gdk_win32_hdc_release) IA__gdk_win32_hdc_release __attribute((visibility("hidden")));
-#define gdk_win32_hdc_release IA__gdk_win32_hdc_release
-
-#endif
-#endif
-#if IN_HEADER(__GDK_WIN32_H__)
-#if IN_FILE(__GDK_SELECTION_WIN32_C__)
-extern __typeof (gdk_win32_selection_add_targets) IA__gdk_win32_selection_add_targets __attribute((visibility("hidden")));
-#define gdk_win32_selection_add_targets IA__gdk_win32_selection_add_targets
-
-#endif
-#endif
-#endif
-#ifdef GDK_WINDOWING_X11
-#if IN_HEADER(__GDK_X_H__)
-#if IN_FILE(__GDK_PROPERTY_X11_C__)
-extern __typeof (gdk_x11_atom_to_xatom) IA__gdk_x11_atom_to_xatom __attribute((visibility("hidden")));
-#define gdk_x11_atom_to_xatom IA__gdk_x11_atom_to_xatom
-
-extern __typeof (gdk_x11_atom_to_xatom_for_display) IA__gdk_x11_atom_to_xatom_for_display __attribute((visibility("hidden")));
-#define gdk_x11_atom_to_xatom_for_display IA__gdk_x11_atom_to_xatom_for_display
-
-extern __typeof (gdk_x11_get_xatom_by_name) IA__gdk_x11_get_xatom_by_name __attribute((visibility("hidden")));
-#define gdk_x11_get_xatom_by_name IA__gdk_x11_get_xatom_by_name
-
-extern __typeof (gdk_x11_get_xatom_by_name_for_display) IA__gdk_x11_get_xatom_by_name_for_display __attribute((visibility("hidden")));
-#define gdk_x11_get_xatom_by_name_for_display IA__gdk_x11_get_xatom_by_name_for_display
-
-extern __typeof (gdk_x11_get_xatom_name) IA__gdk_x11_get_xatom_name __attribute((visibility("hidden")));
-#define gdk_x11_get_xatom_name IA__gdk_x11_get_xatom_name
-
-extern __typeof (gdk_x11_get_xatom_name_for_display) IA__gdk_x11_get_xatom_name_for_display __attribute((visibility("hidden")));
-#define gdk_x11_get_xatom_name_for_display IA__gdk_x11_get_xatom_name_for_display
-
-extern __typeof (gdk_x11_xatom_to_atom) IA__gdk_x11_xatom_to_atom __attribute((visibility("hidden")));
-#define gdk_x11_xatom_to_atom IA__gdk_x11_xatom_to_atom
-
-extern __typeof (gdk_x11_xatom_to_atom_for_display) IA__gdk_x11_xatom_to_atom_for_display __attribute((visibility("hidden")));
-#define gdk_x11_xatom_to_atom_for_display IA__gdk_x11_xatom_to_atom_for_display
-
-#endif
-#if IN_FILE(__GDK_COLOR_X11_C__)
-extern __typeof (gdk_x11_colormap_foreign_new) IA__gdk_x11_colormap_foreign_new __attribute((visibility("hidden")));
-#define gdk_x11_colormap_foreign_new IA__gdk_x11_colormap_foreign_new
-
-extern __typeof (gdk_x11_colormap_get_xcolormap) IA__gdk_x11_colormap_get_xcolormap __attribute((visibility("hidden")));
-#define gdk_x11_colormap_get_xcolormap IA__gdk_x11_colormap_get_xcolormap
-
-extern __typeof (gdk_x11_colormap_get_xdisplay) IA__gdk_x11_colormap_get_xdisplay __attribute((visibility("hidden")));
-#define gdk_x11_colormap_get_xdisplay IA__gdk_x11_colormap_get_xdisplay
-
-#ifdef GDK_ENABLE_BROKEN
-extern __typeof (gdkx_colormap_get) IA__gdkx_colormap_get __attribute((visibility("hidden")));
-#define gdkx_colormap_get IA__gdkx_colormap_get
-
-#endif
-#endif
-#if IN_FILE(__GDK_CURSOR_X11_C__)
-extern __typeof (gdk_x11_cursor_get_xcursor) IA__gdk_x11_cursor_get_xcursor __attribute((visibility("hidden")));
-#define gdk_x11_cursor_get_xcursor IA__gdk_x11_cursor_get_xcursor
-
-extern __typeof (gdk_x11_cursor_get_xdisplay) IA__gdk_x11_cursor_get_xdisplay __attribute((visibility("hidden")));
-#define gdk_x11_cursor_get_xdisplay IA__gdk_x11_cursor_get_xdisplay
-
-extern __typeof (gdk_x11_display_set_cursor_theme) IA__gdk_x11_display_set_cursor_theme __attribute((visibility("hidden")));
-#define gdk_x11_display_set_cursor_theme IA__gdk_x11_display_set_cursor_theme
-
-#endif
-#if IN_FILE(__GDK_DISPLAY_X11_C__)
-extern __typeof (gdk_x11_display_get_user_time) IA__gdk_x11_display_get_user_time __attribute((visibility("hidden")));
-#define gdk_x11_display_get_user_time IA__gdk_x11_display_get_user_time
-
-extern __typeof (gdk_x11_display_get_xdisplay) IA__gdk_x11_display_get_xdisplay __attribute((visibility("hidden")));
-#define gdk_x11_display_get_xdisplay IA__gdk_x11_display_get_xdisplay
-
-extern __typeof (gdk_x11_display_grab) IA__gdk_x11_display_grab __attribute((visibility("hidden")));
-#define gdk_x11_display_grab IA__gdk_x11_display_grab
-
-extern __typeof (gdk_x11_display_ungrab) IA__gdk_x11_display_ungrab __attribute((visibility("hidden")));
-#define gdk_x11_display_ungrab IA__gdk_x11_display_ungrab
-
-extern __typeof (gdk_x11_lookup_xdisplay) IA__gdk_x11_lookup_xdisplay __attribute((visibility("hidden")));
-#define gdk_x11_lookup_xdisplay IA__gdk_x11_lookup_xdisplay
-
-extern __typeof (gdk_x11_display_broadcast_startup_message) IA__gdk_x11_display_broadcast_startup_message __attribute((visibility("hidden")));
-#define gdk_x11_display_broadcast_startup_message IA__gdk_x11_display_broadcast_startup_message
-
-extern __typeof (gdk_x11_display_get_startup_notification_id) IA__gdk_x11_display_get_startup_notification_id __attribute((visibility("hidden")));
-#define gdk_x11_display_get_startup_notification_id IA__gdk_x11_display_get_startup_notification_id
-
-#endif
-#if IN_FILE(__GDK_DRAWABLE_X11_C__)
-extern __typeof (gdk_x11_drawable_get_xdisplay) IA__gdk_x11_drawable_get_xdisplay __attribute((visibility("hidden")));
-#define gdk_x11_drawable_get_xdisplay IA__gdk_x11_drawable_get_xdisplay
-
-extern __typeof (gdk_x11_drawable_get_xid) IA__gdk_x11_drawable_get_xid __attribute((visibility("hidden")));
-#define gdk_x11_drawable_get_xid IA__gdk_x11_drawable_get_xid
-
-#endif
-#if IN_FILE(__GDK_FONT_X11_C__)
-#ifndef GDK_DISABLE_DEPRECATED
-extern __typeof (gdk_x11_font_get_name) IA__gdk_x11_font_get_name __attribute((visibility("hidden")));
-#define gdk_x11_font_get_name IA__gdk_x11_font_get_name
-
-extern __typeof (gdk_x11_font_get_xdisplay) IA__gdk_x11_font_get_xdisplay __attribute((visibility("hidden")));
-#define gdk_x11_font_get_xdisplay IA__gdk_x11_font_get_xdisplay
-
-#endif
-extern __typeof (gdk_x11_font_get_xfont) IA__gdk_x11_font_get_xfont __attribute((visibility("hidden")));
-#define gdk_x11_font_get_xfont IA__gdk_x11_font_get_xfont
-
-#endif
-#if IN_FILE(__GDK_GC_X11_C__)
-extern __typeof (gdk_x11_gc_get_xdisplay) IA__gdk_x11_gc_get_xdisplay __attribute((visibility("hidden")));
-#define gdk_x11_gc_get_xdisplay IA__gdk_x11_gc_get_xdisplay
-
-extern __typeof (gdk_x11_gc_get_xgc) IA__gdk_x11_gc_get_xgc __attribute((visibility("hidden")));
-#define gdk_x11_gc_get_xgc IA__gdk_x11_gc_get_xgc
-
-#endif
-#if IN_FILE(__GDK_MAIN_X11_C__)
-extern __typeof (gdk_x11_get_default_root_xwindow) IA__gdk_x11_get_default_root_xwindow __attribute((visibility("hidden")));
-#define gdk_x11_get_default_root_xwindow IA__gdk_x11_get_default_root_xwindow
-
-extern __typeof (gdk_x11_get_default_screen) IA__gdk_x11_get_default_screen __attribute((visibility("hidden")));
-#define gdk_x11_get_default_screen IA__gdk_x11_get_default_screen
-
-extern __typeof (gdk_x11_get_default_xdisplay) IA__gdk_x11_get_default_xdisplay __attribute((visibility("hidden")));
-#define gdk_x11_get_default_xdisplay IA__gdk_x11_get_default_xdisplay
-
-extern __typeof (gdk_x11_grab_server) IA__gdk_x11_grab_server __attribute((visibility("hidden")));
-#define gdk_x11_grab_server IA__gdk_x11_grab_server
-
-extern __typeof (gdk_x11_ungrab_server) IA__gdk_x11_ungrab_server __attribute((visibility("hidden")));
-#define gdk_x11_ungrab_server IA__gdk_x11_ungrab_server
-
-#endif
-#if IN_FILE(__GDK_EVENTS_X11_C__)
-extern __typeof (gdk_x11_get_server_time) IA__gdk_x11_get_server_time __attribute((visibility("hidden")));
-#define gdk_x11_get_server_time IA__gdk_x11_get_server_time
-
-extern __typeof (gdk_x11_register_standard_event_type) IA__gdk_x11_register_standard_event_type __attribute((visibility("hidden")));
-#define gdk_x11_register_standard_event_type IA__gdk_x11_register_standard_event_type
-
-extern __typeof (gdk_x11_screen_get_window_manager_name) IA__gdk_x11_screen_get_window_manager_name __attribute((visibility("hidden")));
-#define gdk_x11_screen_get_window_manager_name IA__gdk_x11_screen_get_window_manager_name
-
-extern __typeof (gdk_x11_screen_supports_net_wm_hint) IA__gdk_x11_screen_supports_net_wm_hint __attribute((visibility("hidden")));
-#define gdk_x11_screen_supports_net_wm_hint IA__gdk_x11_screen_supports_net_wm_hint
-
-#endif
-#if IN_FILE(__GDK_IMAGE_X11_C__)
-extern __typeof (gdk_x11_image_get_xdisplay) IA__gdk_x11_image_get_xdisplay __attribute((visibility("hidden")));
-#define gdk_x11_image_get_xdisplay IA__gdk_x11_image_get_xdisplay
-
-extern __typeof (gdk_x11_image_get_ximage) IA__gdk_x11_image_get_ximage __attribute((visibility("hidden")));
-#define gdk_x11_image_get_ximage IA__gdk_x11_image_get_ximage
-
-#endif
-#if IN_FILE(__GDK_SCREEN_X11_C__)
-extern __typeof (gdk_x11_screen_get_screen_number) IA__gdk_x11_screen_get_screen_number __attribute((visibility("hidden")));
-#define gdk_x11_screen_get_screen_number IA__gdk_x11_screen_get_screen_number
-
-extern __typeof (gdk_x11_screen_get_xscreen) IA__gdk_x11_screen_get_xscreen __attribute((visibility("hidden")));
-#define gdk_x11_screen_get_xscreen IA__gdk_x11_screen_get_xscreen
-
-#endif
-#if IN_FILE(__GDK_VISUAL_X11_C__)
-extern __typeof (gdk_x11_screen_lookup_visual) IA__gdk_x11_screen_lookup_visual __attribute((visibility("hidden")));
-#define gdk_x11_screen_lookup_visual IA__gdk_x11_screen_lookup_visual
-
-extern __typeof (gdk_x11_visual_get_xvisual) IA__gdk_x11_visual_get_xvisual __attribute((visibility("hidden")));
-#define gdk_x11_visual_get_xvisual IA__gdk_x11_visual_get_xvisual
-
-extern __typeof (gdkx_visual_get) IA__gdkx_visual_get __attribute((visibility("hidden")));
-#define gdkx_visual_get IA__gdkx_visual_get
-
-#endif
-#if IN_FILE(__GDK_WINDOW_X11_C__)
-extern __typeof (gdk_x11_window_set_user_time) IA__gdk_x11_window_set_user_time __attribute((visibility("hidden")));
-#define gdk_x11_window_set_user_time IA__gdk_x11_window_set_user_time
-
-extern __typeof (gdk_x11_window_move_to_current_desktop) IA__gdk_x11_window_move_to_current_desktop __attribute((visibility("hidden")));
-#define gdk_x11_window_move_to_current_desktop IA__gdk_x11_window_move_to_current_desktop
-
-#endif
-#if IN_FILE(__GDK_XID_C__)
-extern __typeof (gdk_xid_table_lookup) IA__gdk_xid_table_lookup __attribute((visibility("hidden")));
-#define gdk_xid_table_lookup IA__gdk_xid_table_lookup
-
-extern __typeof (gdk_xid_table_lookup_for_display) IA__gdk_xid_table_lookup_for_display __attribute((visibility("hidden")));
-#define gdk_xid_table_lookup_for_display IA__gdk_xid_table_lookup_for_display
-
-#endif
-#endif
-#endif
-#ifdef GDK_WINDOWING_X11
-#endif
-
-#endif /* G_HAVE_GNUC_VISIBILITY */
-#endif /* DISABLE_VISIBILITY */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkcairo.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkcairo.h
deleted file mode 100644
index 8550e6bc..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkcairo.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 2005 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 __GDK_CAIRO_H__
-#define __GDK_CAIRO_H__
-
-#include <gdk/gdkcolor.h>
-#include <gdk/gdkpixbuf.h>
-#include <pango/pangocairo.h>
-
-G_BEGIN_DECLS
-
-cairo_t *gdk_cairo_create (GdkDrawable *drawable);
-
-void gdk_cairo_set_source_color  (cairo_t      *cr,
-				  GdkColor     *color);
-void gdk_cairo_set_source_pixbuf (cairo_t      *cr,
-				  GdkPixbuf    *pixbuf,
-				  double        pixbuf_x,
-				  double        pixbuf_y);
-void gdk_cairo_set_source_pixmap (cairo_t   *cr,
-				  GdkPixmap *pixmap,
-				  double     pixmap_x,
-				  double     pixmap_y);
-
-void gdk_cairo_rectangle (cairo_t      *cr,
-			  GdkRectangle *rectangle);
-void gdk_cairo_region    (cairo_t      *cr,
-			  GdkRegion    *region);
-
-G_END_DECLS
-
-#endif /* __GDK_CAIRO_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkcolor.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkcolor.h
deleted file mode 100644
index 46f4a645..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkcolor.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_COLOR_H__
-#define __GDK_COLOR_H__
-
-#include <cairo.h>
-#include <gdk/gdktypes.h>
-
-G_BEGIN_DECLS
-
-/* The color type.
- *   A color consists of red, green and blue values in the
- *    range 0-65535 and a pixel value. The pixel value is highly
- *    dependent on the depth and colormap which this color will
- *    be used to draw into. Therefore, sharing colors between
- *    colormaps is a bad idea.
- */
-struct _GdkColor
-{
-  guint32 pixel;
-  guint16 red;
-  guint16 green;
-  guint16 blue;
-};
-
-/* The colormap type.
- */
-
-typedef struct _GdkColormapClass GdkColormapClass;
-
-#define GDK_TYPE_COLORMAP              (gdk_colormap_get_type ())
-#define GDK_COLORMAP(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_COLORMAP, GdkColormap))
-#define GDK_COLORMAP_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_COLORMAP, GdkColormapClass))
-#define GDK_IS_COLORMAP(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_COLORMAP))
-#define GDK_IS_COLORMAP_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_COLORMAP))
-#define GDK_COLORMAP_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_COLORMAP, GdkColormapClass))
-
-#define GDK_TYPE_COLOR                 (gdk_color_get_type ())
-
-struct _GdkColormap
-{
-  /*< private >*/
-  GObject parent_instance;
-
-  /*< public >*/
-  gint      size;
-  GdkColor *colors;
-
-  /*< private >*/
-  GdkVisual *visual;
-  
-  gpointer windowing_data;
-};
-
-struct _GdkColormapClass
-{
-  GObjectClass parent_class;
-
-};
-
-GType        gdk_colormap_get_type (void) G_GNUC_CONST;
-
-GdkColormap* gdk_colormap_new	  (GdkVisual   *visual,
-				   gboolean	allocate);
-
-#ifndef GDK_DISABLE_DEPRECATED
-GdkColormap* gdk_colormap_ref	  (GdkColormap *cmap);
-void	     gdk_colormap_unref	  (GdkColormap *cmap);
-#endif 
-
-#ifndef GDK_MULTIHEAD_SAFE
-GdkColormap* gdk_colormap_get_system	        (void);
-#endif
-
-GdkScreen *gdk_colormap_get_screen (GdkColormap *cmap);
-
-#ifndef GDK_DISABLE_DEPRECATED
-gint gdk_colormap_get_system_size  (void);
-#endif
-
-#if !defined (GDK_DISABLE_DEPRECATED) || defined (GDK_COMPILATION)
-/* Used by gdk_colors_store () */
-void gdk_colormap_change (GdkColormap	*colormap,
-			  gint		 ncolors);
-#endif 
-
-gint  gdk_colormap_alloc_colors   (GdkColormap *colormap,
-				   GdkColor    *colors,
-				   gint         ncolors,
-				   gboolean     writeable,
-				   gboolean     best_match,
-				   gboolean    *success);
-gboolean gdk_colormap_alloc_color (GdkColormap *colormap,
-				   GdkColor    *color,
-				   gboolean     writeable,
-				   gboolean     best_match);
-void     gdk_colormap_free_colors (GdkColormap *colormap,
-				   GdkColor    *colors,
-				   gint         ncolors);
-void     gdk_colormap_query_color (GdkColormap *colormap,
-				   gulong       pixel,
-				   GdkColor    *result);
-
-GdkVisual *gdk_colormap_get_visual (GdkColormap *colormap);
-     
-GdkColor *gdk_color_copy      (const GdkColor *color);
-void      gdk_color_free      (GdkColor       *color);
-gboolean  gdk_color_parse     (const gchar    *spec,
-			       GdkColor       *color);
-guint     gdk_color_hash      (const GdkColor *colora);
-gboolean  gdk_color_equal     (const GdkColor *colora,
-			       const GdkColor *colorb);
-gchar *   gdk_color_to_string (const GdkColor *color);
-
-GType     gdk_color_get_type (void) G_GNUC_CONST;
-
-/* The following functions are deprecated */
-#ifndef GDK_DISABLE_DEPRECATED
-void gdk_colors_store	 (GdkColormap	*colormap,
-			  GdkColor	*colors,
-			  gint		 ncolors);
-gint gdk_color_white	 (GdkColormap	*colormap,
-			  GdkColor	*color);
-gint gdk_color_black	 (GdkColormap	*colormap,
-			  GdkColor	*color);
-gint gdk_color_alloc	 (GdkColormap	*colormap,
-			  GdkColor	*color);
-gint gdk_color_change	 (GdkColormap	*colormap,
-			  GdkColor	*color);
-#endif /* GDK_DISABLE_DEPRECATED */
-
-#if !defined (GDK_DISABLE_DEPRECATED) || defined (GDK_COMPILATION)
-/* Used by gdk_rgb_try_colormap () */
-gint gdk_colors_alloc	 (GdkColormap	*colormap,
-			  gboolean	 contiguous,
-			  gulong	*planes,
-			  gint		 nplanes,
-			  gulong	*pixels,
-			  gint		 npixels);
-void gdk_colors_free	 (GdkColormap	*colormap,
-			  gulong	*pixels,
-			  gint		 npixels,
-			  gulong	 planes);
-#endif /* !GDK_DISABLE_DEPRECATED || GDK_COMPILATION */
-
-G_END_DECLS
-
-#endif /* __GDK_COLOR_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkcursor.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkcursor.h
deleted file mode 100644
index 7eaa9cae..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkcursor.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_CURSOR_H__
-#define __GDK_CURSOR_H__
-
-#include <gdk/gdktypes.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-G_BEGIN_DECLS
-
-#define GDK_TYPE_CURSOR (gdk_cursor_get_type ())
-
-/* Cursor types.
- */
-typedef enum
-{
-  GDK_X_CURSOR 		  = 0,
-  GDK_ARROW 		  = 2,
-  GDK_BASED_ARROW_DOWN    = 4,
-  GDK_BASED_ARROW_UP 	  = 6,
-  GDK_BOAT 		  = 8,
-  GDK_BOGOSITY 		  = 10,
-  GDK_BOTTOM_LEFT_CORNER  = 12,
-  GDK_BOTTOM_RIGHT_CORNER = 14,
-  GDK_BOTTOM_SIDE 	  = 16,
-  GDK_BOTTOM_TEE 	  = 18,
-  GDK_BOX_SPIRAL 	  = 20,
-  GDK_CENTER_PTR 	  = 22,
-  GDK_CIRCLE 		  = 24,
-  GDK_CLOCK	 	  = 26,
-  GDK_COFFEE_MUG 	  = 28,
-  GDK_CROSS 		  = 30,
-  GDK_CROSS_REVERSE 	  = 32,
-  GDK_CROSSHAIR 	  = 34,
-  GDK_DIAMOND_CROSS 	  = 36,
-  GDK_DOT 		  = 38,
-  GDK_DOTBOX 		  = 40,
-  GDK_DOUBLE_ARROW 	  = 42,
-  GDK_DRAFT_LARGE 	  = 44,
-  GDK_DRAFT_SMALL 	  = 46,
-  GDK_DRAPED_BOX 	  = 48,
-  GDK_EXCHANGE 		  = 50,
-  GDK_FLEUR 		  = 52,
-  GDK_GOBBLER 		  = 54,
-  GDK_GUMBY 		  = 56,
-  GDK_HAND1 		  = 58,
-  GDK_HAND2 		  = 60,
-  GDK_HEART 		  = 62,
-  GDK_ICON 		  = 64,
-  GDK_IRON_CROSS 	  = 66,
-  GDK_LEFT_PTR 		  = 68,
-  GDK_LEFT_SIDE 	  = 70,
-  GDK_LEFT_TEE 		  = 72,
-  GDK_LEFTBUTTON 	  = 74,
-  GDK_LL_ANGLE 		  = 76,
-  GDK_LR_ANGLE 	 	  = 78,
-  GDK_MAN 		  = 80,
-  GDK_MIDDLEBUTTON 	  = 82,
-  GDK_MOUSE 		  = 84,
-  GDK_PENCIL 		  = 86,
-  GDK_PIRATE 		  = 88,
-  GDK_PLUS 		  = 90,
-  GDK_QUESTION_ARROW 	  = 92,
-  GDK_RIGHT_PTR 	  = 94,
-  GDK_RIGHT_SIDE 	  = 96,
-  GDK_RIGHT_TEE 	  = 98,
-  GDK_RIGHTBUTTON 	  = 100,
-  GDK_RTL_LOGO 		  = 102,
-  GDK_SAILBOAT 		  = 104,
-  GDK_SB_DOWN_ARROW 	  = 106,
-  GDK_SB_H_DOUBLE_ARROW   = 108,
-  GDK_SB_LEFT_ARROW 	  = 110,
-  GDK_SB_RIGHT_ARROW 	  = 112,
-  GDK_SB_UP_ARROW 	  = 114,
-  GDK_SB_V_DOUBLE_ARROW   = 116,
-  GDK_SHUTTLE 		  = 118,
-  GDK_SIZING 		  = 120,
-  GDK_SPIDER		  = 122,
-  GDK_SPRAYCAN 		  = 124,
-  GDK_STAR 		  = 126,
-  GDK_TARGET 		  = 128,
-  GDK_TCROSS 		  = 130,
-  GDK_TOP_LEFT_ARROW 	  = 132,
-  GDK_TOP_LEFT_CORNER 	  = 134,
-  GDK_TOP_RIGHT_CORNER 	  = 136,
-  GDK_TOP_SIDE 		  = 138,
-  GDK_TOP_TEE 		  = 140,
-  GDK_TREK 		  = 142,
-  GDK_UL_ANGLE 		  = 144,
-  GDK_UMBRELLA 		  = 146,
-  GDK_UR_ANGLE 		  = 148,
-  GDK_WATCH 		  = 150,
-  GDK_XTERM 		  = 152,
-  GDK_LAST_CURSOR,
-  GDK_CURSOR_IS_PIXMAP 	= -1
-} GdkCursorType;
-
-struct _GdkCursor
-{
-  GdkCursorType type;
-  /*< private >*/
-  guint ref_count;
-};
-
-/* Cursors
- */
-
-GType      gdk_cursor_get_type           (void) G_GNUC_CONST;
-
-GdkCursor* gdk_cursor_new_for_display	 (GdkDisplay      *display,
-					  GdkCursorType    cursor_type);
-#ifndef GDK_MULTIHEAD_SAFE
-GdkCursor* gdk_cursor_new		 (GdkCursorType	   cursor_type);
-#endif
-GdkCursor* gdk_cursor_new_from_pixmap	 (GdkPixmap	  *source,
-					  GdkPixmap	  *mask,
-					  const GdkColor  *fg,
-					  const GdkColor  *bg,
-					  gint		   x,
-					  gint		   y);
-GdkCursor* gdk_cursor_new_from_pixbuf	 (GdkDisplay      *display,
-					  GdkPixbuf       *pixbuf,
-					  gint             x,
-					  gint             y);
-GdkDisplay* gdk_cursor_get_display	 (GdkCursor	  *cursor);
-GdkCursor*  gdk_cursor_ref               (GdkCursor       *cursor);
-void        gdk_cursor_unref             (GdkCursor       *cursor);
-GdkCursor*  gdk_cursor_new_from_name	 (GdkDisplay      *display,
-					  const gchar     *name);
-GdkPixbuf*  gdk_cursor_get_image         (GdkCursor       *cursor);
-
-#ifndef GDK_DISABLE_DEPRECATED
-#define gdk_cursor_destroy             gdk_cursor_unref
-#endif /* GDK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GDK_CURSOR_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkdisplay.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkdisplay.h
deleted file mode 100644
index b55b3122..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkdisplay.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * gdkdisplay.h
- * 
- * Copyright 2001 Sun Microsystems Inc. 
- *
- * Erwann Chenede <erwann.chenede@sun.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 __GDK_DISPLAY_H__
-#define __GDK_DISPLAY_H__
-
-#include <gdk/gdktypes.h>
-#include <gdk/gdkevents.h>
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GdkDisplayClass GdkDisplayClass;
-typedef struct _GdkDisplayPointerHooks GdkDisplayPointerHooks;
-
-#define GDK_TYPE_DISPLAY              (gdk_display_get_type ())
-#define GDK_DISPLAY_OBJECT(object)    (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DISPLAY, GdkDisplay))
-#define GDK_DISPLAY_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DISPLAY, GdkDisplayClass))
-#define GDK_IS_DISPLAY(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DISPLAY))
-#define GDK_IS_DISPLAY_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_DISPLAY))
-#define GDK_DISPLAY_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_DISPLAY, GdkDisplayClass))
-
-struct _GdkDisplay
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GList *queued_events;
-  GList *queued_tail;
-
-  /* Information for determining if the latest button click
-   * is part of a double-click or triple-click
-   */
-  guint32 button_click_time[2];	/* The last 2 button click times. */
-  GdkWindow *button_window[2];  /* The last 2 windows to receive button presses. */
-  gint button_number[2];        /* The last 2 buttons to be pressed. */
-
-  guint double_click_time;	/* Maximum time between clicks in msecs */
-  GdkDevice *core_pointer;	/* Core pointer device */
-
-  const GdkDisplayPointerHooks *pointer_hooks; /* Current hooks for querying pointer */
-  
-  guint closed : 1;		/* Whether this display has been closed */
-
-  guint double_click_distance;	/* Maximum distance between clicks in pixels */
-  gint button_x[2];             /* The last 2 button click positions. */
-  gint button_y[2];
-};
-
-struct _GdkDisplayClass
-{
-  GObjectClass parent_class;
-  
-  G_CONST_RETURN gchar *     (*get_display_name)   (GdkDisplay *display);
-  gint			     (*get_n_screens)      (GdkDisplay *display);
-  GdkScreen *		     (*get_screen)         (GdkDisplay *display,
-						    gint        screen_num);
-  GdkScreen *		     (*get_default_screen) (GdkDisplay *display);
-
-  
-  /* Signals */
-  void (*closed) (GdkDisplay *display,
-		  gboolean    is_error);
-};
-
-struct _GdkDisplayPointerHooks
-{
-  void (*get_pointer)              (GdkDisplay      *display,
-				    GdkScreen      **screen,
-				    gint            *x,
-				    gint            *y,
-				    GdkModifierType *mask);
-  GdkWindow* (*window_get_pointer) (GdkDisplay      *display,
-				    GdkWindow       *window,
-				    gint            *x,
-				    gint            *y,
-				    GdkModifierType *mask);
-  GdkWindow* (*window_at_pointer)  (GdkDisplay      *display,
-				    gint            *win_x,
-				    gint            *win_y);
-};
-
-GType       gdk_display_get_type (void) G_GNUC_CONST;
-GdkDisplay *gdk_display_open                (const gchar *display_name);
-
-G_CONST_RETURN gchar * gdk_display_get_name (GdkDisplay *display);
-
-gint        gdk_display_get_n_screens      (GdkDisplay  *display);
-GdkScreen * gdk_display_get_screen         (GdkDisplay  *display,
-					    gint         screen_num);
-GdkScreen * gdk_display_get_default_screen (GdkDisplay  *display);
-void        gdk_display_pointer_ungrab     (GdkDisplay  *display,
-					    guint32      time_);
-void        gdk_display_keyboard_ungrab    (GdkDisplay  *display,
-					    guint32      time_);
-gboolean    gdk_display_pointer_is_grabbed (GdkDisplay  *display);
-void        gdk_display_beep               (GdkDisplay  *display);
-void        gdk_display_sync               (GdkDisplay  *display);
-void        gdk_display_flush              (GdkDisplay  *display);
-
-void	    gdk_display_close		   (GdkDisplay  *display);
-
-GList *     gdk_display_list_devices       (GdkDisplay  *display);
-
-GdkEvent* gdk_display_get_event  (GdkDisplay *display);
-GdkEvent* gdk_display_peek_event (GdkDisplay *display);
-void      gdk_display_put_event  (GdkDisplay *display,
-				  GdkEvent   *event);
-
-void gdk_display_add_client_message_filter (GdkDisplay   *display,
-					    GdkAtom       message_type,
-					    GdkFilterFunc func,
-					    gpointer      data);
-
-void gdk_display_set_double_click_time     (GdkDisplay   *display,
-					    guint         msec);
-void gdk_display_set_double_click_distance (GdkDisplay   *display,
-					    guint         distance);
-
-GdkDisplay *gdk_display_get_default (void);
-
-GdkDevice  *gdk_display_get_core_pointer (GdkDisplay *display);
-
-void             gdk_display_get_pointer           (GdkDisplay             *display,
-						    GdkScreen             **screen,
-						    gint                   *x,
-						    gint                   *y,
-						    GdkModifierType        *mask);
-GdkWindow *      gdk_display_get_window_at_pointer (GdkDisplay             *display,
-						    gint                   *win_x,
-						    gint                   *win_y);
-void             gdk_display_warp_pointer          (GdkDisplay             *display,
-						    GdkScreen              *screen,
-						    gint                   x,
-						    gint                   y);
-
-GdkDisplayPointerHooks *gdk_display_set_pointer_hooks (GdkDisplay                   *display,
-						       const GdkDisplayPointerHooks *new_hooks);
-
-GdkDisplay *gdk_display_open_default_libgtk_only (void);
-
-gboolean gdk_display_supports_cursor_alpha     (GdkDisplay    *display);
-gboolean gdk_display_supports_cursor_color     (GdkDisplay    *display);
-guint    gdk_display_get_default_cursor_size   (GdkDisplay    *display);
-void     gdk_display_get_maximal_cursor_size   (GdkDisplay    *display,
-						guint         *width,
-						guint         *height);
-
-GdkWindow *gdk_display_get_default_group       (GdkDisplay *display); 
-
-gboolean gdk_display_supports_selection_notification (GdkDisplay *display);
-gboolean gdk_display_request_selection_notification  (GdkDisplay *display,
-						      GdkAtom     selection);
-
-gboolean gdk_display_supports_clipboard_persistence (GdkDisplay *display);
-void     gdk_display_store_clipboard                (GdkDisplay *display,
-						     GdkWindow  *clipboard_window,
-						     guint32     time_,
-						     GdkAtom    *targets,
-						     gint        n_targets);
-
-gboolean gdk_display_supports_shapes           (GdkDisplay    *display);
-gboolean gdk_display_supports_input_shapes     (GdkDisplay    *display);
-gboolean gdk_display_supports_composite        (GdkDisplay    *display);
-
-G_END_DECLS
-
-#endif	/* __GDK_DISPLAY_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkdisplaymanager.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkdisplaymanager.h
deleted file mode 100644
index 75294417..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkdisplaymanager.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __GDK_DISPLAY_MANAGER_H__
-#define __GDK_DISPLAY_MANAGER_H__
-
-#include <gdk/gdktypes.h>
-#include <gdk/gdkdisplay.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GdkDisplayManager      GdkDisplayManager;
-typedef struct _GdkDisplayManagerClass GdkDisplayManagerClass;
-
-#define GDK_TYPE_DISPLAY_MANAGER              (gdk_display_manager_get_type ())
-#define GDK_DISPLAY_MANAGER(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DISPLAY_MANAGER, GdkDisplayManager))
-#define GDK_DISPLAY_MANAGER_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DISPLAY_MANAGER, GdkDisplayManagerClass))
-#define GDK_IS_DISPLAY_MANAGER(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DISPLAY_MANAGER))
-#define GDK_IS_DISPLAY_MANAGER_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_DISPLAY_MANAGER))
-#define GDK_DISPLAY_MANAGER_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_DISPLAY_MANAGER, GdkDisplayManagerClass))
-
-struct _GdkDisplayManagerClass
-{
-  GObjectClass parent_class;
-
-  void (*display_opened) (GdkDisplayManager *display_manager,
-			  GdkDisplay *display);
-};
-
-GType gdk_display_manager_get_type (void) G_GNUC_CONST;
-
-GdkDisplayManager *gdk_display_manager_get                 (void);
-GdkDisplay *       gdk_display_manager_get_default_display (GdkDisplayManager *display_manager);
-void               gdk_display_manager_set_default_display (GdkDisplayManager *display_manager,
-							    GdkDisplay        *display);
-GSList     *       gdk_display_manager_list_displays       (GdkDisplayManager *display_manager);
-
-G_END_DECLS
-
-#endif /* __GDK_DISPLAY_MANAGER_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkdnd.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkdnd.h
deleted file mode 100644
index 68440532..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkdnd.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-#ifndef __GDK_DND_H__
-#define __GDK_DND_H__
-
-#include <gdk/gdktypes.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GdkDragContext        GdkDragContext;
-
-typedef enum
-{
-  GDK_ACTION_DEFAULT = 1 << 0,
-  GDK_ACTION_COPY    = 1 << 1,
-  GDK_ACTION_MOVE    = 1 << 2,
-  GDK_ACTION_LINK    = 1 << 3,
-  GDK_ACTION_PRIVATE = 1 << 4,
-  GDK_ACTION_ASK     = 1 << 5
-} GdkDragAction;
-
-typedef enum
-{
-  GDK_DRAG_PROTO_MOTIF,
-  GDK_DRAG_PROTO_XDND,
-  GDK_DRAG_PROTO_ROOTWIN,	  /* A root window with nobody claiming
-				   * drags */
-  GDK_DRAG_PROTO_NONE,		  /* Not a valid drag window */
-  GDK_DRAG_PROTO_WIN32_DROPFILES, /* The simple WM_DROPFILES dnd */
-  GDK_DRAG_PROTO_OLE2,		  /* The complex OLE2 dnd (not implemented) */
-  GDK_DRAG_PROTO_LOCAL            /* Intra-app */
-} GdkDragProtocol;
-
-/* Object that holds information about a drag in progress.
- * this is used on both source and destination sides.
- */
-
-typedef struct _GdkDragContextClass GdkDragContextClass;
-
-#define GDK_TYPE_DRAG_CONTEXT              (gdk_drag_context_get_type ())
-#define GDK_DRAG_CONTEXT(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DRAG_CONTEXT, GdkDragContext))
-#define GDK_DRAG_CONTEXT_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DRAG_CONTEXT, GdkDragContextClass))
-#define GDK_IS_DRAG_CONTEXT(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DRAG_CONTEXT))
-#define GDK_IS_DRAG_CONTEXT_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_DRAG_CONTEXT))
-#define GDK_DRAG_CONTEXT_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_DRAG_CONTEXT, GdkDragContextClass))
-
-struct _GdkDragContext {
-  GObject parent_instance;
-
-  /*< public >*/
-  
-  GdkDragProtocol protocol;
-  
-  gboolean is_source;
-  
-  GdkWindow *source_window;
-  GdkWindow *dest_window;
-
-  GList *targets;
-  GdkDragAction actions;
-  GdkDragAction suggested_action;
-  GdkDragAction action; 
-
-  guint32 start_time;
-
-  /*< private >*/
-  
-  gpointer windowing_data;
-};
-
-struct _GdkDragContextClass {
-  GObjectClass parent_class;
-
-  
-};
-
-/* Drag and Drop */
-
-GType            gdk_drag_context_get_type   (void) G_GNUC_CONST;
-GdkDragContext * gdk_drag_context_new        (void);
-
-#ifndef GDK_DISABLE_DEPRECATED
-void             gdk_drag_context_ref        (GdkDragContext *context);
-void             gdk_drag_context_unref      (GdkDragContext *context);
-#endif
-
-/* Destination side */
-
-void             gdk_drag_status        (GdkDragContext   *context,
-				         GdkDragAction     action,
-					 guint32           time_);
-void             gdk_drop_reply         (GdkDragContext   *context,
-					 gboolean          ok,
-					 guint32           time_);
-void             gdk_drop_finish        (GdkDragContext   *context,
-					 gboolean          success,
-					 guint32           time_);
-GdkAtom          gdk_drag_get_selection (GdkDragContext   *context);
-
-/* Source side */
-
-GdkDragContext * gdk_drag_begin      (GdkWindow      *window,
-				      GList          *targets);
-
-guint32 gdk_drag_get_protocol_for_display (GdkDisplay       *display,
-					   guint32           xid,
-					   GdkDragProtocol  *protocol);
-void    gdk_drag_find_window_for_screen   (GdkDragContext   *context,
-					   GdkWindow        *drag_window,
-					   GdkScreen        *screen,
-					   gint              x_root,
-					   gint              y_root,
-					   GdkWindow       **dest_window,
-					   GdkDragProtocol  *protocol);
-
-#ifndef GDK_MULTIHEAD_SAFE
-guint32 gdk_drag_get_protocol (guint32           xid,
-			       GdkDragProtocol  *protocol);
-void    gdk_drag_find_window  (GdkDragContext   *context,
-			       GdkWindow        *drag_window,
-			       gint              x_root,
-			       gint              y_root,
-			       GdkWindow       **dest_window,
-			       GdkDragProtocol  *protocol);
-#endif /* GDK_MULTIHEAD_SAFE */
-
-gboolean        gdk_drag_motion      (GdkDragContext *context,
-				      GdkWindow      *dest_window,
-				      GdkDragProtocol protocol,
-				      gint            x_root, 
-				      gint            y_root,
-				      GdkDragAction   suggested_action,
-				      GdkDragAction   possible_actions,
-				      guint32         time_);
-void            gdk_drag_drop        (GdkDragContext *context,
-				      guint32         time_);
-void            gdk_drag_abort       (GdkDragContext *context,
-				      guint32         time_);
-gboolean        gdk_drag_drop_succeeded (GdkDragContext *context);
-
-G_END_DECLS
-
-#endif /* __GDK_DND_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkdrawable.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkdrawable.h
deleted file mode 100644
index ccaa3644..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkdrawable.h
+++ /dev/null
@@ -1,419 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-#ifndef __GDK_DRAWABLE_H__
-#define __GDK_DRAWABLE_H__
-
-#include <gdk/gdktypes.h>
-#include <gdk/gdkgc.h>
-#include <gdk/gdkrgb.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-#include <cairo.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GdkDrawableClass GdkDrawableClass;
-typedef struct _GdkTrapezoid     GdkTrapezoid;
-
-#define GDK_TYPE_DRAWABLE              (gdk_drawable_get_type ())
-#define GDK_DRAWABLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DRAWABLE, GdkDrawable))
-#define GDK_DRAWABLE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DRAWABLE, GdkDrawableClass))
-#define GDK_IS_DRAWABLE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DRAWABLE))
-#define GDK_IS_DRAWABLE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_DRAWABLE))
-#define GDK_DRAWABLE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_DRAWABLE, GdkDrawableClass))
-
-struct _GdkDrawable
-{
-  GObject parent_instance;
-};
- 
-struct _GdkDrawableClass 
-{
-  GObjectClass parent_class;
-  
-  GdkGC *(*create_gc)    (GdkDrawable    *drawable,
-		          GdkGCValues    *values,
-		          GdkGCValuesMask mask);
-  void (*draw_rectangle) (GdkDrawable  *drawable,
-			  GdkGC	       *gc,
-			  gboolean	filled,
-			  gint		x,
-			  gint		y,
-			  gint		width,
-			  gint		height);
-  void (*draw_arc)       (GdkDrawable  *drawable,
-			  GdkGC	       *gc,
-			  gboolean	filled,
-			  gint		x,
-			  gint		y,
-			  gint		width,
-			  gint		height,
-			  gint		angle1,
-			  gint		angle2);
-  void (*draw_polygon)   (GdkDrawable  *drawable,
-			  GdkGC	       *gc,
-			  gboolean	filled,
-			  GdkPoint     *points,
-			  gint		npoints);
-  void (*draw_text)      (GdkDrawable  *drawable,
-			  GdkFont      *font,
-			  GdkGC	       *gc,
-			  gint		x,
-			  gint		y,
-			  const gchar  *text,
-			  gint		text_length);
-  void (*draw_text_wc)   (GdkDrawable	 *drawable,
-			  GdkFont	 *font,
-			  GdkGC		 *gc,
-			  gint		  x,
-			  gint		  y,
-			  const GdkWChar *text,
-			  gint		  text_length);
-  void (*draw_drawable)  (GdkDrawable  *drawable,
-			  GdkGC	       *gc,
-			  GdkDrawable  *src,
-			  gint		xsrc,
-			  gint		ysrc,
-			  gint		xdest,
-			  gint		ydest,
-			  gint		width,
-			  gint		height);
-  void (*draw_points)	 (GdkDrawable  *drawable,
-			  GdkGC	       *gc,
-			  GdkPoint     *points,
-			  gint		npoints);
-  void (*draw_segments)	 (GdkDrawable  *drawable,
-			  GdkGC	       *gc,
-			  GdkSegment   *segs,
-			  gint		nsegs);
- void (*draw_lines)     (GdkDrawable  *drawable,
-			  GdkGC        *gc,
-			  GdkPoint     *points,
-			  gint          npoints);
-
-  void (*draw_glyphs)    (GdkDrawable      *drawable,
-			  GdkGC	           *gc,
-			  PangoFont        *font,
-			  gint              x,
-			  gint              y,
-			  PangoGlyphString *glyphs);
-
-  void (*draw_image)     (GdkDrawable *drawable,
-                          GdkGC	      *gc,
-                          GdkImage    *image,
-                          gint	       xsrc,
-                          gint	       ysrc,
-                          gint	       xdest,
-                          gint	       ydest,
-                          gint	       width,
-                          gint	       height);
-  
-  gint (*get_depth)      (GdkDrawable  *drawable);
-  void (*get_size)       (GdkDrawable  *drawable,
-                          gint         *width,
-                          gint         *height);
-
-  void (*set_colormap)   (GdkDrawable  *drawable,
-                          GdkColormap  *cmap);
-
-  GdkColormap* (*get_colormap)	(GdkDrawable  *drawable);
-  GdkVisual*   (*get_visual)	(GdkDrawable  *drawable);
-  GdkScreen*   (*get_screen)	(GdkDrawable  *drawable);
-
-  GdkImage*    (*get_image)  (GdkDrawable  *drawable,
-                              gint          x,
-                              gint          y,
-                              gint          width,
-                              gint          height);
-
-  GdkRegion*   (*get_clip_region)    (GdkDrawable  *drawable);
-  GdkRegion*   (*get_visible_region) (GdkDrawable  *drawable);
-
-  GdkDrawable* (*get_composite_drawable) (GdkDrawable *drawable,
-                                          gint         x,
-                                          gint         y,
-                                          gint         width,
-                                          gint         height,
-                                          gint        *composite_x_offset,
-                                          gint        *composite_y_offset);
-
-  void         (*draw_pixbuf) (GdkDrawable *drawable,
-			       GdkGC       *gc,
-			       GdkPixbuf   *pixbuf,
-			       gint         src_x,
-			       gint         src_y,
-			       gint         dest_x,
-			       gint         dest_y,
-			       gint         width,
-			       gint         height,
-			       GdkRgbDither dither,
-			       gint         x_dither,
-			       gint         y_dither);
-  GdkImage*    (*_copy_to_image) (GdkDrawable    *drawable,
-				  GdkImage       *image,
-				  gint            src_x,
-				  gint            src_y,
-				  gint            dest_x,
-				  gint            dest_y,
-				  gint            width,
-				  gint            height);
-  
-  void (*draw_glyphs_transformed) (GdkDrawable      *drawable,
-				   GdkGC	    *gc,
-				   PangoMatrix      *matrix,
-				   PangoFont        *font,
-				   gint              x,
-				   gint              y,
-				   PangoGlyphString *glyphs);
-  void (*draw_trapezoids)         (GdkDrawable      *drawable,
-				   GdkGC	    *gc,
-				   GdkTrapezoid     *trapezoids,
-				   gint              n_trapezoids);
-
-  cairo_surface_t *(*ref_cairo_surface) (GdkDrawable *drawable);
-
-  /* Padding for future expansion */
-  void         (*_gdk_reserved4)  (void);
-  void         (*_gdk_reserved5)  (void);
-  void         (*_gdk_reserved6)  (void);
-  void         (*_gdk_reserved7)  (void);
-  void         (*_gdk_reserved9)  (void);
-  void         (*_gdk_reserved10) (void);
-  void         (*_gdk_reserved11) (void);
-  void         (*_gdk_reserved12) (void);
-  void         (*_gdk_reserved13) (void);
-  void         (*_gdk_reserved14) (void);
-  void         (*_gdk_reserved15) (void);
-  void         (*_gdk_reserved16) (void);
-};
-
-struct _GdkTrapezoid
-{
-  double y1, x11, x21, y2, x12, x22;
-};
-
-GType           gdk_drawable_get_type     (void) G_GNUC_CONST;
-
-/* Manipulation of drawables
- */
-
-#ifndef GDK_DISABLE_DEPRECATED
-void            gdk_drawable_set_data     (GdkDrawable    *drawable,
-					   const gchar    *key,
-					   gpointer	  data,
-					   GDestroyNotify  destroy_func);
-gpointer        gdk_drawable_get_data     (GdkDrawable    *drawable,
-					   const gchar    *key);
-#endif /* GDK_DISABLE_DEPRECATED */
-
-void            gdk_drawable_get_size     (GdkDrawable	  *drawable,
-					   gint	          *width,
-					   gint  	  *height);
-void	        gdk_drawable_set_colormap (GdkDrawable	  *drawable,
-					   GdkColormap	  *colormap);
-GdkColormap*    gdk_drawable_get_colormap (GdkDrawable	  *drawable);
-GdkVisual*      gdk_drawable_get_visual   (GdkDrawable	  *drawable);
-gint            gdk_drawable_get_depth    (GdkDrawable	  *drawable);
-GdkScreen*	gdk_drawable_get_screen   (GdkDrawable    *drawable);
-GdkDisplay*	gdk_drawable_get_display  (GdkDrawable    *drawable);
-
-#ifndef GDK_DISABLE_DEPRECATED
-GdkDrawable*    gdk_drawable_ref          (GdkDrawable    *drawable);
-void            gdk_drawable_unref        (GdkDrawable    *drawable);
-#endif /* GDK_DISABLE_DEPRECATED */
-
-/* Drawing
- */
-void gdk_draw_point     (GdkDrawable      *drawable,
-			 GdkGC            *gc,
-			 gint              x,
-			 gint              y);
-void gdk_draw_line      (GdkDrawable      *drawable,
-			 GdkGC            *gc,
-			 gint              x1_,
-			 gint              y1_,
-			 gint              x2_,
-			 gint              y2_);
-void gdk_draw_rectangle (GdkDrawable      *drawable,
-			 GdkGC            *gc,
-			 gboolean          filled,
-			 gint              x,
-			 gint              y,
-			 gint              width,
-			 gint              height);
-void gdk_draw_arc       (GdkDrawable      *drawable,
-			 GdkGC            *gc,
-			 gboolean          filled,
-			 gint              x,
-			 gint              y,
-			 gint              width,
-			 gint              height,
-			 gint              angle1,
-			 gint              angle2);
-void gdk_draw_polygon   (GdkDrawable      *drawable,
-			 GdkGC            *gc,
-			 gboolean          filled,
-			 GdkPoint         *points,
-			 gint              npoints);
-#if !defined (GDK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
-/* Used by gtk_default_draw_string () */
-void gdk_draw_string    (GdkDrawable      *drawable,
-			 GdkFont          *font,
-			 GdkGC            *gc,
-			 gint              x,
-			 gint              y,
-			 const gchar      *string);
-#endif /* !GDK_DISABLE_DEPRECATED || GTK_COMPILATION */
-#if !defined (GDK_DISABLE_DEPRECATED) || defined (GDK_COMPILATION)
-/* Used by gdk_pixmap_draw_text (), gdk_window_draw_text() */
-void gdk_draw_text      (GdkDrawable      *drawable,
-			 GdkFont          *font,
-			 GdkGC            *gc,
-			 gint              x,
-			 gint              y,
-			 const gchar      *text,
-			 gint              text_length);
-/* Used by gdk_pixmap_draw_text_wc (), gdk_window_draw_text_wc () */
-void gdk_draw_text_wc   (GdkDrawable      *drawable,
-			 GdkFont          *font,
-			 GdkGC            *gc,
-			 gint              x,
-			 gint              y,
-			 const GdkWChar   *text,
-			 gint              text_length);
-#endif /* !GDK_DISABLE_DEPRECATED || GDK_COMPILATION */
-void gdk_draw_drawable  (GdkDrawable      *drawable,
-			 GdkGC            *gc,
-			 GdkDrawable      *src,
-			 gint              xsrc,
-			 gint              ysrc,
-			 gint              xdest,
-			 gint              ydest,
-			 gint              width,
-			 gint              height);
-void gdk_draw_image     (GdkDrawable      *drawable,
-			 GdkGC            *gc,
-			 GdkImage         *image,
-			 gint              xsrc,
-			 gint              ysrc,
-			 gint              xdest,
-			 gint              ydest,
-			 gint              width,
-			 gint              height);
-void gdk_draw_points    (GdkDrawable      *drawable,
-			 GdkGC            *gc,
-			 GdkPoint         *points,
-			 gint              npoints);
-void gdk_draw_segments  (GdkDrawable      *drawable,
-			 GdkGC            *gc,
-			 GdkSegment       *segs,
-			 gint              nsegs);
-void gdk_draw_lines     (GdkDrawable      *drawable,
-			 GdkGC            *gc,
-			 GdkPoint         *points,
-			 gint              npoints);
-void gdk_draw_pixbuf    (GdkDrawable      *drawable,
-			 GdkGC            *gc,
-			 GdkPixbuf        *pixbuf,
-			 gint              src_x,
-			 gint              src_y,
-			 gint              dest_x,
-			 gint              dest_y,
-			 gint              width,
-			 gint              height,
-			 GdkRgbDither      dither,
-			 gint              x_dither,
-			 gint              y_dither);
-
-void gdk_draw_glyphs      (GdkDrawable      *drawable,
-			   GdkGC            *gc,
-			   PangoFont        *font,
-			   gint              x,
-			   gint              y,
-			   PangoGlyphString *glyphs);
-void gdk_draw_layout_line (GdkDrawable      *drawable,
-			   GdkGC            *gc,
-			   gint              x,
-			   gint              y,
-			   PangoLayoutLine  *line);
-void gdk_draw_layout      (GdkDrawable      *drawable,
-			   GdkGC            *gc,
-			   gint              x,
-			   gint              y,
-			   PangoLayout      *layout);
-
-void gdk_draw_layout_line_with_colors (GdkDrawable     *drawable,
-                                       GdkGC           *gc,
-                                       gint             x,
-                                       gint             y,
-                                       PangoLayoutLine *line,
-                                       const GdkColor  *foreground,
-                                       const GdkColor  *background);
-void gdk_draw_layout_with_colors      (GdkDrawable     *drawable,
-                                       GdkGC           *gc,
-                                       gint             x,
-                                       gint             y,
-                                       PangoLayout     *layout,
-                                       const GdkColor  *foreground,
-                                       const GdkColor  *background);
-
-void gdk_draw_glyphs_transformed (GdkDrawable      *drawable,
-				  GdkGC	           *gc,
-				  PangoMatrix      *matrix,
-				  PangoFont        *font,
-				  gint              x,
-				  gint              y,
-				  PangoGlyphString *glyphs);
-void gdk_draw_trapezoids         (GdkDrawable      *drawable,
-				  GdkGC	           *gc,
-				  GdkTrapezoid     *trapezoids,
-				  gint              n_trapezoids);
-
-#ifndef GDK_DISABLE_DEPRECATED
-#define gdk_draw_pixmap                gdk_draw_drawable
-#define gdk_draw_bitmap                gdk_draw_drawable
-#endif /* GDK_DISABLE_DEPRECATED */
-
-GdkImage* gdk_drawable_get_image      (GdkDrawable *drawable,
-                                       gint         x,
-                                       gint         y,
-                                       gint         width,
-                                       gint         height);
-GdkImage *gdk_drawable_copy_to_image (GdkDrawable  *drawable,
-				      GdkImage     *image,
-				      gint          src_x,
-				      gint          src_y,
-				      gint          dest_x,
-				      gint          dest_y,
-				      gint          width,
-				      gint          height);
-
-GdkRegion *gdk_drawable_get_clip_region    (GdkDrawable *drawable);
-GdkRegion *gdk_drawable_get_visible_region (GdkDrawable *drawable);
-
-G_END_DECLS
-
-#endif /* __GDK_DRAWABLE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkenumtypes.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkenumtypes.h
deleted file mode 100644
index 1ffe3dbf..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkenumtypes.h
+++ /dev/null
@@ -1,120 +0,0 @@
-
-/* Generated data (by glib-mkenums) */
-
-#ifndef __GDK_ENUM_TYPES_H__
-#define __GDK_ENUM_TYPES_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-/* enumerations from "gdkcursor.h" */
-GType gdk_cursor_type_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_CURSOR_TYPE (gdk_cursor_type_get_type())
-/* enumerations from "gdkdnd.h" */
-GType gdk_drag_action_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_DRAG_ACTION (gdk_drag_action_get_type())
-GType gdk_drag_protocol_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_DRAG_PROTOCOL (gdk_drag_protocol_get_type())
-/* enumerations from "gdkevents.h" */
-GType gdk_filter_return_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_FILTER_RETURN (gdk_filter_return_get_type())
-GType gdk_event_type_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_EVENT_TYPE (gdk_event_type_get_type())
-GType gdk_event_mask_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_EVENT_MASK (gdk_event_mask_get_type())
-GType gdk_visibility_state_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_VISIBILITY_STATE (gdk_visibility_state_get_type())
-GType gdk_scroll_direction_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_SCROLL_DIRECTION (gdk_scroll_direction_get_type())
-GType gdk_notify_type_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_NOTIFY_TYPE (gdk_notify_type_get_type())
-GType gdk_crossing_mode_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_CROSSING_MODE (gdk_crossing_mode_get_type())
-GType gdk_property_state_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_PROPERTY_STATE (gdk_property_state_get_type())
-GType gdk_window_state_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_WINDOW_STATE (gdk_window_state_get_type())
-GType gdk_setting_action_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_SETTING_ACTION (gdk_setting_action_get_type())
-GType gdk_owner_change_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_OWNER_CHANGE (gdk_owner_change_get_type())
-/* enumerations from "gdkfont.h" */
-GType gdk_font_type_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_FONT_TYPE (gdk_font_type_get_type())
-/* enumerations from "gdkgc.h" */
-GType gdk_cap_style_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_CAP_STYLE (gdk_cap_style_get_type())
-GType gdk_fill_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_FILL (gdk_fill_get_type())
-GType gdk_function_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_FUNCTION (gdk_function_get_type())
-GType gdk_join_style_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_JOIN_STYLE (gdk_join_style_get_type())
-GType gdk_line_style_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_LINE_STYLE (gdk_line_style_get_type())
-GType gdk_subwindow_mode_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_SUBWINDOW_MODE (gdk_subwindow_mode_get_type())
-GType gdk_gc_values_mask_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_GC_VALUES_MASK (gdk_gc_values_mask_get_type())
-/* enumerations from "gdkimage.h" */
-GType gdk_image_type_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_IMAGE_TYPE (gdk_image_type_get_type())
-/* enumerations from "gdkinput.h" */
-GType gdk_extension_mode_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_EXTENSION_MODE (gdk_extension_mode_get_type())
-GType gdk_input_source_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_INPUT_SOURCE (gdk_input_source_get_type())
-GType gdk_input_mode_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_INPUT_MODE (gdk_input_mode_get_type())
-GType gdk_axis_use_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_AXIS_USE (gdk_axis_use_get_type())
-/* enumerations from "gdkproperty.h" */
-GType gdk_prop_mode_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_PROP_MODE (gdk_prop_mode_get_type())
-/* enumerations from "gdkregion.h" */
-GType gdk_fill_rule_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_FILL_RULE (gdk_fill_rule_get_type())
-GType gdk_overlap_type_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_OVERLAP_TYPE (gdk_overlap_type_get_type())
-/* enumerations from "gdkrgb.h" */
-GType gdk_rgb_dither_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_RGB_DITHER (gdk_rgb_dither_get_type())
-/* enumerations from "gdktypes.h" */
-GType gdk_byte_order_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_BYTE_ORDER (gdk_byte_order_get_type())
-GType gdk_modifier_type_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_MODIFIER_TYPE (gdk_modifier_type_get_type())
-GType gdk_input_condition_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_INPUT_CONDITION (gdk_input_condition_get_type())
-GType gdk_status_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_STATUS (gdk_status_get_type())
-GType gdk_grab_status_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_GRAB_STATUS (gdk_grab_status_get_type())
-/* enumerations from "gdkvisual.h" */
-GType gdk_visual_type_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_VISUAL_TYPE (gdk_visual_type_get_type())
-/* enumerations from "gdkwindow.h" */
-GType gdk_window_class_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_WINDOW_CLASS (gdk_window_class_get_type())
-GType gdk_window_type_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_WINDOW_TYPE (gdk_window_type_get_type())
-GType gdk_window_attributes_type_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_WINDOW_ATTRIBUTES_TYPE (gdk_window_attributes_type_get_type())
-GType gdk_window_hints_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_WINDOW_HINTS (gdk_window_hints_get_type())
-GType gdk_window_type_hint_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_WINDOW_TYPE_HINT (gdk_window_type_hint_get_type())
-GType gdk_wm_decoration_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_WM_DECORATION (gdk_wm_decoration_get_type())
-GType gdk_wm_function_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_WM_FUNCTION (gdk_wm_function_get_type())
-GType gdk_gravity_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_GRAVITY (gdk_gravity_get_type())
-GType gdk_window_edge_get_type (void) G_GNUC_CONST;
-#define GDK_TYPE_WINDOW_EDGE (gdk_window_edge_get_type())
-G_END_DECLS
-
-#endif /* __GDK_ENUM_TYPES_H__ */
-
-/* Generated data ends here */
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkevents.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkevents.h
deleted file mode 100644
index 5a30e99a..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkevents.h
+++ /dev/null
@@ -1,555 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_EVENTS_H__
-#define __GDK_EVENTS_H__
-
-#include <gdk/gdkcolor.h>
-#include <gdk/gdktypes.h>
-#include <gdk/gdkdnd.h>
-#include <gdk/gdkinput.h>
-
-G_BEGIN_DECLS
-
-#define GDK_TYPE_EVENT          (gdk_event_get_type ())
-
-#define GDK_PRIORITY_EVENTS	(G_PRIORITY_DEFAULT)
-#define GDK_PRIORITY_REDRAW     (G_PRIORITY_HIGH_IDLE + 20)
-
-
-typedef struct _GdkEventAny	    GdkEventAny;
-typedef struct _GdkEventExpose	    GdkEventExpose;
-typedef struct _GdkEventNoExpose    GdkEventNoExpose;
-typedef struct _GdkEventVisibility  GdkEventVisibility;
-typedef struct _GdkEventMotion	    GdkEventMotion;
-typedef struct _GdkEventButton	    GdkEventButton;
-typedef struct _GdkEventScroll      GdkEventScroll;  
-typedef struct _GdkEventKey	    GdkEventKey;
-typedef struct _GdkEventFocus	    GdkEventFocus;
-typedef struct _GdkEventCrossing    GdkEventCrossing;
-typedef struct _GdkEventConfigure   GdkEventConfigure;
-typedef struct _GdkEventProperty    GdkEventProperty;
-typedef struct _GdkEventSelection   GdkEventSelection;
-typedef struct _GdkEventOwnerChange GdkEventOwnerChange;
-typedef struct _GdkEventProximity   GdkEventProximity;
-typedef struct _GdkEventClient	    GdkEventClient;
-typedef struct _GdkEventDND         GdkEventDND;
-typedef struct _GdkEventWindowState GdkEventWindowState;
-typedef struct _GdkEventSetting     GdkEventSetting;
-typedef struct _GdkEventGrabBroken  GdkEventGrabBroken;
-
-typedef union  _GdkEvent	    GdkEvent;
-
-typedef void (*GdkEventFunc) (GdkEvent *event,
-			      gpointer	data);
-
-/* Event filtering */
-
-typedef void GdkXEvent;	  /* Can be cast to window system specific
-			   * even type, XEvent on X11, MSG on Win32.
-			   */
-
-typedef enum {
-  GDK_FILTER_CONTINUE,	  /* Event not handled, continue processesing */
-  GDK_FILTER_TRANSLATE,	  /* Native event translated into a GDK event and
-                             stored in the "event" structure that was
-                             passed in */
-  GDK_FILTER_REMOVE	  /* Terminate processing, removing event */
-} GdkFilterReturn;
-
-typedef GdkFilterReturn (*GdkFilterFunc) (GdkXEvent *xevent,
-					  GdkEvent *event,
-					  gpointer  data);
-
-
-/* Event types.
- *   Nothing: No event occurred.
- *   Delete: A window delete event was sent by the window manager.
- *	     The specified window should be deleted.
- *   Destroy: A window has been destroyed.
- *   Expose: Part of a window has been uncovered.
- *   NoExpose: Same as expose, but no expose event was generated.
- *   VisibilityNotify: A window has become fully/partially/not obscured.
- *   MotionNotify: The mouse has moved.
- *   ButtonPress: A mouse button was pressed.
- *   ButtonRelease: A mouse button was release.
- *   KeyPress: A key was pressed.
- *   KeyRelease: A key was released.
- *   EnterNotify: A window was entered.
- *   LeaveNotify: A window was exited.
- *   FocusChange: The focus window has changed. (The focus window gets
- *		  keyboard events).
- *   Resize: A window has been resized.
- *   Map: A window has been mapped. (It is now visible on the screen).
- *   Unmap: A window has been unmapped. (It is no longer visible on
- *	    the screen).
- *   Scroll: A mouse wheel was scrolled either up or down.
- */
-typedef enum
-{
-  GDK_NOTHING		= -1,
-  GDK_DELETE		= 0,
-  GDK_DESTROY		= 1,
-  GDK_EXPOSE		= 2,
-  GDK_MOTION_NOTIFY	= 3,
-  GDK_BUTTON_PRESS	= 4,
-  GDK_2BUTTON_PRESS	= 5,
-  GDK_3BUTTON_PRESS	= 6,
-  GDK_BUTTON_RELEASE	= 7,
-  GDK_KEY_PRESS		= 8,
-  GDK_KEY_RELEASE	= 9,
-  GDK_ENTER_NOTIFY	= 10,
-  GDK_LEAVE_NOTIFY	= 11,
-  GDK_FOCUS_CHANGE	= 12,
-  GDK_CONFIGURE		= 13,
-  GDK_MAP		= 14,
-  GDK_UNMAP		= 15,
-  GDK_PROPERTY_NOTIFY	= 16,
-  GDK_SELECTION_CLEAR	= 17,
-  GDK_SELECTION_REQUEST = 18,
-  GDK_SELECTION_NOTIFY	= 19,
-  GDK_PROXIMITY_IN	= 20,
-  GDK_PROXIMITY_OUT	= 21,
-  GDK_DRAG_ENTER        = 22,
-  GDK_DRAG_LEAVE        = 23,
-  GDK_DRAG_MOTION       = 24,
-  GDK_DRAG_STATUS       = 25,
-  GDK_DROP_START        = 26,
-  GDK_DROP_FINISHED     = 27,
-  GDK_CLIENT_EVENT	= 28,
-  GDK_VISIBILITY_NOTIFY = 29,
-  GDK_NO_EXPOSE		= 30,
-  GDK_SCROLL            = 31,
-  GDK_WINDOW_STATE      = 32,
-  GDK_SETTING           = 33,
-  GDK_OWNER_CHANGE      = 34,
-  GDK_GRAB_BROKEN       = 35
-} GdkEventType;
-
-/* Event masks. (Used to select what types of events a window
- *  will receive).
- */
-typedef enum
-{
-  GDK_EXPOSURE_MASK		= 1 << 1,
-  GDK_POINTER_MOTION_MASK	= 1 << 2,
-  GDK_POINTER_MOTION_HINT_MASK	= 1 << 3,
-  GDK_BUTTON_MOTION_MASK	= 1 << 4,
-  GDK_BUTTON1_MOTION_MASK	= 1 << 5,
-  GDK_BUTTON2_MOTION_MASK	= 1 << 6,
-  GDK_BUTTON3_MOTION_MASK	= 1 << 7,
-  GDK_BUTTON_PRESS_MASK		= 1 << 8,
-  GDK_BUTTON_RELEASE_MASK	= 1 << 9,
-  GDK_KEY_PRESS_MASK		= 1 << 10,
-  GDK_KEY_RELEASE_MASK		= 1 << 11,
-  GDK_ENTER_NOTIFY_MASK		= 1 << 12,
-  GDK_LEAVE_NOTIFY_MASK		= 1 << 13,
-  GDK_FOCUS_CHANGE_MASK		= 1 << 14,
-  GDK_STRUCTURE_MASK		= 1 << 15,
-  GDK_PROPERTY_CHANGE_MASK	= 1 << 16,
-  GDK_VISIBILITY_NOTIFY_MASK	= 1 << 17,
-  GDK_PROXIMITY_IN_MASK		= 1 << 18,
-  GDK_PROXIMITY_OUT_MASK	= 1 << 19,
-  GDK_SUBSTRUCTURE_MASK		= 1 << 20,
-  GDK_SCROLL_MASK               = 1 << 21,
-  GDK_ALL_EVENTS_MASK		= 0x3FFFFE
-} GdkEventMask;
-
-typedef enum
-{
-  GDK_VISIBILITY_UNOBSCURED,
-  GDK_VISIBILITY_PARTIAL,
-  GDK_VISIBILITY_FULLY_OBSCURED
-} GdkVisibilityState;
-
-typedef enum
-{
-  GDK_SCROLL_UP,
-  GDK_SCROLL_DOWN,
-  GDK_SCROLL_LEFT,
-  GDK_SCROLL_RIGHT
-} GdkScrollDirection;
-
-/* Types of enter/leave notifications.
- *   Ancestor:
- *   Virtual:
- *   Inferior:
- *   Nonlinear:
- *   NonlinearVirtual:
- *   Unknown: An unknown type of enter/leave event occurred.
- */
-typedef enum
-{
-  GDK_NOTIFY_ANCESTOR		= 0,
-  GDK_NOTIFY_VIRTUAL		= 1,
-  GDK_NOTIFY_INFERIOR		= 2,
-  GDK_NOTIFY_NONLINEAR		= 3,
-  GDK_NOTIFY_NONLINEAR_VIRTUAL	= 4,
-  GDK_NOTIFY_UNKNOWN		= 5
-} GdkNotifyType;
-
-/* Enter/leave event modes.
- *   NotifyNormal
- *   NotifyGrab
- *   NotifyUngrab
- */
-typedef enum
-{
-  GDK_CROSSING_NORMAL,
-  GDK_CROSSING_GRAB,
-  GDK_CROSSING_UNGRAB
-} GdkCrossingMode;
-
-typedef enum
-{
-  GDK_PROPERTY_NEW_VALUE,
-  GDK_PROPERTY_DELETE
-} GdkPropertyState;
-
-typedef enum
-{
-  GDK_WINDOW_STATE_WITHDRAWN  = 1 << 0,
-  GDK_WINDOW_STATE_ICONIFIED  = 1 << 1,
-  GDK_WINDOW_STATE_MAXIMIZED  = 1 << 2,
-  GDK_WINDOW_STATE_STICKY     = 1 << 3,
-  GDK_WINDOW_STATE_FULLSCREEN = 1 << 4,
-  GDK_WINDOW_STATE_ABOVE      = 1 << 5,
-  GDK_WINDOW_STATE_BELOW      = 1 << 6
-} GdkWindowState;
-
-typedef enum
-{
-  GDK_SETTING_ACTION_NEW,
-  GDK_SETTING_ACTION_CHANGED,
-  GDK_SETTING_ACTION_DELETED
-} GdkSettingAction;
-
-typedef enum
-{
-  GDK_OWNER_CHANGE_NEW_OWNER,
-  GDK_OWNER_CHANGE_DESTROY,
-  GDK_OWNER_CHANGE_CLOSE
-} GdkOwnerChange;
-
-struct _GdkEventAny
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-};
-
-struct _GdkEventExpose
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  GdkRectangle area;
-  GdkRegion *region;
-  gint count; /* If non-zero, how many more events follow. */
-};
-
-struct _GdkEventNoExpose
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-};
-
-struct _GdkEventVisibility
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  GdkVisibilityState state;
-};
-
-struct _GdkEventMotion
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  guint32 time;
-  gdouble x;
-  gdouble y;
-  gdouble *axes;
-  guint state;
-  gint16 is_hint;
-  GdkDevice *device;
-  gdouble x_root, y_root;
-};
-
-struct _GdkEventButton
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  guint32 time;
-  gdouble x;
-  gdouble y;
-  gdouble *axes;
-  guint state;
-  guint button;
-  GdkDevice *device;
-  gdouble x_root, y_root;
-};
-
-struct _GdkEventScroll
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  guint32 time;
-  gdouble x;
-  gdouble y;
-  guint state;
-  GdkScrollDirection direction;
-  GdkDevice *device;
-  gdouble x_root, y_root;
-};
-
-struct _GdkEventKey
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  guint32 time;
-  guint state;
-  guint keyval;
-  gint length;
-  gchar *string;
-  guint16 hardware_keycode;
-  guint8 group;
-  guint is_modifier : 1;
-};
-
-struct _GdkEventCrossing
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  GdkWindow *subwindow;
-  guint32 time;
-  gdouble x;
-  gdouble y;
-  gdouble x_root;
-  gdouble y_root;
-  GdkCrossingMode mode;
-  GdkNotifyType detail;
-  gboolean focus;
-  guint state;
-};
-
-struct _GdkEventFocus
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  gint16 in;
-};
-
-struct _GdkEventConfigure
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  gint x, y;
-  gint width;
-  gint height;
-};
-
-struct _GdkEventProperty
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  GdkAtom atom;
-  guint32 time;
-  guint state;
-};
-
-struct _GdkEventSelection
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  GdkAtom selection;
-  GdkAtom target;
-  GdkAtom property;
-  guint32 time;
-  GdkNativeWindow requestor;
-};
-
-struct _GdkEventOwnerChange
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  GdkNativeWindow owner;
-  GdkOwnerChange reason;
-  GdkAtom selection;
-  guint32 time;
-  guint32 selection_time;
-};
-
-/* This event type will be used pretty rarely. It only is important
-   for XInput aware programs that are drawing their own cursor */
-
-struct _GdkEventProximity
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  guint32 time;
-  GdkDevice *device;
-};
-
-struct _GdkEventClient
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  GdkAtom message_type;
-  gushort data_format;
-  union {
-    char b[20];
-    short s[10];
-    long l[5];
-  } data;
-};
-
-struct _GdkEventSetting
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  GdkSettingAction action;
-  char *name;
-};
-
-struct _GdkEventWindowState
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  GdkWindowState changed_mask;
-  GdkWindowState new_window_state;
-};
-
-struct _GdkEventGrabBroken {
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  gboolean keyboard;
-  gboolean implicit;
-  GdkWindow *grab_window;
-};
-
-/* Event types for DND */
-
-struct _GdkEventDND {
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  GdkDragContext *context;
-
-  guint32 time;
-  gshort x_root, y_root;
-};
-
-union _GdkEvent
-{
-  GdkEventType		    type;
-  GdkEventAny		    any;
-  GdkEventExpose	    expose;
-  GdkEventNoExpose	    no_expose;
-  GdkEventVisibility	    visibility;
-  GdkEventMotion	    motion;
-  GdkEventButton	    button;
-  GdkEventScroll            scroll;
-  GdkEventKey		    key;
-  GdkEventCrossing	    crossing;
-  GdkEventFocus		    focus_change;
-  GdkEventConfigure	    configure;
-  GdkEventProperty	    property;
-  GdkEventSelection	    selection;
-  GdkEventOwnerChange  	    owner_change;
-  GdkEventProximity	    proximity;
-  GdkEventClient	    client;
-  GdkEventDND               dnd;
-  GdkEventWindowState       window_state;
-  GdkEventSetting           setting;
-  GdkEventGrabBroken        grab_broken;
-};
-
-GType     gdk_event_get_type            (void) G_GNUC_CONST;
-
-gboolean  gdk_events_pending	 	(void);
-GdkEvent* gdk_event_get			(void);
-
-GdkEvent* gdk_event_peek                (void);
-GdkEvent* gdk_event_get_graphics_expose (GdkWindow 	*window);
-void      gdk_event_put	 		(GdkEvent  	*event);
-
-GdkEvent* gdk_event_new                 (GdkEventType    type);
-GdkEvent* gdk_event_copy     		(GdkEvent 	*event);
-void	  gdk_event_free     		(GdkEvent 	*event);
-
-guint32   gdk_event_get_time            (GdkEvent        *event);
-gboolean  gdk_event_get_state           (GdkEvent        *event,
-                                         GdkModifierType *state);
-gboolean  gdk_event_get_coords		(GdkEvent	 *event,
-					 gdouble	 *x_win,
-					 gdouble	 *y_win);
-gboolean  gdk_event_get_root_coords	(GdkEvent	 *event,
-					 gdouble	 *x_root,
-					 gdouble	 *y_root);
-gboolean  gdk_event_get_axis            (GdkEvent        *event,
-                                         GdkAxisUse       axis_use,
-                                         gdouble         *value);
-void      gdk_event_request_motions     (GdkEventMotion  *event);
-void	  gdk_event_handler_set 	(GdkEventFunc    func,
-					 gpointer        data,
-					 GDestroyNotify  notify);
-
-void       gdk_event_set_screen (GdkEvent  *event,
-				 GdkScreen *screen);
-GdkScreen *gdk_event_get_screen (GdkEvent  *event);
-
-void	  gdk_set_show_events		(gboolean	 show_events);
-gboolean  gdk_get_show_events		(void);
-
-#ifndef GDK_MULTIHEAD_SAFE
-void gdk_add_client_message_filter (GdkAtom       message_type,
-				    GdkFilterFunc func,
-				    gpointer      data);
-
-gboolean gdk_setting_get (const gchar *name,
-			  GValue      *value); 
-#endif /* GDK_MULTIHEAD_SAFE */
-
-G_END_DECLS
-
-#endif /* __GDK_EVENTS_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkfont.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkfont.h
deleted file mode 100644
index 18061daa..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkfont.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#if !defined(GDK_DISABLE_DEPRECATED) || defined(GDK_COMPILATION) || defined(GTK_COMPILATION)
-
-#ifndef __GDK_FONT_H__
-#define __GDK_FONT_H__
-
-#include <gdk/gdktypes.h>
-#include <pango/pango-font.h>
-
-G_BEGIN_DECLS
-
-#define GDK_TYPE_FONT gdk_font_get_type ()
-
-/* Types of font.
- *   GDK_FONT_FONT: the font is an XFontStruct.
- *   GDK_FONT_FONTSET: the font is an XFontSet used for I18N.
- */
-typedef enum
-{
-  GDK_FONT_FONT,
-  GDK_FONT_FONTSET
-} GdkFontType;
-
-struct _GdkFont
-{
-  GdkFontType type;
-  gint ascent;
-  gint descent;
-};
-
-GType    gdk_font_get_type  (void) G_GNUC_CONST;
-
-GdkFont* gdk_font_ref	    (GdkFont        *font);
-void	 gdk_font_unref	    (GdkFont        *font);
-gint	 gdk_font_id	    (const GdkFont  *font);
-gboolean gdk_font_equal	    (const GdkFont  *fonta,
-			     const GdkFont  *fontb);
-
-GdkFont *gdk_font_load_for_display             (GdkDisplay           *display,
-						const gchar          *font_name);
-GdkFont *gdk_fontset_load_for_display          (GdkDisplay           *display,
-						const gchar          *fontset_name);
-GdkFont *gdk_font_from_description_for_display (GdkDisplay           *display,
-						PangoFontDescription *font_desc);
-
-#ifndef GDK_DISABLE_DEPRECATED
-
-#ifndef GDK_MULTIHEAD_SAFE
-GdkFont* gdk_font_load             (const gchar          *font_name);
-GdkFont* gdk_fontset_load          (const gchar          *fontset_name);
-GdkFont* gdk_font_from_description (PangoFontDescription *font_desc);
-#endif
-
-gint	 gdk_string_width   (GdkFont        *font,
-			     const gchar    *string);
-gint	 gdk_text_width	    (GdkFont        *font,
-			     const gchar    *text,
-			     gint            text_length);
-gint	 gdk_text_width_wc  (GdkFont        *font,
-			     const GdkWChar *text,
-			     gint            text_length);
-gint	 gdk_char_width	    (GdkFont        *font,
-			     gchar           character);
-gint	 gdk_char_width_wc  (GdkFont        *font,
-			     GdkWChar        character);
-gint	 gdk_string_measure (GdkFont        *font,
-			     const gchar    *string);
-gint	 gdk_text_measure   (GdkFont        *font,
-			     const gchar    *text,
-			     gint            text_length);
-gint	 gdk_char_measure   (GdkFont        *font,
-			     gchar           character);
-gint	 gdk_string_height  (GdkFont        *font,
-			     const gchar    *string);
-gint	 gdk_text_height    (GdkFont        *font,
-			     const gchar    *text,
-			     gint            text_length);
-gint	 gdk_char_height    (GdkFont        *font,
-			     gchar           character);
-
-void     gdk_text_extents   (GdkFont     *font,
-			     const gchar *text,
-			     gint         text_length,
-			     gint        *lbearing,
-			     gint        *rbearing,
-			     gint        *width,
-			     gint        *ascent,
-			     gint        *descent);
-void    gdk_text_extents_wc (GdkFont        *font,
-			     const GdkWChar *text,
-			     gint            text_length,
-			     gint           *lbearing,
-			     gint           *rbearing,
-			     gint           *width,
-			     gint           *ascent,
-			     gint           *descent);
-void     gdk_string_extents (GdkFont     *font,
-			     const gchar *string,
-			     gint        *lbearing,
-			     gint        *rbearing,
-			     gint        *width,
-			     gint        *ascent,
-			     gint        *descent);
-
-GdkDisplay * gdk_font_get_display (GdkFont *font);
-
-#endif /* GDK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GDK_FONT_H__ */
-
-#endif /* !GDK_DISABLE_DEPRECATED || GDK_COMPILATION || GTK_COMPILATION */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkgc.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkgc.h
deleted file mode 100644
index 779735c0..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkgc.h
+++ /dev/null
@@ -1,298 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_GC_H__
-#define __GDK_GC_H__
-
-#include <gdk/gdkcolor.h>
-#include <gdk/gdktypes.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GdkGCValues	      GdkGCValues;
-typedef struct _GdkGCClass	      GdkGCClass;
-
-/* GC cap styles
- *  CapNotLast:
- *  CapButt:
- *  CapRound:
- *  CapProjecting:
- */
-typedef enum
-{
-  GDK_CAP_NOT_LAST,
-  GDK_CAP_BUTT,
-  GDK_CAP_ROUND,
-  GDK_CAP_PROJECTING
-} GdkCapStyle;
-
-/* GC fill types.
- *  Solid:
- *  Tiled:
- *  Stippled:
- *  OpaqueStippled:
- */
-typedef enum
-{
-  GDK_SOLID,
-  GDK_TILED,
-  GDK_STIPPLED,
-  GDK_OPAQUE_STIPPLED
-} GdkFill;
-
-/* GC function types.
- *   Copy: Overwrites destination pixels with the source pixels.
- *   Invert: Inverts the destination pixels.
- *   Xor: Xor's the destination pixels with the source pixels.
- *   Clear: set pixels to 0
- *   And: source AND destination
- *   And Reverse: source AND (NOT destination)
- *   And Invert: (NOT source) AND destination
- *   Noop: destination
- *   Or: source OR destination
- *   Nor: (NOT source) AND (NOT destination)
- *   Equiv: (NOT source) XOR destination
- *   Xor Reverse: source OR (NOT destination)
- *   Copy Inverted: NOT source
- *   Xor Inverted: (NOT source) OR destination
- *   Nand: (NOT source) OR (NOT destination)
- *   Set: set pixels to 1
- */
-typedef enum
-{
-  GDK_COPY,
-  GDK_INVERT,
-  GDK_XOR,
-  GDK_CLEAR,
-  GDK_AND,
-  GDK_AND_REVERSE,
-  GDK_AND_INVERT,
-  GDK_NOOP,
-  GDK_OR,
-  GDK_EQUIV,
-  GDK_OR_REVERSE,
-  GDK_COPY_INVERT,
-  GDK_OR_INVERT,
-  GDK_NAND,
-  GDK_NOR,
-  GDK_SET
-} GdkFunction;
-
-/* GC join styles
- *  JoinMiter:
- *  JoinRound:
- *  JoinBevel:
- */
-typedef enum
-{
-  GDK_JOIN_MITER,
-  GDK_JOIN_ROUND,
-  GDK_JOIN_BEVEL
-} GdkJoinStyle;
-
-/* GC line styles
- *  Solid:
- *  OnOffDash:
- *  DoubleDash:
- */
-typedef enum
-{
-  GDK_LINE_SOLID,
-  GDK_LINE_ON_OFF_DASH,
-  GDK_LINE_DOUBLE_DASH
-} GdkLineStyle;
-
-typedef enum
-{
-  GDK_CLIP_BY_CHILDREN	= 0,
-  GDK_INCLUDE_INFERIORS = 1
-} GdkSubwindowMode;
-
-typedef enum
-{
-  GDK_GC_FOREGROUND    = 1 << 0,
-  GDK_GC_BACKGROUND    = 1 << 1,
-  GDK_GC_FONT	       = 1 << 2,
-  GDK_GC_FUNCTION      = 1 << 3,
-  GDK_GC_FILL	       = 1 << 4,
-  GDK_GC_TILE	       = 1 << 5,
-  GDK_GC_STIPPLE       = 1 << 6,
-  GDK_GC_CLIP_MASK     = 1 << 7,
-  GDK_GC_SUBWINDOW     = 1 << 8,
-  GDK_GC_TS_X_ORIGIN   = 1 << 9,
-  GDK_GC_TS_Y_ORIGIN   = 1 << 10,
-  GDK_GC_CLIP_X_ORIGIN = 1 << 11,
-  GDK_GC_CLIP_Y_ORIGIN = 1 << 12,
-  GDK_GC_EXPOSURES     = 1 << 13,
-  GDK_GC_LINE_WIDTH    = 1 << 14,
-  GDK_GC_LINE_STYLE    = 1 << 15,
-  GDK_GC_CAP_STYLE     = 1 << 16,
-  GDK_GC_JOIN_STYLE    = 1 << 17
-} GdkGCValuesMask;
-
-struct _GdkGCValues
-{
-  GdkColor	    foreground;
-  GdkColor	    background;
-  GdkFont	   *font;
-  GdkFunction	    function;
-  GdkFill	    fill;
-  GdkPixmap	   *tile;
-  GdkPixmap	   *stipple;
-  GdkPixmap	   *clip_mask;
-  GdkSubwindowMode  subwindow_mode;
-  gint		    ts_x_origin;
-  gint		    ts_y_origin;
-  gint		    clip_x_origin;
-  gint		    clip_y_origin;
-  gint		    graphics_exposures;
-  gint		    line_width;
-  GdkLineStyle	    line_style;
-  GdkCapStyle	    cap_style;
-  GdkJoinStyle	    join_style;
-};
-
-#define GDK_TYPE_GC              (gdk_gc_get_type ())
-#define GDK_GC(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_GC, GdkGC))
-#define GDK_GC_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_GC, GdkGCClass))
-#define GDK_IS_GC(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_GC))
-#define GDK_IS_GC_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_GC))
-#define GDK_GC_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_GC, GdkGCClass))
-
-struct _GdkGC
-{
-  GObject parent_instance;
-
-  gint clip_x_origin;
-  gint clip_y_origin;
-  gint ts_x_origin;
-  gint ts_y_origin;
-
-  GdkColormap *colormap;
-};
-
-struct _GdkGCClass 
-{
-  GObjectClass parent_class;
-  
-  void (*get_values)     (GdkGC          *gc,
-			  GdkGCValues    *values);
-  void (*set_values)     (GdkGC          *gc,
-			  GdkGCValues    *values,
-			  GdkGCValuesMask mask);
-  void (*set_dashes)     (GdkGC          *gc,
-			  gint	          dash_offset,
-			  gint8           dash_list[],
-			  gint            n);
-  
-  /* Padding for future expansion */
-  void         (*_gdk_reserved1)  (void);
-  void         (*_gdk_reserved2)  (void);
-  void         (*_gdk_reserved3)  (void);
-  void         (*_gdk_reserved4)  (void);
-};
-
-
-GType  gdk_gc_get_type            (void) G_GNUC_CONST;
-GdkGC *gdk_gc_new		  (GdkDrawable	    *drawable);
-GdkGC *gdk_gc_new_with_values	  (GdkDrawable	    *drawable,
-				   GdkGCValues	    *values,
-				   GdkGCValuesMask   values_mask);
-
-#ifndef GDK_DISABLE_DEPRECATED
-GdkGC *gdk_gc_ref		  (GdkGC	    *gc);
-void   gdk_gc_unref		  (GdkGC	    *gc);
-#endif
-
-void   gdk_gc_get_values	  (GdkGC	    *gc,
-				   GdkGCValues	    *values);
-void   gdk_gc_set_values          (GdkGC           *gc,
-                                   GdkGCValues	   *values,
-                                   GdkGCValuesMask  values_mask);
-void   gdk_gc_set_foreground	  (GdkGC	    *gc,
-				   const GdkColor   *color);
-void   gdk_gc_set_background	  (GdkGC	    *gc,
-				   const GdkColor   *color);
-#ifndef GDK_DISABLE_DEPRECATED
-void   gdk_gc_set_font		  (GdkGC	    *gc,
-				   GdkFont	    *font);
-#endif /* GDK_DISABLE_DEPRECATED */
-void   gdk_gc_set_function	  (GdkGC	    *gc,
-				   GdkFunction	     function);
-void   gdk_gc_set_fill		  (GdkGC	    *gc,
-				   GdkFill	     fill);
-void   gdk_gc_set_tile		  (GdkGC	    *gc,
-				   GdkPixmap	    *tile);
-void   gdk_gc_set_stipple	  (GdkGC	    *gc,
-				   GdkPixmap	    *stipple);
-void   gdk_gc_set_ts_origin	  (GdkGC	    *gc,
-				   gint		     x,
-				   gint		     y);
-void   gdk_gc_set_clip_origin	  (GdkGC	    *gc,
-				   gint		     x,
-				   gint		     y);
-void   gdk_gc_set_clip_mask	  (GdkGC	    *gc,
-				   GdkBitmap	    *mask);
-void   gdk_gc_set_clip_rectangle  (GdkGC	    *gc,
-				   GdkRectangle	    *rectangle);
-void   gdk_gc_set_clip_region	  (GdkGC	    *gc,
-				   GdkRegion	    *region);
-void   gdk_gc_set_subwindow	  (GdkGC	    *gc,
-				   GdkSubwindowMode  mode);
-void   gdk_gc_set_exposures	  (GdkGC	    *gc,
-				   gboolean	     exposures);
-void   gdk_gc_set_line_attributes (GdkGC	    *gc,
-				   gint		     line_width,
-				   GdkLineStyle	     line_style,
-				   GdkCapStyle	     cap_style,
-				   GdkJoinStyle	     join_style);
-void   gdk_gc_set_dashes          (GdkGC            *gc,
-				   gint	             dash_offset,
-				   gint8             dash_list[],
-				   gint              n);
-void   gdk_gc_offset              (GdkGC            *gc,
-				   gint              x_offset,
-				   gint              y_offset);
-void   gdk_gc_copy		  (GdkGC	    *dst_gc,
-				   GdkGC	    *src_gc);
-
-
-void         gdk_gc_set_colormap     (GdkGC          *gc,
-				      GdkColormap    *colormap);
-GdkColormap *gdk_gc_get_colormap     (GdkGC          *gc);
-void         gdk_gc_set_rgb_fg_color (GdkGC          *gc,
-				      const GdkColor *color);
-void         gdk_gc_set_rgb_bg_color (GdkGC          *gc,
-				      const GdkColor *color);
-GdkScreen *  gdk_gc_get_screen	     (GdkGC          *gc);
-
-#ifndef GDK_DISABLE_DEPRECATED
-#define gdk_gc_destroy                 gdk_gc_unref
-#endif /* GDK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GDK_DRAWABLE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdki18n.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdki18n.h
deleted file mode 100644
index 9e70be0b..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdki18n.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_I18N_H__
-#define __GDK_I18N_H__
-
-#ifndef GDK_DISABLE_DEPRECATED
-
-/* GDK uses "glib". (And so does GTK).
- */
-#include <glib.h>
-#include <gdkconfig.h>
-
-/* international string support */
-
-#include <stdlib.h>
-
-#if !defined(GDK_HAVE_BROKEN_WCTYPE) && (defined(GDK_HAVE_WCTYPE_H) || defined(GDK_HAVE_WCHAR_H)) && !defined(X_LOCALE)
-#  ifdef GDK_HAVE_WCTYPE_H
-#    include <wctype.h>
-#  else
-#    ifdef GDK_HAVE_WCHAR_H
-#      include <wchar.h>
-#    endif
-#  endif
-#  define gdk_iswalnum(c) iswalnum(c)
-#  define gdk_iswspace(c) iswspace(c)
-#else
-#  include <ctype.h>
-#  define gdk_iswalnum(c) ((wchar_t)(c) <= 0xFF && isalnum(c))
-#  define gdk_iswspace(c) ((wchar_t)(c) <= 0xFF && isspace(c))
-#endif
-
-#endif /* GDK_DISABLE_DEPRECATED */
-
-#endif /* __GDK_I18N_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkimage.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkimage.h
deleted file mode 100644
index 5b8303be..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkimage.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_IMAGE_H__
-#define __GDK_IMAGE_H__
-
-#include <gdk/gdktypes.h>
-
-G_BEGIN_DECLS
-
-/* Types of images.
- *   Normal: Normal X image type. These are slow as they involve passing
- *	     the entire image through the X connection each time a draw
- *	     request is required. On Win32, a bitmap.
- *   Shared: Shared memory X image type. These are fast as the X server
- *	     and the program actually use the same piece of memory. They
- *	     should be used with care though as there is the possibility
- *	     for both the X server and the program to be reading/writing
- *	     the image simultaneously and producing undesired results.
- *	     On Win32, also a bitmap.
- */
-typedef enum
-{
-  GDK_IMAGE_NORMAL,
-  GDK_IMAGE_SHARED,
-  GDK_IMAGE_FASTEST
-} GdkImageType;
-
-typedef struct _GdkImageClass GdkImageClass;
-
-#define GDK_TYPE_IMAGE              (gdk_image_get_type ())
-#define GDK_IMAGE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_IMAGE, GdkImage))
-#define GDK_IMAGE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_IMAGE, GdkImageClass))
-#define GDK_IS_IMAGE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_IMAGE))
-#define GDK_IS_IMAGE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_IMAGE))
-#define GDK_IMAGE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_IMAGE, GdkImageClass))
-
-struct _GdkImage
-{
-  GObject parent_instance;
-
-  /*< public >*/
-  
-  GdkImageType	type; /* read only. */
-  GdkVisual    *visual;	    /* read only. visual used to create the image */
-  GdkByteOrder	byte_order; /* read only. */
-  gint		width; /* read only. */
-  gint		height; /* read only. */
-  guint16	depth; /* read only. */
-  guint16	bpp;	        /* read only. bytes per pixel */
-  guint16	bpl;	        /* read only. bytes per line */
-  guint16       bits_per_pixel; /* read only. bits per pixel */
-  gpointer	mem;
-
-  GdkColormap  *colormap; /* read only. */
-
-  /*< private >*/
-  gpointer windowing_data; /* read only. */
-};
-
-struct _GdkImageClass
-{
-  GObjectClass parent_class;
-};
-
-GType     gdk_image_get_type   (void) G_GNUC_CONST;
-
-GdkImage*  gdk_image_new       (GdkImageType  type,
-				GdkVisual    *visual,
-				gint	      width,
-				gint	      height);
-
-#ifndef GDK_DISABLE_DEPRECATED
-GdkImage*  gdk_image_get       (GdkDrawable  *drawable,
-				gint	      x,
-				gint	      y,
-				gint	      width,
-				gint	      height);
-
-GdkImage * gdk_image_ref       (GdkImage     *image);
-void       gdk_image_unref     (GdkImage     *image);
-#endif
-
-void	   gdk_image_put_pixel (GdkImage     *image,
-				gint	      x,
-				gint	      y,
-				guint32	      pixel);
-guint32	   gdk_image_get_pixel (GdkImage     *image,
-				gint	      x,
-				gint	      y);
-
-void       gdk_image_set_colormap (GdkImage    *image,
-                                   GdkColormap *colormap);
-GdkColormap* gdk_image_get_colormap (GdkImage    *image);
-
-
-#ifdef GDK_ENABLE_BROKEN
-GdkImage* gdk_image_new_bitmap (GdkVisual     *visual,
-				gpointer      data,
-				gint          width,
-				gint          height);
-#endif /* GDK_ENABLE_BROKEN */
-
-#ifndef GDK_DISABLE_DEPRECATED
-#define gdk_image_destroy              gdk_image_unref
-#endif /* GDK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GDK_IMAGE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkinput.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkinput.h
deleted file mode 100644
index d5fe003d..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkinput.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_INPUT_H__
-#define __GDK_INPUT_H__
-
-#include <gdk/gdktypes.h>
-
-G_BEGIN_DECLS
-
-#define GDK_TYPE_DEVICE              (gdk_device_get_type ())
-#define GDK_DEVICE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DEVICE, GdkDevice))
-#define GDK_DEVICE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DEVICE, GdkDeviceClass))
-#define GDK_IS_DEVICE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DEVICE))
-#define GDK_IS_DEVICE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_DEVICE))
-#define GDK_DEVICE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_DEVICE, GdkDeviceClass))
-
-typedef struct _GdkDeviceKey	    GdkDeviceKey;
-typedef struct _GdkDeviceAxis	    GdkDeviceAxis;
-typedef struct _GdkDevice	    GdkDevice;
-typedef struct _GdkDeviceClass	    GdkDeviceClass;
-typedef struct _GdkTimeCoord	    GdkTimeCoord;
-
-typedef enum
-{
-  GDK_EXTENSION_EVENTS_NONE,
-  GDK_EXTENSION_EVENTS_ALL,
-  GDK_EXTENSION_EVENTS_CURSOR
-} GdkExtensionMode;
-
-typedef enum
-{
-  GDK_SOURCE_MOUSE,
-  GDK_SOURCE_PEN,
-  GDK_SOURCE_ERASER,
-  GDK_SOURCE_CURSOR
-} GdkInputSource;
-
-typedef enum
-{
-  GDK_MODE_DISABLED,
-  GDK_MODE_SCREEN,
-  GDK_MODE_WINDOW
-} GdkInputMode;
-
-typedef enum
-{
-  GDK_AXIS_IGNORE,
-  GDK_AXIS_X,
-  GDK_AXIS_Y,
-  GDK_AXIS_PRESSURE,
-  GDK_AXIS_XTILT,
-  GDK_AXIS_YTILT,
-  GDK_AXIS_WHEEL,
-  GDK_AXIS_LAST
-} GdkAxisUse;
-
-struct _GdkDeviceKey
-{
-  guint keyval;
-  GdkModifierType modifiers;
-};
-
-struct _GdkDeviceAxis
-{
-  GdkAxisUse use;
-  gdouble    min;
-  gdouble    max;
-};
-
-struct _GdkDevice
-{
-  GObject parent_instance;
-  /* All fields are read-only */
-	  
-  gchar *name;
-  GdkInputSource source;
-  GdkInputMode mode;
-  gboolean has_cursor;	     /* TRUE if the X pointer follows device motion */
-	  
-  gint num_axes;
-  GdkDeviceAxis *axes;
-	  
-  gint num_keys;
-  GdkDeviceKey *keys;
-};
-
-/* We don't allocate each coordinate this big, but we use it to
- * be ANSI compliant and avoid accessing past the defined limits.
- */
-#define GDK_MAX_TIMECOORD_AXES 128
-
-struct _GdkTimeCoord
-{
-  guint32 time;
-  gdouble axes[GDK_MAX_TIMECOORD_AXES];
-};
-
-GType          gdk_device_get_type      (void) G_GNUC_CONST;
-
-#ifndef GDK_MULTIHEAD_SAFE
-/* Returns a list of GdkDevice * */	  
-GList *        gdk_devices_list              (void);
-#endif /* GDK_MULTIHEAD_SAFE */
-
-/* Functions to configure a device */
-void           gdk_device_set_source    (GdkDevice      *device,
-					 GdkInputSource  source);
-	  
-gboolean       gdk_device_set_mode      (GdkDevice      *device,
-					 GdkInputMode    mode);
-
-void           gdk_device_set_key       (GdkDevice      *device,
-					 guint           index_,
-					 guint           keyval,
-					 GdkModifierType modifiers);
-
-void     gdk_device_set_axis_use (GdkDevice         *device,
-				  guint              index_,
-				  GdkAxisUse         use);
-void     gdk_device_get_state    (GdkDevice         *device,
-				  GdkWindow         *window,
-				  gdouble           *axes,
-				  GdkModifierType   *mask);
-gboolean gdk_device_get_history  (GdkDevice         *device,
-				  GdkWindow         *window,
-				  guint32            start,
-				  guint32            stop,
-				  GdkTimeCoord    ***events,
-				  gint              *n_events);
-void     gdk_device_free_history (GdkTimeCoord     **events,
-				  gint               n_events);
-gboolean gdk_device_get_axis     (GdkDevice         *device,
-				  gdouble           *axes,
-				  GdkAxisUse         use,
-				  gdouble           *value);
-
-void gdk_input_set_extension_events (GdkWindow        *window,
-				     gint              mask,
-				     GdkExtensionMode  mode);
-
-#ifndef GDK_MULTIHEAD_SAFE
-GdkDevice *gdk_device_get_core_pointer (void);
-#endif
- 
-G_END_DECLS
-
-#endif /* __GDK_INPUT_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkkeys.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkkeys.h
deleted file mode 100644
index fda2997e..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkkeys.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __GDK_KEYS_H__
-#define __GDK_KEYS_H__
-
-#include <gdk/gdktypes.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GdkKeymapKey GdkKeymapKey;
-
-/* GdkKeymapKey is a hardware key that can be mapped to a keyval */
-struct _GdkKeymapKey
-{
-  guint keycode;
-  gint  group;
-  gint  level;
-};
-
-/* A GdkKeymap defines the translation from keyboard state
- * (including a hardware key, a modifier mask, and active keyboard group)
- * to a keyval. This translation has two phases. The first phase is
- * to determine the effective keyboard group and level for the keyboard
- * state; the second phase is to look up the keycode/group/level triplet
- * in the keymap and see what keyval it corresponds to.
- */
-
-typedef struct _GdkKeymap      GdkKeymap;
-typedef struct _GdkKeymapClass GdkKeymapClass;
-
-#define GDK_TYPE_KEYMAP              (gdk_keymap_get_type ())
-#define GDK_KEYMAP(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_KEYMAP, GdkKeymap))
-#define GDK_KEYMAP_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_KEYMAP, GdkKeymapClass))
-#define GDK_IS_KEYMAP(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_KEYMAP))
-#define GDK_IS_KEYMAP_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_KEYMAP))
-#define GDK_KEYMAP_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_KEYMAP, GdkKeymapClass))
-
-struct _GdkKeymap
-{
-  GObject     parent_instance;
-  GdkDisplay *display;
-};
-
-struct _GdkKeymapClass
-{
-  GObjectClass parent_class;
-
-  void (*direction_changed) (GdkKeymap *keymap);
-  void (*keys_changed)      (GdkKeymap *keymap);
-};
-
-GType gdk_keymap_get_type (void) G_GNUC_CONST;
-
-#ifndef GDK_MULTIHEAD_SAFE
-GdkKeymap* gdk_keymap_get_default     (void);
-#endif
-GdkKeymap* gdk_keymap_get_for_display (GdkDisplay *display);
-
-
-guint          gdk_keymap_lookup_key               (GdkKeymap           *keymap,
-						    const GdkKeymapKey  *key);
-gboolean       gdk_keymap_translate_keyboard_state (GdkKeymap           *keymap,
-						    guint                hardware_keycode,
-						    GdkModifierType      state,
-						    gint                 group,
-						    guint               *keyval,
-						    gint                *effective_group,
-						    gint                *level,
-						    GdkModifierType     *consumed_modifiers);
-gboolean       gdk_keymap_get_entries_for_keyval   (GdkKeymap           *keymap,
-						    guint                keyval,
-						    GdkKeymapKey       **keys,
-						    gint                *n_keys);
-gboolean       gdk_keymap_get_entries_for_keycode  (GdkKeymap           *keymap,
-						    guint                hardware_keycode,
-						    GdkKeymapKey       **keys,
-						    guint              **keyvals,
-						    gint                *n_entries);
-PangoDirection gdk_keymap_get_direction            (GdkKeymap           *keymap);
-gboolean       gdk_keymap_have_bidi_layouts        (GdkKeymap           *keymap);
-
-/* Key values
- */
-gchar*   gdk_keyval_name         (guint        keyval) G_GNUC_CONST;
-guint    gdk_keyval_from_name    (const gchar *keyval_name);
-void     gdk_keyval_convert_case (guint        symbol,
-				  guint       *lower,
-				  guint       *upper);
-guint    gdk_keyval_to_upper     (guint        keyval) G_GNUC_CONST;
-guint    gdk_keyval_to_lower     (guint        keyval) G_GNUC_CONST;
-gboolean gdk_keyval_is_upper     (guint        keyval) G_GNUC_CONST;
-gboolean gdk_keyval_is_lower     (guint        keyval) G_GNUC_CONST;
-
-guint32  gdk_keyval_to_unicode   (guint        keyval) G_GNUC_CONST;
-guint    gdk_unicode_to_keyval   (guint32      wc) G_GNUC_CONST;
-
-
-G_END_DECLS
-
-#endif /* __GDK_KEYS_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkkeysyms.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkkeysyms.h
deleted file mode 100644
index e642e72a..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkkeysyms.h
+++ /dev/null
@@ -1,1747 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- * Copyright (C) 2005 GNOME Foundation
- *
- * 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.
- */
-
-/*
- * File auto-generated from script gdkkeysyms-update.pl
- * using the input file
- * http://cvs.freedesktop.org/xorg/xc/include/keysymdef.h
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2001.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __GDK_KEYSYMS_H__
-#define __GDK_KEYSYMS_H__
-
-
-#define GDK_VoidSymbol 0xffffff
-#define GDK_BackSpace 0xff08
-#define GDK_Tab 0xff09
-#define GDK_Linefeed 0xff0a
-#define GDK_Clear 0xff0b
-#define GDK_Return 0xff0d
-#define GDK_Pause 0xff13
-#define GDK_Scroll_Lock 0xff14
-#define GDK_Sys_Req 0xff15
-#define GDK_Escape 0xff1b
-#define GDK_Delete 0xffff
-#define GDK_Multi_key 0xff20
-#define GDK_Codeinput 0xff37
-#define GDK_SingleCandidate 0xff3c
-#define GDK_MultipleCandidate 0xff3d
-#define GDK_PreviousCandidate 0xff3e
-#define GDK_Kanji 0xff21
-#define GDK_Muhenkan 0xff22
-#define GDK_Henkan_Mode 0xff23
-#define GDK_Henkan 0xff23
-#define GDK_Romaji 0xff24
-#define GDK_Hiragana 0xff25
-#define GDK_Katakana 0xff26
-#define GDK_Hiragana_Katakana 0xff27
-#define GDK_Zenkaku 0xff28
-#define GDK_Hankaku 0xff29
-#define GDK_Zenkaku_Hankaku 0xff2a
-#define GDK_Touroku 0xff2b
-#define GDK_Massyo 0xff2c
-#define GDK_Kana_Lock 0xff2d
-#define GDK_Kana_Shift 0xff2e
-#define GDK_Eisu_Shift 0xff2f
-#define GDK_Eisu_toggle 0xff30
-#define GDK_Kanji_Bangou 0xff37
-#define GDK_Zen_Koho 0xff3d
-#define GDK_Mae_Koho 0xff3e
-#define GDK_Home 0xff50
-#define GDK_Left 0xff51
-#define GDK_Up 0xff52
-#define GDK_Right 0xff53
-#define GDK_Down 0xff54
-#define GDK_Prior 0xff55
-#define GDK_Page_Up 0xff55
-#define GDK_Next 0xff56
-#define GDK_Page_Down 0xff56
-#define GDK_End 0xff57
-#define GDK_Begin 0xff58
-#define GDK_Select 0xff60
-#define GDK_Print 0xff61
-#define GDK_Execute 0xff62
-#define GDK_Insert 0xff63
-#define GDK_Undo 0xff65
-#define GDK_Redo 0xff66
-#define GDK_Menu 0xff67
-#define GDK_Find 0xff68
-#define GDK_Cancel 0xff69
-#define GDK_Help 0xff6a
-#define GDK_Break 0xff6b
-#define GDK_Mode_switch 0xff7e
-#define GDK_script_switch 0xff7e
-#define GDK_Num_Lock 0xff7f
-#define GDK_KP_Space 0xff80
-#define GDK_KP_Tab 0xff89
-#define GDK_KP_Enter 0xff8d
-#define GDK_KP_F1 0xff91
-#define GDK_KP_F2 0xff92
-#define GDK_KP_F3 0xff93
-#define GDK_KP_F4 0xff94
-#define GDK_KP_Home 0xff95
-#define GDK_KP_Left 0xff96
-#define GDK_KP_Up 0xff97
-#define GDK_KP_Right 0xff98
-#define GDK_KP_Down 0xff99
-#define GDK_KP_Prior 0xff9a
-#define GDK_KP_Page_Up 0xff9a
-#define GDK_KP_Next 0xff9b
-#define GDK_KP_Page_Down 0xff9b
-#define GDK_KP_End 0xff9c
-#define GDK_KP_Begin 0xff9d
-#define GDK_KP_Insert 0xff9e
-#define GDK_KP_Delete 0xff9f
-#define GDK_KP_Equal 0xffbd
-#define GDK_KP_Multiply 0xffaa
-#define GDK_KP_Add 0xffab
-#define GDK_KP_Separator 0xffac
-#define GDK_KP_Subtract 0xffad
-#define GDK_KP_Decimal 0xffae
-#define GDK_KP_Divide 0xffaf
-#define GDK_KP_0 0xffb0
-#define GDK_KP_1 0xffb1
-#define GDK_KP_2 0xffb2
-#define GDK_KP_3 0xffb3
-#define GDK_KP_4 0xffb4
-#define GDK_KP_5 0xffb5
-#define GDK_KP_6 0xffb6
-#define GDK_KP_7 0xffb7
-#define GDK_KP_8 0xffb8
-#define GDK_KP_9 0xffb9
-#define GDK_F1 0xffbe
-#define GDK_F2 0xffbf
-#define GDK_F3 0xffc0
-#define GDK_F4 0xffc1
-#define GDK_F5 0xffc2
-#define GDK_F6 0xffc3
-#define GDK_F7 0xffc4
-#define GDK_F8 0xffc5
-#define GDK_F9 0xffc6
-#define GDK_F10 0xffc7
-#define GDK_F11 0xffc8
-#define GDK_L1 0xffc8
-#define GDK_F12 0xffc9
-#define GDK_L2 0xffc9
-#define GDK_F13 0xffca
-#define GDK_L3 0xffca
-#define GDK_F14 0xffcb
-#define GDK_L4 0xffcb
-#define GDK_F15 0xffcc
-#define GDK_L5 0xffcc
-#define GDK_F16 0xffcd
-#define GDK_L6 0xffcd
-#define GDK_F17 0xffce
-#define GDK_L7 0xffce
-#define GDK_F18 0xffcf
-#define GDK_L8 0xffcf
-#define GDK_F19 0xffd0
-#define GDK_L9 0xffd0
-#define GDK_F20 0xffd1
-#define GDK_L10 0xffd1
-#define GDK_F21 0xffd2
-#define GDK_R1 0xffd2
-#define GDK_F22 0xffd3
-#define GDK_R2 0xffd3
-#define GDK_F23 0xffd4
-#define GDK_R3 0xffd4
-#define GDK_F24 0xffd5
-#define GDK_R4 0xffd5
-#define GDK_F25 0xffd6
-#define GDK_R5 0xffd6
-#define GDK_F26 0xffd7
-#define GDK_R6 0xffd7
-#define GDK_F27 0xffd8
-#define GDK_R7 0xffd8
-#define GDK_F28 0xffd9
-#define GDK_R8 0xffd9
-#define GDK_F29 0xffda
-#define GDK_R9 0xffda
-#define GDK_F30 0xffdb
-#define GDK_R10 0xffdb
-#define GDK_F31 0xffdc
-#define GDK_R11 0xffdc
-#define GDK_F32 0xffdd
-#define GDK_R12 0xffdd
-#define GDK_F33 0xffde
-#define GDK_R13 0xffde
-#define GDK_F34 0xffdf
-#define GDK_R14 0xffdf
-#define GDK_F35 0xffe0
-#define GDK_R15 0xffe0
-#define GDK_Shift_L 0xffe1
-#define GDK_Shift_R 0xffe2
-#define GDK_Control_L 0xffe3
-#define GDK_Control_R 0xffe4
-#define GDK_Caps_Lock 0xffe5
-#define GDK_Shift_Lock 0xffe6
-#define GDK_Meta_L 0xffe7
-#define GDK_Meta_R 0xffe8
-#define GDK_Alt_L 0xffe9
-#define GDK_Alt_R 0xffea
-#define GDK_Super_L 0xffeb
-#define GDK_Super_R 0xffec
-#define GDK_Hyper_L 0xffed
-#define GDK_Hyper_R 0xffee
-#define GDK_ISO_Lock 0xfe01
-#define GDK_ISO_Level2_Latch 0xfe02
-#define GDK_ISO_Level3_Shift 0xfe03
-#define GDK_ISO_Level3_Latch 0xfe04
-#define GDK_ISO_Level3_Lock 0xfe05
-#define GDK_ISO_Group_Shift 0xff7e
-#define GDK_ISO_Group_Latch 0xfe06
-#define GDK_ISO_Group_Lock 0xfe07
-#define GDK_ISO_Next_Group 0xfe08
-#define GDK_ISO_Next_Group_Lock 0xfe09
-#define GDK_ISO_Prev_Group 0xfe0a
-#define GDK_ISO_Prev_Group_Lock 0xfe0b
-#define GDK_ISO_First_Group 0xfe0c
-#define GDK_ISO_First_Group_Lock 0xfe0d
-#define GDK_ISO_Last_Group 0xfe0e
-#define GDK_ISO_Last_Group_Lock 0xfe0f
-#define GDK_ISO_Left_Tab 0xfe20
-#define GDK_ISO_Move_Line_Up 0xfe21
-#define GDK_ISO_Move_Line_Down 0xfe22
-#define GDK_ISO_Partial_Line_Up 0xfe23
-#define GDK_ISO_Partial_Line_Down 0xfe24
-#define GDK_ISO_Partial_Space_Left 0xfe25
-#define GDK_ISO_Partial_Space_Right 0xfe26
-#define GDK_ISO_Set_Margin_Left 0xfe27
-#define GDK_ISO_Set_Margin_Right 0xfe28
-#define GDK_ISO_Release_Margin_Left 0xfe29
-#define GDK_ISO_Release_Margin_Right 0xfe2a
-#define GDK_ISO_Release_Both_Margins 0xfe2b
-#define GDK_ISO_Fast_Cursor_Left 0xfe2c
-#define GDK_ISO_Fast_Cursor_Right 0xfe2d
-#define GDK_ISO_Fast_Cursor_Up 0xfe2e
-#define GDK_ISO_Fast_Cursor_Down 0xfe2f
-#define GDK_ISO_Continuous_Underline 0xfe30
-#define GDK_ISO_Discontinuous_Underline 0xfe31
-#define GDK_ISO_Emphasize 0xfe32
-#define GDK_ISO_Center_Object 0xfe33
-#define GDK_ISO_Enter 0xfe34
-#define GDK_dead_grave 0xfe50
-#define GDK_dead_acute 0xfe51
-#define GDK_dead_circumflex 0xfe52
-#define GDK_dead_tilde 0xfe53
-#define GDK_dead_macron 0xfe54
-#define GDK_dead_breve 0xfe55
-#define GDK_dead_abovedot 0xfe56
-#define GDK_dead_diaeresis 0xfe57
-#define GDK_dead_abovering 0xfe58
-#define GDK_dead_doubleacute 0xfe59
-#define GDK_dead_caron 0xfe5a
-#define GDK_dead_cedilla 0xfe5b
-#define GDK_dead_ogonek 0xfe5c
-#define GDK_dead_iota 0xfe5d
-#define GDK_dead_voiced_sound 0xfe5e
-#define GDK_dead_semivoiced_sound 0xfe5f
-#define GDK_dead_belowdot 0xfe60
-#define GDK_dead_hook 0xfe61
-#define GDK_dead_horn 0xfe62
-#define GDK_First_Virtual_Screen 0xfed0
-#define GDK_Prev_Virtual_Screen 0xfed1
-#define GDK_Next_Virtual_Screen 0xfed2
-#define GDK_Last_Virtual_Screen 0xfed4
-#define GDK_Terminate_Server 0xfed5
-#define GDK_AccessX_Enable 0xfe70
-#define GDK_AccessX_Feedback_Enable 0xfe71
-#define GDK_RepeatKeys_Enable 0xfe72
-#define GDK_SlowKeys_Enable 0xfe73
-#define GDK_BounceKeys_Enable 0xfe74
-#define GDK_StickyKeys_Enable 0xfe75
-#define GDK_MouseKeys_Enable 0xfe76
-#define GDK_MouseKeys_Accel_Enable 0xfe77
-#define GDK_Overlay1_Enable 0xfe78
-#define GDK_Overlay2_Enable 0xfe79
-#define GDK_AudibleBell_Enable 0xfe7a
-#define GDK_Pointer_Left 0xfee0
-#define GDK_Pointer_Right 0xfee1
-#define GDK_Pointer_Up 0xfee2
-#define GDK_Pointer_Down 0xfee3
-#define GDK_Pointer_UpLeft 0xfee4
-#define GDK_Pointer_UpRight 0xfee5
-#define GDK_Pointer_DownLeft 0xfee6
-#define GDK_Pointer_DownRight 0xfee7
-#define GDK_Pointer_Button_Dflt 0xfee8
-#define GDK_Pointer_Button1 0xfee9
-#define GDK_Pointer_Button2 0xfeea
-#define GDK_Pointer_Button3 0xfeeb
-#define GDK_Pointer_Button4 0xfeec
-#define GDK_Pointer_Button5 0xfeed
-#define GDK_Pointer_DblClick_Dflt 0xfeee
-#define GDK_Pointer_DblClick1 0xfeef
-#define GDK_Pointer_DblClick2 0xfef0
-#define GDK_Pointer_DblClick3 0xfef1
-#define GDK_Pointer_DblClick4 0xfef2
-#define GDK_Pointer_DblClick5 0xfef3
-#define GDK_Pointer_Drag_Dflt 0xfef4
-#define GDK_Pointer_Drag1 0xfef5
-#define GDK_Pointer_Drag2 0xfef6
-#define GDK_Pointer_Drag3 0xfef7
-#define GDK_Pointer_Drag4 0xfef8
-#define GDK_Pointer_Drag5 0xfefd
-#define GDK_Pointer_EnableKeys 0xfef9
-#define GDK_Pointer_Accelerate 0xfefa
-#define GDK_Pointer_DfltBtnNext 0xfefb
-#define GDK_Pointer_DfltBtnPrev 0xfefc
-#define GDK_3270_Duplicate 0xfd01
-#define GDK_3270_FieldMark 0xfd02
-#define GDK_3270_Right2 0xfd03
-#define GDK_3270_Left2 0xfd04
-#define GDK_3270_BackTab 0xfd05
-#define GDK_3270_EraseEOF 0xfd06
-#define GDK_3270_EraseInput 0xfd07
-#define GDK_3270_Reset 0xfd08
-#define GDK_3270_Quit 0xfd09
-#define GDK_3270_PA1 0xfd0a
-#define GDK_3270_PA2 0xfd0b
-#define GDK_3270_PA3 0xfd0c
-#define GDK_3270_Test 0xfd0d
-#define GDK_3270_Attn 0xfd0e
-#define GDK_3270_CursorBlink 0xfd0f
-#define GDK_3270_AltCursor 0xfd10
-#define GDK_3270_KeyClick 0xfd11
-#define GDK_3270_Jump 0xfd12
-#define GDK_3270_Ident 0xfd13
-#define GDK_3270_Rule 0xfd14
-#define GDK_3270_Copy 0xfd15
-#define GDK_3270_Play 0xfd16
-#define GDK_3270_Setup 0xfd17
-#define GDK_3270_Record 0xfd18
-#define GDK_3270_ChangeScreen 0xfd19
-#define GDK_3270_DeleteWord 0xfd1a
-#define GDK_3270_ExSelect 0xfd1b
-#define GDK_3270_CursorSelect 0xfd1c
-#define GDK_3270_PrintScreen 0xfd1d
-#define GDK_3270_Enter 0xfd1e
-#define GDK_space 0x020
-#define GDK_exclam 0x021
-#define GDK_quotedbl 0x022
-#define GDK_numbersign 0x023
-#define GDK_dollar 0x024
-#define GDK_percent 0x025
-#define GDK_ampersand 0x026
-#define GDK_apostrophe 0x027
-#define GDK_quoteright 0x027
-#define GDK_parenleft 0x028
-#define GDK_parenright 0x029
-#define GDK_asterisk 0x02a
-#define GDK_plus 0x02b
-#define GDK_comma 0x02c
-#define GDK_minus 0x02d
-#define GDK_period 0x02e
-#define GDK_slash 0x02f
-#define GDK_0 0x030
-#define GDK_1 0x031
-#define GDK_2 0x032
-#define GDK_3 0x033
-#define GDK_4 0x034
-#define GDK_5 0x035
-#define GDK_6 0x036
-#define GDK_7 0x037
-#define GDK_8 0x038
-#define GDK_9 0x039
-#define GDK_colon 0x03a
-#define GDK_semicolon 0x03b
-#define GDK_less 0x03c
-#define GDK_equal 0x03d
-#define GDK_greater 0x03e
-#define GDK_question 0x03f
-#define GDK_at 0x040
-#define GDK_A 0x041
-#define GDK_B 0x042
-#define GDK_C 0x043
-#define GDK_D 0x044
-#define GDK_E 0x045
-#define GDK_F 0x046
-#define GDK_G 0x047
-#define GDK_H 0x048
-#define GDK_I 0x049
-#define GDK_J 0x04a
-#define GDK_K 0x04b
-#define GDK_L 0x04c
-#define GDK_M 0x04d
-#define GDK_N 0x04e
-#define GDK_O 0x04f
-#define GDK_P 0x050
-#define GDK_Q 0x051
-#define GDK_R 0x052
-#define GDK_S 0x053
-#define GDK_T 0x054
-#define GDK_U 0x055
-#define GDK_V 0x056
-#define GDK_W 0x057
-#define GDK_X 0x058
-#define GDK_Y 0x059
-#define GDK_Z 0x05a
-#define GDK_bracketleft 0x05b
-#define GDK_backslash 0x05c
-#define GDK_bracketright 0x05d
-#define GDK_asciicircum 0x05e
-#define GDK_underscore 0x05f
-#define GDK_grave 0x060
-#define GDK_quoteleft 0x060
-#define GDK_a 0x061
-#define GDK_b 0x062
-#define GDK_c 0x063
-#define GDK_d 0x064
-#define GDK_e 0x065
-#define GDK_f 0x066
-#define GDK_g 0x067
-#define GDK_h 0x068
-#define GDK_i 0x069
-#define GDK_j 0x06a
-#define GDK_k 0x06b
-#define GDK_l 0x06c
-#define GDK_m 0x06d
-#define GDK_n 0x06e
-#define GDK_o 0x06f
-#define GDK_p 0x070
-#define GDK_q 0x071
-#define GDK_r 0x072
-#define GDK_s 0x073
-#define GDK_t 0x074
-#define GDK_u 0x075
-#define GDK_v 0x076
-#define GDK_w 0x077
-#define GDK_x 0x078
-#define GDK_y 0x079
-#define GDK_z 0x07a
-#define GDK_braceleft 0x07b
-#define GDK_bar 0x07c
-#define GDK_braceright 0x07d
-#define GDK_asciitilde 0x07e
-#define GDK_nobreakspace 0x0a0
-#define GDK_exclamdown 0x0a1
-#define GDK_cent 0x0a2
-#define GDK_sterling 0x0a3
-#define GDK_currency 0x0a4
-#define GDK_yen 0x0a5
-#define GDK_brokenbar 0x0a6
-#define GDK_section 0x0a7
-#define GDK_diaeresis 0x0a8
-#define GDK_copyright 0x0a9
-#define GDK_ordfeminine 0x0aa
-#define GDK_guillemotleft 0x0ab
-#define GDK_notsign 0x0ac
-#define GDK_hyphen 0x0ad
-#define GDK_registered 0x0ae
-#define GDK_macron 0x0af
-#define GDK_degree 0x0b0
-#define GDK_plusminus 0x0b1
-#define GDK_twosuperior 0x0b2
-#define GDK_threesuperior 0x0b3
-#define GDK_acute 0x0b4
-#define GDK_mu 0x0b5
-#define GDK_paragraph 0x0b6
-#define GDK_periodcentered 0x0b7
-#define GDK_cedilla 0x0b8
-#define GDK_onesuperior 0x0b9
-#define GDK_masculine 0x0ba
-#define GDK_guillemotright 0x0bb
-#define GDK_onequarter 0x0bc
-#define GDK_onehalf 0x0bd
-#define GDK_threequarters 0x0be
-#define GDK_questiondown 0x0bf
-#define GDK_Agrave 0x0c0
-#define GDK_Aacute 0x0c1
-#define GDK_Acircumflex 0x0c2
-#define GDK_Atilde 0x0c3
-#define GDK_Adiaeresis 0x0c4
-#define GDK_Aring 0x0c5
-#define GDK_AE 0x0c6
-#define GDK_Ccedilla 0x0c7
-#define GDK_Egrave 0x0c8
-#define GDK_Eacute 0x0c9
-#define GDK_Ecircumflex 0x0ca
-#define GDK_Ediaeresis 0x0cb
-#define GDK_Igrave 0x0cc
-#define GDK_Iacute 0x0cd
-#define GDK_Icircumflex 0x0ce
-#define GDK_Idiaeresis 0x0cf
-#define GDK_ETH 0x0d0
-#define GDK_Eth 0x0d0
-#define GDK_Ntilde 0x0d1
-#define GDK_Ograve 0x0d2
-#define GDK_Oacute 0x0d3
-#define GDK_Ocircumflex 0x0d4
-#define GDK_Otilde 0x0d5
-#define GDK_Odiaeresis 0x0d6
-#define GDK_multiply 0x0d7
-#define GDK_Oslash 0x0d8
-#define GDK_Ooblique 0x0d8
-#define GDK_Ugrave 0x0d9
-#define GDK_Uacute 0x0da
-#define GDK_Ucircumflex 0x0db
-#define GDK_Udiaeresis 0x0dc
-#define GDK_Yacute 0x0dd
-#define GDK_THORN 0x0de
-#define GDK_Thorn 0x0de
-#define GDK_ssharp 0x0df
-#define GDK_agrave 0x0e0
-#define GDK_aacute 0x0e1
-#define GDK_acircumflex 0x0e2
-#define GDK_atilde 0x0e3
-#define GDK_adiaeresis 0x0e4
-#define GDK_aring 0x0e5
-#define GDK_ae 0x0e6
-#define GDK_ccedilla 0x0e7
-#define GDK_egrave 0x0e8
-#define GDK_eacute 0x0e9
-#define GDK_ecircumflex 0x0ea
-#define GDK_ediaeresis 0x0eb
-#define GDK_igrave 0x0ec
-#define GDK_iacute 0x0ed
-#define GDK_icircumflex 0x0ee
-#define GDK_idiaeresis 0x0ef
-#define GDK_eth 0x0f0
-#define GDK_ntilde 0x0f1
-#define GDK_ograve 0x0f2
-#define GDK_oacute 0x0f3
-#define GDK_ocircumflex 0x0f4
-#define GDK_otilde 0x0f5
-#define GDK_odiaeresis 0x0f6
-#define GDK_division 0x0f7
-#define GDK_oslash 0x0f8
-#define GDK_ooblique 0x0f8
-#define GDK_ugrave 0x0f9
-#define GDK_uacute 0x0fa
-#define GDK_ucircumflex 0x0fb
-#define GDK_udiaeresis 0x0fc
-#define GDK_yacute 0x0fd
-#define GDK_thorn 0x0fe
-#define GDK_ydiaeresis 0x0ff
-#define GDK_Aogonek 0x1a1
-#define GDK_breve 0x1a2
-#define GDK_Lstroke 0x1a3
-#define GDK_Lcaron 0x1a5
-#define GDK_Sacute 0x1a6
-#define GDK_Scaron 0x1a9
-#define GDK_Scedilla 0x1aa
-#define GDK_Tcaron 0x1ab
-#define GDK_Zacute 0x1ac
-#define GDK_Zcaron 0x1ae
-#define GDK_Zabovedot 0x1af
-#define GDK_aogonek 0x1b1
-#define GDK_ogonek 0x1b2
-#define GDK_lstroke 0x1b3
-#define GDK_lcaron 0x1b5
-#define GDK_sacute 0x1b6
-#define GDK_caron 0x1b7
-#define GDK_scaron 0x1b9
-#define GDK_scedilla 0x1ba
-#define GDK_tcaron 0x1bb
-#define GDK_zacute 0x1bc
-#define GDK_doubleacute 0x1bd
-#define GDK_zcaron 0x1be
-#define GDK_zabovedot 0x1bf
-#define GDK_Racute 0x1c0
-#define GDK_Abreve 0x1c3
-#define GDK_Lacute 0x1c5
-#define GDK_Cacute 0x1c6
-#define GDK_Ccaron 0x1c8
-#define GDK_Eogonek 0x1ca
-#define GDK_Ecaron 0x1cc
-#define GDK_Dcaron 0x1cf
-#define GDK_Dstroke 0x1d0
-#define GDK_Nacute 0x1d1
-#define GDK_Ncaron 0x1d2
-#define GDK_Odoubleacute 0x1d5
-#define GDK_Rcaron 0x1d8
-#define GDK_Uring 0x1d9
-#define GDK_Udoubleacute 0x1db
-#define GDK_Tcedilla 0x1de
-#define GDK_racute 0x1e0
-#define GDK_abreve 0x1e3
-#define GDK_lacute 0x1e5
-#define GDK_cacute 0x1e6
-#define GDK_ccaron 0x1e8
-#define GDK_eogonek 0x1ea
-#define GDK_ecaron 0x1ec
-#define GDK_dcaron 0x1ef
-#define GDK_dstroke 0x1f0
-#define GDK_nacute 0x1f1
-#define GDK_ncaron 0x1f2
-#define GDK_odoubleacute 0x1f5
-#define GDK_udoubleacute 0x1fb
-#define GDK_rcaron 0x1f8
-#define GDK_uring 0x1f9
-#define GDK_tcedilla 0x1fe
-#define GDK_abovedot 0x1ff
-#define GDK_Hstroke 0x2a1
-#define GDK_Hcircumflex 0x2a6
-#define GDK_Iabovedot 0x2a9
-#define GDK_Gbreve 0x2ab
-#define GDK_Jcircumflex 0x2ac
-#define GDK_hstroke 0x2b1
-#define GDK_hcircumflex 0x2b6
-#define GDK_idotless 0x2b9
-#define GDK_gbreve 0x2bb
-#define GDK_jcircumflex 0x2bc
-#define GDK_Cabovedot 0x2c5
-#define GDK_Ccircumflex 0x2c6
-#define GDK_Gabovedot 0x2d5
-#define GDK_Gcircumflex 0x2d8
-#define GDK_Ubreve 0x2dd
-#define GDK_Scircumflex 0x2de
-#define GDK_cabovedot 0x2e5
-#define GDK_ccircumflex 0x2e6
-#define GDK_gabovedot 0x2f5
-#define GDK_gcircumflex 0x2f8
-#define GDK_ubreve 0x2fd
-#define GDK_scircumflex 0x2fe
-#define GDK_kra 0x3a2
-#define GDK_kappa 0x3a2
-#define GDK_Rcedilla 0x3a3
-#define GDK_Itilde 0x3a5
-#define GDK_Lcedilla 0x3a6
-#define GDK_Emacron 0x3aa
-#define GDK_Gcedilla 0x3ab
-#define GDK_Tslash 0x3ac
-#define GDK_rcedilla 0x3b3
-#define GDK_itilde 0x3b5
-#define GDK_lcedilla 0x3b6
-#define GDK_emacron 0x3ba
-#define GDK_gcedilla 0x3bb
-#define GDK_tslash 0x3bc
-#define GDK_ENG 0x3bd
-#define GDK_eng 0x3bf
-#define GDK_Amacron 0x3c0
-#define GDK_Iogonek 0x3c7
-#define GDK_Eabovedot 0x3cc
-#define GDK_Imacron 0x3cf
-#define GDK_Ncedilla 0x3d1
-#define GDK_Omacron 0x3d2
-#define GDK_Kcedilla 0x3d3
-#define GDK_Uogonek 0x3d9
-#define GDK_Utilde 0x3dd
-#define GDK_Umacron 0x3de
-#define GDK_amacron 0x3e0
-#define GDK_iogonek 0x3e7
-#define GDK_eabovedot 0x3ec
-#define GDK_imacron 0x3ef
-#define GDK_ncedilla 0x3f1
-#define GDK_omacron 0x3f2
-#define GDK_kcedilla 0x3f3
-#define GDK_uogonek 0x3f9
-#define GDK_utilde 0x3fd
-#define GDK_umacron 0x3fe
-#define GDK_Babovedot 0x1001e02
-#define GDK_babovedot 0x1001e03
-#define GDK_Dabovedot 0x1001e0a
-#define GDK_Wgrave 0x1001e80
-#define GDK_Wacute 0x1001e82
-#define GDK_dabovedot 0x1001e0b
-#define GDK_Ygrave 0x1001ef2
-#define GDK_Fabovedot 0x1001e1e
-#define GDK_fabovedot 0x1001e1f
-#define GDK_Mabovedot 0x1001e40
-#define GDK_mabovedot 0x1001e41
-#define GDK_Pabovedot 0x1001e56
-#define GDK_wgrave 0x1001e81
-#define GDK_pabovedot 0x1001e57
-#define GDK_wacute 0x1001e83
-#define GDK_Sabovedot 0x1001e60
-#define GDK_ygrave 0x1001ef3
-#define GDK_Wdiaeresis 0x1001e84
-#define GDK_wdiaeresis 0x1001e85
-#define GDK_sabovedot 0x1001e61
-#define GDK_Wcircumflex 0x1000174
-#define GDK_Tabovedot 0x1001e6a
-#define GDK_Ycircumflex 0x1000176
-#define GDK_wcircumflex 0x1000175
-#define GDK_tabovedot 0x1001e6b
-#define GDK_ycircumflex 0x1000177
-#define GDK_OE 0x13bc
-#define GDK_oe 0x13bd
-#define GDK_Ydiaeresis 0x13be
-#define GDK_overline 0x47e
-#define GDK_kana_fullstop 0x4a1
-#define GDK_kana_openingbracket 0x4a2
-#define GDK_kana_closingbracket 0x4a3
-#define GDK_kana_comma 0x4a4
-#define GDK_kana_conjunctive 0x4a5
-#define GDK_kana_middledot 0x4a5
-#define GDK_kana_WO 0x4a6
-#define GDK_kana_a 0x4a7
-#define GDK_kana_i 0x4a8
-#define GDK_kana_u 0x4a9
-#define GDK_kana_e 0x4aa
-#define GDK_kana_o 0x4ab
-#define GDK_kana_ya 0x4ac
-#define GDK_kana_yu 0x4ad
-#define GDK_kana_yo 0x4ae
-#define GDK_kana_tsu 0x4af
-#define GDK_kana_tu 0x4af
-#define GDK_prolongedsound 0x4b0
-#define GDK_kana_A 0x4b1
-#define GDK_kana_I 0x4b2
-#define GDK_kana_U 0x4b3
-#define GDK_kana_E 0x4b4
-#define GDK_kana_O 0x4b5
-#define GDK_kana_KA 0x4b6
-#define GDK_kana_KI 0x4b7
-#define GDK_kana_KU 0x4b8
-#define GDK_kana_KE 0x4b9
-#define GDK_kana_KO 0x4ba
-#define GDK_kana_SA 0x4bb
-#define GDK_kana_SHI 0x4bc
-#define GDK_kana_SU 0x4bd
-#define GDK_kana_SE 0x4be
-#define GDK_kana_SO 0x4bf
-#define GDK_kana_TA 0x4c0
-#define GDK_kana_CHI 0x4c1
-#define GDK_kana_TI 0x4c1
-#define GDK_kana_TSU 0x4c2
-#define GDK_kana_TU 0x4c2
-#define GDK_kana_TE 0x4c3
-#define GDK_kana_TO 0x4c4
-#define GDK_kana_NA 0x4c5
-#define GDK_kana_NI 0x4c6
-#define GDK_kana_NU 0x4c7
-#define GDK_kana_NE 0x4c8
-#define GDK_kana_NO 0x4c9
-#define GDK_kana_HA 0x4ca
-#define GDK_kana_HI 0x4cb
-#define GDK_kana_FU 0x4cc
-#define GDK_kana_HU 0x4cc
-#define GDK_kana_HE 0x4cd
-#define GDK_kana_HO 0x4ce
-#define GDK_kana_MA 0x4cf
-#define GDK_kana_MI 0x4d0
-#define GDK_kana_MU 0x4d1
-#define GDK_kana_ME 0x4d2
-#define GDK_kana_MO 0x4d3
-#define GDK_kana_YA 0x4d4
-#define GDK_kana_YU 0x4d5
-#define GDK_kana_YO 0x4d6
-#define GDK_kana_RA 0x4d7
-#define GDK_kana_RI 0x4d8
-#define GDK_kana_RU 0x4d9
-#define GDK_kana_RE 0x4da
-#define GDK_kana_RO 0x4db
-#define GDK_kana_WA 0x4dc
-#define GDK_kana_N 0x4dd
-#define GDK_voicedsound 0x4de
-#define GDK_semivoicedsound 0x4df
-#define GDK_kana_switch 0xff7e
-#define GDK_Farsi_0 0x10006f0
-#define GDK_Farsi_1 0x10006f1
-#define GDK_Farsi_2 0x10006f2
-#define GDK_Farsi_3 0x10006f3
-#define GDK_Farsi_4 0x10006f4
-#define GDK_Farsi_5 0x10006f5
-#define GDK_Farsi_6 0x10006f6
-#define GDK_Farsi_7 0x10006f7
-#define GDK_Farsi_8 0x10006f8
-#define GDK_Farsi_9 0x10006f9
-#define GDK_Arabic_percent 0x100066a
-#define GDK_Arabic_superscript_alef 0x1000670
-#define GDK_Arabic_tteh 0x1000679
-#define GDK_Arabic_peh 0x100067e
-#define GDK_Arabic_tcheh 0x1000686
-#define GDK_Arabic_ddal 0x1000688
-#define GDK_Arabic_rreh 0x1000691
-#define GDK_Arabic_comma 0x5ac
-#define GDK_Arabic_fullstop 0x10006d4
-#define GDK_Arabic_0 0x1000660
-#define GDK_Arabic_1 0x1000661
-#define GDK_Arabic_2 0x1000662
-#define GDK_Arabic_3 0x1000663
-#define GDK_Arabic_4 0x1000664
-#define GDK_Arabic_5 0x1000665
-#define GDK_Arabic_6 0x1000666
-#define GDK_Arabic_7 0x1000667
-#define GDK_Arabic_8 0x1000668
-#define GDK_Arabic_9 0x1000669
-#define GDK_Arabic_semicolon 0x5bb
-#define GDK_Arabic_question_mark 0x5bf
-#define GDK_Arabic_hamza 0x5c1
-#define GDK_Arabic_maddaonalef 0x5c2
-#define GDK_Arabic_hamzaonalef 0x5c3
-#define GDK_Arabic_hamzaonwaw 0x5c4
-#define GDK_Arabic_hamzaunderalef 0x5c5
-#define GDK_Arabic_hamzaonyeh 0x5c6
-#define GDK_Arabic_alef 0x5c7
-#define GDK_Arabic_beh 0x5c8
-#define GDK_Arabic_tehmarbuta 0x5c9
-#define GDK_Arabic_teh 0x5ca
-#define GDK_Arabic_theh 0x5cb
-#define GDK_Arabic_jeem 0x5cc
-#define GDK_Arabic_hah 0x5cd
-#define GDK_Arabic_khah 0x5ce
-#define GDK_Arabic_dal 0x5cf
-#define GDK_Arabic_thal 0x5d0
-#define GDK_Arabic_ra 0x5d1
-#define GDK_Arabic_zain 0x5d2
-#define GDK_Arabic_seen 0x5d3
-#define GDK_Arabic_sheen 0x5d4
-#define GDK_Arabic_sad 0x5d5
-#define GDK_Arabic_dad 0x5d6
-#define GDK_Arabic_tah 0x5d7
-#define GDK_Arabic_zah 0x5d8
-#define GDK_Arabic_ain 0x5d9
-#define GDK_Arabic_ghain 0x5da
-#define GDK_Arabic_tatweel 0x5e0
-#define GDK_Arabic_feh 0x5e1
-#define GDK_Arabic_qaf 0x5e2
-#define GDK_Arabic_kaf 0x5e3
-#define GDK_Arabic_lam 0x5e4
-#define GDK_Arabic_meem 0x5e5
-#define GDK_Arabic_noon 0x5e6
-#define GDK_Arabic_ha 0x5e7
-#define GDK_Arabic_heh 0x5e7
-#define GDK_Arabic_waw 0x5e8
-#define GDK_Arabic_alefmaksura 0x5e9
-#define GDK_Arabic_yeh 0x5ea
-#define GDK_Arabic_fathatan 0x5eb
-#define GDK_Arabic_dammatan 0x5ec
-#define GDK_Arabic_kasratan 0x5ed
-#define GDK_Arabic_fatha 0x5ee
-#define GDK_Arabic_damma 0x5ef
-#define GDK_Arabic_kasra 0x5f0
-#define GDK_Arabic_shadda 0x5f1
-#define GDK_Arabic_sukun 0x5f2
-#define GDK_Arabic_madda_above 0x1000653
-#define GDK_Arabic_hamza_above 0x1000654
-#define GDK_Arabic_hamza_below 0x1000655
-#define GDK_Arabic_jeh 0x1000698
-#define GDK_Arabic_veh 0x10006a4
-#define GDK_Arabic_keheh 0x10006a9
-#define GDK_Arabic_gaf 0x10006af
-#define GDK_Arabic_noon_ghunna 0x10006ba
-#define GDK_Arabic_heh_doachashmee 0x10006be
-#define GDK_Farsi_yeh 0x10006cc
-#define GDK_Arabic_farsi_yeh 0x10006cc
-#define GDK_Arabic_yeh_baree 0x10006d2
-#define GDK_Arabic_heh_goal 0x10006c1
-#define GDK_Arabic_switch 0xff7e
-#define GDK_Cyrillic_GHE_bar 0x1000492
-#define GDK_Cyrillic_ghe_bar 0x1000493
-#define GDK_Cyrillic_ZHE_descender 0x1000496
-#define GDK_Cyrillic_zhe_descender 0x1000497
-#define GDK_Cyrillic_KA_descender 0x100049a
-#define GDK_Cyrillic_ka_descender 0x100049b
-#define GDK_Cyrillic_KA_vertstroke 0x100049c
-#define GDK_Cyrillic_ka_vertstroke 0x100049d
-#define GDK_Cyrillic_EN_descender 0x10004a2
-#define GDK_Cyrillic_en_descender 0x10004a3
-#define GDK_Cyrillic_U_straight 0x10004ae
-#define GDK_Cyrillic_u_straight 0x10004af
-#define GDK_Cyrillic_U_straight_bar 0x10004b0
-#define GDK_Cyrillic_u_straight_bar 0x10004b1
-#define GDK_Cyrillic_HA_descender 0x10004b2
-#define GDK_Cyrillic_ha_descender 0x10004b3
-#define GDK_Cyrillic_CHE_descender 0x10004b6
-#define GDK_Cyrillic_che_descender 0x10004b7
-#define GDK_Cyrillic_CHE_vertstroke 0x10004b8
-#define GDK_Cyrillic_che_vertstroke 0x10004b9
-#define GDK_Cyrillic_SHHA 0x10004ba
-#define GDK_Cyrillic_shha 0x10004bb
-#define GDK_Cyrillic_SCHWA 0x10004d8
-#define GDK_Cyrillic_schwa 0x10004d9
-#define GDK_Cyrillic_I_macron 0x10004e2
-#define GDK_Cyrillic_i_macron 0x10004e3
-#define GDK_Cyrillic_O_bar 0x10004e8
-#define GDK_Cyrillic_o_bar 0x10004e9
-#define GDK_Cyrillic_U_macron 0x10004ee
-#define GDK_Cyrillic_u_macron 0x10004ef
-#define GDK_Serbian_dje 0x6a1
-#define GDK_Macedonia_gje 0x6a2
-#define GDK_Cyrillic_io 0x6a3
-#define GDK_Ukrainian_ie 0x6a4
-#define GDK_Ukranian_je 0x6a4
-#define GDK_Macedonia_dse 0x6a5
-#define GDK_Ukrainian_i 0x6a6
-#define GDK_Ukranian_i 0x6a6
-#define GDK_Ukrainian_yi 0x6a7
-#define GDK_Ukranian_yi 0x6a7
-#define GDK_Cyrillic_je 0x6a8
-#define GDK_Serbian_je 0x6a8
-#define GDK_Cyrillic_lje 0x6a9
-#define GDK_Serbian_lje 0x6a9
-#define GDK_Cyrillic_nje 0x6aa
-#define GDK_Serbian_nje 0x6aa
-#define GDK_Serbian_tshe 0x6ab
-#define GDK_Macedonia_kje 0x6ac
-#define GDK_Ukrainian_ghe_with_upturn 0x6ad
-#define GDK_Byelorussian_shortu 0x6ae
-#define GDK_Cyrillic_dzhe 0x6af
-#define GDK_Serbian_dze 0x6af
-#define GDK_numerosign 0x6b0
-#define GDK_Serbian_DJE 0x6b1
-#define GDK_Macedonia_GJE 0x6b2
-#define GDK_Cyrillic_IO 0x6b3
-#define GDK_Ukrainian_IE 0x6b4
-#define GDK_Ukranian_JE 0x6b4
-#define GDK_Macedonia_DSE 0x6b5
-#define GDK_Ukrainian_I 0x6b6
-#define GDK_Ukranian_I 0x6b6
-#define GDK_Ukrainian_YI 0x6b7
-#define GDK_Ukranian_YI 0x6b7
-#define GDK_Cyrillic_JE 0x6b8
-#define GDK_Serbian_JE 0x6b8
-#define GDK_Cyrillic_LJE 0x6b9
-#define GDK_Serbian_LJE 0x6b9
-#define GDK_Cyrillic_NJE 0x6ba
-#define GDK_Serbian_NJE 0x6ba
-#define GDK_Serbian_TSHE 0x6bb
-#define GDK_Macedonia_KJE 0x6bc
-#define GDK_Ukrainian_GHE_WITH_UPTURN 0x6bd
-#define GDK_Byelorussian_SHORTU 0x6be
-#define GDK_Cyrillic_DZHE 0x6bf
-#define GDK_Serbian_DZE 0x6bf
-#define GDK_Cyrillic_yu 0x6c0
-#define GDK_Cyrillic_a 0x6c1
-#define GDK_Cyrillic_be 0x6c2
-#define GDK_Cyrillic_tse 0x6c3
-#define GDK_Cyrillic_de 0x6c4
-#define GDK_Cyrillic_ie 0x6c5
-#define GDK_Cyrillic_ef 0x6c6
-#define GDK_Cyrillic_ghe 0x6c7
-#define GDK_Cyrillic_ha 0x6c8
-#define GDK_Cyrillic_i 0x6c9
-#define GDK_Cyrillic_shorti 0x6ca
-#define GDK_Cyrillic_ka 0x6cb
-#define GDK_Cyrillic_el 0x6cc
-#define GDK_Cyrillic_em 0x6cd
-#define GDK_Cyrillic_en 0x6ce
-#define GDK_Cyrillic_o 0x6cf
-#define GDK_Cyrillic_pe 0x6d0
-#define GDK_Cyrillic_ya 0x6d1
-#define GDK_Cyrillic_er 0x6d2
-#define GDK_Cyrillic_es 0x6d3
-#define GDK_Cyrillic_te 0x6d4
-#define GDK_Cyrillic_u 0x6d5
-#define GDK_Cyrillic_zhe 0x6d6
-#define GDK_Cyrillic_ve 0x6d7
-#define GDK_Cyrillic_softsign 0x6d8
-#define GDK_Cyrillic_yeru 0x6d9
-#define GDK_Cyrillic_ze 0x6da
-#define GDK_Cyrillic_sha 0x6db
-#define GDK_Cyrillic_e 0x6dc
-#define GDK_Cyrillic_shcha 0x6dd
-#define GDK_Cyrillic_che 0x6de
-#define GDK_Cyrillic_hardsign 0x6df
-#define GDK_Cyrillic_YU 0x6e0
-#define GDK_Cyrillic_A 0x6e1
-#define GDK_Cyrillic_BE 0x6e2
-#define GDK_Cyrillic_TSE 0x6e3
-#define GDK_Cyrillic_DE 0x6e4
-#define GDK_Cyrillic_IE 0x6e5
-#define GDK_Cyrillic_EF 0x6e6
-#define GDK_Cyrillic_GHE 0x6e7
-#define GDK_Cyrillic_HA 0x6e8
-#define GDK_Cyrillic_I 0x6e9
-#define GDK_Cyrillic_SHORTI 0x6ea
-#define GDK_Cyrillic_KA 0x6eb
-#define GDK_Cyrillic_EL 0x6ec
-#define GDK_Cyrillic_EM 0x6ed
-#define GDK_Cyrillic_EN 0x6ee
-#define GDK_Cyrillic_O 0x6ef
-#define GDK_Cyrillic_PE 0x6f0
-#define GDK_Cyrillic_YA 0x6f1
-#define GDK_Cyrillic_ER 0x6f2
-#define GDK_Cyrillic_ES 0x6f3
-#define GDK_Cyrillic_TE 0x6f4
-#define GDK_Cyrillic_U 0x6f5
-#define GDK_Cyrillic_ZHE 0x6f6
-#define GDK_Cyrillic_VE 0x6f7
-#define GDK_Cyrillic_SOFTSIGN 0x6f8
-#define GDK_Cyrillic_YERU 0x6f9
-#define GDK_Cyrillic_ZE 0x6fa
-#define GDK_Cyrillic_SHA 0x6fb
-#define GDK_Cyrillic_E 0x6fc
-#define GDK_Cyrillic_SHCHA 0x6fd
-#define GDK_Cyrillic_CHE 0x6fe
-#define GDK_Cyrillic_HARDSIGN 0x6ff
-#define GDK_Greek_ALPHAaccent 0x7a1
-#define GDK_Greek_EPSILONaccent 0x7a2
-#define GDK_Greek_ETAaccent 0x7a3
-#define GDK_Greek_IOTAaccent 0x7a4
-#define GDK_Greek_IOTAdieresis 0x7a5
-#define GDK_Greek_IOTAdiaeresis 0x7a5
-#define GDK_Greek_OMICRONaccent 0x7a7
-#define GDK_Greek_UPSILONaccent 0x7a8
-#define GDK_Greek_UPSILONdieresis 0x7a9
-#define GDK_Greek_OMEGAaccent 0x7ab
-#define GDK_Greek_accentdieresis 0x7ae
-#define GDK_Greek_horizbar 0x7af
-#define GDK_Greek_alphaaccent 0x7b1
-#define GDK_Greek_epsilonaccent 0x7b2
-#define GDK_Greek_etaaccent 0x7b3
-#define GDK_Greek_iotaaccent 0x7b4
-#define GDK_Greek_iotadieresis 0x7b5
-#define GDK_Greek_iotaaccentdieresis 0x7b6
-#define GDK_Greek_omicronaccent 0x7b7
-#define GDK_Greek_upsilonaccent 0x7b8
-#define GDK_Greek_upsilondieresis 0x7b9
-#define GDK_Greek_upsilonaccentdieresis 0x7ba
-#define GDK_Greek_omegaaccent 0x7bb
-#define GDK_Greek_ALPHA 0x7c1
-#define GDK_Greek_BETA 0x7c2
-#define GDK_Greek_GAMMA 0x7c3
-#define GDK_Greek_DELTA 0x7c4
-#define GDK_Greek_EPSILON 0x7c5
-#define GDK_Greek_ZETA 0x7c6
-#define GDK_Greek_ETA 0x7c7
-#define GDK_Greek_THETA 0x7c8
-#define GDK_Greek_IOTA 0x7c9
-#define GDK_Greek_KAPPA 0x7ca
-#define GDK_Greek_LAMDA 0x7cb
-#define GDK_Greek_LAMBDA 0x7cb
-#define GDK_Greek_MU 0x7cc
-#define GDK_Greek_NU 0x7cd
-#define GDK_Greek_XI 0x7ce
-#define GDK_Greek_OMICRON 0x7cf
-#define GDK_Greek_PI 0x7d0
-#define GDK_Greek_RHO 0x7d1
-#define GDK_Greek_SIGMA 0x7d2
-#define GDK_Greek_TAU 0x7d4
-#define GDK_Greek_UPSILON 0x7d5
-#define GDK_Greek_PHI 0x7d6
-#define GDK_Greek_CHI 0x7d7
-#define GDK_Greek_PSI 0x7d8
-#define GDK_Greek_OMEGA 0x7d9
-#define GDK_Greek_alpha 0x7e1
-#define GDK_Greek_beta 0x7e2
-#define GDK_Greek_gamma 0x7e3
-#define GDK_Greek_delta 0x7e4
-#define GDK_Greek_epsilon 0x7e5
-#define GDK_Greek_zeta 0x7e6
-#define GDK_Greek_eta 0x7e7
-#define GDK_Greek_theta 0x7e8
-#define GDK_Greek_iota 0x7e9
-#define GDK_Greek_kappa 0x7ea
-#define GDK_Greek_lamda 0x7eb
-#define GDK_Greek_lambda 0x7eb
-#define GDK_Greek_mu 0x7ec
-#define GDK_Greek_nu 0x7ed
-#define GDK_Greek_xi 0x7ee
-#define GDK_Greek_omicron 0x7ef
-#define GDK_Greek_pi 0x7f0
-#define GDK_Greek_rho 0x7f1
-#define GDK_Greek_sigma 0x7f2
-#define GDK_Greek_finalsmallsigma 0x7f3
-#define GDK_Greek_tau 0x7f4
-#define GDK_Greek_upsilon 0x7f5
-#define GDK_Greek_phi 0x7f6
-#define GDK_Greek_chi 0x7f7
-#define GDK_Greek_psi 0x7f8
-#define GDK_Greek_omega 0x7f9
-#define GDK_Greek_switch 0xff7e
-#define GDK_leftradical 0x8a1
-#define GDK_topleftradical 0x8a2
-#define GDK_horizconnector 0x8a3
-#define GDK_topintegral 0x8a4
-#define GDK_botintegral 0x8a5
-#define GDK_vertconnector 0x8a6
-#define GDK_topleftsqbracket 0x8a7
-#define GDK_botleftsqbracket 0x8a8
-#define GDK_toprightsqbracket 0x8a9
-#define GDK_botrightsqbracket 0x8aa
-#define GDK_topleftparens 0x8ab
-#define GDK_botleftparens 0x8ac
-#define GDK_toprightparens 0x8ad
-#define GDK_botrightparens 0x8ae
-#define GDK_leftmiddlecurlybrace 0x8af
-#define GDK_rightmiddlecurlybrace 0x8b0
-#define GDK_topleftsummation 0x8b1
-#define GDK_botleftsummation 0x8b2
-#define GDK_topvertsummationconnector 0x8b3
-#define GDK_botvertsummationconnector 0x8b4
-#define GDK_toprightsummation 0x8b5
-#define GDK_botrightsummation 0x8b6
-#define GDK_rightmiddlesummation 0x8b7
-#define GDK_lessthanequal 0x8bc
-#define GDK_notequal 0x8bd
-#define GDK_greaterthanequal 0x8be
-#define GDK_integral 0x8bf
-#define GDK_therefore 0x8c0
-#define GDK_variation 0x8c1
-#define GDK_infinity 0x8c2
-#define GDK_nabla 0x8c5
-#define GDK_approximate 0x8c8
-#define GDK_similarequal 0x8c9
-#define GDK_ifonlyif 0x8cd
-#define GDK_implies 0x8ce
-#define GDK_identical 0x8cf
-#define GDK_radical 0x8d6
-#define GDK_includedin 0x8da
-#define GDK_includes 0x8db
-#define GDK_intersection 0x8dc
-#define GDK_union 0x8dd
-#define GDK_logicaland 0x8de
-#define GDK_logicalor 0x8df
-#define GDK_partialderivative 0x8ef
-#define GDK_function 0x8f6
-#define GDK_leftarrow 0x8fb
-#define GDK_uparrow 0x8fc
-#define GDK_rightarrow 0x8fd
-#define GDK_downarrow 0x8fe
-#define GDK_blank 0x9df
-#define GDK_soliddiamond 0x9e0
-#define GDK_checkerboard 0x9e1
-#define GDK_ht 0x9e2
-#define GDK_ff 0x9e3
-#define GDK_cr 0x9e4
-#define GDK_lf 0x9e5
-#define GDK_nl 0x9e8
-#define GDK_vt 0x9e9
-#define GDK_lowrightcorner 0x9ea
-#define GDK_uprightcorner 0x9eb
-#define GDK_upleftcorner 0x9ec
-#define GDK_lowleftcorner 0x9ed
-#define GDK_crossinglines 0x9ee
-#define GDK_horizlinescan1 0x9ef
-#define GDK_horizlinescan3 0x9f0
-#define GDK_horizlinescan5 0x9f1
-#define GDK_horizlinescan7 0x9f2
-#define GDK_horizlinescan9 0x9f3
-#define GDK_leftt 0x9f4
-#define GDK_rightt 0x9f5
-#define GDK_bott 0x9f6
-#define GDK_topt 0x9f7
-#define GDK_vertbar 0x9f8
-#define GDK_emspace 0xaa1
-#define GDK_enspace 0xaa2
-#define GDK_em3space 0xaa3
-#define GDK_em4space 0xaa4
-#define GDK_digitspace 0xaa5
-#define GDK_punctspace 0xaa6
-#define GDK_thinspace 0xaa7
-#define GDK_hairspace 0xaa8
-#define GDK_emdash 0xaa9
-#define GDK_endash 0xaaa
-#define GDK_signifblank 0xaac
-#define GDK_ellipsis 0xaae
-#define GDK_doubbaselinedot 0xaaf
-#define GDK_onethird 0xab0
-#define GDK_twothirds 0xab1
-#define GDK_onefifth 0xab2
-#define GDK_twofifths 0xab3
-#define GDK_threefifths 0xab4
-#define GDK_fourfifths 0xab5
-#define GDK_onesixth 0xab6
-#define GDK_fivesixths 0xab7
-#define GDK_careof 0xab8
-#define GDK_figdash 0xabb
-#define GDK_leftanglebracket 0xabc
-#define GDK_decimalpoint 0xabd
-#define GDK_rightanglebracket 0xabe
-#define GDK_marker 0xabf
-#define GDK_oneeighth 0xac3
-#define GDK_threeeighths 0xac4
-#define GDK_fiveeighths 0xac5
-#define GDK_seveneighths 0xac6
-#define GDK_trademark 0xac9
-#define GDK_signaturemark 0xaca
-#define GDK_trademarkincircle 0xacb
-#define GDK_leftopentriangle 0xacc
-#define GDK_rightopentriangle 0xacd
-#define GDK_emopencircle 0xace
-#define GDK_emopenrectangle 0xacf
-#define GDK_leftsinglequotemark 0xad0
-#define GDK_rightsinglequotemark 0xad1
-#define GDK_leftdoublequotemark 0xad2
-#define GDK_rightdoublequotemark 0xad3
-#define GDK_prescription 0xad4
-#define GDK_minutes 0xad6
-#define GDK_seconds 0xad7
-#define GDK_latincross 0xad9
-#define GDK_hexagram 0xada
-#define GDK_filledrectbullet 0xadb
-#define GDK_filledlefttribullet 0xadc
-#define GDK_filledrighttribullet 0xadd
-#define GDK_emfilledcircle 0xade
-#define GDK_emfilledrect 0xadf
-#define GDK_enopencircbullet 0xae0
-#define GDK_enopensquarebullet 0xae1
-#define GDK_openrectbullet 0xae2
-#define GDK_opentribulletup 0xae3
-#define GDK_opentribulletdown 0xae4
-#define GDK_openstar 0xae5
-#define GDK_enfilledcircbullet 0xae6
-#define GDK_enfilledsqbullet 0xae7
-#define GDK_filledtribulletup 0xae8
-#define GDK_filledtribulletdown 0xae9
-#define GDK_leftpointer 0xaea
-#define GDK_rightpointer 0xaeb
-#define GDK_club 0xaec
-#define GDK_diamond 0xaed
-#define GDK_heart 0xaee
-#define GDK_maltesecross 0xaf0
-#define GDK_dagger 0xaf1
-#define GDK_doubledagger 0xaf2
-#define GDK_checkmark 0xaf3
-#define GDK_ballotcross 0xaf4
-#define GDK_musicalsharp 0xaf5
-#define GDK_musicalflat 0xaf6
-#define GDK_malesymbol 0xaf7
-#define GDK_femalesymbol 0xaf8
-#define GDK_telephone 0xaf9
-#define GDK_telephonerecorder 0xafa
-#define GDK_phonographcopyright 0xafb
-#define GDK_caret 0xafc
-#define GDK_singlelowquotemark 0xafd
-#define GDK_doublelowquotemark 0xafe
-#define GDK_cursor 0xaff
-#define GDK_leftcaret 0xba3
-#define GDK_rightcaret 0xba6
-#define GDK_downcaret 0xba8
-#define GDK_upcaret 0xba9
-#define GDK_overbar 0xbc0
-#define GDK_downtack 0xbc2
-#define GDK_upshoe 0xbc3
-#define GDK_downstile 0xbc4
-#define GDK_underbar 0xbc6
-#define GDK_jot 0xbca
-#define GDK_quad 0xbcc
-#define GDK_uptack 0xbce
-#define GDK_circle 0xbcf
-#define GDK_upstile 0xbd3
-#define GDK_downshoe 0xbd6
-#define GDK_rightshoe 0xbd8
-#define GDK_leftshoe 0xbda
-#define GDK_lefttack 0xbdc
-#define GDK_righttack 0xbfc
-#define GDK_hebrew_doublelowline 0xcdf
-#define GDK_hebrew_aleph 0xce0
-#define GDK_hebrew_bet 0xce1
-#define GDK_hebrew_beth 0xce1
-#define GDK_hebrew_gimel 0xce2
-#define GDK_hebrew_gimmel 0xce2
-#define GDK_hebrew_dalet 0xce3
-#define GDK_hebrew_daleth 0xce3
-#define GDK_hebrew_he 0xce4
-#define GDK_hebrew_waw 0xce5
-#define GDK_hebrew_zain 0xce6
-#define GDK_hebrew_zayin 0xce6
-#define GDK_hebrew_chet 0xce7
-#define GDK_hebrew_het 0xce7
-#define GDK_hebrew_tet 0xce8
-#define GDK_hebrew_teth 0xce8
-#define GDK_hebrew_yod 0xce9
-#define GDK_hebrew_finalkaph 0xcea
-#define GDK_hebrew_kaph 0xceb
-#define GDK_hebrew_lamed 0xcec
-#define GDK_hebrew_finalmem 0xced
-#define GDK_hebrew_mem 0xcee
-#define GDK_hebrew_finalnun 0xcef
-#define GDK_hebrew_nun 0xcf0
-#define GDK_hebrew_samech 0xcf1
-#define GDK_hebrew_samekh 0xcf1
-#define GDK_hebrew_ayin 0xcf2
-#define GDK_hebrew_finalpe 0xcf3
-#define GDK_hebrew_pe 0xcf4
-#define GDK_hebrew_finalzade 0xcf5
-#define GDK_hebrew_finalzadi 0xcf5
-#define GDK_hebrew_zade 0xcf6
-#define GDK_hebrew_zadi 0xcf6
-#define GDK_hebrew_qoph 0xcf7
-#define GDK_hebrew_kuf 0xcf7
-#define GDK_hebrew_resh 0xcf8
-#define GDK_hebrew_shin 0xcf9
-#define GDK_hebrew_taw 0xcfa
-#define GDK_hebrew_taf 0xcfa
-#define GDK_Hebrew_switch 0xff7e
-#define GDK_Thai_kokai 0xda1
-#define GDK_Thai_khokhai 0xda2
-#define GDK_Thai_khokhuat 0xda3
-#define GDK_Thai_khokhwai 0xda4
-#define GDK_Thai_khokhon 0xda5
-#define GDK_Thai_khorakhang 0xda6
-#define GDK_Thai_ngongu 0xda7
-#define GDK_Thai_chochan 0xda8
-#define GDK_Thai_choching 0xda9
-#define GDK_Thai_chochang 0xdaa
-#define GDK_Thai_soso 0xdab
-#define GDK_Thai_chochoe 0xdac
-#define GDK_Thai_yoying 0xdad
-#define GDK_Thai_dochada 0xdae
-#define GDK_Thai_topatak 0xdaf
-#define GDK_Thai_thothan 0xdb0
-#define GDK_Thai_thonangmontho 0xdb1
-#define GDK_Thai_thophuthao 0xdb2
-#define GDK_Thai_nonen 0xdb3
-#define GDK_Thai_dodek 0xdb4
-#define GDK_Thai_totao 0xdb5
-#define GDK_Thai_thothung 0xdb6
-#define GDK_Thai_thothahan 0xdb7
-#define GDK_Thai_thothong 0xdb8
-#define GDK_Thai_nonu 0xdb9
-#define GDK_Thai_bobaimai 0xdba
-#define GDK_Thai_popla 0xdbb
-#define GDK_Thai_phophung 0xdbc
-#define GDK_Thai_fofa 0xdbd
-#define GDK_Thai_phophan 0xdbe
-#define GDK_Thai_fofan 0xdbf
-#define GDK_Thai_phosamphao 0xdc0
-#define GDK_Thai_moma 0xdc1
-#define GDK_Thai_yoyak 0xdc2
-#define GDK_Thai_rorua 0xdc3
-#define GDK_Thai_ru 0xdc4
-#define GDK_Thai_loling 0xdc5
-#define GDK_Thai_lu 0xdc6
-#define GDK_Thai_wowaen 0xdc7
-#define GDK_Thai_sosala 0xdc8
-#define GDK_Thai_sorusi 0xdc9
-#define GDK_Thai_sosua 0xdca
-#define GDK_Thai_hohip 0xdcb
-#define GDK_Thai_lochula 0xdcc
-#define GDK_Thai_oang 0xdcd
-#define GDK_Thai_honokhuk 0xdce
-#define GDK_Thai_paiyannoi 0xdcf
-#define GDK_Thai_saraa 0xdd0
-#define GDK_Thai_maihanakat 0xdd1
-#define GDK_Thai_saraaa 0xdd2
-#define GDK_Thai_saraam 0xdd3
-#define GDK_Thai_sarai 0xdd4
-#define GDK_Thai_saraii 0xdd5
-#define GDK_Thai_saraue 0xdd6
-#define GDK_Thai_sarauee 0xdd7
-#define GDK_Thai_sarau 0xdd8
-#define GDK_Thai_sarauu 0xdd9
-#define GDK_Thai_phinthu 0xdda
-#define GDK_Thai_maihanakat_maitho 0xdde
-#define GDK_Thai_baht 0xddf
-#define GDK_Thai_sarae 0xde0
-#define GDK_Thai_saraae 0xde1
-#define GDK_Thai_sarao 0xde2
-#define GDK_Thai_saraaimaimuan 0xde3
-#define GDK_Thai_saraaimaimalai 0xde4
-#define GDK_Thai_lakkhangyao 0xde5
-#define GDK_Thai_maiyamok 0xde6
-#define GDK_Thai_maitaikhu 0xde7
-#define GDK_Thai_maiek 0xde8
-#define GDK_Thai_maitho 0xde9
-#define GDK_Thai_maitri 0xdea
-#define GDK_Thai_maichattawa 0xdeb
-#define GDK_Thai_thanthakhat 0xdec
-#define GDK_Thai_nikhahit 0xded
-#define GDK_Thai_leksun 0xdf0
-#define GDK_Thai_leknung 0xdf1
-#define GDK_Thai_leksong 0xdf2
-#define GDK_Thai_leksam 0xdf3
-#define GDK_Thai_leksi 0xdf4
-#define GDK_Thai_lekha 0xdf5
-#define GDK_Thai_lekhok 0xdf6
-#define GDK_Thai_lekchet 0xdf7
-#define GDK_Thai_lekpaet 0xdf8
-#define GDK_Thai_lekkao 0xdf9
-#define GDK_Hangul 0xff31
-#define GDK_Hangul_Start 0xff32
-#define GDK_Hangul_End 0xff33
-#define GDK_Hangul_Hanja 0xff34
-#define GDK_Hangul_Jamo 0xff35
-#define GDK_Hangul_Romaja 0xff36
-#define GDK_Hangul_Codeinput 0xff37
-#define GDK_Hangul_Jeonja 0xff38
-#define GDK_Hangul_Banja 0xff39
-#define GDK_Hangul_PreHanja 0xff3a
-#define GDK_Hangul_PostHanja 0xff3b
-#define GDK_Hangul_SingleCandidate 0xff3c
-#define GDK_Hangul_MultipleCandidate 0xff3d
-#define GDK_Hangul_PreviousCandidate 0xff3e
-#define GDK_Hangul_Special 0xff3f
-#define GDK_Hangul_switch 0xff7e
-#define GDK_Hangul_Kiyeog 0xea1
-#define GDK_Hangul_SsangKiyeog 0xea2
-#define GDK_Hangul_KiyeogSios 0xea3
-#define GDK_Hangul_Nieun 0xea4
-#define GDK_Hangul_NieunJieuj 0xea5
-#define GDK_Hangul_NieunHieuh 0xea6
-#define GDK_Hangul_Dikeud 0xea7
-#define GDK_Hangul_SsangDikeud 0xea8
-#define GDK_Hangul_Rieul 0xea9
-#define GDK_Hangul_RieulKiyeog 0xeaa
-#define GDK_Hangul_RieulMieum 0xeab
-#define GDK_Hangul_RieulPieub 0xeac
-#define GDK_Hangul_RieulSios 0xead
-#define GDK_Hangul_RieulTieut 0xeae
-#define GDK_Hangul_RieulPhieuf 0xeaf
-#define GDK_Hangul_RieulHieuh 0xeb0
-#define GDK_Hangul_Mieum 0xeb1
-#define GDK_Hangul_Pieub 0xeb2
-#define GDK_Hangul_SsangPieub 0xeb3
-#define GDK_Hangul_PieubSios 0xeb4
-#define GDK_Hangul_Sios 0xeb5
-#define GDK_Hangul_SsangSios 0xeb6
-#define GDK_Hangul_Ieung 0xeb7
-#define GDK_Hangul_Jieuj 0xeb8
-#define GDK_Hangul_SsangJieuj 0xeb9
-#define GDK_Hangul_Cieuc 0xeba
-#define GDK_Hangul_Khieuq 0xebb
-#define GDK_Hangul_Tieut 0xebc
-#define GDK_Hangul_Phieuf 0xebd
-#define GDK_Hangul_Hieuh 0xebe
-#define GDK_Hangul_A 0xebf
-#define GDK_Hangul_AE 0xec0
-#define GDK_Hangul_YA 0xec1
-#define GDK_Hangul_YAE 0xec2
-#define GDK_Hangul_EO 0xec3
-#define GDK_Hangul_E 0xec4
-#define GDK_Hangul_YEO 0xec5
-#define GDK_Hangul_YE 0xec6
-#define GDK_Hangul_O 0xec7
-#define GDK_Hangul_WA 0xec8
-#define GDK_Hangul_WAE 0xec9
-#define GDK_Hangul_OE 0xeca
-#define GDK_Hangul_YO 0xecb
-#define GDK_Hangul_U 0xecc
-#define GDK_Hangul_WEO 0xecd
-#define GDK_Hangul_WE 0xece
-#define GDK_Hangul_WI 0xecf
-#define GDK_Hangul_YU 0xed0
-#define GDK_Hangul_EU 0xed1
-#define GDK_Hangul_YI 0xed2
-#define GDK_Hangul_I 0xed3
-#define GDK_Hangul_J_Kiyeog 0xed4
-#define GDK_Hangul_J_SsangKiyeog 0xed5
-#define GDK_Hangul_J_KiyeogSios 0xed6
-#define GDK_Hangul_J_Nieun 0xed7
-#define GDK_Hangul_J_NieunJieuj 0xed8
-#define GDK_Hangul_J_NieunHieuh 0xed9
-#define GDK_Hangul_J_Dikeud 0xeda
-#define GDK_Hangul_J_Rieul 0xedb
-#define GDK_Hangul_J_RieulKiyeog 0xedc
-#define GDK_Hangul_J_RieulMieum 0xedd
-#define GDK_Hangul_J_RieulPieub 0xede
-#define GDK_Hangul_J_RieulSios 0xedf
-#define GDK_Hangul_J_RieulTieut 0xee0
-#define GDK_Hangul_J_RieulPhieuf 0xee1
-#define GDK_Hangul_J_RieulHieuh 0xee2
-#define GDK_Hangul_J_Mieum 0xee3
-#define GDK_Hangul_J_Pieub 0xee4
-#define GDK_Hangul_J_PieubSios 0xee5
-#define GDK_Hangul_J_Sios 0xee6
-#define GDK_Hangul_J_SsangSios 0xee7
-#define GDK_Hangul_J_Ieung 0xee8
-#define GDK_Hangul_J_Jieuj 0xee9
-#define GDK_Hangul_J_Cieuc 0xeea
-#define GDK_Hangul_J_Khieuq 0xeeb
-#define GDK_Hangul_J_Tieut 0xeec
-#define GDK_Hangul_J_Phieuf 0xeed
-#define GDK_Hangul_J_Hieuh 0xeee
-#define GDK_Hangul_RieulYeorinHieuh 0xeef
-#define GDK_Hangul_SunkyeongeumMieum 0xef0
-#define GDK_Hangul_SunkyeongeumPieub 0xef1
-#define GDK_Hangul_PanSios 0xef2
-#define GDK_Hangul_KkogjiDalrinIeung 0xef3
-#define GDK_Hangul_SunkyeongeumPhieuf 0xef4
-#define GDK_Hangul_YeorinHieuh 0xef5
-#define GDK_Hangul_AraeA 0xef6
-#define GDK_Hangul_AraeAE 0xef7
-#define GDK_Hangul_J_PanSios 0xef8
-#define GDK_Hangul_J_KkogjiDalrinIeung 0xef9
-#define GDK_Hangul_J_YeorinHieuh 0xefa
-#define GDK_Korean_Won 0xeff
-#define GDK_Armenian_ligature_ew 0x1000587
-#define GDK_Armenian_full_stop 0x1000589
-#define GDK_Armenian_verjaket 0x1000589
-#define GDK_Armenian_separation_mark 0x100055d
-#define GDK_Armenian_but 0x100055d
-#define GDK_Armenian_hyphen 0x100058a
-#define GDK_Armenian_yentamna 0x100058a
-#define GDK_Armenian_exclam 0x100055c
-#define GDK_Armenian_amanak 0x100055c
-#define GDK_Armenian_accent 0x100055b
-#define GDK_Armenian_shesht 0x100055b
-#define GDK_Armenian_question 0x100055e
-#define GDK_Armenian_paruyk 0x100055e
-#define GDK_Armenian_AYB 0x1000531
-#define GDK_Armenian_ayb 0x1000561
-#define GDK_Armenian_BEN 0x1000532
-#define GDK_Armenian_ben 0x1000562
-#define GDK_Armenian_GIM 0x1000533
-#define GDK_Armenian_gim 0x1000563
-#define GDK_Armenian_DA 0x1000534
-#define GDK_Armenian_da 0x1000564
-#define GDK_Armenian_YECH 0x1000535
-#define GDK_Armenian_yech 0x1000565
-#define GDK_Armenian_ZA 0x1000536
-#define GDK_Armenian_za 0x1000566
-#define GDK_Armenian_E 0x1000537
-#define GDK_Armenian_e 0x1000567
-#define GDK_Armenian_AT 0x1000538
-#define GDK_Armenian_at 0x1000568
-#define GDK_Armenian_TO 0x1000539
-#define GDK_Armenian_to 0x1000569
-#define GDK_Armenian_ZHE 0x100053a
-#define GDK_Armenian_zhe 0x100056a
-#define GDK_Armenian_INI 0x100053b
-#define GDK_Armenian_ini 0x100056b
-#define GDK_Armenian_LYUN 0x100053c
-#define GDK_Armenian_lyun 0x100056c
-#define GDK_Armenian_KHE 0x100053d
-#define GDK_Armenian_khe 0x100056d
-#define GDK_Armenian_TSA 0x100053e
-#define GDK_Armenian_tsa 0x100056e
-#define GDK_Armenian_KEN 0x100053f
-#define GDK_Armenian_ken 0x100056f
-#define GDK_Armenian_HO 0x1000540
-#define GDK_Armenian_ho 0x1000570
-#define GDK_Armenian_DZA 0x1000541
-#define GDK_Armenian_dza 0x1000571
-#define GDK_Armenian_GHAT 0x1000542
-#define GDK_Armenian_ghat 0x1000572
-#define GDK_Armenian_TCHE 0x1000543
-#define GDK_Armenian_tche 0x1000573
-#define GDK_Armenian_MEN 0x1000544
-#define GDK_Armenian_men 0x1000574
-#define GDK_Armenian_HI 0x1000545
-#define GDK_Armenian_hi 0x1000575
-#define GDK_Armenian_NU 0x1000546
-#define GDK_Armenian_nu 0x1000576
-#define GDK_Armenian_SHA 0x1000547
-#define GDK_Armenian_sha 0x1000577
-#define GDK_Armenian_VO 0x1000548
-#define GDK_Armenian_vo 0x1000578
-#define GDK_Armenian_CHA 0x1000549
-#define GDK_Armenian_cha 0x1000579
-#define GDK_Armenian_PE 0x100054a
-#define GDK_Armenian_pe 0x100057a
-#define GDK_Armenian_JE 0x100054b
-#define GDK_Armenian_je 0x100057b
-#define GDK_Armenian_RA 0x100054c
-#define GDK_Armenian_ra 0x100057c
-#define GDK_Armenian_SE 0x100054d
-#define GDK_Armenian_se 0x100057d
-#define GDK_Armenian_VEV 0x100054e
-#define GDK_Armenian_vev 0x100057e
-#define GDK_Armenian_TYUN 0x100054f
-#define GDK_Armenian_tyun 0x100057f
-#define GDK_Armenian_RE 0x1000550
-#define GDK_Armenian_re 0x1000580
-#define GDK_Armenian_TSO 0x1000551
-#define GDK_Armenian_tso 0x1000581
-#define GDK_Armenian_VYUN 0x1000552
-#define GDK_Armenian_vyun 0x1000582
-#define GDK_Armenian_PYUR 0x1000553
-#define GDK_Armenian_pyur 0x1000583
-#define GDK_Armenian_KE 0x1000554
-#define GDK_Armenian_ke 0x1000584
-#define GDK_Armenian_O 0x1000555
-#define GDK_Armenian_o 0x1000585
-#define GDK_Armenian_FE 0x1000556
-#define GDK_Armenian_fe 0x1000586
-#define GDK_Armenian_apostrophe 0x100055a
-#define GDK_Georgian_an 0x10010d0
-#define GDK_Georgian_ban 0x10010d1
-#define GDK_Georgian_gan 0x10010d2
-#define GDK_Georgian_don 0x10010d3
-#define GDK_Georgian_en 0x10010d4
-#define GDK_Georgian_vin 0x10010d5
-#define GDK_Georgian_zen 0x10010d6
-#define GDK_Georgian_tan 0x10010d7
-#define GDK_Georgian_in 0x10010d8
-#define GDK_Georgian_kan 0x10010d9
-#define GDK_Georgian_las 0x10010da
-#define GDK_Georgian_man 0x10010db
-#define GDK_Georgian_nar 0x10010dc
-#define GDK_Georgian_on 0x10010dd
-#define GDK_Georgian_par 0x10010de
-#define GDK_Georgian_zhar 0x10010df
-#define GDK_Georgian_rae 0x10010e0
-#define GDK_Georgian_san 0x10010e1
-#define GDK_Georgian_tar 0x10010e2
-#define GDK_Georgian_un 0x10010e3
-#define GDK_Georgian_phar 0x10010e4
-#define GDK_Georgian_khar 0x10010e5
-#define GDK_Georgian_ghan 0x10010e6
-#define GDK_Georgian_qar 0x10010e7
-#define GDK_Georgian_shin 0x10010e8
-#define GDK_Georgian_chin 0x10010e9
-#define GDK_Georgian_can 0x10010ea
-#define GDK_Georgian_jil 0x10010eb
-#define GDK_Georgian_cil 0x10010ec
-#define GDK_Georgian_char 0x10010ed
-#define GDK_Georgian_xan 0x10010ee
-#define GDK_Georgian_jhan 0x10010ef
-#define GDK_Georgian_hae 0x10010f0
-#define GDK_Georgian_he 0x10010f1
-#define GDK_Georgian_hie 0x10010f2
-#define GDK_Georgian_we 0x10010f3
-#define GDK_Georgian_har 0x10010f4
-#define GDK_Georgian_hoe 0x10010f5
-#define GDK_Georgian_fi 0x10010f6
-#define GDK_Xabovedot 0x1001e8a
-#define GDK_Ibreve 0x100012c
-#define GDK_Zstroke 0x10001b5
-#define GDK_Gcaron 0x10001e6
-#define GDK_Ocaron 0x10001d1
-#define GDK_Obarred 0x100019f
-#define GDK_xabovedot 0x1001e8b
-#define GDK_ibreve 0x100012d
-#define GDK_zstroke 0x10001b6
-#define GDK_gcaron 0x10001e7
-#define GDK_ocaron 0x10001d2
-#define GDK_obarred 0x1000275
-#define GDK_SCHWA 0x100018f
-#define GDK_schwa 0x1000259
-#define GDK_Lbelowdot 0x1001e36
-#define GDK_lbelowdot 0x1001e37
-#define GDK_Abelowdot 0x1001ea0
-#define GDK_abelowdot 0x1001ea1
-#define GDK_Ahook 0x1001ea2
-#define GDK_ahook 0x1001ea3
-#define GDK_Acircumflexacute 0x1001ea4
-#define GDK_acircumflexacute 0x1001ea5
-#define GDK_Acircumflexgrave 0x1001ea6
-#define GDK_acircumflexgrave 0x1001ea7
-#define GDK_Acircumflexhook 0x1001ea8
-#define GDK_acircumflexhook 0x1001ea9
-#define GDK_Acircumflextilde 0x1001eaa
-#define GDK_acircumflextilde 0x1001eab
-#define GDK_Acircumflexbelowdot 0x1001eac
-#define GDK_acircumflexbelowdot 0x1001ead
-#define GDK_Abreveacute 0x1001eae
-#define GDK_abreveacute 0x1001eaf
-#define GDK_Abrevegrave 0x1001eb0
-#define GDK_abrevegrave 0x1001eb1
-#define GDK_Abrevehook 0x1001eb2
-#define GDK_abrevehook 0x1001eb3
-#define GDK_Abrevetilde 0x1001eb4
-#define GDK_abrevetilde 0x1001eb5
-#define GDK_Abrevebelowdot 0x1001eb6
-#define GDK_abrevebelowdot 0x1001eb7
-#define GDK_Ebelowdot 0x1001eb8
-#define GDK_ebelowdot 0x1001eb9
-#define GDK_Ehook 0x1001eba
-#define GDK_ehook 0x1001ebb
-#define GDK_Etilde 0x1001ebc
-#define GDK_etilde 0x1001ebd
-#define GDK_Ecircumflexacute 0x1001ebe
-#define GDK_ecircumflexacute 0x1001ebf
-#define GDK_Ecircumflexgrave 0x1001ec0
-#define GDK_ecircumflexgrave 0x1001ec1
-#define GDK_Ecircumflexhook 0x1001ec2
-#define GDK_ecircumflexhook 0x1001ec3
-#define GDK_Ecircumflextilde 0x1001ec4
-#define GDK_ecircumflextilde 0x1001ec5
-#define GDK_Ecircumflexbelowdot 0x1001ec6
-#define GDK_ecircumflexbelowdot 0x1001ec7
-#define GDK_Ihook 0x1001ec8
-#define GDK_ihook 0x1001ec9
-#define GDK_Ibelowdot 0x1001eca
-#define GDK_ibelowdot 0x1001ecb
-#define GDK_Obelowdot 0x1001ecc
-#define GDK_obelowdot 0x1001ecd
-#define GDK_Ohook 0x1001ece
-#define GDK_ohook 0x1001ecf
-#define GDK_Ocircumflexacute 0x1001ed0
-#define GDK_ocircumflexacute 0x1001ed1
-#define GDK_Ocircumflexgrave 0x1001ed2
-#define GDK_ocircumflexgrave 0x1001ed3
-#define GDK_Ocircumflexhook 0x1001ed4
-#define GDK_ocircumflexhook 0x1001ed5
-#define GDK_Ocircumflextilde 0x1001ed6
-#define GDK_ocircumflextilde 0x1001ed7
-#define GDK_Ocircumflexbelowdot 0x1001ed8
-#define GDK_ocircumflexbelowdot 0x1001ed9
-#define GDK_Ohornacute 0x1001eda
-#define GDK_ohornacute 0x1001edb
-#define GDK_Ohorngrave 0x1001edc
-#define GDK_ohorngrave 0x1001edd
-#define GDK_Ohornhook 0x1001ede
-#define GDK_ohornhook 0x1001edf
-#define GDK_Ohorntilde 0x1001ee0
-#define GDK_ohorntilde 0x1001ee1
-#define GDK_Ohornbelowdot 0x1001ee2
-#define GDK_ohornbelowdot 0x1001ee3
-#define GDK_Ubelowdot 0x1001ee4
-#define GDK_ubelowdot 0x1001ee5
-#define GDK_Uhook 0x1001ee6
-#define GDK_uhook 0x1001ee7
-#define GDK_Uhornacute 0x1001ee8
-#define GDK_uhornacute 0x1001ee9
-#define GDK_Uhorngrave 0x1001eea
-#define GDK_uhorngrave 0x1001eeb
-#define GDK_Uhornhook 0x1001eec
-#define GDK_uhornhook 0x1001eed
-#define GDK_Uhorntilde 0x1001eee
-#define GDK_uhorntilde 0x1001eef
-#define GDK_Uhornbelowdot 0x1001ef0
-#define GDK_uhornbelowdot 0x1001ef1
-#define GDK_Ybelowdot 0x1001ef4
-#define GDK_ybelowdot 0x1001ef5
-#define GDK_Yhook 0x1001ef6
-#define GDK_yhook 0x1001ef7
-#define GDK_Ytilde 0x1001ef8
-#define GDK_ytilde 0x1001ef9
-#define GDK_Ohorn 0x10001a0
-#define GDK_ohorn 0x10001a1
-#define GDK_Uhorn 0x10001af
-#define GDK_uhorn 0x10001b0
-#define GDK_EcuSign 0x10020a0
-#define GDK_ColonSign 0x10020a1
-#define GDK_CruzeiroSign 0x10020a2
-#define GDK_FFrancSign 0x10020a3
-#define GDK_LiraSign 0x10020a4
-#define GDK_MillSign 0x10020a5
-#define GDK_NairaSign 0x10020a6
-#define GDK_PesetaSign 0x10020a7
-#define GDK_RupeeSign 0x10020a8
-#define GDK_WonSign 0x10020a9
-#define GDK_NewSheqelSign 0x10020aa
-#define GDK_DongSign 0x10020ab
-#define GDK_EuroSign 0x20ac
-#define GDK_zerosuperior 0x1002070
-#define GDK_foursuperior 0x1002074
-#define GDK_fivesuperior 0x1002075
-#define GDK_sixsuperior 0x1002076
-#define GDK_sevensuperior 0x1002077
-#define GDK_eightsuperior 0x1002078
-#define GDK_ninesuperior 0x1002079
-#define GDK_zerosubscript 0x1002080
-#define GDK_onesubscript 0x1002081
-#define GDK_twosubscript 0x1002082
-#define GDK_threesubscript 0x1002083
-#define GDK_foursubscript 0x1002084
-#define GDK_fivesubscript 0x1002085
-#define GDK_sixsubscript 0x1002086
-#define GDK_sevensubscript 0x1002087
-#define GDK_eightsubscript 0x1002088
-#define GDK_ninesubscript 0x1002089
-#define GDK_partdifferential 0x1002202
-#define GDK_emptyset 0x1002205
-#define GDK_elementof 0x1002208
-#define GDK_notelementof 0x1002209
-#define GDK_containsas 0x100220b
-#define GDK_squareroot 0x100221a
-#define GDK_cuberoot 0x100221b
-#define GDK_fourthroot 0x100221c
-#define GDK_dintegral 0x100222c
-#define GDK_tintegral 0x100222d
-#define GDK_because 0x1002235
-#define GDK_approxeq 0x1002248
-#define GDK_notapproxeq 0x1002247
-#define GDK_notidentical 0x1002262
-#define GDK_stricteq 0x1002263
-
-#endif /* __GDK_KEYSYMS_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkpango.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkpango.h
deleted file mode 100644
index b2fef357..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkpango.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 __GDK_PANGO_H__
-#define __GDK_PANGO_H__
-
-#include <gdk/gdktypes.h>
-
-G_BEGIN_DECLS
-
-/* Pango interaction */
-
-typedef struct _GdkPangoRenderer        GdkPangoRenderer;
-typedef struct _GdkPangoRendererClass   GdkPangoRendererClass;
-typedef struct _GdkPangoRendererPrivate GdkPangoRendererPrivate;
-
-#define GDK_TYPE_PANGO_RENDERER            (gdk_pango_renderer_get_type())
-#define GDK_PANGO_RENDERER(object)         (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_PANGO_RENDERER, GdkPangoRenderer))
-#define GDK_IS_PANGO_RENDERER(object)      (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_PANGO_RENDERER))
-#define GDK_PANGO_RENDERER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_PANGO_RENDERER, GdkPangoRendererClass))
-#define GDK_IS_PANGO_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_PANGO_RENDERER))
-#define GDK_PANGO_RENDERER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_PANGO_RENDERER, GdkPangoRendererClass))
-
-/**
- * GdkPangoRenderer:
- *
- * #GdkPangoRenderer is a subclass of #PangoRenderer used for rendering
- * Pango objects into GDK drawables. The default renderer for a particular
- * screen is obtained with gdk_pango_renderer_get_default(); Pango
- * functions like pango_renderer_draw_layout() and
- * pango_renderer_draw_layout_line() are then used to draw objects with
- * the renderer.
- *
- * In most simple cases, applications can just use gdk_draw_layout(), and
- * don't need to directly use #GdkPangoRenderer at all. Using the
- * #GdkPangoRenderer directly is most useful when working with a
- * transformation such as a rotation, because the Pango drawing functions
- * take user space coordinates (coordinates before the transformation)
- * instead of device coordinates.
- *
- * In certain cases it can be useful to subclass #GdkPangoRenderer. Examples
- * of reasons to do this are to add handling of custom attributes by
- * overriding 'prepare_run' or to do custom drawing of embedded objects
- * by overriding 'draw_shape'.
- *
- * Since: 2.6
- **/
-struct _GdkPangoRenderer
-{
-  /*< private >*/
-  PangoRenderer parent_instance;
-
-  GdkPangoRendererPrivate *priv;
-};
-
-/**
- * GdkPangoRendererClass:
- *
- * #GdkPangoRenderer is the class structure for #GdkPangoRenderer.
- *
- * Since: 2.6
- **/
-struct _GdkPangoRendererClass
-{
-  /*< private >*/
-  PangoRendererClass parent_class;
-};
-
-GType gdk_pango_renderer_get_type (void) G_GNUC_CONST;
-
-PangoRenderer *gdk_pango_renderer_new         (GdkScreen *screen);
-PangoRenderer *gdk_pango_renderer_get_default (GdkScreen *screen);
-
-void gdk_pango_renderer_set_drawable       (GdkPangoRenderer *gdk_renderer,
-					    GdkDrawable      *drawable);
-void gdk_pango_renderer_set_gc             (GdkPangoRenderer *gdk_renderer,
-					    GdkGC            *gc);
-void gdk_pango_renderer_set_stipple        (GdkPangoRenderer *gdk_renderer,
-					    PangoRenderPart   part,
-					    GdkBitmap        *stipple);
-void gdk_pango_renderer_set_override_color (GdkPangoRenderer *gdk_renderer,
-					    PangoRenderPart   part,
-					    const GdkColor   *color);
-
-/************************************************************************/
-
-PangoContext *gdk_pango_context_get_for_screen (GdkScreen    *screen);
-#ifndef GDK_MULTIHEAD_SAFE
-PangoContext *gdk_pango_context_get            (void);
-#endif
-#ifndef GDK_DISABLE_DEPRECATED
-void          gdk_pango_context_set_colormap   (PangoContext *context,
-                                                GdkColormap  *colormap);
-#endif 
-
-
-/* Get a clip region to draw only part of a layout or
- * line. index_ranges contains alternating range starts/stops. The
- * region is the region which contains the given ranges, i.e. if you
- * draw with the region as clip, only the given ranges are drawn.
- */
-
-GdkRegion    *gdk_pango_layout_line_get_clip_region (PangoLayoutLine *line,
-                                                     gint             x_origin,
-                                                     gint             y_origin,
-                                                     gint            *index_ranges,
-                                                     gint             n_ranges);
-GdkRegion    *gdk_pango_layout_get_clip_region      (PangoLayout     *layout,
-                                                     gint             x_origin,
-                                                     gint             y_origin,
-                                                     gint            *index_ranges,
-                                                     gint             n_ranges);
-
-
-
-/* Attributes use to render insensitive text in GTK+. */
-
-typedef struct _GdkPangoAttrStipple GdkPangoAttrStipple;
-typedef struct _GdkPangoAttrEmbossed GdkPangoAttrEmbossed;
-typedef struct _GdkPangoAttrEmbossColor GdkPangoAttrEmbossColor;
-
-struct _GdkPangoAttrStipple
-{
-  PangoAttribute attr;
-  GdkBitmap *stipple;
-};
-
-struct _GdkPangoAttrEmbossed
-{
-  PangoAttribute attr;
-  gboolean embossed;
-};
-
-struct _GdkPangoAttrEmbossColor
-{
-  PangoAttribute attr;
-  PangoColor color;
-};
-
-PangoAttribute *gdk_pango_attr_stipple_new  (GdkBitmap *stipple);
-PangoAttribute *gdk_pango_attr_embossed_new (gboolean embossed);
-PangoAttribute *gdk_pango_attr_emboss_color_new (const GdkColor *color);
-
-G_END_DECLS
-
-#endif /* __GDK_FONT_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkpixbuf.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkpixbuf.h
deleted file mode 100644
index 7ec71644..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkpixbuf.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_PIXBUF_H__
-#define __GDK_PIXBUF_H__
-
-#include <cairo.h>
-#include <gdk/gdktypes.h>
-#include <gdk/gdkrgb.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-G_BEGIN_DECLS
-
-/* Rendering to a drawable */
-
-void gdk_pixbuf_render_threshold_alpha   (GdkPixbuf           *pixbuf,
-					  GdkBitmap           *bitmap,
-					  int                  src_x,
-					  int                  src_y,
-					  int                  dest_x,
-					  int                  dest_y,
-					  int                  width,
-					  int                  height,
-					  int                  alpha_threshold);
-#ifndef GDK_DISABLE_DEPRECATED
-void gdk_pixbuf_render_to_drawable       (GdkPixbuf           *pixbuf,
-					  GdkDrawable         *drawable,
-					  GdkGC               *gc,
-					  int                  src_x,
-					  int                  src_y,
-					  int                  dest_x,
-					  int                  dest_y,
-					  int                  width,
-					  int                  height,
-					  GdkRgbDither         dither,
-					  int                  x_dither,
-					  int                  y_dither);
-void gdk_pixbuf_render_to_drawable_alpha (GdkPixbuf           *pixbuf,
-					  GdkDrawable         *drawable,
-					  int                  src_x,
-					  int                  src_y,
-					  int                  dest_x,
-					  int                  dest_y,
-					  int                  width,
-					  int                  height,
-					  GdkPixbufAlphaMode   alpha_mode,
-					  int                  alpha_threshold,
-					  GdkRgbDither         dither,
-					  int                  x_dither,
-					  int                  y_dither);
-#endif /* GDK_DISABLE_DEPRECATED */
-void gdk_pixbuf_render_pixmap_and_mask_for_colormap (GdkPixbuf    *pixbuf,
-						     GdkColormap  *colormap,
-						     GdkPixmap   **pixmap_return,
-						     GdkBitmap   **mask_return,
-						     int           alpha_threshold);
-#ifndef GDK_MULTIHEAD_SAFE
-void gdk_pixbuf_render_pixmap_and_mask              (GdkPixbuf    *pixbuf,
-						     GdkPixmap   **pixmap_return,
-						     GdkBitmap   **mask_return,
-						     int           alpha_threshold);
-#endif
-
-
-/* Fetching a region from a drawable */
-GdkPixbuf *gdk_pixbuf_get_from_drawable (GdkPixbuf   *dest,
-					 GdkDrawable *src,
-					 GdkColormap *cmap,
-					 int          src_x,
-					 int          src_y,
-					 int          dest_x,
-					 int          dest_y,
-					 int          width,
-					 int          height);
-
-GdkPixbuf *gdk_pixbuf_get_from_image    (GdkPixbuf   *dest,
-                                         GdkImage    *src,
-                                         GdkColormap *cmap,
-                                         int          src_x,
-                                         int          src_y,
-                                         int          dest_x,
-                                         int          dest_y,
-                                         int          width,
-                                         int          height);
-
-G_END_DECLS
-
-#endif /* __GDK_PIXBUF_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkpixmap.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkpixmap.h
deleted file mode 100644
index 1f9190b4..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkpixmap.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_PIXMAP_H__
-#define __GDK_PIXMAP_H__
-
-#include <gdk/gdktypes.h>
-#include <gdk/gdkdrawable.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GdkPixmapObject GdkPixmapObject;
-typedef struct _GdkPixmapObjectClass GdkPixmapObjectClass;
-
-#define GDK_TYPE_PIXMAP              (gdk_pixmap_get_type ())
-#define GDK_PIXMAP(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_PIXMAP, GdkPixmap))
-#define GDK_PIXMAP_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_PIXMAP, GdkPixmapObjectClass))
-#define GDK_IS_PIXMAP(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_PIXMAP))
-#define GDK_IS_PIXMAP_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_PIXMAP))
-#define GDK_PIXMAP_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_PIXMAP, GdkPixmapObjectClass))
-#define GDK_PIXMAP_OBJECT(object)    ((GdkPixmapObject *) GDK_PIXMAP (object))
-
-struct _GdkPixmapObject
-{
-  GdkDrawable parent_instance;
-  
-  GdkDrawable *impl;  /* window-system-specific delegate object */
-
-  gint depth;
-};
-
-struct _GdkPixmapObjectClass
-{
-  GdkDrawableClass parent_class;
-
-};
-
-GType      gdk_pixmap_get_type          (void) G_GNUC_CONST;
-
-/* Pixmaps
- */
-GdkPixmap* gdk_pixmap_new		(GdkDrawable *drawable,
-					 gint	      width,
-					 gint	      height,
-					 gint	      depth);
-GdkBitmap* gdk_bitmap_create_from_data	(GdkDrawable *drawable,
-					 const gchar *data,
-					 gint	      width,
-					 gint	      height);
-GdkPixmap* gdk_pixmap_create_from_data	(GdkDrawable    *drawable,
-					 const gchar 	*data,
-					 gint	     	 width,
-					 gint	     	 height,
-					 gint	         depth,
-					 const GdkColor *fg,
-					 const GdkColor *bg);
-
-GdkPixmap* gdk_pixmap_create_from_xpm            (GdkDrawable    *drawable,
-						  GdkBitmap     **mask,
-						  const GdkColor *transparent_color,
-						  const gchar    *filename);
-GdkPixmap* gdk_pixmap_colormap_create_from_xpm   (GdkDrawable    *drawable,
-						  GdkColormap    *colormap,
-						  GdkBitmap     **mask,
-						  const GdkColor *transparent_color,
-						  const gchar    *filename);
-GdkPixmap* gdk_pixmap_create_from_xpm_d          (GdkDrawable    *drawable,
-						  GdkBitmap     **mask,
-						  const GdkColor *transparent_color,
-						  gchar         **data);
-GdkPixmap* gdk_pixmap_colormap_create_from_xpm_d (GdkDrawable    *drawable,
-						  GdkColormap    *colormap,
-						  GdkBitmap     **mask,
-						  const GdkColor *transparent_color,
-						  gchar         **data);
-
-/* Functions to create/lookup pixmaps from their native equivalents
- */
-#ifndef GDK_MULTIHEAD_SAFE
-GdkPixmap*    gdk_pixmap_foreign_new (GdkNativeWindow anid);
-GdkPixmap*    gdk_pixmap_lookup      (GdkNativeWindow anid);
-#endif /* GDK_MULTIHEAD_SAFE */
-
-GdkPixmap*    gdk_pixmap_foreign_new_for_display (GdkDisplay      *display,
-						  GdkNativeWindow  anid);
-GdkPixmap*    gdk_pixmap_lookup_for_display      (GdkDisplay      *display,
-						  GdkNativeWindow  anid);
-GdkPixmap*    gdk_pixmap_foreign_new_for_screen  (GdkScreen       *screen,
-						  GdkNativeWindow  anid,
-						  gint             width,
-                                                  gint             height,
-                                                  gint             depth);
-
-#ifndef GDK_DISABLE_DEPRECATED
-#define gdk_bitmap_ref                 gdk_drawable_ref
-#define gdk_bitmap_unref               gdk_drawable_unref
-#define gdk_pixmap_ref                 gdk_drawable_ref
-#define gdk_pixmap_unref               gdk_drawable_unref
-#endif /* GDK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GDK_PIXMAP_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkprivate.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkprivate.h
deleted file mode 100644
index 29fc346e..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkprivate.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_PRIVATE_H__
-#define __GDK_PRIVATE_H__
-
-#include <gdk/gdktypes.h>
-#include <gdk/gdkevents.h>
-#include <gdk/gdkfont.h>
-#include <gdk/gdkgc.h>
-#include <gdk/gdkimage.h>
-#include <gdk/gdkregion.h>
-#include <gdk/gdkvisual.h>
-#include <gdk/gdkwindow.h>
-#ifdef USE_MEDIALIB
-#include <gdk/gdkmedialib.h>
-#endif
-
-G_BEGIN_DECLS
-
-#define GDK_PARENT_RELATIVE_BG ((GdkPixmap *)1L)
-#define GDK_NO_BG ((GdkPixmap *)2L)
-
-#define GDK_WINDOW_TYPE(d) (((GdkWindowObject*)(GDK_WINDOW (d)))->window_type)
-#define GDK_WINDOW_DESTROYED(d) (((GdkWindowObject*)(GDK_WINDOW (d)))->destroyed)
-
-void gdk_window_destroy_notify	     (GdkWindow *window);
-
-void gdk_synthesize_window_state (GdkWindow     *window,
-                                  GdkWindowState unset_flags,
-                                  GdkWindowState set_flags);
-
-/* Tests whether a pair of x,y may cause overflows when converted to Pango
- * units (multiplied by PANGO_SCALE).  We don't allow the entire range, leave
- * some space for additions afterwards, to be safe...
- */
-#define GDK_PANGO_UNITS_OVERFLOWS(x,y) (G_UNLIKELY ( \
-	(y) >= PANGO_PIXELS (G_MAXINT-PANGO_SCALE)/2 || \
-	(x) >= PANGO_PIXELS (G_MAXINT-PANGO_SCALE)/2 || \
-	(y) <=-PANGO_PIXELS (G_MAXINT-PANGO_SCALE)/2 || \
-	(x) <=-PANGO_PIXELS (G_MAXINT-PANGO_SCALE)/2))
-
-G_END_DECLS
-
-#endif /* __GDK_PRIVATE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkproperty.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkproperty.h
deleted file mode 100644
index 81b6c540..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkproperty.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_PROPERTY_H__
-#define __GDK_PROPERTY_H__
-
-#include <gdk/gdktypes.h>
-
-G_BEGIN_DECLS
-
-typedef enum
-{
-  GDK_PROP_MODE_REPLACE,
-  GDK_PROP_MODE_PREPEND,
-  GDK_PROP_MODE_APPEND
-} GdkPropMode;
-
-GdkAtom gdk_atom_intern (const gchar *atom_name,
-			 gboolean     only_if_exists);
-GdkAtom gdk_atom_intern_static_string (const gchar *atom_name);
-gchar*  gdk_atom_name   (GdkAtom      atom);
-
-gboolean gdk_property_get    (GdkWindow     *window,
-			      GdkAtom        property,
-			      GdkAtom        type,
-			      gulong         offset,
-			      gulong         length,
-			      gint           pdelete,
-			      GdkAtom       *actual_property_type,
-			      gint          *actual_format,
-			      gint          *actual_length,
-			      guchar       **data);
-void     gdk_property_change (GdkWindow     *window,
-			      GdkAtom        property,
-			      GdkAtom        type,
-			      gint           format,
-			      GdkPropMode    mode,
-			      const guchar  *data,
-			      gint           nelements);
-void     gdk_property_delete (GdkWindow     *window,
-			      GdkAtom        property);
-#ifndef GDK_MULTIHEAD_SAFE
-gint gdk_text_property_to_text_list (GdkAtom        encoding,
-				     gint           format,
-				     const guchar  *text,
-				     gint           length,
-				     gchar       ***list);
-gint gdk_text_property_to_utf8_list (GdkAtom        encoding,
-				     gint           format,
-				     const guchar  *text,
-				     gint           length,
-				     gchar       ***list);
-gboolean gdk_utf8_to_compound_text (const gchar *str,
-				    GdkAtom     *encoding,
-				    gint        *format,
-				    guchar     **ctext,
-				    gint        *length);
-gint gdk_string_to_compound_text    (const gchar   *str,
-				     GdkAtom       *encoding,
-				     gint          *format,
-				     guchar       **ctext,
-				     gint          *length);
-#endif
-
-gint gdk_text_property_to_text_list_for_display (GdkDisplay     *display,
-						 GdkAtom         encoding,
-						 gint            format,
-						 const guchar   *text,
-						 gint            length,
-						 gchar        ***list);
-gint gdk_text_property_to_utf8_list_for_display (GdkDisplay     *display,
-						 GdkAtom         encoding,
-						 gint            format,
-						 const guchar   *text,
-						 gint            length,
-						 gchar        ***list);
-  
-gchar   *gdk_utf8_to_string_target   (const gchar *str);
-gint     gdk_string_to_compound_text_for_display (GdkDisplay   *display,
-						  const gchar  *str,
-						  GdkAtom      *encoding,
-						  gint         *format,
-						  guchar      **ctext,
-						  gint         *length);
-gboolean gdk_utf8_to_compound_text_for_display   (GdkDisplay   *display,
-						  const gchar  *str,
-						  GdkAtom      *encoding,
-						  gint         *format,
-						  guchar      **ctext,
-						  gint         *length);
-
-void gdk_free_text_list             (gchar        **list);
-void gdk_free_compound_text         (guchar        *ctext);
-
-G_END_DECLS
-
-#endif /* __GDK_PROPERTY_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkregion.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkregion.h
deleted file mode 100644
index ce31ba03..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkregion.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_REGION_H__
-#define __GDK_REGION_H__
-
-#include <gdk/gdktypes.h>
-
-G_BEGIN_DECLS
-
-/* GC fill rule for polygons
- *  EvenOddRule
- *  WindingRule
- */
-typedef enum
-{
-  GDK_EVEN_ODD_RULE,
-  GDK_WINDING_RULE
-} GdkFillRule;
-
-/* Types of overlapping between a rectangle and a region
- * GDK_OVERLAP_RECTANGLE_IN: rectangle is in region
- * GDK_OVERLAP_RECTANGLE_OUT: rectangle in not in region
- * GDK_OVERLAP_RECTANGLE_PART: rectangle in partially in region
- */
-typedef enum
-{
-  GDK_OVERLAP_RECTANGLE_IN,
-  GDK_OVERLAP_RECTANGLE_OUT,
-  GDK_OVERLAP_RECTANGLE_PART
-} GdkOverlapType;
-
-typedef void (*GdkSpanFunc) (GdkSpan *span,
-			     gpointer data);
-
-GdkRegion *gdk_region_new       (void);
-GdkRegion *gdk_region_polygon   (GdkPoint     *points,
-				 gint          npoints,
-				 GdkFillRule   fill_rule);
-GdkRegion *gdk_region_copy      (GdkRegion    *region);
-GdkRegion *gdk_region_rectangle (GdkRectangle *rectangle);
-void       gdk_region_destroy   (GdkRegion    *region);
-
-void	       gdk_region_get_clipbox    (GdkRegion     *region,
-                                          GdkRectangle  *rectangle);
-void           gdk_region_get_rectangles (GdkRegion     *region,
-                                          GdkRectangle **rectangles,
-                                          gint          *n_rectangles);
-
-gboolean       gdk_region_empty    (GdkRegion    *region);
-gboolean       gdk_region_equal    (GdkRegion    *region1,
-				    GdkRegion    *region2);
-gboolean       gdk_region_point_in (GdkRegion    *region,
-				    int           x,
-				    int           y);
-GdkOverlapType gdk_region_rect_in  (GdkRegion    *region,
-				    GdkRectangle *rectangle);
-
-void gdk_region_offset          (GdkRegion    *region,
-				 gint          dx,
-				 gint          dy);
-void gdk_region_shrink          (GdkRegion    *region,
-				 gint          dx,
-				 gint          dy);
-void gdk_region_union_with_rect (GdkRegion    *region,
-				 GdkRectangle *rect);
-void gdk_region_intersect       (GdkRegion    *source1,
-				 GdkRegion    *source2);
-void gdk_region_union           (GdkRegion    *source1,
-			 	 GdkRegion    *source2);
-void gdk_region_subtract        (GdkRegion    *source1,
-				 GdkRegion    *source2);
-void gdk_region_xor             (GdkRegion    *source1,
-				 GdkRegion    *source2);
-
-void gdk_region_spans_intersect_foreach (GdkRegion   *region,
-					 GdkSpan     *spans,
-					 int          n_spans,
-					 gboolean     sorted,
-					 GdkSpanFunc  function,
-					 gpointer     data);
-
-G_END_DECLS
-
-#endif /* __GDK_REGION_H__ */
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkrgb.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkrgb.h
deleted file mode 100644
index f0633833..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkrgb.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_RGB_H__
-#define __GDK_RGB_H__
-
-#include <gdk/gdktypes.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GdkRgbCmap GdkRgbCmap;
-
-struct _GdkRgbCmap {
-  guint32 colors[256];
-  gint n_colors;
-
-  /*< private >*/
-  GSList *info_list;
-};
-
-#ifndef GDK_DISABLE_DEPRECATED
-void gdk_rgb_init (void);
-
-gulong gdk_rgb_xpixel_from_rgb   (guint32      rgb) G_GNUC_CONST;
-void   gdk_rgb_gc_set_foreground (GdkGC       *gc,
-				  guint32      rgb);
-void   gdk_rgb_gc_set_background (GdkGC       *gc,
-				  guint32      rgb);
-#define gdk_rgb_get_cmap               gdk_rgb_get_colormap
-#endif /* GDK_DISABLE_DEPRECATED */
-
-void   gdk_rgb_find_color        (GdkColormap *colormap,
-				  GdkColor    *color);
-
-typedef enum
-{
-  GDK_RGB_DITHER_NONE,
-  GDK_RGB_DITHER_NORMAL,
-  GDK_RGB_DITHER_MAX
-} GdkRgbDither;
-
-void        gdk_draw_rgb_image              (GdkDrawable  *drawable,
-					     GdkGC        *gc,
-					     gint          x,
-					     gint          y,
-					     gint          width,
-					     gint          height,
-					     GdkRgbDither  dith,
-					     guchar       *rgb_buf,
-					     gint          rowstride);
-void        gdk_draw_rgb_image_dithalign    (GdkDrawable  *drawable,
-					     GdkGC        *gc,
-					     gint          x,
-					     gint          y,
-					     gint          width,
-					     gint          height,
-					     GdkRgbDither  dith,
-					     guchar       *rgb_buf,
-					     gint          rowstride,
-					     gint          xdith,
-					     gint          ydith);
-void        gdk_draw_rgb_32_image           (GdkDrawable  *drawable,
-					     GdkGC        *gc,
-					     gint          x,
-					     gint          y,
-					     gint          width,
-					     gint          height,
-					     GdkRgbDither  dith,
-					     guchar       *buf,
-					     gint          rowstride);
-void        gdk_draw_rgb_32_image_dithalign (GdkDrawable  *drawable,
-					     GdkGC        *gc,
-					     gint          x,
-					     gint          y,
-					     gint          width,
-					     gint          height,
-					     GdkRgbDither  dith,
-					     guchar       *buf,
-					     gint          rowstride,
-					     gint          xdith,
-					     gint          ydith);
-void        gdk_draw_gray_image             (GdkDrawable  *drawable,
-					     GdkGC        *gc,
-					     gint          x,
-					     gint          y,
-					     gint          width,
-					     gint          height,
-					     GdkRgbDither  dith,
-					     guchar       *buf,
-					     gint          rowstride);
-void        gdk_draw_indexed_image          (GdkDrawable  *drawable,
-					     GdkGC        *gc,
-					     gint          x,
-					     gint          y,
-					     gint          width,
-					     gint          height,
-					     GdkRgbDither  dith,
-					     guchar       *buf,
-					     gint          rowstride,
-					     GdkRgbCmap   *cmap);
-GdkRgbCmap *gdk_rgb_cmap_new                (guint32      *colors,
-					     gint          n_colors);
-void        gdk_rgb_cmap_free               (GdkRgbCmap   *cmap);
-
-void     gdk_rgb_set_verbose (gboolean verbose);
-
-/* experimental colormap stuff */
-void gdk_rgb_set_install    (gboolean install);
-void gdk_rgb_set_min_colors (gint     min_colors);
-
-#ifndef GDK_MULTIHEAD_SAFE
-GdkColormap *gdk_rgb_get_colormap (void);
-GdkVisual *  gdk_rgb_get_visual   (void);
-gboolean     gdk_rgb_ditherable   (void);
-gboolean     gdk_rgb_colormap_ditherable (GdkColormap *cmap);
-#endif
-
-G_END_DECLS
-
-
-#endif /* __GDK_RGB_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkscreen.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkscreen.h
deleted file mode 100644
index 7ff92019..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkscreen.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * gdkscreen.h
- * 
- * Copyright 2001 Sun Microsystems Inc. 
- *
- * Erwann Chenede <erwann.chenede@sun.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 __GDK_SCREEN_H__
-#define __GDK_SCREEN_H__
-
-#include <cairo.h>
-#include "gdk/gdktypes.h"
-#include "gdk/gdkdisplay.h"
-
-G_BEGIN_DECLS
-
-typedef struct _GdkScreenClass GdkScreenClass;
-
-#define GDK_TYPE_SCREEN            (gdk_screen_get_type ())
-#define GDK_SCREEN(object)         (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_SCREEN, GdkScreen))
-#define GDK_SCREEN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_SCREEN, GdkScreenClass))
-#define GDK_IS_SCREEN(object)      (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_SCREEN))
-#define GDK_IS_SCREEN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_SCREEN))
-#define GDK_SCREEN_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_SCREEN, GdkScreenClass))
-
-struct _GdkScreen
-{
-  GObject parent_instance;
-
-  guint closed : 1;
-
-  GdkGC *normal_gcs[32];
-  GdkGC *exposure_gcs[32];
-
-  cairo_font_options_t *font_options;
-  double resolution;		/* pixels/points scale factor for fonts */
-};
-
-struct _GdkScreenClass
-{
-  GObjectClass parent_class;
-
-  void (*size_changed) (GdkScreen *screen);
-  void (*composited_changed) (GdkScreen *screen);
-};
-
-GType        gdk_screen_get_type              (void) G_GNUC_CONST;
-GdkColormap *gdk_screen_get_default_colormap  (GdkScreen   *screen);
-void         gdk_screen_set_default_colormap  (GdkScreen   *screen,
-					       GdkColormap *colormap);
-GdkColormap* gdk_screen_get_system_colormap   (GdkScreen   *screen);
-GdkVisual*   gdk_screen_get_system_visual     (GdkScreen   *screen);
-GdkColormap *gdk_screen_get_rgb_colormap      (GdkScreen   *screen);
-GdkVisual *  gdk_screen_get_rgb_visual        (GdkScreen   *screen);
-GdkColormap *gdk_screen_get_rgba_colormap     (GdkScreen   *screen);
-GdkVisual *  gdk_screen_get_rgba_visual       (GdkScreen   *screen);
-gboolean     gdk_screen_is_composited	      (GdkScreen   *screen);
-
-GdkWindow *  gdk_screen_get_root_window       (GdkScreen   *screen);
-GdkDisplay * gdk_screen_get_display           (GdkScreen   *screen);
-gint         gdk_screen_get_number            (GdkScreen   *screen);
-gint         gdk_screen_get_width             (GdkScreen   *screen);
-gint         gdk_screen_get_height            (GdkScreen   *screen);
-gint         gdk_screen_get_width_mm          (GdkScreen   *screen);
-gint         gdk_screen_get_height_mm         (GdkScreen   *screen);
-
-GList *      gdk_screen_list_visuals          (GdkScreen   *screen);
-GList *      gdk_screen_get_toplevel_windows  (GdkScreen   *screen);
-gchar *      gdk_screen_make_display_name     (GdkScreen   *screen);
-
-gint          gdk_screen_get_n_monitors        (GdkScreen *screen);
-void          gdk_screen_get_monitor_geometry  (GdkScreen *screen,
-						gint       monitor_num,
-						GdkRectangle *dest);
-gint          gdk_screen_get_monitor_at_point  (GdkScreen *screen,
-						gint       x,
-						gint       y);
-gint          gdk_screen_get_monitor_at_window (GdkScreen *screen,
-						GdkWindow *window);
-
-void          gdk_screen_broadcast_client_message  (GdkScreen       *screen,
-						    GdkEvent        *event);
-
-GdkScreen *gdk_screen_get_default (void);
-
-gboolean   gdk_screen_get_setting (GdkScreen   *screen,
-				   const gchar *name,
-				   GValue      *value);
-
-void                        gdk_screen_set_font_options (GdkScreen                  *screen,
-							 const cairo_font_options_t *options);
-const cairo_font_options_t *gdk_screen_get_font_options (GdkScreen                  *screen);
-
-void    gdk_screen_set_resolution (GdkScreen *screen,
-				   gdouble    dpi);
-gdouble gdk_screen_get_resolution (GdkScreen *screen);
-
-GdkWindow *gdk_screen_get_active_window (GdkScreen *screen);
-GList     *gdk_screen_get_window_stack  (GdkScreen *screen);
-
-G_END_DECLS
-
-#endif				/* __GDK_SCREEN_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkselection.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkselection.h
deleted file mode 100644
index 1787c8e5..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkselection.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_SELECTION_H__
-#define __GDK_SELECTION_H__
-
-#include <gdk/gdktypes.h>
-
-G_BEGIN_DECLS
-
-/* Predefined atoms relating to selections. In general, one will need to use
- * gdk_intern_atom
- */
-#define GDK_SELECTION_PRIMARY 		_GDK_MAKE_ATOM (1)
-#define GDK_SELECTION_SECONDARY 	_GDK_MAKE_ATOM (2)
-#define GDK_SELECTION_CLIPBOARD 	_GDK_MAKE_ATOM (69)
-#define GDK_TARGET_BITMAP 		_GDK_MAKE_ATOM (5)
-#define GDK_TARGET_COLORMAP 		_GDK_MAKE_ATOM (7)
-#define GDK_TARGET_DRAWABLE 		_GDK_MAKE_ATOM (17)
-#define GDK_TARGET_PIXMAP 		_GDK_MAKE_ATOM (20)
-#define GDK_TARGET_STRING 		_GDK_MAKE_ATOM (31)
-#define GDK_SELECTION_TYPE_ATOM 	_GDK_MAKE_ATOM (4)
-#define GDK_SELECTION_TYPE_BITMAP 	_GDK_MAKE_ATOM (5)
-#define GDK_SELECTION_TYPE_COLORMAP 	_GDK_MAKE_ATOM (7)
-#define GDK_SELECTION_TYPE_DRAWABLE 	_GDK_MAKE_ATOM (17)
-#define GDK_SELECTION_TYPE_INTEGER 	_GDK_MAKE_ATOM (19)
-#define GDK_SELECTION_TYPE_PIXMAP 	_GDK_MAKE_ATOM (20)
-#define GDK_SELECTION_TYPE_WINDOW 	_GDK_MAKE_ATOM (33)
-#define GDK_SELECTION_TYPE_STRING 	_GDK_MAKE_ATOM (31)
-
-#ifndef GDK_DISABLE_DEPRECATED
-
-typedef GdkAtom GdkSelection;
-typedef GdkAtom GdkTarget;
-typedef GdkAtom GdkSelectionType;
-
-#endif /* GDK_DISABLE_DEPRECATED */
-
-/* Selections
- */
-
-#ifndef GDK_MULTIHEAD_SAFE
-gboolean   gdk_selection_owner_set (GdkWindow	 *owner,
-				    GdkAtom	  selection,
-				    guint32	  time_,
-				    gboolean      send_event);
-GdkWindow* gdk_selection_owner_get (GdkAtom	  selection);
-#endif/* GDK_MULTIHEAD_SAFE */
-
-gboolean   gdk_selection_owner_set_for_display (GdkDisplay *display,
-						GdkWindow  *owner,
-						GdkAtom     selection,
-						guint32     time_,
-						gboolean    send_event);
-GdkWindow *gdk_selection_owner_get_for_display (GdkDisplay *display,
-						GdkAtom     selection);
-
-void	   gdk_selection_convert   (GdkWindow	 *requestor,
-				    GdkAtom	  selection,
-				    GdkAtom	  target,
-				    guint32	  time_);
-gboolean   gdk_selection_property_get (GdkWindow  *requestor,
-				       guchar	 **data,
-				       GdkAtom	  *prop_type,
-				       gint	  *prop_format);
-
-#ifndef GDK_MULTIHEAD_SAFE
-void	   gdk_selection_send_notify (guint32	    requestor,
-				      GdkAtom	    selection,
-				      GdkAtom	    target,
-				      GdkAtom	    property,
-				      guint32	    time_);
-#endif /* GDK_MULTIHEAD_SAFE */
-
-void       gdk_selection_send_notify_for_display (GdkDisplay *display,
-						  guint32     requestor,
-						  GdkAtom     selection,
-						  GdkAtom     target,
-						  GdkAtom     property,
-						  guint32     time_);
-
-G_END_DECLS
-
-#endif /* __GDK_SELECTION_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkspawn.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkspawn.h
deleted file mode 100644
index 72901010..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkspawn.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2003 Sun Microsystems 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.
- *
- * Authors: Mark McLoughlin <mark@skynet.ie>
- */
-
-#ifndef __GDK_SPAWN_H__
-#define __GDK_SPAWN_H__
-
-#include <gdk/gdkscreen.h>
-#include <glib/gspawn.h>
-
-G_BEGIN_DECLS
-
-gboolean gdk_spawn_on_screen              (GdkScreen             *screen,
-					   const gchar           *working_directory,
-					   gchar                **argv,
-					   gchar                **envp,
-					   GSpawnFlags            flags,
-					   GSpawnChildSetupFunc   child_setup,
-					   gpointer               user_data,
-					   gint                  *child_pid,
-					   GError               **error);
-
-gboolean gdk_spawn_on_screen_with_pipes   (GdkScreen             *screen,
-					   const gchar           *working_directory,
-					   gchar                **argv,
-					   gchar                **envp,
-					   GSpawnFlags            flags,
-					   GSpawnChildSetupFunc   child_setup,
-					   gpointer               user_data,
-					   gint                  *child_pid,
-					   gint                  *standard_input,
-					   gint                  *standard_output,
-					   gint                  *standard_error,
-					   GError               **error);
-
-gboolean gdk_spawn_command_line_on_screen (GdkScreen             *screen,
-					   const gchar           *command_line,
-					   GError               **error);
-
-G_END_DECLS
-
-#endif /* __GDK_SPAWN_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdktypes.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdktypes.h
deleted file mode 100644
index 648bb40e..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdktypes.h
+++ /dev/null
@@ -1,212 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_TYPES_H__
-#define __GDK_TYPES_H__
-
-/* GDK uses "glib". (And so does GTK).
- */
-#include <glib.h>
-#include <pango/pango.h>
-#include <glib-object.h>
-
-#ifdef G_OS_WIN32
-#  ifdef GDK_COMPILATION
-#    define GDKVAR __declspec(dllexport)
-#  else
-#    define GDKVAR extern __declspec(dllimport)
-#  endif
-#else
-#  define GDKVAR extern
-#endif
-
-/* The system specific file gdkconfig.h contains such configuration
- * settings that are needed not only when compiling GDK (or GTK)
- * itself, but also occasionally when compiling programs that use GDK
- * (or GTK). One such setting is what windowing API backend is in use.
- */
-#include <gdkconfig.h>
-
-/* some common magic values */
-#define GDK_CURRENT_TIME     0L
-#define GDK_PARENT_RELATIVE  1L
-
-
-
-G_BEGIN_DECLS
-
-
-/* Type definitions for the basic structures.
- */
-typedef struct _GdkPoint	      GdkPoint;
-typedef struct _GdkRectangle	      GdkRectangle;
-typedef struct _GdkSegment	      GdkSegment;
-typedef struct _GdkSpan	              GdkSpan;
-
-/*
- * Note that on some platforms the wchar_t type
- * is not the same as GdkWChar. For instance
- * on Win32, wchar_t is unsigned short.
- */
-typedef guint32			    GdkWChar;
-
-typedef struct _GdkAtom            *GdkAtom;
-
-#define GDK_ATOM_TO_POINTER(atom) (atom)
-#define GDK_POINTER_TO_ATOM(ptr)  ((GdkAtom)(ptr))
-
-#define _GDK_MAKE_ATOM(val) ((GdkAtom)GUINT_TO_POINTER(val))
-#define GDK_NONE            _GDK_MAKE_ATOM (0)
-
-#ifdef GDK_NATIVE_WINDOW_POINTER
-typedef gpointer GdkNativeWindow;
-#else
-typedef guint32 GdkNativeWindow;
-#endif
- 
-/* Forward declarations of commonly used types
- */
-typedef struct _GdkColor	      GdkColor;
-typedef struct _GdkColormap	      GdkColormap;
-typedef struct _GdkCursor	      GdkCursor;
-typedef struct _GdkFont		      GdkFont;
-typedef struct _GdkGC                 GdkGC;
-typedef struct _GdkImage              GdkImage;
-typedef struct _GdkRegion             GdkRegion;
-typedef struct _GdkVisual             GdkVisual;
-
-typedef struct _GdkDrawable           GdkDrawable;
-typedef struct _GdkDrawable           GdkBitmap;
-typedef struct _GdkDrawable           GdkPixmap;
-typedef struct _GdkDrawable           GdkWindow;
-typedef struct _GdkDisplay	      GdkDisplay;
-typedef struct _GdkScreen	      GdkScreen;
-
-typedef enum
-{
-  GDK_LSB_FIRST,
-  GDK_MSB_FIRST
-} GdkByteOrder;
-
-/* Types of modifiers.
- */
-typedef enum
-{
-  GDK_SHIFT_MASK    = 1 << 0,
-  GDK_LOCK_MASK	    = 1 << 1,
-  GDK_CONTROL_MASK  = 1 << 2,
-  GDK_MOD1_MASK	    = 1 << 3,
-  GDK_MOD2_MASK	    = 1 << 4,
-  GDK_MOD3_MASK	    = 1 << 5,
-  GDK_MOD4_MASK	    = 1 << 6,
-  GDK_MOD5_MASK	    = 1 << 7,
-  GDK_BUTTON1_MASK  = 1 << 8,
-  GDK_BUTTON2_MASK  = 1 << 9,
-  GDK_BUTTON3_MASK  = 1 << 10,
-  GDK_BUTTON4_MASK  = 1 << 11,
-  GDK_BUTTON5_MASK  = 1 << 12,
-
-  /* The next few modifiers are used by XKB, so we skip to the end.
-   * Bits 15 - 25 are currently unused. Bit 29 is used internally.
-   */
-  
-  GDK_SUPER_MASK    = 1 << 26,
-  GDK_HYPER_MASK    = 1 << 27,
-  GDK_META_MASK     = 1 << 28,
-  
-  GDK_RELEASE_MASK  = 1 << 30,
-
-  GDK_MODIFIER_MASK = 0x5c001fff
-} GdkModifierType;
-
-typedef enum
-{
-  GDK_INPUT_READ       = 1 << 0,
-  GDK_INPUT_WRITE      = 1 << 1,
-  GDK_INPUT_EXCEPTION  = 1 << 2
-} GdkInputCondition;
-
-typedef enum
-{
-  GDK_OK	  = 0,
-  GDK_ERROR	  = -1,
-  GDK_ERROR_PARAM = -2,
-  GDK_ERROR_FILE  = -3,
-  GDK_ERROR_MEM	  = -4
-} GdkStatus;
-
-/* We define specific numeric values for these constants,
- * since old application code may depend on them matching the X values
- * We don't actually depend on the matchup ourselves.
- */
-typedef enum
-{
-  GDK_GRAB_SUCCESS         = 0,
-  GDK_GRAB_ALREADY_GRABBED = 1,
-  GDK_GRAB_INVALID_TIME    = 2,
-  GDK_GRAB_NOT_VIEWABLE    = 3,
-  GDK_GRAB_FROZEN          = 4
-} GdkGrabStatus;
-
-typedef void (*GdkInputFunction) (gpointer	    data,
-				  gint		    source,
-				  GdkInputCondition condition);
-
-typedef void (*GdkDestroyNotify) (gpointer data);
-
-struct _GdkPoint
-{
-  gint x;
-  gint y;
-};
-
-struct _GdkRectangle
-{
-  gint x;
-  gint y;
-  gint width;
-  gint height;
-};
-
-struct _GdkSegment
-{
-  gint x1;
-  gint y1;
-  gint x2;
-  gint y2;
-};
-
-struct _GdkSpan
-{
-  gint x;
-  gint y;
-  gint width;
-};
-
-G_END_DECLS
-
-
-#endif /* __GDK_TYPES_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkvisual.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkvisual.h
deleted file mode 100644
index e49439f4..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkvisual.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_VISUAL_H__
-#define __GDK_VISUAL_H__
-
-#include <gdk/gdktypes.h>
-
-G_BEGIN_DECLS
-
-#define GDK_TYPE_VISUAL              (gdk_visual_get_type ())
-#define GDK_VISUAL(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_VISUAL, GdkVisual))
-#define GDK_VISUAL_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_VISUAL, GdkVisualClass))
-#define GDK_IS_VISUAL(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_VISUAL))
-#define GDK_IS_VISUAL_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_VISUAL))
-#define GDK_VISUAL_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_VISUAL, GdkVisualClass))
-
-typedef struct _GdkVisualClass    GdkVisualClass;
-
-/* Types of visuals.
- *   StaticGray:
- *   Grayscale:
- *   StaticColor:
- *   PseudoColor:
- *   TrueColor:
- *   DirectColor:
- */
-typedef enum
-{
-  GDK_VISUAL_STATIC_GRAY,
-  GDK_VISUAL_GRAYSCALE,
-  GDK_VISUAL_STATIC_COLOR,
-  GDK_VISUAL_PSEUDO_COLOR,
-  GDK_VISUAL_TRUE_COLOR,
-  GDK_VISUAL_DIRECT_COLOR
-} GdkVisualType;
-
-/* The visual type.
- *   "type" is the type of visual this is (PseudoColor, TrueColor, etc).
- *   "depth" is the bit depth of this visual.
- *   "colormap_size" is the size of a colormap for this visual.
- *   "bits_per_rgb" is the number of significant bits per red, green and blue.
- *  The red, green and blue masks, shifts and precisions refer
- *   to value needed to calculate pixel values in TrueColor and DirectColor
- *   visuals. The "mask" is the significant bits within the pixel. The
- *   "shift" is the number of bits left we must shift a primary for it
- *   to be in position (according to the "mask"). "prec" refers to how
- *   much precision the pixel value contains for a particular primary.
- */
-struct _GdkVisual
-{
-  GObject parent_instance;
-  
-  GdkVisualType type;
-  gint depth;
-  GdkByteOrder byte_order;
-  gint colormap_size;
-  gint bits_per_rgb;
-
-  guint32 red_mask;
-  gint red_shift;
-  gint red_prec;
-
-  guint32 green_mask;
-  gint green_shift;
-  gint green_prec;
-
-  guint32 blue_mask;
-  gint blue_shift;
-  gint blue_prec;
-};
-
-GType         gdk_visual_get_type            (void) G_GNUC_CONST;
-
-#ifndef GDK_MULTIHEAD_SAFE
-gint	      gdk_visual_get_best_depth	     (void);
-GdkVisualType gdk_visual_get_best_type	     (void);
-GdkVisual*    gdk_visual_get_system	     (void);
-GdkVisual*    gdk_visual_get_best	     (void);
-GdkVisual*    gdk_visual_get_best_with_depth (gint	     depth);
-GdkVisual*    gdk_visual_get_best_with_type  (GdkVisualType  visual_type);
-GdkVisual*    gdk_visual_get_best_with_both  (gint	     depth,
-					      GdkVisualType  visual_type);
-
-void gdk_query_depths	    (gint	    **depths,
-			     gint	     *count);
-void gdk_query_visual_types (GdkVisualType  **visual_types,
-			     gint	     *count);
-
-GList* gdk_list_visuals (void);
-#endif
-
-GdkScreen *gdk_visual_get_screen (GdkVisual *visual);
-
-#ifndef GDK_DISABLE_DEPRECATED
-#define gdk_visual_ref(v) g_object_ref(v)
-#define gdk_visual_unref(v) g_object_unref(v)
-#endif
-
-G_END_DECLS
-
-#endif /* __GDK_VISUAL_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkwindow.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkwindow.h
deleted file mode 100644
index 3e169c43..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkwindow.h
+++ /dev/null
@@ -1,657 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_WINDOW_H__
-#define __GDK_WINDOW_H__
-
-#include <gdk/gdkdrawable.h>
-#include <gdk/gdktypes.h>
-#include <gdk/gdkevents.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GdkGeometry           GdkGeometry;
-typedef struct _GdkWindowAttr	      GdkWindowAttr;
-typedef struct _GdkPointerHooks	      GdkPointerHooks;
-
-/* Classes of windows.
- *   InputOutput: Almost every window should be of this type. Such windows
- *		  receive events and are also displayed on screen.
- *   InputOnly: Used only in special circumstances when events need to be
- *		stolen from another window or windows. Input only windows
- *		have no visible output, so they are handy for placing over
- *		top of a group of windows in order to grab the events (or
- *		filter the events) from those windows.
- */
-typedef enum
-{
-  GDK_INPUT_OUTPUT,
-  GDK_INPUT_ONLY
-} GdkWindowClass;
-
-/* Types of windows.
- *   Root: There is only 1 root window and it is initialized
- *	   at startup. Creating a window of type GDK_WINDOW_ROOT
- *	   is an error.
- *   Toplevel: Windows which interact with the window manager.
- *   Child: Windows which are children of some other type of window.
- *	    (Any other type of window). Most windows are child windows.
- *   Dialog: A special kind of toplevel window which interacts with
- *	     the window manager slightly differently than a regular
- *	     toplevel window. Dialog windows should be used for any
- *	     transient window.
- *   Foreign: A window that actually belongs to another application
- */
-typedef enum
-{
-  GDK_WINDOW_ROOT,
-  GDK_WINDOW_TOPLEVEL,
-  GDK_WINDOW_CHILD,
-  GDK_WINDOW_DIALOG,
-  GDK_WINDOW_TEMP,
-  GDK_WINDOW_FOREIGN
-} GdkWindowType;
-
-/* Window attribute mask values.
- *   GDK_WA_TITLE: The "title" field is valid.
- *   GDK_WA_X: The "x" field is valid.
- *   GDK_WA_Y: The "y" field is valid.
- *   GDK_WA_CURSOR: The "cursor" field is valid.
- *   GDK_WA_COLORMAP: The "colormap" field is valid.
- *   GDK_WA_VISUAL: The "visual" field is valid.
- */
-typedef enum
-{
-  GDK_WA_TITLE	   = 1 << 1,
-  GDK_WA_X	   = 1 << 2,
-  GDK_WA_Y	   = 1 << 3,
-  GDK_WA_CURSOR	   = 1 << 4,
-  GDK_WA_COLORMAP  = 1 << 5,
-  GDK_WA_VISUAL	   = 1 << 6,
-  GDK_WA_WMCLASS   = 1 << 7,
-  GDK_WA_NOREDIR   = 1 << 8,
-  GDK_WA_TYPE_HINT = 1 << 9
-} GdkWindowAttributesType;
-
-/* Size restriction enumeration.
- */
-typedef enum
-{
-  GDK_HINT_POS	       = 1 << 0,
-  GDK_HINT_MIN_SIZE    = 1 << 1,
-  GDK_HINT_MAX_SIZE    = 1 << 2,
-  GDK_HINT_BASE_SIZE   = 1 << 3,
-  GDK_HINT_ASPECT      = 1 << 4,
-  GDK_HINT_RESIZE_INC  = 1 << 5,
-  GDK_HINT_WIN_GRAVITY = 1 << 6,
-  GDK_HINT_USER_POS    = 1 << 7,
-  GDK_HINT_USER_SIZE   = 1 << 8
-} GdkWindowHints;
-
-
-/* Window type hints.
- * These are hints for the window manager that indicate
- * what type of function the window has. The window manager
- * can use this when determining decoration and behaviour
- * of the window. The hint must be set before mapping the
- * window.
- *
- *   Normal: Normal toplevel window
- *   Dialog: Dialog window
- *   Menu: Window used to implement a menu.
- *   Toolbar: Window used to implement toolbars.
- */
-typedef enum
-{
-  GDK_WINDOW_TYPE_HINT_NORMAL,
-  GDK_WINDOW_TYPE_HINT_DIALOG,
-  GDK_WINDOW_TYPE_HINT_MENU,		/* Torn off menu */
-  GDK_WINDOW_TYPE_HINT_TOOLBAR,
-  GDK_WINDOW_TYPE_HINT_SPLASHSCREEN,
-  GDK_WINDOW_TYPE_HINT_UTILITY,
-  GDK_WINDOW_TYPE_HINT_DOCK,
-  GDK_WINDOW_TYPE_HINT_DESKTOP,
-  GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU,	/* A drop down menu (from a menubar) */
-  GDK_WINDOW_TYPE_HINT_POPUP_MENU,	/* A popup menu (from right-click) */
-  GDK_WINDOW_TYPE_HINT_TOOLTIP,
-  GDK_WINDOW_TYPE_HINT_NOTIFICATION,
-  GDK_WINDOW_TYPE_HINT_COMBO,
-  GDK_WINDOW_TYPE_HINT_DND
-} GdkWindowTypeHint;
-
-/* The next two enumeration values current match the
- * Motif constants. If this is changed, the implementation
- * of gdk_window_set_decorations/gdk_window_set_functions
- * will need to change as well.
- */
-typedef enum
-{
-  GDK_DECOR_ALL		= 1 << 0,
-  GDK_DECOR_BORDER	= 1 << 1,
-  GDK_DECOR_RESIZEH	= 1 << 2,
-  GDK_DECOR_TITLE	= 1 << 3,
-  GDK_DECOR_MENU	= 1 << 4,
-  GDK_DECOR_MINIMIZE	= 1 << 5,
-  GDK_DECOR_MAXIMIZE	= 1 << 6
-} GdkWMDecoration;
-
-typedef enum
-{
-  GDK_FUNC_ALL		= 1 << 0,
-  GDK_FUNC_RESIZE	= 1 << 1,
-  GDK_FUNC_MOVE		= 1 << 2,
-  GDK_FUNC_MINIMIZE	= 1 << 3,
-  GDK_FUNC_MAXIMIZE	= 1 << 4,
-  GDK_FUNC_CLOSE	= 1 << 5
-} GdkWMFunction;
-
-/* Currently, these are the same values numerically as in the
- * X protocol. If you change that, gdkwindow-x11.c/gdk_window_set_geometry_hints()
- * will need fixing.
- */
-typedef enum
-{
-  GDK_GRAVITY_NORTH_WEST = 1,
-  GDK_GRAVITY_NORTH,
-  GDK_GRAVITY_NORTH_EAST,
-  GDK_GRAVITY_WEST,
-  GDK_GRAVITY_CENTER,
-  GDK_GRAVITY_EAST,
-  GDK_GRAVITY_SOUTH_WEST,
-  GDK_GRAVITY_SOUTH,
-  GDK_GRAVITY_SOUTH_EAST,
-  GDK_GRAVITY_STATIC
-} GdkGravity;
-
-
-typedef enum
-{
-  GDK_WINDOW_EDGE_NORTH_WEST,
-  GDK_WINDOW_EDGE_NORTH,
-  GDK_WINDOW_EDGE_NORTH_EAST,
-  GDK_WINDOW_EDGE_WEST,
-  GDK_WINDOW_EDGE_EAST,
-  GDK_WINDOW_EDGE_SOUTH_WEST,
-  GDK_WINDOW_EDGE_SOUTH,
-  GDK_WINDOW_EDGE_SOUTH_EAST  
-} GdkWindowEdge;
-
-struct _GdkWindowAttr
-{
-  gchar *title;
-  gint event_mask;
-  gint x, y;
-  gint width;
-  gint height;
-  GdkWindowClass wclass;
-  GdkVisual *visual;
-  GdkColormap *colormap;
-  GdkWindowType window_type;
-  GdkCursor *cursor;
-  gchar *wmclass_name;
-  gchar *wmclass_class;
-  gboolean override_redirect;
-  GdkWindowTypeHint type_hint;
-};
-
-struct _GdkGeometry
-{
-  gint min_width;
-  gint min_height;
-  gint max_width;
-  gint max_height;
-  gint base_width;
-  gint base_height;
-  gint width_inc;
-  gint height_inc;
-  gdouble min_aspect;
-  gdouble max_aspect;
-  GdkGravity win_gravity;
-};
-
-struct _GdkPointerHooks 
-{
-  GdkWindow* (*get_pointer)       (GdkWindow	   *window,
-			           gint	           *x,
-			           gint   	   *y,
-			           GdkModifierType *mask);
-  GdkWindow* (*window_at_pointer) (GdkScreen       *screen, /* unused */
-                                   gint            *win_x,
-                                   gint            *win_y);
-};
-
-typedef struct _GdkWindowObject GdkWindowObject;
-typedef struct _GdkWindowObjectClass GdkWindowObjectClass;
-
-#define GDK_TYPE_WINDOW              (gdk_window_object_get_type ())
-#define GDK_WINDOW(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_WINDOW, GdkWindow))
-#define GDK_WINDOW_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_WINDOW, GdkWindowObjectClass))
-#define GDK_IS_WINDOW(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_WINDOW))
-#define GDK_IS_WINDOW_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_WINDOW))
-#define GDK_WINDOW_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_WINDOW, GdkWindowObjectClass))
-#define GDK_WINDOW_OBJECT(object)    ((GdkWindowObject *) GDK_WINDOW (object))
-
-struct _GdkWindowObject
-{
-  GdkDrawable parent_instance;
-
-  GdkDrawable *impl; /* window-system-specific delegate object */  
-  
-  GdkWindowObject *parent;
-
-  gpointer user_data;
-
-  gint x;
-  gint y;
-  
-  gint extension_events;
-
-  GList *filters;
-  GList *children;
-
-  GdkColor bg_color;
-  GdkPixmap *bg_pixmap;
-  
-  GSList *paint_stack;
-  
-  GdkRegion *update_area;
-  guint update_freeze_count;
-  
-  guint8 window_type;
-  guint8 depth;
-  guint8 resize_count;
-
-  GdkWindowState state;
-  
-  guint guffaw_gravity : 1;
-  guint input_only : 1;
-  guint modal_hint : 1;
-  guint composited : 1;
-  
-  guint destroyed : 2;
-
-  guint accept_focus : 1;
-  guint focus_on_map : 1;
-  guint shaped : 1;
-  
-  GdkEventMask event_mask;
-
-  guint update_and_descendants_freeze_count;
-};
-
-struct _GdkWindowObjectClass
-{
-  GdkDrawableClass parent_class;
-};
-
-/* Windows
- */
-GType         gdk_window_object_get_type       (void) G_GNUC_CONST;
-GdkWindow*    gdk_window_new                   (GdkWindow     *parent,
-                                                GdkWindowAttr *attributes,
-                                                gint           attributes_mask);
-void          gdk_window_destroy               (GdkWindow     *window);
-GdkWindowType gdk_window_get_window_type       (GdkWindow     *window);
-GdkWindow*    gdk_window_at_pointer            (gint          *win_x,
-                                                gint          *win_y);
-void          gdk_window_show                  (GdkWindow     *window);
-void          gdk_window_hide                  (GdkWindow     *window);
-void          gdk_window_withdraw              (GdkWindow     *window);
-void          gdk_window_show_unraised         (GdkWindow     *window);
-void          gdk_window_move                  (GdkWindow     *window,
-                                                gint           x,
-                                                gint           y);
-void          gdk_window_resize                (GdkWindow     *window,
-                                                gint           width,
-                                                gint           height);
-void          gdk_window_move_resize           (GdkWindow     *window,
-                                                gint           x,
-                                                gint           y,
-                                                gint           width,
-                                                gint           height);
-void          gdk_window_reparent              (GdkWindow     *window,
-                                                GdkWindow     *new_parent,
-                                                gint           x,
-                                                gint           y);
-void          gdk_window_clear                 (GdkWindow     *window);
-void          gdk_window_clear_area            (GdkWindow     *window,
-                                                gint           x,
-                                                gint           y,
-                                                gint           width,
-                                                gint           height);
-void          gdk_window_clear_area_e          (GdkWindow     *window,
-                                                gint           x,
-                                                gint           y,
-                                                gint           width,
-                                                gint           height);
-void          gdk_window_raise                 (GdkWindow     *window);
-void          gdk_window_lower                 (GdkWindow     *window);
-void          gdk_window_focus                 (GdkWindow     *window,
-                                                guint32        timestamp);
-void          gdk_window_set_user_data         (GdkWindow     *window,
-                                                gpointer       user_data);
-void          gdk_window_set_override_redirect (GdkWindow     *window,
-                                                gboolean       override_redirect);
-void          gdk_window_set_accept_focus      (GdkWindow     *window,
-					        gboolean       accept_focus);
-void          gdk_window_set_focus_on_map      (GdkWindow     *window,
-					        gboolean       focus_on_map);
-void          gdk_window_add_filter            (GdkWindow     *window,
-                                                GdkFilterFunc  function,
-                                                gpointer       data);
-void          gdk_window_remove_filter         (GdkWindow     *window,
-                                                GdkFilterFunc  function,
-                                                gpointer       data);
-void          gdk_window_scroll                (GdkWindow *window,
-                                                gint       dx,
-                                                gint       dy);
-void	      gdk_window_move_region           (GdkWindow *window,
-						GdkRegion *region,
-						gint       dx,
-						gint       dy);
-
-/* 
- * This allows for making shaped (partially transparent) windows
- * - cool feature, needed for Drag and Drag for example.
- *  The shape_mask can be the mask
- *  from gdk_pixmap_create_from_xpm.   Stefan Wille
- */
-void gdk_window_shape_combine_mask  (GdkWindow	    *window,
-                                     GdkBitmap	    *mask,
-                                     gint	     x,
-                                     gint	     y);
-void gdk_window_shape_combine_region (GdkWindow	    *window,
-                                      GdkRegion     *shape_region,
-                                      gint	     offset_x,
-                                      gint	     offset_y);
-
-/*
- * This routine allows you to quickly take the shapes of all the child windows
- * of a window and use their shapes as the shape mask for this window - useful
- * for container windows that dont want to look like a big box
- * 
- * - Raster
- */
-void gdk_window_set_child_shapes (GdkWindow *window);
-
-void gdk_window_set_composited   (GdkWindow *window,
-                                  gboolean composited);
-
-/*
- * This routine allows you to merge (ie ADD) child shapes to your
- * own window's shape keeping its current shape and ADDING the child
- * shapes to it.
- * 
- * - Raster
- */
-void gdk_window_merge_child_shapes (GdkWindow *window);
-
-void gdk_window_input_shape_combine_mask   (GdkWindow *window,
-					    GdkBitmap *mask,
-					    gint       x,
-					    gint       y);
-void gdk_window_input_shape_combine_region (GdkWindow *window,
-                                            GdkRegion *shape_region,
-                                            gint       offset_x,
-                                            gint       offset_y);
-void gdk_window_set_child_input_shapes     (GdkWindow *window);
-void gdk_window_merge_child_input_shapes   (GdkWindow *window);
-
-
-/*
- * Check if a window has been shown, and whether all its
- * parents up to a toplevel have been shown, respectively.
- * Note that a window that is_viewable below is not necessarily
- * viewable in the X sense.
- */
-gboolean gdk_window_is_visible     (GdkWindow *window);
-gboolean gdk_window_is_viewable    (GdkWindow *window);
-
-GdkWindowState gdk_window_get_state (GdkWindow *window);
-
-/* Set static bit gravity on the parent, and static
- * window gravity on all children.
- */
-gboolean gdk_window_set_static_gravities (GdkWindow *window,
-					  gboolean   use_static);   
-
-/* Functions to create/lookup windows from their native equivalents */ 
-#ifndef GDK_MULTIHEAD_SAFE
-GdkWindow*    gdk_window_foreign_new (GdkNativeWindow anid);
-GdkWindow*    gdk_window_lookup      (GdkNativeWindow anid);
-#endif
-GdkWindow    *gdk_window_foreign_new_for_display (GdkDisplay      *display,
-						  GdkNativeWindow  anid);
-GdkWindow*    gdk_window_lookup_for_display (GdkDisplay      *display,
-					     GdkNativeWindow  anid);
-
-
-/* GdkWindow */
-
-#ifndef GDK_DISABLE_DEPRECATED
-void	      gdk_window_set_hints	 (GdkWindow	  *window,
-					  gint		   x,
-					  gint		   y,
-					  gint		   min_width,
-					  gint		   min_height,
-					  gint		   max_width,
-					  gint		   max_height,
-					  gint		   flags);
-#endif
-void              gdk_window_set_type_hint (GdkWindow        *window,
-                                            GdkWindowTypeHint hint);
-GdkWindowTypeHint gdk_window_get_type_hint (GdkWindow        *window);
-
-void          gdk_window_set_modal_hint   (GdkWindow       *window,
-                                           gboolean         modal);
-
-void gdk_window_set_skip_taskbar_hint (GdkWindow *window,
-                                       gboolean   skips_taskbar);
-void gdk_window_set_skip_pager_hint   (GdkWindow *window,
-                                       gboolean   skips_pager);
-void gdk_window_set_urgency_hint      (GdkWindow *window,
-				       gboolean   urgent);
-
-void          gdk_window_set_geometry_hints (GdkWindow        *window,
-					     GdkGeometry      *geometry,
-					     GdkWindowHints    geom_mask);
-void          gdk_set_sm_client_id         (const gchar *sm_client_id);
-
-void	      gdk_window_begin_paint_rect   (GdkWindow    *window,
-					     GdkRectangle *rectangle);
-void	      gdk_window_begin_paint_region (GdkWindow    *window,
-					     GdkRegion    *region);
-void	      gdk_window_end_paint          (GdkWindow    *window);
-
-void	      gdk_window_set_title	   (GdkWindow	  *window,
-					    const gchar	  *title);
-void          gdk_window_set_role          (GdkWindow       *window,
-					    const gchar     *role);
-void          gdk_window_set_startup_id    (GdkWindow       *window,
-					    const gchar     *startup_id);					  
-void          gdk_window_set_transient_for (GdkWindow       *window, 
-					    GdkWindow       *parent);
-void	      gdk_window_set_background	 (GdkWindow	  *window,
-					  const GdkColor  *color);
-void	      gdk_window_set_back_pixmap (GdkWindow	  *window,
-					  GdkPixmap	  *pixmap,
-					  gboolean	   parent_relative);
-void	      gdk_window_set_cursor	 (GdkWindow	  *window,
-					  GdkCursor	  *cursor);
-void	      gdk_window_get_user_data	 (GdkWindow	  *window,
-					  gpointer	  *data);
-void	      gdk_window_get_geometry	 (GdkWindow	  *window,
-					  gint		  *x,
-					  gint		  *y,
-					  gint		  *width,
-					  gint		  *height,
-					  gint		  *depth);
-void	      gdk_window_get_position	 (GdkWindow	  *window,
-					  gint		  *x,
-					  gint		  *y);
-gint	      gdk_window_get_origin	 (GdkWindow	  *window,
-					  gint		  *x,
-					  gint		  *y);
-
-#if !defined (GDK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
-/* Used by gtk_handle_box_button_changed () */
-gboolean      gdk_window_get_deskrelative_origin (GdkWindow	  *window,
-					  gint		  *x,
-					  gint		  *y);
-#endif
-
-void	      gdk_window_get_root_origin (GdkWindow	  *window,
-					  gint		  *x,
-					  gint		  *y);
-void          gdk_window_get_frame_extents (GdkWindow     *window,
-                                            GdkRectangle  *rect);
-GdkWindow*    gdk_window_get_pointer	 (GdkWindow	  *window,
-					  gint		  *x,
-					  gint		  *y,
-					  GdkModifierType *mask);
-GdkWindow *   gdk_window_get_parent      (GdkWindow       *window);
-GdkWindow *   gdk_window_get_toplevel    (GdkWindow       *window);
-
-GList *	      gdk_window_get_children	 (GdkWindow	  *window);
-GList *       gdk_window_peek_children   (GdkWindow       *window);
-GdkEventMask  gdk_window_get_events	 (GdkWindow	  *window);
-void	      gdk_window_set_events	 (GdkWindow	  *window,
-					  GdkEventMask	   event_mask);
-
-void          gdk_window_set_icon_list   (GdkWindow       *window,
-					  GList           *pixbufs);
-void	      gdk_window_set_icon	 (GdkWindow	  *window, 
-					  GdkWindow	  *icon_window,
-					  GdkPixmap	  *pixmap,
-					  GdkBitmap	  *mask);
-void	      gdk_window_set_icon_name	 (GdkWindow	  *window, 
-					  const gchar	  *name);
-void	      gdk_window_set_group	 (GdkWindow	  *window, 
-					  GdkWindow	  *leader);
-GdkWindow*    gdk_window_get_group	 (GdkWindow	  *window);
-void	      gdk_window_set_decorations (GdkWindow	  *window,
-					  GdkWMDecoration  decorations);
-gboolean      gdk_window_get_decorations (GdkWindow       *window,
-					  GdkWMDecoration *decorations);
-void	      gdk_window_set_functions	 (GdkWindow	  *window,
-					  GdkWMFunction	   functions);
-#ifndef GDK_MULTIHEAD_SAFE
-GList *       gdk_window_get_toplevels   (void);
-#endif
-
-void          gdk_window_beep            (GdkWindow       *window);
-void          gdk_window_iconify         (GdkWindow       *window);
-void          gdk_window_deiconify       (GdkWindow       *window);
-void          gdk_window_stick           (GdkWindow       *window);
-void          gdk_window_unstick         (GdkWindow       *window);
-void          gdk_window_maximize        (GdkWindow       *window);
-void          gdk_window_unmaximize      (GdkWindow       *window);
-void          gdk_window_fullscreen      (GdkWindow       *window);
-void          gdk_window_unfullscreen    (GdkWindow       *window);
-void          gdk_window_set_keep_above  (GdkWindow       *window,
-                                          gboolean         setting);
-void          gdk_window_set_keep_below  (GdkWindow       *window,
-                                          gboolean         setting);
-void          gdk_window_set_opacity     (GdkWindow       *window,
-                                          gdouble          opacity);
-void          gdk_window_register_dnd    (GdkWindow       *window);
-
-void gdk_window_begin_resize_drag (GdkWindow     *window,
-                                   GdkWindowEdge  edge,
-                                   gint           button,
-                                   gint           root_x,
-                                   gint           root_y,
-                                   guint32        timestamp);
-void gdk_window_begin_move_drag   (GdkWindow     *window,
-                                   gint           button,
-                                   gint           root_x,
-                                   gint           root_y,
-                                   guint32        timestamp);
-
-/* Interface for dirty-region queueing */
-void       gdk_window_invalidate_rect           (GdkWindow    *window,
-					         GdkRectangle *rect,
-					         gboolean      invalidate_children);
-void       gdk_window_invalidate_region         (GdkWindow    *window,
-					         GdkRegion    *region,
-					         gboolean      invalidate_children);
-void       gdk_window_invalidate_maybe_recurse  (GdkWindow *window,
-						 GdkRegion *region,
-						 gboolean (*child_func) (GdkWindow *, gpointer),
-						 gpointer   user_data);
-GdkRegion *gdk_window_get_update_area     (GdkWindow    *window);
-
-void       gdk_window_freeze_updates      (GdkWindow    *window);
-void       gdk_window_thaw_updates        (GdkWindow    *window);
-
-void       gdk_window_freeze_toplevel_updates_libgtk_only (GdkWindow *window);
-void       gdk_window_thaw_toplevel_updates_libgtk_only   (GdkWindow *window);
-
-void       gdk_window_process_all_updates (void);
-void       gdk_window_process_updates     (GdkWindow    *window,
-					   gboolean      update_children);
-
-/* Enable/disable flicker, so you can tell if your code is inefficient. */
-void       gdk_window_set_debug_updates   (gboolean      setting);
-
-void       gdk_window_constrain_size      (GdkGeometry  *geometry,
-                                           guint         flags,
-                                           gint          width,
-                                           gint          height,
-                                           gint         *new_width,
-                                           gint         *new_height);
-
-void gdk_window_get_internal_paint_info (GdkWindow    *window,
-					 GdkDrawable **real_drawable,
-					 gint         *x_offset,
-					 gint         *y_offset);
-
-void gdk_window_enable_synchronized_configure (GdkWindow *window);
-void gdk_window_configure_finished            (GdkWindow *window);
-
-#ifndef GDK_MULTIHEAD_SAFE
-GdkPointerHooks *gdk_set_pointer_hooks (const GdkPointerHooks *new_hooks);   
-#endif /* GDK_MULTIHEAD_SAFE */
-
-GdkWindow *gdk_get_default_root_window (void);
-
-#ifndef GDK_DISABLE_DEPRECATED
-#define GDK_ROOT_PARENT()             (gdk_get_default_root_window ())
-#define gdk_window_get_size            gdk_drawable_get_size
-#define gdk_window_get_type            gdk_window_get_window_type
-#define gdk_window_get_colormap        gdk_drawable_get_colormap
-#define gdk_window_set_colormap        gdk_drawable_set_colormap
-#define gdk_window_get_visual          gdk_drawable_get_visual
-#define gdk_window_ref                 gdk_drawable_ref
-#define gdk_window_unref               gdk_drawable_unref
-
-#define gdk_window_copy_area(drawable,gc,x,y,source_drawable,source_x,source_y,width,height) \
-   gdk_draw_pixmap(drawable,gc,source_drawable,source_x,source_y,x,y,width,height)
-#endif /* GDK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GDK_WINDOW_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkx.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkx.h
deleted file mode 100644
index ec850479..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gdk/gdkx.h
+++ /dev/null
@@ -1,216 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_X_H__
-#define __GDK_X_H__
-
-#include <gdk/gdkprivate.h>
-#include <gdk/gdkcursor.h>
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-
-G_BEGIN_DECLS
-
-#ifndef GDK_MULTIHEAD_SAFE
-extern Display          *gdk_display;
-#endif
-
-Display *gdk_x11_drawable_get_xdisplay    (GdkDrawable *drawable);
-XID      gdk_x11_drawable_get_xid         (GdkDrawable *drawable);
-Display *gdk_x11_image_get_xdisplay       (GdkImage    *image);
-XImage  *gdk_x11_image_get_ximage         (GdkImage    *image);
-Display *gdk_x11_colormap_get_xdisplay    (GdkColormap *colormap);
-Colormap gdk_x11_colormap_get_xcolormap   (GdkColormap *colormap);
-Display *gdk_x11_cursor_get_xdisplay      (GdkCursor   *cursor);
-Cursor   gdk_x11_cursor_get_xcursor       (GdkCursor   *cursor);
-Display *gdk_x11_display_get_xdisplay     (GdkDisplay  *display);
-Visual * gdk_x11_visual_get_xvisual       (GdkVisual   *visual);
-Display *gdk_x11_gc_get_xdisplay          (GdkGC       *gc);
-GC       gdk_x11_gc_get_xgc               (GdkGC       *gc);
-Screen * gdk_x11_screen_get_xscreen       (GdkScreen   *screen);
-int      gdk_x11_screen_get_screen_number (GdkScreen   *screen);
-void     gdk_x11_window_set_user_time     (GdkWindow   *window,
-					   guint32      timestamp);
-void     gdk_x11_window_move_to_current_desktop (GdkWindow   *window);
-
-const char* gdk_x11_screen_get_window_manager_name (GdkScreen *screen);
-
-#ifndef GDK_MULTIHEAD_SAFE
-Window   gdk_x11_get_default_root_xwindow (void);
-Display *gdk_x11_get_default_xdisplay     (void);
-gint     gdk_x11_get_default_screen       (void);
-#endif
-
-#define GDK_COLORMAP_XDISPLAY(cmap)   (gdk_x11_colormap_get_xdisplay (cmap))
-#define GDK_COLORMAP_XCOLORMAP(cmap)  (gdk_x11_colormap_get_xcolormap (cmap))
-#define GDK_CURSOR_XDISPLAY(cursor)   (gdk_x11_cursor_get_xdisplay (cursor))
-#define GDK_CURSOR_XCURSOR(cursor)    (gdk_x11_cursor_get_xcursor (cursor))
-#define GDK_IMAGE_XDISPLAY(image)     (gdk_x11_image_get_xdisplay (image))
-#define GDK_IMAGE_XIMAGE(image)       (gdk_x11_image_get_ximage (image))
-
-#ifndef GDK_MULTIHEAD_SAFE
-#define GDK_DISPLAY()                 gdk_display
-#endif
-
-#ifdef GDK_COMPILATION
-
-#include "gdkprivate-x11.h"
-#include "gdkscreen-x11.h"
-
-#define GDK_DISPLAY_XDISPLAY(display) (GDK_DISPLAY_X11(display)->xdisplay)
-
-#define GDK_WINDOW_XDISPLAY(win)      (GDK_SCREEN_X11 (GDK_WINDOW_SCREEN (win))->xdisplay)
-#define GDK_WINDOW_XID(win)           (GDK_DRAWABLE_IMPL_X11(((GdkWindowObject *)win)->impl)->xid)
-#define GDK_PIXMAP_XDISPLAY(pix)      (GDK_SCREEN_X11 (GDK_PIXMAP_SCREEN (pix))->xdisplay)
-#define GDK_PIXMAP_XID(pix)           (GDK_DRAWABLE_IMPL_X11(((GdkPixmapObject *)pix)->impl)->xid)
-#define GDK_DRAWABLE_XDISPLAY(win)    (GDK_IS_WINDOW (win) ? GDK_WINDOW_XDISPLAY (win) : GDK_PIXMAP_XDISPLAY (win))
-#define GDK_DRAWABLE_XID(win)         (GDK_IS_WINDOW (win) ? GDK_WINDOW_XID (win) : GDK_PIXMAP_XID (win))
-#define GDK_GC_XDISPLAY(gc)           (GDK_SCREEN_XDISPLAY(GDK_GC_X11(gc)->screen))
-#define GDK_GC_XGC(gc)		      (GDK_GC_X11(gc)->xgc)
-#define GDK_SCREEN_XDISPLAY(screen)   (GDK_SCREEN_X11 (screen)->xdisplay)
-#define GDK_SCREEN_XSCREEN(screen)    (GDK_SCREEN_X11 (screen)->xscreen)
-#define GDK_SCREEN_XNUMBER(screen)    (GDK_SCREEN_X11 (screen)->screen_num) 
-#define GDK_VISUAL_XVISUAL(vis)       (((GdkVisualPrivate *) vis)->xvisual)
-#define GDK_GC_GET_XGC(gc)	      (GDK_GC_X11(gc)->dirty_mask ? _gdk_x11_gc_flush (gc) : ((GdkGCX11 *)(gc))->xgc)
-#define GDK_WINDOW_XWINDOW	      GDK_DRAWABLE_XID
-
-#else /* GDK_COMPILATION */
-
-#ifndef GDK_MULTIHEAD_SAFE
-#define GDK_ROOT_WINDOW()             (gdk_x11_get_default_root_xwindow ())
-#endif
-
-#define GDK_DISPLAY_XDISPLAY(display) (gdk_x11_display_get_xdisplay (display))
-
-#define GDK_WINDOW_XDISPLAY(win)      (gdk_x11_drawable_get_xdisplay (((GdkWindowObject *)win)->impl))
-#define GDK_WINDOW_XID(win)           (gdk_x11_drawable_get_xid (win))
-#define GDK_WINDOW_XWINDOW(win)       (gdk_x11_drawable_get_xid (win))
-#define GDK_PIXMAP_XDISPLAY(win)      (gdk_x11_drawable_get_xdisplay (((GdkPixmapObject *)win)->impl))
-#define GDK_PIXMAP_XID(win)           (gdk_x11_drawable_get_xid (win))
-#define GDK_DRAWABLE_XDISPLAY(win)    (gdk_x11_drawable_get_xdisplay (win))
-#define GDK_DRAWABLE_XID(win)         (gdk_x11_drawable_get_xid (win))
-#define GDK_GC_XDISPLAY(gc)           (gdk_x11_gc_get_xdisplay (gc))
-#define GDK_GC_XGC(gc)                (gdk_x11_gc_get_xgc (gc))
-#define GDK_SCREEN_XDISPLAY(screen)   (gdk_x11_display_get_xdisplay (gdk_screen_get_display (screen)))
-#define GDK_SCREEN_XSCREEN(screen)    (gdk_x11_screen_get_xscreen (screen))
-#define GDK_SCREEN_XNUMBER(screen)    (gdk_x11_screen_get_screen_number (screen))
-#define GDK_VISUAL_XVISUAL(visual)    (gdk_x11_visual_get_xvisual (visual))
-
-#endif /* GDK_COMPILATION */
-
-GdkVisual* gdk_x11_screen_lookup_visual (GdkScreen *screen,
-					 VisualID   xvisualid);
-#ifndef GDK_MULTIHEAD_SAFE
-GdkVisual* gdkx_visual_get            (VisualID   xvisualid);
-#endif
-
-#ifdef GDK_ENABLE_BROKEN
-/* XXX: An X Colormap is useless unless we also have the visual. */
-GdkColormap* gdkx_colormap_get (Colormap xcolormap);
-#endif
-
-GdkColormap *gdk_x11_colormap_foreign_new (GdkVisual *visual,
-					   Colormap   xcolormap);
-
-     /* Return the Gdk* for a particular XID */
-gpointer      gdk_xid_table_lookup_for_display (GdkDisplay *display,
-						XID         xid);
-guint32       gdk_x11_get_server_time  (GdkWindow       *window);
-guint32       gdk_x11_display_get_user_time (GdkDisplay *display);
-
-G_CONST_RETURN gchar *gdk_x11_display_get_startup_notification_id (GdkDisplay *display);
-
-void          gdk_x11_display_set_cursor_theme (GdkDisplay  *display,
-						const gchar *theme,
-						const gint   size);
-
-void gdk_x11_display_broadcast_startup_message (GdkDisplay *display,
-						const char *message_type,
-						...) G_GNUC_NULL_TERMINATED;
-
-/* returns TRUE if we support the given WM spec feature */
-gboolean gdk_x11_screen_supports_net_wm_hint (GdkScreen *screen,
-					      GdkAtom    property);
-
-#ifndef GDK_MULTIHEAD_SAFE
-gpointer      gdk_xid_table_lookup   (XID              xid);
-gboolean      gdk_net_wm_supports    (GdkAtom    property);
-void          gdk_x11_grab_server    (void);
-void          gdk_x11_ungrab_server  (void);
-#endif
-
-GdkDisplay   *gdk_x11_lookup_xdisplay (Display *xdisplay);
-
-
-/* Functions to get the X Atom equivalent to the GdkAtom */
-Atom	              gdk_x11_atom_to_xatom_for_display (GdkDisplay  *display,
-							 GdkAtom      atom);
-GdkAtom		      gdk_x11_xatom_to_atom_for_display (GdkDisplay  *display,
-							 Atom	      xatom);
-Atom		      gdk_x11_get_xatom_by_name_for_display (GdkDisplay  *display,
-							     const gchar *atom_name);
-G_CONST_RETURN gchar *gdk_x11_get_xatom_name_for_display (GdkDisplay  *display,
-							  Atom         xatom);
-#ifndef GDK_MULTIHEAD_SAFE
-Atom                  gdk_x11_atom_to_xatom     (GdkAtom      atom);
-GdkAtom               gdk_x11_xatom_to_atom     (Atom         xatom);
-Atom                  gdk_x11_get_xatom_by_name (const gchar *atom_name);
-G_CONST_RETURN gchar *gdk_x11_get_xatom_name    (Atom         xatom);
-#endif
-
-void	    gdk_x11_display_grab	      (GdkDisplay *display);
-void	    gdk_x11_display_ungrab	      (GdkDisplay *display);
-void        gdk_x11_register_standard_event_type (GdkDisplay *display,
-						  gint        event_base,
-						  gint        n_events);
-
-#if !defined(GDK_DISABLE_DEPRECATED) || defined(GDK_COMPILATION)
-
-gpointer             gdk_x11_font_get_xfont    (GdkFont *font);
-#define GDK_FONT_XFONT(font)          (gdk_x11_font_get_xfont (font))
-
-#define gdk_font_lookup_for_display(display, xid) ((GdkFont*) gdk_xid_table_lookup_for_display (display, ((xid)|XID_FONT_BIT)))
-
-#endif /* !GDK_DISABLE_DEPRECATED || GDK_COMPILATION */
-
-#ifndef GDK_DISABLE_DEPRECATED
-
-Display *            gdk_x11_font_get_xdisplay (GdkFont *font);
-G_CONST_RETURN char *gdk_x11_font_get_name     (GdkFont *font);
-
-#define GDK_FONT_XDISPLAY(font)       (gdk_x11_font_get_xdisplay (font))
-
-#ifndef GDK_MULTIHEAD_SAFE
-
-#define gdk_font_lookup(xid)	   ((GdkFont*) gdk_xid_table_lookup (xid))
-
-#endif /* GDK_MULTIHEAD_SAFE */
-#endif /* GDK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GDK_X_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtk.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtk.h
deleted file mode 100644
index bdfaef9b..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtk.h
+++ /dev/null
@@ -1,212 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_H__
-#define __GTK_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkaboutdialog.h>
-#include <gtk/gtkaccelgroup.h>
-#include <gtk/gtkaccellabel.h>
-#include <gtk/gtkaccelmap.h>
-#include <gtk/gtkaccessible.h>
-#include <gtk/gtkaction.h>
-#include <gtk/gtkactiongroup.h>
-#include <gtk/gtkadjustment.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkaspectframe.h>
-#include <gtk/gtkassistant.h>
-#include <gtk/gtkbbox.h>
-#include <gtk/gtkbin.h>
-#include <gtk/gtkbindings.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkbuildable.h>
-#include <gtk/gtkbuilder.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkcalendar.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtkcellrenderer.h>
-#include <gtk/gtkcellrendereraccel.h>
-#include <gtk/gtkcellrenderercombo.h>
-#include <gtk/gtkcellrendererpixbuf.h>
-#include <gtk/gtkcellrendererprogress.h>
-#include <gtk/gtkcellrendererspin.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcellrenderertoggle.h>
-#include <gtk/gtkcellview.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtkclipboard.h>
-#include <gtk/gtkclist.h>
-#include <gtk/gtkcolorbutton.h>
-#include <gtk/gtkcolorsel.h>
-#include <gtk/gtkcolorseldialog.h>
-#include <gtk/gtkcombo.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkcomboboxentry.h>
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtkctree.h>
-#include <gtk/gtkcurve.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkdrawingarea.h>
-#include <gtk/gtkeditable.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkentrycompletion.h>
-#include <gtk/gtkenums.h>
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkexpander.h>
-#include <gtk/gtkfilesel.h>
-#include <gtk/gtkfixed.h>
-#include <gtk/gtkfilechooserbutton.h>
-#include <gtk/gtkfilechooserdialog.h>
-#include <gtk/gtkfilechooserwidget.h>
-#include <gtk/gtkfontbutton.h>
-#include <gtk/gtkfontsel.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkgamma.h>
-#include <gtk/gtkgc.h>
-#include <gtk/gtkhandlebox.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkhpaned.h>
-#include <gtk/gtkhruler.h>
-#include <gtk/gtkhscale.h>
-#include <gtk/gtkhscrollbar.h>
-#include <gtk/gtkhseparator.h>
-#include <gtk/gtkiconfactory.h>
-#include <gtk/gtkicontheme.h>
-#include <gtk/gtkiconview.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkimcontext.h>
-#include <gtk/gtkimcontextsimple.h>
-#include <gtk/gtkimmulticontext.h>
-#include <gtk/gtkinputdialog.h>
-#include <gtk/gtkinvisible.h>
-#include <gtk/gtkitem.h>
-#include <gtk/gtkitemfactory.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtklayout.h>
-#include <gtk/gtklinkbutton.h>
-#include <gtk/gtklist.h>
-#include <gtk/gtklistitem.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenubar.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkmenushell.h>
-#include <gtk/gtkmenutoolbutton.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkmisc.h>
-#include <gtk/gtkmodules.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkobject.h>
-#include <gtk/gtkoldeditable.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkpaned.h>
-#include <gtk/gtkpixmap.h>
-#include <gtk/gtkplug.h>
-#include <gtk/gtkpreview.h>
-#include <gtk/gtkprintoperation.h>
-#include <gtk/gtkprogress.h>
-#include <gtk/gtkprogressbar.h>
-#include <gtk/gtkradioaction.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtkradiomenuitem.h>
-#include <gtk/gtkradiotoolbutton.h>
-#include <gtk/gtkrange.h>
-#include <gtk/gtkrc.h>
-#include <gtk/gtkrecentaction.h>
-#include <gtk/gtkrecentchooser.h>
-#include <gtk/gtkrecentchooserdialog.h>
-#include <gtk/gtkrecentchoosermenu.h>
-#include <gtk/gtkrecentchooserwidget.h>
-#include <gtk/gtkrecentfilter.h>
-#include <gtk/gtkrecentmanager.h>
-#include <gtk/gtkruler.h>
-#include <gtk/gtkscale.h>
-#include <gtk/gtkscalebutton.h>
-#include <gtk/gtkscrollbar.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkselection.h>
-#include <gtk/gtkseparator.h>
-#include <gtk/gtkseparatormenuitem.h>
-#include <gtk/gtkseparatortoolitem.h>
-#include <gtk/gtksettings.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtksizegroup.h>
-#include <gtk/gtksocket.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkstatusbar.h>
-#include <gtk/gtkstatusicon.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkstyle.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtktearoffmenuitem.h>
-#include <gtk/gtktext.h>
-#include <gtk/gtktextbuffer.h>
-#include <gtk/gtktextbufferrichtext.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtktipsquery.h>
-#include <gtk/gtktoggleaction.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtktoggletoolbutton.h>
-#include <gtk/gtktoolbar.h>
-#include <gtk/gtktoolbutton.h>
-#include <gtk/gtktoolitem.h>
-#include <gtk/gtktooltip.h>
-#include <gtk/gtktooltips.h>
-#include <gtk/gtktree.h>
-#include <gtk/gtktreednd.h>
-#include <gtk/gtktreeitem.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreemodelfilter.h>
-#include <gtk/gtktreemodelsort.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreestore.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeviewcolumn.h>
-#include <gtk/gtktypeutils.h>
-#include <gtk/gtkuimanager.h>
-#include <gtk/gtkvbbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkversion.h>
-#include <gtk/gtkviewport.h>
-#include <gtk/gtkvolumebutton.h>
-#include <gtk/gtkvpaned.h>
-#include <gtk/gtkvruler.h>
-#include <gtk/gtkvscale.h>
-#include <gtk/gtkvscrollbar.h>
-#include <gtk/gtkvseparator.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
-
-
-#endif /* __GTK_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaboutdialog.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaboutdialog.h
deleted file mode 100644
index b77e658c..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaboutdialog.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* GTK - The GIMP Toolkit
-
-   Copyright (C) 2001 CodeFactory AB
-   Copyright (C) 2001 Anders Carlsson <andersca@codefactory.se>
-   Copyright (C) 2003, 2004 Matthias Clasen <mclasen@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 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.
-
-   Author: Anders Carlsson <andersca@codefactory.se>
-*/
-
-#ifndef __GTK_ABOUT_DIALOG_H__
-#define __GTK_ABOUT_DIALOG_H__
-
-#include <gtk/gtkdialog.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_ABOUT_DIALOG            (gtk_about_dialog_get_type ())
-#define GTK_ABOUT_DIALOG(object)         (G_TYPE_CHECK_INSTANCE_CAST ((object), GTK_TYPE_ABOUT_DIALOG, GtkAboutDialog))
-#define GTK_ABOUT_DIALOG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ABOUT_DIALOG, GtkAboutDialogClass))
-#define GTK_IS_ABOUT_DIALOG(object)      (G_TYPE_CHECK_INSTANCE_TYPE ((object), GTK_TYPE_ABOUT_DIALOG))
-#define GTK_IS_ABOUT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ABOUT_DIALOG))
-#define GTK_ABOUT_DIALOG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ABOUT_DIALOG, GtkAboutDialogClass))
-
-typedef struct _GtkAboutDialog        GtkAboutDialog;
-typedef struct _GtkAboutDialogClass   GtkAboutDialogClass;
-
-struct _GtkAboutDialog 
-{
-  GtkDialog parent_instance;
-
-  /*< private >*/
-  gpointer private_data;
-};
-
-struct _GtkAboutDialogClass 
-{
-  GtkDialogClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType                  gtk_about_dialog_get_type               (void) G_GNUC_CONST;
-GtkWidget             *gtk_about_dialog_new                    (void);
-void                   gtk_show_about_dialog                   (GtkWindow       *parent,
-								const gchar     *first_property_name,
-								...) G_GNUC_NULL_TERMINATED;
-
-#ifndef GTK_DISABLE_DEPRECATED
-G_CONST_RETURN gchar  *gtk_about_dialog_get_name               (GtkAboutDialog  *about);
-void                   gtk_about_dialog_set_name               (GtkAboutDialog  *about,
-								const gchar     *name);
-#endif /* GTK_DISABLE_DEPRECATED */
-G_CONST_RETURN gchar  *gtk_about_dialog_get_program_name       (GtkAboutDialog  *about);
-void                   gtk_about_dialog_set_program_name       (GtkAboutDialog  *about,
-								const gchar     *name);
-G_CONST_RETURN gchar  *gtk_about_dialog_get_version            (GtkAboutDialog  *about);
-void                   gtk_about_dialog_set_version            (GtkAboutDialog  *about,
-								const gchar     *version);
-G_CONST_RETURN gchar  *gtk_about_dialog_get_copyright          (GtkAboutDialog  *about);
-void                   gtk_about_dialog_set_copyright          (GtkAboutDialog  *about,
-								const gchar     *copyright);
-G_CONST_RETURN gchar  *gtk_about_dialog_get_comments           (GtkAboutDialog  *about);
-void                   gtk_about_dialog_set_comments           (GtkAboutDialog  *about,
-								const gchar     *comments);
-G_CONST_RETURN gchar  *gtk_about_dialog_get_license            (GtkAboutDialog  *about);
-void                   gtk_about_dialog_set_license            (GtkAboutDialog  *about,
-								const gchar     *license);
-
-gboolean               gtk_about_dialog_get_wrap_license       (GtkAboutDialog  *about);
-void                   gtk_about_dialog_set_wrap_license       (GtkAboutDialog  *about,
-                                                                gboolean         wrap_license);
-
-G_CONST_RETURN gchar  *gtk_about_dialog_get_website            (GtkAboutDialog  *about);
-void                   gtk_about_dialog_set_website            (GtkAboutDialog  *about,
-								const gchar     *website);
-G_CONST_RETURN gchar  *gtk_about_dialog_get_website_label      (GtkAboutDialog  *about);
-void                   gtk_about_dialog_set_website_label      (GtkAboutDialog  *about,
-								const gchar     *website_label);
-G_CONST_RETURN gchar* G_CONST_RETURN * gtk_about_dialog_get_authors            (GtkAboutDialog  *about);
-void                   gtk_about_dialog_set_authors            (GtkAboutDialog  *about,
-								const gchar    **authors);
-G_CONST_RETURN gchar* G_CONST_RETURN * gtk_about_dialog_get_documenters        (GtkAboutDialog  *about);
-void                   gtk_about_dialog_set_documenters        (GtkAboutDialog  *about,
-								const gchar    **documenters);
-G_CONST_RETURN gchar* G_CONST_RETURN * gtk_about_dialog_get_artists            (GtkAboutDialog  *about);
-void                   gtk_about_dialog_set_artists            (GtkAboutDialog  *about,
-								const gchar    **artists);
-G_CONST_RETURN gchar  *gtk_about_dialog_get_translator_credits (GtkAboutDialog  *about);
-void                   gtk_about_dialog_set_translator_credits (GtkAboutDialog  *about,
-								const gchar     *translator_credits);
-GdkPixbuf             *gtk_about_dialog_get_logo               (GtkAboutDialog  *about);
-void                   gtk_about_dialog_set_logo               (GtkAboutDialog  *about,
-								GdkPixbuf       *logo);
-G_CONST_RETURN gchar  *gtk_about_dialog_get_logo_icon_name     (GtkAboutDialog  *about);
-void                   gtk_about_dialog_set_logo_icon_name     (GtkAboutDialog  *about,
-								const gchar     *icon_name);
-
-typedef void (* GtkAboutDialogActivateLinkFunc) (GtkAboutDialog *about,
-						 const gchar    *link_,
-						 gpointer        data);
-
-GtkAboutDialogActivateLinkFunc gtk_about_dialog_set_email_hook (GtkAboutDialogActivateLinkFunc func,
-								gpointer                       data,
-								GDestroyNotify                 destroy);
-GtkAboutDialogActivateLinkFunc gtk_about_dialog_set_url_hook   (GtkAboutDialogActivateLinkFunc func,
-								gpointer                       data,
-								GDestroyNotify                 destroy);
-
-G_END_DECLS
-
-#endif /* __GTK_ABOUT_DIALOG_H__ */
-
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaccelgroup.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaccelgroup.h
deleted file mode 100644
index 7e89ddf9..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaccelgroup.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1998, 2001 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_ACCEL_GROUP_H__
-#define __GTK_ACCEL_GROUP_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkenums.h>
-
-G_BEGIN_DECLS
-
-
-/* --- type macros --- */
-#define GTK_TYPE_ACCEL_GROUP              (gtk_accel_group_get_type ())
-#define GTK_ACCEL_GROUP(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GTK_TYPE_ACCEL_GROUP, GtkAccelGroup))
-#define GTK_ACCEL_GROUP_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ACCEL_GROUP, GtkAccelGroupClass))
-#define GTK_IS_ACCEL_GROUP(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GTK_TYPE_ACCEL_GROUP))
-#define GTK_IS_ACCEL_GROUP_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ACCEL_GROUP))
-#define GTK_ACCEL_GROUP_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ACCEL_GROUP, GtkAccelGroupClass))
-
-
-/* --- accel flags --- */
-typedef enum
-{
-  GTK_ACCEL_VISIBLE        = 1 << 0,	/* display in GtkAccelLabel? */
-  GTK_ACCEL_LOCKED         = 1 << 1,	/* is it removable? */
-  GTK_ACCEL_MASK           = 0x07
-} GtkAccelFlags;
-
-
-/* --- typedefs & structures --- */
-typedef struct _GtkAccelGroup	   GtkAccelGroup;
-typedef struct _GtkAccelGroupClass GtkAccelGroupClass;
-typedef struct _GtkAccelKey        GtkAccelKey;
-typedef struct _GtkAccelGroupEntry GtkAccelGroupEntry;
-typedef gboolean (*GtkAccelGroupActivate) (GtkAccelGroup  *accel_group,
-					   GObject        *acceleratable,
-					   guint           keyval,
-					   GdkModifierType modifier);
-
-typedef gboolean (*GtkAccelGroupFindFunc) (GtkAccelKey    *key,
-					   GClosure       *closure,
-					   gpointer        data);
-
-struct _GtkAccelGroup
-{
-  GObject             parent;
-  guint	              lock_count;
-  GdkModifierType     modifier_mask;
-  GSList             *acceleratables;
-  guint		      n_accels;
-  GtkAccelGroupEntry *priv_accels;
-};
-
-struct _GtkAccelGroupClass
-{
-  GObjectClass parent_class;
-
-  void	(*accel_changed)	(GtkAccelGroup	*accel_group,
-				 guint           keyval,
-				 GdkModifierType modifier,
-				 GClosure       *accel_closure);
-  
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-struct _GtkAccelKey
-{
-  guint           accel_key;
-  GdkModifierType accel_mods;
-  guint           accel_flags : 16;
-};
-
-
-/* -- Accelerator Groups --- */
-GType          gtk_accel_group_get_type           (void) G_GNUC_CONST;
-GtkAccelGroup* gtk_accel_group_new	      	  (void);
-void	       gtk_accel_group_lock		  (GtkAccelGroup  *accel_group);
-void	       gtk_accel_group_unlock		  (GtkAccelGroup  *accel_group);
-void	       gtk_accel_group_connect		  (GtkAccelGroup  *accel_group,
-						   guint	   accel_key,
-						   GdkModifierType accel_mods,
-						   GtkAccelFlags   accel_flags,
-						   GClosure	  *closure);
-void           gtk_accel_group_connect_by_path    (GtkAccelGroup  *accel_group,
-						   const gchar	  *accel_path,
-						   GClosure	  *closure);
-gboolean       gtk_accel_group_disconnect	  (GtkAccelGroup  *accel_group,
-						   GClosure	  *closure);
-gboolean       gtk_accel_group_disconnect_key	  (GtkAccelGroup  *accel_group,
-						   guint	   accel_key,
-						   GdkModifierType accel_mods);
-gboolean       gtk_accel_group_activate           (GtkAccelGroup   *accel_group,
-                                                   GQuark	   accel_quark,
-                                                   GObject	  *acceleratable,
-                                                   guint	   accel_key,
-                                                   GdkModifierType accel_mods);
-
-
-/* --- GtkActivatable glue --- */
-void		_gtk_accel_group_attach		(GtkAccelGroup	*accel_group,
-						 GObject	*object);
-void		_gtk_accel_group_detach		(GtkAccelGroup	*accel_group,
-						 GObject	*object);
-gboolean        gtk_accel_groups_activate      	(GObject	*object,
-						 guint		 accel_key,
-						 GdkModifierType accel_mods);
-GSList*	        gtk_accel_groups_from_object    (GObject	*object);
-GtkAccelKey*	gtk_accel_group_find		(GtkAccelGroup	      *accel_group,
-						 GtkAccelGroupFindFunc find_func,
-						 gpointer              data);
-GtkAccelGroup*	gtk_accel_group_from_accel_closure (GClosure    *closure);
-
-
-/* --- Accelerators--- */
-gboolean gtk_accelerator_valid		      (guint	        keyval,
-					       GdkModifierType  modifiers) G_GNUC_CONST;
-void	 gtk_accelerator_parse		      (const gchar     *accelerator,
-					       guint	       *accelerator_key,
-					       GdkModifierType *accelerator_mods);
-gchar*	 gtk_accelerator_name		      (guint	        accelerator_key,
-					       GdkModifierType  accelerator_mods);
-gchar*   gtk_accelerator_get_label            (guint           accelerator_key,
-                                               GdkModifierType accelerator_mods);
-void	 gtk_accelerator_set_default_mod_mask (GdkModifierType  default_mod_mask);
-guint	 gtk_accelerator_get_default_mod_mask (void);
-
-
-/* --- internal --- */
-GtkAccelGroupEntry*	gtk_accel_group_query	(GtkAccelGroup	*accel_group,
-						 guint		 accel_key,
-						 GdkModifierType accel_mods,
-						 guint          *n_entries);
-
-void		     _gtk_accel_group_reconnect (GtkAccelGroup *accel_group,
-						 GQuark         accel_path_quark);
-
-struct _GtkAccelGroupEntry
-{
-  GtkAccelKey  key;
-  GClosure    *closure;
-  GQuark       accel_path_quark;
-};
-
-
-#ifndef GTK_DISABLE_DEPRECATED
-#define	gtk_accel_group_ref	g_object_ref
-#define	gtk_accel_group_unref	g_object_unref
-#endif /* GTK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-
-#endif /* __GTK_ACCEL_GROUP_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaccellabel.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaccellabel.h
deleted file mode 100644
index 4eb842a6..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaccellabel.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * GtkAccelLabel: GtkLabel with accelerator monitoring facilities.
- * 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 GTK+ Team and others 1997-2001.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_ACCEL_LABEL_H__
-#define __GTK_ACCEL_LABEL_H__
-
-
-#include <gtk/gtklabel.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_ACCEL_LABEL		(gtk_accel_label_get_type ())
-#define GTK_ACCEL_LABEL(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ACCEL_LABEL, GtkAccelLabel))
-#define GTK_ACCEL_LABEL_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ACCEL_LABEL, GtkAccelLabelClass))
-#define GTK_IS_ACCEL_LABEL(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ACCEL_LABEL))
-#define GTK_IS_ACCEL_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ACCEL_LABEL))
-#define GTK_ACCEL_LABEL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ACCEL_LABEL, GtkAccelLabelClass))
-
-
-typedef struct _GtkAccelLabel	    GtkAccelLabel;
-typedef struct _GtkAccelLabelClass  GtkAccelLabelClass;
-
-struct _GtkAccelLabel
-{
-  GtkLabel label;
-
-  guint	         gtk_reserved;
-  guint	         accel_padding;
-  GtkWidget     *accel_widget;
-  GClosure	*accel_closure;
-  GtkAccelGroup *accel_group;
-  gchar         *accel_string;
-  guint16        accel_string_width;
-};
-
-struct _GtkAccelLabelClass
-{
-  GtkLabelClass	 parent_class;
-
-  gchar		*signal_quote1;
-  gchar		*signal_quote2;
-  gchar		*mod_name_shift;
-  gchar		*mod_name_control;
-  gchar		*mod_name_alt;
-  gchar		*mod_separator;
-  gchar		*accel_seperator;
-  guint		 latin1_to_char : 1;
-  
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-#ifndef GTK_DISABLE_DEPRECATED
-#define	gtk_accel_label_accelerator_width	gtk_accel_label_get_accel_width
-#endif /* GTK_DISABLE_DEPRECATED */
-
-GType	   gtk_accel_label_get_type	     (void) G_GNUC_CONST;
-GtkWidget* gtk_accel_label_new		     (const gchar   *string);
-GtkWidget* gtk_accel_label_get_accel_widget  (GtkAccelLabel *accel_label);
-guint	   gtk_accel_label_get_accel_width   (GtkAccelLabel *accel_label);
-void	   gtk_accel_label_set_accel_widget  (GtkAccelLabel *accel_label,
-					      GtkWidget	    *accel_widget);
-void	   gtk_accel_label_set_accel_closure (GtkAccelLabel *accel_label,
-					      GClosure	    *accel_closure);
-gboolean   gtk_accel_label_refetch           (GtkAccelLabel *accel_label);
-
-/* private */
-gchar *    _gtk_accel_label_class_get_accelerator_label (GtkAccelLabelClass *klass,
-							 guint               accelerator_key,
-							 GdkModifierType     accelerator_mods);
-
-G_END_DECLS
-
-#endif /* __GTK_ACCEL_LABEL_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaccelmap.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaccelmap.h
deleted file mode 100644
index 932c893a..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaccelmap.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1998, 2001 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 __GTK_ACCEL_MAP_H__
-#define __GTK_ACCEL_MAP_H__
-
-
-#include <gtk/gtkaccelgroup.h>
-
-G_BEGIN_DECLS
-
-/* --- global GtkAccelMap object --- */
-#define GTK_TYPE_ACCEL_MAP                (gtk_accel_map_get_type ())
-#define GTK_ACCEL_MAP(accel_map)	  (G_TYPE_CHECK_INSTANCE_CAST ((accel_map), GTK_TYPE_ACCEL_MAP, GtkAccelMap))
-#define GTK_ACCEL_MAP_CLASS(klass)	  (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ACCEL_MAP, GtkAccelMapClass))
-#define GTK_IS_ACCEL_MAP(accel_map)	  (G_TYPE_CHECK_INSTANCE_TYPE ((accel_map), GTK_TYPE_ACCEL_MAP))
-#define GTK_IS_ACCEL_MAP_CLASS(klass)	  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ACCEL_MAP))
-#define GTK_ACCEL_MAP_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ACCEL_MAP, GtkAccelMapClass))
-
-typedef struct _GtkAccelMap      GtkAccelMap;
-typedef struct _GtkAccelMapClass GtkAccelMapClass;
-
-/* --- notifier --- */
-typedef void (*GtkAccelMapForeach)		(gpointer	 data,
-						 const gchar	*accel_path,
-						 guint           accel_key,
-						 GdkModifierType accel_mods,
-						 gboolean	 changed);
-
-
-/* --- public API --- */
-
-#ifdef G_OS_WIN32
-/* Reserve old names for DLL ABI backward compatibility */
-#define gtk_accel_map_load gtk_accel_map_load_utf8
-#define gtk_accel_map_save gtk_accel_map_save_utf8
-#endif
-
-void	   gtk_accel_map_add_entry	(const gchar		*accel_path,
-					 guint			 accel_key,
-					 GdkModifierType         accel_mods);
-gboolean   gtk_accel_map_lookup_entry	(const gchar		*accel_path,
-					 GtkAccelKey		*key);
-gboolean   gtk_accel_map_change_entry	(const gchar		*accel_path,
-					 guint			 accel_key,
-					 GdkModifierType	 accel_mods,
-					 gboolean		 replace);
-void	   gtk_accel_map_load		(const gchar		*file_name);
-void	   gtk_accel_map_save		(const gchar		*file_name);
-void	   gtk_accel_map_foreach	(gpointer		 data,
-					 GtkAccelMapForeach	 foreach_func);
-void	   gtk_accel_map_load_fd	(gint			 fd);
-void	   gtk_accel_map_load_scanner	(GScanner		*scanner);
-void	   gtk_accel_map_save_fd	(gint			 fd);
-
-void       gtk_accel_map_lock_path      (const gchar            *accel_path);
-void       gtk_accel_map_unlock_path    (const gchar            *accel_path);
-
-/* --- filter functions --- */
-void	gtk_accel_map_add_filter	 (const gchar		*filter_pattern);
-void	gtk_accel_map_foreach_unfiltered (gpointer		 data,
-					  GtkAccelMapForeach	 foreach_func);
-
-/* --- notification --- */
-GType        gtk_accel_map_get_type (void) G_GNUC_CONST;
-GtkAccelMap *gtk_accel_map_get      (void);
-
-
-/* --- internal API --- */
-void		_gtk_accel_map_init		(void);
-
-void            _gtk_accel_map_add_group	 (const gchar   *accel_path,
-						  GtkAccelGroup *accel_group);
-void            _gtk_accel_map_remove_group 	 (const gchar   *accel_path,
-						  GtkAccelGroup *accel_group);
-gboolean	_gtk_accel_path_is_valid	 (const gchar	*accel_path);
-
-
-G_END_DECLS
-
-#endif /* __GTK_ACCEL_MAP_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaccessible.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaccessible.h
deleted file mode 100644
index ca8645be..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaccessible.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright 2001 Sun Microsystems 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 __GTK_ACCESSIBLE_H__
-#define __GTK_ACCESSIBLE_H__
-
-#include <atk/atk.h>
-#include <gtk/gtkwidget.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_ACCESSIBLE                  (gtk_accessible_get_type ())
-#define GTK_ACCESSIBLE(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ACCESSIBLE, GtkAccessible))
-#define GTK_ACCESSIBLE_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ACCESSIBLE, GtkAccessibleClass))
-#define GTK_IS_ACCESSIBLE(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ACCESSIBLE))
-#define GTK_IS_ACCESSIBLE_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ACCESSIBLE))
-#define GTK_ACCESSIBLE_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ACCESSIBLE, GtkAccessibleClass))
-
-typedef struct _GtkAccessible                GtkAccessible;
-typedef struct _GtkAccessibleClass           GtkAccessibleClass;
-
-  /**
-   * This object is a thin wrapper, in the GTK+ namespace, for AtkObject
-   */
-
-struct _GtkAccessible
-{
-  AtkObject parent;
-
-  /*
-   * The GtkWidget whose properties and features are exported via this 
-   * accessible instance.
-   */
-  GtkWidget *widget;
-};
-
-struct _GtkAccessibleClass
-{
-  AtkObjectClass parent_class;
-
-  void (*connect_widget_destroyed)              (GtkAccessible     *accessible);
-  
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType gtk_accessible_get_type (void) G_GNUC_CONST;
-
-void gtk_accessible_connect_widget_destroyed    (GtkAccessible     *accessible);
-
-G_END_DECLS
-
-#endif /* __GTK_ACCESSIBLE_H__ */
-
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaction.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaction.h
deleted file mode 100644
index bb158135..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaction.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * GTK - The GIMP Toolkit
- * Copyright (C) 1998, 1999 Red Hat, Inc.
- * All rights reserved.
- *
- * 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 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.
- */
-
-/*
- * Author: James Henstridge <james@daa.com.au>
- *
- * Modified by the GTK+ Team and others 2003.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-#ifndef __GTK_ACTION_H__
-#define __GTK_ACTION_H__
-
-#include <gtk/gtkwidget.h>
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_ACTION            (gtk_action_get_type ())
-#define GTK_ACTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ACTION, GtkAction))
-#define GTK_ACTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ACTION, GtkActionClass))
-#define GTK_IS_ACTION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ACTION))
-#define GTK_IS_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ACTION))
-#define GTK_ACTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_ACTION, GtkActionClass))
-
-typedef struct _GtkAction      GtkAction;
-typedef struct _GtkActionClass GtkActionClass;
-typedef struct _GtkActionPrivate GtkActionPrivate;
-
-struct _GtkAction
-{
-  GObject object;
-
-  /*< private >*/
-
-  GtkActionPrivate *private_data;
-};
-
-struct _GtkActionClass
-{
-  GObjectClass parent_class;
-
-  /* activation signal */
-  void       (* activate)           (GtkAction    *action);
-
-  GType      menu_item_type;
-  GType      toolbar_item_type;
-
-  /* widget creation routines (not signals) */
-  GtkWidget *(* create_menu_item)   (GtkAction *action);
-  GtkWidget *(* create_tool_item)   (GtkAction *action);
-  void       (* connect_proxy)      (GtkAction *action,
-				     GtkWidget *proxy);
-  void       (* disconnect_proxy)   (GtkAction *action,
-				     GtkWidget *proxy);
-
-  GtkWidget *(* create_menu)        (GtkAction *action);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType        gtk_action_get_type               (void) G_GNUC_CONST;
-GtkAction   *gtk_action_new                    (const gchar *name,
-						const gchar *label,
-						const gchar *tooltip,
-						const gchar *stock_id);
-G_CONST_RETURN gchar* gtk_action_get_name      (GtkAction     *action);
-gboolean     gtk_action_is_sensitive           (GtkAction     *action);
-gboolean     gtk_action_get_sensitive          (GtkAction     *action);
-void         gtk_action_set_sensitive          (GtkAction     *action,
-						gboolean       sensitive);
-gboolean     gtk_action_is_visible             (GtkAction     *action);
-gboolean     gtk_action_get_visible            (GtkAction     *action);
-void         gtk_action_set_visible            (GtkAction     *action,
-						gboolean       visible);
-void         gtk_action_activate               (GtkAction     *action);
-GtkWidget *  gtk_action_create_icon            (GtkAction     *action,
-						GtkIconSize    icon_size);
-GtkWidget *  gtk_action_create_menu_item       (GtkAction     *action);
-GtkWidget *  gtk_action_create_tool_item       (GtkAction     *action);
-GtkWidget *  gtk_action_create_menu            (GtkAction     *action);
-void         gtk_action_connect_proxy          (GtkAction     *action,
-						GtkWidget     *proxy);
-void         gtk_action_disconnect_proxy       (GtkAction     *action,
-						GtkWidget     *proxy);
-GSList *     gtk_action_get_proxies            (GtkAction     *action);
-GtkAction *  gtk_widget_get_action             (GtkWidget     *widget);
-void         gtk_action_connect_accelerator    (GtkAction     *action);
-void         gtk_action_disconnect_accelerator (GtkAction     *action);
-G_CONST_RETURN gchar *gtk_action_get_accel_path (GtkAction     *action);
-GClosure    *gtk_action_get_accel_closure      (GtkAction     *action);
-
-/* protected ... for use by child actions */
-void         gtk_action_block_activate_from    (GtkAction     *action,
-						GtkWidget     *proxy);
-void         gtk_action_unblock_activate_from  (GtkAction     *action,
-						GtkWidget     *proxy);
-void         _gtk_action_emit_activate         (GtkAction     *action);
-
-/* protected ... for use by action groups */
-void         gtk_action_set_accel_path         (GtkAction     *action,
-						const gchar   *accel_path);
-void         gtk_action_set_accel_group        (GtkAction     *action,
-						GtkAccelGroup *accel_group);
-void         _gtk_action_sync_sensitive        (GtkAction     *action);
-void         _gtk_action_sync_visible          (GtkAction     *action);
-void         _gtk_action_sync_menu_visible     (GtkAction     *action,
-						GtkWidget     *proxy,
-						gboolean       empty);
-
-G_END_DECLS
-
-#endif  /* __GTK_ACTION_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkactiongroup.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkactiongroup.h
deleted file mode 100644
index 0f5df594..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkactiongroup.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * GTK - The GIMP Toolkit
- * Copyright (C) 1998, 1999 Red Hat, Inc.
- * All rights reserved.
- *
- * 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 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.
- */
-
-/* 
- * Author: James Henstridge <james@daa.com.au>
- *
- * Modified by the GTK+ Team and others 2003.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-#ifndef __GTK_ACTION_GROUP_H__
-#define __GTK_ACTION_GROUP_H__
-
-#include <gtk/gtkaction.h>
-#include <gtk/gtkitemfactory.h> /* for GtkTranslateFunc */
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_ACTION_GROUP              (gtk_action_group_get_type ())
-#define GTK_ACTION_GROUP(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ACTION_GROUP, GtkActionGroup))
-#define GTK_ACTION_GROUP_CLASS(vtable)     (G_TYPE_CHECK_CLASS_CAST ((vtable), GTK_TYPE_ACTION_GROUP, GtkActionGroupClass))
-#define GTK_IS_ACTION_GROUP(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ACTION_GROUP))
-#define GTK_IS_ACTION_GROUP_CLASS(vtable)  (G_TYPE_CHECK_CLASS_TYPE ((vtable), GTK_TYPE_ACTION_GROUP))
-#define GTK_ACTION_GROUP_GET_CLASS(inst)   (G_TYPE_INSTANCE_GET_CLASS ((inst), GTK_TYPE_ACTION_GROUP, GtkActionGroupClass))
-
-typedef struct _GtkActionGroup        GtkActionGroup;
-typedef struct _GtkActionGroupPrivate GtkActionGroupPrivate;
-typedef struct _GtkActionGroupClass   GtkActionGroupClass;
-typedef struct _GtkActionEntry        GtkActionEntry;
-typedef struct _GtkToggleActionEntry  GtkToggleActionEntry;
-typedef struct _GtkRadioActionEntry   GtkRadioActionEntry;
-
-struct _GtkActionGroup
-{
-  GObject parent;
-
-  /*< private >*/
-
-  GtkActionGroupPrivate *private_data;
-};
-
-struct _GtkActionGroupClass
-{
-  GObjectClass parent_class;
-
-  GtkAction *(* get_action) (GtkActionGroup *action_group,
-                             const gchar    *action_name);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-struct _GtkActionEntry 
-{
-  const gchar     *name;
-  const gchar     *stock_id;
-  const gchar     *label;
-  const gchar     *accelerator;
-  const gchar     *tooltip;
-  GCallback  callback;
-};
-
-struct _GtkToggleActionEntry 
-{
-  const gchar     *name;
-  const gchar     *stock_id;
-  const gchar     *label;
-  const gchar     *accelerator;
-  const gchar     *tooltip;
-  GCallback  callback;
-  gboolean   is_active;
-};
-
-struct _GtkRadioActionEntry 
-{
-  const gchar *name;
-  const gchar *stock_id;
-  const gchar *label;
-  const gchar *accelerator;
-  const gchar *tooltip;
-  gint   value; 
-};
-
-GType           gtk_action_group_get_type                (void) G_GNUC_CONST;
-GtkActionGroup *gtk_action_group_new                     (const gchar                *name);
-G_CONST_RETURN gchar *gtk_action_group_get_name          (GtkActionGroup             *action_group);
-gboolean        gtk_action_group_get_sensitive           (GtkActionGroup             *action_group);
-void            gtk_action_group_set_sensitive           (GtkActionGroup             *action_group,
-							  gboolean                    sensitive);
-gboolean        gtk_action_group_get_visible             (GtkActionGroup             *action_group);
-void            gtk_action_group_set_visible             (GtkActionGroup             *action_group,
-							  gboolean                    visible);
-GtkAction      *gtk_action_group_get_action              (GtkActionGroup             *action_group,
-							  const gchar                *action_name);
-GList          *gtk_action_group_list_actions            (GtkActionGroup             *action_group);
-void            gtk_action_group_add_action              (GtkActionGroup             *action_group,
-							  GtkAction                  *action);
-void            gtk_action_group_add_action_with_accel   (GtkActionGroup             *action_group,
-							  GtkAction                  *action,
-							  const gchar                *accelerator);
-void            gtk_action_group_remove_action           (GtkActionGroup             *action_group,
-							  GtkAction                  *action);
-void            gtk_action_group_add_actions             (GtkActionGroup             *action_group,
-							  const GtkActionEntry       *entries,
-							  guint                       n_entries,
-							  gpointer                    user_data);
-void            gtk_action_group_add_toggle_actions      (GtkActionGroup             *action_group,
-							  const GtkToggleActionEntry *entries,
-							  guint                       n_entries,
-							  gpointer                    user_data);
-void            gtk_action_group_add_radio_actions       (GtkActionGroup             *action_group,
-							  const GtkRadioActionEntry  *entries,
-							  guint                       n_entries,
-							  gint                        value,
-							  GCallback                   on_change,
-							  gpointer                    user_data);
-void            gtk_action_group_add_actions_full        (GtkActionGroup             *action_group,
-							  const GtkActionEntry       *entries,
-							  guint                       n_entries,
-							  gpointer                    user_data,
-							  GDestroyNotify              destroy);
-void            gtk_action_group_add_toggle_actions_full (GtkActionGroup             *action_group,
-							  const GtkToggleActionEntry *entries,
-							  guint                       n_entries,
-							  gpointer                    user_data,
-							  GDestroyNotify              destroy);
-void            gtk_action_group_add_radio_actions_full  (GtkActionGroup             *action_group,
-							  const GtkRadioActionEntry  *entries,
-							  guint                       n_entries,
-							  gint                        value,
-							  GCallback                   on_change,
-							  gpointer                    user_data,
-							  GDestroyNotify              destroy);
-void            gtk_action_group_set_translate_func      (GtkActionGroup             *action_group,
-							  GtkTranslateFunc            func,
-							  gpointer                    data,
-							  GtkDestroyNotify            notify);
-void            gtk_action_group_set_translation_domain  (GtkActionGroup             *action_group,
-							  const gchar                *domain);
-G_CONST_RETURN gchar *gtk_action_group_translate_string  (GtkActionGroup             *action_group,
-  	                                                  const gchar                *string);
-
-/* Protected for use by GtkAction */
-void _gtk_action_group_emit_connect_proxy    (GtkActionGroup *action_group,
-                                              GtkAction      *action,
-                                              GtkWidget      *proxy);
-void _gtk_action_group_emit_disconnect_proxy (GtkActionGroup *action_group,
-                                              GtkAction      *action,
-                                              GtkWidget      *proxy);
-void _gtk_action_group_emit_pre_activate     (GtkActionGroup *action_group,
-                                              GtkAction      *action);
-void _gtk_action_group_emit_post_activate    (GtkActionGroup *action_group,
-                                              GtkAction      *action);
-
-G_END_DECLS
-
-#endif  /* __GTK_ACTION_GROUP_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkadjustment.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkadjustment.h
deleted file mode 100644
index 1fe3e4ae..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkadjustment.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_ADJUSTMENT_H__
-#define __GTK_ADJUSTMENT_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkobject.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_ADJUSTMENT                  (gtk_adjustment_get_type ())
-#define GTK_ADJUSTMENT(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ADJUSTMENT, GtkAdjustment))
-#define GTK_ADJUSTMENT_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ADJUSTMENT, GtkAdjustmentClass))
-#define GTK_IS_ADJUSTMENT(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ADJUSTMENT))
-#define GTK_IS_ADJUSTMENT_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ADJUSTMENT))
-#define GTK_ADJUSTMENT_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ADJUSTMENT, GtkAdjustmentClass))
-
-
-typedef struct _GtkAdjustment	    GtkAdjustment;
-typedef struct _GtkAdjustmentClass  GtkAdjustmentClass;
-
-struct _GtkAdjustment
-{
-  GtkObject parent_instance;
-  
-  gdouble lower;
-  gdouble upper;
-  gdouble value;
-  gdouble step_increment;
-  gdouble page_increment;
-  gdouble page_size;
-};
-
-struct _GtkAdjustmentClass
-{
-  GtkObjectClass parent_class;
-  
-  void (* changed)	 (GtkAdjustment *adjustment);
-  void (* value_changed) (GtkAdjustment *adjustment);
-  
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType	   gtk_adjustment_get_type		(void) G_GNUC_CONST;
-GtkObject* gtk_adjustment_new			(gdouble	  value,
-						 gdouble	  lower,
-						 gdouble	  upper,
-						 gdouble	  step_increment,
-						 gdouble	  page_increment,
-						 gdouble	  page_size);
-void	   gtk_adjustment_changed		(GtkAdjustment	 *adjustment);
-void	   gtk_adjustment_value_changed		(GtkAdjustment	 *adjustment);
-void	   gtk_adjustment_clamp_page		(GtkAdjustment	 *adjustment,
-						 gdouble	  lower,
-						 gdouble	  upper);
-gdouble	   gtk_adjustment_get_value		(GtkAdjustment   *adjustment);
-void	   gtk_adjustment_set_value		(GtkAdjustment	 *adjustment,
-						 gdouble	  value);
-
-G_END_DECLS
-
-#endif /* __GTK_ADJUSTMENT_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkalignment.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkalignment.h
deleted file mode 100644
index df39c541..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkalignment.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_ALIGNMENT_H__
-#define __GTK_ALIGNMENT_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkbin.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_ALIGNMENT                  (gtk_alignment_get_type ())
-#define GTK_ALIGNMENT(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ALIGNMENT, GtkAlignment))
-#define GTK_ALIGNMENT_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ALIGNMENT, GtkAlignmentClass))
-#define GTK_IS_ALIGNMENT(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ALIGNMENT))
-#define GTK_IS_ALIGNMENT_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ALIGNMENT))
-#define GTK_ALIGNMENT_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ALIGNMENT, GtkAlignmentClass))
-
-
-typedef struct _GtkAlignment       GtkAlignment;
-typedef struct _GtkAlignmentClass  GtkAlignmentClass;
-typedef struct _GtkAlignmentPrivate GtkAlignmentPrivate;
-
-struct _GtkAlignment
-{
-  GtkBin bin;
-
-  gfloat xalign;
-  gfloat yalign;
-  gfloat xscale;
-  gfloat yscale;
-};
-
-struct _GtkAlignmentClass
-{
-  GtkBinClass parent_class;
-};
-
-
-GType      gtk_alignment_get_type   (void) G_GNUC_CONST;
-GtkWidget* gtk_alignment_new        (gfloat             xalign,
-				     gfloat             yalign,
-				     gfloat             xscale,
-				     gfloat             yscale);
-void       gtk_alignment_set        (GtkAlignment      *alignment,
-				     gfloat             xalign,
-				     gfloat             yalign,
-				     gfloat             xscale,
-				     gfloat             yscale);
-
-void       gtk_alignment_set_padding (GtkAlignment      *alignment,
-				      guint              padding_top,
-				      guint              padding_bottom,
-				      guint              padding_left,
-				      guint              padding_right);
-
-void       gtk_alignment_get_padding (GtkAlignment      *alignment,
-				      guint             *padding_top,
-				      guint             *padding_bottom,
-				      guint             *padding_left,
-				      guint             *padding_right);
-
-G_END_DECLS
-
-
-#endif /* __GTK_ALIGNMENT_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkarrow.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkarrow.h
deleted file mode 100644
index 7692b771..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkarrow.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2001.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_ARROW_H__
-#define __GTK_ARROW_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkmisc.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_ARROW                  (gtk_arrow_get_type ())
-#define GTK_ARROW(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ARROW, GtkArrow))
-#define GTK_ARROW_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ARROW, GtkArrowClass))
-#define GTK_IS_ARROW(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ARROW))
-#define GTK_IS_ARROW_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ARROW))
-#define GTK_ARROW_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ARROW, GtkArrowClass))
-
-
-typedef struct _GtkArrow       GtkArrow;
-typedef struct _GtkArrowClass  GtkArrowClass;
-
-struct _GtkArrow
-{
-  GtkMisc misc;
-
-  gint16 arrow_type;
-  gint16 shadow_type;
-};
-
-struct _GtkArrowClass
-{
-  GtkMiscClass parent_class;
-};
-
-
-GType      gtk_arrow_get_type   (void) G_GNUC_CONST;
-GtkWidget* gtk_arrow_new        (GtkArrowType   arrow_type,
-				 GtkShadowType  shadow_type);
-void       gtk_arrow_set        (GtkArrow      *arrow,
-				 GtkArrowType   arrow_type,
-				 GtkShadowType  shadow_type);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_ARROW_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaspectframe.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaspectframe.h
deleted file mode 100644
index e85888c6..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkaspectframe.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2001.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_ASPECT_FRAME_H__
-#define __GTK_ASPECT_FRAME_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkframe.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_ASPECT_FRAME            (gtk_aspect_frame_get_type ())
-#define GTK_ASPECT_FRAME(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ASPECT_FRAME, GtkAspectFrame))
-#define GTK_ASPECT_FRAME_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ASPECT_FRAME, GtkAspectFrameClass))
-#define GTK_IS_ASPECT_FRAME(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ASPECT_FRAME))
-#define GTK_IS_ASPECT_FRAME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ASPECT_FRAME))
-#define GTK_ASPECT_FRAME_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ASPECT_FRAME, GtkAspectFrameClass))
-
-
-typedef struct _GtkAspectFrame       GtkAspectFrame;
-typedef struct _GtkAspectFrameClass  GtkAspectFrameClass;
-
-struct _GtkAspectFrame
-{
-  GtkFrame frame;
-
-  gfloat xalign;
-  gfloat yalign;
-  gfloat ratio;
-  gboolean obey_child;
-
-  GtkAllocation center_allocation;
-};
-
-struct _GtkAspectFrameClass
-{
-  GtkFrameClass parent_class;
-};
-
-
-GType      gtk_aspect_frame_get_type   (void) G_GNUC_CONST;
-GtkWidget* gtk_aspect_frame_new        (const gchar     *label,
-					gfloat           xalign,
-					gfloat           yalign,
-					gfloat           ratio,
-					gboolean         obey_child);
-void       gtk_aspect_frame_set        (GtkAspectFrame  *aspect_frame,
-					gfloat           xalign,
-					gfloat           yalign,
-					gfloat           ratio,
-					gboolean         obey_child);
-
-
-G_END_DECLS
-
-#endif /* __GTK_ASPECT_FRAME_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkassistant.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkassistant.h
deleted file mode 100644
index cadffd0d..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkassistant.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/* 
- * GTK - The GIMP Toolkit
- * Copyright (C) 1999  Red Hat, Inc.
- * Copyright (C) 2002  Anders Carlsson <andersca@gnu.org>
- * Copyright (C) 2003  Matthias Clasen <mclasen@redhat.com>
- * Copyright (C) 2005  Carlos Garnacho Parro <carlosg@gnome.org>
- *
- * All rights reserved.
- *
- * 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 __GTK_ASSISTANT_H__
-#define __GTK_ASSISTANT_H__
-
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_ASSISTANT         (gtk_assistant_get_type ())
-#define GTK_ASSISTANT(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GTK_TYPE_ASSISTANT, GtkAssistant))
-#define GTK_ASSISTANT_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST    ((c), GTK_TYPE_ASSISTANT, GtkAssistantClass))
-#define GTK_IS_ASSISTANT(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTK_TYPE_ASSISTANT))
-#define GTK_IS_ASSISTANT_CLASS(c)  (G_TYPE_CHECK_CLASS_TYPE    ((c), GTK_TYPE_ASSISTANT))
-#define GTK_ASSISTANT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS  ((o), GTK_TYPE_ASSISTANT, GtkAssistantClass))
-
-typedef enum
-{
-  GTK_ASSISTANT_PAGE_CONTENT,
-  GTK_ASSISTANT_PAGE_INTRO,
-  GTK_ASSISTANT_PAGE_CONFIRM,
-  GTK_ASSISTANT_PAGE_SUMMARY,
-  GTK_ASSISTANT_PAGE_PROGRESS
-} GtkAssistantPageType;
-
-typedef struct _GtkAssistant        GtkAssistant;
-typedef struct _GtkAssistantPrivate GtkAssistantPrivate;
-typedef struct _GtkAssistantClass   GtkAssistantClass;
-
-struct _GtkAssistant
-{
-  GtkWindow  parent;
-
-  GtkWidget *cancel;
-  GtkWidget *forward;
-  GtkWidget *back;
-  GtkWidget *apply;
-  GtkWidget *close;
-  GtkWidget *last;
-
-  /*< private >*/
-  GtkAssistantPrivate *priv;
-};
-
-struct _GtkAssistantClass
-{
-  GtkWindowClass parent_class;
-
-  void (* prepare) (GtkAssistant *assistant, GtkWidget *page);
-  void (* apply)   (GtkAssistant *assistant);
-  void (* close)   (GtkAssistant *assistant);
-  void (* cancel)  (GtkAssistant *assistant);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-  void (*_gtk_reserved5) (void);
-};
-
-typedef gint (*GtkAssistantPageFunc) (gint current_page, gpointer data);
-
-GType                 gtk_assistant_get_type              (void) G_GNUC_CONST;
-GtkWidget            *gtk_assistant_new                   (void);
-gint                  gtk_assistant_get_current_page      (GtkAssistant         *assistant);
-void                  gtk_assistant_set_current_page      (GtkAssistant         *assistant,
-							   gint                  page_num);
-gint                  gtk_assistant_get_n_pages           (GtkAssistant         *assistant);
-GtkWidget            *gtk_assistant_get_nth_page          (GtkAssistant         *assistant,
-							   gint                  page_num);
-gint                  gtk_assistant_prepend_page          (GtkAssistant         *assistant,
-							   GtkWidget            *page);
-gint                  gtk_assistant_append_page           (GtkAssistant         *assistant,
-							   GtkWidget            *page);
-gint                  gtk_assistant_insert_page           (GtkAssistant         *assistant,
-							   GtkWidget            *page,
-							   gint                  position);
-void                  gtk_assistant_set_forward_page_func (GtkAssistant         *assistant,
-							   GtkAssistantPageFunc  page_func,
-							   gpointer              data,
-							   GDestroyNotify        destroy);
-void                  gtk_assistant_set_page_type         (GtkAssistant         *assistant,
-							   GtkWidget            *page,
-							   GtkAssistantPageType  type);
-GtkAssistantPageType  gtk_assistant_get_page_type         (GtkAssistant         *assistant,
-							   GtkWidget            *page);
-void                  gtk_assistant_set_page_title        (GtkAssistant         *assistant,
-							   GtkWidget            *page,
-							   const gchar          *title);
-G_CONST_RETURN gchar *gtk_assistant_get_page_title        (GtkAssistant         *assistant,
-							   GtkWidget            *page);
-void                  gtk_assistant_set_page_header_image (GtkAssistant         *assistant,
-							   GtkWidget            *page,
-							   GdkPixbuf            *pixbuf);
-GdkPixbuf            *gtk_assistant_get_page_header_image (GtkAssistant         *assistant,
-							   GtkWidget            *page);
-void                  gtk_assistant_set_page_side_image   (GtkAssistant         *assistant,
-							   GtkWidget            *page,
-							   GdkPixbuf            *pixbuf);
-GdkPixbuf            *gtk_assistant_get_page_side_image   (GtkAssistant         *assistant,
-							   GtkWidget            *page);
-void                  gtk_assistant_set_page_complete     (GtkAssistant         *assistant,
-							   GtkWidget            *page,
-							   gboolean              complete);
-gboolean              gtk_assistant_get_page_complete     (GtkAssistant         *assistant,
-							   GtkWidget            *page);
-void                  gtk_assistant_add_action_widget     (GtkAssistant         *assistant,
-							   GtkWidget            *child);
-void                  gtk_assistant_remove_action_widget  (GtkAssistant         *assistant,
-							   GtkWidget            *child);
-
-void                  gtk_assistant_update_buttons_state  (GtkAssistant *assistant);
-
-G_END_DECLS
-
-#endif /* __GTK_ASSISTANT_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbbox.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbbox.h
deleted file mode 100644
index 1f69197f..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbbox.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_BUTTON_BOX_H__
-#define __GTK_BUTTON_BOX_H__
-
-#include <gtk/gtkbox.h>
-
-
-G_BEGIN_DECLS  
-
-#define GTK_TYPE_BUTTON_BOX             (gtk_button_box_get_type ())
-#define GTK_BUTTON_BOX(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BUTTON_BOX, GtkButtonBox))
-#define GTK_BUTTON_BOX_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_BUTTON_BOX, GtkButtonBoxClass))
-#define GTK_IS_BUTTON_BOX(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_BUTTON_BOX))
-#define GTK_IS_BUTTON_BOX_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_BUTTON_BOX))
-#define GTK_BUTTON_BOX_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_BUTTON_BOX, GtkButtonBoxClass))
-  
-
-#define GTK_BUTTONBOX_DEFAULT -1
- 
-typedef struct _GtkButtonBox       GtkButtonBox;
-typedef struct _GtkButtonBoxClass  GtkButtonBoxClass;
-
-struct _GtkButtonBox
-{
-  GtkBox box;
-  gint child_min_width;
-  gint child_min_height;
-  gint child_ipad_x;
-  gint child_ipad_y;
-  GtkButtonBoxStyle layout_style;
-};
-
-struct _GtkButtonBoxClass
-{
-  GtkBoxClass parent_class;
-};
-
-
-GType gtk_button_box_get_type (void) G_GNUC_CONST;
-
-GtkButtonBoxStyle gtk_button_box_get_layout          (GtkButtonBox      *widget);
-void              gtk_button_box_set_layout          (GtkButtonBox      *widget,
-						      GtkButtonBoxStyle  layout_style);
-gboolean          gtk_button_box_get_child_secondary (GtkButtonBox      *widget,
-						      GtkWidget         *child);
-void              gtk_button_box_set_child_secondary (GtkButtonBox      *widget,
-						      GtkWidget         *child,
-						      gboolean           is_secondary);
-
-#ifndef GTK_DISABLE_DEPRECATED
-#define gtk_button_box_set_spacing(b,s) gtk_box_set_spacing (GTK_BOX (b), s)
-#define gtk_button_box_get_spacing(b)   gtk_box_get_spacing (GTK_BOX (b))
-
-void gtk_button_box_set_child_size     (GtkButtonBox *widget,
-					gint          min_width,
-					gint          min_height);
-void gtk_button_box_set_child_ipadding (GtkButtonBox *widget,
-					gint          ipad_x,
-					gint          ipad_y);
-void gtk_button_box_get_child_size     (GtkButtonBox *widget,
-					gint         *min_width,
-					gint         *min_height);
-void gtk_button_box_get_child_ipadding (GtkButtonBox *widget,
-					gint         *ipad_x,
-					gint         *ipad_y);
-#endif
-
-/* Internal method - do not use. */
-void _gtk_button_box_child_requisition (GtkWidget *widget,
-					int       *nvis_children,
-					int       *nvis_secondaries,
-					int       *width,
-					int       *height);
-G_END_DECLS
-
-#endif /* __GTK_BUTTON_BOX_H__ */
-
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbin.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbin.h
deleted file mode 100644
index c919c1d9..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbin.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_BIN_H__
-#define __GTK_BIN_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkcontainer.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_BIN                  (gtk_bin_get_type ())
-#define GTK_BIN(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BIN, GtkBin))
-#define GTK_BIN_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_BIN, GtkBinClass))
-#define GTK_IS_BIN(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_BIN))
-#define GTK_IS_BIN_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_BIN))
-#define GTK_BIN_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_BIN, GtkBinClass))
-
-
-typedef struct _GtkBin       GtkBin;
-typedef struct _GtkBinClass  GtkBinClass;
-
-struct _GtkBin
-{
-  GtkContainer container;
-
-  GtkWidget *child;
-};
-
-struct _GtkBinClass
-{
-  GtkContainerClass parent_class;
-};
-
-
-GType      gtk_bin_get_type  (void) G_GNUC_CONST;
-
-GtkWidget *gtk_bin_get_child (GtkBin *bin);
-
-G_END_DECLS
-
-#endif /* __GTK_BIN_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbindings.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbindings.h
deleted file mode 100644
index a3109b29..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbindings.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * GtkBindingSet: Keybinding manager for GtkObjects.
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_BINDINGS_H__
-#define __GTK_BINDINGS_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkobject.h>
-#include <gtk/gtkenums.h>
-
-
-G_BEGIN_DECLS
-
-
-/* Binding sets
- */
-
-typedef struct _GtkBindingSet		GtkBindingSet;
-typedef struct _GtkBindingEntry		GtkBindingEntry;
-typedef struct _GtkBindingSignal	GtkBindingSignal;
-typedef struct _GtkBindingArg		GtkBindingArg;
-
-struct _GtkBindingSet
-{
-  gchar			*set_name;
-  gint			 priority;
-  GSList		*widget_path_pspecs;
-  GSList		*widget_class_pspecs;
-  GSList		*class_branch_pspecs;
-  GtkBindingEntry	*entries;
-  GtkBindingEntry	*current;
-  guint                  parsed : 1; /* From RC content */
-};
-
-struct _GtkBindingEntry
-{
-  /* key portion
-   */
-  guint			 keyval;
-  GdkModifierType	 modifiers;
-  
-  GtkBindingSet		*binding_set;
-  guint			destroyed : 1;
-  guint			in_emission : 1;
-  guint                 marks_unbound : 1;
-  GtkBindingEntry	*set_next;
-  GtkBindingEntry	*hash_next;
-  GtkBindingSignal	*signals;
-};
-
-struct _GtkBindingArg
-{
-  GType		 arg_type;
-  union {
-    glong	 long_data;
-    gdouble	 double_data;
-    gchar	*string_data;
-  } d;
-};
-
-struct _GtkBindingSignal
-{
-  GtkBindingSignal	*next;
-  gchar 		*signal_name;
-  guint			 n_args;
-  GtkBindingArg		*args;
-};
-
-/* Application-level methods */
-
-GtkBindingSet*	gtk_binding_set_new	(const gchar	*set_name);
-GtkBindingSet*	gtk_binding_set_by_class(gpointer	 object_class);
-GtkBindingSet*	gtk_binding_set_find	(const gchar	*set_name);
-gboolean gtk_bindings_activate		(GtkObject	*object,
-					 guint		 keyval,
-					 GdkModifierType modifiers);
-gboolean gtk_bindings_activate_event    (GtkObject      *object,
-					 GdkEventKey    *event);
-gboolean gtk_binding_set_activate	(GtkBindingSet	*binding_set,
-					 guint		 keyval,
-					 GdkModifierType modifiers,
-					 GtkObject	*object);
-
-#ifndef GTK_DISABLE_DEPRECATED
-#define	 gtk_binding_entry_add		gtk_binding_entry_clear
-void	 gtk_binding_entry_clear	(GtkBindingSet	*binding_set,
-					 guint		 keyval,
-					 GdkModifierType modifiers);
-void	 gtk_binding_entry_add_signall	(GtkBindingSet	*binding_set,
-					 guint		 keyval,
-					 GdkModifierType modifiers,
-					 const gchar	*signal_name,
-					 GSList		*binding_args);
-guint	 gtk_binding_parse_binding      (GScanner       *scanner);
-#endif /* GTK_DISABLE_DEPRECATED */
-
-void	 gtk_binding_entry_skip         (GtkBindingSet  *binding_set,
-                                         guint           keyval,
-                                         GdkModifierType modifiers);
-void	 gtk_binding_entry_add_signal   (GtkBindingSet  *binding_set,
-                                         guint           keyval,
-                                         GdkModifierType modifiers,
-                                         const gchar    *signal_name,
-                                         guint           n_args,
-                                         ...);
-void	 gtk_binding_entry_remove	(GtkBindingSet	*binding_set,
-					 guint		 keyval,
-					 GdkModifierType modifiers);
-
-void	 gtk_binding_set_add_path	(GtkBindingSet	*binding_set,
-					 GtkPathType	 path_type,
-					 const gchar	*path_pattern,
-					 GtkPathPriorityType priority);
-
-
-/* Non-public methods */
-
-guint	 _gtk_binding_parse_binding     (GScanner       *scanner);
-void     _gtk_binding_reset_parsed      (void);
-void	 _gtk_binding_entry_add_signall (GtkBindingSet  *binding_set,
-					 guint		 keyval,
-					 GdkModifierType modifiers,
-					 const gchar	*signal_name,
-					 GSList		*binding_args);
-
-/* Creates a signal with a fixed callback instead of a class offset;
- * useful for key binding signals
- */
-guint _gtk_binding_signal_new (const gchar       *signal_name,
-			       GType		  itype,
-			       GSignalFlags	  signal_flags,
-			       GCallback          handler,
-			       GSignalAccumulator accumulator,
-			       gpointer		  accu_data,
-			       GSignalCMarshaller c_marshaller,
-			       GType		  return_type,
-			       guint		  n_params,
-			       ...);
-
-G_END_DECLS
-
-
-#endif /* __GTK_BINDINGS_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbox.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbox.h
deleted file mode 100644
index b4fec749..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbox.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_BOX_H__
-#define __GTK_BOX_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkcontainer.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_BOX            (gtk_box_get_type ())
-#define GTK_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BOX, GtkBox))
-#define GTK_BOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_BOX, GtkBoxClass))
-#define GTK_IS_BOX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_BOX))
-#define GTK_IS_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_BOX))
-#define GTK_BOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_BOX, GtkBoxClass))
-
-
-typedef struct _GtkBox	      GtkBox;
-typedef struct _GtkBoxClass   GtkBoxClass;
-typedef struct _GtkBoxChild   GtkBoxChild;
-
-struct _GtkBox
-{
-  GtkContainer container;
-
-  /*< public >*/
-  GList *children;
-  gint16 spacing;
-  guint homogeneous : 1;
-};
-
-struct _GtkBoxClass
-{
-  GtkContainerClass parent_class;
-};
-
-struct _GtkBoxChild
-{
-  GtkWidget *widget;
-  guint16 padding;
-  guint expand : 1;
-  guint fill : 1;
-  guint pack : 1;
-  guint is_secondary : 1;
-};
-
-
-GType	   gtk_box_get_type	       (void) G_GNUC_CONST;
-void	   gtk_box_pack_start	       (GtkBox	     *box,
-					GtkWidget    *child,
-					gboolean      expand,
-					gboolean      fill,
-					guint	      padding);
-void	   gtk_box_pack_end	       (GtkBox	     *box,
-					GtkWidget    *child,
-					gboolean      expand,
-					gboolean      fill,
-					guint	      padding);
-void	   gtk_box_pack_start_defaults (GtkBox	     *box,
-					GtkWidget    *widget);
-void	   gtk_box_pack_end_defaults   (GtkBox	     *box,
-					GtkWidget    *widget);
-void	   gtk_box_set_homogeneous     (GtkBox	     *box,
-					gboolean      homogeneous);
-gboolean   gtk_box_get_homogeneous     (GtkBox	     *box);
-void	   gtk_box_set_spacing	       (GtkBox	     *box,
-					gint	      spacing);
-gint       gtk_box_get_spacing         (GtkBox       *box);
-void	   gtk_box_reorder_child       (GtkBox	     *box,
-					GtkWidget    *child,
-					gint	      position);
-void	   gtk_box_query_child_packing (GtkBox	     *box,
-					GtkWidget    *child,
-					gboolean     *expand,
-					gboolean     *fill,
-					guint	     *padding,
-					GtkPackType  *pack_type);
-void	   gtk_box_set_child_packing   (GtkBox	     *box,
-					GtkWidget    *child,
-					gboolean      expand,
-					gboolean      fill,
-					guint	      padding,
-					GtkPackType   pack_type);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_BOX_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbuildable.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbuildable.h
deleted file mode 100644
index ee18fe8d..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbuildable.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2006-2007 Async Open Source,
- *                         Johan Dahlin <jdahlin@async.com.br>
- *
- * 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 __GTK_BUILDABLE_H__
-#define __GTK_BUILDABLE_H__
-
-#include <glib.h>
-#include <gtk/gtkbuilder.h>
-#include <gtk/gtktypeutils.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_BUILDABLE            (gtk_buildable_get_type ())
-#define GTK_BUILDABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BUILDABLE, GtkBuildable))
-#define GTK_BUILDABLE_CLASS(obj)      (G_TYPE_CHECK_CLASS_CAST ((obj), GTK_TYPE_BUILDABLE, GtkBuildableIface))
-#define GTK_IS_BUILDABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_BUILDABLE))
-#define GTK_BUILDABLE_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_BUILDABLE, GtkBuildableIface))
-
-typedef struct _GtkBuildable      GtkBuildable; /* Dummy typedef */
-typedef struct _GtkBuildableIface GtkBuildableIface;
-
-struct _GtkBuildableIface
-{
-  GTypeInterface g_iface;
-
-  /* virtual table */
-  void          (* set_name)               (GtkBuildable  *buildable,
-                                            const gchar   *name);
-  const gchar * (* get_name)               (GtkBuildable  *buildable);
-  void          (* add_child)              (GtkBuildable  *buildable,
-					    GtkBuilder    *builder,
-					    GObject       *child,
-					    const gchar   *type);
-  void          (* set_buildable_property) (GtkBuildable  *buildable,
-					    GtkBuilder    *builder,
-					    const gchar   *name,
-					    const GValue  *value);
-  GObject *     (* construct_child)        (GtkBuildable  *buildable,
-					    GtkBuilder    *builder,
-					    const gchar   *name);
-  gboolean      (* custom_tag_start)       (GtkBuildable  *buildable,
-					    GtkBuilder    *builder,
-					    GObject       *child,
-					    const gchar   *tagname,
-					    GMarkupParser *parser,
-					    gpointer      *data);
-  void          (* custom_tag_end)         (GtkBuildable  *buildable,
-					    GtkBuilder    *builder,
-					    GObject       *child,
-					    const gchar   *tagname,
-					    gpointer      *data);
-  void          (* custom_finished)        (GtkBuildable  *buildable,
-					    GtkBuilder    *builder,
-					    GObject       *child,
-					    const gchar   *tagname,
-					    gpointer       data);
-  void          (* parser_finished)        (GtkBuildable  *buildable,
-					    GtkBuilder    *builder);
-
-  GObject *     (* get_internal_child)     (GtkBuildable  *buildable,
-					    GtkBuilder    *builder,
-					    const gchar   *childname);
-};
-
-
-GType     gtk_buildable_get_type               (void) G_GNUC_CONST;
-
-void      gtk_buildable_set_name               (GtkBuildable        *buildable,
-						const gchar         *name);
-const gchar * gtk_buildable_get_name           (GtkBuildable        *buildable);
-void      gtk_buildable_add_child              (GtkBuildable        *buildable,
-						GtkBuilder          *builder,
-						GObject             *child,
-						const gchar         *type);
-void      gtk_buildable_set_buildable_property (GtkBuildable        *buildable,
-						GtkBuilder          *builder,
-						const gchar         *name,
-						const GValue        *value);
-GObject * gtk_buildable_construct_child        (GtkBuildable        *buildable,
-						GtkBuilder          *builder,
-						const gchar         *name);
-gboolean  gtk_buildable_custom_tag_start       (GtkBuildable        *buildable,
-						GtkBuilder          *builder,
-						GObject             *child,
-						const gchar         *tagname,
-						GMarkupParser       *parser,
-						gpointer            *data);
-void      gtk_buildable_custom_tag_end         (GtkBuildable        *buildable,
-						GtkBuilder          *builder,
-						GObject             *child,
-						const gchar         *tagname,
-						gpointer            *data);
-void      gtk_buildable_custom_finished        (GtkBuildable        *buildable,
-						GtkBuilder          *builder,
-						GObject             *child,
-						const gchar         *tagname,
-						gpointer             data);
-void      gtk_buildable_parser_finished        (GtkBuildable        *buildable,
-						GtkBuilder          *builder);
-GObject * gtk_buildable_get_internal_child     (GtkBuildable        *buildable,
-						GtkBuilder          *builder,
-						const gchar         *childname);
-
-G_END_DECLS
-
-#endif /* __GTK_BUILDABLE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbuilder.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbuilder.h
deleted file mode 100644
index 732acaa1..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbuilder.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2006-2007 Async Open Source,
- *                         Johan Dahlin <jdahlin@async.com.br>
- *
- * 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 __GTK_BUILDER_H__
-#define __GTK_BUILDER_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_BUILDER                 (gtk_builder_get_type ())
-#define GTK_BUILDER(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BUILDER, GtkBuilder))
-#define GTK_BUILDER_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_BUILDER, GtkBuilderClass))
-#define GTK_IS_BUILDER(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_BUILDER))
-#define GTK_IS_BUILDER_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_BUILDER))
-#define GTK_BUILDER_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_BUILDER, GtkBuilderClass))
-
-#define GTK_BUILDER_ERROR                (gtk_builder_error_quark ())
-
-typedef struct _GtkBuilder        GtkBuilder;
-typedef struct _GtkBuilderClass   GtkBuilderClass;
-typedef struct _GtkBuilderPrivate GtkBuilderPrivate;
-
-typedef enum
-{
-  GTK_BUILDER_ERROR_INVALID_TYPE_FUNCTION,
-  GTK_BUILDER_ERROR_UNHANDLED_TAG,
-  GTK_BUILDER_ERROR_MISSING_ATTRIBUTE,
-  GTK_BUILDER_ERROR_INVALID_ATTRIBUTE,
-  GTK_BUILDER_ERROR_INVALID_TAG,
-  GTK_BUILDER_ERROR_MISSING_PROPERTY_VALUE,
-  GTK_BUILDER_ERROR_INVALID_VALUE
-} GtkBuilderError;
-
-GQuark gtk_builder_error_quark (void);
-
-struct _GtkBuilder
-{
-  GObject parent_instance;
-
-  GtkBuilderPrivate *priv;
-};
-
-struct _GtkBuilderClass
-{
-  GObjectClass parent_class;
-  
-  GType (* get_type_from_name) (GtkBuilder *builder,
-                                const char *type_name);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-  void (*_gtk_reserved5) (void);
-  void (*_gtk_reserved6) (void);
-  void (*_gtk_reserved7) (void);
-  void (*_gtk_reserved8) (void);
-};
-
-typedef void (*GtkBuilderConnectFunc) (GtkBuilder    *builder,
-				       GObject       *object,
-				       const gchar   *signal_name,
-				       const gchar   *handler_name,
-				       GObject       *connect_object,
-				       GConnectFlags  flags,
-				       gpointer       user_data);
-
-GType        gtk_builder_get_type                (void) G_GNUC_CONST;
-GtkBuilder*  gtk_builder_new                     (void);
-
-guint        gtk_builder_add_from_file           (GtkBuilder    *builder,
-                                                  const gchar   *filename,
-                                                  GError       **error);
-guint        gtk_builder_add_from_string         (GtkBuilder    *builder,
-                                                  const gchar   *buffer,
-                                                  gsize          length,
-                                                  GError       **error);
-GObject*     gtk_builder_get_object              (GtkBuilder    *builder,
-                                                  const gchar   *name);
-GSList*      gtk_builder_get_objects             (GtkBuilder    *builder);
-void         gtk_builder_connect_signals         (GtkBuilder    *builder,
-						  gpointer       user_data);
-void         gtk_builder_connect_signals_full    (GtkBuilder    *builder,
-                                                  GtkBuilderConnectFunc func,
-						  gpointer       user_data);
-void         gtk_builder_set_translation_domain  (GtkBuilder   	*builder,
-                                                  const gchar  	*domain);
-const gchar* gtk_builder_get_translation_domain  (GtkBuilder   	*builder);
-GType        gtk_builder_get_type_from_name      (GtkBuilder   	*builder,
-                                                  const char   	*type_name);
-
-gboolean     gtk_builder_value_from_string       (GtkBuilder    *builder,
-						  GParamSpec   	*pspec,
-                                                  const gchar  	*string,
-                                                  GValue       	*value,
-						  GError       **error);
-gboolean     gtk_builder_value_from_string_type  (GtkBuilder    *builder,
-						  GType        	 type,
-                                                  const gchar  	*string,
-                                                  GValue       	*value,
-						  GError       **error);
-
-#define GTK_BUILDER_WARN_INVALID_CHILD_TYPE(object, type) \
-  g_warning ("'%s' is not a valid child type of '%s'", type, g_type_name (G_OBJECT_TYPE (type)))
-
-G_END_DECLS
-
-#endif /* __GTK_BUILDER_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbutton.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbutton.h
deleted file mode 100644
index c9fe63bc..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkbutton.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2001.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_BUTTON_H__
-#define __GTK_BUTTON_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkbin.h>
-#include <gtk/gtkenums.h>
-#include <gtk/gtkimage.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_BUTTON                 (gtk_button_get_type ())
-#define GTK_BUTTON(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BUTTON, GtkButton))
-#define GTK_BUTTON_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_BUTTON, GtkButtonClass))
-#define GTK_IS_BUTTON(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_BUTTON))
-#define GTK_IS_BUTTON_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_BUTTON))
-#define GTK_BUTTON_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_BUTTON, GtkButtonClass))
-
-typedef struct _GtkButton        GtkButton;
-typedef struct _GtkButtonClass   GtkButtonClass;
-
-struct _GtkButton
-{
-  GtkBin bin;
-
-  GdkWindow *event_window;
-
-  gchar *label_text;
-
-  guint activate_timeout;
-
-  guint constructed : 1;
-  guint in_button : 1;
-  guint button_down : 1;
-  guint relief : 2;
-  guint use_underline : 1;
-  guint use_stock : 1;
-  guint depressed : 1;
-  guint depress_on_activate : 1;
-  guint focus_on_click : 1;
-};
-
-struct _GtkButtonClass
-{
-  GtkBinClass        parent_class;
-  
-  void (* pressed)  (GtkButton *button);
-  void (* released) (GtkButton *button);
-  void (* clicked)  (GtkButton *button);
-  void (* enter)    (GtkButton *button);
-  void (* leave)    (GtkButton *button);
-  void (* activate) (GtkButton *button);
-  
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType          gtk_button_get_type          (void) G_GNUC_CONST;
-GtkWidget*     gtk_button_new               (void);
-GtkWidget*     gtk_button_new_with_label    (const gchar    *label);
-GtkWidget*     gtk_button_new_from_stock    (const gchar    *stock_id);
-GtkWidget*     gtk_button_new_with_mnemonic (const gchar    *label);
-void           gtk_button_pressed           (GtkButton      *button);
-void           gtk_button_released          (GtkButton      *button);
-void           gtk_button_clicked           (GtkButton      *button);
-void           gtk_button_enter             (GtkButton      *button);
-void           gtk_button_leave             (GtkButton      *button);
-
-void                  gtk_button_set_relief         (GtkButton      *button,
-						     GtkReliefStyle  newstyle);
-GtkReliefStyle        gtk_button_get_relief         (GtkButton      *button);
-void                  gtk_button_set_label          (GtkButton      *button,
-						     const gchar    *label);
-G_CONST_RETURN gchar *gtk_button_get_label          (GtkButton      *button);
-void                  gtk_button_set_use_underline  (GtkButton      *button,
-						     gboolean        use_underline);
-gboolean              gtk_button_get_use_underline  (GtkButton      *button);
-void                  gtk_button_set_use_stock      (GtkButton      *button,
-						     gboolean        use_stock);
-gboolean              gtk_button_get_use_stock      (GtkButton      *button);
-void                  gtk_button_set_focus_on_click (GtkButton      *button,
-						     gboolean        focus_on_click);
-gboolean              gtk_button_get_focus_on_click (GtkButton      *button);
-void                  gtk_button_set_alignment      (GtkButton      *button,
-						     gfloat          xalign,
-						     gfloat          yalign);
-void                  gtk_button_get_alignment      (GtkButton      *button,
-						     gfloat         *xalign,
-						     gfloat         *yalign);
-void                  gtk_button_set_image          (GtkButton      *button,
-					             GtkWidget      *image);
-GtkWidget*            gtk_button_get_image          (GtkButton      *button);
-void                  gtk_button_set_image_position (GtkButton      *button,
-						     GtkPositionType position);
-GtkPositionType       gtk_button_get_image_position (GtkButton      *button);
-
-void _gtk_button_set_depressed             (GtkButton     *button,
-					    gboolean       depressed);
-void _gtk_button_paint                     (GtkButton     *button,
-					    GdkRectangle  *area,
-					    GtkStateType   state_type,
-					    GtkShadowType  shadow_type,
-					    const gchar   *main_detail,
-					    const gchar   *default_detail);
-
-G_END_DECLS
-
-#endif /* __GTK_BUTTON_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcalendar.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcalendar.h
deleted file mode 100644
index 3115e0ee..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcalendar.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * GTK Calendar Widget
- * Copyright (C) 1998 Cesar Miquel and Shawn T. Amundson
- *
- * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_CALENDAR_H__
-#define __GTK_CALENDAR_H__
-
-#include <gdk/gdk.h>
-#include <gtk/gtkwidget.h>
-
-/* Not needed, retained for compatibility -Yosh */
-#include <gtk/gtksignal.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_CALENDAR                  (gtk_calendar_get_type ())
-#define GTK_CALENDAR(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CALENDAR, GtkCalendar))
-#define GTK_CALENDAR_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CALENDAR, GtkCalendarClass))
-#define GTK_IS_CALENDAR(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CALENDAR))
-#define GTK_IS_CALENDAR_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CALENDAR))
-#define GTK_CALENDAR_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CALENDAR, GtkCalendarClass))
-
-
-typedef struct _GtkCalendar	       GtkCalendar;
-typedef struct _GtkCalendarClass       GtkCalendarClass;
-
-typedef struct _GtkCalendarPrivate     GtkCalendarPrivate;
-
-typedef enum
-{
-  GTK_CALENDAR_SHOW_HEADING		= 1 << 0,
-  GTK_CALENDAR_SHOW_DAY_NAMES		= 1 << 1,
-  GTK_CALENDAR_NO_MONTH_CHANGE		= 1 << 2,
-  GTK_CALENDAR_SHOW_WEEK_NUMBERS	= 1 << 3,
-  GTK_CALENDAR_WEEK_START_MONDAY	= 1 << 4
-} GtkCalendarDisplayOptions;
-
-struct _GtkCalendar
-{
-  GtkWidget widget;
-  
-  GtkStyle  *header_style;
-  GtkStyle  *label_style;
-  
-  gint month;
-  gint year;
-  gint selected_day;
-  
-  gint day_month[6][7];
-  gint day[6][7];
-  
-  gint num_marked_dates;
-  gint marked_date[31];
-  GtkCalendarDisplayOptions  display_flags;
-  GdkColor marked_date_color[31];
-  
-  GdkGC *gc;			/* unused */
-  GdkGC *xor_gc;		/* unused */
-
-  gint focus_row;
-  gint focus_col;
-
-  gint highlight_row;
-  gint highlight_col;
-  
-  GtkCalendarPrivate *priv;
-  gchar grow_space [32];
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-struct _GtkCalendarClass
-{
-  GtkWidgetClass parent_class;
-  
-  /* Signal handlers */
-  void (* month_changed)		(GtkCalendar *calendar);
-  void (* day_selected)			(GtkCalendar *calendar);
-  void (* day_selected_double_click)	(GtkCalendar *calendar);
-  void (* prev_month)			(GtkCalendar *calendar);
-  void (* next_month)			(GtkCalendar *calendar);
-  void (* prev_year)			(GtkCalendar *calendar);
-  void (* next_year)			(GtkCalendar *calendar);
-  
-};
-
-
-GType	   gtk_calendar_get_type	(void) G_GNUC_CONST;
-GtkWidget* gtk_calendar_new		(void);
-
-gboolean   gtk_calendar_select_month	(GtkCalendar *calendar, 
-					 guint	      month,
-					 guint	      year);
-void	   gtk_calendar_select_day	(GtkCalendar *calendar,
-					 guint	      day);
-
-gboolean   gtk_calendar_mark_day	(GtkCalendar *calendar,
-					 guint	      day);
-gboolean   gtk_calendar_unmark_day	(GtkCalendar *calendar,
-					 guint	      day);
-void	   gtk_calendar_clear_marks	(GtkCalendar *calendar);
-
-
-void	   gtk_calendar_set_display_options (GtkCalendar    	      *calendar,
-					     GtkCalendarDisplayOptions flags);
-GtkCalendarDisplayOptions
-           gtk_calendar_get_display_options (GtkCalendar   	      *calendar);
-#ifndef GTK_DISABLE_DEPRECATED
-void	   gtk_calendar_display_options (GtkCalendar		  *calendar,
-					 GtkCalendarDisplayOptions flags);
-#endif
-
-void	   gtk_calendar_get_date	(GtkCalendar *calendar, 
-					 guint	     *year,
-					 guint	     *month,
-					 guint	     *day);
-#ifndef GTK_DISABLE_DEPRECATED
-void	   gtk_calendar_freeze		(GtkCalendar *calendar);
-void	   gtk_calendar_thaw		(GtkCalendar *calendar);
-#endif
-
-G_END_DECLS
-
-#endif /* __GTK_CALENDAR_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcelleditable.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcelleditable.h
deleted file mode 100644
index 10cde8e8..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcelleditable.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* gtkcelleditable.h
- * 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 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 __GTK_CELL_EDITABLE_H__
-#define __GTK_CELL_EDITABLE_H__
-
-#include <gtk/gtkwidget.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_CELL_EDITABLE            (gtk_cell_editable_get_type ())
-#define GTK_CELL_EDITABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_EDITABLE, GtkCellEditable))
-#define GTK_CELL_EDITABLE_CLASS(obj)      (G_TYPE_CHECK_CLASS_CAST ((obj), GTK_TYPE_CELL_EDITABLE, GtkCellEditableIface))
-#define GTK_IS_CELL_EDITABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_EDITABLE))
-#define GTK_CELL_EDITABLE_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_CELL_EDITABLE, GtkCellEditableIface))
-
-typedef struct _GtkCellEditable      GtkCellEditable; /* Dummy typedef */
-typedef struct _GtkCellEditableIface GtkCellEditableIface;
-
-struct _GtkCellEditableIface
-{
-  GTypeInterface g_iface;
-
-  /* signals */
-  void (* editing_done)  (GtkCellEditable *cell_editable);
-  void (* remove_widget) (GtkCellEditable *cell_editable);
-
-  /* virtual table */
-  void (* start_editing) (GtkCellEditable *cell_editable,
-			  GdkEvent        *event);
-};
-
-
-GType gtk_cell_editable_get_type      (void) G_GNUC_CONST;
-
-void  gtk_cell_editable_start_editing (GtkCellEditable *cell_editable,
-				       GdkEvent        *event);
-void  gtk_cell_editable_editing_done  (GtkCellEditable *cell_editable);
-void  gtk_cell_editable_remove_widget (GtkCellEditable *cell_editable);
-
-
-G_END_DECLS
-
-#endif /* __GTK_CELL_EDITABLE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcelllayout.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcelllayout.h
deleted file mode 100644
index 3f03687a..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcelllayout.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* gtkcelllayout.h
- * Copyright (C) 2003  Kristian Rietveld  <kris@gtk.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 __GTK_CELL_LAYOUT_H__
-#define __GTK_CELL_LAYOUT_H__
-
-#include <glib-object.h>
-
-#include <gtk/gtkcellrenderer.h>
-#include <gtk/gtktreeviewcolumn.h>
-#include <gtk/gtkbuildable.h>
-#include <gtk/gtkbuilder.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_CELL_LAYOUT            (gtk_cell_layout_get_type ())
-#define GTK_CELL_LAYOUT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_LAYOUT, GtkCellLayout))
-#define GTK_IS_CELL_LAYOUT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_LAYOUT))
-#define GTK_CELL_LAYOUT_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_CELL_LAYOUT, GtkCellLayoutIface))
-
-typedef struct _GtkCellLayout           GtkCellLayout; /* dummy typedef */
-typedef struct _GtkCellLayoutIface      GtkCellLayoutIface;
-
-/* keep in sync with GtkTreeCellDataFunc */
-typedef void (* GtkCellLayoutDataFunc) (GtkCellLayout   *cell_layout,
-                                        GtkCellRenderer *cell,
-                                        GtkTreeModel    *tree_model,
-                                        GtkTreeIter     *iter,
-                                        gpointer         data);
-
-struct _GtkCellLayoutIface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-  void (* pack_start)         (GtkCellLayout         *cell_layout,
-                               GtkCellRenderer       *cell,
-                               gboolean               expand);
-  void (* pack_end)           (GtkCellLayout         *cell_layout,
-                               GtkCellRenderer       *cell,
-                               gboolean               expand);
-  void (* clear)              (GtkCellLayout         *cell_layout);
-  void (* add_attribute)      (GtkCellLayout         *cell_layout,
-                               GtkCellRenderer       *cell,
-                               const gchar           *attribute,
-                               gint                   column);
-  void (* set_cell_data_func) (GtkCellLayout         *cell_layout,
-                               GtkCellRenderer       *cell,
-                               GtkCellLayoutDataFunc  func,
-                               gpointer               func_data,
-                               GDestroyNotify         destroy);
-  void (* clear_attributes)   (GtkCellLayout         *cell_layout,
-                               GtkCellRenderer       *cell);
-  void (* reorder)            (GtkCellLayout         *cell_layout,
-                               GtkCellRenderer       *cell,
-                               gint                   position);
-  GList* (* get_cells)        (GtkCellLayout         *cell_layout);
-};
-
-GType gtk_cell_layout_get_type           (void) G_GNUC_CONST;
-void  gtk_cell_layout_pack_start         (GtkCellLayout         *cell_layout,
-                                          GtkCellRenderer       *cell,
-                                          gboolean               expand);
-void  gtk_cell_layout_pack_end           (GtkCellLayout         *cell_layout,
-                                          GtkCellRenderer       *cell,
-                                          gboolean               expand);
-GList *gtk_cell_layout_get_cells         (GtkCellLayout         *cell_layout);
-void  gtk_cell_layout_clear              (GtkCellLayout         *cell_layout);
-void  gtk_cell_layout_set_attributes     (GtkCellLayout         *cell_layout,
-                                          GtkCellRenderer       *cell,
-                                          ...) G_GNUC_NULL_TERMINATED;
-void  gtk_cell_layout_add_attribute      (GtkCellLayout         *cell_layout,
-                                          GtkCellRenderer       *cell,
-                                          const gchar           *attribute,
-                                          gint                   column);
-void  gtk_cell_layout_set_cell_data_func (GtkCellLayout         *cell_layout,
-                                          GtkCellRenderer       *cell,
-                                          GtkCellLayoutDataFunc  func,
-                                          gpointer               func_data,
-                                          GDestroyNotify         destroy);
-void  gtk_cell_layout_clear_attributes   (GtkCellLayout         *cell_layout,
-                                          GtkCellRenderer       *cell);
-void  gtk_cell_layout_reorder            (GtkCellLayout         *cell_layout,
-                                          GtkCellRenderer       *cell,
-                                          gint                   position);
-gboolean _gtk_cell_layout_buildable_custom_tag_start (GtkBuildable  *buildable,
-						      GtkBuilder    *builder,
-						      GObject       *child,
-						      const gchar   *tagname,
-						      GMarkupParser *parser,
-						      gpointer      *data);
-void _gtk_cell_layout_buildable_custom_tag_end       (GtkBuildable  *buildable,
-						      GtkBuilder    *builder,
-						      GObject       *child,
-						      const gchar   *tagname,
-						      gpointer      *data);
-void _gtk_cell_layout_buildable_add_child            (GtkBuildable  *buildable,
-						      GtkBuilder    *builder,
-						      GObject       *child,
-						      const gchar   *type);
-
-G_END_DECLS
-
-#endif /* __GTK_CELL_LAYOUT_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrenderer.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrenderer.h
deleted file mode 100644
index 375106ac..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrenderer.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/* gtkcellrenderer.h
- * Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb@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 __GTK_CELL_RENDERER_H__
-#define __GTK_CELL_RENDERER_H__
-
-#include <gtk/gtkobject.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkcelleditable.h>
-
-G_BEGIN_DECLS
-
-typedef enum
-{
-  GTK_CELL_RENDERER_SELECTED    = 1 << 0,
-  GTK_CELL_RENDERER_PRELIT      = 1 << 1,
-  GTK_CELL_RENDERER_INSENSITIVE = 1 << 2,
-  /* this flag means the cell is in the sort column/row */
-  GTK_CELL_RENDERER_SORTED      = 1 << 3,
-  GTK_CELL_RENDERER_FOCUSED     = 1 << 4
-} GtkCellRendererState;
-
-typedef enum
-{
-  GTK_CELL_RENDERER_MODE_INERT,
-  GTK_CELL_RENDERER_MODE_ACTIVATABLE,
-  GTK_CELL_RENDERER_MODE_EDITABLE
-} GtkCellRendererMode;
-
-#define GTK_TYPE_CELL_RENDERER		  (gtk_cell_renderer_get_type ())
-#define GTK_CELL_RENDERER(obj)		  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_RENDERER, GtkCellRenderer))
-#define GTK_CELL_RENDERER_CLASS(klass)	  (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER, GtkCellRendererClass))
-#define GTK_IS_CELL_RENDERER(obj)	  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_RENDERER))
-#define GTK_IS_CELL_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER))
-#define GTK_CELL_RENDERER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER, GtkCellRendererClass))
-
-typedef struct _GtkCellRenderer GtkCellRenderer;
-typedef struct _GtkCellRendererClass GtkCellRendererClass;
-
-struct _GtkCellRenderer
-{
-  GtkObject parent;
-
-  gfloat xalign;
-  gfloat yalign;
-
-  gint width;
-  gint height;
-
-  guint16 xpad;
-  guint16 ypad;
-
-  guint mode : 2;
-  guint visible : 1;
-  guint is_expander : 1;
-  guint is_expanded : 1;
-  guint cell_background_set : 1;
-  guint sensitive : 1;
-  guint editing : 1;
-};
-
-struct _GtkCellRendererClass
-{
-  GtkObjectClass parent_class;
-
-  /* vtable - not signals */
-  void             (* get_size)      (GtkCellRenderer      *cell,
-				      GtkWidget            *widget,
-				      GdkRectangle         *cell_area,
-				      gint                 *x_offset,
-				      gint                 *y_offset,
-				      gint                 *width,
-				      gint                 *height);
-  void             (* render)        (GtkCellRenderer      *cell,
-				      GdkDrawable          *window,
-				      GtkWidget            *widget,
-				      GdkRectangle         *background_area,
-				      GdkRectangle         *cell_area,
-				      GdkRectangle         *expose_area,
-				      GtkCellRendererState  flags);
-  gboolean         (* activate)      (GtkCellRenderer      *cell,
-				      GdkEvent             *event,
-				      GtkWidget            *widget,
-				      const gchar          *path,
-				      GdkRectangle         *background_area,
-				      GdkRectangle         *cell_area,
-				      GtkCellRendererState  flags);
-  GtkCellEditable *(* start_editing) (GtkCellRenderer      *cell,
-				      GdkEvent             *event,
-				      GtkWidget            *widget,
-				      const gchar          *path,
-				      GdkRectangle         *background_area,
-				      GdkRectangle         *cell_area,
-				      GtkCellRendererState  flags);
-
-  /* Signals */
-  void (* editing_canceled) (GtkCellRenderer *cell);
-  void (* editing_started)  (GtkCellRenderer *cell,
-			     GtkCellEditable *editable,
-			     const gchar     *path);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-};
-
-GType            gtk_cell_renderer_get_type       (void) G_GNUC_CONST;
-
-void             gtk_cell_renderer_get_size       (GtkCellRenderer      *cell,
-						   GtkWidget            *widget,
-						   GdkRectangle         *cell_area,
-						   gint                 *x_offset,
-						   gint                 *y_offset,
-						   gint                 *width,
-						   gint                 *height);
-void             gtk_cell_renderer_render         (GtkCellRenderer      *cell,
-						   GdkWindow            *window,
-						   GtkWidget            *widget,
-						   GdkRectangle         *background_area,
-						   GdkRectangle         *cell_area,
-						   GdkRectangle         *expose_area,
-						   GtkCellRendererState  flags);
-gboolean         gtk_cell_renderer_activate       (GtkCellRenderer      *cell,
-						   GdkEvent             *event,
-						   GtkWidget            *widget,
-						   const gchar          *path,
-						   GdkRectangle         *background_area,
-						   GdkRectangle         *cell_area,
-						   GtkCellRendererState  flags);
-GtkCellEditable *gtk_cell_renderer_start_editing  (GtkCellRenderer      *cell,
-						   GdkEvent             *event,
-						   GtkWidget            *widget,
-						   const gchar          *path,
-						   GdkRectangle         *background_area,
-						   GdkRectangle         *cell_area,
-						   GtkCellRendererState  flags);
-void             gtk_cell_renderer_set_fixed_size (GtkCellRenderer      *cell,
-						   gint                  width,
-						   gint                  height);
-void             gtk_cell_renderer_get_fixed_size (GtkCellRenderer      *cell,
-						   gint                 *width,
-						   gint                 *height);
-
-/* For use by cell renderer implementations only */
-#ifndef GTK_DISABLE_DEPRECATED
-void gtk_cell_renderer_editing_canceled (GtkCellRenderer *cell);
-#endif
-void gtk_cell_renderer_stop_editing     (GtkCellRenderer *cell,
-				         gboolean         canceled);
-
-
-G_END_DECLS
-
-#endif /* __GTK_CELL_RENDERER_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrendereraccel.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrendereraccel.h
deleted file mode 100644
index d9fd1d11..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrendereraccel.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* gtkcellrendereraccel.h
- * Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb@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 __GTK_CELL_RENDERER_ACCEL_H__
-#define __GTK_CELL_RENDERER_ACCEL_H__
-
-#include "gtkcellrenderertext.h"
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_CELL_RENDERER_ACCEL		(gtk_cell_renderer_accel_get_type ())
-#define GTK_CELL_RENDERER_ACCEL(obj)		(GTK_CHECK_CAST ((obj), GTK_TYPE_CELL_RENDERER_ACCEL, GtkCellRendererAccel))
-#define GTK_CELL_RENDERER_ACCEL_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_ACCEL, GtkCellRendererAccelClass))
-#define GTK_IS_CELL_RENDERER_ACCEL(obj)		(GTK_CHECK_TYPE ((obj), GTK_TYPE_CELL_RENDERER_ACCEL))
-#define GTK_IS_CELL_RENDERER_ACCEL_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_ACCEL))
-#define GTK_CELL_RENDERER_ACCEL_GET_CLASS(obj)   (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_ACCEL, GtkCellRendererAccelClass))
-
-typedef struct _GtkCellRendererAccel      GtkCellRendererAccel;
-typedef struct _GtkCellRendererAccelClass GtkCellRendererAccelClass;
-
-
-typedef enum
-{
-  GTK_CELL_RENDERER_ACCEL_MODE_GTK,
-  GTK_CELL_RENDERER_ACCEL_MODE_OTHER
-} GtkCellRendererAccelMode;
-
-
-struct _GtkCellRendererAccel
-{
-  GtkCellRendererText parent;
-
-  /*< private >*/
-  guint accel_key;
-  GdkModifierType accel_mods;
-  guint keycode;
-  GtkCellRendererAccelMode accel_mode;
-
-  GtkWidget *edit_widget;
-  GtkWidget *grab_widget;
-  GtkWidget *sizing_label;
-};
-
-struct _GtkCellRendererAccelClass
-{
-  GtkCellRendererTextClass parent_class;
-
-  void (* accel_edited)  (GtkCellRendererAccel *accel,
-		 	  const gchar          *path_string,
-			  guint                 accel_key,
-			  GdkModifierType       accel_mods,
-			  guint                 hardware_keycode);
-
-  void (* accel_cleared) (GtkCellRendererAccel *accel,
-			  const gchar          *path_string);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved0) (void);
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType            gtk_cell_renderer_accel_get_type        (void) G_GNUC_CONST;
-GtkCellRenderer *gtk_cell_renderer_accel_new             (void);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_CELL_RENDERER_ACCEL_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrenderercombo.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrenderercombo.h
deleted file mode 100644
index 2c35d096..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrenderercombo.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* GtkCellRendererCombo
- * Copyright (C) 2004 Lorenzo Gil Sanchez
- *
- * 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 __GTK_CELL_RENDERER_COMBO_H__
-#define __GTK_CELL_RENDERER_COMBO_H__
-
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtkcellrenderertext.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_CELL_RENDERER_COMBO		(gtk_cell_renderer_combo_get_type ())
-#define GTK_CELL_RENDERER_COMBO(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_RENDERER_COMBO, GtkCellRendererCombo))
-#define GTK_CELL_RENDERER_COMBO_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_COMBO, GtkCellRendererComboClass))
-#define GTK_IS_CELL_RENDERER_COMBO(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_RENDERER_COMBO))
-#define GTK_IS_CELL_RENDERER_COMBO_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_COMBO))
-#define GTK_CELL_RENDERER_COMBO_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_COMBO, GtkCellRendererTextClass))
-						 
-typedef struct _GtkCellRendererCombo GtkCellRendererCombo;
-typedef struct _GtkCellRendererComboClass GtkCellRendererComboClass;
-
-struct _GtkCellRendererCombo
-{
-  GtkCellRendererText parent;
-
-  GtkTreeModel *model;
-  gint          text_column;
-  gboolean      has_entry;
-  
-  /*< private >*/
-  guint         focus_out_id;
-};
-
-struct _GtkCellRendererComboClass
-{
-  GtkCellRendererTextClass parent;
-};
-
-GType            gtk_cell_renderer_combo_get_type (void) G_GNUC_CONST;
-GtkCellRenderer *gtk_cell_renderer_combo_new      (void);
-
-G_END_DECLS
-
-#endif
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrendererpixbuf.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrendererpixbuf.h
deleted file mode 100644
index b479c9c7..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrendererpixbuf.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* gtkcellrendererpixbuf.h
- * Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb@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 __GTK_CELL_RENDERER_PIXBUF_H__
-#define __GTK_CELL_RENDERER_PIXBUF_H__
-
-#include <gtk/gtkcellrenderer.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_CELL_RENDERER_PIXBUF			(gtk_cell_renderer_pixbuf_get_type ())
-#define GTK_CELL_RENDERER_PIXBUF(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_RENDERER_PIXBUF, GtkCellRendererPixbuf))
-#define GTK_CELL_RENDERER_PIXBUF_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_PIXBUF, GtkCellRendererPixbufClass))
-#define GTK_IS_CELL_RENDERER_PIXBUF(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_RENDERER_PIXBUF))
-#define GTK_IS_CELL_RENDERER_PIXBUF_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_PIXBUF))
-#define GTK_CELL_RENDERER_PIXBUF_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_PIXBUF, GtkCellRendererPixbufClass))
-
-typedef struct _GtkCellRendererPixbuf GtkCellRendererPixbuf;
-typedef struct _GtkCellRendererPixbufClass GtkCellRendererPixbufClass;
-
-struct _GtkCellRendererPixbuf
-{
-  GtkCellRenderer parent;
-
-  /*< private >*/
-  GdkPixbuf *pixbuf;
-  GdkPixbuf *pixbuf_expander_open;
-  GdkPixbuf *pixbuf_expander_closed;
-};
-
-struct _GtkCellRendererPixbufClass
-{
-  GtkCellRendererClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType            gtk_cell_renderer_pixbuf_get_type (void) G_GNUC_CONST;
-GtkCellRenderer *gtk_cell_renderer_pixbuf_new      (void);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_CELL_RENDERER_PIXBUF_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrendererprogress.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrendererprogress.h
deleted file mode 100644
index 6e84cd0e..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrendererprogress.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* gtkcellrendererprogress.h
- * Copyright (C) 2002 Naba Kumar <kh_naba@users.sourceforge.net>
- * modified by Jörgen Scheibengruber <mfcn@gmx.de>
- *
- * 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.
- */
-/*
- * Modified by the GTK+ Team and others 1997-2004.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_CELL_RENDERER_PROGRESS_H__
-#define __GTK_CELL_RENDERER_PROGRESS_H__
-
-#include <gtk/gtkcellrenderer.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_CELL_RENDERER_PROGRESS (gtk_cell_renderer_progress_get_type ())
-#define GTK_CELL_RENDERER_PROGRESS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_RENDERER_PROGRESS, GtkCellRendererProgress))
-#define GTK_CELL_RENDERER_PROGRESS_CLASS(klass)	  (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_PROGRESS, GtkCellRendererProgressClass))
-#define GTK_IS_CELL_RENDERER_PROGRESS(obj)	  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_RENDERER_PROGRESS))
-#define GTK_IS_CELL_RENDERER_PROGRESS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_PROGRESS))
-#define GTK_CELL_RENDERER_PROGRESS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_PROGRESS, GtkCellRendererProgressClass))
-
-typedef struct _GtkCellRendererProgress         GtkCellRendererProgress;
-typedef struct _GtkCellRendererProgressClass    GtkCellRendererProgressClass;
-typedef struct _GtkCellRendererProgressPrivate  GtkCellRendererProgressPrivate;
-
-struct _GtkCellRendererProgress
-{
-  GtkCellRenderer parent_instance;
-  
-  /*< private >*/
-  GtkCellRendererProgressPrivate *priv;
-};
-
-struct _GtkCellRendererProgressClass
-{
-  GtkCellRendererClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType		 gtk_cell_renderer_progress_get_type (void) G_GNUC_CONST;
-GtkCellRenderer* gtk_cell_renderer_progress_new      (void);
-
-G_END_DECLS
-
-#endif  /* __GTK_CELL_RENDERER_PROGRESS_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrendererspin.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrendererspin.h
deleted file mode 100644
index 35c2bff4..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrendererspin.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* GtkCellRendererSpin
- * Copyright (C) 2004 Lorenzo Gil Sanchez
- *
- * 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 __GTK_CELL_RENDERER_SPIN_H__
-#define __GTK_CELL_RENDERER_SPIN_H__
-
-#include <gtk/gtkcellrenderertext.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_CELL_RENDERER_SPIN		(gtk_cell_renderer_spin_get_type ())
-#define GTK_CELL_RENDERER_SPIN(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_RENDERER_SPIN, GtkCellRendererSpin))
-#define GTK_CELL_RENDERER_SPIN_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_SPIN, GtkCellRendererSpinClass))
-#define GTK_IS_CELL_RENDERER_SPIN(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_RENDERER_SPIN))
-#define GTK_IS_CELL_RENDERER_SPIN_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_SPIN))
-#define GTK_CELL_RENDERER_SPIN_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_SPIN, GtkCellRendererTextClass))
-						 
-typedef struct _GtkCellRendererSpin GtkCellRendererSpin;
-typedef struct _GtkCellRendererSpinClass GtkCellRendererSpinClass;
-typedef struct _GtkCellRendererSpinPrivate GtkCellRendererSpinPrivate;
-
-struct _GtkCellRendererSpin
-{
-  GtkCellRendererText parent;
-};
-
-struct _GtkCellRendererSpinClass
-{
-  GtkCellRendererTextClass parent;
-};
-
-GType            gtk_cell_renderer_spin_get_type (void);
-GtkCellRenderer *gtk_cell_renderer_spin_new      (void);
-
-G_END_DECLS
-
-#endif  /* __GTK_CELL_RENDERER_SPIN_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrenderertext.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrenderertext.h
deleted file mode 100644
index fef52adf..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrenderertext.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* gtkcellrenderertext.h
- * Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb@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 __GTK_CELL_RENDERER_TEXT_H__
-#define __GTK_CELL_RENDERER_TEXT_H__
-
-#include <pango/pango.h>
-#include <gtk/gtkcellrenderer.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_CELL_RENDERER_TEXT		(gtk_cell_renderer_text_get_type ())
-#define GTK_CELL_RENDERER_TEXT(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_RENDERER_TEXT, GtkCellRendererText))
-#define GTK_CELL_RENDERER_TEXT_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_TEXT, GtkCellRendererTextClass))
-#define GTK_IS_CELL_RENDERER_TEXT(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_RENDERER_TEXT))
-#define GTK_IS_CELL_RENDERER_TEXT_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_TEXT))
-#define GTK_CELL_RENDERER_TEXT_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_TEXT, GtkCellRendererTextClass))
-
-typedef struct _GtkCellRendererText      GtkCellRendererText;
-typedef struct _GtkCellRendererTextClass GtkCellRendererTextClass;
-
-struct _GtkCellRendererText
-{
-  GtkCellRenderer parent;
-
-  /*< private >*/
-  gchar *text;
-  PangoFontDescription *font;
-  gdouble font_scale;
-  PangoColor foreground;
-  PangoColor background;
-  
-  PangoAttrList *extra_attrs;
-
-  PangoUnderline underline_style;
-
-  gint rise;
-  gint fixed_height_rows;
-
-  guint strikethrough : 1;
-
-  guint editable  : 1;
-
-  guint scale_set : 1;
-  
-  guint foreground_set : 1;
-  guint background_set : 1;
-  
-  guint underline_set : 1;
-
-  guint rise_set : 1;
-  
-  guint strikethrough_set : 1;
-
-  guint editable_set : 1;
-  guint calc_fixed_height : 1;
-};
-
-struct _GtkCellRendererTextClass
-{
-  GtkCellRendererClass parent_class;
-
-  void (* edited) (GtkCellRendererText *cell_renderer_text,
-		   const gchar         *path,
-		   const gchar         *new_text);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType            gtk_cell_renderer_text_get_type (void) G_GNUC_CONST;
-GtkCellRenderer *gtk_cell_renderer_text_new      (void);
-
-void             gtk_cell_renderer_text_set_fixed_height_from_font (GtkCellRendererText *renderer,
-								    gint                 number_of_rows);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_CELL_RENDERER_TEXT_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrenderertoggle.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrenderertoggle.h
deleted file mode 100644
index 302909bd..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellrenderertoggle.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* gtkcellrenderertoggle.h
- * Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb@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 __GTK_CELL_RENDERER_TOGGLE_H__
-#define __GTK_CELL_RENDERER_TOGGLE_H__
-
-#include <gtk/gtkcellrenderer.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_CELL_RENDERER_TOGGLE			(gtk_cell_renderer_toggle_get_type ())
-#define GTK_CELL_RENDERER_TOGGLE(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_RENDERER_TOGGLE, GtkCellRendererToggle))
-#define GTK_CELL_RENDERER_TOGGLE_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_TOGGLE, GtkCellRendererToggleClass))
-#define GTK_IS_CELL_RENDERER_TOGGLE(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_RENDERER_TOGGLE))
-#define GTK_IS_CELL_RENDERER_TOGGLE_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_TOGGLE))
-#define GTK_CELL_RENDERER_TOGGLE_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_TOGGLE, GtkCellRendererToggleClass))
-
-typedef struct _GtkCellRendererToggle GtkCellRendererToggle;
-typedef struct _GtkCellRendererToggleClass GtkCellRendererToggleClass;
-
-struct _GtkCellRendererToggle
-{
-  GtkCellRenderer parent;
-
-  /*< private >*/
-  guint active : 1;
-  guint activatable : 1;
-  guint radio : 1;
-};
-
-struct _GtkCellRendererToggleClass
-{
-  GtkCellRendererClass parent_class;
-
-  void (* toggled) (GtkCellRendererToggle *cell_renderer_toggle,
-		    const gchar                 *path);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType            gtk_cell_renderer_toggle_get_type  (void) G_GNUC_CONST;
-GtkCellRenderer *gtk_cell_renderer_toggle_new       (void);
-
-gboolean         gtk_cell_renderer_toggle_get_radio (GtkCellRendererToggle *toggle);
-void             gtk_cell_renderer_toggle_set_radio (GtkCellRendererToggle *toggle,
-						     gboolean               radio);
-
-gboolean        gtk_cell_renderer_toggle_get_active (GtkCellRendererToggle *toggle);
-void            gtk_cell_renderer_toggle_set_active (GtkCellRendererToggle *toggle,
-                                                     gboolean               setting);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_CELL_RENDERER_TOGGLE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellview.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellview.h
deleted file mode 100644
index 6a79c3ab..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcellview.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* gtkcellview.h
- * Copyright (C) 2002, 2003  Kristian Rietveld <kris@gtk.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 __GTK_CELL_VIEW_H__
-#define __GTK_CELL_VIEW_H__
-
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkcellrenderer.h>
-#include <gtk/gtktreemodel.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_CELL_VIEW                (gtk_cell_view_get_type ())
-#define GTK_CELL_VIEW(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_VIEW, GtkCellView))
-#define GTK_CELL_VIEW_CLASS(vtable)       (G_TYPE_CHECK_CLASS_CAST ((vtable), GTK_TYPE_CELL_VIEW, GtkCellViewClass))
-#define GTK_IS_CELL_VIEW(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_VIEW))
-#define GTK_IS_CELL_VIEW_CLASS(vtable)    (G_TYPE_CHECK_CLASS_TYPE ((vtable), GTK_TYPE_CELL_VIEW))
-#define GTK_CELL_VIEW_GET_CLASS(inst)     (G_TYPE_INSTANCE_GET_CLASS ((inst), GTK_TYPE_CELL_VIEW, GtkCellViewClass))
-
-typedef struct _GtkCellView             GtkCellView;
-typedef struct _GtkCellViewClass        GtkCellViewClass;
-typedef struct _GtkCellViewPrivate      GtkCellViewPrivate;
-
-struct _GtkCellView
-{
-  GtkWidget parent_instance;
-
-  /*< private >*/
-  GtkCellViewPrivate *priv;
-};
-
-struct _GtkCellViewClass
-{
-  GtkWidgetClass parent_class;
-};
-
-GType             gtk_cell_view_get_type               (void) G_GNUC_CONST;
-GtkWidget        *gtk_cell_view_new                    (void);
-GtkWidget        *gtk_cell_view_new_with_text          (const gchar     *text);
-GtkWidget        *gtk_cell_view_new_with_markup        (const gchar     *markup);
-GtkWidget        *gtk_cell_view_new_with_pixbuf        (GdkPixbuf       *pixbuf);
-
-void              gtk_cell_view_set_model               (GtkCellView     *cell_view,
-                                                         GtkTreeModel    *model);
-void              gtk_cell_view_set_displayed_row       (GtkCellView     *cell_view,
-                                                         GtkTreePath     *path);
-GtkTreePath      *gtk_cell_view_get_displayed_row       (GtkCellView     *cell_view);
-gboolean          gtk_cell_view_get_size_of_row         (GtkCellView     *cell_view,
-                                                         GtkTreePath     *path,
-                                                         GtkRequisition  *requisition);
-
-void              gtk_cell_view_set_background_color    (GtkCellView     *cell_view,
-                                                         const GdkColor  *color);
-GList            *gtk_cell_view_get_cell_renderers      (GtkCellView     *cell_view);
-
-G_END_DECLS
-
-#endif /* __GTK_CELL_VIEW_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcheckbutton.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcheckbutton.h
deleted file mode 100644
index 106bf546..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcheckbutton.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_CHECK_BUTTON_H__
-#define __GTK_CHECK_BUTTON_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtktogglebutton.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_CHECK_BUTTON                  (gtk_check_button_get_type ())
-#define GTK_CHECK_BUTTON(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CHECK_BUTTON, GtkCheckButton))
-#define GTK_CHECK_BUTTON_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CHECK_BUTTON, GtkCheckButtonClass))
-#define GTK_IS_CHECK_BUTTON(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CHECK_BUTTON))
-#define GTK_IS_CHECK_BUTTON_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CHECK_BUTTON))
-#define GTK_CHECK_BUTTON_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CHECK_BUTTON, GtkCheckButtonClass))
-
-
-typedef struct _GtkCheckButton       GtkCheckButton;
-typedef struct _GtkCheckButtonClass  GtkCheckButtonClass;
-
-struct _GtkCheckButton
-{
-  GtkToggleButton toggle_button;
-};
-
-struct _GtkCheckButtonClass
-{
-  GtkToggleButtonClass parent_class;
-
-  void (* draw_indicator) (GtkCheckButton *check_button,
-			   GdkRectangle   *area);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType      gtk_check_button_get_type       (void) G_GNUC_CONST;
-GtkWidget* gtk_check_button_new               (void);
-GtkWidget* gtk_check_button_new_with_label    (const gchar *label);
-GtkWidget* gtk_check_button_new_with_mnemonic (const gchar *label);
-
-void _gtk_check_button_get_props (GtkCheckButton *check_button,
-				  gint           *indicator_size,
-				  gint           *indicator_spacing);
-
-G_END_DECLS
-
-#endif /* __GTK_CHECK_BUTTON_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcheckmenuitem.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcheckmenuitem.h
deleted file mode 100644
index 6db552fc..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcheckmenuitem.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2001.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_CHECK_MENU_ITEM_H__
-#define __GTK_CHECK_MENU_ITEM_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkmenuitem.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_CHECK_MENU_ITEM            (gtk_check_menu_item_get_type ())
-#define GTK_CHECK_MENU_ITEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CHECK_MENU_ITEM, GtkCheckMenuItem))
-#define GTK_CHECK_MENU_ITEM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CHECK_MENU_ITEM, GtkCheckMenuItemClass))
-#define GTK_IS_CHECK_MENU_ITEM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CHECK_MENU_ITEM))
-#define GTK_IS_CHECK_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CHECK_MENU_ITEM))
-#define GTK_CHECK_MENU_ITEM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CHECK_MENU_ITEM, GtkCheckMenuItemClass))
-
-
-typedef struct _GtkCheckMenuItem       GtkCheckMenuItem;
-typedef struct _GtkCheckMenuItemClass  GtkCheckMenuItemClass;
-
-struct _GtkCheckMenuItem
-{
-  GtkMenuItem menu_item;
-  
-  guint active : 1;
-  guint always_show_toggle : 1;
-  guint inconsistent : 1;
-  guint draw_as_radio : 1;
-};
-
-struct _GtkCheckMenuItemClass
-{
-  GtkMenuItemClass parent_class;
-  
-  void (* toggled)	  (GtkCheckMenuItem *check_menu_item);
-  void (* draw_indicator) (GtkCheckMenuItem *check_menu_item,
-			   GdkRectangle	    *area);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType	   gtk_check_menu_item_get_type	         (void) G_GNUC_CONST;
-
-GtkWidget* gtk_check_menu_item_new               (void);
-GtkWidget* gtk_check_menu_item_new_with_label    (const gchar      *label);
-GtkWidget* gtk_check_menu_item_new_with_mnemonic (const gchar      *label);
-void       gtk_check_menu_item_set_active        (GtkCheckMenuItem *check_menu_item,
-						  gboolean          is_active);
-gboolean   gtk_check_menu_item_get_active        (GtkCheckMenuItem *check_menu_item);
-void       gtk_check_menu_item_toggled           (GtkCheckMenuItem *check_menu_item);
-void       gtk_check_menu_item_set_inconsistent  (GtkCheckMenuItem *check_menu_item,
-						  gboolean          setting);
-gboolean   gtk_check_menu_item_get_inconsistent  (GtkCheckMenuItem *check_menu_item);
-void       gtk_check_menu_item_set_draw_as_radio (GtkCheckMenuItem *check_menu_item,
-						  gboolean          draw_as_radio);
-gboolean   gtk_check_menu_item_get_draw_as_radio (GtkCheckMenuItem *check_menu_item);
-    
-
-#ifndef GTK_DISABLE_DEPRECATED
-void	   gtk_check_menu_item_set_show_toggle (GtkCheckMenuItem *menu_item,
-						gboolean	  always);
-#define	gtk_check_menu_item_set_state		gtk_check_menu_item_set_active
-#endif
-
-G_END_DECLS
-
-#endif /* __GTK_CHECK_MENU_ITEM_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkclipboard.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkclipboard.h
deleted file mode 100644
index 1825cf76..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkclipboard.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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.
- *
- * Global clipboard abstraction. 
- */
-
-#ifndef __GTK_CLIPBOARD_H__
-#define __GTK_CLIPBOARD_H__
-
-#include <gtk/gtkselection.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_CLIPBOARD            (gtk_clipboard_get_type ())
-#define GTK_CLIPBOARD(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CLIPBOARD, GtkClipboard))
-#define GTK_IS_CLIPBOARD(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CLIPBOARD))
-
-typedef void (* GtkClipboardReceivedFunc)         (GtkClipboard     *clipboard,
-					           GtkSelectionData *selection_data,
-					           gpointer          data);
-typedef void (* GtkClipboardTextReceivedFunc)     (GtkClipboard     *clipboard,
-					           const gchar      *text,
-					           gpointer          data);
-typedef void (* GtkClipboardRichTextReceivedFunc) (GtkClipboard     *clipboard,
-                                                   GdkAtom           format,
-					           const guint8     *text,
-                                                   gsize             length,
-					           gpointer          data);
-typedef void (* GtkClipboardImageReceivedFunc)    (GtkClipboard     *clipboard,
-						   GdkPixbuf        *pixbuf,
-						   gpointer          data);
-typedef void (* GtkClipboardTargetsReceivedFunc)  (GtkClipboard     *clipboard,
-					           GdkAtom          *atoms,
-						   gint              n_atoms,
-					           gpointer          data);
-
-/* Should these functions have GtkClipboard *clipboard as the first argument?
- * right now for ClearFunc, you may have trouble determining _which_ clipboard
- * was cleared, if you reuse your ClearFunc for multiple clipboards.
- */
-typedef void (* GtkClipboardGetFunc)          (GtkClipboard     *clipboard,
-					       GtkSelectionData *selection_data,
-					       guint             info,
-					       gpointer          user_data_or_owner);
-typedef void (* GtkClipboardClearFunc)        (GtkClipboard     *clipboard,
-					       gpointer          user_data_or_owner);
-
-GType         gtk_clipboard_get_type (void) G_GNUC_CONST;
-
-GtkClipboard *gtk_clipboard_get_for_display (GdkDisplay   *display,
-					     GdkAtom       selection);
-#ifndef GDK_MULTIHEAD_SAFE
-GtkClipboard *gtk_clipboard_get             (GdkAtom       selection);
-#endif
-
-GdkDisplay   *gtk_clipboard_get_display     (GtkClipboard *clipboard);
-
-
-gboolean gtk_clipboard_set_with_data  (GtkClipboard          *clipboard,
-				       const GtkTargetEntry  *targets,
-				       guint                  n_targets,
-				       GtkClipboardGetFunc    get_func,
-				       GtkClipboardClearFunc  clear_func,
-				       gpointer               user_data);
-gboolean gtk_clipboard_set_with_owner (GtkClipboard          *clipboard,
-				       const GtkTargetEntry  *targets,
-				       guint                  n_targets,
-				       GtkClipboardGetFunc    get_func,
-				       GtkClipboardClearFunc  clear_func,
-				       GObject               *owner);
-GObject *gtk_clipboard_get_owner      (GtkClipboard          *clipboard);
-void     gtk_clipboard_clear          (GtkClipboard          *clipboard);
-void     gtk_clipboard_set_text       (GtkClipboard          *clipboard,
-				       const gchar           *text,
-				       gint                   len);
-void     gtk_clipboard_set_image      (GtkClipboard          *clipboard,
-				       GdkPixbuf             *pixbuf);
-
-void gtk_clipboard_request_contents  (GtkClipboard                     *clipboard,
-                                      GdkAtom                           target,
-                                      GtkClipboardReceivedFunc          callback,
-                                      gpointer                          user_data);
-void gtk_clipboard_request_text      (GtkClipboard                     *clipboard,
-                                      GtkClipboardTextReceivedFunc      callback,
-                                      gpointer                          user_data);
-void gtk_clipboard_request_rich_text (GtkClipboard                     *clipboard,
-                                      GtkTextBuffer                    *buffer,
-                                      GtkClipboardRichTextReceivedFunc  callback,
-                                      gpointer                          user_data);
-void gtk_clipboard_request_image     (GtkClipboard                     *clipboard,
-                                      GtkClipboardImageReceivedFunc     callback,
-                                      gpointer                          user_data);
-void gtk_clipboard_request_targets   (GtkClipboard                     *clipboard,
-                                      GtkClipboardTargetsReceivedFunc   callback,
-                                      gpointer                          user_data);
-
-GtkSelectionData *gtk_clipboard_wait_for_contents  (GtkClipboard  *clipboard,
-                                                    GdkAtom        target);
-gchar *           gtk_clipboard_wait_for_text      (GtkClipboard  *clipboard);
-guint8 *          gtk_clipboard_wait_for_rich_text (GtkClipboard  *clipboard,
-                                                    GtkTextBuffer *buffer,
-                                                    GdkAtom       *format,
-                                                    gsize         *length);
-GdkPixbuf *       gtk_clipboard_wait_for_image     (GtkClipboard  *clipboard);
-gboolean          gtk_clipboard_wait_for_targets   (GtkClipboard  *clipboard,
-                                                    GdkAtom      **targets,
-                                                    gint          *n_targets);
-
-gboolean gtk_clipboard_wait_is_text_available      (GtkClipboard  *clipboard);
-gboolean gtk_clipboard_wait_is_rich_text_available (GtkClipboard  *clipboard,
-                                                    GtkTextBuffer *buffer);
-gboolean gtk_clipboard_wait_is_image_available     (GtkClipboard  *clipboard);
-gboolean gtk_clipboard_wait_is_target_available    (GtkClipboard  *clipboard,
-                                                    GdkAtom        target);
-
-
-void gtk_clipboard_set_can_store (GtkClipboard         *clipboard,
-				  const GtkTargetEntry *targets,
-				  gint                  n_targets);
-
-void gtk_clipboard_store         (GtkClipboard   *clipboard);
-  
-/* private */
-void     _gtk_clipboard_handle_event    (GdkEventOwnerChange *event);
-
-void     _gtk_clipboard_store_all       (void);
-  
-G_END_DECLS
-
-#endif /* __GTK_CLIPBOARD_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkclist.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkclist.h
deleted file mode 100644
index 5375ea1c..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkclist.h
+++ /dev/null
@@ -1,793 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball, Josh MacDonald
- * Copyright (C) 1997-1998 Jay Painter <jpaint@serv.net><jpaint@gimp.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 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-#ifndef __GTK_CLIST_H__
-#define __GTK_CLIST_H__
-
-#include <gdk/gdk.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkhscrollbar.h>
-#include <gtk/gtkvscrollbar.h>
-#include <gtk/gtkenums.h>
-
-
-G_BEGIN_DECLS
-
-
-/* clist flags */
-enum {
-  GTK_CLIST_IN_DRAG             = 1 <<  0,
-  GTK_CLIST_ROW_HEIGHT_SET      = 1 <<  1,
-  GTK_CLIST_SHOW_TITLES         = 1 <<  2,
-  /* Unused */
-  GTK_CLIST_ADD_MODE            = 1 <<  4,
-  GTK_CLIST_AUTO_SORT           = 1 <<  5,
-  GTK_CLIST_AUTO_RESIZE_BLOCKED = 1 <<  6,
-  GTK_CLIST_REORDERABLE         = 1 <<  7,
-  GTK_CLIST_USE_DRAG_ICONS      = 1 <<  8,
-  GTK_CLIST_DRAW_DRAG_LINE      = 1 <<  9,
-  GTK_CLIST_DRAW_DRAG_RECT      = 1 << 10
-}; 
-
-/* cell types */
-typedef enum
-{
-  GTK_CELL_EMPTY,
-  GTK_CELL_TEXT,
-  GTK_CELL_PIXMAP,
-  GTK_CELL_PIXTEXT,
-  GTK_CELL_WIDGET
-} GtkCellType;
-
-typedef enum
-{
-  GTK_CLIST_DRAG_NONE,
-  GTK_CLIST_DRAG_BEFORE,
-  GTK_CLIST_DRAG_INTO,
-  GTK_CLIST_DRAG_AFTER
-} GtkCListDragPos;
-
-typedef enum
-{
-  GTK_BUTTON_IGNORED = 0,
-  GTK_BUTTON_SELECTS = 1 << 0,
-  GTK_BUTTON_DRAGS   = 1 << 1,
-  GTK_BUTTON_EXPANDS = 1 << 2
-} GtkButtonAction;
-
-#define GTK_TYPE_CLIST            (gtk_clist_get_type ())
-#define GTK_CLIST(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_CLIST, GtkCList))
-#define GTK_CLIST_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_CLIST, GtkCListClass))
-#define GTK_IS_CLIST(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_CLIST))
-#define GTK_IS_CLIST_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CLIST))
-#define GTK_CLIST_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CLIST, GtkCListClass))
-
-
-#define GTK_CLIST_FLAGS(clist)             (GTK_CLIST (clist)->flags)
-#define GTK_CLIST_SET_FLAG(clist,flag)     (GTK_CLIST_FLAGS (clist) |= (GTK_ ## flag))
-#define GTK_CLIST_UNSET_FLAG(clist,flag)   (GTK_CLIST_FLAGS (clist) &= ~(GTK_ ## flag))
-
-#define GTK_CLIST_IN_DRAG(clist)           (GTK_CLIST_FLAGS (clist) & GTK_CLIST_IN_DRAG)
-#define GTK_CLIST_ROW_HEIGHT_SET(clist)    (GTK_CLIST_FLAGS (clist) & GTK_CLIST_ROW_HEIGHT_SET)
-#define GTK_CLIST_SHOW_TITLES(clist)       (GTK_CLIST_FLAGS (clist) & GTK_CLIST_SHOW_TITLES)
-#define GTK_CLIST_ADD_MODE(clist)          (GTK_CLIST_FLAGS (clist) & GTK_CLIST_ADD_MODE)
-#define GTK_CLIST_AUTO_SORT(clist)         (GTK_CLIST_FLAGS (clist) & GTK_CLIST_AUTO_SORT)
-#define GTK_CLIST_AUTO_RESIZE_BLOCKED(clist) (GTK_CLIST_FLAGS (clist) & GTK_CLIST_AUTO_RESIZE_BLOCKED)
-#define GTK_CLIST_REORDERABLE(clist)       (GTK_CLIST_FLAGS (clist) & GTK_CLIST_REORDERABLE)
-#define GTK_CLIST_USE_DRAG_ICONS(clist)    (GTK_CLIST_FLAGS (clist) & GTK_CLIST_USE_DRAG_ICONS)
-#define GTK_CLIST_DRAW_DRAG_LINE(clist)    (GTK_CLIST_FLAGS (clist) & GTK_CLIST_DRAW_DRAG_LINE)
-#define GTK_CLIST_DRAW_DRAG_RECT(clist)    (GTK_CLIST_FLAGS (clist) & GTK_CLIST_DRAW_DRAG_RECT)
-
-#define GTK_CLIST_ROW(_glist_) ((GtkCListRow *)((_glist_)->data))
-
-/* pointer casting for cells */
-#define GTK_CELL_TEXT(cell)     (((GtkCellText *) &(cell)))
-#define GTK_CELL_PIXMAP(cell)   (((GtkCellPixmap *) &(cell)))
-#define GTK_CELL_PIXTEXT(cell)  (((GtkCellPixText *) &(cell)))
-#define GTK_CELL_WIDGET(cell)   (((GtkCellWidget *) &(cell)))
-
-typedef struct _GtkCList GtkCList;
-typedef struct _GtkCListClass GtkCListClass;
-typedef struct _GtkCListColumn GtkCListColumn;
-typedef struct _GtkCListRow GtkCListRow;
-
-typedef struct _GtkCell GtkCell;
-typedef struct _GtkCellText GtkCellText;
-typedef struct _GtkCellPixmap GtkCellPixmap;
-typedef struct _GtkCellPixText GtkCellPixText;
-typedef struct _GtkCellWidget GtkCellWidget;
-
-typedef gint (*GtkCListCompareFunc) (GtkCList     *clist,
-				     gconstpointer ptr1,
-				     gconstpointer ptr2);
-
-typedef struct _GtkCListCellInfo GtkCListCellInfo;
-typedef struct _GtkCListDestInfo GtkCListDestInfo;
-
-struct _GtkCListCellInfo
-{
-  gint row;
-  gint column;
-};
-
-struct _GtkCListDestInfo
-{
-  GtkCListCellInfo cell;
-  GtkCListDragPos  insert_pos;
-};
-
-struct _GtkCList
-{
-  GtkContainer container;
-  
-  guint16 flags;
-  
-  gpointer reserved1;
-  gpointer reserved2;
-
-  guint freeze_count;
-  
-  /* allocation rectangle after the conatiner_border_width
-   * and the width of the shadow border */
-  GdkRectangle internal_allocation;
-  
-  /* rows */
-  gint rows;
-  gint row_height;
-  GList *row_list;
-  GList *row_list_end;
-  
-  /* columns */
-  gint columns;
-  GdkRectangle column_title_area;
-  GdkWindow *title_window;
-  
-  /* dynamicly allocated array of column structures */
-  GtkCListColumn *column;
-  
-  /* the scrolling window and its height and width to
-   * make things a little speedier */
-  GdkWindow *clist_window;
-  gint clist_window_width;
-  gint clist_window_height;
-  
-  /* offsets for scrolling */
-  gint hoffset;
-  gint voffset;
-  
-  /* border shadow style */
-  GtkShadowType shadow_type;
-  
-  /* the list's selection mode (gtkenums.h) */
-  GtkSelectionMode selection_mode;
-  
-  /* list of selected rows */
-  GList *selection;
-  GList *selection_end;
-  
-  GList *undo_selection;
-  GList *undo_unselection;
-  gint undo_anchor;
-  
-  /* mouse buttons */
-  guint8 button_actions[5];
-
-  guint8 drag_button;
-
-  /* dnd */
-  GtkCListCellInfo click_cell;
-
-  /* scroll adjustments */
-  GtkAdjustment *hadjustment;
-  GtkAdjustment *vadjustment;
-  
-  /* xor GC for the vertical drag line */
-  GdkGC *xor_gc;
-  
-  /* gc for drawing unselected cells */
-  GdkGC *fg_gc;
-  GdkGC *bg_gc;
-  
-  /* cursor used to indicate dragging */
-  GdkCursor *cursor_drag;
-  
-  /* the current x-pixel location of the xor-drag line */
-  gint x_drag;
-  
-  /* focus handling */
-  gint focus_row;
-
-  gint focus_header_column;
-  
-  /* dragging the selection */
-  gint anchor;
-  GtkStateType anchor_state;
-  gint drag_pos;
-  gint htimer;
-  gint vtimer;
-  
-  GtkSortType sort_type;
-  GtkCListCompareFunc compare;
-  gint sort_column;
-
-  gint drag_highlight_row;
-  GtkCListDragPos drag_highlight_pos;
-};
-
-struct _GtkCListClass
-{
-  GtkContainerClass parent_class;
-  
-  void  (*set_scroll_adjustments) (GtkCList       *clist,
-				   GtkAdjustment  *hadjustment,
-				   GtkAdjustment  *vadjustment);
-  void   (*refresh)             (GtkCList       *clist);
-  void   (*select_row)          (GtkCList       *clist,
-				 gint            row,
-				 gint            column,
-				 GdkEvent       *event);
-  void   (*unselect_row)        (GtkCList       *clist,
-				 gint            row,
-				 gint            column,
-				 GdkEvent       *event);
-  void   (*row_move)            (GtkCList       *clist,
-				 gint            source_row,
-				 gint            dest_row);
-  void   (*click_column)        (GtkCList       *clist,
-				 gint            column);
-  void   (*resize_column)       (GtkCList       *clist,
-				 gint            column,
-                                 gint            width);
-  void   (*toggle_focus_row)    (GtkCList       *clist);
-  void   (*select_all)          (GtkCList       *clist);
-  void   (*unselect_all)        (GtkCList       *clist);
-  void   (*undo_selection)      (GtkCList       *clist);
-  void   (*start_selection)     (GtkCList       *clist);
-  void   (*end_selection)       (GtkCList       *clist);
-  void   (*extend_selection)    (GtkCList       *clist,
-				 GtkScrollType   scroll_type,
-				 gfloat          position,
-				 gboolean        auto_start_selection);
-  void   (*scroll_horizontal)   (GtkCList       *clist,
-				 GtkScrollType   scroll_type,
-				 gfloat          position);
-  void   (*scroll_vertical)     (GtkCList       *clist,
-				 GtkScrollType   scroll_type,
-				 gfloat          position);
-  void   (*toggle_add_mode)     (GtkCList       *clist);
-  void   (*abort_column_resize) (GtkCList       *clist);
-  void   (*resync_selection)    (GtkCList       *clist,
-				 GdkEvent       *event);
-  GList* (*selection_find)      (GtkCList       *clist,
-				 gint            row_number,
-				 GList          *row_list_element);
-  void   (*draw_row)            (GtkCList       *clist,
-				 GdkRectangle   *area,
-				 gint            row,
-				 GtkCListRow    *clist_row);
-  void   (*draw_drag_highlight) (GtkCList        *clist,
-				 GtkCListRow     *target_row,
-				 gint             target_row_number,
-				 GtkCListDragPos  drag_pos);
-  void   (*clear)               (GtkCList       *clist);
-  void   (*fake_unselect_all)   (GtkCList       *clist,
-				 gint            row);
-  void   (*sort_list)           (GtkCList       *clist);
-  gint   (*insert_row)          (GtkCList       *clist,
-				 gint            row,
-				 gchar          *text[]);
-  void   (*remove_row)          (GtkCList       *clist,
-				 gint            row);
-  void   (*set_cell_contents)   (GtkCList       *clist,
-				 GtkCListRow    *clist_row,
-				 gint            column,
-				 GtkCellType     type,
-				 const gchar    *text,
-				 guint8          spacing,
-				 GdkPixmap      *pixmap,
-				 GdkBitmap      *mask);
-  void   (*cell_size_request)   (GtkCList       *clist,
-				 GtkCListRow    *clist_row,
-				 gint            column,
-				 GtkRequisition *requisition);
-
-};
-
-struct _GtkCListColumn
-{
-  gchar *title;
-  GdkRectangle area;
-  
-  GtkWidget *button;
-  GdkWindow *window;
-  
-  gint width;
-  gint min_width;
-  gint max_width;
-  GtkJustification justification;
-  
-  guint visible        : 1;  
-  guint width_set      : 1;
-  guint resizeable     : 1;
-  guint auto_resize    : 1;
-  guint button_passive : 1;
-};
-
-struct _GtkCListRow
-{
-  GtkCell *cell;
-  GtkStateType state;
-  
-  GdkColor foreground;
-  GdkColor background;
-  
-  GtkStyle *style;
-
-  gpointer data;
-  GtkDestroyNotify destroy;
-  
-  guint fg_set     : 1;
-  guint bg_set     : 1;
-  guint selectable : 1;
-};
-
-/* Cell Structures */
-struct _GtkCellText
-{
-  GtkCellType type;
-  
-  gint16 vertical;
-  gint16 horizontal;
-  
-  GtkStyle *style;
-
-  gchar *text;
-};
-
-struct _GtkCellPixmap
-{
-  GtkCellType type;
-  
-  gint16 vertical;
-  gint16 horizontal;
-  
-  GtkStyle *style;
-
-  GdkPixmap *pixmap;
-  GdkBitmap *mask;
-};
-
-struct _GtkCellPixText
-{
-  GtkCellType type;
-  
-  gint16 vertical;
-  gint16 horizontal;
-  
-  GtkStyle *style;
-
-  gchar *text;
-  guint8 spacing;
-  GdkPixmap *pixmap;
-  GdkBitmap *mask;
-};
-
-struct _GtkCellWidget
-{
-  GtkCellType type;
-  
-  gint16 vertical;
-  gint16 horizontal;
-  
-  GtkStyle *style;
-
-  GtkWidget *widget;
-};
-
-struct _GtkCell
-{
-  GtkCellType type;
-  
-  gint16 vertical;
-  gint16 horizontal;
-  
-  GtkStyle *style;
-
-  union {
-    gchar *text;
-    
-    struct {
-      GdkPixmap *pixmap;
-      GdkBitmap *mask;
-    } pm;
-    
-    struct {
-      gchar *text;
-      guint8 spacing;
-      GdkPixmap *pixmap;
-      GdkBitmap *mask;
-    } pt;
-    
-    GtkWidget *widget;
-  } u;
-};
-
-GtkType gtk_clist_get_type (void) G_GNUC_CONST;
-
-/* create a new GtkCList */
-GtkWidget* gtk_clist_new             (gint   columns);
-GtkWidget* gtk_clist_new_with_titles (gint   columns,
-				      gchar *titles[]);
-
-/* set adjustments of clist */
-void gtk_clist_set_hadjustment (GtkCList      *clist,
-				GtkAdjustment *adjustment);
-void gtk_clist_set_vadjustment (GtkCList      *clist,
-				GtkAdjustment *adjustment);
-
-/* get adjustments of clist */
-GtkAdjustment* gtk_clist_get_hadjustment (GtkCList *clist);
-GtkAdjustment* gtk_clist_get_vadjustment (GtkCList *clist);
-
-/* set the border style of the clist */
-void gtk_clist_set_shadow_type (GtkCList      *clist,
-				GtkShadowType  type);
-
-/* set the clist's selection mode */
-void gtk_clist_set_selection_mode (GtkCList         *clist,
-				   GtkSelectionMode  mode);
-
-/* enable clists reorder ability */
-void gtk_clist_set_reorderable (GtkCList *clist,
-				gboolean  reorderable);
-void gtk_clist_set_use_drag_icons (GtkCList *clist,
-				   gboolean  use_icons);
-void gtk_clist_set_button_actions (GtkCList *clist,
-				   guint     button,
-				   guint8    button_actions);
-
-/* freeze all visual updates of the list, and then thaw the list after
- * you have made a number of changes and the updates wil occure in a
- * more efficent mannor than if you made them on a unfrozen list
- */
-void gtk_clist_freeze (GtkCList *clist);
-void gtk_clist_thaw   (GtkCList *clist);
-
-/* show and hide the column title buttons */
-void gtk_clist_column_titles_show (GtkCList *clist);
-void gtk_clist_column_titles_hide (GtkCList *clist);
-
-/* set the column title to be a active title (responds to button presses, 
- * prelights, and grabs keyboard focus), or passive where it acts as just
- * a title
- */
-void gtk_clist_column_title_active   (GtkCList *clist,
-				      gint      column);
-void gtk_clist_column_title_passive  (GtkCList *clist,
-				      gint      column);
-void gtk_clist_column_titles_active  (GtkCList *clist);
-void gtk_clist_column_titles_passive (GtkCList *clist);
-
-/* set the title in the column title button */
-void gtk_clist_set_column_title (GtkCList    *clist,
-				 gint         column,
-				 const gchar *title);
-
-/* returns the title of column. Returns NULL if title is not set */
-gchar * gtk_clist_get_column_title (GtkCList *clist,
-				    gint      column);
-
-/* set a widget instead of a title for the column title button */
-void gtk_clist_set_column_widget (GtkCList  *clist,
-				  gint       column,
-				  GtkWidget *widget);
-
-/* returns the column widget */
-GtkWidget * gtk_clist_get_column_widget (GtkCList *clist,
-					 gint      column);
-
-/* set the justification on a column */
-void gtk_clist_set_column_justification (GtkCList         *clist,
-					 gint              column,
-					 GtkJustification  justification);
-
-/* set visibility of a column */
-void gtk_clist_set_column_visibility (GtkCList *clist,
-				      gint      column,
-				      gboolean  visible);
-
-/* enable/disable column resize operations by mouse */
-void gtk_clist_set_column_resizeable (GtkCList *clist,
-				      gint      column,
-				      gboolean  resizeable);
-
-/* resize column automatically to its optimal width */
-void gtk_clist_set_column_auto_resize (GtkCList *clist,
-				       gint      column,
-				       gboolean  auto_resize);
-
-gint gtk_clist_columns_autosize (GtkCList *clist);
-
-/* return the optimal column width, i.e. maximum of all cell widths */
-gint gtk_clist_optimal_column_width (GtkCList *clist,
-				     gint      column);
-
-/* set the pixel width of a column; this is a necessary step in
- * creating a CList because otherwise the column width is chozen from
- * the width of the column title, which will never be right
- */
-void gtk_clist_set_column_width (GtkCList *clist,
-				 gint      column,
-				 gint      width);
-
-/* set column minimum/maximum width. min/max_width < 0 => no restriction */
-void gtk_clist_set_column_min_width (GtkCList *clist,
-				     gint      column,
-				     gint      min_width);
-void gtk_clist_set_column_max_width (GtkCList *clist,
-				     gint      column,
-				     gint      max_width);
-
-/* change the height of the rows, the default (height=0) is
- * the hight of the current font.
- */
-void gtk_clist_set_row_height (GtkCList *clist,
-			       guint     height);
-
-/* scroll the viewing area of the list to the given column and row;
- * row_align and col_align are between 0-1 representing the location the
- * row should appear on the screnn, 0.0 being top or left, 1.0 being
- * bottom or right; if row or column is -1 then then there is no change
- */
-void gtk_clist_moveto (GtkCList *clist,
-		       gint      row,
-		       gint      column,
-		       gfloat    row_align,
-		       gfloat    col_align);
-
-/* returns whether the row is visible */
-GtkVisibility gtk_clist_row_is_visible (GtkCList *clist,
-					gint      row);
-
-/* returns the cell type */
-GtkCellType gtk_clist_get_cell_type (GtkCList *clist,
-				     gint      row,
-				     gint      column);
-
-/* sets a given cell's text, replacing its current contents */
-void gtk_clist_set_text (GtkCList    *clist,
-			 gint         row,
-			 gint         column,
-			 const gchar *text);
-
-/* for the "get" functions, any of the return pointer can be
- * NULL if you are not interested
- */
-gint gtk_clist_get_text (GtkCList  *clist,
-			 gint       row,
-			 gint       column,
-			 gchar    **text);
-
-/* sets a given cell's pixmap, replacing its current contents */
-void gtk_clist_set_pixmap (GtkCList  *clist,
-			   gint       row,
-			   gint       column,
-			   GdkPixmap *pixmap,
-			   GdkBitmap *mask);
-
-gint gtk_clist_get_pixmap (GtkCList   *clist,
-			   gint        row,
-			   gint        column,
-			   GdkPixmap **pixmap,
-			   GdkBitmap **mask);
-
-/* sets a given cell's pixmap and text, replacing its current contents */
-void gtk_clist_set_pixtext (GtkCList    *clist,
-			    gint         row,
-			    gint         column,
-			    const gchar *text,
-			    guint8       spacing,
-			    GdkPixmap   *pixmap,
-			    GdkBitmap   *mask);
-
-gint gtk_clist_get_pixtext (GtkCList   *clist,
-			    gint        row,
-			    gint        column,
-			    gchar     **text,
-			    guint8     *spacing,
-			    GdkPixmap **pixmap,
-			    GdkBitmap **mask);
-
-/* sets the foreground color of a row, the color must already
- * be allocated
- */
-void gtk_clist_set_foreground (GtkCList       *clist,
-			       gint            row,
-			       const GdkColor *color);
-
-/* sets the background color of a row, the color must already
- * be allocated
- */
-void gtk_clist_set_background (GtkCList       *clist,
-			       gint            row,
-			       const GdkColor *color);
-
-/* set / get cell styles */
-void gtk_clist_set_cell_style (GtkCList *clist,
-			       gint      row,
-			       gint      column,
-			       GtkStyle *style);
-
-GtkStyle *gtk_clist_get_cell_style (GtkCList *clist,
-				    gint      row,
-				    gint      column);
-
-void gtk_clist_set_row_style (GtkCList *clist,
-			      gint      row,
-			      GtkStyle *style);
-
-GtkStyle *gtk_clist_get_row_style (GtkCList *clist,
-				   gint      row);
-
-/* this sets a horizontal and vertical shift for drawing
- * the contents of a cell; it can be positive or negitive;
- * this is particulary useful for indenting items in a column
- */
-void gtk_clist_set_shift (GtkCList *clist,
-			  gint      row,
-			  gint      column,
-			  gint      vertical,
-			  gint      horizontal);
-
-/* set/get selectable flag of a single row */
-void gtk_clist_set_selectable (GtkCList *clist,
-			       gint      row,
-			       gboolean  selectable);
-gboolean gtk_clist_get_selectable (GtkCList *clist,
-				   gint      row);
-
-/* prepend/append returns the index of the row you just added,
- * making it easier to append and modify a row
- */
-gint gtk_clist_prepend (GtkCList    *clist,
-		        gchar       *text[]);
-gint gtk_clist_append  (GtkCList    *clist,
-			gchar       *text[]);
-
-/* inserts a row at index row and returns the row where it was
- * actually inserted (may be different from "row" in auto_sort mode)
- */
-gint gtk_clist_insert (GtkCList    *clist,
-		       gint         row,
-		       gchar       *text[]);
-
-/* removes row at index row */
-void gtk_clist_remove (GtkCList *clist,
-		       gint      row);
-
-/* sets a arbitrary data pointer for a given row */
-void gtk_clist_set_row_data (GtkCList *clist,
-			     gint      row,
-			     gpointer  data);
-
-/* sets a data pointer for a given row with destroy notification */
-void gtk_clist_set_row_data_full (GtkCList         *clist,
-			          gint              row,
-			          gpointer          data,
-				  GtkDestroyNotify  destroy);
-
-/* returns the data set for a row */
-gpointer gtk_clist_get_row_data (GtkCList *clist,
-				 gint      row);
-
-/* givin a data pointer, find the first (and hopefully only!)
- * row that points to that data, or -1 if none do
- */
-gint gtk_clist_find_row_from_data (GtkCList *clist,
-				   gpointer  data);
-
-/* force selection of a row */
-void gtk_clist_select_row (GtkCList *clist,
-			   gint      row,
-			   gint      column);
-
-/* force unselection of a row */
-void gtk_clist_unselect_row (GtkCList *clist,
-			     gint      row,
-			     gint      column);
-
-/* undo the last select/unselect operation */
-void gtk_clist_undo_selection (GtkCList *clist);
-
-/* clear the entire list -- this is much faster than removing
- * each item with gtk_clist_remove
- */
-void gtk_clist_clear (GtkCList *clist);
-
-/* return the row column corresponding to the x and y coordinates,
- * the returned values are only valid if the x and y coordinates
- * are respectively to a window == clist->clist_window
- */
-gint gtk_clist_get_selection_info (GtkCList *clist,
-			     	   gint      x,
-			     	   gint      y,
-			     	   gint     *row,
-			     	   gint     *column);
-
-/* in multiple or extended mode, select all rows */
-void gtk_clist_select_all (GtkCList *clist);
-
-/* in all modes except browse mode, deselect all rows */
-void gtk_clist_unselect_all (GtkCList *clist);
-
-/* swap the position of two rows */
-void gtk_clist_swap_rows (GtkCList *clist,
-			  gint      row1,
-			  gint      row2);
-
-/* move row from source_row position to dest_row position */
-void gtk_clist_row_move (GtkCList *clist,
-			 gint      source_row,
-			 gint      dest_row);
-
-/* sets a compare function different to the default */
-void gtk_clist_set_compare_func (GtkCList            *clist,
-				 GtkCListCompareFunc  cmp_func);
-
-/* the column to sort by */
-void gtk_clist_set_sort_column (GtkCList *clist,
-				gint      column);
-
-/* how to sort : ascending or descending */
-void gtk_clist_set_sort_type (GtkCList    *clist,
-			      GtkSortType  sort_type);
-
-/* sort the list with the current compare function */
-void gtk_clist_sort (GtkCList *clist);
-
-/* Automatically sort upon insertion */
-void gtk_clist_set_auto_sort (GtkCList *clist,
-			      gboolean  auto_sort);
-
-/* Private function for clist, ctree */
-
-PangoLayout *_gtk_clist_create_cell_layout (GtkCList       *clist,
-					    GtkCListRow    *clist_row,
-					    gint            column);
-
-
-G_END_DECLS
-
-
-#endif				/* __GTK_CLIST_H__ */
-
-#endif /* GTK_DISABLE_DEPRECATED */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcolorbutton.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcolorbutton.h
deleted file mode 100644
index b6a00fdf..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcolorbutton.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * GTK - The GIMP Toolkit
- * Copyright (C) 1998, 1999 Red Hat, Inc.
- * All rights reserved.
- *
- * 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 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.
- */
-/* Color picker button for GNOME
- *
- * Author: Federico Mena <federico@nuclecu.unam.mx>
- *
- * Modified by the GTK+ Team and others 2003.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_COLOR_BUTTON_H__
-#define __GTK_COLOR_BUTTON_H__
-
-
-#include <gtk/gtkbutton.h>
-
-G_BEGIN_DECLS
-
-
-/* The GtkColorSelectionButton widget is a simple color picker in a button.  
- * The button displays a sample of the currently selected color.  When 
- * the user clicks on the button, a color selection dialog pops up.  
- * The color picker emits the "color_set" signal when the color is set.
- */
-
-#define GTK_TYPE_COLOR_BUTTON             (gtk_color_button_get_type ())
-#define GTK_COLOR_BUTTON(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COLOR_BUTTON, GtkColorButton))
-#define GTK_COLOR_BUTTON_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_COLOR_BUTTON, GtkColorButtonClass))
-#define GTK_IS_COLOR_BUTTON(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COLOR_BUTTON))
-#define GTK_IS_COLOR_BUTTON_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_COLOR_BUTTON))
-#define GTK_COLOR_BUTTON_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_COLOR_BUTTON, GtkColorButtonClass))
-
-typedef struct _GtkColorButton          GtkColorButton;
-typedef struct _GtkColorButtonClass     GtkColorButtonClass;
-typedef struct _GtkColorButtonPrivate   GtkColorButtonPrivate;
-
-struct _GtkColorButton {
-  GtkButton button;
-
-  /*< private >*/
-
-  GtkColorButtonPrivate *priv;
-};
-
-struct _GtkColorButtonClass {
-  GtkButtonClass parent_class;
-  
-  void (* color_set) (GtkColorButton *cp);
-  
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType      gtk_color_button_get_type       (void) G_GNUC_CONST;
-GtkWidget *gtk_color_button_new            (void);
-GtkWidget *gtk_color_button_new_with_color (const GdkColor *color);
-void       gtk_color_button_set_color      (GtkColorButton *color_button, 
-					    const GdkColor *color);
-void       gtk_color_button_set_alpha      (GtkColorButton *color_button,
-					    guint16         alpha);
-void       gtk_color_button_get_color      (GtkColorButton *color_button, 
-					    GdkColor       *color);
-guint16    gtk_color_button_get_alpha      (GtkColorButton *color_button);
-void       gtk_color_button_set_use_alpha  (GtkColorButton *color_button, 
-					    gboolean        use_alpha);
-gboolean   gtk_color_button_get_use_alpha  (GtkColorButton *color_button);
-void       gtk_color_button_set_title      (GtkColorButton *color_button, 
-					    const gchar    *title);
-G_CONST_RETURN gchar *gtk_color_button_get_title (GtkColorButton *color_button);
-
-
-G_END_DECLS
-
-#endif  /* __GTK_COLOR_BUTTON_H__ */
-
-
-
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcolorsel.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcolorsel.h
deleted file mode 100644
index 8cfc3c93..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcolorsel.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2000 Red Hat, Inc. 
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-#ifndef __GTK_COLOR_SELECTION_H__
-#define __GTK_COLOR_SELECTION_H__
-
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkvbox.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_COLOR_SELECTION			(gtk_color_selection_get_type ())
-#define GTK_COLOR_SELECTION(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COLOR_SELECTION, GtkColorSelection))
-#define GTK_COLOR_SELECTION_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_COLOR_SELECTION, GtkColorSelectionClass))
-#define GTK_IS_COLOR_SELECTION(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COLOR_SELECTION))
-#define GTK_IS_COLOR_SELECTION_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_COLOR_SELECTION))
-#define GTK_COLOR_SELECTION_GET_CLASS(obj)              (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_COLOR_SELECTION, GtkColorSelectionClass))
-
-
-typedef struct _GtkColorSelection       GtkColorSelection;
-typedef struct _GtkColorSelectionClass  GtkColorSelectionClass;
-
-
-typedef void (* GtkColorSelectionChangePaletteFunc) (const GdkColor    *colors,
-                                                     gint               n_colors);
-typedef void (* GtkColorSelectionChangePaletteWithScreenFunc) (GdkScreen         *screen,
-							       const GdkColor    *colors,
-							       gint               n_colors);
-
-struct _GtkColorSelection
-{
-  GtkVBox parent_instance;
-
-  /* < private_data > */
-  gpointer private_data;
-};
-
-struct _GtkColorSelectionClass
-{
-  GtkVBoxClass parent_class;
-
-  void (*color_changed)	(GtkColorSelection *color_selection);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-/* ColorSelection */
-
-GType      gtk_color_selection_get_type                (void) G_GNUC_CONST;
-GtkWidget *gtk_color_selection_new                     (void);
-gboolean   gtk_color_selection_get_has_opacity_control (GtkColorSelection *colorsel);
-void       gtk_color_selection_set_has_opacity_control (GtkColorSelection *colorsel,
-							gboolean           has_opacity);
-gboolean   gtk_color_selection_get_has_palette         (GtkColorSelection *colorsel);
-void       gtk_color_selection_set_has_palette         (GtkColorSelection *colorsel,
-							gboolean           has_palette);
-
-
-void     gtk_color_selection_set_current_color   (GtkColorSelection *colorsel,
-						  const GdkColor    *color);
-void     gtk_color_selection_set_current_alpha   (GtkColorSelection *colorsel,
-						  guint16            alpha);
-void     gtk_color_selection_get_current_color   (GtkColorSelection *colorsel,
-						  GdkColor          *color);
-guint16  gtk_color_selection_get_current_alpha   (GtkColorSelection *colorsel);
-void     gtk_color_selection_set_previous_color  (GtkColorSelection *colorsel,
-						  const GdkColor    *color);
-void     gtk_color_selection_set_previous_alpha  (GtkColorSelection *colorsel,
-						  guint16            alpha);
-void     gtk_color_selection_get_previous_color  (GtkColorSelection *colorsel,
-						  GdkColor          *color);
-guint16  gtk_color_selection_get_previous_alpha  (GtkColorSelection *colorsel);
-
-gboolean gtk_color_selection_is_adjusting        (GtkColorSelection *colorsel);
-
-gboolean gtk_color_selection_palette_from_string (const gchar       *str,
-                                                  GdkColor         **colors,
-                                                  gint              *n_colors);
-gchar*   gtk_color_selection_palette_to_string   (const GdkColor    *colors,
-                                                  gint               n_colors);
-
-#ifndef GTK_DISABLE_DEPRECATED
-#ifndef GDK_MULTIHEAD_SAFE
-GtkColorSelectionChangePaletteFunc           gtk_color_selection_set_change_palette_hook             (GtkColorSelectionChangePaletteFunc           func);
-#endif
-#endif
-
-GtkColorSelectionChangePaletteWithScreenFunc gtk_color_selection_set_change_palette_with_screen_hook (GtkColorSelectionChangePaletteWithScreenFunc func);
-
-#ifndef GTK_DISABLE_DEPRECATED
-/* Deprecated calls: */
-void gtk_color_selection_set_color         (GtkColorSelection *colorsel,
-					    gdouble           *color);
-void gtk_color_selection_get_color         (GtkColorSelection *colorsel,
-					    gdouble           *color);
-void gtk_color_selection_set_update_policy (GtkColorSelection *colorsel,
-					    GtkUpdateType      policy);
-#endif /* GTK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GTK_COLOR_SELECTION_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcolorseldialog.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcolorseldialog.h
deleted file mode 100644
index 7ad02491..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcolorseldialog.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-#ifndef __GTK_COLOR_SELECTION_DIALOG_H__
-#define __GTK_COLOR_SELECTION_DIALOG_H__
-
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkcolorsel.h>
-#include <gtk/gtkvbox.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_COLOR_SELECTION_DIALOG            (gtk_color_selection_dialog_get_type ())
-#define GTK_COLOR_SELECTION_DIALOG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COLOR_SELECTION_DIALOG, GtkColorSelectionDialog))
-#define GTK_COLOR_SELECTION_DIALOG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_COLOR_SELECTION_DIALOG, GtkColorSelectionDialogClass))
-#define GTK_IS_COLOR_SELECTION_DIALOG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COLOR_SELECTION_DIALOG))
-#define GTK_IS_COLOR_SELECTION_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_COLOR_SELECTION_DIALOG))
-#define GTK_COLOR_SELECTION_DIALOG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_COLOR_SELECTION_DIALOG, GtkColorSelectionDialogClass))
-
-
-typedef struct _GtkColorSelectionDialog       GtkColorSelectionDialog;
-typedef struct _GtkColorSelectionDialogClass  GtkColorSelectionDialogClass;
-
-
-struct _GtkColorSelectionDialog
-{
-  GtkDialog parent_instance;
-
-  GtkWidget *colorsel;
-  GtkWidget *ok_button;
-  GtkWidget *cancel_button;
-  GtkWidget *help_button;
-};
-
-struct _GtkColorSelectionDialogClass
-{
-  GtkDialogClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-/* ColorSelectionDialog */ 
-GType      gtk_color_selection_dialog_get_type (void) G_GNUC_CONST;
-GtkWidget* gtk_color_selection_dialog_new      (const gchar *title); 
-
-
-G_END_DECLS
-
-#endif /* __GTK_COLOR_SELECTION_DIALOG_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcombo.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcombo.h
deleted file mode 100644
index 31655af3..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcombo.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* gtkcombo - combo widget for gtk+
- * Copyright 1997 Paolo Molaro
- *
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-#ifndef __GTK_SMART_COMBO_H__
-#define __GTK_SMART_COMBO_H__
-
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkitem.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_COMBO              (gtk_combo_get_type ())
-#define GTK_COMBO(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COMBO, GtkCombo))
-#define GTK_COMBO_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_COMBO, GtkComboClass))
-#define GTK_IS_COMBO(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COMBO))
-#define GTK_IS_COMBO_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_COMBO))
-#define GTK_COMBO_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_COMBO, GtkComboClass))
-
-
-typedef struct _GtkCombo	GtkCombo;
-typedef struct _GtkComboClass	GtkComboClass;
-
-/* you should access only the entry and list fields directly */
-struct _GtkCombo {
-	GtkHBox hbox;
-  
-        /*< public >*/
-	GtkWidget *entry;
-	
-        /*< private >*/
-	GtkWidget *button;
-	GtkWidget *popup;
-	GtkWidget *popwin;
-	
-        /*< public >*/
-	GtkWidget *list;
-
-        /*< private >*/
-	guint entry_change_id;
-	guint list_change_id;	/* unused */
-
-	guint value_in_list:1;
-	guint ok_if_empty:1;
-	guint case_sensitive:1;
-	guint use_arrows:1;
-	guint use_arrows_always:1;
-
-        guint16 current_button;
-	guint activate_id;
-};
-
-struct _GtkComboClass {
-	GtkHBoxClass parent_class;
-
-        /* Padding for future expansion */
-        void (*_gtk_reserved1) (void);
-        void (*_gtk_reserved2) (void);
-        void (*_gtk_reserved3) (void);
-        void (*_gtk_reserved4) (void);
-};
-
-GType      gtk_combo_get_type              (void) G_GNUC_CONST;
-
-GtkWidget* gtk_combo_new                   (void);
-/* the text in the entry must be or not be in the list */
-void       gtk_combo_set_value_in_list     (GtkCombo*    combo, 
-                                            gboolean     val,
-                                            gboolean     ok_if_empty);
-/* set/unset arrows working for changing the value (can be annoying) */
-void       gtk_combo_set_use_arrows        (GtkCombo*    combo, 
-                                            gboolean     val);
-/* up/down arrows change value if current value not in list */
-void       gtk_combo_set_use_arrows_always (GtkCombo*    combo, 
-                                            gboolean     val);
-/* perform case-sensitive compares */
-void       gtk_combo_set_case_sensitive    (GtkCombo*    combo, 
-                                            gboolean     val);
-/* call this function on an item if it isn't a label or you
-   want it to have a different value to be displayed in the entry */
-void       gtk_combo_set_item_string       (GtkCombo*    combo,
-                                            GtkItem*     item,
-                                            const gchar* item_value);
-/* simple interface */
-void       gtk_combo_set_popdown_strings   (GtkCombo*    combo, 
-                                            GList        *strings);
-
-void       gtk_combo_disable_activate      (GtkCombo*    combo);
-
-G_END_DECLS
-
-#endif /* __GTK_SMART_COMBO_H__ */
-
-#endif /* GTK_DISABLE_DEPRECATED */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcombobox.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcombobox.h
deleted file mode 100644
index 6ab2d954..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcombobox.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/* gtkcombobox.h
- * Copyright (C) 2002, 2003  Kristian Rietveld <kris@gtk.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 __GTK_COMBO_BOX_H__
-#define __GTK_COMBO_BOX_H__
-
-#include <gtk/gtkbin.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeview.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_COMBO_BOX             (gtk_combo_box_get_type ())
-#define GTK_COMBO_BOX(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COMBO_BOX, GtkComboBox))
-#define GTK_COMBO_BOX_CLASS(vtable)    (G_TYPE_CHECK_CLASS_CAST ((vtable), GTK_TYPE_COMBO_BOX, GtkComboBoxClass))
-#define GTK_IS_COMBO_BOX(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COMBO_BOX))
-#define GTK_IS_COMBO_BOX_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), GTK_TYPE_COMBO_BOX))
-#define GTK_COMBO_BOX_GET_CLASS(inst)  (G_TYPE_INSTANCE_GET_CLASS ((inst), GTK_TYPE_COMBO_BOX, GtkComboBoxClass))
-
-typedef struct _GtkComboBox        GtkComboBox;
-typedef struct _GtkComboBoxClass   GtkComboBoxClass;
-typedef struct _GtkComboBoxPrivate GtkComboBoxPrivate;
-
-struct _GtkComboBox
-{
-  GtkBin parent_instance;
-
-  /*< private >*/
-  GtkComboBoxPrivate *priv;
-};
-
-struct _GtkComboBoxClass
-{
-  GtkBinClass parent_class;
-
-  /* signals */
-  void     (* changed)          (GtkComboBox *combo_box);
-
-  /* vfuncs */
-  gchar *  (* get_active_text)  (GtkComboBox *combo_box);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved0) (void);
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-};
-
-
-/* construction */
-GType         gtk_combo_box_get_type         (void) G_GNUC_CONST;
-GtkWidget    *gtk_combo_box_new              (void);
-GtkWidget    *gtk_combo_box_new_with_model   (GtkTreeModel    *model);
-
-/* grids */
-gint          gtk_combo_box_get_wrap_width         (GtkComboBox *combo_box);
-void          gtk_combo_box_set_wrap_width         (GtkComboBox *combo_box,
-                                                    gint         width);
-gint          gtk_combo_box_get_row_span_column    (GtkComboBox *combo_box);
-void          gtk_combo_box_set_row_span_column    (GtkComboBox *combo_box,
-                                                    gint         row_span);
-gint          gtk_combo_box_get_column_span_column (GtkComboBox *combo_box);
-void          gtk_combo_box_set_column_span_column (GtkComboBox *combo_box,
-                                                    gint         column_span);
-
-gboolean      gtk_combo_box_get_add_tearoffs       (GtkComboBox *combo_box);
-void          gtk_combo_box_set_add_tearoffs       (GtkComboBox *combo_box,
-						    gboolean     add_tearoffs);
-
-G_CONST_RETURN gchar *gtk_combo_box_get_title      (GtkComboBox *combo_box);
-void                  gtk_combo_box_set_title      (GtkComboBox *combo_box,
-					            const gchar *title);
-
-gboolean      gtk_combo_box_get_focus_on_click     (GtkComboBox *combo);
-void          gtk_combo_box_set_focus_on_click     (GtkComboBox *combo,
-						    gboolean     focus_on_click);
-
-/* get/set active item */
-gint          gtk_combo_box_get_active       (GtkComboBox     *combo_box);
-void          gtk_combo_box_set_active       (GtkComboBox     *combo_box,
-                                              gint             index_);
-gboolean      gtk_combo_box_get_active_iter  (GtkComboBox     *combo_box,
-                                              GtkTreeIter     *iter);
-void          gtk_combo_box_set_active_iter  (GtkComboBox     *combo_box,
-                                              GtkTreeIter     *iter);
-
-/* getters and setters */
-void          gtk_combo_box_set_model        (GtkComboBox     *combo_box,
-                                              GtkTreeModel    *model);
-GtkTreeModel *gtk_combo_box_get_model        (GtkComboBox     *combo_box);
-
-GtkTreeViewRowSeparatorFunc gtk_combo_box_get_row_separator_func (GtkComboBox                *combo_box);
-void                        gtk_combo_box_set_row_separator_func (GtkComboBox                *combo_box,
-								  GtkTreeViewRowSeparatorFunc func,
-								  gpointer                    data,
-								  GtkDestroyNotify            destroy);
-
-/* convenience -- text */
-GtkWidget    *gtk_combo_box_new_text         (void);
-void          gtk_combo_box_append_text      (GtkComboBox     *combo_box,
-                                              const gchar     *text);
-void          gtk_combo_box_insert_text      (GtkComboBox     *combo_box,
-                                              gint             position,
-                                              const gchar     *text);
-void          gtk_combo_box_prepend_text     (GtkComboBox     *combo_box,
-                                              const gchar     *text);
-void          gtk_combo_box_remove_text      (GtkComboBox     *combo_box,
-                                              gint             position);
-gchar        *gtk_combo_box_get_active_text  (GtkComboBox     *combo_box);
-
-/* programmatic control */
-void          gtk_combo_box_popup            (GtkComboBox     *combo_box);
-void          gtk_combo_box_popdown          (GtkComboBox     *combo_box);
-AtkObject*    gtk_combo_box_get_popup_accessible (GtkComboBox *combo_box);
-
-/* private */
-gboolean     _gtk_combo_box_editing_canceled (GtkComboBox     *combo_box);
-
-G_END_DECLS
-
-#endif /* __GTK_COMBO_BOX_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcomboboxentry.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcomboboxentry.h
deleted file mode 100644
index 5fc71d10..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcomboboxentry.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* gtkcomboboxentry.h
- * Copyright (C) 2002, 2003  Kristian Rietveld <kris@gtk.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 __GTK_COMBO_BOX_ENTRY_H__
-#define __GTK_COMBO_BOX_ENTRY_H__
-
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtktreemodel.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_COMBO_BOX_ENTRY             (gtk_combo_box_entry_get_type ())
-#define GTK_COMBO_BOX_ENTRY(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COMBO_BOX_ENTRY, GtkComboBoxEntry))
-#define GTK_COMBO_BOX_ENTRY_CLASS(vtable)    (G_TYPE_CHECK_CLASS_CAST ((vtable), GTK_TYPE_COMBO_BOX_ENTRY, GtkComboBoxEntryClass))
-#define GTK_IS_COMBO_BOX_ENTRY(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COMBO_BOX_ENTRY))
-#define GTK_IS_COMBO_BOX_ENTRY_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), GTK_TYPE_COMBO_BOX_ENTRY))
-#define GTK_COMBO_BOX_ENTRY_GET_CLASS(inst)  (G_TYPE_INSTANCE_GET_CLASS ((inst), GTK_TYPE_COMBO_BOX_ENTRY, GtkComboBoxEntryClass))
-
-typedef struct _GtkComboBoxEntry             GtkComboBoxEntry;
-typedef struct _GtkComboBoxEntryClass        GtkComboBoxEntryClass;
-typedef struct _GtkComboBoxEntryPrivate      GtkComboBoxEntryPrivate;
-
-struct _GtkComboBoxEntry
-{
-  GtkComboBox parent_instance;
-
-  /*< private >*/
-  GtkComboBoxEntryPrivate *priv;
-};
-
-struct _GtkComboBoxEntryClass
-{
-  GtkComboBoxClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved0) (void);
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-};
-
-
-GType       gtk_combo_box_entry_get_type        (void) G_GNUC_CONST;
-GtkWidget  *gtk_combo_box_entry_new             (void);
-GtkWidget  *gtk_combo_box_entry_new_with_model  (GtkTreeModel     *model,
-                                                 gint              text_column);
-
-void        gtk_combo_box_entry_set_text_column (GtkComboBoxEntry *entry_box,
-                                                 gint              text_column);
-gint        gtk_combo_box_entry_get_text_column (GtkComboBoxEntry *entry_box);
-
-/* convenience -- text */
-GtkWidget  *gtk_combo_box_entry_new_text        (void);
-
-
-G_END_DECLS
-
-#endif /* __GTK_COMBO_BOX_ENTRY_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcontainer.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcontainer.h
deleted file mode 100644
index 612fe8bc..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcontainer.h
+++ /dev/null
@@ -1,225 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_CONTAINER_H__
-#define __GTK_CONTAINER_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkenums.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkadjustment.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_CONTAINER              (gtk_container_get_type ())
-#define GTK_CONTAINER(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CONTAINER, GtkContainer))
-#define GTK_CONTAINER_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CONTAINER, GtkContainerClass))
-#define GTK_IS_CONTAINER(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CONTAINER))
-#define GTK_IS_CONTAINER_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CONTAINER))
-#define GTK_CONTAINER_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CONTAINER, GtkContainerClass))
-
-#define GTK_IS_RESIZE_CONTAINER(widget) (GTK_IS_CONTAINER (widget) && ((GtkContainer*) (widget))->resize_mode != GTK_RESIZE_PARENT)
-
-
-typedef struct _GtkContainer	   GtkContainer;
-typedef struct _GtkContainerClass  GtkContainerClass;
-
-struct _GtkContainer
-{
-  GtkWidget widget;
-  
-  GtkWidget *focus_child;
-  
-  guint border_width : 16;
-
-  /*< private >*/
-  guint need_resize : 1;
-  guint resize_mode : 2;
-  guint reallocate_redraws : 1;
-  guint has_focus_chain : 1;
-};
-
-struct _GtkContainerClass
-{
-  GtkWidgetClass parent_class;
-
-  void    (*add)       		(GtkContainer	 *container,
-				 GtkWidget	 *widget);
-  void    (*remove)    		(GtkContainer	 *container,
-				 GtkWidget	 *widget);
-  void    (*check_resize)	(GtkContainer	 *container);
-  void    (*forall)    		(GtkContainer	 *container,
-				 gboolean	  include_internals,
-				 GtkCallback	  callback,
-				 gpointer	  callback_data);
-  void    (*set_focus_child)	(GtkContainer	 *container,
-				 GtkWidget	 *widget);
-  GType   (*child_type)		(GtkContainer	 *container);
-  gchar*  (*composite_name)	(GtkContainer	 *container,
-				 GtkWidget	 *child);
-  void    (*set_child_property) (GtkContainer    *container,
-				 GtkWidget       *child,
-				 guint            property_id,
-				 const GValue    *value,
-				 GParamSpec      *pspec);
-  void    (*get_child_property) (GtkContainer    *container,
-                                 GtkWidget       *child,
-				 guint            property_id,
-				 GValue          *value,
-				 GParamSpec      *pspec);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-/* Application-level methods */
-
-GType   gtk_container_get_type		 (void) G_GNUC_CONST;
-void    gtk_container_set_border_width	 (GtkContainer	   *container,
-					  guint		    border_width);
-guint   gtk_container_get_border_width   (GtkContainer     *container);
-void    gtk_container_add		 (GtkContainer	   *container,
-					  GtkWidget	   *widget);
-void    gtk_container_remove		 (GtkContainer	   *container,
-					  GtkWidget	   *widget);
-
-void    gtk_container_set_resize_mode    (GtkContainer     *container,
-					  GtkResizeMode     resize_mode);
-GtkResizeMode gtk_container_get_resize_mode (GtkContainer     *container);
-
-void    gtk_container_check_resize       (GtkContainer     *container);
-
-void     gtk_container_foreach      (GtkContainer       *container,
-				     GtkCallback         callback,
-				     gpointer            callback_data);
-#ifndef GTK_DISABLE_DEPRECATED
-void     gtk_container_foreach_full (GtkContainer       *container,
-				     GtkCallback         callback,
-				     GtkCallbackMarshal  marshal,
-				     gpointer            callback_data,
-				     GtkDestroyNotify    notify);
-#endif /*  GTK_DISABLE_DEPRECATED */
-GList*   gtk_container_get_children     (GtkContainer       *container);
-
-#ifndef GTK_DISABLE_DEPRECATED
-#define gtk_container_children gtk_container_get_children
-#endif
-
-void     gtk_container_propagate_expose (GtkContainer   *container,
-					 GtkWidget      *child,
-					 GdkEventExpose *event);
-
-void     gtk_container_set_focus_chain  (GtkContainer   *container,
-                                         GList          *focusable_widgets);
-gboolean gtk_container_get_focus_chain  (GtkContainer   *container,
-					 GList         **focusable_widgets);
-void     gtk_container_unset_focus_chain (GtkContainer  *container);
-
-/* Widget-level methods */
-
-void   gtk_container_set_reallocate_redraws (GtkContainer    *container,
-					     gboolean         needs_redraws);
-void   gtk_container_set_focus_child	   (GtkContainer     *container,
-					    GtkWidget	     *child);
-void   gtk_container_set_focus_vadjustment (GtkContainer     *container,
-					    GtkAdjustment    *adjustment);
-GtkAdjustment *gtk_container_get_focus_vadjustment (GtkContainer *container);
-void   gtk_container_set_focus_hadjustment (GtkContainer     *container,
-					    GtkAdjustment    *adjustment);
-GtkAdjustment *gtk_container_get_focus_hadjustment (GtkContainer *container);
-
-void    gtk_container_resize_children      (GtkContainer     *container);
-
-GType   gtk_container_child_type	   (GtkContainer     *container);
-
-
-void         gtk_container_class_install_child_property (GtkContainerClass *cclass,
-							 guint		    property_id,
-							 GParamSpec	   *pspec);
-GParamSpec*  gtk_container_class_find_child_property	(GObjectClass	   *cclass,
-							 const gchar	   *property_name);
-GParamSpec** gtk_container_class_list_child_properties	(GObjectClass	   *cclass,
-							 guint		   *n_properties);
-void         gtk_container_add_with_properties		(GtkContainer	   *container,
-							 GtkWidget	   *widget,
-							 const gchar	   *first_prop_name,
-							 ...) G_GNUC_NULL_TERMINATED;
-void         gtk_container_child_set			(GtkContainer	   *container,
-							 GtkWidget	   *child,
-							 const gchar	   *first_prop_name,
-							 ...) G_GNUC_NULL_TERMINATED;
-void         gtk_container_child_get			(GtkContainer	   *container,
-							 GtkWidget	   *child,
-							 const gchar	   *first_prop_name,
-							 ...) G_GNUC_NULL_TERMINATED;
-void         gtk_container_child_set_valist		(GtkContainer	   *container,
-							 GtkWidget	   *child,
-							 const gchar	   *first_property_name,
-							 va_list	    var_args);
-void         gtk_container_child_get_valist		(GtkContainer	   *container,
-							 GtkWidget	   *child,
-							 const gchar	   *first_property_name,
-							 va_list	    var_args);
-void	     gtk_container_child_set_property		(GtkContainer	   *container,
-							 GtkWidget	   *child,
-							 const gchar	   *property_name,
-							 const GValue	   *value);
-void	     gtk_container_child_get_property		(GtkContainer	   *container,
-							 GtkWidget	   *child,
-							 const gchar	   *property_name,
-							 GValue		   *value);
-
-#define GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID(object, property_id, pspec) \
-    G_OBJECT_WARN_INVALID_PSPEC ((object), "child property id", (property_id), (pspec))
-
-
-void    gtk_container_forall		     (GtkContainer *container,
-					      GtkCallback   callback,
-					      gpointer	    callback_data);
-
-/* Non-public methods */
-void	_gtk_container_queue_resize	     (GtkContainer *container);
-void    _gtk_container_clear_resize_widgets   (GtkContainer *container);
-gchar*	_gtk_container_child_composite_name   (GtkContainer *container,
-					      GtkWidget	   *child);
-void   _gtk_container_dequeue_resize_handler (GtkContainer *container);
-GList *_gtk_container_focus_sort             (GtkContainer     *container,
-					      GList            *children,
-					      GtkDirectionType  direction,
-					      GtkWidget        *old_focus);
-
-#ifndef GTK_DISABLE_DEPRECATED
-#define	gtk_container_border_width		gtk_container_set_border_width
-#endif /* GTK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GTK_CONTAINER_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkctree.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkctree.h
deleted file mode 100644
index a67ee5f9..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkctree.h
+++ /dev/null
@@ -1,445 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball, Josh MacDonald
- * Copyright (C) 1997-1998 Jay Painter <jpaint@serv.net><jpaint@gimp.org>
- *
- * GtkCTree widget for GTK+
- * Copyright (C) 1998 Lars Hamann and Stefan Jeske
- *
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-#ifndef __GTK_CTREE_H__
-#define __GTK_CTREE_H__
-
-#include <gtk/gtkclist.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_CTREE            (gtk_ctree_get_type ())
-#define GTK_CTREE(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_CTREE, GtkCTree))
-#define GTK_CTREE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_CTREE, GtkCTreeClass))
-#define GTK_IS_CTREE(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_CTREE))
-#define GTK_IS_CTREE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CTREE))
-#define GTK_CTREE_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CTREE, GtkCTreeClass))
-
-#define GTK_CTREE_ROW(_node_) ((GtkCTreeRow *)(((GList *)(_node_))->data))
-#define GTK_CTREE_NODE(_node_) ((GtkCTreeNode *)((_node_)))
-#define GTK_CTREE_NODE_NEXT(_nnode_) ((GtkCTreeNode *)(((GList *)(_nnode_))->next))
-#define GTK_CTREE_NODE_PREV(_pnode_) ((GtkCTreeNode *)(((GList *)(_pnode_))->prev))
-#define GTK_CTREE_FUNC(_func_) ((GtkCTreeFunc)(_func_))
-
-#define GTK_TYPE_CTREE_NODE (gtk_ctree_node_get_type ())
-
-typedef enum
-{
-  GTK_CTREE_POS_BEFORE,
-  GTK_CTREE_POS_AS_CHILD,
-  GTK_CTREE_POS_AFTER
-} GtkCTreePos;
-
-typedef enum
-{
-  GTK_CTREE_LINES_NONE,
-  GTK_CTREE_LINES_SOLID,
-  GTK_CTREE_LINES_DOTTED,
-  GTK_CTREE_LINES_TABBED
-} GtkCTreeLineStyle;
-
-typedef enum
-{
-  GTK_CTREE_EXPANDER_NONE,
-  GTK_CTREE_EXPANDER_SQUARE,
-  GTK_CTREE_EXPANDER_TRIANGLE,
-  GTK_CTREE_EXPANDER_CIRCULAR
-} GtkCTreeExpanderStyle;
-
-typedef enum
-{
-  GTK_CTREE_EXPANSION_EXPAND,
-  GTK_CTREE_EXPANSION_EXPAND_RECURSIVE,
-  GTK_CTREE_EXPANSION_COLLAPSE,
-  GTK_CTREE_EXPANSION_COLLAPSE_RECURSIVE,
-  GTK_CTREE_EXPANSION_TOGGLE,
-  GTK_CTREE_EXPANSION_TOGGLE_RECURSIVE
-} GtkCTreeExpansionType;
-
-typedef struct _GtkCTree      GtkCTree;
-typedef struct _GtkCTreeClass GtkCTreeClass;
-typedef struct _GtkCTreeRow   GtkCTreeRow;
-typedef struct _GtkCTreeNode  GtkCTreeNode;
-
-typedef void (*GtkCTreeFunc) (GtkCTree     *ctree,
-			      GtkCTreeNode *node,
-			      gpointer      data);
-
-typedef gboolean (*GtkCTreeGNodeFunc) (GtkCTree     *ctree,
-                                       guint         depth,
-                                       GNode        *gnode,
-				       GtkCTreeNode *cnode,
-                                       gpointer      data);
-
-typedef gboolean (*GtkCTreeCompareDragFunc) (GtkCTree     *ctree,
-                                             GtkCTreeNode *source_node,
-                                             GtkCTreeNode *new_parent,
-                                             GtkCTreeNode *new_sibling);
-
-struct _GtkCTree
-{
-  GtkCList clist;
-  
-  GdkGC *lines_gc;
-  
-  gint tree_indent;
-  gint tree_spacing;
-  gint tree_column;
-
-  guint line_style     : 2;
-  guint expander_style : 2;
-  guint show_stub      : 1;
-
-  GtkCTreeCompareDragFunc drag_compare;
-};
-
-struct _GtkCTreeClass
-{
-  GtkCListClass parent_class;
-  
-  void (*tree_select_row)   (GtkCTree     *ctree,
-			     GtkCTreeNode *row,
-			     gint          column);
-  void (*tree_unselect_row) (GtkCTree     *ctree,
-			     GtkCTreeNode *row,
-			     gint          column);
-  void (*tree_expand)       (GtkCTree     *ctree,
-			     GtkCTreeNode *node);
-  void (*tree_collapse)     (GtkCTree     *ctree,
-			     GtkCTreeNode *node);
-  void (*tree_move)         (GtkCTree     *ctree,
-			     GtkCTreeNode *node,
-			     GtkCTreeNode *new_parent,
-			     GtkCTreeNode *new_sibling);
-  void (*change_focus_row_expansion) (GtkCTree *ctree,
-				      GtkCTreeExpansionType action);
-};
-
-struct _GtkCTreeRow
-{
-  GtkCListRow row;
-  
-  GtkCTreeNode *parent;
-  GtkCTreeNode *sibling;
-  GtkCTreeNode *children;
-  
-  GdkPixmap *pixmap_closed;
-  GdkBitmap *mask_closed;
-  GdkPixmap *pixmap_opened;
-  GdkBitmap *mask_opened;
-  
-  guint16 level;
-  
-  guint is_leaf  : 1;
-  guint expanded : 1;
-};
-
-struct _GtkCTreeNode {
-  GList list;
-};
-
-
-/***********************************************************
- *           Creation, insertion, deletion                 *
- ***********************************************************/
-
-GtkType gtk_ctree_get_type                       (void) G_GNUC_CONST;
-GtkWidget * gtk_ctree_new_with_titles            (gint          columns, 
-						  gint          tree_column,
-						  gchar        *titles[]);
-GtkWidget * gtk_ctree_new                        (gint          columns, 
-						  gint          tree_column);
-GtkCTreeNode * gtk_ctree_insert_node             (GtkCTree     *ctree,
-						  GtkCTreeNode *parent, 
-						  GtkCTreeNode *sibling,
-						  gchar        *text[],
-						  guint8        spacing,
-						  GdkPixmap    *pixmap_closed,
-						  GdkBitmap    *mask_closed,
-						  GdkPixmap    *pixmap_opened,
-						  GdkBitmap    *mask_opened,
-						  gboolean      is_leaf,
-						  gboolean      expanded);
-void gtk_ctree_remove_node                       (GtkCTree     *ctree, 
-						  GtkCTreeNode *node);
-GtkCTreeNode * gtk_ctree_insert_gnode            (GtkCTree          *ctree,
-						  GtkCTreeNode      *parent,
-						  GtkCTreeNode      *sibling,
-						  GNode             *gnode,
-						  GtkCTreeGNodeFunc  func,
-						  gpointer           data);
-GNode * gtk_ctree_export_to_gnode                (GtkCTree          *ctree,
-						  GNode             *parent,
-						  GNode             *sibling,
-						  GtkCTreeNode      *node,
-						  GtkCTreeGNodeFunc  func,
-						  gpointer           data);
-
-/***********************************************************
- *  Generic recursive functions, querying / finding tree   *
- *  information                                            *
- ***********************************************************/
-
-void gtk_ctree_post_recursive                    (GtkCTree     *ctree, 
-						  GtkCTreeNode *node,
-						  GtkCTreeFunc  func,
-						  gpointer      data);
-void gtk_ctree_post_recursive_to_depth           (GtkCTree     *ctree, 
-						  GtkCTreeNode *node,
-						  gint          depth,
-						  GtkCTreeFunc  func,
-						  gpointer      data);
-void gtk_ctree_pre_recursive                     (GtkCTree     *ctree, 
-						  GtkCTreeNode *node,
-						  GtkCTreeFunc  func,
-						  gpointer      data);
-void gtk_ctree_pre_recursive_to_depth            (GtkCTree     *ctree, 
-						  GtkCTreeNode *node,
-						  gint          depth,
-						  GtkCTreeFunc  func,
-						  gpointer      data);
-gboolean gtk_ctree_is_viewable                   (GtkCTree     *ctree, 
-					          GtkCTreeNode *node);
-GtkCTreeNode * gtk_ctree_last                    (GtkCTree     *ctree,
-					          GtkCTreeNode *node);
-GtkCTreeNode * gtk_ctree_find_node_ptr           (GtkCTree     *ctree,
-					          GtkCTreeRow  *ctree_row);
-GtkCTreeNode * gtk_ctree_node_nth                (GtkCTree     *ctree,
-						  guint         row);
-gboolean gtk_ctree_find                          (GtkCTree     *ctree,
-					          GtkCTreeNode *node,
-					          GtkCTreeNode *child);
-gboolean gtk_ctree_is_ancestor                   (GtkCTree     *ctree,
-					          GtkCTreeNode *node,
-					          GtkCTreeNode *child);
-GtkCTreeNode * gtk_ctree_find_by_row_data        (GtkCTree     *ctree,
-					          GtkCTreeNode *node,
-					          gpointer      data);
-/* returns a GList of all GtkCTreeNodes with row->data == data. */
-GList * gtk_ctree_find_all_by_row_data           (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gpointer      data);
-GtkCTreeNode * gtk_ctree_find_by_row_data_custom (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gpointer      data,
-						  GCompareFunc  func);
-/* returns a GList of all GtkCTreeNodes with row->data == data. */
-GList * gtk_ctree_find_all_by_row_data_custom    (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gpointer      data,
-						  GCompareFunc  func);
-gboolean gtk_ctree_is_hot_spot                   (GtkCTree     *ctree,
-					          gint          x,
-					          gint          y);
-
-/***********************************************************
- *   Tree signals : move, expand, collapse, (un)select     *
- ***********************************************************/
-
-void gtk_ctree_move                              (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  GtkCTreeNode *new_parent, 
-						  GtkCTreeNode *new_sibling);
-void gtk_ctree_expand                            (GtkCTree     *ctree,
-						  GtkCTreeNode *node);
-void gtk_ctree_expand_recursive                  (GtkCTree     *ctree,
-						  GtkCTreeNode *node);
-void gtk_ctree_expand_to_depth                   (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gint          depth);
-void gtk_ctree_collapse                          (GtkCTree     *ctree,
-						  GtkCTreeNode *node);
-void gtk_ctree_collapse_recursive                (GtkCTree     *ctree,
-						  GtkCTreeNode *node);
-void gtk_ctree_collapse_to_depth                 (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gint          depth);
-void gtk_ctree_toggle_expansion                  (GtkCTree     *ctree,
-						  GtkCTreeNode *node);
-void gtk_ctree_toggle_expansion_recursive        (GtkCTree     *ctree,
-						  GtkCTreeNode *node);
-void gtk_ctree_select                            (GtkCTree     *ctree, 
-						  GtkCTreeNode *node);
-void gtk_ctree_select_recursive                  (GtkCTree     *ctree, 
-						  GtkCTreeNode *node);
-void gtk_ctree_unselect                          (GtkCTree     *ctree, 
-						  GtkCTreeNode *node);
-void gtk_ctree_unselect_recursive                (GtkCTree     *ctree, 
-						  GtkCTreeNode *node);
-void gtk_ctree_real_select_recursive             (GtkCTree     *ctree, 
-						  GtkCTreeNode *node, 
-						  gint          state);
-
-/***********************************************************
- *           Analogons of GtkCList functions               *
- ***********************************************************/
-
-void gtk_ctree_node_set_text                     (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gint          column,
-						  const gchar  *text);
-void gtk_ctree_node_set_pixmap                   (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gint          column,
-						  GdkPixmap    *pixmap,
-						  GdkBitmap    *mask);
-void gtk_ctree_node_set_pixtext                  (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gint          column,
-						  const gchar  *text,
-						  guint8        spacing,
-						  GdkPixmap    *pixmap,
-						  GdkBitmap    *mask);
-void gtk_ctree_set_node_info                     (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  const gchar  *text,
-						  guint8        spacing,
-						  GdkPixmap    *pixmap_closed,
-						  GdkBitmap    *mask_closed,
-						  GdkPixmap    *pixmap_opened,
-						  GdkBitmap    *mask_opened,
-						  gboolean      is_leaf,
-						  gboolean      expanded);
-void gtk_ctree_node_set_shift                    (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gint          column,
-						  gint          vertical,
-						  gint          horizontal);
-void gtk_ctree_node_set_selectable               (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gboolean      selectable);
-gboolean gtk_ctree_node_get_selectable           (GtkCTree     *ctree,
-						  GtkCTreeNode *node);
-GtkCellType gtk_ctree_node_get_cell_type         (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gint          column);
-gboolean gtk_ctree_node_get_text                 (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gint          column,
-						  gchar       **text);
-gboolean gtk_ctree_node_get_pixmap               (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gint          column,
-						  GdkPixmap   **pixmap,
-						  GdkBitmap   **mask);
-gboolean gtk_ctree_node_get_pixtext              (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gint          column,
-						  gchar       **text,
-						  guint8       *spacing,
-						  GdkPixmap   **pixmap,
-						  GdkBitmap   **mask);
-gboolean gtk_ctree_get_node_info                 (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gchar       **text,
-						  guint8       *spacing,
-						  GdkPixmap   **pixmap_closed,
-						  GdkBitmap   **mask_closed,
-						  GdkPixmap   **pixmap_opened,
-						  GdkBitmap   **mask_opened,
-						  gboolean     *is_leaf,
-						  gboolean     *expanded);
-void gtk_ctree_node_set_row_style                (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  GtkStyle     *style);
-GtkStyle * gtk_ctree_node_get_row_style          (GtkCTree     *ctree,
-						  GtkCTreeNode *node);
-void gtk_ctree_node_set_cell_style               (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gint          column,
-						  GtkStyle     *style);
-GtkStyle * gtk_ctree_node_get_cell_style         (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gint          column);
-void gtk_ctree_node_set_foreground               (GtkCTree       *ctree,
-						  GtkCTreeNode   *node,
-						  const GdkColor *color);
-void gtk_ctree_node_set_background               (GtkCTree       *ctree,
-						  GtkCTreeNode   *node,
-						  const GdkColor *color);
-void gtk_ctree_node_set_row_data                 (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gpointer      data);
-void gtk_ctree_node_set_row_data_full            (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gpointer      data,
-						  GtkDestroyNotify destroy);
-gpointer gtk_ctree_node_get_row_data             (GtkCTree     *ctree,
-						  GtkCTreeNode *node);
-void gtk_ctree_node_moveto                       (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  gint          column,
-						  gfloat        row_align,
-						  gfloat        col_align);
-GtkVisibility gtk_ctree_node_is_visible          (GtkCTree     *ctree,
-						  GtkCTreeNode *node);
-
-/***********************************************************
- *             GtkCTree specific functions                 *
- ***********************************************************/
-
-void gtk_ctree_set_indent            (GtkCTree                *ctree, 
-				      gint                     indent);
-void gtk_ctree_set_spacing           (GtkCTree                *ctree, 
-				      gint                     spacing);
-void gtk_ctree_set_show_stub         (GtkCTree                *ctree, 
-				      gboolean                 show_stub);
-void gtk_ctree_set_line_style        (GtkCTree                *ctree, 
-				      GtkCTreeLineStyle        line_style);
-void gtk_ctree_set_expander_style    (GtkCTree                *ctree, 
-				      GtkCTreeExpanderStyle    expander_style);
-void gtk_ctree_set_drag_compare_func (GtkCTree     	      *ctree,
-				      GtkCTreeCompareDragFunc  cmp_func);
-
-/***********************************************************
- *             Tree sorting functions                      *
- ***********************************************************/
-
-void gtk_ctree_sort_node                         (GtkCTree     *ctree, 
-						  GtkCTreeNode *node);
-void gtk_ctree_sort_recursive                    (GtkCTree     *ctree, 
-						  GtkCTreeNode *node);
-
-
-#define gtk_ctree_set_reorderable(t,r)                    gtk_clist_set_reorderable((GtkCList*) (t),(r))
-
-/* GType for the GtkCTreeNode.  This is a boxed type, although it uses
- * no-op's for the copy and free routines.  It is defined in order to
- * provide type information for the signal arguments
- */
-GType   gtk_ctree_node_get_type                  (void) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif				/* __GTK_CTREE_H__ */
-
-#endif /* GTK_DISABLE_DEPRECATED */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcurve.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcurve.h
deleted file mode 100644
index 94c2c59b..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkcurve.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-/*
- * NOTE this widget is considered too specialized/little-used for
- * GTK+, and will in the future be moved to some other package.  If
- * your application needs this widget, feel free to use it, as the
- * widget does work and is useful in some applications; it's just not
- * of general interest. However, we are not accepting new features for
- * the widget, and it will eventually move out of the GTK+
- * distribution.
- */
-
-#ifndef __GTK_CURVE_H__
-#define __GTK_CURVE_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkdrawingarea.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_CURVE                  (gtk_curve_get_type ())
-#define GTK_CURVE(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CURVE, GtkCurve))
-#define GTK_CURVE_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CURVE, GtkCurveClass))
-#define GTK_IS_CURVE(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CURVE))
-#define GTK_IS_CURVE_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CURVE))
-#define GTK_CURVE_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CURVE, GtkCurveClass))
-
-
-typedef struct _GtkCurve	GtkCurve;
-typedef struct _GtkCurveClass	GtkCurveClass;
-
-
-struct _GtkCurve
-{
-  GtkDrawingArea graph;
-
-  gint cursor_type;
-  gfloat min_x;
-  gfloat max_x;
-  gfloat min_y;
-  gfloat max_y;
-  GdkPixmap *pixmap;
-  GtkCurveType curve_type;
-  gint height;                  /* (cached) graph height in pixels */
-  gint grab_point;              /* point currently grabbed */
-  gint last;
-
-  /* (cached) curve points: */
-  gint num_points;
-  GdkPoint *point;
-
-  /* control points: */
-  gint num_ctlpoints;           /* number of control points */
-  gfloat (*ctlpoint)[2];        /* array of control points */
-};
-
-struct _GtkCurveClass
-{
-  GtkDrawingAreaClass parent_class;
-
-  void (* curve_type_changed) (GtkCurve *curve);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType		gtk_curve_get_type	(void) G_GNUC_CONST;
-GtkWidget*	gtk_curve_new		(void);
-void		gtk_curve_reset		(GtkCurve *curve);
-void		gtk_curve_set_gamma	(GtkCurve *curve, gfloat gamma_);
-void		gtk_curve_set_range	(GtkCurve *curve,
-					 gfloat min_x, gfloat max_x,
-					 gfloat min_y, gfloat max_y);
-void		gtk_curve_get_vector	(GtkCurve *curve,
-					 int veclen, gfloat vector[]);
-void		gtk_curve_set_vector	(GtkCurve *curve,
-					 int veclen, gfloat vector[]);
-void		gtk_curve_set_curve_type (GtkCurve *curve, GtkCurveType type);
-
-
-G_END_DECLS
-
-#endif /* __GTK_CURVE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkdebug.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkdebug.h
deleted file mode 100644
index 5b148c88..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkdebug.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_DEBUG_H__
-#define __GTK_DEBUG_H__
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-typedef enum {
-  GTK_DEBUG_MISC        = 1 << 0,
-  GTK_DEBUG_PLUGSOCKET  = 1 << 1,
-  GTK_DEBUG_TEXT        = 1 << 2,
-  GTK_DEBUG_TREE        = 1 << 3,
-  GTK_DEBUG_UPDATES     = 1 << 4,
-  GTK_DEBUG_KEYBINDINGS = 1 << 5,
-  GTK_DEBUG_MULTIHEAD   = 1 << 6,
-  GTK_DEBUG_MODULES     = 1 << 7,
-  GTK_DEBUG_GEOMETRY    = 1 << 8,
-  GTK_DEBUG_ICONTHEME   = 1 << 9,
-  GTK_DEBUG_PRINTING	= 1 << 10,
-  GTK_DEBUG_BUILDER	= 1 << 11
-} GtkDebugFlag;
-
-#ifdef G_ENABLE_DEBUG
-
-#define GTK_NOTE(type,action)                G_STMT_START { \
-    if (gtk_debug_flags & GTK_DEBUG_##type)                 \
-       { action; };                          } G_STMT_END
-
-#else /* !G_ENABLE_DEBUG */
-
-#define GTK_NOTE(type, action)
-      
-#endif /* G_ENABLE_DEBUG */
-
-#ifdef G_OS_WIN32
-#  ifdef GTK_COMPILATION
-#    define GTKVAR __declspec(dllexport)
-#  else
-#    define GTKVAR extern __declspec(dllimport)
-#  endif
-#else
-#  define GTKVAR extern
-#endif
-
-GTKVAR guint gtk_debug_flags;
-
-G_END_DECLS
-
-#endif /* __GTK_DEBUG_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkdialog.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkdialog.h
deleted file mode 100644
index 0b6b65c1..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkdialog.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_DIALOG_H__
-#define __GTK_DIALOG_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkwindow.h>
-
-
-G_BEGIN_DECLS
-
-/* Parameters for dialog construction */
-typedef enum
-{
-  GTK_DIALOG_MODAL               = 1 << 0, /* call gtk_window_set_modal (win, TRUE) */
-  GTK_DIALOG_DESTROY_WITH_PARENT = 1 << 1, /* call gtk_window_set_destroy_with_parent () */
-  GTK_DIALOG_NO_SEPARATOR        = 1 << 2  /* no separator bar above buttons */
-} GtkDialogFlags;
-
-/* Convenience enum to use for response_id's.  Positive values are
- * totally user-interpreted. GTK will sometimes return
- * GTK_RESPONSE_NONE if no response_id is available.
- *
- *  Typical usage is:
- *     if (gtk_dialog_run(dialog) == GTK_RESPONSE_ACCEPT)
- *       blah();
- */
-typedef enum
-{
-  /* GTK returns this if a response widget has no response_id,
-   * or if the dialog gets programmatically hidden or destroyed.
-   */
-  GTK_RESPONSE_NONE = -1,
-
-  /* GTK won't return these unless you pass them in
-   * as the response for an action widget. They are
-   * for your convenience.
-   */
-  GTK_RESPONSE_REJECT = -2,
-  GTK_RESPONSE_ACCEPT = -3,
-
-  /* If the dialog is deleted. */
-  GTK_RESPONSE_DELETE_EVENT = -4,
-
-  /* These are returned from GTK dialogs, and you can also use them
-   * yourself if you like.
-   */
-  GTK_RESPONSE_OK     = -5,
-  GTK_RESPONSE_CANCEL = -6,
-  GTK_RESPONSE_CLOSE  = -7,
-  GTK_RESPONSE_YES    = -8,
-  GTK_RESPONSE_NO     = -9,
-  GTK_RESPONSE_APPLY  = -10,
-  GTK_RESPONSE_HELP   = -11
-} GtkResponseType;
-
-
-#define GTK_TYPE_DIALOG                  (gtk_dialog_get_type ())
-#define GTK_DIALOG(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_DIALOG, GtkDialog))
-#define GTK_DIALOG_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_DIALOG, GtkDialogClass))
-#define GTK_IS_DIALOG(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_DIALOG))
-#define GTK_IS_DIALOG_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_DIALOG))
-#define GTK_DIALOG_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_DIALOG, GtkDialogClass))
-
-
-typedef struct _GtkDialog        GtkDialog;
-typedef struct _GtkDialogClass   GtkDialogClass;
-
-struct _GtkDialog
-{
-  GtkWindow window;
-
-  /*< public >*/
-  GtkWidget *vbox;
-  GtkWidget *action_area;
-
-  /*< private >*/
-  GtkWidget *separator;
-};
-
-struct _GtkDialogClass
-{
-  GtkWindowClass parent_class;
-
-  void (* response) (GtkDialog *dialog, gint response_id);
-
-  /* Keybinding signals */
-
-  void (* close)    (GtkDialog *dialog);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType      gtk_dialog_get_type (void) G_GNUC_CONST;
-GtkWidget* gtk_dialog_new      (void);
-
-GtkWidget* gtk_dialog_new_with_buttons (const gchar     *title,
-                                        GtkWindow       *parent,
-                                        GtkDialogFlags   flags,
-                                        const gchar     *first_button_text,
-                                        ...);
-
-void       gtk_dialog_add_action_widget (GtkDialog   *dialog,
-                                         GtkWidget   *child,
-                                         gint         response_id);
-GtkWidget* gtk_dialog_add_button        (GtkDialog   *dialog,
-                                         const gchar *button_text,
-                                         gint         response_id);
-void       gtk_dialog_add_buttons       (GtkDialog   *dialog,
-                                         const gchar *first_button_text,
-                                         ...) G_GNUC_NULL_TERMINATED;
-
-void gtk_dialog_set_response_sensitive (GtkDialog *dialog,
-                                        gint       response_id,
-                                        gboolean   setting);
-void gtk_dialog_set_default_response   (GtkDialog *dialog,
-                                        gint       response_id);
-gint gtk_dialog_get_response_for_widget (GtkDialog *dialog,
-					 GtkWidget *widget);
-
-void     gtk_dialog_set_has_separator (GtkDialog *dialog,
-                                       gboolean   setting);
-gboolean gtk_dialog_get_has_separator (GtkDialog *dialog);
-
-gboolean gtk_alternative_dialog_button_order (GdkScreen *screen);
-void     gtk_dialog_set_alternative_button_order (GtkDialog *dialog,
-						  gint       first_response_id,
-						  ...);
-void     gtk_dialog_set_alternative_button_order_from_array (GtkDialog *dialog,
-                                                             gint       n_params,
-                                                             gint      *new_order);
-
-/* Emit response signal */
-void gtk_dialog_response           (GtkDialog *dialog,
-                                    gint       response_id);
-
-/* Returns response_id */
-gint gtk_dialog_run                (GtkDialog *dialog);
-
-
-/* For private use only */
-void _gtk_dialog_set_ignore_separator (GtkDialog *dialog,
-				       gboolean   ignore_separator);
-
-G_END_DECLS
-
-#endif /* __GTK_DIALOG_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkdnd.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkdnd.h
deleted file mode 100644
index f9119060..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkdnd.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/* -*- Mode: C; c-file-style: "gnu"; tab-width: 8 -*- */
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_DND_H__
-#define __GTK_DND_H__
-
-#include <gdk/gdk.h>
-#include <gtk/gtkenums.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkselection.h>
-
-G_BEGIN_DECLS
-
-typedef enum {
-  GTK_DEST_DEFAULT_MOTION     = 1 << 0, /* respond to "drag_motion" */
-  GTK_DEST_DEFAULT_HIGHLIGHT  = 1 << 1, /* auto-highlight */
-  GTK_DEST_DEFAULT_DROP       = 1 << 2, /* respond to "drag_drop" */
-  GTK_DEST_DEFAULT_ALL        = 0x07
-} GtkDestDefaults;
-
-/* Flags for the GtkTargetEntry on the destination side 
- */
-typedef enum {
-  GTK_TARGET_SAME_APP = 1 << 0,    /*< nick=same-app >*/
-  GTK_TARGET_SAME_WIDGET = 1 << 1, /*< nick=same-widget >*/
-  GTK_TARGET_OTHER_APP = 1 << 2,   /*< nick=other-app >*/
-  GTK_TARGET_OTHER_WIDGET = 1 << 3 /*< nick=other-widget >*/
-} GtkTargetFlags;
-
-/* Destination side */
-
-void gtk_drag_get_data (GtkWidget      *widget,
-			GdkDragContext *context,
-			GdkAtom         target,
-			guint32         time_);
-void gtk_drag_finish   (GdkDragContext *context,
-			gboolean        success,
-			gboolean        del,
-			guint32         time_);
-
-GtkWidget *gtk_drag_get_source_widget (GdkDragContext *context);
-
-void gtk_drag_highlight   (GtkWidget  *widget);
-void gtk_drag_unhighlight (GtkWidget  *widget);
-
-void gtk_drag_dest_set   (GtkWidget            *widget,
-			  GtkDestDefaults       flags,
-  		          const GtkTargetEntry *targets,
-			  gint                  n_targets,
-			  GdkDragAction         actions);
-
-void gtk_drag_dest_set_proxy (GtkWidget      *widget,
-			      GdkWindow      *proxy_window,
-			      GdkDragProtocol protocol,
-			      gboolean        use_coordinates);
-
-void gtk_drag_dest_unset (GtkWidget          *widget);
-
-GdkAtom        gtk_drag_dest_find_target     (GtkWidget      *widget,
-                                              GdkDragContext *context,
-                                              GtkTargetList  *target_list);
-GtkTargetList* gtk_drag_dest_get_target_list (GtkWidget      *widget);
-void           gtk_drag_dest_set_target_list (GtkWidget      *widget,
-                                              GtkTargetList  *target_list);
-void           gtk_drag_dest_add_text_targets  (GtkWidget    *widget);
-void           gtk_drag_dest_add_image_targets (GtkWidget    *widget);
-void           gtk_drag_dest_add_uri_targets   (GtkWidget    *widget);
-
-void           gtk_drag_dest_set_track_motion  (GtkWidget *widget,
-						gboolean   track_motion);
-gboolean       gtk_drag_dest_get_track_motion  (GtkWidget *widget);
-
-/* Source side */
-
-void gtk_drag_source_set  (GtkWidget            *widget,
-			   GdkModifierType       start_button_mask,
-			   const GtkTargetEntry *targets,
-			   gint                  n_targets,
-			   GdkDragAction         actions);
-
-void gtk_drag_source_unset (GtkWidget        *widget);
-
-GtkTargetList* gtk_drag_source_get_target_list (GtkWidget     *widget);
-void           gtk_drag_source_set_target_list (GtkWidget     *widget,
-                                                GtkTargetList *target_list);
-void           gtk_drag_source_add_text_targets  (GtkWidget     *widget);
-void           gtk_drag_source_add_image_targets (GtkWidget    *widget);
-void           gtk_drag_source_add_uri_targets   (GtkWidget    *widget);
-
-void gtk_drag_source_set_icon        (GtkWidget   *widget,
-				      GdkColormap *colormap,
-				      GdkPixmap   *pixmap,
-				      GdkBitmap   *mask);
-void gtk_drag_source_set_icon_pixbuf (GtkWidget   *widget,
-				      GdkPixbuf   *pixbuf);
-void gtk_drag_source_set_icon_stock  (GtkWidget   *widget,
-				      const gchar *stock_id);
-void gtk_drag_source_set_icon_name   (GtkWidget   *widget,
-				      const gchar *icon_name);
-
-/* There probably should be functions for setting the targets
- * as a GtkTargetList
- */
-
-GdkDragContext *gtk_drag_begin (GtkWidget         *widget,
-				GtkTargetList     *targets,
-				GdkDragAction      actions,
-				gint               button,
-				GdkEvent          *event);
-
-/* Set the image being dragged around
- */
-void gtk_drag_set_icon_widget (GdkDragContext *context,
-			       GtkWidget      *widget,
-			       gint            hot_x,
-			       gint            hot_y);
-void gtk_drag_set_icon_pixmap (GdkDragContext *context,
-			       GdkColormap    *colormap,
-			       GdkPixmap      *pixmap,
-			       GdkBitmap      *mask,
-			       gint            hot_x,
-			       gint            hot_y);
-void gtk_drag_set_icon_pixbuf (GdkDragContext *context,
-			       GdkPixbuf      *pixbuf,
-			       gint            hot_x,
-			       gint            hot_y);
-void gtk_drag_set_icon_stock  (GdkDragContext *context,
-			       const gchar    *stock_id,
-			       gint            hot_x,
-			       gint            hot_y);
-void gtk_drag_set_icon_name   (GdkDragContext *context,
-			       const gchar    *icon_name,
-			       gint            hot_x,
-			       gint            hot_y);
-
-void gtk_drag_set_icon_default (GdkDragContext    *context);
-
-gboolean gtk_drag_check_threshold (GtkWidget *widget,
-				   gint       start_x,
-				   gint       start_y,
-				   gint       current_x,
-				   gint       current_y);
-
-/* Internal functions */
-void _gtk_drag_source_handle_event (GtkWidget *widget,
-				    GdkEvent  *event);
-void _gtk_drag_dest_handle_event (GtkWidget *toplevel,
-				  GdkEvent  *event);
-
-#ifndef GTK_DISABLE_DEPRECATED
-void gtk_drag_set_default_icon (GdkColormap   *colormap,
-				GdkPixmap     *pixmap,
-				GdkBitmap     *mask,
-			        gint           hot_x,
-			        gint           hot_y);
-#endif /* !GTK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GTK_DND_H__ */
-
-
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkdrawingarea.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkdrawingarea.h
deleted file mode 100644
index fd445e16..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkdrawingarea.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_DRAWING_AREA_H__
-#define __GTK_DRAWING_AREA_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkwidget.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_DRAWING_AREA            (gtk_drawing_area_get_type ())
-#define GTK_DRAWING_AREA(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_DRAWING_AREA, GtkDrawingArea))
-#define GTK_DRAWING_AREA_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_DRAWING_AREA, GtkDrawingAreaClass))
-#define GTK_IS_DRAWING_AREA(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_DRAWING_AREA))
-#define GTK_IS_DRAWING_AREA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_DRAWING_AREA))
-#define GTK_DRAWING_AREA_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_DRAWING_AREA, GtkDrawingAreaClass))
-
-
-typedef struct _GtkDrawingArea       GtkDrawingArea;
-typedef struct _GtkDrawingAreaClass  GtkDrawingAreaClass;
-
-struct _GtkDrawingArea
-{
-  GtkWidget widget;
-
-  gpointer draw_data;
-};
-
-struct _GtkDrawingAreaClass
-{
-  GtkWidgetClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType      gtk_drawing_area_get_type   (void) G_GNUC_CONST;
-GtkWidget* gtk_drawing_area_new        (void);
-
-#ifndef GTK_DISABLE_DEPRECATED
-void       gtk_drawing_area_size       (GtkDrawingArea      *darea,
-					gint                 width,
-					gint                 height);
-#endif /* GTK_DISABLE_DEPRECATED */
-
-
-G_END_DECLS
-
-#endif /* __GTK_DRAWING_AREA_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkeditable.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkeditable.h
deleted file mode 100644
index 46de8150..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkeditable.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_EDITABLE_H__
-#define __GTK_EDITABLE_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkwidget.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_EDITABLE             (gtk_editable_get_type ())
-#define GTK_EDITABLE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_EDITABLE, GtkEditable))
-#define GTK_EDITABLE_CLASS(vtable)    (G_TYPE_CHECK_CLASS_CAST ((vtable), GTK_TYPE_EDITABLE, GtkEditableClass))
-#define GTK_IS_EDITABLE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_EDITABLE))
-#define GTK_IS_EDITABLE_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), GTK_TYPE_EDITABLE))
-#define GTK_EDITABLE_GET_CLASS(inst)  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GTK_TYPE_EDITABLE, GtkEditableClass))
-
-typedef struct _GtkEditable       GtkEditable;         /* Dummy typedef */
-typedef struct _GtkEditableClass  GtkEditableClass;
-
-struct _GtkEditableClass
-{
-  GTypeInterface		   base_iface;
-  
-  /* signals */
-  void (* insert_text)              (GtkEditable    *editable,
-				     const gchar    *text,
-				     gint            length,
-				     gint           *position);
-  void (* delete_text)              (GtkEditable    *editable,
-				     gint            start_pos,
-				     gint            end_pos);
-  void (* changed)                  (GtkEditable    *editable);
-
-  /* vtable */
-  void (* do_insert_text)           (GtkEditable    *editable,
-				     const gchar    *text,
-				     gint            length,
-				     gint           *position);
-  void (* do_delete_text)           (GtkEditable    *editable,
-				     gint            start_pos,
-				     gint            end_pos);
-
-  gchar* (* get_chars)              (GtkEditable    *editable,
-				     gint            start_pos,
-				     gint            end_pos);
-  void (* set_selection_bounds)     (GtkEditable    *editable,
-				     gint            start_pos,
-				     gint            end_pos);
-  gboolean (* get_selection_bounds) (GtkEditable    *editable,
-				     gint           *start_pos,
-				     gint           *end_pos);
-  void (* set_position)             (GtkEditable    *editable,
-				     gint            position);
-  gint (* get_position)             (GtkEditable    *editable);
-};
-
-GType    gtk_editable_get_type             (void) G_GNUC_CONST;
-void     gtk_editable_select_region        (GtkEditable *editable,
-					    gint         start,
-					    gint         end);
-gboolean gtk_editable_get_selection_bounds (GtkEditable *editable,
-					    gint        *start,
-					    gint        *end);
-void     gtk_editable_insert_text          (GtkEditable *editable,
-					    const gchar *new_text,
-					    gint         new_text_length,
-					    gint        *position);
-void     gtk_editable_delete_text          (GtkEditable *editable,
-					    gint         start_pos,
-					    gint         end_pos);
-gchar*   gtk_editable_get_chars            (GtkEditable *editable,
-					    gint         start_pos,
-					    gint         end_pos);
-void     gtk_editable_cut_clipboard        (GtkEditable *editable);
-void     gtk_editable_copy_clipboard       (GtkEditable *editable);
-void     gtk_editable_paste_clipboard      (GtkEditable *editable);
-void     gtk_editable_delete_selection     (GtkEditable *editable);
-void     gtk_editable_set_position         (GtkEditable *editable,
-					    gint         position);
-gint     gtk_editable_get_position         (GtkEditable *editable);
-void     gtk_editable_set_editable         (GtkEditable *editable,
-					    gboolean     is_editable);
-gboolean gtk_editable_get_editable         (GtkEditable *editable);
-
-G_END_DECLS
-
-#endif /* __GTK_EDITABLE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkentry.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkentry.h
deleted file mode 100644
index 24bf28db..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkentry.h
+++ /dev/null
@@ -1,220 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_ENTRY_H__
-#define __GTK_ENTRY_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkeditable.h>
-#include <gtk/gtkimcontext.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkentrycompletion.h>
-#include <pango/pango.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_ENTRY                  (gtk_entry_get_type ())
-#define GTK_ENTRY(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ENTRY, GtkEntry))
-#define GTK_ENTRY_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ENTRY, GtkEntryClass))
-#define GTK_IS_ENTRY(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ENTRY))
-#define GTK_IS_ENTRY_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ENTRY))
-#define GTK_ENTRY_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ENTRY, GtkEntryClass))
-
-
-typedef struct _GtkEntry       GtkEntry;
-typedef struct _GtkEntryClass  GtkEntryClass;
-
-struct _GtkEntry
-{
-  GtkWidget  widget;
-
-  gchar     *text;
-
-  guint      editable : 1;
-  guint      visible  : 1;
-  guint      overwrite_mode : 1;
-  guint      in_drag : 1;	/* Dragging within the selection */
-
-  guint16 text_length;	/* length in use, in chars */
-  guint16 text_max_length;
-
-  /*< private >*/
-  GdkWindow *text_area;
-  GtkIMContext *im_context;
-  GtkWidget   *popup_menu;
-  
-  gint         current_pos;
-  gint         selection_bound;
-  
-  PangoLayout *cached_layout;
-
-  guint        cache_includes_preedit : 1;
-  guint        need_im_reset          : 1;
-  guint        has_frame              : 1;
-  guint        activates_default      : 1;
-  guint        cursor_visible         : 1;
-  guint        in_click               : 1;	/* Flag so we don't select all when clicking in entry to focus in */
-  guint        is_cell_renderer       : 1;
-  guint        editing_canceled       : 1; /* Only used by GtkCellRendererText */
-  guint        mouse_cursor_obscured  : 1;
-  guint        select_words           : 1;
-  guint        select_lines           : 1;
-  guint        resolved_dir           : 4; /* PangoDirection */
-  guint        truncate_multiline     : 1;
-
-  guint   button;
-  guint   blink_timeout;
-  guint   recompute_idle;
-  gint    scroll_offset;
-  gint    ascent;	/* font ascent, in pango units  */
-  gint    descent;	/* font descent, in pango units  */
-  
-  guint16 text_size;	/* allocated size, in bytes */
-  guint16 n_bytes;	/* length in use, in bytes */
-
-  guint16 preedit_length;	/* length of preedit string, in bytes */
-  guint16 preedit_cursor;	/* offset of cursor within preedit string, in chars */
-
-  gint dnd_position;		/* In chars, -1 == no DND cursor */
-
-  gint drag_start_x;
-  gint drag_start_y;
-  
-  gunichar invisible_char;
-
-  gint width_chars;
-};
-
-struct _GtkEntryClass
-{
-  GtkWidgetClass parent_class;
-
-  /* Hook to customize right-click popup */
-  void (* populate_popup)   (GtkEntry       *entry,
-                             GtkMenu        *menu);
-  
-  /* Action signals
-   */
-  void (* activate)           (GtkEntry       *entry);
-  void (* move_cursor)        (GtkEntry       *entry,
-			       GtkMovementStep step,
-			       gint            count,
-			       gboolean        extend_selection);
-  void (* insert_at_cursor)   (GtkEntry       *entry,
-			       const gchar    *str);
-  void (* delete_from_cursor) (GtkEntry       *entry,
-			       GtkDeleteType   type,
-			       gint            count);
-  void (* backspace)          (GtkEntry       *entry);
-  void (* cut_clipboard)      (GtkEntry       *entry);
-  void (* copy_clipboard)     (GtkEntry       *entry);
-  void (* paste_clipboard)    (GtkEntry       *entry);
-  void (* toggle_overwrite)   (GtkEntry       *entry);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-};
-
-GType      gtk_entry_get_type       		(void) G_GNUC_CONST;
-GtkWidget* gtk_entry_new            		(void);
-void       gtk_entry_set_visibility 		(GtkEntry      *entry,
-						 gboolean       visible);
-gboolean   gtk_entry_get_visibility             (GtkEntry      *entry);
-void       gtk_entry_set_invisible_char         (GtkEntry      *entry,
-                                                 gunichar       ch);
-gunichar   gtk_entry_get_invisible_char         (GtkEntry      *entry);
-void       gtk_entry_set_has_frame              (GtkEntry      *entry,
-                                                 gboolean       setting);
-gboolean   gtk_entry_get_has_frame              (GtkEntry      *entry);
-void       gtk_entry_set_inner_border                (GtkEntry        *entry,
-                                                      const GtkBorder *border);
-G_CONST_RETURN GtkBorder* gtk_entry_get_inner_border (GtkEntry        *entry);
-/* text is truncated if needed */
-void       gtk_entry_set_max_length 		(GtkEntry      *entry,
-						 gint           max);
-gint       gtk_entry_get_max_length             (GtkEntry      *entry);
-void       gtk_entry_set_activates_default      (GtkEntry      *entry,
-                                                 gboolean       setting);
-gboolean   gtk_entry_get_activates_default      (GtkEntry      *entry);
-
-void       gtk_entry_set_width_chars            (GtkEntry      *entry,
-                                                 gint           n_chars);
-gint       gtk_entry_get_width_chars            (GtkEntry      *entry);
-
-/* Somewhat more convenient than the GtkEditable generic functions
- */
-void       gtk_entry_set_text                   (GtkEntry      *entry,
-                                                 const gchar   *text);
-/* returns a reference to the text */
-G_CONST_RETURN gchar* gtk_entry_get_text        (GtkEntry      *entry);
-
-PangoLayout* gtk_entry_get_layout               (GtkEntry      *entry);
-void         gtk_entry_get_layout_offsets       (GtkEntry      *entry,
-                                                 gint          *x,
-                                                 gint          *y);
-void       gtk_entry_set_alignment              (GtkEntry      *entry,
-                                                 gfloat         xalign);
-gfloat     gtk_entry_get_alignment              (GtkEntry      *entry);
-
-void                gtk_entry_set_completion (GtkEntry           *entry,
-                                              GtkEntryCompletion *completion);
-GtkEntryCompletion *gtk_entry_get_completion (GtkEntry           *entry);
-
-gint       gtk_entry_layout_index_to_text_index (GtkEntry      *entry,
-                                                 gint           layout_index);
-gint       gtk_entry_text_index_to_layout_index (GtkEntry      *entry,
-                                                 gint           text_index);
-
-/* For scrolling cursor appropriately 
- */
-void           gtk_entry_set_cursor_hadjustment (GtkEntry      *entry,
-                                                 GtkAdjustment *adjustment);
-GtkAdjustment* gtk_entry_get_cursor_hadjustment (GtkEntry      *entry);
-
-/* Deprecated compatibility functions
- */
-
-#ifndef GTK_DISABLE_DEPRECATED
-GtkWidget* gtk_entry_new_with_max_length	(gint           max);
-void       gtk_entry_append_text    		(GtkEntry      *entry,
-						 const gchar   *text);
-void       gtk_entry_prepend_text   		(GtkEntry      *entry,
-						 const gchar   *text);
-void       gtk_entry_set_position   		(GtkEntry      *entry,
-						 gint           position);
-void       gtk_entry_select_region  		(GtkEntry      *entry,
-						 gint           start,
-						 gint           end);
-void       gtk_entry_set_editable   		(GtkEntry      *entry,
-						 gboolean       editable);
-#endif /* GTK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GTK_ENTRY_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkentrycompletion.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkentrycompletion.h
deleted file mode 100644
index 19cacc85..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkentrycompletion.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/* gtkentrycompletion.h
- * Copyright (C) 2003  Kristian Rietveld  <kris@gtk.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 __GTK_ENTRY_COMPLETION_H__
-#define __GTK_ENTRY_COMPLETION_H__
-
-#include <glib-object.h>
-
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtktreeviewcolumn.h>
-#include <gtk/gtktreemodelfilter.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_ENTRY_COMPLETION            (gtk_entry_completion_get_type ())
-#define GTK_ENTRY_COMPLETION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ENTRY_COMPLETION, GtkEntryCompletion))
-#define GTK_ENTRY_COMPLETION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ENTRY_COMPLETION, GtkEntryCompletionClass))
-#define GTK_IS_ENTRY_COMPLETION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ENTRY_COMPLETION))
-#define GTK_IS_ENTRY_COMPLETION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ENTRY_COMPLETION))
-#define GTK_ENTRY_COMPLETION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ENTRY_COMPLETION, GtkEntryCompletionClass))
-
-typedef struct _GtkEntryCompletion            GtkEntryCompletion;
-typedef struct _GtkEntryCompletionClass       GtkEntryCompletionClass;
-typedef struct _GtkEntryCompletionPrivate     GtkEntryCompletionPrivate;
-
-typedef gboolean (* GtkEntryCompletionMatchFunc) (GtkEntryCompletion *completion,
-                                                  const gchar        *key,
-                                                  GtkTreeIter        *iter,
-                                                  gpointer            user_data);
-
-
-struct _GtkEntryCompletion
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GtkEntryCompletionPrivate *priv;
-};
-
-struct _GtkEntryCompletionClass
-{
-  GObjectClass parent_class;
-
-  gboolean (* match_selected)   (GtkEntryCompletion *completion,
-                                 GtkTreeModel       *model,
-                                 GtkTreeIter        *iter);
-  void     (* action_activated) (GtkEntryCompletion *completion,
-                                 gint                index_);
-  gboolean (* insert_prefix)    (GtkEntryCompletion *completion,
-				 const gchar        *prefix); 
-  gboolean (* cursor_on_match)  (GtkEntryCompletion *completion,
-				 GtkTreeModel       *model,
-				 GtkTreeIter        *iter);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved0) (void);
-  void (*_gtk_reserved1) (void);
-};
-
-/* core */
-GType               gtk_entry_completion_get_type               (void) G_GNUC_CONST;
-GtkEntryCompletion *gtk_entry_completion_new                    (void);
-
-GtkWidget          *gtk_entry_completion_get_entry              (GtkEntryCompletion          *completion);
-
-void                gtk_entry_completion_set_model              (GtkEntryCompletion          *completion,
-                                                                 GtkTreeModel                *model);
-GtkTreeModel       *gtk_entry_completion_get_model              (GtkEntryCompletion          *completion);
-
-void                gtk_entry_completion_set_match_func         (GtkEntryCompletion          *completion,
-                                                                 GtkEntryCompletionMatchFunc  func,
-                                                                 gpointer                     func_data,
-                                                                 GDestroyNotify               func_notify);
-void                gtk_entry_completion_set_minimum_key_length (GtkEntryCompletion          *completion,
-                                                                 gint                         length);
-gint                gtk_entry_completion_get_minimum_key_length (GtkEntryCompletion          *completion);
-void                gtk_entry_completion_complete               (GtkEntryCompletion          *completion);
-void                gtk_entry_completion_insert_prefix          (GtkEntryCompletion          *completion);
-
-void                gtk_entry_completion_insert_action_text     (GtkEntryCompletion          *completion,
-                                                                 gint                         index_,
-                                                                 const gchar                 *text);
-void                gtk_entry_completion_insert_action_markup   (GtkEntryCompletion          *completion,
-                                                                 gint                         index_,
-                                                                 const gchar                 *markup);
-void                gtk_entry_completion_delete_action          (GtkEntryCompletion          *completion,
-                                                                 gint                         index_);
-
-void                gtk_entry_completion_set_inline_completion  (GtkEntryCompletion          *completion,
-                                                                 gboolean                     inline_completion);
-gboolean            gtk_entry_completion_get_inline_completion  (GtkEntryCompletion          *completion);
-void                gtk_entry_completion_set_inline_selection  (GtkEntryCompletion          *completion,
-                                                                 gboolean                     inline_selection);
-gboolean            gtk_entry_completion_get_inline_selection  (GtkEntryCompletion          *completion);
-void                gtk_entry_completion_set_popup_completion   (GtkEntryCompletion          *completion,
-                                                                 gboolean                     popup_completion);
-gboolean            gtk_entry_completion_get_popup_completion   (GtkEntryCompletion          *completion);
-void                gtk_entry_completion_set_popup_set_width    (GtkEntryCompletion          *completion,
-                                                                 gboolean                     popup_set_width);
-gboolean            gtk_entry_completion_get_popup_set_width    (GtkEntryCompletion          *completion);
-void                gtk_entry_completion_set_popup_single_match (GtkEntryCompletion          *completion,
-                                                                 gboolean                     popup_single_match);
-gboolean            gtk_entry_completion_get_popup_single_match (GtkEntryCompletion          *completion);
-
-const gchar         *gtk_entry_completion_get_completion_prefix (GtkEntryCompletion *completion);
-/* convenience */
-void                gtk_entry_completion_set_text_column        (GtkEntryCompletion          *completion,
-                                                                 gint                         column);
-gint                gtk_entry_completion_get_text_column        (GtkEntryCompletion          *completion);
-
-G_END_DECLS
-
-#endif /* __GTK_ENTRY_COMPLETION_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkenums.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkenums.h
deleted file mode 100644
index 6fabacf5..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkenums.h
+++ /dev/null
@@ -1,529 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_ENUMS_H__
-#define __GTK_ENUMS_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/* Anchor types */
-typedef enum
-{
-  GTK_ANCHOR_CENTER,
-  GTK_ANCHOR_NORTH,
-  GTK_ANCHOR_NORTH_WEST,
-  GTK_ANCHOR_NORTH_EAST,
-  GTK_ANCHOR_SOUTH,
-  GTK_ANCHOR_SOUTH_WEST,
-  GTK_ANCHOR_SOUTH_EAST,
-  GTK_ANCHOR_WEST,
-  GTK_ANCHOR_EAST,
-  GTK_ANCHOR_N		= GTK_ANCHOR_NORTH,
-  GTK_ANCHOR_NW		= GTK_ANCHOR_NORTH_WEST,
-  GTK_ANCHOR_NE		= GTK_ANCHOR_NORTH_EAST,
-  GTK_ANCHOR_S		= GTK_ANCHOR_SOUTH,
-  GTK_ANCHOR_SW		= GTK_ANCHOR_SOUTH_WEST,
-  GTK_ANCHOR_SE		= GTK_ANCHOR_SOUTH_EAST,
-  GTK_ANCHOR_W		= GTK_ANCHOR_WEST,
-  GTK_ANCHOR_E		= GTK_ANCHOR_EAST
-} GtkAnchorType;
-
-/* Arrow types */
-typedef enum
-{
-  GTK_ARROW_UP,
-  GTK_ARROW_DOWN,
-  GTK_ARROW_LEFT,
-  GTK_ARROW_RIGHT,
-  GTK_ARROW_NONE
-} GtkArrowType;
-
-/* Attach options (for tables) */
-typedef enum
-{
-  GTK_EXPAND = 1 << 0,
-  GTK_SHRINK = 1 << 1,
-  GTK_FILL   = 1 << 2
-} GtkAttachOptions;
-
-/* Button box styles */
-typedef enum 
-{
-  GTK_BUTTONBOX_DEFAULT_STYLE,
-  GTK_BUTTONBOX_SPREAD,
-  GTK_BUTTONBOX_EDGE,
-  GTK_BUTTONBOX_START,
-  GTK_BUTTONBOX_END,
-  GTK_BUTTONBOX_CENTER
-} GtkButtonBoxStyle;
-
-/* Curve types */
-typedef enum
-{
-  GTK_CURVE_TYPE_LINEAR,       /* linear interpolation */
-  GTK_CURVE_TYPE_SPLINE,       /* spline interpolation */
-  GTK_CURVE_TYPE_FREE          /* free form curve */
-} GtkCurveType;
- 
-typedef enum {
-  GTK_DELETE_CHARS,
-  GTK_DELETE_WORD_ENDS,           /* delete only the portion of the word to the
-                                   * left/right of cursor if we're in the middle
-                                   * of a word */
-  GTK_DELETE_WORDS,
-  GTK_DELETE_DISPLAY_LINES,
-  GTK_DELETE_DISPLAY_LINE_ENDS,
-  GTK_DELETE_PARAGRAPH_ENDS,      /* like C-k in Emacs (or its reverse) */
-  GTK_DELETE_PARAGRAPHS,          /* C-k in pico, kill whole line */
-  GTK_DELETE_WHITESPACE           /* M-\ in Emacs */
-} GtkDeleteType;
-
-/* Focus movement types */
-typedef enum
-{
-  GTK_DIR_TAB_FORWARD,
-  GTK_DIR_TAB_BACKWARD,
-  GTK_DIR_UP,
-  GTK_DIR_DOWN,
-  GTK_DIR_LEFT,
-  GTK_DIR_RIGHT
-} GtkDirectionType;
-
-/* Expander styles */
-typedef enum
-{
-  GTK_EXPANDER_COLLAPSED,
-  GTK_EXPANDER_SEMI_COLLAPSED,
-  GTK_EXPANDER_SEMI_EXPANDED,
-  GTK_EXPANDER_EXPANDED
-} GtkExpanderStyle;
-
-/* Built-in stock icon sizes */
-typedef enum
-{
-  GTK_ICON_SIZE_INVALID,
-  GTK_ICON_SIZE_MENU,
-  GTK_ICON_SIZE_SMALL_TOOLBAR,
-  GTK_ICON_SIZE_LARGE_TOOLBAR,
-  GTK_ICON_SIZE_BUTTON,
-  GTK_ICON_SIZE_DND,
-  GTK_ICON_SIZE_DIALOG
-} GtkIconSize;
-
-/* automatic sensitivity */
-typedef enum
-{
-  GTK_SENSITIVITY_AUTO,
-  GTK_SENSITIVITY_ON,
-  GTK_SENSITIVITY_OFF
-} GtkSensitivityType;
-
-#ifndef GTK_DISABLE_DEPRECATED
-/* side types */
-typedef enum
-{
-  GTK_SIDE_TOP,
-  GTK_SIDE_BOTTOM,
-  GTK_SIDE_LEFT,
-  GTK_SIDE_RIGHT
-} GtkSideType;
-#endif /* GTK_DISABLE_DEPRECATED */
-
-/* Reading directions for text */
-typedef enum
-{
-  GTK_TEXT_DIR_NONE,
-  GTK_TEXT_DIR_LTR,
-  GTK_TEXT_DIR_RTL
-} GtkTextDirection;
-
-/* justification for label and maybe other widgets (text?) */
-typedef enum
-{
-  GTK_JUSTIFY_LEFT,
-  GTK_JUSTIFY_RIGHT,
-  GTK_JUSTIFY_CENTER,
-  GTK_JUSTIFY_FILL
-} GtkJustification;
-
-#ifndef GTK_DISABLE_DEPRECATED
-/* GtkPatternSpec match types */
-typedef enum
-{
-  GTK_MATCH_ALL,       /* "*A?A*" */
-  GTK_MATCH_ALL_TAIL,  /* "*A?AA" */
-  GTK_MATCH_HEAD,      /* "AAAA*" */
-  GTK_MATCH_TAIL,      /* "*AAAA" */
-  GTK_MATCH_EXACT,     /* "AAAAA" */
-  GTK_MATCH_LAST
-} GtkMatchType;
-#endif /* GTK_DISABLE_DEPRECATED */
-
-/* Menu keyboard movement types */
-typedef enum
-{
-  GTK_MENU_DIR_PARENT,
-  GTK_MENU_DIR_CHILD,
-  GTK_MENU_DIR_NEXT,
-  GTK_MENU_DIR_PREV
-} GtkMenuDirectionType;
-
-typedef enum
-{
-  GTK_PIXELS,
-  GTK_INCHES,
-  GTK_CENTIMETERS
-} GtkMetricType;
-
-typedef enum 
-{
-  GTK_MOVEMENT_LOGICAL_POSITIONS, /* move by forw/back graphemes */
-  GTK_MOVEMENT_VISUAL_POSITIONS,  /* move by left/right graphemes */
-  GTK_MOVEMENT_WORDS,             /* move by forward/back words */
-  GTK_MOVEMENT_DISPLAY_LINES,     /* move up/down lines (wrapped lines) */
-  GTK_MOVEMENT_DISPLAY_LINE_ENDS, /* move up/down lines (wrapped lines) */
-  GTK_MOVEMENT_PARAGRAPHS,        /* move up/down paragraphs (newline-ended lines) */
-  GTK_MOVEMENT_PARAGRAPH_ENDS,    /* move to either end of a paragraph */
-  GTK_MOVEMENT_PAGES,	          /* move by pages */
-  GTK_MOVEMENT_BUFFER_ENDS,       /* move to ends of the buffer */
-  GTK_MOVEMENT_HORIZONTAL_PAGES   /* move horizontally by pages */
-} GtkMovementStep;
-
-typedef enum 
-{
-  GTK_SCROLL_STEPS,
-  GTK_SCROLL_PAGES,
-  GTK_SCROLL_ENDS,
-  GTK_SCROLL_HORIZONTAL_STEPS,
-  GTK_SCROLL_HORIZONTAL_PAGES,
-  GTK_SCROLL_HORIZONTAL_ENDS
-} GtkScrollStep;
-
-/* Orientation for toolbars, etc. */
-typedef enum
-{
-  GTK_ORIENTATION_HORIZONTAL,
-  GTK_ORIENTATION_VERTICAL
-} GtkOrientation;
-
-/* Placement type for scrolled window */
-typedef enum
-{
-  GTK_CORNER_TOP_LEFT,
-  GTK_CORNER_BOTTOM_LEFT,
-  GTK_CORNER_TOP_RIGHT,
-  GTK_CORNER_BOTTOM_RIGHT
-} GtkCornerType;
-
-/* Packing types (for boxes) */
-typedef enum
-{
-  GTK_PACK_START,
-  GTK_PACK_END
-} GtkPackType;
-
-/* priorities for path lookups */
-typedef enum
-{
-  GTK_PATH_PRIO_LOWEST      = 0,
-  GTK_PATH_PRIO_GTK	    = 4,
-  GTK_PATH_PRIO_APPLICATION = 8,
-  GTK_PATH_PRIO_THEME       = 10,
-  GTK_PATH_PRIO_RC          = 12,
-  GTK_PATH_PRIO_HIGHEST     = 15
-} GtkPathPriorityType;
-#define GTK_PATH_PRIO_MASK 0x0f
-
-/* widget path types */
-typedef enum
-{
-  GTK_PATH_WIDGET,
-  GTK_PATH_WIDGET_CLASS,
-  GTK_PATH_CLASS
-} GtkPathType;
-
-/* Scrollbar policy types (for scrolled windows) */
-typedef enum
-{
-  GTK_POLICY_ALWAYS,
-  GTK_POLICY_AUTOMATIC,
-  GTK_POLICY_NEVER
-} GtkPolicyType;
-
-typedef enum
-{
-  GTK_POS_LEFT,
-  GTK_POS_RIGHT,
-  GTK_POS_TOP,
-  GTK_POS_BOTTOM
-} GtkPositionType;
-
-#ifndef GTK_DISABLE_DEPRECATED
-typedef enum
-{
-  GTK_PREVIEW_COLOR,
-  GTK_PREVIEW_GRAYSCALE
-} GtkPreviewType;
-#endif /* GTK_DISABLE_DEPRECATED */
-
-/* Style for buttons */
-typedef enum
-{
-  GTK_RELIEF_NORMAL,
-  GTK_RELIEF_HALF,
-  GTK_RELIEF_NONE
-} GtkReliefStyle;
-
-/* Resize type */
-typedef enum
-{
-  GTK_RESIZE_PARENT,		/* Pass resize request to the parent */
-  GTK_RESIZE_QUEUE,		/* Queue resizes on this widget */
-  GTK_RESIZE_IMMEDIATE		/* Perform the resizes now */
-} GtkResizeMode;
-
-#ifndef GTK_DISABLE_DEPRECATED
-/* signal run types */
-typedef enum			/*< flags >*/
-{
-  GTK_RUN_FIRST      = G_SIGNAL_RUN_FIRST,
-  GTK_RUN_LAST       = G_SIGNAL_RUN_LAST,
-  GTK_RUN_BOTH       = (GTK_RUN_FIRST | GTK_RUN_LAST),
-  GTK_RUN_NO_RECURSE = G_SIGNAL_NO_RECURSE,
-  GTK_RUN_ACTION     = G_SIGNAL_ACTION,
-  GTK_RUN_NO_HOOKS   = G_SIGNAL_NO_HOOKS
-} GtkSignalRunType;
-#endif /* GTK_DISABLE_DEPRECATED */
-
-/* scrolling types */
-typedef enum
-{
-  GTK_SCROLL_NONE,
-  GTK_SCROLL_JUMP,
-  GTK_SCROLL_STEP_BACKWARD,
-  GTK_SCROLL_STEP_FORWARD,
-  GTK_SCROLL_PAGE_BACKWARD,
-  GTK_SCROLL_PAGE_FORWARD,
-  GTK_SCROLL_STEP_UP,
-  GTK_SCROLL_STEP_DOWN,
-  GTK_SCROLL_PAGE_UP,
-  GTK_SCROLL_PAGE_DOWN,
-  GTK_SCROLL_STEP_LEFT,
-  GTK_SCROLL_STEP_RIGHT,
-  GTK_SCROLL_PAGE_LEFT,
-  GTK_SCROLL_PAGE_RIGHT,
-  GTK_SCROLL_START,
-  GTK_SCROLL_END
-} GtkScrollType;
-
-/* list selection modes */
-typedef enum
-{
-  GTK_SELECTION_NONE,                             /* Nothing can be selected */
-  GTK_SELECTION_SINGLE,
-  GTK_SELECTION_BROWSE,
-  GTK_SELECTION_MULTIPLE,
-  GTK_SELECTION_EXTENDED = GTK_SELECTION_MULTIPLE /* Deprecated */
-} GtkSelectionMode;
-
-/* Shadow types */
-typedef enum
-{
-  GTK_SHADOW_NONE,
-  GTK_SHADOW_IN,
-  GTK_SHADOW_OUT,
-  GTK_SHADOW_ETCHED_IN,
-  GTK_SHADOW_ETCHED_OUT
-} GtkShadowType;
-
-/* Widget states */
-typedef enum
-{
-  GTK_STATE_NORMAL,
-  GTK_STATE_ACTIVE,
-  GTK_STATE_PRELIGHT,
-  GTK_STATE_SELECTED,
-  GTK_STATE_INSENSITIVE
-} GtkStateType;
-
-#if !defined(GTK_DISABLE_DEPRECATED) || defined (GTK_MENU_INTERNALS)
-/* Directions for submenus */
-typedef enum
-{
-  GTK_DIRECTION_LEFT,
-  GTK_DIRECTION_RIGHT
-} GtkSubmenuDirection;
-
-/* Placement of submenus */
-typedef enum
-{
-  GTK_TOP_BOTTOM,
-  GTK_LEFT_RIGHT
-} GtkSubmenuPlacement;
-#endif /* GTK_DISABLE_DEPRECATED */
-
-/* Style for toolbars */
-typedef enum
-{
-  GTK_TOOLBAR_ICONS,
-  GTK_TOOLBAR_TEXT,
-  GTK_TOOLBAR_BOTH,
-  GTK_TOOLBAR_BOTH_HORIZ
-} GtkToolbarStyle;
-
-/* Data update types (for ranges) */
-typedef enum
-{
-  GTK_UPDATE_CONTINUOUS,
-  GTK_UPDATE_DISCONTINUOUS,
-  GTK_UPDATE_DELAYED
-} GtkUpdateType;
-
-/* Generic visibility flags */
-typedef enum
-{
-  GTK_VISIBILITY_NONE,
-  GTK_VISIBILITY_PARTIAL,
-  GTK_VISIBILITY_FULL
-} GtkVisibility;
-
-/* Window position types */
-typedef enum
-{
-  GTK_WIN_POS_NONE,
-  GTK_WIN_POS_CENTER,
-  GTK_WIN_POS_MOUSE,
-  GTK_WIN_POS_CENTER_ALWAYS,
-  GTK_WIN_POS_CENTER_ON_PARENT
-} GtkWindowPosition;
-
-/* Window types */
-typedef enum
-{
-  GTK_WINDOW_TOPLEVEL,
-  GTK_WINDOW_POPUP
-} GtkWindowType;
-
-/* Text wrap */
-typedef enum
-{
-  GTK_WRAP_NONE,
-  GTK_WRAP_CHAR,
-  GTK_WRAP_WORD,
-  GTK_WRAP_WORD_CHAR
-} GtkWrapMode;
-
-/* How to sort */
-typedef enum
-{
-  GTK_SORT_ASCENDING,
-  GTK_SORT_DESCENDING
-} GtkSortType;
-
-/* Style for gtk input method preedit/status */
-typedef enum
-{
-  GTK_IM_PREEDIT_NOTHING,
-  GTK_IM_PREEDIT_CALLBACK,
-  GTK_IM_PREEDIT_NONE
-} GtkIMPreeditStyle;
-
-typedef enum
-{
-  GTK_IM_STATUS_NOTHING,
-  GTK_IM_STATUS_CALLBACK,
-  GTK_IM_STATUS_NONE
-} GtkIMStatusStyle;
-
-typedef enum
-{
-  GTK_PACK_DIRECTION_LTR,
-  GTK_PACK_DIRECTION_RTL,
-  GTK_PACK_DIRECTION_TTB,
-  GTK_PACK_DIRECTION_BTT
-} GtkPackDirection;
-
-typedef enum {
-  GTK_PRINT_PAGES_ALL,
-  GTK_PRINT_PAGES_CURRENT,
-  GTK_PRINT_PAGES_RANGES
-} GtkPrintPages;
-
-typedef enum {
-  GTK_PAGE_SET_ALL,
-  GTK_PAGE_SET_EVEN,
-  GTK_PAGE_SET_ODD
-} GtkPageSet;
-
-typedef enum {
-  GTK_PAGE_ORIENTATION_PORTRAIT,
-  GTK_PAGE_ORIENTATION_LANDSCAPE,
-  GTK_PAGE_ORIENTATION_REVERSE_PORTRAIT,
-  GTK_PAGE_ORIENTATION_REVERSE_LANDSCAPE
-} GtkPageOrientation;
-
-typedef enum {
-  GTK_PRINT_QUALITY_LOW,
-  GTK_PRINT_QUALITY_NORMAL,
-  GTK_PRINT_QUALITY_HIGH,
-  GTK_PRINT_QUALITY_DRAFT
-} GtkPrintQuality;
-
-typedef enum {
-  GTK_PRINT_DUPLEX_SIMPLEX,
-  GTK_PRINT_DUPLEX_HORIZONTAL,
-  GTK_PRINT_DUPLEX_VERTICAL
-} GtkPrintDuplex;
-
-
-typedef enum {
-  GTK_UNIT_PIXEL,
-  GTK_UNIT_POINTS,
-  GTK_UNIT_INCH,
-  GTK_UNIT_MM
-} GtkUnit;
-
-typedef enum {
-  GTK_TREE_VIEW_GRID_LINES_NONE,
-  GTK_TREE_VIEW_GRID_LINES_HORIZONTAL,
-  GTK_TREE_VIEW_GRID_LINES_VERTICAL,
-  GTK_TREE_VIEW_GRID_LINES_BOTH
-} GtkTreeViewGridLines;
-
-typedef enum {
-  GTK_DRAG_RESULT_SUCCESS,
-  GTK_DRAG_RESULT_NO_TARGET,
-  GTK_DRAG_RESULT_USER_CANCELLED,
-  GTK_DRAG_RESULT_TIMEOUT_EXPIRED,
-  GTK_DRAG_RESULT_GRAB_BROKEN,
-  GTK_DRAG_RESULT_ERROR
-} GtkDragResult;
-
-G_END_DECLS
-
-#endif /* __GTK_ENUMS_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkeventbox.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkeventbox.h
deleted file mode 100644
index 3fba8b4b..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkeventbox.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_EVENT_BOX_H__
-#define __GTK_EVENT_BOX_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkbin.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_EVENT_BOX              (gtk_event_box_get_type ())
-#define GTK_EVENT_BOX(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_EVENT_BOX, GtkEventBox))
-#define GTK_EVENT_BOX_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_EVENT_BOX, GtkEventBoxClass))
-#define GTK_IS_EVENT_BOX(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_EVENT_BOX))
-#define GTK_IS_EVENT_BOX_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_EVENT_BOX))
-#define GTK_EVENT_BOX_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_EVENT_BOX, GtkEventBoxClass))
-
-typedef struct _GtkEventBox	  GtkEventBox;
-typedef struct _GtkEventBoxClass  GtkEventBoxClass;
-
-struct _GtkEventBox
-{
-  GtkBin bin;
-};
-
-struct _GtkEventBoxClass
-{
-  GtkBinClass parent_class;
-};
-
-GType	   gtk_event_box_get_type           (void) G_GNUC_CONST;
-GtkWidget* gtk_event_box_new                (void);
-gboolean   gtk_event_box_get_visible_window (GtkEventBox *event_box);
-void       gtk_event_box_set_visible_window (GtkEventBox *event_box,
-					     gboolean     visible_window);
-gboolean   gtk_event_box_get_above_child    (GtkEventBox *event_box);
-void       gtk_event_box_set_above_child    (GtkEventBox *event_box,
-					     gboolean     above_child);
-
-G_END_DECLS
-
-#endif /* __GTK_EVENT_BOX_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkexpander.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkexpander.h
deleted file mode 100644
index e5bfa454..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkexpander.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* GTK - The GIMP Toolkit
- *
- * Copyright (C) 2003 Sun Microsystems, 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.
- *
- * Authors:
- *	Mark McLoughlin <mark@skynet.ie>
- */
-
-#ifndef __GTK_EXPANDER_H__
-#define __GTK_EXPANDER_H__
-
-#include <gtk/gtkbin.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_EXPANDER            (gtk_expander_get_type ())
-#define GTK_EXPANDER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_EXPANDER, GtkExpander))
-#define GTK_EXPANDER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_EXPANDER, GtkExpanderClass))
-#define GTK_IS_EXPANDER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_EXPANDER))
-#define GTK_IS_EXPANDER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_EXPANDER))
-#define GTK_EXPANDER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_EXPANDER, GtkExpanderClass))
-
-typedef struct _GtkExpander        GtkExpander;
-typedef struct _GtkExpanderClass   GtkExpanderClass;
-typedef struct _GtkExpanderPrivate GtkExpanderPrivate;
-
-struct _GtkExpander
-{
-  GtkBin              bin;
-
-  GtkExpanderPrivate *priv;
-};
-
-struct _GtkExpanderClass
-{
-  GtkBinClass    parent_class;
-
-  /* Key binding signal; to get notification on the expansion
-   * state connect to notify:expanded.
-   */
-  void        (* activate) (GtkExpander *expander);
-};
-
-GType                 gtk_expander_get_type          (void) G_GNUC_CONST;
-
-GtkWidget            *gtk_expander_new               (const gchar *label);
-GtkWidget            *gtk_expander_new_with_mnemonic (const gchar *label);
-
-void                  gtk_expander_set_expanded      (GtkExpander *expander,
-						      gboolean     expanded);
-gboolean              gtk_expander_get_expanded      (GtkExpander *expander);
-
-/* Spacing between the expander/label and the child */
-void                  gtk_expander_set_spacing       (GtkExpander *expander,
-						      gint         spacing);
-gint                  gtk_expander_get_spacing       (GtkExpander *expander);
-
-void                  gtk_expander_set_label         (GtkExpander *expander,
-						      const gchar *label);
-G_CONST_RETURN gchar *gtk_expander_get_label         (GtkExpander *expander);
-
-void                  gtk_expander_set_use_underline (GtkExpander *expander,
-						      gboolean     use_underline);
-gboolean              gtk_expander_get_use_underline (GtkExpander *expander);
-
-void                  gtk_expander_set_use_markup    (GtkExpander *expander,
-						      gboolean    use_markup);
-gboolean              gtk_expander_get_use_markup    (GtkExpander *expander);
-
-void                  gtk_expander_set_label_widget  (GtkExpander *expander,
-						      GtkWidget   *label_widget);
-GtkWidget            *gtk_expander_get_label_widget  (GtkExpander *expander);
-
-G_END_DECLS
-
-#endif /* __GTK_EXPANDER_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilechooser.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilechooser.h
deleted file mode 100644
index 5b233878..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilechooser.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkfilechooser.h: Abstract interface for file selector GUIs
- * Copyright (C) 2003, 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 __GTK_FILE_CHOOSER_H__
-#define __GTK_FILE_CHOOSER_H__
-
-#include "gtkfilefilter.h"
-#include <gtk/gtkwidget.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_FILE_CHOOSER             (gtk_file_chooser_get_type ())
-#define GTK_FILE_CHOOSER(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FILE_CHOOSER, GtkFileChooser))
-#define GTK_IS_FILE_CHOOSER(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FILE_CHOOSER))
-
-typedef struct _GtkFileChooser      GtkFileChooser;
-
-typedef enum
-{
-  GTK_FILE_CHOOSER_ACTION_OPEN,
-  GTK_FILE_CHOOSER_ACTION_SAVE,
-  GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-  GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER
-} GtkFileChooserAction;
-
-typedef enum
-{
-  GTK_FILE_CHOOSER_CONFIRMATION_CONFIRM,
-  GTK_FILE_CHOOSER_CONFIRMATION_ACCEPT_FILENAME,
-  GTK_FILE_CHOOSER_CONFIRMATION_SELECT_AGAIN
-} GtkFileChooserConfirmation;
-
-GType gtk_file_chooser_get_type (void) G_GNUC_CONST;
-
-/* GError enumeration for GtkFileChooser */
-
-#define GTK_FILE_CHOOSER_ERROR (gtk_file_chooser_error_quark ())
-
-typedef enum {
-  GTK_FILE_CHOOSER_ERROR_NONEXISTENT,
-  GTK_FILE_CHOOSER_ERROR_BAD_FILENAME,
-  GTK_FILE_CHOOSER_ERROR_ALREADY_EXISTS
-} GtkFileChooserError;
-
-GQuark gtk_file_chooser_error_quark (void);
-
-/* Configuration
- */
-void                 gtk_file_chooser_set_action          (GtkFileChooser       *chooser,
-							   GtkFileChooserAction  action);
-GtkFileChooserAction gtk_file_chooser_get_action          (GtkFileChooser       *chooser);
-void                 gtk_file_chooser_set_local_only      (GtkFileChooser       *chooser,
-							   gboolean              local_only);
-gboolean             gtk_file_chooser_get_local_only      (GtkFileChooser       *chooser);
-void                 gtk_file_chooser_set_select_multiple (GtkFileChooser       *chooser,
-							   gboolean              select_multiple);
-gboolean             gtk_file_chooser_get_select_multiple (GtkFileChooser       *chooser);
-void                 gtk_file_chooser_set_show_hidden     (GtkFileChooser       *chooser,
-							   gboolean              show_hidden);
-gboolean             gtk_file_chooser_get_show_hidden     (GtkFileChooser       *chooser);
-
-void                 gtk_file_chooser_set_do_overwrite_confirmation (GtkFileChooser *chooser,
-								     gboolean        do_overwrite_confirmation);
-gboolean             gtk_file_chooser_get_do_overwrite_confirmation (GtkFileChooser *chooser);
-
-/* Suggested name for the Save-type actions
- */
-void     gtk_file_chooser_set_current_name   (GtkFileChooser *chooser,
-					      const gchar    *name);
-
-/* Filename manipulation
- */
-#ifdef G_OS_WIN32
-/* Reserve old names for DLL ABI backward compatibility */
-#define gtk_file_chooser_get_filename gtk_file_chooser_get_filename_utf8
-#define gtk_file_chooser_set_filename gtk_file_chooser_set_filename_utf8
-#define gtk_file_chooser_select_filename gtk_file_chooser_select_filename_utf8
-#define gtk_file_chooser_unselect_filename gtk_file_chooser_unselect_filename_utf8
-#define gtk_file_chooser_get_filenames gtk_file_chooser_get_filenames_utf8
-#define gtk_file_chooser_set_current_folder gtk_file_chooser_set_current_folder_utf8
-#define gtk_file_chooser_get_current_folder gtk_file_chooser_get_current_folder_utf8
-#define gtk_file_chooser_get_preview_filename gtk_file_chooser_get_preview_filename_utf8
-#define gtk_file_chooser_add_shortcut_folder gtk_file_chooser_add_shortcut_folder_utf8
-#define gtk_file_chooser_remove_shortcut_folder gtk_file_chooser_remove_shortcut_folder_utf8
-#define gtk_file_chooser_list_shortcut_folders gtk_file_chooser_list_shortcut_folders_utf8
-#endif
-
-gchar *  gtk_file_chooser_get_filename       (GtkFileChooser *chooser);
-gboolean gtk_file_chooser_set_filename       (GtkFileChooser *chooser,
-					      const char     *filename);
-gboolean gtk_file_chooser_select_filename    (GtkFileChooser *chooser,
-					      const char     *filename);
-void     gtk_file_chooser_unselect_filename  (GtkFileChooser *chooser,
-					      const char     *filename);
-void     gtk_file_chooser_select_all         (GtkFileChooser *chooser);
-void     gtk_file_chooser_unselect_all       (GtkFileChooser *chooser);
-GSList * gtk_file_chooser_get_filenames      (GtkFileChooser *chooser);
-gboolean gtk_file_chooser_set_current_folder (GtkFileChooser *chooser,
-					      const gchar    *filename);
-gchar *  gtk_file_chooser_get_current_folder (GtkFileChooser *chooser);
-
-
-/* URI manipulation
- */
-gchar *  gtk_file_chooser_get_uri                (GtkFileChooser *chooser);
-gboolean gtk_file_chooser_set_uri                (GtkFileChooser *chooser,
-						  const char     *uri);
-gboolean gtk_file_chooser_select_uri             (GtkFileChooser *chooser,
-						  const char     *uri);
-void     gtk_file_chooser_unselect_uri           (GtkFileChooser *chooser,
-						  const char     *uri);
-GSList * gtk_file_chooser_get_uris               (GtkFileChooser *chooser);
-gboolean gtk_file_chooser_set_current_folder_uri (GtkFileChooser *chooser,
-						  const gchar    *uri);
-gchar *  gtk_file_chooser_get_current_folder_uri (GtkFileChooser *chooser);
-
-/* Preview widget
- */
-void       gtk_file_chooser_set_preview_widget        (GtkFileChooser *chooser,
-						       GtkWidget      *preview_widget);
-GtkWidget *gtk_file_chooser_get_preview_widget        (GtkFileChooser *chooser);
-void       gtk_file_chooser_set_preview_widget_active (GtkFileChooser *chooser,
-						       gboolean        active);
-gboolean   gtk_file_chooser_get_preview_widget_active (GtkFileChooser *chooser);
-void       gtk_file_chooser_set_use_preview_label     (GtkFileChooser *chooser,
-						       gboolean        use_label);
-gboolean   gtk_file_chooser_get_use_preview_label     (GtkFileChooser *chooser);
-
-char *gtk_file_chooser_get_preview_filename (GtkFileChooser *chooser);
-char *gtk_file_chooser_get_preview_uri      (GtkFileChooser *chooser);
-
-/* Extra widget
- */
-void       gtk_file_chooser_set_extra_widget (GtkFileChooser *chooser,
-					      GtkWidget      *extra_widget);
-GtkWidget *gtk_file_chooser_get_extra_widget (GtkFileChooser *chooser);
-
-/* List of user selectable filters
- */
-void    gtk_file_chooser_add_filter    (GtkFileChooser *chooser,
-					GtkFileFilter  *filter);
-void    gtk_file_chooser_remove_filter (GtkFileChooser *chooser,
-					GtkFileFilter  *filter);
-GSList *gtk_file_chooser_list_filters  (GtkFileChooser *chooser);
-
-/* Current filter
- */
-void           gtk_file_chooser_set_filter (GtkFileChooser *chooser,
-					   GtkFileFilter  *filter);
-GtkFileFilter *gtk_file_chooser_get_filter (GtkFileChooser *chooser);
-
-/* Per-application shortcut folders */
-
-gboolean gtk_file_chooser_add_shortcut_folder    (GtkFileChooser *chooser,
-						  const char     *folder,
-						  GError        **error);
-gboolean gtk_file_chooser_remove_shortcut_folder (GtkFileChooser *chooser,
-						  const char     *folder,
-						  GError        **error);
-GSList *gtk_file_chooser_list_shortcut_folders   (GtkFileChooser *chooser);
-
-gboolean gtk_file_chooser_add_shortcut_folder_uri    (GtkFileChooser *chooser,
-						      const char     *uri,
-						      GError        **error);
-gboolean gtk_file_chooser_remove_shortcut_folder_uri (GtkFileChooser *chooser,
-						      const char     *uri,
-						      GError        **error);
-GSList *gtk_file_chooser_list_shortcut_folder_uris   (GtkFileChooser *chooser);
-
-G_END_DECLS
-
-#endif /* __GTK_FILE_CHOOSER_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilechooserbutton.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilechooserbutton.h
deleted file mode 100644
index 979c4b57..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilechooserbutton.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* GTK+: gtkfilechooserbutton.h
- * 
- * Copyright (c) 2004 James M. Cape <jcape@ignore-your.tv>
- *
- * 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 __GTK_FILE_CHOOSER_BUTTON_H__
-#define __GTK_FILE_CHOOSER_BUTTON_H__
-
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkfilechooser.h>
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_FILE_CHOOSER_BUTTON \
-  (gtk_file_chooser_button_get_type ())
-#define GTK_FILE_CHOOSER_BUTTON(object) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((object), GTK_TYPE_FILE_CHOOSER_BUTTON, GtkFileChooserButton))
-#define GTK_FILE_CHOOSER_BUTTON_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FILE_CHOOSER_BUTTON, GtkFileChooserButtonClass))
-#define GTK_IS_FILE_CHOOSER_BUTTON(object) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((object), GTK_TYPE_FILE_CHOOSER_BUTTON))
-#define GTK_IS_FILE_CHOOSER_BUTTON_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FILE_CHOOSER_BUTTON))
-#define GTK_FILE_CHOOSER_BUTTON_GET_CLASS(object) \
-  (G_TYPE_INSTANCE_GET_CLASS ((object), GTK_TYPE_FILE_CHOOSER_BUTTON, GtkFileChooserButtonClass))
-
-
-typedef struct _GtkFileChooserButton GtkFileChooserButton;
-typedef struct _GtkFileChooserButtonPrivate GtkFileChooserButtonPrivate;
-typedef struct _GtkFileChooserButtonClass GtkFileChooserButtonClass;
-
-struct _GtkFileChooserButton
-{
-  /*< private >*/
-  GtkHBox parent;
-
-  GtkFileChooserButtonPrivate *priv;
-};
-
-struct _GtkFileChooserButtonClass
-{
-  /*< private >*/
-  GtkHBoxClass parent_class;
-
-  void (* file_set) (GtkFileChooserButton *fc);
-
-  void (*__gtk_reserved1);
-  void (*__gtk_reserved2);
-  void (*__gtk_reserved3);
-  void (*__gtk_reserved4);
-  void (*__gtk_reserved5);
-  void (*__gtk_reserved6);
-  void (*__gtk_reserved7);
-};
-
-
-GType                 gtk_file_chooser_button_get_type         (void) G_GNUC_CONST;
-GtkWidget *           gtk_file_chooser_button_new              (const gchar          *title,
-								GtkFileChooserAction  action);
-GtkWidget *           gtk_file_chooser_button_new_with_backend (const gchar          *title,
-								GtkFileChooserAction  action,
-								const gchar          *backend);
-GtkWidget *           gtk_file_chooser_button_new_with_dialog  (GtkWidget            *dialog);
-G_CONST_RETURN gchar *gtk_file_chooser_button_get_title        (GtkFileChooserButton *button);
-void                  gtk_file_chooser_button_set_title        (GtkFileChooserButton *button,
-								const gchar          *title);
-gint                  gtk_file_chooser_button_get_width_chars  (GtkFileChooserButton *button);
-void                  gtk_file_chooser_button_set_width_chars  (GtkFileChooserButton *button,
-								gint                  n_chars);
-gboolean              gtk_file_chooser_button_get_focus_on_click (GtkFileChooserButton *button);
-void                  gtk_file_chooser_button_set_focus_on_click (GtkFileChooserButton *button,
-                                                                  gboolean              focus_on_click);
-
-G_END_DECLS
-
-#endif /* !__GTK_FILE_CHOOSER_BUTTON_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilechooserdialog.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilechooserdialog.h
deleted file mode 100644
index 44cf39c0..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilechooserdialog.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkfilechooserdialog.h: File selector dialog
- * Copyright (C) 2003, 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 __GTK_FILE_CHOOSER_DIALOG_H__
-#define __GTK_FILE_CHOOSER_DIALOG_H__
-
-#include <gtk/gtkdialog.h>
-#include "gtkfilechooser.h"
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_FILE_CHOOSER_DIALOG             (gtk_file_chooser_dialog_get_type ())
-#define GTK_FILE_CHOOSER_DIALOG(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FILE_CHOOSER_DIALOG, GtkFileChooserDialog))
-#define GTK_FILE_CHOOSER_DIALOG_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FILE_CHOOSER_DIALOG, GtkFileChooserDialogClass))
-#define GTK_IS_FILE_CHOOSER_DIALOG(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FILE_CHOOSER_DIALOG))
-#define GTK_IS_FILE_CHOOSER_DIALOG_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FILE_CHOOSER_DIALOG))
-#define GTK_FILE_CHOOSER_DIALOG_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FILE_CHOOSER_DIALOG, GtkFileChooserDialogClass))
-
-typedef struct _GtkFileChooserDialog      GtkFileChooserDialog;
-typedef struct _GtkFileChooserDialogClass GtkFileChooserDialogClass;
-
-typedef struct _GtkFileChooserDialogPrivate GtkFileChooserDialogPrivate;
-
-struct _GtkFileChooserDialogClass
-{
-  GtkDialogClass parent_class;
-};
-
-struct _GtkFileChooserDialog
-{
-  GtkDialog parent_instance;
-
-  GtkFileChooserDialogPrivate *priv;
-};
-
-GType      gtk_file_chooser_dialog_get_type         (void) G_GNUC_CONST;
-GtkWidget *gtk_file_chooser_dialog_new              (const gchar          *title,
-						     GtkWindow            *parent,
-						     GtkFileChooserAction  action,
-						     const gchar          *first_button_text,
-						     ...) G_GNUC_NULL_TERMINATED;
-GtkWidget *gtk_file_chooser_dialog_new_with_backend (const gchar          *title,
-						     GtkWindow            *parent,
-						     GtkFileChooserAction  action,
-						     const gchar          *backend,
-						     const gchar          *first_button_text,
-						     ...) G_GNUC_NULL_TERMINATED;
-
-G_END_DECLS
-
-#endif /* __GTK_FILE_CHOOSER_DIALOG_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilechooserprivate.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilechooserprivate.h
deleted file mode 100644
index 8b2d8534..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilechooserprivate.h
+++ /dev/null
@@ -1,381 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkfilechooserprivate.h: Interface definition for file selector GUIs
- * Copyright (C) 2003, 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 __GTK_FILE_CHOOSER_PRIVATE_H__
-#define __GTK_FILE_CHOOSER_PRIVATE_H__
-
-/* This is a "semi-private" header; it is meant only for
- * alternate GtkFileChooser implementations; no stability guarantees 
- * are made at this point
- */
-#ifndef GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
-#error "gtkfilechooserprivate.h is not supported API for general use"
-#endif
-
-#include "gtkfilechooser.h"
-#include "gtkfilesystem.h"
-#include "gtkfilesystemmodel.h"
-#include "gtkliststore.h"
-#include "gtkrecentmanager.h"
-#include "gtksearchengine.h"
-#include "gtkquery.h"
-#include "gtktooltips.h"
-#include "gtktreemodelsort.h"
-#include "gtktreestore.h"
-#include "gtktreeview.h"
-#include "gtkvbox.h"
-
-G_BEGIN_DECLS
-
-#define GTK_FILE_CHOOSER_GET_IFACE(inst)  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GTK_TYPE_FILE_CHOOSER, GtkFileChooserIface))
-
-typedef struct _GtkFileChooserIface GtkFileChooserIface;
-
-struct _GtkFileChooserIface
-{
-  GTypeInterface base_iface;
-
-  /* Methods
-   */
-  gboolean       (*set_current_folder) 	   (GtkFileChooser    *chooser,
-		 		       	    const GtkFilePath *path,
-					    GError           **error);
-  GtkFilePath *  (*get_current_folder) 	   (GtkFileChooser    *chooser);
-  void           (*set_current_name)   	   (GtkFileChooser    *chooser,
-					    const gchar       *name);
-  gboolean       (*select_path)        	   (GtkFileChooser    *chooser,
-		 		       	    const GtkFilePath *path,
-					    GError           **error);
-  void           (*unselect_path)      	   (GtkFileChooser    *chooser,
-		 		       	    const GtkFilePath *path);
-  void           (*select_all)         	   (GtkFileChooser    *chooser);
-  void           (*unselect_all)       	   (GtkFileChooser    *chooser);
-  GSList *       (*get_paths)          	   (GtkFileChooser    *chooser);
-  GtkFilePath *  (*get_preview_path)   	   (GtkFileChooser    *chooser);
-  GtkFileSystem *(*get_file_system)    	   (GtkFileChooser    *chooser);
-  void           (*add_filter)         	   (GtkFileChooser    *chooser,
-					    GtkFileFilter     *filter);
-  void           (*remove_filter)      	   (GtkFileChooser    *chooser,
-					    GtkFileFilter     *filter);
-  GSList *       (*list_filters)       	   (GtkFileChooser    *chooser);
-  gboolean       (*add_shortcut_folder)    (GtkFileChooser    *chooser,
-					    const GtkFilePath *path,
-					    GError           **error);
-  gboolean       (*remove_shortcut_folder) (GtkFileChooser    *chooser,
-					    const GtkFilePath *path,
-					    GError           **error);
-  GSList *       (*list_shortcut_folders)  (GtkFileChooser    *chooser);
-  
-  /* Signals
-   */
-  void (*current_folder_changed) (GtkFileChooser *chooser);
-  void (*selection_changed)      (GtkFileChooser *chooser);
-  void (*update_preview)         (GtkFileChooser *chooser);
-  void (*file_activated)         (GtkFileChooser *chooser);
-  GtkFileChooserConfirmation (*confirm_overwrite) (GtkFileChooser *chooser);
-};
-
-GtkFileSystem *_gtk_file_chooser_get_file_system         (GtkFileChooser    *chooser);
-gboolean       _gtk_file_chooser_set_current_folder_path (GtkFileChooser    *chooser,
-							  const GtkFilePath *path,
-							  GError           **error);
-GtkFilePath *  _gtk_file_chooser_get_current_folder_path (GtkFileChooser    *chooser);
-gboolean       _gtk_file_chooser_select_path             (GtkFileChooser    *chooser,
-							  const GtkFilePath *path,
-							  GError           **error);
-void           _gtk_file_chooser_unselect_path           (GtkFileChooser    *chooser,
-							  const GtkFilePath *path);
-GSList *       _gtk_file_chooser_get_paths               (GtkFileChooser    *chooser);
-GtkFilePath *  _gtk_file_chooser_get_preview_path        (GtkFileChooser    *chooser);
-gboolean       _gtk_file_chooser_add_shortcut_folder     (GtkFileChooser    *chooser,
-							  const GtkFilePath *path,
-							  GError           **error);
-gboolean       _gtk_file_chooser_remove_shortcut_folder  (GtkFileChooser    *chooser,
-							  const GtkFilePath *path,
-							  GError           **error);
-
-/* GtkFileChooserDialog private */
-
-struct _GtkFileChooserDialogPrivate
-{
-  GtkWidget *widget;
-  
-  char *file_system;
-
-  /* for use with GtkFileChooserEmbed */
-  gboolean response_requested;
-};
-
-
-/* GtkFileChooserWidget private */
-
-struct _GtkFileChooserWidgetPrivate
-{
-  GtkWidget *impl;
-
-  char *file_system;
-};
-
-
-/* GtkFileChooserDefault private */
-
-typedef enum {
-  LOAD_EMPTY,			/* There is no model */
-  LOAD_PRELOAD,			/* Model is loading and a timer is running; model isn't inserted into the tree yet */
-  LOAD_LOADING,			/* Timeout expired, model is inserted into the tree, but not fully loaded yet */
-  LOAD_FINISHED			/* Model is fully loaded and inserted into the tree */
-} LoadState;
-
-typedef enum {
-  RELOAD_EMPTY,			/* No folder has been set */
-  RELOAD_HAS_FOLDER,		/* We have a folder, although it may not be completely loaded yet; no need to reload */
-  RELOAD_WAS_UNMAPPED		/* We had a folder but got unmapped; reload is needed */
-} ReloadState;
-
-typedef enum {
-  LOCATION_MODE_PATH_BAR,
-  LOCATION_MODE_FILENAME_ENTRY
-} LocationMode;
-
-typedef enum {
-  OPERATION_MODE_BROWSE,
-  OPERATION_MODE_SEARCH,
-  OPERATION_MODE_RECENT
-} OperationMode;
-
-struct _GtkFileChooserDefault
-{
-  GtkVBox parent_instance;
-
-  GtkFileChooserAction action;
-
-  GtkFileSystem *file_system;
-
-  /* Save mode widgets */
-  GtkWidget *save_widgets;
-
-  GtkWidget *save_folder_label;
-  GtkWidget *save_folder_combo;
-  GtkWidget *save_expander;
-
-  /* The file browsing widgets */
-  GtkWidget *browse_widgets;
-  GtkWidget *browse_shortcuts_tree_view;
-  GtkWidget *browse_shortcuts_add_button;
-  GtkWidget *browse_shortcuts_remove_button;
-  GtkWidget *browse_shortcuts_popup_menu;
-  GtkWidget *browse_shortcuts_popup_menu_remove_item;
-  GtkWidget *browse_shortcuts_popup_menu_rename_item;
-  GtkWidget *browse_files_tree_view;
-  GtkWidget *browse_files_popup_menu;
-  GtkWidget *browse_files_popup_menu_add_shortcut_item;
-  GtkWidget *browse_files_popup_menu_hidden_files_item;
-  GtkWidget *browse_new_folder_button;
-  GtkWidget *browse_path_bar_hbox;
-  GtkWidget *browse_path_bar;
-
-  GtkFileSystemModel *browse_files_model;
-  char *browse_files_last_selected_name;
-
-  /* OPERATION_MODE_SEARCH */
-  GtkWidget *search_hbox;
-  GtkWidget *search_entry;
-  GtkSearchEngine *search_engine;
-  GtkQuery *search_query;
-  GtkListStore *search_model;
-  GtkTreeModelFilter *search_model_filter;
-  GtkTreeModelSort *search_model_sort;
-
-  /* OPERATION_MODE_RECENT */
-  GtkRecentManager *recent_manager;
-  GtkListStore *recent_model;
-  guint load_recent_id;
-  GtkTreeModelFilter *recent_model_filter;
-  GtkTreeModelSort *recent_model_sort;
-
-  GtkWidget *filter_combo_hbox;
-  GtkWidget *filter_combo;
-  GtkWidget *preview_box;
-  GtkWidget *preview_label;
-  GtkWidget *preview_widget;
-  GtkWidget *extra_align;
-  GtkWidget *extra_widget;
-
-  GtkWidget *location_button;
-  GtkWidget *location_entry_box;
-  GtkWidget *location_label;
-  GtkWidget *location_entry;
-  LocationMode location_mode;
-
-  GtkListStore *shortcuts_model;
-
-  /* Filter for the shortcuts pane.  We filter out the "current folder" row and
-   * the separator that we use for the "Save in folder" combo.
-   */
-  GtkTreeModel *shortcuts_pane_filter_model;
-  
-  /* Filter for the "Save in folder" combo.  We filter out the Search row and
-   * its separator.
-   */
-  GtkTreeModel *shortcuts_combo_filter_model;
-
-  GtkTreeModelSort *sort_model;
-
-  /* Handles */
-  GSList *loading_shortcuts;
-  GSList *reload_icon_handles;
-  GtkFileSystemHandle *file_list_drag_data_received_handle;
-  GtkFileSystemHandle *update_current_folder_handle;
-  GtkFileSystemHandle *show_and_select_paths_handle;
-  GtkFileSystemHandle *should_respond_get_info_handle;
-  GtkFileSystemHandle *file_exists_get_info_handle;
-  GtkFileSystemHandle *update_from_entry_handle;
-  GtkFileSystemHandle *shortcuts_activate_iter_handle;
-  GSList *pending_handles;
-
-  LoadState load_state;
-  ReloadState reload_state;
-  guint load_timeout_id;
-
-  OperationMode operation_mode;
-
-  GSList *pending_select_paths;
-
-  GtkFileFilter *current_filter;
-  GSList *filters;
-
-  GtkTooltips *tooltips;
-
-  int num_volumes;
-  int num_shortcuts;
-  int num_bookmarks;
-
-  gulong volumes_changed_id;
-  gulong bookmarks_changed_id;
-
-  GtkFilePath *current_volume_path;
-  GtkFilePath *current_folder;
-  GtkFilePath *preview_path;
-  char *preview_display_name;
-
-  GtkTreeViewColumn *list_name_column;
-  GtkCellRenderer *list_name_renderer;
-  GtkTreeViewColumn *list_mtime_column;
-
-  GSource *edited_idle;
-  char *edited_new_text;
-
-  gulong settings_signal_id;
-  int icon_size;
-
-  gulong toplevel_set_focus_id;
-  GtkWidget *toplevel_last_focus_widget;
-
-#if 0
-  GdkDragContext *shortcuts_drag_context;
-  GSource *shortcuts_drag_outside_idle;
-#endif
-
-  gint default_width;
-  gint default_height;
-
-  /* Flags */
-
-  guint local_only : 1;
-  guint preview_widget_active : 1;
-  guint use_preview_label : 1;
-  guint select_multiple : 1;
-  guint show_hidden : 1;
-  guint do_overwrite_confirmation : 1;
-  guint list_sort_ascending : 1;
-  guint changing_folder : 1;
-  guint shortcuts_current_folder_active : 1;
-  guint expand_folders : 1;
-  guint has_home : 1;
-  guint has_desktop : 1;
-  guint has_search : 1;
-  guint has_recent : 1;
-
-#if 0
-  guint shortcuts_drag_outside : 1;
-#endif
-};
-
-
-/* GtkFileSystemModel private */
-
-typedef struct _FileModelNode           FileModelNode;
-
-struct _GtkFileSystemModel
-{
-  GObject parent_instance;
-
-  GtkFileSystem  *file_system;
-  GtkFileInfoType types;
-  FileModelNode  *roots;
-  GtkFileFolder  *root_folder;
-  GtkFilePath    *root_path;
-
-  GtkFileSystemModelFilter filter_func;
-  gpointer filter_data;
-
-  GSList *idle_clears;
-  GSource *idle_clear_source;
-
-  gushort max_depth;
-
-  GSList *pending_handles;
-  
-  guint show_hidden : 1;
-  guint show_folders : 1;
-  guint show_files : 1;
-  guint folders_only : 1;
-  guint has_editable : 1;
-};
-
-struct _FileModelNode
-{
-  GtkFilePath *path;
-  FileModelNode *next;
-
-  GtkFileInfo *info;
-  GtkFileFolder *folder;
-  
-  FileModelNode *children;
-  FileModelNode *parent;
-  GtkFileSystemModel *model;
-
-  guint ref_count;
-  guint n_referenced_children;
-
-  gushort depth;
-
-  guint has_dummy : 1;
-  guint is_dummy : 1;
-  guint is_visible : 1;
-  guint loaded : 1;
-  guint idle_clear : 1;
-  guint load_pending : 1;
-};
-
-
-G_END_DECLS
-
-#endif /* __GTK_FILE_CHOOSER_PRIVATE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilechooserutils.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilechooserutils.h
deleted file mode 100644
index 04d6344f..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilechooserutils.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkfilechooserutils.h: Private utility functions useful for
- *                        implementing a GtkFileChooser interface
- * Copyright (C) 2003, 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 __GTK_FILE_CHOOSER_UTILS_H__
-#define __GTK_FILE_CHOOSER_UTILS_H__
-
-/* This is a "semi-private" header; it is meant only for
- * alternate GtkFileChooser implementations; no stability guarantees 
- * are made at this point
- */
-#ifndef GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
-#error "gtkfilechooserutils.h is not supported API for general use"
-#endif
-
-#include "gtkfilechooserprivate.h"
-
-G_BEGIN_DECLS
-
-#define GTK_FILE_CHOOSER_DELEGATE_QUARK	  (_gtk_file_chooser_delegate_get_quark ())
-
-typedef enum {
-  GTK_FILE_CHOOSER_PROP_FIRST                  = 0x1000,
-  GTK_FILE_CHOOSER_PROP_ACTION                 = GTK_FILE_CHOOSER_PROP_FIRST,
-  GTK_FILE_CHOOSER_PROP_FILE_SYSTEM_BACKEND,
-  GTK_FILE_CHOOSER_PROP_FILTER,
-  GTK_FILE_CHOOSER_PROP_LOCAL_ONLY,
-  GTK_FILE_CHOOSER_PROP_PREVIEW_WIDGET, 
-  GTK_FILE_CHOOSER_PROP_PREVIEW_WIDGET_ACTIVE,
-  GTK_FILE_CHOOSER_PROP_USE_PREVIEW_LABEL,
-  GTK_FILE_CHOOSER_PROP_EXTRA_WIDGET,
-  GTK_FILE_CHOOSER_PROP_SELECT_MULTIPLE,
-  GTK_FILE_CHOOSER_PROP_SHOW_HIDDEN,
-  GTK_FILE_CHOOSER_PROP_DO_OVERWRITE_CONFIRMATION,
-  GTK_FILE_CHOOSER_PROP_LAST                   = GTK_FILE_CHOOSER_PROP_DO_OVERWRITE_CONFIRMATION
-} GtkFileChooserProp;
-
-void _gtk_file_chooser_install_properties (GObjectClass *klass);
-#ifdef MAEMO_CHANGES
-void hildon_gtk_file_chooser_install_properties (GObjectClass *klass);
-#endif /* MAEMO_CHANGES */
-
-void _gtk_file_chooser_delegate_iface_init (GtkFileChooserIface *iface);
-void _gtk_file_chooser_set_delegate        (GtkFileChooser *receiver,
-					    GtkFileChooser *delegate);
-
-GQuark _gtk_file_chooser_delegate_get_quark (void) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __GTK_FILE_CHOOSER_UTILS_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilechooserwidget.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilechooserwidget.h
deleted file mode 100644
index 2df7ded1..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilechooserwidget.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkfilechooserwidget.h: Embeddable file selector widget
- * Copyright (C) 2003, 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 __GTK_FILE_CHOOSER_WIDGET_H__
-#define __GTK_FILE_CHOOSER_WIDGET_H__
-
-#include "gtkfilechooser.h"
-#include <gtk/gtkvbox.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_FILE_CHOOSER_WIDGET             (gtk_file_chooser_widget_get_type ())
-#define GTK_FILE_CHOOSER_WIDGET(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FILE_CHOOSER_WIDGET, GtkFileChooserWidget))
-#define GTK_FILE_CHOOSER_WIDGET_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FILE_CHOOSER_WIDGET, GtkFileChooserWidgetClass))
-#define GTK_IS_FILE_CHOOSER_WIDGET(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FILE_CHOOSER_WIDGET))
-#define GTK_IS_FILE_CHOOSER_WIDGET_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FILE_CHOOSER_WIDGET))
-#define GTK_FILE_CHOOSER_WIDGET_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FILE_CHOOSER_WIDGET, GtkFileChooserWidgetClass))
-
-typedef struct _GtkFileChooserWidget      GtkFileChooserWidget;
-typedef struct _GtkFileChooserWidgetClass GtkFileChooserWidgetClass;
-
-typedef struct _GtkFileChooserWidgetPrivate GtkFileChooserWidgetPrivate;
-
-struct _GtkFileChooserWidgetClass
-{
-  GtkVBoxClass parent_class;
-};
-
-struct _GtkFileChooserWidget
-{
-  GtkVBox parent_instance;
-
-  GtkFileChooserWidgetPrivate *priv;
-};
-
-GType      gtk_file_chooser_widget_get_type         (void) G_GNUC_CONST;
-GtkWidget *gtk_file_chooser_widget_new              (GtkFileChooserAction  action);
-GtkWidget *gtk_file_chooser_widget_new_with_backend (GtkFileChooserAction  action,
-						     const gchar          *backend);
-G_END_DECLS
-
-#endif /* __GTK_FILE_CHOOSER_WIDGET_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilefilter.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilefilter.h
deleted file mode 100644
index fd074f87..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilefilter.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkfilefilter.h: Filters for selecting a file subset
- * Copyright (C) 2003, 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 __GTK_FILE_FILTER_H__
-#define __GTK_FILE_FILTER_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_FILE_FILTER              (gtk_file_filter_get_type ())
-#define GTK_FILE_FILTER(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FILE_FILTER, GtkFileFilter))
-#define GTK_IS_FILE_FILTER(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FILE_FILTER))
-
-typedef struct _GtkFileFilter     GtkFileFilter;
-typedef struct _GtkFileFilterInfo GtkFileFilterInfo;
-
-typedef enum {
-  GTK_FILE_FILTER_FILENAME     = 1 << 0,
-  GTK_FILE_FILTER_URI          = 1 << 1,
-  GTK_FILE_FILTER_DISPLAY_NAME = 1 << 2,
-  GTK_FILE_FILTER_MIME_TYPE    = 1 << 3
-} GtkFileFilterFlags;
-
-typedef gboolean (*GtkFileFilterFunc) (const GtkFileFilterInfo *filter_info,
-				       gpointer                 data);
-
-struct _GtkFileFilterInfo
-{
-  GtkFileFilterFlags contains;
-  
-  const gchar *filename;
-  const gchar *uri;
-  const gchar *display_name;
-  const gchar *mime_type;
-};
-
-GType gtk_file_filter_get_type (void) G_GNUC_CONST;
-
-GtkFileFilter *       gtk_file_filter_new      (void);
-void                  gtk_file_filter_set_name (GtkFileFilter *filter,
-						const gchar   *name);
-G_CONST_RETURN gchar *gtk_file_filter_get_name (GtkFileFilter *filter);
-
-void gtk_file_filter_add_mime_type      (GtkFileFilter      *filter,
-					 const gchar        *mime_type);
-void gtk_file_filter_add_pattern        (GtkFileFilter      *filter,
-					 const gchar        *pattern);
-void gtk_file_filter_add_pixbuf_formats (GtkFileFilter      *filter);
-void gtk_file_filter_add_custom         (GtkFileFilter      *filter,
-					 GtkFileFilterFlags  needed,
-					 GtkFileFilterFunc   func,
-					 gpointer            data,
-					 GDestroyNotify      notify);
-
-GtkFileFilterFlags gtk_file_filter_get_needed (GtkFileFilter           *filter);
-gboolean           gtk_file_filter_filter     (GtkFileFilter           *filter,
-					       const GtkFileFilterInfo *filter_info);
-
-G_END_DECLS
-
-#endif /* __GTK_FILE_FILTER_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilesel.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilesel.h
deleted file mode 100644
index 75f65a16..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilesel.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-#ifndef __GTK_FILESEL_H__
-#define __GTK_FILESEL_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkdialog.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_FILE_SELECTION            (gtk_file_selection_get_type ())
-#define GTK_FILE_SELECTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FILE_SELECTION, GtkFileSelection))
-#define GTK_FILE_SELECTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FILE_SELECTION, GtkFileSelectionClass))
-#define GTK_IS_FILE_SELECTION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FILE_SELECTION))
-#define GTK_IS_FILE_SELECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FILE_SELECTION))
-#define GTK_FILE_SELECTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FILE_SELECTION, GtkFileSelectionClass))
-
-
-typedef struct _GtkFileSelection       GtkFileSelection;
-typedef struct _GtkFileSelectionClass  GtkFileSelectionClass;
-
-struct _GtkFileSelection
-{
-  /*< private >*/
-  GtkDialog parent_instance;
-
-  /*< public >*/
-  GtkWidget *dir_list;
-  GtkWidget *file_list;
-  GtkWidget *selection_entry;
-  GtkWidget *selection_text;
-  GtkWidget *main_vbox;
-  GtkWidget *ok_button;
-  GtkWidget *cancel_button;
-  GtkWidget *help_button;
-  GtkWidget *history_pulldown;
-  GtkWidget *history_menu;
-  GList     *history_list;
-  GtkWidget *fileop_dialog;
-  GtkWidget *fileop_entry;
-  gchar     *fileop_file;
-  gpointer   cmpl_state;
-  
-  GtkWidget *fileop_c_dir;
-  GtkWidget *fileop_del_file;
-  GtkWidget *fileop_ren_file;
-  
-  GtkWidget *button_area;
-  GtkWidget *action_area;
-
-  /*< private >*/
-  GPtrArray *selected_names;
-  gchar     *last_selected;
-};
-
-struct _GtkFileSelectionClass
-{
-  GtkDialogClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-#ifdef G_OS_WIN32
-/* Reserve old names for DLL ABI backward compatibility */
-#define gtk_file_selection_get_filename gtk_file_selection_get_filename_utf8
-#define gtk_file_selection_set_filename gtk_file_selection_set_filename_utf8
-#define gtk_file_selection_get_selections gtk_file_selection_get_selections_utf8
-#endif
-
-GType      gtk_file_selection_get_type            (void) G_GNUC_CONST;
-GtkWidget* gtk_file_selection_new                 (const gchar      *title);
-void       gtk_file_selection_set_filename        (GtkFileSelection *filesel,
-						   const gchar      *filename);
-G_CONST_RETURN gchar* gtk_file_selection_get_filename        (GtkFileSelection *filesel);
-
-void	   gtk_file_selection_complete		  (GtkFileSelection *filesel,
-						   const gchar	    *pattern);
-void       gtk_file_selection_show_fileop_buttons (GtkFileSelection *filesel);
-void       gtk_file_selection_hide_fileop_buttons (GtkFileSelection *filesel);
-
-gchar**    gtk_file_selection_get_selections      (GtkFileSelection *filesel);
-
-void       gtk_file_selection_set_select_multiple (GtkFileSelection *filesel,
-						   gboolean          select_multiple);
-gboolean   gtk_file_selection_get_select_multiple (GtkFileSelection *filesel);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_FILESEL_H__ */
-
-#endif /* GTK_DISABLE_DEPRECATED */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilesystem.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilesystem.h
deleted file mode 100644
index 18aa5848..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilesystem.h
+++ /dev/null
@@ -1,448 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkfilesystem.h: Abstract file system interfaces
- * Copyright (C) 2003, 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 __GTK_FILE_SYSTEM_H__
-#define __GTK_FILE_SYSTEM_H__
-
-/* This is a "semi-private" header; it is meant only for
- * alternate GtkFileChooser backend modules; no stability guarantees 
- * are made at this point
- */
-#ifndef GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED
-#error "GtkFileSystem is not supported API for general use"
-#endif
-
-#include <glib-object.h>
-#include <gtk/gtkwidget.h>	/* For icon handling */
-
-G_BEGIN_DECLS
-
-typedef gint64 GtkFileTime;
-
-typedef struct _GtkFileFolder       GtkFileFolder;
-typedef struct _GtkFileFolderIface  GtkFileFolderIface;
-typedef struct _GtkFileInfo         GtkFileInfo;
-typedef struct _GtkFileSystem       GtkFileSystem;
-typedef struct _GtkFileSystemIface  GtkFileSystemIface;
-typedef struct _GtkFileSystemVolume GtkFileSystemVolume;
-
-typedef struct _GtkFilePath        GtkFilePath;
-
-/* Mask of information about a file, for monitoring and
- * gtk_file_system_get_info()
- */
-typedef enum {
-  GTK_FILE_INFO_DISPLAY_NAME      = 1 << 0,
-  GTK_FILE_INFO_IS_FOLDER         = 1 << 1,
-  GTK_FILE_INFO_IS_HIDDEN         = 1 << 2,
-  GTK_FILE_INFO_MIME_TYPE         = 1 << 3,
-  GTK_FILE_INFO_MODIFICATION_TIME = 1 << 4,
-  GTK_FILE_INFO_SIZE              = 1 << 5,
-  GTK_FILE_INFO_ICON              = 1 << 6,
-  GTK_FILE_INFO_ALL               = (1 << 7) - 1
-} GtkFileInfoType;
-
-/* GError enumeration for GtkFileSystem
- */
-
-#define GTK_FILE_SYSTEM_ERROR (gtk_file_system_error_quark ())
-
-typedef enum
-{
-  GTK_FILE_SYSTEM_ERROR_NONEXISTENT,
-  GTK_FILE_SYSTEM_ERROR_NOT_FOLDER,
-  GTK_FILE_SYSTEM_ERROR_INVALID_URI,
-  GTK_FILE_SYSTEM_ERROR_BAD_FILENAME,
-  GTK_FILE_SYSTEM_ERROR_FAILED,
-  GTK_FILE_SYSTEM_ERROR_ALREADY_EXISTS
-} GtkFileSystemError;
-
-GQuark     gtk_file_system_error_quark      (void);
-
-/* Boxed-type for gtk_file_folder_get_info() results
- */
-#define GTK_TYPE_FILE_INFO (gtk_file_info_get_type ())
-
-GType       gtk_file_info_get_type (void) G_GNUC_CONST; 
-
-GtkFileInfo *gtk_file_info_new  (void);
-GtkFileInfo *gtk_file_info_copy (GtkFileInfo *info);
-void         gtk_file_info_free (GtkFileInfo *info);
-
-
-G_CONST_RETURN gchar *gtk_file_info_get_display_name      (const GtkFileInfo *info);
-G_CONST_RETURN gchar *gtk_file_info_get_display_key       (const GtkFileInfo *info);
-void                  gtk_file_info_set_display_name      (GtkFileInfo       *info,
-							   const gchar       *display_name);
-gboolean              gtk_file_info_get_is_folder         (const GtkFileInfo *info);
-void                  gtk_file_info_set_is_folder         (GtkFileInfo       *info,
-							   gboolean           is_folder);
-gboolean              gtk_file_info_get_is_hidden         (const GtkFileInfo *info);
-void                  gtk_file_info_set_is_hidden         (GtkFileInfo       *info,
-							   gboolean           is_hidden);
-G_CONST_RETURN gchar *gtk_file_info_get_mime_type         (const GtkFileInfo *info);
-void                  gtk_file_info_set_mime_type         (GtkFileInfo       *info,
-							   const gchar       *mime_type);
-GtkFileTime           gtk_file_info_get_modification_time (const GtkFileInfo *info);
-void                  gtk_file_info_set_modification_time (GtkFileInfo       *info,
-							   GtkFileTime        modification_time);
-gint64                gtk_file_info_get_size              (const GtkFileInfo *info);
-void                  gtk_file_info_set_size              (GtkFileInfo       *info,
-							   gint64             size);
-
-void                  gtk_file_info_set_icon_name         (GtkFileInfo       *info,
-							   const gchar       *con_name);
-G_CONST_RETURN gchar *gtk_file_info_get_icon_name         (const GtkFileInfo *info);
-GdkPixbuf            *gtk_file_info_render_icon           (const GtkFileInfo *info,
-							   GtkWidget         *widget,
-							   gint               pixel_size,
-							   GError           **error);
-
-/* GtkFileSystemHandle
- */
-
-#define GTK_TYPE_FILE_SYSTEM_HANDLE            (gtk_file_system_handle_get_type ())
-#define GTK_FILE_SYSTEM_HANDLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FILE_SYSTEM_HANDLE, GtkFileSystemHandle))
-#define GTK_IS_FILE_SYSTEM_HANDLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FILE_SYSTEM_HANDLE))
-#define GTK_FILE_SYSTEM_HANDLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FILE_SYSTEM_HANDLE, GtkFileSystemHandleUnixClass))
-#define GTK_IS_FILE_SYSTEM_HANDLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FILE_SYSTEM_HANDLE))
-#define GTK_FILE_SYSTEM_HANDLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FILE_SYSTEM_HANDLE, GtkFileSystemHandleClass))
-
-typedef struct _GtkFileSystemHandle       GtkFileSystemHandle;
-typedef struct _GtkFileSystemHandleClass  GtkFileSystemHandleClass;
-
-struct _GtkFileSystemHandle
-{
-  GObject parent_instance;
-
-  GtkFileSystem *file_system;
-
-  guint cancelled : 1;
-};
-
-struct _GtkFileSystemHandleClass
-{
-  GObjectClass parent_class;
-};
-
-GType gtk_file_system_handle_get_type (void);
-
-/* The base GtkFileSystem interface
- */
-#define GTK_TYPE_FILE_SYSTEM             (gtk_file_system_get_type ())
-#define GTK_FILE_SYSTEM(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FILE_SYSTEM, GtkFileSystem))
-#define GTK_IS_FILE_SYSTEM(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FILE_SYSTEM))
-#define GTK_FILE_SYSTEM_GET_IFACE(inst)  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GTK_TYPE_FILE_SYSTEM, GtkFileSystemIface))
-
-/* Callbacks for the asynchronous GtkFileSystem operations
- */
-
-typedef void (* GtkFileSystemGetInfoCallback) (GtkFileSystemHandle *handle,
-					       const GtkFileInfo   *file_info,
-					       const GError        *error,
-					       gpointer             data);
-typedef void (* GtkFileSystemGetFolderCallback) (GtkFileSystemHandle *handle,
-						 GtkFileFolder       *folder,
-						 const GError        *error,
-						 gpointer             data);
-typedef void (* GtkFileSystemCreateFolderCallback) (GtkFileSystemHandle *handle,
-						    const GtkFilePath   *path,
-						    const GError        *error,
-						    gpointer             data);
-typedef void (* GtkFileSystemVolumeMountCallback) (GtkFileSystemHandle *handle,
-						   GtkFileSystemVolume *volume,
-						   const GError        *error,
-						   gpointer             data);
-
-/*
- */
-
-struct _GtkFileSystemIface
-{
-  GTypeInterface base_iface;
-
-  /* Methods
-   */
-  GSList *              (*list_volumes)        (GtkFileSystem     *file_system);
-  GtkFileSystemVolume * (*get_volume_for_path) (GtkFileSystem     *file_system,
-						const GtkFilePath *path);
-
-  GtkFileSystemHandle * (*get_folder)  (GtkFileSystem                  *file_system,
-					const GtkFilePath              *path,
-					GtkFileInfoType                 types,
-					GtkFileSystemGetFolderCallback  callback,
-					gpointer                        data);
-  GtkFileSystemHandle * (*get_info) (GtkFileSystem                *file_system,
-				     const GtkFilePath            *path,
-				     GtkFileInfoType               types,
-				     GtkFileSystemGetInfoCallback  callback,
-				     gpointer                      data);
-  GtkFileSystemHandle * (*create_folder)  (GtkFileSystem                     *file_system,
-					   const GtkFilePath                 *path,
-					   GtkFileSystemCreateFolderCallback  callback,
-					   gpointer                           data);
-
-  void               (*cancel_operation) (GtkFileSystemHandle *handle);
-
-  /* Volumes
-   */
-  void          (*volume_free)             (GtkFileSystem        *file_system,
-					    GtkFileSystemVolume  *volume);
-  GtkFilePath * (*volume_get_base_path)    (GtkFileSystem        *file_system,
-					    GtkFileSystemVolume  *volume);
-  gboolean      (*volume_get_is_mounted)   (GtkFileSystem        *file_system,
-					    GtkFileSystemVolume  *volume);
-  GtkFileSystemHandle * (*volume_mount)    (GtkFileSystem                    *file_system,
-					    GtkFileSystemVolume              *volume,
-					    GtkFileSystemVolumeMountCallback  callback,
-					    gpointer                          data);
-  char *        (*volume_get_display_name) (GtkFileSystem        *file_system,
-					    GtkFileSystemVolume  *volume);
-  gchar *       (*volume_get_icon_name)    (GtkFileSystem        *file_system,
-					    GtkFileSystemVolume  *volume,
-					    GError              **error);
-
-  /* Path Manipulation
-   */
-  gboolean      (*get_parent)      (GtkFileSystem      *file_system,
-				    const GtkFilePath  *path,
-				    GtkFilePath       **parent,
-				    GError            **error);
-  GtkFilePath * (*make_path)        (GtkFileSystem     *file_system,
-				     const GtkFilePath *base_path,
-				     const gchar       *display_name,
-				     GError           **error);
-  gboolean      (*parse)            (GtkFileSystem     *file_system,
-				     const GtkFilePath *base_path,
-				     const gchar       *str,
-				     GtkFilePath      **folder,
-				     gchar            **file_part,
-				     GError           **error);
-  gchar *      (*path_to_uri)      (GtkFileSystem      *file_system,
-				    const GtkFilePath  *path);
-  gchar *      (*path_to_filename) (GtkFileSystem      *file_system,
-				    const GtkFilePath  *path);
-  GtkFilePath *(*uri_to_path)      (GtkFileSystem      *file_system,
-				    const gchar        *uri);
-  GtkFilePath *(*filename_to_path) (GtkFileSystem      *file_system,
-				    const gchar        *path);
-
-  /* Bookmarks 
-   */
-  gboolean       (*insert_bookmark)        (GtkFileSystem     *file_system,
-					    const GtkFilePath *path,
-					    gint               position,
-					    GError           **error);
-  gboolean       (*remove_bookmark)        (GtkFileSystem     *file_system,
-					    const GtkFilePath *path,
-					    GError           **error);
-  GSList *       (*list_bookmarks)         (GtkFileSystem     *file_system);
-
-  /* Signals 
-   */
-  void (*volumes_changed)   (GtkFileSystem *file_system);
-  void (*bookmarks_changed) (GtkFileSystem *file_system);
-
-  /* Bookmark labels 
-   */
-  gchar *        (*get_bookmark_label)     (GtkFileSystem     *file_system,
-					    const GtkFilePath *path);
-  void           (*set_bookmark_label)     (GtkFileSystem     *file_system,
-					    const GtkFilePath *path,
-					    const gchar       *label);
-};
-
-GType             gtk_file_system_get_type       (void) G_GNUC_CONST;
-
-GSList *          gtk_file_system_list_volumes   (GtkFileSystem     *file_system);
-
-GtkFileSystemVolume *gtk_file_system_get_volume_for_path (GtkFileSystem     *file_system,
-							  const GtkFilePath *path);
-
-void              gtk_file_system_volume_free             (GtkFileSystem        *file_system,
-							   GtkFileSystemVolume  *volume);
-GtkFilePath *     gtk_file_system_volume_get_base_path    (GtkFileSystem        *file_system,
-							   GtkFileSystemVolume  *volume);
-gboolean          gtk_file_system_volume_get_is_mounted   (GtkFileSystem        *file_system,
-							   GtkFileSystemVolume  *volume);
-GtkFileSystemHandle *gtk_file_system_volume_mount         (GtkFileSystem                    *file_system,
-							   GtkFileSystemVolume              *volume,
-							   GtkFileSystemVolumeMountCallback  callback,
-							   gpointer                          data);
-char *            gtk_file_system_volume_get_display_name (GtkFileSystem        *file_system, 
-							   GtkFileSystemVolume  *volume);
-GdkPixbuf *       gtk_file_system_volume_render_icon      (GtkFileSystem        *file_system,
-							   GtkFileSystemVolume  *volume,
-							   GtkWidget            *widget,
-							   gint                  pixel_size,
-							   GError              **error);
-gchar *           gtk_file_system_volume_get_icon_name    (GtkFileSystem        *file_system,
-							   GtkFileSystemVolume  *volume,
-							   GError              **error);
-
-gboolean          gtk_file_system_get_parent     (GtkFileSystem     *file_system,
-						  const GtkFilePath *path,
-						  GtkFilePath      **parent,
-						  GError           **error);
-GtkFileSystemHandle *gtk_file_system_get_folder  (GtkFileSystem                  *file_system,
-						  const GtkFilePath              *path,
-						  GtkFileInfoType                 types,
-						  GtkFileSystemGetFolderCallback  callback,
-						  gpointer                        data);
-GtkFileSystemHandle *gtk_file_system_get_info    (GtkFileSystem                  *file_system,
-						  const GtkFilePath              *path,
-						  GtkFileInfoType                 types,
-						  GtkFileSystemGetInfoCallback    callback,
-						  gpointer                        data);
-GtkFileSystemHandle *gtk_file_system_create_folder (GtkFileSystem                     *file_system,
-						    const GtkFilePath                 *path,
-						    GtkFileSystemCreateFolderCallback  callback,
-						    gpointer                           data);
-void              gtk_file_system_cancel_operation (GtkFileSystemHandle *handle);
-GtkFilePath *     gtk_file_system_make_path      (GtkFileSystem     *file_system,
-						  const GtkFilePath *base_path,
-						  const gchar       *display_name,
-						  GError           **error);
-gboolean          gtk_file_system_parse          (GtkFileSystem     *file_system,
-						  const GtkFilePath *base_path,
-						  const gchar       *str,
-						  GtkFilePath      **folder,
-						  gchar            **file_part,
-						  GError           **error);
-
-gchar *      gtk_file_system_path_to_uri      (GtkFileSystem     *file_system,
-					       const GtkFilePath *path);
-gchar *      gtk_file_system_path_to_filename (GtkFileSystem     *file_system,
-					       const GtkFilePath *path);
-GtkFilePath *gtk_file_system_uri_to_path      (GtkFileSystem     *file_system,
-					       const gchar       *uri);
-GtkFilePath *gtk_file_system_filename_to_path (GtkFileSystem     *file_system,
-					       const gchar       *filename);
-
-gboolean     gtk_file_system_path_is_local    (GtkFileSystem     *filesystem,
-					       const GtkFilePath *path);
-
-gboolean gtk_file_system_insert_bookmark (GtkFileSystem     *file_system,
-					  const GtkFilePath *path,
-					  gint               position,
-					  GError           **error);
-gboolean gtk_file_system_remove_bookmark (GtkFileSystem     *file_system,
-					  const GtkFilePath *path,
-					  GError           **error);
-GSList  *gtk_file_system_list_bookmarks  (GtkFileSystem     *file_system);
-
-gchar   *gtk_file_system_get_bookmark_label (GtkFileSystem     *file_system,
-					     const GtkFilePath *path);
-void     gtk_file_system_set_bookmark_label (GtkFileSystem     *file_system,
-					     const GtkFilePath *path,
-					     const gchar       *label);
-
-/*
- * Detailed information about a particular folder
- */
-#define GTK_TYPE_FILE_FOLDER             (gtk_file_folder_get_type ())
-#define GTK_FILE_FOLDER(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FILE_FOLDER, GtkFileFolder))
-#define GTK_IS_FILE_FOLDER(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FILE_FOLDER))
-#define GTK_FILE_FOLDER_GET_IFACE(inst)  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GTK_TYPE_FILE_FOLDER, GtkFileFolderIface))
-
-struct _GtkFileFolderIface
-{
-  GTypeInterface base_iface;
-
-  /* Methods
-   */
-  GtkFileInfo *      (*get_info)       (GtkFileFolder     *folder,
-					const GtkFilePath *path,
-				        GError           **error);
-  gboolean           (*list_children)  (GtkFileFolder     *folder,
-				        GSList           **children,
-				        GError           **error);
-
-  /* ??? refresh() ??? */
-
-  /* Signals
-   */
-  void (*deleted)       (GtkFileFolder *monitor);
-  void (*files_added)   (GtkFileFolder *monitor,
-			 GSList        *paths);
-  void (*files_changed) (GtkFileFolder *monitor,
-			 GSList        *paths);
-  void (*files_removed) (GtkFileFolder *monitor,
-			 GSList        *paths);
-
-  /* Method / signal */
-  gboolean (*is_finished_loading) (GtkFileFolder *folder);
-  void     (*finished_loading)    (GtkFileFolder *folder);
-};
-
-GType        gtk_file_folder_get_type      (void) G_GNUC_CONST;
-gboolean     gtk_file_folder_list_children (GtkFileFolder      *folder,
-					    GSList            **children,
-					    GError            **error);
-GtkFileInfo *gtk_file_folder_get_info      (GtkFileFolder      *folder,
-					    const GtkFilePath  *path,
-					    GError            **error);
-
-gboolean     gtk_file_folder_is_finished_loading (GtkFileFolder *folder);
-
-
-/* GtkFilePath */
-#define GTK_TYPE_FILE_PATH             (gtk_file_path_get_type ())
-
-GType   gtk_file_path_get_type (void) G_GNUC_CONST;
-#ifdef __GNUC__
-#define gtk_file_path_new_dup(str) \
- ({ const gchar *__s = (str); (GtkFilePath *)g_strdup(__s); })
-#define gtk_file_path_new_steal(str) \
- ({ gchar *__s = (str); (GtkFilePath *)__s; })
-#define gtk_file_path_get_string(path) \
- ({ const GtkFilePath *__p = (path); (const gchar *)__p; })
-#define gtk_file_path_free(path) \
- ({ GtkFilePath *__p = (path); g_free (__p); })
-#else /* __GNUC__ */
-#define gtk_file_path_new_dup(str)     ((GtkFilePath *)g_strdup(str))
-#define gtk_file_path_new_steal(str)   ((GtkFilePath *)(str))
-#define gtk_file_path_get_string(str) ((const gchar *)(str))
-#define gtk_file_path_free(path)       g_free (path)
-#endif/* __GNUC__ */
-
-#define gtk_file_path_copy(path)       gtk_file_path_new_dup (gtk_file_path_get_string(path))
-#ifdef G_OS_WIN32
-int _gtk_file_system_win32_path_compare (const gchar *path1,
-					 const gchar *path2);
-#define gtk_file_path_compare(path1,path2) \
-  _gtk_file_system_win32_path_compare (gtk_file_path_get_string (path1), \
-	                               gtk_file_path_get_string (path2))
-#else
-#define gtk_file_path_compare(path1,path2) strcmp (gtk_file_path_get_string (path1), \
-						   gtk_file_path_get_string (path2))
-#endif
-
-GSList *gtk_file_paths_sort (GSList *paths);
-GSList *gtk_file_paths_copy (GSList *paths);
-void    gtk_file_paths_free (GSList *paths);
-
-/* GtkFileSystem modules support */
-
-GtkFileSystem  *gtk_file_system_create (const char *file_system_name);
-
-G_END_DECLS
-
-#endif /* __GTK_FILE_SYSTEM_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilesystemmodel.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilesystemmodel.h
deleted file mode 100644
index 1bf999ba..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfilesystemmodel.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkfilesystemmodel.h: GtkTreeModel wrapping a GtkFileSystem
- * Copyright (C) 2003, 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 __GTK_FILE_SYSTEM_MODEL_H__
-#define __GTK_FILE_SYSTEM_MODEL_H__
-
-#ifndef GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED
-#error "GtkFileSystemModel is not supported API for general use"
-#endif
-
-#include <glib-object.h>
-#include "gtkfilesystem.h"
-#include <gtk/gtktreemodel.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_FILE_SYSTEM_MODEL             (_gtk_file_system_model_get_type ())
-#define GTK_FILE_SYSTEM_MODEL(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FILE_SYSTEM_MODEL, GtkFileSystemModel))
-#define GTK_IS_FILE_SYSTEM_MODEL(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FILE_SYSTEM_MODEL))
-
-typedef struct _GtkFileSystemModel      GtkFileSystemModel;
-
-GType _gtk_file_system_model_get_type (void) G_GNUC_CONST;
-
-typedef enum {
-  GTK_FILE_SYSTEM_MODEL_INFO,
-  GTK_FILE_SYSTEM_MODEL_DISPLAY_NAME,
-  GTK_FILE_SYSTEM_MODEL_N_COLUMNS
-} GtkFileSystemModelColumns;
-
-GtkFileSystemModel *_gtk_file_system_model_new              (GtkFileSystem      *file_system,
-							     const GtkFilePath  *root_path,
-							     gint                max_depth,
-							     GtkFileInfoType     types,
-							     GError            **error);
-const GtkFileInfo * _gtk_file_system_model_get_info         (GtkFileSystemModel *model,
-							     GtkTreeIter        *iter);
-const GtkFilePath * _gtk_file_system_model_get_path          (GtkFileSystemModel *model,
-							     GtkTreeIter        *iter);
-void                _gtk_file_system_model_set_show_hidden  (GtkFileSystemModel *model,
-							     gboolean            show_hidden);
-void                _gtk_file_system_model_set_show_folders (GtkFileSystemModel *model,
-							     gboolean            show_folders);
-void                _gtk_file_system_model_set_show_files   (GtkFileSystemModel *model,
-							     gboolean            show_files);
-
-typedef gboolean (*GtkFileSystemModelFilter) (GtkFileSystemModel *model,
-					      GtkFilePath        *path,
-					      const GtkFileInfo  *info,
-					      gpointer            user_data);
-
-void     _gtk_file_system_model_set_filter (GtkFileSystemModel      *model,
-					    GtkFileSystemModelFilter filter,
-					    gpointer                 user_data);
-
-typedef void (*GtkFileSystemModelPathFunc) (GtkFileSystemModel *model,
-					    GtkTreePath        *path,
-					    GtkTreeIter        *iter,
-					    gpointer            user_data);
-
-void     _gtk_file_system_model_path_do (GtkFileSystemModel        *model,
-					 const GtkFilePath         *path,
-					 GtkFileSystemModelPathFunc func,
-					 gpointer                   user_data);
-
-void _gtk_file_system_model_add_editable    (GtkFileSystemModel *model,
-					     GtkTreeIter        *iter);
-void _gtk_file_system_model_remove_editable (GtkFileSystemModel *model);
-
-G_END_DECLS
-
-#endif /* __GTK_FILE_SYSTEM_MODEL_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfixed.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfixed.h
deleted file mode 100644
index a313568c..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfixed.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_FIXED_H__
-#define __GTK_FIXED_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkcontainer.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_FIXED                  (gtk_fixed_get_type ())
-#define GTK_FIXED(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FIXED, GtkFixed))
-#define GTK_FIXED_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FIXED, GtkFixedClass))
-#define GTK_IS_FIXED(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FIXED))
-#define GTK_IS_FIXED_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FIXED))
-#define GTK_FIXED_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FIXED, GtkFixedClass))
-
-
-typedef struct _GtkFixed        GtkFixed;
-typedef struct _GtkFixedClass   GtkFixedClass;
-typedef struct _GtkFixedChild   GtkFixedChild;
-
-struct _GtkFixed
-{
-  GtkContainer container;
-
-  GList *children;
-};
-
-struct _GtkFixedClass
-{
-  GtkContainerClass parent_class;
-};
-
-struct _GtkFixedChild
-{
-  GtkWidget *widget;
-  gint x;
-  gint y;
-};
-
-
-GType      gtk_fixed_get_type          (void) G_GNUC_CONST;
-GtkWidget* gtk_fixed_new               (void);
-void       gtk_fixed_put               (GtkFixed       *fixed,
-                                        GtkWidget      *widget,
-                                        gint            x,
-                                        gint            y);
-void       gtk_fixed_move              (GtkFixed       *fixed,
-                                        GtkWidget      *widget,
-                                        gint            x,
-                                        gint            y);
-void       gtk_fixed_set_has_window    (GtkFixed       *fixed,
-					gboolean        has_window);
-gboolean   gtk_fixed_get_has_window    (GtkFixed       *fixed);
-
-G_END_DECLS
-
-#endif /* __GTK_FIXED_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfontbutton.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfontbutton.h
deleted file mode 100644
index 8952569b..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfontbutton.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1998 David Abilleira Freijeiro <odaf@nexo.es>
- * All rights reserved
- * Based on gnome-color-picker by Federico Mena <federico@nuclecu.unam.mx>
- * 
- * 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, Cambridge, MA 02139, USA.
- */
-/*
- * Modified by the GTK+ Team and others 2003.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_FONT_BUTTON_H__
-#define __GTK_FONT_BUTTON_H__
-
-#include <gtk/gtkbutton.h>
-
-
-G_BEGIN_DECLS
-
-/* GtkFontButton is a button widget that allow user to select a font.
- */
-
-#define GTK_TYPE_FONT_BUTTON             (gtk_font_button_get_type ())
-#define GTK_FONT_BUTTON(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FONT_BUTTON, GtkFontButton))
-#define GTK_FONT_BUTTON_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FONT_BUTTON, GtkFontButtonClass))
-#define GTK_IS_FONT_BUTTON(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FONT_BUTTON))
-#define GTK_IS_FONT_BUTTON_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FONT_BUTTON))
-#define GTK_FONT_BUTTON_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FONT_BUTTON, GtkFontButtonClass))
-
-typedef struct _GtkFontButton        GtkFontButton;
-typedef struct _GtkFontButtonClass   GtkFontButtonClass;
-typedef struct _GtkFontButtonPrivate GtkFontButtonPrivate;
-
-struct _GtkFontButton {
-  GtkButton button;
-
-  /*< private >*/
-  GtkFontButtonPrivate *priv;
-};
-
-struct _GtkFontButtonClass {
-  GtkButtonClass parent_class;
-
-  /* font_set signal is emitted when font is chosen */
-  void (* font_set) (GtkFontButton *gfp);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType                 gtk_font_button_get_type       (void) G_GNUC_CONST;
-GtkWidget            *gtk_font_button_new            (void);
-GtkWidget            *gtk_font_button_new_with_font  (const gchar   *fontname);
-
-G_CONST_RETURN gchar *gtk_font_button_get_title      (GtkFontButton *font_button);
-void                  gtk_font_button_set_title      (GtkFontButton *font_button,
-                                                      const gchar   *title);
-gboolean              gtk_font_button_get_use_font   (GtkFontButton *font_button);
-void                  gtk_font_button_set_use_font   (GtkFontButton *font_button,
-                                                      gboolean       use_font);
-gboolean              gtk_font_button_get_use_size   (GtkFontButton *font_button);
-void                  gtk_font_button_set_use_size   (GtkFontButton *font_button,
-                                                      gboolean       use_size);
-G_CONST_RETURN gchar* gtk_font_button_get_font_name  (GtkFontButton *font_button);
-gboolean              gtk_font_button_set_font_name  (GtkFontButton *font_button,
-                                                      const gchar   *fontname);
-gboolean              gtk_font_button_get_show_style (GtkFontButton *font_button);
-void                  gtk_font_button_set_show_style (GtkFontButton *font_button,
-                                                      gboolean       show_style);
-gboolean              gtk_font_button_get_show_size  (GtkFontButton *font_button);
-void                  gtk_font_button_set_show_size  (GtkFontButton *font_button,
-                                                      gboolean       show_size);
-
-G_END_DECLS
-
-    
-#endif /* __GTK_FONT_BUTTON_H__ */
-
-
-
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfontsel.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfontsel.h
deleted file mode 100644
index f4133991..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkfontsel.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * GtkFontSelection widget for Gtk+, by Damon Chaplin, May 1998.
- * Based on the GnomeFontSelector widget, by Elliot Lee, but major changes.
- * The GnomeFontSelector was derived from app/text_tool.c in the GIMP.
- *
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_FONTSEL_H__
-#define __GTK_FONTSEL_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkvbox.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_FONT_SELECTION              (gtk_font_selection_get_type ())
-#define GTK_FONT_SELECTION(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FONT_SELECTION, GtkFontSelection))
-#define GTK_FONT_SELECTION_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FONT_SELECTION, GtkFontSelectionClass))
-#define GTK_IS_FONT_SELECTION(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FONT_SELECTION))
-#define GTK_IS_FONT_SELECTION_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FONT_SELECTION))
-#define GTK_FONT_SELECTION_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FONT_SELECTION, GtkFontSelectionClass))
-
-
-#define GTK_TYPE_FONT_SELECTION_DIALOG              (gtk_font_selection_dialog_get_type ())
-#define GTK_FONT_SELECTION_DIALOG(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FONT_SELECTION_DIALOG, GtkFontSelectionDialog))
-#define GTK_FONT_SELECTION_DIALOG_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FONT_SELECTION_DIALOG, GtkFontSelectionDialogClass))
-#define GTK_IS_FONT_SELECTION_DIALOG(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FONT_SELECTION_DIALOG))
-#define GTK_IS_FONT_SELECTION_DIALOG_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FONT_SELECTION_DIALOG))
-#define GTK_FONT_SELECTION_DIALOG_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FONT_SELECTION_DIALOG, GtkFontSelectionDialogClass))
-
-
-typedef struct _GtkFontSelection	     GtkFontSelection;
-typedef struct _GtkFontSelectionClass	     GtkFontSelectionClass;
-
-typedef struct _GtkFontSelectionDialog	     GtkFontSelectionDialog;
-typedef struct _GtkFontSelectionDialogClass  GtkFontSelectionDialogClass;
-
-struct _GtkFontSelection
-{
-  GtkVBox parent_instance;
-  
-  GtkWidget *font_entry;
-  GtkWidget *family_list;
-  GtkWidget *font_style_entry;
-  GtkWidget *face_list;
-  GtkWidget *size_entry;
-  GtkWidget *size_list;
-  GtkWidget *pixels_button;
-  GtkWidget *points_button;
-  GtkWidget *filter_button;
-  GtkWidget *preview_entry;
-
-  PangoFontFamily *family;	/* Current family */
-  PangoFontFace *face;		/* Current face */
-  
-  gint size;
-  
-  GdkFont *font;		/* Cache for gdk_font_selection_get_font, so we can preserve
-				 * refcounting behavior
-				 */
-};
-
-struct _GtkFontSelectionClass
-{
-  GtkVBoxClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-struct _GtkFontSelectionDialog
-{
-  GtkDialog parent_instance;
-
-  /*< private >*/
-  GtkWidget *fontsel;
-
-  GtkWidget *main_vbox;
-  GtkWidget *action_area;
-  /*< public >*/
-  GtkWidget *ok_button;
-  GtkWidget *apply_button;
-  GtkWidget *cancel_button;
-
-  /*< private >*/
-
-  /* If the user changes the width of the dialog, we turn auto-shrink off.
-   * (Unused now, autoshrink doesn't mean anything anymore -Yosh)
-   */
-  gint dialog_width;
-  gboolean auto_resize;
-};
-
-struct _GtkFontSelectionDialogClass
-{
-  GtkDialogClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-
-/*****************************************************************************
- * GtkFontSelection functions.
- *   see the comments in the GtkFontSelectionDialog functions.
- *****************************************************************************/
-
-GType	   gtk_font_selection_get_type		(void) G_GNUC_CONST;
-GtkWidget* gtk_font_selection_new		(void);
-gchar*	   gtk_font_selection_get_font_name	(GtkFontSelection *fontsel);
-
-#ifndef GTK_DISABLE_DEPRECATED
-GdkFont*   gtk_font_selection_get_font		(GtkFontSelection *fontsel);
-#endif /* GTK_DISABLE_DEPRECATED */
-
-gboolean              gtk_font_selection_set_font_name    (GtkFontSelection *fontsel,
-							   const gchar      *fontname);
-G_CONST_RETURN gchar* gtk_font_selection_get_preview_text (GtkFontSelection *fontsel);
-void                  gtk_font_selection_set_preview_text (GtkFontSelection *fontsel,
-							   const gchar      *text);
-
-/*****************************************************************************
- * GtkFontSelectionDialog functions.
- *   most of these functions simply call the corresponding function in the
- *   GtkFontSelection.
- *****************************************************************************/
-
-GType	   gtk_font_selection_dialog_get_type	(void) G_GNUC_CONST;
-GtkWidget* gtk_font_selection_dialog_new	(const gchar	  *title);
-
-/* This returns the X Logical Font Description fontname, or NULL if no font
-   is selected. Note that there is a slight possibility that the font might not
-   have been loaded OK. You should call gtk_font_selection_dialog_get_font()
-   to see if it has been loaded OK.
-   You should g_free() the returned font name after you're done with it. */
-gchar*	 gtk_font_selection_dialog_get_font_name    (GtkFontSelectionDialog *fsd);
-
-#ifndef GTK_DISABLE_DEPRECATED
-/* This will return the current GdkFont, or NULL if none is selected or there
-   was a problem loading it. Remember to use gdk_font_ref/unref() if you want
-   to use the font (in a style, for example). */
-GdkFont* gtk_font_selection_dialog_get_font	    (GtkFontSelectionDialog *fsd);
-#endif /* GTK_DISABLE_DEPRECATED */
-
-/* This sets the currently displayed font. It should be a valid X Logical
-   Font Description font name (anything else will be ignored), e.g.
-   "-adobe-courier-bold-o-normal--25-*-*-*-*-*-*-*" 
-   It returns TRUE on success. */
-gboolean gtk_font_selection_dialog_set_font_name    (GtkFontSelectionDialog *fsd,
-						     const gchar	*fontname);
-
-/* This returns the text in the preview entry. You should copy the returned
-   text if you need it. */
-G_CONST_RETURN gchar* gtk_font_selection_dialog_get_preview_text (GtkFontSelectionDialog *fsd);
-
-/* This sets the text in the preview entry. It will be copied by the entry,
-   so there's no need to g_strdup() it first. */
-void	 gtk_font_selection_dialog_set_preview_text (GtkFontSelectionDialog *fsd,
-						     const gchar	    *text);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_FONTSEL_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkframe.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkframe.h
deleted file mode 100644
index 85729d13..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkframe.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_FRAME_H__
-#define __GTK_FRAME_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkbin.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_FRAME                  (gtk_frame_get_type ())
-#define GTK_FRAME(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FRAME, GtkFrame))
-#define GTK_FRAME_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FRAME, GtkFrameClass))
-#define GTK_IS_FRAME(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FRAME))
-#define GTK_IS_FRAME_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FRAME))
-#define GTK_FRAME_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FRAME, GtkFrameClass))
-
-
-typedef struct _GtkFrame       GtkFrame;
-typedef struct _GtkFrameClass  GtkFrameClass;
-
-struct _GtkFrame
-{
-  GtkBin bin;
-
-  GtkWidget *label_widget;
-  gint16 shadow_type;
-  gfloat label_xalign;
-  gfloat label_yalign;
-
-  GtkAllocation child_allocation;
-};
-
-struct _GtkFrameClass
-{
-  GtkBinClass parent_class;
-
-  void (*compute_child_allocation) (GtkFrame *frame, GtkAllocation *allocation);
-};
-
-
-GType      gtk_frame_get_type         (void) G_GNUC_CONST;
-GtkWidget* gtk_frame_new              (const gchar   *label);
-
-void                  gtk_frame_set_label (GtkFrame    *frame,
-					   const gchar *label);
-G_CONST_RETURN gchar *gtk_frame_get_label (GtkFrame    *frame);
-
-void       gtk_frame_set_label_widget (GtkFrame      *frame,
-				       GtkWidget     *label_widget);
-GtkWidget *gtk_frame_get_label_widget (GtkFrame      *frame);
-void       gtk_frame_set_label_align  (GtkFrame      *frame,
-				       gfloat         xalign,
-				       gfloat         yalign);
-void       gtk_frame_get_label_align  (GtkFrame      *frame,
-				       gfloat        *xalign,
-				       gfloat        *yalign);
-void       gtk_frame_set_shadow_type  (GtkFrame      *frame,
-				       GtkShadowType  type);
-GtkShadowType gtk_frame_get_shadow_type (GtkFrame    *frame);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_FRAME_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkgamma.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkgamma.h
deleted file mode 100644
index fa6999b3..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkgamma.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1997 David Mosberger
- *
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-/*
- * NOTE this widget is considered too specialized/little-used for
- * GTK+, and will in the future be moved to some other package.  If
- * your application needs this widget, feel free to use it, as the
- * widget does work and is useful in some applications; it's just not
- * of general interest. However, we are not accepting new features for
- * the widget, and it will eventually move out of the GTK+
- * distribution.
- */
-
-#ifndef __GTK_GAMMA_CURVE_H__
-#define __GTK_GAMMA_CURVE_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkvbox.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_GAMMA_CURVE            (gtk_gamma_curve_get_type ())
-#define GTK_GAMMA_CURVE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_GAMMA_CURVE, GtkGammaCurve))
-#define GTK_GAMMA_CURVE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_GAMMA_CURVE, GtkGammaCurveClass))
-#define GTK_IS_GAMMA_CURVE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_GAMMA_CURVE))
-#define GTK_IS_GAMMA_CURVE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_GAMMA_CURVE))
-#define GTK_GAMMA_CURVE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_GAMMA_CURVE, GtkGammaCurveClass))
-
-typedef struct _GtkGammaCurve		GtkGammaCurve;
-typedef struct _GtkGammaCurveClass	GtkGammaCurveClass;
-
-
-struct _GtkGammaCurve
-{
-  GtkVBox vbox;
-
-  GtkWidget *table;
-  GtkWidget *curve;
-  GtkWidget *button[5];	/* spline, linear, free, gamma, reset */
-
-  gfloat gamma;
-  GtkWidget *gamma_dialog;
-  GtkWidget *gamma_text;
-};
-
-struct _GtkGammaCurveClass
-{
-  GtkVBoxClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType      gtk_gamma_curve_get_type (void) G_GNUC_CONST;
-GtkWidget* gtk_gamma_curve_new      (void);
-
-
-G_END_DECLS
-
-#endif /* __GTK_GAMMA_CURVE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkgc.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkgc.h
deleted file mode 100644
index 38d70a6b..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkgc.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_GC_H__
-#define __GTK_GC_H__
-
-
-#include <gdk/gdk.h>
-
-
-G_BEGIN_DECLS
-
-GdkGC* gtk_gc_get     (gint             depth,
-		       GdkColormap     *colormap,
-		       GdkGCValues     *values,
-		       GdkGCValuesMask  values_mask);
-void   gtk_gc_release (GdkGC           *gc);
-
-
-G_END_DECLS
-
-#endif /* __GTK_GC_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhandlebox.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhandlebox.h
deleted file mode 100644
index c690a04b..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhandlebox.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- * Copyright (C) 1998 Elliot Lee
- *
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-/* The GtkHandleBox is to allow widgets to be dragged in and out of
- * their parents.
- */
-
-
-#ifndef __GTK_HANDLE_BOX_H__
-#define __GTK_HANDLE_BOX_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkbin.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_HANDLE_BOX            (gtk_handle_box_get_type ())
-#define GTK_HANDLE_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HANDLE_BOX, GtkHandleBox))
-#define GTK_HANDLE_BOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_HANDLE_BOX, GtkHandleBoxClass))
-#define GTK_IS_HANDLE_BOX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_HANDLE_BOX))
-#define GTK_IS_HANDLE_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HANDLE_BOX))
-#define GTK_HANDLE_BOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_HANDLE_BOX, GtkHandleBoxClass))
-
-
-typedef struct _GtkHandleBox       GtkHandleBox;
-typedef struct _GtkHandleBoxClass  GtkHandleBoxClass;
-
-struct _GtkHandleBox
-{
-  GtkBin bin;
-
-  GdkWindow      *bin_window;	/* parent window for children */
-  GdkWindow      *float_window;
-  GtkShadowType   shadow_type;
-  guint		  handle_position : 2;
-  guint		  float_window_mapped : 1;
-  guint		  child_detached : 1;
-  guint		  in_drag : 1;
-  guint		  shrink_on_detach : 1;
-
-  signed int      snap_edge : 3; /* -1 == unset */
-  
-  /* Variables used during a drag
-   */
-  gint deskoff_x, deskoff_y; /* Offset between root relative coordinates
-			      * and deskrelative coordinates */
-  GtkAllocation   attach_allocation;
-  GtkAllocation   float_allocation;
-};
-
-struct _GtkHandleBoxClass
-{
-  GtkBinClass parent_class;
-
-  void	(*child_attached)	(GtkHandleBox	*handle_box,
-				 GtkWidget	*child);
-  void	(*child_detached)	(GtkHandleBox	*handle_box,
-				 GtkWidget	*child);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType         gtk_handle_box_get_type             (void) G_GNUC_CONST;
-GtkWidget*    gtk_handle_box_new                  (void);
-void          gtk_handle_box_set_shadow_type      (GtkHandleBox    *handle_box,
-                                                   GtkShadowType    type);
-GtkShadowType gtk_handle_box_get_shadow_type      (GtkHandleBox    *handle_box);
-void          gtk_handle_box_set_handle_position  (GtkHandleBox    *handle_box,
-					           GtkPositionType  position);
-GtkPositionType gtk_handle_box_get_handle_position(GtkHandleBox    *handle_box);
-void          gtk_handle_box_set_snap_edge        (GtkHandleBox    *handle_box,
-						   GtkPositionType  edge);
-GtkPositionType gtk_handle_box_get_snap_edge      (GtkHandleBox    *handle_box);
-
-G_END_DECLS
-
-#endif /* __GTK_HANDLE_BOX_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhbbox.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhbbox.h
deleted file mode 100644
index 7423a754..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhbbox.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_HBUTTON_BOX_H__
-#define __GTK_HBUTTON_BOX_H__
-
-
-#include <gtk/gtkbbox.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_HBUTTON_BOX                  (gtk_hbutton_box_get_type ())
-#define GTK_HBUTTON_BOX(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HBUTTON_BOX, GtkHButtonBox))
-#define GTK_HBUTTON_BOX_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_HBUTTON_BOX, GtkHButtonBoxClass))
-#define GTK_IS_HBUTTON_BOX(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_HBUTTON_BOX))
-#define GTK_IS_HBUTTON_BOX_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HBUTTON_BOX))
-#define GTK_HBUTTON_BOX_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_HBUTTON_BOX, GtkHButtonBoxClass))
-
-
-typedef struct _GtkHButtonBox       GtkHButtonBox;
-typedef struct _GtkHButtonBoxClass  GtkHButtonBoxClass;
-
-struct _GtkHButtonBox
-{
-  GtkButtonBox button_box;
-};
-
-struct _GtkHButtonBoxClass
-{
-  GtkButtonBoxClass parent_class;
-};
-
-
-GType      gtk_hbutton_box_get_type (void) G_GNUC_CONST;
-GtkWidget* gtk_hbutton_box_new      (void);
-
-/* buttons can be added by gtk_container_add() */
-
-#ifndef GTK_DISABLE_DEPRECATED
-gint gtk_hbutton_box_get_spacing_default (void);
-GtkButtonBoxStyle gtk_hbutton_box_get_layout_default (void);
-
-void gtk_hbutton_box_set_spacing_default (gint spacing);
-void gtk_hbutton_box_set_layout_default (GtkButtonBoxStyle layout);
-#endif
-
-G_END_DECLS
-
-#endif /* __GTK_HBUTTON_BOX_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhbox.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhbox.h
deleted file mode 100644
index 5296e21e..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhbox.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_HBOX_H__
-#define __GTK_HBOX_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkbox.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_HBOX            (gtk_hbox_get_type ())
-#define GTK_HBOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HBOX, GtkHBox))
-#define GTK_HBOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_HBOX, GtkHBoxClass))
-#define GTK_IS_HBOX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_HBOX))
-#define GTK_IS_HBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HBOX))
-#define GTK_HBOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_HBOX, GtkHBoxClass))
-
-
-typedef struct _GtkHBox	      GtkHBox;
-typedef struct _GtkHBoxClass  GtkHBoxClass;
-
-struct _GtkHBox
-{
-  GtkBox box;
-};
-
-struct _GtkHBoxClass
-{
-  GtkBoxClass parent_class;
-};
-
-
-GType	   gtk_hbox_get_type (void) G_GNUC_CONST;
-GtkWidget* gtk_hbox_new	     (gboolean homogeneous,
-			      gint spacing);
-
-
-G_END_DECLS
-
-#endif /* __GTK_HBOX_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhpaned.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhpaned.h
deleted file mode 100644
index 2272dfd4..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhpaned.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_HPANED_H__
-#define __GTK_HPANED_H__
-
-#include <gtk/gtkpaned.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_HPANED		   (gtk_hpaned_get_type ())
-#define GTK_HPANED(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HPANED, GtkHPaned))
-#define GTK_HPANED_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_HPANED, GtkHPanedClass))
-#define GTK_IS_HPANED(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_HPANED))
-#define GTK_IS_HPANED_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HPANED))
-#define GTK_HPANED_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_HPANED, GtkHPanedClass))
-
-
-typedef struct _GtkHPaned      GtkHPaned;
-typedef struct _GtkHPanedClass GtkHPanedClass;
-
-struct _GtkHPaned
-{
-  GtkPaned paned;
-};
-
-struct _GtkHPanedClass
-{
-  GtkPanedClass parent_class;
-};
-
-GType      gtk_hpaned_get_type (void) G_GNUC_CONST;
-GtkWidget *gtk_hpaned_new      (void);
-
-G_END_DECLS
-
-#endif /* __GTK_HPANED_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhruler.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhruler.h
deleted file mode 100644
index 375b8086..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhruler.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-/*
- * NOTE this widget is considered too specialized/little-used for
- * GTK+, and will in the future be moved to some other package.  If
- * your application needs this widget, feel free to use it, as the
- * widget does work and is useful in some applications; it's just not
- * of general interest. However, we are not accepting new features for
- * the widget, and it will eventually move out of the GTK+
- * distribution.
- */
-
-#ifndef __GTK_HRULER_H__
-#define __GTK_HRULER_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkruler.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_HRULER	           (gtk_hruler_get_type ())
-#define GTK_HRULER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HRULER, GtkHRuler))
-#define GTK_HRULER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_HRULER, GtkHRulerClass))
-#define GTK_IS_HRULER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_HRULER))
-#define GTK_IS_HRULER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HRULER))
-#define GTK_HRULER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_HRULER, GtkHRulerClass))
-
-
-typedef struct _GtkHRuler       GtkHRuler;
-typedef struct _GtkHRulerClass  GtkHRulerClass;
-
-struct _GtkHRuler
-{
-  GtkRuler ruler;
-};
-
-struct _GtkHRulerClass
-{
-  GtkRulerClass parent_class;
-};
-
-
-GType      gtk_hruler_get_type (void) G_GNUC_CONST;
-GtkWidget* gtk_hruler_new      (void);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_HRULER_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhscale.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhscale.h
deleted file mode 100644
index 6f410907..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhscale.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_HSCALE_H__
-#define __GTK_HSCALE_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkscale.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_HSCALE            (gtk_hscale_get_type ())
-#define GTK_HSCALE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HSCALE, GtkHScale))
-#define GTK_HSCALE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_HSCALE, GtkHScaleClass))
-#define GTK_IS_HSCALE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_HSCALE))
-#define GTK_IS_HSCALE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HSCALE))
-#define GTK_HSCALE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_HSCALE, GtkHScaleClass))
-
-
-typedef struct _GtkHScale       GtkHScale;
-typedef struct _GtkHScaleClass  GtkHScaleClass;
-
-struct _GtkHScale
-{
-  GtkScale scale;
-};
-
-struct _GtkHScaleClass
-{
-  GtkScaleClass parent_class;
-};
-
-
-GType      gtk_hscale_get_type       (void) G_GNUC_CONST;
-GtkWidget* gtk_hscale_new            (GtkAdjustment *adjustment);
-GtkWidget* gtk_hscale_new_with_range (gdouble        min,
-                                      gdouble        max,
-                                      gdouble        step);
-
-
-G_END_DECLS
-
-#endif /* __GTK_HSCALE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhscrollbar.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhscrollbar.h
deleted file mode 100644
index a6f595ba..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhscrollbar.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_HSCROLLBAR_H__
-#define __GTK_HSCROLLBAR_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkscrollbar.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_HSCROLLBAR            (gtk_hscrollbar_get_type ())
-#define GTK_HSCROLLBAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HSCROLLBAR, GtkHScrollbar))
-#define GTK_HSCROLLBAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_HSCROLLBAR, GtkHScrollbarClass))
-#define GTK_IS_HSCROLLBAR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_HSCROLLBAR))
-#define GTK_IS_HSCROLLBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HSCROLLBAR))
-#define GTK_HSCROLLBAR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_HSCROLLBAR, GtkHScrollbarClass))
-
-
-typedef struct _GtkHScrollbar       GtkHScrollbar;
-typedef struct _GtkHScrollbarClass  GtkHScrollbarClass;
-
-struct _GtkHScrollbar
-{
-  GtkScrollbar scrollbar;
-};
-
-struct _GtkHScrollbarClass
-{
-  GtkScrollbarClass parent_class;
-};
-
-
-GType      gtk_hscrollbar_get_type (void) G_GNUC_CONST;
-GtkWidget* gtk_hscrollbar_new      (GtkAdjustment *adjustment);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_HSCROLLBAR_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhseparator.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhseparator.h
deleted file mode 100644
index 008a2fe4..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkhseparator.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_HSEPARATOR_H__
-#define __GTK_HSEPARATOR_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkseparator.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_HSEPARATOR                  (gtk_hseparator_get_type ())
-#define GTK_HSEPARATOR(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HSEPARATOR, GtkHSeparator))
-#define GTK_HSEPARATOR_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_HSEPARATOR, GtkHSeparatorClass))
-#define GTK_IS_HSEPARATOR(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_HSEPARATOR))
-#define GTK_IS_HSEPARATOR_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HSEPARATOR))
-#define GTK_HSEPARATOR_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_HSEPARATOR, GtkHSeparatorClass))
-
-
-typedef struct _GtkHSeparator       GtkHSeparator;
-typedef struct _GtkHSeparatorClass  GtkHSeparatorClass;
-
-struct _GtkHSeparator
-{
-  GtkSeparator separator;
-};
-
-struct _GtkHSeparatorClass
-{
-  GtkSeparatorClass parent_class;
-};
-
-
-GType      gtk_hseparator_get_type (void) G_GNUC_CONST;
-GtkWidget* gtk_hseparator_new      (void);
-
-
-G_END_DECLS
-
-#endif /* __GTK_HSEPARATOR_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkiconfactory.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkiconfactory.h
deleted file mode 100644
index 1bcbcb40..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkiconfactory.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_ICON_FACTORY_H__
-#define __GTK_ICON_FACTORY_H__
-
-#include <gdk/gdk.h>
-#include <gtk/gtkrc.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GtkIconFactoryClass GtkIconFactoryClass;
-
-#define GTK_TYPE_ICON_FACTORY              (gtk_icon_factory_get_type ())
-#define GTK_ICON_FACTORY(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GTK_TYPE_ICON_FACTORY, GtkIconFactory))
-#define GTK_ICON_FACTORY_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ICON_FACTORY, GtkIconFactoryClass))
-#define GTK_IS_ICON_FACTORY(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GTK_TYPE_ICON_FACTORY))
-#define GTK_IS_ICON_FACTORY_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ICON_FACTORY))
-#define GTK_ICON_FACTORY_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ICON_FACTORY, GtkIconFactoryClass))
-#define GTK_TYPE_ICON_SET                  (gtk_icon_set_get_type ())
-#define GTK_TYPE_ICON_SOURCE               (gtk_icon_source_get_type ())
-
-struct _GtkIconFactory
-{
-  GObject parent_instance;
-
-  GHashTable *icons;
-};
-
-struct _GtkIconFactoryClass
-{
-  GObjectClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-#ifdef G_OS_WIN32
-/* Reserve old names for DLL ABI backward compatibility */
-#define gtk_icon_source_set_filename gtk_icon_source_set_filename_utf8
-#define gtk_icon_source_get_filename gtk_icon_source_get_filename_utf8
-#endif
-
-GType           gtk_icon_factory_get_type (void) G_GNUC_CONST;
-GtkIconFactory* gtk_icon_factory_new      (void);
-void            gtk_icon_factory_add      (GtkIconFactory *factory,
-                                           const gchar    *stock_id,
-                                           GtkIconSet     *icon_set);
-GtkIconSet*     gtk_icon_factory_lookup   (GtkIconFactory *factory,
-                                           const gchar    *stock_id);
-
-/* Manage the default icon factory stack */
-
-void        gtk_icon_factory_add_default     (GtkIconFactory  *factory);
-void        gtk_icon_factory_remove_default  (GtkIconFactory  *factory);
-GtkIconSet* gtk_icon_factory_lookup_default  (const gchar     *stock_id);
-
-/* Get preferred real size from registered semantic size.  Note that
- * themes SHOULD use this size, but they aren't required to; for size
- * requests and such, you should get the actual pixbuf from the icon
- * set and see what size was rendered.
- *
- * This function is intended for people who are scaling icons,
- * rather than for people who are displaying already-scaled icons.
- * That is, if you are displaying an icon, you should get the
- * size from the rendered pixbuf, not from here.
- */
-
-#ifndef GDK_MULTIHEAD_SAFE
-gboolean gtk_icon_size_lookup              (GtkIconSize  size,
-					    gint        *width,
-					    gint        *height);
-#endif /* GDK_MULTIHEAD_SAFE */
-gboolean gtk_icon_size_lookup_for_settings (GtkSettings *settings,
-					    GtkIconSize  size,
-					    gint        *width,
-					    gint        *height);
-
-GtkIconSize           gtk_icon_size_register       (const gchar *name,
-                                                    gint         width,
-                                                    gint         height);
-void                  gtk_icon_size_register_alias (const gchar *alias,
-                                                    GtkIconSize  target);
-GtkIconSize           gtk_icon_size_from_name      (const gchar *name);
-G_CONST_RETURN gchar* gtk_icon_size_get_name       (GtkIconSize  size);
-
-/* Icon sets */
-
-GType       gtk_icon_set_get_type        (void) G_GNUC_CONST;
-GtkIconSet* gtk_icon_set_new             (void);
-GtkIconSet* gtk_icon_set_new_from_pixbuf (GdkPixbuf       *pixbuf);
-
-GtkIconSet* gtk_icon_set_ref             (GtkIconSet      *icon_set);
-void        gtk_icon_set_unref           (GtkIconSet      *icon_set);
-GtkIconSet* gtk_icon_set_copy            (GtkIconSet      *icon_set);
-
-/* Get one of the icon variants in the set, creating the variant if
- * necessary.
- */
-GdkPixbuf*  gtk_icon_set_render_icon     (GtkIconSet      *icon_set,
-                                          GtkStyle        *style,
-                                          GtkTextDirection direction,
-                                          GtkStateType     state,
-                                          GtkIconSize      size,
-                                          GtkWidget       *widget,
-                                          const char      *detail);
-
-
-void           gtk_icon_set_add_source   (GtkIconSet          *icon_set,
-                                          const GtkIconSource *source);
-
-void           gtk_icon_set_get_sizes    (GtkIconSet          *icon_set,
-                                          GtkIconSize        **sizes,
-                                          gint                *n_sizes);
-
-GType          gtk_icon_source_get_type                 (void) G_GNUC_CONST;
-GtkIconSource* gtk_icon_source_new                      (void);
-GtkIconSource* gtk_icon_source_copy                     (const GtkIconSource *source);
-void           gtk_icon_source_free                     (GtkIconSource       *source);
-
-void           gtk_icon_source_set_filename             (GtkIconSource       *source,
-                                                         const gchar         *filename);
-void           gtk_icon_source_set_icon_name            (GtkIconSource       *source,
-                                                         const gchar         *icon_name);
-void           gtk_icon_source_set_pixbuf               (GtkIconSource       *source,
-                                                         GdkPixbuf           *pixbuf);
-
-G_CONST_RETURN gchar* gtk_icon_source_get_filename  (const GtkIconSource *source);
-G_CONST_RETURN gchar* gtk_icon_source_get_icon_name (const GtkIconSource *source);
-GdkPixbuf*            gtk_icon_source_get_pixbuf    (const GtkIconSource *source);
-
-void             gtk_icon_source_set_direction_wildcarded (GtkIconSource       *source,
-                                                           gboolean             setting);
-void             gtk_icon_source_set_state_wildcarded     (GtkIconSource       *source,
-                                                           gboolean             setting);
-void             gtk_icon_source_set_size_wildcarded      (GtkIconSource       *source,
-                                                           gboolean             setting);
-gboolean         gtk_icon_source_get_size_wildcarded      (const GtkIconSource *source);
-gboolean         gtk_icon_source_get_state_wildcarded     (const GtkIconSource *source);
-gboolean         gtk_icon_source_get_direction_wildcarded (const GtkIconSource *source);
-void             gtk_icon_source_set_direction            (GtkIconSource       *source,
-                                                           GtkTextDirection     direction);
-void             gtk_icon_source_set_state                (GtkIconSource       *source,
-                                                           GtkStateType         state);
-void             gtk_icon_source_set_size                 (GtkIconSource       *source,
-                                                           GtkIconSize          size);
-GtkTextDirection gtk_icon_source_get_direction            (const GtkIconSource *source);
-GtkStateType     gtk_icon_source_get_state                (const GtkIconSource *source);
-GtkIconSize      gtk_icon_source_get_size                 (const GtkIconSource *source);
-
-
-/* ignore this */
-void _gtk_icon_set_invalidate_caches (void);
-GList* _gtk_icon_factory_list_ids (void);
-void _gtk_icon_factory_ensure_default_icons (void);
-
-G_END_DECLS
-
-#endif /* __GTK_ICON_FACTORY_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkicontheme.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkicontheme.h
deleted file mode 100644
index 6b62bc51..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkicontheme.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/* GtkIconTheme - a loader for icon themes
- * gtk-icon-loader.h Copyright (C) 2002, 2003 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 __GTK_ICON_THEME_H__
-#define __GTK_ICON_THEME_H__
-
-#include <glib-object.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk/gdkscreen.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_ICON_INFO              (gtk_icon_info_get_type ())
-
-#define GTK_TYPE_ICON_THEME             (gtk_icon_theme_get_type ())
-#define GTK_ICON_THEME(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ICON_THEME, GtkIconTheme))
-#define GTK_ICON_THEME_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ICON_THEME, GtkIconThemeClass))
-#define GTK_IS_ICON_THEME(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ICON_THEME))
-#define GTK_IS_ICON_THEME_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ICON_THEME))
-#define GTK_ICON_THEME_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ICON_THEME, GtkIconThemeClass))
-
-typedef struct _GtkIconInfo         GtkIconInfo;
-typedef struct _GtkIconTheme        GtkIconTheme;
-typedef struct _GtkIconThemeClass   GtkIconThemeClass;
-typedef struct _GtkIconThemePrivate GtkIconThemePrivate;
-
-struct _GtkIconTheme
-{
-  /*< private >*/
-  GObject parent_instance;
-
-  GtkIconThemePrivate *priv;
-};
-
-struct _GtkIconThemeClass
-{
-  GObjectClass parent_class;
-
-  void (* changed)  (GtkIconTheme *icon_theme);
-};
-
-/**
- * GtkIconLookupFlags:
- * @GTK_ICON_LOOKUP_NO_SVG: Never return SVG icons, even if gdk-pixbuf
- *   supports them. Cannot be used together with %GTK_ICON_LOOKUP_FORCE_SVG.
- * @GTK_ICON_LOOKUP_FORCE_SVG: Return SVG icons, even if gdk-pixbuf
- *   doesn't support them.
- *   Cannot be used together with %GTK_ICON_LOOKUP_NO_SVG.
- * @GTK_ICON_LOOKUP_USE_BUILTIN: When passed to
- *   gtk_icon_theme_lookup_icon() includes builtin icons
- *   as well as files. For a builtin icon, gtk_icon_info_get_filename()
- *   returns %NULL and you need to call gtk_icon_info_get_builtin_pixbuf().
- * @GTK_ICON_LOOKUP_GENERIC_FALLBACK: Try to shorten icon name at '-'
- *   characters before looking at inherited themes. For more general
- *   fallback, see gtk_icon_theme_choose_icon(). Since 2.12.
- * 
- * Used to specify options for gtk_icon_theme_lookup_icon()
- **/
-typedef enum
-{
-  GTK_ICON_LOOKUP_NO_SVG = 1 << 0,
-  GTK_ICON_LOOKUP_FORCE_SVG = 1 << 1,
-  GTK_ICON_LOOKUP_USE_BUILTIN = 1 << 2,
-  GTK_ICON_LOOKUP_GENERIC_FALLBACK = 1 << 3
-} GtkIconLookupFlags;
-
-#define GTK_ICON_THEME_ERROR gtk_icon_theme_error_quark ()
-
-/**
- * GtkIconThemeError:
- * @GTK_ICON_THEME_NOT_FOUND: The icon specified does not exist in the theme
- * @GTK_ICON_THEME_FAILED: An unspecified error occurred.
- * 
- * Error codes for GtkIconTheme operations.
- **/
-typedef enum {
-  GTK_ICON_THEME_NOT_FOUND,
-  GTK_ICON_THEME_FAILED
-} GtkIconThemeError;
-
-GQuark gtk_icon_theme_error_quark (void);
-
-#ifdef G_OS_WIN32
-/* Reserve old name for DLL ABI backward compatibility */
-#define gtk_icon_theme_set_search_path gtk_icon_theme_set_search_path_utf8
-#define gtk_icon_theme_get_search_path gtk_icon_theme_get_search_path_utf8
-#define gtk_icon_theme_append_search_path gtk_icon_theme_append_search_path_utf8
-#define gtk_icon_theme_prepend_search_path gtk_icon_theme_prepend_search_path_utf8
-#define gtk_icon_info_get_filename gtk_icon_info_get_filename_utf8
-#endif
-
-GType         gtk_icon_theme_get_type              (void) G_GNUC_CONST;
-
-GtkIconTheme *gtk_icon_theme_new                   (void);
-GtkIconTheme *gtk_icon_theme_get_default           (void);
-GtkIconTheme *gtk_icon_theme_get_for_screen        (GdkScreen                   *screen);
-void          gtk_icon_theme_set_screen            (GtkIconTheme                *icon_theme,
-						    GdkScreen                   *screen);
-
-void          gtk_icon_theme_set_search_path       (GtkIconTheme                *icon_theme,
-						    const gchar                 *path[],
-						    gint                         n_elements);
-void          gtk_icon_theme_get_search_path       (GtkIconTheme                *icon_theme,
-						    gchar                      **path[],
-						    gint                        *n_elements);
-void          gtk_icon_theme_append_search_path    (GtkIconTheme                *icon_theme,
-						    const gchar                 *path);
-void          gtk_icon_theme_prepend_search_path   (GtkIconTheme                *icon_theme,
-						    const gchar                 *path);
-
-void          gtk_icon_theme_set_custom_theme      (GtkIconTheme                *icon_theme,
-						    const gchar                 *theme_name);
-
-gboolean      gtk_icon_theme_has_icon              (GtkIconTheme                *icon_theme,
-						    const gchar                 *icon_name);
-gint         *gtk_icon_theme_get_icon_sizes        (GtkIconTheme                *icon_theme,
-						    const gchar                 *icon_name);
-GtkIconInfo * gtk_icon_theme_lookup_icon           (GtkIconTheme                *icon_theme,
-						    const gchar                 *icon_name,
-						    gint                         size,
-						    GtkIconLookupFlags           flags);
-GtkIconInfo * gtk_icon_theme_choose_icon           (GtkIconTheme                *icon_theme,
-						    const gchar                 *icon_names[],
-						    gint                         size,
-						    GtkIconLookupFlags           flags);
-GdkPixbuf *   gtk_icon_theme_load_icon             (GtkIconTheme                *icon_theme,
-						    const gchar                 *icon_name,
-						    gint                         size,
-						    GtkIconLookupFlags           flags,
-						    GError                     **error);
-
-GList *       gtk_icon_theme_list_icons            (GtkIconTheme                *icon_theme,
-						    const gchar                 *context);
-GList *       gtk_icon_theme_list_contexts         (GtkIconTheme                *icon_theme);
-char *        gtk_icon_theme_get_example_icon_name (GtkIconTheme                *icon_theme);
-
-gboolean      gtk_icon_theme_rescan_if_needed      (GtkIconTheme                *icon_theme);
-
-void       gtk_icon_theme_add_builtin_icon  (const gchar *icon_name,
-					     gint         size,
-					     GdkPixbuf   *pixbuf);
-
-GType         gtk_icon_info_get_type (void) G_GNUC_CONST;
-GtkIconInfo  *gtk_icon_info_copy     (GtkIconInfo *icon_info);
-void          gtk_icon_info_free     (GtkIconInfo *icon_info);
-
-gint                  gtk_icon_info_get_base_size      (GtkIconInfo *icon_info);
-G_CONST_RETURN gchar *gtk_icon_info_get_filename       (GtkIconInfo *icon_info);
-GdkPixbuf    *        gtk_icon_info_get_builtin_pixbuf (GtkIconInfo *icon_info);
-GdkPixbuf    *        gtk_icon_info_load_icon          (GtkIconInfo *icon_info,
-							GError     **error);
-
-void                  gtk_icon_info_set_raw_coordinates (GtkIconInfo *icon_info,
-							 gboolean     raw_coordinates);
-
-gboolean              gtk_icon_info_get_embedded_rect (GtkIconInfo   *icon_info,
-						       GdkRectangle  *rectangle);
-gboolean              gtk_icon_info_get_attach_points (GtkIconInfo   *icon_info,
-						       GdkPoint     **points,
-						       gint          *n_points);
-G_CONST_RETURN gchar *gtk_icon_info_get_display_name  (GtkIconInfo   *icon_info);
-
-/* Non-public methods */
-void _gtk_icon_theme_check_reload                     (GdkDisplay *display);
-void _gtk_icon_theme_ensure_builtin_cache             (void);
-
-G_END_DECLS
-
-#endif /* __GTK_ICON_THEME_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkiconview.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkiconview.h
deleted file mode 100644
index 66acd5fd..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkiconview.h
+++ /dev/null
@@ -1,227 +0,0 @@
-/* gtkiconview.h
- * Copyright (C) 2002, 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 __GTK_ICON_VIEW_H__
-#define __GTK_ICON_VIEW_H__
-
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtkcellrenderer.h>
-#include <gtk/gtkselection.h>
-#include <gtk/gtktooltip.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_ICON_VIEW		(gtk_icon_view_get_type ())
-#define GTK_ICON_VIEW(obj)		(GTK_CHECK_CAST ((obj), GTK_TYPE_ICON_VIEW, GtkIconView))
-#define GTK_ICON_VIEW_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_ICON_VIEW, GtkIconViewClass))
-#define GTK_IS_ICON_VIEW(obj)		(GTK_CHECK_TYPE ((obj), GTK_TYPE_ICON_VIEW))
-#define GTK_IS_ICON_VIEW_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ICON_VIEW))
-#define GTK_ICON_VIEW_GET_CLASS(obj)    (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_ICON_VIEW, GtkIconViewClass))
-
-typedef struct _GtkIconView           GtkIconView;
-typedef struct _GtkIconViewClass      GtkIconViewClass;
-typedef struct _GtkIconViewPrivate    GtkIconViewPrivate;
-
-typedef void (* GtkIconViewForeachFunc)     (GtkIconView      *icon_view,
-					     GtkTreePath      *path,
-					     gpointer          data);
-
-typedef enum
-{
-  GTK_ICON_VIEW_NO_DROP,
-  GTK_ICON_VIEW_DROP_INTO,
-  GTK_ICON_VIEW_DROP_LEFT,
-  GTK_ICON_VIEW_DROP_RIGHT,
-  GTK_ICON_VIEW_DROP_ABOVE,
-  GTK_ICON_VIEW_DROP_BELOW
-} GtkIconViewDropPosition;
-
-struct _GtkIconView
-{
-  GtkContainer parent;
-
-  GtkIconViewPrivate *priv;
-};
-
-struct _GtkIconViewClass
-{
-  GtkContainerClass parent_class;
-
-  void    (* set_scroll_adjustments) (GtkIconView      *icon_view,
-				      GtkAdjustment    *hadjustment,
-				      GtkAdjustment    *vadjustment);
-  
-  void    (* item_activated)         (GtkIconView      *icon_view,
-				      GtkTreePath      *path);
-  void    (* selection_changed)      (GtkIconView      *icon_view);
-
-  /* Key binding signals */
-  void    (* select_all)             (GtkIconView      *icon_view);
-  void    (* unselect_all)           (GtkIconView      *icon_view);
-  void    (* select_cursor_item)     (GtkIconView      *icon_view);
-  void    (* toggle_cursor_item)     (GtkIconView      *icon_view);
-  gboolean (* move_cursor)           (GtkIconView      *icon_view,
-				      GtkMovementStep   step,
-				      gint              count);
-  gboolean (* activate_cursor_item)  (GtkIconView      *icon_view);
-};
-
-GType          gtk_icon_view_get_type          (void) G_GNUC_CONST;
-GtkWidget *    gtk_icon_view_new               (void);
-GtkWidget *    gtk_icon_view_new_with_model    (GtkTreeModel   *model);
-
-void           gtk_icon_view_set_model         (GtkIconView    *icon_view,
- 					        GtkTreeModel   *model);
-GtkTreeModel * gtk_icon_view_get_model         (GtkIconView    *icon_view);
-void           gtk_icon_view_set_text_column   (GtkIconView    *icon_view,
-	 	 			        gint            column);
-gint           gtk_icon_view_get_text_column   (GtkIconView    *icon_view);
-void           gtk_icon_view_set_markup_column (GtkIconView    *icon_view,
-					        gint            column);
-gint           gtk_icon_view_get_markup_column (GtkIconView    *icon_view);
-void           gtk_icon_view_set_pixbuf_column (GtkIconView    *icon_view,
-					        gint            column);
-gint           gtk_icon_view_get_pixbuf_column (GtkIconView    *icon_view);
-
-void           gtk_icon_view_set_orientation   (GtkIconView    *icon_view,
-	   			                GtkOrientation  orientation);
-GtkOrientation gtk_icon_view_get_orientation   (GtkIconView    *icon_view);
-void           gtk_icon_view_set_columns       (GtkIconView    *icon_view,
-		 			        gint            columns);
-gint           gtk_icon_view_get_columns       (GtkIconView    *icon_view);
-void           gtk_icon_view_set_item_width    (GtkIconView    *icon_view,
-					        gint            item_width);
-gint           gtk_icon_view_get_item_width    (GtkIconView    *icon_view);
-void           gtk_icon_view_set_spacing       (GtkIconView    *icon_view, 
-		 			        gint            spacing);
-gint           gtk_icon_view_get_spacing       (GtkIconView    *icon_view);
-void           gtk_icon_view_set_row_spacing   (GtkIconView    *icon_view, 
-					        gint            row_spacing);
-gint           gtk_icon_view_get_row_spacing   (GtkIconView    *icon_view);
-void           gtk_icon_view_set_column_spacing (GtkIconView    *icon_view, 
-					        gint            column_spacing);
-gint           gtk_icon_view_get_column_spacing (GtkIconView    *icon_view);
-void           gtk_icon_view_set_margin        (GtkIconView    *icon_view, 
-					        gint            margin);
-gint           gtk_icon_view_get_margin        (GtkIconView    *icon_view);
-
-
-GtkTreePath *  gtk_icon_view_get_path_at_pos   (GtkIconView     *icon_view,
-						gint             x,
-						gint             y);
-gboolean       gtk_icon_view_get_item_at_pos   (GtkIconView     *icon_view,
-						gint              x,
-						gint              y,
-						GtkTreePath     **path,
-						GtkCellRenderer **cell);
-gboolean       gtk_icon_view_get_visible_range (GtkIconView      *icon_view,
-						GtkTreePath     **start_path,
-						GtkTreePath     **end_path);
-
-void           gtk_icon_view_selected_foreach   (GtkIconView            *icon_view,
-						 GtkIconViewForeachFunc  func,
-						 gpointer                data);
-void           gtk_icon_view_set_selection_mode (GtkIconView            *icon_view,
-						 GtkSelectionMode        mode);
-GtkSelectionMode gtk_icon_view_get_selection_mode (GtkIconView            *icon_view);
-void             gtk_icon_view_select_path        (GtkIconView            *icon_view,
-						   GtkTreePath            *path);
-void             gtk_icon_view_unselect_path      (GtkIconView            *icon_view,
-						   GtkTreePath            *path);
-gboolean         gtk_icon_view_path_is_selected   (GtkIconView            *icon_view,
-						   GtkTreePath            *path);
-GList           *gtk_icon_view_get_selected_items (GtkIconView            *icon_view);
-void             gtk_icon_view_select_all         (GtkIconView            *icon_view);
-void             gtk_icon_view_unselect_all       (GtkIconView            *icon_view);
-void             gtk_icon_view_item_activated     (GtkIconView            *icon_view,
-						   GtkTreePath            *path);
-void             gtk_icon_view_set_cursor         (GtkIconView            *icon_view,
-						   GtkTreePath            *path,
-						   GtkCellRenderer        *cell,
-						   gboolean                start_editing);
-gboolean         gtk_icon_view_get_cursor         (GtkIconView            *icon_view,
-						   GtkTreePath           **path,
-						   GtkCellRenderer       **cell);
-void             gtk_icon_view_scroll_to_path     (GtkIconView            *icon_view,
-                                                   GtkTreePath            *path,
-						   gboolean                use_align,
-						   gfloat                  row_align,
-                                                   gfloat                  col_align);
-
-/* Drag-and-Drop support */
-void                   gtk_icon_view_enable_model_drag_source (GtkIconView              *icon_view,
-							       GdkModifierType           start_button_mask,
-							       const GtkTargetEntry     *targets,
-							       gint                      n_targets,
-							       GdkDragAction             actions);
-void                   gtk_icon_view_enable_model_drag_dest   (GtkIconView              *icon_view,
-							       const GtkTargetEntry     *targets,
-							       gint                      n_targets,
-							       GdkDragAction             actions);
-void                   gtk_icon_view_unset_model_drag_source  (GtkIconView              *icon_view);
-void                   gtk_icon_view_unset_model_drag_dest    (GtkIconView              *icon_view);
-void                   gtk_icon_view_set_reorderable          (GtkIconView              *icon_view,
-							       gboolean                  reorderable);
-gboolean               gtk_icon_view_get_reorderable          (GtkIconView              *icon_view);
-
-
-/* These are useful to implement your own custom stuff. */
-void                   gtk_icon_view_set_drag_dest_item       (GtkIconView              *icon_view,
-							       GtkTreePath              *path,
-							       GtkIconViewDropPosition   pos);
-void                   gtk_icon_view_get_drag_dest_item       (GtkIconView              *icon_view,
-							       GtkTreePath             **path,
-							       GtkIconViewDropPosition  *pos);
-gboolean               gtk_icon_view_get_dest_item_at_pos     (GtkIconView              *icon_view,
-							       gint                      drag_x,
-							       gint                      drag_y,
-							       GtkTreePath             **path,
-							       GtkIconViewDropPosition  *pos);
-GdkPixmap             *gtk_icon_view_create_drag_icon         (GtkIconView              *icon_view,
-							       GtkTreePath              *path);
-
-void    gtk_icon_view_convert_widget_to_bin_window_coords     (GtkIconView *icon_view,
-                                                               gint         wx,
-                                                               gint         wy,
-                                                               gint        *bx,
-                                                               gint        *by);
-
-
-void    gtk_icon_view_set_tooltip_item                        (GtkIconView     *icon_view,
-                                                               GtkTooltip      *tooltip,
-                                                               GtkTreePath     *path);
-void    gtk_icon_view_set_tooltip_cell                        (GtkIconView     *icon_view,
-                                                               GtkTooltip      *tooltip,
-                                                               GtkTreePath     *path,
-                                                               GtkCellRenderer *cell);
-gboolean gtk_icon_view_get_tooltip_context                    (GtkIconView       *icon_view,
-                                                               gint              *x,
-                                                               gint              *y,
-                                                               gboolean           keyboard_tip,
-                                                               GtkTreeModel     **model,
-                                                               GtkTreePath      **path,
-                                                               GtkTreeIter       *iter);
-void     gtk_icon_view_set_tooltip_column                     (GtkIconView       *icon_view,
-                                                               gint               column);
-gint     gtk_icon_view_get_tooltip_column                     (GtkIconView       *icon_view);
-
-
-G_END_DECLS
-
-#endif /* __GTK_ICON_VIEW_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkimage.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkimage.h
deleted file mode 100644
index e1b061cc..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkimage.h
+++ /dev/null
@@ -1,224 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_IMAGE_H__
-#define __GTK_IMAGE_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkmisc.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_IMAGE                  (gtk_image_get_type ())
-#define GTK_IMAGE(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IMAGE, GtkImage))
-#define GTK_IMAGE_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_IMAGE, GtkImageClass))
-#define GTK_IS_IMAGE(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_IMAGE))
-#define GTK_IS_IMAGE_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IMAGE))
-#define GTK_IMAGE_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_IMAGE, GtkImageClass))
-
-
-typedef struct _GtkImage       GtkImage;
-typedef struct _GtkImageClass  GtkImageClass;
-
-typedef struct _GtkImagePixmapData  GtkImagePixmapData;
-typedef struct _GtkImageImageData   GtkImageImageData;
-typedef struct _GtkImagePixbufData  GtkImagePixbufData;
-typedef struct _GtkImageStockData   GtkImageStockData;
-typedef struct _GtkImageIconSetData GtkImageIconSetData;
-typedef struct _GtkImageAnimationData GtkImageAnimationData;
-typedef struct _GtkImageIconNameData  GtkImageIconNameData;
-
-struct _GtkImagePixmapData
-{
-  GdkPixmap *pixmap;
-};
-
-struct _GtkImageImageData
-{
-  GdkImage *image;
-};
-
-struct _GtkImagePixbufData
-{
-  GdkPixbuf *pixbuf;
-};
-
-struct _GtkImageStockData
-{
-  gchar *stock_id;
-};
-
-struct _GtkImageIconSetData
-{
-  GtkIconSet *icon_set;
-};
-
-struct _GtkImageAnimationData
-{
-  GdkPixbufAnimation *anim;
-  GdkPixbufAnimationIter *iter;
-  guint frame_timeout;
-};
-
-struct _GtkImageIconNameData
-{
-  gchar *icon_name;
-  GdkPixbuf *pixbuf;
-  guint theme_change_id;
-};
-
-typedef enum
-{
-  GTK_IMAGE_EMPTY,
-  GTK_IMAGE_PIXMAP,
-  GTK_IMAGE_IMAGE,
-  GTK_IMAGE_PIXBUF,
-  GTK_IMAGE_STOCK,
-  GTK_IMAGE_ICON_SET,
-  GTK_IMAGE_ANIMATION,
-  GTK_IMAGE_ICON_NAME
-} GtkImageType;
-
-struct _GtkImage
-{
-  GtkMisc misc;
-
-  GtkImageType storage_type;
-  
-  union
-  {
-    GtkImagePixmapData pixmap;
-    GtkImageImageData image;
-    GtkImagePixbufData pixbuf;
-    GtkImageStockData stock;
-    GtkImageIconSetData icon_set;
-    GtkImageAnimationData anim;
-    GtkImageIconNameData name;
-  } data;
-
-  /* Only used with GTK_IMAGE_PIXMAP, GTK_IMAGE_IMAGE */
-  GdkBitmap *mask;
-
-  /* Only used with GTK_IMAGE_STOCK, GTK_IMAGE_ICON_SET, GTK_IMAGE_ICON_NAME */
-  GtkIconSize icon_size;
-};
-
-struct _GtkImageClass
-{
-  GtkMiscClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-#ifdef G_OS_WIN32
-/* Reserve old names for DLL ABI backward compatibility */
-#define gtk_image_new_from_file gtk_image_new_from_file_utf8
-#define gtk_image_set_from_file gtk_image_set_from_file_utf8
-#endif
-
-GType      gtk_image_get_type (void) G_GNUC_CONST;
-
-GtkWidget* gtk_image_new                (void);
-GtkWidget* gtk_image_new_from_pixmap    (GdkPixmap       *pixmap,
-                                         GdkBitmap       *mask);
-GtkWidget* gtk_image_new_from_image     (GdkImage        *image,
-                                         GdkBitmap       *mask);
-GtkWidget* gtk_image_new_from_file      (const gchar     *filename);
-GtkWidget* gtk_image_new_from_pixbuf    (GdkPixbuf       *pixbuf);
-GtkWidget* gtk_image_new_from_stock     (const gchar     *stock_id,
-                                         GtkIconSize      size);
-GtkWidget* gtk_image_new_from_icon_set  (GtkIconSet      *icon_set,
-                                         GtkIconSize      size);
-GtkWidget* gtk_image_new_from_animation (GdkPixbufAnimation *animation);
-GtkWidget* gtk_image_new_from_icon_name (const gchar     *icon_name,
-					 GtkIconSize      size);
-
-void gtk_image_clear              (GtkImage        *image);
-void gtk_image_set_from_pixmap    (GtkImage        *image,
-                                   GdkPixmap       *pixmap,
-                                   GdkBitmap       *mask);
-void gtk_image_set_from_image     (GtkImage        *image,
-                                   GdkImage        *gdk_image,
-                                   GdkBitmap       *mask);
-void gtk_image_set_from_file      (GtkImage        *image,
-                                   const gchar     *filename);
-void gtk_image_set_from_pixbuf    (GtkImage        *image,
-                                   GdkPixbuf       *pixbuf);
-void gtk_image_set_from_stock     (GtkImage        *image,
-                                   const gchar     *stock_id,
-                                   GtkIconSize      size);
-void gtk_image_set_from_icon_set  (GtkImage        *image,
-                                   GtkIconSet      *icon_set,
-                                   GtkIconSize      size);
-void gtk_image_set_from_animation (GtkImage           *image,
-                                   GdkPixbufAnimation *animation);
-void gtk_image_set_from_icon_name (GtkImage        *image,
-				   const gchar     *icon_name,
-				   GtkIconSize      size);
-void gtk_image_set_pixel_size     (GtkImage        *image,
-				   gint             pixel_size);
-
-GtkImageType gtk_image_get_storage_type (GtkImage   *image);
-
-void       gtk_image_get_pixmap   (GtkImage         *image,
-                                   GdkPixmap       **pixmap,
-                                   GdkBitmap       **mask);
-void       gtk_image_get_image    (GtkImage         *image,
-                                   GdkImage        **gdk_image,
-                                   GdkBitmap       **mask);
-GdkPixbuf* gtk_image_get_pixbuf   (GtkImage         *image);
-void       gtk_image_get_stock    (GtkImage         *image,
-                                   gchar           **stock_id,
-                                   GtkIconSize      *size);
-void       gtk_image_get_icon_set (GtkImage         *image,
-                                   GtkIconSet      **icon_set,
-                                   GtkIconSize      *size);
-GdkPixbufAnimation* gtk_image_get_animation (GtkImage *image);
-void       gtk_image_get_icon_name (GtkImage              *image,
-				    G_CONST_RETURN gchar **icon_name,
-				    GtkIconSize           *size);
-gint       gtk_image_get_pixel_size (GtkImage             *image);
-
-#ifndef GTK_DISABLE_DEPRECATED
-/* These three are deprecated */
-
-void       gtk_image_set      (GtkImage   *image,
-			       GdkImage   *val,
-			       GdkBitmap  *mask);
-void       gtk_image_get      (GtkImage   *image,
-			       GdkImage  **val,
-			       GdkBitmap **mask);
-#endif /* GTK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GTK_IMAGE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkimagemenuitem.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkimagemenuitem.h
deleted file mode 100644
index f70df311..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkimagemenuitem.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 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.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_IMAGE_MENU_ITEM_H__
-#define __GTK_IMAGE_MENU_ITEM_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkmenuitem.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_IMAGE_MENU_ITEM            (gtk_image_menu_item_get_type ())
-#define GTK_IMAGE_MENU_ITEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IMAGE_MENU_ITEM, GtkImageMenuItem))
-#define GTK_IMAGE_MENU_ITEM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_IMAGE_MENU_ITEM, GtkImageMenuItemClass))
-#define GTK_IS_IMAGE_MENU_ITEM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_IMAGE_MENU_ITEM))
-#define GTK_IS_IMAGE_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IMAGE_MENU_ITEM))
-#define GTK_IMAGE_MENU_ITEM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_IMAGE_MENU_ITEM, GtkImageMenuItemClass))
-
-
-typedef struct _GtkImageMenuItem       GtkImageMenuItem;
-typedef struct _GtkImageMenuItemClass  GtkImageMenuItemClass;
-
-struct _GtkImageMenuItem
-{
-  GtkMenuItem menu_item;
-
-  /*< private >*/
-  GtkWidget *image;
-};
-
-struct _GtkImageMenuItemClass
-{
-  GtkMenuItemClass parent_class;
-};
-
-
-GType	   gtk_image_menu_item_get_type          (void) G_GNUC_CONST;
-GtkWidget* gtk_image_menu_item_new               (void);
-GtkWidget* gtk_image_menu_item_new_with_label    (const gchar      *label);
-GtkWidget* gtk_image_menu_item_new_with_mnemonic (const gchar      *label);
-GtkWidget* gtk_image_menu_item_new_from_stock    (const gchar      *stock_id,
-                                                  GtkAccelGroup    *accel_group);
-void       gtk_image_menu_item_set_image         (GtkImageMenuItem *image_menu_item,
-                                                  GtkWidget        *image);
-GtkWidget* gtk_image_menu_item_get_image         (GtkImageMenuItem *image_menu_item);
-
-G_END_DECLS
-
-#endif /* __GTK_IMAGE_MENU_ITEM_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkimcontext.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkimcontext.h
deleted file mode 100644
index ae4a7107..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkimcontext.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2000 Red Hat Software
- *
- * 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 __GTK_IM_CONTEXT_H__
-#define __GTK_IM_CONTEXT_H__
-
-#include <gdk/gdk.h>
-#include <gtk/gtkobject.h>
-#include <pango/pango.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_IM_CONTEXT              (gtk_im_context_get_type ())
-#define GTK_IM_CONTEXT(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IM_CONTEXT, GtkIMContext))
-#define GTK_IM_CONTEXT_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_IM_CONTEXT, GtkIMContextClass))
-#define GTK_IS_IM_CONTEXT(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_IM_CONTEXT))
-#define GTK_IS_IM_CONTEXT_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IM_CONTEXT))
-#define GTK_IM_CONTEXT_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_IM_CONTEXT, GtkIMContextClass))
-
-
-typedef struct _GtkIMContext       GtkIMContext;
-typedef struct _GtkIMContextClass  GtkIMContextClass;
-
-struct _GtkIMContext
-{
-  GObject parent_instance;
-};
-
-struct _GtkIMContextClass
-{
-  /* Yes, this should be GObjectClass, be we can't fix it without breaking
-   * binary compatibility - see bug #90935
-   */
-  GtkObjectClass parent_class;
-
-  /* Signals */
-  void     (*preedit_start)        (GtkIMContext *context);
-  void     (*preedit_end)          (GtkIMContext *context);
-  void     (*preedit_changed)      (GtkIMContext *context);
-  void     (*commit)               (GtkIMContext *context, const gchar *str);
-  gboolean (*retrieve_surrounding) (GtkIMContext *context);
-  gboolean (*delete_surrounding)   (GtkIMContext *context,
-				    gint          offset,
-				    gint          n_chars);
-
-  /* Virtual functions */
-  void     (*set_client_window)   (GtkIMContext   *context,
-				   GdkWindow      *window);
-  void     (*get_preedit_string)  (GtkIMContext   *context,
-				   gchar         **str,
-				   PangoAttrList **attrs,
-				   gint           *cursor_pos);
-  gboolean (*filter_keypress)     (GtkIMContext   *context,
-			           GdkEventKey    *event);
-  void     (*focus_in)            (GtkIMContext   *context);
-  void     (*focus_out)           (GtkIMContext   *context);
-  void     (*reset)               (GtkIMContext   *context);
-  void     (*set_cursor_location) (GtkIMContext   *context,
-				   GdkRectangle   *area);
-  void     (*set_use_preedit)     (GtkIMContext   *context,
-				   gboolean        use_preedit);
-  void     (*set_surrounding)     (GtkIMContext   *context,
-				   const gchar    *text,
-				   gint            len,
-				   gint            cursor_index);
-  gboolean (*get_surrounding)     (GtkIMContext   *context,
-				   gchar         **text,
-				   gint           *cursor_index);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-  void (*_gtk_reserved5) (void);
-  void (*_gtk_reserved6) (void);
-};
-
-GType    gtk_im_context_get_type            (void) G_GNUC_CONST;
-
-void     gtk_im_context_set_client_window   (GtkIMContext   *context,
-					     GdkWindow      *window);
-void     gtk_im_context_get_preedit_string  (GtkIMContext   *context,
-					     gchar         **str,
-					     PangoAttrList **attrs,
-					     gint           *cursor_pos);
-gboolean gtk_im_context_filter_keypress     (GtkIMContext   *context,
-					     GdkEventKey    *event);
-void     gtk_im_context_focus_in            (GtkIMContext   *context);
-void     gtk_im_context_focus_out           (GtkIMContext   *context);
-void     gtk_im_context_reset               (GtkIMContext   *context);
-void     gtk_im_context_set_cursor_location (GtkIMContext   *context,
-					     GdkRectangle   *area);
-void     gtk_im_context_set_use_preedit     (GtkIMContext   *context,
-					     gboolean        use_preedit);
-void     gtk_im_context_set_surrounding     (GtkIMContext   *context,
-					     const gchar    *text,
-					     gint            len,
-					     gint            cursor_index);
-gboolean gtk_im_context_get_surrounding     (GtkIMContext   *context,
-					     gchar         **text,
-					     gint           *cursor_index);
-gboolean gtk_im_context_delete_surrounding  (GtkIMContext   *context,
-					     gint            offset,
-					     gint            n_chars);
-
-G_END_DECLS
-
-#endif /* __GTK_IM_CONTEXT_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkimcontextsimple.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkimcontextsimple.h
deleted file mode 100644
index 1378c43d..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkimcontextsimple.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2000 Red Hat Software
- *
- * 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 __GTK_IM_CONTEXT_SIMPLE_H__
-#define __GTK_IM_CONTEXT_SIMPLE_H__
-
-#include <gtk/gtkimcontext.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_IM_CONTEXT_SIMPLE              (gtk_im_context_simple_get_type ())
-#define GTK_IM_CONTEXT_SIMPLE(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IM_CONTEXT_SIMPLE, GtkIMContextSimple))
-#define GTK_IM_CONTEXT_SIMPLE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_IM_CONTEXT_SIMPLE, GtkIMContextSimpleClass))
-#define GTK_IS_IM_CONTEXT_SIMPLE(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_IM_CONTEXT_SIMPLE))
-#define GTK_IS_IM_CONTEXT_SIMPLE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IM_CONTEXT_SIMPLE))
-#define GTK_IM_CONTEXT_SIMPLE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_IM_CONTEXT_SIMPLE, GtkIMContextSimpleClass))
-
-
-typedef struct _GtkIMContextSimple       GtkIMContextSimple;
-typedef struct _GtkIMContextSimpleClass  GtkIMContextSimpleClass;
-
-#define GTK_MAX_COMPOSE_LEN 7
-  
-struct _GtkIMContextSimple
-{
-  GtkIMContext object;
-
-  GSList *tables;
-  
-  guint compose_buffer[GTK_MAX_COMPOSE_LEN + 1];
-  gunichar tentative_match;
-  gint tentative_match_len;
-
-  guint in_hex_sequence : 1;
-  guint modifiers_dropped : 1;
-};
-
-struct _GtkIMContextSimpleClass
-{
-  GtkIMContextClass parent_class;
-};
-
-GType         gtk_im_context_simple_get_type  (void) G_GNUC_CONST;
-GtkIMContext *gtk_im_context_simple_new       (void);
-
-void          gtk_im_context_simple_add_table (GtkIMContextSimple *context_simple,
-					       guint16            *data,
-					       gint                max_seq_len,
-					       gint                n_seqs);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_IM_CONTEXT_SIMPLE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkimmodule.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkimmodule.h
deleted file mode 100644
index a6e3a2d3..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkimmodule.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2000 Red Hat Software
- *
- * 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 __GTK_IM_MODULE_H__
-#define __GTK_IM_MODULE_H__
-
-
-#include <gtk/gtkimcontext.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GtkIMContextInfo GtkIMContextInfo;
-
-struct _GtkIMContextInfo 
-{
-  const gchar *context_id;
-  const gchar *context_name;
-  const gchar *domain;
-  const gchar *domain_dirname;
-  const gchar *default_locales;
-};
-
-/* Functions for use within GTK+
- */
-void           _gtk_im_module_list                   (const GtkIMContextInfo ***contexts,
-						      guint                    *n_contexts);
-GtkIMContext * _gtk_im_module_create                 (const gchar              *context_id);
-const gchar  * _gtk_im_module_get_default_context_id (GdkWindow                *client_window);
-
-/* The following entry points are exported by each input method module
- */
-
-/*
-void          im_module_list   (const GtkIMContextInfo ***contexts,
-				guint                    *n_contexts);
-void          im_module_init   (GtkModule             *module);
-void          im_module_exit   (void);
-GtkIMContext *im_module_create (const gchar             *context_id);
-*/
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_IM_MODULE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkimmulticontext.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkimmulticontext.h
deleted file mode 100644
index aa410f17..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkimmulticontext.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2000 Red Hat Software
- *
- * 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 __GTK_IM_MULTICONTEXT_H__
-#define __GTK_IM_MULTICONTEXT_H__
-
-#include <gtk/gtkimcontext.h>
-#include <gtk/gtkmenushell.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_IM_MULTICONTEXT              (gtk_im_multicontext_get_type ())
-#define GTK_IM_MULTICONTEXT(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IM_MULTICONTEXT, GtkIMMulticontext))
-#define GTK_IM_MULTICONTEXT_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_IM_MULTICONTEXT, GtkIMMulticontextClass))
-#define GTK_IS_IM_MULTICONTEXT(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_IM_MULTICONTEXT))
-#define GTK_IS_IM_MULTICONTEXT_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IM_MULTICONTEXT))
-#define GTK_IM_MULTICONTEXT_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_IM_MULTICONTEXT, GtkIMMulticontextClass))
-
-
-typedef struct _GtkIMMulticontext        GtkIMMulticontext;
-typedef struct _GtkIMMulticontextClass   GtkIMMulticontextClass;
-typedef struct _GtkIMMulticontextPrivate GtkIMMulticontextPrivate;
-
-struct _GtkIMMulticontext
-{
-  GtkIMContext object;
-
-  GtkIMContext *slave;
-
-  GtkIMMulticontextPrivate *priv;
-
-  gchar *context_id;
-};
-
-struct _GtkIMMulticontextClass
-{
-  GtkIMContextClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType         gtk_im_multicontext_get_type (void) G_GNUC_CONST;
-GtkIMContext *gtk_im_multicontext_new      (void);
-
-void          gtk_im_multicontext_append_menuitems (GtkIMMulticontext *context,
-						    GtkMenuShell      *menushell);
-
-G_END_DECLS
-
-#endif /* __GTK_IM_MULTICONTEXT_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkinputdialog.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkinputdialog.h
deleted file mode 100644
index 1a1a6489..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkinputdialog.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-/*
- * NOTE this widget is considered too specialized/little-used for
- * GTK+, and will in the future be moved to some other package.  If
- * your application needs this widget, feel free to use it, as the
- * widget does work and is useful in some applications; it's just not
- * of general interest. However, we are not accepting new features for
- * the widget, and it will eventually move out of the GTK+
- * distribution.
- */
-
-#ifndef __GTK_INPUTDIALOG_H__
-#define __GTK_INPUTDIALOG_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkdialog.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_INPUT_DIALOG              (gtk_input_dialog_get_type ())
-#define GTK_INPUT_DIALOG(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_INPUT_DIALOG, GtkInputDialog))
-#define GTK_INPUT_DIALOG_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_INPUT_DIALOG, GtkInputDialogClass))
-#define GTK_IS_INPUT_DIALOG(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_INPUT_DIALOG))
-#define GTK_IS_INPUT_DIALOG_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_INPUT_DIALOG))
-#define GTK_INPUT_DIALOG_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_INPUT_DIALOG, GtkInputDialogClass))
-
-
-typedef struct _GtkInputDialog       GtkInputDialog;
-typedef struct _GtkInputDialogClass  GtkInputDialogClass;
-
-struct _GtkInputDialog
-{
-  GtkDialog dialog;
-
-  GtkWidget *axis_list;
-  GtkWidget *axis_listbox;
-  GtkWidget *mode_optionmenu;
-
-  GtkWidget *close_button;
-  GtkWidget *save_button;
-  
-  GtkWidget *axis_items[GDK_AXIS_LAST];
-  GdkDevice *current_device;
-
-  GtkWidget *keys_list;
-  GtkWidget *keys_listbox;
-};
-
-struct _GtkInputDialogClass
-{
-  GtkDialogClass parent_class;
-
-  void (* enable_device)               (GtkInputDialog    *inputd,
-					GdkDevice         *device);
-  void (* disable_device)              (GtkInputDialog    *inputd,
-					GdkDevice         *device);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType      gtk_input_dialog_get_type     (void) G_GNUC_CONST;
-GtkWidget* gtk_input_dialog_new          (void);
-
-
-G_END_DECLS
-
-#endif /* __GTK_INPUTDIALOG_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkinvisible.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkinvisible.h
deleted file mode 100644
index ad0ad4c2..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkinvisible.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_INVISIBLE_H__
-#define __GTK_INVISIBLE_H__
-
-#include <gtk/gtkwidget.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_INVISIBLE		(gtk_invisible_get_type ())
-#define GTK_INVISIBLE(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_INVISIBLE, GtkInvisible))
-#define GTK_INVISIBLE_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_INVISIBLE, GtkInvisibleClass))
-#define GTK_IS_INVISIBLE(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_INVISIBLE))
-#define GTK_IS_INVISIBLE_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_INVISIBLE))
-#define GTK_INVISIBLE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_INVISIBLE, GtkInvisibleClass))
-
-
-typedef struct _GtkInvisible	   GtkInvisible;
-typedef struct _GtkInvisibleClass  GtkInvisibleClass;
-
-struct _GtkInvisible
-{
-  GtkWidget widget;
-  gboolean has_user_ref_count;
-  GdkScreen *screen;
-};
-
-struct _GtkInvisibleClass
-{
-  GtkWidgetClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType gtk_invisible_get_type (void) G_GNUC_CONST;
-
-GtkWidget* gtk_invisible_new            (void);
-GtkWidget* gtk_invisible_new_for_screen (GdkScreen *screen);
-void	   gtk_invisible_set_screen	(GtkInvisible *invisible,
-					 GdkScreen    *screen);
-GdkScreen* gtk_invisible_get_screen	(GtkInvisible *invisible);
-
-G_END_DECLS
-
-#endif /* __GTK_INVISIBLE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkitem.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkitem.h
deleted file mode 100644
index 01ca95c1..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkitem.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_ITEM_H__
-#define __GTK_ITEM_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkbin.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_ITEM                  (gtk_item_get_type ())
-#define GTK_ITEM(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ITEM, GtkItem))
-#define GTK_ITEM_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ITEM, GtkItemClass))
-#define GTK_IS_ITEM(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ITEM))
-#define GTK_IS_ITEM_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ITEM))
-#define GTK_ITEM_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ITEM, GtkItemClass))
-
-
-typedef struct _GtkItem       GtkItem;
-typedef struct _GtkItemClass  GtkItemClass;
-
-struct _GtkItem
-{
-  GtkBin bin;
-};
-
-struct _GtkItemClass
-{
-  GtkBinClass parent_class;
-
-  void (* select)   (GtkItem *item);
-  void (* deselect) (GtkItem *item);
-  void (* toggle)   (GtkItem *item);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType gtk_item_get_type (void) G_GNUC_CONST;
-void  gtk_item_select   (GtkItem *item);
-void  gtk_item_deselect (GtkItem *item);
-void  gtk_item_toggle   (GtkItem *item);
-
-G_END_DECLS
-
-#endif /* __GTK_ITEM_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkitemfactory.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkitemfactory.h
deleted file mode 100644
index f0d1e4fc..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkitemfactory.h
+++ /dev/null
@@ -1,240 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * GtkItemFactory: Flexible item factory with automatic rc handling
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_ITEM_FACTORY_H__
-#define	__GTK_ITEM_FACTORY_H__
-
-
-#include <gtk/gtkwidget.h>
-
-G_BEGIN_DECLS
-
-typedef gchar * (*GtkTranslateFunc)	   (const gchar		*path,
-					    gpointer             func_data);
-
-#if !defined (GTK_DISABLE_DEPRECATED)
-
-typedef void	(*GtkPrintFunc)		   (gpointer		 func_data,
-					    const gchar		*str);
-/* We use () here to mean unspecified arguments. This is deprecated
- * as of C99, but we can't change it without breaking compatibility.
- * (Note that if we are included from a C++ program () will mean
- * (void) so an explicit cast will be needed.)
- */
-typedef	void	(*GtkItemFactoryCallback)  ();
-typedef	void	(*GtkItemFactoryCallback1) (gpointer		 callback_data,
-					    guint		 callback_action,
-					    GtkWidget		*widget);
-
-#define GTK_TYPE_ITEM_FACTORY            (gtk_item_factory_get_type ())
-#define GTK_ITEM_FACTORY(object)         (G_TYPE_CHECK_INSTANCE_CAST ((object), GTK_TYPE_ITEM_FACTORY, GtkItemFactory))
-#define GTK_ITEM_FACTORY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ITEM_FACTORY, GtkItemFactoryClass))
-#define GTK_IS_ITEM_FACTORY(object)      (G_TYPE_CHECK_INSTANCE_TYPE ((object), GTK_TYPE_ITEM_FACTORY))
-#define GTK_IS_ITEM_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ITEM_FACTORY))
-#define GTK_ITEM_FACTORY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ITEM_FACTORY, GtkItemFactoryClass))
-
-
-typedef	struct	_GtkItemFactory			GtkItemFactory;
-typedef	struct	_GtkItemFactoryClass		GtkItemFactoryClass;
-typedef	struct	_GtkItemFactoryEntry		GtkItemFactoryEntry;
-typedef	struct	_GtkItemFactoryItem		GtkItemFactoryItem;
-
-struct _GtkItemFactory
-{
-  GtkObject		 object;
-
-  gchar			*path;
-  GtkAccelGroup		*accel_group;
-  GtkWidget		*widget;
-  GSList		*items;
-
-  GtkTranslateFunc       translate_func;
-  gpointer               translate_data;
-  GtkDestroyNotify       translate_notify;   
-};
-
-struct _GtkItemFactoryClass
-{
-  GtkObjectClass	 object_class;
-
-  GHashTable		*item_ht;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-struct _GtkItemFactoryEntry
-{
-  gchar *path;
-  gchar *accelerator;
-
-  GtkItemFactoryCallback callback;
-  guint			 callback_action;
-
-  /* possible values:
-   * NULL		-> "<Item>"
-   * ""			-> "<Item>"
-   * "<Title>"		-> create a title item
-   * "<Item>"		-> create a simple item
-   * "<ImageItem>"	-> create an item holding an image
-   * "<StockItem>"	-> create an item holding a stock image
-   * "<CheckItem>"	-> create a check item
-   * "<ToggleItem>"	-> create a toggle item
-   * "<RadioItem>"	-> create a radio item
-   * <path>		-> path of a radio item to link against
-   * "<Separator>"	-> create a separator
-   * "<Tearoff>"	-> create a tearoff separator
-   * "<Branch>"		-> create an item to hold sub items
-   * "<LastBranch>"	-> create a right justified item to hold sub items
-   */
-  gchar		 *item_type;
-
-  /* Extra data for some item types:
-   *  ImageItem  -> pointer to inlined pixbuf stream
-   *  StockItem  -> name of stock item
-   */
-  gconstpointer extra_data;
-};
-
-struct _GtkItemFactoryItem
-{
-  gchar *path;
-  GSList *widgets;
-};
-
-
-GType		gtk_item_factory_get_type	    (void) G_GNUC_CONST;
-
-/* `container_type' must be of GTK_TYPE_MENU_BAR, GTK_TYPE_MENU,
- * or GTK_TYPE_OPTION_MENU.
- */
-GtkItemFactory*	gtk_item_factory_new	   (GType		 container_type,
-					    const gchar		*path,
-					    GtkAccelGroup       *accel_group);
-void		gtk_item_factory_construct (GtkItemFactory	*ifactory,
-					    GType		 container_type,
-					    const gchar		*path,
-					    GtkAccelGroup       *accel_group);
-     
-/* These functions operate on GtkItemFactoryClass basis.
- */
-void		gtk_item_factory_add_foreign        (GtkWidget	    *accel_widget,
-						     const gchar    *full_path,
-						     GtkAccelGroup  *accel_group,
-						     guint	     keyval,
-						     GdkModifierType modifiers);
-     
-GtkItemFactory*       gtk_item_factory_from_widget      (GtkWidget *widget);
-G_CONST_RETURN gchar* gtk_item_factory_path_from_widget (GtkWidget *widget);
-
-GtkWidget*	gtk_item_factory_get_item	      (GtkItemFactory *ifactory,
-						       const gchar    *path);
-GtkWidget*	gtk_item_factory_get_widget	      (GtkItemFactory *ifactory,
-						       const gchar    *path);
-GtkWidget*	gtk_item_factory_get_widget_by_action (GtkItemFactory *ifactory,
-						       guint	       action);
-GtkWidget*	gtk_item_factory_get_item_by_action   (GtkItemFactory *ifactory,
-						       guint	       action);
-
-void	gtk_item_factory_create_item	(GtkItemFactory		*ifactory,
-					 GtkItemFactoryEntry	*entry,
-					 gpointer		 callback_data,
-					 guint			 callback_type);
-void	gtk_item_factory_create_items	(GtkItemFactory		*ifactory,
-					 guint			 n_entries,
-					 GtkItemFactoryEntry	*entries,
-					 gpointer		 callback_data);
-void	gtk_item_factory_delete_item	(GtkItemFactory		*ifactory,
-					 const gchar		*path);
-void	gtk_item_factory_delete_entry	(GtkItemFactory		*ifactory,
-					 GtkItemFactoryEntry	*entry);
-void	gtk_item_factory_delete_entries	(GtkItemFactory		*ifactory,
-					 guint			 n_entries,
-					 GtkItemFactoryEntry	*entries);
-void	gtk_item_factory_popup		(GtkItemFactory		*ifactory,
-					 guint			 x,
-					 guint			 y,
-					 guint			 mouse_button,
-					 guint32		 time_);
-void	gtk_item_factory_popup_with_data(GtkItemFactory		*ifactory,
-					 gpointer		 popup_data,
-					 GtkDestroyNotify	 destroy,
-					 guint			 x,
-					 guint			 y,
-					 guint			 mouse_button,
-					 guint32		 time_);
-gpointer gtk_item_factory_popup_data	(GtkItemFactory		*ifactory);
-gpointer gtk_item_factory_popup_data_from_widget (GtkWidget	*widget);
-void   gtk_item_factory_set_translate_func (GtkItemFactory      *ifactory,
-					    GtkTranslateFunc     func,
-					    gpointer             data,
-					    GtkDestroyNotify     notify);
-
-/* Compatibility functions for deprecated GtkMenuFactory code
- */
-
-/* Used by gtk_item_factory_create_menu_entries () */
-typedef void (*GtkMenuCallback) (GtkWidget *widget,
-				 gpointer   user_data);
-typedef struct {
-  gchar *path;
-  gchar *accelerator;
-  GtkMenuCallback callback;
-  gpointer callback_data;
-  GtkWidget *widget;
-} GtkMenuEntry;
-
-/* Used by gtk_item_factory_callback_marshal () */
-typedef	void	(*GtkItemFactoryCallback2) (GtkWidget		*widget,
-					    gpointer		 callback_data,
-					    guint		 callback_action);
-
-/* Used by gtk_item_factory_create_items () */
-void	gtk_item_factory_create_items_ac (GtkItemFactory	*ifactory,
-					  guint			 n_entries,
-					  GtkItemFactoryEntry	*entries,
-					  gpointer		 callback_data,
-					  guint			 callback_type);
-
-GtkItemFactory*	gtk_item_factory_from_path   (const gchar       *path);
-void	gtk_item_factory_create_menu_entries (guint		 n_entries,
-					      GtkMenuEntry      *entries);
-void	gtk_item_factories_path_delete	   (const gchar		*ifactory_path,
-					    const gchar		*path);
-
-#endif /* !GTK_DISABLE_DEPRECATED */
-
-
-G_END_DECLS
-
-#endif	/* __GTK_ITEM_FACTORY_H__ */
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtklabel.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtklabel.h
deleted file mode 100644
index 5656ebbf..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtklabel.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_LABEL_H__
-#define __GTK_LABEL_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkmisc.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkmenu.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_LABEL		  (gtk_label_get_type ())
-#define GTK_LABEL(obj)		  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_LABEL, GtkLabel))
-#define GTK_LABEL_CLASS(klass)	  (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_LABEL, GtkLabelClass))
-#define GTK_IS_LABEL(obj)	  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_LABEL))
-#define GTK_IS_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LABEL))
-#define GTK_LABEL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_LABEL, GtkLabelClass))
-       
-
-typedef struct _GtkLabel       GtkLabel;
-typedef struct _GtkLabelClass  GtkLabelClass;
-
-typedef struct _GtkLabelSelectionInfo GtkLabelSelectionInfo;
-
-struct _GtkLabel
-{
-  GtkMisc misc;
-
-  /*< private >*/
-  gchar  *label;
-  guint   jtype            : 2;
-  guint   wrap             : 1;
-  guint   use_underline    : 1;
-  guint   use_markup       : 1;
-  guint   ellipsize        : 3;
-  guint   single_line_mode : 1;
-  guint   have_transform   : 1;
-  guint   in_click         : 1;
-  guint   wrap_mode        : 3;
-  guint   pattern_set      : 1;
-
-  guint   mnemonic_keyval;
-  
-  gchar  *text; 
-  PangoAttrList *attrs;
-  PangoAttrList *effective_attrs;
-  
-  PangoLayout *layout;
-
-  GtkWidget *mnemonic_widget;
-  GtkWindow *mnemonic_window;
-  
-  GtkLabelSelectionInfo *select_info;
-};
-
-struct _GtkLabelClass
-{
-  GtkMiscClass parent_class;
-
-  void (* move_cursor)     (GtkLabel       *label,
-			    GtkMovementStep step,
-			    gint            count,
-			    gboolean        extend_selection);
-  void (* copy_clipboard)  (GtkLabel       *label);
-  
-  /* Hook to customize right-click popup for selectable labels */
-  void (* populate_popup)   (GtkLabel       *label,
-                             GtkMenu        *menu);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType                 gtk_label_get_type          (void) G_GNUC_CONST;
-GtkWidget*            gtk_label_new               (const gchar   *str);
-GtkWidget*            gtk_label_new_with_mnemonic (const gchar   *str);
-void                  gtk_label_set_text          (GtkLabel      *label,
-						   const gchar   *str);
-G_CONST_RETURN gchar* gtk_label_get_text          (GtkLabel      *label);
-void                  gtk_label_set_attributes    (GtkLabel      *label,
-						   PangoAttrList *attrs);
-PangoAttrList        *gtk_label_get_attributes    (GtkLabel      *label);
-void                  gtk_label_set_label         (GtkLabel      *label,
-						   const gchar   *str);
-G_CONST_RETURN gchar *gtk_label_get_label         (GtkLabel      *label);
-void                  gtk_label_set_markup        (GtkLabel      *label,
-						   const gchar   *str);
-void                  gtk_label_set_use_markup    (GtkLabel      *label,
-						   gboolean       setting);
-gboolean              gtk_label_get_use_markup    (GtkLabel      *label);
-void                  gtk_label_set_use_underline (GtkLabel      *label,
-						   gboolean       setting);
-gboolean              gtk_label_get_use_underline (GtkLabel      *label);
-
-void     gtk_label_set_markup_with_mnemonic       (GtkLabel         *label,
-						   const gchar      *str);
-guint    gtk_label_get_mnemonic_keyval            (GtkLabel         *label);
-void     gtk_label_set_mnemonic_widget            (GtkLabel         *label,
-						   GtkWidget        *widget);
-GtkWidget *gtk_label_get_mnemonic_widget          (GtkLabel         *label);
-void     gtk_label_set_text_with_mnemonic         (GtkLabel         *label,
-						   const gchar      *str);
-void     gtk_label_set_justify                    (GtkLabel         *label,
-						   GtkJustification  jtype);
-GtkJustification gtk_label_get_justify            (GtkLabel         *label);
-void     gtk_label_set_ellipsize		  (GtkLabel         *label,
-						   PangoEllipsizeMode mode);
-PangoEllipsizeMode gtk_label_get_ellipsize        (GtkLabel         *label);
-void     gtk_label_set_width_chars		  (GtkLabel         *label,
-						   gint              n_chars);
-gint     gtk_label_get_width_chars                (GtkLabel         *label);
-void     gtk_label_set_max_width_chars    	  (GtkLabel         *label,
-					  	   gint              n_chars);
-gint     gtk_label_get_max_width_chars  	  (GtkLabel         *label);
-void     gtk_label_set_pattern                    (GtkLabel         *label,
-						   const gchar      *pattern);
-void     gtk_label_set_line_wrap                  (GtkLabel         *label,
-						   gboolean          wrap);
-gboolean gtk_label_get_line_wrap                  (GtkLabel         *label);
-void     gtk_label_set_line_wrap_mode             (GtkLabel         *label,
-						   PangoWrapMode     wrap_mode);
-PangoWrapMode gtk_label_get_line_wrap_mode        (GtkLabel         *label);
-void     gtk_label_set_selectable                 (GtkLabel         *label,
-						   gboolean          setting);
-gboolean gtk_label_get_selectable                 (GtkLabel         *label);
-void     gtk_label_set_angle                      (GtkLabel         *label,
-						   gdouble           angle);
-gdouble  gtk_label_get_angle                      (GtkLabel         *label);
-void     gtk_label_select_region                  (GtkLabel         *label,
-						   gint              start_offset,
-						   gint              end_offset);
-gboolean gtk_label_get_selection_bounds           (GtkLabel         *label,
-                                                   gint             *start,
-                                                   gint             *end);
-
-PangoLayout *gtk_label_get_layout         (GtkLabel *label);
-void         gtk_label_get_layout_offsets (GtkLabel *label,
-                                           gint     *x,
-                                           gint     *y);
-
-void         gtk_label_set_single_line_mode  (GtkLabel *label,
-                                              gboolean single_line_mode);
-gboolean     gtk_label_get_single_line_mode  (GtkLabel *label);
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-#define  gtk_label_set           gtk_label_set_text
-void       gtk_label_get           (GtkLabel          *label,
-                                    gchar            **str);
-
-/* Convenience function to set the name and pattern by parsing
- * a string with embedded underscores, and return the appropriate
- * key symbol for the accelerator.
- */
-guint gtk_label_parse_uline            (GtkLabel    *label,
-					const gchar *string);
-
-#endif /* GTK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GTK_LABEL_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtklayout.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtklayout.h
deleted file mode 100644
index ffd8b45d..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtklayout.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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.
- *
- * GtkLayout: Widget for scrolling of arbitrary-sized areas.
- *
- * Copyright Owen Taylor, 1998
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_LAYOUT_H__
-#define __GTK_LAYOUT_H__
-
-#include <gdk/gdk.h>
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtkadjustment.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_LAYOUT            (gtk_layout_get_type ())
-#define GTK_LAYOUT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_LAYOUT, GtkLayout))
-#define GTK_LAYOUT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_LAYOUT, GtkLayoutClass))
-#define GTK_IS_LAYOUT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_LAYOUT))
-#define GTK_IS_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LAYOUT))
-#define GTK_LAYOUT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_LAYOUT, GtkLayoutClass))
-
-
-typedef struct _GtkLayout        GtkLayout;
-typedef struct _GtkLayoutClass   GtkLayoutClass;
-
-struct _GtkLayout
-{
-  GtkContainer container;
-
-  GList *children;
-
-  guint width;
-  guint height;
-
-  GtkAdjustment *hadjustment;
-  GtkAdjustment *vadjustment;
-
-  /*< public >*/
-  GdkWindow *bin_window;
-
-  /*< private >*/
-  GdkVisibilityState visibility;
-  gint scroll_x;
-  gint scroll_y;
-
-  guint freeze_count;
-};
-
-struct _GtkLayoutClass
-{
-  GtkContainerClass parent_class;
-
-  void  (*set_scroll_adjustments)   (GtkLayout	    *layout,
-				     GtkAdjustment  *hadjustment,
-				     GtkAdjustment  *vadjustment);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType          gtk_layout_get_type        (void) G_GNUC_CONST;
-GtkWidget*     gtk_layout_new             (GtkAdjustment *hadjustment,
-				           GtkAdjustment *vadjustment);
-void           gtk_layout_put             (GtkLayout     *layout, 
-		                           GtkWidget     *child_widget, 
-		                           gint           x, 
-		                           gint           y);
-  
-void           gtk_layout_move            (GtkLayout     *layout, 
-		                           GtkWidget     *child_widget, 
-		                           gint           x, 
-		                           gint           y);
-  
-void           gtk_layout_set_size        (GtkLayout     *layout, 
-			                   guint          width,
-			                   guint          height);
-void           gtk_layout_get_size        (GtkLayout     *layout,
-					   guint         *width,
-					   guint         *height);
-
-GtkAdjustment* gtk_layout_get_hadjustment (GtkLayout     *layout);
-GtkAdjustment* gtk_layout_get_vadjustment (GtkLayout     *layout);
-void           gtk_layout_set_hadjustment (GtkLayout     *layout,
-					   GtkAdjustment *adjustment);
-void           gtk_layout_set_vadjustment (GtkLayout     *layout,
-					   GtkAdjustment *adjustment);
-
-
-#ifndef GTK_DISABLE_DEPRECATED
-/* These disable and enable moving and repainting the scrolling window
- * of the GtkLayout, respectively.  If you want to update the layout's
- * offsets but do not want it to repaint itself, you should use these
- * functions.
- *
- * - I don't understand these are supposed to work, so I suspect
- * - they don't now.                    OWT 1/20/98
- */
-void           gtk_layout_freeze          (GtkLayout     *layout);
-void           gtk_layout_thaw            (GtkLayout     *layout);
-#endif /* GTK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GTK_LAYOUT_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtklinkbutton.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtklinkbutton.h
deleted file mode 100644
index 24e79b46..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtklinkbutton.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtklinkbutton.h - an hyperlink-enabled button
- * 
- * Copyright (C) 2005 Emmanuele Bassi <ebassi@gmail.com>
- * All rights reserved.
- *
- * Based on gnome-href code by:
- * 	James Henstridge <james@daa.com.au>
- * 
- * 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, Cambridge, MA 02139, USA.
- */
-
-#ifndef __GTK_LINK_BUTTON_H__
-#define __GTK_LINK_BUTTON_H__
-
-#include <glib.h>
-#include <gtk/gtkbutton.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_LINK_BUTTON		(gtk_link_button_get_type ())
-#define GTK_LINK_BUTTON(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_LINK_BUTTON, GtkLinkButton))
-#define GTK_IS_LINK_BUTTON(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_LINK_BUTTON))
-#define GTK_LINK_BUTTON_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_LINK_BUTTON, GtkLinkButtonClass))
-#define GTK_IS_LINK_BUTTON_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LINK_BUTTON))
-#define GTK_LINK_BUTTON_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_LINK_BUTTON, GtkLinkButtonClass))
-
-typedef struct _GtkLinkButton		GtkLinkButton;
-typedef struct _GtkLinkButtonClass	GtkLinkButtonClass;
-typedef struct _GtkLinkButtonPrivate	GtkLinkButtonPrivate;
-
-typedef void (*GtkLinkButtonUriFunc) (GtkLinkButton *button,
-				      const gchar   *link_,
-				      gpointer       user_data);
-
-struct _GtkLinkButton
-{
-  GtkButton parent_instance;
-  
-  GtkLinkButtonPrivate *priv;
-};
-
-struct _GtkLinkButtonClass
-{
-  GtkButtonClass parent_class;
-  
-  void (*_gtk_padding1) (void);
-  void (*_gtk_padding2) (void);
-  void (*_gtk_padding3) (void);
-  void (*_gtk_padding4) (void);
-};
-
-GType                 gtk_link_button_get_type          (void) G_GNUC_CONST;
-
-GtkWidget *           gtk_link_button_new               (const gchar   *uri);
-GtkWidget *           gtk_link_button_new_with_label    (const gchar   *uri,
-						         const gchar   *label);
-
-G_CONST_RETURN gchar *gtk_link_button_get_uri           (GtkLinkButton *link_button);
-void                  gtk_link_button_set_uri           (GtkLinkButton *link_button,
-						         const gchar   *uri);
-
-GtkLinkButtonUriFunc  gtk_link_button_set_uri_hook      (GtkLinkButtonUriFunc func,
-							 gpointer             data,
-							 GDestroyNotify       destroy);
-
-G_END_DECLS
-
-#endif /* __GTK_LINK_BUTTON_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtklist.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtklist.h
deleted file mode 100644
index 4023f2e7..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtklist.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-#ifndef __GTK_LIST_H__
-#define __GTK_LIST_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkenums.h>
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtklistitem.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_LIST                  (gtk_list_get_type ())
-#define GTK_LIST(obj)                  (GTK_CHECK_CAST ((obj), GTK_TYPE_LIST, GtkList))
-#define GTK_LIST_CLASS(klass)          (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_LIST, GtkListClass))
-#define GTK_IS_LIST(obj)               (GTK_CHECK_TYPE ((obj), GTK_TYPE_LIST))
-#define GTK_IS_LIST_CLASS(klass)       (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LIST))
-#define GTK_LIST_GET_CLASS(obj)        (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_LIST, GtkListClass))
-
-
-typedef struct _GtkList	      GtkList;
-typedef struct _GtkListClass  GtkListClass;
-
-struct _GtkList
-{
-  GtkContainer container;
-
-  GList *children;
-  GList *selection;
-
-  GList *undo_selection;
-  GList *undo_unselection;
-
-  GtkWidget *last_focus_child;
-  GtkWidget *undo_focus_child;
-
-  guint htimer;
-  guint vtimer;
-
-  gint anchor;
-  gint drag_pos;
-  GtkStateType anchor_state;
-
-  guint selection_mode : 2;
-  guint drag_selection:1;
-  guint add_mode:1;
-};
-
-struct _GtkListClass
-{
-  GtkContainerClass parent_class;
-
-  void (* selection_changed) (GtkList	*list);
-  void (* select_child)	     (GtkList	*list,
-			      GtkWidget *child);
-  void (* unselect_child)    (GtkList	*list,
-			      GtkWidget *child);
-};
-
-
-GtkType	   gtk_list_get_type		  (void) G_GNUC_CONST;
-GtkWidget* gtk_list_new			  (void);
-void	   gtk_list_insert_items	  (GtkList	    *list,
-					   GList	    *items,
-					   gint		     position);
-void	   gtk_list_append_items	  (GtkList	    *list,
-					   GList	    *items);
-void	   gtk_list_prepend_items	  (GtkList	    *list,
-					   GList	    *items);
-void	   gtk_list_remove_items	  (GtkList	    *list,
-					   GList	    *items);
-void	   gtk_list_remove_items_no_unref (GtkList	    *list,
-					   GList	    *items);
-void	   gtk_list_clear_items		  (GtkList	    *list,
-					   gint		     start,
-					   gint		     end);
-void	   gtk_list_select_item		  (GtkList	    *list,
-					   gint		     item);
-void	   gtk_list_unselect_item	  (GtkList	    *list,
-					   gint		     item);
-void	   gtk_list_select_child	  (GtkList	    *list,
-					   GtkWidget	    *child);
-void	   gtk_list_unselect_child	  (GtkList	    *list,
-					   GtkWidget	    *child);
-gint	   gtk_list_child_position	  (GtkList	    *list,
-					   GtkWidget	    *child);
-void	   gtk_list_set_selection_mode	  (GtkList	    *list,
-					   GtkSelectionMode  mode);
-
-void       gtk_list_extend_selection      (GtkList          *list,
-					   GtkScrollType     scroll_type,
-					   gfloat            position,
-					   gboolean          auto_start_selection);
-void       gtk_list_start_selection       (GtkList          *list);
-void       gtk_list_end_selection         (GtkList          *list);
-void       gtk_list_select_all            (GtkList          *list);
-void       gtk_list_unselect_all          (GtkList          *list);
-void       gtk_list_scroll_horizontal     (GtkList          *list,
-					   GtkScrollType     scroll_type,
-					   gfloat            position);
-void       gtk_list_scroll_vertical       (GtkList          *list,
-					   GtkScrollType     scroll_type,
-					   gfloat            position);
-void       gtk_list_toggle_add_mode       (GtkList          *list);
-void       gtk_list_toggle_focus_row      (GtkList          *list);
-void       gtk_list_toggle_row            (GtkList          *list,
-					   GtkWidget        *item);
-void       gtk_list_undo_selection        (GtkList          *list);
-void       gtk_list_end_drag_selection    (GtkList          *list);
-
-G_END_DECLS
-
-#endif /* __GTK_LIST_H__ */
-
-#endif /* GTK_DISABLE_DEPRECATED */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtklistitem.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtklistitem.h
deleted file mode 100644
index 9738bce4..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtklistitem.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-#ifndef __GTK_LIST_ITEM_H__
-#define __GTK_LIST_ITEM_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkitem.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_LIST_ITEM              (gtk_list_item_get_type ())
-#define GTK_LIST_ITEM(obj)              (GTK_CHECK_CAST ((obj), GTK_TYPE_LIST_ITEM, GtkListItem))
-#define GTK_LIST_ITEM_CLASS(klass)      (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_LIST_ITEM, GtkListItemClass))
-#define GTK_IS_LIST_ITEM(obj)           (GTK_CHECK_TYPE ((obj), GTK_TYPE_LIST_ITEM))
-#define GTK_IS_LIST_ITEM_CLASS(klass)   (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LIST_ITEM))
-#define GTK_LIST_ITEM_GET_CLASS(obj)    (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_LIST_ITEM, GtkListItemClass))
-
-
-typedef struct _GtkListItem       GtkListItem;
-typedef struct _GtkListItemClass  GtkListItemClass;
-
-struct _GtkListItem
-{
-  GtkItem item;
-};
-
-struct _GtkListItemClass
-{
-  GtkItemClass parent_class;
-
-  void (*toggle_focus_row)  (GtkListItem   *list_item);
-  void (*select_all)        (GtkListItem   *list_item);
-  void (*unselect_all)      (GtkListItem   *list_item);
-  void (*undo_selection)    (GtkListItem   *list_item);
-  void (*start_selection)   (GtkListItem   *list_item);
-  void (*end_selection)     (GtkListItem   *list_item);
-  void (*extend_selection)  (GtkListItem   *list_item,
-			     GtkScrollType  scroll_type,
-			     gfloat         position,
-			     gboolean       auto_start_selection);
-  void (*scroll_horizontal) (GtkListItem   *list_item,
-			     GtkScrollType  scroll_type,
-			     gfloat         position);
-  void (*scroll_vertical)   (GtkListItem   *list_item,
-			     GtkScrollType  scroll_type,
-			     gfloat         position);
-  void (*toggle_add_mode)   (GtkListItem   *list_item);
-};
-
-
-GtkType    gtk_list_item_get_type       (void) G_GNUC_CONST;
-GtkWidget* gtk_list_item_new            (void);
-GtkWidget* gtk_list_item_new_with_label (const gchar      *label);
-void       gtk_list_item_select         (GtkListItem      *list_item);
-void       gtk_list_item_deselect       (GtkListItem      *list_item);
-
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_LIST_ITEM_H__ */
-
-#endif /* GTK_DISABLE_DEPRECATED */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkliststore.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkliststore.h
deleted file mode 100644
index 9aeb81b3..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkliststore.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/* gtkliststore.h
- * Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb@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 __GTK_LIST_STORE_H__
-#define __GTK_LIST_STORE_H__
-
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreesortable.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_LIST_STORE	       (gtk_list_store_get_type ())
-#define GTK_LIST_STORE(obj)	       (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_LIST_STORE, GtkListStore))
-#define GTK_LIST_STORE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_LIST_STORE, GtkListStoreClass))
-#define GTK_IS_LIST_STORE(obj)	       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_LIST_STORE))
-#define GTK_IS_LIST_STORE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LIST_STORE))
-#define GTK_LIST_STORE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_LIST_STORE, GtkListStoreClass))
-
-typedef struct _GtkListStore       GtkListStore;
-typedef struct _GtkListStoreClass  GtkListStoreClass;
-
-struct _GtkListStore
-{
-  GObject parent;
-
-  /*< private >*/
-  gint stamp;
-  gpointer seq;		/* head of the list */
-  gpointer _gtk_reserved1;
-  GList *sort_list;	
-  gint n_columns;
-  gint sort_column_id;
-  GtkSortType order;
-  GType *column_headers;
-  gint length;
-  GtkTreeIterCompareFunc default_sort_func;
-  gpointer default_sort_data;
-  GtkDestroyNotify default_sort_destroy;
-  guint columns_dirty : 1;
-};
-
-struct _GtkListStoreClass
-{
-  GObjectClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType         gtk_list_store_get_type         (void) G_GNUC_CONST;
-GtkListStore *gtk_list_store_new              (gint          n_columns,
-					       ...);
-GtkListStore *gtk_list_store_newv             (gint          n_columns,
-					       GType        *types);
-void          gtk_list_store_set_column_types (GtkListStore *list_store,
-					       gint          n_columns,
-					       GType        *types);
-
-/* NOTE: use gtk_tree_model_get to get values from a GtkListStore */
-
-void          gtk_list_store_set_value        (GtkListStore *list_store,
-					       GtkTreeIter  *iter,
-					       gint          column,
-					       GValue       *value);
-void          gtk_list_store_set              (GtkListStore *list_store,
-					       GtkTreeIter  *iter,
-					       ...);
-void          gtk_list_store_set_valuesv      (GtkListStore *list_store,
-					       GtkTreeIter  *iter,
-					       gint         *columns, 
-					       GValue       *values,
-					       gint          n_values);
-void          gtk_list_store_set_valist       (GtkListStore *list_store,
-					       GtkTreeIter  *iter,
-					       va_list       var_args);
-gboolean      gtk_list_store_remove           (GtkListStore *list_store,
-					       GtkTreeIter  *iter);
-void          gtk_list_store_insert           (GtkListStore *list_store,
-					       GtkTreeIter  *iter,
-					       gint          position);
-void          gtk_list_store_insert_before    (GtkListStore *list_store,
-					       GtkTreeIter  *iter,
-					       GtkTreeIter  *sibling);
-void          gtk_list_store_insert_after     (GtkListStore *list_store,
-					       GtkTreeIter  *iter,
-					       GtkTreeIter  *sibling);
-void          gtk_list_store_insert_with_values  (GtkListStore *list_store,
-						  GtkTreeIter  *iter,
-						  gint          position,
-						  ...);
-void          gtk_list_store_insert_with_valuesv (GtkListStore *list_store,
-						  GtkTreeIter  *iter,
-						  gint          position,
-						  gint         *columns, 
-						  GValue       *values,
-						  gint          n_values);
-void          gtk_list_store_prepend          (GtkListStore *list_store,
-					       GtkTreeIter  *iter);
-void          gtk_list_store_append           (GtkListStore *list_store,
-					       GtkTreeIter  *iter);
-void          gtk_list_store_clear            (GtkListStore *list_store);
-gboolean      gtk_list_store_iter_is_valid    (GtkListStore *list_store,
-                                               GtkTreeIter  *iter);
-void          gtk_list_store_reorder          (GtkListStore *store,
-                                               gint         *new_order);
-void          gtk_list_store_swap             (GtkListStore *store,
-                                               GtkTreeIter  *a,
-                                               GtkTreeIter  *b);
-void          gtk_list_store_move_after       (GtkListStore *store,
-                                               GtkTreeIter  *iter,
-                                               GtkTreeIter  *position);
-void          gtk_list_store_move_before      (GtkListStore *store,
-                                               GtkTreeIter  *iter,
-                                               GtkTreeIter  *position);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_LIST_STORE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmain.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmain.h
deleted file mode 100644
index 15d08cbe..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmain.h
+++ /dev/null
@@ -1,226 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_MAIN_H__
-#define __GTK_MAIN_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkwidget.h>
-#ifdef G_PLATFORM_WIN32
-#include <gtk/gtkbox.h>
-#include <gtk/gtkwindow.h>
-#endif
-
-G_BEGIN_DECLS
-
-/* Priorities for redrawing and resizing
- */
-#define GTK_PRIORITY_RESIZE     (G_PRIORITY_HIGH_IDLE + 10)
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-/* Use GDK_PRIORITY_REDRAW */
-#define GTK_PRIORITY_REDRAW     (G_PRIORITY_HIGH_IDLE + 20)
-
-/* Deprecated. Use G_PRIORITY #define's instead
- */
-#define GTK_PRIORITY_HIGH       G_PRIORITY_HIGH
-#define GTK_PRIORITY_INTERNAL   GTK_PRIORITY_REDRAW
-#define GTK_PRIORITY_DEFAULT	G_PRIORITY_DEFAULT_IDLE
-#define GTK_PRIORITY_LOW	G_PRIORITY_LOW
-
-#endif /* GTK_DISABLE_DEPRECATED */
-
-typedef gint	(*GtkKeySnoopFunc)	    (GtkWidget	  *grab_widget,
-					     GdkEventKey  *event,
-					     gpointer	   func_data);
-
-/* Gtk version.
- */
-#ifdef G_PLATFORM_WIN32
-#ifdef GTK_COMPILATION
-#define GTKMAIN_C_VAR __declspec(dllexport)
-#else
-#define GTKMAIN_C_VAR extern __declspec(dllimport)
-#endif
-#else
-#define GTKMAIN_C_VAR extern
-#endif
-
-GTKMAIN_C_VAR const guint gtk_major_version;
-GTKMAIN_C_VAR const guint gtk_minor_version;
-GTKMAIN_C_VAR const guint gtk_micro_version;
-GTKMAIN_C_VAR const guint gtk_binary_age;
-GTKMAIN_C_VAR const guint gtk_interface_age;
-const gchar* gtk_check_version (guint	required_major,
-			        guint	required_minor,
-			        guint	required_micro);
-
-
-/* Initialization, exit, mainloop and miscellaneous routines
- */
-
-gboolean gtk_parse_args           (int    *argc,
-				   char ***argv);
-
-void     gtk_init                 (int    *argc,
-                                   char ***argv);
-
-gboolean gtk_init_check           (int    *argc,
-                                   char ***argv);
-  
-gboolean gtk_init_with_args       (int            *argc,
-				   char         ***argv,
-				   char           *parameter_string,
-				   GOptionEntry   *entries,
-				   char           *translation_domain,
-				   GError        **error);
-
-GOptionGroup *gtk_get_option_group (gboolean open_default_display);
-  
-#ifdef G_PLATFORM_WIN32
-
-/* Variants that are used to check for correct struct packing
- * when building GTK+-using code.
- */
-void	 gtk_init_abi_check       (int	  *argc,
-				   char	***argv,
-				   int     num_checks,
-				   size_t  sizeof_GtkWindow,
-				   size_t  sizeof_GtkBox);
-gboolean gtk_init_check_abi_check (int	  *argc,
-				   char	***argv,
-				   int     num_checks,
-				   size_t  sizeof_GtkWindow,
-				   size_t  sizeof_GtkBox);
-
-#define gtk_init(argc, argv) gtk_init_abi_check (argc, argv, 2, sizeof (GtkWindow), sizeof (GtkBox))
-#define gtk_init_check(argc, argv) gtk_init_check_abi_check (argc, argv, 2, sizeof (GtkWindow), sizeof (GtkBox))
-
-#endif
-
-#ifndef GTK_DISABLE_DEPRECATED
-void     gtk_exit                 (gint    error_code);
-#endif /* GTK_DISABLE_DEPRECATED */
-
-void           gtk_disable_setlocale    (void);
-gchar *        gtk_set_locale           (void);
-PangoLanguage *gtk_get_default_language (void);
-gboolean       gtk_events_pending       (void);
-
-/* The following is the event func GTK+ registers with GDK
- * we expose it mainly to allow filtering of events between
- * GDK and GTK+.
- */
-void 	   gtk_main_do_event	   (GdkEvent           *event);
-
-void	   gtk_main		   (void);
-guint	   gtk_main_level	   (void);
-void	   gtk_main_quit	   (void);
-gboolean   gtk_main_iteration	   (void);
-/* gtk_main_iteration() calls gtk_main_iteration_do(TRUE) */
-gboolean   gtk_main_iteration_do   (gboolean blocking);
-
-gboolean   gtk_true		   (void) G_GNUC_CONST;
-gboolean   gtk_false		   (void) G_GNUC_CONST;
-
-void	   gtk_grab_add		   (GtkWidget	       *widget);
-GtkWidget* gtk_grab_get_current	   (void);
-void	   gtk_grab_remove	   (GtkWidget	       *widget);
-
-void	   gtk_init_add		   (GtkFunction	       function,
-				    gpointer	       data);
-void	   gtk_quit_add_destroy	   (guint	       main_level,
-				    GtkObject	      *object);
-guint	   gtk_quit_add		   (guint	       main_level,
-				    GtkFunction	       function,
-				    gpointer	       data);
-guint	   gtk_quit_add_full	   (guint	       main_level,
-				    GtkFunction	       function,
-				    GtkCallbackMarshal marshal,
-				    gpointer	       data,
-				    GtkDestroyNotify   destroy);
-void	   gtk_quit_remove	   (guint	       quit_handler_id);
-void	   gtk_quit_remove_by_data (gpointer	       data);
-#ifndef GTK_DISABLE_DEPRECATED
-guint	   gtk_timeout_add	   (guint32	       interval,
-				    GtkFunction	       function,
-				    gpointer	       data);
-guint	   gtk_timeout_add_full	   (guint32	       interval,
-				    GtkFunction	       function,
-				    GtkCallbackMarshal marshal,
-				    gpointer	       data,
-				    GtkDestroyNotify   destroy);
-void	   gtk_timeout_remove	   (guint	       timeout_handler_id);
-
-guint	   gtk_idle_add		   (GtkFunction	       function,
-				    gpointer	       data);
-guint	   gtk_idle_add_priority   (gint	       priority,
-				    GtkFunction	       function,
-				    gpointer	       data);
-guint	   gtk_idle_add_full	   (gint	       priority,
-				    GtkFunction	       function,
-				    GtkCallbackMarshal marshal,
-				    gpointer	       data,
-				    GtkDestroyNotify   destroy);
-void	   gtk_idle_remove	   (guint	       idle_handler_id);
-void	   gtk_idle_remove_by_data (gpointer	       data);
-guint	   gtk_input_add_full	   (gint	       source,
-				    GdkInputCondition  condition,
-				    GdkInputFunction   function,
-				    GtkCallbackMarshal marshal,
-				    gpointer	       data,
-				    GtkDestroyNotify   destroy);
-void	   gtk_input_remove	   (guint	       input_handler_id);
-#endif /* GTK_DISABLE_DEPRECATED */
-
-guint	   gtk_key_snooper_install (GtkKeySnoopFunc snooper,
-				    gpointer	    func_data);
-void	   gtk_key_snooper_remove  (guint	    snooper_handler_id);
-
-GdkEvent*       gtk_get_current_event       (void);
-guint32         gtk_get_current_event_time  (void);
-gboolean        gtk_get_current_event_state (GdkModifierType *state);
-
-GtkWidget* gtk_get_event_widget	   (GdkEvent	   *event);
-
-
-/* Private routines internal to GTK+ 
- */
-void       gtk_propagate_event     (GtkWidget         *widget,
-				    GdkEvent          *event);
-
-gboolean _gtk_boolean_handled_accumulator (GSignalInvocationHint *ihint,
-                                   GValue                *return_accu,
-                                   const GValue          *handler_return,
-                                   gpointer               dummy);
-
-gchar *_gtk_get_lc_ctype (void);
-
-G_END_DECLS
-
-#endif /* __GTK_MAIN_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmarshal.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmarshal.h
deleted file mode 100644
index 4f46f42b..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmarshal.h
+++ /dev/null
@@ -1,283 +0,0 @@
-#ifndef GTK_DISABLE_DEPRECATED
-
-#ifndef __gtk_marshal_MARSHAL_H__
-#define __gtk_marshal_MARSHAL_H__
-
-#include	<glib-object.h>
-
-G_BEGIN_DECLS
-
-/* BOOL:NONE (/tmp/buildd/gtk+2.0-2.12.12/gtk/gtkmarshal.list:1) */
-extern void gtk_marshal_BOOLEAN__VOID (GClosure     *closure,
-                                       GValue       *return_value,
-                                       guint         n_param_values,
-                                       const GValue *param_values,
-                                       gpointer      invocation_hint,
-                                       gpointer      marshal_data);
-#define gtk_marshal_BOOL__NONE	gtk_marshal_BOOLEAN__VOID
-
-/* BOOL:POINTER (/tmp/buildd/gtk+2.0-2.12.12/gtk/gtkmarshal.list:2) */
-extern void gtk_marshal_BOOLEAN__POINTER (GClosure     *closure,
-                                          GValue       *return_value,
-                                          guint         n_param_values,
-                                          const GValue *param_values,
-                                          gpointer      invocation_hint,
-                                          gpointer      marshal_data);
-#define gtk_marshal_BOOL__POINTER	gtk_marshal_BOOLEAN__POINTER
-
-/* BOOL:POINTER,POINTER,INT,INT (/tmp/buildd/gtk+2.0-2.12.12/gtk/gtkmarshal.list:3) */
-extern void gtk_marshal_BOOLEAN__POINTER_POINTER_INT_INT (GClosure     *closure,
-                                                          GValue       *return_value,
-                                                          guint         n_param_values,
-                                                          const GValue *param_values,
-                                                          gpointer      invocation_hint,
-                                                          gpointer      marshal_data);
-#define gtk_marshal_BOOL__POINTER_POINTER_INT_INT	gtk_marshal_BOOLEAN__POINTER_POINTER_INT_INT
-
-/* BOOL:POINTER,INT,INT (/tmp/buildd/gtk+2.0-2.12.12/gtk/gtkmarshal.list:4) */
-extern void gtk_marshal_BOOLEAN__POINTER_INT_INT (GClosure     *closure,
-                                                  GValue       *return_value,
-                                                  guint         n_param_values,
-                                                  const GValue *param_values,
-                                                  gpointer      invocation_hint,
-                                                  gpointer      marshal_data);
-#define gtk_marshal_BOOL__POINTER_INT_INT	gtk_marshal_BOOLEAN__POINTER_INT_INT
-
-/* BOOL:POINTER,INT,INT,UINT (/tmp/buildd/gtk+2.0-2.12.12/gtk/gtkmarshal.list:5) */
-extern void gtk_marshal_BOOLEAN__POINTER_INT_INT_UINT (GClosure     *closure,
-                                                       GValue       *return_value,
-                                                       guint         n_param_values,
-                                                       const GValue *param_values,
-                                                       gpointer      invocation_hint,
-                                                       gpointer      marshal_data);
-#define gtk_marshal_BOOL__POINTER_INT_INT_UINT	gtk_marshal_BOOLEAN__POINTER_INT_INT_UINT
-
-/* BOOL:POINTER,STRING,STRING,POINTER (/tmp/buildd/gtk+2.0-2.12.12/gtk/gtkmarshal.list:6) */
-extern void gtk_marshal_BOOLEAN__POINTER_STRING_STRING_POINTER (GClosure     *closure,
-                                                                GValue       *return_value,
-                                                                guint         n_param_values,
-                                                                const GValue *param_values,
-                                                                gpointer      invocation_hint,
-                                                                gpointer      marshal_data);
-#define gtk_marshal_BOOL__POINTER_STRING_STRING_POINTER	gtk_marshal_BOOLEAN__POINTER_STRING_STRING_POINTER
-
-/* ENUM:ENUM (/tmp/buildd/gtk+2.0-2.12.12/gtk/gtkmarshal.list:7) */
-extern void gtk_marshal_ENUM__ENUM (GClosure     *closure,
-                                    GValue       *return_value,
-                                    guint         n_param_values,
-                                    const GValue *param_values,
-                                    gpointer      invocation_hint,
-                                    gpointer      marshal_data);
-
-/* INT:POINTER (/tmp/buildd/gtk+2.0-2.12.12/gtk/gtkmarshal.list:8) */
-extern void gtk_marshal_INT__POINTER (GClosure     *closure,
-                                      GValue       *return_value,
-                                      guint         n_param_values,
-                                      const GValue *param_values,
-                                      gpointer      invocation_hint,
-                                      gpointer      marshal_data);
-
-/* INT:POINTER,CHAR,CHAR (/tmp/buildd/gtk+2.0-2.12.12/gtk/gtkmarshal.list:9) */
-extern void gtk_marshal_INT__POINTER_CHAR_CHAR (GClosure     *closure,
-                                                GValue       *return_value,
-                                                guint         n_param_values,
-                                                const GValue *param_values,
-                                                gpointer      invocation_hint,
-                                                gpointer      marshal_data);
-
-/* NONE:BOOL (/tmp/buildd/gtk+2.0-2.12.12/gtk/gtkmarshal.list:10) */
-#define gtk_marshal_VOID__BOOLEAN	g_cclosure_marshal_VOID__BOOLEAN
-#define gtk_marshal_NONE__BOOL	gtk_marshal_VOID__BOOLEAN
-
-/* NONE:BOXED (/tmp/buildd/gtk+2.0-2.12.12/gtk/gtkmarshal.list:11) */
-#define gtk_marshal_VOID__BOXED	g_cclosure_marshal_VOID__BOXED
-#define gtk_marshal_NONE__BOXED	gtk_marshal_VOID__BOXED
-
-/* NONE:ENUM (/tmp/buildd/gtk+2.0-2.12.12/gtk/gtkmarshal.list:12) */
-#define gtk_marshal_VOID__ENUM	g_cclosure_marshal_VOID__ENUM
-#define gtk_marshal_NONE__ENUM	gtk_marshal_VOID__ENUM
-
-/* NONE:ENUM,FLOAT (/tmp/buildd/gtk+2.0-2.12.12/gtk/gtkmarshal.list:13) */
-extern void gtk_marshal_VOID__ENUM_FLOAT (GClosure     *closure,
-                                          GValue       *return_value,
-                                          guint         n_param_values,
-                                          const GValue *param_values,
-                                          gpointer      invocation_hint,
-                                          gpointer      marshal_data);
-#define gtk_marshal_NONE__ENUM_FLOAT	gtk_marshal_VOID__ENUM_FLOAT
-
-/* NONE:ENUM,FLOAT,BOOL (/tmp/buildd/gtk+2.0-2.12.12/gtk/gtkmarshal.list:14) */
-extern void gtk_marshal_VOID__ENUM_FLOAT_BOOLEAN (GClosure     *closure,
-                                                  GValue       *return_value,
-                                                  guint         n_param_values,
-                                                  const GValue *param_values,
-                                                  gpointer      invocation_hint,
-                                                  gpointer      marshal_data);
-#define gtk_marshal_NONE__ENUM_FLOAT_BOOL	gtk_marshal_VOID__ENUM_FLOAT_BOOLEAN
-
-/* NONE:INT (/tmp/buildd/gtk+2.0-2.12.12/gtk/gtkmarshal.list:15) */
-#define gtk_marshal_VOID__INT	g_cclosure_marshal_VOID__INT
-#define gtk_marshal_NONE__INT	gtk_marshal_VOID__INT
-
-/* NONE:INT,INT (/tmp/buildd/gtk+2.0-2.12.12/gtk/gtkmarshal.list:16) */
-extern void gtk_marshal_VOID__INT_INT (GClosure     *closure,
-                                       GValue       *return_value,
-                                       guint         n_param_values,
-                                       const GValue *param_values,
-                                       gpointer      invocation_hint,
-                                       gpointer      marshal_data);
-#define gtk_marshal_NONE__INT_INT	gtk_marshal_VOID__INT_INT
-
-/* NONE:INT,INT,POINTER (/tmp/buildd/gtk+2.0-2.12.12/gtk/gtkmarshal.list:17) */
-extern void gtk_marshal_VOID__INT_INT_POINTER (GClosure     *closure,
-                                               GValue       *return_value,
-                                               guint         n_param_values,
-                                               const GValue *param_values,
-                                               gpointer      invocation_hint,
-                                               gpointer      marshal_data);
-#define gtk_marshal_NONE__INT_INT_POINTER	gtk_marshal_VOID__INT_INT_POINTER
-
-/* NONE:NONE (/tmp/buildd/gtk+2.0-2.12.12/gtk/gtkmarshal.list:18) */
-#define gtk_marshal_VOID__VOID	g_cclosure_marshal_VOID__VOID
-#define gtk_marshal_NONE__NONE	gtk_marshal_VOID__VOID
-
-/* NONE:OBJECT (/tmp/buildd/gtk+2.0-2.12.12/gtk/gtkmarshal.list:19) */
-#define gtk_marshal_VOID__OBJECT	g_cclosure_marshal_VOID__OBJECT
-#define gtk_marshal_NONE__OBJECT	gtk_marshal_VOID__OBJECT
-
-/* NONE:POINTER (/tmp/buildd/gtk+2.0-2.12.12/gtk/gtkmarshal.list:20) */
-#define gtk_marshal_VOID__POINTER	g_cclosure_marshal_VOID__POINTER
-#define gtk_marshal_NONE__POINTER	gtk_marshal_VOID__POINTER
-
-/* NONE:POINTER,INT (/tmp/buildd/gtk+2.0-2.12.12/gtk/gtkmarshal.list:21) */
-extern void gtk_marshal_VOID__POINTER_INT (GClosure     *closure,
-                                           GValue       *return_value,
-                                           guint         n_param_values,
-                                           const GValue *param_values,
-                                           gpointer      invocation_hint,
-                                           gpointer      marshal_data);
-#define gtk_marshal_NONE__POINTER_INT	gtk_marshal_VOID__POINTER_INT
-
-/* NONE:POINTER,POINTER (/tmp/buildd/gtk+2.0-2.12.12/gtk/gtkmarshal.list:22) */
-extern void gtk_marshal_VOID__POINTER_POINTER (GClosure     *closure,
-                                               GValue       *return_value,
-                                               guint         n_param_values,
-                                               const GValue *param_values,
-                                               gpointer      invocation_hint,
-                                               gpointer      marshal_data);
-#define gtk_marshal_NONE__POINTER_POINTER	gtk_marshal_VOID__POINTER_POINTER
-
-/* NONE:POINTER,POINTER,POINTER (/tmp/buildd/gtk+2.0-2.12.12/gtk/gtkmarshal.list:23) */
-extern void gtk_marshal_VOID__POINTER_POINTER_POINTER (GClosure     *closure,
-                                                       GValue       *return_value,
-                                                       guint         n_param_values,
-                                                       const GValue *param_values,
-                                                       gpointer      invocation_hint,
-                                                       gpointer      marshal_data);
-#define gtk_marshal_NONE__POINTER_POINTER_POINTER	gtk_marshal_VOID__POINTER_POINTER_POINTER
-
-/* NONE:POINTER,STRING,STRING (/tmp/buildd/gtk+2.0-2.12.12/gtk/gtkmarshal.list:24) */
-extern void gtk_marshal_VOID__POINTER_STRING_STRING (GClosure     *closure,
-                                                     GValue       *return_value,
-                                                     guint         n_param_values,
-                                                     const GValue *param_values,
-                                                     gpointer      invocation_hint,
-                                                     gpointer      marshal_data);
-#define gtk_marshal_NONE__POINTER_STRING_STRING	gtk_marshal_VOID__POINTER_STRING_STRING
-
-/* NONE:POINTER,UINT (/tmp/buildd/gtk+2.0-2.12.12/gtk/gtkmarshal.list:25) */
-extern void gtk_marshal_VOID__POINTER_UINT (GClosure     *closure,
-                                            GValue       *return_value,
-                                            guint         n_param_values,
-                                            const GValue *param_values,
-                                            gpointer      invocation_hint,
-                                            gpointer      marshal_data);
-#define gtk_marshal_NONE__POINTER_UINT	gtk_marshal_VOID__POINTER_UINT
-
-/* NONE:POINTER,UINT,ENUM (/tmp/buildd/gtk+2.0-2.12.12/gtk/gtkmarshal.list:26) */
-extern void gtk_marshal_VOID__POINTER_UINT_ENUM (GClosure     *closure,
-                                                 GValue       *return_value,
-                                                 guint         n_param_values,
-                                                 const GValue *param_values,
-                                                 gpointer      invocation_hint,
-                                                 gpointer      marshal_data);
-#define gtk_marshal_NONE__POINTER_UINT_ENUM	gtk_marshal_VOID__POINTER_UINT_ENUM
-
-/* NONE:POINTER,POINTER,UINT,UINT (/tmp/buildd/gtk+2.0-2.12.12/gtk/gtkmarshal.list:27) */
-extern void gtk_marshal_VOID__POINTER_POINTER_UINT_UINT (GClosure     *closure,
-                                                         GValue       *return_value,
-                                                         guint         n_param_values,
-                                                         const GValue *param_values,
-                                                         gpointer      invocation_hint,
-                                                         gpointer      marshal_data);
-#define gtk_marshal_NONE__POINTER_POINTER_UINT_UINT	gtk_marshal_VOID__POINTER_POINTER_UINT_UINT
-
-/* NONE:POINTER,INT,INT,POINTER,UINT,UINT (/tmp/buildd/gtk+2.0-2.12.12/gtk/gtkmarshal.list:28) */
-extern void gtk_marshal_VOID__POINTER_INT_INT_POINTER_UINT_UINT (GClosure     *closure,
-                                                                 GValue       *return_value,
-                                                                 guint         n_param_values,
-                                                                 const GValue *param_values,
-                                                                 gpointer      invocation_hint,
-                                                                 gpointer      marshal_data);
-#define gtk_marshal_NONE__POINTER_INT_INT_POINTER_UINT_UINT	gtk_marshal_VOID__POINTER_INT_INT_POINTER_UINT_UINT
-
-/* NONE:POINTER,UINT,UINT (/tmp/buildd/gtk+2.0-2.12.12/gtk/gtkmarshal.list:29) */
-extern void gtk_marshal_VOID__POINTER_UINT_UINT (GClosure     *closure,
-                                                 GValue       *return_value,
-                                                 guint         n_param_values,
-                                                 const GValue *param_values,
-                                                 gpointer      invocation_hint,
-                                                 gpointer      marshal_data);
-#define gtk_marshal_NONE__POINTER_UINT_UINT	gtk_marshal_VOID__POINTER_UINT_UINT
-
-/* NONE:POINTER,UINT,UINT (/tmp/buildd/gtk+2.0-2.12.12/gtk/gtkmarshal.list:30) */
-
-/* NONE:STRING (/tmp/buildd/gtk+2.0-2.12.12/gtk/gtkmarshal.list:31) */
-#define gtk_marshal_VOID__STRING	g_cclosure_marshal_VOID__STRING
-#define gtk_marshal_NONE__STRING	gtk_marshal_VOID__STRING
-
-/* NONE:STRING,INT,POINTER (/tmp/buildd/gtk+2.0-2.12.12/gtk/gtkmarshal.list:32) */
-extern void gtk_marshal_VOID__STRING_INT_POINTER (GClosure     *closure,
-                                                  GValue       *return_value,
-                                                  guint         n_param_values,
-                                                  const GValue *param_values,
-                                                  gpointer      invocation_hint,
-                                                  gpointer      marshal_data);
-#define gtk_marshal_NONE__STRING_INT_POINTER	gtk_marshal_VOID__STRING_INT_POINTER
-
-/* NONE:UINT (/tmp/buildd/gtk+2.0-2.12.12/gtk/gtkmarshal.list:33) */
-#define gtk_marshal_VOID__UINT	g_cclosure_marshal_VOID__UINT
-#define gtk_marshal_NONE__UINT	gtk_marshal_VOID__UINT
-
-/* NONE:UINT,POINTER,UINT,ENUM,ENUM,POINTER (/tmp/buildd/gtk+2.0-2.12.12/gtk/gtkmarshal.list:34) */
-extern void gtk_marshal_VOID__UINT_POINTER_UINT_ENUM_ENUM_POINTER (GClosure     *closure,
-                                                                   GValue       *return_value,
-                                                                   guint         n_param_values,
-                                                                   const GValue *param_values,
-                                                                   gpointer      invocation_hint,
-                                                                   gpointer      marshal_data);
-#define gtk_marshal_NONE__UINT_POINTER_UINT_ENUM_ENUM_POINTER	gtk_marshal_VOID__UINT_POINTER_UINT_ENUM_ENUM_POINTER
-
-/* NONE:UINT,POINTER,UINT,UINT,ENUM (/tmp/buildd/gtk+2.0-2.12.12/gtk/gtkmarshal.list:35) */
-extern void gtk_marshal_VOID__UINT_POINTER_UINT_UINT_ENUM (GClosure     *closure,
-                                                           GValue       *return_value,
-                                                           guint         n_param_values,
-                                                           const GValue *param_values,
-                                                           gpointer      invocation_hint,
-                                                           gpointer      marshal_data);
-#define gtk_marshal_NONE__UINT_POINTER_UINT_UINT_ENUM	gtk_marshal_VOID__UINT_POINTER_UINT_UINT_ENUM
-
-/* NONE:UINT,STRING (/tmp/buildd/gtk+2.0-2.12.12/gtk/gtkmarshal.list:36) */
-extern void gtk_marshal_VOID__UINT_STRING (GClosure     *closure,
-                                           GValue       *return_value,
-                                           guint         n_param_values,
-                                           const GValue *param_values,
-                                           gpointer      invocation_hint,
-                                           gpointer      marshal_data);
-#define gtk_marshal_NONE__UINT_STRING	gtk_marshal_VOID__UINT_STRING
-
-G_END_DECLS
-
-#endif /* __gtk_marshal_MARSHAL_H__ */
-
-#endif /* GTK_DISABLE_DEPRECATED */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmenu.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmenu.h
deleted file mode 100644
index ba4c8013..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmenu.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_MENU_H__
-#define __GTK_MENU_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkaccelgroup.h>
-#include <gtk/gtkmenushell.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_MENU			(gtk_menu_get_type ())
-#define GTK_MENU(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MENU, GtkMenu))
-#define GTK_MENU_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MENU, GtkMenuClass))
-#define GTK_IS_MENU(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_MENU))
-#define GTK_IS_MENU_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MENU))
-#define GTK_MENU_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MENU, GtkMenuClass))
-
-
-typedef struct _GtkMenu	      GtkMenu;
-typedef struct _GtkMenuClass  GtkMenuClass;
-
-typedef void (*GtkMenuPositionFunc) (GtkMenu   *menu,
-				     gint      *x,
-				     gint      *y,
-				     gboolean  *push_in,
-				     gpointer	user_data);
-typedef void (*GtkMenuDetachFunc)   (GtkWidget *attach_widget,
-				     GtkMenu   *menu);
-
-struct _GtkMenu
-{
-  GtkMenuShell menu_shell;
-  
-  GtkWidget *parent_menu_item;
-  GtkWidget *old_active_menu_item;
-
-  GtkAccelGroup *accel_group;
-  gchar         *accel_path;
-  GtkMenuPositionFunc position_func;
-  gpointer position_func_data;
-
-  guint toggle_size;
-  /* Do _not_ touch these widgets directly. We hide the reference
-   * count from the toplevel to the menu, so it must be restored
-   * before operating on these widgets
-   */
-  GtkWidget *toplevel;
-  
-  GtkWidget *tearoff_window;
-  GtkWidget *tearoff_hbox;
-  GtkWidget *tearoff_scrollbar;
-  GtkAdjustment *tearoff_adjustment;
-
-  GdkWindow *view_window;
-  GdkWindow *bin_window;
-
-  gint scroll_offset;
-  gint saved_scroll_offset;
-  gint scroll_step;
-  guint timeout_id;
-  
-  /* When a submenu of this menu is popped up, motion in this
-   * region is ignored
-   */
-  GdkRegion *navigation_region;
-  guint navigation_timeout;
-
-  guint needs_destruction_ref_count : 1;
-  guint torn_off : 1;
-  /* The tearoff is active when it is torn off and the not-torn-off
-   * menu is not popped up.
-   */
-  guint tearoff_active : 1; 
-
-  guint scroll_fast : 1;
-
-  guint upper_arrow_visible : 1;
-  guint lower_arrow_visible : 1;
-  guint upper_arrow_prelight : 1;
-  guint lower_arrow_prelight : 1;
-};
-
-struct _GtkMenuClass
-{
-  GtkMenuShellClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType	   gtk_menu_get_type		  (void) G_GNUC_CONST;
-GtkWidget* gtk_menu_new			  (void);
-
-/* Display the menu onscreen */
-void	   gtk_menu_popup		  (GtkMenu	       *menu,
-					   GtkWidget	       *parent_menu_shell,
-					   GtkWidget	       *parent_menu_item,
-					   GtkMenuPositionFunc	func,
-					   gpointer		data,
-					   guint		button,
-					   guint32		activate_time);
-
-/* Position the menu according to its position function. Called
- * from gtkmenuitem.c when a menu-item changes its allocation
- */
-void	   gtk_menu_reposition		  (GtkMenu	       *menu);
-
-void	   gtk_menu_popdown		  (GtkMenu	       *menu);
-
-/* Keep track of the last menu item selected. (For the purposes
- * of the option menu
- */
-GtkWidget* gtk_menu_get_active		  (GtkMenu	       *menu);
-void	   gtk_menu_set_active		  (GtkMenu	       *menu,
-					   guint		index_);
-
-/* set/get the accelerator group that holds global accelerators (should
- * be added to the corresponding toplevel with gtk_window_add_accel_group().
- */
-void	       gtk_menu_set_accel_group	  (GtkMenu	       *menu,
-					   GtkAccelGroup       *accel_group);
-GtkAccelGroup* gtk_menu_get_accel_group	  (GtkMenu	       *menu);
-void           gtk_menu_set_accel_path    (GtkMenu             *menu,
-					   const gchar         *accel_path);
-
-/* A reference count is kept for a widget when it is attached to
- * a particular widget. This is typically a menu item; it may also
- * be a widget with a popup menu - for instance, the Notebook widget.
- */
-void	   gtk_menu_attach_to_widget	  (GtkMenu	       *menu,
-					   GtkWidget	       *attach_widget,
-					   GtkMenuDetachFunc	detacher);
-void	   gtk_menu_detach		  (GtkMenu	       *menu);
-
-/* This should be dumped in favor of data set when the menu is popped
- * up - that is currently in the ItemFactory code, but should be
- * in the Menu code.
- */
-GtkWidget* gtk_menu_get_attach_widget	  (GtkMenu	       *menu);
-
-void       gtk_menu_set_tearoff_state     (GtkMenu             *menu,
-					   gboolean             torn_off);
-gboolean   gtk_menu_get_tearoff_state     (GtkMenu             *menu);
-
-/* This sets the window manager title for the window that
- * appears when a menu is torn off
- */
-void       gtk_menu_set_title             (GtkMenu             *menu,
-					   const gchar         *title);
-G_CONST_RETURN gchar *gtk_menu_get_title  (GtkMenu             *menu);
-
-void       gtk_menu_reorder_child         (GtkMenu             *menu,
-                                           GtkWidget           *child,
-                                           gint                position);
-
-void	   gtk_menu_set_screen		  (GtkMenu	       *menu,
-					   GdkScreen	       *screen);
-
-void       gtk_menu_attach                (GtkMenu             *menu,
-                                           GtkWidget           *child,
-                                           guint                left_attach,
-                                           guint                right_attach,
-                                           guint                top_attach,
-                                           guint                bottom_attach);
-
-void       gtk_menu_set_monitor           (GtkMenu             *menu,
-                                           gint                 monitor_num);
-GList*     gtk_menu_get_for_attach_widget (GtkWidget           *widget); 
-
-#ifndef GTK_DISABLE_DEPRECATED
-#define gtk_menu_append(menu,child)	gtk_menu_shell_append  ((GtkMenuShell *)(menu),(child))
-#define gtk_menu_prepend(menu,child)    gtk_menu_shell_prepend ((GtkMenuShell *)(menu),(child))
-#define gtk_menu_insert(menu,child,pos)	gtk_menu_shell_insert ((GtkMenuShell *)(menu),(child),(pos))
-#endif /* GTK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GTK_MENU_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmenubar.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmenubar.h
deleted file mode 100644
index 53fba835..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmenubar.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_MENU_BAR_H__
-#define __GTK_MENU_BAR_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkmenushell.h>
-
-
-G_BEGIN_DECLS
-
-
-#define	GTK_TYPE_MENU_BAR               (gtk_menu_bar_get_type ())
-#define GTK_MENU_BAR(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MENU_BAR, GtkMenuBar))
-#define GTK_MENU_BAR_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MENU_BAR, GtkMenuBarClass))
-#define GTK_IS_MENU_BAR(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_MENU_BAR))
-#define GTK_IS_MENU_BAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MENU_BAR))
-#define GTK_MENU_BAR_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MENU_BAR, GtkMenuBarClass))
-
-typedef struct _GtkMenuBar       GtkMenuBar;
-typedef struct _GtkMenuBarClass  GtkMenuBarClass;
-
-struct _GtkMenuBar
-{
-  GtkMenuShell menu_shell;
-};
-
-struct _GtkMenuBarClass
-{
-  GtkMenuShellClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType      gtk_menu_bar_get_type        (void) G_GNUC_CONST;
-GtkWidget* gtk_menu_bar_new             (void);
-
-GtkPackDirection gtk_menu_bar_get_pack_direction (GtkMenuBar       *menubar);
-void             gtk_menu_bar_set_pack_direction (GtkMenuBar       *menubar,
-						  GtkPackDirection  pack_dir);
-GtkPackDirection gtk_menu_bar_get_child_pack_direction (GtkMenuBar       *menubar);
-void             gtk_menu_bar_set_child_pack_direction (GtkMenuBar       *menubar,
-							GtkPackDirection  child_pack_dir);
-
-#ifndef GTK_DISABLE_DEPRECATED
-#define gtk_menu_bar_append(menu,child)	    gtk_menu_shell_append  ((GtkMenuShell *)(menu),(child))
-#define gtk_menu_bar_prepend(menu,child)    gtk_menu_shell_prepend ((GtkMenuShell *)(menu),(child))
-#define gtk_menu_bar_insert(menu,child,pos) gtk_menu_shell_insert ((GtkMenuShell *)(menu),(child),(pos))
-#endif /* GTK_DISABLE_DEPRECATED */
-
-/* Private functions */
-void _gtk_menu_bar_cycle_focus (GtkMenuBar       *menubar,
-				GtkDirectionType  dir);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_MENU_BAR_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmenuitem.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmenuitem.h
deleted file mode 100644
index 4da800ed..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmenuitem.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_MENU_ITEM_H__
-#define __GTK_MENU_ITEM_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkitem.h>
-
-
-G_BEGIN_DECLS
-
-#define	GTK_TYPE_MENU_ITEM		(gtk_menu_item_get_type ())
-#define GTK_MENU_ITEM(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MENU_ITEM, GtkMenuItem))
-#define GTK_MENU_ITEM_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MENU_ITEM, GtkMenuItemClass))
-#define GTK_IS_MENU_ITEM(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_MENU_ITEM))
-#define GTK_IS_MENU_ITEM_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MENU_ITEM))
-#define GTK_MENU_ITEM_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MENU_ITEM, GtkMenuItemClass))
-
-
-typedef struct _GtkMenuItem	  GtkMenuItem;
-typedef struct _GtkMenuItemClass  GtkMenuItemClass;
-
-struct _GtkMenuItem
-{
-  GtkItem item;
-  
-  GtkWidget *submenu;
-  GdkWindow *event_window;
-  
-  guint16 toggle_size;
-  guint16 accelerator_width;
-  gchar  *accel_path;
-  
-  guint show_submenu_indicator : 1;
-  guint submenu_placement : 1;
-  guint submenu_direction : 1;
-  guint right_justify: 1;
-  guint timer_from_keypress : 1;
-  guint from_menubar : 1;
-  guint timer;
-};
-
-struct _GtkMenuItemClass
-{
-  GtkItemClass parent_class;
-  
-  /* If the following flag is true, then we should always hide
-   * the menu when the MenuItem is activated. Otherwise, the 
-   * it is up to the caller. For instance, when navigating
-   * a menu with the keyboard, <Space> doesn't hide, but
-   * <Return> does.
-   */
-  guint hide_on_activate : 1;
-  
-  void (* activate)             (GtkMenuItem *menu_item);
-  void (* activate_item)        (GtkMenuItem *menu_item);
-  void (* toggle_size_request)  (GtkMenuItem *menu_item,
-				 gint        *requisition);
-  void (* toggle_size_allocate) (GtkMenuItem *menu_item,
-				 gint         allocation);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType	   gtk_menu_item_get_type	      (void) G_GNUC_CONST;
-GtkWidget* gtk_menu_item_new                  (void);
-GtkWidget* gtk_menu_item_new_with_label       (const gchar         *label);
-GtkWidget* gtk_menu_item_new_with_mnemonic    (const gchar         *label);
-void       gtk_menu_item_set_submenu          (GtkMenuItem         *menu_item,
-					       GtkWidget           *submenu);
-GtkWidget* gtk_menu_item_get_submenu          (GtkMenuItem         *menu_item);
-void       gtk_menu_item_select               (GtkMenuItem         *menu_item);
-void       gtk_menu_item_deselect             (GtkMenuItem         *menu_item);
-void       gtk_menu_item_activate             (GtkMenuItem         *menu_item);
-void       gtk_menu_item_toggle_size_request  (GtkMenuItem         *menu_item,
-					       gint                *requisition);
-void       gtk_menu_item_toggle_size_allocate (GtkMenuItem         *menu_item,
-					       gint                 allocation);
-void       gtk_menu_item_set_right_justified  (GtkMenuItem         *menu_item,
-					       gboolean             right_justified);
-gboolean   gtk_menu_item_get_right_justified  (GtkMenuItem         *menu_item);
-void	   gtk_menu_item_set_accel_path	      (GtkMenuItem	   *menu_item,
-					       const gchar	   *accel_path);
-
-/* private */
-void	  _gtk_menu_item_refresh_accel_path   (GtkMenuItem	   *menu_item,
-					       const gchar	   *prefix,
-					       GtkAccelGroup	   *accel_group,
-					       gboolean		    group_changed);
-gboolean  _gtk_menu_item_is_selectable        (GtkWidget           *menu_item);
-void      _gtk_menu_item_popup_submenu        (GtkWidget           *menu_item,
-                                               gboolean             with_delay);
-void      _gtk_menu_item_popdown_submenu      (GtkWidget           *menu_item);
-
-#ifndef GTK_DISABLE_DEPRECATED
-void       gtk_menu_item_remove_submenu       (GtkMenuItem         *menu_item);
-#define gtk_menu_item_right_justify(menu_item) gtk_menu_item_set_right_justified ((menu_item), TRUE)
-#endif /* GTK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GTK_MENU_ITEM_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmenushell.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmenushell.h
deleted file mode 100644
index 2595a74f..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmenushell.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_MENU_SHELL_H__
-#define __GTK_MENU_SHELL_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkcontainer.h>
-
-
-G_BEGIN_DECLS
-
-#define	GTK_TYPE_MENU_SHELL		(gtk_menu_shell_get_type ())
-#define GTK_MENU_SHELL(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MENU_SHELL, GtkMenuShell))
-#define GTK_MENU_SHELL_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MENU_SHELL, GtkMenuShellClass))
-#define GTK_IS_MENU_SHELL(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_MENU_SHELL))
-#define GTK_IS_MENU_SHELL_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MENU_SHELL))
-#define GTK_MENU_SHELL_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MENU_SHELL, GtkMenuShellClass))
-
-
-typedef struct _GtkMenuShell	   GtkMenuShell;
-typedef struct _GtkMenuShellClass  GtkMenuShellClass;
-
-struct _GtkMenuShell
-{
-  GtkContainer container;
-  
-  GList *children;
-  GtkWidget *active_menu_item;
-  GtkWidget *parent_menu_shell;
-  
-  guint button;
-  guint32 activate_time;
-
-  guint active : 1;
-  guint have_grab : 1;
-  guint have_xgrab : 1;
-  guint ignore_leave : 1;	/* unused */
-  guint menu_flag : 1;		/* unused */
-  guint ignore_enter : 1;
-};
-
-struct _GtkMenuShellClass
-{
-  GtkContainerClass parent_class;
-  
-  guint submenu_placement : 1;
-  
-  void (*deactivate)     (GtkMenuShell *menu_shell);
-  void (*selection_done) (GtkMenuShell *menu_shell);
-
-  void (*move_current)     (GtkMenuShell        *menu_shell,
-			    GtkMenuDirectionType direction);
-  void (*activate_current) (GtkMenuShell *menu_shell,
-			    gboolean      force_hide);
-  void (*cancel)           (GtkMenuShell *menu_shell);
-  void (*select_item)      (GtkMenuShell *menu_shell,
-			    GtkWidget    *menu_item);
-  void (*insert)           (GtkMenuShell *menu_shell,
-			    GtkWidget    *child,
-			    gint          position);
-  gint (*get_popup_delay)  (GtkMenuShell *menu_shell);
-  gboolean (*move_selected) (GtkMenuShell *menu_shell,
-			     gint          distance);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-};
-
-
-GType gtk_menu_shell_get_type          (void) G_GNUC_CONST;
-void  gtk_menu_shell_append            (GtkMenuShell *menu_shell,
-					GtkWidget    *child);
-void  gtk_menu_shell_prepend           (GtkMenuShell *menu_shell,
-					GtkWidget    *child);
-void  gtk_menu_shell_insert            (GtkMenuShell *menu_shell,
-					GtkWidget    *child,
-					gint          position);
-void  gtk_menu_shell_deactivate        (GtkMenuShell *menu_shell);
-void  gtk_menu_shell_select_item       (GtkMenuShell *menu_shell,
-					GtkWidget    *menu_item);
-void  gtk_menu_shell_deselect          (GtkMenuShell *menu_shell);
-void  gtk_menu_shell_activate_item     (GtkMenuShell *menu_shell,
-					GtkWidget    *menu_item,
-					gboolean      force_deactivate);
-void  gtk_menu_shell_select_first      (GtkMenuShell *menu_shell,
-					gboolean      search_sensitive);
-void _gtk_menu_shell_select_last       (GtkMenuShell *menu_shell,
-					gboolean      search_sensitive);
-void  _gtk_menu_shell_activate         (GtkMenuShell *menu_shell);
-gint  _gtk_menu_shell_get_popup_delay  (GtkMenuShell *menu_shell);
-void  gtk_menu_shell_cancel            (GtkMenuShell *menu_shell);
-
-void  _gtk_menu_shell_add_mnemonic     (GtkMenuShell *menu_shell,
-                                        guint         keyval,
-                                        GtkWidget    *target);
-void  _gtk_menu_shell_remove_mnemonic  (GtkMenuShell *menu_shell,
-                                        guint         keyval,
-                                        GtkWidget    *target);
-
-gboolean gtk_menu_shell_get_take_focus (GtkMenuShell *menu_shell);
-void     gtk_menu_shell_set_take_focus (GtkMenuShell *menu_shell,
-                                        gboolean      take_focus);
-
-G_END_DECLS
-
-#endif /* __GTK_MENU_SHELL_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmenutoolbutton.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmenutoolbutton.h
deleted file mode 100644
index 4eb860e3..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmenutoolbutton.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* GTK - The GIMP Toolkit
- *
- * Copyright (C) 2003 Ricardo Fernandez Pascual
- * Copyright (C) 2004 Paolo Borelli
- *
- * 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 __GTK_MENU_TOOL_BUTTON_H__
-#define __GTK_MENU_TOOL_BUTTON_H__
-
-#include "gtkmenu.h"
-#include "gtk/gtktoolbutton.h"
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_MENU_TOOL_BUTTON         (gtk_menu_tool_button_get_type ())
-#define GTK_MENU_TOOL_BUTTON(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GTK_TYPE_MENU_TOOL_BUTTON, GtkMenuToolButton))
-#define GTK_MENU_TOOL_BUTTON_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), GTK_TYPE_MENU_TOOL_BUTTON, GtkMenuToolButtonClass))
-#define GTK_IS_MENU_TOOL_BUTTON(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTK_TYPE_MENU_TOOL_BUTTON))
-#define GTK_IS_MENU_TOOL_BUTTON_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), GTK_TYPE_MENU_TOOL_BUTTON))
-#define GTK_MENU_TOOL_BUTTON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GTK_TYPE_MENU_TOOL_BUTTON, GtkMenuToolButtonClass))
-
-typedef struct _GtkMenuToolButtonClass   GtkMenuToolButtonClass;
-typedef struct _GtkMenuToolButton        GtkMenuToolButton;
-typedef struct _GtkMenuToolButtonPrivate GtkMenuToolButtonPrivate;
-
-struct _GtkMenuToolButton
-{
-  GtkToolButton parent;
-
-  /*< private >*/
-  GtkMenuToolButtonPrivate *priv;
-};
-
-struct _GtkMenuToolButtonClass
-{
-  GtkToolButtonClass parent_class;
-
-  void (*show_menu) (GtkMenuToolButton *button);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType         gtk_menu_tool_button_get_type       (void) G_GNUC_CONST;
-GtkToolItem  *gtk_menu_tool_button_new            (GtkWidget   *icon_widget,
-                                                   const gchar *label);
-GtkToolItem  *gtk_menu_tool_button_new_from_stock (const gchar *stock_id);
-
-void          gtk_menu_tool_button_set_menu       (GtkMenuToolButton *button,
-                                                   GtkWidget         *menu);
-GtkWidget    *gtk_menu_tool_button_get_menu       (GtkMenuToolButton *button);
-
-#ifndef GTK_DISABLE_DEPRECATED
-void          gtk_menu_tool_button_set_arrow_tooltip (GtkMenuToolButton *button,
-                                                      GtkTooltips       *tooltips,
-                                                      const gchar       *tip_text,
-                                                      const gchar       *tip_private);
-#endif /* GTK_DISABLE_DEPRECATED */
-
-void          gtk_menu_tool_button_set_arrow_tooltip_text   (GtkMenuToolButton *button,
-							     const gchar       *text);
-void          gtk_menu_tool_button_set_arrow_tooltip_markup (GtkMenuToolButton *button,
-							     const gchar       *markup);
-
-G_END_DECLS
-
-#endif /* __GTK_MENU_TOOL_BUTTON_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmessagedialog.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmessagedialog.h
deleted file mode 100644
index dbf17d2b..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmessagedialog.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 2 -*- */
-/* GTK - The GIMP Toolkit
- * 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.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2003.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_MESSAGE_DIALOG_H__
-#define __GTK_MESSAGE_DIALOG_H__
-
-#include <gtk/gtkdialog.h>
-
-G_BEGIN_DECLS
-
-typedef enum
-{
-  GTK_MESSAGE_INFO,
-  GTK_MESSAGE_WARNING,
-  GTK_MESSAGE_QUESTION,
-  GTK_MESSAGE_ERROR,
-  GTK_MESSAGE_OTHER
-} GtkMessageType;
-
-typedef enum
-{
-  GTK_BUTTONS_NONE,
-  GTK_BUTTONS_OK,
-  GTK_BUTTONS_CLOSE,
-  GTK_BUTTONS_CANCEL,
-  GTK_BUTTONS_YES_NO,
-  GTK_BUTTONS_OK_CANCEL
-} GtkButtonsType;
-
-#define GTK_TYPE_MESSAGE_DIALOG                  (gtk_message_dialog_get_type ())
-#define GTK_MESSAGE_DIALOG(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MESSAGE_DIALOG, GtkMessageDialog))
-#define GTK_MESSAGE_DIALOG_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MESSAGE_DIALOG, GtkMessageDialogClass))
-#define GTK_IS_MESSAGE_DIALOG(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_MESSAGE_DIALOG))
-#define GTK_IS_MESSAGE_DIALOG_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MESSAGE_DIALOG))
-#define GTK_MESSAGE_DIALOG_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MESSAGE_DIALOG, GtkMessageDialogClass))
-
-typedef struct _GtkMessageDialog        GtkMessageDialog;
-typedef struct _GtkMessageDialogClass   GtkMessageDialogClass;
-
-struct _GtkMessageDialog
-{
-  /*< private >*/
-  
-  GtkDialog parent_instance;
-  
-  GtkWidget *image;
-  GtkWidget *label;
-};
-
-struct _GtkMessageDialogClass
-{
-  GtkDialogClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType      gtk_message_dialog_get_type (void) G_GNUC_CONST;
-
-GtkWidget* gtk_message_dialog_new      (GtkWindow      *parent,
-                                        GtkDialogFlags  flags,
-                                        GtkMessageType  type,
-                                        GtkButtonsType  buttons,
-                                        const gchar    *message_format,
-                                        ...) G_GNUC_PRINTF (5, 6);
-
-GtkWidget* gtk_message_dialog_new_with_markup   (GtkWindow      *parent,
-                                                 GtkDialogFlags  flags,
-                                                 GtkMessageType  type,
-                                                 GtkButtonsType  buttons,
-                                                 const gchar    *message_format,
-                                                 ...) G_GNUC_PRINTF (5, 6);
-
-void       gtk_message_dialog_set_image    (GtkMessageDialog *dialog,
-					    GtkWidget        *image);
-
-void       gtk_message_dialog_set_markup  (GtkMessageDialog *message_dialog,
-                                           const gchar      *str);
-
-void       gtk_message_dialog_format_secondary_text (GtkMessageDialog *message_dialog,
-                                                     const gchar      *message_format,
-                                                     ...) G_GNUC_PRINTF (2, 3);
-
-void       gtk_message_dialog_format_secondary_markup (GtkMessageDialog *message_dialog,
-                                                       const gchar      *message_format,
-                                                       ...) G_GNUC_PRINTF (2, 3);
-
-G_END_DECLS
-
-#endif /* __GTK_MESSAGE_DIALOG_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmisc.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmisc.h
deleted file mode 100644
index 3bc638ae..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmisc.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_MISC_H__
-#define __GTK_MISC_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkwidget.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_MISC		       (gtk_misc_get_type ())
-#define GTK_MISC(obj)		       (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MISC, GtkMisc))
-#define GTK_MISC_CLASS(klass)	       (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MISC, GtkMiscClass))
-#define GTK_IS_MISC(obj)	       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_MISC))
-#define GTK_IS_MISC_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MISC))
-#define GTK_MISC_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MISC, GtkMiscClass))
-
-
-typedef struct _GtkMisc	      GtkMisc;
-typedef struct _GtkMiscClass  GtkMiscClass;
-
-struct _GtkMisc
-{
-  GtkWidget widget;
-  
-  gfloat xalign;
-  gfloat yalign;
-  
-  guint16 xpad;
-  guint16 ypad;
-};
-
-struct _GtkMiscClass
-{
-  GtkWidgetClass parent_class;
-};
-
-
-GType   gtk_misc_get_type      (void) G_GNUC_CONST;
-void	gtk_misc_set_alignment (GtkMisc *misc,
-				gfloat	 xalign,
-				gfloat	 yalign);
-void    gtk_misc_get_alignment (GtkMisc *misc,
-				gfloat  *xalign,
-				gfloat  *yalign);
-void	gtk_misc_set_padding   (GtkMisc *misc,
-				gint	 xpad,
-				gint	 ypad);
-void    gtk_misc_get_padding   (GtkMisc *misc,
-				gint    *xpad,
-				gint    *ypad);
-
-
-G_END_DECLS
-
-#endif /* __GTK_MISC_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmodules.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmodules.h
deleted file mode 100644
index bd157f79..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkmodules.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright 1998-2002 Tim Janik, Red Hat, Inc., and others.
- * Copyright (C) 2003 Alex Graveley
- *
- * 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 __GTK_MODULES_H__
-#define __GTK_MODULES_H__
-
-#include <gtk/gtksettings.h>
-
-
-G_BEGIN_DECLS
-
-
-/* Functions for use within GTK+
- */
-gchar * _gtk_find_module        (const gchar *name,
-			         const gchar *type);
-gchar **_gtk_get_module_path    (const gchar *type);
-
-void    _gtk_modules_init             (gint         *argc,
-				       gchar      ***argv,
-				       const gchar  *gtk_modules_args);
-void    _gtk_modules_settings_changed (GtkSettings  *settings, 
-				       const gchar  *modules);
-
-typedef void	 (*GtkModuleInitFunc)        (gint	  *argc,
-					      gchar      ***argv);
-typedef void	 (*GtkModuleDisplayInitFunc) (GdkDisplay   *display);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_MODULES_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtknotebook.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtknotebook.h
deleted file mode 100644
index 887704a2..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtknotebook.h
+++ /dev/null
@@ -1,291 +0,0 @@
-/* -*- Mode: C; c-file-style: "gnu"; tab-width: 8 -*- */
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_NOTEBOOK_H__
-#define __GTK_NOTEBOOK_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkcontainer.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_NOTEBOOK                  (gtk_notebook_get_type ())
-#define GTK_NOTEBOOK(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_NOTEBOOK, GtkNotebook))
-#define GTK_NOTEBOOK_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_NOTEBOOK, GtkNotebookClass))
-#define GTK_IS_NOTEBOOK(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_NOTEBOOK))
-#define GTK_IS_NOTEBOOK_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_NOTEBOOK))
-#define GTK_NOTEBOOK_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_NOTEBOOK, GtkNotebookClass))
-
-
-typedef enum
-{
-  GTK_NOTEBOOK_TAB_FIRST,
-  GTK_NOTEBOOK_TAB_LAST
-} GtkNotebookTab;
-
-typedef struct _GtkNotebook       GtkNotebook;
-typedef struct _GtkNotebookClass  GtkNotebookClass;
-typedef struct _GtkNotebookPage   GtkNotebookPage;
-
-struct _GtkNotebook
-{
-  GtkContainer container;
-  
-  GtkNotebookPage *cur_page;
-  GList *children;
-  GList *first_tab;		/* The first tab visible (for scrolling notebooks) */
-  GList *focus_tab;
-  
-  GtkWidget *menu;
-  GdkWindow *event_window;
-  
-  guint32 timer;
-  
-  guint16 tab_hborder;
-  guint16 tab_vborder;
-  
-  guint show_tabs          : 1;
-  guint homogeneous        : 1;
-  guint show_border        : 1;
-  guint tab_pos            : 2;
-  guint scrollable         : 1;
-  guint in_child           : 3;
-  guint click_child        : 3;
-  guint button             : 2;
-  guint need_timer         : 1;
-  guint child_has_focus    : 1;
-  guint have_visible_child : 1;
-  guint focus_out          : 1;	/* Flag used by ::move-focus-out implementation */
-
-  guint has_before_previous : 1;
-  guint has_before_next     : 1;
-  guint has_after_previous  : 1;
-  guint has_after_next      : 1;
-};
-
-struct _GtkNotebookClass
-{
-  GtkContainerClass parent_class;
-  
-  void (* switch_page)       (GtkNotebook     *notebook,
-                              GtkNotebookPage *page,
-			      guint            page_num);
-
-  /* Action signals for keybindings */
-  gboolean (* select_page)     (GtkNotebook       *notebook,
-                                gboolean           move_focus);
-  gboolean (* focus_tab)       (GtkNotebook       *notebook,
-                                GtkNotebookTab     type);
-  gboolean (* change_current_page) (GtkNotebook   *notebook,
-                                gint               offset);
-  void (* move_focus_out)      (GtkNotebook       *notebook,
-				GtkDirectionType   direction);
-  gboolean (* reorder_tab)     (GtkNotebook       *notebook,
-				GtkDirectionType   direction,
-				gboolean           move_to_last);
-
-  /* More vfuncs */
-  gint (* insert_page)         (GtkNotebook       *notebook,
-			        GtkWidget         *child,
-				GtkWidget         *tab_label,
-				GtkWidget         *menu_label,
-				gint               position);
-
-  GtkNotebook * (* create_window) (GtkNotebook       *notebook,
-                                   GtkWidget         *page,
-                                   gint               x,
-                                   gint               y);
-
-  void (*_gtk_reserved1) (void);
-};
-
-typedef GtkNotebook* (*GtkNotebookWindowCreationFunc) (GtkNotebook *source,
-                                                       GtkWidget   *page,
-                                                       gint         x,
-                                                       gint         y,
-                                                       gpointer     data);
-
-/***********************************************************
- *           Creation, insertion, deletion                 *
- ***********************************************************/
-
-GType   gtk_notebook_get_type       (void) G_GNUC_CONST;
-GtkWidget * gtk_notebook_new        (void);
-gint gtk_notebook_append_page       (GtkNotebook *notebook,
-				     GtkWidget   *child,
-				     GtkWidget   *tab_label);
-gint gtk_notebook_append_page_menu  (GtkNotebook *notebook,
-				     GtkWidget   *child,
-				     GtkWidget   *tab_label,
-				     GtkWidget   *menu_label);
-gint gtk_notebook_prepend_page      (GtkNotebook *notebook,
-				     GtkWidget   *child,
-				     GtkWidget   *tab_label);
-gint gtk_notebook_prepend_page_menu (GtkNotebook *notebook,
-				     GtkWidget   *child,
-				     GtkWidget   *tab_label,
-				     GtkWidget   *menu_label);
-gint gtk_notebook_insert_page       (GtkNotebook *notebook,
-				     GtkWidget   *child,
-				     GtkWidget   *tab_label,
-				     gint         position);
-gint gtk_notebook_insert_page_menu  (GtkNotebook *notebook,
-				     GtkWidget   *child,
-				     GtkWidget   *tab_label,
-				     GtkWidget   *menu_label,
-				     gint         position);
-void gtk_notebook_remove_page       (GtkNotebook *notebook,
-				     gint         page_num);
-
-/***********************************************************
- *           Tabs drag and drop                            *
- ***********************************************************/
-
-void gtk_notebook_set_window_creation_hook (GtkNotebookWindowCreationFunc  func,
-					    gpointer                       data,
-                                            GDestroyNotify                 destroy);
-#ifndef GTK_DISABLE_DEPRECATED
-void gtk_notebook_set_group_id             (GtkNotebook *notebook,
-					    gint         group_id);
-gint gtk_notebook_get_group_id             (GtkNotebook *notebook);
-
-#endif /* GTK_DISABLE_DEPRECATED */
-
-void gtk_notebook_set_group                (GtkNotebook *notebook,
-					    gpointer     group);
-gpointer gtk_notebook_get_group            (GtkNotebook *notebook);
-
-
-
-/***********************************************************
- *            query, set current NotebookPage              *
- ***********************************************************/
-
-gint       gtk_notebook_get_current_page (GtkNotebook *notebook);
-GtkWidget* gtk_notebook_get_nth_page     (GtkNotebook *notebook,
-					  gint         page_num);
-gint       gtk_notebook_get_n_pages      (GtkNotebook *notebook);
-gint       gtk_notebook_page_num         (GtkNotebook *notebook,
-					  GtkWidget   *child);
-void       gtk_notebook_set_current_page (GtkNotebook *notebook,
-					  gint         page_num);
-void       gtk_notebook_next_page        (GtkNotebook *notebook);
-void       gtk_notebook_prev_page        (GtkNotebook *notebook);
-
-/***********************************************************
- *            set Notebook, NotebookTab style              *
- ***********************************************************/
-
-void     gtk_notebook_set_show_border      (GtkNotebook     *notebook,
-					    gboolean         show_border);
-gboolean gtk_notebook_get_show_border      (GtkNotebook     *notebook);
-void     gtk_notebook_set_show_tabs        (GtkNotebook     *notebook,
-					    gboolean         show_tabs);
-gboolean gtk_notebook_get_show_tabs        (GtkNotebook     *notebook);
-void     gtk_notebook_set_tab_pos          (GtkNotebook     *notebook,
-				            GtkPositionType  pos);
-GtkPositionType gtk_notebook_get_tab_pos   (GtkNotebook     *notebook);
-
-#ifndef GTK_DISABLE_DEPRECATED
-void     gtk_notebook_set_homogeneous_tabs (GtkNotebook     *notebook,
-					    gboolean         homogeneous);
-void     gtk_notebook_set_tab_border       (GtkNotebook     *notebook,
-					    guint            border_width);
-void     gtk_notebook_set_tab_hborder      (GtkNotebook     *notebook,
-					    guint            tab_hborder);
-void     gtk_notebook_set_tab_vborder      (GtkNotebook     *notebook,
-					    guint            tab_vborder);
-#endif /* GTK_DISABLE_DEPRECATED */
-
-void     gtk_notebook_set_scrollable       (GtkNotebook     *notebook,
-					    gboolean         scrollable);
-gboolean gtk_notebook_get_scrollable       (GtkNotebook     *notebook);
-
-/***********************************************************
- *               enable/disable PopupMenu                  *
- ***********************************************************/
-
-void gtk_notebook_popup_enable  (GtkNotebook *notebook);
-void gtk_notebook_popup_disable (GtkNotebook *notebook);
-
-/***********************************************************
- *             query/set NotebookPage Properties           *
- ***********************************************************/
-
-GtkWidget * gtk_notebook_get_tab_label    (GtkNotebook *notebook,
-					   GtkWidget   *child);
-void gtk_notebook_set_tab_label           (GtkNotebook *notebook,
-					   GtkWidget   *child,
-					   GtkWidget   *tab_label);
-void gtk_notebook_set_tab_label_text      (GtkNotebook *notebook,
-					   GtkWidget   *child,
-					   const gchar *tab_text);
-G_CONST_RETURN gchar *gtk_notebook_get_tab_label_text (GtkNotebook *notebook,
-						       GtkWidget   *child);
-GtkWidget * gtk_notebook_get_menu_label   (GtkNotebook *notebook,
-					   GtkWidget   *child);
-void gtk_notebook_set_menu_label          (GtkNotebook *notebook,
-					   GtkWidget   *child,
-					   GtkWidget   *menu_label);
-void gtk_notebook_set_menu_label_text     (GtkNotebook *notebook,
-					   GtkWidget   *child,
-					   const gchar *menu_text);
-G_CONST_RETURN gchar *gtk_notebook_get_menu_label_text (GtkNotebook *notebook,
-							GtkWidget   *child);
-void gtk_notebook_query_tab_label_packing (GtkNotebook *notebook,
-					   GtkWidget   *child,
-					   gboolean    *expand,
-					   gboolean    *fill,
-					   GtkPackType *pack_type);
-void gtk_notebook_set_tab_label_packing   (GtkNotebook *notebook,
-					   GtkWidget   *child,
-					   gboolean     expand,
-					   gboolean     fill,
-					   GtkPackType  pack_type);
-void gtk_notebook_reorder_child           (GtkNotebook *notebook,
-					   GtkWidget   *child,
-					   gint         position);
-gboolean gtk_notebook_get_tab_reorderable (GtkNotebook *notebook,
-					   GtkWidget   *child);
-void gtk_notebook_set_tab_reorderable     (GtkNotebook *notebook,
-					   GtkWidget   *child,
-					   gboolean     reorderable);
-gboolean gtk_notebook_get_tab_detachable  (GtkNotebook *notebook,
-					   GtkWidget   *child);
-void gtk_notebook_set_tab_detachable      (GtkNotebook *notebook,
-					   GtkWidget   *child,
-					   gboolean     detachable);
-
-#ifndef GTK_DISABLE_DEPRECATED
-#define	gtk_notebook_current_page               gtk_notebook_get_current_page
-#define gtk_notebook_set_page                   gtk_notebook_set_current_page
-#endif /* GTK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GTK_NOTEBOOK_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkobject.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkobject.h
deleted file mode 100644
index 22d4bf4b..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkobject.h
+++ /dev/null
@@ -1,226 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_OBJECT_H__
-#define __GTK_OBJECT_H__
-
-
-#include <gtk/gtkenums.h>
-#include <gtk/gtktypeutils.h>
-#include <gtk/gtkdebug.h>
-
-G_BEGIN_DECLS
-
-/* macros for casting a pointer to a GtkObject or GtkObjectClass pointer,
- * and to test whether `object' and `klass' are of type GTK_TYPE_OBJECT.
- * these are the standard macros for all GtkObject-derived classes.
- */
-#define	GTK_TYPE_OBJECT			(gtk_object_get_type ())
-#define GTK_OBJECT(object)		(GTK_CHECK_CAST ((object), GTK_TYPE_OBJECT, GtkObject))
-#define GTK_OBJECT_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_OBJECT, GtkObjectClass))
-#define GTK_IS_OBJECT(object)		(GTK_CHECK_TYPE ((object), GTK_TYPE_OBJECT))
-#define GTK_IS_OBJECT_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_OBJECT))
-#define	GTK_OBJECT_GET_CLASS(object)	(GTK_CHECK_GET_CLASS ((object), GTK_TYPE_OBJECT, GtkObjectClass))
-
-/* Macros for extracting various fields from GtkObject and GtkObjectClass.
- */
-#define GTK_OBJECT_TYPE(object)		  (G_TYPE_FROM_INSTANCE (object))
-#define GTK_OBJECT_TYPE_NAME(object)	  (g_type_name (GTK_OBJECT_TYPE (object)))
-
-/* GtkObject only uses the first 4 bits of the flags field.
- * Derived objects may use the remaining bits. Though this
- * is a kinda nasty break up, it does make the size of
- * derived objects smaller.
- */
-typedef enum
-{
-  GTK_IN_DESTRUCTION	= 1 << 0, /* Used internally during dispose */
-#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
-  GTK_FLOATING		= 1 << 1,
-#endif
-  GTK_RESERVED_1	= 1 << 2,
-  GTK_RESERVED_2	= 1 << 3
-} GtkObjectFlags;
-
-/* Macros for extracting the object_flags from GtkObject.
- */
-#define GTK_OBJECT_FLAGS(obj)		  (GTK_OBJECT (obj)->flags)
-#ifndef GTK_DISABLE_DEPRECATED
-#define GTK_OBJECT_FLOATING(obj)	  (g_object_is_floating (obj))
-#endif
-
-/* Macros for setting and clearing bits in the object_flags field of GtkObject.
- */
-#define GTK_OBJECT_SET_FLAGS(obj,flag)	  G_STMT_START{ (GTK_OBJECT_FLAGS (obj) |= (flag)); }G_STMT_END
-#define GTK_OBJECT_UNSET_FLAGS(obj,flag)  G_STMT_START{ (GTK_OBJECT_FLAGS (obj) &= ~(flag)); }G_STMT_END
-
-typedef struct _GtkObjectClass	GtkObjectClass;
-
-
-struct _GtkObject
-{
-  GInitiallyUnowned parent_instance;
-  
-  /* 32 bits of flags. GtkObject only uses 4 of these bits and
-   *  GtkWidget uses the rest. This is done because structs are
-   *  aligned on 4 or 8 byte boundaries. If a new bitfield were
-   *  used in GtkWidget much space would be wasted.
-   */
-  guint32 flags;
-};
-
-struct _GtkObjectClass
-{
-  GInitiallyUnownedClass parent_class;
-  
-  /* Non overridable class methods to set and get per class arguments */
-  void (*set_arg) (GtkObject *object,
-		   GtkArg    *arg,
-		   guint      arg_id);
-  void (*get_arg) (GtkObject *object,
-		   GtkArg    *arg,
-		   guint      arg_id);
-  
-  /* Default signal handler for the ::destroy signal, which is
-   *  invoked to request that references to the widget be dropped.
-   *  If an object class overrides destroy() in order to perform class
-   *  specific destruction then it must still invoke its superclass'
-   *  implementation of the method after it is finished with its
-   *  own cleanup. (See gtk_widget_real_destroy() for an example of
-   *  how to do this).
-   */
-  void (*destroy)  (GtkObject *object);
-};
-
-
-
-/* Application-level methods */
-
-GtkType	gtk_object_get_type		(void) G_GNUC_CONST;
-
-#ifndef GTK_DISABLE_DEPRECATED
-void gtk_object_sink	  (GtkObject *object);
-#endif
-void gtk_object_destroy	  (GtkObject *object);
-
-/****************************************************************/
-
-#ifndef GTK_DISABLE_DEPRECATED 
-
-GtkObject*	gtk_object_new		  (GtkType	       type,
-					   const gchar	      *first_property_name,
-					   ...);
-GtkObject*	gtk_object_ref		  (GtkObject	      *object);
-void		gtk_object_unref	  (GtkObject	      *object);
-void gtk_object_weakref	  (GtkObject	    *object,
-			   GtkDestroyNotify  notify,
-			   gpointer	     data);
-void gtk_object_weakunref (GtkObject	    *object,
-			   GtkDestroyNotify  notify,
-			   gpointer	     data);
-
-/* Set 'data' to the "object_data" field of the object. The
- *  data is indexed by the "key". If there is already data
- *  associated with "key" then the new data will replace it.
- *  If 'data' is NULL then this call is equivalent to
- *  'gtk_object_remove_data'.
- *  The gtk_object_set_data_full variant acts just the same,
- *  but takes an additional argument which is a function to
- *  be called when the data is removed.
- *  `gtk_object_remove_data' is equivalent to the above,
- *  where 'data' is NULL
- *  `gtk_object_get_data' gets the data associated with "key".
- */
-void	 gtk_object_set_data	     (GtkObject	     *object,
-				      const gchar    *key,
-				      gpointer	      data);
-void	 gtk_object_set_data_full    (GtkObject	     *object,
-				      const gchar    *key,
-				      gpointer	      data,
-				      GtkDestroyNotify destroy);
-void	 gtk_object_remove_data	     (GtkObject	     *object,
-				      const gchar    *key);
-gpointer gtk_object_get_data	     (GtkObject	     *object,
-				      const gchar    *key);
-void	 gtk_object_remove_no_notify (GtkObject	     *object,
-				      const gchar    *key);
-
-/* Set/get the "user_data" object data field of "object". It should
- *  be noted that these functions are no different than calling
- *  `gtk_object_set_data'/`gtk_object_get_data' with a key of "user_data".
- *  They are merely provided as a convenience.
- */
-void	 gtk_object_set_user_data (GtkObject	*object,
-				   gpointer	 data);
-gpointer gtk_object_get_user_data (GtkObject	*object);
-
-
-/* Object-level methods */
-
-/* Object data method variants that operate on key ids. */
-void gtk_object_set_data_by_id		(GtkObject	 *object,
-					 GQuark		  data_id,
-					 gpointer	  data);
-void gtk_object_set_data_by_id_full	(GtkObject	 *object,
-					 GQuark		  data_id,
-					 gpointer	  data,
-					 GtkDestroyNotify destroy);
-gpointer gtk_object_get_data_by_id	(GtkObject	 *object,
-					 GQuark		  data_id);
-void  gtk_object_remove_data_by_id	(GtkObject	 *object,
-					 GQuark		  data_id);
-void  gtk_object_remove_no_notify_by_id	(GtkObject	 *object,
-					 GQuark		  key_id);
-#define	gtk_object_data_try_key	    g_quark_try_string
-#define	gtk_object_data_force_id    g_quark_from_string
-
-/* GtkArg flag bits for gtk_object_add_arg_type
- */
-typedef enum
-{
-  GTK_ARG_READABLE	 = G_PARAM_READABLE,
-  GTK_ARG_WRITABLE	 = G_PARAM_WRITABLE,
-  GTK_ARG_CONSTRUCT	 = G_PARAM_CONSTRUCT,
-  GTK_ARG_CONSTRUCT_ONLY = G_PARAM_CONSTRUCT_ONLY,
-  GTK_ARG_CHILD_ARG	 = 1 << 4
-} GtkArgFlags;
-#define	GTK_ARG_READWRITE	(GTK_ARG_READABLE | GTK_ARG_WRITABLE)
-void	gtk_object_get		(GtkObject	*object,
-				 const gchar	*first_property_name,
-				 ...) G_GNUC_NULL_TERMINATED;
-void	gtk_object_set		(GtkObject	*object,
-				 const gchar	*first_property_name,
-				 ...) G_GNUC_NULL_TERMINATED;
-void	gtk_object_add_arg_type		(const gchar	*arg_name,
-					 GtkType	 arg_type,
-					 guint		 arg_flags,
-					 guint		 arg_id);
-
-#endif /* GTK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GTK_OBJECT_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkoldeditable.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkoldeditable.h
deleted file mode 100644
index da6d90c3..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkoldeditable.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-#ifndef __GTK_OLD_EDITABLE_H__
-#define __GTK_OLD_EDITABLE_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkeditable.h>
-#include <gtk/gtkwidget.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_OLD_EDITABLE            (gtk_old_editable_get_type ())
-#define GTK_OLD_EDITABLE(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_OLD_EDITABLE, GtkOldEditable))
-#define GTK_OLD_EDITABLE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_OLD_EDITABLE, GtkOldEditableClass))
-#define GTK_IS_OLD_EDITABLE(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_OLD_EDITABLE))
-#define GTK_IS_OLD_EDITABLE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_OLD_EDITABLE))
-#define GTK_OLD_EDITABLE_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_OLD_EDITABLE, GtkOldEditableClass))
-
-
-typedef struct _GtkOldEditable       GtkOldEditable;
-typedef struct _GtkOldEditableClass  GtkOldEditableClass;
-
-typedef void (*GtkTextFunction) (GtkOldEditable  *editable, guint32 time_);
-
-struct _GtkOldEditable
-{
-  GtkWidget widget;
-
-  /*< public >*/
-  guint      current_pos;
-
-  guint      selection_start_pos;
-  guint      selection_end_pos;
-  guint      has_selection : 1;
-
-  /*< private >*/
-  guint      editable : 1;
-  guint      visible : 1;
-  
-  gchar *clipboard_text;
-};
-
-struct _GtkOldEditableClass
-{
-  GtkWidgetClass parent_class;
-  
-  /* Bindings actions */
-  void (* activate)        (GtkOldEditable *editable);
-  void (* set_editable)    (GtkOldEditable *editable,
-			    gboolean	    is_editable);
-  void (* move_cursor)     (GtkOldEditable *editable,
-			    gint            x,
-			    gint            y);
-  void (* move_word)       (GtkOldEditable *editable,
-			    gint            n);
-  void (* move_page)       (GtkOldEditable *editable,
-			    gint            x,
-			    gint            y);
-  void (* move_to_row)     (GtkOldEditable *editable,
-			    gint            row);
-  void (* move_to_column)  (GtkOldEditable *editable,
-			    gint            row);
-  void (* kill_char)       (GtkOldEditable *editable,
-			    gint            direction);
-  void (* kill_word)       (GtkOldEditable *editable,
-			    gint            direction);
-  void (* kill_line)       (GtkOldEditable *editable,
-			    gint            direction);
-  void (* cut_clipboard)   (GtkOldEditable *editable);
-  void (* copy_clipboard)  (GtkOldEditable *editable);
-  void (* paste_clipboard) (GtkOldEditable *editable);
-
-  /* Virtual functions. get_chars is in paricular not a signal because
-   * it returns malloced memory. The others are not signals because
-   * they would not be particularly useful as such. (All changes to
-   * selection and position do not go through these functions)
-   */
-  void (* update_text)  (GtkOldEditable  *editable,
-			 gint             start_pos,
-			 gint             end_pos);
-  gchar* (* get_chars)  (GtkOldEditable  *editable,
-			 gint             start_pos,
-			 gint             end_pos);
-  void (* set_selection)(GtkOldEditable  *editable,
-			 gint             start_pos,
-			 gint             end_pos);
-  void (* set_position) (GtkOldEditable  *editable,
-			 gint             position);
-};
-
-GtkType    gtk_old_editable_get_type        (void) G_GNUC_CONST;
-void       gtk_old_editable_claim_selection (GtkOldEditable *old_editable,
-					     gboolean        claim,
-					     guint32         time_);
-void       gtk_old_editable_changed         (GtkOldEditable *old_editable);
-
-G_END_DECLS
-
-#endif /* __GTK_OLD_EDITABLE_H__ */
-
-#endif /* GTK_DISABLE_DEPRECATED */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkoptionmenu.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkoptionmenu.h
deleted file mode 100644
index 32f6de9f..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkoptionmenu.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-#ifndef __GTK_OPTION_MENU_H__
-#define __GTK_OPTION_MENU_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkbutton.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_OPTION_MENU              (gtk_option_menu_get_type ())
-#define GTK_OPTION_MENU(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_OPTION_MENU, GtkOptionMenu))
-#define GTK_OPTION_MENU_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_OPTION_MENU, GtkOptionMenuClass))
-#define GTK_IS_OPTION_MENU(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_OPTION_MENU))
-#define GTK_IS_OPTION_MENU_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_OPTION_MENU))
-#define GTK_OPTION_MENU_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_OPTION_MENU, GtkOptionMenuClass))
-
-
-typedef struct _GtkOptionMenu       GtkOptionMenu;
-typedef struct _GtkOptionMenuClass  GtkOptionMenuClass;
-
-struct _GtkOptionMenu
-{
-  GtkButton button;
-  
-  GtkWidget *menu;
-  GtkWidget *menu_item;
-  
-  guint16 width;
-  guint16 height;
-};
-
-struct _GtkOptionMenuClass
-{
-  GtkButtonClass parent_class;
-
-  void (*changed) (GtkOptionMenu *option_menu);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType      gtk_option_menu_get_type    (void) G_GNUC_CONST;
-GtkWidget* gtk_option_menu_new         (void);
-GtkWidget* gtk_option_menu_get_menu    (GtkOptionMenu *option_menu);
-void       gtk_option_menu_set_menu    (GtkOptionMenu *option_menu,
-					GtkWidget     *menu);
-void       gtk_option_menu_remove_menu (GtkOptionMenu *option_menu);
-gint       gtk_option_menu_get_history (GtkOptionMenu *option_menu);
-void       gtk_option_menu_set_history (GtkOptionMenu *option_menu,
-					guint          index_);
-
-
-G_END_DECLS
-
-#endif /* __GTK_OPTION_MENU_H__ */
-
-#endif /* GTK_DISABLE_DEPRECATED */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkpagesetup.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkpagesetup.h
deleted file mode 100644
index 6de2ef5f..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkpagesetup.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkpagesetup.h: Page Setup
- * Copyright (C) 2006, 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 __GTK_PAGE_SETUP_H__
-#define __GTK_PAGE_SETUP_H__
-
-#include <glib-object.h>
-#include "gtkenums.h"
-#include "gtkpapersize.h"
-
-G_BEGIN_DECLS
-
-typedef struct _GtkPageSetup GtkPageSetup;
-
-#define GTK_TYPE_PAGE_SETUP    (gtk_page_setup_get_type ())
-#define GTK_PAGE_SETUP(obj)    (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PAGE_SETUP, GtkPageSetup))
-#define GTK_IS_PAGE_SETUP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PAGE_SETUP))
-
-GType              gtk_page_setup_get_type          (void) G_GNUC_CONST;
-GtkPageSetup *     gtk_page_setup_new               (void);
-GtkPageSetup *     gtk_page_setup_copy              (GtkPageSetup       *other);
-GtkPageOrientation gtk_page_setup_get_orientation   (GtkPageSetup       *setup);
-void               gtk_page_setup_set_orientation   (GtkPageSetup       *setup,
-						     GtkPageOrientation  orientation);
-GtkPaperSize *     gtk_page_setup_get_paper_size    (GtkPageSetup       *setup);
-void               gtk_page_setup_set_paper_size    (GtkPageSetup       *setup,
-						     GtkPaperSize       *size);
-gdouble            gtk_page_setup_get_top_margin    (GtkPageSetup       *setup,
-						     GtkUnit             unit);
-void               gtk_page_setup_set_top_margin    (GtkPageSetup       *setup,
-						     gdouble             margin,
-						     GtkUnit             unit);
-gdouble            gtk_page_setup_get_bottom_margin (GtkPageSetup       *setup,
-						     GtkUnit             unit);
-void               gtk_page_setup_set_bottom_margin (GtkPageSetup       *setup,
-						     gdouble             margin,
-						     GtkUnit             unit);
-gdouble            gtk_page_setup_get_left_margin   (GtkPageSetup       *setup,
-						     GtkUnit             unit);
-void               gtk_page_setup_set_left_margin   (GtkPageSetup       *setup,
-						     gdouble             margin,
-						     GtkUnit             unit);
-gdouble            gtk_page_setup_get_right_margin  (GtkPageSetup       *setup,
-						     GtkUnit             unit);
-void               gtk_page_setup_set_right_margin  (GtkPageSetup       *setup,
-						     gdouble             margin,
-						     GtkUnit             unit);
-
-void gtk_page_setup_set_paper_size_and_default_margins (GtkPageSetup    *setup,
-							GtkPaperSize    *size);
-
-/* These take orientation, but not margins into consideration */
-gdouble            gtk_page_setup_get_paper_width   (GtkPageSetup       *setup,
-						     GtkUnit             unit);
-gdouble            gtk_page_setup_get_paper_height  (GtkPageSetup       *setup,
-						     GtkUnit             unit);
-
-
-/* These take orientation, and margins into consideration */
-gdouble            gtk_page_setup_get_page_width    (GtkPageSetup       *setup,
-						     GtkUnit             unit);
-gdouble            gtk_page_setup_get_page_height   (GtkPageSetup       *setup,
-						     GtkUnit             unit);
-
-/* Saving and restoring page setup */
-GtkPageSetup	  *gtk_page_setup_new_from_file	    (const gchar         *file_name,
-						     GError              **error);
-gboolean	   gtk_page_setup_to_file	    (GtkPageSetup        *setup,
-						     const char          *file_name,
-						     GError             **error);
-GtkPageSetup	  *gtk_page_setup_new_from_key_file (GKeyFile            *key_file,
-						     const gchar         *group_name,
-						     GError             **error);
-void		   gtk_page_setup_to_key_file	    (GtkPageSetup        *setup,
-						     GKeyFile            *key_file,
-						     const gchar         *group_name);
-
-G_END_DECLS
-
-#endif /* __GTK_PAGE_SETUP_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkpaned.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkpaned.h
deleted file mode 100644
index 003316ae..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkpaned.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_PANED_H__
-#define __GTK_PANED_H__
-
-#include <gtk/gtkcontainer.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_PANED                  (gtk_paned_get_type ())
-#define GTK_PANED(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PANED, GtkPaned))
-#define GTK_PANED_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PANED, GtkPanedClass))
-#define GTK_IS_PANED(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PANED))
-#define GTK_IS_PANED_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PANED))
-#define GTK_PANED_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PANED, GtkPanedClass))
-
-
-typedef struct _GtkPaned        GtkPaned;
-typedef struct _GtkPanedClass   GtkPanedClass;
-typedef struct _GtkPanedPrivate GtkPanedPrivate;
-	
-struct _GtkPaned
-{
-  GtkContainer container;
-  
-  GtkWidget *child1;
-  GtkWidget *child2;
-  
-  GdkWindow *handle;
-  GdkGC *xor_gc;
-  GdkCursorType cursor_type;
-  
-  /*< private >*/
-  GdkRectangle handle_pos;
-
-  gint child1_size;
-  gint last_allocation;
-  gint min_position;
-  gint max_position;
-
-  guint position_set : 1;
-  guint in_drag : 1;
-  guint child1_shrink : 1;
-  guint child1_resize : 1;
-  guint child2_shrink : 1;
-  guint child2_resize : 1;
-  guint orientation : 1;
-  guint in_recursion : 1;
-  guint handle_prelit : 1;
-
-  GtkWidget *last_child1_focus;
-  GtkWidget *last_child2_focus;
-  GtkPanedPrivate *priv;
-
-  gint drag_pos;
-  gint original_position;
-};
- 
-struct _GtkPanedClass
-{
-  GtkContainerClass parent_class;
-  
-  gboolean (* cycle_child_focus)   (GtkPaned      *paned,
-				    gboolean       reverse); 
-  gboolean (* toggle_handle_focus) (GtkPaned      *paned);
-  gboolean (* move_handle)         (GtkPaned      *paned,
-				    GtkScrollType  scroll);
-  gboolean (* cycle_handle_focus)  (GtkPaned      *paned,
-				    gboolean       reverse);
-  gboolean (* accept_position)     (GtkPaned	  *paned);
-  gboolean (* cancel_position)     (GtkPaned	  *paned);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType   gtk_paned_get_type        (void) G_GNUC_CONST;
-void    gtk_paned_add1            (GtkPaned  *paned,
-				   GtkWidget *child);
-void    gtk_paned_add2            (GtkPaned  *paned,
-				   GtkWidget *child);
-void    gtk_paned_pack1           (GtkPaned  *paned,
-				   GtkWidget *child,
-				   gboolean   resize,
-				   gboolean   shrink);
-void    gtk_paned_pack2           (GtkPaned  *paned,
-				   GtkWidget *child,
-				   gboolean   resize,
-				   gboolean   shrink);
-gint    gtk_paned_get_position    (GtkPaned  *paned);
-void    gtk_paned_set_position    (GtkPaned  *paned,
-				   gint       position);
-
-GtkWidget *gtk_paned_get_child1   (GtkPaned  *paned);
-GtkWidget *gtk_paned_get_child2   (GtkPaned  *paned);
-
-/* Internal function */
-#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
-void    gtk_paned_compute_position (GtkPaned  *paned,
-				    gint       allocation,
-				    gint       child1_req,
-				    gint       child2_req);
-#endif /* !GTK_DISABLE_DEPRECATED || GTK_COMPILATION */
-#ifndef GTK_DISABLE_DEPRECATED
-#define	gtk_paned_gutter_size(p,s)		(void) 0
-#define	gtk_paned_set_gutter_size(p,s)		(void) 0
-#endif /* GTK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GTK_PANED_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkpapersize.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkpapersize.h
deleted file mode 100644
index 65aed126..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkpapersize.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkpapersize.h: Paper Size
- * Copyright (C) 2006, 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 __GTK_PAPER_SIZE_H__
-#define __GTK_PAPER_SIZE_H__
-
-#include <glib-object.h>
-#include "gtkenums.h"
-
-G_BEGIN_DECLS
-
-typedef struct _GtkPaperSize GtkPaperSize;
-
-#define GTK_TYPE_PAPER_SIZE    (gtk_paper_size_get_type ())
-
-/* Common names, from PWG 5101.1-2002 PWG: Standard for Media Standardized Names */
-#define GTK_PAPER_NAME_A3 "iso_a3"
-#define GTK_PAPER_NAME_A4 "iso_a4"
-#define GTK_PAPER_NAME_A5 "iso_a5"
-#define GTK_PAPER_NAME_B5 "iso_b5"
-#define GTK_PAPER_NAME_LETTER "na_letter"
-#define GTK_PAPER_NAME_EXECUTIVE "na_executive"
-#define GTK_PAPER_NAME_LEGAL "na_legal"
-
-GType gtk_paper_size_get_type (void) G_GNUC_CONST;
-
-GtkPaperSize *gtk_paper_size_new          (const gchar  *name);
-GtkPaperSize *gtk_paper_size_new_from_ppd (const gchar  *ppd_name,
-					   const gchar  *ppd_display_name,
-					   gdouble       width,
-					   gdouble       height);
-GtkPaperSize *gtk_paper_size_new_custom   (const gchar  *name,
-					   const gchar  *display_name,
-					   gdouble       width,
-					   gdouble       height,
-					   GtkUnit       unit);
-GtkPaperSize *gtk_paper_size_copy         (GtkPaperSize *other);
-void          gtk_paper_size_free         (GtkPaperSize *size);
-gboolean      gtk_paper_size_is_equal     (GtkPaperSize *size1,
-					   GtkPaperSize *size2);
-
-GList        *gtk_paper_size_get_paper_sizes (gboolean include_custom);
-
-/* The width is always the shortest side, measure in mm */
-G_CONST_RETURN gchar *gtk_paper_size_get_name         (GtkPaperSize *size);
-G_CONST_RETURN gchar *gtk_paper_size_get_display_name (GtkPaperSize *size);
-G_CONST_RETURN gchar *gtk_paper_size_get_ppd_name     (GtkPaperSize *size);
-
-gdouble  gtk_paper_size_get_width        (GtkPaperSize *size, GtkUnit unit);
-gdouble  gtk_paper_size_get_height       (GtkPaperSize *size, GtkUnit unit);
-gboolean gtk_paper_size_is_custom        (GtkPaperSize *size);
-
-/* Only for custom sizes: */
-void    gtk_paper_size_set_size                  (GtkPaperSize *size, 
-                                                  gdouble       width, 
-                                                  gdouble       height, 
-                                                  GtkUnit       unit);
-
-gdouble gtk_paper_size_get_default_top_margin    (GtkPaperSize *size,
-						  GtkUnit       unit);
-gdouble gtk_paper_size_get_default_bottom_margin (GtkPaperSize *size,
-						  GtkUnit       unit);
-gdouble gtk_paper_size_get_default_left_margin   (GtkPaperSize *size,
-						  GtkUnit       unit);
-gdouble gtk_paper_size_get_default_right_margin  (GtkPaperSize *size,
-						  GtkUnit       unit);
-
-G_CONST_RETURN gchar *gtk_paper_size_get_default (void);
-
-GtkPaperSize *gtk_paper_size_new_from_key_file (GKeyFile    *key_file,
-					        const gchar *group_name,
-					        GError     **error);
-void     gtk_paper_size_to_key_file            (GtkPaperSize *size,
-					        GKeyFile     *key_file,
-					        const gchar  *group_name);
-
-G_END_DECLS
-
-#endif /* __GTK_PAPER_SIZE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkpixmap.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkpixmap.h
deleted file mode 100644
index 1bb4f854..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkpixmap.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-#ifndef __GTK_PIXMAP_H__
-#define __GTK_PIXMAP_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkmisc.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_PIXMAP			 (gtk_pixmap_get_type ())
-#define GTK_PIXMAP(obj)			 (GTK_CHECK_CAST ((obj), GTK_TYPE_PIXMAP, GtkPixmap))
-#define GTK_PIXMAP_CLASS(klass)		 (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_PIXMAP, GtkPixmapClass))
-#define GTK_IS_PIXMAP(obj)		 (GTK_CHECK_TYPE ((obj), GTK_TYPE_PIXMAP))
-#define GTK_IS_PIXMAP_CLASS(klass)	 (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PIXMAP))
-#define GTK_PIXMAP_GET_CLASS(obj)        (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_PIXMAP, GtkPixmapClass))
-
-
-typedef struct _GtkPixmap	GtkPixmap;
-typedef struct _GtkPixmapClass	GtkPixmapClass;
-
-struct _GtkPixmap
-{
-  GtkMisc misc;
-  
-  GdkPixmap *pixmap;
-  GdkBitmap *mask;
-
-  GdkPixmap *pixmap_insensitive;
-  guint build_insensitive : 1;
-};
-
-struct _GtkPixmapClass
-{
-  GtkMiscClass parent_class;
-};
-
-
-GtkType	   gtk_pixmap_get_type	 (void) G_GNUC_CONST;
-GtkWidget* gtk_pixmap_new	 (GdkPixmap  *pixmap,
-				  GdkBitmap  *mask);
-void	   gtk_pixmap_set	 (GtkPixmap  *pixmap,
-				  GdkPixmap  *val,
-				  GdkBitmap  *mask);
-void	   gtk_pixmap_get	 (GtkPixmap  *pixmap,
-				  GdkPixmap **val,
-				  GdkBitmap **mask);
-
-void       gtk_pixmap_set_build_insensitive (GtkPixmap *pixmap,
-		                             gboolean   build);
-
-
-G_END_DECLS
-
-#endif /* __GTK_PIXMAP_H__ */
-
-#endif /* GTK_DISABLE_DEPRECATED */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkplug.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkplug.h
deleted file mode 100644
index 87fe6f92..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkplug.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_PLUG_H__
-#define __GTK_PLUG_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtksocket.h>
-#include <gtk/gtkwindow.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_PLUG            (gtk_plug_get_type ())
-#define GTK_PLUG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PLUG, GtkPlug))
-#define GTK_PLUG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PLUG, GtkPlugClass))
-#define GTK_IS_PLUG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PLUG))
-#define GTK_IS_PLUG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PLUG))
-#define GTK_PLUG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PLUG, GtkPlugClass))
-
-
-typedef struct _GtkPlug        GtkPlug;
-typedef struct _GtkPlugClass   GtkPlugClass;
-
-
-struct _GtkPlug
-{
-  GtkWindow window;
-
-  GdkWindow *socket_window;
-  GtkWidget *modality_window;
-  GtkWindowGroup *modality_group;
-  GHashTable *grabbed_keys;
-
-  guint same_app : 1;
-};
-
-struct _GtkPlugClass
-{
-  GtkWindowClass parent_class;
-
-  void (*embedded) (GtkPlug *plug);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType      gtk_plug_get_type  (void) G_GNUC_CONST;
-
-#ifndef GDK_MULTIHEAD_SAFE
-void       gtk_plug_construct (GtkPlug         *plug,
-			       GdkNativeWindow  socket_id);
-GtkWidget* gtk_plug_new       (GdkNativeWindow  socket_id);
-#endif
-
-void       gtk_plug_construct_for_display (GtkPlug         *plug,
-					   GdkDisplay      *display,
-					   GdkNativeWindow  socket_id);
-GtkWidget* gtk_plug_new_for_display       (GdkDisplay      *display,
-					   GdkNativeWindow  socket_id);
-
-GdkNativeWindow gtk_plug_get_id (GtkPlug         *plug);
-
-void _gtk_plug_add_to_socket      (GtkPlug   *plug,
-				   GtkSocket *socket_);
-void _gtk_plug_remove_from_socket (GtkPlug   *plug,
-				   GtkSocket *socket_);
-
-G_END_DECLS
-
-#endif /* __GTK_PLUG_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkpreview.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkpreview.h
deleted file mode 100644
index 515e6d8a..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkpreview.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-#ifndef __GTK_PREVIEW_H__
-#define __GTK_PREVIEW_H__
-
-
-#include <gtk/gtkwidget.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_PREVIEW            (gtk_preview_get_type ())
-#define GTK_PREVIEW(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_PREVIEW, GtkPreview))
-#define GTK_PREVIEW_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_PREVIEW, GtkPreviewClass))
-#define GTK_IS_PREVIEW(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_PREVIEW))
-#define GTK_IS_PREVIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PREVIEW))
-#define GTK_PREVIEW_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_PREVIEW, GtkPreviewClass))
-
-
-typedef struct _GtkPreview       GtkPreview;
-typedef struct _GtkPreviewInfo   GtkPreviewInfo;
-typedef union  _GtkDitherInfo    GtkDitherInfo;
-typedef struct _GtkPreviewClass  GtkPreviewClass;
-
-struct _GtkPreview
-{
-  GtkWidget widget;
-
-  guchar *buffer;
-  guint16 buffer_width;
-  guint16 buffer_height;
-
-  guint16 bpp;
-  guint16 rowstride;
-
-  GdkRgbDither dither;
-
-  guint type : 1;
-  guint expand : 1;
-};
-
-struct _GtkPreviewInfo
-{
-  guchar *lookup;
-
-  gdouble gamma;
-};
-
-union _GtkDitherInfo
-{
-  gushort s[2];
-  guchar c[4];
-};
-
-struct _GtkPreviewClass
-{
-  GtkWidgetClass parent_class;
-
-  GtkPreviewInfo info;
-
-};
-
-
-GtkType         gtk_preview_get_type           (void) G_GNUC_CONST;
-void            gtk_preview_uninit             (void);
-GtkWidget*      gtk_preview_new                (GtkPreviewType   type);
-void            gtk_preview_size               (GtkPreview      *preview,
-						gint             width,
-						gint             height);
-void            gtk_preview_put                (GtkPreview      *preview,
-						GdkWindow       *window,
-						GdkGC           *gc,
-						gint             srcx,
-						gint             srcy,
-						gint             destx,
-						gint             desty,
-						gint             width,
-						gint             height);
-void            gtk_preview_draw_row           (GtkPreview      *preview,
-						guchar          *data,
-						gint             x,
-						gint             y,
-						gint             w);
-void            gtk_preview_set_expand         (GtkPreview      *preview,
-						gboolean         expand);
-
-void            gtk_preview_set_gamma          (double           gamma_);
-void            gtk_preview_set_color_cube     (guint            nred_shades,
-						guint            ngreen_shades,
-						guint            nblue_shades,
-						guint            ngray_shades);
-void            gtk_preview_set_install_cmap   (gint             install_cmap);
-void            gtk_preview_set_reserved       (gint             nreserved);
-void            gtk_preview_set_dither         (GtkPreview      *preview,
-						GdkRgbDither     dither);
-#ifndef GTK_DISABLE_DEPRECATED
-GdkVisual*      gtk_preview_get_visual         (void);
-GdkColormap*    gtk_preview_get_cmap           (void);
-#endif
-GtkPreviewInfo* gtk_preview_get_info           (void);
-
-/* This function reinitializes the preview colormap and visual from
- * the current gamma/color_cube/install_cmap settings. It must only
- * be called if there are no previews or users's of the preview
- * colormap in existence.
- */
-void            gtk_preview_reset              (void);
-
-
-G_END_DECLS
-
-#endif /* __GTK_PREVIEW_H__ */
-
-#endif /* GTK_DISABLE_DEPRECATED */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprintcontext.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprintcontext.h
deleted file mode 100644
index 936cae4f..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprintcontext.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkprintcontext.h: Print Context
- * Copyright (C) 2006, 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 __GTK_PRINT_CONTEXT_H__
-#define __GTK_PRINT_CONTEXT_H__
-
-#include <glib-object.h>
-#include <pango/pango-layout.h>
-#include "gtkenums.h"
-#include "gtkpagesetup.h"
-
-G_BEGIN_DECLS
-
-typedef struct _GtkPrintContext GtkPrintContext;
-
-#define GTK_TYPE_PRINT_CONTEXT    (gtk_print_context_get_type ())
-#define GTK_PRINT_CONTEXT(obj)    (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PRINT_CONTEXT, GtkPrintContext))
-#define GTK_IS_PRINT_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PRINT_CONTEXT))
-
-GType          gtk_print_context_get_type (void) G_GNUC_CONST;
-
-
-/* Rendering */
-cairo_t      *gtk_print_context_get_cairo_context    (GtkPrintContext *context);
-
-GtkPageSetup *gtk_print_context_get_page_setup       (GtkPrintContext *context);
-gdouble       gtk_print_context_get_width            (GtkPrintContext *context);
-gdouble       gtk_print_context_get_height           (GtkPrintContext *context);
-gdouble       gtk_print_context_get_dpi_x            (GtkPrintContext *context);
-gdouble       gtk_print_context_get_dpi_y            (GtkPrintContext *context);
-
-/* Fonts */
-PangoFontMap *gtk_print_context_get_pango_fontmap    (GtkPrintContext *context);
-PangoContext *gtk_print_context_create_pango_context (GtkPrintContext *context);
-PangoLayout  *gtk_print_context_create_pango_layout  (GtkPrintContext *context);
-
-/* Needed for preview implementations */
-void         gtk_print_context_set_cairo_context     (GtkPrintContext *context,
-						      cairo_t         *cr,
-						      double           dpi_x,
-						      double           dpi_y);
-
-G_END_DECLS
-
-#endif /* __GTK_PRINT_CONTEXT_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprintoperation.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprintoperation.h
deleted file mode 100644
index d0d3a386..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprintoperation.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkprintoperation.h: Print Operation
- * Copyright (C) 2006, 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 __GTK_PRINT_OPERATION_H__
-#define __GTK_PRINT_OPERATION_H__
-
-#include <glib-object.h>
-#include <cairo.h>
-#include "gtkmain.h"
-#include "gtkenums.h"
-#include "gtkwindow.h"
-#include "gtkpagesetup.h"
-#include "gtkprintsettings.h"
-#include "gtkprintcontext.h"
-#include "gtkprintoperationpreview.h"
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_PRINT_OPERATION		(gtk_print_operation_get_type ())
-#define GTK_PRINT_OPERATION(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PRINT_OPERATION, GtkPrintOperation))
-#define GTK_PRINT_OPERATION_CLASS(klass)    	(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PRINT_OPERATION, GtkPrintOperationClass))
-#define GTK_IS_PRINT_OPERATION(obj) 		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PRINT_OPERATION))
-#define GTK_IS_PRINT_OPERATION_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PRINT_OPERATION))
-#define GTK_PRINT_OPERATION_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PRINT_OPERATION, GtkPrintOperationClass))
-
-typedef struct _GtkPrintOperationClass   GtkPrintOperationClass;
-typedef struct _GtkPrintOperationPrivate GtkPrintOperationPrivate;
-typedef struct _GtkPrintOperation        GtkPrintOperation;
-
-typedef enum {
-  GTK_PRINT_STATUS_INITIAL,
-  GTK_PRINT_STATUS_PREPARING,
-  GTK_PRINT_STATUS_GENERATING_DATA,
-  GTK_PRINT_STATUS_SENDING_DATA,
-  GTK_PRINT_STATUS_PENDING,
-  GTK_PRINT_STATUS_PENDING_ISSUE,
-  GTK_PRINT_STATUS_PRINTING,
-  GTK_PRINT_STATUS_FINISHED,
-  GTK_PRINT_STATUS_FINISHED_ABORTED
-} GtkPrintStatus;
-
-typedef enum {
-  GTK_PRINT_OPERATION_RESULT_ERROR,
-  GTK_PRINT_OPERATION_RESULT_APPLY,
-  GTK_PRINT_OPERATION_RESULT_CANCEL,
-  GTK_PRINT_OPERATION_RESULT_IN_PROGRESS
-} GtkPrintOperationResult;
-
-typedef enum {
-  GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG,
-  GTK_PRINT_OPERATION_ACTION_PRINT,
-  GTK_PRINT_OPERATION_ACTION_PREVIEW,
-  GTK_PRINT_OPERATION_ACTION_EXPORT
-} GtkPrintOperationAction;
-
-
-struct _GtkPrintOperation
-{
-  GObject parent_instance;
-  
-  GtkPrintOperationPrivate *priv;
-};
-
-struct _GtkPrintOperationClass
-{
-  GObjectClass parent_class;
-  
-  void     (*done)               (GtkPrintOperation *operation,
-				  GtkPrintOperationResult result);
-  void     (*begin_print)        (GtkPrintOperation *operation, 
-				  GtkPrintContext   *context);
-  gboolean (*paginate)           (GtkPrintOperation *operation, 
-				  GtkPrintContext   *context);
-  void     (*request_page_setup) (GtkPrintOperation *operation,
-				  GtkPrintContext   *context,
-				  gint               page_nr,
-				  GtkPageSetup      *setup);
-  void     (*draw_page)          (GtkPrintOperation *operation,
-				  GtkPrintContext   *context,
-				  gint               page_nr);
-  void     (*end_print)          (GtkPrintOperation *operation,
-				  GtkPrintContext   *context);
-  void     (*status_changed)     (GtkPrintOperation *operation);
-
-  GtkWidget *(*create_custom_widget) (GtkPrintOperation *operation);
-  void       (*custom_widget_apply)  (GtkPrintOperation *operation,
-				      GtkWidget *widget);
-
-  
-  gboolean (*preview)	     (GtkPrintOperation        *operation,
-			      GtkPrintOperationPreview *preview, 
-			      GtkPrintContext          *context,
-			      GtkWindow                *parent);  
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-  void (*_gtk_reserved5) (void);
-  void (*_gtk_reserved6) (void);
-  void (*_gtk_reserved7) (void);
-};
-
-#define GTK_PRINT_ERROR gtk_print_error_quark ()
-
-typedef enum
-{
-  GTK_PRINT_ERROR_GENERAL,
-  GTK_PRINT_ERROR_INTERNAL_ERROR,
-  GTK_PRINT_ERROR_NOMEM,
-  GTK_PRINT_ERROR_INVALID_FILE
-} GtkPrintError;
-
-GQuark gtk_print_error_quark (void);
-
-GType                   gtk_print_operation_get_type               (void) G_GNUC_CONST;
-GtkPrintOperation *     gtk_print_operation_new                    (void);
-void                    gtk_print_operation_set_default_page_setup (GtkPrintOperation  *op,
-								    GtkPageSetup       *default_page_setup);
-GtkPageSetup *          gtk_print_operation_get_default_page_setup (GtkPrintOperation  *op);
-void                    gtk_print_operation_set_print_settings     (GtkPrintOperation  *op,
-								    GtkPrintSettings   *print_settings);
-GtkPrintSettings *      gtk_print_operation_get_print_settings     (GtkPrintOperation  *op);
-void                    gtk_print_operation_set_job_name           (GtkPrintOperation  *op,
-								    const gchar        *job_name);
-void                    gtk_print_operation_set_n_pages            (GtkPrintOperation  *op,
-								    gint                n_pages);
-void                    gtk_print_operation_set_current_page       (GtkPrintOperation  *op,
-								    gint                current_page);
-void                    gtk_print_operation_set_use_full_page      (GtkPrintOperation  *op,
-								    gboolean            full_page);
-void                    gtk_print_operation_set_unit               (GtkPrintOperation  *op,
-								    GtkUnit             unit);
-void                    gtk_print_operation_set_export_filename    (GtkPrintOperation  *op,
-								    const gchar        *filename);
-void                    gtk_print_operation_set_track_print_status (GtkPrintOperation  *op,
-								    gboolean            track_status);
-void                    gtk_print_operation_set_show_progress      (GtkPrintOperation  *op,
-								    gboolean            show_progress);
-void                    gtk_print_operation_set_allow_async        (GtkPrintOperation  *op,
-								    gboolean            allow_async);
-void                    gtk_print_operation_set_custom_tab_label   (GtkPrintOperation  *op,
-								    const gchar        *label);
-GtkPrintOperationResult gtk_print_operation_run                    (GtkPrintOperation  *op,
-								    GtkPrintOperationAction action,
-								    GtkWindow          *parent,
-								    GError            **error);
-void                    gtk_print_operation_get_error              (GtkPrintOperation  *op,
-								    GError            **error);
-GtkPrintStatus          gtk_print_operation_get_status             (GtkPrintOperation  *op);
-G_CONST_RETURN gchar *  gtk_print_operation_get_status_string      (GtkPrintOperation  *op);
-gboolean                gtk_print_operation_is_finished            (GtkPrintOperation  *op);
-void                    gtk_print_operation_cancel                 (GtkPrintOperation  *op);
-
-GtkPageSetup           *gtk_print_run_page_setup_dialog            (GtkWindow          *parent,
-								    GtkPageSetup       *page_setup,
-								    GtkPrintSettings   *settings);
-
-typedef void  (* GtkPageSetupDoneFunc) (GtkPageSetup *page_setup, 
-					gpointer      data);
-
-void                    gtk_print_run_page_setup_dialog_async      (GtkWindow            *parent,
-								    GtkPageSetup         *page_setup,
-								    GtkPrintSettings     *settings,
-                                                                    GtkPageSetupDoneFunc  done_cb,
-                                                                    gpointer              data);
-
-G_END_DECLS
-
-#endif /* __GTK_PRINT_OPERATION_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprintoperationpreview.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprintoperationpreview.h
deleted file mode 100644
index d2922bf9..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprintoperationpreview.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkprintoperationpreview.h: Abstract print preview interface
- * Copyright (C) 2006, 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 __GTK_PRINT_OPERATION_PREVIEW_H__
-#define __GTK_PRINT_OPERATION_PREVIEW_H__
-
-#include <glib-object.h>
-#include <cairo.h>
-
-#include "gtkprintcontext.h" 
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_PRINT_OPERATION_PREVIEW                  (gtk_print_operation_preview_get_type ())
-#define GTK_PRINT_OPERATION_PREVIEW(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PRINT_OPERATION_PREVIEW, GtkPrintOperationPreview))
-#define GTK_IS_PRINT_OPERATION_PREVIEW(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PRINT_OPERATION_PREVIEW))
-#define GTK_PRINT_OPERATION_PREVIEW_GET_IFACE(obj)        (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_PRINT_OPERATION_PREVIEW, GtkPrintOperationPreviewIface))
-
-typedef struct _GtkPrintOperationPreview      GtkPrintOperationPreview;      /*dummy typedef */
-typedef struct _GtkPrintOperationPreviewIface GtkPrintOperationPreviewIface;
-
-
-struct _GtkPrintOperationPreviewIface
-{
-  GTypeInterface g_iface;
-
-  /* signals */
-  void              (*ready)          (GtkPrintOperationPreview *preview, 
-				       GtkPrintContext          *context);
-  void              (*got_page_size)  (GtkPrintOperationPreview *preview, 
-				       GtkPrintContext          *context,
-				       GtkPageSetup             *page_setup);
-  
- 
-  /* methods */
-  void              (*render_page)    (GtkPrintOperationPreview *preview,
-				       gint                      page_nr);
-  gboolean          (*is_selected)    (GtkPrintOperationPreview *preview,
-				       gint                      page_nr);
-  void              (*end_preview)    (GtkPrintOperationPreview *preview);
-  
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-  void (*_gtk_reserved5) (void);
-  void (*_gtk_reserved6) (void);
-  void (*_gtk_reserved7) (void);
-};
-
-GType   gtk_print_operation_preview_get_type       (void) G_GNUC_CONST;
-
-void     gtk_print_operation_preview_render_page (GtkPrintOperationPreview *preview,
-						  gint                      page_nr);
-void     gtk_print_operation_preview_end_preview (GtkPrintOperationPreview *preview);
-gboolean gtk_print_operation_preview_is_selected (GtkPrintOperationPreview *preview,
-						  gint                      page_nr);
-
-G_END_DECLS
-
-#endif /* __GTK_PRINT_OPERATION_PREVIEW_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprintsettings.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprintsettings.h
deleted file mode 100644
index 0e731187..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprintsettings.h
+++ /dev/null
@@ -1,208 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkprintsettings.h: Print Settings
- * Copyright (C) 2006, 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 __GTK_PRINT_SETTINGS_H__
-#define __GTK_PRINT_SETTINGS_H__
-
-#include <glib-object.h>
-#include "gtkpapersize.h"
-
-G_BEGIN_DECLS
-
-typedef struct _GtkPrintSettings GtkPrintSettings;
-
-#define GTK_TYPE_PRINT_SETTINGS    (gtk_print_settings_get_type ())
-#define GTK_PRINT_SETTINGS(obj)    (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PRINT_SETTINGS, GtkPrintSettings))
-#define GTK_IS_PRINT_SETTINGS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PRINT_SETTINGS))
-
-typedef void  (*GtkPrintSettingsFunc)  (const gchar *key,
-					const gchar *value,
-					gpointer     user_data);
-
-typedef struct _GtkPageRange GtkPageRange;
-struct _GtkPageRange
-{
-  gint start;
-  gint end;
-};
-
-GType             gtk_print_settings_get_type (void) G_GNUC_CONST;
-GtkPrintSettings *gtk_print_settings_new      (void);
-
-GtkPrintSettings *gtk_print_settings_copy                    (GtkPrintSettings     *other);
-
-GtkPrintSettings *gtk_print_settings_new_from_file           (const gchar          *file_name,
-							      GError              **error);
-gboolean          gtk_print_settings_to_file                 (GtkPrintSettings     *settings,
-							      const gchar          *file_name,
-							      GError              **error);
-GtkPrintSettings *gtk_print_settings_new_from_key_file       (GKeyFile             *key_file,
-							      const gchar          *group_name,
-							      GError              **error);
-void              gtk_print_settings_to_key_file             (GtkPrintSettings     *settings,
-							      GKeyFile             *key_file,
-							      const gchar          *group_name);
-gboolean          gtk_print_settings_has_key                 (GtkPrintSettings     *settings,
-							      const gchar          *key);
-G_CONST_RETURN gchar *gtk_print_settings_get                (GtkPrintSettings     *settings,
-							      const gchar          *key);
-void              gtk_print_settings_set                     (GtkPrintSettings     *settings,
-							      const gchar          *key,
-							      const gchar          *value);
-void              gtk_print_settings_unset                   (GtkPrintSettings     *settings,
-							      const gchar          *key);
-void              gtk_print_settings_foreach                 (GtkPrintSettings     *settings,
-							      GtkPrintSettingsFunc  func,
-							      gpointer              user_data);
-gboolean          gtk_print_settings_get_bool                (GtkPrintSettings     *settings,
-							      const gchar          *key);
-void              gtk_print_settings_set_bool                (GtkPrintSettings     *settings,
-							      const gchar          *key,
-							      gboolean              value);
-gdouble           gtk_print_settings_get_double              (GtkPrintSettings     *settings,
-							      const gchar          *key);
-gdouble           gtk_print_settings_get_double_with_default (GtkPrintSettings     *settings,
-							      const gchar          *key,
-							      gdouble               def);
-void              gtk_print_settings_set_double              (GtkPrintSettings     *settings,
-							      const gchar          *key,
-							      gdouble               value);
-gdouble           gtk_print_settings_get_length              (GtkPrintSettings     *settings,
-							      const gchar          *key,
-							      GtkUnit               unit);
-void              gtk_print_settings_set_length              (GtkPrintSettings     *settings,
-							      const gchar          *key,
-							      gdouble               value,
-							      GtkUnit               unit);
-gint              gtk_print_settings_get_int                 (GtkPrintSettings     *settings,
-							      const gchar          *key);
-gint              gtk_print_settings_get_int_with_default    (GtkPrintSettings     *settings,
-							      const gchar          *key,
-							      gint                  def);
-void              gtk_print_settings_set_int                 (GtkPrintSettings     *settings,
-							      const gchar          *key,
-							      gint                  value);
-
-#define GTK_PRINT_SETTINGS_PRINTER        "printer"
-#define GTK_PRINT_SETTINGS_ORIENTATION    "orientation"
-#define GTK_PRINT_SETTINGS_PAPER_FORMAT   "paper-format"
-#define GTK_PRINT_SETTINGS_PAPER_WIDTH    "paper-width"
-#define GTK_PRINT_SETTINGS_PAPER_HEIGHT   "paper-height"
-#define GTK_PRINT_SETTINGS_N_COPIES       "n-copies"
-#define GTK_PRINT_SETTINGS_DEFAULT_SOURCE "default-source"
-#define GTK_PRINT_SETTINGS_QUALITY        "quality"
-#define GTK_PRINT_SETTINGS_RESOLUTION     "resolution"
-#define GTK_PRINT_SETTINGS_USE_COLOR      "use-color"
-#define GTK_PRINT_SETTINGS_DUPLEX         "duplex"
-#define GTK_PRINT_SETTINGS_COLLATE        "collate"
-#define GTK_PRINT_SETTINGS_REVERSE        "reverse"
-#define GTK_PRINT_SETTINGS_MEDIA_TYPE     "media-type"
-#define GTK_PRINT_SETTINGS_DITHER         "dither"
-#define GTK_PRINT_SETTINGS_SCALE          "scale"
-#define GTK_PRINT_SETTINGS_PRINT_PAGES    "print-pages"
-#define GTK_PRINT_SETTINGS_PAGE_RANGES    "page-ranges"
-#define GTK_PRINT_SETTINGS_PAGE_SET       "page-set"
-#define GTK_PRINT_SETTINGS_FINISHINGS     "finishings"
-#define GTK_PRINT_SETTINGS_NUMBER_UP      "number-up"
-#define GTK_PRINT_SETTINGS_OUTPUT_BIN     "output-bin"
-
-#define GTK_PRINT_SETTINGS_OUTPUT_FILE_FORMAT  "output-file-format"
-#define GTK_PRINT_SETTINGS_OUTPUT_URI          "output-uri"
-
-#define GTK_PRINT_SETTINGS_WIN32_DRIVER_VERSION "win32-driver-version"
-#define GTK_PRINT_SETTINGS_WIN32_DRIVER_EXTRA   "win32-driver-extra"
-
-/* Helpers: */
-
-G_CONST_RETURN gchar *gtk_print_settings_get_printer     (GtkPrintSettings   *settings);
-void               gtk_print_settings_set_printer        (GtkPrintSettings   *settings,
-							  const gchar        *printer);
-GtkPageOrientation gtk_print_settings_get_orientation    (GtkPrintSettings   *settings);
-void               gtk_print_settings_set_orientation    (GtkPrintSettings   *settings,
-							  GtkPageOrientation  orientation);
-GtkPaperSize *     gtk_print_settings_get_paper_size     (GtkPrintSettings   *settings);
-void               gtk_print_settings_set_paper_size     (GtkPrintSettings   *settings,
-							  GtkPaperSize       *paper_size);
-gdouble            gtk_print_settings_get_paper_width    (GtkPrintSettings   *settings,
-							  GtkUnit             unit);
-void               gtk_print_settings_set_paper_width    (GtkPrintSettings   *settings,
-							  gdouble             width,
-							  GtkUnit             unit);
-gdouble            gtk_print_settings_get_paper_height   (GtkPrintSettings   *settings,
-							  GtkUnit             unit);
-void               gtk_print_settings_set_paper_height   (GtkPrintSettings   *settings,
-							  gdouble             height,
-							  GtkUnit             unit);
-gboolean           gtk_print_settings_get_use_color      (GtkPrintSettings   *settings);
-void               gtk_print_settings_set_use_color      (GtkPrintSettings   *settings,
-							  gboolean            use_color);
-gboolean           gtk_print_settings_get_collate        (GtkPrintSettings   *settings);
-void               gtk_print_settings_set_collate        (GtkPrintSettings   *settings,
-							  gboolean            collate);
-gboolean           gtk_print_settings_get_reverse        (GtkPrintSettings   *settings);
-void               gtk_print_settings_set_reverse        (GtkPrintSettings   *settings,
-							  gboolean            reverse);
-GtkPrintDuplex     gtk_print_settings_get_duplex         (GtkPrintSettings   *settings);
-void               gtk_print_settings_set_duplex         (GtkPrintSettings   *settings,
-							  GtkPrintDuplex      duplex);
-GtkPrintQuality    gtk_print_settings_get_quality        (GtkPrintSettings   *settings);
-void               gtk_print_settings_set_quality        (GtkPrintSettings   *settings,
-							  GtkPrintQuality     quality);
-gint               gtk_print_settings_get_n_copies       (GtkPrintSettings   *settings);
-void               gtk_print_settings_set_n_copies       (GtkPrintSettings   *settings,
-							  gint                num_copies);
-gint               gtk_print_settings_get_number_up      (GtkPrintSettings   *settings);
-void               gtk_print_settings_set_number_up      (GtkPrintSettings   *settings,
-							  gint                number_up);
-gint               gtk_print_settings_get_resolution     (GtkPrintSettings   *settings);
-void               gtk_print_settings_set_resolution     (GtkPrintSettings   *settings,
-							  gint                resolution);
-gdouble            gtk_print_settings_get_scale          (GtkPrintSettings   *settings);
-void               gtk_print_settings_set_scale          (GtkPrintSettings   *settings,
-							  gdouble             scale);
-GtkPrintPages      gtk_print_settings_get_print_pages    (GtkPrintSettings   *settings);
-void               gtk_print_settings_set_print_pages    (GtkPrintSettings   *settings,
-							  GtkPrintPages       pages);
-GtkPageRange *     gtk_print_settings_get_page_ranges    (GtkPrintSettings   *settings,
-							  gint               *num_ranges);
-void               gtk_print_settings_set_page_ranges    (GtkPrintSettings   *settings,
-							  GtkPageRange       *page_ranges,
-							  gint                num_ranges);
-GtkPageSet         gtk_print_settings_get_page_set       (GtkPrintSettings   *settings);
-void               gtk_print_settings_set_page_set       (GtkPrintSettings   *settings,
-							  GtkPageSet          page_set);
-G_CONST_RETURN gchar *gtk_print_settings_get_default_source (GtkPrintSettings   *settings);
-void               gtk_print_settings_set_default_source (GtkPrintSettings   *settings,
-							  const gchar        *default_source);
-G_CONST_RETURN gchar *gtk_print_settings_get_media_type  (GtkPrintSettings   *settings);
-void               gtk_print_settings_set_media_type     (GtkPrintSettings   *settings,
-							  const gchar        *media_type);
-G_CONST_RETURN gchar *gtk_print_settings_get_dither      (GtkPrintSettings   *settings);
-void               gtk_print_settings_set_dither         (GtkPrintSettings   *settings,
-							  const gchar        *dither);
-G_CONST_RETURN gchar *gtk_print_settings_get_finishings  (GtkPrintSettings   *settings);
-void               gtk_print_settings_set_finishings     (GtkPrintSettings   *settings,
-							  const gchar        *finishings);
-G_CONST_RETURN gchar *gtk_print_settings_get_output_bin  (GtkPrintSettings   *settings);
-void               gtk_print_settings_set_output_bin     (GtkPrintSettings   *settings,
-							  const gchar        *output_bin);
-
-G_END_DECLS
-
-#endif /* __GTK_PRINT_SETTINGS_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprivate.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprivate.h
deleted file mode 100644
index 690cc8a3..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprivate.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_PRIVATE_H__
-#define __GTK_PRIVATE_H__
-
-
-#include <gtk/gtkobject.h>
-#include <gtk/gtkwidget.h>
-
-
-G_BEGIN_DECLS
-
-/* The private flags that are used in the private_flags member of GtkWidget.
- */
-typedef enum
-{
-  PRIVATE_GTK_USER_STYLE	= 1 <<  0,
-  PRIVATE_GTK_RESIZE_PENDING	= 1 <<  2,
-  PRIVATE_GTK_LEAVE_PENDING	= 1 <<  4,
-  PRIVATE_GTK_HAS_SHAPE_MASK	= 1 <<  5,
-  PRIVATE_GTK_IN_REPARENT       = 1 <<  6,
-  PRIVATE_GTK_DIRECTION_SET     = 1 <<  7,   /* If the reading direction is not DIR_NONE */
-  PRIVATE_GTK_DIRECTION_LTR     = 1 <<  8,   /* If the reading direction is DIR_LTR */
-  PRIVATE_GTK_ANCHORED          = 1 <<  9,   /* If widget has a GtkWindow ancestor */
-  PRIVATE_GTK_CHILD_VISIBLE     = 1 <<  10,  /* If widget should be mapped when parent is mapped */
-  PRIVATE_GTK_REDRAW_ON_ALLOC   = 1 <<  11,  /* If we should queue a draw on the entire widget when it is reallocated */
-  PRIVATE_GTK_ALLOC_NEEDED      = 1 <<  12,  /* If we we should allocate even if the allocation is the same */
-  PRIVATE_GTK_REQUEST_NEEDED    = 1 <<  13   /* Whether we need to call gtk_widget_size_request */
-} GtkPrivateFlags;
-
-/* Macros for extracting a widgets private_flags from GtkWidget.
- */
-#define GTK_PRIVATE_FLAGS(wid)            (GTK_WIDGET (wid)->private_flags)
-#define GTK_WIDGET_USER_STYLE(obj)	  ((GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_USER_STYLE) != 0)
-#define GTK_CONTAINER_RESIZE_PENDING(obj) ((GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_RESIZE_PENDING) != 0)
-#define GTK_WIDGET_LEAVE_PENDING(obj)	  ((GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_LEAVE_PENDING) != 0)
-#define GTK_WIDGET_HAS_SHAPE_MASK(obj)	  ((GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_HAS_SHAPE_MASK) != 0)
-#define GTK_WIDGET_IN_REPARENT(obj)	  ((GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_IN_REPARENT) != 0)
-#define GTK_WIDGET_DIRECTION_SET(obj)	  ((GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_DIRECTION_SET) != 0)
-#define GTK_WIDGET_DIRECTION_LTR(obj)     ((GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_DIRECTION_LTR) != 0)
-#define GTK_WIDGET_ANCHORED(obj)          ((GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_ANCHORED) != 0)
-#define GTK_WIDGET_CHILD_VISIBLE(obj)     ((GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_CHILD_VISIBLE) != 0)
-#define GTK_WIDGET_REDRAW_ON_ALLOC(obj)   ((GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_REDRAW_ON_ALLOC) != 0)
-#define GTK_WIDGET_ALLOC_NEEDED(obj)      ((GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_ALLOC_NEEDED) != 0)
-#define GTK_WIDGET_REQUEST_NEEDED(obj)    ((GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_REQUEST_NEEDED) != 0)
-
-/* Macros for setting and clearing private widget flags.
- * we use a preprocessor string concatenation here for a clear
- * flags/private_flags distinction at the cost of single flag operations.
- */
-#define GTK_PRIVATE_SET_FLAG(wid,flag)    G_STMT_START{ (GTK_PRIVATE_FLAGS (wid) |= (PRIVATE_ ## flag)); }G_STMT_END
-#define GTK_PRIVATE_UNSET_FLAG(wid,flag)  G_STMT_START{ (GTK_PRIVATE_FLAGS (wid) &= ~(PRIVATE_ ## flag)); }G_STMT_END
-
-#ifdef G_OS_WIN32
-
-const gchar *_gtk_get_datadir ();
-const gchar *_gtk_get_libdir ();
-const gchar *_gtk_get_sysconfdir ();
-const gchar *_gtk_get_localedir ();
-const gchar *_gtk_get_data_prefix ();
-
-#undef GTK_DATADIR
-#define GTK_DATADIR _gtk_get_datadir ()
-#undef GTK_LIBDIR
-#define GTK_LIBDIR _gtk_get_libdir ()
-#undef GTK_LOCALEDIR
-#define GTK_LOCALEDIR _gtk_get_localedir ()
-#undef GTK_SYSCONFDIR
-#define GTK_SYSCONFDIR _gtk_get_sysconfdir ()
-#undef GTK_DATA_PREFIX
-#define GTK_DATA_PREFIX _gtk_get_data_prefix ()
-
-#endif /* G_OS_WIN32 */
-
-gboolean _gtk_fnmatch (const char *pattern,
-		       const char *string,
-		       gboolean    no_leading_period);
-
-#define GTK_PARAM_READABLE G_PARAM_READABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
-#define GTK_PARAM_WRITABLE G_PARAM_WRITABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
-#define GTK_PARAM_READWRITE G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
-
-G_END_DECLS
-
-#endif /* __GTK_PRIVATE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprogress.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprogress.h
deleted file mode 100644
index 477ae33d..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprogress.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_PROGRESS_H__
-#define __GTK_PROGRESS_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkadjustment.h>
-
-
-G_BEGIN_DECLS
-
-#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
-
-#define GTK_TYPE_PROGRESS            (gtk_progress_get_type ())
-#define GTK_PROGRESS(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_PROGRESS, GtkProgress))
-#define GTK_PROGRESS_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_PROGRESS, GtkProgressClass))
-#define GTK_IS_PROGRESS(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_PROGRESS))
-#define GTK_IS_PROGRESS_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PROGRESS))
-#define GTK_PROGRESS_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_PROGRESS, GtkProgressClass))
-
-#endif /* !GTK_DISABLE_DEPRECATED || GTK_COMPILATION */
-
-typedef struct _GtkProgress       GtkProgress;
-typedef struct _GtkProgressClass  GtkProgressClass;
-
-
-struct _GtkProgress
-{
-  GtkWidget widget;
-
-  GtkAdjustment *adjustment;
-  GdkPixmap     *offscreen_pixmap;
-  gchar         *format;
-  gfloat         x_align;
-  gfloat         y_align;
-
-  guint          show_text : 1;
-  guint          activity_mode : 1;
-  guint          use_text_format : 1;
-};
-
-struct _GtkProgressClass
-{
-  GtkWidgetClass parent_class;
-
-  void (* paint)            (GtkProgress *progress);
-  void (* update)           (GtkProgress *progress);
-  void (* act_mode_enter)   (GtkProgress *progress);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-/* This entire interface is deprecated. Use GtkProgressBar
- * directly.
- */
-
-#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
-
-GType      gtk_progress_get_type            (void) G_GNUC_CONST;
-void       gtk_progress_set_show_text       (GtkProgress   *progress,
-					     gboolean       show_text);
-void       gtk_progress_set_text_alignment  (GtkProgress   *progress,
-					     gfloat         x_align,
-					     gfloat         y_align);
-void       gtk_progress_set_format_string   (GtkProgress   *progress,
-					     const gchar   *format);
-void       gtk_progress_set_adjustment      (GtkProgress   *progress,
-					     GtkAdjustment *adjustment);
-void       gtk_progress_configure           (GtkProgress   *progress,
-					     gdouble        value,
-					     gdouble        hmin,
-					     gdouble        max);
-void       gtk_progress_set_percentage      (GtkProgress   *progress,
-					     gdouble        percentage);
-void       gtk_progress_set_value           (GtkProgress   *progress,
-					     gdouble        value);
-gdouble    gtk_progress_get_value           (GtkProgress   *progress);
-void       gtk_progress_set_activity_mode   (GtkProgress   *progress,
-					     gboolean       activity_mode);
-gchar*     gtk_progress_get_current_text    (GtkProgress   *progress);
-gchar*     gtk_progress_get_text_from_value (GtkProgress   *progress,
-					     gdouble        value);
-gdouble    gtk_progress_get_current_percentage (GtkProgress *progress);
-gdouble    gtk_progress_get_percentage_from_value (GtkProgress *progress,
-						   gdouble      value);
-
-#endif /* !GTK_DISABLE_DEPRECATED || GTK_COMPILATION */
-
-G_END_DECLS
-
-#endif /* __GTK_PROGRESS_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprogressbar.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprogressbar.h
deleted file mode 100644
index 1e556164..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkprogressbar.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_PROGRESS_BAR_H__
-#define __GTK_PROGRESS_BAR_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkprogress.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_PROGRESS_BAR            (gtk_progress_bar_get_type ())
-#define GTK_PROGRESS_BAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PROGRESS_BAR, GtkProgressBar))
-#define GTK_PROGRESS_BAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PROGRESS_BAR, GtkProgressBarClass))
-#define GTK_IS_PROGRESS_BAR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PROGRESS_BAR))
-#define GTK_IS_PROGRESS_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PROGRESS_BAR))
-#define GTK_PROGRESS_BAR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PROGRESS_BAR, GtkProgressBarClass))
-
-
-typedef struct _GtkProgressBar       GtkProgressBar;
-typedef struct _GtkProgressBarClass  GtkProgressBarClass;
-
-typedef enum
-{
-  GTK_PROGRESS_CONTINUOUS,
-  GTK_PROGRESS_DISCRETE
-} GtkProgressBarStyle;
-
-typedef enum
-{
-  GTK_PROGRESS_LEFT_TO_RIGHT,
-  GTK_PROGRESS_RIGHT_TO_LEFT,
-  GTK_PROGRESS_BOTTOM_TO_TOP,
-  GTK_PROGRESS_TOP_TO_BOTTOM
-} GtkProgressBarOrientation;
-
-struct _GtkProgressBar
-{
-  GtkProgress progress;
-
-  GtkProgressBarStyle bar_style;
-  GtkProgressBarOrientation orientation;
-
-  guint blocks;
-  gint  in_block;
-
-  gint  activity_pos;
-  guint activity_step;
-  guint activity_blocks;
-
-  gdouble pulse_fraction;
-  
-  guint activity_dir : 1;
-  guint ellipsize : 3;
-  guint dirty : 1;
-};
-
-struct _GtkProgressBarClass
-{
-  GtkProgressClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType      gtk_progress_bar_get_type             (void) G_GNUC_CONST;
-GtkWidget* gtk_progress_bar_new                  (void);
-
-/*
- * GtkProgress/GtkProgressBar had serious problems in GTK 1.2.
- * 
- *  - Only 3 or 4 functions are really needed for 95% of progress  
- *    interfaces; GtkProgress[Bar] had about 25 functions, and 
- *    didn't even include these 3 or 4.
- *  - In activity mode, the API involves setting the adjustment 
- *    to any random value, just to have the side effect of 
- *    calling the progress bar update function - the adjustment
- *    is totally ignored in activity mode
- *  - You set the activity step as a pixel value, which means to 
- *    set the activity step you basically need to connect to 
- *    size_allocate
- *  - There are ctree_set_expander_style()-functions, to randomly 
- *    change look-and-feel for no good reason
- *  - The split between GtkProgress and GtkProgressBar makes no sense 
- *    to me whatsoever.
- *  
- * This was a big wart on GTK and made people waste lots of time,
- * both learning and using the interface.
- * 
- * So, I have added what I feel is the correct API, and marked all the
- * rest deprecated. However, the changes are 100% backward-compatible and
- * should break no existing code.
- *
- * The following 9 functions are the new programming interface. 
- */
-void       gtk_progress_bar_pulse                (GtkProgressBar *pbar);
-void       gtk_progress_bar_set_text             (GtkProgressBar *pbar,
-                                                  const gchar    *text);
-void       gtk_progress_bar_set_fraction         (GtkProgressBar *pbar,
-                                                  gdouble         fraction);
-
-void       gtk_progress_bar_set_pulse_step       (GtkProgressBar *pbar,
-                                                  gdouble         fraction);
-void       gtk_progress_bar_set_orientation      (GtkProgressBar *pbar,
-						  GtkProgressBarOrientation orientation);
-
-G_CONST_RETURN gchar* gtk_progress_bar_get_text       (GtkProgressBar *pbar);
-gdouble               gtk_progress_bar_get_fraction   (GtkProgressBar *pbar);
-gdouble               gtk_progress_bar_get_pulse_step (GtkProgressBar *pbar);
-
-GtkProgressBarOrientation gtk_progress_bar_get_orientation (GtkProgressBar *pbar);
-void               gtk_progress_bar_set_ellipsize (GtkProgressBar     *pbar,
-						   PangoEllipsizeMode  mode);
-PangoEllipsizeMode gtk_progress_bar_get_ellipsize (GtkProgressBar     *pbar);
-
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-/* Everything below here is deprecated */
-GtkWidget* gtk_progress_bar_new_with_adjustment  (GtkAdjustment  *adjustment);
-void       gtk_progress_bar_set_bar_style        (GtkProgressBar *pbar,
-						  GtkProgressBarStyle style);
-void       gtk_progress_bar_set_discrete_blocks  (GtkProgressBar *pbar,
-						  guint           blocks);
-/* set_activity_step() is not only deprecated, it doesn't even work.
- * (Of course, it wasn't usable anyway, you had to set it from a size_allocate
- * handler or something)
- */
-void       gtk_progress_bar_set_activity_step    (GtkProgressBar *pbar,
-                                                  guint           step);
-void       gtk_progress_bar_set_activity_blocks  (GtkProgressBar *pbar,
-						  guint           blocks);
-void       gtk_progress_bar_update               (GtkProgressBar *pbar,
-						  gdouble         percentage);
-
-#endif /* GTK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GTK_PROGRESS_BAR_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkquery.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkquery.h
deleted file mode 100644
index 7e32eb6e..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkquery.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2005 Novell, 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,
- *
- * Author: Anders Carlsson <andersca@imendio.com>
- *
- * Based on nautilus-query.h
- */
-
-#ifndef __GTK_QUERY_H__
-#define __GTK_QUERY_H__
-
-/* This is a "semi-private" header; it is meant only for
- * alternate GtkFileChooser implementations; no stability guarantees 
- * are made at this point
- */
-#ifndef GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
-#error "gtkfilechooserprivate.h is not supported API for general use"
-#endif
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_QUERY		(_gtk_query_get_type ())
-#define GTK_QUERY(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_QUERY, GtkQuery))
-#define GTK_QUERY_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_QUERY, GtkQueryClass))
-#define GTK_IS_QUERY(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_QUERY))
-#define GTK_IS_QUERY_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_QUERY))
-#define GTK_QUERY_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_QUERY, GtkQueryClass))
-
-typedef struct _GtkQuery GtkQuery;
-typedef struct _GtkQueryClass GtkQueryClass;
-typedef struct _GtkQueryPrivate GtkQueryPrivate;
-
-struct _GtkQuery 
-{
-  GObject parent;
-
-  GtkQueryPrivate *priv;
-};
-
-struct _GtkQueryClass
-{
-  GObjectClass parent_class;
-};
-
-GType     _gtk_query_get_type       (void);
-gboolean  _gtk_query_enabled        (void);
-
-GtkQuery* _gtk_query_new            (void);
-
-gchar*    _gtk_query_get_text       (GtkQuery    *query);
-void      _gtk_query_set_text       (GtkQuery    *query, 
-				     const gchar *text);
-
-gchar*    _gtk_query_get_location   (GtkQuery    *query);
-void      _gtk_query_set_location   (GtkQuery    *query, 
-				     const gchar *uri);
-
-GList*    _gtk_query_get_mime_types (GtkQuery    *query);
-void      _gtk_query_set_mime_types (GtkQuery    *query, 
-				     GList       *mime_types);
-void      _gtk_query_add_mime_type  (GtkQuery    *query, 
-				     const gchar *mime_type);
-
-G_END_DECLS
-
-#endif /* __GTK_QUERY_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkradioaction.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkradioaction.h
deleted file mode 100644
index d39648b4..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkradioaction.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * GTK - The GIMP Toolkit
- * Copyright (C) 1998, 1999 Red Hat, Inc.
- * All rights reserved.
- *
- * 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 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.
- */
-
-/*
- * Author: James Henstridge <james@daa.com.au>
- *
- * Modified by the GTK+ Team and others 2003.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-#ifndef __GTK_RADIO_ACTION_H__
-#define __GTK_RADIO_ACTION_H__
-
-#include <gtk/gtktoggleaction.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_RADIO_ACTION            (gtk_radio_action_get_type ())
-#define GTK_RADIO_ACTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RADIO_ACTION, GtkRadioAction))
-#define GTK_RADIO_ACTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RADIO_ACTION, GtkRadioActionClass))
-#define GTK_IS_RADIO_ACTION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RADIO_ACTION))
-#define GTK_IS_RADIO_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RADIO_ACTION))
-#define GTK_RADIO_ACTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_RADIO_ACTION, GtkRadioActionClass))
-
-typedef struct _GtkRadioAction        GtkRadioAction;
-typedef struct _GtkRadioActionPrivate GtkRadioActionPrivate;
-typedef struct _GtkRadioActionClass   GtkRadioActionClass;
-
-struct _GtkRadioAction
-{
-  GtkToggleAction parent;
-
-  /*< private >*/
-
-  GtkRadioActionPrivate *private_data;
-};
-
-struct _GtkRadioActionClass
-{
-  GtkToggleActionClass parent_class;
-
-  void       (* changed) (GtkRadioAction *action, GtkRadioAction *current);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType           gtk_radio_action_get_type          (void) G_GNUC_CONST;
-GtkRadioAction *gtk_radio_action_new               (const gchar           *name,
-                                                    const gchar           *label,
-                                                    const gchar           *tooltip,
-                                                    const gchar           *stock_id,
-                                                    gint                   value);
-GSList         *gtk_radio_action_get_group         (GtkRadioAction        *action);
-void            gtk_radio_action_set_group         (GtkRadioAction        *action,
-                                                    GSList                *group);
-gint            gtk_radio_action_get_current_value (GtkRadioAction        *action);
-void            gtk_radio_action_set_current_value (GtkRadioAction        *action,
-                                                    gint                   current_value);
-
-G_END_DECLS
-
-#endif  /* __GTK_RADIO_ACTION_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkradiobutton.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkradiobutton.h
deleted file mode 100644
index 0d885e63..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkradiobutton.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_RADIO_BUTTON_H__
-#define __GTK_RADIO_BUTTON_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkcheckbutton.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_RADIO_BUTTON		       (gtk_radio_button_get_type ())
-#define GTK_RADIO_BUTTON(obj)		       (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RADIO_BUTTON, GtkRadioButton))
-#define GTK_RADIO_BUTTON_CLASS(klass)	       (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RADIO_BUTTON, GtkRadioButtonClass))
-#define GTK_IS_RADIO_BUTTON(obj)	       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RADIO_BUTTON))
-#define GTK_IS_RADIO_BUTTON_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RADIO_BUTTON))
-#define GTK_RADIO_BUTTON_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_RADIO_BUTTON, GtkRadioButtonClass))
-
-
-typedef struct _GtkRadioButton	     GtkRadioButton;
-typedef struct _GtkRadioButtonClass  GtkRadioButtonClass;
-
-struct _GtkRadioButton
-{
-  GtkCheckButton check_button;
-  
-  GSList *group;
-};
-
-struct _GtkRadioButtonClass
-{
-  GtkCheckButtonClass parent_class;
-
-  /* Signals */
-  void (*group_changed) (GtkRadioButton *radio_button);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType	   gtk_radio_button_get_type	     (void) G_GNUC_CONST;
-
-GtkWidget* gtk_radio_button_new                           (GSList         *group);
-GtkWidget* gtk_radio_button_new_from_widget               (GtkRadioButton *radio_group_member);
-GtkWidget* gtk_radio_button_new_with_label                (GSList         *group,
-                                                           const gchar    *label);
-GtkWidget* gtk_radio_button_new_with_label_from_widget    (GtkRadioButton *radio_group_member,
-                                                           const gchar    *label);
-GtkWidget* gtk_radio_button_new_with_mnemonic             (GSList         *group,
-                                                           const gchar    *label);
-GtkWidget* gtk_radio_button_new_with_mnemonic_from_widget (GtkRadioButton *radio_group_member,
-                                                           const gchar    *label);
-GSList*    gtk_radio_button_get_group                     (GtkRadioButton *radio_button);
-void       gtk_radio_button_set_group                     (GtkRadioButton *radio_button,
-                                                           GSList         *group);
-
-#ifndef GTK_DISABLE_DEPRECATED
-#define gtk_radio_button_group gtk_radio_button_get_group
-#endif
-
-G_END_DECLS
-
-#endif /* __GTK_RADIO_BUTTON_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkradiomenuitem.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkradiomenuitem.h
deleted file mode 100644
index 2adb5636..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkradiomenuitem.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_RADIO_MENU_ITEM_H__
-#define __GTK_RADIO_MENU_ITEM_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkcheckmenuitem.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_RADIO_MENU_ITEM	      (gtk_radio_menu_item_get_type ())
-#define GTK_RADIO_MENU_ITEM(obj)	      (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItem))
-#define GTK_RADIO_MENU_ITEM_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItemClass))
-#define GTK_IS_RADIO_MENU_ITEM(obj)	      (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RADIO_MENU_ITEM))
-#define GTK_IS_RADIO_MENU_ITEM_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RADIO_MENU_ITEM))
-#define GTK_RADIO_MENU_ITEM_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItemClass))
-
-
-typedef struct _GtkRadioMenuItem       GtkRadioMenuItem;
-typedef struct _GtkRadioMenuItemClass  GtkRadioMenuItemClass;
-
-struct _GtkRadioMenuItem
-{
-  GtkCheckMenuItem check_menu_item;
-  
-  GSList *group;
-};
-
-struct _GtkRadioMenuItemClass
-{
-  GtkCheckMenuItemClass parent_class;
-  
-  /* Signals */
-  void (*group_changed) (GtkRadioMenuItem *radio_menu_item);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType      gtk_radio_menu_item_get_type	         (void) G_GNUC_CONST;
-							
-GtkWidget* gtk_radio_menu_item_new                           (GSList           *group);
-GtkWidget* gtk_radio_menu_item_new_with_label                (GSList           *group,
-							      const gchar      *label);
-GtkWidget* gtk_radio_menu_item_new_with_mnemonic             (GSList           *group,
-							      const gchar      *label);
-GtkWidget* gtk_radio_menu_item_new_from_widget               (GtkRadioMenuItem *group);
-GtkWidget *gtk_radio_menu_item_new_with_mnemonic_from_widget (GtkRadioMenuItem *group,
-							      const gchar      *label);
-GtkWidget *gtk_radio_menu_item_new_with_label_from_widget    (GtkRadioMenuItem *group,
-							      const gchar      *label);
-GSList*    gtk_radio_menu_item_get_group                     (GtkRadioMenuItem *radio_menu_item);
-void       gtk_radio_menu_item_set_group                     (GtkRadioMenuItem *radio_menu_item,
-							      GSList           *group);
-
-#ifndef GTK_DISABLE_DEPRECATED
-#define gtk_radio_menu_item_group gtk_radio_menu_item_get_group
-#endif
-
-G_END_DECLS
-
-#endif /* __GTK_RADIO_MENU_ITEM_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkradiotoolbutton.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkradiotoolbutton.h
deleted file mode 100644
index febdcf77..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkradiotoolbutton.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* gtkradiotoolbutton.h
- *
- * Copyright (C) 2002 Anders Carlsson <andersca@gnome.org>
- * Copyright (C) 2002 James Henstridge <james@daa.com.au>
- * Copyright (C) 2003 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 __GTK_RADIO_TOOL_BUTTON_H__
-#define __GTK_RADIO_TOOL_BUTTON_H__
-
-#include "gtktoggletoolbutton.h"
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_RADIO_TOOL_BUTTON            (gtk_radio_tool_button_get_type ())
-#define GTK_RADIO_TOOL_BUTTON(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RADIO_TOOL_BUTTON, GtkRadioToolButton))
-#define GTK_RADIO_TOOL_BUTTON_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RADIO_TOOL_BUTTON, GtkRadioToolButtonClass))
-#define GTK_IS_RADIO_TOOL_BUTTON(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RADIO_TOOL_BUTTON))
-#define GTK_IS_RADIO_TOOL_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RADIO_TOOL_BUTTON))
-#define GTK_RADIO_TOOL_BUTTON_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_RADIO_TOOL_BUTTON, GtkRadioToolButtonClass))
-
-typedef struct _GtkRadioToolButton      GtkRadioToolButton;
-typedef struct _GtkRadioToolButtonClass GtkRadioToolButtonClass;
-
-struct _GtkRadioToolButton
-{
-  GtkToggleToolButton parent;
-};
-
-struct _GtkRadioToolButtonClass
-{
-  GtkToggleToolButtonClass parent_class;
-
-  /* Padding for future expansion */
-  void (* _gtk_reserved1) (void);
-  void (* _gtk_reserved2) (void);
-  void (* _gtk_reserved3) (void);
-  void (* _gtk_reserved4) (void);
-};
-
-GType        gtk_radio_tool_button_get_type       (void) G_GNUC_CONST;
-
-GtkToolItem *gtk_radio_tool_button_new                        (GSList             *group);
-GtkToolItem *gtk_radio_tool_button_new_from_stock             (GSList             *group,
-							       const gchar        *stock_id);
-GtkToolItem *gtk_radio_tool_button_new_from_widget            (GtkRadioToolButton *group);
-GtkToolItem *gtk_radio_tool_button_new_with_stock_from_widget (GtkRadioToolButton *group,
-							       const gchar        *stock_id);
-GSList *     gtk_radio_tool_button_get_group                  (GtkRadioToolButton *button);
-void         gtk_radio_tool_button_set_group                  (GtkRadioToolButton *button,
-							       GSList             *group);
-
-G_END_DECLS
-
-#endif /* __GTK_RADIO_TOOL_BUTTON_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrange.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrange.h
deleted file mode 100644
index 7ebb9df6..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrange.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_RANGE_H__
-#define __GTK_RANGE_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkadjustment.h>
-#include <gtk/gtkwidget.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_RANGE            (gtk_range_get_type ())
-#define GTK_RANGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RANGE, GtkRange))
-#define GTK_RANGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RANGE, GtkRangeClass))
-#define GTK_IS_RANGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RANGE))
-#define GTK_IS_RANGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RANGE))
-#define GTK_RANGE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_RANGE, GtkRangeClass))
-
-/* These two are private/opaque types, ignore */
-typedef struct _GtkRangeLayout    GtkRangeLayout;
-typedef struct _GtkRangeStepTimer GtkRangeStepTimer;
-
-typedef struct _GtkRange        GtkRange;
-typedef struct _GtkRangeClass   GtkRangeClass;
-
-struct _GtkRange
-{
-  GtkWidget widget;
-
-  GtkAdjustment *adjustment;
-  GtkUpdateType update_policy;
-  guint inverted : 1;
-
-  /*< protected >*/
-  
-  guint flippable : 1;
-  
-  /* Steppers are: < > ---- < >
-   *               a b      c d
-   */
-   
-  guint has_stepper_a : 1;
-  guint has_stepper_b : 1;
-  guint has_stepper_c : 1;
-  guint has_stepper_d : 1;
-
-  guint need_recalc : 1;
-
-  guint slider_size_fixed : 1;
-  
-  gint min_slider_size;
-
-  GtkOrientation orientation;
-
-  /* Area of entire stepper + trough assembly in widget->window coords */
-  GdkRectangle range_rect;
-  /* Slider range along the long dimension, in widget->window coords */
-  gint slider_start, slider_end;
-
-  /* Round off value to this many digits, -1 for no rounding */
-  gint round_digits;
-  
-  /*< private >*/
-  guint trough_click_forward : 1;  /* trough click was on the forward side of slider */
-  guint update_pending : 1;        /* need to emit value_changed */
-  GtkRangeLayout *layout;
-  GtkRangeStepTimer *timer;
-  gint slide_initial_slider_position;
-  gint slide_initial_coordinate;
-  guint update_timeout_id;
-  GdkWindow *event_window;
-};
-
-struct _GtkRangeClass
-{
-  GtkWidgetClass parent_class;
-
-  /* what detail to pass to GTK drawing functions */
-  gchar *slider_detail;
-  gchar *stepper_detail;
-
-  void (* value_changed)    (GtkRange     *range);
-  void (* adjust_bounds)    (GtkRange     *range,
-                             gdouble	   new_value);
-  
-  /* action signals for keybindings */
-  void (* move_slider)      (GtkRange     *range,
-                             GtkScrollType scroll);
-
-  /* Virtual functions */
-  void (* get_range_border) (GtkRange     *range,
-                             GtkBorder    *border_);
-
-  gboolean (* change_value) (GtkRange     *range,
-                             GtkScrollType scroll,
-                             gdouble       new_value);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-};
-
-
-GType              gtk_range_get_type                      (void) G_GNUC_CONST;
-
-void               gtk_range_set_update_policy             (GtkRange      *range,
-                                                            GtkUpdateType  policy);
-GtkUpdateType      gtk_range_get_update_policy             (GtkRange      *range);
-
-void               gtk_range_set_adjustment                (GtkRange      *range,
-                                                            GtkAdjustment *adjustment);
-GtkAdjustment*     gtk_range_get_adjustment                (GtkRange      *range);
-
-void               gtk_range_set_inverted                  (GtkRange      *range,
-                                                            gboolean       setting);
-gboolean           gtk_range_get_inverted                  (GtkRange      *range);
-
-void               gtk_range_set_lower_stepper_sensitivity (GtkRange      *range,
-                                                            GtkSensitivityType sensitivity);
-GtkSensitivityType gtk_range_get_lower_stepper_sensitivity (GtkRange      *range);
-void               gtk_range_set_upper_stepper_sensitivity (GtkRange      *range,
-                                                            GtkSensitivityType sensitivity);
-GtkSensitivityType gtk_range_get_upper_stepper_sensitivity (GtkRange      *range);
-
-void               gtk_range_set_increments                (GtkRange      *range,
-                                                            gdouble        step,
-                                                            gdouble        page);
-void               gtk_range_set_range                     (GtkRange      *range,
-                                                            gdouble        min,
-                                                            gdouble        max);
-void               gtk_range_set_value                     (GtkRange      *range,
-                                                            gdouble        value);
-gdouble            gtk_range_get_value                     (GtkRange      *range);
-
-void               gtk_range_set_show_fill_level           (GtkRange      *range,
-                                                            gboolean       show_fill_level);
-gboolean           gtk_range_get_show_fill_level           (GtkRange      *range);
-void               gtk_range_set_restrict_to_fill_level    (GtkRange      *range,
-                                                            gboolean       restrict_to_fill_level);
-gboolean           gtk_range_get_restrict_to_fill_level    (GtkRange      *range);
-void               gtk_range_set_fill_level                (GtkRange      *range,
-                                                            gdouble        fill_level);
-gdouble            gtk_range_get_fill_level                (GtkRange      *range);
-
-gdouble            _gtk_range_get_wheel_delta              (GtkRange      *range,
-                                                            GdkScrollDirection direction);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_RANGE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrc.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrc.h
deleted file mode 100644
index c6880af2..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrc.h
+++ /dev/null
@@ -1,267 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_RC_H__
-#define __GTK_RC_H__
-
-
-#include <gtk/gtkstyle.h>
-
-G_BEGIN_DECLS
-
-/* Forward declarations */
-typedef struct _GtkIconFactory  GtkIconFactory;
-typedef struct _GtkRcContext    GtkRcContext;
-
-typedef struct _GtkRcStyleClass GtkRcStyleClass;
-
-#define GTK_TYPE_RC_STYLE              (gtk_rc_style_get_type ())
-#define GTK_RC_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GTK_TYPE_RC_STYLE, GtkRcStyle))
-#define GTK_RC_STYLE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RC_STYLE, GtkRcStyleClass))
-#define GTK_IS_RC_STYLE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GTK_TYPE_RC_STYLE))
-#define GTK_IS_RC_STYLE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RC_STYLE))
-#define GTK_RC_STYLE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_RC_STYLE, GtkRcStyleClass))
-
-typedef enum
-{
-  GTK_RC_FG		= 1 << 0,
-  GTK_RC_BG		= 1 << 1,
-  GTK_RC_TEXT		= 1 << 2,
-  GTK_RC_BASE		= 1 << 3
-} GtkRcFlags;
-
-struct _GtkRcStyle
-{
-  GObject parent_instance;
-
-  /*< public >*/
-  
-  gchar *name;
-  gchar *bg_pixmap_name[5];
-  PangoFontDescription *font_desc;
-
-  GtkRcFlags color_flags[5];
-  GdkColor   fg[5];
-  GdkColor   bg[5];
-  GdkColor   text[5];
-  GdkColor   base[5];
-
-  gint xthickness;
-  gint ythickness;
-
-  /*< private >*/
-  GArray *rc_properties;
-  
-  /* list of RC style lists including this RC style */
-  GSList *rc_style_lists;
-
-  GSList *icon_factories;
-
-  guint engine_specified : 1;	/* The RC file specified the engine */
-};
-
-struct _GtkRcStyleClass
-{
-  GObjectClass parent_class;
-
-  /* Create an empty RC style of the same type as this RC style.
-   * The default implementation, which does
-   * g_object_new (G_OBJECT_TYPE (style), NULL);
-   * should work in most cases.
-   */
-  GtkRcStyle * (*create_rc_style) (GtkRcStyle *rc_style);
-
-  /* Fill in engine specific parts of GtkRcStyle by parsing contents
-   * of brackets. Returns G_TOKEN_NONE if successful, otherwise returns
-   * the token it expected but didn't get.
-   */
-  guint     (*parse)  (GtkRcStyle   *rc_style,
-		       GtkSettings  *settings,
-		       GScanner     *scanner);
-  
-  /* Combine RC style data from src into dest. If overridden, this
-   * function should chain to the parent.
-   */
-  void      (*merge)  (GtkRcStyle *dest,
-		       GtkRcStyle *src);
-
-  /* Create an empty style suitable to this RC style
-   */
-  GtkStyle * (*create_style) (GtkRcStyle *rc_style);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-#ifdef G_OS_WIN32
-/* Reserve old names for DLL ABI backward compatibility */
-#define gtk_rc_add_default_file gtk_rc_add_default_file_utf8
-#define gtk_rc_set_default_files gtk_rc_set_default_files_utf8
-#define gtk_rc_parse gtk_rc_parse_utf8
-#endif
-
-void	  _gtk_rc_init			 (void);
-GSList*   _gtk_rc_parse_widget_class_path (const gchar *pattern);
-void      _gtk_rc_free_widget_class_path (GSList       *list);
-gboolean  _gtk_rc_match_widget_class     (GSList       *list,
-                                          gint          length,
-                                          gchar        *path,
-                                          gchar        *path_reversed);
-
-void      gtk_rc_add_default_file	(const gchar *filename);
-void      gtk_rc_set_default_files      (gchar **filenames);
-gchar**   gtk_rc_get_default_files      (void);
-GtkStyle* gtk_rc_get_style		(GtkWidget   *widget);
-GtkStyle* gtk_rc_get_style_by_paths     (GtkSettings *settings,
-					 const char  *widget_path,
-					 const char  *class_path,
-					 GType        type);
-
-gboolean gtk_rc_reparse_all_for_settings (GtkSettings *settings,
-					  gboolean     force_load);
-void     gtk_rc_reset_styles             (GtkSettings *settings);
-
-gchar*   gtk_rc_find_pixmap_in_path (GtkSettings  *settings,
-				     GScanner     *scanner,
-				     const gchar  *pixmap_file);
-
-void	  gtk_rc_parse			(const gchar *filename);
-void	  gtk_rc_parse_string		(const gchar *rc_string);
-gboolean  gtk_rc_reparse_all		(void);
-
-#ifndef GTK_DISABLE_DEPRECATED
-void	  gtk_rc_add_widget_name_style	(GtkRcStyle   *rc_style,
-					 const gchar  *pattern);
-void	  gtk_rc_add_widget_class_style (GtkRcStyle   *rc_style,
-					 const gchar  *pattern);
-void	  gtk_rc_add_class_style	(GtkRcStyle   *rc_style,
-					 const gchar  *pattern);
-#endif /* GTK_DISABLE_DEPRECATED */
-
-
-GType       gtk_rc_style_get_type   (void) G_GNUC_CONST;
-GtkRcStyle* gtk_rc_style_new        (void);
-GtkRcStyle* gtk_rc_style_copy       (GtkRcStyle *orig);
-
-#ifndef GTK_DISABLE_DEPRECATED
-void        gtk_rc_style_ref        (GtkRcStyle *rc_style);
-void        gtk_rc_style_unref      (GtkRcStyle *rc_style);
-#endif
-
-gchar*		gtk_rc_find_module_in_path	(const gchar 	*module_file);
-gchar*		gtk_rc_get_theme_dir		(void);
-gchar*		gtk_rc_get_module_dir		(void);
-gchar*		gtk_rc_get_im_module_path	(void);
-gchar*		gtk_rc_get_im_module_file	(void);
-
-/* private functions/definitions */
-typedef enum {
-  GTK_RC_TOKEN_INVALID = G_TOKEN_LAST,
-  GTK_RC_TOKEN_INCLUDE,
-  GTK_RC_TOKEN_NORMAL,
-  GTK_RC_TOKEN_ACTIVE,
-  GTK_RC_TOKEN_PRELIGHT,
-  GTK_RC_TOKEN_SELECTED,
-  GTK_RC_TOKEN_INSENSITIVE,
-  GTK_RC_TOKEN_FG,
-  GTK_RC_TOKEN_BG,
-  GTK_RC_TOKEN_TEXT,
-  GTK_RC_TOKEN_BASE,
-  GTK_RC_TOKEN_XTHICKNESS,
-  GTK_RC_TOKEN_YTHICKNESS,
-  GTK_RC_TOKEN_FONT,
-  GTK_RC_TOKEN_FONTSET,
-  GTK_RC_TOKEN_FONT_NAME,
-  GTK_RC_TOKEN_BG_PIXMAP,
-  GTK_RC_TOKEN_PIXMAP_PATH,
-  GTK_RC_TOKEN_STYLE,
-  GTK_RC_TOKEN_BINDING,
-  GTK_RC_TOKEN_BIND,
-  GTK_RC_TOKEN_WIDGET,
-  GTK_RC_TOKEN_WIDGET_CLASS,
-  GTK_RC_TOKEN_CLASS,
-  GTK_RC_TOKEN_LOWEST,
-  GTK_RC_TOKEN_GTK,
-  GTK_RC_TOKEN_APPLICATION,
-  GTK_RC_TOKEN_THEME,
-  GTK_RC_TOKEN_RC,
-  GTK_RC_TOKEN_HIGHEST,
-  GTK_RC_TOKEN_ENGINE,
-  GTK_RC_TOKEN_MODULE_PATH,
-  GTK_RC_TOKEN_IM_MODULE_PATH,
-  GTK_RC_TOKEN_IM_MODULE_FILE,
-  GTK_RC_TOKEN_STOCK,
-  GTK_RC_TOKEN_LTR,
-  GTK_RC_TOKEN_RTL,
-  GTK_RC_TOKEN_COLOR,
-  GTK_RC_TOKEN_UNBIND,
-  GTK_RC_TOKEN_LAST
-} GtkRcTokenType;
-
-GScanner* gtk_rc_scanner_new	(void);
-guint	  gtk_rc_parse_color	(GScanner	     *scanner,
-				 GdkColor	     *color);
-guint	  gtk_rc_parse_color_full (GScanner	     *scanner,
-                                   GtkRcStyle        *style,
-				   GdkColor	     *color);
-guint	  gtk_rc_parse_state	(GScanner	     *scanner,
-				 GtkStateType	     *state);
-guint	  gtk_rc_parse_priority	(GScanner	     *scanner,
-				 GtkPathPriorityType *priority);
-
-/* rc properties
- * (structure forward declared in gtkstyle.h)
- */
-struct _GtkRcProperty
-{
-  /* quark-ified property identifier like "GtkScrollbar::spacing" */
-  GQuark type_name;
-  GQuark property_name;
-
-  /* fields similar to GtkSettingsValue */
-  gchar *origin;
-  GValue value;
-};
-const GtkRcProperty* _gtk_rc_style_lookup_rc_property (GtkRcStyle *rc_style,
-						       GQuark      type_name,
-						       GQuark      property_name);
-void	      _gtk_rc_style_set_rc_property	      (GtkRcStyle *rc_style,
-						       GtkRcProperty *property);
-void	      _gtk_rc_style_unset_rc_property	      (GtkRcStyle *rc_style,
-						       GQuark      type_name,
-						       GQuark      property_name);
-
-GSList     * _gtk_rc_style_get_color_hashes        (GtkRcStyle *rc_style);
-
-const gchar* _gtk_rc_context_get_default_font_name (GtkSettings *settings);
-void         _gtk_rc_context_destroy               (GtkSettings *settings);
-
-G_END_DECLS
-
-#endif /* __GTK_RC_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentaction.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentaction.h
deleted file mode 100644
index 776f9426..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentaction.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Recent chooser action for GtkUIManager
- *
- * Copyright (C) 2007, Emmanuele Bassi
- * 
- * 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 __GTK_RECENT_ACTION_H__
-#define __GTK_RECENT_ACTION_H__
-
-#include <gtk/gtkaction.h>
-#include <gtk/gtkrecentmanager.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_RECENT_ACTION                  (gtk_recent_action_get_type ())
-#define GTK_RECENT_ACTION(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RECENT_ACTION, GtkRecentAction))
-#define GTK_IS_RECENT_ACTION(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RECENT_ACTION))
-#define GTK_RECENT_ACTION_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RECENT_ACTION, GtkRecentActionClass))
-#define GTK_IS_RECENT_ACTION_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RECENT_ACTION))
-#define GTK_RECENT_ACTION_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_RECENT_ACTION, GtkRecentActionClass))
-
-typedef struct _GtkRecentAction         GtkRecentAction;
-typedef struct _GtkRecentActionPrivate  GtkRecentActionPrivate;
-typedef struct _GtkRecentActionClass    GtkRecentActionClass;
-
-struct _GtkRecentAction
-{
-  GtkAction parent_instance;
-  
-  /*< private >*/
-  GtkRecentActionPrivate *priv;
-};
-
-struct _GtkRecentActionClass
-{
-  GtkActionClass parent_class;
-};
-
-GType      gtk_recent_action_get_type         (void) G_GNUC_CONST;
-GtkAction *gtk_recent_action_new              (const gchar      *name,
-                                               const gchar      *label,
-                                               const gchar      *tooltip,
-                                               const gchar      *stock_id);
-GtkAction *gtk_recent_action_new_for_manager  (const gchar      *name,
-                                               const gchar      *label,
-                                               const gchar      *tooltip,
-                                               const gchar      *stock_id,
-                                               GtkRecentManager *manager);
-gboolean   gtk_recent_action_get_show_numbers (GtkRecentAction  *action);
-void       gtk_recent_action_set_show_numbers (GtkRecentAction  *action,
-                                               gboolean          show_numbers);
-
-G_END_DECLS
-
-#endif /* __GTK_RECENT_ACTION_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentchooser.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentchooser.h
deleted file mode 100644
index 738a9b67..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentchooser.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkrecentchooser.h - Abstract interface for recent file selectors GUIs
- *
- * Copyright (C) 2006, Emmanuele Bassi
- * 
- * 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 __GTK_RECENT_CHOOSER_H__
-#define __GTK_RECENT_CHOOSER_H__
-
-#include <gtk/gtkwidget.h>
-
-#include "gtkrecentmanager.h"
-#include "gtkrecentfilter.h"
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_RECENT_CHOOSER			(gtk_recent_chooser_get_type ())
-#define GTK_RECENT_CHOOSER(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RECENT_CHOOSER, GtkRecentChooser))
-#define GTK_IS_RECENT_CHOOSER(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RECENT_CHOOSER))
-#define GTK_RECENT_CHOOSER_GET_IFACE(inst)	(G_TYPE_INSTANCE_GET_INTERFACE ((inst), GTK_TYPE_RECENT_CHOOSER, GtkRecentChooserIface))
-
-/**
- * GtkRecentSortType:
- * @GTK_RECENT_SORT_NONE: Do not sort the returned list of recently used
- *   resources.
- * @GTK_RECENT_SORT_MRU: Sort the returned list with the most recently used
- *   items first.
- * @GTK_RECENT_SORT_LRU: Sort the returned list with the least recently used
- *   items first.
- * @GTK_RECENT_SORT_CUSTOM: Sort the returned list using a custom sorting
- *   function passed using gtk_recent_manager_set_sort_func().
- *
- * Used to specify the sorting method to be applyed to the recently
- * used resource list.
- **/
-typedef enum
-{
-  GTK_RECENT_SORT_NONE = 0,
-  GTK_RECENT_SORT_MRU,
-  GTK_RECENT_SORT_LRU,
-  GTK_RECENT_SORT_CUSTOM
-} GtkRecentSortType;
-
-typedef gint (*GtkRecentSortFunc) (GtkRecentInfo *a,
-				   GtkRecentInfo *b,
-				   gpointer       user_data);
-
-
-typedef struct _GtkRecentChooser      GtkRecentChooser; /* dummy */
-typedef struct _GtkRecentChooserIface GtkRecentChooserIface;
-
-#define GTK_RECENT_CHOOSER_ERROR	(gtk_recent_chooser_error_quark ())
-
-typedef enum
-{
-  GTK_RECENT_CHOOSER_ERROR_NOT_FOUND,
-  GTK_RECENT_CHOOSER_ERROR_INVALID_URI
-} GtkRecentChooserError;
-
-GQuark  gtk_recent_chooser_error_quark (void);
-
-
-struct _GtkRecentChooserIface
-{
-  GTypeInterface base_iface;
-  
-  /*
-   * Methods
-   */
-  gboolean          (* set_current_uri)    (GtkRecentChooser  *chooser,
-  					    const gchar       *uri,
-  					    GError           **error);
-  gchar *           (* get_current_uri)    (GtkRecentChooser  *chooser);
-  gboolean          (* select_uri)         (GtkRecentChooser  *chooser,
-  					    const gchar       *uri,
-  					    GError           **error);
-  void              (* unselect_uri)       (GtkRecentChooser  *chooser,
-                                            const gchar       *uri);
-  void              (* select_all)         (GtkRecentChooser  *chooser);
-  void              (* unselect_all)       (GtkRecentChooser  *chooser);
-  GList *           (* get_items)          (GtkRecentChooser  *chooser);
-  GtkRecentManager *(* get_recent_manager) (GtkRecentChooser  *chooser);
-  void              (* add_filter)         (GtkRecentChooser  *chooser,
-  					    GtkRecentFilter   *filter);
-  void              (* remove_filter)      (GtkRecentChooser  *chooser,
-  					    GtkRecentFilter   *filter);
-  GSList *          (* list_filters)       (GtkRecentChooser  *chooser);
-  void              (* set_sort_func)      (GtkRecentChooser  *chooser,
-  					    GtkRecentSortFunc  sort_func,
-  					    gpointer           data,
-  					    GDestroyNotify     destroy);
-  
-  /*
-   * Signals
-   */
-  void		    (* item_activated)     (GtkRecentChooser  *chooser);
-  void		    (* selection_changed)  (GtkRecentChooser  *chooser);
-};
-
-GType   gtk_recent_chooser_get_type    (void) G_GNUC_CONST;
-
-/*
- * Configuration
- */
-void              gtk_recent_chooser_set_show_private    (GtkRecentChooser  *chooser,
-							  gboolean           show_private);
-gboolean          gtk_recent_chooser_get_show_private    (GtkRecentChooser  *chooser);
-void              gtk_recent_chooser_set_show_not_found  (GtkRecentChooser  *chooser,
-							  gboolean           show_not_found);
-gboolean          gtk_recent_chooser_get_show_not_found  (GtkRecentChooser  *chooser);
-void              gtk_recent_chooser_set_select_multiple (GtkRecentChooser  *chooser,
-							  gboolean           select_multiple);
-gboolean          gtk_recent_chooser_get_select_multiple (GtkRecentChooser  *chooser);
-void              gtk_recent_chooser_set_limit           (GtkRecentChooser  *chooser,
-							  gint               limit);
-gint              gtk_recent_chooser_get_limit           (GtkRecentChooser  *chooser);
-void              gtk_recent_chooser_set_local_only      (GtkRecentChooser  *chooser,
-							  gboolean           local_only);
-gboolean          gtk_recent_chooser_get_local_only      (GtkRecentChooser  *chooser);
-void              gtk_recent_chooser_set_show_tips       (GtkRecentChooser  *chooser,
-							  gboolean           show_tips);
-gboolean          gtk_recent_chooser_get_show_tips       (GtkRecentChooser  *chooser);
-#ifndef GTK_DISABLE_DEPRECATED
-void              gtk_recent_chooser_set_show_numbers    (GtkRecentChooser  *chooser,
-							  gboolean           show_numbers);
-gboolean          gtk_recent_chooser_get_show_numbers    (GtkRecentChooser  *chooser);
-#endif /* GTK_DISABLE_DEPRECATED */
-void              gtk_recent_chooser_set_show_icons      (GtkRecentChooser  *chooser,
-							  gboolean           show_icons);
-gboolean          gtk_recent_chooser_get_show_icons      (GtkRecentChooser  *chooser);
-void              gtk_recent_chooser_set_sort_type       (GtkRecentChooser  *chooser,
-							  GtkRecentSortType  sort_type);
-GtkRecentSortType gtk_recent_chooser_get_sort_type       (GtkRecentChooser  *chooser);
-void              gtk_recent_chooser_set_sort_func       (GtkRecentChooser  *chooser,
-							  GtkRecentSortFunc  sort_func,
-							  gpointer           sort_data,
-							  GDestroyNotify     data_destroy);
-
-/*
- * Items handling
- */
-gboolean       gtk_recent_chooser_set_current_uri  (GtkRecentChooser  *chooser,
-						    const gchar       *uri,
-						    GError           **error);
-gchar *        gtk_recent_chooser_get_current_uri  (GtkRecentChooser  *chooser);
-GtkRecentInfo *gtk_recent_chooser_get_current_item (GtkRecentChooser  *chooser);
-gboolean       gtk_recent_chooser_select_uri       (GtkRecentChooser  *chooser,
-						    const gchar       *uri,
-						    GError           **error);
-void           gtk_recent_chooser_unselect_uri     (GtkRecentChooser  *chooser,
-					            const gchar       *uri);
-void           gtk_recent_chooser_select_all       (GtkRecentChooser  *chooser);
-void           gtk_recent_chooser_unselect_all     (GtkRecentChooser  *chooser);
-GList *        gtk_recent_chooser_get_items        (GtkRecentChooser  *chooser);
-gchar **       gtk_recent_chooser_get_uris         (GtkRecentChooser  *chooser,
-						    gsize             *length);
-
-/*
- * Filters
- */
-void 		 gtk_recent_chooser_add_filter    (GtkRecentChooser *chooser,
-			 			   GtkRecentFilter  *filter);
-void 		 gtk_recent_chooser_remove_filter (GtkRecentChooser *chooser,
-						   GtkRecentFilter  *filter);
-GSList * 	 gtk_recent_chooser_list_filters  (GtkRecentChooser *chooser);
-void 		 gtk_recent_chooser_set_filter    (GtkRecentChooser *chooser,
-						   GtkRecentFilter  *filter);
-GtkRecentFilter *gtk_recent_chooser_get_filter    (GtkRecentChooser *chooser);
-
-
-G_END_DECLS
-
-#endif /* __GTK_RECENT_CHOOSER_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentchooserdialog.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentchooserdialog.h
deleted file mode 100644
index 22be218d..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentchooserdialog.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkrecentchooserdialog.h: Recent files selector dialog
- * Copyright (C) 2006 Emmanuele Bassi
- * 
- * 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 __GTK_RECENT_CHOOSER_DIALOG_H__
-#define __GTK_RECENT_CHOOSER_DIALOG_H__
-
-#include <gtk/gtkdialog.h>
-#include "gtkrecentchooser.h"
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_RECENT_CHOOSER_DIALOG		  (gtk_recent_chooser_dialog_get_type ())
-#define GTK_RECENT_CHOOSER_DIALOG(obj)		  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RECENT_CHOOSER_DIALOG, GtkRecentChooserDialog))
-#define GTK_IS_RECENT_CHOOSER_DIALOG(obj)	  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RECENT_CHOOSER_DIALOG))
-#define GTK_RECENT_CHOOSER_DIALOG_CLASS(klass)	  (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RECENT_CHOOSER_DIALOG, GtkRecentChooserDialogClass))
-#define GTK_IS_RECENT_CHOOSER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RECENT_CHOOSER_DIALOG))
-#define GTK_RECENT_CHOOSER_DIALOG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_RECENT_CHOOSER_DIALOG, GtkRecentChooserDialogClass))
-
-typedef struct _GtkRecentChooserDialog        GtkRecentChooserDialog;
-typedef struct _GtkRecentChooserDialogClass   GtkRecentChooserDialogClass;
-
-typedef struct _GtkRecentChooserDialogPrivate GtkRecentChooserDialogPrivate;
-
-
-struct _GtkRecentChooserDialog
-{
-  /*< private >*/
-  GtkDialog parent_instance;
-  
-  GtkRecentChooserDialogPrivate *priv;
-};
-
-struct _GtkRecentChooserDialogClass
-{
-  GtkDialogClass parent_class;
-};
-
-
-GType      gtk_recent_chooser_dialog_get_type        (void) G_GNUC_CONST;
-
-GtkWidget *gtk_recent_chooser_dialog_new             (const gchar      *title,
-					              GtkWindow        *parent,
-					              const gchar      *first_button_text,
-					              ...) G_GNUC_NULL_TERMINATED;
-GtkWidget *gtk_recent_chooser_dialog_new_for_manager (const gchar      *title,
-						      GtkWindow        *parent,
-						      GtkRecentManager *manager,
-						      const gchar      *first_button_text,
-						      ...) G_GNUC_NULL_TERMINATED;
-
-G_END_DECLS
-
-#endif /* __GTK_RECENT_CHOOSER_DIALOG_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentchoosermenu.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentchoosermenu.h
deleted file mode 100644
index 200233f9..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentchoosermenu.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkrecentchoosermenu.h - Recently used items menu widget
- * Copyright (C) 2006, Emmanuele Bassi
- * 
- * 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 __GTK_RECENT_CHOOSER_MENU_H__
-#define __GTK_RECENT_CHOOSER_MENU_H__
-
-#include <gtk/gtkmenu.h>
-#include "gtkrecentchooser.h"
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_RECENT_CHOOSER_MENU		(gtk_recent_chooser_menu_get_type ())
-#define GTK_RECENT_CHOOSER_MENU(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RECENT_CHOOSER_MENU, GtkRecentChooserMenu))
-#define GTK_IS_RECENT_CHOOSER_MENU(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RECENT_CHOOSER_MENU))
-#define GTK_RECENT_CHOOSER_MENU_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RECENT_CHOOSER_MENU, GtkRecentChooserMenuClass))
-#define GTK_IS_RECENT_CHOOSER_MENU_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RECENT_CHOOSER_MENU))
-#define GTK_RECENT_CHOOSER_MENU_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_RECENT_CHOOSER_MENU, GtkRecentChooserMenuClass))
-
-typedef struct _GtkRecentChooserMenu		GtkRecentChooserMenu;
-typedef struct _GtkRecentChooserMenuClass	GtkRecentChooserMenuClass;
-typedef struct _GtkRecentChooserMenuPrivate	GtkRecentChooserMenuPrivate;
-
-struct _GtkRecentChooserMenu
-{
-  /*< private >*/
-  GtkMenu parent_instance;
-
-  GtkRecentChooserMenuPrivate *priv;
-};
-
-struct _GtkRecentChooserMenuClass
-{
-  GtkMenuClass parent_class;
-  
-  /* padding for future expansion */
-  void (* gtk_recent1) (void);
-  void (* gtk_recent2) (void);
-  void (* gtk_recent3) (void);
-  void (* gtk_recent4) (void);
-};
-
-GType      gtk_recent_chooser_menu_get_type         (void) G_GNUC_CONST;
-
-GtkWidget *gtk_recent_chooser_menu_new              (void);
-GtkWidget *gtk_recent_chooser_menu_new_for_manager  (GtkRecentManager     *manager);
-
-gboolean   gtk_recent_chooser_menu_get_show_numbers (GtkRecentChooserMenu *menu);
-void       gtk_recent_chooser_menu_set_show_numbers (GtkRecentChooserMenu *menu,
-						     gboolean              show_numbers);
-
-G_END_DECLS
-
-#endif /* ! __GTK_RECENT_CHOOSER_MENU_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentchooserwidget.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentchooserwidget.h
deleted file mode 100644
index 96aea95f..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentchooserwidget.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkrecentchooserwidget.h: embeddable recently used resources chooser widget
- * Copyright (C) 2006 Emmanuele Bassi
- * 
- * 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 __GTK_RECENT_CHOOSER_WIDGET_H__
-#define __GTK_RECENT_CHOOSER_WIDGET_H__
-
-#include "gtkrecentchooser.h"
-#include <gtk/gtkvbox.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_RECENT_CHOOSER_WIDGET		  (gtk_recent_chooser_widget_get_type ())
-#define GTK_RECENT_CHOOSER_WIDGET(obj)		  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RECENT_CHOOSER_WIDGET, GtkRecentChooserWidget))
-#define GTK_IS_RECENT_CHOOSER_WIDGET(obj)	  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RECENT_CHOOSER_WIDGET))
-#define GTK_RECENT_CHOOSER_WIDGET_CLASS(klass)	  (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RECENT_CHOOSER_WIDGET, GtkRecentChooserWidgetClass))
-#define GTK_IS_RECENT_CHOOSER_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RECENT_CHOOSER_WIDGET))
-#define GTK_RECENT_CHOOSER_WIDGET_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_RECENT_CHOOSER_WIDGET, GtkRecentChooserWidgetClass))
-
-typedef struct _GtkRecentChooserWidget        GtkRecentChooserWidget;
-typedef struct _GtkRecentChooserWidgetClass   GtkRecentChooserWidgetClass;
-
-typedef struct _GtkRecentChooserWidgetPrivate GtkRecentChooserWidgetPrivate;
-
-struct _GtkRecentChooserWidget
-{
-  /*< private >*/
-  GtkVBox parent_instance;
-  
-  GtkRecentChooserWidgetPrivate *priv;
-};
-
-struct _GtkRecentChooserWidgetClass
-{
-  GtkVBoxClass parent_class;
-};
-
-GType      gtk_recent_chooser_widget_get_type        (void) G_GNUC_CONST;
-GtkWidget *gtk_recent_chooser_widget_new             (void);
-GtkWidget *gtk_recent_chooser_widget_new_for_manager (GtkRecentManager *manager);
-
-G_END_DECLS
-
-#endif /* __GTK_RECENT_CHOOSER_WIDGET_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentfilter.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentfilter.h
deleted file mode 100644
index 28f6fe7a..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentfilter.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkrecentfilter.h - Filter object for recently used resources
- * Copyright (C) 2006, Emmanuele Bassi
- * 
- * 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 __GTK_RECENT_FILTER_H__
-#define __GTK_RECENT_FILTER_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_RECENT_FILTER		(gtk_recent_filter_get_type ())
-#define GTK_RECENT_FILTER(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RECENT_FILTER, GtkRecentFilter))
-#define GTK_IS_RECENT_FILTER(obj)	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RECENT_FILTER))
-
-typedef struct _GtkRecentFilter		GtkRecentFilter;
-typedef struct _GtkRecentFilterInfo	GtkRecentFilterInfo;
-
-typedef enum {
-  GTK_RECENT_FILTER_URI          = 1 << 0,
-  GTK_RECENT_FILTER_DISPLAY_NAME = 1 << 1,
-  GTK_RECENT_FILTER_MIME_TYPE    = 1 << 2,
-  GTK_RECENT_FILTER_APPLICATION  = 1 << 3,
-  GTK_RECENT_FILTER_GROUP        = 1 << 4,
-  GTK_RECENT_FILTER_AGE          = 1 << 5
-} GtkRecentFilterFlags;
-
-typedef gboolean (*GtkRecentFilterFunc) (const GtkRecentFilterInfo *filter_info,
-					 gpointer                   user_data);
-
-struct _GtkRecentFilterInfo
-{
-  GtkRecentFilterFlags contains;
-
-  const gchar *uri;
-  const gchar *display_name;
-  const gchar *mime_type;
-  const gchar **applications;
-  const gchar **groups;
-  
-  gint age;
-};
-
-GType                 gtk_recent_filter_get_type (void) G_GNUC_CONST;
-
-GtkRecentFilter *     gtk_recent_filter_new      (void);
-void                  gtk_recent_filter_set_name (GtkRecentFilter *filter,
-						  const gchar     *name);
-G_CONST_RETURN gchar *gtk_recent_filter_get_name (GtkRecentFilter *filter);
-
-void gtk_recent_filter_add_mime_type      (GtkRecentFilter      *filter,
-					   const gchar          *mime_type);
-void gtk_recent_filter_add_pattern        (GtkRecentFilter      *filter,
-					   const gchar          *pattern);
-void gtk_recent_filter_add_pixbuf_formats (GtkRecentFilter      *filter);
-void gtk_recent_filter_add_application    (GtkRecentFilter      *filter,
-					   const gchar          *application);
-void gtk_recent_filter_add_group          (GtkRecentFilter      *filter,
-					   const gchar          *group);
-void gtk_recent_filter_add_age            (GtkRecentFilter      *filter,
-					   gint                  days);
-void gtk_recent_filter_add_custom         (GtkRecentFilter      *filter,
-					   GtkRecentFilterFlags  needed,
-					   GtkRecentFilterFunc   func,
-					   gpointer              data,
-					   GDestroyNotify        data_destroy);
-
-GtkRecentFilterFlags gtk_recent_filter_get_needed (GtkRecentFilter           *filter);
-gboolean             gtk_recent_filter_filter     (GtkRecentFilter           *filter,
-						   const GtkRecentFilterInfo *filter_info);
-
-G_END_DECLS
-
-#endif /* ! __GTK_RECENT_FILTER_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentmanager.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentmanager.h
deleted file mode 100644
index b184b3fa..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkrecentmanager.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkrecentmanager.h: a manager for the recently used resources
- *
- * Copyright (C) 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 __GTK_RECENT_MANAGER_H__
-#define __GTK_RECENT_MANAGER_H__
-
-#include <glib-object.h>
-#include <gdk/gdkscreen.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <time.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_RECENT_INFO			(gtk_recent_info_get_type ())
-
-#define GTK_TYPE_RECENT_MANAGER			(gtk_recent_manager_get_type ())
-#define GTK_RECENT_MANAGER(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RECENT_MANAGER, GtkRecentManager))
-#define GTK_IS_RECENT_MANAGER(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RECENT_MANAGER))
-#define GTK_RECENT_MANAGER_CLASS(klass) 	(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RECENT_MANAGER, GtkRecentManagerClass))
-#define GTK_IS_RECENT_MANAGER_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RECENT_MANAGER))
-#define GTK_RECENT_MANAGER_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_RECENT_MANAGER, GtkRecentManagerClass))
-
-typedef struct _GtkRecentInfo		GtkRecentInfo;
-typedef struct _GtkRecentData		GtkRecentData;
-typedef struct _GtkRecentManager	GtkRecentManager;
-typedef struct _GtkRecentManagerClass	GtkRecentManagerClass;
-typedef struct _GtkRecentManagerPrivate GtkRecentManagerPrivate;
-
-/**
- * GtkRecentData:
- * @display_name: a UTF-8 encoded string, containing the name of the recently
- *   used resource to be displayed, or %NULL;
- * @description: a UTF-8 encoded string, containing a short description of
- *   the resource, or %NULL;
- * @mime_type: the MIME type of the resource;
- * @app_name: the name of the application that is registering this recently
- *   used resource;
- * @app_exec: command line used to launch this resource; may contain the
- *   "&percnt;f" and "&percnt;u" escape characters which will be expanded 
- *   to the resource file path and URI respectively when the command line 
- *   is retrieved;
- * @groups: a vector of strings containing groups names;
- * @is_private: whether this resource should be displayed only by the
- *   applications that have registered it or not.
- *
- * Meta-data to be passed to gtk_recent_manager_add_full() when
- * registering a recently used resource.
- **/
-struct _GtkRecentData
-{
-  gchar *display_name;
-  gchar *description;
-  
-  gchar *mime_type;
-  
-  gchar *app_name;
-  gchar *app_exec;
-  
-  gchar **groups;
-  
-  gboolean is_private;
-};
-
-struct _GtkRecentManager
-{
-  /*< private >*/
-  GObject parent_instance;
-  
-  GtkRecentManagerPrivate *priv;
-};
-
-struct _GtkRecentManagerClass
-{
-  /*< private >*/
-  GObjectClass parent_class;
-  
-  void (*changed) (GtkRecentManager *manager);
-  
-  /* padding for future expansion */
-  void (*_gtk_recent1) (void);
-  void (*_gtk_recent2) (void);
-  void (*_gtk_recent3) (void);
-  void (*_gtk_recent4) (void);
-};
-
-/**
- * GtkRecentManagerError:
- * @GTK_RECENT_MANAGER_ERROR_NOT_FOUND: the URI specified does not exists in
- *   the recently used resources list.
- * @GTK_RECENT_MANAGER_ERROR_INVALID_URI: the URI specified is not valid.
- * @GTK_RECENT_MANAGER_ERROR_INVALID_ENCODING: the supplied string is not
- *   UTF-8 encoded.
- * @GTK_RECENT_MANAGER_ERROR_NOT_REGISTERED: no application has registered
- *   the specified item.
- * @GTK_RECENT_MANAGER_ERROR_READ: failure while reading the recently used
- *   resources file.
- * @GTK_RECENT_MANAGER_ERROR_WRITE: failure while writing the recently used
- *   resources file.
- * @GTK_RECENT_MANAGER_ERROR_UNKNOWN: unspecified error.
- *
- * Error codes for GtkRecentManager operations
- **/
-typedef enum
-{
-  GTK_RECENT_MANAGER_ERROR_NOT_FOUND,
-  GTK_RECENT_MANAGER_ERROR_INVALID_URI,
-  GTK_RECENT_MANAGER_ERROR_INVALID_ENCODING,
-  GTK_RECENT_MANAGER_ERROR_NOT_REGISTERED,
-  GTK_RECENT_MANAGER_ERROR_READ,
-  GTK_RECENT_MANAGER_ERROR_WRITE,
-  GTK_RECENT_MANAGER_ERROR_UNKNOWN
-} GtkRecentManagerError;
-
-#define GTK_RECENT_MANAGER_ERROR	(gtk_recent_manager_error_quark ())
-GQuark 	gtk_recent_manager_error_quark (void);
-
-
-GType 		  gtk_recent_manager_get_type       (void) G_GNUC_CONST;
-
-GtkRecentManager *gtk_recent_manager_new            (void);
-GtkRecentManager *gtk_recent_manager_get_default    (void);
-
-#ifndef GTK_DISABLE_DEPRECATED
-GtkRecentManager *gtk_recent_manager_get_for_screen (GdkScreen            *screen);
-void              gtk_recent_manager_set_screen     (GtkRecentManager     *manager,
-						     GdkScreen            *screen);
-#endif
-
-gboolean          gtk_recent_manager_add_item       (GtkRecentManager     *manager,
-						     const gchar          *uri);
-gboolean          gtk_recent_manager_add_full       (GtkRecentManager     *manager,
-						     const gchar          *uri,
-						     const GtkRecentData  *recent_data);
-gboolean          gtk_recent_manager_remove_item    (GtkRecentManager     *manager,
-						     const gchar          *uri,
-						     GError              **error);
-GtkRecentInfo *   gtk_recent_manager_lookup_item    (GtkRecentManager     *manager,
-						     const gchar          *uri,
-						     GError              **error);
-gboolean          gtk_recent_manager_has_item       (GtkRecentManager     *manager,
-						     const gchar          *uri);
-gboolean          gtk_recent_manager_move_item      (GtkRecentManager     *manager,
-						     const gchar          *uri,
-						     const gchar          *new_uri,
-						     GError              **error);
-void              gtk_recent_manager_set_limit      (GtkRecentManager     *manager,
-						     gint                  limit);
-gint              gtk_recent_manager_get_limit      (GtkRecentManager     *manager);
-GList *           gtk_recent_manager_get_items      (GtkRecentManager     *manager);
-gint              gtk_recent_manager_purge_items    (GtkRecentManager     *manager,
-						     GError              **error);
-
-
-GType	              gtk_recent_info_get_type             (void) G_GNUC_CONST;
-
-GtkRecentInfo *       gtk_recent_info_ref                  (GtkRecentInfo  *info);
-void                  gtk_recent_info_unref                (GtkRecentInfo  *info);
-
-G_CONST_RETURN gchar *gtk_recent_info_get_uri              (GtkRecentInfo  *info);
-G_CONST_RETURN gchar *gtk_recent_info_get_display_name     (GtkRecentInfo  *info);
-G_CONST_RETURN gchar *gtk_recent_info_get_description      (GtkRecentInfo  *info);
-G_CONST_RETURN gchar *gtk_recent_info_get_mime_type        (GtkRecentInfo  *info);
-time_t                gtk_recent_info_get_added            (GtkRecentInfo  *info);
-time_t                gtk_recent_info_get_modified         (GtkRecentInfo  *info);
-time_t                gtk_recent_info_get_visited          (GtkRecentInfo  *info);
-gboolean              gtk_recent_info_get_private_hint     (GtkRecentInfo  *info);
-gboolean              gtk_recent_info_get_application_info (GtkRecentInfo  *info,
-							    const gchar    *app_name,
-							    gchar         **app_exec,
-							    guint          *count,
-							    time_t         *time_);
-gchar **              gtk_recent_info_get_applications     (GtkRecentInfo  *info,
-							    gsize          *length) G_GNUC_MALLOC;
-gchar *               gtk_recent_info_last_application     (GtkRecentInfo  *info) G_GNUC_MALLOC;
-gboolean              gtk_recent_info_has_application      (GtkRecentInfo  *info,
-							    const gchar    *app_name);
-gchar **              gtk_recent_info_get_groups           (GtkRecentInfo  *info,
-							    gsize          *length) G_GNUC_MALLOC;
-gboolean              gtk_recent_info_has_group            (GtkRecentInfo  *info,
-							    const gchar    *group_name);
-GdkPixbuf *           gtk_recent_info_get_icon             (GtkRecentInfo  *info,
-							    gint            size);
-gchar *               gtk_recent_info_get_short_name       (GtkRecentInfo  *info) G_GNUC_MALLOC;
-gchar *               gtk_recent_info_get_uri_display      (GtkRecentInfo  *info) G_GNUC_MALLOC;
-gint                  gtk_recent_info_get_age              (GtkRecentInfo  *info);
-gboolean              gtk_recent_info_is_local             (GtkRecentInfo  *info);
-gboolean              gtk_recent_info_exists               (GtkRecentInfo  *info);
-gboolean              gtk_recent_info_match                (GtkRecentInfo  *info_a,
-							    GtkRecentInfo  *info_b);
-
-/* private */
-void _gtk_recent_manager_sync (void);
-
-G_END_DECLS
-
-#endif /* __GTK_RECENT_MANAGER_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkruler.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkruler.h
deleted file mode 100644
index 7b8fe529..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkruler.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-/*
- * NOTE this widget is considered too specialized/little-used for
- * GTK+, and will in the future be moved to some other package.  If
- * your application needs this widget, feel free to use it, as the
- * widget does work and is useful in some applications; it's just not
- * of general interest. However, we are not accepting new features for
- * the widget, and it will eventually move out of the GTK+
- * distribution.
- */
-
-#ifndef __GTK_RULER_H__
-#define __GTK_RULER_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkwidget.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_RULER            (gtk_ruler_get_type ())
-#define GTK_RULER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RULER, GtkRuler))
-#define GTK_RULER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RULER, GtkRulerClass))
-#define GTK_IS_RULER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RULER))
-#define GTK_IS_RULER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RULER))
-#define GTK_RULER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_RULER, GtkRulerClass))
-
-
-typedef struct _GtkRuler        GtkRuler;
-typedef struct _GtkRulerClass   GtkRulerClass;
-typedef struct _GtkRulerMetric  GtkRulerMetric;
-
-/* All distances below are in 1/72nd's of an inch. (According to
- * Adobe that's a point, but points are really 1/72.27 in.)
- */
-struct _GtkRuler
-{
-  GtkWidget widget;
-
-  GdkPixmap *backing_store;
-  GdkGC *non_gr_exp_gc;		/* unused */
-  GtkRulerMetric *metric;
-  gint xsrc, ysrc;
-  gint slider_size;
-
-  /* The upper limit of the ruler (in points) */
-  gdouble lower;
-  /* The lower limit of the ruler */
-  gdouble upper;
-  /* The position of the mark on the ruler */
-  gdouble position;
-  /* The maximum size of the ruler */
-  gdouble max_size;
-};
-
-struct _GtkRulerClass
-{
-  GtkWidgetClass parent_class;
-
-  void (* draw_ticks) (GtkRuler *ruler);
-  void (* draw_pos)   (GtkRuler *ruler);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-struct _GtkRulerMetric
-{
-  gchar *metric_name;
-  gchar *abbrev;
-  /* This should be points_per_unit. This is the size of the unit
-   * in 1/72nd's of an inch and has nothing to do with screen pixels */
-  gdouble pixels_per_unit;
-  gdouble ruler_scale[10];
-  gint subdivide[5];        /* five possible modes of subdivision */
-};
-
-
-GType   gtk_ruler_get_type   (void) G_GNUC_CONST;
-void    gtk_ruler_set_metric (GtkRuler      *ruler,
-			      GtkMetricType  metric);
-void    gtk_ruler_set_range  (GtkRuler      *ruler,
-			      gdouble        lower,
-			      gdouble        upper,
-			      gdouble        position,
-			      gdouble        max_size);
-void    gtk_ruler_draw_ticks (GtkRuler      *ruler);
-void    gtk_ruler_draw_pos   (GtkRuler      *ruler);
-
-GtkMetricType gtk_ruler_get_metric (GtkRuler *ruler);
-void          gtk_ruler_get_range  (GtkRuler *ruler,
-				    gdouble  *lower,
-				    gdouble  *upper,
-				    gdouble  *position,
-				    gdouble  *max_size);
-
-G_END_DECLS
-
-#endif /* __GTK_RULER_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkscale.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkscale.h
deleted file mode 100644
index b249c290..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkscale.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_SCALE_H__
-#define __GTK_SCALE_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkrange.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_SCALE            (gtk_scale_get_type ())
-#define GTK_SCALE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SCALE, GtkScale))
-#define GTK_SCALE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SCALE, GtkScaleClass))
-#define GTK_IS_SCALE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SCALE))
-#define GTK_IS_SCALE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SCALE))
-#define GTK_SCALE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SCALE, GtkScaleClass))
-
-
-typedef struct _GtkScale        GtkScale;
-typedef struct _GtkScaleClass   GtkScaleClass;
-
-struct _GtkScale
-{
-  GtkRange range;
-
-  gint digits;
-  guint draw_value : 1;
-  guint value_pos : 2;
-};
-
-struct _GtkScaleClass
-{
-  GtkRangeClass parent_class;
-
-  gchar* (* format_value) (GtkScale *scale,
-                           gdouble   value);  
-  
-  void (* draw_value) (GtkScale *scale);
-
-  void (* get_layout_offsets) (GtkScale *scale,
-                               gint     *x,
-                               gint     *y);
-  /* Padding for future expansion */
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType           gtk_scale_get_type       (void) G_GNUC_CONST;
-
-void            gtk_scale_set_digits     (GtkScale        *scale,
-                                          gint             digits);
-gint            gtk_scale_get_digits     (GtkScale        *scale);
-void            gtk_scale_set_draw_value (GtkScale        *scale,
-                                          gboolean         draw_value);
-gboolean        gtk_scale_get_draw_value (GtkScale        *scale);
-void            gtk_scale_set_value_pos  (GtkScale        *scale,
-                                          GtkPositionType  pos);
-GtkPositionType gtk_scale_get_value_pos  (GtkScale        *scale);
-
-PangoLayout     *gtk_scale_get_layout        (GtkScale        *scale);
-void            gtk_scale_get_layout_offsets (GtkScale        *scale,
-					      gint            *x,
-					      gint            *y);
-void    _gtk_scale_clear_layout    (GtkScale        *scale);
-
-void    _gtk_scale_get_value_size  (GtkScale        *scale,
-                                    gint            *width,
-                                    gint            *height);
-gchar  *_gtk_scale_format_value    (GtkScale        *scale,
-                                    gdouble          value);
-
-
-G_END_DECLS
-
-#endif /* __GTK_SCALE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkscalebutton.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkscalebutton.h
deleted file mode 100644
index 0644ace2..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkscalebutton.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2005 Ronald S. Bultje
- * Copyright (C) 2006, 2007 Christian Persch
- * Copyright (C) 2006 Jan Arne Petersen
- * Copyright (C) 2007 Red Hat, Inc.
- *
- * Authors:
- * - Ronald S. Bultje <rbultje@ronald.bitfreak.net>
- * - Bastien Nocera <bnocera@redhat.com>
- * - Jan Arne Petersen <jpetersen@jpetersen.org>
- * - Christian Persch <chpe@svn.gnome.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 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 GTK+ Team and others 2007.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_SCALE_BUTTON_H__
-#define __GTK_SCALE_BUTTON_H__
-
-#include <gtk/gtkbutton.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_SCALE_BUTTON                 (gtk_scale_button_get_type ())
-#define GTK_SCALE_BUTTON(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SCALE_BUTTON, GtkScaleButton))
-#define GTK_SCALE_BUTTON_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SCALE_BUTTON, GtkScaleButtonClass))
-#define GTK_IS_SCALE_BUTTON(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SCALE_BUTTON))
-#define GTK_IS_SCALE_BUTTON_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SCALE_BUTTON))
-#define GTK_SCALE_BUTTON_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SCALE_BUTTON, GtkScaleButtonClass))
-
-typedef struct _GtkScaleButton        GtkScaleButton;
-typedef struct _GtkScaleButtonClass   GtkScaleButtonClass;
-typedef struct _GtkScaleButtonPrivate GtkScaleButtonPrivate;
-
-struct _GtkScaleButtonClass
-{
-  GtkButtonClass parent_class;
-
-  /* signals */
-  void	(* value_changed) (GtkScaleButton *button, gdouble value);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-struct _GtkScaleButton
-{
-  GtkButton parent;
-  
-  GtkWidget *plus_button;
-  GtkWidget *minus_button;
-  
-  /*< private >*/
-  GtkScaleButtonPrivate *priv;
-};
-
-GType		gtk_scale_button_get_type	(void) G_GNUC_CONST;
-GtkWidget*	gtk_scale_button_new		(GtkIconSize     size,
-						 gdouble         min,
-						 gdouble         max,
-						 gdouble         step,
-						 const gchar   **icons);
-void		gtk_scale_button_set_icons	(GtkScaleButton *button,
-						 const gchar   **icons);
-gdouble		gtk_scale_button_get_value	(GtkScaleButton *button);
-void		gtk_scale_button_set_value	(GtkScaleButton *button,
-						 gdouble         value);
-GtkAdjustment*	gtk_scale_button_get_adjustment	(GtkScaleButton *button);
-void		gtk_scale_button_set_adjustment	(GtkScaleButton *button,
-						 GtkAdjustment  *adjustment);
-
-G_END_DECLS
-
-#endif /* __GTK_SCALE_BUTTON_H__ */
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkscrollbar.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkscrollbar.h
deleted file mode 100644
index 2fb94e86..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkscrollbar.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_SCROLLBAR_H__
-#define __GTK_SCROLLBAR_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkrange.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_SCROLLBAR            (gtk_scrollbar_get_type ())
-#define GTK_SCROLLBAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SCROLLBAR, GtkScrollbar))
-#define GTK_SCROLLBAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SCROLLBAR, GtkScrollbarClass))
-#define GTK_IS_SCROLLBAR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SCROLLBAR))
-#define GTK_IS_SCROLLBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SCROLLBAR))
-#define GTK_SCROLLBAR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SCROLLBAR, GtkScrollbarClass))
-
-
-typedef struct _GtkScrollbar        GtkScrollbar;
-typedef struct _GtkScrollbarClass   GtkScrollbarClass;
-
-struct _GtkScrollbar
-{
-  GtkRange range;
-};
-
-struct _GtkScrollbarClass
-{
-  GtkRangeClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType gtk_scrollbar_get_type (void) G_GNUC_CONST;
-
-
-G_END_DECLS
-
-#endif /* __GTK_SCROLLBAR_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkscrolledwindow.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkscrolledwindow.h
deleted file mode 100644
index c9668f37..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkscrolledwindow.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_SCROLLED_WINDOW_H__
-#define __GTK_SCROLLED_WINDOW_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkhscrollbar.h>
-#include <gtk/gtkvscrollbar.h>
-#include <gtk/gtkviewport.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_SCROLLED_WINDOW            (gtk_scrolled_window_get_type ())
-#define GTK_SCROLLED_WINDOW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SCROLLED_WINDOW, GtkScrolledWindow))
-#define GTK_SCROLLED_WINDOW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SCROLLED_WINDOW, GtkScrolledWindowClass))
-#define GTK_IS_SCROLLED_WINDOW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SCROLLED_WINDOW))
-#define GTK_IS_SCROLLED_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SCROLLED_WINDOW))
-#define GTK_SCROLLED_WINDOW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SCROLLED_WINDOW, GtkScrolledWindowClass))
-
-
-
-typedef struct _GtkScrolledWindow       GtkScrolledWindow;
-typedef struct _GtkScrolledWindowClass  GtkScrolledWindowClass;
-
-struct _GtkScrolledWindow
-{
-  GtkBin container;
-
-  /*< public >*/
-  GtkWidget *hscrollbar;
-  GtkWidget *vscrollbar;
-
-  /*< private >*/
-  guint hscrollbar_policy      : 2;
-  guint vscrollbar_policy      : 2;
-  guint hscrollbar_visible     : 1;
-  guint vscrollbar_visible     : 1;
-  guint window_placement       : 2;
-  guint focus_out              : 1;	/* Flag used by ::move-focus-out implementation */
-
-  guint16 shadow_type;
-};
-
-struct _GtkScrolledWindowClass
-{
-  GtkBinClass parent_class;
-  
-  gint scrollbar_spacing;
-
-  /* Action signals for keybindings. Do not connect to these signals
-   */
-
-  /* Unfortunately, GtkScrollType is deficient in that there is
-   * no horizontal/vertical variants for GTK_SCROLL_START/END,
-   * so we have to add an additional boolean flag.
-   */
-  gboolean (*scroll_child) (GtkScrolledWindow *scrolled_window,
-	  		    GtkScrollType      scroll,
-			    gboolean           horizontal);
-
-  void (* move_focus_out) (GtkScrolledWindow *scrolled_window,
-			   GtkDirectionType   direction);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType          gtk_scrolled_window_get_type          (void) G_GNUC_CONST;
-GtkWidget*     gtk_scrolled_window_new               (GtkAdjustment     *hadjustment,
-						      GtkAdjustment     *vadjustment);
-void           gtk_scrolled_window_set_hadjustment   (GtkScrolledWindow *scrolled_window,
-						      GtkAdjustment     *hadjustment);
-void           gtk_scrolled_window_set_vadjustment   (GtkScrolledWindow *scrolled_window,
-						      GtkAdjustment     *vadjustment);
-GtkAdjustment* gtk_scrolled_window_get_hadjustment   (GtkScrolledWindow *scrolled_window);
-GtkAdjustment* gtk_scrolled_window_get_vadjustment   (GtkScrolledWindow *scrolled_window);
-GtkWidget*     gtk_scrolled_window_get_hscrollbar    (GtkScrolledWindow *scrolled_window);
-GtkWidget*     gtk_scrolled_window_get_vscrollbar    (GtkScrolledWindow *scrolled_window);
-void           gtk_scrolled_window_set_policy        (GtkScrolledWindow *scrolled_window,
-						      GtkPolicyType      hscrollbar_policy,
-						      GtkPolicyType      vscrollbar_policy);
-void           gtk_scrolled_window_get_policy        (GtkScrolledWindow *scrolled_window,
-						      GtkPolicyType     *hscrollbar_policy,
-						      GtkPolicyType     *vscrollbar_policy);
-void           gtk_scrolled_window_set_placement     (GtkScrolledWindow *scrolled_window,
-						      GtkCornerType      window_placement);
-void           gtk_scrolled_window_unset_placement   (GtkScrolledWindow *scrolled_window);
-
-GtkCornerType  gtk_scrolled_window_get_placement     (GtkScrolledWindow *scrolled_window);
-void           gtk_scrolled_window_set_shadow_type   (GtkScrolledWindow *scrolled_window,
-						      GtkShadowType      type);
-GtkShadowType  gtk_scrolled_window_get_shadow_type   (GtkScrolledWindow *scrolled_window);
-void	       gtk_scrolled_window_add_with_viewport (GtkScrolledWindow *scrolled_window,
-						      GtkWidget		*child);
-
-gint _gtk_scrolled_window_get_scrollbar_spacing (GtkScrolledWindow *scrolled_window);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_SCROLLED_WINDOW_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtksearchengine.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtksearchengine.h
deleted file mode 100644
index c8611083..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtksearchengine.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2005 Novell, 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,
- *
- * Author: Anders Carlsson <andersca@imendio.com> 
- *
- * Based on nautilus-search-engine.h
- */
-
-#ifndef __GTK_SEARCH_ENGINE_H__
-#define __GTK_SEARCH_ENGINE_H__
-
-/* This is a "semi-private" header; it is meant only for
- * alternate GtkFileChooser implementations; no stability guarantees 
- * are made at this point
- */
-#ifndef GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
-#error "gtkfilechooserprivate.h is not supported API for general use"
-#endif
-
-#include <glib-object.h>
-#include "gtkquery.h"
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_SEARCH_ENGINE		(_gtk_search_engine_get_type ())
-#define GTK_SEARCH_ENGINE(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SEARCH_ENGINE, GtkSearchEngine))
-#define GTK_SEARCH_ENGINE_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SEARCH_ENGINE, GtkSearchEngineClass))
-#define GTK_IS_SEARCH_ENGINE(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SEARCH_ENGINE))
-#define GTK_IS_SEARCH_ENGINE_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SEARCH_ENGINE))
-#define GTK_SEARCH_ENGINE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SEARCH_ENGINE, GtkSearchEngineClass))
-
-typedef struct _GtkSearchEngine GtkSearchEngine;
-typedef struct _GtkSearchEngineClass GtkSearchEngineClass;
-typedef struct _GtkSearchEnginePrivate GtkSearchEnginePrivate;
-
-struct _GtkSearchEngine 
-{
-  GObject parent;
-
-  GtkSearchEnginePrivate *priv;
-};
-
-struct _GtkSearchEngineClass 
-{
-  GObjectClass parent_class;
-  
-  /* VTable */
-  void     (*set_query)       (GtkSearchEngine *engine, 
-			       GtkQuery        *query);
-  void     (*start)           (GtkSearchEngine *engine);
-  void     (*stop)            (GtkSearchEngine *engine);
-  gboolean (*is_indexed)      (GtkSearchEngine *engine);
-  
-  /* Signals */
-  void     (*hits_added)      (GtkSearchEngine *engine, 
-			       GList           *hits);
-  void     (*hits_subtracted) (GtkSearchEngine *engine, 
-			       GList           *hits);
-  void     (*finished)        (GtkSearchEngine *engine);
-  void     (*error)           (GtkSearchEngine *engine, 
-			       const gchar     *error_message);
-};
-
-GType            _gtk_search_engine_get_type        (void);
-gboolean         _gtk_search_engine_enabled         (void);
-
-GtkSearchEngine* _gtk_search_engine_new             (void);
-
-void             _gtk_search_engine_set_query       (GtkSearchEngine *engine, 
-                                                     GtkQuery        *query);
-void	         _gtk_search_engine_start           (GtkSearchEngine *engine);
-void	         _gtk_search_engine_stop            (GtkSearchEngine *engine);
-gboolean         _gtk_search_engine_is_indexed      (GtkSearchEngine *engine);
-
-void	         _gtk_search_engine_hits_added      (GtkSearchEngine *engine, 
-						     GList           *hits);
-void	         _gtk_search_engine_hits_subtracted (GtkSearchEngine *engine, 
-						     GList           *hits);
-void	         _gtk_search_engine_finished        (GtkSearchEngine *engine);
-void	         _gtk_search_engine_error           (GtkSearchEngine *engine, 
-						     const gchar     *error_message);
-
-G_END_DECLS
-
-#endif /* __GTK_SEARCH_ENGINE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkselection.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkselection.h
deleted file mode 100644
index 9e97ae2a..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkselection.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_SELECTION_H__
-#define __GTK_SELECTION_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkenums.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtktextiter.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GtkTargetList    GtkTargetList;
-typedef struct _GtkTargetEntry   GtkTargetEntry;
-
-#define GTK_TYPE_SELECTION_DATA (gtk_selection_data_get_type ())
-#define GTK_TYPE_TARGET_LIST    (gtk_target_list_get_type ())
-
-/* The contents of a selection are returned in a GtkSelectionData
- * structure. selection/target identify the request.  type specifies
- * the type of the return; if length < 0, and the data should be
- * ignored. This structure has object semantics - no fields should be
- * modified directly, they should not be created directly, and
- * pointers to them should not be stored beyond the duration of a
- * callback. (If the last is changed, we'll need to add reference
- * counting.) The time field gives the timestamp at which the data was
- * sent.
- */
-
-struct _GtkSelectionData
-{
-  GdkAtom	selection;
-  GdkAtom	target;
-  GdkAtom	type;
-  gint		format;
-  guchar       *data;  
-  gint		length;
-  GdkDisplay   *display;
-};
-
-struct _GtkTargetEntry {
-  gchar *target;
-  guint  flags;
-  guint  info;
-};
-
-/* These structures not public, and are here only for the convenience of
- * gtkdnd.c 
- */
-
-typedef struct _GtkTargetPair GtkTargetPair;
-
-/* This structure is a list of destinations, and associated guint id's */
-struct _GtkTargetList {
-  GList *list;
-  guint ref_count;
-};
-
-struct _GtkTargetPair {
-  GdkAtom   target;
-  guint     flags;
-  guint     info;
-};
-
-GtkTargetList *gtk_target_list_new       (const GtkTargetEntry *targets,
-					  guint                 ntargets);
-GtkTargetList *gtk_target_list_ref       (GtkTargetList  *list);
-void           gtk_target_list_unref     (GtkTargetList  *list);
-void           gtk_target_list_add       (GtkTargetList  *list,
-				  	  GdkAtom         target,
-					  guint           flags,
-					  guint           info);
-void           gtk_target_list_add_text_targets      (GtkTargetList  *list,
-                                                      guint           info);
-void           gtk_target_list_add_rich_text_targets (GtkTargetList  *list,
-                                                      guint           info,
-                                                      gboolean        deserializable,
-                                                      GtkTextBuffer  *buffer);
-void           gtk_target_list_add_image_targets     (GtkTargetList  *list,
-                                                      guint           info,
-                                                      gboolean        writable);
-void           gtk_target_list_add_uri_targets       (GtkTargetList  *list,
-                                                      guint           info);
-void           gtk_target_list_add_table (GtkTargetList        *list,
-					  const GtkTargetEntry *targets,
-					  guint                 ntargets);
-void           gtk_target_list_remove    (GtkTargetList  *list,
-					  GdkAtom         target);
-gboolean       gtk_target_list_find      (GtkTargetList  *list,
-					  GdkAtom         target,
-					  guint          *info);
-
-GtkTargetEntry * gtk_target_table_new_from_list (GtkTargetList  *list,
-                                                 gint           *n_targets);
-void             gtk_target_table_free          (GtkTargetEntry *targets,
-                                                 gint            n_targets);
-
-/* Public interface */
-
-gboolean gtk_selection_owner_set             (GtkWidget  *widget,
-					      GdkAtom     selection,
-					      guint32     time_);
-gboolean gtk_selection_owner_set_for_display (GdkDisplay *display,
-					      GtkWidget  *widget,
-					      GdkAtom     selection,
-					      guint32     time_);
-
-void     gtk_selection_add_target    (GtkWidget            *widget,
-				      GdkAtom               selection,
-				      GdkAtom               target,
-				      guint                 info);
-void     gtk_selection_add_targets   (GtkWidget            *widget,
-				      GdkAtom               selection,
-				      const GtkTargetEntry *targets,
-				      guint                 ntargets);
-void     gtk_selection_clear_targets (GtkWidget            *widget,
-				      GdkAtom               selection);
-gboolean gtk_selection_convert       (GtkWidget            *widget,
-				      GdkAtom               selection,
-				      GdkAtom               target,
-				      guint32               time_);
-void     gtk_selection_data_set      (GtkSelectionData     *selection_data,
-				      GdkAtom               type,
-				      gint                  format,
-				      const guchar         *data,
-				      gint                  length);
-gboolean gtk_selection_data_set_text (GtkSelectionData     *selection_data,
-				      const gchar          *str,
-				      gint                  len);
-guchar * gtk_selection_data_get_text (GtkSelectionData     *selection_data);
-gboolean gtk_selection_data_set_pixbuf   (GtkSelectionData  *selection_data,
-				          GdkPixbuf         *pixbuf);
-GdkPixbuf *gtk_selection_data_get_pixbuf (GtkSelectionData  *selection_data);
-gboolean gtk_selection_data_set_uris (GtkSelectionData     *selection_data,
-				      gchar               **uris);
-gchar  **gtk_selection_data_get_uris (GtkSelectionData     *selection_data);
-
-gboolean gtk_selection_data_get_targets          (GtkSelectionData  *selection_data,
-						  GdkAtom          **targets,
-						  gint              *n_atoms);
-gboolean gtk_selection_data_targets_include_text (GtkSelectionData  *selection_data);
-gboolean gtk_selection_data_targets_include_rich_text (GtkSelectionData *selection_data,
-                                                       GtkTextBuffer    *buffer);
-gboolean gtk_selection_data_targets_include_image (GtkSelectionData  *selection_data,
-						   gboolean           writable);
-gboolean gtk_selection_data_targets_include_uri  (GtkSelectionData  *selection_data);
-gboolean gtk_targets_include_text                (GdkAtom       *targets,
-						  gint           n_targets);
-gboolean gtk_targets_include_rich_text           (GdkAtom       *targets,
-						  gint           n_targets,
-                                                  GtkTextBuffer *buffer);
-gboolean gtk_targets_include_image               (GdkAtom       *targets,
-						  gint           n_targets,
-						  gboolean       writable);
-gboolean gtk_targets_include_uri                 (GdkAtom       *targets,
-						  gint           n_targets);
-
-/* Called when a widget is destroyed */
-
-void gtk_selection_remove_all      (GtkWidget *widget);
-
-/* Event handlers */
-#if !defined(GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
-gboolean gtk_selection_clear		  (GtkWidget 	     *widget,
-					   GdkEventSelection *event);
-#endif
-gboolean _gtk_selection_request		  (GtkWidget  	     *widget,
-					   GdkEventSelection *event);
-gboolean _gtk_selection_incr_event	  (GdkWindow         *window,
-					   GdkEventProperty  *event);
-gboolean _gtk_selection_notify		  (GtkWidget         *widget,
-					   GdkEventSelection *event);
-gboolean _gtk_selection_property_notify	  (GtkWidget         *widget,
-					   GdkEventProperty  *event);
-
-GType             gtk_selection_data_get_type (void) G_GNUC_CONST;
-GtkSelectionData *gtk_selection_data_copy     (GtkSelectionData *data);
-void		  gtk_selection_data_free     (GtkSelectionData *data);
-
-GType             gtk_target_list_get_type    (void) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __GTK_SELECTION_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkseparator.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkseparator.h
deleted file mode 100644
index 5ea35644..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkseparator.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_SEPARATOR_H__
-#define __GTK_SEPARATOR_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkwidget.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_SEPARATOR                  (gtk_separator_get_type ())
-#define GTK_SEPARATOR(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SEPARATOR, GtkSeparator))
-#define GTK_SEPARATOR_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SEPARATOR, GtkSeparatorClass))
-#define GTK_IS_SEPARATOR(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SEPARATOR))
-#define GTK_IS_SEPARATOR_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SEPARATOR))
-#define GTK_SEPARATOR_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SEPARATOR, GtkSeparatorClass))
-
-
-
-typedef struct _GtkSeparator       GtkSeparator;
-typedef struct _GtkSeparatorClass  GtkSeparatorClass;
-
-struct _GtkSeparator
-{
-  GtkWidget widget;
-};
-
-struct _GtkSeparatorClass
-{
-  GtkWidgetClass parent_class;
-};
-
-
-GType  gtk_separator_get_type (void) G_GNUC_CONST;
-
-
-G_END_DECLS
-
-#endif /* __GTK_SEPARATOR_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkseparatormenuitem.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkseparatormenuitem.h
deleted file mode 100644
index fe4f96bf..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkseparatormenuitem.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_SEPARATOR_MENU_ITEM_H__
-#define __GTK_SEPARATOR_MENU_ITEM_H__
-
-#include <gdk/gdk.h>
-#include <gtk/gtkmenuitem.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_SEPARATOR_MENU_ITEM            (gtk_separator_menu_item_get_type ())
-#define GTK_SEPARATOR_MENU_ITEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SEPARATOR_MENU_ITEM, GtkSeparatorMenuItem))
-#define GTK_SEPARATOR_MENU_ITEM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SEPARATOR_MENU_ITEM, GtkSeparatorMenuItemClass))
-#define GTK_IS_SEPARATOR_MENU_ITEM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SEPARATOR_MENU_ITEM))
-#define GTK_IS_SEPARATOR_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SEPARATOR_MENU_ITEM))
-#define GTK_SEPARATOR_MENU_ITEM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SEPARATOR_MENU_ITEM, GtkSeparatorMenuItemClass))
-
-
-typedef struct _GtkSeparatorMenuItem       GtkSeparatorMenuItem;
-typedef struct _GtkSeparatorMenuItemClass  GtkSeparatorMenuItemClass;
-
-struct _GtkSeparatorMenuItem
-{
-  GtkMenuItem menu_item;
-};
-
-struct _GtkSeparatorMenuItemClass
-{
-  GtkMenuItemClass parent_class;
-};
-
-
-GType	   gtk_separator_menu_item_get_type	   (void) G_GNUC_CONST;
-GtkWidget* gtk_separator_menu_item_new	           (void);
-
-
-G_END_DECLS
-
-#endif /* __GTK_SEPARATOR_MENU_ITEM_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkseparatortoolitem.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkseparatortoolitem.h
deleted file mode 100644
index 55e404be..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkseparatortoolitem.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* gtktoggletoolbutton.h
- *
- * Copyright (C) 2002 Anders Carlsson <andersca@gnome.org>
- * Copyright (C) 2002 James Henstridge <james@daa.com.au>
- *
- * 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 __GTK_SEPARATOR_TOOL_ITEM_H__
-#define __GTK_SEPARATOR_TOOL_ITEM_H__
-
-#include "gtktoolitem.h"
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_SEPARATOR_TOOL_ITEM            (gtk_separator_tool_item_get_type ())
-#define GTK_SEPARATOR_TOOL_ITEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SEPARATOR_TOOL_ITEM, GtkSeparatorToolItem))
-#define GTK_SEPARATOR_TOOL_ITEM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SEPARATOR_TOOL_ITEM, GtkSeparatorToolItemClass))
-#define GTK_IS_SEPARATOR_TOOL_ITEM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SEPARATOR_TOOL_ITEM))
-#define GTK_IS_SEPARATOR_TOOL_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SEPARATOR_TOOL_ITEM))
-#define GTK_SEPARATOR_TOOL_ITEM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_SEPARATOR_TOOL_ITEM, GtkSeparatorToolItemClass))
-
-typedef struct _GtkSeparatorToolItem        GtkSeparatorToolItem;
-typedef struct _GtkSeparatorToolItemClass   GtkSeparatorToolItemClass;
-typedef struct _GtkSeparatorToolItemPrivate GtkSeparatorToolItemPrivate;
-
-struct _GtkSeparatorToolItem
-{
-  GtkToolItem parent;
-  
-  /*< private >*/
-  GtkSeparatorToolItemPrivate *priv;
-};
-
-struct _GtkSeparatorToolItemClass
-{
-  GtkToolItemClass parent_class;
-
-  /* Padding for future expansion */
-  void (* _gtk_reserved1) (void);
-  void (* _gtk_reserved2) (void);
-  void (* _gtk_reserved3) (void);
-  void (* _gtk_reserved4) (void);
-};
-
-GType        gtk_separator_tool_item_get_type (void) G_GNUC_CONST;
-GtkToolItem *gtk_separator_tool_item_new      (void);
-
-gboolean     gtk_separator_tool_item_get_draw (GtkSeparatorToolItem *item);
-void         gtk_separator_tool_item_set_draw (GtkSeparatorToolItem *item,
-					       gboolean              draw);
-
-G_END_DECLS
-
-#endif /* __GTK_SEPARATOR_TOOL_ITEM_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtksettings.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtksettings.h
deleted file mode 100644
index f058e00a..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtksettings.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-#ifndef __GTK_SETTINGS_H__
-#define __GTK_SETTINGS_H__
-
-#include	<gtk/gtkrc.h>
-
-G_BEGIN_DECLS
-
-
-/* -- type macros --- */
-#define GTK_TYPE_SETTINGS             (gtk_settings_get_type ())
-#define GTK_SETTINGS(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SETTINGS, GtkSettings))
-#define GTK_SETTINGS_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SETTINGS, GtkSettingsClass))
-#define GTK_IS_SETTINGS(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SETTINGS))
-#define GTK_IS_SETTINGS_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SETTINGS))
-#define GTK_SETTINGS_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SETTINGS, GtkSettingsClass))
-
-
-/* --- typedefs --- */
-typedef struct    _GtkSettingsClass GtkSettingsClass;
-typedef struct    _GtkSettingsValue GtkSettingsValue;
-typedef struct    _GtkSettingsPropertyValue GtkSettingsPropertyValue; /* Internal */
-
-
-/* --- structures --- */
-struct _GtkSettings
-{
-  GObject parent_instance;
-
-  GData  *queued_settings;	/* of type GtkSettingsValue* */
-  GtkSettingsPropertyValue *property_values;
-
-  GtkRcContext *rc_context;
-  GdkScreen    *screen;
-};
-struct _GtkSettingsClass
-{
-  GObjectClass parent_class;
-  
-};
-struct _GtkSettingsValue
-{
-  /* origin should be something like "filename:linenumber" for rc files,
-   * or e.g. "XProperty" for other sources
-   */
-  gchar *origin;
-
-  /* valid types are LONG, DOUBLE and STRING corresponding to the token parsed,
-   * or a GSTRING holding an unparsed statement
-   */
-  GValue value;
-};
-
-
-/* --- functions --- */
-GType		gtk_settings_get_type		     (void) G_GNUC_CONST;
-#ifndef GDK_MULTIHEAD_SAFE
-GtkSettings*	gtk_settings_get_default	     (void);
-#endif
-GtkSettings*	gtk_settings_get_for_screen	     (GdkScreen *screen);
-  
-void		gtk_settings_install_property	     (GParamSpec         *pspec);
-void		gtk_settings_install_property_parser (GParamSpec         *pspec,
-						      GtkRcPropertyParser parser);
-
-/* --- precoded parsing functions --- */
-gboolean gtk_rc_property_parse_color       (const GParamSpec *pspec,
-					    const GString    *gstring,
-					    GValue           *property_value);
-gboolean gtk_rc_property_parse_enum        (const GParamSpec *pspec,
-					    const GString    *gstring,
-					    GValue           *property_value);
-gboolean gtk_rc_property_parse_flags       (const GParamSpec *pspec,
-					    const GString    *gstring,
-					    GValue           *property_value);
-gboolean gtk_rc_property_parse_requisition (const GParamSpec *pspec,
-					    const GString    *gstring,
-					    GValue           *property_value);
-gboolean gtk_rc_property_parse_border      (const GParamSpec *pspec,
-					    const GString    *gstring,
-					    GValue           *property_value);
-
-/*< private >*/
-void		gtk_settings_set_property_value	 (GtkSettings	*settings,
-						  const gchar	*name,
-						  const GtkSettingsValue *svalue);
-void		gtk_settings_set_string_property (GtkSettings	*settings,
-						  const gchar	*name,
-						  const gchar	*v_string,
-						  const gchar   *origin);
-void		gtk_settings_set_long_property	 (GtkSettings	*settings,
-						  const gchar	*name,
-						  glong		 v_long,
-						  const gchar   *origin);
-void		gtk_settings_set_double_property (GtkSettings	*settings,
-						  const gchar	*name,
-						  gdouble	 v_double,
-						  const gchar   *origin);
-
-
-/* implementation details */
-void _gtk_settings_set_property_value_from_rc (GtkSettings            *settings,
-					       const gchar            *name,
-					       const GtkSettingsValue *svalue);
-void _gtk_settings_reset_rc_values            (GtkSettings            *settings);
-
-void                _gtk_settings_handle_event        (GdkEventSetting    *event);
-GtkRcPropertyParser _gtk_rc_property_parser_from_type (GType               type);
-gboolean	    _gtk_settings_parse_convert       (GtkRcPropertyParser parser,
-						       const GValue       *src_value,
-						       GParamSpec         *pspec,
-						       GValue	          *dest_value);
-
-
-G_END_DECLS
-
-#endif /* __GTK_SETTINGS_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtksignal.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtksignal.h
deleted file mode 100644
index 56bbe0b4..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtksignal.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_SIGNAL_H__
-#define __GTK_SIGNAL_H__
-
-
-#include <gtk/gtkenums.h>
-#include <gtk/gtkobject.h>
-#include <gtk/gtkmarshal.h>
-
-G_BEGIN_DECLS
-  
-#ifndef GTK_DISABLE_DEPRECATED
-
-#define	gtk_signal_default_marshaller	g_cclosure_marshal_VOID__VOID
-
-
-/* --- compat defines --- */
-#define GTK_SIGNAL_OFFSET	                      GTK_STRUCT_OFFSET
-#define	gtk_signal_lookup(name,object_type)	                                       \
-   g_signal_lookup ((name), (object_type))
-#define	gtk_signal_name(signal_id)                                                     \
-   g_signal_name (signal_id)
-#define	gtk_signal_emit_stop(object,signal_id)                                         \
-   g_signal_stop_emission ((object), (signal_id), 0)
-#define	gtk_signal_connect(object,name,func,func_data)                                 \
-   gtk_signal_connect_full ((object), (name), (func), NULL, (func_data), NULL, 0, 0)
-#define	gtk_signal_connect_after(object,name,func,func_data)                           \
-   gtk_signal_connect_full ((object), (name), (func), NULL, (func_data), NULL, 0, 1)
-#define	gtk_signal_connect_object(object,name,func,slot_object)                        \
-   gtk_signal_connect_full ((object), (name), (func), NULL, (slot_object), NULL, 1, 0)
-#define	gtk_signal_connect_object_after(object,name,func,slot_object)                  \
-   gtk_signal_connect_full ((object), (name), (func), NULL, (slot_object), NULL, 1, 1)
-#define	gtk_signal_disconnect(object,handler_id)                                       \
-   g_signal_handler_disconnect ((object), (handler_id))
-#define	gtk_signal_handler_block(object,handler_id)                                    \
-   g_signal_handler_block ((object), (handler_id))
-#define	gtk_signal_handler_unblock(object,handler_id)                                  \
-   g_signal_handler_unblock ((object), (handler_id))
-#define	gtk_signal_disconnect_by_func(object,func,data)	                               \
-   gtk_signal_compat_matched ((object), (func), (data),                                \
-			      (GSignalMatchType)(G_SIGNAL_MATCH_FUNC |                 \
-						 G_SIGNAL_MATCH_DATA), 0)
-#define	gtk_signal_disconnect_by_data(object,data)                                     \
-   gtk_signal_compat_matched ((object), 0, (data), G_SIGNAL_MATCH_DATA, 0)
-#define	gtk_signal_handler_block_by_func(object,func,data)                             \
-   gtk_signal_compat_matched ((object), (func), (data),                                \
-			      (GSignalMatchType)(G_SIGNAL_MATCH_FUNC |                 \
-						 G_SIGNAL_MATCH_DATA), 1)
-#define	gtk_signal_handler_block_by_data(object,data)                                  \
-   gtk_signal_compat_matched ((object), 0, (data), G_SIGNAL_MATCH_DATA, 1)
-#define	gtk_signal_handler_unblock_by_func(object,func,data)                           \
-   gtk_signal_compat_matched ((object), (func), (data),                                \
-			      (GSignalMatchType)(G_SIGNAL_MATCH_FUNC |                 \
-						 G_SIGNAL_MATCH_DATA), 2)
-#define	gtk_signal_handler_unblock_by_data(object,data)                                \
-   gtk_signal_compat_matched ((object), 0, (data), G_SIGNAL_MATCH_DATA, 2)
-#define	gtk_signal_handler_pending(object,signal_id,may_be_blocked)                    \
-   g_signal_has_handler_pending ((object), (signal_id), 0, (may_be_blocked))
-#define	gtk_signal_handler_pending_by_func(object,signal_id,may_be_blocked,func,data)  \
-   (g_signal_handler_find ((object),                                                             \
-			   (GSignalMatchType)(G_SIGNAL_MATCH_ID |                                \
-                                              G_SIGNAL_MATCH_FUNC |                              \
-                                              G_SIGNAL_MATCH_DATA |                              \
-                                              ((may_be_blocked) ? 0 : G_SIGNAL_MATCH_UNBLOCKED)),\
-                           (signal_id), 0, 0, (func), (data)) != 0)
-
-
-/* --- compat functions --- */
-guint	gtk_signal_newv				(const gchar	    *name,
-						 GtkSignalRunType    signal_flags,
-						 GtkType	     object_type,
-						 guint		     function_offset,
-						 GtkSignalMarshaller marshaller,
-						 GtkType	     return_val,
-						 guint		     n_args,
-						 GtkType	    *args);
-guint	gtk_signal_new				(const gchar	    *name,
-						 GtkSignalRunType    signal_flags,
-						 GtkType	     object_type,
-						 guint		     function_offset,
-						 GtkSignalMarshaller marshaller,
-						 GtkType	     return_val,
-						 guint		     n_args,
-						 ...);
-void	gtk_signal_emit_stop_by_name		(GtkObject	    *object,
-						 const gchar	    *name);
-void	gtk_signal_connect_object_while_alive	(GtkObject	    *object,
-						 const gchar        *name,
-						 GtkSignalFunc	     func,
-						 GtkObject	    *alive_object);
-void	gtk_signal_connect_while_alive		(GtkObject	    *object,
-						 const gchar        *name,
-						 GtkSignalFunc	     func,
-						 gpointer	     func_data,
-						 GtkObject	    *alive_object);
-gulong	gtk_signal_connect_full			(GtkObject	    *object,
-						 const gchar	    *name,
-						 GtkSignalFunc	     func,
-						 GtkCallbackMarshal  unsupported,
-						 gpointer	     data,
-						 GtkDestroyNotify    destroy_func,
-						 gint		     object_signal,
-						 gint		     after);
-void	gtk_signal_emitv			(GtkObject	    *object,
-						 guint		     signal_id,
-						 GtkArg		    *args);
-void	gtk_signal_emit				(GtkObject	    *object,
-						 guint		     signal_id,
-						 ...);
-void	gtk_signal_emit_by_name			(GtkObject	    *object,
-						 const gchar	    *name,
-						 ...);
-void	gtk_signal_emitv_by_name		(GtkObject	    *object,
-						 const gchar	    *name,
-						 GtkArg		    *args);
-void	gtk_signal_compat_matched		(GtkObject	    *object,
-						 GtkSignalFunc 	     func,
-						 gpointer      	     data,
-						 GSignalMatchType    match,
-						 guint               action);
-
-#endif /* GTK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GTK_SIGNAL_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtksizegroup.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtksizegroup.h
deleted file mode 100644
index 4a831538..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtksizegroup.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtksizegroup.h: 
- * Copyright (C) 2000 Red Hat Software
- *
- * 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 __GTK_SIZE_GROUP_H__
-#define __GTK_SIZE_GROUP_H__
-
-#include <gtk/gtkwidget.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_SIZE_GROUP            (gtk_size_group_get_type ())
-#define GTK_SIZE_GROUP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SIZE_GROUP, GtkSizeGroup))
-#define GTK_SIZE_GROUP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SIZE_GROUP, GtkSizeGroupClass))
-#define GTK_IS_SIZE_GROUP(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SIZE_GROUP))
-#define GTK_IS_SIZE_GROUP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SIZE_GROUP))
-#define GTK_SIZE_GROUP_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SIZE_GROUP, GtkSizeGroupClass))
-
-
-typedef struct _GtkSizeGroup       GtkSizeGroup;
-typedef struct _GtkSizeGroupClass  GtkSizeGroupClass;
-
-struct _GtkSizeGroup
-{
-  GObject parent_instance;
-
-  /* <private> */
-  GSList *widgets;
-
-  guint8 mode;
-  
-  guint have_width : 1;
-  guint have_height : 1;
-  guint ignore_hidden : 1;
-
-  GtkRequisition requisition;
-};
-
-struct _GtkSizeGroupClass
-{
-  GObjectClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-/**
- * GtkSizeGroupMode:
- * @GTK_SIZE_GROUP_NONE: group has no effect  
- * @GTK_SIZE_GROUP_HORIZONTAL: group affects horizontal requisition
- * @GTK_SIZE_GROUP_VERTICAL: group affects vertical requisition
- * @GTK_SIZE_GROUP_BOTH: group affects both horizontal and vertical requisition
- * 
- * The mode of the size group determines the directions in which the size
- * group affects the requested sizes of its component widgets.
- **/
-typedef enum {
-  GTK_SIZE_GROUP_NONE,
-  GTK_SIZE_GROUP_HORIZONTAL,
-  GTK_SIZE_GROUP_VERTICAL,
-  GTK_SIZE_GROUP_BOTH
-} GtkSizeGroupMode;
-
-GType            gtk_size_group_get_type      (void) G_GNUC_CONST;
-
-GtkSizeGroup *   gtk_size_group_new           (GtkSizeGroupMode  mode);
-void             gtk_size_group_set_mode      (GtkSizeGroup     *size_group,
-					       GtkSizeGroupMode  mode);
-GtkSizeGroupMode gtk_size_group_get_mode      (GtkSizeGroup     *size_group);
-void             gtk_size_group_set_ignore_hidden (GtkSizeGroup *size_group,
-						   gboolean      ignore_hidden);
-gboolean         gtk_size_group_get_ignore_hidden (GtkSizeGroup *size_group);
-void             gtk_size_group_add_widget    (GtkSizeGroup     *size_group,
-					       GtkWidget        *widget);
-void             gtk_size_group_remove_widget (GtkSizeGroup     *size_group,
-					       GtkWidget        *widget);
-GSList *         gtk_size_group_get_widgets   (GtkSizeGroup     *size_group);
-
-
-void _gtk_size_group_get_child_requisition (GtkWidget      *widget,
-					    GtkRequisition *requisition);
-void _gtk_size_group_compute_requisition   (GtkWidget      *widget,
-					    GtkRequisition *requisition);
-void _gtk_size_group_queue_resize          (GtkWidget      *widget);
-
-G_END_DECLS
-
-#endif /* __GTK_SIZE_GROUP_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtksocket.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtksocket.h
deleted file mode 100644
index c522e5ba..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtksocket.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_SOCKET_H__
-#define __GTK_SOCKET_H__
-
-#include <gtk/gtkcontainer.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_SOCKET            (gtk_socket_get_type ())
-#define GTK_SOCKET(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOCKET, GtkSocket))
-#define GTK_SOCKET_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOCKET, GtkSocketClass))
-#define GTK_IS_SOCKET(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SOCKET))
-#define GTK_IS_SOCKET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOCKET))
-#define GTK_SOCKET_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SOCKET, GtkSocketClass))
-
-
-typedef struct _GtkSocket        GtkSocket;
-typedef struct _GtkSocketClass   GtkSocketClass;
-
-struct _GtkSocket
-{
-  GtkContainer container;
-
-  guint16 request_width;
-  guint16 request_height;
-  guint16 current_width;
-  guint16 current_height;
-  
-  GdkWindow *plug_window;
-  GtkWidget *plug_widget;
-
-  gshort xembed_version;	/* -1 == not xembed */
-  guint same_app : 1;
-  guint focus_in : 1;
-  guint have_size : 1;
-  guint need_map : 1;
-  guint is_mapped : 1;
-  guint active : 1;
-  
-  GtkAccelGroup *accel_group;
-  GtkWidget *toplevel;
-};
-
-struct _GtkSocketClass
-{
-  GtkContainerClass parent_class;
-
-  void     (*plug_added)   (GtkSocket *socket_);
-  gboolean (*plug_removed) (GtkSocket *socket_);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType          gtk_socket_get_type (void) G_GNUC_CONST;
-GtkWidget*     gtk_socket_new      (void);
-
-void            gtk_socket_add_id (GtkSocket       *socket_,
-				   GdkNativeWindow  window_id);
-GdkNativeWindow gtk_socket_get_id (GtkSocket       *socket_);
-
-#ifndef GTK_DISABLE_DEPRECATED
-void           gtk_socket_steal    (GtkSocket      *socket_,
-				    GdkNativeWindow wid);
-#endif /* GTK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GTK_SOCKET_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkspinbutton.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkspinbutton.h
deleted file mode 100644
index 4bf3570c..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkspinbutton.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * GtkSpinButton widget for GTK+
- * Copyright (C) 1998 Lars Hamann and Stefan Jeske
- *
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_SPIN_BUTTON_H__
-#define __GTK_SPIN_BUTTON_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkadjustment.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_SPIN_BUTTON                  (gtk_spin_button_get_type ())
-#define GTK_SPIN_BUTTON(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SPIN_BUTTON, GtkSpinButton))
-#define GTK_SPIN_BUTTON_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SPIN_BUTTON, GtkSpinButtonClass))
-#define GTK_IS_SPIN_BUTTON(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SPIN_BUTTON))
-#define GTK_IS_SPIN_BUTTON_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SPIN_BUTTON))
-#define GTK_SPIN_BUTTON_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SPIN_BUTTON, GtkSpinButtonClass))
-
-#define GTK_INPUT_ERROR -1
-
-typedef enum
-{
-  GTK_UPDATE_ALWAYS,
-  GTK_UPDATE_IF_VALID
-} GtkSpinButtonUpdatePolicy;
-
-typedef enum
-{
-  GTK_SPIN_STEP_FORWARD,
-  GTK_SPIN_STEP_BACKWARD,
-  GTK_SPIN_PAGE_FORWARD,
-  GTK_SPIN_PAGE_BACKWARD,
-  GTK_SPIN_HOME,
-  GTK_SPIN_END,
-  GTK_SPIN_USER_DEFINED
-} GtkSpinType;
-
-
-typedef struct _GtkSpinButton	    GtkSpinButton;
-typedef struct _GtkSpinButtonClass  GtkSpinButtonClass;
-
-
-struct _GtkSpinButton
-{
-  GtkEntry entry;
-  
-  GtkAdjustment *adjustment;
-  
-  GdkWindow *panel;
-  
-  guint32 timer;
-  
-  gdouble climb_rate;
-  gdouble timer_step;
-  
-  GtkSpinButtonUpdatePolicy update_policy;
-  
-  guint in_child : 2;
-  guint click_child : 2; /* valid: GTK_ARROW_UP=0, GTK_ARROW_DOWN=1 or 2=NONE/BOTH */
-  guint button : 2;
-  guint need_timer : 1;
-  guint timer_calls : 3;
-  guint digits : 10;
-  guint numeric : 1;
-  guint wrap : 1;
-  guint snap_to_ticks : 1;
-};
-
-struct _GtkSpinButtonClass
-{
-  GtkEntryClass parent_class;
-
-  gint (*input)  (GtkSpinButton *spin_button,
-		  gdouble       *new_value);
-  gint (*output) (GtkSpinButton *spin_button);
-  void (*value_changed) (GtkSpinButton *spin_button);
-
-  /* Action signals for keybindings, do not connect to these */
-  void (*change_value) (GtkSpinButton *spin_button,
-			GtkScrollType  scroll);
-
-  void (*wrapped) (GtkSpinButton *spin_button);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-};
-
-
-GType		gtk_spin_button_get_type	   (void) G_GNUC_CONST;
-
-void		gtk_spin_button_configure	   (GtkSpinButton  *spin_button,
-						    GtkAdjustment  *adjustment,
-						    gdouble	    climb_rate,
-						    guint	    digits);
-
-GtkWidget*	gtk_spin_button_new		   (GtkAdjustment  *adjustment,
-						    gdouble	    climb_rate,
-						    guint	    digits);
-
-GtkWidget*	gtk_spin_button_new_with_range	   (gdouble  min,
-						    gdouble  max,
-						    gdouble  step);
-
-void		gtk_spin_button_set_adjustment	   (GtkSpinButton  *spin_button,
-						    GtkAdjustment  *adjustment);
-
-GtkAdjustment*	gtk_spin_button_get_adjustment	   (GtkSpinButton  *spin_button);
-
-void		gtk_spin_button_set_digits	   (GtkSpinButton  *spin_button,
-						    guint	    digits);
-guint           gtk_spin_button_get_digits         (GtkSpinButton  *spin_button);
-
-void		gtk_spin_button_set_increments	   (GtkSpinButton  *spin_button,
-						    gdouble         step,
-						    gdouble         page);
-void            gtk_spin_button_get_increments     (GtkSpinButton  *spin_button,
-						    gdouble        *step,
-						    gdouble        *page);
-
-void		gtk_spin_button_set_range	   (GtkSpinButton  *spin_button,
-						    gdouble         min,
-						    gdouble         max);
-void            gtk_spin_button_get_range          (GtkSpinButton  *spin_button,
-						    gdouble        *min,
-						    gdouble        *max);
-
-gdouble		gtk_spin_button_get_value          (GtkSpinButton  *spin_button);
-
-gint		gtk_spin_button_get_value_as_int   (GtkSpinButton  *spin_button);
-
-void		gtk_spin_button_set_value	   (GtkSpinButton  *spin_button, 
-						    gdouble	    value);
-
-void		gtk_spin_button_set_update_policy  (GtkSpinButton  *spin_button,
-						    GtkSpinButtonUpdatePolicy  policy);
-GtkSpinButtonUpdatePolicy gtk_spin_button_get_update_policy (GtkSpinButton *spin_button);
-
-void		gtk_spin_button_set_numeric	   (GtkSpinButton  *spin_button,
-						    gboolean	    numeric);
-gboolean        gtk_spin_button_get_numeric        (GtkSpinButton  *spin_button);
-
-void		gtk_spin_button_spin		   (GtkSpinButton  *spin_button,
-						    GtkSpinType     direction,
-						    gdouble	    increment);
-
-void		gtk_spin_button_set_wrap	   (GtkSpinButton  *spin_button,
-						    gboolean	    wrap);
-gboolean        gtk_spin_button_get_wrap           (GtkSpinButton  *spin_button);
-
-void		gtk_spin_button_set_snap_to_ticks  (GtkSpinButton  *spin_button,
-						    gboolean	    snap_to_ticks);
-gboolean        gtk_spin_button_get_snap_to_ticks  (GtkSpinButton  *spin_button);
-void            gtk_spin_button_update             (GtkSpinButton  *spin_button);
-
-
-#ifndef GTK_DISABLE_DEPRECATED
-#define gtk_spin_button_get_value_as_float gtk_spin_button_get_value
-#endif
-
-G_END_DECLS
-
-#endif /* __GTK_SPIN_BUTTON_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkstatusbar.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkstatusbar.h
deleted file mode 100644
index 47025331..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkstatusbar.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- * GtkStatusbar Copyright (C) 1998 Shawn T. Amundson
- *
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_STATUSBAR_H__
-#define __GTK_STATUSBAR_H__
-
-#include <gtk/gtkhbox.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_STATUSBAR            (gtk_statusbar_get_type ())
-#define GTK_STATUSBAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_STATUSBAR, GtkStatusbar))
-#define GTK_STATUSBAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_STATUSBAR, GtkStatusbarClass))
-#define GTK_IS_STATUSBAR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_STATUSBAR))
-#define GTK_IS_STATUSBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_STATUSBAR))
-#define GTK_STATUSBAR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_STATUSBAR, GtkStatusbarClass))
-
-
-typedef struct _GtkStatusbar      GtkStatusbar;
-typedef struct _GtkStatusbarClass GtkStatusbarClass;
-
-struct _GtkStatusbar
-{
-  GtkHBox parent_widget;
-
-  GtkWidget *frame;
-  GtkWidget *label;
-
-  GSList *messages;
-  GSList *keys;
-
-  guint seq_context_id;
-  guint seq_message_id;
-
-  GdkWindow *grip_window;
-  
-  guint has_resize_grip : 1;
-};
-
-struct _GtkStatusbarClass
-{
-  GtkHBoxClass parent_class;
-
-  gpointer reserved;
-
-  void	(*text_pushed)	(GtkStatusbar	*statusbar,
-			 guint		 context_id,
-			 const gchar	*text);
-  void	(*text_popped)	(GtkStatusbar	*statusbar,
-			 guint		 context_id,
-			 const gchar	*text);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType      gtk_statusbar_get_type     	(void) G_GNUC_CONST;
-GtkWidget* gtk_statusbar_new          	(void);
-/* If you don't want to use contexts, 0 is a predefined global
- * context_id you can pass to push/pop/remove
- */
-guint	   gtk_statusbar_get_context_id	(GtkStatusbar *statusbar,
-					 const gchar  *context_description);
-/* Returns message_id used for gtk_statusbar_remove */
-guint      gtk_statusbar_push          	(GtkStatusbar *statusbar,
-					 guint	       context_id,
-					 const gchar  *text);
-void       gtk_statusbar_pop          	(GtkStatusbar *statusbar,
-					 guint	       context_id);
-void       gtk_statusbar_remove        	(GtkStatusbar *statusbar,
-					 guint	       context_id,
-					 guint         message_id);
-
-void     gtk_statusbar_set_has_resize_grip (GtkStatusbar *statusbar,
-					    gboolean      setting);
-gboolean gtk_statusbar_get_has_resize_grip (GtkStatusbar *statusbar);
-
-G_END_DECLS
-
-#endif /* __GTK_STATUSBAR_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkstatusicon.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkstatusicon.h
deleted file mode 100644
index e58eb6ad..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkstatusicon.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* gtkstatusicon.h:
- *
- * Copyright (C) 2003 Sun Microsystems, 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.
- *
- * Authors:
- *      Mark McLoughlin <mark@skynet.ie>
- */
-
-#ifndef __GTK_STATUS_ICON_H__
-#define __GTK_STATUS_ICON_H__
-
-#include <gtk/gtkimage.h>
-#include <gtk/gtkmenu.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_STATUS_ICON         (gtk_status_icon_get_type ())
-#define GTK_STATUS_ICON(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GTK_TYPE_STATUS_ICON, GtkStatusIcon))
-#define GTK_STATUS_ICON_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), GTK_TYPE_STATUS_ICON, GtkStatusIconClass))
-#define GTK_IS_STATUS_ICON(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTK_TYPE_STATUS_ICON))
-#define GTK_IS_STATUS_ICON_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), GTK_TYPE_STATUS_ICON))
-#define GTK_STATUS_ICON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GTK_TYPE_STATUS_ICON, GtkStatusIconClass))
-
-typedef struct _GtkStatusIcon	     GtkStatusIcon;
-typedef struct _GtkStatusIconClass   GtkStatusIconClass;
-typedef struct _GtkStatusIconPrivate GtkStatusIconPrivate;
-
-struct _GtkStatusIcon
-{
-  GObject               parent_instance;
-
-  GtkStatusIconPrivate *priv;
-};
-
-struct _GtkStatusIconClass
-{
-  GObjectClass parent_class;
-
-  void     (* activate)     (GtkStatusIcon *status_icon);
-  void     (* popup_menu)   (GtkStatusIcon *status_icon,
-			     guint          button,
-			     guint32        activate_time);
-  gboolean (* size_changed) (GtkStatusIcon *status_icon,
-			     gint           size);
-
-  void (*__gtk_reserved1);
-  void (*__gtk_reserved2);
-  void (*__gtk_reserved3);
-  void (*__gtk_reserved4);
-  void (*__gtk_reserved5);
-  void (*__gtk_reserved6);  
-};
-
-GType                 gtk_status_icon_get_type           (void) G_GNUC_CONST;
-
-GtkStatusIcon        *gtk_status_icon_new                (void);
-GtkStatusIcon        *gtk_status_icon_new_from_pixbuf    (GdkPixbuf          *pixbuf);
-GtkStatusIcon        *gtk_status_icon_new_from_file      (const gchar        *filename);
-GtkStatusIcon        *gtk_status_icon_new_from_stock     (const gchar        *stock_id);
-GtkStatusIcon        *gtk_status_icon_new_from_icon_name (const gchar        *icon_name);
-
-void                  gtk_status_icon_set_from_pixbuf    (GtkStatusIcon      *status_icon,
-							  GdkPixbuf          *pixbuf);
-void                  gtk_status_icon_set_from_file      (GtkStatusIcon      *status_icon,
-							  const gchar        *filename);
-void                  gtk_status_icon_set_from_stock     (GtkStatusIcon      *status_icon,
-							  const gchar        *stock_id);
-void                  gtk_status_icon_set_from_icon_name (GtkStatusIcon      *status_icon,
-							  const gchar        *icon_name);
-
-GtkImageType          gtk_status_icon_get_storage_type   (GtkStatusIcon      *status_icon);
-
-GdkPixbuf            *gtk_status_icon_get_pixbuf         (GtkStatusIcon      *status_icon);
-G_CONST_RETURN gchar *gtk_status_icon_get_stock          (GtkStatusIcon      *status_icon);
-G_CONST_RETURN gchar *gtk_status_icon_get_icon_name      (GtkStatusIcon      *status_icon);
-
-gint                  gtk_status_icon_get_size           (GtkStatusIcon      *status_icon);
-
-void                  gtk_status_icon_set_screen         (GtkStatusIcon      *status_icon,
-                                                          GdkScreen          *screen);
-GdkScreen            *gtk_status_icon_get_screen         (GtkStatusIcon      *status_icon);
-
-void                  gtk_status_icon_set_tooltip        (GtkStatusIcon      *status_icon,
-							  const gchar        *tooltip_text);
-
-void                  gtk_status_icon_set_visible        (GtkStatusIcon      *status_icon,
-							  gboolean            visible);
-gboolean              gtk_status_icon_get_visible        (GtkStatusIcon      *status_icon);
-
-void                  gtk_status_icon_set_blinking       (GtkStatusIcon      *status_icon,
-							  gboolean            blinking);
-gboolean              gtk_status_icon_get_blinking       (GtkStatusIcon      *status_icon);
-
-gboolean              gtk_status_icon_is_embedded        (GtkStatusIcon      *status_icon);
-
-void                  gtk_status_icon_position_menu      (GtkMenu            *menu,
-							  gint               *x,
-							  gint               *y,
-							  gboolean           *push_in,
-							  gpointer            user_data);
-gboolean              gtk_status_icon_get_geometry       (GtkStatusIcon      *status_icon,
-							  GdkScreen         **screen,
-							  GdkRectangle       *area,
-							  GtkOrientation     *orientation);
-
-G_END_DECLS
-
-#endif /* __GTK_STATUS_ICON_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkstock.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkstock.h
deleted file mode 100644
index 75d3b1fd..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkstock.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_STOCK_H__
-#define __GTK_STOCK_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkitemfactory.h> /* for GtkTranslateFunc */
-
-G_BEGIN_DECLS
-
-typedef struct _GtkStockItem GtkStockItem;
-
-struct _GtkStockItem
-{
-  gchar *stock_id;
-  gchar *label;
-  GdkModifierType modifier;
-  guint keyval;
-  gchar *translation_domain;
-};
-
-void     gtk_stock_add        (const GtkStockItem  *items,
-                               guint                n_items);
-void     gtk_stock_add_static (const GtkStockItem  *items,
-                               guint                n_items);
-gboolean gtk_stock_lookup     (const gchar         *stock_id,
-                               GtkStockItem        *item);
-
-/* Should free the list (and free each string in it also).
- * This function is only useful for GUI builders and such.
- */
-GSList*  gtk_stock_list_ids  (void);
-
-GtkStockItem *gtk_stock_item_copy (const GtkStockItem *item);
-void          gtk_stock_item_free (GtkStockItem       *item);
-
-void          gtk_stock_set_translate_func (const gchar      *domain,
-					    GtkTranslateFunc  func,
-					    gpointer          data,
-					    GtkDestroyNotify  notify);
-
-/* Stock IDs (not all are stock items; some are images only) */
-#define GTK_STOCK_DIALOG_AUTHENTICATION \
-                                   "gtk-dialog-authentication"
-#define GTK_STOCK_DIALOG_INFO      "gtk-dialog-info"
-#define GTK_STOCK_DIALOG_WARNING   "gtk-dialog-warning"
-#define GTK_STOCK_DIALOG_ERROR     "gtk-dialog-error"
-#define GTK_STOCK_DIALOG_QUESTION  "gtk-dialog-question"
-
-#define GTK_STOCK_DND              "gtk-dnd"
-#define GTK_STOCK_DND_MULTIPLE     "gtk-dnd-multiple"
-
-#define GTK_STOCK_ABOUT            "gtk-about"
-#define GTK_STOCK_ADD              "gtk-add"
-#define GTK_STOCK_APPLY            "gtk-apply"
-#define GTK_STOCK_BOLD             "gtk-bold"
-#define GTK_STOCK_CANCEL           "gtk-cancel"
-#define GTK_STOCK_CDROM            "gtk-cdrom"
-#define GTK_STOCK_CLEAR            "gtk-clear"
-#define GTK_STOCK_CLOSE            "gtk-close"
-#define GTK_STOCK_COLOR_PICKER     "gtk-color-picker"
-#define GTK_STOCK_CONVERT          "gtk-convert"
-#define GTK_STOCK_CONNECT          "gtk-connect"
-#define GTK_STOCK_COPY             "gtk-copy"
-#define GTK_STOCK_CUT              "gtk-cut"
-#define GTK_STOCK_DELETE           "gtk-delete"
-#define GTK_STOCK_DIRECTORY        "gtk-directory"
-#define GTK_STOCK_DISCARD          "gtk-discard"
-#define GTK_STOCK_DISCONNECT       "gtk-disconnect"
-#define GTK_STOCK_EDIT             "gtk-edit"
-#define GTK_STOCK_EXECUTE          "gtk-execute"
-#define GTK_STOCK_FILE             "gtk-file"
-#define GTK_STOCK_FIND             "gtk-find"
-#define GTK_STOCK_FIND_AND_REPLACE "gtk-find-and-replace"
-#define GTK_STOCK_FLOPPY           "gtk-floppy"
-#define GTK_STOCK_FULLSCREEN       "gtk-fullscreen"
-#define GTK_STOCK_GOTO_BOTTOM      "gtk-goto-bottom"
-#define GTK_STOCK_GOTO_FIRST       "gtk-goto-first"
-#define GTK_STOCK_GOTO_LAST        "gtk-goto-last"
-#define GTK_STOCK_GOTO_TOP         "gtk-goto-top"
-#define GTK_STOCK_GO_BACK          "gtk-go-back"
-#define GTK_STOCK_GO_DOWN          "gtk-go-down"
-#define GTK_STOCK_GO_FORWARD       "gtk-go-forward"
-#define GTK_STOCK_GO_UP            "gtk-go-up"
-#define GTK_STOCK_HARDDISK         "gtk-harddisk"
-#define GTK_STOCK_HELP             "gtk-help"
-#define GTK_STOCK_HOME             "gtk-home"
-#define GTK_STOCK_INDEX            "gtk-index"
-#define GTK_STOCK_INDENT           "gtk-indent"
-#define GTK_STOCK_INFO             "gtk-info"
-#define GTK_STOCK_UNINDENT         "gtk-unindent"
-#define GTK_STOCK_ITALIC           "gtk-italic"
-#define GTK_STOCK_JUMP_TO          "gtk-jump-to"
-#define GTK_STOCK_JUSTIFY_CENTER   "gtk-justify-center"
-#define GTK_STOCK_JUSTIFY_FILL     "gtk-justify-fill"
-#define GTK_STOCK_JUSTIFY_LEFT     "gtk-justify-left"
-#define GTK_STOCK_JUSTIFY_RIGHT    "gtk-justify-right"
-#define GTK_STOCK_LEAVE_FULLSCREEN "gtk-leave-fullscreen"
-#define GTK_STOCK_MISSING_IMAGE    "gtk-missing-image"
-#define GTK_STOCK_MEDIA_FORWARD    "gtk-media-forward"
-#define GTK_STOCK_MEDIA_NEXT       "gtk-media-next"
-#define GTK_STOCK_MEDIA_PAUSE      "gtk-media-pause"
-#define GTK_STOCK_MEDIA_PLAY       "gtk-media-play"
-#define GTK_STOCK_MEDIA_PREVIOUS   "gtk-media-previous"
-#define GTK_STOCK_MEDIA_RECORD     "gtk-media-record"
-#define GTK_STOCK_MEDIA_REWIND     "gtk-media-rewind"
-#define GTK_STOCK_MEDIA_STOP       "gtk-media-stop"
-#define GTK_STOCK_NETWORK          "gtk-network"
-#define GTK_STOCK_NEW              "gtk-new"
-#define GTK_STOCK_NO               "gtk-no"
-#define GTK_STOCK_OK               "gtk-ok"
-#define GTK_STOCK_OPEN             "gtk-open"
-#define GTK_STOCK_ORIENTATION_PORTRAIT "gtk-orientation-portrait"
-#define GTK_STOCK_ORIENTATION_LANDSCAPE "gtk-orientation-landscape"
-#define GTK_STOCK_ORIENTATION_REVERSE_LANDSCAPE "gtk-orientation-reverse-landscape"
-#define GTK_STOCK_ORIENTATION_REVERSE_PORTRAIT "gtk-orientation-reverse-portrait"
-#define GTK_STOCK_PASTE            "gtk-paste"
-#define GTK_STOCK_PREFERENCES      "gtk-preferences"
-#define GTK_STOCK_PRINT            "gtk-print"
-#define GTK_STOCK_PRINT_PREVIEW    "gtk-print-preview"
-#define GTK_STOCK_PROPERTIES       "gtk-properties"
-#define GTK_STOCK_QUIT             "gtk-quit"
-#define GTK_STOCK_REDO             "gtk-redo"
-#define GTK_STOCK_REFRESH          "gtk-refresh"
-#define GTK_STOCK_REMOVE           "gtk-remove"
-#define GTK_STOCK_REVERT_TO_SAVED  "gtk-revert-to-saved"
-#define GTK_STOCK_SAVE             "gtk-save"
-#define GTK_STOCK_SAVE_AS          "gtk-save-as"
-#define GTK_STOCK_SELECT_ALL       "gtk-select-all"
-#define GTK_STOCK_SELECT_COLOR     "gtk-select-color"
-#define GTK_STOCK_SELECT_FONT      "gtk-select-font"
-#define GTK_STOCK_SORT_ASCENDING   "gtk-sort-ascending"
-#define GTK_STOCK_SORT_DESCENDING  "gtk-sort-descending"
-#define GTK_STOCK_SPELL_CHECK      "gtk-spell-check"
-#define GTK_STOCK_STOP             "gtk-stop"
-#define GTK_STOCK_STRIKETHROUGH    "gtk-strikethrough"
-#define GTK_STOCK_UNDELETE         "gtk-undelete"
-#define GTK_STOCK_UNDERLINE        "gtk-underline"
-#define GTK_STOCK_UNDO             "gtk-undo"
-#define GTK_STOCK_YES              "gtk-yes"
-#define GTK_STOCK_ZOOM_100         "gtk-zoom-100"
-#define GTK_STOCK_ZOOM_FIT         "gtk-zoom-fit"
-#define GTK_STOCK_ZOOM_IN          "gtk-zoom-in"
-#define GTK_STOCK_ZOOM_OUT         "gtk-zoom-out"
-
-G_END_DECLS
-
-#endif /* __GTK_STOCK_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkstyle.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkstyle.h
deleted file mode 100644
index bed56e0c..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkstyle.h
+++ /dev/null
@@ -1,908 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_STYLE_H__
-#define __GTK_STYLE_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkenums.h>
-#include <pango/pango.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_STYLE              (gtk_style_get_type ())
-#define GTK_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GTK_TYPE_STYLE, GtkStyle))
-#define GTK_STYLE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_STYLE, GtkStyleClass))
-#define GTK_IS_STYLE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GTK_TYPE_STYLE))
-#define GTK_IS_STYLE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_STYLE))
-#define GTK_STYLE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_STYLE, GtkStyleClass))
-
-#define GTK_TYPE_BORDER             (gtk_border_get_type ())
-
-/* Some forward declarations needed to rationalize the header
- * files.
- */
-typedef struct _GtkBorder      GtkBorder;
-typedef struct _GtkStyle       GtkStyle;
-typedef struct _GtkStyleClass  GtkStyleClass;
-typedef struct _GtkThemeEngine GtkThemeEngine;
-typedef struct _GtkRcStyle     GtkRcStyle;
-typedef struct _GtkIconSet     GtkIconSet;
-typedef struct _GtkIconSource  GtkIconSource;
-typedef struct _GtkRcProperty  GtkRcProperty;
-typedef struct _GtkSettings    GtkSettings;
-typedef gboolean (*GtkRcPropertyParser) (const GParamSpec *pspec,
-					 const GString    *rc_string,
-					 GValue           *property_value);
-
-/* We make this forward declaration here, since we pass
- * GtkWidget's to the draw functions.
- */
-typedef struct _GtkWidget      GtkWidget;
-
-#define GTK_STYLE_ATTACHED(style)	(GTK_STYLE (style)->attach_count > 0)
-
-struct _GtkStyle
-{
-  GObject parent_instance;
-
-  /*< public >*/
-  
-  GdkColor fg[5];
-  GdkColor bg[5];
-  GdkColor light[5];
-  GdkColor dark[5];
-  GdkColor mid[5];
-  GdkColor text[5];
-  GdkColor base[5];
-  GdkColor text_aa[5];		/* Halfway between text/base */
-  
-  GdkColor black;
-  GdkColor white;
-  PangoFontDescription *font_desc;
-  
-  gint xthickness;
-  gint ythickness;
-  
-  GdkGC *fg_gc[5];
-  GdkGC *bg_gc[5];
-  GdkGC *light_gc[5];
-  GdkGC *dark_gc[5];
-  GdkGC *mid_gc[5];
-  GdkGC *text_gc[5];
-  GdkGC *base_gc[5];
-  GdkGC *text_aa_gc[5];
-  GdkGC *black_gc;
-  GdkGC *white_gc;
-  
-  GdkPixmap *bg_pixmap[5];
-
-  /*< private >*/
-  
-  gint attach_count;
-  
-  gint depth;
-  GdkColormap *colormap;
-  GdkFont *private_font;
-  PangoFontDescription *private_font_desc; /* Font description for style->private_font or %NULL */
-  
-  /* the RcStyle from which this style was created */
-  GtkRcStyle	 *rc_style;
-
-  GSList	 *styles;	  /* of type GtkStyle* */
-  GArray	 *property_cache;
-  GSList         *icon_factories; /* of type GtkIconFactory* */
-};
-
-struct _GtkStyleClass
-{
-  GObjectClass parent_class;
-
-  /* Initialize for a particular colormap/depth
-   * combination. style->colormap/style->depth will have
-   * been set at this point. Will typically chain to parent.
-   */
-  void (*realize)               (GtkStyle               *style);
-
-  /* Clean up for a particular colormap/depth combination. Will
-   * typically chain to parent.
-   */
-  void (*unrealize)             (GtkStyle               *style);
-
-  /* Make style an exact duplicate of src.
-   */
-  void (*copy)                  (GtkStyle               *style,
-				 GtkStyle               *src);
-
-  /* Create an empty style of the same type as this style.
-   * The default implementation, which does
-   * g_object_new (G_OBJECT_TYPE (style), NULL);
-   * should work in most cases.
-   */
-  GtkStyle *(*clone)             (GtkStyle               *style);
-
-  /* Initialize the GtkStyle with the values in the GtkRcStyle.
-   * should chain to the parent implementation.
-   */
-  void     (*init_from_rc)      (GtkStyle               *style,
-				 GtkRcStyle             *rc_style);
-
-  void (*set_background)        (GtkStyle               *style,
-				 GdkWindow              *window,
-				 GtkStateType            state_type);
-
-
-  GdkPixbuf * (* render_icon)   (GtkStyle               *style,
-                                 const GtkIconSource    *source,
-                                 GtkTextDirection        direction,
-                                 GtkStateType            state,
-                                 GtkIconSize             size,
-                                 GtkWidget              *widget,
-                                 const gchar            *detail);
-  
-  /* Drawing functions
-   */
-  
-  void (*draw_hline)		(GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 gint			 x1,
-				 gint			 x2,
-				 gint			 y);
-  void (*draw_vline)		(GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 gint			 y1_,
-				 gint			 y2_,
-				 gint			 x);
-  void (*draw_shadow)		(GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 GtkShadowType		 shadow_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 gint			 x,
-				 gint			 y,
-				 gint			 width,
-				 gint			 height);
-  void (*draw_polygon)		(GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 GtkShadowType		 shadow_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 GdkPoint		*point,
-				 gint			 npoints,
-				 gboolean		 fill);
-  void (*draw_arrow)		(GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 GtkShadowType		 shadow_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 GtkArrowType		 arrow_type,
-				 gboolean		 fill,
-				 gint			 x,
-				 gint			 y,
-				 gint			 width,
-				 gint			 height);
-  void (*draw_diamond)		(GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 GtkShadowType		 shadow_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 gint			 x,
-				 gint			 y,
-				 gint			 width,
-				 gint			 height);
-  void (*draw_string)		(GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 gint			 x,
-				 gint			 y,
-				 const gchar		*string);
-  void (*draw_box)		(GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 GtkShadowType		 shadow_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 gint			 x,
-				 gint			 y,
-				 gint			 width,
-				 gint			 height);
-  void (*draw_flat_box)		(GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 GtkShadowType		 shadow_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 gint			 x,
-				 gint			 y,
-				 gint			 width,
-				 gint			 height);
-  void (*draw_check)		(GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 GtkShadowType		 shadow_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 gint			 x,
-				 gint			 y,
-				 gint			 width,
-				 gint			 height);
-  void (*draw_option)		(GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 GtkShadowType		 shadow_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 gint			 x,
-				 gint			 y,
-				 gint			 width,
-				 gint			 height);
-  void (*draw_tab)		(GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 GtkShadowType		 shadow_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 gint			 x,
-				 gint			 y,
-				 gint			 width,
-				 gint			 height); 
-  void (*draw_shadow_gap)	(GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 GtkShadowType		 shadow_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 gint			 x,
-				 gint			 y,
-				 gint			 width,
-				 gint			 height,
-				 GtkPositionType	 gap_side,
-				 gint			 gap_x,
-				 gint			 gap_width);
-  void (*draw_box_gap)		(GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 GtkShadowType		 shadow_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 gint			 x,
-				 gint			 y,
-				 gint			 width,
-				 gint			 height,
-				 GtkPositionType	 gap_side,
-				 gint			 gap_x,
-				 gint			 gap_width);
-  void (*draw_extension)	(GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 GtkShadowType		 shadow_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 gint			 x,
-				 gint			 y,
-				 gint			 width,
-				 gint			 height,
-				 GtkPositionType	 gap_side);
-  void (*draw_focus)		(GtkStyle		*style,
-				 GdkWindow		*window,
-                                 GtkStateType            state_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 gint			 x,
-				 gint			 y,
-				 gint			 width,
-				 gint			 height);
-  void (*draw_slider)		(GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 GtkShadowType		 shadow_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 gint			 x,
-				 gint			 y,
-				 gint			 width,
-				 gint			 height,
-				 GtkOrientation		 orientation);
-  void (*draw_handle)		(GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 GtkShadowType		 shadow_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 gint			 x,
-				 gint			 y,
-				 gint			 width,
-				 gint			 height,
-				 GtkOrientation		 orientation);
-
-  void (*draw_expander)		(GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 gint			 x,
-				 gint			 y,
-                                 GtkExpanderStyle        expander_style);
-  void (*draw_layout)		(GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 gboolean                use_text,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-				 gint			 x,
-				 gint			 y,
-                                 PangoLayout            *layout);
-  void (*draw_resize_grip)      (GtkStyle		*style,
-				 GdkWindow		*window,
-				 GtkStateType		 state_type,
-				 GdkRectangle		*area,
-				 GtkWidget		*widget,
-				 const gchar		*detail,
-                                 GdkWindowEdge           edge,
-				 gint			 x,
-				 gint			 y,
-				 gint			 width,
-				 gint			 height);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1)  (void);
-  void (*_gtk_reserved2)  (void);
-  void (*_gtk_reserved3)  (void);
-  void (*_gtk_reserved4)  (void);
-  void (*_gtk_reserved5)  (void);
-  void (*_gtk_reserved6)  (void);
-  void (*_gtk_reserved7)  (void);
-  void (*_gtk_reserved8)  (void);
-  void (*_gtk_reserved9)  (void);
-  void (*_gtk_reserved10) (void);
-  void (*_gtk_reserved11) (void);
-  void (*_gtk_reserved12) (void);
-};
-
-struct _GtkBorder
-{
-  gint left;
-  gint right;
-  gint top;
-  gint bottom;
-};
-
-GType     gtk_style_get_type                 (void) G_GNUC_CONST;
-GtkStyle* gtk_style_new			     (void);
-GtkStyle* gtk_style_copy		     (GtkStyle	   *style);
-GtkStyle* gtk_style_attach		     (GtkStyle	   *style,
-					      GdkWindow	   *window) G_GNUC_WARN_UNUSED_RESULT;
-void	  gtk_style_detach		     (GtkStyle	   *style);
-
-#ifndef GTK_DISABLE_DEPRECATED
-GtkStyle* gtk_style_ref			     (GtkStyle	   *style);
-void	  gtk_style_unref		     (GtkStyle	   *style);
-
-GdkFont * gtk_style_get_font                 (GtkStyle     *style);
-void      gtk_style_set_font                 (GtkStyle     *style,
-					      GdkFont      *font);
-#endif /* GTK_DISABLE_DEPRECATED */
-
-void	  gtk_style_set_background	     (GtkStyle	   *style,
-					      GdkWindow	   *window,
-					      GtkStateType  state_type);
-void	  gtk_style_apply_default_background (GtkStyle	   *style,
-					      GdkWindow	   *window,
-					      gboolean	    set_bg,
-					      GtkStateType  state_type, 
-					      GdkRectangle *area, 
-					      gint	    x, 
-					      gint	    y, 
-					      gint	    width, 
-					      gint	    height);
-
-GtkIconSet* gtk_style_lookup_icon_set        (GtkStyle     *style,
-                                              const gchar  *stock_id);
-gboolean    gtk_style_lookup_color           (GtkStyle     *style,
-                                              const gchar  *color_name,
-                                              GdkColor     *color);
-
-GdkPixbuf*  gtk_style_render_icon     (GtkStyle            *style,
-                                       const GtkIconSource *source,
-                                       GtkTextDirection     direction,
-                                       GtkStateType         state,
-                                       GtkIconSize          size,
-                                       GtkWidget           *widget,
-                                       const gchar         *detail);
-
-#ifndef GTK_DISABLE_DEPRECATED
-void gtk_draw_hline      (GtkStyle        *style,
-			  GdkWindow       *window,
-			  GtkStateType     state_type,
-			  gint             x1,
-			  gint             x2,
-			  gint             y);
-void gtk_draw_vline      (GtkStyle        *style,
-			  GdkWindow       *window,
-			  GtkStateType     state_type,
-			  gint             y1_,
-			  gint             y2_,
-			  gint             x);
-void gtk_draw_shadow     (GtkStyle        *style,
-			  GdkWindow       *window,
-			  GtkStateType     state_type,
-			  GtkShadowType    shadow_type,
-			  gint             x,
-			  gint             y,
-			  gint             width,
-			  gint             height);
-void gtk_draw_polygon    (GtkStyle        *style,
-			  GdkWindow       *window,
-			  GtkStateType     state_type,
-			  GtkShadowType    shadow_type,
-			  GdkPoint        *points,
-			  gint             npoints,
-			  gboolean         fill);
-void gtk_draw_arrow      (GtkStyle        *style,
-			  GdkWindow       *window,
-			  GtkStateType     state_type,
-			  GtkShadowType    shadow_type,
-			  GtkArrowType     arrow_type,
-			  gboolean         fill,
-			  gint             x,
-			  gint             y,
-			  gint             width,
-			  gint             height);
-void gtk_draw_diamond    (GtkStyle        *style,
-			  GdkWindow       *window,
-			  GtkStateType     state_type,
-			  GtkShadowType    shadow_type,
-			  gint             x,
-			  gint             y,
-			  gint             width,
-			  gint             height);
-void gtk_draw_box        (GtkStyle        *style,
-			  GdkWindow       *window,
-			  GtkStateType     state_type,
-			  GtkShadowType    shadow_type,
-			  gint             x,
-			  gint             y,
-			  gint             width,
-			  gint             height);
-void gtk_draw_flat_box   (GtkStyle        *style,
-			  GdkWindow       *window,
-			  GtkStateType     state_type,
-			  GtkShadowType    shadow_type,
-			  gint             x,
-			  gint             y,
-			  gint             width,
-			  gint             height);
-void gtk_draw_check      (GtkStyle        *style,
-			  GdkWindow       *window,
-			  GtkStateType     state_type,
-			  GtkShadowType    shadow_type,
-			  gint             x,
-			  gint             y,
-			  gint             width,
-			  gint             height);
-void gtk_draw_option     (GtkStyle        *style,
-			  GdkWindow       *window,
-			  GtkStateType     state_type,
-			  GtkShadowType    shadow_type,
-			  gint             x,
-			  gint             y,
-			  gint             width,
-			  gint             height);
-void gtk_draw_tab        (GtkStyle        *style,
-			  GdkWindow       *window,
-			  GtkStateType     state_type,
-			  GtkShadowType    shadow_type,
-			  gint             x,
-			  gint             y,
-			  gint             width,
-			  gint             height);
-void gtk_draw_shadow_gap (GtkStyle        *style,
-			  GdkWindow       *window,
-			  GtkStateType     state_type,
-			  GtkShadowType    shadow_type,
-			  gint             x,
-			  gint             y,
-			  gint             width,
-			  gint             height,
-			  GtkPositionType  gap_side,
-			  gint             gap_x,
-			  gint             gap_width);
-void gtk_draw_box_gap    (GtkStyle        *style,
-			  GdkWindow       *window,
-			  GtkStateType     state_type,
-			  GtkShadowType    shadow_type,
-			  gint             x,
-			  gint             y,
-			  gint             width,
-			  gint             height,
-			  GtkPositionType  gap_side,
-			  gint             gap_x,
-			  gint             gap_width);
-void gtk_draw_extension  (GtkStyle        *style,
-			  GdkWindow       *window,
-			  GtkStateType     state_type,
-			  GtkShadowType    shadow_type,
-			  gint             x,
-			  gint             y,
-			  gint             width,
-			  gint             height,
-			  GtkPositionType  gap_side);
-void gtk_draw_focus      (GtkStyle        *style,
-			  GdkWindow       *window,
-			  gint             x,
-			  gint             y,
-			  gint             width,
-			  gint             height);
-void gtk_draw_slider     (GtkStyle        *style,
-			  GdkWindow       *window,
-			  GtkStateType     state_type,
-			  GtkShadowType    shadow_type,
-			  gint             x,
-			  gint             y,
-			  gint             width,
-			  gint             height,
-			  GtkOrientation   orientation);
-void gtk_draw_handle     (GtkStyle        *style,
-			  GdkWindow       *window,
-			  GtkStateType     state_type,
-			  GtkShadowType    shadow_type,
-			  gint             x,
-			  gint             y,
-			  gint             width,
-			  gint             height,
-			  GtkOrientation   orientation);
-void gtk_draw_expander   (GtkStyle        *style,
-                          GdkWindow       *window,
-                          GtkStateType     state_type,
-                          gint             x,
-                          gint             y,
-			  GtkExpanderStyle expander_style);
-void gtk_draw_layout     (GtkStyle        *style,
-                          GdkWindow       *window,
-                          GtkStateType     state_type,
-			  gboolean         use_text,
-                          gint             x,
-                          gint             y,
-                          PangoLayout     *layout);
-void gtk_draw_resize_grip (GtkStyle       *style,
-                           GdkWindow      *window,
-                           GtkStateType    state_type,
-                           GdkWindowEdge   edge,
-                           gint            x,
-                           gint            y,
-                           gint            width,
-                           gint            height);
-#endif /* GTK_DISABLE_DEPRECATED */
-
-void gtk_paint_hline      (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   const gchar     *detail,
-			   gint             x1,
-			   gint             x2,
-			   gint             y);
-void gtk_paint_vline      (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   const gchar     *detail,
-			   gint             y1_,
-			   gint             y2_,
-			   gint             x);
-void gtk_paint_shadow     (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GtkShadowType    shadow_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   const gchar     *detail,
-			   gint             x,
-			   gint             y,
-			   gint             width,
-			   gint             height);
-void gtk_paint_polygon    (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GtkShadowType    shadow_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   const gchar     *detail,
-			   GdkPoint        *points,
-			   gint             npoints,
-			   gboolean         fill);
-void gtk_paint_arrow      (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GtkShadowType    shadow_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   const gchar     *detail,
-			   GtkArrowType     arrow_type,
-			   gboolean         fill,
-			   gint             x,
-			   gint             y,
-			   gint             width,
-			   gint             height);
-void gtk_paint_diamond    (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GtkShadowType    shadow_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   const gchar     *detail,
-			   gint             x,
-			   gint             y,
-			   gint             width,
-			   gint             height);
-void gtk_paint_box        (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GtkShadowType    shadow_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   const gchar     *detail,
-			   gint             x,
-			   gint             y,
-			   gint             width,
-			   gint             height);
-void gtk_paint_flat_box   (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GtkShadowType    shadow_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   const gchar     *detail,
-			   gint             x,
-			   gint             y,
-			   gint             width,
-			   gint             height);
-void gtk_paint_check      (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GtkShadowType    shadow_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   const gchar     *detail,
-			   gint             x,
-			   gint             y,
-			   gint             width,
-			   gint             height);
-void gtk_paint_option     (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GtkShadowType    shadow_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   const gchar     *detail,
-			   gint             x,
-			   gint             y,
-			   gint             width,
-			   gint             height);
-void gtk_paint_tab        (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GtkShadowType    shadow_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   const gchar     *detail,
-			   gint             x,
-			   gint             y,
-			   gint             width,
-			   gint             height);
-void gtk_paint_shadow_gap (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GtkShadowType    shadow_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   gchar           *detail,
-			   gint             x,
-			   gint             y,
-			   gint             width,
-			   gint             height,
-			   GtkPositionType  gap_side,
-			   gint             gap_x,
-			   gint             gap_width);
-void gtk_paint_box_gap    (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GtkShadowType    shadow_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   gchar           *detail,
-			   gint             x,
-			   gint             y,
-			   gint             width,
-			   gint             height,
-			   GtkPositionType  gap_side,
-			   gint             gap_x,
-			   gint             gap_width);
-void gtk_paint_extension  (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GtkShadowType    shadow_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   gchar           *detail,
-			   gint             x,
-			   gint             y,
-			   gint             width,
-			   gint             height,
-			   GtkPositionType  gap_side);
-void gtk_paint_focus      (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   const gchar     *detail,
-			   gint             x,
-			   gint             y,
-			   gint             width,
-			   gint             height);
-void gtk_paint_slider     (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GtkShadowType    shadow_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   const gchar     *detail,
-			   gint             x,
-			   gint             y,
-			   gint             width,
-			   gint             height,
-			   GtkOrientation   orientation);
-void gtk_paint_handle     (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GtkShadowType    shadow_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   const gchar     *detail,
-			   gint             x,
-			   gint             y,
-			   gint             width,
-			   gint             height,
-			   GtkOrientation   orientation);
-void gtk_paint_expander   (GtkStyle        *style,
-                           GdkWindow       *window,
-                           GtkStateType     state_type,
-                           GdkRectangle    *area,
-                           GtkWidget       *widget,
-                           const gchar     *detail,
-                           gint             x,
-                           gint             y,
-			   GtkExpanderStyle expander_style);
-void gtk_paint_layout     (GtkStyle        *style,
-                           GdkWindow       *window,
-                           GtkStateType     state_type,
-			   gboolean         use_text,
-                           GdkRectangle    *area,
-                           GtkWidget       *widget,
-                           const gchar     *detail,
-                           gint             x,
-                           gint             y,
-                           PangoLayout     *layout);
-
-void gtk_paint_resize_grip (GtkStyle		*style,
-                            GdkWindow		*window,
-                            GtkStateType         state_type,
-                            GdkRectangle        *area,
-                            GtkWidget		*widget,
-                            const gchar		*detail,
-                            GdkWindowEdge        edge,
-                            gint                 x,
-                            gint                 y,
-                            gint                 width,
-                            gint           	 height);
-
-
-GType      gtk_border_get_type (void) G_GNUC_CONST;
-GtkBorder *gtk_border_copy     (const GtkBorder *border_);
-void       gtk_border_free     (GtkBorder       *border_);
-
-/* --- private API --- */
-const GValue* _gtk_style_peek_property_value (GtkStyle           *style,
-					      GType               widget_type,
-					      GParamSpec         *pspec,
-					      GtkRcPropertyParser parser);
-
-void          _gtk_style_init_for_settings   (GtkStyle           *style,
-                                              GtkSettings        *settings);
-
-void          _gtk_style_shade               (GdkColor           *a,
-                                              GdkColor           *b,
-                                              gdouble             k);
-
-/* deprecated */
-#ifndef GTK_DISABLE_DEPRECATED
-#define gtk_style_apply_default_pixmap(s,gw,st,a,x,y,w,h) gtk_style_apply_default_background (s,gw,1,st,a,x,y,w,h)
-void gtk_draw_string     (GtkStyle        *style,
-			  GdkWindow       *window,
-			  GtkStateType     state_type,
-			  gint             x,
-			  gint             y,
-			  const gchar     *string);
-void gtk_paint_string     (GtkStyle        *style,
-			   GdkWindow       *window,
-			   GtkStateType     state_type,
-			   GdkRectangle    *area,
-			   GtkWidget       *widget,
-			   const gchar     *detail,
-			   gint             x,
-			   gint             y,
-			   const gchar     *string);
-#endif /* GTK_DISABLE_DEPRECATED */
-
-void   gtk_draw_insertion_cursor (GtkWidget        *widget,
-				  GdkDrawable      *drawable,
-				  GdkRectangle     *area,
-				  GdkRectangle     *location,
-				  gboolean          is_primary,
-				  GtkTextDirection  direction,
-				  gboolean          draw_arrow);
-GdkGC *_gtk_widget_get_cursor_gc    (GtkWidget *widget);
-void   _gtk_widget_get_cursor_color (GtkWidget *widget,
-				     GdkColor  *color);
-
-G_END_DECLS
-
-#endif /* __GTK_STYLE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktable.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktable.h
deleted file mode 100644
index f925d330..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktable.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_TABLE_H__
-#define __GTK_TABLE_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkcontainer.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_TABLE			(gtk_table_get_type ())
-#define GTK_TABLE(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TABLE, GtkTable))
-#define GTK_TABLE_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TABLE, GtkTableClass))
-#define GTK_IS_TABLE(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TABLE))
-#define GTK_IS_TABLE_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TABLE))
-#define GTK_TABLE_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TABLE, GtkTableClass))
-
-
-typedef struct _GtkTable	GtkTable;
-typedef struct _GtkTableClass	GtkTableClass;
-typedef struct _GtkTableChild	GtkTableChild;
-typedef struct _GtkTableRowCol	GtkTableRowCol;
-
-struct _GtkTable
-{
-  GtkContainer container;
-  
-  GList *children;
-  GtkTableRowCol *rows;
-  GtkTableRowCol *cols;
-  guint16 nrows;
-  guint16 ncols;
-  guint16 column_spacing;
-  guint16 row_spacing;
-  guint homogeneous : 1;
-};
-
-struct _GtkTableClass
-{
-  GtkContainerClass parent_class;
-};
-
-struct _GtkTableChild
-{
-  GtkWidget *widget;
-  guint16 left_attach;
-  guint16 right_attach;
-  guint16 top_attach;
-  guint16 bottom_attach;
-  guint16 xpadding;
-  guint16 ypadding;
-  guint xexpand : 1;
-  guint yexpand : 1;
-  guint xshrink : 1;
-  guint yshrink : 1;
-  guint xfill : 1;
-  guint yfill : 1;
-};
-
-struct _GtkTableRowCol
-{
-  guint16 requisition;
-  guint16 allocation;
-  guint16 spacing;
-  guint need_expand : 1;
-  guint need_shrink : 1;
-  guint expand : 1;
-  guint shrink : 1;
-  guint empty : 1;
-};
-
-
-GType	   gtk_table_get_type	      (void) G_GNUC_CONST;
-GtkWidget* gtk_table_new	      (guint		rows,
-				       guint		columns,
-				       gboolean		homogeneous);
-void	   gtk_table_resize	      (GtkTable	       *table,
-				       guint            rows,
-				       guint            columns);
-void	   gtk_table_attach	      (GtkTable	       *table,
-				       GtkWidget       *child,
-				       guint		left_attach,
-				       guint		right_attach,
-				       guint		top_attach,
-				       guint		bottom_attach,
-				       GtkAttachOptions xoptions,
-				       GtkAttachOptions yoptions,
-				       guint		xpadding,
-				       guint		ypadding);
-void	   gtk_table_attach_defaults  (GtkTable	       *table,
-				       GtkWidget       *widget,
-				       guint		left_attach,
-				       guint		right_attach,
-				       guint		top_attach,
-				       guint		bottom_attach);
-void	   gtk_table_set_row_spacing  (GtkTable	       *table,
-				       guint		row,
-				       guint		spacing);
-guint      gtk_table_get_row_spacing  (GtkTable        *table,
-				       guint            row);
-void	   gtk_table_set_col_spacing  (GtkTable	       *table,
-				       guint		column,
-				       guint		spacing);
-guint      gtk_table_get_col_spacing  (GtkTable        *table,
-				       guint            column);
-void	   gtk_table_set_row_spacings (GtkTable	       *table,
-				       guint		spacing);
-guint      gtk_table_get_default_row_spacing (GtkTable        *table);
-void	   gtk_table_set_col_spacings (GtkTable	       *table,
-				       guint		spacing);
-guint      gtk_table_get_default_col_spacing (GtkTable        *table);
-void	   gtk_table_set_homogeneous  (GtkTable	       *table,
-				       gboolean		homogeneous);
-gboolean   gtk_table_get_homogeneous  (GtkTable        *table);
-
-
-G_END_DECLS
-
-#endif /* __GTK_TABLE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktearoffmenuitem.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktearoffmenuitem.h
deleted file mode 100644
index cd744b0d..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktearoffmenuitem.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_TEAROFF_MENU_ITEM_H__
-#define __GTK_TEAROFF_MENU_ITEM_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkmenuitem.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_TEAROFF_MENU_ITEM	      (gtk_tearoff_menu_item_get_type ())
-#define GTK_TEAROFF_MENU_ITEM(obj)	      (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TEAROFF_MENU_ITEM, GtkTearoffMenuItem))
-#define GTK_TEAROFF_MENU_ITEM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEAROFF_MENU_ITEM, GtkTearoffMenuItemClass))
-#define GTK_IS_TEAROFF_MENU_ITEM(obj)	      (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TEAROFF_MENU_ITEM))
-#define GTK_IS_TEAROFF_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TEAROFF_MENU_ITEM))
-#define GTK_TEAROFF_MENU_ITEM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TEAROFF_MENU_ITEM, GtkTearoffMenuItemClass))
-
-
-typedef struct _GtkTearoffMenuItem       GtkTearoffMenuItem;
-typedef struct _GtkTearoffMenuItemClass  GtkTearoffMenuItemClass;
-
-struct _GtkTearoffMenuItem
-{
-  GtkMenuItem menu_item;
-
-  guint torn_off : 1;
-};
-
-struct _GtkTearoffMenuItemClass
-{
-  GtkMenuItemClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType	   gtk_tearoff_menu_item_get_type     (void) G_GNUC_CONST;
-GtkWidget* gtk_tearoff_menu_item_new	      (void);
-
-G_END_DECLS
-
-#endif /* __GTK_TEAROFF_MENU_ITEM_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktext.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktext.h
deleted file mode 100644
index a2be7faf..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktext.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifdef GTK_ENABLE_BROKEN
-
-#ifndef __GTK_TEXT_H__
-#define __GTK_TEXT_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkadjustment.h>
-#include <gtk/gtkoldeditable.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_TEXT                  (gtk_text_get_type ())
-#define GTK_TEXT(obj)                  (GTK_CHECK_CAST ((obj), GTK_TYPE_TEXT, GtkText))
-#define GTK_TEXT_CLASS(klass)          (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT, GtkTextClass))
-#define GTK_IS_TEXT(obj)               (GTK_CHECK_TYPE ((obj), GTK_TYPE_TEXT))
-#define GTK_IS_TEXT_CLASS(klass)       (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TEXT))
-#define GTK_TEXT_GET_CLASS(obj)        (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TEXT, GtkTextClass))
-
-
-typedef struct _GtkTextFont       GtkTextFont;
-typedef struct _GtkPropertyMark   GtkPropertyMark;
-typedef struct _GtkText           GtkText;
-typedef struct _GtkTextClass      GtkTextClass;
-
-struct _GtkPropertyMark
-{
-  /* Position in list. */
-  GList* property;
-
-  /* Offset into that property. */
-  guint offset;
-
-  /* Current index. */
-  guint index;
-};
-
-struct _GtkText
-{
-  GtkOldEditable old_editable;
-
-  GdkWindow *text_area;
-
-  GtkAdjustment *hadj;
-  GtkAdjustment *vadj;
-
-  GdkGC *gc;
-
-  GdkPixmap* line_wrap_bitmap;
-  GdkPixmap* line_arrow_bitmap;
-
-		      /* GAPPED TEXT SEGMENT */
-
-  /* The text, a single segment of text a'la emacs, with a gap
-   * where insertion occurs. */
-  union { GdkWChar *wc; guchar  *ch; } text;
-  /* The allocated length of the text segment. */
-  guint text_len;
-  /* The gap position, index into address where a char
-   * should be inserted. */
-  guint gap_position;
-  /* The gap size, s.t. *(text + gap_position + gap_size) is
-   * the first valid character following the gap. */
-  guint gap_size;
-  /* The last character position, index into address where a
-   * character should be appeneded.  Thus, text_end - gap_size
-   * is the length of the actual data. */
-  guint text_end;
-			/* LINE START CACHE */
-
-  /* A cache of line-start information.  Data is a LineParam*. */
-  GList *line_start_cache;
-  /* Index to the start of the first visible line. */
-  guint first_line_start_index;
-  /* The number of pixels cut off of the top line. */
-  guint first_cut_pixels;
-  /* First visible horizontal pixel. */
-  guint first_onscreen_hor_pixel;
-  /* First visible vertical pixel. */
-  guint first_onscreen_ver_pixel;
-
-			     /* FLAGS */
-
-  /* True iff this buffer is wrapping lines, otherwise it is using a
-   * horizontal scrollbar. */
-  guint line_wrap : 1;
-  guint word_wrap : 1;
- /* If a fontset is supplied for the widget, use_wchar become true,
-   * and we use GdkWchar as the encoding of text. */
-  guint use_wchar : 1;
-
-  /* Frozen, don't do updates. @@@ fixme */
-  guint freeze_count;
-			/* TEXT PROPERTIES */
-
-  /* A doubly-linked-list containing TextProperty objects. */
-  GList *text_properties;
-  /* The end of this list. */
-  GList *text_properties_end;
-  /* The first node before or on the point along with its offset to
-   * the point and the buffer's current point.  This is the only
-   * PropertyMark whose index is guaranteed to remain correct
-   * following a buffer insertion or deletion. */
-  GtkPropertyMark point;
-
-			  /* SCRATCH AREA */
-
-  union { GdkWChar *wc; guchar *ch; } scratch_buffer;
-  guint   scratch_buffer_len;
-
-			   /* SCROLLING */
-
-  gint last_ver_value;
-
-			     /* CURSOR */
-
-  gint            cursor_pos_x;       /* Position of cursor. */
-  gint            cursor_pos_y;       /* Baseline of line cursor is drawn on. */
-  GtkPropertyMark cursor_mark;        /* Where it is in the buffer. */
-  GdkWChar        cursor_char;        /* Character to redraw. */
-  gchar           cursor_char_offset; /* Distance from baseline of the font. */
-  gint            cursor_virtual_x;   /* Where it would be if it could be. */
-  gint            cursor_drawn_level; /* How many people have undrawn. */
-
-			  /* Current Line */
-
-  GList *current_line;
-
-			   /* Tab Stops */
-
-  GList *tab_stops;
-  gint default_tab_width;
-
-  GtkTextFont *current_font;	/* Text font for current style */
-
-  /* Timer used for auto-scrolling off ends */
-  gint timer;
-  
-  guint button;			/* currently pressed mouse button */
-  GdkGC *bg_gc;			/* gc for drawing background pixmap */
-};
-
-struct _GtkTextClass
-{
-  GtkOldEditableClass parent_class;
-
-  void  (*set_scroll_adjustments)   (GtkText	    *text,
-				     GtkAdjustment  *hadjustment,
-				     GtkAdjustment  *vadjustment);
-};
-
-
-GtkType    gtk_text_get_type        (void) G_GNUC_CONST;
-GtkWidget* gtk_text_new             (GtkAdjustment *hadj,
-				     GtkAdjustment *vadj);
-void       gtk_text_set_editable    (GtkText       *text,
-				     gboolean       editable);
-void       gtk_text_set_word_wrap   (GtkText       *text,
-				     gboolean       word_wrap);
-void       gtk_text_set_line_wrap   (GtkText       *text,
-				     gboolean       line_wrap);
-void       gtk_text_set_adjustments (GtkText       *text,
-				     GtkAdjustment *hadj,
-				     GtkAdjustment *vadj);
-void       gtk_text_set_point       (GtkText       *text,
-				     guint          index);
-guint      gtk_text_get_point       (GtkText       *text);
-guint      gtk_text_get_length      (GtkText       *text);
-void       gtk_text_freeze          (GtkText       *text);
-void       gtk_text_thaw            (GtkText       *text);
-void       gtk_text_insert          (GtkText        *text,
-				     GdkFont        *font,
-				     const GdkColor *fore,
-				     const GdkColor *back,
-				     const char     *chars,
-				     gint            length);
-gboolean   gtk_text_backward_delete (GtkText       *text,
-				     guint          nchars);
-gboolean   gtk_text_forward_delete  (GtkText       *text,
-				     guint          nchars);
-
-#define GTK_TEXT_INDEX(t, index)	(((t)->use_wchar) \
-	? ((index) < (t)->gap_position ? (t)->text.wc[index] : \
-					(t)->text.wc[(index)+(t)->gap_size]) \
-	: ((index) < (t)->gap_position ? (t)->text.ch[index] : \
-					(t)->text.ch[(index)+(t)->gap_size]))
-
-G_END_DECLS
-
-#endif /* __GTK_TEXT_H__ */
-
-#endif /* GTK_ENABLE_BROKEN */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextbuffer.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextbuffer.h
deleted file mode 100644
index 9a0eb9d2..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextbuffer.h
+++ /dev/null
@@ -1,403 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtktextbuffer.h 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.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __GTK_TEXT_BUFFER_H__
-#define __GTK_TEXT_BUFFER_H__
-
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkclipboard.h>
-#include <gtk/gtktexttagtable.h>
-#include <gtk/gtktextiter.h>
-#include <gtk/gtktextmark.h>
-#include <gtk/gtktextchild.h>
-
-G_BEGIN_DECLS
-
-/*
- * This is the PUBLIC representation of a text buffer.
- * GtkTextBTree is the PRIVATE internal representation of it.
- */
-
-/* these values are used as "info" for the targets contained in the
- * lists returned by gtk_text_buffer_get_copy,paste_target_list()
- *
- * the enum counts down from G_MAXUINT to avoid clashes with application
- * added drag destinations which usually start at 0.
- */
-typedef enum
-{
-  GTK_TEXT_BUFFER_TARGET_INFO_BUFFER_CONTENTS = - 1,
-  GTK_TEXT_BUFFER_TARGET_INFO_RICH_TEXT       = - 2,
-  GTK_TEXT_BUFFER_TARGET_INFO_TEXT            = - 3
-} GtkTextBufferTargetInfo;
-
-typedef struct _GtkTextBTree GtkTextBTree;
-
-typedef struct _GtkTextLogAttrCache GtkTextLogAttrCache;
-
-#define GTK_TYPE_TEXT_BUFFER            (gtk_text_buffer_get_type ())
-#define GTK_TEXT_BUFFER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TEXT_BUFFER, GtkTextBuffer))
-#define GTK_TEXT_BUFFER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_BUFFER, GtkTextBufferClass))
-#define GTK_IS_TEXT_BUFFER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TEXT_BUFFER))
-#define GTK_IS_TEXT_BUFFER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TEXT_BUFFER))
-#define GTK_TEXT_BUFFER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TEXT_BUFFER, GtkTextBufferClass))
-
-typedef struct _GtkTextBufferClass GtkTextBufferClass;
-
-struct _GtkTextBuffer
-{
-  GObject parent_instance;
-
-  GtkTextTagTable *tag_table;
-  GtkTextBTree *btree;
-
-  GSList *clipboard_contents_buffers;
-  GSList *selection_clipboards;
-
-  GtkTextLogAttrCache *log_attr_cache;
-
-  guint user_action_count;
-  
-  /* Whether the buffer has been modified since last save */
-  guint modified : 1;
-
-  guint has_selection : 1;
-};
-
-struct _GtkTextBufferClass
-{
-  GObjectClass parent_class;
-
-  void (* insert_text)     (GtkTextBuffer *buffer,
-                            GtkTextIter *pos,
-                            const gchar *text,
-                            gint length);
-
-  void (* insert_pixbuf)   (GtkTextBuffer *buffer,
-                            GtkTextIter   *pos,
-                            GdkPixbuf     *pixbuf);
-
-  void (* insert_child_anchor)   (GtkTextBuffer      *buffer,
-                                  GtkTextIter        *pos,
-                                  GtkTextChildAnchor *anchor);
-  
-  void (* delete_range)     (GtkTextBuffer *buffer,
-                             GtkTextIter   *start,
-                             GtkTextIter   *end);
-
-  /* Only for text/widgets/pixbuf changed, marks/tags don't cause this
-   * to be emitted
-   */
-  void (* changed)         (GtkTextBuffer *buffer);
-
-
-  /* New value for the modified flag */
-  void (* modified_changed)   (GtkTextBuffer *buffer);
-
-  /* Mark moved or created */
-  void (* mark_set)           (GtkTextBuffer *buffer,
-                               const GtkTextIter *location,
-                               GtkTextMark *mark);
-
-  void (* mark_deleted)       (GtkTextBuffer *buffer,
-                               GtkTextMark *mark);
-
-  void (* apply_tag)          (GtkTextBuffer *buffer,
-                               GtkTextTag *tag,
-                               const GtkTextIter *start_char,
-                               const GtkTextIter *end_char);
-
-  void (* remove_tag)         (GtkTextBuffer *buffer,
-                               GtkTextTag *tag,
-                               const GtkTextIter *start_char,
-                               const GtkTextIter *end_char);
-
-  /* Called at the start and end of an atomic user action */
-  void (* begin_user_action)  (GtkTextBuffer *buffer);
-  void (* end_user_action)    (GtkTextBuffer *buffer);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-  void (*_gtk_reserved5) (void);
-  void (*_gtk_reserved6) (void);
-};
-
-GType        gtk_text_buffer_get_type       (void) G_GNUC_CONST;
-
-
-
-/* table is NULL to create a new one */
-GtkTextBuffer *gtk_text_buffer_new            (GtkTextTagTable *table);
-gint           gtk_text_buffer_get_line_count (GtkTextBuffer   *buffer);
-gint           gtk_text_buffer_get_char_count (GtkTextBuffer   *buffer);
-
-
-GtkTextTagTable* gtk_text_buffer_get_tag_table (GtkTextBuffer  *buffer);
-
-/* Delete whole buffer, then insert */
-void gtk_text_buffer_set_text          (GtkTextBuffer *buffer,
-                                        const gchar   *text,
-                                        gint           len);
-
-/* Insert into the buffer */
-void gtk_text_buffer_insert            (GtkTextBuffer *buffer,
-                                        GtkTextIter   *iter,
-                                        const gchar   *text,
-                                        gint           len);
-void gtk_text_buffer_insert_at_cursor  (GtkTextBuffer *buffer,
-                                        const gchar   *text,
-                                        gint           len);
-
-gboolean gtk_text_buffer_insert_interactive           (GtkTextBuffer *buffer,
-                                                       GtkTextIter   *iter,
-                                                       const gchar   *text,
-                                                       gint           len,
-                                                       gboolean       default_editable);
-gboolean gtk_text_buffer_insert_interactive_at_cursor (GtkTextBuffer *buffer,
-                                                       const gchar   *text,
-                                                       gint           len,
-                                                       gboolean       default_editable);
-
-void     gtk_text_buffer_insert_range             (GtkTextBuffer     *buffer,
-                                                   GtkTextIter       *iter,
-                                                   const GtkTextIter *start,
-                                                   const GtkTextIter *end);
-gboolean gtk_text_buffer_insert_range_interactive (GtkTextBuffer     *buffer,
-                                                   GtkTextIter       *iter,
-                                                   const GtkTextIter *start,
-                                                   const GtkTextIter *end,
-                                                   gboolean           default_editable);
-
-void    gtk_text_buffer_insert_with_tags          (GtkTextBuffer     *buffer,
-                                                   GtkTextIter       *iter,
-                                                   const gchar       *text,
-                                                   gint               len,
-                                                   GtkTextTag        *first_tag,
-                                                   ...) G_GNUC_NULL_TERMINATED;
-
-void    gtk_text_buffer_insert_with_tags_by_name  (GtkTextBuffer     *buffer,
-                                                   GtkTextIter       *iter,
-                                                   const gchar       *text,
-                                                   gint               len,
-                                                   const gchar       *first_tag_name,
-                                                   ...) G_GNUC_NULL_TERMINATED;
-
-/* Delete from the buffer */
-void     gtk_text_buffer_delete             (GtkTextBuffer *buffer,
-					     GtkTextIter   *start,
-					     GtkTextIter   *end);
-gboolean gtk_text_buffer_delete_interactive (GtkTextBuffer *buffer,
-					     GtkTextIter   *start_iter,
-					     GtkTextIter   *end_iter,
-					     gboolean       default_editable);
-gboolean gtk_text_buffer_backspace          (GtkTextBuffer *buffer,
-					     GtkTextIter   *iter,
-					     gboolean       interactive,
-					     gboolean       default_editable);
-
-/* Obtain strings from the buffer */
-gchar          *gtk_text_buffer_get_text            (GtkTextBuffer     *buffer,
-                                                     const GtkTextIter *start,
-                                                     const GtkTextIter *end,
-                                                     gboolean           include_hidden_chars);
-
-gchar          *gtk_text_buffer_get_slice           (GtkTextBuffer     *buffer,
-                                                     const GtkTextIter *start,
-                                                     const GtkTextIter *end,
-                                                     gboolean           include_hidden_chars);
-
-/* Insert a pixbuf */
-void gtk_text_buffer_insert_pixbuf         (GtkTextBuffer *buffer,
-                                            GtkTextIter   *iter,
-                                            GdkPixbuf     *pixbuf);
-
-/* Insert a child anchor */
-void               gtk_text_buffer_insert_child_anchor (GtkTextBuffer      *buffer,
-                                                        GtkTextIter        *iter,
-                                                        GtkTextChildAnchor *anchor);
-
-/* Convenience, create and insert a child anchor */
-GtkTextChildAnchor *gtk_text_buffer_create_child_anchor (GtkTextBuffer *buffer,
-                                                         GtkTextIter   *iter);
-
-/* Mark manipulation */
-void           gtk_text_buffer_add_mark    (GtkTextBuffer     *buffer,
-                                            GtkTextMark       *mark,
-                                            const GtkTextIter *where);
-GtkTextMark   *gtk_text_buffer_create_mark (GtkTextBuffer     *buffer,
-                                            const gchar       *mark_name,
-                                            const GtkTextIter *where,
-                                            gboolean           left_gravity);
-void           gtk_text_buffer_move_mark   (GtkTextBuffer     *buffer,
-                                            GtkTextMark       *mark,
-                                            const GtkTextIter *where);
-void           gtk_text_buffer_delete_mark (GtkTextBuffer     *buffer,
-                                            GtkTextMark       *mark);
-GtkTextMark*   gtk_text_buffer_get_mark    (GtkTextBuffer     *buffer,
-                                            const gchar       *name);
-
-void gtk_text_buffer_move_mark_by_name   (GtkTextBuffer     *buffer,
-                                          const gchar       *name,
-                                          const GtkTextIter *where);
-void gtk_text_buffer_delete_mark_by_name (GtkTextBuffer     *buffer,
-                                          const gchar       *name);
-
-GtkTextMark* gtk_text_buffer_get_insert          (GtkTextBuffer *buffer);
-GtkTextMark* gtk_text_buffer_get_selection_bound (GtkTextBuffer *buffer);
-
-/* efficiently move insert and selection_bound at the same time */
-void gtk_text_buffer_place_cursor (GtkTextBuffer     *buffer,
-                                   const GtkTextIter *where);
-void gtk_text_buffer_select_range (GtkTextBuffer     *buffer,
-                                   const GtkTextIter *ins,
-				   const GtkTextIter *bound);
-
-
-
-/* Tag manipulation */
-void gtk_text_buffer_apply_tag             (GtkTextBuffer     *buffer,
-                                            GtkTextTag        *tag,
-                                            const GtkTextIter *start,
-                                            const GtkTextIter *end);
-void gtk_text_buffer_remove_tag            (GtkTextBuffer     *buffer,
-                                            GtkTextTag        *tag,
-                                            const GtkTextIter *start,
-                                            const GtkTextIter *end);
-void gtk_text_buffer_apply_tag_by_name     (GtkTextBuffer     *buffer,
-                                            const gchar       *name,
-                                            const GtkTextIter *start,
-                                            const GtkTextIter *end);
-void gtk_text_buffer_remove_tag_by_name    (GtkTextBuffer     *buffer,
-                                            const gchar       *name,
-                                            const GtkTextIter *start,
-                                            const GtkTextIter *end);
-void gtk_text_buffer_remove_all_tags       (GtkTextBuffer     *buffer,
-                                            const GtkTextIter *start,
-                                            const GtkTextIter *end);
-
-
-/* You can either ignore the return value, or use it to
- * set the attributes of the tag. tag_name can be NULL
- */
-GtkTextTag    *gtk_text_buffer_create_tag (GtkTextBuffer *buffer,
-                                           const gchar   *tag_name,
-                                           const gchar   *first_property_name,
-                                           ...);
-
-/* Obtain iterators pointed at various places, then you can move the
- * iterator around using the GtkTextIter operators
- */
-void gtk_text_buffer_get_iter_at_line_offset (GtkTextBuffer *buffer,
-                                              GtkTextIter   *iter,
-                                              gint           line_number,
-                                              gint           char_offset);
-void gtk_text_buffer_get_iter_at_line_index  (GtkTextBuffer *buffer,
-                                              GtkTextIter   *iter,
-                                              gint           line_number,
-                                              gint           byte_index);
-void gtk_text_buffer_get_iter_at_offset      (GtkTextBuffer *buffer,
-                                              GtkTextIter   *iter,
-                                              gint           char_offset);
-void gtk_text_buffer_get_iter_at_line        (GtkTextBuffer *buffer,
-                                              GtkTextIter   *iter,
-                                              gint           line_number);
-void gtk_text_buffer_get_start_iter          (GtkTextBuffer *buffer,
-                                              GtkTextIter   *iter);
-void gtk_text_buffer_get_end_iter            (GtkTextBuffer *buffer,
-                                              GtkTextIter   *iter);
-void gtk_text_buffer_get_bounds              (GtkTextBuffer *buffer,
-                                              GtkTextIter   *start,
-                                              GtkTextIter   *end);
-void gtk_text_buffer_get_iter_at_mark        (GtkTextBuffer *buffer,
-                                              GtkTextIter   *iter,
-                                              GtkTextMark   *mark);
-
-void gtk_text_buffer_get_iter_at_child_anchor (GtkTextBuffer      *buffer,
-                                               GtkTextIter        *iter,
-                                               GtkTextChildAnchor *anchor);
-
-/* There's no get_first_iter because you just get the iter for
-   line or char 0 */
-
-/* Used to keep track of whether the buffer needs saving; anytime the
-   buffer contents change, the modified flag is turned on. Whenever
-   you save, turn it off. Tags and marks do not affect the modified
-   flag, but if you would like them to you can connect a handler to
-   the tag/mark signals and call set_modified in your handler */
-
-gboolean        gtk_text_buffer_get_modified            (GtkTextBuffer *buffer);
-void            gtk_text_buffer_set_modified            (GtkTextBuffer *buffer,
-                                                         gboolean       setting);
-
-gboolean        gtk_text_buffer_get_has_selection       (GtkTextBuffer *buffer);
-
-void gtk_text_buffer_add_selection_clipboard    (GtkTextBuffer     *buffer,
-						 GtkClipboard      *clipboard);
-void gtk_text_buffer_remove_selection_clipboard (GtkTextBuffer     *buffer,
-						 GtkClipboard      *clipboard);
-
-void            gtk_text_buffer_cut_clipboard           (GtkTextBuffer *buffer,
-							 GtkClipboard  *clipboard,
-                                                         gboolean       default_editable);
-void            gtk_text_buffer_copy_clipboard          (GtkTextBuffer *buffer,
-							 GtkClipboard  *clipboard);
-void            gtk_text_buffer_paste_clipboard         (GtkTextBuffer *buffer,
-							 GtkClipboard  *clipboard,
-							 GtkTextIter   *override_location,
-                                                         gboolean       default_editable);
-
-gboolean        gtk_text_buffer_get_selection_bounds    (GtkTextBuffer *buffer,
-                                                         GtkTextIter   *start,
-                                                         GtkTextIter   *end);
-gboolean        gtk_text_buffer_delete_selection        (GtkTextBuffer *buffer,
-                                                         gboolean       interactive,
-                                                         gboolean       default_editable);                                                    
-
-/* Called to specify atomic user actions, used to implement undo */
-void            gtk_text_buffer_begin_user_action       (GtkTextBuffer *buffer);
-void            gtk_text_buffer_end_user_action         (GtkTextBuffer *buffer);
-
-GtkTargetList * gtk_text_buffer_get_copy_target_list    (GtkTextBuffer *buffer);
-GtkTargetList * gtk_text_buffer_get_paste_target_list   (GtkTextBuffer *buffer);
-
-/* INTERNAL private stuff */
-void            _gtk_text_buffer_spew                  (GtkTextBuffer      *buffer);
-
-GtkTextBTree*   _gtk_text_buffer_get_btree             (GtkTextBuffer      *buffer);
-
-const PangoLogAttr* _gtk_text_buffer_get_line_log_attrs (GtkTextBuffer     *buffer,
-                                                         const GtkTextIter *anywhere_in_line,
-                                                         gint              *char_len);
-
-void _gtk_text_buffer_notify_will_remove_tag (GtkTextBuffer *buffer,
-                                              GtkTextTag    *tag);
-
-G_END_DECLS
-
-#endif
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextbufferrichtext.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextbufferrichtext.h
deleted file mode 100644
index 96fc3c96..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextbufferrichtext.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* gtkrichtext.h
- *
- * Copyright (C) 2006 Imendio AB
- * Contact: Michael Natterer <mitch@imendio.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 __GTK_TEXT_BUFFER_RICH_TEXT_H__
-#define __GTK_TEXT_BUFFER_RICH_TEXT_H__
-
-#include <gtk/gtktextbuffer.h>
-
-G_BEGIN_DECLS
-
-typedef guint8 * (* GtkTextBufferSerializeFunc)   (GtkTextBuffer     *register_buffer,
-                                                   GtkTextBuffer     *content_buffer,
-                                                   const GtkTextIter *start,
-                                                   const GtkTextIter *end,
-                                                   gsize             *length,
-                                                   gpointer           user_data);
-typedef gboolean (* GtkTextBufferDeserializeFunc) (GtkTextBuffer     *register_buffer,
-                                                   GtkTextBuffer     *content_buffer,
-                                                   GtkTextIter       *iter,
-                                                   const guint8      *data,
-                                                   gsize              length,
-                                                   gboolean           create_tags,
-                                                   gpointer           user_data,
-                                                   GError           **error);
-
-GdkAtom   gtk_text_buffer_register_serialize_format   (GtkTextBuffer                *buffer,
-                                                       const gchar                  *mime_type,
-                                                       GtkTextBufferSerializeFunc    function,
-                                                       gpointer                      user_data,
-                                                       GDestroyNotify                user_data_destroy);
-GdkAtom   gtk_text_buffer_register_serialize_tagset   (GtkTextBuffer                *buffer,
-                                                       const gchar                  *tagset_name);
-
-GdkAtom   gtk_text_buffer_register_deserialize_format (GtkTextBuffer                *buffer,
-                                                       const gchar                  *mime_type,
-                                                       GtkTextBufferDeserializeFunc  function,
-                                                       gpointer                      user_data,
-                                                       GDestroyNotify                user_data_destroy);
-GdkAtom   gtk_text_buffer_register_deserialize_tagset (GtkTextBuffer                *buffer,
-                                                       const gchar                  *tagset_name);
-
-void    gtk_text_buffer_unregister_serialize_format   (GtkTextBuffer                *buffer,
-                                                       GdkAtom                       format);
-void    gtk_text_buffer_unregister_deserialize_format (GtkTextBuffer                *buffer,
-                                                       GdkAtom                       format);
-
-void     gtk_text_buffer_deserialize_set_can_create_tags (GtkTextBuffer             *buffer,
-                                                          GdkAtom                    format,
-                                                          gboolean                   can_create_tags);
-gboolean gtk_text_buffer_deserialize_get_can_create_tags (GtkTextBuffer             *buffer,
-                                                          GdkAtom                    format);
-
-GdkAtom * gtk_text_buffer_get_serialize_formats       (GtkTextBuffer                *buffer,
-                                                       gint                         *n_formats);
-GdkAtom * gtk_text_buffer_get_deserialize_formats     (GtkTextBuffer                *buffer,
-                                                       gint                         *n_formats);
-
-guint8  * gtk_text_buffer_serialize                   (GtkTextBuffer                *register_buffer,
-                                                       GtkTextBuffer                *content_buffer,
-                                                       GdkAtom                       format,
-                                                       const GtkTextIter            *start,
-                                                       const GtkTextIter            *end,
-                                                       gsize                        *length);
-gboolean  gtk_text_buffer_deserialize                 (GtkTextBuffer                *register_buffer,
-                                                       GtkTextBuffer                *content_buffer,
-                                                       GdkAtom                       format,
-                                                       GtkTextIter                  *iter,
-                                                       const guint8                 *data,
-                                                       gsize                         length,
-                                                       GError                      **error);
-
-G_END_DECLS
-
-#endif /* __GTK_TEXT_BUFFER_RICH_TEXT_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextchild.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextchild.h
deleted file mode 100644
index 19c3ad9a..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextchild.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtktextchild.h 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.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __GTK_TEXT_CHILD_H__
-#define __GTK_TEXT_CHILD_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/* A GtkTextChildAnchor is a spot in the buffer where child widgets
- * can be "anchored" (inserted inline, as if they were characters).
- * The anchor can have multiple widgets anchored, to allow for multiple
- * views.
- */
-
-typedef struct _GtkTextChildAnchor      GtkTextChildAnchor;
-typedef struct _GtkTextChildAnchorClass GtkTextChildAnchorClass;
-
-#define GTK_TYPE_TEXT_CHILD_ANCHOR              (gtk_text_child_anchor_get_type ())
-#define GTK_TEXT_CHILD_ANCHOR(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GTK_TYPE_TEXT_CHILD_ANCHOR, GtkTextChildAnchor))
-#define GTK_TEXT_CHILD_ANCHOR_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_CHILD_ANCHOR, GtkTextChildAnchorClass))
-#define GTK_IS_TEXT_CHILD_ANCHOR(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GTK_TYPE_TEXT_CHILD_ANCHOR))
-#define GTK_IS_TEXT_CHILD_ANCHOR_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TEXT_CHILD_ANCHOR))
-#define GTK_TEXT_CHILD_ANCHOR_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TEXT_CHILD_ANCHOR, GtkTextChildAnchorClass))
-
-struct _GtkTextChildAnchor
-{
-  GObject parent_instance;
-
-  gpointer segment;
-};
-
-struct _GtkTextChildAnchorClass
-{
-  GObjectClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType gtk_text_child_anchor_get_type (void) G_GNUC_CONST;
-
-GtkTextChildAnchor* gtk_text_child_anchor_new (void);
-
-GList*   gtk_text_child_anchor_get_widgets (GtkTextChildAnchor *anchor);
-gboolean gtk_text_child_anchor_get_deleted (GtkTextChildAnchor *anchor);
-
-G_END_DECLS
-
-#endif
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextdisplay.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextdisplay.h
deleted file mode 100644
index b93a84c2..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextdisplay.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* gtktextdisplay.c - display layed-out text
- *
- * Copyright (c) 1992-1994 The Regents of the University of California.
- * Copyright (c) 1994-1997 Sun Microsystems, Inc.
- * Copyright (c) 2000 Red Hat, Inc.
- * Tk->Gtk port by Havoc Pennington
- *
- * This file can be used under your choice of two licenses, the LGPL
- * and the original Tk license.
- *
- * LGPL:
- *
- * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Original Tk license:
- *
- * This software is copyrighted by the Regents of the University of
- * California, Sun Microsystems, Inc., and other parties.  The
- * following terms apply to all files associated with the software
- * unless explicitly disclaimed in individual files.
- *
- * The authors hereby grant permission to use, copy, modify,
- * distribute, and license this software and its documentation for any
- * purpose, provided that existing copyright notices are retained in
- * all copies and that this notice is included verbatim in any
- * distributions. No written agreement, license, or royalty fee is
- * required for any of the authorized uses.  Modifications to this
- * software may be copyrighted by their authors and need not follow
- * the licensing terms described here, provided that the new terms are
- * clearly indicated on the first page of each file where they apply.
- *
- * IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY
- * PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
- * DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION,
- * OR ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND
- * NON-INFRINGEMENT.  THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS,
- * AND THE AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE
- * MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * GOVERNMENT USE: If you are acquiring this software on behalf of the
- * U.S. government, the Government shall have only "Restricted Rights"
- * in the software and related documentation as defined in the Federal
- * Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
- * are acquiring the software on behalf of the Department of Defense,
- * the software shall be classified as "Commercial Computer Software"
- * and the Government shall have only "Restricted Rights" as defined
- * in Clause 252.227-7013 (c) (1) of DFARs.  Notwithstanding the
- * foregoing, the authors grant the U.S. Government and others acting
- * in its behalf permission to use and distribute the software in
- * accordance with the terms specified in this license.
- *
- */
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __GTK_TEXT_DISPLAY_H__
-#define __GTK_TEXT_DISPLAY_H__
-
-#include <gtk/gtktextlayout.h>
-
-G_BEGIN_DECLS
-
-/* A semi-public header intended for use by code that also
- * uses GtkTextLayout
- */
-
-/* The drawable should be pre-initialized to your preferred background.
- * widget            - Widget to grab some style info from
- * drawable          - Drawable to render to
- * cursor_gc         - Graphics context to use for cursor
- * x_offset/y_offset - Position of the drawable in layout coordinates
- * x/y/width/height  - Region of the layout to render. x,y must be inside
- *                     the drawable.
- * widgets           - list of widgets that need exposing
- */
-void gtk_text_layout_draw (GtkTextLayout        *layout,
-                           GtkWidget            *widget,
-                           GdkDrawable          *drawable,
-			   GdkGC                *cursor_gc,
-                           gint                  x_offset,
-                           gint                  y_offset,
-                           gint                  x,
-                           gint                  y,
-                           gint                  width,
-                           gint                  height,
-                           GList               **widgets);
-
-
-G_END_DECLS
-
-#endif  /* __GTK_TEXT_DISPLAY_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextiter.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextiter.h
deleted file mode 100644
index f788397f..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextiter.h
+++ /dev/null
@@ -1,303 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtktextiter.h 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.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __GTK_TEXT_ITER_H__
-#define __GTK_TEXT_ITER_H__
-
-#include <gtk/gtktexttag.h>
-#include <gtk/gtktextchild.h>
-
-G_BEGIN_DECLS
-
-typedef enum {
-  GTK_TEXT_SEARCH_VISIBLE_ONLY = 1 << 0,
-  GTK_TEXT_SEARCH_TEXT_ONLY    = 1 << 1
-  /* Possible future plans: SEARCH_CASE_INSENSITIVE, SEARCH_REGEXP */
-} GtkTextSearchFlags;
-
-/*
- * Iter: represents a location in the text. Becomes invalid if the
- * characters/pixmaps/widgets (indexable objects) in the text buffer
- * are changed.
- */
-
-typedef struct _GtkTextBuffer GtkTextBuffer;
-
-#define GTK_TYPE_TEXT_ITER     (gtk_text_iter_get_type ())
-
-struct _GtkTextIter {
-  /* GtkTextIter is an opaque datatype; ignore all these fields.
-   * Initialize the iter with gtk_text_buffer_get_iter_*
-   * functions
-   */
-  /*< private >*/
-  gpointer dummy1;
-  gpointer dummy2;
-  gint dummy3;
-  gint dummy4;
-  gint dummy5;
-  gint dummy6;
-  gint dummy7;
-  gint dummy8;
-  gpointer dummy9;
-  gpointer dummy10;
-  gint dummy11;
-  gint dummy12;
-  /* padding */
-  gint dummy13;
-  gpointer dummy14;
-};
-
-
-/* This is primarily intended for language bindings that want to avoid
-   a "buffer" argument to text insertions, deletions, etc. */
-GtkTextBuffer *gtk_text_iter_get_buffer (const GtkTextIter *iter);
-
-/*
- * Life cycle
- */
-
-GtkTextIter *gtk_text_iter_copy     (const GtkTextIter *iter);
-void         gtk_text_iter_free     (GtkTextIter       *iter);
-
-GType        gtk_text_iter_get_type (void) G_GNUC_CONST;
-
-/*
- * Convert to different kinds of index
- */
-
-gint gtk_text_iter_get_offset      (const GtkTextIter *iter);
-gint gtk_text_iter_get_line        (const GtkTextIter *iter);
-gint gtk_text_iter_get_line_offset (const GtkTextIter *iter);
-gint gtk_text_iter_get_line_index  (const GtkTextIter *iter);
-
-gint gtk_text_iter_get_visible_line_offset (const GtkTextIter *iter);
-gint gtk_text_iter_get_visible_line_index (const GtkTextIter *iter);
-
-
-/*
- * "Dereference" operators
- */
-gunichar gtk_text_iter_get_char          (const GtkTextIter  *iter);
-
-/* includes the 0xFFFC char for pixmaps/widgets, so char offsets
- * into the returned string map properly into buffer char offsets
- */
-gchar   *gtk_text_iter_get_slice         (const GtkTextIter  *start,
-                                          const GtkTextIter  *end);
-
-/* includes only text, no 0xFFFC */
-gchar   *gtk_text_iter_get_text          (const GtkTextIter  *start,
-                                          const GtkTextIter  *end);
-/* exclude invisible chars */
-gchar   *gtk_text_iter_get_visible_slice (const GtkTextIter  *start,
-                                          const GtkTextIter  *end);
-gchar   *gtk_text_iter_get_visible_text  (const GtkTextIter  *start,
-                                          const GtkTextIter  *end);
-
-GdkPixbuf* gtk_text_iter_get_pixbuf (const GtkTextIter *iter);
-GSList  *  gtk_text_iter_get_marks  (const GtkTextIter *iter);
-
-GtkTextChildAnchor* gtk_text_iter_get_child_anchor (const GtkTextIter *iter);
-
-/* Return list of tags toggled at this point (toggled_on determines
- * whether the list is of on-toggles or off-toggles)
- */
-GSList  *gtk_text_iter_get_toggled_tags  (const GtkTextIter  *iter,
-                                          gboolean            toggled_on);
-
-gboolean gtk_text_iter_begins_tag        (const GtkTextIter  *iter,
-                                          GtkTextTag         *tag);
-
-gboolean gtk_text_iter_ends_tag          (const GtkTextIter  *iter,
-                                          GtkTextTag         *tag);
-
-gboolean gtk_text_iter_toggles_tag       (const GtkTextIter  *iter,
-                                          GtkTextTag         *tag);
-
-gboolean gtk_text_iter_has_tag           (const GtkTextIter   *iter,
-                                          GtkTextTag          *tag);
-GSList  *gtk_text_iter_get_tags          (const GtkTextIter   *iter);
-
-gboolean gtk_text_iter_editable          (const GtkTextIter   *iter,
-                                          gboolean             default_setting);
-gboolean gtk_text_iter_can_insert        (const GtkTextIter   *iter,
-                                          gboolean             default_editability);
-
-gboolean gtk_text_iter_starts_word        (const GtkTextIter   *iter);
-gboolean gtk_text_iter_ends_word          (const GtkTextIter   *iter);
-gboolean gtk_text_iter_inside_word        (const GtkTextIter   *iter);
-gboolean gtk_text_iter_starts_sentence    (const GtkTextIter   *iter);
-gboolean gtk_text_iter_ends_sentence      (const GtkTextIter   *iter);
-gboolean gtk_text_iter_inside_sentence    (const GtkTextIter   *iter);
-gboolean gtk_text_iter_starts_line        (const GtkTextIter   *iter);
-gboolean gtk_text_iter_ends_line          (const GtkTextIter   *iter);
-gboolean gtk_text_iter_is_cursor_position (const GtkTextIter   *iter);
-
-gint     gtk_text_iter_get_chars_in_line (const GtkTextIter   *iter);
-gint     gtk_text_iter_get_bytes_in_line (const GtkTextIter   *iter);
-
-gboolean       gtk_text_iter_get_attributes (const GtkTextIter *iter,
-					     GtkTextAttributes *values);
-PangoLanguage* gtk_text_iter_get_language   (const GtkTextIter *iter);
-gboolean       gtk_text_iter_is_end         (const GtkTextIter *iter);
-gboolean       gtk_text_iter_is_start       (const GtkTextIter *iter);
-
-/*
- * Moving around the buffer
- */
-
-gboolean gtk_text_iter_forward_char         (GtkTextIter *iter);
-gboolean gtk_text_iter_backward_char        (GtkTextIter *iter);
-gboolean gtk_text_iter_forward_chars        (GtkTextIter *iter,
-                                             gint         count);
-gboolean gtk_text_iter_backward_chars       (GtkTextIter *iter,
-                                             gint         count);
-gboolean gtk_text_iter_forward_line         (GtkTextIter *iter);
-gboolean gtk_text_iter_backward_line        (GtkTextIter *iter);
-gboolean gtk_text_iter_forward_lines        (GtkTextIter *iter,
-                                             gint         count);
-gboolean gtk_text_iter_backward_lines       (GtkTextIter *iter,
-                                             gint         count);
-gboolean gtk_text_iter_forward_word_end     (GtkTextIter *iter);
-gboolean gtk_text_iter_backward_word_start  (GtkTextIter *iter);
-gboolean gtk_text_iter_forward_word_ends    (GtkTextIter *iter,
-                                             gint         count);
-gboolean gtk_text_iter_backward_word_starts (GtkTextIter *iter,
-                                             gint         count);
-                                             
-gboolean gtk_text_iter_forward_visible_line   (GtkTextIter *iter);
-gboolean gtk_text_iter_backward_visible_line  (GtkTextIter *iter);
-gboolean gtk_text_iter_forward_visible_lines  (GtkTextIter *iter,
-                                               gint         count);
-gboolean gtk_text_iter_backward_visible_lines (GtkTextIter *iter,
-                                               gint         count);
-
-gboolean gtk_text_iter_forward_visible_word_end     (GtkTextIter *iter);
-gboolean gtk_text_iter_backward_visible_word_start  (GtkTextIter *iter);
-gboolean gtk_text_iter_forward_visible_word_ends    (GtkTextIter *iter,
-                                             gint         count);
-gboolean gtk_text_iter_backward_visible_word_starts (GtkTextIter *iter,
-                                             gint         count);
-
-gboolean gtk_text_iter_forward_sentence_end     (GtkTextIter *iter);
-gboolean gtk_text_iter_backward_sentence_start  (GtkTextIter *iter);
-gboolean gtk_text_iter_forward_sentence_ends    (GtkTextIter *iter,
-                                                 gint         count);
-gboolean gtk_text_iter_backward_sentence_starts (GtkTextIter *iter,
-                                                 gint         count);
-/* cursor positions are almost equivalent to chars, but not quite;
- * in some languages, you can't put the cursor between certain
- * chars. Also, you can't put the cursor between \r\n at the end
- * of a line.
- */
-gboolean gtk_text_iter_forward_cursor_position   (GtkTextIter *iter);
-gboolean gtk_text_iter_backward_cursor_position  (GtkTextIter *iter);
-gboolean gtk_text_iter_forward_cursor_positions  (GtkTextIter *iter,
-                                                  gint         count);
-gboolean gtk_text_iter_backward_cursor_positions (GtkTextIter *iter,
-                                                  gint         count);
-
-gboolean gtk_text_iter_forward_visible_cursor_position   (GtkTextIter *iter);
-gboolean gtk_text_iter_backward_visible_cursor_position  (GtkTextIter *iter);
-gboolean gtk_text_iter_forward_visible_cursor_positions  (GtkTextIter *iter,
-                                                          gint         count);
-gboolean gtk_text_iter_backward_visible_cursor_positions (GtkTextIter *iter,
-                                                          gint         count);
-
-
-void     gtk_text_iter_set_offset         (GtkTextIter *iter,
-                                           gint         char_offset);
-void     gtk_text_iter_set_line           (GtkTextIter *iter,
-                                           gint         line_number);
-void     gtk_text_iter_set_line_offset    (GtkTextIter *iter,
-                                           gint         char_on_line);
-void     gtk_text_iter_set_line_index     (GtkTextIter *iter,
-                                           gint         byte_on_line);
-void     gtk_text_iter_forward_to_end     (GtkTextIter *iter);
-gboolean gtk_text_iter_forward_to_line_end (GtkTextIter *iter);
-
-void     gtk_text_iter_set_visible_line_offset (GtkTextIter *iter,
-                                                gint         char_on_line);
-void     gtk_text_iter_set_visible_line_index  (GtkTextIter *iter,
-                                                gint         byte_on_line);
-
-/* returns TRUE if a toggle was found; NULL for the tag pointer
- * means "any tag toggle", otherwise the next toggle of the
- * specified tag is located.
- */
-gboolean gtk_text_iter_forward_to_tag_toggle (GtkTextIter *iter,
-                                              GtkTextTag  *tag);
-
-gboolean gtk_text_iter_backward_to_tag_toggle (GtkTextIter *iter,
-                                               GtkTextTag  *tag);
-
-typedef gboolean (* GtkTextCharPredicate) (gunichar ch, gpointer user_data);
-
-gboolean gtk_text_iter_forward_find_char  (GtkTextIter          *iter,
-                                           GtkTextCharPredicate  pred,
-                                           gpointer              user_data,
-                                           const GtkTextIter    *limit);
-gboolean gtk_text_iter_backward_find_char (GtkTextIter          *iter,
-                                           GtkTextCharPredicate  pred,
-                                           gpointer              user_data,
-                                           const GtkTextIter    *limit);
-
-gboolean gtk_text_iter_forward_search  (const GtkTextIter *iter,
-                                        const gchar       *str,
-                                        GtkTextSearchFlags flags,
-                                        GtkTextIter       *match_start,
-                                        GtkTextIter       *match_end,
-                                        const GtkTextIter *limit);
-
-gboolean gtk_text_iter_backward_search (const GtkTextIter *iter,
-                                        const gchar       *str,
-                                        GtkTextSearchFlags flags,
-                                        GtkTextIter       *match_start,
-                                        GtkTextIter       *match_end,
-                                        const GtkTextIter *limit);
-
-
-/*
- * Comparisons
- */
-gboolean gtk_text_iter_equal           (const GtkTextIter *lhs,
-                                        const GtkTextIter *rhs);
-gint     gtk_text_iter_compare         (const GtkTextIter *lhs,
-                                        const GtkTextIter *rhs);
-gboolean gtk_text_iter_in_range        (const GtkTextIter *iter,
-                                        const GtkTextIter *start,
-                                        const GtkTextIter *end);
-
-/* Put these two in ascending order */
-void     gtk_text_iter_order           (GtkTextIter *first,
-                                        GtkTextIter *second);
-
-G_END_DECLS
-
-#endif
-
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextlayout.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextlayout.h
deleted file mode 100644
index cb357864..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextlayout.h
+++ /dev/null
@@ -1,440 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtktextlayout.h
- *
- * Copyright (c) 1992-1994 The Regents of the University of California.
- * Copyright (c) 1994-1997 Sun Microsystems, Inc.
- * Copyright (c) 2000 Red Hat, Inc.
- * Tk->Gtk port by Havoc Pennington
- * Pango support by Owen Taylor
- *
- * This file can be used under your choice of two licenses, the LGPL
- * and the original Tk license.
- *
- * LGPL:
- *
- * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Original Tk license:
- *
- * This software is copyrighted by the Regents of the University of
- * California, Sun Microsystems, Inc., and other parties.  The
- * following terms apply to all files associated with the software
- * unless explicitly disclaimed in individual files.
- *
- * The authors hereby grant permission to use, copy, modify,
- * distribute, and license this software and its documentation for any
- * purpose, provided that existing copyright notices are retained in
- * all copies and that this notice is included verbatim in any
- * distributions. No written agreement, license, or royalty fee is
- * required for any of the authorized uses.  Modifications to this
- * software may be copyrighted by their authors and need not follow
- * the licensing terms described here, provided that the new terms are
- * clearly indicated on the first page of each file where they apply.
- *
- * IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY
- * PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
- * DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION,
- * OR ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND
- * NON-INFRINGEMENT.  THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS,
- * AND THE AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE
- * MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * GOVERNMENT USE: If you are acquiring this software on behalf of the
- * U.S. government, the Government shall have only "Restricted Rights"
- * in the software and related documentation as defined in the Federal
- * Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
- * are acquiring the software on behalf of the Department of Defense,
- * the software shall be classified as "Commercial Computer Software"
- * and the Government shall have only "Restricted Rights" as defined
- * in Clause 252.227-7013 (c) (1) of DFARs.  Notwithstanding the
- * foregoing, the authors grant the U.S. Government and others acting
- * in its behalf permission to use and distribute the software in
- * accordance with the terms specified in this license.
- *
- */
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __GTK_TEXT_LAYOUT_H__
-#define __GTK_TEXT_LAYOUT_H__
-
-/* This is a "semi-private" header; it is intended for
- * use by the text widget, and the text canvas item,
- * but that's all. We may have to install it so the
- * canvas item can use it, but users are not supposed
- * to use it.
- */
-#ifndef GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
-#error "You are not supposed to be including this file; the equivalent public API is in gtktextview.h"
-#endif
-
-#include <gtk/gtktextbuffer.h>
-#include <gtk/gtktextiter.h>
-
-G_BEGIN_DECLS
-
-/* forward declarations that have to be here to avoid including
- * gtktextbtree.h
- */
-typedef struct _GtkTextLine     GtkTextLine;
-typedef struct _GtkTextLineData GtkTextLineData;
-
-#define GTK_TYPE_TEXT_LAYOUT             (gtk_text_layout_get_type ())
-#define GTK_TEXT_LAYOUT(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TEXT_LAYOUT, GtkTextLayout))
-#define GTK_TEXT_LAYOUT_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_LAYOUT, GtkTextLayoutClass))
-#define GTK_IS_TEXT_LAYOUT(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TEXT_LAYOUT))
-#define GTK_IS_TEXT_LAYOUT_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TEXT_LAYOUT))
-#define GTK_TEXT_LAYOUT_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TEXT_LAYOUT, GtkTextLayoutClass))
-
-typedef struct _GtkTextLayout         GtkTextLayout;
-typedef struct _GtkTextLayoutClass    GtkTextLayoutClass;
-typedef struct _GtkTextLineDisplay    GtkTextLineDisplay;
-typedef struct _GtkTextCursorDisplay  GtkTextCursorDisplay;
-typedef struct _GtkTextAttrAppearance GtkTextAttrAppearance;
-
-struct _GtkTextLayout
-{
-  GObject parent_instance;
-
-  /* width of the display area on-screen,
-   * i.e. pixels we should wrap to fit inside. */
-  gint screen_width;
-
-  /* width/height of the total logical area being layed out */
-  gint width;
-  gint height;
-
-  /* Pixel offsets from the left and from the top to be used when we
-   * draw; these allow us to create left/top margins. We don't need
-   * anything special for bottom/right margins, because those don't
-   * affect drawing.
-   */
-  /* gint left_edge; */
-  /* gint top_edge; */
-
-  GtkTextBuffer *buffer;
-
-  /* Default style used if no tags override it */
-  GtkTextAttributes *default_style;
-
-  /* Pango contexts used for creating layouts */
-  PangoContext *ltr_context;
-  PangoContext *rtl_context;
-
-  /* A cache of one style; this is used to ensure
-   * we don't constantly regenerate the style
-   * over long runs with the same style. */
-  GtkTextAttributes *one_style_cache;
-
-  /* A cache of one line display. Getting the same line
-   * many times in a row is the most common case.
-   */
-  GtkTextLineDisplay *one_display_cache;
-
-  /* Whether we are allowed to wrap right now */
-  gint wrap_loop_count;
-  
-  /* Whether to show the insertion cursor */
-  guint cursor_visible : 1;
-
-  /* For what GtkTextDirection to draw cursor GTK_TEXT_DIR_NONE -
-   * means draw both cursors.
-   */
-  guint cursor_direction : 2;
-
-  /* The keyboard direction is used to default the alignment when
-     there are no strong characters.
-  */
-  guint keyboard_direction : 2;
-
-  /* The preedit string and attributes, if any */
-
-  gchar *preedit_string;
-  PangoAttrList *preedit_attrs;
-  gint preedit_len;
-  gint preedit_cursor;
-
-  guint overwrite_mode : 1;
-};
-
-struct _GtkTextLayoutClass
-{
-  GObjectClass parent_class;
-
-  /* Some portion of the layout was invalidated
-   */
-  void  (*invalidated)  (GtkTextLayout *layout);
-
-  /* A range of the layout changed appearance and possibly height
-   */
-  void  (*changed)              (GtkTextLayout     *layout,
-                                 gint               y,
-                                 gint               old_height,
-                                 gint               new_height);
-  GtkTextLineData* (*wrap)      (GtkTextLayout     *layout,
-                                 GtkTextLine       *line,
-                                 GtkTextLineData   *line_data); /* may be NULL */
-  void  (*get_log_attrs)        (GtkTextLayout     *layout,
-                                 GtkTextLine       *line,
-                                 PangoLogAttr     **attrs,
-                                 gint              *n_attrs);
-  void  (*invalidate)           (GtkTextLayout     *layout,
-                                 const GtkTextIter *start,
-                                 const GtkTextIter *end);
-  void  (*free_line_data)       (GtkTextLayout     *layout,
-                                 GtkTextLine       *line,
-                                 GtkTextLineData   *line_data);
-
-  void (*allocate_child)        (GtkTextLayout     *layout,
-                                 GtkWidget         *child,
-                                 gint               x,
-                                 gint               y);
-
-  void (*invalidate_cursors)    (GtkTextLayout     *layout,
-                                 const GtkTextIter *start,
-                                 const GtkTextIter *end);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-};
-
-struct _GtkTextAttrAppearance
-{
-  PangoAttribute attr;
-  GtkTextAppearance appearance;
-};
-struct _GtkTextCursorDisplay
-{
-  gint x;
-  gint y;
-  gint height;
-  guint is_strong : 1;
-  guint is_weak : 1;
-};
-struct _GtkTextLineDisplay
-{
-  PangoLayout *layout;
-  GSList *cursors;
-  GSList *shaped_objects;	/* Only for backwards compatibility */
-  
-  GtkTextDirection direction;
-
-  gint width;                   /* Width of layout */
-  gint total_width;             /* width - margins, if no width set on layout, if width set on layout, -1 */
-  gint height;
-  /* Amount layout is shifted from left edge - this is the left margin
-   * plus any other factors, such as alignment or indentation.
-   */
-  gint x_offset;
-  gint left_margin;
-  gint right_margin;
-  gint top_margin;
-  gint bottom_margin;
-  gint insert_index;		/* Byte index of insert cursor within para or -1 */
-
-  gboolean size_only;
-  GtkTextLine *line;
-  
-  GdkColor *pg_bg_color;
-
-  GdkRectangle block_cursor;
-  guint cursors_invalid : 1;
-  guint has_block_cursor : 1;
-  guint cursor_at_line_end : 1;
-};
-
-extern PangoAttrType gtk_text_attr_appearance_type;
-
-GType         gtk_text_layout_get_type    (void) G_GNUC_CONST;
-
-GtkTextLayout*     gtk_text_layout_new                   (void);
-void               gtk_text_layout_set_buffer            (GtkTextLayout     *layout,
-							  GtkTextBuffer     *buffer);
-GtkTextBuffer     *gtk_text_layout_get_buffer            (GtkTextLayout     *layout);
-void               gtk_text_layout_set_default_style     (GtkTextLayout     *layout,
-							  GtkTextAttributes *values);
-void               gtk_text_layout_set_contexts          (GtkTextLayout     *layout,
-							  PangoContext      *ltr_context,
-							  PangoContext      *rtl_context);
-void               gtk_text_layout_set_cursor_direction  (GtkTextLayout     *layout,
-                                                          GtkTextDirection   direction);
-void		   gtk_text_layout_set_overwrite_mode	 (GtkTextLayout     *layout,
-							  gboolean           overwrite);
-void               gtk_text_layout_set_keyboard_direction (GtkTextLayout     *layout,
-							   GtkTextDirection keyboard_dir);
-void               gtk_text_layout_default_style_changed (GtkTextLayout     *layout);
-
-void gtk_text_layout_set_screen_width       (GtkTextLayout     *layout,
-                                             gint               width);
-void gtk_text_layout_set_preedit_string     (GtkTextLayout     *layout,
- 					     const gchar       *preedit_string,
- 					     PangoAttrList     *preedit_attrs,
- 					     gint               cursor_pos);
-
-void     gtk_text_layout_set_cursor_visible (GtkTextLayout     *layout,
-                                             gboolean           cursor_visible);
-gboolean gtk_text_layout_get_cursor_visible (GtkTextLayout     *layout);
-
-/* Getting the size or the lines potentially results in a call to
- * recompute, which is pretty massively expensive. Thus it should
- * basically only be done in an idle handler.
- *
- * Long-term, we would really like to be able to do these without
- * a full recompute so they may get cheaper over time.
- */
-void    gtk_text_layout_get_size  (GtkTextLayout  *layout,
-                                   gint           *width,
-                                   gint           *height);
-GSList* gtk_text_layout_get_lines (GtkTextLayout  *layout,
-                                   /* [top_y, bottom_y) */
-                                   gint            top_y,
-                                   gint            bottom_y,
-                                   gint           *first_line_y);
-
-void gtk_text_layout_wrap_loop_start (GtkTextLayout *layout);
-void gtk_text_layout_wrap_loop_end   (GtkTextLayout *layout);
-
-GtkTextLineDisplay* gtk_text_layout_get_line_display  (GtkTextLayout      *layout,
-                                                       GtkTextLine        *line,
-                                                       gboolean            size_only);
-void                gtk_text_layout_free_line_display (GtkTextLayout      *layout,
-                                                       GtkTextLineDisplay *display);
-
-void gtk_text_layout_get_line_at_y     (GtkTextLayout     *layout,
-                                        GtkTextIter       *target_iter,
-                                        gint               y,
-                                        gint              *line_top);
-void gtk_text_layout_get_iter_at_pixel (GtkTextLayout     *layout,
-                                        GtkTextIter       *iter,
-                                        gint               x,
-                                        gint               y);
-void gtk_text_layout_get_iter_at_position (GtkTextLayout     *layout,
-					   GtkTextIter       *iter,
-					   gint              *trailing,
-					   gint               x,
-					   gint               y);
-void gtk_text_layout_invalidate        (GtkTextLayout     *layout,
-                                        const GtkTextIter *start,
-                                        const GtkTextIter *end);
-void gtk_text_layout_invalidate_cursors(GtkTextLayout     *layout,
-                                        const GtkTextIter *start,
-                                        const GtkTextIter *end);
-void gtk_text_layout_free_line_data    (GtkTextLayout     *layout,
-                                        GtkTextLine       *line,
-                                        GtkTextLineData   *line_data);
-
-gboolean gtk_text_layout_is_valid        (GtkTextLayout *layout);
-void     gtk_text_layout_validate_yrange (GtkTextLayout *layout,
-                                          GtkTextIter   *anchor_line,
-                                          gint           y0_,
-                                          gint           y1_);
-void     gtk_text_layout_validate        (GtkTextLayout *layout,
-                                          gint           max_pixels);
-
-/* This function should return the passed-in line data,
- * OR remove the existing line data from the line, and
- * return a NEW line data after adding it to the line.
- * That is, invariant after calling the callback is that
- * there should be exactly one line data for this view
- * stored on the btree line.
- */
-GtkTextLineData* gtk_text_layout_wrap  (GtkTextLayout   *layout,
-                                        GtkTextLine     *line,
-                                        GtkTextLineData *line_data); /* may be NULL */
-void     gtk_text_layout_changed              (GtkTextLayout     *layout,
-                                               gint               y,
-                                               gint               old_height,
-                                               gint               new_height);
-void     gtk_text_layout_cursors_changed      (GtkTextLayout     *layout,
-                                               gint               y,
-                                               gint               old_height,
-                                               gint               new_height);
-void     gtk_text_layout_get_iter_location    (GtkTextLayout     *layout,
-                                               const GtkTextIter *iter,
-                                               GdkRectangle      *rect);
-void     gtk_text_layout_get_line_yrange      (GtkTextLayout     *layout,
-                                               const GtkTextIter *iter,
-                                               gint              *y,
-                                               gint              *height);
-void     _gtk_text_layout_get_line_xrange     (GtkTextLayout     *layout,
-                                               const GtkTextIter *iter,
-                                               gint              *x,
-                                               gint              *width);
-void     gtk_text_layout_get_cursor_locations (GtkTextLayout     *layout,
-                                               GtkTextIter       *iter,
-                                               GdkRectangle      *strong_pos,
-                                               GdkRectangle      *weak_pos);
-gboolean _gtk_text_layout_get_block_cursor    (GtkTextLayout     *layout,
-					       GdkRectangle      *pos);
-gboolean gtk_text_layout_clamp_iter_to_vrange (GtkTextLayout     *layout,
-                                               GtkTextIter       *iter,
-                                               gint               top,
-                                               gint               bottom);
-
-gboolean gtk_text_layout_move_iter_to_line_end      (GtkTextLayout *layout,
-                                                     GtkTextIter   *iter,
-                                                     gint           direction);
-gboolean gtk_text_layout_move_iter_to_previous_line (GtkTextLayout *layout,
-                                                     GtkTextIter   *iter);
-gboolean gtk_text_layout_move_iter_to_next_line     (GtkTextLayout *layout,
-                                                     GtkTextIter   *iter);
-void     gtk_text_layout_move_iter_to_x             (GtkTextLayout *layout,
-                                                     GtkTextIter   *iter,
-                                                     gint           x);
-gboolean gtk_text_layout_move_iter_visually         (GtkTextLayout *layout,
-                                                     GtkTextIter   *iter,
-                                                     gint           count);
-
-gboolean gtk_text_layout_iter_starts_line           (GtkTextLayout       *layout,
-                                                     const GtkTextIter   *iter);
-
-void     gtk_text_layout_get_iter_at_line           (GtkTextLayout *layout,
-                                                     GtkTextIter    *iter,
-                                                     GtkTextLine    *line,
-                                                     gint            byte_offset);
-
-/* Don't use these. Use gtk_text_view_add_child_at_anchor().
- * These functions are defined in gtktextchild.c, but here
- * since they are semi-public and require GtkTextLayout to
- * be declared.
- */
-void gtk_text_child_anchor_register_child   (GtkTextChildAnchor *anchor,
-                                             GtkWidget          *child,
-                                             GtkTextLayout      *layout);
-void gtk_text_child_anchor_unregister_child (GtkTextChildAnchor *anchor,
-                                             GtkWidget          *child);
-
-void gtk_text_child_anchor_queue_resize     (GtkTextChildAnchor *anchor,
-                                             GtkTextLayout      *layout);
-
-void gtk_text_anchored_child_set_layout     (GtkWidget          *child,
-                                             GtkTextLayout      *layout);
-
-void gtk_text_layout_spew (GtkTextLayout *layout);
-
-G_END_DECLS
-
-#endif  /* __GTK_TEXT_LAYOUT_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextmark.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextmark.h
deleted file mode 100644
index 41bcb949..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextmark.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* gtktextmark.h - mark segments
- *
- * Copyright (c) 1994 The Regents of the University of California.
- * Copyright (c) 1994-1997 Sun Microsystems, Inc.
- * Copyright (c) 2000      Red Hat, Inc.
- * Tk -> Gtk port by Havoc Pennington <hp@redhat.com>
- *
- * This software is copyrighted by the Regents of the University of
- * California, Sun Microsystems, Inc., and other parties.  The
- * following terms apply to all files associated with the software
- * unless explicitly disclaimed in individual files.
- *
- * The authors hereby grant permission to use, copy, modify,
- * distribute, and license this software and its documentation for any
- * purpose, provided that existing copyright notices are retained in
- * all copies and that this notice is included verbatim in any
- * distributions. No written agreement, license, or royalty fee is
- * required for any of the authorized uses.  Modifications to this
- * software may be copyrighted by their authors and need not follow
- * the licensing terms described here, provided that the new terms are
- * clearly indicated on the first page of each file where they apply.
- *
- * IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY
- * PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
- * DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION,
- * OR ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND
- * NON-INFRINGEMENT.  THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS,
- * AND THE AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE
- * MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * GOVERNMENT USE: If you are acquiring this software on behalf of the
- * U.S. government, the Government shall have only "Restricted Rights"
- * in the software and related documentation as defined in the Federal
- * Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
- * are acquiring the software on behalf of the Department of Defense,
- * the software shall be classified as "Commercial Computer Software"
- * and the Government shall have only "Restricted Rights" as defined
- * in Clause 252.227-7013 (c) (1) of DFARs.  Notwithstanding the
- * foregoing, the authors grant the U.S. Government and others acting
- * in its behalf permission to use and distribute the software in
- * accordance with the terms specified in this license.
- *
- */
-
-#ifndef __GTK_TEXT_MARK_H__
-#define __GTK_TEXT_MARK_H__
-
-G_BEGIN_DECLS
-
-/* The GtkTextMark data type */
-
-typedef struct _GtkTextMark      GtkTextMark;
-typedef struct _GtkTextMarkClass GtkTextMarkClass;
-
-#define GTK_TYPE_TEXT_MARK              (gtk_text_mark_get_type ())
-#define GTK_TEXT_MARK(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GTK_TYPE_TEXT_MARK, GtkTextMark))
-#define GTK_TEXT_MARK_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_MARK, GtkTextMarkClass))
-#define GTK_IS_TEXT_MARK(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GTK_TYPE_TEXT_MARK))
-#define GTK_IS_TEXT_MARK_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TEXT_MARK))
-#define GTK_TEXT_MARK_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TEXT_MARK, GtkTextMarkClass))
-
-struct _GtkTextMark
-{
-  GObject parent_instance;
-
-  gpointer segment;
-};
-
-struct _GtkTextMarkClass
-{
-  GObjectClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType        gtk_text_mark_get_type   (void) G_GNUC_CONST;
-
-void           gtk_text_mark_set_visible (GtkTextMark *mark,
-                                          gboolean     setting);
-gboolean       gtk_text_mark_get_visible (GtkTextMark *mark);
-
-GtkTextMark          *gtk_text_mark_new              (const gchar *name,
-						      gboolean     left_gravity);
-G_CONST_RETURN gchar* gtk_text_mark_get_name         (GtkTextMark *mark);
-gboolean              gtk_text_mark_get_deleted      (GtkTextMark *mark);
-GtkTextBuffer*        gtk_text_mark_get_buffer       (GtkTextMark *mark);
-gboolean              gtk_text_mark_get_left_gravity (GtkTextMark *mark);
-
-G_END_DECLS
-
-#endif
-
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktexttag.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktexttag.h
deleted file mode 100644
index 61d60d9a..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktexttag.h
+++ /dev/null
@@ -1,284 +0,0 @@
-/* gtktexttag.c - text tag object
- *
- * Copyright (c) 1992-1994 The Regents of the University of California.
- * Copyright (c) 1994-1997 Sun Microsystems, Inc.
- * Copyright (c) 2000      Red Hat, Inc.
- * Tk -> Gtk port by Havoc Pennington <hp@redhat.com>
- *
- * This software is copyrighted by the Regents of the University of
- * California, Sun Microsystems, Inc., and other parties.  The
- * following terms apply to all files associated with the software
- * unless explicitly disclaimed in individual files.
- *
- * The authors hereby grant permission to use, copy, modify,
- * distribute, and license this software and its documentation for any
- * purpose, provided that existing copyright notices are retained in
- * all copies and that this notice is included verbatim in any
- * distributions. No written agreement, license, or royalty fee is
- * required for any of the authorized uses.  Modifications to this
- * software may be copyrighted by their authors and need not follow
- * the licensing terms described here, provided that the new terms are
- * clearly indicated on the first page of each file where they apply.
- *
- * IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY
- * PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
- * DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION,
- * OR ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND
- * NON-INFRINGEMENT.  THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS,
- * AND THE AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE
- * MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * GOVERNMENT USE: If you are acquiring this software on behalf of the
- * U.S. government, the Government shall have only "Restricted Rights"
- * in the software and related documentation as defined in the Federal
- * Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
- * are acquiring the software on behalf of the Department of Defense,
- * the software shall be classified as "Commercial Computer Software"
- * and the Government shall have only "Restricted Rights" as defined
- * in Clause 252.227-7013 (c) (1) of DFARs.  Notwithstanding the
- * foregoing, the authors grant the U.S. Government and others acting
- * in its behalf permission to use and distribute the software in
- * accordance with the terms specified in this license.
- *
- */
-
-#ifndef __GTK_TEXT_TAG_H__
-#define __GTK_TEXT_TAG_H__
-
-#include <glib-object.h>
-#include <gdk/gdk.h>
-#include <gtk/gtkenums.h>
-
-/* Not needed, retained for compatibility -Yosh */
-#include <gtk/gtkobject.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GtkTextIter GtkTextIter;
-typedef struct _GtkTextTagTable GtkTextTagTable;
-
-typedef struct _GtkTextAttributes GtkTextAttributes;
-
-#define GTK_TYPE_TEXT_TAG            (gtk_text_tag_get_type ())
-#define GTK_TEXT_TAG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TEXT_TAG, GtkTextTag))
-#define GTK_TEXT_TAG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_TAG, GtkTextTagClass))
-#define GTK_IS_TEXT_TAG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TEXT_TAG))
-#define GTK_IS_TEXT_TAG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TEXT_TAG))
-#define GTK_TEXT_TAG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TEXT_TAG, GtkTextTagClass))
-
-#define GTK_TYPE_TEXT_ATTRIBUTES     (gtk_text_attributes_get_type ())
-
-typedef struct _GtkTextTag GtkTextTag;
-typedef struct _GtkTextTagClass GtkTextTagClass;
-
-struct _GtkTextTag
-{
-  GObject parent_instance;
-
-  GtkTextTagTable *table;
-
-  char *name;                   /* Name of this tag.  This field is actually
-                                 * a pointer to the key from the entry in
-                                 * tkxt->tagTable, so it needn't be freed
-                                 * explicitly. */
-  int priority;         /* Priority of this tag within widget.  0
-                         * means lowest priority.  Exactly one tag
-                         * has each integer value between 0 and
-                         * numTags-1. */
-  /*
-   * Information for displaying text with this tag.  The information
-   * belows acts as an override on information specified by lower-priority
-   * tags.  If no value is specified, then the next-lower-priority tag
-   * on the text determins the value.  The text widget itself provides
-   * defaults if no tag specifies an override.
-   */
-
-  GtkTextAttributes *values;
-  
-  /* Flags for whether a given value is set; if a value is unset, then
-   * this tag does not affect it.
-   */
-  guint bg_color_set : 1;
-  guint bg_stipple_set : 1;
-  guint fg_color_set : 1;
-  guint scale_set : 1;
-  guint fg_stipple_set : 1;
-  guint justification_set : 1;
-  guint left_margin_set : 1;
-  guint indent_set : 1;
-  guint rise_set : 1;
-  guint strikethrough_set : 1;
-  guint right_margin_set : 1;
-  guint pixels_above_lines_set : 1;
-  guint pixels_below_lines_set : 1;
-  guint pixels_inside_wrap_set : 1;
-  guint tabs_set : 1;
-  guint underline_set : 1;
-  guint wrap_mode_set : 1;
-  guint bg_full_height_set : 1;
-  guint invisible_set : 1;
-  guint editable_set : 1;
-  guint language_set : 1;
-  guint pg_bg_color_set : 1;
-
-  /* Whether these margins accumulate or override */
-  guint accumulative_margin : 1;
-
-  guint pad1 : 1;
-};
-
-struct _GtkTextTagClass
-{
-  GObjectClass parent_class;
-
-  gboolean (* event) (GtkTextTag        *tag,
-                      GObject           *event_object, /* widget, canvas item, whatever */
-                      GdkEvent          *event,        /* the event itself */
-                      const GtkTextIter *iter);        /* location of event in buffer */
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType        gtk_text_tag_get_type     (void) G_GNUC_CONST;
-GtkTextTag  *gtk_text_tag_new          (const gchar       *name);
-gint         gtk_text_tag_get_priority (GtkTextTag        *tag);
-void         gtk_text_tag_set_priority (GtkTextTag        *tag,
-                                        gint               priority);
-gboolean     gtk_text_tag_event        (GtkTextTag        *tag,
-                                        GObject           *event_object,
-                                        GdkEvent          *event,
-                                        const GtkTextIter *iter);
-
-/*
- * Style object created by folding a set of tags together
- */
-
-typedef struct _GtkTextAppearance GtkTextAppearance;
-
-struct _GtkTextAppearance
-{
-  /*< public >*/
-  GdkColor bg_color;
-  GdkColor fg_color;
-  GdkBitmap *bg_stipple;
-  GdkBitmap *fg_stipple;
-
-  /* super/subscript rise, can be negative */
-  gint rise;
-
-  /*< private >*/
-  /* I'm not sure this can really be used without breaking some things
-   * an app might do :-/
-   */
-  gpointer padding1;
-
-  /*< public >*/
-  guint underline : 4;          /* PangoUnderline */
-  guint strikethrough : 1;
-
-  /* Whether to use background-related values; this is irrelevant for
-   * the values struct when in a tag, but is used for the composite
-   * values struct; it's true if any of the tags being composited
-   * had background stuff set.
-   */
-  guint draw_bg : 1;
-  
-  /* These are only used when we are actually laying out and rendering
-   * a paragraph; not when a GtkTextAppearance is part of a
-   * GtkTextAttributes.
-   */
-  guint inside_selection : 1;
-  guint is_text : 1;
-
-  /*< private >*/
-  guint pad1 : 1;
-  guint pad2 : 1;
-  guint pad3 : 1;
-  guint pad4 : 1;
-};
-
-struct _GtkTextAttributes
-{
-  /*< private >*/
-  guint refcount;
-
-  /*< public >*/
-  GtkTextAppearance appearance;
-
-  GtkJustification justification;
-  GtkTextDirection direction;
-
-  /* Individual chunks of this can be set/unset as a group */
-  PangoFontDescription *font;
-
-  gdouble font_scale;
-  
-  gint left_margin;
-
-  gint indent;  
-
-  gint right_margin;
-
-  gint pixels_above_lines;
-
-  gint pixels_below_lines;
-
-  gint pixels_inside_wrap;
-
-  PangoTabArray *tabs;
-
-  GtkWrapMode wrap_mode;        /* How to handle wrap-around for this tag.
-                                 * Must be GTK_WRAPMODE_CHAR,
-                                 * GTK_WRAPMODE_NONE, GTK_WRAPMODE_WORD
-                                 */
-
-  PangoLanguage *language;
-
-  /*< private >*/
-  GdkColor *pg_bg_color;
-
-  /*< public >*/
-  /* hide the text  */
-  guint invisible : 1;
-
-  /* Background is fit to full line height rather than
-   * baseline +/- ascent/descent (font height)
-   */
-  guint bg_full_height : 1;
-
-  /* can edit this text */
-  guint editable : 1;
-
-  /* colors are allocated etc. */
-  guint realized : 1;
-
-  /*< private >*/
-  guint pad1 : 1;
-  guint pad2 : 1;
-  guint pad3 : 1;
-  guint pad4 : 1;
-};
-
-GtkTextAttributes* gtk_text_attributes_new         (void);
-GtkTextAttributes* gtk_text_attributes_copy        (GtkTextAttributes *src);
-void               gtk_text_attributes_copy_values (GtkTextAttributes *src,
-                                                    GtkTextAttributes *dest);
-void               gtk_text_attributes_unref       (GtkTextAttributes *values);
-GtkTextAttributes *gtk_text_attributes_ref         (GtkTextAttributes *values);
-
-GType              gtk_text_attributes_get_type    (void) G_GNUC_CONST;
-
-
-G_END_DECLS
-
-#endif
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktexttagtable.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktexttagtable.h
deleted file mode 100644
index 6582c7ec..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktexttagtable.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_TEXT_TAG_TABLE_H__
-#define __GTK_TEXT_TAG_TABLE_H__
-
-#include <gtk/gtktexttag.h>
-
-G_BEGIN_DECLS
-
-#include <gtk/gtktexttag.h>
-
-typedef void (* GtkTextTagTableForeach) (GtkTextTag *tag, gpointer data);
-
-#define GTK_TYPE_TEXT_TAG_TABLE            (gtk_text_tag_table_get_type ())
-#define GTK_TEXT_TAG_TABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TEXT_TAG_TABLE, GtkTextTagTable))
-#define GTK_TEXT_TAG_TABLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_TAG_TABLE, GtkTextTagTableClass))
-#define GTK_IS_TEXT_TAG_TABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TEXT_TAG_TABLE))
-#define GTK_IS_TEXT_TAG_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TEXT_TAG_TABLE))
-#define GTK_TEXT_TAG_TABLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TEXT_TAG_TABLE, GtkTextTagTableClass))
-
-typedef struct _GtkTextTagTableClass GtkTextTagTableClass;
-
-struct _GtkTextTagTable
-{
-  GObject parent_instance;
-
-  GHashTable *hash;
-  GSList *anonymous;
-  gint anon_count;
-
-  GSList *buffers;
-};
-
-struct _GtkTextTagTableClass
-{
-  GObjectClass parent_class;
-
-  void (* tag_changed) (GtkTextTagTable *table, GtkTextTag *tag, gboolean size_changed);
-  void (* tag_added) (GtkTextTagTable *table, GtkTextTag *tag);
-  void (* tag_removed) (GtkTextTagTable *table, GtkTextTag *tag);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType          gtk_text_tag_table_get_type (void) G_GNUC_CONST;
-
-GtkTextTagTable *gtk_text_tag_table_new      (void);
-void             gtk_text_tag_table_add      (GtkTextTagTable        *table,
-                                              GtkTextTag             *tag);
-void             gtk_text_tag_table_remove   (GtkTextTagTable        *table,
-                                              GtkTextTag             *tag);
-GtkTextTag      *gtk_text_tag_table_lookup   (GtkTextTagTable        *table,
-                                              const gchar            *name);
-void             gtk_text_tag_table_foreach  (GtkTextTagTable        *table,
-                                              GtkTextTagTableForeach  func,
-                                              gpointer                data);
-gint             gtk_text_tag_table_get_size (GtkTextTagTable        *table);
-
-
-/* INTERNAL private stuff - not even exported from the library on
- * many platforms
- */
-void _gtk_text_tag_table_add_buffer    (GtkTextTagTable *table,
-                                        gpointer         buffer);
-void _gtk_text_tag_table_remove_buffer (GtkTextTagTable *table,
-                                        gpointer         buffer);
-
-G_END_DECLS
-
-#endif
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextview.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextview.h
deleted file mode 100644
index d5223118..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktextview.h
+++ /dev/null
@@ -1,367 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtktextview.h 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.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __GTK_TEXT_VIEW_H__
-#define __GTK_TEXT_VIEW_H__
-
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtkimcontext.h>
-#include <gtk/gtktextbuffer.h>
-#include <gtk/gtkmenu.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_TEXT_VIEW             (gtk_text_view_get_type ())
-#define GTK_TEXT_VIEW(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TEXT_VIEW, GtkTextView))
-#define GTK_TEXT_VIEW_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_VIEW, GtkTextViewClass))
-#define GTK_IS_TEXT_VIEW(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TEXT_VIEW))
-#define GTK_IS_TEXT_VIEW_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TEXT_VIEW))
-#define GTK_TEXT_VIEW_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TEXT_VIEW, GtkTextViewClass))
-
-typedef enum
-{
-  GTK_TEXT_WINDOW_PRIVATE,
-  GTK_TEXT_WINDOW_WIDGET,
-  GTK_TEXT_WINDOW_TEXT,
-  GTK_TEXT_WINDOW_LEFT,
-  GTK_TEXT_WINDOW_RIGHT,
-  GTK_TEXT_WINDOW_TOP,
-  GTK_TEXT_WINDOW_BOTTOM
-} GtkTextWindowType;
-
-#define GTK_TEXT_VIEW_PRIORITY_VALIDATE (GDK_PRIORITY_REDRAW + 5)
-
-typedef struct _GtkTextView GtkTextView;
-typedef struct _GtkTextViewClass GtkTextViewClass;
-
-/* Internal private types. */
-typedef struct _GtkTextWindow GtkTextWindow;
-typedef struct _GtkTextPendingScroll GtkTextPendingScroll;
-
-struct _GtkTextView
-{
-  GtkContainer parent_instance;
-
-  struct _GtkTextLayout *layout;
-  GtkTextBuffer *buffer;
-
-  guint selection_drag_handler;
-  guint scroll_timeout;
-
-  /* Default style settings */
-  gint pixels_above_lines;
-  gint pixels_below_lines;
-  gint pixels_inside_wrap;
-  GtkWrapMode wrap_mode;  
-  GtkJustification justify;
-  gint left_margin;
-  gint right_margin;
-  gint indent;
-  PangoTabArray *tabs;
-  guint editable : 1;
-
-  
-  
-  guint overwrite_mode : 1;
-  guint cursor_visible : 1;
-
-  /* if we have reset the IM since the last character entered */  
-  guint  need_im_reset : 1;	
-
-  guint accepts_tab : 1;
-  
-  guint width_changed : 1;
-  
-  /* debug flag - means that we've validated onscreen since the
-   * last "invalidate" signal from the layout
-   */
-  guint onscreen_validated : 1;
-
-  guint mouse_cursor_obscured : 1;
-
-  GtkTextWindow *text_window;
-  GtkTextWindow *left_window;
-  GtkTextWindow *right_window;
-  GtkTextWindow *top_window;
-  GtkTextWindow *bottom_window;
-
-  GtkAdjustment *hadjustment;
-  GtkAdjustment *vadjustment;
-
-  gint xoffset;                 /* Offsets between widget coordinates and buffer coordinates */
-  gint yoffset;
-  gint width;                   /* Width and height of the buffer */
-  gint height;
-
-  /* The virtual cursor position is normally the same as the
-   * actual (strong) cursor position, except in two circumstances:
-   *
-   * a) When the cursor is moved vertically with the keyboard
-   * b) When the text view is scrolled with the keyboard
-   *
-   * In case a), virtual_cursor_x is preserved, but not virtual_cursor_y
-   * In case b), both virtual_cursor_x and virtual_cursor_y are preserved.
-   */
-  gint virtual_cursor_x;           /* -1 means use actual cursor position */
-  gint virtual_cursor_y;           /* -1 means use actual cursor position */
-
-  GtkTextMark *first_para_mark;    /* Mark at the beginning of the first onscreen paragraph */
-  gint first_para_pixels;          /* Offset of top of screen in the first onscreen paragraph */
-
-  GtkTextMark *dnd_mark;
-  guint blink_timeout;
-
-  guint first_validate_idle;            /* Idle to revalidate onscreen portion, runs before resize */
-  guint incremental_validate_idle;      /* Idle to revalidate offscreen portions, runs after redraw */
-
-  GtkIMContext *im_context;
-  GtkWidget *popup_menu;
-
-  gint drag_start_x;
-  gint drag_start_y;
-
-  GSList *children;
-
-  GtkTextPendingScroll *pending_scroll;
-
-  gint pending_place_cursor_button;
-};
-
-struct _GtkTextViewClass
-{
-  GtkContainerClass parent_class;
-
-  void (* set_scroll_adjustments)   (GtkTextView    *text_view,
-                                     GtkAdjustment  *hadjustment,
-                                     GtkAdjustment  *vadjustment);
-
-  void (* populate_popup)           (GtkTextView    *text_view,
-                                     GtkMenu        *menu);
-  
-  /* These are all RUN_ACTION signals for keybindings */
-
-  /* move insertion point */
-  void (* move_cursor) (GtkTextView    *text_view,
-                        GtkMovementStep step,
-                        gint            count,
-                        gboolean        extend_selection);
-
-  /* FIXME should be deprecated in favor of adding GTK_MOVEMENT_HORIZONTAL_PAGES
-   * or something in GTK 2.2, was put in to avoid adding enum values during
-   * the freeze.
-   */
-  void (* page_horizontally) (GtkTextView *text_view,
-                              gint         count,
-                              gboolean     extend_selection);
-  
-  /* move the "anchor" (what Emacs calls the mark) to the cursor position */
-  void (* set_anchor)  (GtkTextView    *text_view);
-
-  /* Edits */
-  void (* insert_at_cursor)      (GtkTextView *text_view,
-                                  const gchar *str);
-  void (* delete_from_cursor)    (GtkTextView  *text_view,
-                                  GtkDeleteType type,
-                                  gint          count);
-  void (* backspace)             (GtkTextView *text_view);
-
-  /* cut copy paste */
-  void (* cut_clipboard)   (GtkTextView *text_view);
-  void (* copy_clipboard)  (GtkTextView *text_view);
-  void (* paste_clipboard) (GtkTextView *text_view);
-  /* overwrite */
-  void (* toggle_overwrite) (GtkTextView *text_view);
-
-  /* as of GTK+ 2.12 the "move-focus" signal has been moved to GtkWidget,
-   * so this is merley a virtual function now. Overriding it in subclasses
-   * continues to work though.
-   */
-  void (* move_focus)       (GtkTextView     *text_view,
-                             GtkDirectionType direction);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-  void (*_gtk_reserved5) (void);
-  void (*_gtk_reserved6) (void);
-  void (*_gtk_reserved7) (void);
-};
-
-GType          gtk_text_view_get_type              (void) G_GNUC_CONST;
-GtkWidget *    gtk_text_view_new                   (void);
-GtkWidget *    gtk_text_view_new_with_buffer       (GtkTextBuffer *buffer);
-void           gtk_text_view_set_buffer            (GtkTextView   *text_view,
-                                                    GtkTextBuffer *buffer);
-GtkTextBuffer *gtk_text_view_get_buffer            (GtkTextView   *text_view);
-gboolean       gtk_text_view_scroll_to_iter        (GtkTextView   *text_view,
-                                                    GtkTextIter   *iter,
-                                                    gdouble        within_margin,
-                                                    gboolean       use_align,
-                                                    gdouble        xalign,
-                                                    gdouble        yalign);
-void           gtk_text_view_scroll_to_mark        (GtkTextView   *text_view,
-                                                    GtkTextMark   *mark,
-                                                    gdouble        within_margin,
-                                                    gboolean       use_align,
-                                                    gdouble        xalign,
-                                                    gdouble        yalign);
-void           gtk_text_view_scroll_mark_onscreen  (GtkTextView   *text_view,
-                                                    GtkTextMark   *mark);
-gboolean       gtk_text_view_move_mark_onscreen    (GtkTextView   *text_view,
-                                                    GtkTextMark   *mark);
-gboolean       gtk_text_view_place_cursor_onscreen (GtkTextView   *text_view);
-
-void           gtk_text_view_get_visible_rect      (GtkTextView   *text_view,
-                                                    GdkRectangle  *visible_rect);
-void           gtk_text_view_set_cursor_visible    (GtkTextView   *text_view,
-                                                    gboolean       setting);
-gboolean       gtk_text_view_get_cursor_visible    (GtkTextView   *text_view);
-
-void           gtk_text_view_get_iter_location     (GtkTextView   *text_view,
-                                                    const GtkTextIter *iter,
-                                                    GdkRectangle  *location);
-void           gtk_text_view_get_iter_at_location  (GtkTextView   *text_view,
-                                                    GtkTextIter   *iter,
-                                                    gint           x,
-                                                    gint           y);
-void           gtk_text_view_get_iter_at_position  (GtkTextView   *text_view,
-                                                    GtkTextIter   *iter,
-						    gint          *trailing,
-                                                    gint           x,
-                                                    gint           y);
-void           gtk_text_view_get_line_yrange       (GtkTextView       *text_view,
-                                                    const GtkTextIter *iter,
-                                                    gint              *y,
-                                                    gint              *height);
-
-void           gtk_text_view_get_line_at_y         (GtkTextView       *text_view,
-                                                    GtkTextIter       *target_iter,
-                                                    gint               y,
-                                                    gint              *line_top);
-
-void gtk_text_view_buffer_to_window_coords (GtkTextView       *text_view,
-                                            GtkTextWindowType  win,
-                                            gint               buffer_x,
-                                            gint               buffer_y,
-                                            gint              *window_x,
-                                            gint              *window_y);
-void gtk_text_view_window_to_buffer_coords (GtkTextView       *text_view,
-                                            GtkTextWindowType  win,
-                                            gint               window_x,
-                                            gint               window_y,
-                                            gint              *buffer_x,
-                                            gint              *buffer_y);
-
-GdkWindow*        gtk_text_view_get_window      (GtkTextView       *text_view,
-                                                 GtkTextWindowType  win);
-GtkTextWindowType gtk_text_view_get_window_type (GtkTextView       *text_view,
-                                                 GdkWindow         *window);
-
-void gtk_text_view_set_border_window_size (GtkTextView       *text_view,
-                                           GtkTextWindowType  type,
-                                           gint               size);
-gint gtk_text_view_get_border_window_size (GtkTextView       *text_view,
-					   GtkTextWindowType  type);
-
-gboolean gtk_text_view_forward_display_line           (GtkTextView       *text_view,
-                                                       GtkTextIter       *iter);
-gboolean gtk_text_view_backward_display_line          (GtkTextView       *text_view,
-                                                       GtkTextIter       *iter);
-gboolean gtk_text_view_forward_display_line_end       (GtkTextView       *text_view,
-                                                       GtkTextIter       *iter);
-gboolean gtk_text_view_backward_display_line_start    (GtkTextView       *text_view,
-                                                       GtkTextIter       *iter);
-gboolean gtk_text_view_starts_display_line            (GtkTextView       *text_view,
-                                                       const GtkTextIter *iter);
-gboolean gtk_text_view_move_visually                  (GtkTextView       *text_view,
-                                                       GtkTextIter       *iter,
-                                                       gint               count);
-
-/* Adding child widgets */
-void gtk_text_view_add_child_at_anchor (GtkTextView          *text_view,
-                                        GtkWidget            *child,
-                                        GtkTextChildAnchor   *anchor);
-
-void gtk_text_view_add_child_in_window (GtkTextView          *text_view,
-                                        GtkWidget            *child,
-                                        GtkTextWindowType     which_window,
-                                        /* window coordinates */
-                                        gint                  xpos,
-                                        gint                  ypos);
-
-void gtk_text_view_move_child          (GtkTextView          *text_view,
-                                        GtkWidget            *child,
-                                        /* window coordinates */
-                                        gint                  xpos,
-                                        gint                  ypos);
-
-/* Default style settings (fallbacks if no tag affects the property) */
-
-void             gtk_text_view_set_wrap_mode          (GtkTextView      *text_view,
-                                                       GtkWrapMode       wrap_mode);
-GtkWrapMode      gtk_text_view_get_wrap_mode          (GtkTextView      *text_view);
-void             gtk_text_view_set_editable           (GtkTextView      *text_view,
-                                                       gboolean          setting);
-gboolean         gtk_text_view_get_editable           (GtkTextView      *text_view);
-void             gtk_text_view_set_overwrite          (GtkTextView      *text_view,
-						       gboolean          overwrite);
-gboolean         gtk_text_view_get_overwrite          (GtkTextView      *text_view);
-void		 gtk_text_view_set_accepts_tab        (GtkTextView	*text_view,
-						       gboolean		 accepts_tab);
-gboolean	 gtk_text_view_get_accepts_tab        (GtkTextView	*text_view);
-void             gtk_text_view_set_pixels_above_lines (GtkTextView      *text_view,
-                                                       gint              pixels_above_lines);
-gint             gtk_text_view_get_pixels_above_lines (GtkTextView      *text_view);
-void             gtk_text_view_set_pixels_below_lines (GtkTextView      *text_view,
-                                                       gint              pixels_below_lines);
-gint             gtk_text_view_get_pixels_below_lines (GtkTextView      *text_view);
-void             gtk_text_view_set_pixels_inside_wrap (GtkTextView      *text_view,
-                                                       gint              pixels_inside_wrap);
-gint             gtk_text_view_get_pixels_inside_wrap (GtkTextView      *text_view);
-void             gtk_text_view_set_justification      (GtkTextView      *text_view,
-                                                       GtkJustification  justification);
-GtkJustification gtk_text_view_get_justification      (GtkTextView      *text_view);
-void             gtk_text_view_set_left_margin        (GtkTextView      *text_view,
-                                                       gint              left_margin);
-gint             gtk_text_view_get_left_margin        (GtkTextView      *text_view);
-void             gtk_text_view_set_right_margin       (GtkTextView      *text_view,
-                                                       gint              right_margin);
-gint             gtk_text_view_get_right_margin       (GtkTextView      *text_view);
-void             gtk_text_view_set_indent             (GtkTextView      *text_view,
-                                                       gint              indent);
-gint             gtk_text_view_get_indent             (GtkTextView      *text_view);
-void             gtk_text_view_set_tabs               (GtkTextView      *text_view,
-                                                       PangoTabArray    *tabs);
-PangoTabArray*   gtk_text_view_get_tabs               (GtkTextView      *text_view);
-
-/* note that the return value of this changes with the theme */
-GtkTextAttributes* gtk_text_view_get_default_attributes (GtkTextView    *text_view);
-
-G_END_DECLS
-
-#endif /* __GTK_TEXT_VIEW_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktipsquery.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktipsquery.h
deleted file mode 100644
index 2a09baed..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktipsquery.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * GtkQueryTips: Query onscreen widgets for their tooltips
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-#ifndef __GTK_TIPS_QUERY_H__
-#define __GTK_TIPS_QUERY_H__
-
-
-#include <gtk/gtklabel.h>
-
-
-G_BEGIN_DECLS
-
-/* --- type macros --- */
-#define	GTK_TYPE_TIPS_QUERY		(gtk_tips_query_get_type ())
-#define GTK_TIPS_QUERY(obj)		(GTK_CHECK_CAST ((obj), GTK_TYPE_TIPS_QUERY, GtkTipsQuery))
-#define GTK_TIPS_QUERY_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TIPS_QUERY, GtkTipsQueryClass))
-#define GTK_IS_TIPS_QUERY(obj)		(GTK_CHECK_TYPE ((obj), GTK_TYPE_TIPS_QUERY))
-#define GTK_IS_TIPS_QUERY_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TIPS_QUERY))
-#define GTK_TIPS_QUERY_GET_CLASS(obj)   (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TIPS_QUERY, GtkTipsQueryClass))
-
-
-/* --- typedefs --- */
-typedef	struct	_GtkTipsQuery		GtkTipsQuery;
-typedef	struct	_GtkTipsQueryClass	GtkTipsQueryClass;
-
-
-/* --- structures --- */
-struct	_GtkTipsQuery
-{
-  GtkLabel	label;
-
-  guint		emit_always : 1;
-  guint		in_query : 1;
-  gchar		*label_inactive;
-  gchar		*label_no_tip;
-
-  GtkWidget	*caller;
-  GtkWidget	*last_crossed;
-
-  GdkCursor	*query_cursor;
-};
-
-struct	_GtkTipsQueryClass
-{
-  GtkLabelClass			parent_class;
-
-  void	(*start_query)		(GtkTipsQuery	*tips_query);
-  void	(*stop_query)		(GtkTipsQuery	*tips_query);
-  void	(*widget_entered)	(GtkTipsQuery	*tips_query,
-				 GtkWidget	*widget,
-				 const gchar	*tip_text,
-				 const gchar	*tip_private);
-  gint	(*widget_selected)	(GtkTipsQuery	*tips_query,
-				 GtkWidget	*widget,
-				 const gchar	*tip_text,
-				 const gchar	*tip_private,
-				 GdkEventButton	*event);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-/* --- prototypes --- */
-GtkType		gtk_tips_query_get_type		(void) G_GNUC_CONST;
-GtkWidget*	gtk_tips_query_new		(void);
-void		gtk_tips_query_start_query	(GtkTipsQuery	*tips_query);
-void		gtk_tips_query_stop_query	(GtkTipsQuery	*tips_query);
-void		gtk_tips_query_set_caller	(GtkTipsQuery	*tips_query,
-						 GtkWidget	*caller);
-void		gtk_tips_query_set_labels 	(GtkTipsQuery   *tips_query,
-						 const gchar    *label_inactive,
-						 const gchar    *label_no_tip);
-     
-G_END_DECLS
-
-#endif	/* __GTK_TIPS_QUERY_H__ */
-
-#endif /* GTK_DISABLE_DEPRECATED */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktoggleaction.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktoggleaction.h
deleted file mode 100644
index 6325c35b..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktoggleaction.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * GTK - The GIMP Toolkit
- * Copyright (C) 1998, 1999 Red Hat, Inc.
- * All rights reserved.
- *
- * 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 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.
- */
-
-/*
- * Author: James Henstridge <james@daa.com.au>
- *
- * Modified by the GTK+ Team and others 2003.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-#ifndef __GTK_TOGGLE_ACTION_H__
-#define __GTK_TOGGLE_ACTION_H__
-
-#include <gtk/gtkaction.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_TOGGLE_ACTION            (gtk_toggle_action_get_type ())
-#define GTK_TOGGLE_ACTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOGGLE_ACTION, GtkToggleAction))
-#define GTK_TOGGLE_ACTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOGGLE_ACTION, GtkToggleActionClass))
-#define GTK_IS_TOGGLE_ACTION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TOGGLE_ACTION))
-#define GTK_IS_TOGGLE_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TOGGLE_ACTION))
-#define GTK_TOGGLE_ACTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_TOGGLE_ACTION, GtkToggleActionClass))
-
-typedef struct _GtkToggleAction        GtkToggleAction;
-typedef struct _GtkToggleActionPrivate GtkToggleActionPrivate;
-typedef struct _GtkToggleActionClass   GtkToggleActionClass;
-
-struct _GtkToggleAction
-{
-  GtkAction parent;
-
-  /*< private >*/
-
-  GtkToggleActionPrivate *private_data;
-};
-
-struct _GtkToggleActionClass
-{
-  GtkActionClass parent_class;
-
-  void (* toggled) (GtkToggleAction *action);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType            gtk_toggle_action_get_type          (void) G_GNUC_CONST;
-GtkToggleAction *gtk_toggle_action_new               (const gchar     *name,
-                                                      const gchar     *label,
-                                                      const gchar     *tooltip,
-                                                      const gchar     *stock_id);
-void             gtk_toggle_action_toggled           (GtkToggleAction *action);
-void             gtk_toggle_action_set_active        (GtkToggleAction *action,
-                                                      gboolean         is_active);
-gboolean         gtk_toggle_action_get_active        (GtkToggleAction *action);
-void             gtk_toggle_action_set_draw_as_radio (GtkToggleAction *action,
-                                                      gboolean         draw_as_radio);
-gboolean         gtk_toggle_action_get_draw_as_radio (GtkToggleAction *action);
-
-
-G_END_DECLS
-
-#endif  /* __GTK_TOGGLE_ACTION_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktogglebutton.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktogglebutton.h
deleted file mode 100644
index c5bb68e3..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktogglebutton.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_TOGGLE_BUTTON_H__
-#define __GTK_TOGGLE_BUTTON_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkbutton.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_TOGGLE_BUTTON                  (gtk_toggle_button_get_type ())
-#define GTK_TOGGLE_BUTTON(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOGGLE_BUTTON, GtkToggleButton))
-#define GTK_TOGGLE_BUTTON_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOGGLE_BUTTON, GtkToggleButtonClass))
-#define GTK_IS_TOGGLE_BUTTON(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TOGGLE_BUTTON))
-#define GTK_IS_TOGGLE_BUTTON_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TOGGLE_BUTTON))
-#define GTK_TOGGLE_BUTTON_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TOGGLE_BUTTON, GtkToggleButtonClass))
-
-
-typedef struct _GtkToggleButton       GtkToggleButton;
-typedef struct _GtkToggleButtonClass  GtkToggleButtonClass;
-
-struct _GtkToggleButton
-{
-  GtkButton button;
-
-  guint active : 1;
-  guint draw_indicator : 1;
-  guint inconsistent : 1;
-};
-
-struct _GtkToggleButtonClass
-{
-  GtkButtonClass parent_class;
-
-  void (* toggled) (GtkToggleButton *toggle_button);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType      gtk_toggle_button_get_type          (void) G_GNUC_CONST;
-
-GtkWidget* gtk_toggle_button_new               (void);
-GtkWidget* gtk_toggle_button_new_with_label    (const gchar     *label);
-GtkWidget* gtk_toggle_button_new_with_mnemonic (const gchar     *label);
-void       gtk_toggle_button_set_mode          (GtkToggleButton *toggle_button,
-                                                gboolean         draw_indicator);
-gboolean   gtk_toggle_button_get_mode          (GtkToggleButton *toggle_button);
-void       gtk_toggle_button_set_active        (GtkToggleButton *toggle_button,
-                                                gboolean         is_active);
-gboolean   gtk_toggle_button_get_active        (GtkToggleButton *toggle_button);
-void       gtk_toggle_button_toggled           (GtkToggleButton *toggle_button);
-void       gtk_toggle_button_set_inconsistent  (GtkToggleButton *toggle_button,
-                                                gboolean         setting);
-gboolean   gtk_toggle_button_get_inconsistent  (GtkToggleButton *toggle_button);
-
-
-#ifndef GTK_DISABLE_DEPRECATED
-#define	gtk_toggle_button_set_state		gtk_toggle_button_set_active
-#endif /* GTK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GTK_TOGGLE_BUTTON_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktoggletoolbutton.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktoggletoolbutton.h
deleted file mode 100644
index 1d747d5a..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktoggletoolbutton.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* gtktoggletoolbutton.h
- *
- * Copyright (C) 2002 Anders Carlsson <andersca@gnome.org>
- * Copyright (C) 2002 James Henstridge <james@daa.com.au>
- * Copyright (C) 2003 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 __GTK_TOGGLE_TOOL_BUTTON_H__
-#define __GTK_TOGGLE_TOOL_BUTTON_H__
-
-#include "gtktoolbutton.h"
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_TOGGLE_TOOL_BUTTON             (gtk_toggle_tool_button_get_type ())
-#define GTK_TOGGLE_TOOL_BUTTON(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOGGLE_TOOL_BUTTON, GtkToggleToolButton))
-#define GTK_TOGGLE_TOOL_BUTTON_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOGGLE_TOOL_BUTTON, GtkToggleToolButtonClass))
-#define GTK_IS_TOGGLE_TOOL_BUTTON(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TOGGLE_TOOL_BUTTON))
-#define GTK_IS_TOGGLE_TOOL_BUTTON_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TOGGLE_TOOL_BUTTON))
-#define GTK_TOGGLE_TOOL_BUTTON_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_TOGGLE_TOOL_BUTTON, GtkToggleToolButtonClass))
-
-typedef struct _GtkToggleToolButton        GtkToggleToolButton;
-typedef struct _GtkToggleToolButtonClass   GtkToggleToolButtonClass;
-typedef struct _GtkToggleToolButtonPrivate GtkToggleToolButtonPrivate;
-
-struct _GtkToggleToolButton
-{
-  GtkToolButton parent;
-
-  /*< private >*/
-  GtkToggleToolButtonPrivate *priv;
-};
-
-struct _GtkToggleToolButtonClass
-{
-  GtkToolButtonClass parent_class;
-
-  /* signal */
-  void (* toggled) (GtkToggleToolButton *button);
-
-  /* Padding for future expansion */
-  void (* _gtk_reserved1) (void);
-  void (* _gtk_reserved2) (void);
-  void (* _gtk_reserved3) (void);
-  void (* _gtk_reserved4) (void);
-};
-
-GType        gtk_toggle_tool_button_get_type       (void) G_GNUC_CONST;
-GtkToolItem *gtk_toggle_tool_button_new            (void);
-GtkToolItem *gtk_toggle_tool_button_new_from_stock (const gchar *stock_id);
-
-void         gtk_toggle_tool_button_set_active     (GtkToggleToolButton *button,
-						    gboolean             is_active);
-gboolean     gtk_toggle_tool_button_get_active     (GtkToggleToolButton *button);
-
-G_END_DECLS
-
-#endif /* __GTK_TOGGLE_TOOL_BUTTON_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktoolbar.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktoolbar.h
deleted file mode 100644
index dbe72a81..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktoolbar.h
+++ /dev/null
@@ -1,278 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- * GtkToolbar copyright (C) Federico Mena
- *
- * Copyright (C) 2002 Anders Carlsson <andersca@gnome.org>
- * Copyright (C) 2002 James Henstridge <james@daa.com.au>
- * Copyright (C) 2003 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.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_TOOLBAR_H__
-#define __GTK_TOOLBAR_H__
-
-#include <gdk/gdk.h>
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtkenums.h>
-#include <gtk/gtktooltips.h>
-
-#include "gtktoolitem.h"
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-/* Not needed, retained for compatibility -Yosh */
-#include <gtk/gtkpixmap.h>
-#include <gtk/gtksignal.h>
-
-#endif /* GTK_DISABLE_DEPRECATED */
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_TOOLBAR            (gtk_toolbar_get_type ())
-#define GTK_TOOLBAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOOLBAR, GtkToolbar))
-#define GTK_TOOLBAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOOLBAR, GtkToolbarClass))
-#define GTK_IS_TOOLBAR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TOOLBAR))
-#define GTK_IS_TOOLBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TOOLBAR))
-#define GTK_TOOLBAR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TOOLBAR, GtkToolbarClass))
-
-#ifndef GTK_DISABLE_DEPRECATED
-typedef enum
-{
-  GTK_TOOLBAR_CHILD_SPACE,
-  GTK_TOOLBAR_CHILD_BUTTON,
-  GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
-  GTK_TOOLBAR_CHILD_RADIOBUTTON,
-  GTK_TOOLBAR_CHILD_WIDGET
-} GtkToolbarChildType;
-
-typedef struct _GtkToolbarChild	     GtkToolbarChild;
-
-struct _GtkToolbarChild
-{
-  GtkToolbarChildType type;
-  GtkWidget *widget;
-  GtkWidget *icon;
-  GtkWidget *label;
-};
-
-#endif /* GTK_DISABLE_DEPRECATED */
-
-typedef enum
-{
-  GTK_TOOLBAR_SPACE_EMPTY,
-  GTK_TOOLBAR_SPACE_LINE
-} GtkToolbarSpaceStyle;
-
-typedef struct _GtkToolbar           GtkToolbar;
-typedef struct _GtkToolbarClass      GtkToolbarClass;
-typedef struct _GtkToolbarPrivate    GtkToolbarPrivate;
-
-struct _GtkToolbar
-{
-  GtkContainer container;
-
-  /*< public >*/
-  gint             num_children;
-  GList           *children;
-  GtkOrientation   orientation;
-  GtkToolbarStyle  style;
-  GtkIconSize      icon_size;
-  
-#ifndef GTK_DISABLE_DEPRECATED
-  GtkTooltips     *tooltips;
-#else
-  gpointer         _tooltips;
-#endif
-  
-  /*< private >*/
-  gint             button_maxw;		/* maximum width of homogeneous children */
-  gint             button_maxh;		/* maximum height of homogeneous children */
-
-  guint            _gtk_reserved1;
-  guint            _gtk_reserved2;
-
-  guint            style_set : 1;
-  guint            icon_size_set : 1;
-};
-
-struct _GtkToolbarClass
-{
-  GtkContainerClass parent_class;
-  
-  /* signals */
-  void     (* orientation_changed) (GtkToolbar       *toolbar,
-				    GtkOrientation    orientation);
-  void     (* style_changed)       (GtkToolbar       *toolbar,
-				    GtkToolbarStyle   style);
-  gboolean (* popup_context_menu)  (GtkToolbar       *toolbar,
-				    gint              x,
-				    gint              y,
-				    gint              button_number);
-  
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-};
-
-GType           gtk_toolbar_get_type         (void) G_GNUC_CONST;
-GtkWidget*      gtk_toolbar_new                     (void);
-void            gtk_toolbar_insert                  (GtkToolbar      *toolbar,
-						     GtkToolItem     *item,
-						     gint             pos);
-gint            gtk_toolbar_get_item_index          (GtkToolbar      *toolbar,
-						     GtkToolItem     *item);
-gint            gtk_toolbar_get_n_items             (GtkToolbar      *toolbar);
-GtkToolItem *   gtk_toolbar_get_nth_item            (GtkToolbar      *toolbar,
-						     gint             n);
-gboolean        gtk_toolbar_get_show_arrow          (GtkToolbar      *toolbar);
-void            gtk_toolbar_set_show_arrow          (GtkToolbar      *toolbar,
-						     gboolean         show_arrow);
-GtkOrientation  gtk_toolbar_get_orientation         (GtkToolbar      *toolbar);
-void            gtk_toolbar_set_orientation         (GtkToolbar      *toolbar,
-						     GtkOrientation   orientation);
-gboolean        gtk_toolbar_get_tooltips            (GtkToolbar      *toolbar);
-void            gtk_toolbar_set_tooltips            (GtkToolbar      *toolbar,
-						     gboolean         enable);
-GtkToolbarStyle gtk_toolbar_get_style               (GtkToolbar      *toolbar);
-void            gtk_toolbar_set_style               (GtkToolbar      *toolbar,
-						     GtkToolbarStyle  style);
-void            gtk_toolbar_unset_style             (GtkToolbar      *toolbar);
-GtkIconSize     gtk_toolbar_get_icon_size           (GtkToolbar      *toolbar);
-GtkReliefStyle  gtk_toolbar_get_relief_style        (GtkToolbar      *toolbar);
-gint            gtk_toolbar_get_drop_index          (GtkToolbar      *toolbar,
-						     gint             x,
-						     gint             y);
-void            gtk_toolbar_set_drop_highlight_item (GtkToolbar      *toolbar,
-						     GtkToolItem     *tool_item,
-						     gint             index_);
-
-/* internal functions */
-gchar *         _gtk_toolbar_elide_underscores      (const gchar     *original);
-void            _gtk_toolbar_paint_space_line       (GtkWidget       *widget,
-						     GtkToolbar      *toolbar,
-						     GdkRectangle    *area,
-						     GtkAllocation   *allocation);
-gint            _gtk_toolbar_get_default_space_size (void);
-void            _gtk_toolbar_rebuild_menu           (GtkToolbar      *toolbar);
-
-
-void       gtk_toolbar_set_icon_size   (GtkToolbar      *toolbar,
-				        GtkIconSize      icon_size);
-void       gtk_toolbar_unset_icon_size (GtkToolbar      *toolbar);
-
-#ifndef GTK_DISABLE_DEPRECATED
-/* Simple button items */
-GtkWidget* gtk_toolbar_append_item   (GtkToolbar      *toolbar,
-				      const char      *text,
-				      const char      *tooltip_text,
-				      const char      *tooltip_private_text,
-				      GtkWidget       *icon,
-				      GtkSignalFunc    callback,
-				      gpointer         user_data);
-GtkWidget* gtk_toolbar_prepend_item  (GtkToolbar      *toolbar,
-				      const char      *text,
-				      const char      *tooltip_text,
-				      const char      *tooltip_private_text,
-				      GtkWidget       *icon,
-				      GtkSignalFunc    callback,
-				      gpointer         user_data);
-GtkWidget* gtk_toolbar_insert_item   (GtkToolbar      *toolbar,
-				      const char      *text,
-				      const char      *tooltip_text,
-				      const char      *tooltip_private_text,
-				      GtkWidget       *icon,
-				      GtkSignalFunc    callback,
-				      gpointer         user_data,
-				      gint             position);
-
-/* Stock Items */
-GtkWidget* gtk_toolbar_insert_stock    (GtkToolbar      *toolbar,
-					const gchar     *stock_id,
-					const char      *tooltip_text,
-					const char      *tooltip_private_text,
-					GtkSignalFunc    callback,
-					gpointer         user_data,
-					gint             position);
-
-/* Space Items */
-void       gtk_toolbar_append_space    (GtkToolbar      *toolbar);
-void       gtk_toolbar_prepend_space   (GtkToolbar      *toolbar);
-void       gtk_toolbar_insert_space    (GtkToolbar      *toolbar,
-					gint             position);
-void       gtk_toolbar_remove_space    (GtkToolbar      *toolbar,
-                                        gint             position);
-/* Any element type */
-GtkWidget* gtk_toolbar_append_element  (GtkToolbar      *toolbar,
-					GtkToolbarChildType type,
-					GtkWidget       *widget,
-					const char      *text,
-					const char      *tooltip_text,
-					const char      *tooltip_private_text,
-					GtkWidget       *icon,
-					GtkSignalFunc    callback,
-					gpointer         user_data);
-
-GtkWidget* gtk_toolbar_prepend_element (GtkToolbar      *toolbar,
-					GtkToolbarChildType type,
-					GtkWidget       *widget,
-					const char      *text,
-					const char      *tooltip_text,
-					const char      *tooltip_private_text,
-					GtkWidget       *icon,
-					GtkSignalFunc    callback,
-					gpointer         user_data);
-
-GtkWidget* gtk_toolbar_insert_element  (GtkToolbar      *toolbar,
-					GtkToolbarChildType type,
-					GtkWidget       *widget,
-					const char      *text,
-					const char      *tooltip_text,
-					const char      *tooltip_private_text,
-					GtkWidget       *icon,
-					GtkSignalFunc    callback,
-					gpointer         user_data,
-					gint             position);
-
-/* Generic Widgets */
-void       gtk_toolbar_append_widget   (GtkToolbar      *toolbar,
-					GtkWidget       *widget,
-					const char      *tooltip_text,
-					const char      *tooltip_private_text);
-void       gtk_toolbar_prepend_widget  (GtkToolbar      *toolbar,
-					GtkWidget       *widget,
-					const char      *tooltip_text,
-					const char	*tooltip_private_text);
-void       gtk_toolbar_insert_widget   (GtkToolbar      *toolbar,
-					GtkWidget       *widget,
-					const char      *tooltip_text,
-					const char      *tooltip_private_text,
-					gint             position);
-
-#endif /* GTK_DISABLE_DEPRECATED */
-
-
-G_END_DECLS
-
-#endif /* __GTK_TOOLBAR_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktoolbutton.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktoolbutton.h
deleted file mode 100644
index b7329a02..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktoolbutton.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* gtktoolbutton.h
- *
- * Copyright (C) 2002 Anders Carlsson <andersca@gnome.org>
- * Copyright (C) 2002 James Henstridge <james@daa.com.au>
- * Copyright (C) 2003 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 __GTK_TOOL_BUTTON_H__
-#define __GTK_TOOL_BUTTON_H__
-
-#include "gtktoolitem.h"
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_TOOL_BUTTON            (gtk_tool_button_get_type ())
-#define GTK_TOOL_BUTTON(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOOL_BUTTON, GtkToolButton))
-#define GTK_TOOL_BUTTON_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOOL_BUTTON, GtkToolButtonClass))
-#define GTK_IS_TOOL_BUTTON(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TOOL_BUTTON))
-#define GTK_IS_TOOL_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TOOL_BUTTON))
-#define GTK_TOOL_BUTTON_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_TOOL_BUTTON, GtkToolButtonClass))
-
-typedef struct _GtkToolButton        GtkToolButton;
-typedef struct _GtkToolButtonClass   GtkToolButtonClass;
-typedef struct _GtkToolButtonPrivate GtkToolButtonPrivate;
-
-struct _GtkToolButton
-{
-  GtkToolItem parent;
-
-  /*< private >*/
-  GtkToolButtonPrivate *priv;
-};
-
-struct _GtkToolButtonClass
-{
-  GtkToolItemClass parent_class;
- 
-  GType button_type;
-
-  /* signal */
-  void       (* clicked)             (GtkToolButton    *tool_item);
-
-  /* Padding for future expansion */
-  void (* _gtk_reserved1) (void);
-  void (* _gtk_reserved2) (void);
-  void (* _gtk_reserved3) (void);
-  void (* _gtk_reserved4) (void);
-};
-
-GType        gtk_tool_button_get_type       (void) G_GNUC_CONST;
-GtkToolItem *gtk_tool_button_new            (GtkWidget   *icon_widget,
-					     const gchar *label);
-GtkToolItem *gtk_tool_button_new_from_stock (const gchar *stock_id);
-
-void                  gtk_tool_button_set_label         (GtkToolButton *button,
-							 const gchar   *label);
-G_CONST_RETURN gchar *gtk_tool_button_get_label         (GtkToolButton *button);
-void                  gtk_tool_button_set_use_underline (GtkToolButton *button,
-							 gboolean       use_underline);
-gboolean              gtk_tool_button_get_use_underline (GtkToolButton *button);
-void                  gtk_tool_button_set_stock_id      (GtkToolButton *button,
-							 const gchar   *stock_id);
-G_CONST_RETURN gchar *gtk_tool_button_get_stock_id      (GtkToolButton *button);
-void                  gtk_tool_button_set_icon_name     (GtkToolButton *button,
-							 const gchar   *icon_name);
-G_CONST_RETURN gchar *gtk_tool_button_get_icon_name     (GtkToolButton *button);
-void                  gtk_tool_button_set_icon_widget   (GtkToolButton *button,
-							 GtkWidget     *icon_widget);
-GtkWidget *           gtk_tool_button_get_icon_widget   (GtkToolButton *button);
-void                  gtk_tool_button_set_label_widget  (GtkToolButton *button,
-							 GtkWidget     *label_widget);
-GtkWidget *           gtk_tool_button_get_label_widget  (GtkToolButton *button);
-
-								   
-/* internal function */
-GtkWidget *_gtk_tool_button_get_button (GtkToolButton *button);
-
-G_END_DECLS
-
-#endif /* __GTK_TOOL_BUTTON_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktoolitem.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktoolitem.h
deleted file mode 100644
index dac7c0f0..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktoolitem.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/* gtktoolitem.c
- *
- * Copyright (C) 2002 Anders Carlsson <andersca@gnome.org>
- * Copyright (C) 2002 James Henstridge <james@daa.com.au>
- * Copyright (C) 2003 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 __GTK_TOOL_ITEM_H__
-#define __GTK_TOOL_ITEM_H__
-
-#include <gtk/gtkbin.h>
-#include <gtk/gtktooltips.h>
-#include <gtk/gtkmenuitem.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_TOOL_ITEM            (gtk_tool_item_get_type ())
-#define GTK_TOOL_ITEM(o)              (G_TYPE_CHECK_INSTANCE_CAST ((o), GTK_TYPE_TOOL_ITEM, GtkToolItem))
-#define GTK_TOOL_ITEM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOOL_ITEM, GtkToolItemClass))
-#define GTK_IS_TOOL_ITEM(o)           (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTK_TYPE_TOOL_ITEM))
-#define GTK_IS_TOOL_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TOOL_ITEM))
-#define GTK_TOOL_ITEM_GET_CLASS(o)    (G_TYPE_INSTANCE_GET_CLASS((o), GTK_TYPE_TOOL_ITEM, GtkToolItemClass))
-
-typedef struct _GtkToolItem        GtkToolItem;
-typedef struct _GtkToolItemClass   GtkToolItemClass;
-typedef struct _GtkToolItemPrivate GtkToolItemPrivate;
-
-struct _GtkToolItem
-{
-  GtkBin parent;
-
-  /*< private >*/
-  GtkToolItemPrivate *priv;
-};
-
-struct _GtkToolItemClass
-{
-  GtkBinClass parent_class;
-
-  /* signals */
-  gboolean   (* create_menu_proxy)    (GtkToolItem *tool_item);
-  void       (* toolbar_reconfigured) (GtkToolItem *tool_item);
-#ifndef GTK_DISABLE_DEPRECATED
-  gboolean   (* set_tooltip)	      (GtkToolItem *tool_item,
-				       GtkTooltips *tooltips,
-				       const gchar *tip_text,
-				       const gchar *tip_private);
-#else
-  gpointer _set_tooltip;
-#endif
-
-  /* Padding for future expansion */
-  void (* _gtk_reserved1) (void);
-  void (* _gtk_reserved2) (void);
-  void (* _gtk_reserved3) (void);
-  void (* _gtk_reserved4) (void);
-};
-
-GType        gtk_tool_item_get_type (void) G_GNUC_CONST;
-GtkToolItem *gtk_tool_item_new      (void);
-
-void            gtk_tool_item_set_homogeneous          (GtkToolItem *tool_item,
-							gboolean     homogeneous);
-gboolean        gtk_tool_item_get_homogeneous          (GtkToolItem *tool_item);
-
-void            gtk_tool_item_set_expand               (GtkToolItem *tool_item,
-							gboolean     expand);
-gboolean        gtk_tool_item_get_expand               (GtkToolItem *tool_item);
-
-#ifndef GTK_DISABLE_DEPRECATED
-void            gtk_tool_item_set_tooltip              (GtkToolItem *tool_item,
-							GtkTooltips *tooltips,
-							const gchar *tip_text,
-							const gchar *tip_private);
-#endif /* GTK_DISABLE_DEPRECATED */
-void            gtk_tool_item_set_tooltip_text         (GtkToolItem *tool_item,
-							const gchar *text);
-void            gtk_tool_item_set_tooltip_markup       (GtkToolItem *tool_item,
-							const gchar *markup);
-
-void            gtk_tool_item_set_use_drag_window      (GtkToolItem *tool_item,
-							gboolean     use_drag_window);
-gboolean        gtk_tool_item_get_use_drag_window      (GtkToolItem *tool_item);
-
-void            gtk_tool_item_set_visible_horizontal   (GtkToolItem *tool_item,
-							gboolean     visible_horizontal);
-gboolean        gtk_tool_item_get_visible_horizontal   (GtkToolItem *tool_item);
-
-void            gtk_tool_item_set_visible_vertical     (GtkToolItem *tool_item,
-							gboolean     visible_vertical);
-gboolean        gtk_tool_item_get_visible_vertical     (GtkToolItem *tool_item);
-
-gboolean        gtk_tool_item_get_is_important         (GtkToolItem *tool_item);
-void            gtk_tool_item_set_is_important         (GtkToolItem *tool_item,
-							gboolean     is_important);
-
-GtkIconSize     gtk_tool_item_get_icon_size            (GtkToolItem *tool_item);
-GtkOrientation  gtk_tool_item_get_orientation          (GtkToolItem *tool_item);
-GtkToolbarStyle gtk_tool_item_get_toolbar_style        (GtkToolItem *tool_item);
-GtkReliefStyle  gtk_tool_item_get_relief_style         (GtkToolItem *tool_item);
-
-GtkWidget *     gtk_tool_item_retrieve_proxy_menu_item (GtkToolItem *tool_item);
-GtkWidget *     gtk_tool_item_get_proxy_menu_item      (GtkToolItem *tool_item,
-							const gchar *menu_item_id);
-void            gtk_tool_item_set_proxy_menu_item      (GtkToolItem *tool_item,
-							const gchar *menu_item_id,
-							GtkWidget   *menu_item);
-void		gtk_tool_item_rebuild_menu	       (GtkToolItem *tool_item);
-
-/* internal function */
-void       _gtk_tool_item_toolbar_reconfigured (GtkToolItem *tool_item);
-
-G_END_DECLS
-
-#endif /* __GTK_TOOL_ITEM_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktooltip.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktooltip.h
deleted file mode 100644
index bc498af4..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktooltip.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* gtktooltip.h
- *
- * Copyright (C) 2006-2007 Imendio AB
- * Contact: Kristian Rietveld <kris@imendio.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 __GTK_TOOLTIP_H__
-#define __GTK_TOOLTIP_H__
-
-#include "gtkwidget.h"
-#include "gtkwindow.h"
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_TOOLTIP                 (gtk_tooltip_get_type ())
-#define GTK_TOOLTIP(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOOLTIP, GtkTooltip))
-#define GTK_IS_TOOLTIP(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TOOLTIP))
-
-GType gtk_tooltip_get_type (void);
-
-void gtk_tooltip_set_markup            (GtkTooltip  *tooltip,
-			                const gchar *markup);
-void gtk_tooltip_set_text              (GtkTooltip  *tooltip,
-                                        const gchar *text);
-void gtk_tooltip_set_icon              (GtkTooltip  *tooltip,
-				        GdkPixbuf   *pixbuf);
-void gtk_tooltip_set_icon_from_stock   (GtkTooltip  *tooltip,
-				        const gchar *stock_id,
-				        GtkIconSize  size);
-void gtk_tooltip_set_custom	       (GtkTooltip  *tooltip,
-				        GtkWidget   *custom_widget);
-
-void gtk_tooltip_set_tip_area          (GtkTooltip   *tooltip,
-					GdkRectangle *rect);
-
-void gtk_tooltip_trigger_tooltip_query (GdkDisplay  *display);
-
-
-void _gtk_tooltip_focus_in             (GtkWidget   *widget);
-void _gtk_tooltip_focus_out            (GtkWidget   *widget);
-void _gtk_tooltip_toggle_keyboard_mode (GtkWidget   *widget);
-void _gtk_tooltip_handle_event         (GdkEvent    *event);
-void _gtk_tooltip_hide                 (GtkWidget   *widget);
-
-G_END_DECLS
-
-#endif /* __GTK_TOOLTIP_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktooltips.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktooltips.h
deleted file mode 100644
index a8608565..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktooltips.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-#ifndef __GTK_TOOLTIPS_H__
-#define __GTK_TOOLTIPS_H__
-
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_TOOLTIPS                  (gtk_tooltips_get_type ())
-#define GTK_TOOLTIPS(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOOLTIPS, GtkTooltips))
-#define GTK_TOOLTIPS_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOOLTIPS, GtkTooltipsClass))
-#define GTK_IS_TOOLTIPS(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TOOLTIPS))
-#define GTK_IS_TOOLTIPS_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TOOLTIPS))
-#define GTK_TOOLTIPS_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TOOLTIPS, GtkTooltipsClass))
-
-
-typedef struct _GtkTooltips	 GtkTooltips;
-typedef struct _GtkTooltipsClass GtkTooltipsClass;
-typedef struct _GtkTooltipsData	 GtkTooltipsData;
-
-struct _GtkTooltipsData
-{
-  GtkTooltips *tooltips;
-  GtkWidget *widget;
-  gchar *tip_text;
-  gchar *tip_private;
-};
-
-struct _GtkTooltips
-{
-  GtkObject parent_instance;
-
-  /*< private >*/
-  GtkWidget *tip_window;
-  GtkWidget *tip_label;
-  GtkTooltipsData *active_tips_data;
-  GList *tips_data_list; /* unused */
-
-  guint   delay : 30;
-  guint	  enabled : 1;
-  guint   have_grab : 1;
-  guint   use_sticky_delay : 1;
-  gint	  timer_tag;
-  GTimeVal last_popdown;
-};
-
-struct _GtkTooltipsClass
-{
-  GtkObjectClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType		 gtk_tooltips_get_type	   (void) G_GNUC_CONST;
-GtkTooltips*	 gtk_tooltips_new	   (void);
-
-void		 gtk_tooltips_enable	   (GtkTooltips   *tooltips);
-void		 gtk_tooltips_disable	   (GtkTooltips   *tooltips);
-void		 gtk_tooltips_set_delay	   (GtkTooltips   *tooltips,
-					    guint	   delay);
-void		 gtk_tooltips_set_tip	   (GtkTooltips   *tooltips,
-					    GtkWidget	  *widget,
-					    const gchar   *tip_text,
-					    const gchar   *tip_private);
-GtkTooltipsData* gtk_tooltips_data_get	   (GtkWidget	  *widget);
-void             gtk_tooltips_force_window (GtkTooltips   *tooltips);
-
-gboolean         gtk_tooltips_get_info_from_tip_window (GtkWindow    *tip_window,
-                                                        GtkTooltips **tooltips,
-                                                        GtkWidget   **current_widget);
-
-G_END_DECLS
-
-#endif /* __GTK_TOOLTIPS_H__ */
-
-#endif /* GTK_DISABLE_DEPRECATED */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktree.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktree.h
deleted file mode 100644
index 7e9da0eb..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktree.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifdef GTK_ENABLE_BROKEN
-
-#ifndef __GTK_TREE_H__
-#define __GTK_TREE_H__
-
-/* set this flag to enable tree debugging output */
-/* #define TREE_DEBUG */
-
-#include <gdk/gdk.h>
-#include <gtk/gtkcontainer.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_TREE                  (gtk_tree_get_type ())
-#define GTK_TREE(obj)                  (GTK_CHECK_CAST ((obj), GTK_TYPE_TREE, GtkTree))
-#define GTK_TREE_CLASS(klass)          (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE, GtkTreeClass))
-#define GTK_IS_TREE(obj)               (GTK_CHECK_TYPE ((obj), GTK_TYPE_TREE))
-#define GTK_IS_TREE_CLASS(klass)       (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TREE))
-#define GTK_TREE_GET_CLASS(obj)        (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TREE, GtkTreeClass))
-
-
-#define GTK_IS_ROOT_TREE(obj)   ((GtkObject*) GTK_TREE(obj)->root_tree == (GtkObject*)obj)
-#define GTK_TREE_ROOT_TREE(obj) (GTK_TREE(obj)->root_tree ? GTK_TREE(obj)->root_tree : GTK_TREE(obj))
-#define GTK_TREE_SELECTION_OLD(obj) (GTK_TREE_ROOT_TREE(obj)->selection)
-
-typedef enum 
-{
-  GTK_TREE_VIEW_LINE,  /* default view mode */
-  GTK_TREE_VIEW_ITEM
-} GtkTreeViewMode;
-
-typedef struct _GtkTree       GtkTree;
-typedef struct _GtkTreeClass  GtkTreeClass;
-
-struct _GtkTree
-{
-  GtkContainer container;
-  
-  GList *children;
-  
-  GtkTree* root_tree; /* owner of selection list */
-  GtkWidget* tree_owner;
-  GList *selection;
-  guint level;
-  guint indent_value;
-  guint current_indent;
-  guint selection_mode : 2;
-  guint view_mode : 1;
-  guint view_line : 1;
-};
-
-struct _GtkTreeClass
-{
-  GtkContainerClass parent_class;
-  
-  void (* selection_changed) (GtkTree   *tree);
-  void (* select_child)      (GtkTree   *tree,
-			      GtkWidget *child);
-  void (* unselect_child)    (GtkTree   *tree,
-			      GtkWidget *child);
-};
-
-
-GtkType    gtk_tree_get_type           (void) G_GNUC_CONST;
-GtkWidget* gtk_tree_new                (void);
-void       gtk_tree_append             (GtkTree          *tree,
-				        GtkWidget        *tree_item);
-void       gtk_tree_prepend            (GtkTree          *tree,
-				        GtkWidget        *tree_item);
-void       gtk_tree_insert             (GtkTree          *tree,
-				        GtkWidget        *tree_item,
-				        gint              position);
-void       gtk_tree_remove_items       (GtkTree          *tree,
-				        GList            *items);
-void       gtk_tree_clear_items        (GtkTree          *tree,
-				        gint              start,
-				        gint              end);
-void       gtk_tree_select_item        (GtkTree          *tree,
-				        gint              item);
-void       gtk_tree_unselect_item      (GtkTree          *tree,
-				        gint              item);
-void       gtk_tree_select_child       (GtkTree          *tree,
-				        GtkWidget        *tree_item);
-void       gtk_tree_unselect_child     (GtkTree          *tree,
-				        GtkWidget        *tree_item);
-gint       gtk_tree_child_position     (GtkTree          *tree,
-				        GtkWidget        *child);
-void       gtk_tree_set_selection_mode (GtkTree          *tree,
-				        GtkSelectionMode  mode);
-void       gtk_tree_set_view_mode      (GtkTree          *tree,
-				        GtkTreeViewMode   mode); 
-void       gtk_tree_set_view_lines     (GtkTree          *tree,
-					gboolean	  flag);
-
-/* deprecated function, use gtk_container_remove instead.
- */
-void       gtk_tree_remove_item        (GtkTree          *tree,
-				        GtkWidget        *child);
-
-
-G_END_DECLS
-
-#endif /* __GTK_TREE_H__ */
-
-#endif /* GTK_ENABLE_BROKEN */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreednd.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreednd.h
deleted file mode 100644
index eb983b7a..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreednd.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* gtktreednd.h
- * 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 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 __GTK_TREE_DND_H__
-#define __GTK_TREE_DND_H__
-
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtkdnd.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_TREE_DRAG_SOURCE            (gtk_tree_drag_source_get_type ())
-#define GTK_TREE_DRAG_SOURCE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_DRAG_SOURCE, GtkTreeDragSource))
-#define GTK_IS_TREE_DRAG_SOURCE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TREE_DRAG_SOURCE))
-#define GTK_TREE_DRAG_SOURCE_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_TREE_DRAG_SOURCE, GtkTreeDragSourceIface))
-
-typedef struct _GtkTreeDragSource      GtkTreeDragSource; /* Dummy typedef */
-typedef struct _GtkTreeDragSourceIface GtkTreeDragSourceIface;
-
-struct _GtkTreeDragSourceIface
-{
-  GTypeInterface g_iface;
-
-  /* VTable - not signals */
-
-  gboolean     (* row_draggable)        (GtkTreeDragSource   *drag_source,
-                                         GtkTreePath         *path);
-
-  gboolean     (* drag_data_get)        (GtkTreeDragSource   *drag_source,
-                                         GtkTreePath         *path,
-                                         GtkSelectionData    *selection_data);
-
-  gboolean     (* drag_data_delete)     (GtkTreeDragSource *drag_source,
-                                         GtkTreePath       *path);
-};
-
-GType           gtk_tree_drag_source_get_type   (void) G_GNUC_CONST;
-
-/* Returns whether the given row can be dragged */
-gboolean gtk_tree_drag_source_row_draggable    (GtkTreeDragSource *drag_source,
-                                                GtkTreePath       *path);
-
-/* Deletes the given row, or returns FALSE if it can't */
-gboolean gtk_tree_drag_source_drag_data_delete (GtkTreeDragSource *drag_source,
-                                                GtkTreePath       *path);
-
-/* Fills in selection_data with type selection_data->target based on
- * the row denoted by path, returns TRUE if it does anything
- */
-gboolean gtk_tree_drag_source_drag_data_get    (GtkTreeDragSource *drag_source,
-                                                GtkTreePath       *path,
-                                                GtkSelectionData  *selection_data);
-
-#define GTK_TYPE_TREE_DRAG_DEST            (gtk_tree_drag_dest_get_type ())
-#define GTK_TREE_DRAG_DEST(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_DRAG_DEST, GtkTreeDragDest))
-#define GTK_IS_TREE_DRAG_DEST(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TREE_DRAG_DEST))
-#define GTK_TREE_DRAG_DEST_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_TREE_DRAG_DEST, GtkTreeDragDestIface))
-
-typedef struct _GtkTreeDragDest      GtkTreeDragDest; /* Dummy typedef */
-typedef struct _GtkTreeDragDestIface GtkTreeDragDestIface;
-
-struct _GtkTreeDragDestIface
-{
-  GTypeInterface g_iface;
-
-  /* VTable - not signals */
-
-  gboolean     (* drag_data_received) (GtkTreeDragDest   *drag_dest,
-                                       GtkTreePath       *dest,
-                                       GtkSelectionData  *selection_data);
-
-  gboolean     (* row_drop_possible)  (GtkTreeDragDest   *drag_dest,
-                                       GtkTreePath       *dest_path,
-				       GtkSelectionData  *selection_data);
-};
-
-GType           gtk_tree_drag_dest_get_type   (void) G_GNUC_CONST;
-
-/* Inserts a row before dest which contains data in selection_data,
- * or returns FALSE if it can't
- */
-gboolean gtk_tree_drag_dest_drag_data_received (GtkTreeDragDest   *drag_dest,
-						GtkTreePath       *dest,
-						GtkSelectionData  *selection_data);
-
-
-/* Returns TRUE if we can drop before path; path may not exist. */
-gboolean gtk_tree_drag_dest_row_drop_possible  (GtkTreeDragDest   *drag_dest,
-						GtkTreePath       *dest_path,
-						GtkSelectionData  *selection_data);
-
-
-/* The selection data would normally have target type GTK_TREE_MODEL_ROW in this
- * case. If the target is wrong these functions return FALSE.
- */
-gboolean gtk_tree_set_row_drag_data            (GtkSelectionData  *selection_data,
-						GtkTreeModel      *tree_model,
-						GtkTreePath       *path);
-gboolean gtk_tree_get_row_drag_data            (GtkSelectionData  *selection_data,
-						GtkTreeModel     **tree_model,
-						GtkTreePath      **path);
-
-G_END_DECLS
-
-#endif /* __GTK_TREE_DND_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreeitem.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreeitem.h
deleted file mode 100644
index 0fef9e21..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreeitem.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifdef GTK_ENABLE_BROKEN
-
-#ifndef __GTK_TREE_ITEM_H__
-#define __GTK_TREE_ITEM_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkitem.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_TREE_ITEM              (gtk_tree_item_get_type ())
-#define GTK_TREE_ITEM(obj)              (GTK_CHECK_CAST ((obj), GTK_TYPE_TREE_ITEM, GtkTreeItem))
-#define GTK_TREE_ITEM_CLASS(klass)      (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE_ITEM, GtkTreeItemClass))
-#define GTK_IS_TREE_ITEM(obj)           (GTK_CHECK_TYPE ((obj), GTK_TYPE_TREE_ITEM))
-#define GTK_IS_TREE_ITEM_CLASS(klass)   (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TREE_ITEM))
-#define GTK_TREE_ITEM_GET_CLASS(obj)    (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TREE_ITEM, GtkTreeItemClass))
-
-
-#define GTK_TREE_ITEM_SUBTREE(obj)      (GTK_TREE_ITEM(obj)->subtree)
-
-
-typedef struct _GtkTreeItem       GtkTreeItem;
-typedef struct _GtkTreeItemClass  GtkTreeItemClass;
-
-struct _GtkTreeItem
-{
-  GtkItem item;
-
-  GtkWidget *subtree;
-  GtkWidget *pixmaps_box;
-  GtkWidget *plus_pix_widget, *minus_pix_widget;
-
-  GList *pixmaps;		/* pixmap node for this items color depth */
-
-  guint expanded : 1;
-};
-
-struct _GtkTreeItemClass
-{
-  GtkItemClass parent_class;
-
-  void (* expand)   (GtkTreeItem *tree_item);
-  void (* collapse) (GtkTreeItem *tree_item);
-};
-
-
-GtkType    gtk_tree_item_get_type       (void) G_GNUC_CONST;
-GtkWidget* gtk_tree_item_new            (void);
-GtkWidget* gtk_tree_item_new_with_label (const gchar *label);
-void       gtk_tree_item_set_subtree    (GtkTreeItem *tree_item,
-					 GtkWidget   *subtree);
-void       gtk_tree_item_remove_subtree (GtkTreeItem *tree_item);
-void       gtk_tree_item_select         (GtkTreeItem *tree_item);
-void       gtk_tree_item_deselect       (GtkTreeItem *tree_item);
-void       gtk_tree_item_expand         (GtkTreeItem *tree_item);
-void       gtk_tree_item_collapse       (GtkTreeItem *tree_item);
-
-
-G_END_DECLS
-
-#endif /* __GTK_TREE_ITEM_H__ */
-
-#endif /* GTK_ENABLE_BROKEN */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreemodel.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreemodel.h
deleted file mode 100644
index cc5b937d..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreemodel.h
+++ /dev/null
@@ -1,267 +0,0 @@
-/* gtktreemodel.h
- * Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb@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 __GTK_TREE_MODEL_H__
-#define __GTK_TREE_MODEL_H__
-
-#include <glib-object.h>
-
-/* Not needed, retained for compatibility -Yosh */
-#include <gtk/gtkobject.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_TREE_MODEL            (gtk_tree_model_get_type ())
-#define GTK_TREE_MODEL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_MODEL, GtkTreeModel))
-#define GTK_IS_TREE_MODEL(obj)	       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TREE_MODEL))
-#define GTK_TREE_MODEL_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_TREE_MODEL, GtkTreeModelIface))
-
-#define GTK_TYPE_TREE_ITER             (gtk_tree_iter_get_type ())
-#define GTK_TYPE_TREE_PATH             (gtk_tree_path_get_type ())
-#define GTK_TYPE_TREE_ROW_REFERENCE    (gtk_tree_row_reference_get_type ())
-
-typedef struct _GtkTreeIter         GtkTreeIter;
-typedef struct _GtkTreePath         GtkTreePath;
-typedef struct _GtkTreeRowReference GtkTreeRowReference;
-typedef struct _GtkTreeModel        GtkTreeModel; /* Dummy typedef */
-typedef struct _GtkTreeModelIface   GtkTreeModelIface;
-typedef gboolean (* GtkTreeModelForeachFunc) (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data);
-
-
-typedef enum
-{
-  GTK_TREE_MODEL_ITERS_PERSIST = 1 << 0,
-  GTK_TREE_MODEL_LIST_ONLY = 1 << 1
-} GtkTreeModelFlags;
-
-struct _GtkTreeIter
-{
-  gint stamp;
-  gpointer user_data;
-  gpointer user_data2;
-  gpointer user_data3;
-};
-
-struct _GtkTreeModelIface
-{
-  GTypeInterface g_iface;
-
-  /* Signals */
-  void         (* row_changed)           (GtkTreeModel *tree_model,
-					  GtkTreePath  *path,
-					  GtkTreeIter  *iter);
-  void         (* row_inserted)          (GtkTreeModel *tree_model,
-					  GtkTreePath  *path,
-					  GtkTreeIter  *iter);
-  void         (* row_has_child_toggled) (GtkTreeModel *tree_model,
-					  GtkTreePath  *path,
-					  GtkTreeIter  *iter);
-  void         (* row_deleted)           (GtkTreeModel *tree_model,
-					  GtkTreePath  *path);
-  void         (* rows_reordered)        (GtkTreeModel *tree_model,
-					  GtkTreePath  *path,
-					  GtkTreeIter  *iter,
-					  gint         *new_order);
-
-  /* Virtual Table */
-  GtkTreeModelFlags (* get_flags)  (GtkTreeModel *tree_model);   
-
-  gint         (* get_n_columns)   (GtkTreeModel *tree_model);
-  GType        (* get_column_type) (GtkTreeModel *tree_model,
-				    gint          index_);
-  gboolean     (* get_iter)        (GtkTreeModel *tree_model,
-				    GtkTreeIter  *iter,
-				    GtkTreePath  *path);
-  GtkTreePath *(* get_path)        (GtkTreeModel *tree_model,
-				    GtkTreeIter  *iter);
-  void         (* get_value)       (GtkTreeModel *tree_model,
-				    GtkTreeIter  *iter,
-				    gint          column,
-				    GValue       *value);
-  gboolean     (* iter_next)       (GtkTreeModel *tree_model,
-				    GtkTreeIter  *iter);
-  gboolean     (* iter_children)   (GtkTreeModel *tree_model,
-				    GtkTreeIter  *iter,
-				    GtkTreeIter  *parent);
-  gboolean     (* iter_has_child)  (GtkTreeModel *tree_model,
-				    GtkTreeIter  *iter);
-  gint         (* iter_n_children) (GtkTreeModel *tree_model,
-				    GtkTreeIter  *iter);
-  gboolean     (* iter_nth_child)  (GtkTreeModel *tree_model,
-				    GtkTreeIter  *iter,
-				    GtkTreeIter  *parent,
-				    gint          n);
-  gboolean     (* iter_parent)     (GtkTreeModel *tree_model,
-				    GtkTreeIter  *iter,
-				    GtkTreeIter  *child);
-  void         (* ref_node)        (GtkTreeModel *tree_model,
-				    GtkTreeIter  *iter);
-  void         (* unref_node)      (GtkTreeModel *tree_model,
-				    GtkTreeIter  *iter);
-};
-
-
-/* GtkTreePath operations */
-GtkTreePath *gtk_tree_path_new              (void);
-GtkTreePath *gtk_tree_path_new_from_string  (const gchar       *path);
-GtkTreePath *gtk_tree_path_new_from_indices (gint               first_index,
-					     ...);
-gchar       *gtk_tree_path_to_string        (GtkTreePath       *path);
-GtkTreePath *gtk_tree_path_new_first        (void);
-void         gtk_tree_path_append_index     (GtkTreePath       *path,
-					     gint               index_);
-void         gtk_tree_path_prepend_index    (GtkTreePath       *path,
-					     gint               index_);
-gint         gtk_tree_path_get_depth        (GtkTreePath       *path);
-gint        *gtk_tree_path_get_indices      (GtkTreePath       *path);
-void         gtk_tree_path_free             (GtkTreePath       *path);
-GtkTreePath *gtk_tree_path_copy             (const GtkTreePath *path);
-GType        gtk_tree_path_get_type         (void) G_GNUC_CONST;
-gint         gtk_tree_path_compare          (const GtkTreePath *a,
-					     const GtkTreePath *b);
-void         gtk_tree_path_next             (GtkTreePath       *path);
-gboolean     gtk_tree_path_prev             (GtkTreePath       *path);
-gboolean     gtk_tree_path_up               (GtkTreePath       *path);
-void         gtk_tree_path_down             (GtkTreePath       *path);
-
-gboolean     gtk_tree_path_is_ancestor      (GtkTreePath       *path,
-                                             GtkTreePath       *descendant);
-gboolean     gtk_tree_path_is_descendant    (GtkTreePath       *path,
-                                             GtkTreePath       *ancestor);
-
-#ifndef GTK_DISABLE_DEPRECATED
-#define gtk_tree_path_new_root() gtk_tree_path_new_first()
-#endif /* !GTK_DISABLE_DEPRECATED */
-
-/* Row reference (an object that tracks model changes so it refers to the same
- * row always; a path refers to a position, not a fixed row).  You almost always
- * want to call gtk_tree_row_reference_new.
- */
-
-GType                gtk_tree_row_reference_get_type (void) G_GNUC_CONST;
-GtkTreeRowReference *gtk_tree_row_reference_new       (GtkTreeModel        *model,
-						       GtkTreePath         *path);
-GtkTreeRowReference *gtk_tree_row_reference_new_proxy (GObject             *proxy,
-						       GtkTreeModel        *model,
-						       GtkTreePath         *path);
-GtkTreePath         *gtk_tree_row_reference_get_path  (GtkTreeRowReference *reference);
-GtkTreeModel        *gtk_tree_row_reference_get_model (GtkTreeRowReference *reference);
-gboolean             gtk_tree_row_reference_valid     (GtkTreeRowReference *reference);
-GtkTreeRowReference *gtk_tree_row_reference_copy      (GtkTreeRowReference *reference);
-void                 gtk_tree_row_reference_free      (GtkTreeRowReference *reference);
-/* These two functions are only needed if you created the row reference with a
- * proxy object */
-void                 gtk_tree_row_reference_inserted  (GObject     *proxy,
-						       GtkTreePath *path);
-void                 gtk_tree_row_reference_deleted   (GObject     *proxy,
-						       GtkTreePath *path);
-void                 gtk_tree_row_reference_reordered (GObject     *proxy,
-						       GtkTreePath *path,
-						       GtkTreeIter *iter,
-						       gint        *new_order);
-						       
-/* GtkTreeIter operations */
-GtkTreeIter *     gtk_tree_iter_copy             (GtkTreeIter  *iter);
-void              gtk_tree_iter_free             (GtkTreeIter  *iter);
-GType             gtk_tree_iter_get_type         (void) G_GNUC_CONST;
-
-GType             gtk_tree_model_get_type        (void) G_GNUC_CONST;
-GtkTreeModelFlags gtk_tree_model_get_flags       (GtkTreeModel *tree_model);
-gint              gtk_tree_model_get_n_columns   (GtkTreeModel *tree_model);
-GType             gtk_tree_model_get_column_type (GtkTreeModel *tree_model,
-						  gint          index_);
-
-
-/* Iterator movement */
-gboolean          gtk_tree_model_get_iter        (GtkTreeModel *tree_model,
-						  GtkTreeIter  *iter,
-						  GtkTreePath  *path);
-gboolean          gtk_tree_model_get_iter_from_string (GtkTreeModel *tree_model,
-						       GtkTreeIter  *iter,
-						       const gchar  *path_string);
-gchar *           gtk_tree_model_get_string_from_iter (GtkTreeModel *tree_model,
-                                                       GtkTreeIter  *iter);
-gboolean          gtk_tree_model_get_iter_first  (GtkTreeModel *tree_model,
-						  GtkTreeIter  *iter);
-GtkTreePath *     gtk_tree_model_get_path        (GtkTreeModel *tree_model,
-						  GtkTreeIter  *iter);
-void              gtk_tree_model_get_value       (GtkTreeModel *tree_model,
-						  GtkTreeIter  *iter,
-						  gint          column,
-						  GValue       *value);
-gboolean          gtk_tree_model_iter_next       (GtkTreeModel *tree_model,
-						  GtkTreeIter  *iter);
-gboolean          gtk_tree_model_iter_children   (GtkTreeModel *tree_model,
-						  GtkTreeIter  *iter,
-						  GtkTreeIter  *parent);
-gboolean          gtk_tree_model_iter_has_child  (GtkTreeModel *tree_model,
-						  GtkTreeIter  *iter);
-gint              gtk_tree_model_iter_n_children (GtkTreeModel *tree_model,
-						  GtkTreeIter  *iter);
-gboolean          gtk_tree_model_iter_nth_child  (GtkTreeModel *tree_model,
-						  GtkTreeIter  *iter,
-						  GtkTreeIter  *parent,
-						  gint          n);
-gboolean          gtk_tree_model_iter_parent     (GtkTreeModel *tree_model,
-						  GtkTreeIter  *iter,
-						  GtkTreeIter  *child);
-void              gtk_tree_model_ref_node        (GtkTreeModel *tree_model,
-						  GtkTreeIter  *iter);
-void              gtk_tree_model_unref_node      (GtkTreeModel *tree_model,
-						  GtkTreeIter  *iter);
-void              gtk_tree_model_get             (GtkTreeModel *tree_model,
-						  GtkTreeIter  *iter,
-						  ...);
-void              gtk_tree_model_get_valist      (GtkTreeModel *tree_model,
-						  GtkTreeIter  *iter,
-						  va_list       var_args);
-
-
-void              gtk_tree_model_foreach         (GtkTreeModel            *model,
-						  GtkTreeModelForeachFunc  func,
-						  gpointer                 user_data);
-
-
-#ifndef GTK_DISABLE_DEPRECATED
-#define gtk_tree_model_get_iter_root(tree_model, iter) gtk_tree_model_get_iter_first(tree_model, iter)
-#endif /* !GTK_DISABLE_DEPRECATED */
-
-/* Signals */
-void gtk_tree_model_row_changed           (GtkTreeModel *tree_model,
-					   GtkTreePath  *path,
-					   GtkTreeIter  *iter);
-void gtk_tree_model_row_inserted          (GtkTreeModel *tree_model,
-					   GtkTreePath  *path,
-					   GtkTreeIter  *iter);
-void gtk_tree_model_row_has_child_toggled (GtkTreeModel *tree_model,
-					   GtkTreePath  *path,
-					   GtkTreeIter  *iter);
-void gtk_tree_model_row_deleted           (GtkTreeModel *tree_model,
-					   GtkTreePath  *path);
-void gtk_tree_model_rows_reordered        (GtkTreeModel *tree_model,
-					   GtkTreePath  *path,
-					   GtkTreeIter  *iter,
-					   gint         *new_order);
-
-
-
-
-G_END_DECLS
-
-#endif /* __GTK_TREE_MODEL_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreemodelfilter.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreemodelfilter.h
deleted file mode 100644
index e9ab5829..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreemodelfilter.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* gtktreemodelfilter.h
- * Copyright (C) 2000,2001  Red Hat, Inc., Jonathan Blandford <jrb@redhat.com>
- * Copyright (C) 2001-2003  Kristian Rietveld <kris@gtk.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 __GTK_TREE_MODEL_FILTER_H__
-#define __GTK_TREE_MODEL_FILTER_H__
-
-#include <gtk/gtktreemodel.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_TREE_MODEL_FILTER              (gtk_tree_model_filter_get_type ())
-#define GTK_TREE_MODEL_FILTER(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_MODEL_FILTER, GtkTreeModelFilter))
-#define GTK_TREE_MODEL_FILTER_CLASS(vtable)     (G_TYPE_CHECK_CLASS_CAST ((vtable), GTK_TYPE_TREE_MODEL_FILTER, GtkTreeModelFilterClass))
-#define GTK_IS_TREE_MODEL_FILTER(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TREE_MODEL_FILTER))
-#define GTK_IS_TREE_MODEL_FILTER_CLASS(vtable)  (G_TYPE_CHECK_CLASS_TYPE ((vtable), GTK_TYPE_TREE_MODEL_FILTER))
-#define GTK_TREE_MODEL_FILTER_GET_CLASS(inst)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TREE_MODEL_FILTER, GtkTreeModelFilterClass))
-
-typedef gboolean (* GtkTreeModelFilterVisibleFunc) (GtkTreeModel *model,
-                                                    GtkTreeIter  *iter,
-                                                    gpointer      data);
-typedef void (* GtkTreeModelFilterModifyFunc) (GtkTreeModel *model,
-                                               GtkTreeIter  *iter,
-                                               GValue       *value,
-                                               gint          column,
-                                               gpointer      data);
-
-typedef struct _GtkTreeModelFilter          GtkTreeModelFilter;
-typedef struct _GtkTreeModelFilterClass     GtkTreeModelFilterClass;
-typedef struct _GtkTreeModelFilterPrivate   GtkTreeModelFilterPrivate;
-
-struct _GtkTreeModelFilter
-{
-  GObject parent;
-
-  /*< private >*/
-  GtkTreeModelFilterPrivate *priv;
-};
-
-struct _GtkTreeModelFilterClass
-{
-  GObjectClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved0) (void);
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-};
-
-/* base */
-GType         gtk_tree_model_filter_get_type                   (void) G_GNUC_CONST;
-GtkTreeModel *gtk_tree_model_filter_new                        (GtkTreeModel                 *child_model,
-                                                                GtkTreePath                  *root);
-void          gtk_tree_model_filter_set_visible_func           (GtkTreeModelFilter           *filter,
-                                                                GtkTreeModelFilterVisibleFunc func,
-                                                                gpointer                      data,
-                                                                GtkDestroyNotify              destroy);
-void          gtk_tree_model_filter_set_modify_func            (GtkTreeModelFilter           *filter,
-                                                                gint                          n_columns,
-                                                                GType                        *types,
-                                                                GtkTreeModelFilterModifyFunc  func,
-                                                                gpointer                      data,
-                                                                GtkDestroyNotify              destroy);
-void          gtk_tree_model_filter_set_visible_column         (GtkTreeModelFilter           *filter,
-                                                                gint                          column);
-
-GtkTreeModel *gtk_tree_model_filter_get_model                  (GtkTreeModelFilter           *filter);
-
-/* conversion */
-gboolean      gtk_tree_model_filter_convert_child_iter_to_iter (GtkTreeModelFilter           *filter,
-                                                                GtkTreeIter                  *filter_iter,
-                                                                GtkTreeIter                  *child_iter);
-void          gtk_tree_model_filter_convert_iter_to_child_iter (GtkTreeModelFilter           *filter,
-                                                                GtkTreeIter                  *child_iter,
-                                                                GtkTreeIter                  *filter_iter);
-GtkTreePath  *gtk_tree_model_filter_convert_child_path_to_path (GtkTreeModelFilter           *filter,
-                                                                GtkTreePath                  *child_path);
-GtkTreePath  *gtk_tree_model_filter_convert_path_to_child_path (GtkTreeModelFilter           *filter,
-                                                                GtkTreePath                  *filter_path);
-
-/* extras */
-void          gtk_tree_model_filter_refilter                   (GtkTreeModelFilter           *filter);
-void          gtk_tree_model_filter_clear_cache                (GtkTreeModelFilter           *filter);
-
-G_END_DECLS
-
-#endif /* __GTK_TREE_MODEL_FILTER_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreemodelsort.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreemodelsort.h
deleted file mode 100644
index bfd24e90..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreemodelsort.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* gtktreemodelsort.h
- * Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb@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 __GTK_TREE_MODEL_SORT_H__
-#define __GTK_TREE_MODEL_SORT_H__
-
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreesortable.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_TREE_MODEL_SORT			(gtk_tree_model_sort_get_type ())
-#define GTK_TREE_MODEL_SORT(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_MODEL_SORT, GtkTreeModelSort))
-#define GTK_TREE_MODEL_SORT_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE_MODEL_SORT, GtkTreeModelSortClass))
-#define GTK_IS_TREE_MODEL_SORT(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TREE_MODEL_SORT))
-#define GTK_IS_TREE_MODEL_SORT_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TREE_MODEL_SORT))
-#define GTK_TREE_MODEL_SORT_GET_CLASS(obj)		(G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TREE_MODEL_SORT, GtkTreeModelSortClass))
-
-typedef struct _GtkTreeModelSort       GtkTreeModelSort;
-typedef struct _GtkTreeModelSortClass  GtkTreeModelSortClass;
-
-struct _GtkTreeModelSort
-{
-  GObject parent;
-
-  /* < private > */
-  gpointer root;
-  gint stamp;
-  guint child_flags;
-  GtkTreeModel *child_model;
-  gint zero_ref_count;
-
-  /* sort information */
-  GList *sort_list;
-  gint sort_column_id;
-  GtkSortType order;
-
-  /* default sort */
-  GtkTreeIterCompareFunc default_sort_func;
-  gpointer default_sort_data;
-  GtkDestroyNotify default_sort_destroy;
-
-  /* signal ids */
-  guint changed_id;
-  guint inserted_id;
-  guint has_child_toggled_id;
-  guint deleted_id;
-  guint reordered_id;
-};
-
-struct _GtkTreeModelSortClass
-{
-  GObjectClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType         gtk_tree_model_sort_get_type                   (void) G_GNUC_CONST;
-GtkTreeModel *gtk_tree_model_sort_new_with_model             (GtkTreeModel     *child_model);
-
-GtkTreeModel *gtk_tree_model_sort_get_model                  (GtkTreeModelSort *tree_model);
-GtkTreePath  *gtk_tree_model_sort_convert_child_path_to_path (GtkTreeModelSort *tree_model_sort,
-							      GtkTreePath      *child_path);
-void          gtk_tree_model_sort_convert_child_iter_to_iter (GtkTreeModelSort *tree_model_sort,
-							      GtkTreeIter      *sort_iter,
-							      GtkTreeIter      *child_iter);
-GtkTreePath  *gtk_tree_model_sort_convert_path_to_child_path (GtkTreeModelSort *tree_model_sort,
-							      GtkTreePath      *sorted_path);
-void          gtk_tree_model_sort_convert_iter_to_child_iter (GtkTreeModelSort *tree_model_sort,
-							      GtkTreeIter      *child_iter,
-							      GtkTreeIter      *sorted_iter);
-void          gtk_tree_model_sort_reset_default_sort_func    (GtkTreeModelSort *tree_model_sort);
-void          gtk_tree_model_sort_clear_cache                (GtkTreeModelSort *tree_model_sort);
-gboolean      gtk_tree_model_sort_iter_is_valid              (GtkTreeModelSort *tree_model_sort,
-                                                              GtkTreeIter      *iter);
-
-
-G_END_DECLS
-
-#endif /* __GTK_TREE_MODEL_SORT_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreeselection.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreeselection.h
deleted file mode 100644
index 2c3e0a2b..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreeselection.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* gtktreeselection.h
- * Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb@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 __GTK_TREE_SELECTION_H__
-#define __GTK_TREE_SELECTION_H__
-
-#include <glib-object.h>
-#include <gtk/gtktreeview.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_TREE_SELECTION			(gtk_tree_selection_get_type ())
-#define GTK_TREE_SELECTION(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_SELECTION, GtkTreeSelection))
-#define GTK_TREE_SELECTION_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE_SELECTION, GtkTreeSelectionClass))
-#define GTK_IS_TREE_SELECTION(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TREE_SELECTION))
-#define GTK_IS_TREE_SELECTION_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TREE_SELECTION))
-#define GTK_TREE_SELECTION_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TREE_SELECTION, GtkTreeSelectionClass))
-
-typedef gboolean (* GtkTreeSelectionFunc)    (GtkTreeSelection  *selection,
-					      GtkTreeModel      *model,
-					      GtkTreePath       *path,
-                                              gboolean           path_currently_selected,
-					      gpointer           data);
-typedef void (* GtkTreeSelectionForeachFunc) (GtkTreeModel      *model,
-					      GtkTreePath       *path,
-					      GtkTreeIter       *iter,
-					      gpointer           data);
-
-struct _GtkTreeSelection
-{
-  GObject parent;
-
-  /*< private >*/
-  
-  GtkTreeView *tree_view;
-  GtkSelectionMode type;
-  GtkTreeSelectionFunc user_func;
-  gpointer user_data;
-  GtkDestroyNotify destroy;
-};
-
-struct _GtkTreeSelectionClass
-{
-  GObjectClass parent_class;
-
-  void (* changed) (GtkTreeSelection *selection);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType            gtk_tree_selection_get_type            (void) G_GNUC_CONST;
-
-void             gtk_tree_selection_set_mode            (GtkTreeSelection            *selection,
-							 GtkSelectionMode             type);
-GtkSelectionMode gtk_tree_selection_get_mode        (GtkTreeSelection            *selection);
-void             gtk_tree_selection_set_select_function (GtkTreeSelection            *selection,
-							 GtkTreeSelectionFunc         func,
-							 gpointer                     data,
-							 GtkDestroyNotify             destroy);
-gpointer         gtk_tree_selection_get_user_data       (GtkTreeSelection            *selection);
-GtkTreeView*     gtk_tree_selection_get_tree_view       (GtkTreeSelection            *selection);
-
-/* Only meaningful if GTK_SELECTION_SINGLE or GTK_SELECTION_BROWSE is set */
-/* Use selected_foreach or get_selected_rows for GTK_SELECTION_MULTIPLE */
-gboolean         gtk_tree_selection_get_selected        (GtkTreeSelection            *selection,
-							 GtkTreeModel               **model,
-							 GtkTreeIter                 *iter);
-GList *          gtk_tree_selection_get_selected_rows   (GtkTreeSelection            *selection,
-                                                         GtkTreeModel               **model);
-gint             gtk_tree_selection_count_selected_rows (GtkTreeSelection            *selection);
-void             gtk_tree_selection_selected_foreach    (GtkTreeSelection            *selection,
-							 GtkTreeSelectionForeachFunc  func,
-							 gpointer                     data);
-void             gtk_tree_selection_select_path         (GtkTreeSelection            *selection,
-							 GtkTreePath                 *path);
-void             gtk_tree_selection_unselect_path       (GtkTreeSelection            *selection,
-							 GtkTreePath                 *path);
-void             gtk_tree_selection_select_iter         (GtkTreeSelection            *selection,
-							 GtkTreeIter                 *iter);
-void             gtk_tree_selection_unselect_iter       (GtkTreeSelection            *selection,
-							 GtkTreeIter                 *iter);
-gboolean         gtk_tree_selection_path_is_selected    (GtkTreeSelection            *selection,
-							 GtkTreePath                 *path);
-gboolean         gtk_tree_selection_iter_is_selected    (GtkTreeSelection            *selection,
-							 GtkTreeIter                 *iter);
-void             gtk_tree_selection_select_all          (GtkTreeSelection            *selection);
-void             gtk_tree_selection_unselect_all        (GtkTreeSelection            *selection);
-void             gtk_tree_selection_select_range        (GtkTreeSelection            *selection,
-							 GtkTreePath                 *start_path,
-							 GtkTreePath                 *end_path);
-void             gtk_tree_selection_unselect_range      (GtkTreeSelection            *selection,
-                                                         GtkTreePath                 *start_path,
-							 GtkTreePath                 *end_path);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_TREE_SELECTION_H__ */
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreesortable.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreesortable.h
deleted file mode 100644
index dd7282a1..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreesortable.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* gtktreesortable.h
- * 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 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 __GTK_TREE_SORTABLE_H__
-#define __GTK_TREE_SORTABLE_H__
-
-#include <gtk/gtkenums.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktypeutils.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_TREE_SORTABLE            (gtk_tree_sortable_get_type ())
-#define GTK_TREE_SORTABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_SORTABLE, GtkTreeSortable))
-#define GTK_TREE_SORTABLE_CLASS(obj)      (G_TYPE_CHECK_CLASS_CAST ((obj), GTK_TYPE_TREE_SORTABLE, GtkTreeSortableIface))
-#define GTK_IS_TREE_SORTABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TREE_SORTABLE))
-#define GTK_TREE_SORTABLE_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_TREE_SORTABLE, GtkTreeSortableIface))
-
-enum {
-  GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID = -1,
-  GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID = -2
-};
-
-typedef struct _GtkTreeSortable      GtkTreeSortable; /* Dummy typedef */
-typedef struct _GtkTreeSortableIface GtkTreeSortableIface;
-
-typedef gint (* GtkTreeIterCompareFunc) (GtkTreeModel *model,
-					 GtkTreeIter  *a,
-					 GtkTreeIter  *b,
-					 gpointer      user_data);
-
-
-struct _GtkTreeSortableIface
-{
-  GTypeInterface g_iface;
-
-  /* signals */
-  void     (* sort_column_changed)   (GtkTreeSortable        *sortable);
-
-  /* virtual table */
-  gboolean (* get_sort_column_id)    (GtkTreeSortable        *sortable,
-				      gint                   *sort_column_id,
-				      GtkSortType            *order);
-  void     (* set_sort_column_id)    (GtkTreeSortable        *sortable,
-				      gint                    sort_column_id,
-				      GtkSortType             order);
-  void     (* set_sort_func)         (GtkTreeSortable        *sortable,
-				      gint                    sort_column_id,
-				      GtkTreeIterCompareFunc  func,
-				      gpointer                data,
-				      GtkDestroyNotify        destroy);
-  void     (* set_default_sort_func) (GtkTreeSortable        *sortable,
-				      GtkTreeIterCompareFunc  func,
-				      gpointer                data,
-				      GtkDestroyNotify        destroy);
-  gboolean (* has_default_sort_func) (GtkTreeSortable        *sortable);
-};
-
-
-GType    gtk_tree_sortable_get_type              (void) G_GNUC_CONST;
-
-void     gtk_tree_sortable_sort_column_changed   (GtkTreeSortable        *sortable);
-gboolean gtk_tree_sortable_get_sort_column_id    (GtkTreeSortable        *sortable,
-						  gint                   *sort_column_id,
-						  GtkSortType            *order);
-void     gtk_tree_sortable_set_sort_column_id    (GtkTreeSortable        *sortable,
-						  gint                    sort_column_id,
-						  GtkSortType             order);
-void     gtk_tree_sortable_set_sort_func         (GtkTreeSortable        *sortable,
-						  gint                    sort_column_id,
-						  GtkTreeIterCompareFunc  sort_func,
-						  gpointer                user_data,
-						  GtkDestroyNotify        destroy);
-void     gtk_tree_sortable_set_default_sort_func (GtkTreeSortable        *sortable,
-						  GtkTreeIterCompareFunc  sort_func,
-						  gpointer                user_data,
-						  GtkDestroyNotify        destroy);
-gboolean gtk_tree_sortable_has_default_sort_func (GtkTreeSortable        *sortable);
-						  
-						  
-G_END_DECLS
-
-#endif /* __GTK_TREE_SORTABLE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreestore.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreestore.h
deleted file mode 100644
index b7e61e2a..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreestore.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/* gtktreestore.h
- * Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb@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 __GTK_TREE_STORE_H__
-#define __GTK_TREE_STORE_H__
-
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreesortable.h>
-#include <stdarg.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_TREE_STORE			(gtk_tree_store_get_type ())
-#define GTK_TREE_STORE(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_STORE, GtkTreeStore))
-#define GTK_TREE_STORE_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE_STORE, GtkTreeStoreClass))
-#define GTK_IS_TREE_STORE(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TREE_STORE))
-#define GTK_IS_TREE_STORE_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TREE_STORE))
-#define GTK_TREE_STORE_GET_CLASS(obj)		(G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TREE_STORE, GtkTreeStoreClass))
-
-typedef struct _GtkTreeStore       GtkTreeStore;
-typedef struct _GtkTreeStoreClass  GtkTreeStoreClass;
-
-struct _GtkTreeStore
-{
-  GObject parent;
-
-  gint stamp;
-  gpointer root;
-  gpointer last;
-  gint n_columns;
-  gint sort_column_id;
-  GList *sort_list;
-  GtkSortType order;
-  GType *column_headers;
-  GtkTreeIterCompareFunc default_sort_func;
-  gpointer default_sort_data;
-  GtkDestroyNotify default_sort_destroy;
-  guint columns_dirty : 1;
-};
-
-struct _GtkTreeStoreClass
-{
-  GObjectClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType         gtk_tree_store_get_type         (void) G_GNUC_CONST;
-GtkTreeStore *gtk_tree_store_new              (gint          n_columns,
-					       ...);
-GtkTreeStore *gtk_tree_store_newv             (gint          n_columns,
-					       GType        *types);
-void          gtk_tree_store_set_column_types (GtkTreeStore *tree_store,
-					       gint          n_columns,
-					       GType        *types);
-
-/* NOTE: use gtk_tree_model_get to get values from a GtkTreeStore */
-
-void          gtk_tree_store_set_value        (GtkTreeStore *tree_store,
-					       GtkTreeIter  *iter,
-					       gint          column,
-					       GValue       *value);
-void          gtk_tree_store_set              (GtkTreeStore *tree_store,
-					       GtkTreeIter  *iter,
-					       ...);
-void          gtk_tree_store_set_valuesv      (GtkTreeStore *tree_store,
-					       GtkTreeIter  *iter,
-					       gint         *columns,
-					       GValue       *values,
-					       gint          n_values);
-void          gtk_tree_store_set_valist       (GtkTreeStore *tree_store,
-					       GtkTreeIter  *iter,
-					       va_list       var_args);
-gboolean      gtk_tree_store_remove           (GtkTreeStore *tree_store,
-					       GtkTreeIter  *iter);
-void          gtk_tree_store_insert           (GtkTreeStore *tree_store,
-					       GtkTreeIter  *iter,
-					       GtkTreeIter  *parent,
-					       gint          position);
-void          gtk_tree_store_insert_before    (GtkTreeStore *tree_store,
-					       GtkTreeIter  *iter,
-					       GtkTreeIter  *parent,
-					       GtkTreeIter  *sibling);
-void          gtk_tree_store_insert_after     (GtkTreeStore *tree_store,
-					       GtkTreeIter  *iter,
-					       GtkTreeIter  *parent,
-					       GtkTreeIter  *sibling);
-void          gtk_tree_store_insert_with_values (GtkTreeStore *tree_store,
-						 GtkTreeIter  *iter,
-						 GtkTreeIter  *parent,
-						 gint          position,
-						 ...);
-void          gtk_tree_store_insert_with_valuesv (GtkTreeStore *tree_store,
-						  GtkTreeIter  *iter,
-						  GtkTreeIter  *parent,
-						  gint          position,
-						  gint         *columns,
-						  GValue       *values,
-						  gint          n_values);
-void          gtk_tree_store_prepend          (GtkTreeStore *tree_store,
-					       GtkTreeIter  *iter,
-					       GtkTreeIter  *parent);
-void          gtk_tree_store_append           (GtkTreeStore *tree_store,
-					       GtkTreeIter  *iter,
-					       GtkTreeIter  *parent);
-gboolean      gtk_tree_store_is_ancestor      (GtkTreeStore *tree_store,
-					       GtkTreeIter  *iter,
-					       GtkTreeIter  *descendant);
-gint          gtk_tree_store_iter_depth       (GtkTreeStore *tree_store,
-					       GtkTreeIter  *iter);
-void          gtk_tree_store_clear            (GtkTreeStore *tree_store);
-gboolean      gtk_tree_store_iter_is_valid    (GtkTreeStore *tree_store,
-                                               GtkTreeIter  *iter);
-void          gtk_tree_store_reorder          (GtkTreeStore *tree_store,
-                                               GtkTreeIter  *parent,
-                                               gint         *new_order);
-void          gtk_tree_store_swap             (GtkTreeStore *tree_store,
-                                               GtkTreeIter  *a,
-                                               GtkTreeIter  *b);
-void          gtk_tree_store_move_before      (GtkTreeStore *tree_store,
-                                               GtkTreeIter  *iter,
-                                               GtkTreeIter  *position);
-void          gtk_tree_store_move_after       (GtkTreeStore *tree_store,
-                                               GtkTreeIter  *iter,
-                                               GtkTreeIter  *position);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_TREE_STORE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreeview.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreeview.h
deleted file mode 100644
index 9ea61a9f..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreeview.h
+++ /dev/null
@@ -1,429 +0,0 @@
-/* gtktreeview.h
- * Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb@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 __GTK_TREE_VIEW_H__
-#define __GTK_TREE_VIEW_H__
-
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeviewcolumn.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkentry.h>
-
-
-G_BEGIN_DECLS
-
-
-typedef enum
-{
-  /* drop before/after this row */
-  GTK_TREE_VIEW_DROP_BEFORE,
-  GTK_TREE_VIEW_DROP_AFTER,
-  /* drop as a child of this row (with fallback to before or after
-   * if into is not possible)
-   */
-  GTK_TREE_VIEW_DROP_INTO_OR_BEFORE,
-  GTK_TREE_VIEW_DROP_INTO_OR_AFTER
-} GtkTreeViewDropPosition;
-
-#define GTK_TYPE_TREE_VIEW		(gtk_tree_view_get_type ())
-#define GTK_TREE_VIEW(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_VIEW, GtkTreeView))
-#define GTK_TREE_VIEW_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE_VIEW, GtkTreeViewClass))
-#define GTK_IS_TREE_VIEW(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TREE_VIEW))
-#define GTK_IS_TREE_VIEW_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TREE_VIEW))
-#define GTK_TREE_VIEW_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TREE_VIEW, GtkTreeViewClass))
-
-typedef struct _GtkTreeView           GtkTreeView;
-typedef struct _GtkTreeViewClass      GtkTreeViewClass;
-typedef struct _GtkTreeViewPrivate    GtkTreeViewPrivate;
-typedef struct _GtkTreeSelection      GtkTreeSelection;
-typedef struct _GtkTreeSelectionClass GtkTreeSelectionClass;
-
-struct _GtkTreeView
-{
-  GtkContainer parent;
-
-  GtkTreeViewPrivate *priv;
-};
-
-struct _GtkTreeViewClass
-{
-  GtkContainerClass parent_class;
-
-  void     (* set_scroll_adjustments)     (GtkTreeView       *tree_view,
-				           GtkAdjustment     *hadjustment,
-				           GtkAdjustment     *vadjustment);
-  void     (* row_activated)              (GtkTreeView       *tree_view,
-				           GtkTreePath       *path,
-					   GtkTreeViewColumn *column);
-  gboolean (* test_expand_row)            (GtkTreeView       *tree_view,
-				           GtkTreeIter       *iter,
-				           GtkTreePath       *path);
-  gboolean (* test_collapse_row)          (GtkTreeView       *tree_view,
-				           GtkTreeIter       *iter,
-				           GtkTreePath       *path);
-  void     (* row_expanded)               (GtkTreeView       *tree_view,
-				           GtkTreeIter       *iter,
-				           GtkTreePath       *path);
-  void     (* row_collapsed)              (GtkTreeView       *tree_view,
-				           GtkTreeIter       *iter,
-				           GtkTreePath       *path);
-  void     (* columns_changed)            (GtkTreeView       *tree_view);
-  void     (* cursor_changed)             (GtkTreeView       *tree_view);
-
-  /* Key Binding signals */
-  gboolean (* move_cursor)                (GtkTreeView       *tree_view,
-				           GtkMovementStep    step,
-				           gint               count);
-  gboolean (* select_all)                 (GtkTreeView       *tree_view);
-  gboolean (* unselect_all)               (GtkTreeView       *tree_view);
-  gboolean (* select_cursor_row)          (GtkTreeView       *tree_view,
-					   gboolean           start_editing);
-  gboolean (* toggle_cursor_row)          (GtkTreeView       *tree_view);
-  gboolean (* expand_collapse_cursor_row) (GtkTreeView       *tree_view,
-					   gboolean           logical,
-					   gboolean           expand,
-					   gboolean           open_all);
-  gboolean (* select_cursor_parent)       (GtkTreeView       *tree_view);
-  gboolean (* start_interactive_search)   (GtkTreeView       *tree_view);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved0) (void);
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-typedef gboolean (* GtkTreeViewColumnDropFunc) (GtkTreeView             *tree_view,
-						GtkTreeViewColumn       *column,
-						GtkTreeViewColumn       *prev_column,
-						GtkTreeViewColumn       *next_column,
-						gpointer                 data);
-typedef void     (* GtkTreeViewMappingFunc)    (GtkTreeView             *tree_view,
-						GtkTreePath             *path,
-						gpointer                 user_data);
-typedef gboolean (*GtkTreeViewSearchEqualFunc) (GtkTreeModel            *model,
-						gint                     column,
-						const gchar             *key,
-						GtkTreeIter             *iter,
-						gpointer                 search_data);
-typedef gboolean (*GtkTreeViewRowSeparatorFunc) (GtkTreeModel      *model,
-						 GtkTreeIter       *iter,
-						 gpointer           data);
-typedef void     (*GtkTreeViewSearchPositionFunc) (GtkTreeView  *tree_view,
-						   GtkWidget    *search_dialog,
-						   gpointer      user_data);
-
-
-/* Creators */
-GType                  gtk_tree_view_get_type                      (void) G_GNUC_CONST;
-GtkWidget             *gtk_tree_view_new                           (void);
-GtkWidget             *gtk_tree_view_new_with_model                (GtkTreeModel              *model);
-
-/* Accessors */
-GtkTreeModel          *gtk_tree_view_get_model                     (GtkTreeView               *tree_view);
-void                   gtk_tree_view_set_model                     (GtkTreeView               *tree_view,
-								    GtkTreeModel              *model);
-GtkTreeSelection      *gtk_tree_view_get_selection                 (GtkTreeView               *tree_view);
-GtkAdjustment         *gtk_tree_view_get_hadjustment               (GtkTreeView               *tree_view);
-void                   gtk_tree_view_set_hadjustment               (GtkTreeView               *tree_view,
-								    GtkAdjustment             *adjustment);
-GtkAdjustment         *gtk_tree_view_get_vadjustment               (GtkTreeView               *tree_view);
-void                   gtk_tree_view_set_vadjustment               (GtkTreeView               *tree_view,
-								    GtkAdjustment             *adjustment);
-gboolean               gtk_tree_view_get_headers_visible           (GtkTreeView               *tree_view);
-void                   gtk_tree_view_set_headers_visible           (GtkTreeView               *tree_view,
-								    gboolean                   headers_visible);
-void                   gtk_tree_view_columns_autosize              (GtkTreeView               *tree_view);
-gboolean               gtk_tree_view_get_headers_clickable         (GtkTreeView *tree_view);
-void                   gtk_tree_view_set_headers_clickable         (GtkTreeView               *tree_view,
-								    gboolean                   setting);
-void                   gtk_tree_view_set_rules_hint                (GtkTreeView               *tree_view,
-								    gboolean                   setting);
-gboolean               gtk_tree_view_get_rules_hint                (GtkTreeView               *tree_view);
-
-/* Column funtions */
-gint                   gtk_tree_view_append_column                 (GtkTreeView               *tree_view,
-								    GtkTreeViewColumn         *column);
-gint                   gtk_tree_view_remove_column                 (GtkTreeView               *tree_view,
-								    GtkTreeViewColumn         *column);
-gint                   gtk_tree_view_insert_column                 (GtkTreeView               *tree_view,
-								    GtkTreeViewColumn         *column,
-								    gint                       position);
-gint                   gtk_tree_view_insert_column_with_attributes (GtkTreeView               *tree_view,
-								    gint                       position,
-								    const gchar               *title,
-								    GtkCellRenderer           *cell,
-								    ...) G_GNUC_NULL_TERMINATED;
-gint                   gtk_tree_view_insert_column_with_data_func  (GtkTreeView               *tree_view,
-								    gint                       position,
-								    const gchar               *title,
-								    GtkCellRenderer           *cell,
-                                                                    GtkTreeCellDataFunc        func,
-                                                                    gpointer                   data,
-                                                                    GDestroyNotify             dnotify);
-GtkTreeViewColumn     *gtk_tree_view_get_column                    (GtkTreeView               *tree_view,
-								    gint                       n);
-GList                 *gtk_tree_view_get_columns                   (GtkTreeView               *tree_view);
-void                   gtk_tree_view_move_column_after             (GtkTreeView               *tree_view,
-								    GtkTreeViewColumn         *column,
-								    GtkTreeViewColumn         *base_column);
-void                   gtk_tree_view_set_expander_column           (GtkTreeView               *tree_view,
-								    GtkTreeViewColumn         *column);
-GtkTreeViewColumn     *gtk_tree_view_get_expander_column           (GtkTreeView               *tree_view);
-void                   gtk_tree_view_set_column_drag_function      (GtkTreeView               *tree_view,
-								    GtkTreeViewColumnDropFunc  func,
-								    gpointer                   user_data,
-								    GtkDestroyNotify           destroy);
-
-/* Actions */
-void                   gtk_tree_view_scroll_to_point               (GtkTreeView               *tree_view,
-								    gint                       tree_x,
-								    gint                       tree_y);
-void                   gtk_tree_view_scroll_to_cell                (GtkTreeView               *tree_view,
-								    GtkTreePath               *path,
-								    GtkTreeViewColumn         *column,
-								    gboolean                   use_align,
-								    gfloat                     row_align,
-								    gfloat                     col_align);
-void                   gtk_tree_view_row_activated                 (GtkTreeView               *tree_view,
-								    GtkTreePath               *path,
-								    GtkTreeViewColumn         *column);
-void                   gtk_tree_view_expand_all                    (GtkTreeView               *tree_view);
-void                   gtk_tree_view_collapse_all                  (GtkTreeView               *tree_view);
-void                   gtk_tree_view_expand_to_path                (GtkTreeView               *tree_view,
-								    GtkTreePath               *path);
-gboolean               gtk_tree_view_expand_row                    (GtkTreeView               *tree_view,
-								    GtkTreePath               *path,
-								    gboolean                   open_all);
-gboolean               gtk_tree_view_collapse_row                  (GtkTreeView               *tree_view,
-								    GtkTreePath               *path);
-void                   gtk_tree_view_map_expanded_rows             (GtkTreeView               *tree_view,
-								    GtkTreeViewMappingFunc     func,
-								    gpointer                   data);
-gboolean               gtk_tree_view_row_expanded                  (GtkTreeView               *tree_view,
-								    GtkTreePath               *path);
-void                   gtk_tree_view_set_reorderable               (GtkTreeView               *tree_view,
-								    gboolean                   reorderable);
-gboolean               gtk_tree_view_get_reorderable               (GtkTreeView               *tree_view);
-void                   gtk_tree_view_set_cursor                    (GtkTreeView               *tree_view,
-								    GtkTreePath               *path,
-								    GtkTreeViewColumn         *focus_column,
-								    gboolean                   start_editing);
-void                   gtk_tree_view_set_cursor_on_cell            (GtkTreeView               *tree_view,
-								    GtkTreePath               *path,
-								    GtkTreeViewColumn         *focus_column,
-								    GtkCellRenderer           *focus_cell,
-								    gboolean                   start_editing);
-void                   gtk_tree_view_get_cursor                    (GtkTreeView               *tree_view,
-								    GtkTreePath              **path,
-								    GtkTreeViewColumn        **focus_column);
-
-
-/* Layout information */
-GdkWindow             *gtk_tree_view_get_bin_window                (GtkTreeView               *tree_view);
-gboolean               gtk_tree_view_get_path_at_pos               (GtkTreeView               *tree_view,
-								    gint                       x,
-								    gint                       y,
-								    GtkTreePath              **path,
-								    GtkTreeViewColumn        **column,
-								    gint                      *cell_x,
-								    gint                      *cell_y);
-void                   gtk_tree_view_get_cell_area                 (GtkTreeView               *tree_view,
-								    GtkTreePath               *path,
-								    GtkTreeViewColumn         *column,
-								    GdkRectangle              *rect);
-void                   gtk_tree_view_get_background_area           (GtkTreeView               *tree_view,
-								    GtkTreePath               *path,
-								    GtkTreeViewColumn         *column,
-								    GdkRectangle              *rect);
-void                   gtk_tree_view_get_visible_rect              (GtkTreeView               *tree_view,
-								    GdkRectangle              *visible_rect);
-
-#ifndef GTK_DISABLE_DEPRECATED
-void                   gtk_tree_view_widget_to_tree_coords         (GtkTreeView               *tree_view,
-								    gint                       wx,
-								    gint                       wy,
-								    gint                      *tx,
-								    gint                      *ty);
-void                   gtk_tree_view_tree_to_widget_coords         (GtkTreeView               *tree_view,
-								    gint                       tx,
-								    gint                       ty,
-								    gint                      *wx,
-								    gint                      *wy);
-#endif /* !GTK_DISABLE_DEPRECATED */
-gboolean               gtk_tree_view_get_visible_range             (GtkTreeView               *tree_view,
-								    GtkTreePath              **start_path,
-								    GtkTreePath              **end_path);
-
-/* Drag-and-Drop support */
-void                   gtk_tree_view_enable_model_drag_source      (GtkTreeView               *tree_view,
-								    GdkModifierType            start_button_mask,
-								    const GtkTargetEntry      *targets,
-								    gint                       n_targets,
-								    GdkDragAction              actions);
-void                   gtk_tree_view_enable_model_drag_dest        (GtkTreeView               *tree_view,
-								    const GtkTargetEntry      *targets,
-								    gint                       n_targets,
-								    GdkDragAction              actions);
-void                   gtk_tree_view_unset_rows_drag_source        (GtkTreeView               *tree_view);
-void                   gtk_tree_view_unset_rows_drag_dest          (GtkTreeView               *tree_view);
-
-
-/* These are useful to implement your own custom stuff. */
-void                   gtk_tree_view_set_drag_dest_row             (GtkTreeView               *tree_view,
-								    GtkTreePath               *path,
-								    GtkTreeViewDropPosition    pos);
-void                   gtk_tree_view_get_drag_dest_row             (GtkTreeView               *tree_view,
-								    GtkTreePath              **path,
-								    GtkTreeViewDropPosition   *pos);
-gboolean               gtk_tree_view_get_dest_row_at_pos           (GtkTreeView               *tree_view,
-								    gint                       drag_x,
-								    gint                       drag_y,
-								    GtkTreePath              **path,
-								    GtkTreeViewDropPosition   *pos);
-GdkPixmap             *gtk_tree_view_create_row_drag_icon          (GtkTreeView               *tree_view,
-								    GtkTreePath               *path);
-
-/* Interactive search */
-void                       gtk_tree_view_set_enable_search     (GtkTreeView                *tree_view,
-								gboolean                    enable_search);
-gboolean                   gtk_tree_view_get_enable_search     (GtkTreeView                *tree_view);
-gint                       gtk_tree_view_get_search_column     (GtkTreeView                *tree_view);
-void                       gtk_tree_view_set_search_column     (GtkTreeView                *tree_view,
-								gint                        column);
-GtkTreeViewSearchEqualFunc gtk_tree_view_get_search_equal_func (GtkTreeView                *tree_view);
-void                       gtk_tree_view_set_search_equal_func (GtkTreeView                *tree_view,
-								GtkTreeViewSearchEqualFunc  search_equal_func,
-								gpointer                    search_user_data,
-								GtkDestroyNotify            search_destroy);
-
-GtkEntry                     *gtk_tree_view_get_search_entry         (GtkTreeView                   *tree_view);
-void                          gtk_tree_view_set_search_entry         (GtkTreeView                   *tree_view,
-								      GtkEntry                      *entry);
-GtkTreeViewSearchPositionFunc gtk_tree_view_get_search_position_func (GtkTreeView                   *tree_view);
-void                          gtk_tree_view_set_search_position_func (GtkTreeView                   *tree_view,
-								      GtkTreeViewSearchPositionFunc  func,
-								      gpointer                       data,
-								      GDestroyNotify                 destroy);
-
-/* Convert between the different coordinate systems */
-void gtk_tree_view_convert_widget_to_tree_coords       (GtkTreeView *tree_view,
-							gint         wx,
-							gint         wy,
-							gint        *tx,
-							gint        *ty);
-void gtk_tree_view_convert_tree_to_widget_coords       (GtkTreeView *tree_view,
-							gint         tx,
-							gint         ty,
-							gint        *wx,
-							gint        *wy);
-void gtk_tree_view_convert_widget_to_bin_window_coords (GtkTreeView *tree_view,
-							gint         wx,
-							gint         wy,
-							gint        *bx,
-							gint        *by);
-void gtk_tree_view_convert_bin_window_to_widget_coords (GtkTreeView *tree_view,
-							gint         bx,
-							gint         by,
-							gint        *wx,
-							gint        *wy);
-void gtk_tree_view_convert_tree_to_bin_window_coords   (GtkTreeView *tree_view,
-							gint         tx,
-							gint         ty,
-							gint        *bx,
-							gint        *by);
-void gtk_tree_view_convert_bin_window_to_tree_coords   (GtkTreeView *tree_view,
-							gint         bx,
-							gint         by,
-							gint        *tx,
-							gint        *ty);
-
-/* This function should really never be used.  It is just for use by ATK.
- */
-typedef void (* GtkTreeDestroyCountFunc)  (GtkTreeView             *tree_view,
-					   GtkTreePath             *path,
-					   gint                     children,
-					   gpointer                 user_data);
-void gtk_tree_view_set_destroy_count_func (GtkTreeView             *tree_view,
-					   GtkTreeDestroyCountFunc  func,
-					   gpointer                 data,
-					   GtkDestroyNotify         destroy);
-
-void     gtk_tree_view_set_fixed_height_mode (GtkTreeView          *tree_view,
-					      gboolean              enable);
-gboolean gtk_tree_view_get_fixed_height_mode (GtkTreeView          *tree_view);
-void     gtk_tree_view_set_hover_selection   (GtkTreeView          *tree_view,
-					      gboolean              hover);
-gboolean gtk_tree_view_get_hover_selection   (GtkTreeView          *tree_view);
-void     gtk_tree_view_set_hover_expand      (GtkTreeView          *tree_view,
-					      gboolean              expand);
-gboolean gtk_tree_view_get_hover_expand      (GtkTreeView          *tree_view);
-void     gtk_tree_view_set_rubber_banding    (GtkTreeView          *tree_view,
-					      gboolean              enable);
-gboolean gtk_tree_view_get_rubber_banding    (GtkTreeView          *tree_view);
-
-gboolean gtk_tree_view_is_rubber_banding_active (GtkTreeView       *tree_view);
-
-GtkTreeViewRowSeparatorFunc gtk_tree_view_get_row_separator_func (GtkTreeView               *tree_view);
-void                        gtk_tree_view_set_row_separator_func (GtkTreeView                *tree_view,
-								  GtkTreeViewRowSeparatorFunc func,
-								  gpointer                    data,
-								  GtkDestroyNotify            destroy);
-
-GtkTreeViewGridLines        gtk_tree_view_get_grid_lines         (GtkTreeView                *tree_view);
-void                        gtk_tree_view_set_grid_lines         (GtkTreeView                *tree_view,
-								  GtkTreeViewGridLines        grid_lines);
-gboolean                    gtk_tree_view_get_enable_tree_lines  (GtkTreeView                *tree_view);
-void                        gtk_tree_view_set_enable_tree_lines  (GtkTreeView                *tree_view,
-								  gboolean                    enabled);
-void                        gtk_tree_view_set_show_expanders     (GtkTreeView                *tree_view,
-								  gboolean                    enabled);
-gboolean                    gtk_tree_view_get_show_expanders     (GtkTreeView                *tree_view);
-void                        gtk_tree_view_set_level_indentation  (GtkTreeView                *tree_view,
-								  gint                        indentation);
-gint                        gtk_tree_view_get_level_indentation  (GtkTreeView                *tree_view);
-
-/* Convenience functions for setting tooltips */
-void          gtk_tree_view_set_tooltip_row    (GtkTreeView       *tree_view,
-						GtkTooltip        *tooltip,
-						GtkTreePath       *path);
-void          gtk_tree_view_set_tooltip_cell   (GtkTreeView       *tree_view,
-						GtkTooltip        *tooltip,
-						GtkTreePath       *path,
-						GtkTreeViewColumn *column,
-						GtkCellRenderer   *cell);
-gboolean      gtk_tree_view_get_tooltip_context(GtkTreeView       *tree_view,
-						gint              *x,
-						gint              *y,
-						gboolean           keyboard_tip,
-						GtkTreeModel     **model,
-						GtkTreePath      **path,
-						GtkTreeIter       *iter);
-void          gtk_tree_view_set_tooltip_column (GtkTreeView       *tree_view,
-					        gint               column);
-gint          gtk_tree_view_get_tooltip_column (GtkTreeView       *tree_view);
-
-G_END_DECLS
-
-
-#endif /* __GTK_TREE_VIEW_H__ */
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreeviewcolumn.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreeviewcolumn.h
deleted file mode 100644
index d7f14cb4..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktreeviewcolumn.h
+++ /dev/null
@@ -1,241 +0,0 @@
-/* gtktreeviewcolumn.h
- * Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb@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 __GTK_TREE_VIEW_COLUMN_H__
-#define __GTK_TREE_VIEW_COLUMN_H__
-
-#include <glib-object.h>
-#include <gtk/gtkcellrenderer.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreesortable.h>
-
-/* Not needed, retained for compatibility -Yosh */
-#include <gtk/gtkobject.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_TREE_VIEW_COLUMN	     (gtk_tree_view_column_get_type ())
-#define GTK_TREE_VIEW_COLUMN(obj)	     (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_VIEW_COLUMN, GtkTreeViewColumn))
-#define GTK_TREE_VIEW_COLUMN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE_VIEW_COLUMN, GtkTreeViewColumnClass))
-#define GTK_IS_TREE_VIEW_COLUMN(obj)	     (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TREE_VIEW_COLUMN))
-#define GTK_IS_TREE_VIEW_COLUMN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TREE_VIEW_COLUMN))
-#define GTK_TREE_VIEW_COLUMN_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TREE_VIEW_COLUMN, GtkTreeViewColumnClass))
-
-typedef enum
-{
-  GTK_TREE_VIEW_COLUMN_GROW_ONLY,
-  GTK_TREE_VIEW_COLUMN_AUTOSIZE,
-  GTK_TREE_VIEW_COLUMN_FIXED
-} GtkTreeViewColumnSizing;
-
-typedef struct _GtkTreeViewColumn      GtkTreeViewColumn;
-typedef struct _GtkTreeViewColumnClass GtkTreeViewColumnClass;
-
-typedef void (* GtkTreeCellDataFunc) (GtkTreeViewColumn *tree_column,
-				      GtkCellRenderer   *cell,
-				      GtkTreeModel      *tree_model,
-				      GtkTreeIter       *iter,
-				      gpointer           data);
-
-  
-struct _GtkTreeViewColumn
-{
-  GtkObject parent;
-
-  GtkWidget *tree_view;
-  GtkWidget *button;
-  GtkWidget *child;  
-  GtkWidget *arrow;
-  GtkWidget *alignment;
-  GdkWindow *window;
-  GtkCellEditable *editable_widget;
-  gfloat xalign;
-  guint property_changed_signal;
-  gint spacing;
-
-  /* Sizing fields */
-  /* see gtk+/doc/tree-column-sizing.txt for more information on them */
-  GtkTreeViewColumnSizing column_type;
-  gint requested_width;
-  gint button_request;
-  gint resized_width;
-  gint width;
-  gint fixed_width;
-  gint min_width;
-  gint max_width;
-
-  /* dragging columns */
-  gint drag_x;
-  gint drag_y;
-
-  gchar *title;
-  GList *cell_list;
-
-  /* Sorting */
-  guint sort_clicked_signal;
-  guint sort_column_changed_signal;
-  gint sort_column_id;
-  GtkSortType sort_order;
-
-  /* Flags */
-  guint visible             : 1;
-  guint resizable           : 1;
-  guint clickable           : 1;
-  guint dirty               : 1;
-  guint show_sort_indicator : 1;
-  guint maybe_reordered     : 1;
-  guint reorderable         : 1;
-  guint use_resized_width   : 1;
-  guint expand              : 1;
-};
-
-struct _GtkTreeViewColumnClass
-{
-  GtkObjectClass parent_class;
-
-  void (*clicked) (GtkTreeViewColumn *tree_column);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType                   gtk_tree_view_column_get_type            (void) G_GNUC_CONST;
-GtkTreeViewColumn      *gtk_tree_view_column_new                 (void);
-GtkTreeViewColumn      *gtk_tree_view_column_new_with_attributes (const gchar             *title,
-								  GtkCellRenderer         *cell,
-								  ...) G_GNUC_NULL_TERMINATED;
-void                    gtk_tree_view_column_pack_start          (GtkTreeViewColumn       *tree_column,
-								  GtkCellRenderer         *cell,
-								  gboolean                 expand);
-void                    gtk_tree_view_column_pack_end            (GtkTreeViewColumn       *tree_column,
-								  GtkCellRenderer         *cell,
-								  gboolean                 expand);
-void                    gtk_tree_view_column_clear               (GtkTreeViewColumn       *tree_column);
-GList                  *gtk_tree_view_column_get_cell_renderers  (GtkTreeViewColumn       *tree_column);
-void                    gtk_tree_view_column_add_attribute       (GtkTreeViewColumn       *tree_column,
-								  GtkCellRenderer         *cell_renderer,
-								  const gchar             *attribute,
-								  gint                     column);
-void                    gtk_tree_view_column_set_attributes      (GtkTreeViewColumn       *tree_column,
-								  GtkCellRenderer         *cell_renderer,
-								  ...) G_GNUC_NULL_TERMINATED;
-void                    gtk_tree_view_column_set_cell_data_func  (GtkTreeViewColumn       *tree_column,
-								  GtkCellRenderer         *cell_renderer,
-								  GtkTreeCellDataFunc      func,
-								  gpointer                 func_data,
-								  GtkDestroyNotify         destroy);
-void                    gtk_tree_view_column_clear_attributes    (GtkTreeViewColumn       *tree_column,
-								  GtkCellRenderer         *cell_renderer);
-void                    gtk_tree_view_column_set_spacing         (GtkTreeViewColumn       *tree_column,
-								  gint                     spacing);
-gint                    gtk_tree_view_column_get_spacing         (GtkTreeViewColumn       *tree_column);
-void                    gtk_tree_view_column_set_visible         (GtkTreeViewColumn       *tree_column,
-								  gboolean                 visible);
-gboolean                gtk_tree_view_column_get_visible         (GtkTreeViewColumn       *tree_column);
-void                    gtk_tree_view_column_set_resizable       (GtkTreeViewColumn       *tree_column,
-								  gboolean                 resizable);
-gboolean                gtk_tree_view_column_get_resizable       (GtkTreeViewColumn       *tree_column);
-void                    gtk_tree_view_column_set_sizing          (GtkTreeViewColumn       *tree_column,
-								  GtkTreeViewColumnSizing  type);
-GtkTreeViewColumnSizing gtk_tree_view_column_get_sizing          (GtkTreeViewColumn       *tree_column);
-gint                    gtk_tree_view_column_get_width           (GtkTreeViewColumn       *tree_column);
-gint                    gtk_tree_view_column_get_fixed_width     (GtkTreeViewColumn       *tree_column);
-void                    gtk_tree_view_column_set_fixed_width     (GtkTreeViewColumn       *tree_column,
-								  gint                     fixed_width);
-void                    gtk_tree_view_column_set_min_width       (GtkTreeViewColumn       *tree_column,
-								  gint                     min_width);
-gint                    gtk_tree_view_column_get_min_width       (GtkTreeViewColumn       *tree_column);
-void                    gtk_tree_view_column_set_max_width       (GtkTreeViewColumn       *tree_column,
-								  gint                     max_width);
-gint                    gtk_tree_view_column_get_max_width       (GtkTreeViewColumn       *tree_column);
-void                    gtk_tree_view_column_clicked             (GtkTreeViewColumn       *tree_column);
-
-
-
-/* Options for manipulating the column headers
- */
-void                    gtk_tree_view_column_set_title           (GtkTreeViewColumn       *tree_column,
-								  const gchar             *title);
-G_CONST_RETURN gchar   *gtk_tree_view_column_get_title           (GtkTreeViewColumn       *tree_column);
-void                    gtk_tree_view_column_set_expand          (GtkTreeViewColumn       *tree_column,
-								  gboolean                 expand);
-gboolean                gtk_tree_view_column_get_expand          (GtkTreeViewColumn       *tree_column);
-void                    gtk_tree_view_column_set_clickable       (GtkTreeViewColumn       *tree_column,
-								  gboolean                 clickable);
-gboolean                gtk_tree_view_column_get_clickable       (GtkTreeViewColumn       *tree_column);
-void                    gtk_tree_view_column_set_widget          (GtkTreeViewColumn       *tree_column,
-								  GtkWidget               *widget);
-GtkWidget              *gtk_tree_view_column_get_widget          (GtkTreeViewColumn       *tree_column);
-void                    gtk_tree_view_column_set_alignment       (GtkTreeViewColumn       *tree_column,
-								  gfloat                   xalign);
-gfloat                  gtk_tree_view_column_get_alignment       (GtkTreeViewColumn       *tree_column);
-void                    gtk_tree_view_column_set_reorderable     (GtkTreeViewColumn       *tree_column,
-								  gboolean                 reorderable);
-gboolean                gtk_tree_view_column_get_reorderable     (GtkTreeViewColumn       *tree_column);
-
-
-
-/* You probably only want to use gtk_tree_view_column_set_sort_column_id.  The
- * other sorting functions exist primarily to let others do their own custom sorting.
- */
-void                    gtk_tree_view_column_set_sort_column_id  (GtkTreeViewColumn       *tree_column,
-								  gint                     sort_column_id);
-gint                    gtk_tree_view_column_get_sort_column_id  (GtkTreeViewColumn       *tree_column);
-void                    gtk_tree_view_column_set_sort_indicator  (GtkTreeViewColumn       *tree_column,
-								  gboolean                 setting);
-gboolean                gtk_tree_view_column_get_sort_indicator  (GtkTreeViewColumn       *tree_column);
-void                    gtk_tree_view_column_set_sort_order      (GtkTreeViewColumn       *tree_column,
-								  GtkSortType              order);
-GtkSortType             gtk_tree_view_column_get_sort_order      (GtkTreeViewColumn       *tree_column);
-
-
-/* These functions are meant primarily for interaction between the GtkTreeView and the column.
- */
-void                    gtk_tree_view_column_cell_set_cell_data  (GtkTreeViewColumn       *tree_column,
-								  GtkTreeModel            *tree_model,
-								  GtkTreeIter             *iter,
-								  gboolean                 is_expander,
-								  gboolean                 is_expanded);
-void                    gtk_tree_view_column_cell_get_size       (GtkTreeViewColumn       *tree_column,
-								  GdkRectangle            *cell_area,
-								  gint                    *x_offset,
-								  gint                    *y_offset,
-								  gint                    *width,
-								  gint                    *height);
-gboolean                gtk_tree_view_column_cell_is_visible     (GtkTreeViewColumn       *tree_column);
-void                    gtk_tree_view_column_focus_cell          (GtkTreeViewColumn       *tree_column,
-								  GtkCellRenderer         *cell);
-gboolean                gtk_tree_view_column_cell_get_position   (GtkTreeViewColumn       *tree_column,
-					                          GtkCellRenderer         *cell_renderer,
-					                          gint                    *start_pos,
-					                          gint                    *width);
-void                    gtk_tree_view_column_queue_resize        (GtkTreeViewColumn       *tree_column);
-GtkWidget              *gtk_tree_view_column_get_tree_view       (GtkTreeViewColumn       *tree_column);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_TREE_VIEW_COLUMN_H__ */
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktypebuiltins.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktypebuiltins.h
deleted file mode 100644
index 3c3832a1..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktypebuiltins.h
+++ /dev/null
@@ -1,280 +0,0 @@
-
-/* Generated data (by glib-mkenums) */
-
-#ifndef __GTK_TYPE_BUILTINS_H__
-#define __GTK_TYPE_BUILTINS_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-/* enumerations from "gtkaccelgroup.h" */
-GType gtk_accel_flags_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_ACCEL_FLAGS (gtk_accel_flags_get_type())
-/* enumerations from "gtkassistant.h" */
-GType gtk_assistant_page_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_ASSISTANT_PAGE_TYPE (gtk_assistant_page_type_get_type())
-/* enumerations from "gtkbuilder.h" */
-GType gtk_builder_error_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_BUILDER_ERROR (gtk_builder_error_get_type())
-/* enumerations from "gtkcalendar.h" */
-GType gtk_calendar_display_options_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_CALENDAR_DISPLAY_OPTIONS (gtk_calendar_display_options_get_type())
-/* enumerations from "gtkcellrenderer.h" */
-GType gtk_cell_renderer_state_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_CELL_RENDERER_STATE (gtk_cell_renderer_state_get_type())
-GType gtk_cell_renderer_mode_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_CELL_RENDERER_MODE (gtk_cell_renderer_mode_get_type())
-/* enumerations from "gtkcellrendereraccel.h" */
-GType gtk_cell_renderer_accel_mode_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_CELL_RENDERER_ACCEL_MODE (gtk_cell_renderer_accel_mode_get_type())
-/* enumerations from "gtkclist.h" */
-GType gtk_cell_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_CELL_TYPE (gtk_cell_type_get_type())
-GType gtk_clist_drag_pos_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_CLIST_DRAG_POS (gtk_clist_drag_pos_get_type())
-GType gtk_button_action_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_BUTTON_ACTION (gtk_button_action_get_type())
-/* enumerations from "gtkctree.h" */
-GType gtk_ctree_pos_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_CTREE_POS (gtk_ctree_pos_get_type())
-GType gtk_ctree_line_style_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_CTREE_LINE_STYLE (gtk_ctree_line_style_get_type())
-GType gtk_ctree_expander_style_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_CTREE_EXPANDER_STYLE (gtk_ctree_expander_style_get_type())
-GType gtk_ctree_expansion_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_CTREE_EXPANSION_TYPE (gtk_ctree_expansion_type_get_type())
-/* enumerations from "gtkdebug.h" */
-GType gtk_debug_flag_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_DEBUG_FLAG (gtk_debug_flag_get_type())
-/* enumerations from "gtkdialog.h" */
-GType gtk_dialog_flags_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_DIALOG_FLAGS (gtk_dialog_flags_get_type())
-GType gtk_response_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_RESPONSE_TYPE (gtk_response_type_get_type())
-/* enumerations from "gtkdnd.h" */
-GType gtk_dest_defaults_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_DEST_DEFAULTS (gtk_dest_defaults_get_type())
-GType gtk_target_flags_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_TARGET_FLAGS (gtk_target_flags_get_type())
-/* enumerations from "gtkenums.h" */
-GType gtk_anchor_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_ANCHOR_TYPE (gtk_anchor_type_get_type())
-GType gtk_arrow_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_ARROW_TYPE (gtk_arrow_type_get_type())
-GType gtk_attach_options_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_ATTACH_OPTIONS (gtk_attach_options_get_type())
-GType gtk_button_box_style_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_BUTTON_BOX_STYLE (gtk_button_box_style_get_type())
-GType gtk_curve_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_CURVE_TYPE (gtk_curve_type_get_type())
-GType gtk_delete_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_DELETE_TYPE (gtk_delete_type_get_type())
-GType gtk_direction_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_DIRECTION_TYPE (gtk_direction_type_get_type())
-GType gtk_expander_style_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_EXPANDER_STYLE (gtk_expander_style_get_type())
-GType gtk_icon_size_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_ICON_SIZE (gtk_icon_size_get_type())
-GType gtk_sensitivity_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_SENSITIVITY_TYPE (gtk_sensitivity_type_get_type())
-GType gtk_side_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_SIDE_TYPE (gtk_side_type_get_type())
-GType gtk_text_direction_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_TEXT_DIRECTION (gtk_text_direction_get_type())
-GType gtk_justification_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_JUSTIFICATION (gtk_justification_get_type())
-GType gtk_match_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_MATCH_TYPE (gtk_match_type_get_type())
-GType gtk_menu_direction_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_MENU_DIRECTION_TYPE (gtk_menu_direction_type_get_type())
-GType gtk_metric_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_METRIC_TYPE (gtk_metric_type_get_type())
-GType gtk_movement_step_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_MOVEMENT_STEP (gtk_movement_step_get_type())
-GType gtk_scroll_step_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_SCROLL_STEP (gtk_scroll_step_get_type())
-GType gtk_orientation_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_ORIENTATION (gtk_orientation_get_type())
-GType gtk_corner_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_CORNER_TYPE (gtk_corner_type_get_type())
-GType gtk_pack_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_PACK_TYPE (gtk_pack_type_get_type())
-GType gtk_path_priority_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_PATH_PRIORITY_TYPE (gtk_path_priority_type_get_type())
-GType gtk_path_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_PATH_TYPE (gtk_path_type_get_type())
-GType gtk_policy_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_POLICY_TYPE (gtk_policy_type_get_type())
-GType gtk_position_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_POSITION_TYPE (gtk_position_type_get_type())
-GType gtk_preview_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_PREVIEW_TYPE (gtk_preview_type_get_type())
-GType gtk_relief_style_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_RELIEF_STYLE (gtk_relief_style_get_type())
-GType gtk_resize_mode_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_RESIZE_MODE (gtk_resize_mode_get_type())
-GType gtk_signal_run_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_SIGNAL_RUN_TYPE (gtk_signal_run_type_get_type())
-GType gtk_scroll_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_SCROLL_TYPE (gtk_scroll_type_get_type())
-GType gtk_selection_mode_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_SELECTION_MODE (gtk_selection_mode_get_type())
-GType gtk_shadow_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_SHADOW_TYPE (gtk_shadow_type_get_type())
-GType gtk_state_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_STATE_TYPE (gtk_state_type_get_type())
-GType gtk_submenu_direction_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_SUBMENU_DIRECTION (gtk_submenu_direction_get_type())
-GType gtk_submenu_placement_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_SUBMENU_PLACEMENT (gtk_submenu_placement_get_type())
-GType gtk_toolbar_style_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_TOOLBAR_STYLE (gtk_toolbar_style_get_type())
-GType gtk_update_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_UPDATE_TYPE (gtk_update_type_get_type())
-GType gtk_visibility_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_VISIBILITY (gtk_visibility_get_type())
-GType gtk_window_position_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_WINDOW_POSITION (gtk_window_position_get_type())
-GType gtk_window_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_WINDOW_TYPE (gtk_window_type_get_type())
-GType gtk_wrap_mode_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_WRAP_MODE (gtk_wrap_mode_get_type())
-GType gtk_sort_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_SORT_TYPE (gtk_sort_type_get_type())
-GType gtk_im_preedit_style_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_IM_PREEDIT_STYLE (gtk_im_preedit_style_get_type())
-GType gtk_im_status_style_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_IM_STATUS_STYLE (gtk_im_status_style_get_type())
-GType gtk_pack_direction_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_PACK_DIRECTION (gtk_pack_direction_get_type())
-GType gtk_print_pages_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_PRINT_PAGES (gtk_print_pages_get_type())
-GType gtk_page_set_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_PAGE_SET (gtk_page_set_get_type())
-GType gtk_page_orientation_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_PAGE_ORIENTATION (gtk_page_orientation_get_type())
-GType gtk_print_quality_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_PRINT_QUALITY (gtk_print_quality_get_type())
-GType gtk_print_duplex_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_PRINT_DUPLEX (gtk_print_duplex_get_type())
-GType gtk_unit_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_UNIT (gtk_unit_get_type())
-GType gtk_tree_view_grid_lines_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_TREE_VIEW_GRID_LINES (gtk_tree_view_grid_lines_get_type())
-GType gtk_drag_result_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_DRAG_RESULT (gtk_drag_result_get_type())
-/* enumerations from "gtkfilechooser.h" */
-GType gtk_file_chooser_action_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_FILE_CHOOSER_ACTION (gtk_file_chooser_action_get_type())
-GType gtk_file_chooser_confirmation_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_FILE_CHOOSER_CONFIRMATION (gtk_file_chooser_confirmation_get_type())
-GType gtk_file_chooser_error_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_FILE_CHOOSER_ERROR (gtk_file_chooser_error_get_type())
-/* enumerations from "gtkfilefilter.h" */
-GType gtk_file_filter_flags_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_FILE_FILTER_FLAGS (gtk_file_filter_flags_get_type())
-/* enumerations from "gtkicontheme.h" */
-GType gtk_icon_lookup_flags_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_ICON_LOOKUP_FLAGS (gtk_icon_lookup_flags_get_type())
-GType gtk_icon_theme_error_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_ICON_THEME_ERROR (gtk_icon_theme_error_get_type())
-/* enumerations from "gtkiconview.h" */
-GType gtk_icon_view_drop_position_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_ICON_VIEW_DROP_POSITION (gtk_icon_view_drop_position_get_type())
-/* enumerations from "gtkimage.h" */
-GType gtk_image_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_IMAGE_TYPE (gtk_image_type_get_type())
-/* enumerations from "gtkmessagedialog.h" */
-GType gtk_message_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_MESSAGE_TYPE (gtk_message_type_get_type())
-GType gtk_buttons_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_BUTTONS_TYPE (gtk_buttons_type_get_type())
-/* enumerations from "gtknotebook.h" */
-GType gtk_notebook_tab_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_NOTEBOOK_TAB (gtk_notebook_tab_get_type())
-/* enumerations from "gtkobject.h" */
-GType gtk_object_flags_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_OBJECT_FLAGS (gtk_object_flags_get_type())
-GType gtk_arg_flags_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_ARG_FLAGS (gtk_arg_flags_get_type())
-/* enumerations from "gtkprintoperation.h" */
-GType gtk_print_status_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_PRINT_STATUS (gtk_print_status_get_type())
-GType gtk_print_operation_result_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_PRINT_OPERATION_RESULT (gtk_print_operation_result_get_type())
-GType gtk_print_operation_action_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_PRINT_OPERATION_ACTION (gtk_print_operation_action_get_type())
-GType gtk_print_error_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_PRINT_ERROR (gtk_print_error_get_type())
-/* enumerations from "gtkprivate.h" */
-GType gtk_private_flags_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_PRIVATE_FLAGS (gtk_private_flags_get_type())
-/* enumerations from "gtkprogressbar.h" */
-GType gtk_progress_bar_style_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_PROGRESS_BAR_STYLE (gtk_progress_bar_style_get_type())
-GType gtk_progress_bar_orientation_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_PROGRESS_BAR_ORIENTATION (gtk_progress_bar_orientation_get_type())
-/* enumerations from "gtkrc.h" */
-GType gtk_rc_flags_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_RC_FLAGS (gtk_rc_flags_get_type())
-GType gtk_rc_token_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_RC_TOKEN_TYPE (gtk_rc_token_type_get_type())
-/* enumerations from "gtkrecentchooser.h" */
-GType gtk_recent_sort_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_RECENT_SORT_TYPE (gtk_recent_sort_type_get_type())
-GType gtk_recent_chooser_error_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_RECENT_CHOOSER_ERROR (gtk_recent_chooser_error_get_type())
-/* enumerations from "gtkrecentfilter.h" */
-GType gtk_recent_filter_flags_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_RECENT_FILTER_FLAGS (gtk_recent_filter_flags_get_type())
-/* enumerations from "gtkrecentmanager.h" */
-GType gtk_recent_manager_error_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_RECENT_MANAGER_ERROR (gtk_recent_manager_error_get_type())
-/* enumerations from "gtksizegroup.h" */
-GType gtk_size_group_mode_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_SIZE_GROUP_MODE (gtk_size_group_mode_get_type())
-/* enumerations from "gtkspinbutton.h" */
-GType gtk_spin_button_update_policy_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_SPIN_BUTTON_UPDATE_POLICY (gtk_spin_button_update_policy_get_type())
-GType gtk_spin_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_SPIN_TYPE (gtk_spin_type_get_type())
-/* enumerations from "gtktextbuffer.h" */
-GType gtk_text_buffer_target_info_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_TEXT_BUFFER_TARGET_INFO (gtk_text_buffer_target_info_get_type())
-/* enumerations from "gtktextiter.h" */
-GType gtk_text_search_flags_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_TEXT_SEARCH_FLAGS (gtk_text_search_flags_get_type())
-/* enumerations from "gtktextview.h" */
-GType gtk_text_window_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_TEXT_WINDOW_TYPE (gtk_text_window_type_get_type())
-/* enumerations from "gtktoolbar.h" */
-GType gtk_toolbar_child_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_TOOLBAR_CHILD_TYPE (gtk_toolbar_child_type_get_type())
-GType gtk_toolbar_space_style_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_TOOLBAR_SPACE_STYLE (gtk_toolbar_space_style_get_type())
-/* enumerations from "gtktree.h" */
-GType gtk_tree_view_mode_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_TREE_VIEW_MODE (gtk_tree_view_mode_get_type())
-/* enumerations from "gtktreemodel.h" */
-GType gtk_tree_model_flags_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_TREE_MODEL_FLAGS (gtk_tree_model_flags_get_type())
-/* enumerations from "gtktreeview.h" */
-GType gtk_tree_view_drop_position_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_TREE_VIEW_DROP_POSITION (gtk_tree_view_drop_position_get_type())
-/* enumerations from "gtktreeviewcolumn.h" */
-GType gtk_tree_view_column_sizing_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_TREE_VIEW_COLUMN_SIZING (gtk_tree_view_column_sizing_get_type())
-/* enumerations from "gtkuimanager.h" */
-GType gtk_ui_manager_item_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_UI_MANAGER_ITEM_TYPE (gtk_ui_manager_item_type_get_type())
-/* enumerations from "gtkwidget.h" */
-GType gtk_widget_flags_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_WIDGET_FLAGS (gtk_widget_flags_get_type())
-GType gtk_widget_help_type_get_type (void) G_GNUC_CONST;
-#define GTK_TYPE_WIDGET_HELP_TYPE (gtk_widget_help_type_get_type())
-G_END_DECLS
-
-#endif /* __GTK_TYPE_BUILTINS_H__ */
-
-/* Generated data ends here */
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktypeutils.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktypeutils.h
deleted file mode 100644
index 90b97ab1..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtktypeutils.h
+++ /dev/null
@@ -1,267 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_TYPE_UTILS_H__
-#define __GTK_TYPE_UTILS_H__
-
-
-#include <glib-object.h>
-
-
-G_BEGIN_DECLS
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-/* Fundamental Types
- * many of these are just aliases for GLib types to maintain
- * compatibility
- */
-
-#define GTK_TYPE_INVALID G_TYPE_INVALID
-#define GTK_TYPE_NONE    G_TYPE_NONE
-#define GTK_TYPE_ENUM    G_TYPE_ENUM
-#define GTK_TYPE_FLAGS   G_TYPE_FLAGS
-
-/* GtkArg types */
-#define GTK_TYPE_CHAR    G_TYPE_CHAR
-#define GTK_TYPE_UCHAR   G_TYPE_UCHAR
-#define GTK_TYPE_BOOL    G_TYPE_BOOLEAN
-#define GTK_TYPE_INT     G_TYPE_INT
-#define GTK_TYPE_UINT    G_TYPE_UINT
-#define GTK_TYPE_LONG    G_TYPE_LONG
-#define GTK_TYPE_ULONG   G_TYPE_ULONG
-#define GTK_TYPE_FLOAT   G_TYPE_FLOAT
-#define GTK_TYPE_DOUBLE  G_TYPE_DOUBLE
-#define GTK_TYPE_STRING  G_TYPE_STRING
-#define GTK_TYPE_BOXED   G_TYPE_BOXED
-#define GTK_TYPE_POINTER G_TYPE_POINTER
-
-typedef GType GtkFundamentalType;
-
-/* --- type macros --- */
-#define GTK_CLASS_NAME(class)		(g_type_name (G_TYPE_FROM_CLASS (class)))
-#define GTK_CLASS_TYPE(class)		(G_TYPE_FROM_CLASS (class))
-#define GTK_TYPE_IS_OBJECT(type)	(g_type_is_a ((type), GTK_TYPE_OBJECT))
-
-/* outdated macros that really shouldn't e used anymore,
- * use the GLib type system instead
- */
-#define	GTK_TYPE_FUNDAMENTAL_LAST        (G_TYPE_LAST_RESERVED_FUNDAMENTAL - 1)
-#define	GTK_TYPE_FUNDAMENTAL_MAX         (G_TYPE_FUNDAMENTAL_MAX)
-
-#define	GTK_FUNDAMENTAL_TYPE	G_TYPE_FUNDAMENTAL
-#define GTK_STRUCT_OFFSET	G_STRUCT_OFFSET
-
-#endif /* GTK_DISABLE_DEPRECATED */
-
-/* glib macro wrappers (compatibility) */
-#define	GTK_CHECK_CAST		G_TYPE_CHECK_INSTANCE_CAST
-#define	GTK_CHECK_CLASS_CAST	G_TYPE_CHECK_CLASS_CAST
-#define GTK_CHECK_GET_CLASS	G_TYPE_INSTANCE_GET_CLASS
-#define	GTK_CHECK_TYPE		G_TYPE_CHECK_INSTANCE_TYPE
-#define	GTK_CHECK_CLASS_TYPE	G_TYPE_CHECK_CLASS_TYPE
-
-/* glib type wrappers (compatibility) */
-
-typedef GType			GtkType;
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-typedef GTypeInstance		GtkTypeObject;
-typedef GTypeClass		GtkTypeClass;
-typedef GBaseInitFunc		GtkClassInitFunc;
-typedef GInstanceInitFunc	GtkObjectInitFunc;
-
-#endif /* GTK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-/* Builtin Types
- */
-#include <gtk/gtktypebuiltins.h>
-
-G_BEGIN_DECLS
-
-/* urg */
-#define GTK_TYPE_IDENTIFIER (gtk_identifier_get_type ())
-GType gtk_identifier_get_type (void) G_GNUC_CONST;
-
-/* --- typedefs --- */
-/* here we come with some necessary forward declarations for structures and
- * provide some fundamental function signatures
- */
-typedef struct _GtkArg	       	     GtkArg;
-typedef struct _GtkObject   	     GtkObject; /* object forward declaration */
-typedef gboolean (*GtkFunction)	    (gpointer      data);
-typedef void (*GtkDestroyNotify)    (gpointer      data);
-typedef void (*GtkCallbackMarshal)  (GtkObject    *object,
-				     gpointer      data,
-				     guint         n_args,
-				     GtkArg       *args);
-typedef void (*GtkSignalFunc)       (void);
-#define GTK_SIGNAL_FUNC(f)	    ((GtkSignalFunc) (f))
-
-#ifndef GTK_DISABLE_DEPRECATED
-typedef struct _GtkTypeInfo 	     GtkTypeInfo;
-typedef GSignalCMarshaller          GtkSignalMarshaller;
-#endif
-
-#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
-/* Used by gtk_container_foreach_unmarshal () */
-
-/* GtkArg, used to hold differently typed values */
-struct _GtkArg
-{
-  GtkType type;
-  gchar *name;
-  
-  /* this union only defines the required storage types for
-   * the possibile values, thus there is no gint enum_data field,
-   * because that would just be a mere alias for gint int_data.
-   * use the GTK_VALUE_*() and GTK_RETLOC_*() macros to access
-   * the discrete memebers.
-   */
-  union {
-    /* flat values */
-    gchar char_data;
-    guchar uchar_data;
-    gboolean bool_data;
-    gint int_data;
-    guint uint_data;
-    glong long_data;
-    gulong ulong_data;
-    gfloat float_data;
-    gdouble double_data;
-    gchar *string_data;
-    GtkObject *object_data;
-    gpointer pointer_data;
-    
-    /* structured values */
-    struct {
-      GtkSignalFunc f;
-      gpointer d;
-    } signal_data;
-  } d;
-};
-
-/* argument value access macros, these must not contain casts,
- * to allow the usage of these macros in combination with the
- * address operator, e.g. &GTK_VALUE_CHAR (*arg)
- */
-#define GTK_VALUE_CHAR(a)	((a).d.char_data)
-#define GTK_VALUE_UCHAR(a)	((a).d.uchar_data)
-#define GTK_VALUE_BOOL(a)	((a).d.bool_data)
-#define GTK_VALUE_INT(a)	((a).d.int_data)
-#define GTK_VALUE_UINT(a)	((a).d.uint_data)
-#define GTK_VALUE_LONG(a)	((a).d.long_data)
-#define GTK_VALUE_ULONG(a)	((a).d.ulong_data)
-#define GTK_VALUE_FLOAT(a)	((a).d.float_data)
-#define GTK_VALUE_DOUBLE(a)	((a).d.double_data)
-#define GTK_VALUE_STRING(a)	((a).d.string_data)
-#define GTK_VALUE_ENUM(a)	((a).d.int_data)
-#define GTK_VALUE_FLAGS(a)	((a).d.uint_data)
-#define GTK_VALUE_BOXED(a)	((a).d.pointer_data)
-#define GTK_VALUE_OBJECT(a)	((a).d.object_data)
-#define GTK_VALUE_POINTER(a)	((a).d.pointer_data)
-#define GTK_VALUE_SIGNAL(a)	((a).d.signal_data)
-#endif /* !GTK_DISABLE_DEPRECATED || GTK_COMPILATION */
-
-#ifndef GTK_DISABLE_DEPRECATED
-/* return location macros, these all narrow down to
- * pointer types, because return values need to be
- * passed by reference
- */
-#define GTK_RETLOC_CHAR(a)	((gchar*)	(a).d.pointer_data)
-#define GTK_RETLOC_UCHAR(a)	((guchar*)	(a).d.pointer_data)
-#define GTK_RETLOC_BOOL(a)	((gboolean*)	(a).d.pointer_data)
-#define GTK_RETLOC_INT(a)	((gint*)	(a).d.pointer_data)
-#define GTK_RETLOC_UINT(a)	((guint*)	(a).d.pointer_data)
-#define GTK_RETLOC_LONG(a)	((glong*)	(a).d.pointer_data)
-#define GTK_RETLOC_ULONG(a)	((gulong*)	(a).d.pointer_data)
-#define GTK_RETLOC_FLOAT(a)	((gfloat*)	(a).d.pointer_data)
-#define GTK_RETLOC_DOUBLE(a)	((gdouble*)	(a).d.pointer_data)
-#define GTK_RETLOC_STRING(a)	((gchar**)	(a).d.pointer_data)
-#define GTK_RETLOC_ENUM(a)	((gint*)	(a).d.pointer_data)
-#define GTK_RETLOC_FLAGS(a)	((guint*)	(a).d.pointer_data)
-#define GTK_RETLOC_BOXED(a)	((gpointer*)	(a).d.pointer_data)
-#define GTK_RETLOC_OBJECT(a)	((GtkObject**)	(a).d.pointer_data)
-#define GTK_RETLOC_POINTER(a)	((gpointer*)	(a).d.pointer_data)
-/* GTK_RETLOC_SIGNAL() - no such thing */
-
-/* type registration, it is recommended to use
- * g_type_register_static() or
- * g_type_register_dynamic() instead
- */
-struct _GtkTypeInfo
-{
-  gchar			*type_name;
-  guint			 object_size;
-  guint			 class_size;
-  GtkClassInitFunc	 class_init_func;
-  GtkObjectInitFunc	 object_init_func;
-  gpointer		 reserved_1;
-  gpointer		 reserved_2;
-  GtkClassInitFunc	 base_class_init_func;
-};
-
-#endif /* GTK_DISABLE_DEPRECATED */
-
-gpointer	gtk_type_class	(GtkType	 type);
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-GtkType		gtk_type_unique	(GtkType	   parent_type,
-				 const GtkTypeInfo *gtkinfo);
-gpointer	gtk_type_new	(GtkType	 type);
-
-/* --- compatibility defines --- */
-#define	gtk_type_name(type)		 g_type_name (type)
-#define	gtk_type_from_name(name)	 g_type_from_name (name)
-#define	gtk_type_parent(type)		 g_type_parent (type)
-#define	gtk_type_is_a(type, is_a_type)	 g_type_is_a ((type), (is_a_type))
-
-/* enum/flags compatibility functions, we strongly
- * recommend to use the glib enum/flags classes directly
- */
-typedef GEnumValue  GtkEnumValue;
-typedef GFlagsValue GtkFlagValue;
-GtkEnumValue*	gtk_type_enum_get_values	(GtkType	 enum_type);
-GtkFlagValue*	gtk_type_flags_get_values	(GtkType	 flags_type);
-GtkEnumValue*	gtk_type_enum_find_value	(GtkType	 enum_type,
-						 const gchar	*value_name);
-GtkFlagValue*	gtk_type_flags_find_value	(GtkType	 flags_type,
-						 const gchar	*value_name);
-
-#endif /* GTK_DISABLE_DEPRECATED */
-
-#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
-/* deprecated, use g_type_init() instead */
-void		gtk_type_init	(GTypeDebugFlags debug_flags);
-#endif /* !GTK_DISABLE_DEPRECATED || GTK_COMPILATION */
-
-G_END_DECLS
-
-#endif /* __GTK_TYPE_UTILS_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkuimanager.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkuimanager.h
deleted file mode 100644
index 7e1e6ead..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkuimanager.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * GTK - The GIMP Toolkit
- * Copyright (C) 1998, 1999 Red Hat, Inc.
- * All rights reserved.
- *
- * 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 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.
- */
-
-/*
- * Author: James Henstridge <james@daa.com.au>
- *
- * Modified by the GTK+ Team and others 2003.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-#ifndef __GTK_UI_MANAGER_H__
-#define __GTK_UI_MANAGER_H__
-
-
-#include <glib.h>
-#include <glib-object.h>
-#include <gtk/gtkaccelgroup.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkaction.h>
-#include <gtk/gtkactiongroup.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_UI_MANAGER            (gtk_ui_manager_get_type ())
-#define GTK_UI_MANAGER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_UI_MANAGER, GtkUIManager))
-#define GTK_UI_MANAGER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_UI_MANAGER, GtkUIManagerClass))
-#define GTK_IS_UI_MANAGER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_UI_MANAGER))
-#define GTK_IS_UI_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_UI_MANAGER))
-#define GTK_UI_MANAGER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_UI_MANAGER, GtkUIManagerClass))
-
-typedef struct _GtkUIManager      GtkUIManager;
-typedef struct _GtkUIManagerClass GtkUIManagerClass;
-typedef struct _GtkUIManagerPrivate GtkUIManagerPrivate;
-
-
-struct _GtkUIManager {
-  GObject parent;
-
-  /*< private >*/
-
-  GtkUIManagerPrivate *private_data;
-};
-
-struct _GtkUIManagerClass {
-  GObjectClass parent_class;
-
-  /* Signals */
-  void (* add_widget)       (GtkUIManager *merge, 
-                             GtkWidget    *widget);
-  void (* actions_changed)  (GtkUIManager *merge);
-  void (* connect_proxy)    (GtkUIManager *merge,
-			     GtkAction    *action,
-			     GtkWidget    *proxy);
-  void (* disconnect_proxy) (GtkUIManager *merge,
-			     GtkAction    *action,
-			     GtkWidget    *proxy);
-  void (* pre_activate)     (GtkUIManager *merge,
-			     GtkAction    *action);
-  void (* post_activate)    (GtkUIManager *merge,
-			     GtkAction    *action);
-
-  /* Virtual functions */
-  GtkWidget * (* get_widget) (GtkUIManager *manager,
-                              const gchar  *path);
-  GtkAction * (* get_action) (GtkUIManager *manager,
-                              const gchar  *path);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-};
-
-typedef enum {
-  GTK_UI_MANAGER_AUTO         = 0,
-  GTK_UI_MANAGER_MENUBAR      = 1 << 0,
-  GTK_UI_MANAGER_MENU         = 1 << 1,
-  GTK_UI_MANAGER_TOOLBAR      = 1 << 2,
-  GTK_UI_MANAGER_PLACEHOLDER  = 1 << 3,
-  GTK_UI_MANAGER_POPUP        = 1 << 4,
-  GTK_UI_MANAGER_MENUITEM     = 1 << 5,
-  GTK_UI_MANAGER_TOOLITEM     = 1 << 6,
-  GTK_UI_MANAGER_SEPARATOR    = 1 << 7,
-  GTK_UI_MANAGER_ACCELERATOR  = 1 << 8
-} GtkUIManagerItemType;
-
-#ifdef G_OS_WIN32
-/* Reserve old name for DLL ABI backward compatibility */
-#define gtk_ui_manager_add_ui_from_file gtk_ui_manager_add_ui_from_file_utf8
-#endif
-
-GType          gtk_ui_manager_get_type            (void) G_GNUC_CONST;
-GtkUIManager  *gtk_ui_manager_new                 (void);
-void           gtk_ui_manager_set_add_tearoffs    (GtkUIManager          *self,
-						   gboolean               add_tearoffs);
-gboolean       gtk_ui_manager_get_add_tearoffs    (GtkUIManager          *self);
-void           gtk_ui_manager_insert_action_group (GtkUIManager          *self,
-						   GtkActionGroup        *action_group,
-						   gint                   pos);
-void           gtk_ui_manager_remove_action_group (GtkUIManager          *self,
-						   GtkActionGroup        *action_group);
-GList         *gtk_ui_manager_get_action_groups   (GtkUIManager          *self);
-GtkAccelGroup *gtk_ui_manager_get_accel_group     (GtkUIManager          *self);
-GtkWidget     *gtk_ui_manager_get_widget          (GtkUIManager          *self,
-						   const gchar           *path);
-GSList        *gtk_ui_manager_get_toplevels       (GtkUIManager          *self,
-						   GtkUIManagerItemType   types);
-GtkAction     *gtk_ui_manager_get_action          (GtkUIManager          *self,
-						   const gchar           *path);
-guint          gtk_ui_manager_add_ui_from_string  (GtkUIManager          *self,
-						   const gchar           *buffer,
-						   gssize                 length,
-						   GError               **error);
-guint          gtk_ui_manager_add_ui_from_file    (GtkUIManager          *self,
-						   const gchar           *filename,
-						   GError               **error);
-void           gtk_ui_manager_add_ui              (GtkUIManager          *self,
-						   guint                  merge_id,
-						   const gchar           *path,
-						   const gchar           *name,
-						   const gchar           *action,
-						   GtkUIManagerItemType   type,
-						   gboolean               top);
-void           gtk_ui_manager_remove_ui           (GtkUIManager          *self,
-						   guint                  merge_id);
-gchar         *gtk_ui_manager_get_ui              (GtkUIManager          *self);
-void           gtk_ui_manager_ensure_update       (GtkUIManager          *self);
-guint          gtk_ui_manager_new_merge_id        (GtkUIManager          *self);
-
-G_END_DECLS
-
-#endif /* __GTK_UI_MANAGER_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvbbox.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvbbox.h
deleted file mode 100644
index 8c21273c..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvbbox.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_VBBOX_H__
-#define __GTK_VBBOX_H__
-
-
-#include <gtk/gtkbbox.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_VBUTTON_BOX            (gtk_vbutton_box_get_type ())
-#define GTK_VBUTTON_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_VBUTTON_BOX, GtkVButtonBox))
-#define GTK_VBUTTON_BOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_VBUTTON_BOX, GtkVButtonBoxClass))
-#define GTK_IS_VBUTTON_BOX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_VBUTTON_BOX))
-#define GTK_IS_VBUTTON_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VBUTTON_BOX))
-#define GTK_VBUTTON_BOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_VBUTTON_BOX, GtkVButtonBoxClass))
-
-
-typedef struct _GtkVButtonBox       GtkVButtonBox;
-typedef struct _GtkVButtonBoxClass  GtkVButtonBoxClass;
-
-struct _GtkVButtonBox
-{
-  GtkButtonBox button_box;
-};
-
-struct _GtkVButtonBoxClass
-{
-  GtkButtonBoxClass parent_class;
-};
-
-
-GType      gtk_vbutton_box_get_type (void) G_GNUC_CONST;
-GtkWidget *gtk_vbutton_box_new      (void);
-
-/* buttons can be added by gtk_container_add() */
-
-#ifndef GTK_DISABLE_DEPRECATED
-gint gtk_vbutton_box_get_spacing_default (void);
-void gtk_vbutton_box_set_spacing_default (gint spacing);
-
-GtkButtonBoxStyle gtk_vbutton_box_get_layout_default (void);
-void gtk_vbutton_box_set_layout_default (GtkButtonBoxStyle layout);
-#endif
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_VBBOX_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvbox.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvbox.h
deleted file mode 100644
index 3cdb2ad1..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvbox.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_VBOX_H__
-#define __GTK_VBOX_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkbox.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_VBOX		 (gtk_vbox_get_type ())
-#define GTK_VBOX(obj)		 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_VBOX, GtkVBox))
-#define GTK_VBOX_CLASS(klass)	 (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_VBOX, GtkVBoxClass))
-#define GTK_IS_VBOX(obj)	 (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_VBOX))
-#define GTK_IS_VBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VBOX))
-#define GTK_VBOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_VBOX, GtkVBoxClass))
-
-
-typedef struct _GtkVBox	      GtkVBox;
-typedef struct _GtkVBoxClass  GtkVBoxClass;
-
-struct _GtkVBox
-{
-  GtkBox box;
-};
-
-struct _GtkVBoxClass
-{
-  GtkBoxClass parent_class;
-};
-
-
-GType	   gtk_vbox_get_type (void) G_GNUC_CONST;
-GtkWidget* gtk_vbox_new	     (gboolean homogeneous,
-			      gint spacing);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_VBOX_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkversion.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkversion.h
deleted file mode 100644
index 191bbe7a..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkversion.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-1999.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_VERSION_H__
-#define __GTK_VERSION_H__
-
-/* compile time version
- */
-#define GTK_MAJOR_VERSION				(2)
-#define GTK_MINOR_VERSION				(12)
-#define GTK_MICRO_VERSION				(12)
-#define GTK_BINARY_AGE					(1212)
-#define GTK_INTERFACE_AGE				(12)
-
-/* check whether a Gtk+ version equal to or greater than
- * major.minor.micro is present.
- */
-#define	GTK_CHECK_VERSION(major,minor,micro)	\
-    (GTK_MAJOR_VERSION > (major) || \
-     (GTK_MAJOR_VERSION == (major) && GTK_MINOR_VERSION > (minor)) || \
-     (GTK_MAJOR_VERSION == (major) && GTK_MINOR_VERSION == (minor) && \
-      GTK_MICRO_VERSION >= (micro)))
-
-
-#endif /* __GTK_VERSION_H__ */
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkviewport.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkviewport.h
deleted file mode 100644
index 8b64f174..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkviewport.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_VIEWPORT_H__
-#define __GTK_VIEWPORT_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkadjustment.h>
-#include <gtk/gtkbin.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_VIEWPORT            (gtk_viewport_get_type ())
-#define GTK_VIEWPORT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_VIEWPORT, GtkViewport))
-#define GTK_VIEWPORT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_VIEWPORT, GtkViewportClass))
-#define GTK_IS_VIEWPORT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_VIEWPORT))
-#define GTK_IS_VIEWPORT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VIEWPORT))
-#define GTK_VIEWPORT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_VIEWPORT, GtkViewportClass))
-
-
-typedef struct _GtkViewport       GtkViewport;
-typedef struct _GtkViewportClass  GtkViewportClass;
-
-struct _GtkViewport
-{
-  GtkBin bin;
-
-  GtkShadowType shadow_type;
-  GdkWindow *view_window;
-  GdkWindow *bin_window;
-  GtkAdjustment *hadjustment;
-  GtkAdjustment *vadjustment;
-};
-
-struct _GtkViewportClass
-{
-  GtkBinClass parent_class;
-
-  void	(*set_scroll_adjustments)	(GtkViewport	*viewport,
-					 GtkAdjustment	*hadjustment,
-					 GtkAdjustment	*vadjustment);
-};
-
-
-GType          gtk_viewport_get_type        (void) G_GNUC_CONST;
-GtkWidget*     gtk_viewport_new             (GtkAdjustment *hadjustment,
-					     GtkAdjustment *vadjustment);
-GtkAdjustment* gtk_viewport_get_hadjustment (GtkViewport   *viewport);
-GtkAdjustment* gtk_viewport_get_vadjustment (GtkViewport   *viewport);
-void           gtk_viewport_set_hadjustment (GtkViewport   *viewport,
-					     GtkAdjustment *adjustment);
-void           gtk_viewport_set_vadjustment (GtkViewport   *viewport,
-					     GtkAdjustment *adjustment);
-void           gtk_viewport_set_shadow_type (GtkViewport   *viewport,
-					     GtkShadowType  type);
-GtkShadowType  gtk_viewport_get_shadow_type (GtkViewport   *viewport);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_VIEWPORT_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvolumebutton.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvolumebutton.h
deleted file mode 100644
index 069c1228..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvolumebutton.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2007 Red Hat, Inc.
- *
- * Authors:
- * - Bastien Nocera <bnocera@redhat.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.
- */
-
-/*
- * Modified by the GTK+ Team and others 2007.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_VOLUME_BUTTON_H__
-#define __GTK_VOLUME_BUTTON_H__
-
-#include <gtk/gtkscalebutton.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_VOLUME_BUTTON                 (gtk_volume_button_get_type ())
-#define GTK_VOLUME_BUTTON(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_VOLUME_BUTTON, GtkVolumeButton))
-#define GTK_VOLUME_BUTTON_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_VOLUME_BUTTON, GtkVolumeeButtonClass))
-#define GTK_IS_VOLUME_BUTTON(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_VOLUME_BUTTON))
-#define GTK_IS_VOLUME_BUTTON_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VOLUME_BUTTON))
-#define GTK_VOLUME_BUTTON_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_VOLUME_BUTTON, GtkVolumeButtonClass))
-
-typedef struct _GtkVolumeButton       GtkVolumeButton;
-typedef struct _GtkVolumeButtonClass  GtkVolumeButtonClass;
-
-struct _GtkVolumeButtonClass
-{
-  GtkScaleButtonClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType		gtk_volume_button_get_type	(void) G_GNUC_CONST;
-GtkWidget*	gtk_volume_button_new		(void);
-
-G_END_DECLS
-
-#endif /* __GTK_VOLUME_BUTTON_H__ */
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvpaned.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvpaned.h
deleted file mode 100644
index 10bb9a0c..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvpaned.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_VPANED_H__
-#define __GTK_VPANED_H__
-
-#include <gtk/gtkpaned.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_VPANED            (gtk_vpaned_get_type ())
-#define GTK_VPANED(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_VPANED, GtkVPaned))
-#define GTK_VPANED_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_VPANED, GtkVPanedClass))
-#define GTK_IS_VPANED(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_VPANED))
-#define GTK_IS_VPANED_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VPANED))
-#define GTK_VPANED_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_VPANED, GtkVPanedClass))
-
-
-typedef struct _GtkVPaned      GtkVPaned;
-typedef struct _GtkVPanedClass GtkVPanedClass;
-
-struct _GtkVPaned
-{
-  GtkPaned paned;
-};
-
-struct _GtkVPanedClass
-{
-  GtkPanedClass parent_class;
-};
-
-GType      gtk_vpaned_get_type (void) G_GNUC_CONST;
-GtkWidget *gtk_vpaned_new      (void);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_VPANED_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvruler.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvruler.h
deleted file mode 100644
index 2b27e52f..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvruler.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-/*
- * NOTE this widget is considered too specialized/little-used for
- * GTK+, and will in the future be moved to some other package.  If
- * your application needs this widget, feel free to use it, as the
- * widget does work and is useful in some applications; it's just not
- * of general interest. However, we are not accepting new features for
- * the widget, and it will eventually move out of the GTK+
- * distribution.
- */
-
-#ifndef __GTK_VRULER_H__
-#define __GTK_VRULER_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkruler.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_VRULER            (gtk_vruler_get_type ())
-#define GTK_VRULER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_VRULER, GtkVRuler))
-#define GTK_VRULER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_VRULER, GtkVRulerClass))
-#define GTK_IS_VRULER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_VRULER))
-#define GTK_IS_VRULER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VRULER))
-#define GTK_VRULER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_VRULER, GtkVRulerClass))
-
-
-typedef struct _GtkVRuler       GtkVRuler;
-typedef struct _GtkVRulerClass  GtkVRulerClass;
-
-struct _GtkVRuler
-{
-  GtkRuler ruler;
-};
-
-struct _GtkVRulerClass
-{
-  GtkRulerClass parent_class;
-};
-
-
-GType      gtk_vruler_get_type (void) G_GNUC_CONST;
-GtkWidget* gtk_vruler_new      (void);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_VRULER_H__ */
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvscale.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvscale.h
deleted file mode 100644
index 8661b751..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvscale.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_VSCALE_H__
-#define __GTK_VSCALE_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkscale.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_VSCALE            (gtk_vscale_get_type ())
-#define GTK_VSCALE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_VSCALE, GtkVScale))
-#define GTK_VSCALE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_VSCALE, GtkVScaleClass))
-#define GTK_IS_VSCALE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_VSCALE))
-#define GTK_IS_VSCALE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VSCALE))
-#define GTK_VSCALE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_VSCALE, GtkVScaleClass))
-
-
-typedef struct _GtkVScale       GtkVScale;
-typedef struct _GtkVScaleClass  GtkVScaleClass;
-
-struct _GtkVScale
-{
-  GtkScale scale;
-};
-
-struct _GtkVScaleClass
-{
-  GtkScaleClass parent_class;
-};
-
-
-GType      gtk_vscale_get_type       (void) G_GNUC_CONST;
-GtkWidget* gtk_vscale_new            (GtkAdjustment *adjustment);
-GtkWidget* gtk_vscale_new_with_range (gdouble        min,
-                                      gdouble        max,
-                                      gdouble        step);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_VSCALE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvscrollbar.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvscrollbar.h
deleted file mode 100644
index bdd6c3d0..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvscrollbar.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_VSCROLLBAR_H__
-#define __GTK_VSCROLLBAR_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkscrollbar.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_VSCROLLBAR            (gtk_vscrollbar_get_type ())
-#define GTK_VSCROLLBAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_VSCROLLBAR, GtkVScrollbar))
-#define GTK_VSCROLLBAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_VSCROLLBAR, GtkVScrollbarClass))
-#define GTK_IS_VSCROLLBAR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_VSCROLLBAR))
-#define GTK_IS_VSCROLLBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VSCROLLBAR))
-#define GTK_VSCROLLBAR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_VSCROLLBAR, GtkVScrollbarClass))
-
-
-typedef struct _GtkVScrollbar       GtkVScrollbar;
-typedef struct _GtkVScrollbarClass  GtkVScrollbarClass;
-
-struct _GtkVScrollbar
-{
-  GtkScrollbar scrollbar;
-};
-
-struct _GtkVScrollbarClass
-{
-  GtkScrollbarClass parent_class;
-};
-
-
-GType      gtk_vscrollbar_get_type (void) G_GNUC_CONST;
-GtkWidget* gtk_vscrollbar_new      (GtkAdjustment *adjustment);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_VSCROLLBAR_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvseparator.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvseparator.h
deleted file mode 100644
index e7fd88b0..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkvseparator.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_VSEPARATOR_H__
-#define __GTK_VSEPARATOR_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkseparator.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_VSEPARATOR                  (gtk_vseparator_get_type ())
-#define GTK_VSEPARATOR(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_VSEPARATOR, GtkVSeparator))
-#define GTK_VSEPARATOR_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_VSEPARATOR, GtkVSeparatorClass))
-#define GTK_IS_VSEPARATOR(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_VSEPARATOR))
-#define GTK_IS_VSEPARATOR_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VSEPARATOR))
-#define GTK_VSEPARATOR_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_VSEPARATOR, GtkVSeparatorClass))
-
-
-typedef struct _GtkVSeparator       GtkVSeparator;
-typedef struct _GtkVSeparatorClass  GtkVSeparatorClass;
-
-struct _GtkVSeparator
-{
-  GtkSeparator separator;
-};
-
-struct _GtkVSeparatorClass
-{
-  GtkSeparatorClass parent_class;
-};
-
-
-GType      gtk_vseparator_get_type (void) G_GNUC_CONST;
-GtkWidget* gtk_vseparator_new      (void);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_SEPARATOR_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkwidget.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkwidget.h
deleted file mode 100644
index b7f889ab..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkwidget.h
+++ /dev/null
@@ -1,828 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_WIDGET_H__
-#define __GTK_WIDGET_H__
-
-#include <gdk/gdk.h>
-#include <gtk/gtkaccelgroup.h>
-#include <gtk/gtkobject.h>
-#include <gtk/gtkadjustment.h>
-#include <gtk/gtkstyle.h>
-#include <gtk/gtksettings.h>
-#include <atk/atkobject.h>
-
-G_BEGIN_DECLS
-
-/* The flags that are used by GtkWidget on top of the
- * flags field of GtkObject.
- */
-typedef enum
-{
-  GTK_TOPLEVEL         = 1 << 4,
-  GTK_NO_WINDOW        = 1 << 5,
-  GTK_REALIZED         = 1 << 6,
-  GTK_MAPPED           = 1 << 7,
-  GTK_VISIBLE          = 1 << 8,
-  GTK_SENSITIVE        = 1 << 9,
-  GTK_PARENT_SENSITIVE = 1 << 10,
-  GTK_CAN_FOCUS        = 1 << 11,
-  GTK_HAS_FOCUS        = 1 << 12,
-
-  /* widget is allowed to receive the default via gtk_widget_grab_default
-   * and will reserve space to draw the default if possible
-   */
-  GTK_CAN_DEFAULT      = 1 << 13,
-
-  /* the widget currently is receiving the default action and should be drawn
-   * appropriately if possible
-   */
-  GTK_HAS_DEFAULT      = 1 << 14,
-
-  GTK_HAS_GRAB	       = 1 << 15,
-  GTK_RC_STYLE	       = 1 << 16,
-  GTK_COMPOSITE_CHILD  = 1 << 17,
-  GTK_NO_REPARENT      = 1 << 18,
-  GTK_APP_PAINTABLE    = 1 << 19,
-
-  /* the widget when focused will receive the default action and have
-   * HAS_DEFAULT set even if there is a different widget set as default
-   */
-  GTK_RECEIVES_DEFAULT = 1 << 20,
-
-  GTK_DOUBLE_BUFFERED  = 1 << 21,
-  GTK_NO_SHOW_ALL      = 1 << 22
-} GtkWidgetFlags;
-
-/* Kinds of widget-specific help */
-typedef enum
-{
-  GTK_WIDGET_HELP_TOOLTIP,
-  GTK_WIDGET_HELP_WHATS_THIS
-} GtkWidgetHelpType;
-
-/* Macro for casting a pointer to a GtkWidget or GtkWidgetClass pointer.
- * Macros for testing whether `widget' or `klass' are of type GTK_TYPE_WIDGET.
- */
-#define GTK_TYPE_WIDGET			  (gtk_widget_get_type ())
-#define GTK_WIDGET(widget)		  (G_TYPE_CHECK_INSTANCE_CAST ((widget), GTK_TYPE_WIDGET, GtkWidget))
-#define GTK_WIDGET_CLASS(klass)		  (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WIDGET, GtkWidgetClass))
-#define GTK_IS_WIDGET(widget)		  (G_TYPE_CHECK_INSTANCE_TYPE ((widget), GTK_TYPE_WIDGET))
-#define GTK_IS_WIDGET_CLASS(klass)	  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WIDGET))
-#define GTK_WIDGET_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_WIDGET, GtkWidgetClass))
-
-/* Macros for extracting various fields from GtkWidget and GtkWidgetClass.
- */
-#define GTK_WIDGET_TYPE(wid)		  (GTK_OBJECT_TYPE (wid))
-#define GTK_WIDGET_STATE(wid)		  (GTK_WIDGET (wid)->state)
-#define GTK_WIDGET_SAVED_STATE(wid)	  (GTK_WIDGET (wid)->saved_state)
-
-/* Macros for extracting the widget flags from GtkWidget.
- */
-#define GTK_WIDGET_FLAGS(wid)		  (GTK_OBJECT_FLAGS (wid))
-#define GTK_WIDGET_TOPLEVEL(wid)	  ((GTK_WIDGET_FLAGS (wid) & GTK_TOPLEVEL) != 0)
-#define GTK_WIDGET_NO_WINDOW(wid)	  ((GTK_WIDGET_FLAGS (wid) & GTK_NO_WINDOW) != 0)
-#define GTK_WIDGET_REALIZED(wid)	  ((GTK_WIDGET_FLAGS (wid) & GTK_REALIZED) != 0)
-#define GTK_WIDGET_MAPPED(wid)		  ((GTK_WIDGET_FLAGS (wid) & GTK_MAPPED) != 0)
-#define GTK_WIDGET_VISIBLE(wid)		  ((GTK_WIDGET_FLAGS (wid) & GTK_VISIBLE) != 0)
-#define GTK_WIDGET_DRAWABLE(wid)	  (GTK_WIDGET_VISIBLE (wid) && GTK_WIDGET_MAPPED (wid))
-#define GTK_WIDGET_SENSITIVE(wid)	  ((GTK_WIDGET_FLAGS (wid) & GTK_SENSITIVE) != 0)
-#define GTK_WIDGET_PARENT_SENSITIVE(wid)  ((GTK_WIDGET_FLAGS (wid) & GTK_PARENT_SENSITIVE) != 0)
-#define GTK_WIDGET_IS_SENSITIVE(wid)	  (GTK_WIDGET_SENSITIVE (wid) && \
-					   GTK_WIDGET_PARENT_SENSITIVE (wid))
-#define GTK_WIDGET_CAN_FOCUS(wid)	  ((GTK_WIDGET_FLAGS (wid) & GTK_CAN_FOCUS) != 0)
-#define GTK_WIDGET_HAS_FOCUS(wid)	  ((GTK_WIDGET_FLAGS (wid) & GTK_HAS_FOCUS) != 0)
-#define GTK_WIDGET_CAN_DEFAULT(wid)	  ((GTK_WIDGET_FLAGS (wid) & GTK_CAN_DEFAULT) != 0)
-#define GTK_WIDGET_HAS_DEFAULT(wid)	  ((GTK_WIDGET_FLAGS (wid) & GTK_HAS_DEFAULT) != 0)
-#define GTK_WIDGET_HAS_GRAB(wid)	  ((GTK_WIDGET_FLAGS (wid) & GTK_HAS_GRAB) != 0)
-#define GTK_WIDGET_RC_STYLE(wid)	  ((GTK_WIDGET_FLAGS (wid) & GTK_RC_STYLE) != 0)
-#define GTK_WIDGET_COMPOSITE_CHILD(wid)	  ((GTK_WIDGET_FLAGS (wid) & GTK_COMPOSITE_CHILD) != 0)
-#define GTK_WIDGET_APP_PAINTABLE(wid)	  ((GTK_WIDGET_FLAGS (wid) & GTK_APP_PAINTABLE) != 0)
-#define GTK_WIDGET_RECEIVES_DEFAULT(wid)  ((GTK_WIDGET_FLAGS (wid) & GTK_RECEIVES_DEFAULT) != 0)
-#define GTK_WIDGET_DOUBLE_BUFFERED(wid)	  ((GTK_WIDGET_FLAGS (wid) & GTK_DOUBLE_BUFFERED) != 0)
-  
-/* Macros for setting and clearing widget flags.
- */
-#define GTK_WIDGET_SET_FLAGS(wid,flag)	  G_STMT_START{ (GTK_WIDGET_FLAGS (wid) |= (flag)); }G_STMT_END
-#define GTK_WIDGET_UNSET_FLAGS(wid,flag)  G_STMT_START{ (GTK_WIDGET_FLAGS (wid) &= ~(flag)); }G_STMT_END
-
-#define GTK_TYPE_REQUISITION              (gtk_requisition_get_type ())
-
-/* forward declaration to avoid excessive includes (and concurrent includes)
- */
-typedef struct _GtkRequisition	   GtkRequisition;
-typedef 	GdkRectangle	   GtkAllocation;
-typedef struct _GtkSelectionData   GtkSelectionData;
-typedef struct _GtkWidgetClass	   GtkWidgetClass;
-typedef struct _GtkWidgetAuxInfo   GtkWidgetAuxInfo;
-typedef struct _GtkWidgetShapeInfo GtkWidgetShapeInfo;
-typedef struct _GtkClipboard	   GtkClipboard;
-typedef struct _GtkTooltip         GtkTooltip;
-typedef struct _GtkWindow          GtkWindow;
-typedef void     (*GtkCallback)        (GtkWidget        *widget,
-					gpointer	  data);
-
-/* A requisition is a desired amount of space which a
- *  widget may request.
- */
-struct _GtkRequisition
-{
-  gint width;
-  gint height;
-};
-
-/* The widget is the base of the tree for displayable objects.
- *  (A displayable object is one which takes up some amount
- *  of screen real estate). It provides a common base and interface
- *  which actual widgets must adhere to.
- */
-struct _GtkWidget
-{
-  /* The object structure needs to be the first
-   *  element in the widget structure in order for
-   *  the object mechanism to work correctly. This
-   *  allows a GtkWidget pointer to be cast to a
-   *  GtkObject pointer.
-   */
-  GtkObject object;
-  
-  /* 16 bits of internally used private flags.
-   * this will be packed into the same 4 byte alignment frame that
-   * state and saved_state go. we therefore don't waste any new
-   * space on this.
-   */
-  guint16 private_flags;
-  
-  /* The state of the widget. There are actually only
-   *  5 widget states (defined in "gtkenums.h").
-   */
-  guint8 state;
-  
-  /* The saved state of the widget. When a widget's state
-   *  is changed to GTK_STATE_INSENSITIVE via
-   *  "gtk_widget_set_state" or "gtk_widget_set_sensitive"
-   *  the old state is kept around in this field. The state
-   *  will be restored once the widget gets sensitive again.
-   */
-  guint8 saved_state;
-  
-  /* The widget's name. If the widget does not have a name
-   *  (the name is NULL), then its name (as returned by
-   *  "gtk_widget_get_name") is its class's name.
-   * Among other things, the widget name is used to determine
-   *  the style to use for a widget.
-   */
-  gchar *name;
-  
-  /*< public >*/
-
-  /* The style for the widget. The style contains the
-   *  colors the widget should be drawn in for each state
-   *  along with graphics contexts used to draw with and
-   *  the font to use for text.
-   */
-  GtkStyle *style;
-  
-  /* The widget's desired size.
-   */
-  GtkRequisition requisition;
-  
-  /* The widget's allocated size.
-   */
-  GtkAllocation allocation;
-  
-  /* The widget's window or its parent window if it does
-   *  not have a window. (Which will be indicated by the
-   *  GTK_NO_WINDOW flag being set).
-   */
-  GdkWindow *window;
-  
-  /* The widget's parent.
-   */
-  GtkWidget *parent;
-};
-
-struct _GtkWidgetClass
-{
-  /* The object class structure needs to be the first
-   *  element in the widget class structure in order for
-   *  the class mechanism to work correctly. This allows a
-   *  GtkWidgetClass pointer to be cast to a GtkObjectClass
-   *  pointer.
-   */
-  GtkObjectClass parent_class;
-
-  /*< public >*/
-  
-  guint activate_signal;
-
-  guint set_scroll_adjustments_signal;
-
-  /*< private >*/
-  
-  /* seldomly overidden */
-  void (*dispatch_child_properties_changed) (GtkWidget   *widget,
-					     guint        n_pspecs,
-					     GParamSpec **pspecs);
-
-  /* basics */
-  void (* show)		       (GtkWidget        *widget);
-  void (* show_all)            (GtkWidget        *widget);
-  void (* hide)		       (GtkWidget        *widget);
-  void (* hide_all)            (GtkWidget        *widget);
-  void (* map)		       (GtkWidget        *widget);
-  void (* unmap)	       (GtkWidget        *widget);
-  void (* realize)	       (GtkWidget        *widget);
-  void (* unrealize)	       (GtkWidget        *widget);
-  void (* size_request)	       (GtkWidget        *widget,
-				GtkRequisition   *requisition);
-  void (* size_allocate)       (GtkWidget        *widget,
-				GtkAllocation    *allocation);
-  void (* state_changed)       (GtkWidget        *widget,
-				GtkStateType   	  previous_state);
-  void (* parent_set)	       (GtkWidget        *widget,
-				GtkWidget        *previous_parent);
-  void (* hierarchy_changed)   (GtkWidget        *widget,
-				GtkWidget        *previous_toplevel);
-  void (* style_set)	       (GtkWidget        *widget,
-				GtkStyle         *previous_style);
-  void (* direction_changed)   (GtkWidget        *widget,
-				GtkTextDirection  previous_direction);
-  void (* grab_notify)         (GtkWidget        *widget,
-				gboolean          was_grabbed);
-  void (* child_notify)        (GtkWidget	 *widget,
-				GParamSpec       *pspec);
-  
-  /* Mnemonics */
-  gboolean (* mnemonic_activate) (GtkWidget    *widget,
-				  gboolean      group_cycling);
-  
-  /* explicit focus */
-  void     (* grab_focus)      (GtkWidget        *widget);
-  gboolean (* focus)           (GtkWidget        *widget,
-                                GtkDirectionType  direction);
-  
-  /* events */
-  gboolean (* event)			(GtkWidget	     *widget,
-					 GdkEvent	     *event);
-  gboolean (* button_press_event)	(GtkWidget	     *widget,
-					 GdkEventButton      *event);
-  gboolean (* button_release_event)	(GtkWidget	     *widget,
-					 GdkEventButton      *event);
-  gboolean (* scroll_event)		(GtkWidget           *widget,
-					 GdkEventScroll      *event);
-  gboolean (* motion_notify_event)	(GtkWidget	     *widget,
-					 GdkEventMotion      *event);
-  gboolean (* delete_event)		(GtkWidget	     *widget,
-					 GdkEventAny	     *event);
-  gboolean (* destroy_event)		(GtkWidget	     *widget,
-					 GdkEventAny	     *event);
-  gboolean (* expose_event)		(GtkWidget	     *widget,
-					 GdkEventExpose      *event);
-  gboolean (* key_press_event)		(GtkWidget	     *widget,
-					 GdkEventKey	     *event);
-  gboolean (* key_release_event)	(GtkWidget	     *widget,
-					 GdkEventKey	     *event);
-  gboolean (* enter_notify_event)	(GtkWidget	     *widget,
-					 GdkEventCrossing    *event);
-  gboolean (* leave_notify_event)	(GtkWidget	     *widget,
-					 GdkEventCrossing    *event);
-  gboolean (* configure_event)		(GtkWidget	     *widget,
-					 GdkEventConfigure   *event);
-  gboolean (* focus_in_event)		(GtkWidget	     *widget,
-					 GdkEventFocus       *event);
-  gboolean (* focus_out_event)		(GtkWidget	     *widget,
-					 GdkEventFocus       *event);
-  gboolean (* map_event)		(GtkWidget	     *widget,
-					 GdkEventAny	     *event);
-  gboolean (* unmap_event)		(GtkWidget	     *widget,
-					 GdkEventAny	     *event);
-  gboolean (* property_notify_event)	(GtkWidget	     *widget,
-					 GdkEventProperty    *event);
-  gboolean (* selection_clear_event)	(GtkWidget	     *widget,
-					 GdkEventSelection   *event);
-  gboolean (* selection_request_event)	(GtkWidget	     *widget,
-					 GdkEventSelection   *event);
-  gboolean (* selection_notify_event)	(GtkWidget	     *widget,
-					 GdkEventSelection   *event);
-  gboolean (* proximity_in_event)	(GtkWidget	     *widget,
-					 GdkEventProximity   *event);
-  gboolean (* proximity_out_event)	(GtkWidget	     *widget,
-					 GdkEventProximity   *event);
-  gboolean (* visibility_notify_event)	(GtkWidget	     *widget,
-					 GdkEventVisibility  *event);
-  gboolean (* client_event)		(GtkWidget	     *widget,
-					 GdkEventClient	     *event);
-  gboolean (* no_expose_event)		(GtkWidget	     *widget,
-					 GdkEventAny	     *event);
-  gboolean (* window_state_event)	(GtkWidget	     *widget,
-					 GdkEventWindowState *event);
-  
-  /* selection */
-  void (* selection_get)           (GtkWidget          *widget,
-				    GtkSelectionData   *selection_data,
-				    guint               info,
-				    guint               time_);
-  void (* selection_received)      (GtkWidget          *widget,
-				    GtkSelectionData   *selection_data,
-				    guint               time_);
-
-  /* Source side drag signals */
-  void (* drag_begin)	           (GtkWidget	       *widget,
-				    GdkDragContext     *context);
-  void (* drag_end)	           (GtkWidget	       *widget,
-				    GdkDragContext     *context);
-  void (* drag_data_get)           (GtkWidget          *widget,
-				    GdkDragContext     *context,
-				    GtkSelectionData   *selection_data,
-				    guint               info,
-				    guint               time_);
-  void (* drag_data_delete)        (GtkWidget	       *widget,
-				    GdkDragContext     *context);
-
-  /* Target side drag signals */
-  void (* drag_leave)	           (GtkWidget	       *widget,
-				    GdkDragContext     *context,
-				    guint               time_);
-  gboolean (* drag_motion)         (GtkWidget	       *widget,
-				    GdkDragContext     *context,
-				    gint                x,
-				    gint                y,
-				    guint               time_);
-  gboolean (* drag_drop)           (GtkWidget	       *widget,
-				    GdkDragContext     *context,
-				    gint                x,
-				    gint                y,
-				    guint               time_);
-  void (* drag_data_received)      (GtkWidget          *widget,
-				    GdkDragContext     *context,
-				    gint                x,
-				    gint                y,
-				    GtkSelectionData   *selection_data,
-				    guint               info,
-				    guint               time_);
-
-  /* Signals used only for keybindings */
-  gboolean (* popup_menu)          (GtkWidget          *widget);
-
-  /* If a widget has multiple tooltips/whatsthis, it should show the
-   * one for the current focus location, or if that doesn't make
-   * sense, should cycle through them showing each tip alongside
-   * whatever piece of the widget it applies to.
-   */
-  gboolean (* show_help)           (GtkWidget          *widget,
-                                    GtkWidgetHelpType   help_type);
-  
-  /* accessibility support 
-   */
-  AtkObject*   (*get_accessible)     (GtkWidget *widget);
-
-  void         (*screen_changed)     (GtkWidget *widget,
-                                      GdkScreen *previous_screen);
-  gboolean     (*can_activate_accel) (GtkWidget *widget,
-                                      guint      signal_id);
-
-  /* Sent when a grab is broken. */
-  gboolean (*grab_broken_event) (GtkWidget	     *widget,
-                                 GdkEventGrabBroken  *event);
-
-  void         (* composited_changed) (GtkWidget *widget);
-
-  gboolean     (* query_tooltip)      (GtkWidget  *widget,
-				       gint        x,
-				       gint        y,
-				       gboolean    keyboard_tooltip,
-				       GtkTooltip *tooltip);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved5) (void);
-  void (*_gtk_reserved6) (void);
-  void (*_gtk_reserved7) (void);
-};
-
-struct _GtkWidgetAuxInfo
-{
-  gint x;
-  gint y;
-  gint width;
-  gint height;
-  guint x_set : 1;
-  guint y_set : 1;
-};
-
-struct _GtkWidgetShapeInfo
-{
-  gint16     offset_x;
-  gint16     offset_y;
-  GdkBitmap *shape_mask;
-};
-
-GType	   gtk_widget_get_type		  (void) G_GNUC_CONST;
-GtkWidget* gtk_widget_new		  (GType		type,
-					   const gchar	       *first_property_name,
-					   ...);
-void	   gtk_widget_destroy		  (GtkWidget	       *widget);
-void	   gtk_widget_destroyed		  (GtkWidget	       *widget,
-					   GtkWidget	      **widget_pointer);
-#ifndef GTK_DISABLE_DEPRECATED
-GtkWidget* gtk_widget_ref		  (GtkWidget	       *widget);
-void	   gtk_widget_unref		  (GtkWidget	       *widget);
-void	   gtk_widget_set		  (GtkWidget	       *widget,
-					   const gchar         *first_property_name,
-					   ...) G_GNUC_NULL_TERMINATED;
-#endif /* GTK_DISABLE_DEPRECATED */
-void	   gtk_widget_unparent		  (GtkWidget	       *widget);
-void	   gtk_widget_show		  (GtkWidget	       *widget);
-void       gtk_widget_show_now            (GtkWidget           *widget);
-void	   gtk_widget_hide		  (GtkWidget	       *widget);
-void	   gtk_widget_show_all		  (GtkWidget	       *widget);
-void	   gtk_widget_hide_all		  (GtkWidget	       *widget);
-void       gtk_widget_set_no_show_all     (GtkWidget           *widget,
-					   gboolean             no_show_all);
-gboolean   gtk_widget_get_no_show_all     (GtkWidget           *widget);
-void	   gtk_widget_map		  (GtkWidget	       *widget);
-void	   gtk_widget_unmap		  (GtkWidget	       *widget);
-void	   gtk_widget_realize		  (GtkWidget	       *widget);
-void	   gtk_widget_unrealize		  (GtkWidget	       *widget);
-
-/* Queuing draws */
-void	   gtk_widget_queue_draw	  (GtkWidget	       *widget);
-void	   gtk_widget_queue_draw_area	  (GtkWidget	       *widget,
-					   gint                 x,
-					   gint                 y,
-					   gint                 width,
-					   gint                 height);
-#ifndef GTK_DISABLE_DEPRECATED
-void	   gtk_widget_queue_clear	  (GtkWidget	       *widget);
-void	   gtk_widget_queue_clear_area	  (GtkWidget	       *widget,
-					   gint                 x,
-					   gint                 y,
-					   gint                 width,
-					   gint                 height);
-#endif /* GTK_DISABLE_DEPRECATED */
-
-
-void	   gtk_widget_queue_resize	  (GtkWidget	       *widget);
-void	   gtk_widget_queue_resize_no_redraw (GtkWidget *widget);
-#ifndef GTK_DISABLE_DEPRECATED
-void	   gtk_widget_draw		  (GtkWidget	       *widget,
-					   GdkRectangle	       *area);
-#endif /* GTK_DISABLE_DEPRECATED */
-void	   gtk_widget_size_request	  (GtkWidget	       *widget,
-					   GtkRequisition      *requisition);
-void	   gtk_widget_size_allocate	  (GtkWidget	       *widget,
-					   GtkAllocation       *allocation);
-void       gtk_widget_get_child_requisition (GtkWidget	       *widget,
-					     GtkRequisition    *requisition);
-void	   gtk_widget_add_accelerator	  (GtkWidget           *widget,
-					   const gchar         *accel_signal,
-					   GtkAccelGroup       *accel_group,
-					   guint                accel_key,
-					   GdkModifierType      accel_mods,
-					   GtkAccelFlags        accel_flags);
-gboolean   gtk_widget_remove_accelerator  (GtkWidget           *widget,
-					   GtkAccelGroup       *accel_group,
-					   guint                accel_key,
-					   GdkModifierType      accel_mods);
-void       gtk_widget_set_accel_path      (GtkWidget           *widget,
-					   const gchar         *accel_path,
-					   GtkAccelGroup       *accel_group);
-const gchar* _gtk_widget_get_accel_path   (GtkWidget           *widget,
-					   gboolean	       *locked);
-GList*     gtk_widget_list_accel_closures (GtkWidget	       *widget);
-gboolean   gtk_widget_can_activate_accel  (GtkWidget           *widget,
-                                           guint                signal_id);
-gboolean   gtk_widget_mnemonic_activate   (GtkWidget           *widget,
-					   gboolean             group_cycling);
-gboolean   gtk_widget_event		  (GtkWidget	       *widget,
-					   GdkEvent	       *event);
-gint       gtk_widget_send_expose         (GtkWidget           *widget,
-					   GdkEvent            *event);
-
-gboolean   gtk_widget_activate		     (GtkWidget	       *widget);
-gboolean   gtk_widget_set_scroll_adjustments (GtkWidget        *widget,
-					      GtkAdjustment    *hadjustment,
-					      GtkAdjustment    *vadjustment);
-     
-void	   gtk_widget_reparent		  (GtkWidget	       *widget,
-					   GtkWidget	       *new_parent);
-gboolean   gtk_widget_intersect		  (GtkWidget	       *widget,
-					   GdkRectangle	       *area,
-					   GdkRectangle	       *intersection);
-GdkRegion *gtk_widget_region_intersect	  (GtkWidget	       *widget,
-					   GdkRegion	       *region);
-
-void	gtk_widget_freeze_child_notify	  (GtkWidget	       *widget);
-void	gtk_widget_child_notify		  (GtkWidget	       *widget,
-					   const gchar	       *child_property);
-void	gtk_widget_thaw_child_notify	  (GtkWidget	       *widget);
-
-gboolean   gtk_widget_is_focus            (GtkWidget           *widget);
-void	   gtk_widget_grab_focus	  (GtkWidget	       *widget);
-void	   gtk_widget_grab_default	  (GtkWidget	       *widget);
-
-void                  gtk_widget_set_name               (GtkWidget    *widget,
-							 const gchar  *name);
-G_CONST_RETURN gchar* gtk_widget_get_name               (GtkWidget    *widget);
-void                  gtk_widget_set_state              (GtkWidget    *widget,
-							 GtkStateType  state);
-void                  gtk_widget_set_sensitive          (GtkWidget    *widget,
-							 gboolean      sensitive);
-void                  gtk_widget_set_app_paintable      (GtkWidget    *widget,
-							 gboolean      app_paintable);
-void                  gtk_widget_set_double_buffered    (GtkWidget    *widget,
-							 gboolean      double_buffered);
-void                  gtk_widget_set_redraw_on_allocate (GtkWidget    *widget,
-							 gboolean      redraw_on_allocate);
-void                  gtk_widget_set_parent             (GtkWidget    *widget,
-							 GtkWidget    *parent);
-void                  gtk_widget_set_parent_window      (GtkWidget    *widget,
-							 GdkWindow    *parent_window);
-void                  gtk_widget_set_child_visible      (GtkWidget    *widget,
-							 gboolean      is_visible);
-gboolean              gtk_widget_get_child_visible      (GtkWidget    *widget);
-
-GtkWidget *gtk_widget_get_parent          (GtkWidget           *widget);
-GdkWindow *gtk_widget_get_parent_window	  (GtkWidget	       *widget);
-
-gboolean   gtk_widget_child_focus         (GtkWidget           *widget,
-                                           GtkDirectionType     direction);
-gboolean   gtk_widget_keynav_failed       (GtkWidget           *widget,
-                                           GtkDirectionType     direction);
-void       gtk_widget_error_bell          (GtkWidget           *widget);
-
-void       gtk_widget_set_size_request    (GtkWidget           *widget,
-                                           gint                 width,
-                                           gint                 height);
-void       gtk_widget_get_size_request    (GtkWidget           *widget,
-                                           gint                *width,
-                                           gint                *height);
-#ifndef GTK_DISABLE_DEPRECATED
-void	   gtk_widget_set_uposition	  (GtkWidget	       *widget,
-					   gint			x,
-					   gint			y);
-void	   gtk_widget_set_usize		  (GtkWidget	       *widget,
-					   gint			width,
-					   gint			height);
-#endif
-
-void	   gtk_widget_set_events	  (GtkWidget	       *widget,
-					   gint			events);
-void       gtk_widget_add_events          (GtkWidget           *widget,
-					   gint	                events);
-void	   gtk_widget_set_extension_events (GtkWidget		*widget,
-					    GdkExtensionMode	mode);
-
-GdkExtensionMode gtk_widget_get_extension_events (GtkWidget	*widget);
-GtkWidget*   gtk_widget_get_toplevel	(GtkWidget	*widget);
-GtkWidget*   gtk_widget_get_ancestor	(GtkWidget	*widget,
-					 GType		 widget_type);
-GdkColormap* gtk_widget_get_colormap	(GtkWidget	*widget);
-GdkVisual*   gtk_widget_get_visual	(GtkWidget	*widget);
-
-GdkScreen *   gtk_widget_get_screen      (GtkWidget *widget);
-gboolean      gtk_widget_has_screen      (GtkWidget *widget);
-GdkDisplay *  gtk_widget_get_display     (GtkWidget *widget);
-GdkWindow *   gtk_widget_get_root_window (GtkWidget *widget);
-GtkSettings*  gtk_widget_get_settings    (GtkWidget *widget);
-GtkClipboard *gtk_widget_get_clipboard   (GtkWidget *widget,
-					  GdkAtom    selection);
-
-#ifndef GTK_DISABLE_DEPRECATED
-#define gtk_widget_set_visual(widget,visual)  ((void) 0)
-#define gtk_widget_push_visual(visual)        ((void) 0)
-#define gtk_widget_pop_visual()               ((void) 0)
-#define gtk_widget_set_default_visual(visual) ((void) 0)
-#endif /* GTK_DISABLE_DEPRECATED */
-
-/* Accessibility support */
-AtkObject*       gtk_widget_get_accessible               (GtkWidget          *widget);
-
-/* The following functions must not be called on an already
- * realized widget. Because it is possible that somebody
- * can call get_colormap() or get_visual() and save the
- * result, these functions are probably only safe to
- * call in a widget's init() function.
- */
-void         gtk_widget_set_colormap    (GtkWidget      *widget,
-					 GdkColormap    *colormap);
-
-gint	     gtk_widget_get_events	(GtkWidget	*widget);
-void	     gtk_widget_get_pointer	(GtkWidget	*widget,
-					 gint		*x,
-					 gint		*y);
-
-gboolean     gtk_widget_is_ancestor	(GtkWidget	*widget,
-					 GtkWidget	*ancestor);
-
-gboolean     gtk_widget_translate_coordinates (GtkWidget  *src_widget,
-					       GtkWidget  *dest_widget,
-					       gint        src_x,
-					       gint        src_y,
-					       gint       *dest_x,
-					       gint       *dest_y);
-
-/* Hide widget and return TRUE.
- */
-gboolean     gtk_widget_hide_on_delete	(GtkWidget	*widget);
-
-/* Widget styles.
- */
-void	   gtk_widget_set_style		(GtkWidget	*widget,
-					 GtkStyle	*style);
-void	   gtk_widget_ensure_style	(GtkWidget	*widget);
-GtkStyle*  gtk_widget_get_style		(GtkWidget	*widget);
-
-void        gtk_widget_modify_style       (GtkWidget            *widget,
-					   GtkRcStyle           *style);
-GtkRcStyle *gtk_widget_get_modifier_style (GtkWidget            *widget);
-void        gtk_widget_modify_fg          (GtkWidget            *widget,
-					   GtkStateType          state,
-					   const GdkColor       *color);
-void        gtk_widget_modify_bg          (GtkWidget            *widget,
-					   GtkStateType          state,
-					   const GdkColor       *color);
-void        gtk_widget_modify_text        (GtkWidget            *widget,
-					   GtkStateType          state,
-					   const GdkColor       *color);
-void        gtk_widget_modify_base        (GtkWidget            *widget,
-					   GtkStateType          state,
-					   const GdkColor       *color);
-void        gtk_widget_modify_cursor      (GtkWidget            *widget,
-					   const GdkColor       *primary,
-					   const GdkColor       *secondary);
-void        gtk_widget_modify_font        (GtkWidget            *widget,
-					   PangoFontDescription *font_desc);
-
-#ifndef GTK_DISABLE_DEPRECATED
-#define gtk_widget_set_rc_style(widget)          (gtk_widget_set_style (widget, NULL))
-#define gtk_widget_restore_default_style(widget) (gtk_widget_set_style (widget, NULL))
-#endif
-
-PangoContext *gtk_widget_create_pango_context (GtkWidget   *widget);
-PangoContext *gtk_widget_get_pango_context    (GtkWidget   *widget);
-PangoLayout  *gtk_widget_create_pango_layout  (GtkWidget   *widget,
-					       const gchar *text);
-
-GdkPixbuf    *gtk_widget_render_icon          (GtkWidget   *widget,
-                                               const gchar *stock_id,
-                                               GtkIconSize  size,
-                                               const gchar *detail);
-
-/* handle composite names for GTK_COMPOSITE_CHILD widgets,
- * the returned name is newly allocated.
- */
-void   gtk_widget_set_composite_name	(GtkWidget	*widget,
-					 const gchar   	*name);
-gchar* gtk_widget_get_composite_name	(GtkWidget	*widget);
-     
-/* Descend recursively and set rc-style on all widgets without user styles */
-void       gtk_widget_reset_rc_styles   (GtkWidget      *widget);
-
-/* Push/pop pairs, to change default values upon a widget's creation.
- * This will override the values that got set by the
- * gtk_widget_set_default_* () functions.
- */
-void	     gtk_widget_push_colormap	     (GdkColormap *cmap);
-void	     gtk_widget_push_composite_child (void);
-void	     gtk_widget_pop_composite_child  (void);
-void	     gtk_widget_pop_colormap	     (void);
-
-/* widget style properties
- */
-void gtk_widget_class_install_style_property        (GtkWidgetClass     *klass,
-						     GParamSpec         *pspec);
-void gtk_widget_class_install_style_property_parser (GtkWidgetClass     *klass,
-						     GParamSpec         *pspec,
-						     GtkRcPropertyParser parser);
-GParamSpec*  gtk_widget_class_find_style_property   (GtkWidgetClass     *klass,
-						     const gchar        *property_name);
-GParamSpec** gtk_widget_class_list_style_properties (GtkWidgetClass     *klass,
-						     guint              *n_properties);
-void gtk_widget_style_get_property (GtkWidget	     *widget,
-				    const gchar    *property_name,
-				    GValue	     *value);
-void gtk_widget_style_get_valist   (GtkWidget	     *widget,
-				    const gchar    *first_property_name,
-				    va_list         var_args);
-void gtk_widget_style_get          (GtkWidget	     *widget,
-				    const gchar    *first_property_name,
-				    ...) G_GNUC_NULL_TERMINATED;
-
-
-/* Set certain default values to be used at widget creation time.
- */
-void	     gtk_widget_set_default_colormap (GdkColormap *colormap);
-GtkStyle*    gtk_widget_get_default_style    (void);
-#ifndef GDK_MULTIHEAD_SAFE
-GdkColormap* gtk_widget_get_default_colormap (void);
-GdkVisual*   gtk_widget_get_default_visual   (void);
-#endif
-
-/* Functions for setting directionality for widgets
- */
-
-void             gtk_widget_set_direction         (GtkWidget        *widget,
-						   GtkTextDirection  dir);
-GtkTextDirection gtk_widget_get_direction         (GtkWidget        *widget);
-
-void             gtk_widget_set_default_direction (GtkTextDirection  dir);
-GtkTextDirection gtk_widget_get_default_direction (void);
-
-/* Compositing manager functionality */
-gboolean gtk_widget_is_composited (GtkWidget *widget);
-
-/* Counterpart to gdk_window_shape_combine_mask.
- */
-void	     gtk_widget_shape_combine_mask (GtkWidget *widget,
-					    GdkBitmap *shape_mask,
-					    gint       offset_x,
-					    gint       offset_y);
-void	     gtk_widget_input_shape_combine_mask (GtkWidget *widget,
-						  GdkBitmap *shape_mask,
-						  gint       offset_x,
-						  gint       offset_y);
-
-/* internal function */
-void	     gtk_widget_reset_shapes	   (GtkWidget *widget);
-
-/* Compute a widget's path in the form "GtkWindow.MyLabel", and
- * return newly alocated strings.
- */
-void	     gtk_widget_path		   (GtkWidget *widget,
-					    guint     *path_length,
-					    gchar    **path,
-					    gchar    **path_reversed);
-void	     gtk_widget_class_path	   (GtkWidget *widget,
-					    guint     *path_length,
-					    gchar    **path,
-					    gchar    **path_reversed);
-
-GList* gtk_widget_list_mnemonic_labels  (GtkWidget *widget);
-void   gtk_widget_add_mnemonic_label    (GtkWidget *widget,
-					 GtkWidget *label);
-void   gtk_widget_remove_mnemonic_label (GtkWidget *widget,
-					 GtkWidget *label);
-
-void                  gtk_widget_set_tooltip_window    (GtkWidget   *widget,
-                                                        GtkWindow   *custom_window);
-GtkWindow *gtk_widget_get_tooltip_window    (GtkWidget   *widget);
-void       gtk_widget_trigger_tooltip_query (GtkWidget   *widget);
-void       gtk_widget_set_tooltip_text      (GtkWidget   *widget,
-                                             const gchar *text);
-gchar *    gtk_widget_get_tooltip_text      (GtkWidget   *widget);
-void       gtk_widget_set_tooltip_markup    (GtkWidget   *widget,
-                                             const gchar *markup);
-gchar *    gtk_widget_get_tooltip_markup    (GtkWidget   *widget);
-void       gtk_widget_set_has_tooltip       (GtkWidget   *widget,
-					     gboolean     has_tooltip);
-gboolean   gtk_widget_get_has_tooltip       (GtkWidget   *widget);
-
-GType           gtk_requisition_get_type (void) G_GNUC_CONST;
-GtkRequisition *gtk_requisition_copy     (const GtkRequisition *requisition);
-void            gtk_requisition_free     (GtkRequisition       *requisition);
-
-#if	defined (GTK_TRACE_OBJECTS) && defined (__GNUC__)
-#  define gtk_widget_ref gtk_object_ref
-#  define gtk_widget_unref gtk_object_unref
-#endif	/* GTK_TRACE_OBJECTS && __GNUC__ */
-
-void              _gtk_widget_grab_notify                 (GtkWidget    *widget,
-						           gboolean	was_grabbed);
-
-GtkWidgetAuxInfo *_gtk_widget_get_aux_info                (GtkWidget    *widget,
-							   gboolean      create);
-void              _gtk_widget_propagate_hierarchy_changed (GtkWidget    *widget,
-							   GtkWidget    *previous_toplevel);
-void              _gtk_widget_propagate_screen_changed    (GtkWidget    *widget,
-							   GdkScreen    *previous_screen);
-void		  _gtk_widget_propagate_composited_changed (GtkWidget    *widget);
-
-GdkColormap* _gtk_widget_peek_colormap (void);
-
-G_END_DECLS
-
-#endif /* __GTK_WIDGET_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkwindow.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkwindow.h
deleted file mode 100644
index 2f84c497..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-2.0/gtk/gtkwindow.h
+++ /dev/null
@@ -1,435 +0,0 @@
-/* GTK - The GIMP Toolkit
- * 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 GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_WINDOW_H__
-#define __GTK_WINDOW_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkaccelgroup.h>
-#include <gtk/gtkbin.h>
-#include <gtk/gtkenums.h>
-#include <gtk/gtkwidget.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_WINDOW			(gtk_window_get_type ())
-#define GTK_WINDOW(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WINDOW, GtkWindow))
-#define GTK_WINDOW_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WINDOW, GtkWindowClass))
-#define GTK_IS_WINDOW(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WINDOW))
-#define GTK_IS_WINDOW_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WINDOW))
-#define GTK_WINDOW_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_WINDOW, GtkWindowClass))
-
-
-typedef struct _GtkWindowClass        GtkWindowClass;
-typedef struct _GtkWindowGeometryInfo GtkWindowGeometryInfo;
-typedef struct _GtkWindowGroup        GtkWindowGroup;
-typedef struct _GtkWindowGroupClass   GtkWindowGroupClass;
-
-struct _GtkWindow
-{
-  GtkBin bin;
-
-  gchar *title;
-  gchar *wmclass_name;
-  gchar *wmclass_class;
-  gchar *wm_role;
-
-  GtkWidget *focus_widget;
-  GtkWidget *default_widget;
-  GtkWindow *transient_parent;
-  GtkWindowGeometryInfo *geometry_info;
-  GdkWindow *frame;
-  GtkWindowGroup *group;
-
-  guint16 configure_request_count;
-  guint allow_shrink : 1;
-  guint allow_grow : 1;
-  guint configure_notify_received : 1;
-  /* The following flags are initially TRUE (before a window is mapped).
-   * They cause us to compute a configure request that involves
-   * default-only parameters. Once mapped, we set them to FALSE.
-   * Then we set them to TRUE again on unmap (for position)
-   * and on unrealize (for size).
-   */
-  guint need_default_position : 1;
-  guint need_default_size : 1;
-  guint position : 3;
-  guint type : 4; /* GtkWindowType */ 
-  guint has_user_ref_count : 1;
-  guint has_focus : 1;
-
-  guint modal : 1;
-  guint destroy_with_parent : 1;
-  
-  guint has_frame : 1;
-
-  /* gtk_window_iconify() called before realization */
-  guint iconify_initially : 1;
-  guint stick_initially : 1;
-  guint maximize_initially : 1;
-  guint decorated : 1;
-  
-  guint type_hint : 3; /* GdkWindowTypeHint if the hint is one of the original eight. If not, then
-			* it contains GDK_WINDOW_TYPE_HINT_NORMAL
-			*/
-  guint gravity : 5; /* GdkGravity */
-
-  guint is_active : 1;
-  guint has_toplevel_focus : 1;
-  
-  guint frame_left;
-  guint frame_top;
-  guint frame_right;
-  guint frame_bottom;
-
-  guint keys_changed_handler;
-  
-  GdkModifierType mnemonic_modifier;
-  GdkScreen      *screen;
-};
-
-struct _GtkWindowClass
-{
-  GtkBinClass parent_class;
-
-  void     (* set_focus)   (GtkWindow *window,
-			    GtkWidget *focus);
-  gboolean (* frame_event) (GtkWindow *window,
-			    GdkEvent  *event);
-
-  /* G_SIGNAL_ACTION signals for keybindings */
-
-  void     (* activate_focus)          (GtkWindow       *window);
-  void     (* activate_default)        (GtkWindow       *window);
-
-  /* as of GTK+ 2.12 the "move-focus" signal has been moved to GtkWidget,
-   * so this is merley a virtual function now. Overriding it in subclasses
-   * continues to work though.
-   */
-  void     (* move_focus)              (GtkWindow       *window,
-                                        GtkDirectionType direction);
-  
-  void	   (*keys_changed)	       (GtkWindow	*window);
-  
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-#define GTK_TYPE_WINDOW_GROUP             (gtk_window_group_get_type ())
-#define GTK_WINDOW_GROUP(object)          (G_TYPE_CHECK_INSTANCE_CAST ((object), GTK_TYPE_WINDOW_GROUP, GtkWindowGroup))
-#define GTK_WINDOW_GROUP_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WINDOW_GROUP, GtkWindowGroupClass))
-#define GTK_IS_WINDOW_GROUP(object)       (G_TYPE_CHECK_INSTANCE_TYPE ((object), GTK_TYPE_WINDOW_GROUP))
-#define GTK_IS_WINDOW_GROUP_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WINDOW_GROUP))
-#define GTK_WINDOW_GROUP_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_WINDOW_GROUP, GtkWindowGroupClass))
-
-struct _GtkWindowGroup
-{
-  GObject parent_instance;
-
-  GSList *grabs;
-};
-
-struct _GtkWindowGroupClass
-{
-  GObjectClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-#ifdef G_OS_WIN32
-/* Reserve old names for DLL ABI backward compatibility */
-#define gtk_window_set_icon_from_file gtk_window_set_icon_from_file_utf8
-#define gtk_window_set_default_icon_from_file gtk_window_set_default_icon_from_file_utf8
-#endif
-
-GType      gtk_window_get_type                 (void) G_GNUC_CONST;
-GtkWidget* gtk_window_new                      (GtkWindowType        type);
-void       gtk_window_set_title                (GtkWindow           *window,
-						const gchar         *title);
-G_CONST_RETURN gchar *gtk_window_get_title     (GtkWindow           *window);
-void       gtk_window_set_wmclass              (GtkWindow           *window,
-						const gchar         *wmclass_name,
-						const gchar         *wmclass_class);
-void       gtk_window_set_role                 (GtkWindow           *window,
-                                                const gchar         *role);
-void       gtk_window_set_startup_id           (GtkWindow           *window,
-                                                const gchar         *startup_id);
-G_CONST_RETURN gchar *gtk_window_get_role      (GtkWindow           *window);
-void       gtk_window_add_accel_group          (GtkWindow           *window,
-						GtkAccelGroup	    *accel_group);
-void       gtk_window_remove_accel_group       (GtkWindow           *window,
-						GtkAccelGroup	    *accel_group);
-void       gtk_window_set_position             (GtkWindow           *window,
-						GtkWindowPosition    position);
-gboolean   gtk_window_activate_focus	       (GtkWindow           *window);
-void       gtk_window_set_focus                (GtkWindow           *window,
-						GtkWidget           *focus);
-GtkWidget *gtk_window_get_focus                (GtkWindow           *window);
-void       gtk_window_set_default              (GtkWindow           *window,
-						GtkWidget           *default_widget);
-gboolean   gtk_window_activate_default	       (GtkWindow           *window);
-
-void       gtk_window_set_transient_for        (GtkWindow           *window, 
-						GtkWindow           *parent);
-GtkWindow *gtk_window_get_transient_for        (GtkWindow           *window);
-void       gtk_window_set_opacity              (GtkWindow           *window, 
-						gdouble              opacity);
-gdouble    gtk_window_get_opacity              (GtkWindow           *window);
-void       gtk_window_set_type_hint            (GtkWindow           *window, 
-						GdkWindowTypeHint    hint);
-GdkWindowTypeHint gtk_window_get_type_hint     (GtkWindow           *window);
-void       gtk_window_set_skip_taskbar_hint    (GtkWindow           *window,
-                                                gboolean             setting);
-gboolean   gtk_window_get_skip_taskbar_hint    (GtkWindow           *window);
-void       gtk_window_set_skip_pager_hint      (GtkWindow           *window,
-                                                gboolean             setting);
-gboolean   gtk_window_get_skip_pager_hint      (GtkWindow           *window);
-void       gtk_window_set_urgency_hint         (GtkWindow           *window,
-                                                gboolean             setting);
-gboolean   gtk_window_get_urgency_hint         (GtkWindow           *window);
-void       gtk_window_set_accept_focus         (GtkWindow           *window,
-                                                gboolean             setting);
-gboolean   gtk_window_get_accept_focus         (GtkWindow           *window);
-void       gtk_window_set_focus_on_map         (GtkWindow           *window,
-                                                gboolean             setting);
-gboolean   gtk_window_get_focus_on_map         (GtkWindow           *window);
-void       gtk_window_set_destroy_with_parent  (GtkWindow           *window,
-                                                gboolean             setting);
-gboolean   gtk_window_get_destroy_with_parent  (GtkWindow           *window);
-
-void       gtk_window_set_resizable            (GtkWindow           *window,
-                                                gboolean             resizable);
-gboolean   gtk_window_get_resizable            (GtkWindow           *window);
-
-void       gtk_window_set_gravity              (GtkWindow           *window,
-                                                GdkGravity           gravity);
-GdkGravity gtk_window_get_gravity              (GtkWindow           *window);
-
-
-void       gtk_window_set_geometry_hints       (GtkWindow           *window,
-						GtkWidget           *geometry_widget,
-						GdkGeometry         *geometry,
-						GdkWindowHints       geom_mask);
-
-void	   gtk_window_set_screen	       (GtkWindow	    *window,
-						GdkScreen	    *screen);
-GdkScreen* gtk_window_get_screen	       (GtkWindow	    *window);
-
-gboolean   gtk_window_is_active                (GtkWindow           *window);
-gboolean   gtk_window_has_toplevel_focus       (GtkWindow           *window);
-
-
-
-/* gtk_window_set_has_frame () must be called before realizing the window_*/
-void       gtk_window_set_has_frame            (GtkWindow *window, 
-						gboolean   setting);
-gboolean   gtk_window_get_has_frame            (GtkWindow *window);
-void       gtk_window_set_frame_dimensions     (GtkWindow *window, 
-						gint       left,
-						gint       top,
-						gint       right,
-						gint       bottom);
-void       gtk_window_get_frame_dimensions     (GtkWindow *window, 
-						gint      *left,
-						gint      *top,
-						gint      *right,
-						gint      *bottom);
-void       gtk_window_set_decorated            (GtkWindow *window,
-                                                gboolean   setting);
-gboolean   gtk_window_get_decorated            (GtkWindow *window);
-void       gtk_window_set_deletable            (GtkWindow *window,
-                                                gboolean   setting);
-gboolean   gtk_window_get_deletable            (GtkWindow *window);
-
-void       gtk_window_set_icon_list                (GtkWindow  *window,
-                                                    GList      *list);
-GList*     gtk_window_get_icon_list                (GtkWindow  *window);
-void       gtk_window_set_icon                     (GtkWindow  *window,
-                                                    GdkPixbuf  *icon);
-void       gtk_window_set_icon_name                (GtkWindow   *window,
-						    const gchar *name);
-gboolean   gtk_window_set_icon_from_file           (GtkWindow   *window,
-						    const gchar *filename,
-						    GError     **err);
-GdkPixbuf* gtk_window_get_icon                     (GtkWindow  *window);
-G_CONST_RETURN 
-gchar     *gtk_window_get_icon_name                (GtkWindow  *window);
-void       gtk_window_set_default_icon_list        (GList      *list);
-GList*     gtk_window_get_default_icon_list        (void);
-void       gtk_window_set_default_icon             (GdkPixbuf  *icon);
-void       gtk_window_set_default_icon_name        (const gchar *name);
-gboolean   gtk_window_set_default_icon_from_file   (const gchar *filename,
-						    GError     **err);
-
-void       gtk_window_set_auto_startup_notification (gboolean setting);
-
-/* If window is set modal, input will be grabbed when show and released when hide */
-void       gtk_window_set_modal      (GtkWindow *window,
-				      gboolean   modal);
-gboolean   gtk_window_get_modal      (GtkWindow *window);
-GList*     gtk_window_list_toplevels (void);
-
-void     gtk_window_add_mnemonic          (GtkWindow       *window,
-					   guint            keyval,
-					   GtkWidget       *target);
-void     gtk_window_remove_mnemonic       (GtkWindow       *window,
-					   guint            keyval,
-					   GtkWidget       *target);
-gboolean gtk_window_mnemonic_activate     (GtkWindow       *window,
-					   guint            keyval,
-					   GdkModifierType  modifier);
-void     gtk_window_set_mnemonic_modifier (GtkWindow       *window,
-					   GdkModifierType  modifier);
-GdkModifierType gtk_window_get_mnemonic_modifier (GtkWindow *window);
-
-gboolean gtk_window_activate_key          (GtkWindow        *window,
-					   GdkEventKey      *event);
-gboolean gtk_window_propagate_key_event   (GtkWindow        *window,
-					   GdkEventKey      *event);
-
-void     gtk_window_present            (GtkWindow *window);
-void     gtk_window_present_with_time  (GtkWindow *window,
-				        guint32    timestamp);
-void     gtk_window_iconify       (GtkWindow *window);
-void     gtk_window_deiconify     (GtkWindow *window);
-void     gtk_window_stick         (GtkWindow *window);
-void     gtk_window_unstick       (GtkWindow *window);
-void     gtk_window_maximize      (GtkWindow *window);
-void     gtk_window_unmaximize    (GtkWindow *window);
-void     gtk_window_fullscreen    (GtkWindow *window);
-void     gtk_window_unfullscreen  (GtkWindow *window);
-void     gtk_window_set_keep_above    (GtkWindow *window, gboolean setting);
-void     gtk_window_set_keep_below    (GtkWindow *window, gboolean setting);
-
-void gtk_window_begin_resize_drag (GtkWindow     *window,
-                                   GdkWindowEdge  edge,
-                                   gint           button,
-                                   gint           root_x,
-                                   gint           root_y,
-                                   guint32        timestamp);
-void gtk_window_begin_move_drag   (GtkWindow     *window,
-                                   gint           button,
-                                   gint           root_x,
-                                   gint           root_y,
-                                   guint32        timestamp);
-
-#ifndef GTK_DISABLE_DEPRECATED
-void       gtk_window_set_policy               (GtkWindow           *window,
-						gint                 allow_shrink,
-						gint                 allow_grow,
-						gint                 auto_shrink);
-#define	gtk_window_position			gtk_window_set_position
-#endif /* GTK_DISABLE_DEPRECATED */
-
-/* Set initial default size of the window (does not constrain user
- * resize operations)
- */
-void     gtk_window_set_default_size (GtkWindow   *window,
-                                      gint         width,
-                                      gint         height);
-void     gtk_window_get_default_size (GtkWindow   *window,
-                                      gint        *width,
-                                      gint        *height);
-void     gtk_window_resize           (GtkWindow   *window,
-                                      gint         width,
-                                      gint         height);
-void     gtk_window_get_size         (GtkWindow   *window,
-                                      gint        *width,
-                                      gint        *height);
-void     gtk_window_move             (GtkWindow   *window,
-                                      gint         x,
-                                      gint         y);
-void     gtk_window_get_position     (GtkWindow   *window,
-                                      gint        *root_x,
-                                      gint        *root_y);
-gboolean gtk_window_parse_geometry   (GtkWindow   *window,
-                                      const gchar *geometry);
-GtkWindowGroup *gtk_window_get_group (GtkWindow   *window);
-
-/* Ignore this unless you are writing a GUI builder */
-void     gtk_window_reshow_with_initial_size (GtkWindow *window);
-
-/* Window groups
- */
-GType            gtk_window_group_get_type      (void) G_GNUC_CONST;
-
-GtkWindowGroup * gtk_window_group_new           (void);
-void             gtk_window_group_add_window    (GtkWindowGroup     *window_group,
-						 GtkWindow          *window);
-void             gtk_window_group_remove_window (GtkWindowGroup     *window_group,
-					         GtkWindow          *window);
-
-/* --- internal functions --- */
-void            _gtk_window_internal_set_focus (GtkWindow *window,
-						GtkWidget *focus);
-void            gtk_window_remove_embedded_xid (GtkWindow *window,
-						guint      xid);
-void            gtk_window_add_embedded_xid    (GtkWindow *window,
-						guint      xid);
-void            _gtk_window_reposition         (GtkWindow *window,
-						gint       x,
-						gint       y);
-void            _gtk_window_constrain_size     (GtkWindow *window,
-						gint       width,
-						gint       height,
-						gint      *new_width,
-						gint      *new_height);
-GtkWidget      *_gtk_window_group_get_current_grab (GtkWindowGroup *window_group);
-
-void            _gtk_window_set_has_toplevel_focus (GtkWindow *window,
-						    gboolean   has_toplevel_focus);
-void            _gtk_window_unset_focus_and_default (GtkWindow *window,
-						     GtkWidget *widget);
-
-void            _gtk_window_set_is_active          (GtkWindow *window,
-						    gboolean   is_active);
-
-typedef void (*GtkWindowKeysForeachFunc) (GtkWindow      *window,
-					  guint           keyval,
-					  GdkModifierType modifiers,
-					  gboolean        is_mnemonic,
-					  gpointer        data);
-
-void _gtk_window_keys_foreach (GtkWindow               *window,
-			       GtkWindowKeysForeachFunc func,
-			       gpointer                 func_data);
-
-/* --- internal (GtkAcceleratable) --- */
-gboolean	_gtk_window_query_nonaccels	(GtkWindow	*window,
-						 guint		 accel_key,
-						 GdkModifierType accel_mods);
-
-G_END_DECLS
-
-#endif /* __GTK_WINDOW_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-unix-print-2.0/gtk/gtkpagesetupunixdialog.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-unix-print-2.0/gtk/gtkpagesetupunixdialog.h
deleted file mode 100644
index a99a07d6..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-unix-print-2.0/gtk/gtkpagesetupunixdialog.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* GtkPageSetupUnixDialog 
- * Copyright (C) 2006 Alexander Larsson <alexl@redhat.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 __GTK_PAGE_SETUP_UNIX_DIALOG_H__
-#define __GTK_PAGE_SETUP_UNIX_DIALOG_H__
-
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkpagesetup.h>
-#include <gtk/gtkprintsettings.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_PAGE_SETUP_UNIX_DIALOG                  (gtk_page_setup_unix_dialog_get_type ())
-#define GTK_PAGE_SETUP_UNIX_DIALOG(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PAGE_SETUP_UNIX_DIALOG, GtkPageSetupUnixDialog))
-#define GTK_PAGE_SETUP_UNIX_DIALOG_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PAGE_SETUP_UNIX_DIALOG, GtkPageSetupUnixDialogClass))
-#define GTK_IS_PAGE_SETUP_UNIX_DIALOG(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PAGE_SETUP_UNIX_DIALOG))
-#define GTK_IS_PAGE_SETUP_UNIX_DIALOG_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PAGE_SETUP_UNIX_DIALOG))
-#define GTK_PAGE_SETUP_UNIX_DIALOG_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PAGE_SETUP_UNIX_DIALOG, GtkPageSetupUnixDialogClass))
-
-
-typedef struct _GtkPageSetupUnixDialog         GtkPageSetupUnixDialog;
-typedef struct _GtkPageSetupUnixDialogClass    GtkPageSetupUnixDialogClass;
-typedef struct GtkPageSetupUnixDialogPrivate   GtkPageSetupUnixDialogPrivate;
-
-struct _GtkPageSetupUnixDialog
-{
-  GtkDialog parent_instance;
-
-  GtkPageSetupUnixDialogPrivate *priv;
-};
-
-struct _GtkPageSetupUnixDialogClass
-{
-  GtkDialogClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-  void (*_gtk_reserved5) (void);
-  void (*_gtk_reserved6) (void);
-  void (*_gtk_reserved7) (void);
-};
-
-GType 		  gtk_page_setup_unix_dialog_get_type	        (void) G_GNUC_CONST;
-GtkWidget *       gtk_page_setup_unix_dialog_new                (const gchar            *title,
-								 GtkWindow              *parent);
-void              gtk_page_setup_unix_dialog_set_page_setup     (GtkPageSetupUnixDialog *dialog,
-								 GtkPageSetup           *page_setup);
-GtkPageSetup *    gtk_page_setup_unix_dialog_get_page_setup     (GtkPageSetupUnixDialog *dialog);
-void              gtk_page_setup_unix_dialog_set_print_settings (GtkPageSetupUnixDialog *dialog,
-								 GtkPrintSettings       *print_settings);
-GtkPrintSettings *gtk_page_setup_unix_dialog_get_print_settings (GtkPageSetupUnixDialog *dialog);
-
-G_END_DECLS
-
-#endif /* __GTK_PAGE_SETUP_UNIX_DIALOG_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-unix-print-2.0/gtk/gtkprinter.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-unix-print-2.0/gtk/gtkprinter.h
deleted file mode 100644
index 2d8bec1f..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-unix-print-2.0/gtk/gtkprinter.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/* GtkPrinter 
- * Copyright (C) 2006 John (J5) Palmieri <johnp@redhat.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 __GTK_PRINTER_H__
-#define __GTK_PRINTER_H__
-
-#include <glib-object.h>
-#include <cairo.h>
-#include <gtk/gtkprintsettings.h>
-#include <gtk/gtkpagesetup.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_PRINT_CAPABILITIES (gtk_print_capabilities_get_type ())
-
-/* Note, this type is manually registered with GObject in gtkprinter.c
- * If you add any flags, update the registration as well!
- */
-typedef enum
-{
-  GTK_PRINT_CAPABILITY_PAGE_SET     = 1 << 0,
-  GTK_PRINT_CAPABILITY_COPIES       = 1 << 1,
-  GTK_PRINT_CAPABILITY_COLLATE      = 1 << 2,
-  GTK_PRINT_CAPABILITY_REVERSE      = 1 << 3,
-  GTK_PRINT_CAPABILITY_SCALE        = 1 << 4,
-  GTK_PRINT_CAPABILITY_GENERATE_PDF = 1 << 5,
-  GTK_PRINT_CAPABILITY_GENERATE_PS  = 1 << 6,
-  GTK_PRINT_CAPABILITY_PREVIEW      = 1 << 7,
-  GTK_PRINT_CAPABILITY_NUMBER_UP    = 1 << 8
-} GtkPrintCapabilities;
-
-GType gtk_print_capabilities_get_type (void) G_GNUC_CONST;
-
-#define GTK_TYPE_PRINTER                  (gtk_printer_get_type ())
-#define GTK_PRINTER(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PRINTER, GtkPrinter))
-#define GTK_PRINTER_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PRINTER, GtkPrinterClass))
-#define GTK_IS_PRINTER(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PRINTER))
-#define GTK_IS_PRINTER_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PRINTER))
-#define GTK_PRINTER_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PRINTER, GtkPrinterClass))
-
-typedef struct _GtkPrinter          GtkPrinter;
-typedef struct _GtkPrinterClass     GtkPrinterClass;
-typedef struct _GtkPrinterPrivate   GtkPrinterPrivate;
-typedef struct _GtkPrintBackend     GtkPrintBackend;
-
-struct _GtkPrintBackend;
-
-struct _GtkPrinter
-{
-  GObject parent_instance;
-
-  GtkPrinterPrivate *priv;
-};
-
-struct _GtkPrinterClass
-{
-  GObjectClass parent_class;
-
-  void (*details_acquired) (GtkPrinter *printer, gboolean success);
-  
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-  void (*_gtk_reserved5) (void);
-  void (*_gtk_reserved6) (void);
-  void (*_gtk_reserved7) (void);
-};
-
-GType                    gtk_printer_get_type          (void) G_GNUC_CONST;
-GtkPrinter              *gtk_printer_new               (const gchar     *name,
-							GtkPrintBackend *backend,
-							gboolean         virtual_);
-GtkPrintBackend         *gtk_printer_get_backend       (GtkPrinter      *printer);
-G_CONST_RETURN gchar    *gtk_printer_get_name          (GtkPrinter      *printer);
-G_CONST_RETURN gchar    *gtk_printer_get_state_message (GtkPrinter      *printer);
-G_CONST_RETURN gchar    *gtk_printer_get_description   (GtkPrinter      *printer);
-G_CONST_RETURN gchar    *gtk_printer_get_location      (GtkPrinter      *printer);
-G_CONST_RETURN gchar    *gtk_printer_get_icon_name     (GtkPrinter      *printer);
-gint                     gtk_printer_get_job_count     (GtkPrinter      *printer);
-gboolean                 gtk_printer_is_active         (GtkPrinter      *printer);
-gboolean                 gtk_printer_is_virtual        (GtkPrinter      *printer);
-gboolean                 gtk_printer_is_default        (GtkPrinter      *printer);
-gboolean                 gtk_printer_accepts_pdf       (GtkPrinter      *printer);
-gboolean                 gtk_printer_accepts_ps        (GtkPrinter      *printer);
-GList                   *gtk_printer_list_papers       (GtkPrinter      *printer);
-gint                     gtk_printer_compare           (GtkPrinter *a,
-							GtkPrinter *b);
-gboolean                 gtk_printer_has_details       (GtkPrinter       *printer);
-void                     gtk_printer_request_details   (GtkPrinter       *printer);
-GtkPrintCapabilities     gtk_printer_get_capabilities  (GtkPrinter       *printer);
-
-typedef gboolean (*GtkPrinterFunc) (GtkPrinter *printer,
-				    gpointer    data);
-
-void                     gtk_enumerate_printers        (GtkPrinterFunc   func,
-							gpointer         data,
-							GDestroyNotify   destroy,
-							gboolean         wait);
-
-G_END_DECLS
-
-#endif /* __GTK_PRINTER_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-unix-print-2.0/gtk/gtkprintjob.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-unix-print-2.0/gtk/gtkprintjob.h
deleted file mode 100644
index 89a3d5bc..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-unix-print-2.0/gtk/gtkprintjob.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* GtkPrintJob 
- * Copyright (C) 2006 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 __GTK_PRINT_JOB_H__
-#define __GTK_PRINT_JOB_H__
-
-#include <glib-object.h>
-#include <cairo.h>
-
-#include <gtk/gtkprinter.h>
-#include <gtk/gtkprintoperation.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_PRINT_JOB                  (gtk_print_job_get_type ())
-#define GTK_PRINT_JOB(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PRINT_JOB, GtkPrintJob))
-#define GTK_PRINT_JOB_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PRINT_JOB, GtkPrintJobClass))
-#define GTK_IS_PRINT_JOB(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PRINT_JOB))
-#define GTK_IS_PRINT_JOB_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PRINT_JOB))
-#define GTK_PRINT_JOB_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PRINT_JOB, GtkPrintJobClass))
-
-typedef struct _GtkPrintJob          GtkPrintJob;
-typedef struct _GtkPrintJobClass     GtkPrintJobClass;
-typedef struct _GtkPrintJobPrivate   GtkPrintJobPrivate;
-
-typedef void (*GtkPrintJobCompleteFunc) (GtkPrintJob *print_job,
-                                         gpointer     user_data, 
-                                         GError      *error);
-
-struct _GtkPrinter;
-
-struct _GtkPrintJob
-{
-  GObject parent_instance;
-
-  GtkPrintJobPrivate *priv;
-
-  /* Settings the client has to implement:
-   * (These are read-only, set at initialization)
-   */
-  GtkPrintPages print_pages;
-  GtkPageRange *page_ranges;
-  gint num_page_ranges;
-  GtkPageSet page_set;
-  gint num_copies;
-  gdouble scale;
-  guint rotate_to_orientation : 1;
-  guint collate               : 1;
-  guint reverse               : 1;
-};
-
-struct _GtkPrintJobClass
-{
-  GObjectClass parent_class;
-
-  void (*status_changed) (GtkPrintJob *job);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-  void (*_gtk_reserved5) (void);
-  void (*_gtk_reserved6) (void);
-  void (*_gtk_reserved7) (void);
-};
-
-GType                    gtk_print_job_get_type               (void) G_GNUC_CONST;
-GtkPrintJob             *gtk_print_job_new                    (const gchar              *title,
-							       GtkPrinter               *printer,
-							       GtkPrintSettings         *settings,
-							       GtkPageSetup             *page_setup);
-GtkPrintSettings        *gtk_print_job_get_settings           (GtkPrintJob              *job);
-GtkPrinter              *gtk_print_job_get_printer            (GtkPrintJob              *job);
-G_CONST_RETURN gchar    *gtk_print_job_get_title              (GtkPrintJob              *job);
-GtkPrintStatus           gtk_print_job_get_status             (GtkPrintJob              *job);
-gboolean                 gtk_print_job_set_source_file        (GtkPrintJob              *job,
-							       const gchar              *filename,
-							       GError                  **error);
-cairo_surface_t         *gtk_print_job_get_surface            (GtkPrintJob              *job,
-							       GError                  **error);
-void                     gtk_print_job_set_track_print_status (GtkPrintJob              *job,
-							       gboolean                  track_status);
-gboolean                 gtk_print_job_get_track_print_status (GtkPrintJob              *job);
-void                     gtk_print_job_send                   (GtkPrintJob              *job,
-							       GtkPrintJobCompleteFunc   callback,
-							       gpointer                  user_data,
-							       GDestroyNotify            dnotify);
-
-G_END_DECLS
-
-#endif /* __GTK_PRINT_JOB_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/gtk-unix-print-2.0/gtk/gtkprintunixdialog.h b/lib-x86-64/gtk-2.12.12/usr/include/gtk-unix-print-2.0/gtk/gtkprintunixdialog.h
deleted file mode 100644
index b6ad921a..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/gtk-unix-print-2.0/gtk/gtkprintunixdialog.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* GtkPrintUnixDialog 
- * Copyright (C) 2006 John (J5) Palmieri <johnp@redhat.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 __GTK_PRINT_UNIX_DIALOG_H__
-#define __GTK_PRINT_UNIX_DIALOG_H__
-
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkprinter.h>
-#include <gtk/gtkprintjob.h>
-#include <gtk/gtkprintsettings.h>
-#include <gtk/gtkpagesetup.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_PRINT_UNIX_DIALOG                  (gtk_print_unix_dialog_get_type ())
-#define GTK_PRINT_UNIX_DIALOG(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PRINT_UNIX_DIALOG, GtkPrintUnixDialog))
-#define GTK_PRINT_UNIX_DIALOG_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PRINT_UNIX_DIALOG, GtkPrintUnixDialogClass))
-#define GTK_IS_PRINT_UNIX_DIALOG(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PRINT_UNIX_DIALOG))
-#define GTK_IS_PRINT_UNIX_DIALOG_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PRINT_UNIX_DIALOG))
-#define GTK_PRINT_UNIX_DIALOG_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PRINT_UNIX_DIALOG, GtkPrintUnixDialogClass))
-
-
-typedef struct _GtkPrintUnixDialog         GtkPrintUnixDialog;
-typedef struct _GtkPrintUnixDialogClass    GtkPrintUnixDialogClass;
-typedef struct GtkPrintUnixDialogPrivate   GtkPrintUnixDialogPrivate;
-
-struct _GtkPrintUnixDialog
-{
-  GtkDialog parent_instance;
-
-  GtkPrintUnixDialogPrivate *priv;
-};
-
-struct _GtkPrintUnixDialogClass
-{
-  GtkDialogClass parent_class;
-
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-  void (*_gtk_reserved5) (void);
-  void (*_gtk_reserved6) (void);
-  void (*_gtk_reserved7) (void);
-};
-
-GType		  gtk_print_unix_dialog_get_type	     (void) G_GNUC_CONST;
-GtkWidget *       gtk_print_unix_dialog_new                  (const gchar *title,
-                                                              GtkWindow   *parent);
-
-void              gtk_print_unix_dialog_set_page_setup       (GtkPrintUnixDialog *dialog,
-							      GtkPageSetup       *page_setup);
-GtkPageSetup *    gtk_print_unix_dialog_get_page_setup       (GtkPrintUnixDialog *dialog);
-void              gtk_print_unix_dialog_set_current_page     (GtkPrintUnixDialog *dialog,
-							      gint                current_page);
-gint              gtk_print_unix_dialog_get_current_page     (GtkPrintUnixDialog *dialog);
-void              gtk_print_unix_dialog_set_settings         (GtkPrintUnixDialog *dialog,
-							      GtkPrintSettings   *settings);
-GtkPrintSettings *gtk_print_unix_dialog_get_settings         (GtkPrintUnixDialog *dialog);
-GtkPrinter *      gtk_print_unix_dialog_get_selected_printer (GtkPrintUnixDialog *dialog);
-void              gtk_print_unix_dialog_add_custom_tab       (GtkPrintUnixDialog *dialog,
-							      GtkWidget          *child,
-							      GtkWidget          *tab_label);
-void              gtk_print_unix_dialog_set_manual_capabilities (GtkPrintUnixDialog *dialog,
-								 GtkPrintCapabilities capabilities);
-
-G_END_DECLS
-
-#endif /* __GTK_PRINT_UNIX_DIALOG_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-attributes.h b/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-attributes.h
deleted file mode 100644
index ad7a0861..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-attributes.h
+++ /dev/null
@@ -1,276 +0,0 @@
-/* Pango
- * pango-attributes.h: Attributed text
- *
- * Copyright (C) 2000 Red Hat Software
- *
- * 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 __PANGO_ATTRIBUTES_H__
-#define __PANGO_ATTRIBUTES_H__
-
-#include <pango/pango-font.h>
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/* PangoColor */
-
-typedef struct _PangoColor PangoColor;
-
-struct _PangoColor
-{
-  guint16 red;
-  guint16 green;
-  guint16 blue;
-};
-
-#define PANGO_TYPE_COLOR pango_color_get_type ()
-GType       pango_color_get_type (void) G_GNUC_CONST;
-
-PangoColor *pango_color_copy     (const PangoColor *src);
-void        pango_color_free     (PangoColor       *color);
-gboolean    pango_color_parse    (PangoColor       *color,
-				  const char       *spec);
-gchar      *pango_color_to_string(const PangoColor *color);
-
-
-/* Attributes */
-
-typedef struct _PangoAttribute    PangoAttribute;
-typedef struct _PangoAttrClass    PangoAttrClass;
-
-typedef struct _PangoAttrString   PangoAttrString;
-typedef struct _PangoAttrLanguage PangoAttrLanguage;
-typedef struct _PangoAttrInt      PangoAttrInt;
-typedef struct _PangoAttrSize     PangoAttrSize;
-typedef struct _PangoAttrFloat    PangoAttrFloat;
-typedef struct _PangoAttrColor    PangoAttrColor;
-typedef struct _PangoAttrFontDesc PangoAttrFontDesc;
-typedef struct _PangoAttrShape    PangoAttrShape;
-
-#define PANGO_TYPE_ATTR_LIST pango_attr_list_get_type ()
-typedef struct _PangoAttrList     PangoAttrList;
-typedef struct _PangoAttrIterator PangoAttrIterator;
-
-typedef enum
-{
-  PANGO_ATTR_INVALID,           /* 0 is an invalid attribute type */
-  PANGO_ATTR_LANGUAGE,		/* PangoAttrLanguage */
-  PANGO_ATTR_FAMILY,		/* PangoAttrString */
-  PANGO_ATTR_STYLE,		/* PangoAttrInt */
-  PANGO_ATTR_WEIGHT,		/* PangoAttrInt */
-  PANGO_ATTR_VARIANT,		/* PangoAttrInt */
-  PANGO_ATTR_STRETCH,		/* PangoAttrInt */
-  PANGO_ATTR_SIZE,		/* PangoAttrSize */
-  PANGO_ATTR_FONT_DESC,		/* PangoAttrFontDesc */
-  PANGO_ATTR_FOREGROUND,	/* PangoAttrColor */
-  PANGO_ATTR_BACKGROUND,	/* PangoAttrColor */
-  PANGO_ATTR_UNDERLINE,		/* PangoAttrInt */
-  PANGO_ATTR_STRIKETHROUGH,	/* PangoAttrInt */
-  PANGO_ATTR_RISE,		/* PangoAttrInt */
-  PANGO_ATTR_SHAPE,		/* PangoAttrShape */
-  PANGO_ATTR_SCALE,             /* PangoAttrFloat */
-  PANGO_ATTR_FALLBACK,          /* PangoAttrInt */
-  PANGO_ATTR_LETTER_SPACING,    /* PangoAttrInt */
-  PANGO_ATTR_UNDERLINE_COLOR,	/* PangoAttrColor */
-  PANGO_ATTR_STRIKETHROUGH_COLOR,/* PangoAttrColor */
-  PANGO_ATTR_ABSOLUTE_SIZE,	/* PangoAttrSize */
-  PANGO_ATTR_GRAVITY,		/* PangoAttrInt */
-  PANGO_ATTR_GRAVITY_HINT	/* PangoAttrInt */
-} PangoAttrType;
-
-typedef enum {
-  PANGO_UNDERLINE_NONE,
-  PANGO_UNDERLINE_SINGLE,
-  PANGO_UNDERLINE_DOUBLE,
-  PANGO_UNDERLINE_LOW,
-  PANGO_UNDERLINE_ERROR
-} PangoUnderline;
-
-struct _PangoAttribute
-{
-  const PangoAttrClass *klass;
-  guint start_index;	/* in bytes */
-  guint end_index;	/* in bytes. The character at this index is not included */
-};
-
-typedef gboolean (*PangoAttrFilterFunc) (PangoAttribute *attribute,
-					 gpointer        data);
-
-typedef gpointer (*PangoAttrDataCopyFunc) (gconstpointer data);
-
-struct _PangoAttrClass
-{
-  /*< public >*/
-  PangoAttrType type;
-  PangoAttribute * (*copy) (const PangoAttribute *attr);
-  void             (*destroy) (PangoAttribute *attr);
-  gboolean         (*equal) (const PangoAttribute *attr1, const PangoAttribute *attr2);
-};
-
-struct _PangoAttrString
-{
-  PangoAttribute attr;
-  char *value;
-};
-
-struct _PangoAttrLanguage
-{
-  PangoAttribute attr;
-  PangoLanguage *value;
-};
-
-struct _PangoAttrInt
-{
-  PangoAttribute attr;
-  int value;
-};
-
-struct _PangoAttrFloat
-{
-  PangoAttribute attr;
-  double value;
-};
-
-struct _PangoAttrColor
-{
-  PangoAttribute attr;
-  PangoColor color;
-};
-
-struct _PangoAttrSize
-{
-  PangoAttribute attr;
-  int size;
-  guint absolute : 1;
-};
-
-struct _PangoAttrShape
-{
-  PangoAttribute attr;
-  PangoRectangle ink_rect;
-  PangoRectangle logical_rect;
-
-  gpointer              data;
-  PangoAttrDataCopyFunc copy_func;
-  GDestroyNotify        destroy_func;
-};
-
-struct _PangoAttrFontDesc
-{
-  PangoAttribute attr;
-  PangoFontDescription *desc;
-};
-
-PangoAttrType    pango_attr_type_register    (const gchar          *name);
-
-void             pango_attribute_init        (PangoAttribute       *attr,
-					      const PangoAttrClass *klass);
-PangoAttribute * pango_attribute_copy        (const PangoAttribute *attr);
-void             pango_attribute_destroy     (PangoAttribute       *attr);
-gboolean         pango_attribute_equal       (const PangoAttribute *attr1,
-					      const PangoAttribute *attr2) G_GNUC_PURE;
-
-PangoAttribute *pango_attr_language_new      (PangoLanguage              *language);
-PangoAttribute *pango_attr_family_new        (const char                 *family);
-PangoAttribute *pango_attr_foreground_new    (guint16                     red,
-					      guint16                     green,
-					      guint16                     blue);
-PangoAttribute *pango_attr_background_new    (guint16                     red,
-					      guint16                     green,
-					      guint16                     blue);
-PangoAttribute *pango_attr_size_new          (int                         size);
-PangoAttribute *pango_attr_size_new_absolute (int                         size);
-PangoAttribute *pango_attr_style_new         (PangoStyle                  style);
-PangoAttribute *pango_attr_weight_new        (PangoWeight                 weight);
-PangoAttribute *pango_attr_variant_new       (PangoVariant                variant);
-PangoAttribute *pango_attr_stretch_new       (PangoStretch                stretch);
-PangoAttribute *pango_attr_font_desc_new     (const PangoFontDescription *desc);
-
-PangoAttribute *pango_attr_underline_new           (PangoUnderline underline);
-PangoAttribute *pango_attr_underline_color_new     (guint16        red,
-						    guint16        green,
-						    guint16        blue);
-PangoAttribute *pango_attr_strikethrough_new       (gboolean       strikethrough);
-PangoAttribute *pango_attr_strikethrough_color_new (guint16        red,
-						    guint16        green,
-						    guint16        blue);
-
-PangoAttribute *pango_attr_rise_new          (int                         rise);
-PangoAttribute *pango_attr_scale_new         (double                      scale_factor);
-PangoAttribute *pango_attr_fallback_new      (gboolean                    enable_fallback);
-PangoAttribute *pango_attr_letter_spacing_new (int                        letter_spacing);
-
-PangoAttribute *pango_attr_shape_new           (const PangoRectangle       *ink_rect,
-						const PangoRectangle       *logical_rect);
-PangoAttribute *pango_attr_shape_new_with_data (const PangoRectangle       *ink_rect,
-						const PangoRectangle       *logical_rect,
-						gpointer                    data,
-						PangoAttrDataCopyFunc       copy_func,
-						GDestroyNotify              destroy_func);
-
-PangoAttribute *pango_attr_gravity_new      (PangoGravity     gravity);
-PangoAttribute *pango_attr_gravity_hint_new (PangoGravityHint hint);
-
-GType              pango_attr_list_get_type      (void) G_GNUC_CONST;
-PangoAttrList *    pango_attr_list_new           (void);
-PangoAttrList *    pango_attr_list_ref           (PangoAttrList  *list);
-void               pango_attr_list_unref         (PangoAttrList  *list);
-PangoAttrList *    pango_attr_list_copy          (PangoAttrList  *list);
-void               pango_attr_list_insert        (PangoAttrList  *list,
-						  PangoAttribute *attr);
-void               pango_attr_list_insert_before (PangoAttrList  *list,
-						  PangoAttribute *attr);
-void               pango_attr_list_change        (PangoAttrList  *list,
-						  PangoAttribute *attr);
-void               pango_attr_list_splice        (PangoAttrList  *list,
-						  PangoAttrList  *other,
-						  gint            pos,
-						  gint            len);
-
-PangoAttrList *pango_attr_list_filter (PangoAttrList       *list,
-				       PangoAttrFilterFunc  func,
-				       gpointer             data);
-
-PangoAttrIterator *pango_attr_list_get_iterator  (PangoAttrList  *list);
-
-void               pango_attr_iterator_range    (PangoAttrIterator     *iterator,
-						 gint                  *start,
-						 gint                  *end);
-gboolean           pango_attr_iterator_next     (PangoAttrIterator     *iterator);
-PangoAttrIterator *pango_attr_iterator_copy     (PangoAttrIterator     *iterator);
-void               pango_attr_iterator_destroy  (PangoAttrIterator     *iterator);
-PangoAttribute *   pango_attr_iterator_get      (PangoAttrIterator     *iterator,
-						 PangoAttrType          type);
-void               pango_attr_iterator_get_font (PangoAttrIterator     *iterator,
-						 PangoFontDescription  *desc,
-						 PangoLanguage        **language,
-						 GSList               **extra_attrs);
-GSList *          pango_attr_iterator_get_attrs (PangoAttrIterator     *iterator);
-
-
-gboolean pango_parse_markup (const char                 *markup_text,
-			     int                         length,
-			     gunichar                    accel_marker,
-			     PangoAttrList             **attr_list,
-			     char                      **text,
-			     gunichar                   *accel_char,
-			     GError                    **error);
-
-G_END_DECLS
-
-#endif /* __PANGO_ATTRIBUTES_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-break.h b/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-break.h
deleted file mode 100644
index fe22acec..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-break.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* Pango
- * pango-break.h:
- *
- * Copyright (C) 1999 Red Hat Software
- *
- * 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 __PANGO_BREAK_H__
-#define __PANGO_BREAK_H__
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-#include <pango/pango-item.h>
-
-/* Logical attributes of a character.
- */
-struct _PangoLogAttr
-{
-  guint is_line_break : 1;      /* Can break line in front of character */
-
-  guint is_mandatory_break : 1; /* Must break line in front of character */
-
-  guint is_char_break : 1;      /* Can break here when doing char wrap */
-
-  guint is_white : 1;           /* Whitespace character */
-
-  /* Cursor can appear in front of character (i.e. this is a grapheme
-   * boundary, or the first character in the text).
-   */
-  guint is_cursor_position : 1;
-
-  /* Note that in degenerate cases, you could have both start/end set on
-   * some text, most likely for sentences (e.g. no space after a period, so
-   * the next sentence starts right away).
-   */
-
-  guint is_word_start : 1;      /* first character in a word */
-  guint is_word_end   : 1;      /* is first non-word char after a word */
-
-  /* There are two ways to divide sentences. The first assigns all
-   * intersentence whitespace/control/format chars to some sentence,
-   * so all chars are in some sentence; is_sentence_boundary denotes
-   * the boundaries there. The second way doesn't assign
-   * between-sentence spaces, etc. to any sentence, so
-   * is_sentence_start/is_sentence_end mark the boundaries of those
-   * sentences.
-   */
-  guint is_sentence_boundary : 1;
-  guint is_sentence_start : 1;  /* first character in a sentence */
-  guint is_sentence_end : 1;    /* first non-sentence char after a sentence */
-
-  /* If set, backspace deletes one character rather than
-   * the entire grapheme cluster.
-   */
-  guint backspace_deletes_character : 1;
-
-  /* Only few space variants (U+0020 and U+00A0) have variable
-   * width during justification.
-   */
-  guint is_expandable_space : 1;
-};
-
-/* Determine information about cluster/word/line breaks in a string
- * of Unicode text.
- */
-void pango_break (const gchar   *text,
-		  int            length,
-		  PangoAnalysis *analysis,
-		  PangoLogAttr  *attrs,
-		  int            attrs_len);
-
-void pango_find_paragraph_boundary (const gchar *text,
-				    gint         length,
-				    gint        *paragraph_delimiter_index,
-				    gint        *next_paragraph_start);
-
-void pango_get_log_attrs (const char    *text,
-			  int            length,
-			  int            level,
-			  PangoLanguage *language,
-			  PangoLogAttr  *log_attrs,
-			  int            attrs_len);
-
-#ifdef PANGO_ENABLE_ENGINE
-
-/* This is the default break algorithm, used if no language
- * engine overrides it. Normally you should use pango_break()
- * instead; this function is mostly useful for chaining up
- * from a language engine override.
- */
-void pango_default_break (const gchar   *text,
-			  int            length,
-			  PangoAnalysis *analysis,
-			  PangoLogAttr  *attrs,
-			  int            attrs_len);
-
-#endif /* PANGO_ENABLE_ENGINE */
-
-G_END_DECLS
-
-#endif /* __PANGO_BREAK_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-context.h b/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-context.h
deleted file mode 100644
index 5cd88404..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-context.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* Pango
- * pango-context.h: Rendering contexts
- *
- * Copyright (C) 2000 Red Hat Software
- *
- * 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 __PANGO_CONTEXT_H__
-#define __PANGO_CONTEXT_H__
-
-#include <pango/pango-font.h>
-#include <pango/pango-fontmap.h>
-#include <pango/pango-attributes.h>
-
-G_BEGIN_DECLS
-
-/* Sort of like a GC - application set information about how
- * to handle scripts
- */
-
-/* PangoContext typedefed in pango-fontmap.h */
-typedef struct _PangoContextClass PangoContextClass;
-
-#define PANGO_TYPE_CONTEXT              (pango_context_get_type ())
-#define PANGO_CONTEXT(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_CONTEXT, PangoContext))
-#define PANGO_CONTEXT_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_CONTEXT, PangoContextClass))
-#define PANGO_IS_CONTEXT(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_CONTEXT))
-#define PANGO_IS_CONTEXT_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_CONTEXT))
-#define PANGO_CONTEXT_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_CONTEXT, PangoContextClass))
-
-
-/* The PangoContext and PangoContextClass structs are private; if you
- * need to create a subclass of these, file a bug.
- */
-
-GType         pango_context_get_type      (void) G_GNUC_CONST;
-
-#ifdef PANGO_ENABLE_BACKEND
-PangoContext *pango_context_new           (void);
-void          pango_context_set_font_map  (PangoContext                 *context,
-					   PangoFontMap                 *font_map);
-#endif /* PANGO_ENABLE_BACKEND */
-PangoFontMap *pango_context_get_font_map  (PangoContext                 *context);
-
-void          pango_context_list_families (PangoContext                 *context,
-					   PangoFontFamily            ***families,
-					   int                          *n_families);
-PangoFont *   pango_context_load_font     (PangoContext                 *context,
-					   const PangoFontDescription   *desc);
-PangoFontset *pango_context_load_fontset  (PangoContext                 *context,
-					   const PangoFontDescription   *desc,
-					   PangoLanguage                *language);
-
-PangoFontMetrics *pango_context_get_metrics   (PangoContext                 *context,
-					       const PangoFontDescription   *desc,
-					       PangoLanguage                *language);
-
-void                      pango_context_set_font_description (PangoContext               *context,
-							      const PangoFontDescription *desc);
-PangoFontDescription *    pango_context_get_font_description (PangoContext               *context);
-PangoLanguage            *pango_context_get_language         (PangoContext               *context);
-void                      pango_context_set_language         (PangoContext               *context,
-							      PangoLanguage              *language);
-void                      pango_context_set_base_dir         (PangoContext               *context,
-							      PangoDirection              direction);
-PangoDirection            pango_context_get_base_dir         (PangoContext               *context);
-void                      pango_context_set_base_gravity     (PangoContext               *context,
-							      PangoGravity                gravity);
-PangoGravity              pango_context_get_base_gravity     (PangoContext               *context);
-PangoGravity              pango_context_get_gravity          (PangoContext               *context);
-void                      pango_context_set_gravity_hint     (PangoContext               *context,
-							      PangoGravityHint            hint);
-PangoGravityHint          pango_context_get_gravity_hint     (PangoContext               *context);
-
-void                        pango_context_set_matrix (PangoContext      *context,
-						      const PangoMatrix *matrix);
-G_CONST_RETURN PangoMatrix *pango_context_get_matrix (PangoContext      *context);
-
-/* Break a string of Unicode characters into segments with
- * consistent shaping/language engine and bidrectional level.
- * Returns a #GList of #PangoItem's
- */
-GList *pango_itemize                (PangoContext      *context,
-				     const char        *text,
-				     int                start_index,
-				     int                length,
-				     PangoAttrList     *attrs,
-				     PangoAttrIterator *cached_iter);
-GList *pango_itemize_with_base_dir  (PangoContext      *context,
-				     PangoDirection     base_dir,
-				     const char        *text,
-				     int                start_index,
-				     int                length,
-				     PangoAttrList     *attrs,
-				     PangoAttrIterator *cached_iter);
-
-G_END_DECLS
-
-#endif /* __PANGO_CONTEXT_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-coverage.h b/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-coverage.h
deleted file mode 100644
index e1e8d133..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-coverage.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Pango
- * pango-coverage.h: Coverage sets for fonts
- *
- * Copyright (C) 2000 Red Hat Software
- *
- * 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 __PANGO_COVERAGE_H__
-#define __PANGO_COVERAGE_H__
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-typedef struct _PangoCoverage PangoCoverage;
-
-typedef enum {
-  PANGO_COVERAGE_NONE,
-  PANGO_COVERAGE_FALLBACK,
-  PANGO_COVERAGE_APPROXIMATE,
-  PANGO_COVERAGE_EXACT
-} PangoCoverageLevel;
-
-PangoCoverage *    pango_coverage_new     (void);
-PangoCoverage *    pango_coverage_ref     (PangoCoverage      *coverage);
-void               pango_coverage_unref   (PangoCoverage      *coverage);
-PangoCoverage *    pango_coverage_copy    (PangoCoverage      *coverage);
-PangoCoverageLevel pango_coverage_get     (PangoCoverage      *coverage,
-					   int                 index_);
-void               pango_coverage_set     (PangoCoverage      *coverage,
-					   int                 index_,
-					   PangoCoverageLevel  level);
-void               pango_coverage_max     (PangoCoverage      *coverage,
-					   PangoCoverage      *other);
-
-void           pango_coverage_to_bytes   (PangoCoverage  *coverage,
-					  guchar        **bytes,
-					  int            *n_bytes);
-PangoCoverage *pango_coverage_from_bytes (guchar         *bytes,
-					  int             n_bytes);
-
-G_END_DECLS
-
-#endif /* __PANGO_COVERAGE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-engine.h b/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-engine.h
deleted file mode 100644
index ddc9ab16..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-engine.h
+++ /dev/null
@@ -1,379 +0,0 @@
-/* Pango
- * pango-engine.h: Engines for script and language specific processing
- *
- * Copyright (C) 2000,2003 Red Hat Software
- *
- * 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 __PANGO_ENGINE_H__
-#define __PANGO_ENGINE_H__
-
-#include <pango/pango-types.h>
-#include <pango/pango-item.h>
-#include <pango/pango-font.h>
-#include <pango/pango-glyph.h>
-#include <pango/pango-script.h>
-
-G_BEGIN_DECLS
-
-#ifdef PANGO_ENABLE_ENGINE
-
-/* Module API */
-
-#define PANGO_RENDER_TYPE_NONE "PangoRenderNone"
-
-#define PANGO_TYPE_ENGINE              (pango_engine_get_type ())
-#define PANGO_ENGINE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_ENGINE, PangoEngine))
-#define PANGO_IS_ENGINE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_ENGINE))
-#define PANGO_ENGINE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_ENGINE, PangoEngineClass))
-#define PANGO_IS_ENGINE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_ENGINE))
-#define PANGO_ENGINE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_ENGINE, PangoEngineClass))
-
-typedef struct _PangoEngine PangoEngine;
-typedef struct _PangoEngineClass PangoEngineClass;
-
-/**
- * PangoEngine:
- *
- * #PangoEngine is the base class for all types of language and
- * script specific engines. It has no functionality by itself.
- **/
-struct _PangoEngine
-{
-  /*< private >*/
-  GObject parent_instance;
-};
-
-/**
- * PangoEngineClass:
- *
- * Class structure for #PangoEngine
- **/
-struct _PangoEngineClass
-{
-  /*< private >*/
-  GObjectClass parent_class;
-};
-
-GType pango_engine_get_type (void) G_GNUC_CONST;
-
-#define PANGO_ENGINE_TYPE_LANG "PangoEngineLang"
-
-#define PANGO_TYPE_ENGINE_LANG              (pango_engine_lang_get_type ())
-#define PANGO_ENGINE_LANG(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_ENGINE_LANG, PangoEngineLang))
-#define PANGO_IS_ENGINE_LANG(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_ENGINE_LANG))
-#define PANGO_ENGINE_LANG_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_ENGINE_LANG, PangoEngineLangClass))
-#define PANGO_IS_ENGINE_LANG_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_ENGINE_LANG))
-#define PANGO_ENGINE_LANG_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_ENGINE_LANG, PangoEngineLangClass))
-
-typedef struct _PangoEngineLangClass PangoEngineLangClass;
-
-/**
- * PangoEngineLang:
- *
- * The #PangoEngineLang class is implemented by engines that
- * customize the rendering-system independent part of the
- * Pango pipeline for a particular script or language. For
- * instance, a custom #PangoEngineLang could be provided for
- * Thai to implement the dictionary-based word boundary
- * lookups needed for that language.
- **/
-struct _PangoEngineLang
-{
-  /*< private >*/
-  PangoEngine parent_instance;
-};
-
-/**
- * PangoEngineLangClass:
- * @script_break: Provides a custom implementation of pango_break().
- * If %NULL, pango_default_break() is used instead. If not %NULL, for
- * Pango versions before 1.16 (module interface version before 1.6.0),
- * this was called instead of pango_default_break(), but in newer versions,
- * pango_default_break() is always called and this is called after that to
- * allow tailoring the breaking results.
- *
- * Class structure for #PangoEngineLang
- **/
-struct _PangoEngineLangClass
-{
-  /*< private >*/
-  PangoEngineClass parent_class;
-
-  /*< public >*/
-  void (*script_break) (PangoEngineLang *engine,
-			const char    *text,
-			int            len,
-			PangoAnalysis *analysis,
-			PangoLogAttr  *attrs,
-			int            attrs_len);
-};
-
-GType pango_engine_lang_get_type (void) G_GNUC_CONST;
-
-#define PANGO_ENGINE_TYPE_SHAPE "PangoEngineShape"
-
-#define PANGO_TYPE_ENGINE_SHAPE              (pango_engine_shape_get_type ())
-#define PANGO_ENGINE_SHAPE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_ENGINE_SHAPE, PangoEngineShape))
-#define PANGO_IS_ENGINE_SHAPE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_ENGINE_SHAPE))
-#define PANGO_ENGINE_SHAPE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_ENGINE_SHAPE, PangoEngine_ShapeClass))
-#define PANGO_IS_ENGINE_SHAPE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_ENGINE_SHAPE))
-#define PANGO_ENGINE_SHAPE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_ENGINE_SHAPE, PangoEngineShapeClass))
-
-typedef struct _PangoEngineShapeClass PangoEngineShapeClass;
-
-/**
- * PangoEngineShape
- *
- * The #PangoEngineShape class is implemented by engines that
- * customize the rendering-system dependent part of the
- * Pango pipeline for a particular script or language.
- * A #PangoEngineShape implementation is then specific to both
- * a particular rendering system or group of rendering systems
- * and to a particular script. For instance, there is one
- * #PangoEngineShape implementation to handle shaping Arabic
- * for Fontconfig-based backends.
- **/
-struct _PangoEngineShape
-{
-  PangoEngine parent_instance;
-};
-
-/**
- * PangoEngineShapeClass:
- * @script_shape: Given a font, a piece of text, and a #PangoAnalysis
- *   structure, converts characters to glyphs and positions the
- *   resulting glyphs. The results are stored in the #PangoGlyphString
- *   that is passed in. (The implementation should resize it
- *   appropriately using pango_glyph_string_set_size()). All fields
- *   of the @log_clusters and @glyphs array must be filled in, with
- *   the exception that Pango will automatically generate
- *   <literal>glyphs->glyphs[i].attr.is_cluster_start</literal>
- *   using the @log_clusters array. Each input character must occur in one
- *   of the output logical clusters;
- *   if no rendering is desired for a character, this may involve
- *   inserting glyphs with the #PangoGlyph ID #PANGO_GLYPH_EMPTY, which
- *   is guaranteed never to render. If the shaping fails for any reason,
- *   the shaper should return with an empty (zero-size) glyph string.
- *   If the shaper has not set the size on the glyph string yet, simply
- *   returning signals the failure too.
- * @covers: Returns the characters that this engine can cover
- *   with a given font for a given language. If not overridden, the default
- *   implementation simply returns the coverage information for the
- *   font itself unmodified.
- *
- * Class structure for #PangoEngineShape
- **/
-struct _PangoEngineShapeClass
-{
-  /*< private >*/
-  PangoEngineClass parent_class;
-
-  /*< public >*/
-  void (*script_shape) (PangoEngineShape *engine,
-			PangoFont        *font,
-			const char       *text,
-			int               length,
-			const PangoAnalysis *analysis,
-			PangoGlyphString *glyphs);
-  PangoCoverageLevel (*covers)   (PangoEngineShape *engine,
-				  PangoFont        *font,
-				  PangoLanguage    *language,
-				  gunichar          wc);
-};
-
-GType pango_engine_shape_get_type (void) G_GNUC_CONST;
-
-typedef struct _PangoEngineInfo PangoEngineInfo;
-typedef struct _PangoEngineScriptInfo PangoEngineScriptInfo;
-
-struct _PangoEngineScriptInfo
-{
-  PangoScript script;
-  const gchar *langs;
-};
-
-struct _PangoEngineInfo
-{
-  const gchar *id;
-  const gchar *engine_type;
-  const gchar *render_type;
-  PangoEngineScriptInfo *scripts;
-  gint n_scripts;
-};
-
-/**
- * script_engine_list:
- * @engines: location to store a pointer to an array of engines.
- * @n_engines: location to store the number of elements in @engines.
- *
- * Function to be provided by a module to list the engines that the
- * module supplies. The function stores a pointer to an array
- * of #PangoEngineInfo structures and the length of that array in
- * the given location.
- *
- * Note that script_engine_init() will not be called before this
- * function.
- **/
-void script_engine_list (PangoEngineInfo **engines,
-			 int              *n_engines);
-
-/**
- * script_engine_init:
- * @module: a #GTypeModule structure used to associate any
- *  GObject types created in this module with the module.
- *
- * Function to be provided by a module to register any
- * GObject types in the module.
- **/
-void script_engine_init (GTypeModule *module);
-
-
-/**
- * script_engine_exit:
- *
- * Function to be provided by the module that is called
- * when the module is unloading. Frequently does nothing.
- **/
-void script_engine_exit (void);
-
-/**
- * script_engine_create:
- * @id: the ID of an engine as reported by script_engine_list.
- *
- * Function to be provided by the module to create an instance
- * of one of the engines implemented by the module.
- *
- * Return value: a newly created #PangoEngine of the specified
- *  type, or %NULL if an error occurred. (In normal operation,
- *  a module should not return %NULL. A %NULL return is only
- *  acceptable in the case where system misconfiguration or
- *  bugs in the driver routine are encountered.)
- **/
-PangoEngine *script_engine_create (const char *id);
-
-/* Utility macro used by PANGO_ENGINE_LANG_DEFINE_TYPE and
- * PANGO_ENGINE_LANG_DEFINE_TYPE
- */
-#define PANGO_ENGINE_DEFINE_TYPE(name, prefix, class_init, instance_init, parent_type) \
-static GType prefix ## _type;						  \
-static void								  \
-prefix ## _register_type (GTypeModule *module)				  \
-{									  \
-  const GTypeInfo object_info =						  \
-    {									  \
-      sizeof (name ## Class),						  \
-      (GBaseInitFunc) NULL,						  \
-      (GBaseFinalizeFunc) NULL,						  \
-      (GClassInitFunc) class_init,					  \
-      (GClassFinalizeFunc) NULL,					  \
-      NULL,          /* class_data */					  \
-      sizeof (name),							  \
-      0,             /* n_prelocs */					  \
-      (GInstanceInitFunc) instance_init,				  \
-      NULL           /* value_table */					  \
-    };									  \
-									  \
-  prefix ## _type =  g_type_module_register_type (module, parent_type,	  \
-						  # name,		  \
-						  &object_info, 0);	  \
-}
-
-/**
- * PANGO_ENGINE_LANG_DEFINE_TYPE:
- * @name: Name of the the type to register (for example:, <literal>ArabicEngineFc</literal>
- * @prefix: Prefix for symbols that will be defined (for example:, <literal>arabic_engine_fc</literal>
- * @class_init: Class initialization function for the new type, or %NULL
- * @instance_init: Instance initialization function for the new type, or %NULL
- *
- * Outputs the necessary code for GObject type registration for a
- * #PangoEngineLang class defined in a module. Two static symbols
- * are defined.
- *
- * <programlisting>
- *  static GType <replaceable>prefix</replaceable>_type;
- *  static void <replaceable>prefix</replaceable>_register_type (GTypeModule module);
- * </programlisting>
- *
- * The <function><replaceable>prefix</replaceable>_register_type()</function>
- * function should be called in your script_engine_init() function for
- * each type that your module implements, and then your script_engine_create()
- * function can create instances of the object as follows:
- *
- * <informalexample><programlisting>
- *  PangoEngine *engine = g_object_new (<replaceable>prefix</replaceable>_type, NULL);
- * </programlisting></informalexample>
- **/
-#define PANGO_ENGINE_LANG_DEFINE_TYPE(name, prefix, class_init, instance_init)	\
-  PANGO_ENGINE_DEFINE_TYPE (name, prefix,				\
-			    class_init, instance_init,			\
-			    PANGO_TYPE_ENGINE_LANG)
-
-/**
- * PANGO_ENGINE_SHAPE_DEFINE_TYPE:
- * @name: Name of the the type to register (for example:, <literal>ArabicEngineFc</literal>
- * @prefix: Prefix for symbols that will be defined (for example:, <literal>arabic_engine_fc</literal>
- * @class_init: Class initialization function for the new type, or %NULL
- * @instance_init: Instance initialization function for the new type, or %NULL
- *
- * Outputs the necessary code for GObject type registration for a
- * #PangoEngineShape class defined in a module. Two static symbols
- * are defined.
- *
- * <programlisting>
- *  static GType <replaceable>prefix</replaceable>_type;
- *  static void <replaceable>prefix</replaceable>_register_type (GTypeModule module);
- * </programlisting>
- *
- * The <function><replaceable>prefix</replaceable>_register_type()</function>
- * function should be called in your script_engine_init() function for
- * each type that your module implements, and then your script_engine_create()
- * function can create instances of the object as follows:
- *
- * <informalexample><programlisting>
- *  PangoEngine *engine = g_object_new (<replaceable>prefix</replaceable>_type, NULL);
- * </programlisting></informalexample>
- **/
-#define PANGO_ENGINE_SHAPE_DEFINE_TYPE(name, prefix, class_init, instance_init)	\
-  PANGO_ENGINE_DEFINE_TYPE (name, prefix,				\
-			    class_init, instance_init,			\
-			    PANGO_TYPE_ENGINE_SHAPE)
-
-/* Macro used for possibly builtin Pango modules. Not useful
- * for externally build modules. If we are compiling a module standaline,
- * then we name the entry points script_engine_list, etc. But if we
- * are compiling it for inclusion directly in Pango, then we need them to
- * to have distinct names for this module, so we prepend a prefix.
- *
- * The two intermediate macros are to deal with details of the C
- * preprocessor; token pasting tokens must be function arguments,
- * and macro substitution isn't used on function arguments that
- * are used for token pasting.
- */
-#ifdef PANGO_MODULE_PREFIX
-#define PANGO_MODULE_ENTRY(func) _PANGO_MODULE_ENTRY2(PANGO_MODULE_PREFIX,func)
-#define _PANGO_MODULE_ENTRY2(prefix,func) _PANGO_MODULE_ENTRY3(prefix,func)
-#define _PANGO_MODULE_ENTRY3(prefix,func) prefix##_script_engine_##func
-#else
-#define PANGO_MODULE_ENTRY(func) script_engine_##func
-#endif
-
-#endif /* PANGO_ENABLE_ENGINE */
-
-G_END_DECLS
-
-#endif /* __PANGO_ENGINE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-enum-types.h b/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-enum-types.h
deleted file mode 100644
index 8aca839a..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-enum-types.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-/* Generated data (by glib-mkenums) */
-
-#ifndef __PANGO_ENUM_TYPES_H__
-#define __PANGO_ENUM_TYPES_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-/* enumerations from "pango-attributes.h" */
-GType pango_attr_type_get_type (void);
-#define PANGO_TYPE_ATTR_TYPE (pango_attr_type_get_type())
-GType pango_underline_get_type (void);
-#define PANGO_TYPE_UNDERLINE (pango_underline_get_type())
-/* enumerations from "pango-coverage.h" */
-GType pango_coverage_level_get_type (void);
-#define PANGO_TYPE_COVERAGE_LEVEL (pango_coverage_level_get_type())
-/* enumerations from "pango-font.h" */
-GType pango_style_get_type (void);
-#define PANGO_TYPE_STYLE (pango_style_get_type())
-GType pango_variant_get_type (void);
-#define PANGO_TYPE_VARIANT (pango_variant_get_type())
-GType pango_weight_get_type (void);
-#define PANGO_TYPE_WEIGHT (pango_weight_get_type())
-GType pango_stretch_get_type (void);
-#define PANGO_TYPE_STRETCH (pango_stretch_get_type())
-GType pango_font_mask_get_type (void);
-#define PANGO_TYPE_FONT_MASK (pango_font_mask_get_type())
-/* enumerations from "pango-gravity.h" */
-GType pango_gravity_get_type (void);
-#define PANGO_TYPE_GRAVITY (pango_gravity_get_type())
-GType pango_gravity_hint_get_type (void);
-#define PANGO_TYPE_GRAVITY_HINT (pango_gravity_hint_get_type())
-/* enumerations from "pango-layout.h" */
-GType pango_alignment_get_type (void);
-#define PANGO_TYPE_ALIGNMENT (pango_alignment_get_type())
-GType pango_wrap_mode_get_type (void);
-#define PANGO_TYPE_WRAP_MODE (pango_wrap_mode_get_type())
-GType pango_ellipsize_mode_get_type (void);
-#define PANGO_TYPE_ELLIPSIZE_MODE (pango_ellipsize_mode_get_type())
-/* enumerations from "pango-renderer.h" */
-GType pango_render_part_get_type (void);
-#define PANGO_TYPE_RENDER_PART (pango_render_part_get_type())
-/* enumerations from "pango-script.h" */
-GType pango_script_get_type (void);
-#define PANGO_TYPE_SCRIPT (pango_script_get_type())
-/* enumerations from "pango-tabs.h" */
-GType pango_tab_align_get_type (void);
-#define PANGO_TYPE_TAB_ALIGN (pango_tab_align_get_type())
-/* enumerations from "pango-types.h" */
-GType pango_direction_get_type (void);
-#define PANGO_TYPE_DIRECTION (pango_direction_get_type())
-G_END_DECLS
-
-#endif /* __PANGO_ENUM_TYPES_H__ */
-
-/* Generated data ends here */
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-features.h b/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-features.h
deleted file mode 100644
index 48c66dc7..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-features.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* Generated by configure. Do not edit */
-#ifndef PANGO_FEATURES_H
-#define PANGO_FEATURES_H
-
-#define PANGO_VERSION_MAJOR 1
-#define PANGO_VERSION_MINOR 20
-#define PANGO_VERSION_MICRO 5
-
-#define PANGO_VERSION_STRING "1.20.5"
-
-
-#endif
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-font.h b/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-font.h
deleted file mode 100644
index 66e68aa8..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-font.h
+++ /dev/null
@@ -1,382 +0,0 @@
-/* Pango
- * pango-font.h: Font handling
- *
- * Copyright (C) 2000 Red Hat Software
- *
- * 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 __PANGO_FONT_H__
-#define __PANGO_FONT_H__
-
-#include <pango/pango-coverage.h>
-#include <pango/pango-types.h>
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-typedef struct _PangoFontDescription PangoFontDescription;
-typedef struct _PangoFontMetrics PangoFontMetrics;
-
-/**
- * PangoStyle:
- * @PANGO_STYLE_NORMAL: the font is upright.
- * @PANGO_STYLE_OBLIQUE: the font is slanted, but in a roman style.
- * @PANGO_STYLE_ITALIC: the font is slanted in an italic style.
- *
- * An enumeration specifying the various slant styles possible for a font.
- **/
-typedef enum {
-  PANGO_STYLE_NORMAL,
-  PANGO_STYLE_OBLIQUE,
-  PANGO_STYLE_ITALIC
-} PangoStyle;
-
-typedef enum {
-  PANGO_VARIANT_NORMAL,
-  PANGO_VARIANT_SMALL_CAPS
-} PangoVariant;
-
-typedef enum {
-  PANGO_WEIGHT_ULTRALIGHT = 200,
-  PANGO_WEIGHT_LIGHT = 300,
-  PANGO_WEIGHT_NORMAL = 400,
-  PANGO_WEIGHT_SEMIBOLD = 600,
-  PANGO_WEIGHT_BOLD = 700,
-  PANGO_WEIGHT_ULTRABOLD = 800,
-  PANGO_WEIGHT_HEAVY = 900
-} PangoWeight;
-
-typedef enum {
-  PANGO_STRETCH_ULTRA_CONDENSED,
-  PANGO_STRETCH_EXTRA_CONDENSED,
-  PANGO_STRETCH_CONDENSED,
-  PANGO_STRETCH_SEMI_CONDENSED,
-  PANGO_STRETCH_NORMAL,
-  PANGO_STRETCH_SEMI_EXPANDED,
-  PANGO_STRETCH_EXPANDED,
-  PANGO_STRETCH_EXTRA_EXPANDED,
-  PANGO_STRETCH_ULTRA_EXPANDED
-} PangoStretch;
-
-typedef enum {
-  PANGO_FONT_MASK_FAMILY  = 1 << 0,
-  PANGO_FONT_MASK_STYLE   = 1 << 1,
-  PANGO_FONT_MASK_VARIANT = 1 << 2,
-  PANGO_FONT_MASK_WEIGHT  = 1 << 3,
-  PANGO_FONT_MASK_STRETCH = 1 << 4,
-  PANGO_FONT_MASK_SIZE    = 1 << 5,
-  PANGO_FONT_MASK_GRAVITY = 1 << 6
-} PangoFontMask;
-
-/* CSS scale factors (1.2 factor between each size) */
-#define PANGO_SCALE_XX_SMALL ((double)0.5787037037037)
-#define PANGO_SCALE_X_SMALL  ((double)0.6444444444444)
-#define PANGO_SCALE_SMALL    ((double)0.8333333333333)
-#define PANGO_SCALE_MEDIUM   ((double)1.0)
-#define PANGO_SCALE_LARGE    ((double)1.2)
-#define PANGO_SCALE_X_LARGE  ((double)1.4399999999999)
-#define PANGO_SCALE_XX_LARGE ((double)1.728)
-
-/*
- * PangoFontDescription
- */
-
-#define PANGO_TYPE_FONT_DESCRIPTION (pango_font_description_get_type ())
-
-GType                 pango_font_description_get_type    (void) G_GNUC_CONST;
-PangoFontDescription *pango_font_description_new         (void);
-PangoFontDescription *pango_font_description_copy        (const PangoFontDescription  *desc);
-PangoFontDescription *pango_font_description_copy_static (const PangoFontDescription  *desc);
-guint                 pango_font_description_hash        (const PangoFontDescription  *desc) G_GNUC_PURE;
-gboolean              pango_font_description_equal       (const PangoFontDescription  *desc1,
-							  const PangoFontDescription  *desc2) G_GNUC_PURE;
-void                  pango_font_description_free        (PangoFontDescription        *desc);
-void                  pango_font_descriptions_free       (PangoFontDescription       **descs,
-							  int                          n_descs);
-
-void                 pango_font_description_set_family        (PangoFontDescription *desc,
-							       const char           *family);
-void                 pango_font_description_set_family_static (PangoFontDescription *desc,
-							       const char           *family);
-G_CONST_RETURN char *pango_font_description_get_family        (const PangoFontDescription *desc) G_GNUC_PURE;
-void                 pango_font_description_set_style         (PangoFontDescription *desc,
-							       PangoStyle            style);
-PangoStyle           pango_font_description_get_style         (const PangoFontDescription *desc) G_GNUC_PURE;
-void                 pango_font_description_set_variant       (PangoFontDescription *desc,
-							       PangoVariant          variant);
-PangoVariant         pango_font_description_get_variant       (const PangoFontDescription *desc) G_GNUC_PURE;
-void                 pango_font_description_set_weight        (PangoFontDescription *desc,
-							       PangoWeight           weight);
-PangoWeight          pango_font_description_get_weight        (const PangoFontDescription *desc) G_GNUC_PURE;
-void                 pango_font_description_set_stretch       (PangoFontDescription *desc,
-							       PangoStretch          stretch);
-PangoStretch         pango_font_description_get_stretch       (const PangoFontDescription *desc) G_GNUC_PURE;
-void                 pango_font_description_set_size          (PangoFontDescription *desc,
-							       gint                  size);
-gint                 pango_font_description_get_size          (const PangoFontDescription *desc) G_GNUC_PURE;
-void                 pango_font_description_set_absolute_size (PangoFontDescription *desc,
-							       double                size);
-gboolean             pango_font_description_get_size_is_absolute (const PangoFontDescription *desc) G_GNUC_PURE;
-void                 pango_font_description_set_gravity       (PangoFontDescription *desc,
-							       PangoGravity          gravity);
-PangoGravity         pango_font_description_get_gravity       (const PangoFontDescription *desc) G_GNUC_PURE;
-
-PangoFontMask pango_font_description_get_set_fields (const PangoFontDescription *desc) G_GNUC_PURE;
-void          pango_font_description_unset_fields   (PangoFontDescription       *desc,
-						     PangoFontMask               to_unset);
-
-void pango_font_description_merge        (PangoFontDescription       *desc,
-					  const PangoFontDescription *desc_to_merge,
-					  gboolean                    replace_existing);
-void pango_font_description_merge_static (PangoFontDescription       *desc,
-					  const PangoFontDescription *desc_to_merge,
-					  gboolean                    replace_existing);
-
-gboolean pango_font_description_better_match (const PangoFontDescription *desc,
-					      const PangoFontDescription *old_match,
-					      const PangoFontDescription *new_match) G_GNUC_PURE;
-
-PangoFontDescription *pango_font_description_from_string (const char                  *str);
-char *                pango_font_description_to_string   (const PangoFontDescription  *desc);
-char *                pango_font_description_to_filename (const PangoFontDescription  *desc);
-
-/*
- * PangoFontMetrics
- */
-
-#define PANGO_TYPE_FONT_METRICS  (pango_font_metrics_get_type ())
-GType             pango_font_metrics_get_type                    (void) G_GNUC_CONST;
-PangoFontMetrics *pango_font_metrics_ref                         (PangoFontMetrics *metrics);
-void              pango_font_metrics_unref                       (PangoFontMetrics *metrics);
-int               pango_font_metrics_get_ascent                  (PangoFontMetrics *metrics) G_GNUC_PURE;
-int               pango_font_metrics_get_descent                 (PangoFontMetrics *metrics) G_GNUC_PURE;
-int               pango_font_metrics_get_approximate_char_width  (PangoFontMetrics *metrics) G_GNUC_PURE;
-int               pango_font_metrics_get_approximate_digit_width (PangoFontMetrics *metrics) G_GNUC_PURE;
-int               pango_font_metrics_get_underline_position      (PangoFontMetrics *metrics) G_GNUC_PURE;
-int               pango_font_metrics_get_underline_thickness     (PangoFontMetrics *metrics) G_GNUC_PURE;
-int               pango_font_metrics_get_strikethrough_position  (PangoFontMetrics *metrics) G_GNUC_PURE;
-int               pango_font_metrics_get_strikethrough_thickness (PangoFontMetrics *metrics) G_GNUC_PURE;
-
-#ifdef PANGO_ENABLE_BACKEND
-
-PangoFontMetrics *pango_font_metrics_new (void);
-
-struct _PangoFontMetrics
-{
-  guint ref_count;
-
-  int ascent;
-  int descent;
-  int approximate_char_width;
-  int approximate_digit_width;
-  int underline_position;
-  int underline_thickness;
-  int strikethrough_position;
-  int strikethrough_thickness;
-};
-
-#endif /* PANGO_ENABLE_BACKEND */
-
-/*
- * PangoFontFamily
- */
-
-#define PANGO_TYPE_FONT_FAMILY              (pango_font_family_get_type ())
-#define PANGO_FONT_FAMILY(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_FONT_FAMILY, PangoFontFamily))
-#define PANGO_IS_FONT_FAMILY(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_FONT_FAMILY))
-
-typedef struct _PangoFontFamily      PangoFontFamily;
-typedef struct _PangoFontFace        PangoFontFace;
-
-GType      pango_font_family_get_type       (void) G_GNUC_CONST;
-
-void                 pango_font_family_list_faces (PangoFontFamily  *family,
-						   PangoFontFace  ***faces,
-						   int              *n_faces);
-G_CONST_RETURN char *pango_font_family_get_name   (PangoFontFamily  *family) G_GNUC_PURE;
-gboolean   pango_font_family_is_monospace         (PangoFontFamily  *family) G_GNUC_PURE;
-
-#ifdef PANGO_ENABLE_BACKEND
-
-#define PANGO_FONT_FAMILY_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_FONT_FAMILY, PangoFontFamilyClass))
-#define PANGO_IS_FONT_FAMILY_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_FONT_FAMILY))
-#define PANGO_FONT_FAMILY_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_FONT_FAMILY, PangoFontFamilyClass))
-
-typedef struct _PangoFontFamilyClass PangoFontFamilyClass;
-
-struct _PangoFontFamily
-{
-  GObject parent_instance;
-};
-
-struct _PangoFontFamilyClass
-{
-  GObjectClass parent_class;
-
-  /*< public >*/
-
-  void  (*list_faces)      (PangoFontFamily  *family,
-			    PangoFontFace  ***faces,
-			    int              *n_faces);
-  const char * (*get_name) (PangoFontFamily  *family);
-  gboolean (*is_monospace) (PangoFontFamily *family);
-
-  /*< private >*/
-
-  /* Padding for future expansion */
-  void (*_pango_reserved2) (void);
-  void (*_pango_reserved3) (void);
-  void (*_pango_reserved4) (void);
-};
-
-#endif /* PANGO_ENABLE_BACKEND */
-
-/*
- * PangoFontFace
- */
-
-#define PANGO_TYPE_FONT_FACE              (pango_font_face_get_type ())
-#define PANGO_FONT_FACE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_FONT_FACE, PangoFontFace))
-#define PANGO_IS_FONT_FACE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_FONT_FACE))
-
-GType      pango_font_face_get_type       (void) G_GNUC_CONST;
-
-PangoFontDescription *pango_font_face_describe       (PangoFontFace  *face);
-G_CONST_RETURN char  *pango_font_face_get_face_name  (PangoFontFace  *face) G_GNUC_PURE;
-void                  pango_font_face_list_sizes     (PangoFontFace  *face,
-						      int           **sizes,
-						      int            *n_sizes);
-gboolean              pango_font_face_is_synthesized (PangoFontFace  *face) G_GNUC_PURE;
-
-#ifdef PANGO_ENABLE_BACKEND
-
-#define PANGO_FONT_FACE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_FONT_FACE, PangoFontFaceClass))
-#define PANGO_IS_FONT_FACE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_FONT_FACE))
-#define PANGO_FONT_FACE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_FONT_FACE, PangoFontFaceClass))
-
-typedef struct _PangoFontFaceClass   PangoFontFaceClass;
-
-struct _PangoFontFace
-{
-  GObject parent_instance;
-};
-
-struct _PangoFontFaceClass
-{
-  GObjectClass parent_class;
-
-  /*< public >*/
-
-  const char           * (*get_face_name)  (PangoFontFace *face);
-  PangoFontDescription * (*describe)       (PangoFontFace *face);
-  void                   (*list_sizes)     (PangoFontFace  *face,
-					    int           **sizes,
-					    int            *n_sizes);
-  gboolean               (*is_synthesized) (PangoFontFace *face);
-
-  /*< private >*/
-
-  /* Padding for future expansion */
-  void (*_pango_reserved3) (void);
-  void (*_pango_reserved4) (void);
-};
-
-#endif /* PANGO_ENABLE_BACKEND */
-
-/*
- * PangoFont
- */
-
-#define PANGO_TYPE_FONT              (pango_font_get_type ())
-#define PANGO_FONT(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_FONT, PangoFont))
-#define PANGO_IS_FONT(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_FONT))
-
-GType                 pango_font_get_type          (void) G_GNUC_CONST;
-
-PangoFontDescription *pango_font_describe          (PangoFont        *font);
-PangoFontDescription *pango_font_describe_with_absolute_size (PangoFont        *font);
-PangoCoverage *       pango_font_get_coverage      (PangoFont        *font,
-						    PangoLanguage    *language);
-PangoEngineShape *    pango_font_find_shaper       (PangoFont        *font,
-						    PangoLanguage    *language,
-						    guint32           ch);
-PangoFontMetrics *    pango_font_get_metrics       (PangoFont        *font,
-						    PangoLanguage    *language);
-void                  pango_font_get_glyph_extents (PangoFont        *font,
-						    PangoGlyph        glyph,
-						    PangoRectangle   *ink_rect,
-						    PangoRectangle   *logical_rect);
-PangoFontMap         *pango_font_get_font_map      (PangoFont        *font);
-
-#ifdef PANGO_ENABLE_BACKEND
-
-#define PANGO_FONT_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_FONT, PangoFontClass))
-#define PANGO_IS_FONT_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_FONT))
-#define PANGO_FONT_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_FONT, PangoFontClass))
-
-typedef struct _PangoFontClass       PangoFontClass;
-
-struct _PangoFont
-{
-  GObject parent_instance;
-};
-
-struct _PangoFontClass
-{
-  GObjectClass parent_class;
-
-  /*< public >*/
-
-  PangoFontDescription *(*describe)           (PangoFont      *font);
-  PangoCoverage *       (*get_coverage)       (PangoFont      *font,
-					       PangoLanguage  *lang);
-  PangoEngineShape *    (*find_shaper)        (PangoFont      *font,
-					       PangoLanguage  *lang,
-					       guint32         ch);
-  void                  (*get_glyph_extents)  (PangoFont      *font,
-					       PangoGlyph      glyph,
-					       PangoRectangle *ink_rect,
-					       PangoRectangle *logical_rect);
-  PangoFontMetrics *    (*get_metrics)        (PangoFont      *font,
-					       PangoLanguage  *language);
-  PangoFontMap *        (*get_font_map)       (PangoFont      *font);
-  PangoFontDescription *(*describe_absolute)  (PangoFont      *font);
-  /*< private >*/
-
-  /* Padding for future expansion */
-  void (*_pango_reserved1) (void);
-  void (*_pango_reserved2) (void);
-};
-
-/* used for very rare and miserable situtations that we cannot even
- * draw a hexbox
- */
-#define PANGO_UNKNOWN_GLYPH_WIDTH  10
-#define PANGO_UNKNOWN_GLYPH_HEIGHT 14
-
-#endif /* PANGO_ENABLE_BACKEND */
-
-#define PANGO_GLYPH_EMPTY           ((PangoGlyph)0x0FFFFFFF)
-#define PANGO_GLYPH_INVALID_INPUT   ((PangoGlyph)0xFFFFFFFF)
-#define PANGO_GLYPH_UNKNOWN_FLAG    ((PangoGlyph)0x10000000)
-#define PANGO_GET_UNKNOWN_GLYPH(wc) ((PangoGlyph)(wc)|PANGO_GLYPH_UNKNOWN_FLAG)
-
-
-G_END_DECLS
-
-#endif /* __PANGO_FONT_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-fontmap.h b/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-fontmap.h
deleted file mode 100644
index 204178fc..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-fontmap.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* Pango
- * pango-font.h: Font handling
- *
- * Copyright (C) 2000 Red Hat Software
- *
- * 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 __PANGO_FONTMAP_H__
-#define __PANGO_FONTMAP_H__
-
-#include <pango/pango-font.h>
-#include <pango/pango-fontset.h>
-
-G_BEGIN_DECLS
-
-#define PANGO_TYPE_FONT_MAP              (pango_font_map_get_type ())
-#define PANGO_FONT_MAP(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_FONT_MAP, PangoFontMap))
-#define PANGO_IS_FONT_MAP(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_FONT_MAP))
-
-typedef struct _PangoContext PangoContext;
-
-GType         pango_font_map_get_type       (void) G_GNUC_CONST;
-PangoFont *   pango_font_map_load_font     (PangoFontMap                 *fontmap,
-					    PangoContext                 *context,
-					    const PangoFontDescription   *desc);
-PangoFontset *pango_font_map_load_fontset  (PangoFontMap                 *fontmap,
-					    PangoContext                 *context,
-					    const PangoFontDescription   *desc,
-					    PangoLanguage                *language);
-void          pango_font_map_list_families (PangoFontMap                 *fontmap,
-					    PangoFontFamily            ***families,
-					    int                          *n_families);
-
-#ifdef PANGO_ENABLE_BACKEND
-
-#define PANGO_FONT_MAP_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_FONT_MAP, PangoFontMapClass))
-#define PANGO_IS_FONT_MAP_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_FONT_MAP))
-#define PANGO_FONT_MAP_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_FONT_MAP, PangoFontMapClass))
-
-typedef struct _PangoFontMapClass PangoFontMapClass;
-
-struct _PangoFontMap
-{
-  GObject parent_instance;
-};
-
-struct _PangoFontMapClass
-{
-  GObjectClass parent_class;
-
-  /*< public >*/
-
-  PangoFont *   (*load_font)     (PangoFontMap               *fontmap,
-				  PangoContext               *context,
-				  const PangoFontDescription *desc);
-  void          (*list_families) (PangoFontMap               *fontmap,
-				  PangoFontFamily          ***families,
-				  int                        *n_families);
-  PangoFontset *(*load_fontset)  (PangoFontMap               *fontmap,
-				  PangoContext               *context,
-				  const PangoFontDescription *desc,
-				  PangoLanguage              *language);
-
-  const char *shape_engine_type;
-
-  /*< private >*/
-
-  /* Padding for future expansion */
-  void (*_pango_reserved1) (void);
-  void (*_pango_reserved2) (void);
-  void (*_pango_reserved3) (void);
-  void (*_pango_reserved4) (void);
-};
-
-const char   *pango_font_map_get_shape_engine_type (PangoFontMap *fontmap);
-
-#endif /* PANGO_ENABLE_BACKEND */
-
-G_END_DECLS
-
-#endif /* __PANGO_FONTMAP_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-fontset.h b/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-fontset.h
deleted file mode 100644
index 5c6c7488..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-fontset.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/* Pango
- * pango-fontset.h: Font set handling
- *
- * Copyright (C) 2001 Red Hat Software
- *
- * 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 __PANGO_FONTSET_H__
-#define __PANGO_FONTSET_H__
-
-#include <pango/pango-coverage.h>
-#include <pango/pango-types.h>
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/*
- * PangoFontset
- */
-
-#define PANGO_TYPE_FONTSET              (pango_fontset_get_type ())
-#define PANGO_FONTSET(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_FONTSET, PangoFontset))
-#define PANGO_IS_FONTSET(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_FONTSET))
-
-GType pango_fontset_get_type (void) G_GNUC_CONST;
-
-typedef struct _PangoFontset        PangoFontset;
-
-/**
- * PangoFontsetForeachFunc
- * @fontset: a #PangoFontset
- * @font: a font from @fontset
- * @data: callback data
- *
- * A callback function used by pango_fontset_foreach() when enumerating
- * the fonts in a fontset.
- *
- * Returns: if %TRUE, stop iteration and return immediately.
- *
- * Since: 1.4
- **/
-typedef gboolean (*PangoFontsetForeachFunc) (PangoFontset  *fontset,
-					     PangoFont     *font,
-					     gpointer       data);
-
-PangoFont *       pango_fontset_get_font    (PangoFontset           *fontset,
-					     guint                   wc);
-PangoFontMetrics *pango_fontset_get_metrics (PangoFontset           *fontset);
-void              pango_fontset_foreach     (PangoFontset           *fontset,
-					     PangoFontsetForeachFunc func,
-					     gpointer                data);
-
-#ifdef PANGO_ENABLE_BACKEND
-
-typedef struct _PangoFontsetClass   PangoFontsetClass;
-
-#define PANGO_FONTSET_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_FONTSET, PangoFontsetClass))
-#define PANGO_IS_FONTSET_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_FONTSET))
-#define PANGO_FONTSET_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_FONTSET, PangoFontsetClass))
-
-struct _PangoFontset
-{
-  GObject parent_instance;
-};
-
-struct _PangoFontsetClass
-{
-  GObjectClass parent_class;
-
-  /*< public >*/
-
-  PangoFont *       (*get_font)     (PangoFontset     *fontset,
-				     guint             wc);
-
-  PangoFontMetrics *(*get_metrics)  (PangoFontset     *fontset);
-  PangoLanguage *   (*get_language) (PangoFontset     *fontset);
-  void              (*foreach)      (PangoFontset           *fontset,
-				     PangoFontsetForeachFunc func,
-				     gpointer                data);
-
-  /*< private >*/
-
-  /* Padding for future expansion */
-  void (*_pango_reserved1) (void);
-  void (*_pango_reserved2) (void);
-  void (*_pango_reserved3) (void);
-  void (*_pango_reserved4) (void);
-};
-
-/*
- * PangoFontsetSimple
- */
-
-#define PANGO_TYPE_FONTSET_SIMPLE       (pango_fontset_simple_get_type ())
-#define PANGO_FONTSET_SIMPLE(object)    (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_FONTSET_SIMPLE, PangoFontsetSimple))
-#define PANGO_IS_FONTSET_SIMPLE(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_FONTSET_SIMPLE))
-
-typedef struct _PangoFontsetSimple  PangoFontsetSimple;
-typedef struct _PangoFontsetSimpleClass  PangoFontsetSimpleClass;
-
-GType pango_fontset_simple_get_type (void) G_GNUC_CONST;
-
-PangoFontsetSimple * pango_fontset_simple_new    (PangoLanguage      *language);
-void                 pango_fontset_simple_append (PangoFontsetSimple *fontset,
-						  PangoFont          *font);
-int                  pango_fontset_simple_size   (PangoFontsetSimple *fontset);
-
-#endif /* PANGO_ENABLE_BACKEND */
-
-G_END_DECLS
-
-#endif /* __PANGO_FONTSET_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-glyph-item.h b/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-glyph-item.h
deleted file mode 100644
index 4bad2651..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-glyph-item.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Pango
- * pango-glyph-item.h: Pair of PangoItem and a glyph string
- *
- * Copyright (C) 2002 Red Hat Software
- *
- * 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 __PANGO_GLYPH_ITEM_H__
-#define __PANGO_GLYPH_ITEM_H__
-
-#include <pango/pango-attributes.h>
-#include <pango/pango-break.h>
-#include <pango/pango-item.h>
-#include <pango/pango-glyph.h>
-
-G_BEGIN_DECLS
-
-typedef struct _PangoGlyphItem PangoGlyphItem;
-
-struct _PangoGlyphItem
-{
-  PangoItem        *item;
-  PangoGlyphString *glyphs;
-};
-
-#define PANGO_TYPE_GLYPH_ITEM (pango_glyph_item_get_type ())
-
-GType pango_glyph_item_get_type (void) G_GNUC_CONST;
-
-PangoGlyphItem *pango_glyph_item_split        (PangoGlyphItem *orig,
-					       const char     *text,
-					       int             split_index);
-PangoGlyphItem *pango_glyph_item_copy         (PangoGlyphItem *orig);
-void            pango_glyph_item_free         (PangoGlyphItem *glyph_item);
-GSList *        pango_glyph_item_apply_attrs  (PangoGlyphItem *glyph_item,
-					       const char     *text,
-					       PangoAttrList  *list);
-void            pango_glyph_item_letter_space (PangoGlyphItem *glyph_item,
-					       const char     *text,
-					       PangoLogAttr   *log_attrs,
-					       int             letter_spacing);
-
-G_END_DECLS
-
-#endif /* __PANGO_GLYPH_ITEM_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-glyph.h b/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-glyph.h
deleted file mode 100644
index cd26f53c..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-glyph.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/* Pango
- * pango-glyph.h: Glyph storage
- *
- * Copyright (C) 2000 Red Hat Software
- *
- * 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 __PANGO_GLYPH_H__
-#define __PANGO_GLYPH_H__
-
-#include <pango/pango-types.h>
-#include <pango/pango-item.h>
-
-G_BEGIN_DECLS
-
-typedef struct _PangoGlyphGeometry PangoGlyphGeometry;
-typedef struct _PangoGlyphVisAttr PangoGlyphVisAttr;
-typedef struct _PangoGlyphInfo PangoGlyphInfo;
-typedef struct _PangoGlyphString PangoGlyphString;
-
-/* 1024ths of a device unit */
-typedef gint32 PangoGlyphUnit;
-
-/* Positioning information about a glyph
- */
-struct _PangoGlyphGeometry
-{
-  PangoGlyphUnit width;
-  PangoGlyphUnit x_offset;
-  PangoGlyphUnit y_offset;
-};
-
-/* Visual attributes of a glyph
- */
-struct _PangoGlyphVisAttr
-{
-  guint is_cluster_start : 1;
-};
-
-/* A single glyph
- */
-struct _PangoGlyphInfo
-{
-  PangoGlyph    glyph;
-  PangoGlyphGeometry geometry;
-  PangoGlyphVisAttr  attr;
-};
-
-/* A string of glyphs with positional information and visual attributes -
- * ready for drawing
- */
-struct _PangoGlyphString {
-  gint num_glyphs;
-
-  PangoGlyphInfo *glyphs;
-
-  /* This is a memory inefficient way of representing the information
-   * here - each value gives the byte index within the text
-   * corresponding to the glyph string of the start of the cluster to
-   * which the glyph belongs.
-   */
-  gint *log_clusters;
-
-  /*< private >*/
-  gint space;
-};
-
-#define PANGO_TYPE_GLYPH_STRING (pango_glyph_string_get_type ())
-
-PangoGlyphString *pango_glyph_string_new      (void);
-void              pango_glyph_string_set_size (PangoGlyphString *string,
-					       gint              new_len);
-GType             pango_glyph_string_get_type (void) G_GNUC_CONST;
-PangoGlyphString *pango_glyph_string_copy     (PangoGlyphString *string);
-void              pango_glyph_string_free     (PangoGlyphString *string);
-void              pango_glyph_string_extents  (PangoGlyphString *glyphs,
-					       PangoFont        *font,
-					       PangoRectangle   *ink_rect,
-					       PangoRectangle   *logical_rect);
-int               pango_glyph_string_get_width(PangoGlyphString *glyphs) G_GNUC_PURE;
-
-void              pango_glyph_string_extents_range  (PangoGlyphString *glyphs,
-						     int               start,
-						     int               end,
-						     PangoFont        *font,
-						     PangoRectangle   *ink_rect,
-						     PangoRectangle   *logical_rect);
-
-void pango_glyph_string_get_logical_widths (PangoGlyphString *glyphs,
-					    const char       *text,
-					    int               length,
-					    int               embedding_level,
-					    int              *logical_widths);
-
-void pango_glyph_string_index_to_x (PangoGlyphString *glyphs,
-				    char             *text,
-				    int               length,
-				    PangoAnalysis    *analysis,
-				    int               index_,
-				    gboolean          trailing,
-				    int              *x_pos);
-void pango_glyph_string_x_to_index (PangoGlyphString *glyphs,
-				    char             *text,
-				    int               length,
-				    PangoAnalysis    *analysis,
-				    int               x_pos,
-				    int              *index_,
-				    int              *trailing);
-
-/* Turn a string of characters into a string of glyphs
- */
-void pango_shape (const gchar      *text,
-		  gint              length,
-		  const PangoAnalysis *analysis,
-		  PangoGlyphString *glyphs);
-
-GList *pango_reorder_items (GList *logical_items);
-
-G_END_DECLS
-
-#endif /* __PANGO_GLYPH_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-gravity.h b/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-gravity.h
deleted file mode 100644
index 2e42ebd8..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-gravity.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* Pango
- * pango-gravity.h: Gravity routines
- *
- * Copyright (C) 2006, 2007 Red Hat Software
- *
- * 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 __PANGO_GRAVITY_H__
-#define __PANGO_GRAVITY_H__
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-/**
- * PangoGravity:
- * @PANGO_GRAVITY_SOUTH: Glyphs stand upright (default)
- * @PANGO_GRAVITY_EAST: Glyphs are rotated 90 degrees clockwise
- * @PANGO_GRAVITY_NORTH: Glyphs are upside-down
- * @PANGO_GRAVITY_WEST: Glyphs are rotated 90 degrees counter-clockwise
- * @PANGO_GRAVITY_AUTO: Gravity is resolved from the context matrix
- *
- * The #PangoGravity type represents the orientation of glyphs in a segment
- * of text.  This is useful when rendering vertical text layouts.  In
- * those situations, the layout is rotated using a non-identity PangoMatrix,
- * and then glyph orientation is controlled using #PangoGravity.
- * Not every value in this enumeration makes sense for every usage of
- * #PangoGravity; for example, %PANGO_GRAVITY_AUTO only can be passed to
- * pango_context_set_base_gravity() and can only be returned by
- * pango_context_get_base_gravity().
- *
- * See also: #PangoGravityHint
- *
- * Since: 1.16
- **/
-typedef enum {
-  PANGO_GRAVITY_SOUTH,
-  PANGO_GRAVITY_EAST,
-  PANGO_GRAVITY_NORTH,
-  PANGO_GRAVITY_WEST,
-  PANGO_GRAVITY_AUTO
-} PangoGravity;
-
-/**
- * PangoGravityHint:
- * @PANGO_GRAVITY_HINT_NATURAL: scripts will take their natural gravity based
- * on the base gravity and the script.  This is the default.
- * @PANGO_GRAVITY_HINT_STRONG: always use the base gravity set, regardless of
- * the script.
- * @PANGO_GRAVITY_HINT_LINE: for scripts not in their natural direction (eg.
- * Latin in East gravity), choose per-script gravity such that every script
- * respects the line progression.  This means, Latin and Arabic will take
- * opposite gravities and both flow top-to-bottom for example.
- *
- * The #PangoGravityHint defines how horizontal scripts should behave in a
- * vertical context.  That is, English excerpt in a vertical paragraph for
- * example.
- *
- * See #PangoGravity.
- *
- * Since: 1.16
- **/
-typedef enum {
-  PANGO_GRAVITY_HINT_NATURAL,
-  PANGO_GRAVITY_HINT_STRONG,
-  PANGO_GRAVITY_HINT_LINE
-} PangoGravityHint;
-
-/**
- * PANGO_GRAVITY_IS_VERTICAL:
- * @gravity: the #PangoGravity to check
- *
- * Whether a #PangoGravity represents vertical writing directions.
- *
- * Returns: %TRUE if @gravity is %PANGO_GRAVITY_EAST or %PANGO_GRAVITY_WEST,
- *          %FALSE otherwise.
- *
- * Since: 1.16
- **/
-#define PANGO_GRAVITY_IS_VERTICAL(gravity) \
-	((gravity) == PANGO_GRAVITY_EAST || (gravity) == PANGO_GRAVITY_WEST)
-
-#include <pango/pango-matrix.h>
-#include <pango/pango-script.h>
-
-double       pango_gravity_to_rotation    (PangoGravity       gravity) G_GNUC_CONST;
-PangoGravity pango_gravity_get_for_matrix (const PangoMatrix *matrix) G_GNUC_PURE;
-PangoGravity pango_gravity_get_for_script (PangoScript        script,
-					   PangoGravity       base_gravity,
-					   PangoGravityHint   hint) G_GNUC_CONST;
-
-
-G_END_DECLS
-
-#endif /* __PANGO_GRAVITY_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-item.h b/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-item.h
deleted file mode 100644
index 0775003c..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-item.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Pango
- * pango-item.h: Structure for storing run information
- *
- * Copyright (C) 2000 Red Hat Software
- *
- * 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 __PANGO_ITEM_H__
-#define __PANGO_ITEM_H__
-
-#include <pango/pango-types.h>
-
-G_BEGIN_DECLS
-
-typedef struct _PangoAnalysis PangoAnalysis;
-typedef struct _PangoItem PangoItem;
-
-/* TODO: if more flags are needed, turn this into a real PangoAnalysisFlags enum */
-#define PANGO_ANALYSIS_FLAG_CENTERED_BASELINE (1 << 0)
-
-struct _PangoAnalysis
-{
-  PangoEngineShape *shape_engine;
-  PangoEngineLang  *lang_engine;
-  PangoFont *font;
-
-  guint8 level;
-  guint8 gravity; /* PangoGravity */
-  guint8 flags;
-
-  guint8 script; /* PangoScript */
-  PangoLanguage *language;
-
-  GSList *extra_attrs;
-};
-
-struct _PangoItem
-{
-  gint offset;
-  gint length;
-  gint num_chars;
-  PangoAnalysis analysis;
-};
-
-#define PANGO_TYPE_ITEM (pango_item_get_type ())
-
-GType pango_item_get_type (void) G_GNUC_CONST;
-
-PangoItem *pango_item_new   (void);
-PangoItem *pango_item_copy  (PangoItem  *item);
-void       pango_item_free  (PangoItem  *item);
-PangoItem *pango_item_split (PangoItem  *orig,
-			     int         split_index,
-			     int         split_offset);
-
-G_END_DECLS
-
-#endif /* __PANGO_ITEM_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-language.h b/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-language.h
deleted file mode 100644
index 9c1a9d8d..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-language.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Pango
- * pango-language.h: Language handling routines
- *
- * Copyright (C) 1999 Red Hat Software
- *
- * 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 __PANGO_LANGUAGE_H__
-#define __PANGO_LANGUAGE_H__
-
-#include <glib.h>
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/* Dummy typedef - internally it's a 'const char *' */
-typedef struct _PangoLanguage PangoLanguage;
-
-#define PANGO_TYPE_LANGUAGE (pango_language_get_type ())
-
-GType          pango_language_get_type    (void) G_GNUC_CONST;
-PangoLanguage *pango_language_from_string (const char *language);
-
-#define pango_language_to_string(language) ((const char *)language)
-
-G_CONST_RETURN char *pango_language_get_sample_string (PangoLanguage *language) G_GNUC_CONST;
-PangoLanguage *pango_language_get_default (void) G_GNUC_CONST;
-
-gboolean      pango_language_matches  (PangoLanguage *language,
-				       const char *range_list) G_GNUC_PURE;
-
-G_END_DECLS
-
-#endif /* __PANGO_LANGUAGE_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-layout.h b/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-layout.h
deleted file mode 100644
index 108ce872..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-layout.h
+++ /dev/null
@@ -1,290 +0,0 @@
-/* Pango
- * pango-layout.h: High-level layout driver
- *
- * Copyright (C) 2000 Red Hat Software
- *
- * 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 __PANGO_LAYOUT_H__
-#define __PANGO_LAYOUT_H__
-
-#include <pango/pango-attributes.h>
-#include <pango/pango-context.h>
-#include <pango/pango-glyph-item.h>
-#include <pango/pango-tabs.h>
-
-G_BEGIN_DECLS
-
-typedef struct _PangoLayout      PangoLayout;
-typedef struct _PangoLayoutClass PangoLayoutClass;
-typedef struct _PangoLayoutLine  PangoLayoutLine;
-
-typedef PangoGlyphItem PangoLayoutRun;
-
-typedef enum {
-  PANGO_ALIGN_LEFT,
-  PANGO_ALIGN_CENTER,
-  PANGO_ALIGN_RIGHT
-} PangoAlignment;
-
-typedef enum {
-  PANGO_WRAP_WORD,
-  PANGO_WRAP_CHAR,
-  PANGO_WRAP_WORD_CHAR
-} PangoWrapMode;
-
-/**
- * PangoEllipsizeMode
- * @PANGO_ELLIPSIZE_NONE: No ellipsization
- * @PANGO_ELLIPSIZE_START: Omit characters at the start of the text
- * @PANGO_ELLIPSIZE_MIDDLE: Omit characters in the middle of the text
- * @PANGO_ELLIPSIZE_END: Omit characters at the end of the text
- *
- * The #PangoEllipsizeMode type describes what sort of (if any)
- * ellipsization should be applied to a line of text. In
- * the ellipsization process characters are removed from the
- * text in order to make it fit to a given width and replaced
- * with an ellipsis.
- */
-typedef enum {
-  PANGO_ELLIPSIZE_NONE,
-  PANGO_ELLIPSIZE_START,
-  PANGO_ELLIPSIZE_MIDDLE,
-  PANGO_ELLIPSIZE_END
-} PangoEllipsizeMode;
-
-struct _PangoLayoutLine
-{
-  PangoLayout *layout;
-  gint         start_index;     /* start of line as byte index into layout->text */
-  gint         length;		/* length of line in bytes */
-  GSList      *runs;
-  guint        is_paragraph_start : 1;  /* TRUE if this is the first line of the paragraph */
-  guint        resolved_dir : 3;  /* Resolved PangoDirection of line */
-};
-
-#define PANGO_TYPE_LAYOUT              (pango_layout_get_type ())
-#define PANGO_LAYOUT(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_LAYOUT, PangoLayout))
-#define PANGO_LAYOUT_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_LAYOUT, PangoLayoutClass))
-#define PANGO_IS_LAYOUT(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_LAYOUT))
-#define PANGO_IS_LAYOUT_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_LAYOUT))
-#define PANGO_LAYOUT_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_LAYOUT, PangoLayoutClass))
-
-/* The PangoLayout and PangoLayoutClass structs are private; if you
- * need to create a subclass of these, file a bug.
- */
-
-GType        pango_layout_get_type       (void) G_GNUC_CONST;
-PangoLayout *pango_layout_new            (PangoContext   *context);
-PangoLayout *pango_layout_copy           (PangoLayout    *src);
-
-PangoContext  *pango_layout_get_context    (PangoLayout    *layout);
-
-void           pango_layout_set_attributes (PangoLayout    *layout,
-					    PangoAttrList  *attrs);
-PangoAttrList *pango_layout_get_attributes (PangoLayout    *layout);
-
-void           pango_layout_set_text       (PangoLayout    *layout,
-					    const char     *text,
-					    int             length);
-const char    *pango_layout_get_text       (PangoLayout    *layout);
-
-void           pango_layout_set_markup     (PangoLayout    *layout,
-					    const char     *markup,
-					    int             length);
-
-void           pango_layout_set_markup_with_accel (PangoLayout    *layout,
-						   const char     *markup,
-						   int             length,
-						   gunichar        accel_marker,
-						   gunichar       *accel_char);
-
-void           pango_layout_set_font_description (PangoLayout                *layout,
-						  const PangoFontDescription *desc);
-
-G_CONST_RETURN PangoFontDescription *pango_layout_get_font_description (PangoLayout *layout);
-
-void           pango_layout_set_width            (PangoLayout                *layout,
-						  int                         width);
-int            pango_layout_get_width            (PangoLayout                *layout);
-void           pango_layout_set_height           (PangoLayout                *layout,
-						  int                         height);
-int            pango_layout_get_height           (PangoLayout                *layout);
-void           pango_layout_set_wrap             (PangoLayout                *layout,
-						  PangoWrapMode               wrap);
-PangoWrapMode  pango_layout_get_wrap             (PangoLayout                *layout);
-gboolean       pango_layout_is_wrapped           (PangoLayout                *layout);
-void           pango_layout_set_indent           (PangoLayout                *layout,
-						  int                         indent);
-int            pango_layout_get_indent           (PangoLayout                *layout);
-void           pango_layout_set_spacing          (PangoLayout                *layout,
-						  int                         spacing);
-int            pango_layout_get_spacing          (PangoLayout                *layout);
-void           pango_layout_set_justify          (PangoLayout                *layout,
-						  gboolean                    justify);
-gboolean       pango_layout_get_justify          (PangoLayout                *layout);
-void           pango_layout_set_auto_dir         (PangoLayout                *layout,
-						  gboolean                    auto_dir);
-gboolean       pango_layout_get_auto_dir         (PangoLayout                *layout);
-void           pango_layout_set_alignment        (PangoLayout                *layout,
-						  PangoAlignment              alignment);
-PangoAlignment pango_layout_get_alignment        (PangoLayout                *layout);
-
-void           pango_layout_set_tabs             (PangoLayout                *layout,
-						  PangoTabArray              *tabs);
-
-PangoTabArray* pango_layout_get_tabs             (PangoLayout                *layout);
-
-void           pango_layout_set_single_paragraph_mode (PangoLayout                *layout,
-						       gboolean                    setting);
-gboolean       pango_layout_get_single_paragraph_mode (PangoLayout                *layout);
-
-void               pango_layout_set_ellipsize (PangoLayout        *layout,
-					       PangoEllipsizeMode  ellipsize);
-PangoEllipsizeMode pango_layout_get_ellipsize (PangoLayout        *layout);
-gboolean           pango_layout_is_ellipsized (PangoLayout        *layout);
-
-int      pango_layout_get_unknown_glyphs_count (PangoLayout    *layout);
-
-void     pango_layout_context_changed (PangoLayout    *layout);
-
-void     pango_layout_get_log_attrs (PangoLayout    *layout,
-				     PangoLogAttr  **attrs,
-				     gint           *n_attrs);
-
-void     pango_layout_index_to_pos         (PangoLayout    *layout,
-					    int             index_,
-					    PangoRectangle *pos);
-void     pango_layout_index_to_line_x      (PangoLayout    *layout,
-					    int             index_,
-					    gboolean        trailing,
-					    int            *line,
-					    int            *x_pos);
-void     pango_layout_get_cursor_pos       (PangoLayout    *layout,
-					    int             index_,
-					    PangoRectangle *strong_pos,
-					    PangoRectangle *weak_pos);
-void     pango_layout_move_cursor_visually (PangoLayout    *layout,
-					    gboolean        strong,
-					    int             old_index,
-					    int             old_trailing,
-					    int             direction,
-					    int            *new_index,
-					    int            *new_trailing);
-gboolean pango_layout_xy_to_index          (PangoLayout    *layout,
-					    int             x,
-					    int             y,
-					    int            *index_,
-					    int            *trailing);
-void     pango_layout_get_extents          (PangoLayout    *layout,
-					    PangoRectangle *ink_rect,
-					    PangoRectangle *logical_rect);
-void     pango_layout_get_pixel_extents    (PangoLayout    *layout,
-					    PangoRectangle *ink_rect,
-					    PangoRectangle *logical_rect);
-void     pango_layout_get_size             (PangoLayout    *layout,
-					    int            *width,
-					    int            *height);
-void     pango_layout_get_pixel_size       (PangoLayout    *layout,
-					    int            *width,
-					    int            *height);
-
-int              pango_layout_get_line_count       (PangoLayout    *layout);
-PangoLayoutLine *pango_layout_get_line             (PangoLayout    *layout,
-						    int             line);
-PangoLayoutLine *pango_layout_get_line_readonly    (PangoLayout    *layout,
-						    int             line);
-GSList *         pango_layout_get_lines            (PangoLayout    *layout);
-GSList *         pango_layout_get_lines_readonly   (PangoLayout    *layout);
-
-
-#define PANGO_TYPE_LAYOUT_LINE (pango_layout_line_get_type ())
-
-GType    pango_layout_line_get_type     (void) G_GNUC_CONST;
-
-PangoLayoutLine *pango_layout_line_ref   (PangoLayoutLine *line);
-void             pango_layout_line_unref (PangoLayoutLine *line);
-
-gboolean pango_layout_line_x_to_index   (PangoLayoutLine  *line,
-					 int               x_pos,
-					 int              *index_,
-					 int              *trailing);
-void     pango_layout_line_index_to_x   (PangoLayoutLine  *line,
-					 int               index_,
-					 gboolean          trailing,
-					 int              *x_pos);
-void     pango_layout_line_get_x_ranges (PangoLayoutLine  *line,
-					 int               start_index,
-					 int               end_index,
-					 int             **ranges,
-					 int              *n_ranges);
-void     pango_layout_line_get_extents  (PangoLayoutLine  *line,
-					 PangoRectangle   *ink_rect,
-					 PangoRectangle   *logical_rect);
-void     pango_layout_line_get_pixel_extents (PangoLayoutLine *layout_line,
-					      PangoRectangle  *ink_rect,
-					      PangoRectangle  *logical_rect);
-
-typedef struct _PangoLayoutIter PangoLayoutIter;
-
-#define PANGO_TYPE_LAYOUT_ITER         (pango_layout_iter_get_type ())
-
-GType            pango_layout_iter_get_type (void) G_GNUC_CONST;
-
-PangoLayoutIter *pango_layout_get_iter  (PangoLayout     *layout);
-PangoLayoutIter *pango_layout_iter_copy (PangoLayoutIter *iter);
-void             pango_layout_iter_free (PangoLayoutIter *iter);
-
-int              pango_layout_iter_get_index  (PangoLayoutIter *iter);
-PangoLayoutRun  *pango_layout_iter_get_run    (PangoLayoutIter *iter);
-PangoLayoutRun  *pango_layout_iter_get_run_readonly   (PangoLayoutIter *iter);
-PangoLayoutLine *pango_layout_iter_get_line   (PangoLayoutIter *iter);
-PangoLayoutLine *pango_layout_iter_get_line_readonly  (PangoLayoutIter *iter);
-gboolean         pango_layout_iter_at_last_line (PangoLayoutIter *iter);
-PangoLayout     *pango_layout_iter_get_layout (PangoLayoutIter *iter);
-
-gboolean pango_layout_iter_next_char    (PangoLayoutIter *iter);
-gboolean pango_layout_iter_next_cluster (PangoLayoutIter *iter);
-gboolean pango_layout_iter_next_run     (PangoLayoutIter *iter);
-gboolean pango_layout_iter_next_line    (PangoLayoutIter *iter);
-
-void pango_layout_iter_get_char_extents    (PangoLayoutIter *iter,
-					    PangoRectangle  *logical_rect);
-void pango_layout_iter_get_cluster_extents (PangoLayoutIter *iter,
-					    PangoRectangle  *ink_rect,
-					    PangoRectangle  *logical_rect);
-void pango_layout_iter_get_run_extents     (PangoLayoutIter *iter,
-					    PangoRectangle  *ink_rect,
-					    PangoRectangle  *logical_rect);
-void pango_layout_iter_get_line_extents    (PangoLayoutIter *iter,
-					    PangoRectangle  *ink_rect,
-					    PangoRectangle  *logical_rect);
-/* All the yranges meet, unlike the logical_rect's (i.e. the yranges
- * assign between-line spacing to the nearest line)
- */
-void pango_layout_iter_get_line_yrange     (PangoLayoutIter *iter,
-					    int             *y0_,
-					    int             *y1_);
-void pango_layout_iter_get_layout_extents  (PangoLayoutIter *iter,
-					    PangoRectangle  *ink_rect,
-					    PangoRectangle  *logical_rect);
-int  pango_layout_iter_get_baseline        (PangoLayoutIter *iter);
-
-G_END_DECLS
-
-#endif /* __PANGO_LAYOUT_H__ */
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-matrix.h b/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-matrix.h
deleted file mode 100644
index 5909367d..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-matrix.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* Pango
- * pango-matrix.h: Matrix manipulation routines
- *
- * Copyright (C) 2002, 2006 Red Hat Software
- *
- * 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 __PANGO_MATRIX_H__
-#define __PANGO_MATRIX_H__
-
-#include <glib.h>
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-typedef struct _PangoMatrix    PangoMatrix;
-
-/**
- * PangoMatrix:
- * @xx: 1st component of the transformation matrix
- * @xy: 2nd component of the transformation matrix
- * @yx: 3rd component of the transformation matrix
- * @yy: 4th component of the transformation matrix
- * @x0: x translation
- * @y0: y translation
- *
- * A structure specifying a transformation between user-space
- * coordinates and device coordinates. The transformation
- * is given by
- *
- * <programlisting>
- * x_device = x_user * matrix->xx + y_user * matrix->xy + matrix->x0;
- * y_device = x_user * matrix->yx + y_user * matrix->yy + matrix->y0;
- * </programlisting>
- *
- * Since: 1.6
- **/
-struct _PangoMatrix
-{
-  double xx;
-  double xy;
-  double yx;
-  double yy;
-  double x0;
-  double y0;
-};
-
-/**
- * PANGO_TYPE_MATRIX
- *
- * The GObject type for #PangoMatrix
- **/
-#define PANGO_TYPE_MATRIX (pango_matrix_get_type ())
-
-/**
- * PANGO_MATRIX_INIT
- *
- * Constant that can be used to initialize a PangoMatrix to
- * the identity transform.
- *
- * <informalexample><programlisting>
- * PangoMatrix matrix = PANGO_MATRIX_INIT;
- * pango_matrix_rotate (&amp;matrix, 45.);
- * </programlisting></informalexample>
- *
- * Since: 1.6
- **/
-#define PANGO_MATRIX_INIT { 1., 0., 0., 1., 0., 0. }
-
-/* for PangoRectangle */
-#include <pango/pango-types.h>
-
-GType pango_matrix_get_type (void) G_GNUC_CONST;
-
-PangoMatrix *pango_matrix_copy   (const PangoMatrix *matrix);
-void         pango_matrix_free   (PangoMatrix *matrix);
-
-void pango_matrix_translate (PangoMatrix *matrix,
-			     double       tx,
-			     double       ty);
-void pango_matrix_scale     (PangoMatrix *matrix,
-			     double       scale_x,
-			     double       scale_y);
-void pango_matrix_rotate    (PangoMatrix *matrix,
-			     double       degrees);
-void pango_matrix_concat    (PangoMatrix       *matrix,
-			     const PangoMatrix *new_matrix);
-void pango_matrix_transform_point    (const PangoMatrix *matrix,
-				      double            *x,
-				      double            *y);
-void pango_matrix_transform_distance (const PangoMatrix *matrix,
-				      double            *dx,
-				      double            *dy);
-void pango_matrix_transform_rectangle (const PangoMatrix *matrix,
-				       PangoRectangle    *rect);
-void pango_matrix_transform_pixel_rectangle (const PangoMatrix *matrix,
-					     PangoRectangle    *rect);
-double pango_matrix_get_font_scale_factor (const PangoMatrix *matrix) G_GNUC_PURE;
-
-
-G_END_DECLS
-
-#endif /* __PANGO_MATRIX_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-modules.h b/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-modules.h
deleted file mode 100644
index 5dbcfe9f..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-modules.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Pango
- * pango-modules.h:
- *
- * Copyright (C) 1999 Red Hat Software
- *
- * 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 __PANGO_MODULES_H__
-#define __PANGO_MODULES_H__
-
-#include <pango/pango-engine.h>
-
-G_BEGIN_DECLS
-
-#ifdef PANGO_ENABLE_BACKEND
-
-typedef struct _PangoMap PangoMap;
-typedef struct _PangoMapEntry PangoMapEntry;
-
-typedef struct _PangoIncludedModule PangoIncludedModule;
-
-struct _PangoIncludedModule
-{
-  void (*list) (PangoEngineInfo **engines,
-		int              *n_engines);
-  void (*init) (GTypeModule      *module);
-  void (*exit) (void);
-  PangoEngine *(*create) (const char       *id);
-};
-
-PangoMap *     pango_find_map        (PangoLanguage       *language,
-				      guint                engine_type_id,
-				      guint                render_type_id);
-PangoEngine *  pango_map_get_engine  (PangoMap            *map,
-				      PangoScript          script);
-void           pango_map_get_engines (PangoMap            *map,
-				      PangoScript          script,
-				      GSList             **exact_engines,
-				      GSList             **fallback_engines);
-void           pango_module_register (PangoIncludedModule *module);
-
-#endif /* PANGO_ENABLE_BACKEND */
-
-G_END_DECLS
-
-#endif /* __PANGO_MODULES_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-ot.h b/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-ot.h
deleted file mode 100644
index f9d787a8..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-ot.h
+++ /dev/null
@@ -1,196 +0,0 @@
-/* Pango
- * pango-ot.h:
- *
- * Copyright (C) 2000,2007 Red Hat Software
- *
- * 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 __PANGO_OT_H__
-#define __PANGO_OT_H__
-
-#include <pango/pangofc-font.h>
-#include <pango/pango-glyph.h>
-#include <pango/pango-font.h>
-#include <pango/pango-script.h>
-#include <pango/pango-language.h>
-
-G_BEGIN_DECLS
-
-#ifdef PANGO_ENABLE_ENGINE
-
-typedef guint32 PangoOTTag;
-
-#define PANGO_OT_TAG_MAKE(c1,c2,c3,c4)		((PangoOTTag) FT_MAKE_TAG (c1, c2, c3, c4))
-#define PANGO_OT_TAG_MAKE_FROM_STRING(s)	(PANGO_OT_TAG_MAKE(((const char *) s)[0], \
-								   ((const char *) s)[1], \
-								   ((const char *) s)[2], \
-								   ((const char *) s)[3]))
-
-typedef struct _PangoOTInfo       PangoOTInfo;
-typedef struct _PangoOTBuffer     PangoOTBuffer;
-typedef struct _PangoOTGlyph      PangoOTGlyph;
-typedef struct _PangoOTRuleset    PangoOTRuleset;
-typedef struct _PangoOTFeatureMap PangoOTFeatureMap;
-typedef struct _PangoOTRulesetDescription PangoOTRulesetDescription;
-
-typedef enum
-{
-  PANGO_OT_TABLE_GSUB,
-  PANGO_OT_TABLE_GPOS
-} PangoOTTableType;
-
-#define PANGO_OT_ALL_GLYPHS			((guint) 0xFFFF)
-#define PANGO_OT_NO_FEATURE			((guint) 0xFFFF)
-#define PANGO_OT_NO_SCRIPT			((guint) 0xFFFF)
-#define PANGO_OT_DEFAULT_LANGUAGE		((guint) 0xFFFF)
-
-#define PANGO_OT_TAG_DEFAULT_SCRIPT		PANGO_OT_TAG_MAKE ('D', 'F', 'L', 'T')
-#define PANGO_OT_TAG_DEFAULT_LANGUAGE		PANGO_OT_TAG_MAKE ('d', 'f', 'l', 't')
-
-/* Note that this must match HB_GlyphItem */
-struct _PangoOTGlyph
-{
-  guint    glyph;
-  guint    properties;
-  guint    cluster;
-  gushort  component;
-  gushort  ligID;
-  gushort  property_cache;    /* Internal */
-};
-
-struct _PangoOTFeatureMap
-{
-  char     feature_name[5];
-  gulong   property_bit;
-};
-
-struct _PangoOTRulesetDescription {
-  PangoScript               script;
-  PangoLanguage            *language;
-  const PangoOTFeatureMap  *static_gsub_features;
-  guint                   n_static_gsub_features;
-  const PangoOTFeatureMap  *static_gpos_features;
-  guint                   n_static_gpos_features;
-  const PangoOTFeatureMap  *other_features;
-  guint                   n_other_features;
-};
-
-
-#define PANGO_TYPE_OT_INFO              (pango_ot_info_get_type ())
-#define PANGO_OT_INFO(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_OT_INFO, PangoOTInfo))
-#define PANGO_IS_OT_INFO(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_OT_INFO))
-GType pango_ot_info_get_type (void) G_GNUC_CONST;
-
-#define PANGO_TYPE_OT_RULESET           (pango_ot_ruleset_get_type ())
-#define PANGO_OT_RULESET(object)        (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_OT_RULESET, PangoOTRuleset))
-#define PANGO_IS_OT_RULESET(object)     (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_OT_RULESET))
-GType pango_ot_ruleset_get_type (void) G_GNUC_CONST;
-
-
-PangoOTInfo *pango_ot_info_get (FT_Face face);
-
-gboolean pango_ot_info_find_script   (PangoOTInfo      *info,
-				      PangoOTTableType  table_type,
-				      PangoOTTag        script_tag,
-				      guint            *script_index);
-gboolean pango_ot_info_find_language (PangoOTInfo      *info,
-				      PangoOTTableType  table_type,
-				      guint             script_index,
-				      PangoOTTag        language_tag,
-				      guint            *language_index,
-				      guint            *required_feature_index);
-gboolean pango_ot_info_find_feature  (PangoOTInfo      *info,
-				      PangoOTTableType  table_type,
-				      PangoOTTag        feature_tag,
-				      guint             script_index,
-				      guint             language_index,
-				      guint            *feature_index);
-
-PangoOTTag *pango_ot_info_list_scripts   (PangoOTInfo      *info,
-					  PangoOTTableType  table_type);
-PangoOTTag *pango_ot_info_list_languages (PangoOTInfo      *info,
-					  PangoOTTableType  table_type,
-					  guint             script_index,
-					  PangoOTTag        language_tag);
-PangoOTTag *pango_ot_info_list_features  (PangoOTInfo      *info,
-					  PangoOTTableType  table_type,
-					  PangoOTTag        tag,
-					  guint             script_index,
-					  guint             language_index);
-
-PangoOTBuffer *pango_ot_buffer_new        (PangoFcFont       *font);
-void           pango_ot_buffer_destroy    (PangoOTBuffer     *buffer);
-void           pango_ot_buffer_clear      (PangoOTBuffer     *buffer);
-void           pango_ot_buffer_set_rtl    (PangoOTBuffer     *buffer,
-					   gboolean           rtl);
-void           pango_ot_buffer_add_glyph  (PangoOTBuffer     *buffer,
-					   guint              glyph,
-					   guint              properties,
-					   guint              cluster);
-void           pango_ot_buffer_get_glyphs (const PangoOTBuffer  *buffer,
-					   PangoOTGlyph        **glyphs,
-					   int                  *n_glyphs);
-void           pango_ot_buffer_output     (const PangoOTBuffer  *buffer,
-					   PangoGlyphString     *glyphs);
-
-void           pango_ot_buffer_set_zero_width_marks (PangoOTBuffer     *buffer,
-						     gboolean           zero_width_marks);
-
-const PangoOTRuleset *pango_ot_ruleset_get_for_description (PangoOTInfo                     *info,
-							    const PangoOTRulesetDescription *desc);
-PangoOTRuleset *pango_ot_ruleset_new (PangoOTInfo       *info);
-PangoOTRuleset *pango_ot_ruleset_new_for (PangoOTInfo       *info,
-					  PangoScript        script,
-					  PangoLanguage     *language);
-PangoOTRuleset *pango_ot_ruleset_new_from_description (PangoOTInfo                     *info,
-						       const PangoOTRulesetDescription *desc);
-void            pango_ot_ruleset_add_feature (PangoOTRuleset   *ruleset,
-					      PangoOTTableType  table_type,
-					      guint             feature_index,
-					      gulong            property_bit);
-gboolean        pango_ot_ruleset_maybe_add_feature (PangoOTRuleset   *ruleset,
-						    PangoOTTableType  table_type,
-						    PangoOTTag        feature_tag,
-						    gulong            property_bit);
-guint           pango_ot_ruleset_maybe_add_features (PangoOTRuleset          *ruleset,
-						     PangoOTTableType         table_type,
-						     const PangoOTFeatureMap *features,
-						     guint                    n_features);
-guint           pango_ot_ruleset_get_feature_count (const PangoOTRuleset   *ruleset,
-						    guint                  *n_gsub_features,
-						    guint                  *n_gpos_features);
-void            pango_ot_ruleset_substitute  (const PangoOTRuleset   *ruleset,
-					      PangoOTBuffer          *buffer);
-void            pango_ot_ruleset_position    (const PangoOTRuleset   *ruleset,
-					      PangoOTBuffer          *buffer);
-PangoScript     pango_ot_tag_to_script     (PangoOTTag     script_tag) G_GNUC_CONST;
-PangoOTTag      pango_ot_tag_from_script   (PangoScript    script) G_GNUC_CONST;
-PangoLanguage  *pango_ot_tag_to_language   (PangoOTTag     language_tag) G_GNUC_CONST;
-PangoOTTag      pango_ot_tag_from_language (PangoLanguage *language) G_GNUC_CONST;
-
-guint           pango_ot_ruleset_description_hash  (const PangoOTRulesetDescription *desc) G_GNUC_PURE;
-gboolean        pango_ot_ruleset_description_equal (const PangoOTRulesetDescription *desc1,
-						    const PangoOTRulesetDescription *desc2) G_GNUC_PURE;
-PangoOTRulesetDescription *pango_ot_ruleset_description_copy  (const PangoOTRulesetDescription *desc);
-void            pango_ot_ruleset_description_free  (PangoOTRulesetDescription       *desc);
-
-
-#endif /* PANGO_ENABLE_ENGINE */
-
-G_END_DECLS
-
-#endif /* __PANGO_OT_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-renderer.h b/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-renderer.h
deleted file mode 100644
index 89c45fac..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-renderer.h
+++ /dev/null
@@ -1,246 +0,0 @@
-/* Pango
- * pango-renderer.h: Base class for rendering
- *
- * Copyright (C) 2004, 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 __PANGO_RENDERER_H_
-#define __PANGO_RENDERER_H_
-
-#include <pango/pango-layout.h>
-
-G_BEGIN_DECLS
-
-#define PANGO_TYPE_RENDERER            (pango_renderer_get_type())
-#define PANGO_RENDERER(object)         (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_RENDERER, PangoRenderer))
-#define PANGO_IS_RENDERER(object)      (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_RENDERER))
-#define PANGO_RENDERER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_RENDERER, PangoRendererClass))
-#define PANGO_IS_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_RENDERER))
-#define PANGO_RENDERER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_RENDERER, PangoRendererClass))
-
-typedef struct _PangoRenderer        PangoRenderer;
-typedef struct _PangoRendererClass   PangoRendererClass;
-typedef struct _PangoRendererPrivate PangoRendererPrivate;
-
-/**
- * PangoRenderPart:
- * @PANGO_RENDER_PART_FOREGROUND: the text itself
- * @PANGO_RENDER_PART_BACKGROUND: the area behind the text
- * @PANGO_RENDER_PART_UNDERLINE: underlines
- * @PANGO_RENDER_PART_STRIKETHROUGH: strikethrough lines
- *
- * #PangoRenderPart defines different items to render for such
- * purposes as setting colors.
- *
- * Since: 1.8
- **/
-/* When extending, note N_RENDER_PARTS #define in pango-renderer.c */
-typedef enum
-{
-  PANGO_RENDER_PART_FOREGROUND,
-  PANGO_RENDER_PART_BACKGROUND,
-  PANGO_RENDER_PART_UNDERLINE,
-  PANGO_RENDER_PART_STRIKETHROUGH
-} PangoRenderPart;
-
-/**
- * PangoRenderer:
- * @matrix: the current transformation matrix for the Renderer; may
- *    be %NULL, which should be treated the same as the identity matrix.
- *
- * #PangoRenderer is a base class for objects that are used to
- * render Pango objects such as #PangoGlyphString and
- * #PangoLayout.
- *
- * Since: 1.8
- **/
-struct _PangoRenderer
-{
-  /*< private >*/
-  GObject parent_instance;
-
-  PangoUnderline underline;
-  gboolean strikethrough;
-  int active_count;
-
-  /*< public >*/
-  PangoMatrix *matrix;		/* May be NULL */
-
-  /*< private >*/
-  PangoRendererPrivate *priv;
-};
-
-/**
- * PangoRendererClass:
- * @draw_glyphs: draws a #PangoGlyphString
- * @draw_rectangle: draws a rectangle
- * @draw_error_underline: draws a squiggly line that approximately
- * covers the given rectangle in the style of an underline used to
- * indicate a spelling error.
- * @draw_shape: draw content for a glyph shaped with #PangoAttrShape.
- *   @x, @y are the coordinates of the left edge of the baseline,
- *   in user coordinates.
- * @draw_trapezoid: draws a trapezoidal filled area
- * @draw_glyph: draws a single glyph
- * @part_changed: do renderer specific processing when rendering
- *  attributes change
- * @begin: Do renderer-specific initialization before drawing
- * @end: Do renderer-specific cleanup after drawing
- * @prepare_run: updates the renderer for a new run
- *
- * Class structure for #PangoRenderer.
- *
- * Since: 1.8
- **/
-struct _PangoRendererClass
-{
-  /*< private >*/
-  GObjectClass parent_class;
-
-  /* vtable - not signals */
-  /*< public >*/
-
-  /* All of the following have default implementations
-   * and take as coordinates user coordinates in Pango units
-   */
-  void (*draw_glyphs) (PangoRenderer     *renderer,
-		       PangoFont         *font,
-		       PangoGlyphString  *glyphs,
-		       int                x,
-		       int                y);
-  void (*draw_rectangle) (PangoRenderer     *renderer,
-			  PangoRenderPart    part,
-			  int                x,
-			  int                y,
-			  int                width,
-			  int                height);
-  void (*draw_error_underline) (PangoRenderer     *renderer,
-				int                x,
-				int                y,
-				int                width,
-				int                height);
-
-  /* Nothing is drawn for shaped glyphs unless this is implemented */
-  void (*draw_shape) (PangoRenderer  *renderer,
-		      PangoAttrShape *attr,
-		      int             x,
-		      int             y);
-
-  /* These two must be implemented and take coordinates in
-   * device space as doubles.
-   */
-  void (*draw_trapezoid) (PangoRenderer  *renderer,
-			  PangoRenderPart part,
-			  double          y1_,
-			  double          x11,
-			  double          x21,
-			  double          y2,
-			  double          x12,
-			  double          x22);
-  void (*draw_glyph) (PangoRenderer *renderer,
-		      PangoFont     *font,
-		      PangoGlyph     glyph,
-		      double         x,
-		      double         y);
-
-  /* Notification of change in rendering attributes
-   */
-  void (*part_changed) (PangoRenderer   *renderer,
-			PangoRenderPart  part);
-
-  /* Paired around drawing operations
-   */
-  void (*begin) (PangoRenderer *renderer);
-  void (*end)   (PangoRenderer *renderer);
-
-  /* Hooks into the details of layout rendering
-   */
-  void (*prepare_run) (PangoRenderer  *renderer,
-		       PangoLayoutRun *run);
-
-  /*< private >*/
-
-  /* Padding for future expansion */
-  void (*_pango_reserved1) (void);
-  void (*_pango_reserved2) (void);
-  void (*_pango_reserved3) (void);
-  void (*_pango_reserved4) (void);
-};
-
-GType pango_renderer_get_type    (void) G_GNUC_CONST;
-
-void pango_renderer_draw_layout          (PangoRenderer    *renderer,
-					  PangoLayout      *layout,
-					  int               x,
-					  int               y);
-void pango_renderer_draw_layout_line     (PangoRenderer    *renderer,
-					  PangoLayoutLine  *line,
-					  int               x,
-					  int               y);
-void pango_renderer_draw_glyphs          (PangoRenderer    *renderer,
-					  PangoFont        *font,
-					  PangoGlyphString *glyphs,
-					  int               x,
-					  int               y);
-void pango_renderer_draw_rectangle       (PangoRenderer    *renderer,
-					  PangoRenderPart   part,
-					  int               x,
-					  int               y,
-					  int               width,
-					  int               height);
-void pango_renderer_draw_error_underline (PangoRenderer    *renderer,
-					  int               x,
-					  int               y,
-					  int               width,
-					  int               height);
-void pango_renderer_draw_trapezoid       (PangoRenderer    *renderer,
-					  PangoRenderPart   part,
-					  double            y1_,
-					  double            x11,
-					  double            x21,
-					  double            y2,
-					  double            x12,
-					  double            x22);
-void pango_renderer_draw_glyph           (PangoRenderer    *renderer,
-					  PangoFont        *font,
-					  PangoGlyph        glyph,
-					  double            x,
-					  double            y);
-
-void pango_renderer_activate             (PangoRenderer    *renderer);
-void pango_renderer_deactivate           (PangoRenderer    *renderer);
-
-void        pango_renderer_part_changed (PangoRenderer   *renderer,
-					 PangoRenderPart  part);
-
-void        pango_renderer_set_color (PangoRenderer    *renderer,
-				      PangoRenderPart   part,
-				      const PangoColor *color);
-PangoColor *pango_renderer_get_color (PangoRenderer    *renderer,
-				      PangoRenderPart   part);
-
-void                        pango_renderer_set_matrix (PangoRenderer     *renderer,
-						       const PangoMatrix *matrix);
-G_CONST_RETURN PangoMatrix *pango_renderer_get_matrix (PangoRenderer     *renderer);
-
-PangoLayout     *pango_renderer_get_layout      (PangoRenderer     *renderer);
-PangoLayoutLine *pango_renderer_get_layout_line (PangoRenderer     *renderer);
-
-G_END_DECLS
-
-#endif /* __PANGO_RENDERER_H_ */
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-script.h b/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-script.h
deleted file mode 100644
index 16e99b8c..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-script.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/* Pango
- * pango-script.h: Script tag handling
- *
- * Copyright (C) 2002 Red Hat Software
- *
- * 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 __PANGO_SCRIPT_H__
-#define __PANGO_SCRIPT_H__
-
-#include <glib.h>
-
-#include <pango/pango-language.h>
-
-G_BEGIN_DECLS
-
-/**
- * PangoScriptIter:
- *
- * A #PangoScriptIter is used to iterate through a string
- * and identify ranges in different scripts.
- **/
-typedef struct _PangoScriptIter PangoScriptIter;
-
-typedef enum {                         /* ISO 15924 code */
-      PANGO_SCRIPT_INVALID_CODE = -1,
-      PANGO_SCRIPT_COMMON       = 0,   /* Zyyy */
-      PANGO_SCRIPT_INHERITED,          /* Qaai */
-      PANGO_SCRIPT_ARABIC,             /* Arab */
-      PANGO_SCRIPT_ARMENIAN,           /* Armn */
-      PANGO_SCRIPT_BENGALI,            /* Beng */
-      PANGO_SCRIPT_BOPOMOFO,           /* Bopo */
-      PANGO_SCRIPT_CHEROKEE,           /* Cher */
-      PANGO_SCRIPT_COPTIC,             /* Qaac */
-      PANGO_SCRIPT_CYRILLIC,           /* Cyrl (Cyrs) */
-      PANGO_SCRIPT_DESERET,            /* Dsrt */
-      PANGO_SCRIPT_DEVANAGARI,         /* Deva */
-      PANGO_SCRIPT_ETHIOPIC,           /* Ethi */
-      PANGO_SCRIPT_GEORGIAN,           /* Geor (Geon, Geoa) */
-      PANGO_SCRIPT_GOTHIC,             /* Goth */
-      PANGO_SCRIPT_GREEK,              /* Grek */
-      PANGO_SCRIPT_GUJARATI,           /* Gujr */
-      PANGO_SCRIPT_GURMUKHI,           /* Guru */
-      PANGO_SCRIPT_HAN,                /* Hani */
-      PANGO_SCRIPT_HANGUL,             /* Hang */
-      PANGO_SCRIPT_HEBREW,             /* Hebr */
-      PANGO_SCRIPT_HIRAGANA,           /* Hira */
-      PANGO_SCRIPT_KANNADA,            /* Knda */
-      PANGO_SCRIPT_KATAKANA,           /* Kana */
-      PANGO_SCRIPT_KHMER,              /* Khmr */
-      PANGO_SCRIPT_LAO,                /* Laoo */
-      PANGO_SCRIPT_LATIN,              /* Latn (Latf, Latg) */
-      PANGO_SCRIPT_MALAYALAM,          /* Mlym */
-      PANGO_SCRIPT_MONGOLIAN,          /* Mong */
-      PANGO_SCRIPT_MYANMAR,            /* Mymr */
-      PANGO_SCRIPT_OGHAM,              /* Ogam */
-      PANGO_SCRIPT_OLD_ITALIC,         /* Ital */
-      PANGO_SCRIPT_ORIYA,              /* Orya */
-      PANGO_SCRIPT_RUNIC,              /* Runr */
-      PANGO_SCRIPT_SINHALA,            /* Sinh */
-      PANGO_SCRIPT_SYRIAC,             /* Syrc (Syrj, Syrn, Syre) */
-      PANGO_SCRIPT_TAMIL,              /* Taml */
-      PANGO_SCRIPT_TELUGU,             /* Telu */
-      PANGO_SCRIPT_THAANA,             /* Thaa */
-      PANGO_SCRIPT_THAI,               /* Thai */
-      PANGO_SCRIPT_TIBETAN,            /* Tibt */
-      PANGO_SCRIPT_CANADIAN_ABORIGINAL, /* Cans */
-      PANGO_SCRIPT_YI,                 /* Yiii */
-      PANGO_SCRIPT_TAGALOG,            /* Tglg */
-      PANGO_SCRIPT_HANUNOO,            /* Hano */
-      PANGO_SCRIPT_BUHID,              /* Buhd */
-      PANGO_SCRIPT_TAGBANWA,           /* Tagb */
-
-      /* Unicode-4.0 additions */
-      PANGO_SCRIPT_BRAILLE,            /* Brai */
-      PANGO_SCRIPT_CYPRIOT,            /* Cprt */
-      PANGO_SCRIPT_LIMBU,              /* Limb */
-      PANGO_SCRIPT_OSMANYA,            /* Osma */
-      PANGO_SCRIPT_SHAVIAN,            /* Shaw */
-      PANGO_SCRIPT_LINEAR_B,           /* Linb */
-      PANGO_SCRIPT_TAI_LE,             /* Tale */
-      PANGO_SCRIPT_UGARITIC,           /* Ugar */
-
-      /* Unicode-4.1 additions */
-      PANGO_SCRIPT_NEW_TAI_LUE,        /* Talu */
-      PANGO_SCRIPT_BUGINESE,           /* Bugi */
-      PANGO_SCRIPT_GLAGOLITIC,         /* Glag */
-      PANGO_SCRIPT_TIFINAGH,           /* Tfng */
-      PANGO_SCRIPT_SYLOTI_NAGRI,       /* Sylo */
-      PANGO_SCRIPT_OLD_PERSIAN,        /* Xpeo */
-      PANGO_SCRIPT_KHAROSHTHI,         /* Khar */
-
-      /* Unicode-5.0 additions */
-      PANGO_SCRIPT_UNKNOWN,            /* Zzzz */
-      PANGO_SCRIPT_BALINESE,           /* Bali */
-      PANGO_SCRIPT_CUNEIFORM,          /* Xsux */
-      PANGO_SCRIPT_PHOENICIAN,         /* Phnx */
-      PANGO_SCRIPT_PHAGS_PA,           /* Phag */
-      PANGO_SCRIPT_NKO,                /* Nkoo */
-
-      /* Unicode-5.1 additions */
-      PANGO_SCRIPT_KAYAH_LI,           /* Kali */
-      PANGO_SCRIPT_LEPCHA,             /* Lepc */
-      PANGO_SCRIPT_REJANG,             /* Rjng */
-      PANGO_SCRIPT_SUNDANESE,          /* Sund */
-      PANGO_SCRIPT_SAURASHTRA,         /* Saur */
-      PANGO_SCRIPT_CHAM,               /* Cham */
-      PANGO_SCRIPT_OL_CHIKI,           /* Olck */
-      PANGO_SCRIPT_VAI,                /* Vaii */
-      PANGO_SCRIPT_CARIAN,             /* Cari */
-      PANGO_SCRIPT_LYCIAN,             /* Lyci */
-      PANGO_SCRIPT_LYDIAN              /* Lydi */
-} PangoScript;
-
-PangoScript pango_script_for_unichar         (gunichar             ch) G_GNUC_CONST;
-
-PangoScriptIter *pango_script_iter_new       (const char          *text,
-					      int                  length);
-void             pango_script_iter_get_range (PangoScriptIter      *iter,
-					      G_CONST_RETURN char **start,
-					      G_CONST_RETURN char **end,
-					      PangoScript          *script);
-gboolean         pango_script_iter_next      (PangoScriptIter      *iter);
-void             pango_script_iter_free      (PangoScriptIter      *iter);
-
-PangoLanguage *pango_script_get_sample_language (PangoScript    script) G_GNUC_PURE;
-gboolean       pango_language_includes_script   (PangoLanguage *language,
-						 PangoScript    script) G_GNUC_PURE;
-
-G_END_DECLS
-
-#endif /* __PANGO_SCRIPT_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-tabs.h b/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-tabs.h
deleted file mode 100644
index 7f52d1d0..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-tabs.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Pango
- * pango-tabs.h: Tab-related stuff
- *
- * Copyright (C) 2000 Red Hat Software
- *
- * 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 __PANGO_TABS_H__
-#define __PANGO_TABS_H__
-
-#include <pango/pango-types.h>
-
-G_BEGIN_DECLS
-
-typedef struct _PangoTabArray PangoTabArray;
-
-typedef enum
-{
-  PANGO_TAB_LEFT
-
-  /* These are not supported now, but may be in the
-   * future.
-   *
-   *  PANGO_TAB_RIGHT,
-   *  PANGO_TAB_CENTER,
-   *  PANGO_TAB_NUMERIC
-   */
-} PangoTabAlign;
-
-#define PANGO_TYPE_TAB_ARRAY (pango_tab_array_get_type ())
-
-PangoTabArray  *pango_tab_array_new                 (gint           initial_size,
-						     gboolean       positions_in_pixels);
-PangoTabArray  *pango_tab_array_new_with_positions  (gint           size,
-						     gboolean       positions_in_pixels,
-						     PangoTabAlign  first_alignment,
-						     gint           first_position,
-						     ...);
-GType           pango_tab_array_get_type            (void) G_GNUC_CONST;
-PangoTabArray  *pango_tab_array_copy                (PangoTabArray *src);
-void            pango_tab_array_free                (PangoTabArray *tab_array);
-gint            pango_tab_array_get_size            (PangoTabArray *tab_array);
-void            pango_tab_array_resize              (PangoTabArray *tab_array,
-						     gint           new_size);
-void            pango_tab_array_set_tab             (PangoTabArray *tab_array,
-						     gint           tab_index,
-						     PangoTabAlign  alignment,
-						     gint           location);
-void            pango_tab_array_get_tab             (PangoTabArray *tab_array,
-						     gint           tab_index,
-						     PangoTabAlign *alignment,
-						     gint          *location);
-void            pango_tab_array_get_tabs            (PangoTabArray *tab_array,
-						     PangoTabAlign **alignments,
-						     gint          **locations);
-
-gboolean        pango_tab_array_get_positions_in_pixels (PangoTabArray *tab_array);
-
-
-G_END_DECLS
-
-#endif /* __PANGO_TABS_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-types.h b/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-types.h
deleted file mode 100644
index 41d68e98..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-types.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/* Pango
- * pango-types.h:
- *
- * Copyright (C) 1999 Red Hat Software
- *
- * 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 __PANGO_TYPES_H__
-#define __PANGO_TYPES_H__
-
-#include <glib.h>
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-typedef struct _PangoLogAttr PangoLogAttr;
-
-typedef struct _PangoEngineLang PangoEngineLang;
-typedef struct _PangoEngineShape PangoEngineShape;
-
-typedef struct _PangoFont    PangoFont;
-typedef struct _PangoFontMap PangoFontMap;
-
-typedef struct _PangoRectangle PangoRectangle;
-
-
-
-/* A index of a glyph into a font. Rendering system dependent */
-typedef guint32 PangoGlyph;
-
-
-
-#define PANGO_SCALE 1024
-#define PANGO_PIXELS(d) (((int)(d) + 512) >> 10)
-#define PANGO_PIXELS_FLOOR(d) (((int)(d)) >> 10)
-#define PANGO_PIXELS_CEIL(d) (((int)(d) + 1023) >> 10)
-/* The above expressions are just slightly wrong for floating point d;
- * For example we'd expect PANGO_PIXELS(-512.5) => -1 but instead we get 0.
- * That's unlikely to matter for practical use and the expression is much
- * more compact and faster than alternatives that work exactly for both
- * integers and floating point.
- *
- * PANGO_PIXELS also behaves differently for +512 and -512.
- */
-
-#define PANGO_UNITS_ROUND(d)				\
-  (((d) + (PANGO_SCALE >> 1)) & ~(PANGO_SCALE - 1))
-
-
-int    pango_units_from_double (double d) G_GNUC_CONST;
-double pango_units_to_double (int i) G_GNUC_CONST;
-
-
-
-/* A rectangle. Used to store logical and physical extents of glyphs,
- * runs, strings, etc.
- */
-struct _PangoRectangle
-{
-  int x;
-  int y;
-  int width;
-  int height;
-};
-
-/* Macros to translate from extents rectangles to ascent/descent/lbearing/rbearing
- */
-#define PANGO_ASCENT(rect) (-(rect).y)
-#define PANGO_DESCENT(rect) ((rect).y + (rect).height)
-#define PANGO_LBEARING(rect) ((rect).x)
-#define PANGO_RBEARING(rect) ((rect).x + (rect).width)
-
-void pango_extents_to_pixels (PangoRectangle *inclusive,
-			      PangoRectangle *nearest);
-
-/**
- * PangoDirection:
- * @PANGO_DIRECTION_LTR: A strong left-to-right direction
- * @PANGO_DIRECTION_RTL: A strong right-to-left direction
- * @PANGO_DIRECTION_TTB_LTR: Deprecated value; treated the
- *   same as %PANGO_DIRECTION_RTL.
- * @PANGO_DIRECTION_TTB_RTL: Deprecated value; treated the
- *   same as %PANGO_DIRECTION_LTR
- * @PANGO_DIRECTION_WEAK_LTR: A weak left-to-right direction
- * @PANGO_DIRECTION_WEAK_RTL: A weak right-to-left direction
- * @PANGO_DIRECTION_NEUTRAL: No direction specified
- *
- * The #PangoDirection type represents a direction in the
- * Unicode bidirectional algorithm; not every value in this
- * enumeration makes sense for every usage of #PangoDirection;
- * for example, the return value of pango_unichar_direction()
- * and pango_find_base_dir() cannot be %PANGO_DIRECTION_WEAK_LTR
- * or %PANGO_DIRECTION_WEAK_RTL, since every character is either
- * neutral or has a strong direction; on the other hand
- * %PANGO_DIRECTION_NEUTRAL doesn't make sense to pass
- * to pango_itemize_with_base_dir().
- *
- * The %PANGO_DIRECTION_TTB_LTR, %PANGO_DIRECTION_TTB_RTL
- * values come from an earlier interpretation of this
- * enumeration as the writing direction of a block of
- * text and are no longer used; See #PangoGravity for how
- * vertical text is handled in Pango.
- **/
-typedef enum {
-  PANGO_DIRECTION_LTR,
-  PANGO_DIRECTION_RTL,
-  PANGO_DIRECTION_TTB_LTR,
-  PANGO_DIRECTION_TTB_RTL,
-  PANGO_DIRECTION_WEAK_LTR,
-  PANGO_DIRECTION_WEAK_RTL,
-  PANGO_DIRECTION_NEUTRAL
-} PangoDirection;
-
-PangoDirection pango_unichar_direction      (gunichar     ch) G_GNUC_CONST;
-PangoDirection pango_find_base_dir          (const gchar *text,
-					     gint         length);
-
-#ifndef PANGO_DISABLE_DEPRECATED
-gboolean       pango_get_mirror_char        (gunichar     ch,
-					     gunichar    *mirrored_ch);
-#endif
-
-
-#include <pango/pango-gravity.h>
-#include <pango/pango-language.h>
-#include <pango/pango-matrix.h>
-#include <pango/pango-script.h>
-
-
-G_END_DECLS
-
-#endif /* __PANGO_TYPES_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-utils.h b/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-utils.h
deleted file mode 100644
index 41a8bbb0..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango-utils.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/* Pango
- * pango-utils.c: Utilities for internal functions and modules
- *
- * Copyright (C) 2000 Red Hat Software
- *
- * 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 __PANGO_UTILS_H__
-#define __PANGO_UTILS_H__
-
-#include <stdio.h>
-#include <glib.h>
-#include <pango/pango-font.h>
-
-G_BEGIN_DECLS
-
-char **  pango_split_file_list (const char *str);
-
-char    *pango_trim_string     (const char *str);
-gint     pango_read_line      (FILE        *stream,
-			       GString     *str);
-gboolean pango_skip_space     (const char **pos);
-gboolean pango_scan_word      (const char **pos,
-			       GString     *out);
-gboolean pango_scan_string    (const char **pos,
-			       GString     *out);
-gboolean pango_scan_int       (const char **pos,
-			       int         *out);
-
-#ifdef PANGO_ENABLE_BACKEND
-char *   pango_config_key_get (const char  *key);
-void     pango_lookup_aliases (const char   *fontname,
-			       char       ***families,
-			       int          *n_families);
-#endif /* PANGO_ENABLE_BACKEND */
-
-gboolean pango_parse_enum     (GType       type,
-			       const char *str,
-			       int        *value,
-			       gboolean    warn,
-			       char      **possible_values);
-
-/* Functions for parsing textual representations
- * of PangoFontDescription fields. They return TRUE if the input string
- * contains a valid value, which then has been assigned to the corresponding
- * field in the PangoFontDescription. If the warn parameter is TRUE,
- * a warning is printed (with g_warning) if the string does not
- * contain a valid value.
- */
-gboolean pango_parse_style   (const char   *str,
-			      PangoStyle   *style,
-			      gboolean      warn);
-gboolean pango_parse_variant (const char   *str,
-			      PangoVariant *variant,
-			      gboolean      warn);
-gboolean pango_parse_weight  (const char   *str,
-			      PangoWeight  *weight,
-			      gboolean      warn);
-gboolean pango_parse_stretch (const char   *str,
-			      PangoStretch *stretch,
-			      gboolean      warn);
-
-#ifdef PANGO_ENABLE_BACKEND
-
-/* On Unix, return the name of the "pango" subdirectory of SYSCONFDIR
- * (which is set at compile time). On Win32, return the Pango
- * installation directory (which is set at installation time, and
- * stored in the registry). The returned string should not be
- * g_free'd.
- */
-G_CONST_RETURN char *   pango_get_sysconf_subdirectory (void) G_GNUC_PURE;
-
-/* Ditto for LIBDIR/pango. On Win32, use the same Pango
- * installation directory. This returned string should not be
- * g_free'd either.
- */
-G_CONST_RETURN char *   pango_get_lib_subdirectory (void) G_GNUC_PURE;
-
-#endif /* PANGO_ENABLE_BACKEND */
-
-/* Hint line position and thickness.
- */
-void pango_quantize_line_geometry (int *thickness,
-				   int *position);
-
-/* A routine from fribidi that we either wrap or provide ourselves.
- */
-guint8 * pango_log2vis_get_embedding_levels (const gchar    *text,
-					     int             length,
-					     PangoDirection *pbase_dir);
-
-/* Unicode characters that are zero-width and should not be rendered
- * normally.
- */
-gboolean pango_is_zero_width (gunichar ch) G_GNUC_CONST;
-
-/* Pango version checking */
-
-/* Encode a Pango version as an integer */
-#define PANGO_VERSION_ENCODE(major, minor, micro) (     \
-	  ((major) * 10000)                             \
-	+ ((minor) *   100)                             \
-	+ ((micro) *     1))
-
-/* Encoded version of Pango at compile-time */
-#define PANGO_VERSION PANGO_VERSION_ENCODE(     \
-	PANGO_VERSION_MAJOR,                    \
-	PANGO_VERSION_MINOR,                    \
-	PANGO_VERSION_MICRO)
-
-/* Check that compile-time Pango is as new as required */
-#define PANGO_VERSION_CHECK(major,minor,micro)    \
-	(PANGO_VERSION >= PANGO_VERSION_ENCODE(major,minor,micro))
-
-
-/* Return encoded version of Pango at run-time */
-int pango_version (void) G_GNUC_CONST;
-
-/* Return run-time Pango version as an string */
-G_CONST_RETURN char * pango_version_string (void) G_GNUC_CONST;
-
-/* Check that run-time Pango is as new as required */
-G_CONST_RETURN char * pango_version_check (int required_major,
-					   int required_minor,
-					   int required_micro) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __PANGO_UTILS_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango.h b/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango.h
deleted file mode 100644
index 5b5ef1e4..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pango.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Pango
- * pango.h:
- *
- * Copyright (C) 1999 Red Hat Software
- *
- * 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 __PANGO_H__
-#define __PANGO_H__
-
-#include <pango/pango-attributes.h>
-#include <pango/pango-break.h>
-#include <pango/pango-context.h>
-#include <pango/pango-coverage.h>
-#include <pango/pango-engine.h>
-#include <pango/pango-enum-types.h>
-#include <pango/pango-features.h>
-#include <pango/pango-font.h>
-#include <pango/pango-fontmap.h>
-#include <pango/pango-fontset.h>
-#include <pango/pango-glyph.h>
-#include <pango/pango-glyph-item.h>
-#include <pango/pango-gravity.h>
-#include <pango/pango-item.h>
-#include <pango/pango-layout.h>
-#include <pango/pango-matrix.h>
-#include <pango/pango-renderer.h>
-#include <pango/pango-script.h>
-#include <pango/pango-tabs.h>
-#include <pango/pango-types.h>
-#include <pango/pango-utils.h>
-
-#endif /* __PANGO_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pangocairo.h b/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pangocairo.h
deleted file mode 100644
index 364d8019..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pangocairo.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/* Pango
- * pangocairo.h:
- *
- * Copyright (C) 1999, 2004 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 __PANGOCAIRO_H__
-#define __PANGOCAIRO_H__
-
-#include <pango/pango.h>
-#include <cairo.h>
-
-G_BEGIN_DECLS
-
-/**
- * PangoCairoFont:
- *
- * #PangoCairoFont is an interface exported by fonts for
- * use with Cairo. The actual type of the font will depend
- * on the particular font technology Cairo was compiled to use.
- *
- * Since: 1.18
- **/
-typedef struct _PangoCairoFont      PangoCairoFont;
-#define PANGO_TYPE_CAIRO_FONT       (pango_cairo_font_get_type ())
-#define PANGO_CAIRO_FONT(object)    (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_CAIRO_FONT, PangoCairoFont))
-#define PANGO_IS_CAIRO_FONT(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_CAIRO_FONT))
-
-/**
- * PangoCairoFontMap:
- *
- * #PangoCairoFontMap is an interface exported by font maps for
- * use with Cairo. The actual type of the font map will depend
- * on the particular font technology Cairo was compiled to use.
- *
- * Since: 1.10
- **/
-typedef struct _PangoCairoFontMap        PangoCairoFontMap;
-#define PANGO_TYPE_CAIRO_FONT_MAP       (pango_cairo_font_map_get_type ())
-#define PANGO_CAIRO_FONT_MAP(object)    (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_CAIRO_FONT_MAP, PangoCairoFontMap))
-#define PANGO_IS_CAIRO_FONT_MAP(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_CAIRO_FONT_MAP))
-
-typedef void (* PangoCairoShapeRendererFunc) (cairo_t        *cr,
-					      PangoAttrShape *attr,
-					      gboolean        do_path,
-					      gpointer        data);
-
-/*
- * PangoCairoFontMap
- */
-GType         pango_cairo_font_map_get_type          (void) G_GNUC_CONST;
-
-PangoFontMap *pango_cairo_font_map_new               (void);
-PangoFontMap *pango_cairo_font_map_new_for_font_type (cairo_font_type_t fonttype);
-PangoFontMap *pango_cairo_font_map_get_default       (void);
-cairo_font_type_t pango_cairo_font_map_get_font_type (PangoCairoFontMap *fontmap);
-
-void          pango_cairo_font_map_set_resolution (PangoCairoFontMap *fontmap,
-						   double             dpi);
-double        pango_cairo_font_map_get_resolution (PangoCairoFontMap *fontmap);
-PangoContext *pango_cairo_font_map_create_context (PangoCairoFontMap *fontmap);
-
-/*
- * PangoCairoFont
- */
-GType         pango_cairo_font_get_type               (void) G_GNUC_CONST;
-
-cairo_scaled_font_t *pango_cairo_font_get_scaled_font (PangoCairoFont *font);
-
-/* Update a Pango context for the current state of a cairo context
- */
-void         pango_cairo_update_context (cairo_t      *cr,
-					 PangoContext *context);
-
-void                        pango_cairo_context_set_font_options (PangoContext               *context,
-								  const cairo_font_options_t *options);
-const cairo_font_options_t *pango_cairo_context_get_font_options (PangoContext               *context);
-
-void               pango_cairo_context_set_resolution     (PangoContext       *context,
-							   double              dpi);
-double             pango_cairo_context_get_resolution     (PangoContext       *context);
-
-void                        pango_cairo_context_set_shape_renderer (PangoContext                *context,
-								    PangoCairoShapeRendererFunc  func,
-								    gpointer                     data,
-								    GDestroyNotify               dnotify);
-PangoCairoShapeRendererFunc pango_cairo_context_get_shape_renderer (PangoContext                *context,
-								    gpointer                    *data);
-
-/* Convenience
- */
-PangoLayout *pango_cairo_create_layout (cairo_t     *cr);
-void         pango_cairo_update_layout (cairo_t     *cr,
-					PangoLayout *layout);
-
-/*
- * Rendering
- */
-void pango_cairo_show_glyph_string (cairo_t          *cr,
-				    PangoFont        *font,
-				    PangoGlyphString *glyphs);
-void pango_cairo_show_layout_line  (cairo_t          *cr,
-				    PangoLayoutLine  *line);
-void pango_cairo_show_layout       (cairo_t          *cr,
-				    PangoLayout      *layout);
-
-void pango_cairo_show_error_underline (cairo_t       *cr,
-				       double         x,
-				       double         y,
-				       double         width,
-				       double         height);
-
-/*
- * Rendering to a path
- */
-void pango_cairo_glyph_string_path (cairo_t          *cr,
-				    PangoFont        *font,
-				    PangoGlyphString *glyphs);
-void pango_cairo_layout_line_path  (cairo_t          *cr,
-				    PangoLayoutLine  *line);
-void pango_cairo_layout_path       (cairo_t          *cr,
-				    PangoLayout      *layout);
-
-void pango_cairo_error_underline_path (cairo_t       *cr,
-				       double         x,
-				       double         y,
-				       double         width,
-				       double         height);
-
-G_END_DECLS
-
-#endif /* __PANGOCAIRO_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pangofc-decoder.h b/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pangofc-decoder.h
deleted file mode 100644
index 8e341469..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pangofc-decoder.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/* Pango
- * pangofc-decoder.h: Custom encoders/decoders on a per-font basis.
- *
- * Copyright (C) 2004 Red Hat Software
- *
- * 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 __PANGO_DECODER_H_
-#define __PANGO_DECODER_H_
-
-#include <pango/pangofc-font.h>
-
-G_BEGIN_DECLS
-
-#define PANGO_TYPE_FC_DECODER       (pango_fc_decoder_get_type())
-#define PANGO_FC_DECODER(object)    (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_FC_DECODER, PangoFcDecoder))
-#define PANGO_IS_FC_DECODER(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_FC_DECODER))
-
-typedef struct _PangoFcDecoder      PangoFcDecoder;
-typedef struct _PangoFcDecoderClass PangoFcDecoderClass;
-
-#define PANGO_FC_DECODER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_FC_DECODER, PangoFcDecoderClass))
-#define PANGO_IS_FC_DECODER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_FC_DECODER))
-#define PANGO_FC_DECODER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_FC_DECODER, PangoFcDecoderClass))
-
-/**
- * PangoFcDecoder:
- *
- * #PangoFcDecoder is a virtual base class that implementations will
- * inherit from.  It's the interface that is used to define a custom
- * encoding for a font.  These objects are created in your code from a
- * function callback that was originally registered with
- * pango_fc_font_map_add_decoder_find_func().  Pango requires
- * information about the supported charset for a font as well as the
- * individual character to glyph conversions.  Pango gets that
- * information via the #get_charset and #get_glyph callbacks into your
- * object implementation.
- *
- * Since: 1.6
- **/
-struct _PangoFcDecoder
-{
-  /*< private >*/
-  GObject parent_instance;
-};
-
-/**
- * PangoFcDecoderClass:
- * @get_charset: This returns an #FcCharset given a #PangoFcFont that
- *  includes a list of supported characters in the font.  The
- *  #FcCharSet that is returned should be an internal reference to your
- *  code.  Pango will not free this structure.  It is important that
- *  you make this callback fast because this callback is called
- *  separately for each character to determine Unicode coverage.
- * @get_glyph: This returns a single #PangoGlyph for a given Unicode
- *  code point.
- *
- * Class structure for #PangoFcDecoder.
- *
- * Since: 1.6
- **/
-struct _PangoFcDecoderClass
-{
-  /*< private >*/
-  GObjectClass parent_class;
-
-  /* vtable - not signals */
-  /*< public >*/
-  FcCharSet  *(*get_charset) (PangoFcDecoder *decoder,
-			      PangoFcFont    *fcfont);
-  PangoGlyph  (*get_glyph)   (PangoFcDecoder *decoder,
-			      PangoFcFont    *fcfont,
-			      guint32         wc);
-
-  /*< private >*/
-
-  /* Padding for future expansion */
-  void (*_pango_reserved1) (void);
-  void (*_pango_reserved2) (void);
-  void (*_pango_reserved3) (void);
-  void (*_pango_reserved4) (void);
-};
-
-GType      pango_fc_decoder_get_type    (void) G_GNUC_CONST;
-
-FcCharSet *pango_fc_decoder_get_charset (PangoFcDecoder *decoder,
-					 PangoFcFont    *fcfont);
-
-PangoGlyph pango_fc_decoder_get_glyph   (PangoFcDecoder *decoder,
-					 PangoFcFont    *fcfont,
-					 guint32         wc);
-
-G_END_DECLS
-
-#endif /* __PANGO_DECODER_H_ */
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pangofc-font.h b/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pangofc-font.h
deleted file mode 100644
index ae16b168..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pangofc-font.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/* Pango
- * pangofc-font.h: Base fontmap type for fontconfig-based backends
- *
- * Copyright (C) 2003 Red Hat Software
- *
- * 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 __PANGO_FC_FONT_H__
-#define __PANGO_FC_FONT_H__
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#include <fontconfig/fontconfig.h>
-#include <pango/pango-font.h>
-#include <pango/pango-fontmap.h>
-#include <pango/pango-glyph.h>
-
-G_BEGIN_DECLS
-
-#define PANGO_TYPE_FC_FONT              (pango_fc_font_get_type ())
-#define PANGO_FC_FONT(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_FC_FONT, PangoFcFont))
-#define PANGO_IS_FC_FONT(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_FC_FONT))
-
-typedef struct _PangoFcFont      PangoFcFont;
-typedef struct _PangoFcFontClass PangoFcFontClass;
-
-#if defined(PANGO_ENABLE_ENGINE) || defined(PANGO_ENABLE_BACKEND)
-
-/**
- * PANGO_RENDER_TYPE_FC:
- *
- * A string constant used to identify shape engines that work
- * with the fontconfig based backends. See the @engine_type field
- * of #PangoEngineInfo.
- **/
-#define PANGO_RENDER_TYPE_FC "PangoRenderFc"
-
-#ifdef PANGO_ENABLE_BACKEND
-
-#define PANGO_FC_FONT_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_FC_FONT, PangoFcFontClass))
-#define PANGO_IS_FC_FONT_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_FC_FONT))
-#define PANGO_FC_FONT_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_FC_FONT, PangoFcFontClass))
-
-/**
- * PangoFcFont:
- *
- * #PangoFcFont is a base class for font implementations
- * using the Fontconfig and FreeType libraries and is used in
- * conjunction with #PangoFcFontMap. When deriving from this
- * class, you need to implement all of its virtual functions
- * other than shutdown() along with the get_glyph_extents()
- * virtual function from #PangoFont.
- **/
-struct _PangoFcFont
-{
-  PangoFont parent_instance;
-
-  FcPattern *font_pattern;	    /* fully resolved pattern */
-  PangoFontMap *fontmap;	    /* associated map */
-  gpointer priv;		    /* used internally */
-  PangoMatrix matrix;		    /* used internally */
-  PangoFontDescription *description;
-
-  GSList *metrics_by_lang;
-
-  guint is_hinted : 1;
-  guint is_transformed : 1;
-};
-
-/**
- * PangoFcFontClass:
- * @lock_face: Returns the FT_Face of the font and increases
- *  the reference count for the face by one.
- * @unlock_face: Decreases the reference count for the
- *  FT_Face of the font by one. When the count is zero,
- *  the #PangoFcFont subclass is allowed to free the
- *  FT_Face.
- * @has_char: Return %TRUE if the the font contains a glyph
- *   corresponding to the specified character.
- * @get_glyph: Gets the glyph that corresponds to the given
- *   Unicode character.
- * @get_unknown_glyph: Gets the glyph that should be used to
- *   display an unknown-glyph indication for the specified
- *   Unicode character.
- *   May be %NULL.
- * @shutdown: Performs any font-specific shutdown code that
- *   needs to be done when pango_fc_font_map_shutdown is called.
- *   May be %NULL.
- *
- * Class structure for #PangoFcFont.
- **/
-struct _PangoFcFontClass
-{
-  /*< private >*/
-  PangoFontClass parent_class;
-
-  /*< public >*/
-  FT_Face    (*lock_face)         (PangoFcFont      *font);
-  void       (*unlock_face)       (PangoFcFont      *font);
-  gboolean   (*has_char)          (PangoFcFont      *font,
-				   gunichar          wc);
-  guint      (*get_glyph)         (PangoFcFont      *font,
-				   gunichar          wc);
-  PangoGlyph (*get_unknown_glyph) (PangoFcFont      *font,
-				   gunichar          wc);
-  void       (*shutdown)          (PangoFcFont      *font);
-  /*< private >*/
-
-  /* Padding for future expansion */
-  void (*_pango_reserved1) (void);
-  void (*_pango_reserved2) (void);
-  void (*_pango_reserved3) (void);
-  void (*_pango_reserved4) (void);
-};
-
-#endif /* PANGO_ENABLE_BACKEND */
-
-gboolean   pango_fc_font_has_char          (PangoFcFont      *font,
-					    gunichar          wc);
-guint      pango_fc_font_get_glyph         (PangoFcFont      *font,
-					    gunichar          wc);
-#ifndef PANGO_DISABLE_DEPRECATED
-PangoGlyph pango_fc_font_get_unknown_glyph (PangoFcFont      *font,
-					    gunichar          wc);
-#endif /* PANGO_DISABLE_DEPRECATED */
-void       pango_fc_font_kern_glyphs       (PangoFcFont      *font,
-					    PangoGlyphString *glyphs);
-
-#endif /* PANGO_ENABLE_ENGINE || PANGO_ENABLE_BACKEND */
-
-GType      pango_fc_font_get_type (void) G_GNUC_CONST;
-
-FT_Face    pango_fc_font_lock_face         (PangoFcFont      *font);
-void       pango_fc_font_unlock_face       (PangoFcFont      *font);
-
-G_END_DECLS
-#endif /* __PANGO_FC_FONT_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pangofc-fontmap.h b/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pangofc-fontmap.h
deleted file mode 100644
index 69a56ade..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pangofc-fontmap.h
+++ /dev/null
@@ -1,203 +0,0 @@
-/* Pango
- * pangofc-fontmap.h: Base fontmap type for fontconfig-based backends
- *
- * Copyright (C) 2003 Red Hat Software
- *
- * 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 __PANGO_FC_FONT_MAP_H__
-#define __PANGO_FC_FONT_MAP_H__
-
-#include <fontconfig/fontconfig.h>
-#include <pango/pango-fontmap.h>
-#include <pango/pangofc-decoder.h>
-#include <pango/pangofc-font.h>
-
-G_BEGIN_DECLS
-
-#define PANGO_TYPE_FC_FONT_MAP              (pango_fc_font_map_get_type ())
-#define PANGO_FC_FONT_MAP(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_FC_FONT_MAP, PangoFcFontMap))
-#define PANGO_IS_FC_FONT_MAP(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_FC_FONT_MAP))
-
-typedef struct _PangoFcFontMap        PangoFcFontMap;
-typedef struct _PangoFcFontMapClass   PangoFcFontMapClass;
-typedef struct _PangoFcFontMapPrivate PangoFcFontMapPrivate;
-
-#ifdef PANGO_ENABLE_BACKEND
-
-#define PANGO_FC_FONT_MAP_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_FC_FONT_MAP, PangoFcFontMapClass))
-#define PANGO_IS_FC_FONT_MAP_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_FC_FONT_MAP))
-#define PANGO_FC_FONT_MAP_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_FC_FONT_MAP, PangoFcFontMapClass))
-
-/**
- * PangoFcFontMap:
- *
- * #PangoFcFontMap is a base class for font map implementations
- * using the Fontconfig and FreeType libraries. To create a new
- * backend using Fontconfig and FreeType, you derive from this class
- * and implement a new_font() virtual function that creates an
- * instance deriving from #PangoFcFont.
- **/
-struct _PangoFcFontMap
-{
-  PangoFontMap parent_instance;
-
-  PangoFcFontMapPrivate *priv;
-};
-
-/**
- * PangoFcFontMapClass:
- * @default_substitute: Substitutes in default values for
- *  unspecified fields in a #FcPattern. This will be called
- *  prior to creating a font for the pattern. May be %NULL.
- *  Deprecated in favor of @context_substitute().
- * @new_font: Creates a new #PangoFcFont for the specified
- *  pattern of the appropriate type for this font map. The
- *  @pattern argument must be passed to the "pattern" property
- *  of #PangoFcFont when you call g_object_new(). Deprecated
- *  in favor of @create_font().
- * @get_resolution: Gets the resolution (the scale factor
- *  between logical and absolute font sizes) that the backend
- *  will use for a particular fontmap and context. @context
- *  may be null.
- * @context_key_get: Gets an opaque key holding backend
- *  specific options for the context that will affect
- *  fonts created by create_font(). The result must point to
- *  persistant storage owned by the fontmap. This key
- *  is used to index hash tables used to look up fontsets
- *  and fonts.
- * @context_key_copy: Copies a context key. Pango uses this
- *  to make a persistant copy of the value returned from
- *  @context_key_get.
- * @context_key_free: Frees a context key copied with
- *  @context_key_copy.
- * @context_key_hash: Gets a hash value for a context key
- * @context_key_equal: Compares two context keys for equality.
- * @create_font: Creates a new #PangoFcFont for the specified
- *  pattern of the appropriate type for this font map using
- *  information from the context that is passed in. The
- *  @pattern argument must be passed to the "pattern" property
- *  of #PangoFcFont when you call g_object_new(). Deprecated
- *  in favor of @create_font(). If %NULL, new_font() is used.
- * @context_substitute: Substitutes in default values for
- *  unspecified fields in a #FcPattern. This will be called
- *  prior to creating a font for the pattern. May be %NULL.
- *
- * Class structure for #PangoFcFontMap.
- **/
-struct _PangoFcFontMapClass
-{
-  /*< private >*/
-  PangoFontMapClass parent_class;
-
-  /*< public >*/
-  /* Deprecated in favor of context_substitute */
-  void         (*default_substitute) (PangoFcFontMap   *fontmap,
-				      FcPattern        *pattern);
-  /* Deprecated in favor of create_font */
-  PangoFcFont  *(*new_font)          (PangoFcFontMap  *fontmap,
-				      FcPattern       *pattern);
-
-  double       (*get_resolution)     (PangoFcFontMap             *fcfontmap,
-				      PangoContext               *context);
-
-  gconstpointer (*context_key_get)   (PangoFcFontMap             *fcfontmap,
-				      PangoContext               *context);
-  gpointer     (*context_key_copy)   (PangoFcFontMap             *fcfontmap,
-				      gconstpointer               key);
-  void         (*context_key_free)   (PangoFcFontMap             *fcfontmap,
-				      gpointer                    key);
-  guint32      (*context_key_hash)   (PangoFcFontMap             *fcfontmap,
-				      gconstpointer               key);
-  gboolean     (*context_key_equal)  (PangoFcFontMap             *fcfontmap,
-				      gconstpointer               key_a,
-				      gconstpointer               key_b);
-
-  void         (*context_substitute) (PangoFcFontMap             *fontmap,
-				      PangoContext               *context,
-				      FcPattern                  *pattern);
-  PangoFcFont  *(*create_font)       (PangoFcFontMap             *fontmap,
-				      PangoContext               *context,
-				      const PangoFontDescription *desc,
-				      FcPattern                  *pattern);
-  /*< private >*/
-
-  /* Padding for future expansion */
-  void (*_pango_reserved1) (void);
-  void (*_pango_reserved2) (void);
-  void (*_pango_reserved3) (void);
-  void (*_pango_reserved4) (void);
-};
-
-PangoContext * pango_fc_font_map_create_context (PangoFcFontMap *fcfontmap);
-void           pango_fc_font_map_cache_clear    (PangoFcFontMap *fcfontmap);
-void           pango_fc_font_map_shutdown       (PangoFcFontMap *fcfontmap);
-
-#endif
-
-GType pango_fc_font_map_get_type (void) G_GNUC_CONST;
-
-/**
- * PangoFcDecoderFindFunc:
- * @pattern: a fully resolved #FcPattern specifying the font on the system
- * @user_data: user data passed to pango_fc_font_map_add_decoder_find_func()
- *
- * Callback function passed to pango_fc_font_map_add_decoder_find_func().
- *
- * Return value: a new reference to a custom decoder for this pattern,
- *  or %NULL if the default decoder handling should be used.
- **/
-typedef PangoFcDecoder * (*PangoFcDecoderFindFunc) (FcPattern *pattern,
-						    gpointer   user_data);
-
-void pango_fc_font_map_add_decoder_find_func (PangoFcFontMap        *fcfontmap,
-					      PangoFcDecoderFindFunc findfunc,
-					      gpointer               user_data,
-					      GDestroyNotify         dnotify);
-
-PangoFontDescription *pango_fc_font_description_from_pattern (FcPattern *pattern,
-							      gboolean   include_size);
-
-/**
- * PANGO_FC_GRAVITY:
- *
- * String representing a fontconfig property name that Pango sets on any
- * fontconfig pattern it passes to fontconfig if a #PangoGravity other
- * than %PangoGravitySouth is desired.
- *
- * The property will have a #PangoGravity value as a string, like "east".
- *
- * Since: 1.20
- */
-#define PANGO_FC_GRAVITY "pangogravity"
-
-/**
- * PANGO_FC_VERSION:
- *
- * String representing a fontconfig property name that Pango sets on any
- * fontconfig pattern it passes to fontconfig.
- *
- * The property will have an integer value equal to what
- * pango_version() returns.
- *
- * Since: 1.20
- */
-#define PANGO_FC_VERSION "pangoversion"
-
-G_END_DECLS
-
-#endif /* __PANGO_FC_FONT_MAP_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pangoft2.h b/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pangoft2.h
deleted file mode 100644
index 27acfa6e..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pangoft2.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/* Pango
- * pangoft2.h:
- *
- * Copyright (C) 1999 Red Hat Software
- * Copyright (C) 2000 Tor Lillqvist
- *
- * 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 __PANGOFT2_H__
-#define __PANGOFT2_H__
-
-#include <fontconfig/fontconfig.h>
-
-#include <pango/pango-layout.h>
-#include <pango/pangofc-font.h>
-
-G_BEGIN_DECLS
-
-#ifndef PANGO_DISABLE_DEPRECATED
-#define PANGO_RENDER_TYPE_FT2 "PangoRenderFT2"
-#endif
-
-#define PANGO_TYPE_FT2_FONT_MAP              (pango_ft2_font_map_get_type ())
-#define PANGO_FT2_FONT_MAP(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_FT2_FONT_MAP, PangoFT2FontMap))
-#define PANGO_FT2_IS_FONT_MAP(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_FT2_FONT_MAP))
-
-typedef struct _PangoFT2FontMap      PangoFT2FontMap;
-
-typedef void (*PangoFT2SubstituteFunc) (FcPattern *pattern,
-					gpointer   data);
-
-/* Calls for applications */
-
-void pango_ft2_render             (FT_Bitmap         *bitmap,
-				   PangoFont         *font,
-				   PangoGlyphString  *glyphs,
-				   gint               x,
-				   gint               y);
-void pango_ft2_render_transformed (FT_Bitmap         *bitmap,
-				   const PangoMatrix *matrix,
-				   PangoFont         *font,
-				   PangoGlyphString  *glyphs,
-				   int                x,
-				   int                y);
-
-void pango_ft2_render_layout_line          (FT_Bitmap        *bitmap,
-					    PangoLayoutLine  *line,
-					    int               x,
-					    int               y);
-void pango_ft2_render_layout_line_subpixel (FT_Bitmap        *bitmap,
-					    PangoLayoutLine  *line,
-					    int               x,
-					    int               y);
-void pango_ft2_render_layout               (FT_Bitmap        *bitmap,
-					    PangoLayout      *layout,
-					    int               x,
-					    int               y);
-void pango_ft2_render_layout_subpixel      (FT_Bitmap        *bitmap,
-					    PangoLayout      *layout,
-					    int               x,
-					    int               y);
-
-GType pango_ft2_font_map_get_type (void) G_GNUC_CONST;
-
-PangoFontMap *pango_ft2_font_map_new                    (void);
-void          pango_ft2_font_map_set_resolution         (PangoFT2FontMap        *fontmap,
-							 double                  dpi_x,
-							 double                  dpi_y);
-void          pango_ft2_font_map_set_default_substitute (PangoFT2FontMap        *fontmap,
-							 PangoFT2SubstituteFunc  func,
-							 gpointer                data,
-							 GDestroyNotify          notify);
-void          pango_ft2_font_map_substitute_changed     (PangoFT2FontMap         *fontmap);
-PangoContext *pango_ft2_font_map_create_context         (PangoFT2FontMap         *fontmap);
-
-
-/* API for rendering modules
- */
-#ifndef PANGO_DISABLE_DEPRECATED
-PangoContext      *pango_ft2_get_context          (double dpi_x,
-						   double dpi_y);
-PangoFontMap      *pango_ft2_font_map_for_display (void);
-void               pango_ft2_shutdown_display     (void);
-
-PangoGlyph     pango_ft2_get_unknown_glyph (PangoFont       *font);
-int            pango_ft2_font_get_kerning  (PangoFont       *font,
-					    PangoGlyph       left,
-					    PangoGlyph       right);
-FT_Face        pango_ft2_font_get_face     (PangoFont       *font);
-PangoCoverage *pango_ft2_font_get_coverage (PangoFont       *font,
-					    PangoLanguage   *language);
-#endif /* PANGO_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __PANGOFT2_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pangox.h b/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pangox.h
deleted file mode 100644
index dc41b61e..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pangox.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/* Pango
- * pangox.h:
- *
- * Copyright (C) 1999 Red Hat Software
- * Copyright (C) 2000 SuSE Linux Ltd
- *
- * 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 __PANGOX_H__
-#define __PANGOX_H__
-
-#include <glib.h>
-#include <pango/pango-layout.h>
-
-G_BEGIN_DECLS
-
-#include <X11/Xlib.h>
-
-#ifndef PANGO_DISABLE_DEPRECATED
-
-#define PANGO_RENDER_TYPE_X "PangoRenderX"
-
-typedef GC (*PangoGetGCFunc) (PangoContext *context, PangoColor *color, GC base_gc);
-typedef void (*PangoFreeGCFunc) (PangoContext *context, GC gc);
-
-/* Calls for applications
- */
-PangoContext * pango_x_get_context        (Display          *display);
-void           pango_x_context_set_funcs  (PangoContext     *context,
-					   PangoGetGCFunc    get_gc_func,
-					   PangoFreeGCFunc   free_gc_func);
-
-PangoFont *    pango_x_load_font          (Display          *display,
-					   const gchar      *spec);
-void           pango_x_render             (Display          *display,
-					   Drawable          d,
-					   GC                gc,
-					   PangoFont        *font,
-					   PangoGlyphString *glyphs,
-					   gint              x,
-					   gint              y);
-void           pango_x_render_layout_line (Display          *display,
-					   Drawable          drawable,
-					   GC                gc,
-					   PangoLayoutLine  *line,
-					   int               x,
-					   int               y);
-void           pango_x_render_layout      (Display          *display,
-					   Drawable          drawable,
-					   GC                gc,
-					   PangoLayout      *layout,
-					   int               x,
-					   int               y);
-
-/* API for rendering modules
- */
-typedef guint16 PangoXSubfont;
-
-#define PANGO_X_MAKE_GLYPH(subfont,index_) ((subfont)<<16 | (index_))
-#define PANGO_X_GLYPH_SUBFONT(glyph) ((glyph)>>16)
-#define PANGO_X_GLYPH_INDEX(glyph) ((glyph) & 0xffff)
-
-int        pango_x_list_subfonts     (PangoFont      *font,
-				      char          **charsets,
-				      int             n_charsets,
-				      PangoXSubfont **subfont_ids,
-				      int           **subfont_charsets);
-gboolean   pango_x_has_glyph         (PangoFont      *font,
-				      PangoGlyph      glyph);
-PangoGlyph pango_x_get_unknown_glyph (PangoFont      *font);
-
-#ifdef PANGO_ENABLE_ENGINE
-PangoGlyph pango_x_font_get_unknown_glyph (PangoFont    *font,
-					   gunichar      wc);
-#endif /* PANGO_ENABLE_ENGINE */
-
-/* API for libraries that want to use PangoX mixed with classic X fonts.
- */
-typedef struct _PangoXFontCache PangoXFontCache;
-
-PangoXFontCache *pango_x_font_cache_new     (Display         *display);
-void             pango_x_font_cache_free    (PangoXFontCache *cache);
-
-XFontStruct * pango_x_font_cache_load      (PangoXFontCache *cache,
-					    const char      *xlfd);
-void          pango_x_font_cache_unload    (PangoXFontCache *cache,
-					    XFontStruct     *fs);
-
-PangoFontMap *   pango_x_font_map_for_display  (Display     *display);
-void             pango_x_shutdown_display      (Display     *display);
-PangoXFontCache *pango_x_font_map_get_font_cache (PangoFontMap *font_map);
-
-char *pango_x_font_subfont_xlfd (PangoFont     *font,
-				 PangoXSubfont  subfont_id);
-
-
-gboolean pango_x_find_first_subfont (PangoFont     *font,
-				     char         **charsets,
-				     int            n_charsets,
-				     PangoXSubfont *rfont);
-
-void pango_x_fallback_shape (PangoFont        *font,
-			     PangoGlyphString *glyphs,
-			     const char       *text,
-			     int               n_chars);
-
-gboolean pango_x_apply_ligatures (PangoFont     *font,
-				  PangoXSubfont  subfont,
-				  gunichar     **glyphs,
-				  int           *n_glyphs,
-				  int          **clusters);
-
-#endif /* PANGO_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __PANGOX_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pangoxft-render.h b/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pangoxft-render.h
deleted file mode 100644
index 87c26a75..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pangoxft-render.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/* Pango
- * pangoxft-render.h: Rendering routines for the Xft library
- *
- * Copyright (C) 2004 Red Hat Software
- *
- * 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 __PANGOXFT_RENDER_H__
-#define __PANGOXFT_RENDER_H__
-
-#include <pango/pango-renderer.h>
-
-G_BEGIN_DECLS
-
-#define _XFT_NO_COMPAT_
-#include <X11/Xlib.h>
-#include <X11/Xft/Xft.h>
-#if defined(XftVersion) && XftVersion >= 20000
-#else
-#error "must have Xft version 2 or newer"
-#endif
-
-typedef struct _PangoXftRenderer        PangoXftRenderer;
-typedef struct _PangoXftRendererClass   PangoXftRendererClass;
-typedef struct _PangoXftRendererPrivate PangoXftRendererPrivate;
-
-#define PANGO_TYPE_XFT_RENDERER            (pango_xft_renderer_get_type())
-#define PANGO_XFT_RENDERER(object)         (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_XFT_RENDERER, PangoXftRenderer))
-#define PANGO_IS_XFT_RENDERER(object)      (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_XFT_RENDERER))
-#define PANGO_XFT_RENDERER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_XFT_RENDERER, PangoXftRendererClass))
-#define PANGO_IS_XFT_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_XFT_RENDERER))
-#define PANGO_XFT_RENDERER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_XFT_RENDERER, PangoXftRendererClass))
-
-/**
- * PangoXftRenderer
- *
- * #PangoXftRenderer is a subclass of #PangoRenderer used for rendering
- * with Pango's Xft backend. It can be used directly, or it can be
- * further subclassed to modify exactly how drawing of individual
- * elements occurs.
- *
- * Since: 1.8
- */
-struct _PangoXftRenderer
-{
-  /*< private >*/
-  PangoRenderer parent_instance;
-
-  Display *display;
-  int screen;
-  XftDraw *draw;
-
-  PangoXftRendererPrivate *priv;
-};
-
-/**
- * PangoXftRendererClass
- * @composite_trapezoids: draw the specified trapezoids using
- *   the current color and other attributes for @part
- * @composite_glyphs: draw the specified glyphs using
- *   the current foreground color and other foreground
- *   attributes
- *
- * The class structure for #PangoXftRenderer
- *
- * Since: 1.8
- */
-struct _PangoXftRendererClass
-{
-  /*< private >*/
-  PangoRendererClass parent_class;
-
-  /*< public >*/
-  void (*composite_trapezoids) (PangoXftRenderer *xftrenderer,
-				PangoRenderPart   part,
-				XTrapezoid       *trapezoids,
-				int               n_trapezoids);
-  void (*composite_glyphs)     (PangoXftRenderer *xftrenderer,
-				XftFont          *xft_font,
-				XftGlyphSpec     *glyphs,
-				int               n_glyphs);
-};
-
-GType pango_xft_renderer_get_type    (void) G_GNUC_CONST;
-
-PangoRenderer *pango_xft_renderer_new                 (Display          *display,
-						       int               screen);
-void           pango_xft_renderer_set_draw            (PangoXftRenderer *xftrenderer,
-						       XftDraw          *draw);
-void           pango_xft_renderer_set_default_color   (PangoXftRenderer *xftrenderer,
-						       PangoColor       *default_color);
-
-void pango_xft_render             (XftDraw          *draw,
-				   XftColor         *color,
-				   PangoFont        *font,
-				   PangoGlyphString *glyphs,
-				   gint              x,
-				   gint              y);
-void pango_xft_picture_render     (Display          *display,
-				   Picture           src_picture,
-				   Picture           dest_picture,
-				   PangoFont        *font,
-				   PangoGlyphString *glyphs,
-				   gint              x,
-				   gint              y);
-void pango_xft_render_transformed (XftDraw          *draw,
-				   XftColor         *color,
-				   PangoMatrix      *matrix,
-				   PangoFont        *font,
-				   PangoGlyphString *glyphs,
-				   int               x,
-				   int               y);
-void pango_xft_render_layout_line (XftDraw          *draw,
-				   XftColor         *color,
-				   PangoLayoutLine  *line,
-				   int               x,
-				   int               y);
-void pango_xft_render_layout      (XftDraw          *draw,
-				   XftColor         *color,
-				   PangoLayout      *layout,
-				   int               x,
-				   int               y);
-
-G_END_DECLS
-
-#endif /* __PANGOXFT_RENDER_H__ */
-
diff --git a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pangoxft.h b/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pangoxft.h
deleted file mode 100644
index a84571a8..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/include/pango-1.0/pango/pangoxft.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* Pango
- * pangoxft.h:
- *
- * Copyright (C) 1999 Red Hat Software
- * Copyright (C) 2000 SuSE Linux Ltd
- *
- * 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 __PANGOXFT_H__
-#define __PANGOXFT_H__
-
-#include <pango/pango-context.h>
-#include <pango/pango-ot.h>
-#include <pango/pangofc-font.h>
-#include <pango/pango-layout.h>
-#include <pango/pangoxft-render.h>
-
-G_BEGIN_DECLS
-
-#ifndef PANGO_DISABLE_DEPRECATED
-#define PANGO_RENDER_TYPE_XFT "PangoRenderXft"
-#endif
-
-#define PANGO_TYPE_XFT_FONT_MAP              (pango_xft_font_map_get_type ())
-#define PANGO_XFT_FONT_MAP(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_XFT_FONT_MAP, PangoXftFontMap))
-#define PANGO_XFT_IS_FONT_MAP(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_XFT_FONT_MAP))
-
-typedef struct _PangoXftFontMap      PangoXftFontMap;
-
-typedef struct _PangoXftFont    PangoXftFont;
-
-typedef void (*PangoXftSubstituteFunc) (FcPattern *pattern,
-					gpointer   data);
-
-/* Calls for applications
- */
-PangoFontMap *pango_xft_get_font_map     (Display *display,
-					  int      screen);
-PangoContext *pango_xft_get_context      (Display *display,
-					  int      screen);
-void          pango_xft_shutdown_display (Display *display,
-					  int      screen);
-
-void pango_xft_set_default_substitute (Display                *display,
-				       int                     screen,
-				       PangoXftSubstituteFunc  func,
-				       gpointer                data,
-				       GDestroyNotify          notify);
-void pango_xft_substitute_changed     (Display                *display,
-				       int                     screen);
-
-GType pango_xft_font_map_get_type (void) G_GNUC_CONST;
-
-#define PANGO_XFT_FONT(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_XFT_FONT, PangoXftFont))
-#define PANGO_TYPE_XFT_FONT              (pango_xft_font_get_type ())
-#define PANGO_XFT_IS_FONT(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_XFT_FONT))
-
-GType      pango_xft_font_get_type (void) G_GNUC_CONST;
-
-/* For shape engines
- */
-
-#ifdef PANGO_ENABLE_ENGINE
-XftFont *     pango_xft_font_get_font          (PangoFont *font);
-Display *     pango_xft_font_get_display       (PangoFont *font);
-#ifndef PANGO_DISABLE_DEPRECATED
-FT_Face       pango_xft_font_lock_face         (PangoFont *font);
-void	      pango_xft_font_unlock_face       (PangoFont *font);
-guint	      pango_xft_font_get_glyph	       (PangoFont *font,
-						gunichar   wc);
-gboolean      pango_xft_font_has_char          (PangoFont *font,
-						gunichar   wc);
-PangoGlyph    pango_xft_font_get_unknown_glyph (PangoFont *font,
-						gunichar   wc);
-#endif /* PANGO_DISABLE_DEPRECATED */
-#endif /* PANGO_ENABLE_ENGINE */
-
-G_END_DECLS
-
-#endif /* __PANGOXFT_H__ */
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/glib-2.0/include/glibconfig.h b/lib-x86-64/gtk-2.12.12/usr/lib/glib-2.0/include/glibconfig.h
deleted file mode 100644
index b88953aa..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/glib-2.0/include/glibconfig.h
+++ /dev/null
@@ -1,203 +0,0 @@
-/* glibconfig.h
- *
- * This is a generated file.  Please modify 'configure.in'
- */
-
-#ifndef __G_LIBCONFIG_H__
-#define __G_LIBCONFIG_H__
-
-#include <glib/gmacros.h>
-
-#include <limits.h>
-#include <float.h>
-#define GLIB_HAVE_ALLOCA_H
-#define GLIB_HAVE_SYS_POLL_H
-
-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 */
-
-typedef signed long gint64;
-typedef unsigned long guint64;
-
-#define G_GINT64_CONSTANT(val)	(val##L)
-#define G_GUINT64_CONSTANT(val)	(val##UL)
-#define G_GINT64_MODIFIER "l"
-#define G_GINT64_FORMAT "li"
-#define G_GUINT64_FORMAT "lu"
-
-#define GLIB_SIZEOF_VOID_P 8
-#define GLIB_SIZEOF_LONG   8
-#define GLIB_SIZEOF_SIZE_T 8
-
-typedef signed long gssize;
-typedef unsigned long gsize;
-#define G_GSIZE_MODIFIER "l"
-#define G_GSSIZE_FORMAT "li"
-#define G_GSIZE_FORMAT "lu"
-
-#define G_MAXSIZE	G_MAXULONG
-#define G_MINSSIZE	G_MINLONG
-#define G_MAXSSIZE	G_MAXLONG
-
-typedef gint64 goffset;
-#define G_MINOFFSET	G_MININT64
-#define G_MAXOFFSET	G_MAXINT64
-
-
-#define GPOINTER_TO_INT(p)	((gint)  (glong) (p))
-#define GPOINTER_TO_UINT(p)	((guint) (gulong) (p))
-
-#define GINT_TO_POINTER(i)	((gpointer) (glong) (i))
-#define GUINT_TO_POINTER(u)	((gpointer) (gulong) (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 16
-#define GLIB_MICRO_VERSION 6
-
-#define G_OS_UNIX
-
-#define G_VA_COPY	va_copy
-#define G_VA_COPY_AS_ARRAY 1
-
-#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 0
-
-#define G_HAVE_GNUC_VISIBILITY 1
-#if 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
-typedef struct _GStaticMutex GStaticMutex;
-struct _GStaticMutex
-{
-  struct _GMutex *runtime_mutex;
-  union {
-    char   pad[40];
-    double dummy_double;
-    void  *dummy_pointer;
-    long   dummy_long;
-  } static_mutex;
-};
-#define	G_STATIC_MUTEX_INIT	{ NULL, { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} } }
-#define	g_static_mutex_get_mutex(mutex) \
-  (g_thread_use_default_impl ? ((GMutex*) ((mutex)->static_mutex.pad)) : \
-   g_static_mutex_get_mutex_impl_shortcut (&((mutex)->runtime_mutex)))
-/* This represents a system thread as used by the implementation. An
- * alien implementaion, as loaded by g_thread_init can only count on
- * "sizeof (gpointer)" bytes to store their info. We however need more
- * for some of our native implementations. */
-typedef union _GSystemThread GSystemThread;
-union _GSystemThread
-{
-  char   data[8];
-  double dummy_double;
-  void  *dummy_pointer;
-  long   dummy_long;
-};
-
-#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) GINT64_TO_LE (val))
-#define GULONG_TO_LE(val)	((gulong) GUINT64_TO_LE (val))
-#define GLONG_TO_BE(val)	((glong) GINT64_TO_BE (val))
-#define GULONG_TO_BE(val)	((gulong) GUINT64_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 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;
-
-G_END_DECLS
-
-#endif /* GLIBCONFIG_H */
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/gtk-2.0/include/gdkconfig.h b/lib-x86-64/gtk-2.12.12/usr/lib/gtk-2.0/include/gdkconfig.h
deleted file mode 100644
index 67c1a719..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/gtk-2.0/include/gdkconfig.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* gdkconfig.h
- *
- * This is a generated file.  Please modify `configure.in'
- */
-
-#ifndef GDKCONFIG_H
-#define GDKCONFIG_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-#define GDK_WINDOWING_X11
-
-#define GDK_HAVE_WCHAR_H 1
-#define GDK_HAVE_WCTYPE_H 1
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* GDKCONFIG_H */
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/libatk-1.0.a b/lib-x86-64/gtk-2.12.12/usr/lib/libatk-1.0.a
deleted file mode 100644
index 63e7b75c..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/libatk-1.0.a
+++ /dev/null
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/libcairo.a b/lib-x86-64/gtk-2.12.12/usr/lib/libcairo.a
deleted file mode 100644
index 0ba5b06c..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/libcairo.a
+++ /dev/null
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/libgdk-x11-2.0.a b/lib-x86-64/gtk-2.12.12/usr/lib/libgdk-x11-2.0.a
deleted file mode 100644
index 1732ea16..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/libgdk-x11-2.0.a
+++ /dev/null
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/libgdk_pixbuf-2.0.a b/lib-x86-64/gtk-2.12.12/usr/lib/libgdk_pixbuf-2.0.a
deleted file mode 100644
index 25ca30e6..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/libgdk_pixbuf-2.0.a
+++ /dev/null
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/libgdk_pixbuf_xlib-2.0.a b/lib-x86-64/gtk-2.12.12/usr/lib/libgdk_pixbuf_xlib-2.0.a
deleted file mode 100644
index e4e229fc..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/libgdk_pixbuf_xlib-2.0.a
+++ /dev/null
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/libgio-2.0.a b/lib-x86-64/gtk-2.12.12/usr/lib/libgio-2.0.a
deleted file mode 100644
index 3f7bbcd8..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/libgio-2.0.a
+++ /dev/null
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/libglib-2.0.a b/lib-x86-64/gtk-2.12.12/usr/lib/libglib-2.0.a
deleted file mode 100644
index 9265c671..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/libglib-2.0.a
+++ /dev/null
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/libgmodule-2.0.a b/lib-x86-64/gtk-2.12.12/usr/lib/libgmodule-2.0.a
deleted file mode 100644
index 174d62d2..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/libgmodule-2.0.a
+++ /dev/null
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/libgobject-2.0.a b/lib-x86-64/gtk-2.12.12/usr/lib/libgobject-2.0.a
deleted file mode 100644
index 87c9479e..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/libgobject-2.0.a
+++ /dev/null
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/libgthread-2.0.a b/lib-x86-64/gtk-2.12.12/usr/lib/libgthread-2.0.a
deleted file mode 100644
index 46583d4d..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/libgthread-2.0.a
+++ /dev/null
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/libgtk-x11-2.0.a b/lib-x86-64/gtk-2.12.12/usr/lib/libgtk-x11-2.0.a
deleted file mode 100644
index 530e4214..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/libgtk-x11-2.0.a
+++ /dev/null
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/libpango-1.0.a b/lib-x86-64/gtk-2.12.12/usr/lib/libpango-1.0.a
deleted file mode 100644
index e980d528..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/libpango-1.0.a
+++ /dev/null
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/libpangocairo-1.0.a b/lib-x86-64/gtk-2.12.12/usr/lib/libpangocairo-1.0.a
deleted file mode 100644
index 0818fcb9..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/libpangocairo-1.0.a
+++ /dev/null
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/libpangoft2-1.0.a b/lib-x86-64/gtk-2.12.12/usr/lib/libpangoft2-1.0.a
deleted file mode 100644
index 2218ecbc..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/libpangoft2-1.0.a
+++ /dev/null
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/libpangox-1.0.a b/lib-x86-64/gtk-2.12.12/usr/lib/libpangox-1.0.a
deleted file mode 100644
index 5d33c3e1..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/libpangox-1.0.a
+++ /dev/null
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/libpangoxft-1.0.a b/lib-x86-64/gtk-2.12.12/usr/lib/libpangoxft-1.0.a
deleted file mode 100644
index c3761b4b..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/libpangoxft-1.0.a
+++ /dev/null
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/atk.pc b/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/atk.pc
deleted file mode 100644
index 8e1cab06..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/atk.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: Atk
-Description: Accessibility Toolkit
-Version: 1.22.0
-Requires: gobject-2.0 gmodule-no-export-2.0
-Libs: -L${libdir} -latk-1.0
-Cflags: -I${includedir}/atk-1.0
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/cairo-directfb.pc b/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/cairo-directfb.pc
deleted file mode 100644
index 51de49d2..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/cairo-directfb.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=NONE
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: cairo-directfb
-Description: directfb backend for cairo graphics library
-Version: 1.6.4
-
-Requires: cairo directfb 
-Libs: 
-Cflags: -I${includedir}/cairo 
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/cairo-ft.pc b/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/cairo-ft.pc
deleted file mode 100644
index 65726c9e..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/cairo-ft.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=NONE
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: cairo-ft
-Description: FreeType font backend for cairo graphics library
-Version: 1.6.4
-
-Requires: cairo freetype2 >= 9.7.3 fontconfig 
-Libs: 
-Cflags: -I${includedir}/cairo 
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/cairo-pdf.pc b/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/cairo-pdf.pc
deleted file mode 100644
index 45508107..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/cairo-pdf.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=NONE
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: cairo-pdf
-Description: PDF backend for cairo graphics library
-Version: 1.6.4
-
-Requires: cairo 
-Libs: -lz 
-Cflags: -I${includedir}/cairo 
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/cairo-png.pc b/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/cairo-png.pc
deleted file mode 100644
index 6d19486a..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/cairo-png.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=NONE
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: cairo-png
-Description: PNG backend for cairo graphics library
-Version: 1.6.4
-
-Requires: cairo libpng12 
-Libs: 
-Cflags: -I${includedir}/cairo 
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/cairo-ps.pc b/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/cairo-ps.pc
deleted file mode 100644
index 73f9b89b..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/cairo-ps.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=NONE
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: cairo-ps
-Description: PostScript backend for cairo graphics library
-Version: 1.6.4
-
-Requires: cairo 
-Libs: -lz 
-Cflags: -I${includedir}/cairo 
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/cairo-svg.pc b/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/cairo-svg.pc
deleted file mode 100644
index 9fea7ec3..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/cairo-svg.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=NONE
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: cairo-svg
-Description: SVG backend for cairo graphics library
-Version: 1.6.4
-
-Requires: cairo 
-Libs: 
-Cflags: -I${includedir}/cairo 
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/cairo-xcb.pc b/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/cairo-xcb.pc
deleted file mode 100644
index 1e3423a9..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/cairo-xcb.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=NONE
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: cairo-xcb
-Description: XCB backend for cairo graphics library
-Version: 1.6.4
-
-Requires: cairo xcb >= 0.9.92 xcb-render >= 0.9.92 xcb-renderutil 
-Libs: 
-Cflags: -I${includedir}/cairo 
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/cairo-xlib-xrender.pc b/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/cairo-xlib-xrender.pc
deleted file mode 100644
index ac2c2537..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/cairo-xlib-xrender.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=NONE
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: cairo-xlib_xrender
-Description: Xlib Xrender backend for cairo graphics library
-Version: 1.6.4
-
-Requires: cairo-xlib xrender >= 0.6 
-Libs: 
-Cflags: -I${includedir}/cairo 
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/cairo-xlib.pc b/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/cairo-xlib.pc
deleted file mode 100644
index 5625dbe2..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/cairo-xlib.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=NONE
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: cairo-xlib
-Description: Xlib backend for cairo graphics library
-Version: 1.6.4
-
-Requires: cairo x11 
-Libs: 
-Cflags: -I${includedir}/cairo 
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/cairo.pc b/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/cairo.pc
deleted file mode 100644
index 464fa6cc..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/cairo.pc
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: cairo
-Description: Multi-platform 2D graphics library
-Version: 1.6.4
-
-Requires.private: freetype2 >= 9.7.3 fontconfig directfb libpng12 xcb >= 0.9.92 xcb-render >= 0.9.92 xcb-renderutil xrender >= 0.6 x11 pixman-1 >= 0.10.0 
-Libs: -L${libdir} -lcairo
-Libs.private: -lz -lz -lm
-Cflags: -I${includedir}/cairo
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gdk-2.0.pc b/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gdk-2.0.pc
deleted file mode 100644
index 3cdd1737..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gdk-2.0.pc
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=${prefix}/include
-target=x11
-
-Name: GDK
-Description: GIMP Drawing Kit (${target} target)
-Version: 2.12.12
-Requires: gdk-pixbuf-2.0 pango pangocairo
-Requires.private: fontconfig x11 xext xrender xinerama xi xrandr xcursor xfixes xcomposite xdamage
-Libs: -L${libdir} -lgdk-${target}-2.0 
-Cflags: -I${includedir}/gtk-2.0 -I${libdir}/gtk-2.0/include 
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gdk-pixbuf-2.0.pc b/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gdk-pixbuf-2.0.pc
deleted file mode 100644
index ac67b526..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gdk-pixbuf-2.0.pc
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=${prefix}/include
-
-Name: GdkPixbuf
-Description: Image loading and scaling
-Version: 2.12.12
-Requires: gobject-2.0,gmodule-no-export-2.0
-Libs: -L${libdir} -lgdk_pixbuf-2.0 -lm
-Cflags: -I${includedir}/gtk-2.0 
-
-Libs.private: -ltiff -ljpeg -lpng12
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gdk-pixbuf-xlib-2.0.pc b/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gdk-pixbuf-xlib-2.0.pc
deleted file mode 100644
index 31194ce2..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gdk-pixbuf-xlib-2.0.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=${prefix}/include
-
-Name: GdkPixbuf Xlib
-Description: GdkPixbuf rendering for Xlib
-Version: 2.12.12
-Requires: gobject-2.0,gmodule-no-export-2.0,gdk-pixbuf-2.0
-Libs: -L${libdir} -lgdk_pixbuf_xlib-2.0
-Cflags: -I${includedir}
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gdk-x11-2.0.pc b/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gdk-x11-2.0.pc
deleted file mode 100644
index 3cdd1737..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gdk-x11-2.0.pc
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=${prefix}/include
-target=x11
-
-Name: GDK
-Description: GIMP Drawing Kit (${target} target)
-Version: 2.12.12
-Requires: gdk-pixbuf-2.0 pango pangocairo
-Requires.private: fontconfig x11 xext xrender xinerama xi xrandr xcursor xfixes xcomposite xdamage
-Libs: -L${libdir} -lgdk-${target}-2.0 
-Cflags: -I${includedir}/gtk-2.0 -I${libdir}/gtk-2.0/include 
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gio-2.0.pc b/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gio-2.0.pc
deleted file mode 100644
index ad465fdf..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gio-2.0.pc
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-giomoduledir=${libdir}/gio/modules
-
-Name: GIO
-Description: glib I/O library
-Version: 2.16.6
-Requires: glib-2.0,gobject-2.0,gmodule-no-export-2.0
-Libs: -L${libdir} -lgio-2.0
-Cflags: 
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gio-unix-2.0.pc b/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gio-unix-2.0.pc
deleted file mode 100644
index c7d221f8..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gio-unix-2.0.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-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.16.6
-Requires: gobject-2.0,gmodule-no-export-2.0,gio-2.0
-Libs: -L${libdir} -lgio-2.0
-Cflags: -I${includedir}/gio-unix-2.0/
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/glib-2.0.pc b/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/glib-2.0.pc
deleted file mode 100644
index d926ca47..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/glib-2.0.pc
+++ /dev/null
@@ -1,14 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-glib_genmarshal=glib-genmarshal
-gobject_query=gobject-query
-glib_mkenums=glib-mkenums
-
-Name: GLib
-Description: C Utility Library
-Version: 2.16.6
-Libs: -L${libdir} -lglib-2.0  
-Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include 
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gmodule-2.0.pc b/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gmodule-2.0.pc
deleted file mode 100644
index 6c29784f..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gmodule-2.0.pc
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=/usr
-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.16.6
-Libs: -L${libdir} -Wl,--export-dynamic -lgmodule-2.0 -ldl
-Cflags:
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gmodule-export-2.0.pc b/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gmodule-export-2.0.pc
deleted file mode 100644
index 6c29784f..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gmodule-export-2.0.pc
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=/usr
-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.16.6
-Libs: -L${libdir} -Wl,--export-dynamic -lgmodule-2.0 -ldl
-Cflags:
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gmodule-no-export-2.0.pc b/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gmodule-no-export-2.0.pc
deleted file mode 100644
index c833cd19..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gmodule-no-export-2.0.pc
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=/usr
-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.16.6
-Libs: -L${libdir} -lgmodule-2.0 -ldl
-Cflags:
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gobject-2.0.pc b/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gobject-2.0.pc
deleted file mode 100644
index 59e6d1d9..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gobject-2.0.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-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.16.6
-Libs: -L${libdir} -lgobject-2.0
-Cflags:
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gthread-2.0.pc b/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gthread-2.0.pc
deleted file mode 100644
index 5dc7071b..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gthread-2.0.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: GThread
-Description: Thread support for GLib
-Requires: glib-2.0
-Version: 2.16.6
-Libs: -L${libdir} -lgthread-2.0 -pthread  -lrt
-Cflags: -pthread
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gtk+-2.0.pc b/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gtk+-2.0.pc
deleted file mode 100644
index 81799bac..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gtk+-2.0.pc
+++ /dev/null
@@ -1,15 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=${prefix}/include
-target=x11
-
-gtk_binary_version=2.10.0
-gtk_host=x86_64-pc-linux-gnu
-
-Name: GTK+
-Description: GIMP Tool Kit (${target} target)
-Version: 2.12.12
-Requires: gdk-${target}-2.0 atk cairo
-Libs: -L${libdir} -lgtk-${target}-2.0 
-Cflags: -I${includedir}/gtk-2.0 
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gtk+-unix-print-2.0.pc b/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gtk+-unix-print-2.0.pc
deleted file mode 100644
index 916eee9c..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gtk+-unix-print-2.0.pc
+++ /dev/null
@@ -1,14 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=${prefix}/include
-target=x11
-
-gtk_binary_version=2.10.0
-gtk_host=x86_64-pc-linux-gnu
-
-Name: GTK+
-Description: GIMP Tool Kit Unix print support
-Version: 2.12.12
-Requires: gtk+-${target}-2.0 atk cairo
-Cflags: -I${includedir}/gtk-unix-print-2.0
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gtk+-x11-2.0.pc b/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gtk+-x11-2.0.pc
deleted file mode 100644
index 81799bac..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/gtk+-x11-2.0.pc
+++ /dev/null
@@ -1,15 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=${prefix}/include
-target=x11
-
-gtk_binary_version=2.10.0
-gtk_host=x86_64-pc-linux-gnu
-
-Name: GTK+
-Description: GIMP Tool Kit (${target} target)
-Version: 2.12.12
-Requires: gdk-${target}-2.0 atk cairo
-Libs: -L${libdir} -lgtk-${target}-2.0 
-Cflags: -I${includedir}/gtk-2.0 
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/pango.pc b/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/pango.pc
deleted file mode 100644
index 7dfc2aaa..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/pango.pc
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=${prefix}/include
-
-pango_module_version=1.6.0
-
-Name: Pango
-Description: Internationalized text handling
-Version: 1.20.5
-Requires: glib-2.0,gobject-2.0,gmodule-no-export-2.0
-Libs: -L${libdir} -lpango-1.0 
-Cflags: -I${includedir}/pango-1.0
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/pangocairo.pc b/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/pangocairo.pc
deleted file mode 100644
index ade47757..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/pangocairo.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=${prefix}/include
-
-Name: Pango Cairo
-Description: Cairo rendering support for Pango
-Version: 1.20.5
-Requires: pango cairo 
-Libs: -L${libdir} -lpangocairo-1.0
-Cflags: -I${includedir}/pango-1.0
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/pangoft2.pc b/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/pangoft2.pc
deleted file mode 100644
index 22b928e4..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/pangoft2.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=${prefix}/include
-
-Name: Pango FT2 and Pango Fc
-Description: Freetype 2.0 and fontconfig font support for Pango
-Version: 1.20.5
-Requires: pango freetype2 fontconfig
-Libs: -L${libdir} -lpangoft2-1.0
-Cflags: -I${includedir}/pango-1.0
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/pangox.pc b/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/pangox.pc
deleted file mode 100644
index 0bd5c465..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/pangox.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=${prefix}/include
-
-Name: Pango X
-Description: X Window System font support for Pango
-Version: 1.20.5
-Requires: pango
-Libs: -L${libdir} -lpangox-1.0  -lX11
-Cflags: -I${includedir}/pango-1.0 
diff --git a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/pangoxft.pc b/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/pangoxft.pc
deleted file mode 100644
index f8beac91..00000000
--- a/lib-x86-64/gtk-2.12.12/usr/lib/pkgconfig/pangoxft.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=${prefix}/include
-
-Name: Pango Xft
-Description: Xft font support for Pango
-Version: 1.20.5
-Requires: pango pangoft2 xft
-Libs: -L${libdir} -lpangoxft-1.0
-Cflags: -I${includedir}/pango-1.0
diff --git a/lib-x86-64/include/FLAC/all.h b/lib-x86-64/include/FLAC/all.h
deleted file mode 100644
index c542c0d5..00000000
--- a/lib-x86-64/include/FLAC/all.h
+++ /dev/null
@@ -1,370 +0,0 @@
-/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007  Josh Coalson
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - 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.
- *
- * - Neither the name of the Xiph.org Foundation nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * 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 FOUNDATION 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 FLAC__ALL_H
-#define FLAC__ALL_H
-
-#include "export.h"
-
-#include "assert.h"
-#include "callback.h"
-#include "format.h"
-#include "metadata.h"
-#include "ordinals.h"
-#include "stream_decoder.h"
-#include "stream_encoder.h"
-
-/** \mainpage
- *
- * \section intro Introduction
- *
- * This is the documentation for the FLAC C and C++ APIs.  It is
- * highly interconnected; this introduction should give you a top
- * level idea of the structure and how to find the information you
- * need.  As a prerequisite you should have at least a basic
- * knowledge of the FLAC format, documented
- * <A HREF="../format.html">here</A>.
- *
- * \section c_api FLAC C API
- *
- * The FLAC C API is the interface to libFLAC, a set of structures
- * describing the components of FLAC streams, and functions for
- * encoding and decoding streams, as well as manipulating FLAC
- * metadata in files.  The public include files will be installed
- * in your include area (for example /usr/include/FLAC/...).
- *
- * By writing a little code and linking against libFLAC, it is
- * relatively easy to add FLAC support to another program.  The
- * library is licensed under <A HREF="../license.html">Xiph's BSD license</A>.
- * Complete source code of libFLAC as well as the command-line
- * encoder and plugins is available and is a useful source of
- * examples.
- *
- * Aside from encoders and decoders, libFLAC provides a powerful
- * metadata interface for manipulating metadata in FLAC files.  It
- * allows the user to add, delete, and modify FLAC metadata blocks
- * and it can automatically take advantage of PADDING blocks to avoid
- * rewriting the entire FLAC file when changing the size of the
- * metadata.
- *
- * libFLAC usually only requires the standard C library and C math
- * library. In particular, threading is not used so there is no
- * dependency on a thread library. However, libFLAC does not use
- * global variables and should be thread-safe.
- *
- * libFLAC also supports encoding to and decoding from Ogg FLAC.
- * However the metadata editing interfaces currently have limited
- * read-only support for Ogg FLAC files.
- *
- * \section cpp_api FLAC C++ API
- *
- * The FLAC C++ API is a set of classes that encapsulate the
- * structures and functions in libFLAC.  They provide slightly more
- * functionality with respect to metadata but are otherwise
- * equivalent.  For the most part, they share the same usage as
- * their counterparts in libFLAC, and the FLAC C API documentation
- * can be used as a supplement.  The public include files
- * for the C++ API will be installed in your include area (for
- * example /usr/include/FLAC++/...).
- *
- * libFLAC++ is also licensed under
- * <A HREF="../license.html">Xiph's BSD license</A>.
- *
- * \section getting_started Getting Started
- *
- * A good starting point for learning the API is to browse through
- * the <A HREF="modules.html">modules</A>.  Modules are logical
- * groupings of related functions or classes, which correspond roughly
- * to header files or sections of header files.  Each module includes a
- * detailed description of the general usage of its functions or
- * classes.
- *
- * From there you can go on to look at the documentation of
- * individual functions.  You can see different views of the individual
- * functions through the links in top bar across this page.
- *
- * If you prefer a more hands-on approach, you can jump right to some
- * <A HREF="../documentation_example_code.html">example code</A>.
- *
- * \section porting_guide Porting Guide
- *
- * Starting with FLAC 1.1.3 a \link porting Porting Guide \endlink
- * has been introduced which gives detailed instructions on how to
- * port your code to newer versions of FLAC.
- *
- * \section embedded_developers Embedded Developers
- *
- * libFLAC has grown larger over time as more functionality has been
- * included, but much of it may be unnecessary for a particular embedded
- * implementation.  Unused parts may be pruned by some simple editing of
- * src/libFLAC/Makefile.am.  In general, the decoders, encoders, and
- * metadata interface are all independent from each other.
- *
- * It is easiest to just describe the dependencies:
- *
- * - All modules depend on the \link flac_format Format \endlink module.
- * - The decoders and encoders depend on the bitbuffer.
- * - The decoder is independent of the encoder.  The encoder uses the
- *   decoder because of the verify feature, but this can be removed if
- *   not needed.
- * - Parts of the metadata interface require the stream decoder (but not
- *   the encoder).
- * - Ogg support is selectable through the compile time macro
- *   \c FLAC__HAS_OGG.
- *
- * For example, if your application only requires the stream decoder, no
- * encoder, and no metadata interface, you can remove the stream encoder
- * and the metadata interface, which will greatly reduce the size of the
- * library.
- *
- * Also, there are several places in the libFLAC code with comments marked
- * with "OPT:" where a #define can be changed to enable code that might be
- * faster on a specific platform.  Experimenting with these can yield faster
- * binaries.
- */
-
-/** \defgroup porting Porting Guide for New Versions
- *
- * This module describes differences in the library interfaces from
- * version to version.  It assists in the porting of code that uses
- * the libraries to newer versions of FLAC.
- *
- * One simple facility for making porting easier that has been added
- * in FLAC 1.1.3 is a set of \c #defines in \c export.h of each
- * library's includes (e.g. \c include/FLAC/export.h).  The
- * \c #defines mirror the libraries'
- * <A HREF="http://www.gnu.org/software/libtool/manual.html#Libtool-versioning">libtool version numbers</A>,
- * e.g. in libFLAC there are \c FLAC_API_VERSION_CURRENT,
- * \c FLAC_API_VERSION_REVISION, and \c FLAC_API_VERSION_AGE.
- * These can be used to support multiple versions of an API during the
- * transition phase, e.g.
- *
- * \code
- * #if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7
- *   legacy code
- * #else
- *   new code
- * #endif
- * \endcode
- *
- * The the source will work for multiple versions and the legacy code can
- * easily be removed when the transition is complete.
- *
- * Another available symbol is FLAC_API_SUPPORTS_OGG_FLAC (defined in
- * include/FLAC/export.h), which can be used to determine whether or not
- * the library has been compiled with support for Ogg FLAC.  This is
- * simpler than trying to call an Ogg init function and catching the
- * error.
- */
-
-/** \defgroup porting_1_1_2_to_1_1_3 Porting from FLAC 1.1.2 to 1.1.3
- *  \ingroup porting
- *
- *  \brief
- *  This module describes porting from FLAC 1.1.2 to FLAC 1.1.3.
- *
- * The main change between the APIs in 1.1.2 and 1.1.3 is that they have
- * been simplified.  First, libOggFLAC has been merged into libFLAC and
- * libOggFLAC++ has been merged into libFLAC++.  Second, both the three
- * decoding layers and three encoding layers have been merged into a
- * single stream decoder and stream encoder.  That is, the functionality
- * of FLAC__SeekableStreamDecoder and FLAC__FileDecoder has been merged
- * into FLAC__StreamDecoder, and FLAC__SeekableStreamEncoder and
- * FLAC__FileEncoder into FLAC__StreamEncoder.  Only the
- * FLAC__StreamDecoder and FLAC__StreamEncoder remain.  What this means
- * is there is now a single API that can be used to encode or decode
- * streams to/from native FLAC or Ogg FLAC and the single API can work
- * on both seekable and non-seekable streams.
- *
- * Instead of creating an encoder or decoder of a certain layer, now the
- * client will always create a FLAC__StreamEncoder or
- * FLAC__StreamDecoder.  The old layers are now differentiated by the
- * initialization function.  For example, for the decoder,
- * FLAC__stream_decoder_init() has been replaced by
- * FLAC__stream_decoder_init_stream().  This init function takes
- * callbacks for the I/O, and the seeking callbacks are optional.  This
- * allows the client to use the same object for seekable and
- * non-seekable streams.  For decoding a FLAC file directly, the client
- * can use FLAC__stream_decoder_init_file() and pass just a filename
- * and fewer callbacks; most of the other callbacks are supplied
- * internally.  For situations where fopen()ing by filename is not
- * possible (e.g. Unicode filenames on Windows) the client can instead
- * open the file itself and supply the FILE* to
- * FLAC__stream_decoder_init_FILE().  The init functions now returns a
- * FLAC__StreamDecoderInitStatus instead of FLAC__StreamDecoderState.
- * Since the callbacks and client data are now passed to the init
- * function, the FLAC__stream_decoder_set_*_callback() functions and
- * FLAC__stream_decoder_set_client_data() are no longer needed.  The
- * rest of the calls to the decoder are the same as before.
- *
- * There are counterpart init functions for Ogg FLAC, e.g.
- * FLAC__stream_decoder_init_ogg_stream().  All the rest of the calls
- * and callbacks are the same as for native FLAC.
- *
- * As an example, in FLAC 1.1.2 a seekable stream decoder would have
- * been set up like so:
- *
- * \code
- * FLAC__SeekableStreamDecoder *decoder = FLAC__seekable_stream_decoder_new();
- * if(decoder == NULL) do_something;
- * FLAC__seekable_stream_decoder_set_md5_checking(decoder, true);
- * [... other settings ...]
- * FLAC__seekable_stream_decoder_set_read_callback(decoder, my_read_callback);
- * FLAC__seekable_stream_decoder_set_seek_callback(decoder, my_seek_callback);
- * FLAC__seekable_stream_decoder_set_tell_callback(decoder, my_tell_callback);
- * FLAC__seekable_stream_decoder_set_length_callback(decoder, my_length_callback);
- * FLAC__seekable_stream_decoder_set_eof_callback(decoder, my_eof_callback);
- * FLAC__seekable_stream_decoder_set_write_callback(decoder, my_write_callback);
- * FLAC__seekable_stream_decoder_set_metadata_callback(decoder, my_metadata_callback);
- * FLAC__seekable_stream_decoder_set_error_callback(decoder, my_error_callback);
- * FLAC__seekable_stream_decoder_set_client_data(decoder, my_client_data);
- * if(FLAC__seekable_stream_decoder_init(decoder) != FLAC__SEEKABLE_STREAM_DECODER_OK) do_something;
- * \endcode
- *
- * In FLAC 1.1.3 it is like this:
- *
- * \code
- * FLAC__StreamDecoder *decoder = FLAC__stream_decoder_new();
- * if(decoder == NULL) do_something;
- * FLAC__stream_decoder_set_md5_checking(decoder, true);
- * [... other settings ...]
- * if(FLAC__stream_decoder_init_stream(
- *   decoder,
- *   my_read_callback,
- *   my_seek_callback,      // or NULL
- *   my_tell_callback,      // or NULL
- *   my_length_callback,    // or NULL
- *   my_eof_callback,       // or NULL
- *   my_write_callback,
- *   my_metadata_callback,  // or NULL
- *   my_error_callback,
- *   my_client_data
- * ) != FLAC__STREAM_DECODER_INIT_STATUS_OK) do_something;
- * \endcode
- *
- * or you could do;
- *
- * \code
- * [...]
- * FILE *file = fopen("somefile.flac","rb");
- * if(file == NULL) do_somthing;
- * if(FLAC__stream_decoder_init_FILE(
- *   decoder,
- *   file,
- *   my_write_callback,
- *   my_metadata_callback,  // or NULL
- *   my_error_callback,
- *   my_client_data
- * ) != FLAC__STREAM_DECODER_INIT_STATUS_OK) do_something;
- * \endcode
- *
- * or just:
- *
- * \code
- * [...]
- * if(FLAC__stream_decoder_init_file(
- *   decoder,
- *   "somefile.flac",
- *   my_write_callback,
- *   my_metadata_callback,  // or NULL
- *   my_error_callback,
- *   my_client_data
- * ) != FLAC__STREAM_DECODER_INIT_STATUS_OK) do_something;
- * \endcode
- *
- * Another small change to the decoder is in how it handles unparseable
- * streams.  Before, when the decoder found an unparseable stream
- * (reserved for when the decoder encounters a stream from a future
- * encoder that it can't parse), it changed the state to
- * \c FLAC__STREAM_DECODER_UNPARSEABLE_STREAM.  Now the decoder instead
- * drops sync and calls the error callback with a new error code
- * \c FLAC__STREAM_DECODER_ERROR_STATUS_UNPARSEABLE_STREAM.  This is
- * more robust.  If your error callback does not discriminate on the the
- * error state, your code does not need to be changed.
- *
- * The encoder now has a new setting:
- * FLAC__stream_encoder_set_apodization().  This is for setting the
- * method used to window the data before LPC analysis.  You only need to
- * add a call to this function if the default is not suitable.   There
- * are also two new convenience functions that may be useful:
- * FLAC__metadata_object_cuesheet_calculate_cddb_id() and
- * FLAC__metadata_get_cuesheet().
- *
- * The \a bytes parameter to FLAC__StreamDecoderReadCallback,
- * FLAC__StreamEncoderReadCallback, and FLAC__StreamEncoderWriteCallback
- * is now \c size_t instead of \c unsigned.
- */
-
-/** \defgroup porting_1_1_3_to_1_1_4 Porting from FLAC 1.1.3 to 1.1.4
- *  \ingroup porting
- *
- *  \brief
- *  This module describes porting from FLAC 1.1.3 to FLAC 1.1.4.
- *
- * There were no changes to any of the interfaces from 1.1.3 to 1.1.4.
- * There was a slight change in the implementation of
- * FLAC__stream_encoder_set_metadata(); the function now makes a copy
- * of the \a metadata array of pointers so the client no longer needs
- * to maintain it after the call.  The objects themselves that are
- * pointed to by the array are still not copied though and must be
- * maintained until the call to FLAC__stream_encoder_finish().
- */
-
-/** \defgroup porting_1_1_4_to_1_2_0 Porting from FLAC 1.1.4 to 1.2.0
- *  \ingroup porting
- *
- *  \brief
- *  This module describes porting from FLAC 1.1.4 to FLAC 1.2.0.
- *
- * There were only very minor changes to the interfaces from 1.1.4 to 1.2.0.
- * In libFLAC, \c FLAC__format_sample_rate_is_subset() was added.
- * In libFLAC++, \c FLAC::Decoder::Stream::get_decode_position() was added.
- *
- * Finally, value of the constant \c FLAC__FRAME_HEADER_RESERVED_LEN
- * has changed to reflect the conversion of one of the reserved bits
- * into active use.  It used to be \c 2 and now is \c 1.  However the
- * FLAC frame header length has not changed, so to skip the proper
- * number of bits, use \c FLAC__FRAME_HEADER_RESERVED_LEN +
- * \c FLAC__FRAME_HEADER_BLOCKING_STRATEGY_LEN
- */
-
-/** \defgroup flac FLAC C API
- *
- * The FLAC C API is the interface to libFLAC, a set of structures
- * describing the components of FLAC streams, and functions for
- * encoding and decoding streams, as well as manipulating FLAC
- * metadata in files.
- *
- * You should start with the format components as all other modules
- * are dependent on it.
- */
-
-#endif
diff --git a/lib-x86-64/include/FLAC/assert.h b/lib-x86-64/include/FLAC/assert.h
deleted file mode 100644
index 3fc03f31..00000000
--- a/lib-x86-64/include/FLAC/assert.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2001,2002,2003,2004,2005,2006,2007  Josh Coalson
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - 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.
- *
- * - Neither the name of the Xiph.org Foundation nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * 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 FOUNDATION 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 FLAC__ASSERT_H
-#define FLAC__ASSERT_H
-
-/* we need this since some compilers (like MSVC) leave assert()s on release code (and we don't want to use their ASSERT) */
-#ifdef DEBUG
-#include <assert.h>
-#define FLAC__ASSERT(x) assert(x)
-#define FLAC__ASSERT_DECLARATION(x) x
-#else
-#define FLAC__ASSERT(x)
-#define FLAC__ASSERT_DECLARATION(x)
-#endif
-
-#endif
diff --git a/lib-x86-64/include/FLAC/callback.h b/lib-x86-64/include/FLAC/callback.h
deleted file mode 100644
index c9541210..00000000
--- a/lib-x86-64/include/FLAC/callback.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2004,2005,2006,2007  Josh Coalson
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - 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.
- *
- * - Neither the name of the Xiph.org Foundation nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * 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 FOUNDATION 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 FLAC__CALLBACK_H
-#define FLAC__CALLBACK_H
-
-#include "ordinals.h"
-#include <stdlib.h> /* for size_t */
-
-/** \file include/FLAC/callback.h
- *
- *  \brief
- *  This module defines the structures for describing I/O callbacks
- *  to the other FLAC interfaces.
- *
- *  See the detailed documentation for callbacks in the
- *  \link flac_callbacks callbacks \endlink module.
- */
-
-/** \defgroup flac_callbacks FLAC/callback.h: I/O callback structures
- *  \ingroup flac
- *
- *  \brief
- *  This module defines the structures for describing I/O callbacks
- *  to the other FLAC interfaces.
- *
- *  The purpose of the I/O callback functions is to create a common way
- *  for the metadata interfaces to handle I/O.
- *
- *  Originally the metadata interfaces required filenames as the way of
- *  specifying FLAC files to operate on.  This is problematic in some
- *  environments so there is an additional option to specify a set of
- *  callbacks for doing I/O on the FLAC file, instead of the filename.
- *
- *  In addition to the callbacks, a FLAC__IOHandle type is defined as an
- *  opaque structure for a data source.
- *
- *  The callback function prototypes are similar (but not identical) to the
- *  stdio functions fread, fwrite, fseek, ftell, feof, and fclose.  If you use
- *  stdio streams to implement the callbacks, you can pass fread, fwrite, and
- *  fclose anywhere a FLAC__IOCallback_Read, FLAC__IOCallback_Write, or
- *  FLAC__IOCallback_Close is required, and a FILE* anywhere a FLAC__IOHandle
- *  is required.  \warning You generally CANNOT directly use fseek or ftell
- *  for FLAC__IOCallback_Seek or FLAC__IOCallback_Tell since on most systems
- *  these use 32-bit offsets and FLAC requires 64-bit offsets to deal with
- *  large files.  You will have to find an equivalent function (e.g. ftello),
- *  or write a wrapper.  The same is true for feof() since this is usually
- *  implemented as a macro, not as a function whose address can be taken.
- *
- * \{
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** This is the opaque handle type used by the callbacks.  Typically
- *  this is a \c FILE* or address of a file descriptor.
- */
-typedef void* FLAC__IOHandle;
-
-/** Signature for the read callback.
- *  The signature and semantics match POSIX fread() implementations
- *  and can generally be used interchangeably.
- *
- * \param  ptr      The address of the read buffer.
- * \param  size     The size of the records to be read.
- * \param  nmemb    The number of records to be read.
- * \param  handle   The handle to the data source.
- * \retval size_t
- *    The number of records read.
- */
-typedef size_t (*FLAC__IOCallback_Read) (void *ptr, size_t size, size_t nmemb, FLAC__IOHandle handle);
-
-/** Signature for the write callback.
- *  The signature and semantics match POSIX fwrite() implementations
- *  and can generally be used interchangeably.
- *
- * \param  ptr      The address of the write buffer.
- * \param  size     The size of the records to be written.
- * \param  nmemb    The number of records to be written.
- * \param  handle   The handle to the data source.
- * \retval size_t
- *    The number of records written.
- */
-typedef size_t (*FLAC__IOCallback_Write) (const void *ptr, size_t size, size_t nmemb, FLAC__IOHandle handle);
-
-/** Signature for the seek callback.
- *  The signature and semantics mostly match POSIX fseek() WITH ONE IMPORTANT
- *  EXCEPTION: the offset is a 64-bit type whereas fseek() is generally 'long'
- *  and 32-bits wide.
- *
- * \param  handle   The handle to the data source.
- * \param  offset   The new position, relative to \a whence
- * \param  whence   \c SEEK_SET, \c SEEK_CUR, or \c SEEK_END
- * \retval int
- *    \c 0 on success, \c -1 on error.
- */
-typedef int (*FLAC__IOCallback_Seek) (FLAC__IOHandle handle, FLAC__int64 offset, int whence);
-
-/** Signature for the tell callback.
- *  The signature and semantics mostly match POSIX ftell() WITH ONE IMPORTANT
- *  EXCEPTION: the offset is a 64-bit type whereas ftell() is generally 'long'
- *  and 32-bits wide.
- *
- * \param  handle   The handle to the data source.
- * \retval FLAC__int64
- *    The current position on success, \c -1 on error.
- */
-typedef FLAC__int64 (*FLAC__IOCallback_Tell) (FLAC__IOHandle handle);
-
-/** Signature for the EOF callback.
- *  The signature and semantics mostly match POSIX feof() but WATCHOUT:
- *  on many systems, feof() is a macro, so in this case a wrapper function
- *  must be provided instead.
- *
- * \param  handle   The handle to the data source.
- * \retval int
- *    \c 0 if not at end of file, nonzero if at end of file.
- */
-typedef int (*FLAC__IOCallback_Eof) (FLAC__IOHandle handle);
-
-/** Signature for the close callback.
- *  The signature and semantics match POSIX fclose() implementations
- *  and can generally be used interchangeably.
- *
- * \param  handle   The handle to the data source.
- * \retval int
- *    \c 0 on success, \c EOF on error.
- */
-typedef int (*FLAC__IOCallback_Close) (FLAC__IOHandle handle);
-
-/** A structure for holding a set of callbacks.
- *  Each FLAC interface that requires a FLAC__IOCallbacks structure will
- *  describe which of the callbacks are required.  The ones that are not
- *  required may be set to NULL.
- *
- *  If the seek requirement for an interface is optional, you can signify that
- *  a data sorce is not seekable by setting the \a seek field to \c NULL.
- */
-typedef struct {
-	FLAC__IOCallback_Read read;
-	FLAC__IOCallback_Write write;
-	FLAC__IOCallback_Seek seek;
-	FLAC__IOCallback_Tell tell;
-	FLAC__IOCallback_Eof eof;
-	FLAC__IOCallback_Close close;
-} FLAC__IOCallbacks;
-
-/* \} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib-x86-64/include/FLAC/export.h b/lib-x86-64/include/FLAC/export.h
deleted file mode 100644
index a525f29c..00000000
--- a/lib-x86-64/include/FLAC/export.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007  Josh Coalson
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - 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.
- *
- * - Neither the name of the Xiph.org Foundation nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * 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 FOUNDATION 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 FLAC__EXPORT_H
-#define FLAC__EXPORT_H
-
-/** \file include/FLAC/export.h
- *
- *  \brief
- *  This module contains #defines and symbols for exporting function
- *  calls, and providing version information and compiled-in features.
- *
- *  See the \link flac_export export \endlink module.
- */
-
-/** \defgroup flac_export FLAC/export.h: export symbols
- *  \ingroup flac
- *
- *  \brief
- *  This module contains #defines and symbols for exporting function
- *  calls, and providing version information and compiled-in features.
- *
- *  If you are compiling with MSVC and will link to the static library
- *  (libFLAC.lib) you should define FLAC__NO_DLL in your project to
- *  make sure the symbols are exported properly.
- *
- * \{
- */
-
-#if defined(FLAC__NO_DLL) || !defined(_MSC_VER)
-#define FLAC_API
-
-#else
-
-#ifdef FLAC_API_EXPORTS
-#define	FLAC_API	_declspec(dllexport)
-#else
-#define FLAC_API	_declspec(dllimport)
-
-#endif
-#endif
-
-/** These #defines will mirror the libtool-based library version number, see
- * http://www.gnu.org/software/libtool/manual.html#Libtool-versioning
- */
-#define FLAC_API_VERSION_CURRENT 10
-#define FLAC_API_VERSION_REVISION 0 /**< see above */
-#define FLAC_API_VERSION_AGE 2 /**< see above */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** \c 1 if the library has been compiled with support for Ogg FLAC, else \c 0. */
-extern FLAC_API int FLAC_API_SUPPORTS_OGG_FLAC;
-
-#ifdef __cplusplus
-}
-#endif
-
-/* \} */
-
-#endif
diff --git a/lib-x86-64/include/FLAC/format.h b/lib-x86-64/include/FLAC/format.h
deleted file mode 100644
index 77e2d013..00000000
--- a/lib-x86-64/include/FLAC/format.h
+++ /dev/null
@@ -1,1010 +0,0 @@
-/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007  Josh Coalson
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - 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.
- *
- * - Neither the name of the Xiph.org Foundation nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * 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 FOUNDATION 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 FLAC__FORMAT_H
-#define FLAC__FORMAT_H
-
-#include "export.h"
-#include "ordinals.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** \file include/FLAC/format.h
- *
- *  \brief
- *  This module contains structure definitions for the representation
- *  of FLAC format components in memory.  These are the basic
- *  structures used by the rest of the interfaces.
- *
- *  See the detailed documentation in the
- *  \link flac_format format \endlink module.
- */
-
-/** \defgroup flac_format FLAC/format.h: format components
- *  \ingroup flac
- *
- *  \brief
- *  This module contains structure definitions for the representation
- *  of FLAC format components in memory.  These are the basic
- *  structures used by the rest of the interfaces.
- *
- *  First, you should be familiar with the
- *  <A HREF="../format.html">FLAC format</A>.  Many of the values here
- *  follow directly from the specification.  As a user of libFLAC, the
- *  interesting parts really are the structures that describe the frame
- *  header and metadata blocks.
- *
- *  The format structures here are very primitive, designed to store
- *  information in an efficient way.  Reading information from the
- *  structures is easy but creating or modifying them directly is
- *  more complex.  For the most part, as a user of a library, editing
- *  is not necessary; however, for metadata blocks it is, so there are
- *  convenience functions provided in the \link flac_metadata metadata
- *  module \endlink to simplify the manipulation of metadata blocks.
- *
- * \note
- * It's not the best convention, but symbols ending in _LEN are in bits
- * and _LENGTH are in bytes.  _LENGTH symbols are \#defines instead of
- * global variables because they are usually used when declaring byte
- * arrays and some compilers require compile-time knowledge of array
- * sizes when declared on the stack.
- *
- * \{
- */
-
-
-/*
-	Most of the values described in this file are defined by the FLAC
-	format specification.  There is nothing to tune here.
-*/
-
-/** The largest legal metadata type code. */
-#define FLAC__MAX_METADATA_TYPE_CODE (126u)
-
-/** The minimum block size, in samples, permitted by the format. */
-#define FLAC__MIN_BLOCK_SIZE (16u)
-
-/** The maximum block size, in samples, permitted by the format. */
-#define FLAC__MAX_BLOCK_SIZE (65535u)
-
-/** The maximum block size, in samples, permitted by the FLAC subset for
- *  sample rates up to 48kHz. */
-#define FLAC__SUBSET_MAX_BLOCK_SIZE_48000HZ (4608u)
-
-/** The maximum number of channels permitted by the format. */
-#define FLAC__MAX_CHANNELS (8u)
-
-/** The minimum sample resolution permitted by the format. */
-#define FLAC__MIN_BITS_PER_SAMPLE (4u)
-
-/** The maximum sample resolution permitted by the format. */
-#define FLAC__MAX_BITS_PER_SAMPLE (32u)
-
-/** The maximum sample resolution permitted by libFLAC.
- *
- * \warning
- * FLAC__MAX_BITS_PER_SAMPLE is the limit of the FLAC format.  However,
- * the reference encoder/decoder is currently limited to 24 bits because
- * of prevalent 32-bit math, so make sure and use this value when
- * appropriate.
- */
-#define FLAC__REFERENCE_CODEC_MAX_BITS_PER_SAMPLE (24u)
-
-/** The maximum sample rate permitted by the format.  The value is
- *  ((2 ^ 16) - 1) * 10; see <A HREF="../format.html">FLAC format</A>
- *  as to why.
- */
-#define FLAC__MAX_SAMPLE_RATE (655350u)
-
-/** The maximum LPC order permitted by the format. */
-#define FLAC__MAX_LPC_ORDER (32u)
-
-/** The maximum LPC order permitted by the FLAC subset for sample rates
- *  up to 48kHz. */
-#define FLAC__SUBSET_MAX_LPC_ORDER_48000HZ (12u)
-
-/** The minimum quantized linear predictor coefficient precision
- *  permitted by the format.
- */
-#define FLAC__MIN_QLP_COEFF_PRECISION (5u)
-
-/** The maximum quantized linear predictor coefficient precision
- *  permitted by the format.
- */
-#define FLAC__MAX_QLP_COEFF_PRECISION (15u)
-
-/** The maximum order of the fixed predictors permitted by the format. */
-#define FLAC__MAX_FIXED_ORDER (4u)
-
-/** The maximum Rice partition order permitted by the format. */
-#define FLAC__MAX_RICE_PARTITION_ORDER (15u)
-
-/** The maximum Rice partition order permitted by the FLAC Subset. */
-#define FLAC__SUBSET_MAX_RICE_PARTITION_ORDER (8u)
-
-/** The version string of the release, stamped onto the libraries and binaries.
- *
- * \note
- * This does not correspond to the shared library version number, which
- * is used to determine binary compatibility.
- */
-extern FLAC_API const char *FLAC__VERSION_STRING;
-
-/** The vendor string inserted by the encoder into the VORBIS_COMMENT block.
- *  This is a NUL-terminated ASCII string; when inserted into the
- *  VORBIS_COMMENT the trailing null is stripped.
- */
-extern FLAC_API const char *FLAC__VENDOR_STRING;
-
-/** The byte string representation of the beginning of a FLAC stream. */
-extern FLAC_API const FLAC__byte FLAC__STREAM_SYNC_STRING[4]; /* = "fLaC" */
-
-/** The 32-bit integer big-endian representation of the beginning of
- *  a FLAC stream.
- */
-extern FLAC_API const unsigned FLAC__STREAM_SYNC; /* = 0x664C6143 */
-
-/** The length of the FLAC signature in bits. */
-extern FLAC_API const unsigned FLAC__STREAM_SYNC_LEN; /* = 32 bits */
-
-/** The length of the FLAC signature in bytes. */
-#define FLAC__STREAM_SYNC_LENGTH (4u)
-
-
-/*****************************************************************************
- *
- * Subframe structures
- *
- *****************************************************************************/
-
-/*****************************************************************************/
-
-/** An enumeration of the available entropy coding methods. */
-typedef enum {
-	FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE = 0,
-	/**< Residual is coded by partitioning into contexts, each with it's own
-	 * 4-bit Rice parameter. */
-
-	FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2 = 1
-	/**< Residual is coded by partitioning into contexts, each with it's own
-	 * 5-bit Rice parameter. */
-} FLAC__EntropyCodingMethodType;
-
-/** Maps a FLAC__EntropyCodingMethodType to a C string.
- *
- *  Using a FLAC__EntropyCodingMethodType as the index to this array will
- *  give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__EntropyCodingMethodTypeString[];
-
-
-/** Contents of a Rice partitioned residual
- */
-typedef struct {
-
-	unsigned *parameters;
-	/**< The Rice parameters for each context. */
-
-	unsigned *raw_bits;
-	/**< Widths for escape-coded partitions.  Will be non-zero for escaped
-	 * partitions and zero for unescaped partitions.
-	 */
-
-	unsigned capacity_by_order;
-	/**< The capacity of the \a parameters and \a raw_bits arrays
-	 * specified as an order, i.e. the number of array elements
-	 * allocated is 2 ^ \a capacity_by_order.
-	 */
-} FLAC__EntropyCodingMethod_PartitionedRiceContents;
-
-/** Header for a Rice partitioned residual.  (c.f. <A HREF="../format.html#partitioned_rice">format specification</A>)
- */
-typedef struct {
-
-	unsigned order;
-	/**< The partition order, i.e. # of contexts = 2 ^ \a order. */
-
-	const FLAC__EntropyCodingMethod_PartitionedRiceContents *contents;
-	/**< The context's Rice parameters and/or raw bits. */
-
-} FLAC__EntropyCodingMethod_PartitionedRice;
-
-extern FLAC_API const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_ORDER_LEN; /**< == 4 (bits) */
-extern FLAC_API const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_PARAMETER_LEN; /**< == 4 (bits) */
-extern FLAC_API const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2_PARAMETER_LEN; /**< == 5 (bits) */
-extern FLAC_API const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_RAW_LEN; /**< == 5 (bits) */
-
-extern FLAC_API const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_ESCAPE_PARAMETER;
-/**< == (1<<FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_PARAMETER_LEN)-1 */
-extern FLAC_API const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2_ESCAPE_PARAMETER;
-/**< == (1<<FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2_PARAMETER_LEN)-1 */
-
-/** Header for the entropy coding method.  (c.f. <A HREF="../format.html#residual">format specification</A>)
- */
-typedef struct {
-	FLAC__EntropyCodingMethodType type;
-	union {
-		FLAC__EntropyCodingMethod_PartitionedRice partitioned_rice;
-	} data;
-} FLAC__EntropyCodingMethod;
-
-extern FLAC_API const unsigned FLAC__ENTROPY_CODING_METHOD_TYPE_LEN; /**< == 2 (bits) */
-
-/*****************************************************************************/
-
-/** An enumeration of the available subframe types. */
-typedef enum {
-	FLAC__SUBFRAME_TYPE_CONSTANT = 0, /**< constant signal */
-	FLAC__SUBFRAME_TYPE_VERBATIM = 1, /**< uncompressed signal */
-	FLAC__SUBFRAME_TYPE_FIXED = 2, /**< fixed polynomial prediction */
-	FLAC__SUBFRAME_TYPE_LPC = 3 /**< linear prediction */
-} FLAC__SubframeType;
-
-/** Maps a FLAC__SubframeType to a C string.
- *
- *  Using a FLAC__SubframeType as the index to this array will
- *  give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__SubframeTypeString[];
-
-
-/** CONSTANT subframe.  (c.f. <A HREF="../format.html#subframe_constant">format specification</A>)
- */
-typedef struct {
-	FLAC__int32 value; /**< The constant signal value. */
-} FLAC__Subframe_Constant;
-
-
-/** VERBATIM subframe.  (c.f. <A HREF="../format.html#subframe_verbatim">format specification</A>)
- */
-typedef struct {
-	const FLAC__int32 *data; /**< A pointer to verbatim signal. */
-} FLAC__Subframe_Verbatim;
-
-
-/** FIXED subframe.  (c.f. <A HREF="../format.html#subframe_fixed">format specification</A>)
- */
-typedef struct {
-	FLAC__EntropyCodingMethod entropy_coding_method;
-	/**< The residual coding method. */
-
-	unsigned order;
-	/**< The polynomial order. */
-
-	FLAC__int32 warmup[FLAC__MAX_FIXED_ORDER];
-	/**< Warmup samples to prime the predictor, length == order. */
-
-	const FLAC__int32 *residual;
-	/**< The residual signal, length == (blocksize minus order) samples. */
-} FLAC__Subframe_Fixed;
-
-
-/** LPC subframe.  (c.f. <A HREF="../format.html#subframe_lpc">format specification</A>)
- */
-typedef struct {
-	FLAC__EntropyCodingMethod entropy_coding_method;
-	/**< The residual coding method. */
-
-	unsigned order;
-	/**< The FIR order. */
-
-	unsigned qlp_coeff_precision;
-	/**< Quantized FIR filter coefficient precision in bits. */
-
-	int quantization_level;
-	/**< The qlp coeff shift needed. */
-
-	FLAC__int32 qlp_coeff[FLAC__MAX_LPC_ORDER];
-	/**< FIR filter coefficients. */
-
-	FLAC__int32 warmup[FLAC__MAX_LPC_ORDER];
-	/**< Warmup samples to prime the predictor, length == order. */
-
-	const FLAC__int32 *residual;
-	/**< The residual signal, length == (blocksize minus order) samples. */
-} FLAC__Subframe_LPC;
-
-extern FLAC_API const unsigned FLAC__SUBFRAME_LPC_QLP_COEFF_PRECISION_LEN; /**< == 4 (bits) */
-extern FLAC_API const unsigned FLAC__SUBFRAME_LPC_QLP_SHIFT_LEN; /**< == 5 (bits) */
-
-
-/** FLAC subframe structure.  (c.f. <A HREF="../format.html#subframe">format specification</A>)
- */
-typedef struct {
-	FLAC__SubframeType type;
-	union {
-		FLAC__Subframe_Constant constant;
-		FLAC__Subframe_Fixed fixed;
-		FLAC__Subframe_LPC lpc;
-		FLAC__Subframe_Verbatim verbatim;
-	} data;
-	unsigned wasted_bits;
-} FLAC__Subframe;
-
-/** == 1 (bit)
- *
- * This used to be a zero-padding bit (hence the name
- * FLAC__SUBFRAME_ZERO_PAD_LEN) but is now a reserved bit.  It still has a
- * mandatory value of \c 0 but in the future may take on the value \c 0 or \c 1
- * to mean something else.
- */
-extern FLAC_API const unsigned FLAC__SUBFRAME_ZERO_PAD_LEN;
-extern FLAC_API const unsigned FLAC__SUBFRAME_TYPE_LEN; /**< == 6 (bits) */
-extern FLAC_API const unsigned FLAC__SUBFRAME_WASTED_BITS_FLAG_LEN; /**< == 1 (bit) */
-
-extern FLAC_API const unsigned FLAC__SUBFRAME_TYPE_CONSTANT_BYTE_ALIGNED_MASK; /**< = 0x00 */
-extern FLAC_API const unsigned FLAC__SUBFRAME_TYPE_VERBATIM_BYTE_ALIGNED_MASK; /**< = 0x02 */
-extern FLAC_API const unsigned FLAC__SUBFRAME_TYPE_FIXED_BYTE_ALIGNED_MASK; /**< = 0x10 */
-extern FLAC_API const unsigned FLAC__SUBFRAME_TYPE_LPC_BYTE_ALIGNED_MASK; /**< = 0x40 */
-
-/*****************************************************************************/
-
-
-/*****************************************************************************
- *
- * Frame structures
- *
- *****************************************************************************/
-
-/** An enumeration of the available channel assignments. */
-typedef enum {
-	FLAC__CHANNEL_ASSIGNMENT_INDEPENDENT = 0, /**< independent channels */
-	FLAC__CHANNEL_ASSIGNMENT_LEFT_SIDE = 1, /**< left+side stereo */
-	FLAC__CHANNEL_ASSIGNMENT_RIGHT_SIDE = 2, /**< right+side stereo */
-	FLAC__CHANNEL_ASSIGNMENT_MID_SIDE = 3 /**< mid+side stereo */
-} FLAC__ChannelAssignment;
-
-/** Maps a FLAC__ChannelAssignment to a C string.
- *
- *  Using a FLAC__ChannelAssignment as the index to this array will
- *  give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__ChannelAssignmentString[];
-
-/** An enumeration of the possible frame numbering methods. */
-typedef enum {
-	FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER, /**< number contains the frame number */
-	FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER /**< number contains the sample number of first sample in frame */
-} FLAC__FrameNumberType;
-
-/** Maps a FLAC__FrameNumberType to a C string.
- *
- *  Using a FLAC__FrameNumberType as the index to this array will
- *  give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__FrameNumberTypeString[];
-
-
-/** FLAC frame header structure.  (c.f. <A HREF="../format.html#frame_header">format specification</A>)
- */
-typedef struct {
-	unsigned blocksize;
-	/**< The number of samples per subframe. */
-
-	unsigned sample_rate;
-	/**< The sample rate in Hz. */
-
-	unsigned channels;
-	/**< The number of channels (== number of subframes). */
-
-	FLAC__ChannelAssignment channel_assignment;
-	/**< The channel assignment for the frame. */
-
-	unsigned bits_per_sample;
-	/**< The sample resolution. */
-
-	FLAC__FrameNumberType number_type;
-	/**< The numbering scheme used for the frame.  As a convenience, the
-	 * decoder will always convert a frame number to a sample number because
-	 * the rules are complex. */
-
-	union {
-		FLAC__uint32 frame_number;
-		FLAC__uint64 sample_number;
-	} number;
-	/**< The frame number or sample number of first sample in frame;
-	 * use the \a number_type value to determine which to use. */
-
-	FLAC__uint8 crc;
-	/**< CRC-8 (polynomial = x^8 + x^2 + x^1 + x^0, initialized with 0)
-	 * of the raw frame header bytes, meaning everything before the CRC byte
-	 * including the sync code.
-	 */
-} FLAC__FrameHeader;
-
-extern FLAC_API const unsigned FLAC__FRAME_HEADER_SYNC; /**< == 0x3ffe; the frame header sync code */
-extern FLAC_API const unsigned FLAC__FRAME_HEADER_SYNC_LEN; /**< == 14 (bits) */
-extern FLAC_API const unsigned FLAC__FRAME_HEADER_RESERVED_LEN; /**< == 1 (bits) */
-extern FLAC_API const unsigned FLAC__FRAME_HEADER_BLOCKING_STRATEGY_LEN; /**< == 1 (bits) */
-extern FLAC_API const unsigned FLAC__FRAME_HEADER_BLOCK_SIZE_LEN; /**< == 4 (bits) */
-extern FLAC_API const unsigned FLAC__FRAME_HEADER_SAMPLE_RATE_LEN; /**< == 4 (bits) */
-extern FLAC_API const unsigned FLAC__FRAME_HEADER_CHANNEL_ASSIGNMENT_LEN; /**< == 4 (bits) */
-extern FLAC_API const unsigned FLAC__FRAME_HEADER_BITS_PER_SAMPLE_LEN; /**< == 3 (bits) */
-extern FLAC_API const unsigned FLAC__FRAME_HEADER_ZERO_PAD_LEN; /**< == 1 (bit) */
-extern FLAC_API const unsigned FLAC__FRAME_HEADER_CRC_LEN; /**< == 8 (bits) */
-
-
-/** FLAC frame footer structure.  (c.f. <A HREF="../format.html#frame_footer">format specification</A>)
- */
-typedef struct {
-	FLAC__uint16 crc;
-	/**< CRC-16 (polynomial = x^16 + x^15 + x^2 + x^0, initialized with
-	 * 0) of the bytes before the crc, back to and including the frame header
-	 * sync code.
-	 */
-} FLAC__FrameFooter;
-
-extern FLAC_API const unsigned FLAC__FRAME_FOOTER_CRC_LEN; /**< == 16 (bits) */
-
-
-/** FLAC frame structure.  (c.f. <A HREF="../format.html#frame">format specification</A>)
- */
-typedef struct {
-	FLAC__FrameHeader header;
-	FLAC__Subframe subframes[FLAC__MAX_CHANNELS];
-	FLAC__FrameFooter footer;
-} FLAC__Frame;
-
-/*****************************************************************************/
-
-
-/*****************************************************************************
- *
- * Meta-data structures
- *
- *****************************************************************************/
-
-/** An enumeration of the available metadata block types. */
-typedef enum {
-
-	FLAC__METADATA_TYPE_STREAMINFO = 0,
-	/**< <A HREF="../format.html#metadata_block_streaminfo">STREAMINFO</A> block */
-
-	FLAC__METADATA_TYPE_PADDING = 1,
-	/**< <A HREF="../format.html#metadata_block_padding">PADDING</A> block */
-
-	FLAC__METADATA_TYPE_APPLICATION = 2,
-	/**< <A HREF="../format.html#metadata_block_application">APPLICATION</A> block */
-
-	FLAC__METADATA_TYPE_SEEKTABLE = 3,
-	/**< <A HREF="../format.html#metadata_block_seektable">SEEKTABLE</A> block */
-
-	FLAC__METADATA_TYPE_VORBIS_COMMENT = 4,
-	/**< <A HREF="../format.html#metadata_block_vorbis_comment">VORBISCOMMENT</A> block (a.k.a. FLAC tags) */
-
-	FLAC__METADATA_TYPE_CUESHEET = 5,
-	/**< <A HREF="../format.html#metadata_block_cuesheet">CUESHEET</A> block */
-
-	FLAC__METADATA_TYPE_PICTURE = 6,
-	/**< <A HREF="../format.html#metadata_block_picture">PICTURE</A> block */
-
-	FLAC__METADATA_TYPE_UNDEFINED = 7
-	/**< marker to denote beginning of undefined type range; this number will increase as new metadata types are added */
-
-} FLAC__MetadataType;
-
-/** Maps a FLAC__MetadataType to a C string.
- *
- *  Using a FLAC__MetadataType as the index to this array will
- *  give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__MetadataTypeString[];
-
-
-/** FLAC STREAMINFO structure.  (c.f. <A HREF="../format.html#metadata_block_streaminfo">format specification</A>)
- */
-typedef struct {
-	unsigned min_blocksize, max_blocksize;
-	unsigned min_framesize, max_framesize;
-	unsigned sample_rate;
-	unsigned channels;
-	unsigned bits_per_sample;
-	FLAC__uint64 total_samples;
-	FLAC__byte md5sum[16];
-} FLAC__StreamMetadata_StreamInfo;
-
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_MIN_BLOCK_SIZE_LEN; /**< == 16 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_MAX_BLOCK_SIZE_LEN; /**< == 16 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_MIN_FRAME_SIZE_LEN; /**< == 24 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_MAX_FRAME_SIZE_LEN; /**< == 24 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_SAMPLE_RATE_LEN; /**< == 20 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_CHANNELS_LEN; /**< == 3 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_BITS_PER_SAMPLE_LEN; /**< == 5 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_TOTAL_SAMPLES_LEN; /**< == 36 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_MD5SUM_LEN; /**< == 128 (bits) */
-
-/** The total stream length of the STREAMINFO block in bytes. */
-#define FLAC__STREAM_METADATA_STREAMINFO_LENGTH (34u)
-
-/** FLAC PADDING structure.  (c.f. <A HREF="../format.html#metadata_block_padding">format specification</A>)
- */
-typedef struct {
-	int dummy;
-	/**< Conceptually this is an empty struct since we don't store the
-	 * padding bytes.  Empty structs are not allowed by some C compilers,
-	 * hence the dummy.
-	 */
-} FLAC__StreamMetadata_Padding;
-
-
-/** FLAC APPLICATION structure.  (c.f. <A HREF="../format.html#metadata_block_application">format specification</A>)
- */
-typedef struct {
-	FLAC__byte id[4];
-	FLAC__byte *data;
-} FLAC__StreamMetadata_Application;
-
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_APPLICATION_ID_LEN; /**< == 32 (bits) */
-
-/** SeekPoint structure used in SEEKTABLE blocks.  (c.f. <A HREF="../format.html#seekpoint">format specification</A>)
- */
-typedef struct {
-	FLAC__uint64 sample_number;
-	/**<  The sample number of the target frame. */
-
-	FLAC__uint64 stream_offset;
-	/**< The offset, in bytes, of the target frame with respect to
-	 * beginning of the first frame. */
-
-	unsigned frame_samples;
-	/**< The number of samples in the target frame. */
-} FLAC__StreamMetadata_SeekPoint;
-
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_SEEKPOINT_SAMPLE_NUMBER_LEN; /**< == 64 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_SEEKPOINT_STREAM_OFFSET_LEN; /**< == 64 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_SEEKPOINT_FRAME_SAMPLES_LEN; /**< == 16 (bits) */
-
-/** The total stream length of a seek point in bytes. */
-#define FLAC__STREAM_METADATA_SEEKPOINT_LENGTH (18u)
-
-/** The value used in the \a sample_number field of
- *  FLAC__StreamMetadataSeekPoint used to indicate a placeholder
- *  point (== 0xffffffffffffffff).
- */
-extern FLAC_API const FLAC__uint64 FLAC__STREAM_METADATA_SEEKPOINT_PLACEHOLDER;
-
-
-/** FLAC SEEKTABLE structure.  (c.f. <A HREF="../format.html#metadata_block_seektable">format specification</A>)
- *
- * \note From the format specification:
- * - The seek points must be sorted by ascending sample number.
- * - Each seek point's sample number must be the first sample of the
- *   target frame.
- * - Each seek point's sample number must be unique within the table.
- * - Existence of a SEEKTABLE block implies a correct setting of
- *   total_samples in the stream_info block.
- * - Behavior is undefined when more than one SEEKTABLE block is
- *   present in a stream.
- */
-typedef struct {
-	unsigned num_points;
-	FLAC__StreamMetadata_SeekPoint *points;
-} FLAC__StreamMetadata_SeekTable;
-
-
-/** Vorbis comment entry structure used in VORBIS_COMMENT blocks.  (c.f. <A HREF="../format.html#metadata_block_vorbis_comment">format specification</A>)
- *
- *  For convenience, the APIs maintain a trailing NUL character at the end of
- *  \a entry which is not counted toward \a length, i.e.
- *  \code strlen(entry) == length \endcode
- */
-typedef struct {
-	FLAC__uint32 length;
-	FLAC__byte *entry;
-} FLAC__StreamMetadata_VorbisComment_Entry;
-
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN; /**< == 32 (bits) */
-
-
-/** FLAC VORBIS_COMMENT structure.  (c.f. <A HREF="../format.html#metadata_block_vorbis_comment">format specification</A>)
- */
-typedef struct {
-	FLAC__StreamMetadata_VorbisComment_Entry vendor_string;
-	FLAC__uint32 num_comments;
-	FLAC__StreamMetadata_VorbisComment_Entry *comments;
-} FLAC__StreamMetadata_VorbisComment;
-
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_VORBIS_COMMENT_NUM_COMMENTS_LEN; /**< == 32 (bits) */
-
-
-/** FLAC CUESHEET track index structure.  (See the
- * <A HREF="../format.html#cuesheet_track_index">format specification</A> for
- * the full description of each field.)
- */
-typedef struct {
-	FLAC__uint64 offset;
-	/**< Offset in samples, relative to the track offset, of the index
-	 * point.
-	 */
-
-	FLAC__byte number;
-	/**< The index point number. */
-} FLAC__StreamMetadata_CueSheet_Index;
-
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_INDEX_OFFSET_LEN; /**< == 64 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_INDEX_NUMBER_LEN; /**< == 8 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_INDEX_RESERVED_LEN; /**< == 3*8 (bits) */
-
-
-/** FLAC CUESHEET track structure.  (See the
- * <A HREF="../format.html#cuesheet_track">format specification</A> for
- * the full description of each field.)
- */
-typedef struct {
-	FLAC__uint64 offset;
-	/**< Track offset in samples, relative to the beginning of the FLAC audio stream. */
-
-	FLAC__byte number;
-	/**< The track number. */
-
-	char isrc[13];
-	/**< Track ISRC.  This is a 12-digit alphanumeric code plus a trailing \c NUL byte */
-
-	unsigned type:1;
-	/**< The track type: 0 for audio, 1 for non-audio. */
-
-	unsigned pre_emphasis:1;
-	/**< The pre-emphasis flag: 0 for no pre-emphasis, 1 for pre-emphasis. */
-
-	FLAC__byte num_indices;
-	/**< The number of track index points. */
-
-	FLAC__StreamMetadata_CueSheet_Index *indices;
-	/**< NULL if num_indices == 0, else pointer to array of index points. */
-
-} FLAC__StreamMetadata_CueSheet_Track;
-
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_OFFSET_LEN; /**< == 64 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_NUMBER_LEN; /**< == 8 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_ISRC_LEN; /**< == 12*8 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_TYPE_LEN; /**< == 1 (bit) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_PRE_EMPHASIS_LEN; /**< == 1 (bit) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_RESERVED_LEN; /**< == 6+13*8 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_NUM_INDICES_LEN; /**< == 8 (bits) */
-
-
-/** FLAC CUESHEET structure.  (See the
- * <A HREF="../format.html#metadata_block_cuesheet">format specification</A>
- * for the full description of each field.)
- */
-typedef struct {
-	char media_catalog_number[129];
-	/**< Media catalog number, in ASCII printable characters 0x20-0x7e.  In
-	 * general, the media catalog number may be 0 to 128 bytes long; any
-	 * unused characters should be right-padded with NUL characters.
-	 */
-
-	FLAC__uint64 lead_in;
-	/**< The number of lead-in samples. */
-
-	FLAC__bool is_cd;
-	/**< \c true if CUESHEET corresponds to a Compact Disc, else \c false. */
-
-	unsigned num_tracks;
-	/**< The number of tracks. */
-
-	FLAC__StreamMetadata_CueSheet_Track *tracks;
-	/**< NULL if num_tracks == 0, else pointer to array of tracks. */
-
-} FLAC__StreamMetadata_CueSheet;
-
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_MEDIA_CATALOG_NUMBER_LEN; /**< == 128*8 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_LEAD_IN_LEN; /**< == 64 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_IS_CD_LEN; /**< == 1 (bit) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_RESERVED_LEN; /**< == 7+258*8 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_NUM_TRACKS_LEN; /**< == 8 (bits) */
-
-
-/** An enumeration of the PICTURE types (see FLAC__StreamMetadataPicture and id3 v2.4 APIC tag). */
-typedef enum {
-	FLAC__STREAM_METADATA_PICTURE_TYPE_OTHER = 0, /**< Other */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_FILE_ICON_STANDARD = 1, /**< 32x32 pixels 'file icon' (PNG only) */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_FILE_ICON = 2, /**< Other file icon */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_FRONT_COVER = 3, /**< Cover (front) */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_BACK_COVER = 4, /**< Cover (back) */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_LEAFLET_PAGE = 5, /**< Leaflet page */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_MEDIA = 6, /**< Media (e.g. label side of CD) */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_LEAD_ARTIST = 7, /**< Lead artist/lead performer/soloist */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_ARTIST = 8, /**< Artist/performer */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_CONDUCTOR = 9, /**< Conductor */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_BAND = 10, /**< Band/Orchestra */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_COMPOSER = 11, /**< Composer */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_LYRICIST = 12, /**< Lyricist/text writer */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_RECORDING_LOCATION = 13, /**< Recording Location */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_DURING_RECORDING = 14, /**< During recording */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_DURING_PERFORMANCE = 15, /**< During performance */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_VIDEO_SCREEN_CAPTURE = 16, /**< Movie/video screen capture */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_FISH = 17, /**< A bright coloured fish */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_ILLUSTRATION = 18, /**< Illustration */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_BAND_LOGOTYPE = 19, /**< Band/artist logotype */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_PUBLISHER_LOGOTYPE = 20, /**< Publisher/Studio logotype */
-	FLAC__STREAM_METADATA_PICTURE_TYPE_UNDEFINED
-} FLAC__StreamMetadata_Picture_Type;
-
-/** Maps a FLAC__StreamMetadata_Picture_Type to a C string.
- *
- *  Using a FLAC__StreamMetadata_Picture_Type as the index to this array
- *  will give the string equivalent.  The contents should not be
- *  modified.
- */
-extern FLAC_API const char * const FLAC__StreamMetadata_Picture_TypeString[];
-
-/** FLAC PICTURE structure.  (See the
- * <A HREF="../format.html#metadata_block_picture">format specification</A>
- * for the full description of each field.)
- */
-typedef struct {
-	FLAC__StreamMetadata_Picture_Type type;
-	/**< The kind of picture stored. */
-
-	char *mime_type;
-	/**< Picture data's MIME type, in ASCII printable characters
-	 * 0x20-0x7e, NUL terminated.  For best compatibility with players,
-	 * use picture data of MIME type \c image/jpeg or \c image/png.  A
-	 * MIME type of '-->' is also allowed, in which case the picture
-	 * data should be a complete URL.  In file storage, the MIME type is
-	 * stored as a 32-bit length followed by the ASCII string with no NUL
-	 * terminator, but is converted to a plain C string in this structure
-	 * for convenience.
-	 */
-
-	FLAC__byte *description;
-	/**< Picture's description in UTF-8, NUL terminated.  In file storage,
-	 * the description is stored as a 32-bit length followed by the UTF-8
-	 * string with no NUL terminator, but is converted to a plain C string
-	 * in this structure for convenience.
-	 */
-
-	FLAC__uint32 width;
-	/**< Picture's width in pixels. */
-
-	FLAC__uint32 height;
-	/**< Picture's height in pixels. */
-
-	FLAC__uint32 depth;
-	/**< Picture's color depth in bits-per-pixel. */
-
-	FLAC__uint32 colors;
-	/**< For indexed palettes (like GIF), picture's number of colors (the
-	 * number of palette entries), or \c 0 for non-indexed (i.e. 2^depth).
-	 */
-
-	FLAC__uint32 data_length;
-	/**< Length of binary picture data in bytes. */
-
-	FLAC__byte *data;
-	/**< Binary picture data. */
-
-} FLAC__StreamMetadata_Picture;
-
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_PICTURE_TYPE_LEN; /**< == 32 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_PICTURE_MIME_TYPE_LENGTH_LEN; /**< == 32 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_PICTURE_DESCRIPTION_LENGTH_LEN; /**< == 32 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_PICTURE_WIDTH_LEN; /**< == 32 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_PICTURE_HEIGHT_LEN; /**< == 32 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_PICTURE_DEPTH_LEN; /**< == 32 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_PICTURE_COLORS_LEN; /**< == 32 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_PICTURE_DATA_LENGTH_LEN; /**< == 32 (bits) */
-
-
-/** Structure that is used when a metadata block of unknown type is loaded.
- *  The contents are opaque.  The structure is used only internally to
- *  correctly handle unknown metadata.
- */
-typedef struct {
-	FLAC__byte *data;
-} FLAC__StreamMetadata_Unknown;
-
-
-/** FLAC metadata block structure.  (c.f. <A HREF="../format.html#metadata_block">format specification</A>)
- */
-typedef struct {
-	FLAC__MetadataType type;
-	/**< The type of the metadata block; used determine which member of the
-	 * \a data union to dereference.  If type >= FLAC__METADATA_TYPE_UNDEFINED
-	 * then \a data.unknown must be used. */
-
-	FLAC__bool is_last;
-	/**< \c true if this metadata block is the last, else \a false */
-
-	unsigned length;
-	/**< Length, in bytes, of the block data as it appears in the stream. */
-
-	union {
-		FLAC__StreamMetadata_StreamInfo stream_info;
-		FLAC__StreamMetadata_Padding padding;
-		FLAC__StreamMetadata_Application application;
-		FLAC__StreamMetadata_SeekTable seek_table;
-		FLAC__StreamMetadata_VorbisComment vorbis_comment;
-		FLAC__StreamMetadata_CueSheet cue_sheet;
-		FLAC__StreamMetadata_Picture picture;
-		FLAC__StreamMetadata_Unknown unknown;
-	} data;
-	/**< Polymorphic block data; use the \a type value to determine which
-	 * to use. */
-} FLAC__StreamMetadata;
-
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_IS_LAST_LEN; /**< == 1 (bit) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_TYPE_LEN; /**< == 7 (bits) */
-extern FLAC_API const unsigned FLAC__STREAM_METADATA_LENGTH_LEN; /**< == 24 (bits) */
-
-/** The total stream length of a metadata block header in bytes. */
-#define FLAC__STREAM_METADATA_HEADER_LENGTH (4u)
-
-/*****************************************************************************/
-
-
-/*****************************************************************************
- *
- * Utility functions
- *
- *****************************************************************************/
-
-/** Tests that a sample rate is valid for FLAC.
- *
- * \param sample_rate  The sample rate to test for compliance.
- * \retval FLAC__bool
- *    \c true if the given sample rate conforms to the specification, else
- *    \c false.
- */
-FLAC_API FLAC__bool FLAC__format_sample_rate_is_valid(unsigned sample_rate);
-
-/** Tests that a sample rate is valid for the FLAC subset.  The subset rules
- *  for valid sample rates are slightly more complex since the rate has to
- *  be expressible completely in the frame header.
- *
- * \param sample_rate  The sample rate to test for compliance.
- * \retval FLAC__bool
- *    \c true if the given sample rate conforms to the specification for the
- *    subset, else \c false.
- */
-FLAC_API FLAC__bool FLAC__format_sample_rate_is_subset(unsigned sample_rate);
-
-/** Check a Vorbis comment entry name to see if it conforms to the Vorbis
- *  comment specification.
- *
- *  Vorbis comment names must be composed only of characters from
- *  [0x20-0x3C,0x3E-0x7D].
- *
- * \param name       A NUL-terminated string to be checked.
- * \assert
- *    \code name != NULL \endcode
- * \retval FLAC__bool
- *    \c false if entry name is illegal, else \c true.
- */
-FLAC_API FLAC__bool FLAC__format_vorbiscomment_entry_name_is_legal(const char *name);
-
-/** Check a Vorbis comment entry value to see if it conforms to the Vorbis
- *  comment specification.
- *
- *  Vorbis comment values must be valid UTF-8 sequences.
- *
- * \param value      A string to be checked.
- * \param length     A the length of \a value in bytes.  May be
- *                   \c (unsigned)(-1) to indicate that \a value is a plain
- *                   UTF-8 NUL-terminated string.
- * \assert
- *    \code value != NULL \endcode
- * \retval FLAC__bool
- *    \c false if entry name is illegal, else \c true.
- */
-FLAC_API FLAC__bool FLAC__format_vorbiscomment_entry_value_is_legal(const FLAC__byte *value, unsigned length);
-
-/** Check a Vorbis comment entry to see if it conforms to the Vorbis
- *  comment specification.
- *
- *  Vorbis comment entries must be of the form 'name=value', and 'name' and
- *  'value' must be legal according to
- *  FLAC__format_vorbiscomment_entry_name_is_legal() and
- *  FLAC__format_vorbiscomment_entry_value_is_legal() respectively.
- *
- * \param entry      An entry to be checked.
- * \param length     The length of \a entry in bytes.
- * \assert
- *    \code value != NULL \endcode
- * \retval FLAC__bool
- *    \c false if entry name is illegal, else \c true.
- */
-FLAC_API FLAC__bool FLAC__format_vorbiscomment_entry_is_legal(const FLAC__byte *entry, unsigned length);
-
-/** Check a seek table to see if it conforms to the FLAC specification.
- *  See the format specification for limits on the contents of the
- *  seek table.
- *
- * \param seek_table  A pointer to a seek table to be checked.
- * \assert
- *    \code seek_table != NULL \endcode
- * \retval FLAC__bool
- *    \c false if seek table is illegal, else \c true.
- */
-FLAC_API FLAC__bool FLAC__format_seektable_is_legal(const FLAC__StreamMetadata_SeekTable *seek_table);
-
-/** Sort a seek table's seek points according to the format specification.
- *  This includes a "unique-ification" step to remove duplicates, i.e.
- *  seek points with identical \a sample_number values.  Duplicate seek
- *  points are converted into placeholder points and sorted to the end of
- *  the table.
- *
- * \param seek_table  A pointer to a seek table to be sorted.
- * \assert
- *    \code seek_table != NULL \endcode
- * \retval unsigned
- *    The number of duplicate seek points converted into placeholders.
- */
-FLAC_API unsigned FLAC__format_seektable_sort(FLAC__StreamMetadata_SeekTable *seek_table);
-
-/** Check a cue sheet to see if it conforms to the FLAC specification.
- *  See the format specification for limits on the contents of the
- *  cue sheet.
- *
- * \param cue_sheet  A pointer to an existing cue sheet to be checked.
- * \param check_cd_da_subset  If \c true, check CUESHEET against more
- *                   stringent requirements for a CD-DA (audio) disc.
- * \param violation  Address of a pointer to a string.  If there is a
- *                   violation, a pointer to a string explanation of the
- *                   violation will be returned here. \a violation may be
- *                   \c NULL if you don't need the returned string.  Do not
- *                   free the returned string; it will always point to static
- *                   data.
- * \assert
- *    \code cue_sheet != NULL \endcode
- * \retval FLAC__bool
- *    \c false if cue sheet is illegal, else \c true.
- */
-FLAC_API FLAC__bool FLAC__format_cuesheet_is_legal(const FLAC__StreamMetadata_CueSheet *cue_sheet, FLAC__bool check_cd_da_subset, const char **violation);
-
-/** Check picture data to see if it conforms to the FLAC specification.
- *  See the format specification for limits on the contents of the
- *  PICTURE block.
- *
- * \param picture    A pointer to existing picture data to be checked.
- * \param violation  Address of a pointer to a string.  If there is a
- *                   violation, a pointer to a string explanation of the
- *                   violation will be returned here. \a violation may be
- *                   \c NULL if you don't need the returned string.  Do not
- *                   free the returned string; it will always point to static
- *                   data.
- * \assert
- *    \code picture != NULL \endcode
- * \retval FLAC__bool
- *    \c false if picture data is illegal, else \c true.
- */
-FLAC_API FLAC__bool FLAC__format_picture_is_legal(const FLAC__StreamMetadata_Picture *picture, const char **violation);
-
-/* \} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib-x86-64/include/FLAC/metadata.h b/lib-x86-64/include/FLAC/metadata.h
deleted file mode 100644
index fff90b0b..00000000
--- a/lib-x86-64/include/FLAC/metadata.h
+++ /dev/null
@@ -1,2181 +0,0 @@
-/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2001,2002,2003,2004,2005,2006,2007  Josh Coalson
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - 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.
- *
- * - Neither the name of the Xiph.org Foundation nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * 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 FOUNDATION 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 FLAC__METADATA_H
-#define FLAC__METADATA_H
-
-#include <sys/types.h> /* for off_t */
-#include "export.h"
-#include "callback.h"
-#include "format.h"
-
-/* --------------------------------------------------------------------
-   (For an example of how all these routines are used, see the source
-   code for the unit tests in src/test_libFLAC/metadata_*.c, or
-   metaflac in src/metaflac/)
-   ------------------------------------------------------------------*/
-
-/** \file include/FLAC/metadata.h
- *
- *  \brief
- *  This module provides functions for creating and manipulating FLAC
- *  metadata blocks in memory, and three progressively more powerful
- *  interfaces for traversing and editing metadata in FLAC files.
- *
- *  See the detailed documentation for each interface in the
- *  \link flac_metadata metadata \endlink module.
- */
-
-/** \defgroup flac_metadata FLAC/metadata.h: metadata interfaces
- *  \ingroup flac
- *
- *  \brief
- *  This module provides functions for creating and manipulating FLAC
- *  metadata blocks in memory, and three progressively more powerful
- *  interfaces for traversing and editing metadata in native FLAC files.
- *  Note that currently only the Chain interface (level 2) supports Ogg
- *  FLAC files, and it is read-only i.e. no writing back changed
- *  metadata to file.
- *
- *  There are three metadata interfaces of increasing complexity:
- *
- *  Level 0:
- *  Read-only access to the STREAMINFO, VORBIS_COMMENT, CUESHEET, and
- *  PICTURE blocks.
- *
- *  Level 1:
- *  Read-write access to all metadata blocks.  This level is write-
- *  efficient in most cases (more on this below), and uses less memory
- *  than level 2.
- *
- *  Level 2:
- *  Read-write access to all metadata blocks.  This level is write-
- *  efficient in all cases, but uses more memory since all metadata for
- *  the whole file is read into memory and manipulated before writing
- *  out again.
- *
- *  What do we mean by efficient?  Since FLAC metadata appears at the
- *  beginning of the file, when writing metadata back to a FLAC file
- *  it is possible to grow or shrink the metadata such that the entire
- *  file must be rewritten.  However, if the size remains the same during
- *  changes or PADDING blocks are utilized, only the metadata needs to be
- *  overwritten, which is much faster.
- *
- *  Efficient means the whole file is rewritten at most one time, and only
- *  when necessary.  Level 1 is not efficient only in the case that you
- *  cause more than one metadata block to grow or shrink beyond what can
- *  be accomodated by padding.  In this case you should probably use level
- *  2, which allows you to edit all the metadata for a file in memory and
- *  write it out all at once.
- *
- *  All levels know how to skip over and not disturb an ID3v2 tag at the
- *  front of the file.
- *
- *  All levels access files via their filenames.  In addition, level 2
- *  has additional alternative read and write functions that take an I/O
- *  handle and callbacks, for situations where access by filename is not
- *  possible.
- *
- *  In addition to the three interfaces, this module defines functions for
- *  creating and manipulating various metadata objects in memory.  As we see
- *  from the Format module, FLAC metadata blocks in memory are very primitive
- *  structures for storing information in an efficient way.  Reading
- *  information from the structures is easy but creating or modifying them
- *  directly is more complex.  The metadata object routines here facilitate
- *  this by taking care of the consistency and memory management drudgery.
- *
- *  Unless you will be using the level 1 or 2 interfaces to modify existing
- *  metadata however, you will not probably not need these.
- *
- *  From a dependency standpoint, none of the encoders or decoders require
- *  the metadata module.  This is so that embedded users can strip out the
- *  metadata module from libFLAC to reduce the size and complexity.
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/** \defgroup flac_metadata_level0 FLAC/metadata.h: metadata level 0 interface
- *  \ingroup flac_metadata
- *
- *  \brief
- *  The level 0 interface consists of individual routines to read the
- *  STREAMINFO, VORBIS_COMMENT, CUESHEET, and PICTURE blocks, requiring
- *  only a filename.
- *
- *  They try to skip any ID3v2 tag at the head of the file.
- *
- * \{
- */
-
-/** Read the STREAMINFO metadata block of the given FLAC file.  This function
- *  will try to skip any ID3v2 tag at the head of the file.
- *
- * \param filename    The path to the FLAC file to read.
- * \param streaminfo  A pointer to space for the STREAMINFO block.  Since
- *                    FLAC__StreamMetadata is a simple structure with no
- *                    memory allocation involved, you pass the address of
- *                    an existing structure.  It need not be initialized.
- * \assert
- *    \code filename != NULL \endcode
- *    \code streaminfo != NULL \endcode
- * \retval FLAC__bool
- *    \c true if a valid STREAMINFO block was read from \a filename.  Returns
- *    \c false if there was a memory allocation error, a file decoder error,
- *    or the file contained no STREAMINFO block.  (A memory allocation error
- *    is possible because this function must set up a file decoder.)
- */
-FLAC_API FLAC__bool FLAC__metadata_get_streaminfo(const char *filename, FLAC__StreamMetadata *streaminfo);
-
-/** Read the VORBIS_COMMENT metadata block of the given FLAC file.  This
- *  function will try to skip any ID3v2 tag at the head of the file.
- *
- * \param filename    The path to the FLAC file to read.
- * \param tags        The address where the returned pointer will be
- *                    stored.  The \a tags object must be deleted by
- *                    the caller using FLAC__metadata_object_delete().
- * \assert
- *    \code filename != NULL \endcode
- *    \code tags != NULL \endcode
- * \retval FLAC__bool
- *    \c true if a valid VORBIS_COMMENT block was read from \a filename,
- *    and \a *tags will be set to the address of the metadata structure.
- *    Returns \c false if there was a memory allocation error, a file
- *    decoder error, or the file contained no VORBIS_COMMENT block, and
- *    \a *tags will be set to \c NULL.
- */
-FLAC_API FLAC__bool FLAC__metadata_get_tags(const char *filename, FLAC__StreamMetadata **tags);
-
-/** Read the CUESHEET metadata block of the given FLAC file.  This
- *  function will try to skip any ID3v2 tag at the head of the file.
- *
- * \param filename    The path to the FLAC file to read.
- * \param cuesheet    The address where the returned pointer will be
- *                    stored.  The \a cuesheet object must be deleted by
- *                    the caller using FLAC__metadata_object_delete().
- * \assert
- *    \code filename != NULL \endcode
- *    \code cuesheet != NULL \endcode
- * \retval FLAC__bool
- *    \c true if a valid CUESHEET block was read from \a filename,
- *    and \a *cuesheet will be set to the address of the metadata
- *    structure.  Returns \c false if there was a memory allocation
- *    error, a file decoder error, or the file contained no CUESHEET
- *    block, and \a *cuesheet will be set to \c NULL.
- */
-FLAC_API FLAC__bool FLAC__metadata_get_cuesheet(const char *filename, FLAC__StreamMetadata **cuesheet);
-
-/** Read a PICTURE metadata block of the given FLAC file.  This
- *  function will try to skip any ID3v2 tag at the head of the file.
- *  Since there can be more than one PICTURE block in a file, this
- *  function takes a number of parameters that act as constraints to
- *  the search.  The PICTURE block with the largest area matching all
- *  the constraints will be returned, or \a *picture will be set to
- *  \c NULL if there was no such block.
- *
- * \param filename    The path to the FLAC file to read.
- * \param picture     The address where the returned pointer will be
- *                    stored.  The \a picture object must be deleted by
- *                    the caller using FLAC__metadata_object_delete().
- * \param type        The desired picture type.  Use \c -1 to mean
- *                    "any type".
- * \param mime_type   The desired MIME type, e.g. "image/jpeg".  The
- *                    string will be matched exactly.  Use \c NULL to
- *                    mean "any MIME type".
- * \param description The desired description.  The string will be
- *                    matched exactly.  Use \c NULL to mean "any
- *                    description".
- * \param max_width   The maximum width in pixels desired.  Use
- *                    \c (unsigned)(-1) to mean "any width".
- * \param max_height  The maximum height in pixels desired.  Use
- *                    \c (unsigned)(-1) to mean "any height".
- * \param max_depth   The maximum color depth in bits-per-pixel desired.
- *                    Use \c (unsigned)(-1) to mean "any depth".
- * \param max_colors  The maximum number of colors desired.  Use
- *                    \c (unsigned)(-1) to mean "any number of colors".
- * \assert
- *    \code filename != NULL \endcode
- *    \code picture != NULL \endcode
- * \retval FLAC__bool
- *    \c true if a valid PICTURE block was read from \a filename,
- *    and \a *picture will be set to the address of the metadata
- *    structure.  Returns \c false if there was a memory allocation
- *    error, a file decoder error, or the file contained no PICTURE
- *    block, and \a *picture will be set to \c NULL.
- */
-FLAC_API FLAC__bool FLAC__metadata_get_picture(const char *filename, FLAC__StreamMetadata **picture, FLAC__StreamMetadata_Picture_Type type, const char *mime_type, const FLAC__byte *description, unsigned max_width, unsigned max_height, unsigned max_depth, unsigned max_colors);
-
-/* \} */
-
-
-/** \defgroup flac_metadata_level1 FLAC/metadata.h: metadata level 1 interface
- *  \ingroup flac_metadata
- *
- * \brief
- * The level 1 interface provides read-write access to FLAC file metadata and
- * operates directly on the FLAC file.
- *
- * The general usage of this interface is:
- *
- * - Create an iterator using FLAC__metadata_simple_iterator_new()
- * - Attach it to a file using FLAC__metadata_simple_iterator_init() and check
- *   the exit code.  Call FLAC__metadata_simple_iterator_is_writable() to
- *   see if the file is writable, or only read access is allowed.
- * - Use FLAC__metadata_simple_iterator_next() and
- *   FLAC__metadata_simple_iterator_prev() to traverse the blocks.
- *   This is does not read the actual blocks themselves.
- *   FLAC__metadata_simple_iterator_next() is relatively fast.
- *   FLAC__metadata_simple_iterator_prev() is slower since it needs to search
- *   forward from the front of the file.
- * - Use FLAC__metadata_simple_iterator_get_block_type() or
- *   FLAC__metadata_simple_iterator_get_block() to access the actual data at
- *   the current iterator position.  The returned object is yours to modify
- *   and free.
- * - Use FLAC__metadata_simple_iterator_set_block() to write a modified block
- *   back.  You must have write permission to the original file.  Make sure to
- *   read the whole comment to FLAC__metadata_simple_iterator_set_block()
- *   below.
- * - Use FLAC__metadata_simple_iterator_insert_block_after() to add new blocks.
- *   Use the object creation functions from
- *   \link flac_metadata_object here \endlink to generate new objects.
- * - Use FLAC__metadata_simple_iterator_delete_block() to remove the block
- *   currently referred to by the iterator, or replace it with padding.
- * - Destroy the iterator with FLAC__metadata_simple_iterator_delete() when
- *   finished.
- *
- * \note
- * The FLAC file remains open the whole time between
- * FLAC__metadata_simple_iterator_init() and
- * FLAC__metadata_simple_iterator_delete(), so make sure you are not altering
- * the file during this time.
- *
- * \note
- * Do not modify the \a is_last, \a length, or \a type fields of returned
- * FLAC__StreamMetadata objects.  These are managed automatically.
- *
- * \note
- * If any of the modification functions
- * (FLAC__metadata_simple_iterator_set_block(),
- * FLAC__metadata_simple_iterator_delete_block(),
- * FLAC__metadata_simple_iterator_insert_block_after(), etc.) return \c false,
- * you should delete the iterator as it may no longer be valid.
- *
- * \{
- */
-
-struct FLAC__Metadata_SimpleIterator;
-/** The opaque structure definition for the level 1 iterator type.
- *  See the
- *  \link flac_metadata_level1 metadata level 1 module \endlink
- *  for a detailed description.
- */
-typedef struct FLAC__Metadata_SimpleIterator FLAC__Metadata_SimpleIterator;
-
-/** Status type for FLAC__Metadata_SimpleIterator.
- *
- *  The iterator's current status can be obtained by calling FLAC__metadata_simple_iterator_status().
- */
-typedef enum {
-
-	FLAC__METADATA_SIMPLE_ITERATOR_STATUS_OK = 0,
-	/**< The iterator is in the normal OK state */
-
-	FLAC__METADATA_SIMPLE_ITERATOR_STATUS_ILLEGAL_INPUT,
-	/**< The data passed into a function violated the function's usage criteria */
-
-	FLAC__METADATA_SIMPLE_ITERATOR_STATUS_ERROR_OPENING_FILE,
-	/**< The iterator could not open the target file */
-
-	FLAC__METADATA_SIMPLE_ITERATOR_STATUS_NOT_A_FLAC_FILE,
-	/**< The iterator could not find the FLAC signature at the start of the file */
-
-	FLAC__METADATA_SIMPLE_ITERATOR_STATUS_NOT_WRITABLE,
-	/**< The iterator tried to write to a file that was not writable */
-
-	FLAC__METADATA_SIMPLE_ITERATOR_STATUS_BAD_METADATA,
-	/**< The iterator encountered input that does not conform to the FLAC metadata specification */
-
-	FLAC__METADATA_SIMPLE_ITERATOR_STATUS_READ_ERROR,
-	/**< The iterator encountered an error while reading the FLAC file */
-
-	FLAC__METADATA_SIMPLE_ITERATOR_STATUS_SEEK_ERROR,
-	/**< The iterator encountered an error while seeking in the FLAC file */
-
-	FLAC__METADATA_SIMPLE_ITERATOR_STATUS_WRITE_ERROR,
-	/**< The iterator encountered an error while writing the FLAC file */
-
-	FLAC__METADATA_SIMPLE_ITERATOR_STATUS_RENAME_ERROR,
-	/**< The iterator encountered an error renaming the FLAC file */
-
-	FLAC__METADATA_SIMPLE_ITERATOR_STATUS_UNLINK_ERROR,
-	/**< The iterator encountered an error removing the temporary file */
-
-	FLAC__METADATA_SIMPLE_ITERATOR_STATUS_MEMORY_ALLOCATION_ERROR,
-	/**< Memory allocation failed */
-
-	FLAC__METADATA_SIMPLE_ITERATOR_STATUS_INTERNAL_ERROR
-	/**< The caller violated an assertion or an unexpected error occurred */
-
-} FLAC__Metadata_SimpleIteratorStatus;
-
-/** Maps a FLAC__Metadata_SimpleIteratorStatus to a C string.
- *
- *  Using a FLAC__Metadata_SimpleIteratorStatus as the index to this array
- *  will give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__Metadata_SimpleIteratorStatusString[];
-
-
-/** Create a new iterator instance.
- *
- * \retval FLAC__Metadata_SimpleIterator*
- *    \c NULL if there was an error allocating memory, else the new instance.
- */
-FLAC_API FLAC__Metadata_SimpleIterator *FLAC__metadata_simple_iterator_new(void);
-
-/** Free an iterator instance.  Deletes the object pointed to by \a iterator.
- *
- * \param iterator  A pointer to an existing iterator.
- * \assert
- *    \code iterator != NULL \endcode
- */
-FLAC_API void FLAC__metadata_simple_iterator_delete(FLAC__Metadata_SimpleIterator *iterator);
-
-/** Get the current status of the iterator.  Call this after a function
- *  returns \c false to get the reason for the error.  Also resets the status
- *  to FLAC__METADATA_SIMPLE_ITERATOR_STATUS_OK.
- *
- * \param iterator  A pointer to an existing iterator.
- * \assert
- *    \code iterator != NULL \endcode
- * \retval FLAC__Metadata_SimpleIteratorStatus
- *    The current status of the iterator.
- */
-FLAC_API FLAC__Metadata_SimpleIteratorStatus FLAC__metadata_simple_iterator_status(FLAC__Metadata_SimpleIterator *iterator);
-
-/** Initialize the iterator to point to the first metadata block in the
- *  given FLAC file.
- *
- * \param iterator             A pointer to an existing iterator.
- * \param filename             The path to the FLAC file.
- * \param read_only            If \c true, the FLAC file will be opened
- *                             in read-only mode; if \c false, the FLAC
- *                             file will be opened for edit even if no
- *                             edits are performed.
- * \param preserve_file_stats  If \c true, the owner and modification
- *                             time will be preserved even if the FLAC
- *                             file is written to.
- * \assert
- *    \code iterator != NULL \endcode
- *    \code filename != NULL \endcode
- * \retval FLAC__bool
- *    \c false if a memory allocation error occurs, the file can't be
- *    opened, or another error occurs, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_simple_iterator_init(FLAC__Metadata_SimpleIterator *iterator, const char *filename, FLAC__bool read_only, FLAC__bool preserve_file_stats);
-
-/** Returns \c true if the FLAC file is writable.  If \c false, calls to
- *  FLAC__metadata_simple_iterator_set_block() and
- *  FLAC__metadata_simple_iterator_insert_block_after() will fail.
- *
- * \param iterator             A pointer to an existing iterator.
- * \assert
- *    \code iterator != NULL \endcode
- * \retval FLAC__bool
- *    See above.
- */
-FLAC_API FLAC__bool FLAC__metadata_simple_iterator_is_writable(const FLAC__Metadata_SimpleIterator *iterator);
-
-/** Moves the iterator forward one metadata block, returning \c false if
- *  already at the end.
- *
- * \param iterator  A pointer to an existing initialized iterator.
- * \assert
- *    \code iterator != NULL \endcode
- *    \a iterator has been successfully initialized with
- *    FLAC__metadata_simple_iterator_init()
- * \retval FLAC__bool
- *    \c false if already at the last metadata block of the chain, else
- *    \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_simple_iterator_next(FLAC__Metadata_SimpleIterator *iterator);
-
-/** Moves the iterator backward one metadata block, returning \c false if
- *  already at the beginning.
- *
- * \param iterator  A pointer to an existing initialized iterator.
- * \assert
- *    \code iterator != NULL \endcode
- *    \a iterator has been successfully initialized with
- *    FLAC__metadata_simple_iterator_init()
- * \retval FLAC__bool
- *    \c false if already at the first metadata block of the chain, else
- *    \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_simple_iterator_prev(FLAC__Metadata_SimpleIterator *iterator);
-
-/** Returns a flag telling if the current metadata block is the last.
- *
- * \param iterator  A pointer to an existing initialized iterator.
- * \assert
- *    \code iterator != NULL \endcode
- *    \a iterator has been successfully initialized with
- *    FLAC__metadata_simple_iterator_init()
- * \retval FLAC__bool
- *    \c true if the current metadata block is the last in the file,
- *    else \c false.
- */
-FLAC_API FLAC__bool FLAC__metadata_simple_iterator_is_last(const FLAC__Metadata_SimpleIterator *iterator);
-
-/** Get the offset of the metadata block at the current position.  This
- *  avoids reading the actual block data which can save time for large
- *  blocks.
- *
- * \param iterator  A pointer to an existing initialized iterator.
- * \assert
- *    \code iterator != NULL \endcode
- *    \a iterator has been successfully initialized with
- *    FLAC__metadata_simple_iterator_init()
- * \retval off_t
- *    The offset of the metadata block at the current iterator position.
- *    This is the byte offset relative to the beginning of the file of
- *    the current metadata block's header.
- */
-FLAC_API off_t FLAC__metadata_simple_iterator_get_block_offset(const FLAC__Metadata_SimpleIterator *iterator);
-
-/** Get the type of the metadata block at the current position.  This
- *  avoids reading the actual block data which can save time for large
- *  blocks.
- *
- * \param iterator  A pointer to an existing initialized iterator.
- * \assert
- *    \code iterator != NULL \endcode
- *    \a iterator has been successfully initialized with
- *    FLAC__metadata_simple_iterator_init()
- * \retval FLAC__MetadataType
- *    The type of the metadata block at the current iterator position.
- */
-FLAC_API FLAC__MetadataType FLAC__metadata_simple_iterator_get_block_type(const FLAC__Metadata_SimpleIterator *iterator);
-
-/** Get the length of the metadata block at the current position.  This
- *  avoids reading the actual block data which can save time for large
- *  blocks.
- *
- * \param iterator  A pointer to an existing initialized iterator.
- * \assert
- *    \code iterator != NULL \endcode
- *    \a iterator has been successfully initialized with
- *    FLAC__metadata_simple_iterator_init()
- * \retval unsigned
- *    The length of the metadata block at the current iterator position.
- *    The is same length as that in the
- *    <a href="http://flac.sourceforge.net/format.html#metadata_block_header">metadata block header</a>,
- *    i.e. the length of the metadata body that follows the header.
- */
-FLAC_API unsigned FLAC__metadata_simple_iterator_get_block_length(const FLAC__Metadata_SimpleIterator *iterator);
-
-/** Get the application ID of the \c APPLICATION block at the current
- *  position.  This avoids reading the actual block data which can save
- *  time for large blocks.
- *
- * \param iterator  A pointer to an existing initialized iterator.
- * \param id        A pointer to a buffer of at least \c 4 bytes where
- *                  the ID will be stored.
- * \assert
- *    \code iterator != NULL \endcode
- *    \code id != NULL \endcode
- *    \a iterator has been successfully initialized with
- *    FLAC__metadata_simple_iterator_init()
- * \retval FLAC__bool
- *    \c true if the ID was successfully read, else \c false, in which
- *    case you should check FLAC__metadata_simple_iterator_status() to
- *    find out why.  If the status is
- *    \c FLAC__METADATA_SIMPLE_ITERATOR_STATUS_ILLEGAL_INPUT, then the
- *    current metadata block is not an \c APPLICATION block.  Otherwise
- *    if the status is
- *    \c FLAC__METADATA_SIMPLE_ITERATOR_STATUS_READ_ERROR or
- *    \c FLAC__METADATA_SIMPLE_ITERATOR_STATUS_SEEK_ERROR, an I/O error
- *    occurred and the iterator can no longer be used.
- */
-FLAC_API FLAC__bool FLAC__metadata_simple_iterator_get_application_id(FLAC__Metadata_SimpleIterator *iterator, FLAC__byte *id);
-
-/** Get the metadata block at the current position.  You can modify the
- *  block but must use FLAC__metadata_simple_iterator_set_block() to
- *  write it back to the FLAC file.
- *
- *  You must call FLAC__metadata_object_delete() on the returned object
- *  when you are finished with it.
- *
- * \param iterator  A pointer to an existing initialized iterator.
- * \assert
- *    \code iterator != NULL \endcode
- *    \a iterator has been successfully initialized with
- *    FLAC__metadata_simple_iterator_init()
- * \retval FLAC__StreamMetadata*
- *    The current metadata block, or \c NULL if there was a memory
- *    allocation error.
- */
-FLAC_API FLAC__StreamMetadata *FLAC__metadata_simple_iterator_get_block(FLAC__Metadata_SimpleIterator *iterator);
-
-/** Write a block back to the FLAC file.  This function tries to be
- *  as efficient as possible; how the block is actually written is
- *  shown by the following:
- *
- *  Existing block is a STREAMINFO block and the new block is a
- *  STREAMINFO block: the new block is written in place.  Make sure
- *  you know what you're doing when changing the values of a
- *  STREAMINFO block.
- *
- *  Existing block is a STREAMINFO block and the new block is a
- *  not a STREAMINFO block: this is an error since the first block
- *  must be a STREAMINFO block.  Returns \c false without altering the
- *  file.
- *
- *  Existing block is not a STREAMINFO block and the new block is a
- *  STREAMINFO block: this is an error since there may be only one
- *  STREAMINFO block.  Returns \c false without altering the file.
- *
- *  Existing block and new block are the same length: the existing
- *  block will be replaced by the new block, written in place.
- *
- *  Existing block is longer than new block: if use_padding is \c true,
- *  the existing block will be overwritten in place with the new
- *  block followed by a PADDING block, if possible, to make the total
- *  size the same as the existing block.  Remember that a padding
- *  block requires at least four bytes so if the difference in size
- *  between the new block and existing block is less than that, the
- *  entire file will have to be rewritten, using the new block's
- *  exact size.  If use_padding is \c false, the entire file will be
- *  rewritten, replacing the existing block by the new block.
- *
- *  Existing block is shorter than new block: if use_padding is \c true,
- *  the function will try and expand the new block into the following
- *  PADDING block, if it exists and doing so won't shrink the PADDING
- *  block to less than 4 bytes.  If there is no following PADDING
- *  block, or it will shrink to less than 4 bytes, or use_padding is
- *  \c false, the entire file is rewritten, replacing the existing block
- *  with the new block.  Note that in this case any following PADDING
- *  block is preserved as is.
- *
- *  After writing the block, the iterator will remain in the same
- *  place, i.e. pointing to the new block.
- *
- * \param iterator     A pointer to an existing initialized iterator.
- * \param block        The block to set.
- * \param use_padding  See above.
- * \assert
- *    \code iterator != NULL \endcode
- *    \a iterator has been successfully initialized with
- *    FLAC__metadata_simple_iterator_init()
- *    \code block != NULL \endcode
- * \retval FLAC__bool
- *    \c true if successful, else \c false.
- */
-FLAC_API FLAC__bool FLAC__metadata_simple_iterator_set_block(FLAC__Metadata_SimpleIterator *iterator, FLAC__StreamMetadata *block, FLAC__bool use_padding);
-
-/** This is similar to FLAC__metadata_simple_iterator_set_block()
- *  except that instead of writing over an existing block, it appends
- *  a block after the existing block.  \a use_padding is again used to
- *  tell the function to try an expand into following padding in an
- *  attempt to avoid rewriting the entire file.
- *
- *  This function will fail and return \c false if given a STREAMINFO
- *  block.
- *
- *  After writing the block, the iterator will be pointing to the
- *  new block.
- *
- * \param iterator     A pointer to an existing initialized iterator.
- * \param block        The block to set.
- * \param use_padding  See above.
- * \assert
- *    \code iterator != NULL \endcode
- *    \a iterator has been successfully initialized with
- *    FLAC__metadata_simple_iterator_init()
- *    \code block != NULL \endcode
- * \retval FLAC__bool
- *    \c true if successful, else \c false.
- */
-FLAC_API FLAC__bool FLAC__metadata_simple_iterator_insert_block_after(FLAC__Metadata_SimpleIterator *iterator, FLAC__StreamMetadata *block, FLAC__bool use_padding);
-
-/** Deletes the block at the current position.  This will cause the
- *  entire FLAC file to be rewritten, unless \a use_padding is \c true,
- *  in which case the block will be replaced by an equal-sized PADDING
- *  block.  The iterator will be left pointing to the block before the
- *  one just deleted.
- *
- *  You may not delete the STREAMINFO block.
- *
- * \param iterator     A pointer to an existing initialized iterator.
- * \param use_padding  See above.
- * \assert
- *    \code iterator != NULL \endcode
- *    \a iterator has been successfully initialized with
- *    FLAC__metadata_simple_iterator_init()
- * \retval FLAC__bool
- *    \c true if successful, else \c false.
- */
-FLAC_API FLAC__bool FLAC__metadata_simple_iterator_delete_block(FLAC__Metadata_SimpleIterator *iterator, FLAC__bool use_padding);
-
-/* \} */
-
-
-/** \defgroup flac_metadata_level2 FLAC/metadata.h: metadata level 2 interface
- *  \ingroup flac_metadata
- *
- * \brief
- * The level 2 interface provides read-write access to FLAC file metadata;
- * all metadata is read into memory, operated on in memory, and then written
- * to file, which is more efficient than level 1 when editing multiple blocks.
- *
- * Currently Ogg FLAC is supported for read only, via
- * FLAC__metadata_chain_read_ogg() but a subsequent
- * FLAC__metadata_chain_write() will fail.
- *
- * The general usage of this interface is:
- *
- * - Create a new chain using FLAC__metadata_chain_new().  A chain is a
- *   linked list of FLAC metadata blocks.
- * - Read all metadata into the the chain from a FLAC file using
- *   FLAC__metadata_chain_read() or FLAC__metadata_chain_read_ogg() and
- *   check the status.
- * - Optionally, consolidate the padding using
- *   FLAC__metadata_chain_merge_padding() or
- *   FLAC__metadata_chain_sort_padding().
- * - Create a new iterator using FLAC__metadata_iterator_new()
- * - Initialize the iterator to point to the first element in the chain
- *   using FLAC__metadata_iterator_init()
- * - Traverse the chain using FLAC__metadata_iterator_next and
- *   FLAC__metadata_iterator_prev().
- * - Get a block for reading or modification using
- *   FLAC__metadata_iterator_get_block().  The pointer to the object
- *   inside the chain is returned, so the block is yours to modify.
- *   Changes will be reflected in the FLAC file when you write the
- *   chain.  You can also add and delete blocks (see functions below).
- * - When done, write out the chain using FLAC__metadata_chain_write().
- *   Make sure to read the whole comment to the function below.
- * - Delete the chain using FLAC__metadata_chain_delete().
- *
- * \note
- * Even though the FLAC file is not open while the chain is being
- * manipulated, you must not alter the file externally during
- * this time.  The chain assumes the FLAC file will not change
- * between the time of FLAC__metadata_chain_read()/FLAC__metadata_chain_read_ogg()
- * and FLAC__metadata_chain_write().
- *
- * \note
- * Do not modify the is_last, length, or type fields of returned
- * FLAC__StreamMetadata objects.  These are managed automatically.
- *
- * \note
- * The metadata objects returned by FLAC__metadata_iterator_get_block()
- * are owned by the chain; do not FLAC__metadata_object_delete() them.
- * In the same way, blocks passed to FLAC__metadata_iterator_set_block()
- * become owned by the chain and they will be deleted when the chain is
- * deleted.
- *
- * \{
- */
-
-struct FLAC__Metadata_Chain;
-/** The opaque structure definition for the level 2 chain type.
- */
-typedef struct FLAC__Metadata_Chain FLAC__Metadata_Chain;
-
-struct FLAC__Metadata_Iterator;
-/** The opaque structure definition for the level 2 iterator type.
- */
-typedef struct FLAC__Metadata_Iterator FLAC__Metadata_Iterator;
-
-typedef enum {
-	FLAC__METADATA_CHAIN_STATUS_OK = 0,
-	/**< The chain is in the normal OK state */
-
-	FLAC__METADATA_CHAIN_STATUS_ILLEGAL_INPUT,
-	/**< The data passed into a function violated the function's usage criteria */
-
-	FLAC__METADATA_CHAIN_STATUS_ERROR_OPENING_FILE,
-	/**< The chain could not open the target file */
-
-	FLAC__METADATA_CHAIN_STATUS_NOT_A_FLAC_FILE,
-	/**< The chain could not find the FLAC signature at the start of the file */
-
-	FLAC__METADATA_CHAIN_STATUS_NOT_WRITABLE,
-	/**< The chain tried to write to a file that was not writable */
-
-	FLAC__METADATA_CHAIN_STATUS_BAD_METADATA,
-	/**< The chain encountered input that does not conform to the FLAC metadata specification */
-
-	FLAC__METADATA_CHAIN_STATUS_READ_ERROR,
-	/**< The chain encountered an error while reading the FLAC file */
-
-	FLAC__METADATA_CHAIN_STATUS_SEEK_ERROR,
-	/**< The chain encountered an error while seeking in the FLAC file */
-
-	FLAC__METADATA_CHAIN_STATUS_WRITE_ERROR,
-	/**< The chain encountered an error while writing the FLAC file */
-
-	FLAC__METADATA_CHAIN_STATUS_RENAME_ERROR,
-	/**< The chain encountered an error renaming the FLAC file */
-
-	FLAC__METADATA_CHAIN_STATUS_UNLINK_ERROR,
-	/**< The chain encountered an error removing the temporary file */
-
-	FLAC__METADATA_CHAIN_STATUS_MEMORY_ALLOCATION_ERROR,
-	/**< Memory allocation failed */
-
-	FLAC__METADATA_CHAIN_STATUS_INTERNAL_ERROR,
-	/**< The caller violated an assertion or an unexpected error occurred */
-
-	FLAC__METADATA_CHAIN_STATUS_INVALID_CALLBACKS,
-	/**< One or more of the required callbacks was NULL */
-
-	FLAC__METADATA_CHAIN_STATUS_READ_WRITE_MISMATCH,
-	/**< FLAC__metadata_chain_write() was called on a chain read by
-	 *   FLAC__metadata_chain_read_with_callbacks()/FLAC__metadata_chain_read_ogg_with_callbacks(),
-	 *   or 
-	 *   FLAC__metadata_chain_write_with_callbacks()/FLAC__metadata_chain_write_with_callbacks_and_tempfile()
-	 *   was called on a chain read by
-	 *   FLAC__metadata_chain_read()/FLAC__metadata_chain_read_ogg().
-	 *   Matching read/write methods must always be used. */
-
-	FLAC__METADATA_CHAIN_STATUS_WRONG_WRITE_CALL
-	/**< FLAC__metadata_chain_write_with_callbacks() was called when the
-	 *   chain write requires a tempfile; use
-	 *   FLAC__metadata_chain_write_with_callbacks_and_tempfile() instead.
-	 *   Or, FLAC__metadata_chain_write_with_callbacks_and_tempfile() was
-	 *   called when the chain write does not require a tempfile; use
-	 *   FLAC__metadata_chain_write_with_callbacks() instead.
-	 *   Always check FLAC__metadata_chain_check_if_tempfile_needed()
-	 *   before writing via callbacks. */
-
-} FLAC__Metadata_ChainStatus;
-
-/** Maps a FLAC__Metadata_ChainStatus to a C string.
- *
- *  Using a FLAC__Metadata_ChainStatus as the index to this array
- *  will give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__Metadata_ChainStatusString[];
-
-/*********** FLAC__Metadata_Chain ***********/
-
-/** Create a new chain instance.
- *
- * \retval FLAC__Metadata_Chain*
- *    \c NULL if there was an error allocating memory, else the new instance.
- */
-FLAC_API FLAC__Metadata_Chain *FLAC__metadata_chain_new(void);
-
-/** Free a chain instance.  Deletes the object pointed to by \a chain.
- *
- * \param chain  A pointer to an existing chain.
- * \assert
- *    \code chain != NULL \endcode
- */
-FLAC_API void FLAC__metadata_chain_delete(FLAC__Metadata_Chain *chain);
-
-/** Get the current status of the chain.  Call this after a function
- *  returns \c false to get the reason for the error.  Also resets the
- *  status to FLAC__METADATA_CHAIN_STATUS_OK.
- *
- * \param chain    A pointer to an existing chain.
- * \assert
- *    \code chain != NULL \endcode
- * \retval FLAC__Metadata_ChainStatus
- *    The current status of the chain.
- */
-FLAC_API FLAC__Metadata_ChainStatus FLAC__metadata_chain_status(FLAC__Metadata_Chain *chain);
-
-/** Read all metadata from a FLAC file into the chain.
- *
- * \param chain    A pointer to an existing chain.
- * \param filename The path to the FLAC file to read.
- * \assert
- *    \code chain != NULL \endcode
- *    \code filename != NULL \endcode
- * \retval FLAC__bool
- *    \c true if a valid list of metadata blocks was read from
- *    \a filename, else \c false.  On failure, check the status with
- *    FLAC__metadata_chain_status().
- */
-FLAC_API FLAC__bool FLAC__metadata_chain_read(FLAC__Metadata_Chain *chain, const char *filename);
-
-/** Read all metadata from an Ogg FLAC file into the chain.
- *
- * \note Ogg FLAC metadata data writing is not supported yet and
- * FLAC__metadata_chain_write() will fail.
- *
- * \param chain    A pointer to an existing chain.
- * \param filename The path to the Ogg FLAC file to read.
- * \assert
- *    \code chain != NULL \endcode
- *    \code filename != NULL \endcode
- * \retval FLAC__bool
- *    \c true if a valid list of metadata blocks was read from
- *    \a filename, else \c false.  On failure, check the status with
- *    FLAC__metadata_chain_status().
- */
-FLAC_API FLAC__bool FLAC__metadata_chain_read_ogg(FLAC__Metadata_Chain *chain, const char *filename);
-
-/** Read all metadata from a FLAC stream into the chain via I/O callbacks.
- *
- *  The \a handle need only be open for reading, but must be seekable.
- *  The equivalent minimum stdio fopen() file mode is \c "r" (or \c "rb"
- *  for Windows).
- *
- * \param chain    A pointer to an existing chain.
- * \param handle   The I/O handle of the FLAC stream to read.  The
- *                 handle will NOT be closed after the metadata is read;
- *                 that is the duty of the caller.
- * \param callbacks
- *                 A set of callbacks to use for I/O.  The mandatory
- *                 callbacks are \a read, \a seek, and \a tell.
- * \assert
- *    \code chain != NULL \endcode
- * \retval FLAC__bool
- *    \c true if a valid list of metadata blocks was read from
- *    \a handle, else \c false.  On failure, check the status with
- *    FLAC__metadata_chain_status().
- */
-FLAC_API FLAC__bool FLAC__metadata_chain_read_with_callbacks(FLAC__Metadata_Chain *chain, FLAC__IOHandle handle, FLAC__IOCallbacks callbacks);
-
-/** Read all metadata from an Ogg FLAC stream into the chain via I/O callbacks.
- *
- *  The \a handle need only be open for reading, but must be seekable.
- *  The equivalent minimum stdio fopen() file mode is \c "r" (or \c "rb"
- *  for Windows).
- *
- * \note Ogg FLAC metadata data writing is not supported yet and
- * FLAC__metadata_chain_write() will fail.
- *
- * \param chain    A pointer to an existing chain.
- * \param handle   The I/O handle of the Ogg FLAC stream to read.  The
- *                 handle will NOT be closed after the metadata is read;
- *                 that is the duty of the caller.
- * \param callbacks
- *                 A set of callbacks to use for I/O.  The mandatory
- *                 callbacks are \a read, \a seek, and \a tell.
- * \assert
- *    \code chain != NULL \endcode
- * \retval FLAC__bool
- *    \c true if a valid list of metadata blocks was read from
- *    \a handle, else \c false.  On failure, check the status with
- *    FLAC__metadata_chain_status().
- */
-FLAC_API FLAC__bool FLAC__metadata_chain_read_ogg_with_callbacks(FLAC__Metadata_Chain *chain, FLAC__IOHandle handle, FLAC__IOCallbacks callbacks);
-
-/** Checks if writing the given chain would require the use of a
- *  temporary file, or if it could be written in place.
- *
- *  Under certain conditions, padding can be utilized so that writing
- *  edited metadata back to the FLAC file does not require rewriting the
- *  entire file.  If rewriting is required, then a temporary workfile is
- *  required.  When writing metadata using callbacks, you must check
- *  this function to know whether to call
- *  FLAC__metadata_chain_write_with_callbacks() or
- *  FLAC__metadata_chain_write_with_callbacks_and_tempfile().  When
- *  writing with FLAC__metadata_chain_write(), the temporary file is
- *  handled internally.
- *
- * \param chain    A pointer to an existing chain.
- * \param use_padding
- *                 Whether or not padding will be allowed to be used
- *                 during the write.  The value of \a use_padding given
- *                 here must match the value later passed to
- *                 FLAC__metadata_chain_write_with_callbacks() or
- *                 FLAC__metadata_chain_write_with_callbacks_with_tempfile().
- * \assert
- *    \code chain != NULL \endcode
- * \retval FLAC__bool
- *    \c true if writing the current chain would require a tempfile, or
- *    \c false if metadata can be written in place.
- */
-FLAC_API FLAC__bool FLAC__metadata_chain_check_if_tempfile_needed(FLAC__Metadata_Chain *chain, FLAC__bool use_padding);
-
-/** Write all metadata out to the FLAC file.  This function tries to be as
- *  efficient as possible; how the metadata is actually written is shown by
- *  the following:
- *
- *  If the current chain is the same size as the existing metadata, the new
- *  data is written in place.
- *
- *  If the current chain is longer than the existing metadata, and
- *  \a use_padding is \c true, and the last block is a PADDING block of
- *  sufficient length, the function will truncate the final padding block
- *  so that the overall size of the metadata is the same as the existing
- *  metadata, and then just rewrite the metadata.  Otherwise, if not all of
- *  the above conditions are met, the entire FLAC file must be rewritten.
- *  If you want to use padding this way it is a good idea to call
- *  FLAC__metadata_chain_sort_padding() first so that you have the maximum
- *  amount of padding to work with, unless you need to preserve ordering
- *  of the PADDING blocks for some reason.
- *
- *  If the current chain is shorter than the existing metadata, and
- *  \a use_padding is \c true, and the final block is a PADDING block, the padding
- *  is extended to make the overall size the same as the existing data.  If
- *  \a use_padding is \c true and the last block is not a PADDING block, a new
- *  PADDING block is added to the end of the new data to make it the same
- *  size as the existing data (if possible, see the note to
- *  FLAC__metadata_simple_iterator_set_block() about the four byte limit)
- *  and the new data is written in place.  If none of the above apply or
- *  \a use_padding is \c false, the entire FLAC file is rewritten.
- *
- *  If \a preserve_file_stats is \c true, the owner and modification time will
- *  be preserved even if the FLAC file is written.
- *
- *  For this write function to be used, the chain must have been read with
- *  FLAC__metadata_chain_read()/FLAC__metadata_chain_read_ogg(), not
- *  FLAC__metadata_chain_read_with_callbacks()/FLAC__metadata_chain_read_ogg_with_callbacks().
- *
- * \param chain               A pointer to an existing chain.
- * \param use_padding         See above.
- * \param preserve_file_stats See above.
- * \assert
- *    \code chain != NULL \endcode
- * \retval FLAC__bool
- *    \c true if the write succeeded, else \c false.  On failure,
- *    check the status with FLAC__metadata_chain_status().
- */
-FLAC_API FLAC__bool FLAC__metadata_chain_write(FLAC__Metadata_Chain *chain, FLAC__bool use_padding, FLAC__bool preserve_file_stats);
-
-/** Write all metadata out to a FLAC stream via callbacks.
- *
- *  (See FLAC__metadata_chain_write() for the details on how padding is
- *  used to write metadata in place if possible.)
- *
- *  The \a handle must be open for updating and be seekable.  The
- *  equivalent minimum stdio fopen() file mode is \c "r+" (or \c "r+b"
- *  for Windows).
- *
- *  For this write function to be used, the chain must have been read with
- *  FLAC__metadata_chain_read_with_callbacks()/FLAC__metadata_chain_read_ogg_with_callbacks(),
- *  not FLAC__metadata_chain_read()/FLAC__metadata_chain_read_ogg().
- *  Also, FLAC__metadata_chain_check_if_tempfile_needed() must have returned
- *  \c false.
- *
- * \param chain        A pointer to an existing chain.
- * \param use_padding  See FLAC__metadata_chain_write()
- * \param handle       The I/O handle of the FLAC stream to write.  The
- *                     handle will NOT be closed after the metadata is
- *                     written; that is the duty of the caller.
- * \param callbacks    A set of callbacks to use for I/O.  The mandatory
- *                     callbacks are \a write and \a seek.
- * \assert
- *    \code chain != NULL \endcode
- * \retval FLAC__bool
- *    \c true if the write succeeded, else \c false.  On failure,
- *    check the status with FLAC__metadata_chain_status().
- */
-FLAC_API FLAC__bool FLAC__metadata_chain_write_with_callbacks(FLAC__Metadata_Chain *chain, FLAC__bool use_padding, FLAC__IOHandle handle, FLAC__IOCallbacks callbacks);
-
-/** Write all metadata out to a FLAC stream via callbacks.
- *
- *  (See FLAC__metadata_chain_write() for the details on how padding is
- *  used to write metadata in place if possible.)
- *
- *  This version of the write-with-callbacks function must be used when
- *  FLAC__metadata_chain_check_if_tempfile_needed() returns true.  In
- *  this function, you must supply an I/O handle corresponding to the
- *  FLAC file to edit, and a temporary handle to which the new FLAC
- *  file will be written.  It is the caller's job to move this temporary
- *  FLAC file on top of the original FLAC file to complete the metadata
- *  edit.
- *
- *  The \a handle must be open for reading and be seekable.  The
- *  equivalent minimum stdio fopen() file mode is \c "r" (or \c "rb"
- *  for Windows).
- *
- *  The \a temp_handle must be open for writing.  The
- *  equivalent minimum stdio fopen() file mode is \c "w" (or \c "wb"
- *  for Windows).  It should be an empty stream, or at least positioned
- *  at the start-of-file (in which case it is the caller's duty to
- *  truncate it on return).
- *
- *  For this write function to be used, the chain must have been read with
- *  FLAC__metadata_chain_read_with_callbacks()/FLAC__metadata_chain_read_ogg_with_callbacks(),
- *  not FLAC__metadata_chain_read()/FLAC__metadata_chain_read_ogg().
- *  Also, FLAC__metadata_chain_check_if_tempfile_needed() must have returned
- *  \c true.
- *
- * \param chain        A pointer to an existing chain.
- * \param use_padding  See FLAC__metadata_chain_write()
- * \param handle       The I/O handle of the original FLAC stream to read.
- *                     The handle will NOT be closed after the metadata is
- *                     written; that is the duty of the caller.
- * \param callbacks    A set of callbacks to use for I/O on \a handle.
- *                     The mandatory callbacks are \a read, \a seek, and
- *                     \a eof.
- * \param temp_handle  The I/O handle of the FLAC stream to write.  The
- *                     handle will NOT be closed after the metadata is
- *                     written; that is the duty of the caller.
- * \param temp_callbacks
- *                     A set of callbacks to use for I/O on temp_handle.
- *                     The only mandatory callback is \a write.
- * \assert
- *    \code chain != NULL \endcode
- * \retval FLAC__bool
- *    \c true if the write succeeded, else \c false.  On failure,
- *    check the status with FLAC__metadata_chain_status().
- */
-FLAC_API FLAC__bool FLAC__metadata_chain_write_with_callbacks_and_tempfile(FLAC__Metadata_Chain *chain, FLAC__bool use_padding, FLAC__IOHandle handle, FLAC__IOCallbacks callbacks, FLAC__IOHandle temp_handle, FLAC__IOCallbacks temp_callbacks);
-
-/** Merge adjacent PADDING blocks into a single block.
- *
- * \note This function does not write to the FLAC file, it only
- * modifies the chain.
- *
- * \warning Any iterator on the current chain will become invalid after this
- * call.  You should delete the iterator and get a new one.
- *
- * \param chain               A pointer to an existing chain.
- * \assert
- *    \code chain != NULL \endcode
- */
-FLAC_API void FLAC__metadata_chain_merge_padding(FLAC__Metadata_Chain *chain);
-
-/** This function will move all PADDING blocks to the end on the metadata,
- *  then merge them into a single block.
- *
- * \note This function does not write to the FLAC file, it only
- * modifies the chain.
- *
- * \warning Any iterator on the current chain will become invalid after this
- * call.  You should delete the iterator and get a new one.
- *
- * \param chain  A pointer to an existing chain.
- * \assert
- *    \code chain != NULL \endcode
- */
-FLAC_API void FLAC__metadata_chain_sort_padding(FLAC__Metadata_Chain *chain);
-
-
-/*********** FLAC__Metadata_Iterator ***********/
-
-/** Create a new iterator instance.
- *
- * \retval FLAC__Metadata_Iterator*
- *    \c NULL if there was an error allocating memory, else the new instance.
- */
-FLAC_API FLAC__Metadata_Iterator *FLAC__metadata_iterator_new(void);
-
-/** Free an iterator instance.  Deletes the object pointed to by \a iterator.
- *
- * \param iterator  A pointer to an existing iterator.
- * \assert
- *    \code iterator != NULL \endcode
- */
-FLAC_API void FLAC__metadata_iterator_delete(FLAC__Metadata_Iterator *iterator);
-
-/** Initialize the iterator to point to the first metadata block in the
- *  given chain.
- *
- * \param iterator  A pointer to an existing iterator.
- * \param chain     A pointer to an existing and initialized (read) chain.
- * \assert
- *    \code iterator != NULL \endcode
- *    \code chain != NULL \endcode
- */
-FLAC_API void FLAC__metadata_iterator_init(FLAC__Metadata_Iterator *iterator, FLAC__Metadata_Chain *chain);
-
-/** Moves the iterator forward one metadata block, returning \c false if
- *  already at the end.
- *
- * \param iterator  A pointer to an existing initialized iterator.
- * \assert
- *    \code iterator != NULL \endcode
- *    \a iterator has been successfully initialized with
- *    FLAC__metadata_iterator_init()
- * \retval FLAC__bool
- *    \c false if already at the last metadata block of the chain, else
- *    \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_iterator_next(FLAC__Metadata_Iterator *iterator);
-
-/** Moves the iterator backward one metadata block, returning \c false if
- *  already at the beginning.
- *
- * \param iterator  A pointer to an existing initialized iterator.
- * \assert
- *    \code iterator != NULL \endcode
- *    \a iterator has been successfully initialized with
- *    FLAC__metadata_iterator_init()
- * \retval FLAC__bool
- *    \c false if already at the first metadata block of the chain, else
- *    \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_iterator_prev(FLAC__Metadata_Iterator *iterator);
-
-/** Get the type of the metadata block at the current position.
- *
- * \param iterator  A pointer to an existing initialized iterator.
- * \assert
- *    \code iterator != NULL \endcode
- *    \a iterator has been successfully initialized with
- *    FLAC__metadata_iterator_init()
- * \retval FLAC__MetadataType
- *    The type of the metadata block at the current iterator position.
- */
-FLAC_API FLAC__MetadataType FLAC__metadata_iterator_get_block_type(const FLAC__Metadata_Iterator *iterator);
-
-/** Get the metadata block at the current position.  You can modify
- *  the block in place but must write the chain before the changes
- *  are reflected to the FLAC file.  You do not need to call
- *  FLAC__metadata_iterator_set_block() to reflect the changes;
- *  the pointer returned by FLAC__metadata_iterator_get_block()
- *  points directly into the chain.
- *
- * \warning
- * Do not call FLAC__metadata_object_delete() on the returned object;
- * to delete a block use FLAC__metadata_iterator_delete_block().
- *
- * \param iterator  A pointer to an existing initialized iterator.
- * \assert
- *    \code iterator != NULL \endcode
- *    \a iterator has been successfully initialized with
- *    FLAC__metadata_iterator_init()
- * \retval FLAC__StreamMetadata*
- *    The current metadata block.
- */
-FLAC_API FLAC__StreamMetadata *FLAC__metadata_iterator_get_block(FLAC__Metadata_Iterator *iterator);
-
-/** Set the metadata block at the current position, replacing the existing
- *  block.  The new block passed in becomes owned by the chain and it will be
- *  deleted when the chain is deleted.
- *
- * \param iterator  A pointer to an existing initialized iterator.
- * \param block     A pointer to a metadata block.
- * \assert
- *    \code iterator != NULL \endcode
- *    \a iterator has been successfully initialized with
- *    FLAC__metadata_iterator_init()
- *    \code block != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the conditions in the above description are not met, or
- *    a memory allocation error occurs, otherwise \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_iterator_set_block(FLAC__Metadata_Iterator *iterator, FLAC__StreamMetadata *block);
-
-/** Removes the current block from the chain.  If \a replace_with_padding is
- *  \c true, the block will instead be replaced with a padding block of equal
- *  size.  You can not delete the STREAMINFO block.  The iterator will be
- *  left pointing to the block before the one just "deleted", even if
- *  \a replace_with_padding is \c true.
- *
- * \param iterator              A pointer to an existing initialized iterator.
- * \param replace_with_padding  See above.
- * \assert
- *    \code iterator != NULL \endcode
- *    \a iterator has been successfully initialized with
- *    FLAC__metadata_iterator_init()
- * \retval FLAC__bool
- *    \c false if the conditions in the above description are not met,
- *    otherwise \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_iterator_delete_block(FLAC__Metadata_Iterator *iterator, FLAC__bool replace_with_padding);
-
-/** Insert a new block before the current block.  You cannot insert a block
- *  before the first STREAMINFO block.  You cannot insert a STREAMINFO block
- *  as there can be only one, the one that already exists at the head when you
- *  read in a chain.  The chain takes ownership of the new block and it will be
- *  deleted when the chain is deleted.  The iterator will be left pointing to
- *  the new block.
- *
- * \param iterator  A pointer to an existing initialized iterator.
- * \param block     A pointer to a metadata block to insert.
- * \assert
- *    \code iterator != NULL \endcode
- *    \a iterator has been successfully initialized with
- *    FLAC__metadata_iterator_init()
- * \retval FLAC__bool
- *    \c false if the conditions in the above description are not met, or
- *    a memory allocation error occurs, otherwise \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_iterator_insert_block_before(FLAC__Metadata_Iterator *iterator, FLAC__StreamMetadata *block);
-
-/** Insert a new block after the current block.  You cannot insert a STREAMINFO
- *  block as there can be only one, the one that already exists at the head when
- *  you read in a chain.  The chain takes ownership of the new block and it will
- *  be deleted when the chain is deleted.  The iterator will be left pointing to
- *  the new block.
- *
- * \param iterator  A pointer to an existing initialized iterator.
- * \param block     A pointer to a metadata block to insert.
- * \assert
- *    \code iterator != NULL \endcode
- *    \a iterator has been successfully initialized with
- *    FLAC__metadata_iterator_init()
- * \retval FLAC__bool
- *    \c false if the conditions in the above description are not met, or
- *    a memory allocation error occurs, otherwise \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_iterator_insert_block_after(FLAC__Metadata_Iterator *iterator, FLAC__StreamMetadata *block);
-
-/* \} */
-
-
-/** \defgroup flac_metadata_object FLAC/metadata.h: metadata object methods
- *  \ingroup flac_metadata
- *
- * \brief
- * This module contains methods for manipulating FLAC metadata objects.
- *
- * Since many are variable length we have to be careful about the memory
- * management.  We decree that all pointers to data in the object are
- * owned by the object and memory-managed by the object.
- *
- * Use the FLAC__metadata_object_new() and FLAC__metadata_object_delete()
- * functions to create all instances.  When using the
- * FLAC__metadata_object_set_*() functions to set pointers to data, set
- * \a copy to \c true to have the function make it's own copy of the data, or
- * to \c false to give the object ownership of your data.  In the latter case
- * your pointer must be freeable by free() and will be free()d when the object
- * is FLAC__metadata_object_delete()d.  It is legal to pass a null pointer as
- * the data pointer to a FLAC__metadata_object_set_*() function as long as
- * the length argument is 0 and the \a copy argument is \c false.
- *
- * The FLAC__metadata_object_new() and FLAC__metadata_object_clone() function
- * will return \c NULL in the case of a memory allocation error, otherwise a new
- * object.  The FLAC__metadata_object_set_*() functions return \c false in the
- * case of a memory allocation error.
- *
- * We don't have the convenience of C++ here, so note that the library relies
- * on you to keep the types straight.  In other words, if you pass, for
- * example, a FLAC__StreamMetadata* that represents a STREAMINFO block to
- * FLAC__metadata_object_application_set_data(), you will get an assertion
- * failure.
- *
- * For convenience the FLAC__metadata_object_vorbiscomment_*() functions
- * maintain a trailing NUL on each Vorbis comment entry.  This is not counted
- * toward the length or stored in the stream, but it can make working with plain
- * comments (those that don't contain embedded-NULs in the value) easier.
- * Entries passed into these functions have trailing NULs added if missing, and
- * returned entries are guaranteed to have a trailing NUL.
- *
- * The FLAC__metadata_object_vorbiscomment_*() functions that take a Vorbis
- * comment entry/name/value will first validate that it complies with the Vorbis
- * comment specification and return false if it does not.
- *
- * There is no need to recalculate the length field on metadata blocks you
- * have modified.  They will be calculated automatically before they  are
- * written back to a file.
- *
- * \{
- */
-
-
-/** Create a new metadata object instance of the given type.
- *
- *  The object will be "empty"; i.e. values and data pointers will be \c 0,
- *  with the exception of FLAC__METADATA_TYPE_VORBIS_COMMENT, which will have
- *  the vendor string set (but zero comments).
- *
- *  Do not pass in a value greater than or equal to
- *  \a FLAC__METADATA_TYPE_UNDEFINED unless you really know what you're
- *  doing.
- *
- * \param type  Type of object to create
- * \retval FLAC__StreamMetadata*
- *    \c NULL if there was an error allocating memory or the type code is
- *    greater than FLAC__MAX_METADATA_TYPE_CODE, else the new instance.
- */
-FLAC_API FLAC__StreamMetadata *FLAC__metadata_object_new(FLAC__MetadataType type);
-
-/** Create a copy of an existing metadata object.
- *
- *  The copy is a "deep" copy, i.e. dynamically allocated data within the
- *  object is also copied.  The caller takes ownership of the new block and
- *  is responsible for freeing it with FLAC__metadata_object_delete().
- *
- * \param object  Pointer to object to copy.
- * \assert
- *    \code object != NULL \endcode
- * \retval FLAC__StreamMetadata*
- *    \c NULL if there was an error allocating memory, else the new instance.
- */
-FLAC_API FLAC__StreamMetadata *FLAC__metadata_object_clone(const FLAC__StreamMetadata *object);
-
-/** Free a metadata object.  Deletes the object pointed to by \a object.
- *
- *  The delete is a "deep" delete, i.e. dynamically allocated data within the
- *  object is also deleted.
- *
- * \param object  A pointer to an existing object.
- * \assert
- *    \code object != NULL \endcode
- */
-FLAC_API void FLAC__metadata_object_delete(FLAC__StreamMetadata *object);
-
-/** Compares two metadata objects.
- *
- *  The compare is "deep", i.e. dynamically allocated data within the
- *  object is also compared.
- *
- * \param block1  A pointer to an existing object.
- * \param block2  A pointer to an existing object.
- * \assert
- *    \code block1 != NULL \endcode
- *    \code block2 != NULL \endcode
- * \retval FLAC__bool
- *    \c true if objects are identical, else \c false.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_is_equal(const FLAC__StreamMetadata *block1, const FLAC__StreamMetadata *block2);
-
-/** Sets the application data of an APPLICATION block.
- *
- *  If \a copy is \c true, a copy of the data is stored; otherwise, the object
- *  takes ownership of the pointer.  The existing data will be freed if this
- *  function is successful, otherwise the original data will remain if \a copy
- *  is \c true and malloc() fails.
- *
- * \note It is safe to pass a const pointer to \a data if \a copy is \c true.
- *
- * \param object  A pointer to an existing APPLICATION object.
- * \param data    A pointer to the data to set.
- * \param length  The length of \a data in bytes.
- * \param copy    See above.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_APPLICATION \endcode
- *    \code (data != NULL && length > 0) ||
- * (data == NULL && length == 0 && copy == false) \endcode
- * \retval FLAC__bool
- *    \c false if \a copy is \c true and malloc() fails, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_application_set_data(FLAC__StreamMetadata *object, FLAC__byte *data, unsigned length, FLAC__bool copy);
-
-/** Resize the seekpoint array.
- *
- *  If the size shrinks, elements will truncated; if it grows, new placeholder
- *  points will be added to the end.
- *
- * \param object          A pointer to an existing SEEKTABLE object.
- * \param new_num_points  The desired length of the array; may be \c 0.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_SEEKTABLE \endcode
- *    \code (object->data.seek_table.points == NULL && object->data.seek_table.num_points == 0) ||
- * (object->data.seek_table.points != NULL && object->data.seek_table.num_points > 0) \endcode
- * \retval FLAC__bool
- *    \c false if memory allocation error, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_seektable_resize_points(FLAC__StreamMetadata *object, unsigned new_num_points);
-
-/** Set a seekpoint in a seektable.
- *
- * \param object     A pointer to an existing SEEKTABLE object.
- * \param point_num  Index into seekpoint array to set.
- * \param point      The point to set.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_SEEKTABLE \endcode
- *    \code object->data.seek_table.num_points > point_num \endcode
- */
-FLAC_API void FLAC__metadata_object_seektable_set_point(FLAC__StreamMetadata *object, unsigned point_num, FLAC__StreamMetadata_SeekPoint point);
-
-/** Insert a seekpoint into a seektable.
- *
- * \param object     A pointer to an existing SEEKTABLE object.
- * \param point_num  Index into seekpoint array to set.
- * \param point      The point to set.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_SEEKTABLE \endcode
- *    \code object->data.seek_table.num_points >= point_num \endcode
- * \retval FLAC__bool
- *    \c false if memory allocation error, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_seektable_insert_point(FLAC__StreamMetadata *object, unsigned point_num, FLAC__StreamMetadata_SeekPoint point);
-
-/** Delete a seekpoint from a seektable.
- *
- * \param object     A pointer to an existing SEEKTABLE object.
- * \param point_num  Index into seekpoint array to set.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_SEEKTABLE \endcode
- *    \code object->data.seek_table.num_points > point_num \endcode
- * \retval FLAC__bool
- *    \c false if memory allocation error, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_seektable_delete_point(FLAC__StreamMetadata *object, unsigned point_num);
-
-/** Check a seektable to see if it conforms to the FLAC specification.
- *  See the format specification for limits on the contents of the
- *  seektable.
- *
- * \param object  A pointer to an existing SEEKTABLE object.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_SEEKTABLE \endcode
- * \retval FLAC__bool
- *    \c false if seek table is illegal, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_seektable_is_legal(const FLAC__StreamMetadata *object);
-
-/** Append a number of placeholder points to the end of a seek table.
- *
- * \note
- * As with the other ..._seektable_template_... functions, you should
- * call FLAC__metadata_object_seektable_template_sort() when finished
- * to make the seek table legal.
- *
- * \param object  A pointer to an existing SEEKTABLE object.
- * \param num     The number of placeholder points to append.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_SEEKTABLE \endcode
- * \retval FLAC__bool
- *    \c false if memory allocation fails, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_seektable_template_append_placeholders(FLAC__StreamMetadata *object, unsigned num);
-
-/** Append a specific seek point template to the end of a seek table.
- *
- * \note
- * As with the other ..._seektable_template_... functions, you should
- * call FLAC__metadata_object_seektable_template_sort() when finished
- * to make the seek table legal.
- *
- * \param object  A pointer to an existing SEEKTABLE object.
- * \param sample_number  The sample number of the seek point template.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_SEEKTABLE \endcode
- * \retval FLAC__bool
- *    \c false if memory allocation fails, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_seektable_template_append_point(FLAC__StreamMetadata *object, FLAC__uint64 sample_number);
-
-/** Append specific seek point templates to the end of a seek table.
- *
- * \note
- * As with the other ..._seektable_template_... functions, you should
- * call FLAC__metadata_object_seektable_template_sort() when finished
- * to make the seek table legal.
- *
- * \param object  A pointer to an existing SEEKTABLE object.
- * \param sample_numbers  An array of sample numbers for the seek points.
- * \param num     The number of seek point templates to append.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_SEEKTABLE \endcode
- * \retval FLAC__bool
- *    \c false if memory allocation fails, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_seektable_template_append_points(FLAC__StreamMetadata *object, FLAC__uint64 sample_numbers[], unsigned num);
-
-/** Append a set of evenly-spaced seek point templates to the end of a
- *  seek table.
- *
- * \note
- * As with the other ..._seektable_template_... functions, you should
- * call FLAC__metadata_object_seektable_template_sort() when finished
- * to make the seek table legal.
- *
- * \param object  A pointer to an existing SEEKTABLE object.
- * \param num     The number of placeholder points to append.
- * \param total_samples  The total number of samples to be encoded;
- *                       the seekpoints will be spaced approximately
- *                       \a total_samples / \a num samples apart.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_SEEKTABLE \endcode
- *    \code total_samples > 0 \endcode
- * \retval FLAC__bool
- *    \c false if memory allocation fails, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_seektable_template_append_spaced_points(FLAC__StreamMetadata *object, unsigned num, FLAC__uint64 total_samples);
-
-/** Append a set of evenly-spaced seek point templates to the end of a
- *  seek table.
- *
- * \note
- * As with the other ..._seektable_template_... functions, you should
- * call FLAC__metadata_object_seektable_template_sort() when finished
- * to make the seek table legal.
- *
- * \param object  A pointer to an existing SEEKTABLE object.
- * \param samples The number of samples apart to space the placeholder
- *                points.  The first point will be at sample \c 0, the
- *                second at sample \a samples, then 2*\a samples, and
- *                so on.  As long as \a samples and \a total_samples
- *                are greater than \c 0, there will always be at least
- *                one seekpoint at sample \c 0.
- * \param total_samples  The total number of samples to be encoded;
- *                       the seekpoints will be spaced
- *                       \a samples samples apart.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_SEEKTABLE \endcode
- *    \code samples > 0 \endcode
- *    \code total_samples > 0 \endcode
- * \retval FLAC__bool
- *    \c false if memory allocation fails, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_seektable_template_append_spaced_points_by_samples(FLAC__StreamMetadata *object, unsigned samples, FLAC__uint64 total_samples);
-
-/** Sort a seek table's seek points according to the format specification,
- *  removing duplicates.
- *
- * \param object   A pointer to a seek table to be sorted.
- * \param compact  If \c false, behaves like FLAC__format_seektable_sort().
- *                 If \c true, duplicates are deleted and the seek table is
- *                 shrunk appropriately; the number of placeholder points
- *                 present in the seek table will be the same after the call
- *                 as before.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_SEEKTABLE \endcode
- * \retval FLAC__bool
- *    \c false if realloc() fails, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_seektable_template_sort(FLAC__StreamMetadata *object, FLAC__bool compact);
-
-/** Sets the vendor string in a VORBIS_COMMENT block.
- *
- *  For convenience, a trailing NUL is added to the entry if it doesn't have
- *  one already.
- *
- *  If \a copy is \c true, a copy of the entry is stored; otherwise, the object
- *  takes ownership of the \c entry.entry pointer.
- *
- *  \note If this function returns \c false, the caller still owns the
- *  pointer.
- *
- * \param object  A pointer to an existing VORBIS_COMMENT object.
- * \param entry   The entry to set the vendor string to.
- * \param copy    See above.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT \endcode
- *    \code (entry.entry != NULL && entry.length > 0) ||
- * (entry.entry == NULL && entry.length == 0) \endcode
- * \retval FLAC__bool
- *    \c false if memory allocation fails or \a entry does not comply with the
- *    Vorbis comment specification, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_set_vendor_string(FLAC__StreamMetadata *object, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy);
-
-/** Resize the comment array.
- *
- *  If the size shrinks, elements will truncated; if it grows, new empty
- *  fields will be added to the end.
- *
- * \param object            A pointer to an existing VORBIS_COMMENT object.
- * \param new_num_comments  The desired length of the array; may be \c 0.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT \endcode
- *    \code (object->data.vorbis_comment.comments == NULL && object->data.vorbis_comment.num_comments == 0) ||
- * (object->data.vorbis_comment.comments != NULL && object->data.vorbis_comment.num_comments > 0) \endcode
- * \retval FLAC__bool
- *    \c false if memory allocation fails, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_resize_comments(FLAC__StreamMetadata *object, unsigned new_num_comments);
-
-/** Sets a comment in a VORBIS_COMMENT block.
- *
- *  For convenience, a trailing NUL is added to the entry if it doesn't have
- *  one already.
- *
- *  If \a copy is \c true, a copy of the entry is stored; otherwise, the object
- *  takes ownership of the \c entry.entry pointer.
- *
- *  \note If this function returns \c false, the caller still owns the
- *  pointer.
- *
- * \param object       A pointer to an existing VORBIS_COMMENT object.
- * \param comment_num  Index into comment array to set.
- * \param entry        The entry to set the comment to.
- * \param copy         See above.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT \endcode
- *    \code comment_num < object->data.vorbis_comment.num_comments \endcode
- *    \code (entry.entry != NULL && entry.length > 0) ||
- * (entry.entry == NULL && entry.length == 0) \endcode
- * \retval FLAC__bool
- *    \c false if memory allocation fails or \a entry does not comply with the
- *    Vorbis comment specification, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_set_comment(FLAC__StreamMetadata *object, unsigned comment_num, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy);
-
-/** Insert a comment in a VORBIS_COMMENT block at the given index.
- *
- *  For convenience, a trailing NUL is added to the entry if it doesn't have
- *  one already.
- *
- *  If \a copy is \c true, a copy of the entry is stored; otherwise, the object
- *  takes ownership of the \c entry.entry pointer.
- *
- *  \note If this function returns \c false, the caller still owns the
- *  pointer.
- *
- * \param object       A pointer to an existing VORBIS_COMMENT object.
- * \param comment_num  The index at which to insert the comment.  The comments
- *                     at and after \a comment_num move right one position.
- *                     To append a comment to the end, set \a comment_num to
- *                     \c object->data.vorbis_comment.num_comments .
- * \param entry        The comment to insert.
- * \param copy         See above.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT \endcode
- *    \code object->data.vorbis_comment.num_comments >= comment_num \endcode
- *    \code (entry.entry != NULL && entry.length > 0) ||
- * (entry.entry == NULL && entry.length == 0 && copy == false) \endcode
- * \retval FLAC__bool
- *    \c false if memory allocation fails or \a entry does not comply with the
- *    Vorbis comment specification, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_insert_comment(FLAC__StreamMetadata *object, unsigned comment_num, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy);
-
-/** Appends a comment to a VORBIS_COMMENT block.
- *
- *  For convenience, a trailing NUL is added to the entry if it doesn't have
- *  one already.
- *
- *  If \a copy is \c true, a copy of the entry is stored; otherwise, the object
- *  takes ownership of the \c entry.entry pointer.
- *
- *  \note If this function returns \c false, the caller still owns the
- *  pointer.
- *
- * \param object       A pointer to an existing VORBIS_COMMENT object.
- * \param entry        The comment to insert.
- * \param copy         See above.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT \endcode
- *    \code (entry.entry != NULL && entry.length > 0) ||
- * (entry.entry == NULL && entry.length == 0 && copy == false) \endcode
- * \retval FLAC__bool
- *    \c false if memory allocation fails or \a entry does not comply with the
- *    Vorbis comment specification, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_append_comment(FLAC__StreamMetadata *object, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy);
-
-/** Replaces comments in a VORBIS_COMMENT block with a new one.
- *
- *  For convenience, a trailing NUL is added to the entry if it doesn't have
- *  one already.
- *
- *  Depending on the the value of \a all, either all or just the first comment
- *  whose field name(s) match the given entry's name will be replaced by the
- *  given entry.  If no comments match, \a entry will simply be appended.
- *
- *  If \a copy is \c true, a copy of the entry is stored; otherwise, the object
- *  takes ownership of the \c entry.entry pointer.
- *
- *  \note If this function returns \c false, the caller still owns the
- *  pointer.
- *
- * \param object       A pointer to an existing VORBIS_COMMENT object.
- * \param entry        The comment to insert.
- * \param all          If \c true, all comments whose field name matches
- *                     \a entry's field name will be removed, and \a entry will
- *                     be inserted at the position of the first matching
- *                     comment.  If \c false, only the first comment whose
- *                     field name matches \a entry's field name will be
- *                     replaced with \a entry.
- * \param copy         See above.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT \endcode
- *    \code (entry.entry != NULL && entry.length > 0) ||
- * (entry.entry == NULL && entry.length == 0 && copy == false) \endcode
- * \retval FLAC__bool
- *    \c false if memory allocation fails or \a entry does not comply with the
- *    Vorbis comment specification, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_replace_comment(FLAC__StreamMetadata *object, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool all, FLAC__bool copy);
-
-/** Delete a comment in a VORBIS_COMMENT block at the given index.
- *
- * \param object       A pointer to an existing VORBIS_COMMENT object.
- * \param comment_num  The index of the comment to delete.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT \endcode
- *    \code object->data.vorbis_comment.num_comments > comment_num \endcode
- * \retval FLAC__bool
- *    \c false if realloc() fails, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_delete_comment(FLAC__StreamMetadata *object, unsigned comment_num);
-
-/** Creates a Vorbis comment entry from NUL-terminated name and value strings.
- *
- *  On return, the filled-in \a entry->entry pointer will point to malloc()ed
- *  memory and shall be owned by the caller.  For convenience the entry will
- *  have a terminating NUL.
- *
- * \param entry              A pointer to a Vorbis comment entry.  The entry's
- *                           \c entry pointer should not point to allocated
- *                           memory as it will be overwritten.
- * \param field_name         The field name in ASCII, \c NUL terminated.
- * \param field_value        The field value in UTF-8, \c NUL terminated.
- * \assert
- *    \code entry != NULL \endcode
- *    \code field_name != NULL \endcode
- *    \code field_value != NULL \endcode
- * \retval FLAC__bool
- *    \c false if malloc() fails, or if \a field_name or \a field_value does
- *    not comply with the Vorbis comment specification, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair(FLAC__StreamMetadata_VorbisComment_Entry *entry, const char *field_name, const char *field_value);
-
-/** Splits a Vorbis comment entry into NUL-terminated name and value strings.
- *
- *  The returned pointers to name and value will be allocated by malloc()
- *  and shall be owned by the caller.
- *
- * \param entry              An existing Vorbis comment entry.
- * \param field_name         The address of where the returned pointer to the
- *                           field name will be stored.
- * \param field_value        The address of where the returned pointer to the
- *                           field value will be stored.
- * \assert
- *    \code (entry.entry != NULL && entry.length > 0) \endcode
- *    \code memchr(entry.entry, '=', entry.length) != NULL \endcode
- *    \code field_name != NULL \endcode
- *    \code field_value != NULL \endcode
- * \retval FLAC__bool
- *    \c false if memory allocation fails or \a entry does not comply with the
- *    Vorbis comment specification, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_entry_to_name_value_pair(const FLAC__StreamMetadata_VorbisComment_Entry entry, char **field_name, char **field_value);
-
-/** Check if the given Vorbis comment entry's field name matches the given
- *  field name.
- *
- * \param entry              An existing Vorbis comment entry.
- * \param field_name         The field name to check.
- * \param field_name_length  The length of \a field_name, not including the
- *                           terminating \c NUL.
- * \assert
- *    \code (entry.entry != NULL && entry.length > 0) \endcode
- * \retval FLAC__bool
- *    \c true if the field names match, else \c false
- */
-FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_entry_matches(const FLAC__StreamMetadata_VorbisComment_Entry entry, const char *field_name, unsigned field_name_length);
-
-/** Find a Vorbis comment with the given field name.
- *
- *  The search begins at entry number \a offset; use an offset of 0 to
- *  search from the beginning of the comment array.
- *
- * \param object      A pointer to an existing VORBIS_COMMENT object.
- * \param offset      The offset into the comment array from where to start
- *                    the search.
- * \param field_name  The field name of the comment to find.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT \endcode
- *    \code field_name != NULL \endcode
- * \retval int
- *    The offset in the comment array of the first comment whose field
- *    name matches \a field_name, or \c -1 if no match was found.
- */
-FLAC_API int FLAC__metadata_object_vorbiscomment_find_entry_from(const FLAC__StreamMetadata *object, unsigned offset, const char *field_name);
-
-/** Remove first Vorbis comment matching the given field name.
- *
- * \param object      A pointer to an existing VORBIS_COMMENT object.
- * \param field_name  The field name of comment to delete.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT \endcode
- * \retval int
- *    \c -1 for memory allocation error, \c 0 for no matching entries,
- *    \c 1 for one matching entry deleted.
- */
-FLAC_API int FLAC__metadata_object_vorbiscomment_remove_entry_matching(FLAC__StreamMetadata *object, const char *field_name);
-
-/** Remove all Vorbis comments matching the given field name.
- *
- * \param object      A pointer to an existing VORBIS_COMMENT object.
- * \param field_name  The field name of comments to delete.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT \endcode
- * \retval int
- *    \c -1 for memory allocation error, \c 0 for no matching entries,
- *    else the number of matching entries deleted.
- */
-FLAC_API int FLAC__metadata_object_vorbiscomment_remove_entries_matching(FLAC__StreamMetadata *object, const char *field_name);
-
-/** Create a new CUESHEET track instance.
- *
- *  The object will be "empty"; i.e. values and data pointers will be \c 0.
- *
- * \retval FLAC__StreamMetadata_CueSheet_Track*
- *    \c NULL if there was an error allocating memory, else the new instance.
- */
-FLAC_API FLAC__StreamMetadata_CueSheet_Track *FLAC__metadata_object_cuesheet_track_new(void);
-
-/** Create a copy of an existing CUESHEET track object.
- *
- *  The copy is a "deep" copy, i.e. dynamically allocated data within the
- *  object is also copied.  The caller takes ownership of the new object and
- *  is responsible for freeing it with
- *  FLAC__metadata_object_cuesheet_track_delete().
- *
- * \param object  Pointer to object to copy.
- * \assert
- *    \code object != NULL \endcode
- * \retval FLAC__StreamMetadata_CueSheet_Track*
- *    \c NULL if there was an error allocating memory, else the new instance.
- */
-FLAC_API FLAC__StreamMetadata_CueSheet_Track *FLAC__metadata_object_cuesheet_track_clone(const FLAC__StreamMetadata_CueSheet_Track *object);
-
-/** Delete a CUESHEET track object
- *
- * \param object       A pointer to an existing CUESHEET track object.
- * \assert
- *    \code object != NULL \endcode
- */
-FLAC_API void FLAC__metadata_object_cuesheet_track_delete(FLAC__StreamMetadata_CueSheet_Track *object);
-
-/** Resize a track's index point array.
- *
- *  If the size shrinks, elements will truncated; if it grows, new blank
- *  indices will be added to the end.
- *
- * \param object           A pointer to an existing CUESHEET object.
- * \param track_num        The index of the track to modify.  NOTE: this is not
- *                         necessarily the same as the track's \a number field.
- * \param new_num_indices  The desired length of the array; may be \c 0.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_CUESHEET \endcode
- *    \code object->data.cue_sheet.num_tracks > track_num \endcode
- *    \code (object->data.cue_sheet.tracks[track_num].indices == NULL && object->data.cue_sheet.tracks[track_num].num_indices == 0) ||
- * (object->data.cue_sheet.tracks[track_num].indices != NULL && object->data.cue_sheet.tracks[track_num].num_indices > 0) \endcode
- * \retval FLAC__bool
- *    \c false if memory allocation error, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_track_resize_indices(FLAC__StreamMetadata *object, unsigned track_num, unsigned new_num_indices);
-
-/** Insert an index point in a CUESHEET track at the given index.
- *
- * \param object       A pointer to an existing CUESHEET object.
- * \param track_num    The index of the track to modify.  NOTE: this is not
- *                     necessarily the same as the track's \a number field.
- * \param index_num    The index into the track's index array at which to
- *                     insert the index point.  NOTE: this is not necessarily
- *                     the same as the index point's \a number field.  The
- *                     indices at and after \a index_num move right one
- *                     position.  To append an index point to the end, set
- *                     \a index_num to
- *                     \c object->data.cue_sheet.tracks[track_num].num_indices .
- * \param index        The index point to insert.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_CUESHEET \endcode
- *    \code object->data.cue_sheet.num_tracks > track_num \endcode
- *    \code object->data.cue_sheet.tracks[track_num].num_indices >= index_num \endcode
- * \retval FLAC__bool
- *    \c false if realloc() fails, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_track_insert_index(FLAC__StreamMetadata *object, unsigned track_num, unsigned index_num, FLAC__StreamMetadata_CueSheet_Index index);
-
-/** Insert a blank index point in a CUESHEET track at the given index.
- *
- *  A blank index point is one in which all field values are zero.
- *
- * \param object       A pointer to an existing CUESHEET object.
- * \param track_num    The index of the track to modify.  NOTE: this is not
- *                     necessarily the same as the track's \a number field.
- * \param index_num    The index into the track's index array at which to
- *                     insert the index point.  NOTE: this is not necessarily
- *                     the same as the index point's \a number field.  The
- *                     indices at and after \a index_num move right one
- *                     position.  To append an index point to the end, set
- *                     \a index_num to
- *                     \c object->data.cue_sheet.tracks[track_num].num_indices .
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_CUESHEET \endcode
- *    \code object->data.cue_sheet.num_tracks > track_num \endcode
- *    \code object->data.cue_sheet.tracks[track_num].num_indices >= index_num \endcode
- * \retval FLAC__bool
- *    \c false if realloc() fails, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_track_insert_blank_index(FLAC__StreamMetadata *object, unsigned track_num, unsigned index_num);
-
-/** Delete an index point in a CUESHEET track at the given index.
- *
- * \param object       A pointer to an existing CUESHEET object.
- * \param track_num    The index into the track array of the track to
- *                     modify.  NOTE: this is not necessarily the same
- *                     as the track's \a number field.
- * \param index_num    The index into the track's index array of the index
- *                     to delete.  NOTE: this is not necessarily the same
- *                     as the index's \a number field.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_CUESHEET \endcode
- *    \code object->data.cue_sheet.num_tracks > track_num \endcode
- *    \code object->data.cue_sheet.tracks[track_num].num_indices > index_num \endcode
- * \retval FLAC__bool
- *    \c false if realloc() fails, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_track_delete_index(FLAC__StreamMetadata *object, unsigned track_num, unsigned index_num);
-
-/** Resize the track array.
- *
- *  If the size shrinks, elements will truncated; if it grows, new blank
- *  tracks will be added to the end.
- *
- * \param object            A pointer to an existing CUESHEET object.
- * \param new_num_tracks    The desired length of the array; may be \c 0.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_CUESHEET \endcode
- *    \code (object->data.cue_sheet.tracks == NULL && object->data.cue_sheet.num_tracks == 0) ||
- * (object->data.cue_sheet.tracks != NULL && object->data.cue_sheet.num_tracks > 0) \endcode
- * \retval FLAC__bool
- *    \c false if memory allocation error, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_resize_tracks(FLAC__StreamMetadata *object, unsigned new_num_tracks);
-
-/** Sets a track in a CUESHEET block.
- *
- *  If \a copy is \c true, a copy of the track is stored; otherwise, the object
- *  takes ownership of the \a track pointer.
- *
- * \param object       A pointer to an existing CUESHEET object.
- * \param track_num    Index into track array to set.  NOTE: this is not
- *                     necessarily the same as the track's \a number field.
- * \param track        The track to set the track to.  You may safely pass in
- *                     a const pointer if \a copy is \c true.
- * \param copy         See above.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_CUESHEET \endcode
- *    \code track_num < object->data.cue_sheet.num_tracks \endcode
- *    \code (track->indices != NULL && track->num_indices > 0) ||
- * (track->indices == NULL && track->num_indices == 0)
- * \retval FLAC__bool
- *    \c false if \a copy is \c true and malloc() fails, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_set_track(FLAC__StreamMetadata *object, unsigned track_num, FLAC__StreamMetadata_CueSheet_Track *track, FLAC__bool copy);
-
-/** Insert a track in a CUESHEET block at the given index.
- *
- *  If \a copy is \c true, a copy of the track is stored; otherwise, the object
- *  takes ownership of the \a track pointer.
- *
- * \param object       A pointer to an existing CUESHEET object.
- * \param track_num    The index at which to insert the track.  NOTE: this
- *                     is not necessarily the same as the track's \a number
- *                     field.  The tracks at and after \a track_num move right
- *                     one position.  To append a track to the end, set
- *                     \a track_num to \c object->data.cue_sheet.num_tracks .
- * \param track        The track to insert.  You may safely pass in a const
- *                     pointer if \a copy is \c true.
- * \param copy         See above.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_CUESHEET \endcode
- *    \code object->data.cue_sheet.num_tracks >= track_num \endcode
- * \retval FLAC__bool
- *    \c false if \a copy is \c true and malloc() fails, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_insert_track(FLAC__StreamMetadata *object, unsigned track_num, FLAC__StreamMetadata_CueSheet_Track *track, FLAC__bool copy);
-
-/** Insert a blank track in a CUESHEET block at the given index.
- *
- *  A blank track is one in which all field values are zero.
- *
- * \param object       A pointer to an existing CUESHEET object.
- * \param track_num    The index at which to insert the track.  NOTE: this
- *                     is not necessarily the same as the track's \a number
- *                     field.  The tracks at and after \a track_num move right
- *                     one position.  To append a track to the end, set
- *                     \a track_num to \c object->data.cue_sheet.num_tracks .
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_CUESHEET \endcode
- *    \code object->data.cue_sheet.num_tracks >= track_num \endcode
- * \retval FLAC__bool
- *    \c false if \a copy is \c true and malloc() fails, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_insert_blank_track(FLAC__StreamMetadata *object, unsigned track_num);
-
-/** Delete a track in a CUESHEET block at the given index.
- *
- * \param object       A pointer to an existing CUESHEET object.
- * \param track_num    The index into the track array of the track to
- *                     delete.  NOTE: this is not necessarily the same
- *                     as the track's \a number field.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_CUESHEET \endcode
- *    \code object->data.cue_sheet.num_tracks > track_num \endcode
- * \retval FLAC__bool
- *    \c false if realloc() fails, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_delete_track(FLAC__StreamMetadata *object, unsigned track_num);
-
-/** Check a cue sheet to see if it conforms to the FLAC specification.
- *  See the format specification for limits on the contents of the
- *  cue sheet.
- *
- * \param object     A pointer to an existing CUESHEET object.
- * \param check_cd_da_subset  If \c true, check CUESHEET against more
- *                   stringent requirements for a CD-DA (audio) disc.
- * \param violation  Address of a pointer to a string.  If there is a
- *                   violation, a pointer to a string explanation of the
- *                   violation will be returned here. \a violation may be
- *                   \c NULL if you don't need the returned string.  Do not
- *                   free the returned string; it will always point to static
- *                   data.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_CUESHEET \endcode
- * \retval FLAC__bool
- *    \c false if cue sheet is illegal, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_is_legal(const FLAC__StreamMetadata *object, FLAC__bool check_cd_da_subset, const char **violation);
-
-/** Calculate and return the CDDB/freedb ID for a cue sheet.  The function
- *  assumes the cue sheet corresponds to a CD; the result is undefined
- *  if the cuesheet's is_cd bit is not set.
- *
- * \param object     A pointer to an existing CUESHEET object.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_CUESHEET \endcode
- * \retval FLAC__uint32
- *    The unsigned integer representation of the CDDB/freedb ID
- */
-FLAC_API FLAC__uint32 FLAC__metadata_object_cuesheet_calculate_cddb_id(const FLAC__StreamMetadata *object);
-
-/** Sets the MIME type of a PICTURE block.
- *
- *  If \a copy is \c true, a copy of the string is stored; otherwise, the object
- *  takes ownership of the pointer.  The existing string will be freed if this
- *  function is successful, otherwise the original string will remain if \a copy
- *  is \c true and malloc() fails.
- *
- * \note It is safe to pass a const pointer to \a mime_type if \a copy is \c true.
- *
- * \param object      A pointer to an existing PICTURE object.
- * \param mime_type   A pointer to the MIME type string.  The string must be
- *                    ASCII characters 0x20-0x7e, NUL-terminated.  No validation
- *                    is done.
- * \param copy        See above.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_PICTURE \endcode
- *    \code (mime_type != NULL) \endcode
- * \retval FLAC__bool
- *    \c false if \a copy is \c true and malloc() fails, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_picture_set_mime_type(FLAC__StreamMetadata *object, char *mime_type, FLAC__bool copy);
-
-/** Sets the description of a PICTURE block.
- *
- *  If \a copy is \c true, a copy of the string is stored; otherwise, the object
- *  takes ownership of the pointer.  The existing string will be freed if this
- *  function is successful, otherwise the original string will remain if \a copy
- *  is \c true and malloc() fails.
- *
- * \note It is safe to pass a const pointer to \a description if \a copy is \c true.
- *
- * \param object      A pointer to an existing PICTURE object.
- * \param description A pointer to the description string.  The string must be
- *                    valid UTF-8, NUL-terminated.  No validation is done.
- * \param copy        See above.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_PICTURE \endcode
- *    \code (description != NULL) \endcode
- * \retval FLAC__bool
- *    \c false if \a copy is \c true and malloc() fails, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_picture_set_description(FLAC__StreamMetadata *object, FLAC__byte *description, FLAC__bool copy);
-
-/** Sets the picture data of a PICTURE block.
- *
- *  If \a copy is \c true, a copy of the data is stored; otherwise, the object
- *  takes ownership of the pointer.  Also sets the \a data_length field of the
- *  metadata object to what is passed in as the \a length parameter.  The
- *  existing data will be freed if this function is successful, otherwise the
- *  original data and data_length will remain if \a copy is \c true and
- *  malloc() fails.
- *
- * \note It is safe to pass a const pointer to \a data if \a copy is \c true.
- *
- * \param object  A pointer to an existing PICTURE object.
- * \param data    A pointer to the data to set.
- * \param length  The length of \a data in bytes.
- * \param copy    See above.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_PICTURE \endcode
- *    \code (data != NULL && length > 0) ||
- * (data == NULL && length == 0 && copy == false) \endcode
- * \retval FLAC__bool
- *    \c false if \a copy is \c true and malloc() fails, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_picture_set_data(FLAC__StreamMetadata *object, FLAC__byte *data, FLAC__uint32 length, FLAC__bool copy);
-
-/** Check a PICTURE block to see if it conforms to the FLAC specification.
- *  See the format specification for limits on the contents of the
- *  PICTURE block.
- *
- * \param object     A pointer to existing PICTURE block to be checked.
- * \param violation  Address of a pointer to a string.  If there is a
- *                   violation, a pointer to a string explanation of the
- *                   violation will be returned here. \a violation may be
- *                   \c NULL if you don't need the returned string.  Do not
- *                   free the returned string; it will always point to static
- *                   data.
- * \assert
- *    \code object != NULL \endcode
- *    \code object->type == FLAC__METADATA_TYPE_PICTURE \endcode
- * \retval FLAC__bool
- *    \c false if PICTURE block is illegal, else \c true.
- */
-FLAC_API FLAC__bool FLAC__metadata_object_picture_is_legal(const FLAC__StreamMetadata *object, const char **violation);
-
-/* \} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib-x86-64/include/FLAC/ordinals.h b/lib-x86-64/include/FLAC/ordinals.h
deleted file mode 100644
index a7a5cd96..00000000
--- a/lib-x86-64/include/FLAC/ordinals.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007  Josh Coalson
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - 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.
- *
- * - Neither the name of the Xiph.org Foundation nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * 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 FOUNDATION 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 FLAC__ORDINALS_H
-#define FLAC__ORDINALS_H
-
-#if !(defined(_MSC_VER) || defined(__BORLANDC__) || defined(__EMX__))
-#include <inttypes.h>
-#endif
-
-typedef signed char FLAC__int8;
-typedef unsigned char FLAC__uint8;
-
-#if defined(_MSC_VER) || defined(__BORLANDC__)
-typedef __int16 FLAC__int16;
-typedef __int32 FLAC__int32;
-typedef __int64 FLAC__int64;
-typedef unsigned __int16 FLAC__uint16;
-typedef unsigned __int32 FLAC__uint32;
-typedef unsigned __int64 FLAC__uint64;
-#elif defined(__EMX__)
-typedef short FLAC__int16;
-typedef long FLAC__int32;
-typedef long long FLAC__int64;
-typedef unsigned short FLAC__uint16;
-typedef unsigned long FLAC__uint32;
-typedef unsigned long long FLAC__uint64;
-#else
-typedef int16_t FLAC__int16;
-typedef int32_t FLAC__int32;
-typedef int64_t FLAC__int64;
-typedef uint16_t FLAC__uint16;
-typedef uint32_t FLAC__uint32;
-typedef uint64_t FLAC__uint64;
-#endif
-
-typedef int FLAC__bool;
-
-typedef FLAC__uint8 FLAC__byte;
-
-#ifdef true
-#undef true
-#endif
-#ifdef false
-#undef false
-#endif
-#ifndef __cplusplus
-#define true 1
-#define false 0
-#endif
-
-#endif
diff --git a/lib-x86-64/include/FLAC/stream_decoder.h b/lib-x86-64/include/FLAC/stream_decoder.h
deleted file mode 100644
index 9ac15947..00000000
--- a/lib-x86-64/include/FLAC/stream_decoder.h
+++ /dev/null
@@ -1,1559 +0,0 @@
-/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007  Josh Coalson
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - 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.
- *
- * - Neither the name of the Xiph.org Foundation nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * 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 FOUNDATION 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 FLAC__STREAM_DECODER_H
-#define FLAC__STREAM_DECODER_H
-
-#include <stdio.h> /* for FILE */
-#include "export.h"
-#include "format.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/** \file include/FLAC/stream_decoder.h
- *
- *  \brief
- *  This module contains the functions which implement the stream
- *  decoder.
- *
- *  See the detailed documentation in the
- *  \link flac_stream_decoder stream decoder \endlink module.
- */
-
-/** \defgroup flac_decoder FLAC/ \*_decoder.h: decoder interfaces
- *  \ingroup flac
- *
- *  \brief
- *  This module describes the decoder layers provided by libFLAC.
- *
- * The stream decoder can be used to decode complete streams either from
- * the client via callbacks, or directly from a file, depending on how
- * it is initialized.  When decoding via callbacks, the client provides
- * callbacks for reading FLAC data and writing decoded samples, and
- * handling metadata and errors.  If the client also supplies seek-related
- * callback, the decoder function for sample-accurate seeking within the
- * FLAC input is also available.  When decoding from a file, the client
- * needs only supply a filename or open \c FILE* and write/metadata/error
- * callbacks; the rest of the callbacks are supplied internally.  For more
- * info see the \link flac_stream_decoder stream decoder \endlink module.
- */
-
-/** \defgroup flac_stream_decoder FLAC/stream_decoder.h: stream decoder interface
- *  \ingroup flac_decoder
- *
- *  \brief
- *  This module contains the functions which implement the stream
- *  decoder.
- *
- * The stream decoder can decode native FLAC, and optionally Ogg FLAC
- * (check FLAC_API_SUPPORTS_OGG_FLAC) streams and files.
- *
- * The basic usage of this decoder is as follows:
- * - The program creates an instance of a decoder using
- *   FLAC__stream_decoder_new().
- * - The program overrides the default settings using
- *   FLAC__stream_decoder_set_*() functions.
- * - The program initializes the instance to validate the settings and
- *   prepare for decoding using
- *   - FLAC__stream_decoder_init_stream() or FLAC__stream_decoder_init_FILE()
- *     or FLAC__stream_decoder_init_file() for native FLAC,
- *   - FLAC__stream_decoder_init_ogg_stream() or FLAC__stream_decoder_init_ogg_FILE()
- *     or FLAC__stream_decoder_init_ogg_file() for Ogg FLAC
- * - The program calls the FLAC__stream_decoder_process_*() functions
- *   to decode data, which subsequently calls the callbacks.
- * - The program finishes the decoding with FLAC__stream_decoder_finish(),
- *   which flushes the input and output and resets the decoder to the
- *   uninitialized state.
- * - The instance may be used again or deleted with
- *   FLAC__stream_decoder_delete().
- *
- * In more detail, the program will create a new instance by calling
- * FLAC__stream_decoder_new(), then call FLAC__stream_decoder_set_*()
- * functions to override the default decoder options, and call
- * one of the FLAC__stream_decoder_init_*() functions.
- *
- * There are three initialization functions for native FLAC, one for
- * setting up the decoder to decode FLAC data from the client via
- * callbacks, and two for decoding directly from a FLAC file.
- *
- * For decoding via callbacks, use FLAC__stream_decoder_init_stream().
- * You must also supply several callbacks for handling I/O.  Some (like
- * seeking) are optional, depending on the capabilities of the input.
- *
- * For decoding directly from a file, use FLAC__stream_decoder_init_FILE()
- * or FLAC__stream_decoder_init_file().  Then you must only supply an open
- * \c FILE* or filename and fewer callbacks; the decoder will handle
- * the other callbacks internally.
- *
- * There are three similarly-named init functions for decoding from Ogg
- * FLAC streams.  Check \c FLAC_API_SUPPORTS_OGG_FLAC to find out if the
- * library has been built with Ogg support.
- *
- * Once the decoder is initialized, your program will call one of several
- * functions to start the decoding process:
- *
- * - FLAC__stream_decoder_process_single() - Tells the decoder to process at
- *   most one metadata block or audio frame and return, calling either the
- *   metadata callback or write callback, respectively, once.  If the decoder
- *   loses sync it will return with only the error callback being called.
- * - FLAC__stream_decoder_process_until_end_of_metadata() - Tells the decoder
- *   to process the stream from the current location and stop upon reaching
- *   the first audio frame.  The client will get one metadata, write, or error
- *   callback per metadata block, audio frame, or sync error, respectively.
- * - FLAC__stream_decoder_process_until_end_of_stream() - Tells the decoder
- *   to process the stream from the current location until the read callback
- *   returns FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM or
- *   FLAC__STREAM_DECODER_READ_STATUS_ABORT.  The client will get one metadata,
- *   write, or error callback per metadata block, audio frame, or sync error,
- *   respectively.
- *
- * When the decoder has finished decoding (normally or through an abort),
- * the instance is finished by calling FLAC__stream_decoder_finish(), which
- * ensures the decoder is in the correct state and frees memory.  Then the
- * instance may be deleted with FLAC__stream_decoder_delete() or initialized
- * again to decode another stream.
- *
- * Seeking is exposed through the FLAC__stream_decoder_seek_absolute() method.
- * At any point after the stream decoder has been initialized, the client can
- * call this function to seek to an exact sample within the stream.
- * Subsequently, the first time the write callback is called it will be
- * passed a (possibly partial) block starting at that sample.
- *
- * If the client cannot seek via the callback interface provided, but still
- * has another way of seeking, it can flush the decoder using
- * FLAC__stream_decoder_flush() and start feeding data from the new position
- * through the read callback.
- *
- * The stream decoder also provides MD5 signature checking.  If this is
- * turned on before initialization, FLAC__stream_decoder_finish() will
- * report when the decoded MD5 signature does not match the one stored
- * in the STREAMINFO block.  MD5 checking is automatically turned off
- * (until the next FLAC__stream_decoder_reset()) if there is no signature
- * in the STREAMINFO block or when a seek is attempted.
- *
- * The FLAC__stream_decoder_set_metadata_*() functions deserve special
- * attention.  By default, the decoder only calls the metadata_callback for
- * the STREAMINFO block.  These functions allow you to tell the decoder
- * explicitly which blocks to parse and return via the metadata_callback
- * and/or which to skip.  Use a FLAC__stream_decoder_set_metadata_respond_all(),
- * FLAC__stream_decoder_set_metadata_ignore() ... or FLAC__stream_decoder_set_metadata_ignore_all(),
- * FLAC__stream_decoder_set_metadata_respond() ... sequence to exactly specify
- * which blocks to return.  Remember that metadata blocks can potentially
- * be big (for example, cover art) so filtering out the ones you don't
- * use can reduce the memory requirements of the decoder.  Also note the
- * special forms FLAC__stream_decoder_set_metadata_respond_application(id)
- * and FLAC__stream_decoder_set_metadata_ignore_application(id) for
- * filtering APPLICATION blocks based on the application ID.
- *
- * STREAMINFO and SEEKTABLE blocks are always parsed and used internally, but
- * they still can legally be filtered from the metadata_callback.
- *
- * \note
- * The "set" functions may only be called when the decoder is in the
- * state FLAC__STREAM_DECODER_UNINITIALIZED, i.e. after
- * FLAC__stream_decoder_new() or FLAC__stream_decoder_finish(), but
- * before FLAC__stream_decoder_init_*().  If this is the case they will
- * return \c true, otherwise \c false.
- *
- * \note
- * FLAC__stream_decoder_finish() resets all settings to the constructor
- * defaults, including the callbacks.
- *
- * \{
- */
-
-
-/** State values for a FLAC__StreamDecoder
- *
- * The decoder's state can be obtained by calling FLAC__stream_decoder_get_state().
- */
-typedef enum {
-
-	FLAC__STREAM_DECODER_SEARCH_FOR_METADATA = 0,
-	/**< The decoder is ready to search for metadata. */
-
-	FLAC__STREAM_DECODER_READ_METADATA,
-	/**< The decoder is ready to or is in the process of reading metadata. */
-
-	FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC,
-	/**< The decoder is ready to or is in the process of searching for the
-	 * frame sync code.
-	 */
-
-	FLAC__STREAM_DECODER_READ_FRAME,
-	/**< The decoder is ready to or is in the process of reading a frame. */
-
-	FLAC__STREAM_DECODER_END_OF_STREAM,
-	/**< The decoder has reached the end of the stream. */
-
-	FLAC__STREAM_DECODER_OGG_ERROR,
-	/**< An error occurred in the underlying Ogg layer.  */
-
-	FLAC__STREAM_DECODER_SEEK_ERROR,
-	/**< An error occurred while seeking.  The decoder must be flushed
-	 * with FLAC__stream_decoder_flush() or reset with
-	 * FLAC__stream_decoder_reset() before decoding can continue.
-	 */
-
-	FLAC__STREAM_DECODER_ABORTED,
-	/**< The decoder was aborted by the read callback. */
-
-	FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR,
-	/**< An error occurred allocating memory.  The decoder is in an invalid
-	 * state and can no longer be used.
-	 */
-
-	FLAC__STREAM_DECODER_UNINITIALIZED
-	/**< The decoder is in the uninitialized state; one of the
-	 * FLAC__stream_decoder_init_*() functions must be called before samples
-	 * can be processed.
-	 */
-
-} FLAC__StreamDecoderState;
-
-/** Maps a FLAC__StreamDecoderState to a C string.
- *
- *  Using a FLAC__StreamDecoderState as the index to this array
- *  will give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__StreamDecoderStateString[];
-
-
-/** Possible return values for the FLAC__stream_decoder_init_*() functions.
- */
-typedef enum {
-
-	FLAC__STREAM_DECODER_INIT_STATUS_OK = 0,
-	/**< Initialization was successful. */
-
-	FLAC__STREAM_DECODER_INIT_STATUS_UNSUPPORTED_CONTAINER,
-	/**< The library was not compiled with support for the given container
-	 * format.
-	 */
-
-	FLAC__STREAM_DECODER_INIT_STATUS_INVALID_CALLBACKS,
-	/**< A required callback was not supplied. */
-
-	FLAC__STREAM_DECODER_INIT_STATUS_MEMORY_ALLOCATION_ERROR,
-	/**< An error occurred allocating memory. */
-
-	FLAC__STREAM_DECODER_INIT_STATUS_ERROR_OPENING_FILE,
-	/**< fopen() failed in FLAC__stream_decoder_init_file() or
-	 * FLAC__stream_decoder_init_ogg_file(). */
-
-	FLAC__STREAM_DECODER_INIT_STATUS_ALREADY_INITIALIZED
-	/**< FLAC__stream_decoder_init_*() was called when the decoder was
-	 * already initialized, usually because
-	 * FLAC__stream_decoder_finish() was not called.
-	 */
-
-} FLAC__StreamDecoderInitStatus;
-
-/** Maps a FLAC__StreamDecoderInitStatus to a C string.
- *
- *  Using a FLAC__StreamDecoderInitStatus as the index to this array
- *  will give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__StreamDecoderInitStatusString[];
-
-
-/** Return values for the FLAC__StreamDecoder read callback.
- */
-typedef enum {
-
-	FLAC__STREAM_DECODER_READ_STATUS_CONTINUE,
-	/**< The read was OK and decoding can continue. */
-
-	FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM,
-	/**< The read was attempted while at the end of the stream.  Note that
-	 * the client must only return this value when the read callback was
-	 * called when already at the end of the stream.  Otherwise, if the read
-	 * itself moves to the end of the stream, the client should still return
-	 * the data and \c FLAC__STREAM_DECODER_READ_STATUS_CONTINUE, and then on
-	 * the next read callback it should return
-	 * \c FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM with a byte count
-	 * of \c 0.
-	 */
-
-	FLAC__STREAM_DECODER_READ_STATUS_ABORT
-	/**< An unrecoverable error occurred.  The decoder will return from the process call. */
-
-} FLAC__StreamDecoderReadStatus;
-
-/** Maps a FLAC__StreamDecoderReadStatus to a C string.
- *
- *  Using a FLAC__StreamDecoderReadStatus as the index to this array
- *  will give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__StreamDecoderReadStatusString[];
-
-
-/** Return values for the FLAC__StreamDecoder seek callback.
- */
-typedef enum {
-
-	FLAC__STREAM_DECODER_SEEK_STATUS_OK,
-	/**< The seek was OK and decoding can continue. */
-
-	FLAC__STREAM_DECODER_SEEK_STATUS_ERROR,
-	/**< An unrecoverable error occurred.  The decoder will return from the process call. */
-
-	FLAC__STREAM_DECODER_SEEK_STATUS_UNSUPPORTED
-	/**< Client does not support seeking. */
-
-} FLAC__StreamDecoderSeekStatus;
-
-/** Maps a FLAC__StreamDecoderSeekStatus to a C string.
- *
- *  Using a FLAC__StreamDecoderSeekStatus as the index to this array
- *  will give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__StreamDecoderSeekStatusString[];
-
-
-/** Return values for the FLAC__StreamDecoder tell callback.
- */
-typedef enum {
-
-	FLAC__STREAM_DECODER_TELL_STATUS_OK,
-	/**< The tell was OK and decoding can continue. */
-
-	FLAC__STREAM_DECODER_TELL_STATUS_ERROR,
-	/**< An unrecoverable error occurred.  The decoder will return from the process call. */
-
-	FLAC__STREAM_DECODER_TELL_STATUS_UNSUPPORTED
-	/**< Client does not support telling the position. */
-
-} FLAC__StreamDecoderTellStatus;
-
-/** Maps a FLAC__StreamDecoderTellStatus to a C string.
- *
- *  Using a FLAC__StreamDecoderTellStatus as the index to this array
- *  will give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__StreamDecoderTellStatusString[];
-
-
-/** Return values for the FLAC__StreamDecoder length callback.
- */
-typedef enum {
-
-	FLAC__STREAM_DECODER_LENGTH_STATUS_OK,
-	/**< The length call was OK and decoding can continue. */
-
-	FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR,
-	/**< An unrecoverable error occurred.  The decoder will return from the process call. */
-
-	FLAC__STREAM_DECODER_LENGTH_STATUS_UNSUPPORTED
-	/**< Client does not support reporting the length. */
-
-} FLAC__StreamDecoderLengthStatus;
-
-/** Maps a FLAC__StreamDecoderLengthStatus to a C string.
- *
- *  Using a FLAC__StreamDecoderLengthStatus as the index to this array
- *  will give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__StreamDecoderLengthStatusString[];
-
-
-/** Return values for the FLAC__StreamDecoder write callback.
- */
-typedef enum {
-
-	FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE,
-	/**< The write was OK and decoding can continue. */
-
-	FLAC__STREAM_DECODER_WRITE_STATUS_ABORT
-	/**< An unrecoverable error occurred.  The decoder will return from the process call. */
-
-} FLAC__StreamDecoderWriteStatus;
-
-/** Maps a FLAC__StreamDecoderWriteStatus to a C string.
- *
- *  Using a FLAC__StreamDecoderWriteStatus as the index to this array
- *  will give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__StreamDecoderWriteStatusString[];
-
-
-/** Possible values passed back to the FLAC__StreamDecoder error callback.
- *  \c FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC is the generic catch-
- *  all.  The rest could be caused by bad sync (false synchronization on
- *  data that is not the start of a frame) or corrupted data.  The error
- *  itself is the decoder's best guess at what happened assuming a correct
- *  sync.  For example \c FLAC__STREAM_DECODER_ERROR_STATUS_BAD_HEADER
- *  could be caused by a correct sync on the start of a frame, but some
- *  data in the frame header was corrupted.  Or it could be the result of
- *  syncing on a point the stream that looked like the starting of a frame
- *  but was not.  \c FLAC__STREAM_DECODER_ERROR_STATUS_UNPARSEABLE_STREAM
- *  could be because the decoder encountered a valid frame made by a future
- *  version of the encoder which it cannot parse, or because of a false
- *  sync making it appear as though an encountered frame was generated by
- *  a future encoder.
- */
-typedef enum {
-
-	FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC,
-	/**< An error in the stream caused the decoder to lose synchronization. */
-
-	FLAC__STREAM_DECODER_ERROR_STATUS_BAD_HEADER,
-	/**< The decoder encountered a corrupted frame header. */
-
-	FLAC__STREAM_DECODER_ERROR_STATUS_FRAME_CRC_MISMATCH,
-	/**< The frame's data did not match the CRC in the footer. */
-
-	FLAC__STREAM_DECODER_ERROR_STATUS_UNPARSEABLE_STREAM
-	/**< The decoder encountered reserved fields in use in the stream. */
-
-} FLAC__StreamDecoderErrorStatus;
-
-/** Maps a FLAC__StreamDecoderErrorStatus to a C string.
- *
- *  Using a FLAC__StreamDecoderErrorStatus as the index to this array
- *  will give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__StreamDecoderErrorStatusString[];
-
-
-/***********************************************************************
- *
- * class FLAC__StreamDecoder
- *
- ***********************************************************************/
-
-struct FLAC__StreamDecoderProtected;
-struct FLAC__StreamDecoderPrivate;
-/** The opaque structure definition for the stream decoder type.
- *  See the \link flac_stream_decoder stream decoder module \endlink
- *  for a detailed description.
- */
-typedef struct {
-	struct FLAC__StreamDecoderProtected *protected_; /* avoid the C++ keyword 'protected' */
-	struct FLAC__StreamDecoderPrivate *private_; /* avoid the C++ keyword 'private' */
-} FLAC__StreamDecoder;
-
-/** Signature for the read callback.
- *
- *  A function pointer matching this signature must be passed to
- *  FLAC__stream_decoder_init*_stream(). The supplied function will be
- *  called when the decoder needs more input data.  The address of the
- *  buffer to be filled is supplied, along with the number of bytes the
- *  buffer can hold.  The callback may choose to supply less data and
- *  modify the byte count but must be careful not to overflow the buffer.
- *  The callback then returns a status code chosen from
- *  FLAC__StreamDecoderReadStatus.
- *
- * Here is an example of a read callback for stdio streams:
- * \code
- * FLAC__StreamDecoderReadStatus read_cb(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data)
- * {
- *   FILE *file = ((MyClientData*)client_data)->file;
- *   if(*bytes > 0) {
- *     *bytes = fread(buffer, sizeof(FLAC__byte), *bytes, file);
- *     if(ferror(file))
- *       return FLAC__STREAM_DECODER_READ_STATUS_ABORT;
- *     else if(*bytes == 0)
- *       return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
- *     else
- *       return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
- *   }
- *   else
- *     return FLAC__STREAM_DECODER_READ_STATUS_ABORT;
- * }
- * \endcode
- *
- * \note In general, FLAC__StreamDecoder functions which change the
- * state should not be called on the \a decoder while in the callback.
- *
- * \param  decoder  The decoder instance calling the callback.
- * \param  buffer   A pointer to a location for the callee to store
- *                  data to be decoded.
- * \param  bytes    A pointer to the size of the buffer.  On entry
- *                  to the callback, it contains the maximum number
- *                  of bytes that may be stored in \a buffer.  The
- *                  callee must set it to the actual number of bytes
- *                  stored (0 in case of error or end-of-stream) before
- *                  returning.
- * \param  client_data  The callee's client data set through
- *                      FLAC__stream_decoder_init_*().
- * \retval FLAC__StreamDecoderReadStatus
- *    The callee's return status.  Note that the callback should return
- *    \c FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM if and only if
- *    zero bytes were read and there is no more data to be read.
- */
-typedef FLAC__StreamDecoderReadStatus (*FLAC__StreamDecoderReadCallback)(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data);
-
-/** Signature for the seek callback.
- *
- *  A function pointer matching this signature may be passed to
- *  FLAC__stream_decoder_init*_stream().  The supplied function will be
- *  called when the decoder needs to seek the input stream.  The decoder
- *  will pass the absolute byte offset to seek to, 0 meaning the
- *  beginning of the stream.
- *
- * Here is an example of a seek callback for stdio streams:
- * \code
- * FLAC__StreamDecoderSeekStatus seek_cb(const FLAC__StreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data)
- * {
- *   FILE *file = ((MyClientData*)client_data)->file;
- *   if(file == stdin)
- *     return FLAC__STREAM_DECODER_SEEK_STATUS_UNSUPPORTED;
- *   else if(fseeko(file, (off_t)absolute_byte_offset, SEEK_SET) < 0)
- *     return FLAC__STREAM_DECODER_SEEK_STATUS_ERROR;
- *   else
- *     return FLAC__STREAM_DECODER_SEEK_STATUS_OK;
- * }
- * \endcode
- *
- * \note In general, FLAC__StreamDecoder functions which change the
- * state should not be called on the \a decoder while in the callback.
- *
- * \param  decoder  The decoder instance calling the callback.
- * \param  absolute_byte_offset  The offset from the beginning of the stream
- *                               to seek to.
- * \param  client_data  The callee's client data set through
- *                      FLAC__stream_decoder_init_*().
- * \retval FLAC__StreamDecoderSeekStatus
- *    The callee's return status.
- */
-typedef FLAC__StreamDecoderSeekStatus (*FLAC__StreamDecoderSeekCallback)(const FLAC__StreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data);
-
-/** Signature for the tell callback.
- *
- *  A function pointer matching this signature may be passed to
- *  FLAC__stream_decoder_init*_stream().  The supplied function will be
- *  called when the decoder wants to know the current position of the
- *  stream.  The callback should return the byte offset from the
- *  beginning of the stream.
- *
- * Here is an example of a tell callback for stdio streams:
- * \code
- * FLAC__StreamDecoderTellStatus tell_cb(const FLAC__StreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data)
- * {
- *   FILE *file = ((MyClientData*)client_data)->file;
- *   off_t pos;
- *   if(file == stdin)
- *     return FLAC__STREAM_DECODER_TELL_STATUS_UNSUPPORTED;
- *   else if((pos = ftello(file)) < 0)
- *     return FLAC__STREAM_DECODER_TELL_STATUS_ERROR;
- *   else {
- *     *absolute_byte_offset = (FLAC__uint64)pos;
- *     return FLAC__STREAM_DECODER_TELL_STATUS_OK;
- *   }
- * }
- * \endcode
- *
- * \note In general, FLAC__StreamDecoder functions which change the
- * state should not be called on the \a decoder while in the callback.
- *
- * \param  decoder  The decoder instance calling the callback.
- * \param  absolute_byte_offset  A pointer to storage for the current offset
- *                               from the beginning of the stream.
- * \param  client_data  The callee's client data set through
- *                      FLAC__stream_decoder_init_*().
- * \retval FLAC__StreamDecoderTellStatus
- *    The callee's return status.
- */
-typedef FLAC__StreamDecoderTellStatus (*FLAC__StreamDecoderTellCallback)(const FLAC__StreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data);
-
-/** Signature for the length callback.
- *
- *  A function pointer matching this signature may be passed to
- *  FLAC__stream_decoder_init*_stream().  The supplied function will be
- *  called when the decoder wants to know the total length of the stream
- *  in bytes.
- *
- * Here is an example of a length callback for stdio streams:
- * \code
- * FLAC__StreamDecoderLengthStatus length_cb(const FLAC__StreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data)
- * {
- *   FILE *file = ((MyClientData*)client_data)->file;
- *   struct stat filestats;
- *
- *   if(file == stdin)
- *     return FLAC__STREAM_DECODER_LENGTH_STATUS_UNSUPPORTED;
- *   else if(fstat(fileno(file), &filestats) != 0)
- *     return FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR;
- *   else {
- *     *stream_length = (FLAC__uint64)filestats.st_size;
- *     return FLAC__STREAM_DECODER_LENGTH_STATUS_OK;
- *   }
- * }
- * \endcode
- *
- * \note In general, FLAC__StreamDecoder functions which change the
- * state should not be called on the \a decoder while in the callback.
- *
- * \param  decoder  The decoder instance calling the callback.
- * \param  stream_length  A pointer to storage for the length of the stream
- *                        in bytes.
- * \param  client_data  The callee's client data set through
- *                      FLAC__stream_decoder_init_*().
- * \retval FLAC__StreamDecoderLengthStatus
- *    The callee's return status.
- */
-typedef FLAC__StreamDecoderLengthStatus (*FLAC__StreamDecoderLengthCallback)(const FLAC__StreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data);
-
-/** Signature for the EOF callback.
- *
- *  A function pointer matching this signature may be passed to
- *  FLAC__stream_decoder_init*_stream().  The supplied function will be
- *  called when the decoder needs to know if the end of the stream has
- *  been reached.
- *
- * Here is an example of a EOF callback for stdio streams:
- * FLAC__bool eof_cb(const FLAC__StreamDecoder *decoder, void *client_data)
- * \code
- * {
- *   FILE *file = ((MyClientData*)client_data)->file;
- *   return feof(file)? true : false;
- * }
- * \endcode
- *
- * \note In general, FLAC__StreamDecoder functions which change the
- * state should not be called on the \a decoder while in the callback.
- *
- * \param  decoder  The decoder instance calling the callback.
- * \param  client_data  The callee's client data set through
- *                      FLAC__stream_decoder_init_*().
- * \retval FLAC__bool
- *    \c true if the currently at the end of the stream, else \c false.
- */
-typedef FLAC__bool (*FLAC__StreamDecoderEofCallback)(const FLAC__StreamDecoder *decoder, void *client_data);
-
-/** Signature for the write callback.
- *
- *  A function pointer matching this signature must be passed to one of
- *  the FLAC__stream_decoder_init_*() functions.
- *  The supplied function will be called when the decoder has decoded a
- *  single audio frame.  The decoder will pass the frame metadata as well
- *  as an array of pointers (one for each channel) pointing to the
- *  decoded audio.
- *
- * \note In general, FLAC__StreamDecoder functions which change the
- * state should not be called on the \a decoder while in the callback.
- *
- * \param  decoder  The decoder instance calling the callback.
- * \param  frame    The description of the decoded frame.  See
- *                  FLAC__Frame.
- * \param  buffer   An array of pointers to decoded channels of data.
- *                  Each pointer will point to an array of signed
- *                  samples of length \a frame->header.blocksize.
- *                  Channels will be ordered according to the FLAC
- *                  specification; see the documentation for the
- *                  <A HREF="../format.html#frame_header">frame header</A>.
- * \param  client_data  The callee's client data set through
- *                      FLAC__stream_decoder_init_*().
- * \retval FLAC__StreamDecoderWriteStatus
- *    The callee's return status.
- */
-typedef FLAC__StreamDecoderWriteStatus (*FLAC__StreamDecoderWriteCallback)(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
-
-/** Signature for the metadata callback.
- *
- *  A function pointer matching this signature must be passed to one of
- *  the FLAC__stream_decoder_init_*() functions.
- *  The supplied function will be called when the decoder has decoded a
- *  metadata block.  In a valid FLAC file there will always be one
- *  \c STREAMINFO block, followed by zero or more other metadata blocks.
- *  These will be supplied by the decoder in the same order as they
- *  appear in the stream and always before the first audio frame (i.e.
- *  write callback).  The metadata block that is passed in must not be
- *  modified, and it doesn't live beyond the callback, so you should make
- *  a copy of it with FLAC__metadata_object_clone() if you will need it
- *  elsewhere.  Since metadata blocks can potentially be large, by
- *  default the decoder only calls the metadata callback for the
- *  \c STREAMINFO block; you can instruct the decoder to pass or filter
- *  other blocks with FLAC__stream_decoder_set_metadata_*() calls.
- *
- * \note In general, FLAC__StreamDecoder functions which change the
- * state should not be called on the \a decoder while in the callback.
- *
- * \param  decoder  The decoder instance calling the callback.
- * \param  metadata The decoded metadata block.
- * \param  client_data  The callee's client data set through
- *                      FLAC__stream_decoder_init_*().
- */
-typedef void (*FLAC__StreamDecoderMetadataCallback)(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
-
-/** Signature for the error callback.
- *
- *  A function pointer matching this signature must be passed to one of
- *  the FLAC__stream_decoder_init_*() functions.
- *  The supplied function will be called whenever an error occurs during
- *  decoding.
- *
- * \note In general, FLAC__StreamDecoder functions which change the
- * state should not be called on the \a decoder while in the callback.
- *
- * \param  decoder  The decoder instance calling the callback.
- * \param  status   The error encountered by the decoder.
- * \param  client_data  The callee's client data set through
- *                      FLAC__stream_decoder_init_*().
- */
-typedef void (*FLAC__StreamDecoderErrorCallback)(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
-
-
-/***********************************************************************
- *
- * Class constructor/destructor
- *
- ***********************************************************************/
-
-/** Create a new stream decoder instance.  The instance is created with
- *  default settings; see the individual FLAC__stream_decoder_set_*()
- *  functions for each setting's default.
- *
- * \retval FLAC__StreamDecoder*
- *    \c NULL if there was an error allocating memory, else the new instance.
- */
-FLAC_API FLAC__StreamDecoder *FLAC__stream_decoder_new(void);
-
-/** Free a decoder instance.  Deletes the object pointed to by \a decoder.
- *
- * \param decoder  A pointer to an existing decoder.
- * \assert
- *    \code decoder != NULL \endcode
- */
-FLAC_API void FLAC__stream_decoder_delete(FLAC__StreamDecoder *decoder);
-
-
-/***********************************************************************
- *
- * Public class method prototypes
- *
- ***********************************************************************/
-
-/** Set the serial number for the FLAC stream within the Ogg container.
- *  The default behavior is to use the serial number of the first Ogg
- *  page.  Setting a serial number here will explicitly specify which
- *  stream is to be decoded.
- *
- * \note
- * This does not need to be set for native FLAC decoding.
- *
- * \default \c use serial number of first page
- * \param  decoder        A decoder instance to set.
- * \param  serial_number  See above.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the decoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_decoder_set_ogg_serial_number(FLAC__StreamDecoder *decoder, long serial_number);
-
-/** Set the "MD5 signature checking" flag.  If \c true, the decoder will
- *  compute the MD5 signature of the unencoded audio data while decoding
- *  and compare it to the signature from the STREAMINFO block, if it
- *  exists, during FLAC__stream_decoder_finish().
- *
- *  MD5 signature checking will be turned off (until the next
- *  FLAC__stream_decoder_reset()) if there is no signature in the
- *  STREAMINFO block or when a seek is attempted.
- *
- *  Clients that do not use the MD5 check should leave this off to speed
- *  up decoding.
- *
- * \default \c false
- * \param  decoder  A decoder instance to set.
- * \param  value    Flag value (see above).
- * \assert
- *    \code decoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the decoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_decoder_set_md5_checking(FLAC__StreamDecoder *decoder, FLAC__bool value);
-
-/** Direct the decoder to pass on all metadata blocks of type \a type.
- *
- * \default By default, only the \c STREAMINFO block is returned via the
- *          metadata callback.
- * \param  decoder  A decoder instance to set.
- * \param  type     See above.
- * \assert
- *    \code decoder != NULL \endcode
- *    \a type is valid
- * \retval FLAC__bool
- *    \c false if the decoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_decoder_set_metadata_respond(FLAC__StreamDecoder *decoder, FLAC__MetadataType type);
-
-/** Direct the decoder to pass on all APPLICATION metadata blocks of the
- *  given \a id.
- *
- * \default By default, only the \c STREAMINFO block is returned via the
- *          metadata callback.
- * \param  decoder  A decoder instance to set.
- * \param  id       See above.
- * \assert
- *    \code decoder != NULL \endcode
- *    \code id != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the decoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_decoder_set_metadata_respond_application(FLAC__StreamDecoder *decoder, const FLAC__byte id[4]);
-
-/** Direct the decoder to pass on all metadata blocks of any type.
- *
- * \default By default, only the \c STREAMINFO block is returned via the
- *          metadata callback.
- * \param  decoder  A decoder instance to set.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the decoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_decoder_set_metadata_respond_all(FLAC__StreamDecoder *decoder);
-
-/** Direct the decoder to filter out all metadata blocks of type \a type.
- *
- * \default By default, only the \c STREAMINFO block is returned via the
- *          metadata callback.
- * \param  decoder  A decoder instance to set.
- * \param  type     See above.
- * \assert
- *    \code decoder != NULL \endcode
- *    \a type is valid
- * \retval FLAC__bool
- *    \c false if the decoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_decoder_set_metadata_ignore(FLAC__StreamDecoder *decoder, FLAC__MetadataType type);
-
-/** Direct the decoder to filter out all APPLICATION metadata blocks of
- *  the given \a id.
- *
- * \default By default, only the \c STREAMINFO block is returned via the
- *          metadata callback.
- * \param  decoder  A decoder instance to set.
- * \param  id       See above.
- * \assert
- *    \code decoder != NULL \endcode
- *    \code id != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the decoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_decoder_set_metadata_ignore_application(FLAC__StreamDecoder *decoder, const FLAC__byte id[4]);
-
-/** Direct the decoder to filter out all metadata blocks of any type.
- *
- * \default By default, only the \c STREAMINFO block is returned via the
- *          metadata callback.
- * \param  decoder  A decoder instance to set.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the decoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_decoder_set_metadata_ignore_all(FLAC__StreamDecoder *decoder);
-
-/** Get the current decoder state.
- *
- * \param  decoder  A decoder instance to query.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval FLAC__StreamDecoderState
- *    The current decoder state.
- */
-FLAC_API FLAC__StreamDecoderState FLAC__stream_decoder_get_state(const FLAC__StreamDecoder *decoder);
-
-/** Get the current decoder state as a C string.
- *
- * \param  decoder  A decoder instance to query.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval const char *
- *    The decoder state as a C string.  Do not modify the contents.
- */
-FLAC_API const char *FLAC__stream_decoder_get_resolved_state_string(const FLAC__StreamDecoder *decoder);
-
-/** Get the "MD5 signature checking" flag.
- *  This is the value of the setting, not whether or not the decoder is
- *  currently checking the MD5 (remember, it can be turned off automatically
- *  by a seek).  When the decoder is reset the flag will be restored to the
- *  value returned by this function.
- *
- * \param  decoder  A decoder instance to query.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval FLAC__bool
- *    See above.
- */
-FLAC_API FLAC__bool FLAC__stream_decoder_get_md5_checking(const FLAC__StreamDecoder *decoder);
-
-/** Get the total number of samples in the stream being decoded.
- *  Will only be valid after decoding has started and will contain the
- *  value from the \c STREAMINFO block.  A value of \c 0 means "unknown".
- *
- * \param  decoder  A decoder instance to query.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval unsigned
- *    See above.
- */
-FLAC_API FLAC__uint64 FLAC__stream_decoder_get_total_samples(const FLAC__StreamDecoder *decoder);
-
-/** Get the current number of channels in the stream being decoded.
- *  Will only be valid after decoding has started and will contain the
- *  value from the most recently decoded frame header.
- *
- * \param  decoder  A decoder instance to query.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval unsigned
- *    See above.
- */
-FLAC_API unsigned FLAC__stream_decoder_get_channels(const FLAC__StreamDecoder *decoder);
-
-/** Get the current channel assignment in the stream being decoded.
- *  Will only be valid after decoding has started and will contain the
- *  value from the most recently decoded frame header.
- *
- * \param  decoder  A decoder instance to query.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval FLAC__ChannelAssignment
- *    See above.
- */
-FLAC_API FLAC__ChannelAssignment FLAC__stream_decoder_get_channel_assignment(const FLAC__StreamDecoder *decoder);
-
-/** Get the current sample resolution in the stream being decoded.
- *  Will only be valid after decoding has started and will contain the
- *  value from the most recently decoded frame header.
- *
- * \param  decoder  A decoder instance to query.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval unsigned
- *    See above.
- */
-FLAC_API unsigned FLAC__stream_decoder_get_bits_per_sample(const FLAC__StreamDecoder *decoder);
-
-/** Get the current sample rate in Hz of the stream being decoded.
- *  Will only be valid after decoding has started and will contain the
- *  value from the most recently decoded frame header.
- *
- * \param  decoder  A decoder instance to query.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval unsigned
- *    See above.
- */
-FLAC_API unsigned FLAC__stream_decoder_get_sample_rate(const FLAC__StreamDecoder *decoder);
-
-/** Get the current blocksize of the stream being decoded.
- *  Will only be valid after decoding has started and will contain the
- *  value from the most recently decoded frame header.
- *
- * \param  decoder  A decoder instance to query.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval unsigned
- *    See above.
- */
-FLAC_API unsigned FLAC__stream_decoder_get_blocksize(const FLAC__StreamDecoder *decoder);
-
-/** Returns the decoder's current read position within the stream.
- *  The position is the byte offset from the start of the stream.
- *  Bytes before this position have been fully decoded.  Note that
- *  there may still be undecoded bytes in the decoder's read FIFO.
- *  The returned position is correct even after a seek.
- *
- *  \warning This function currently only works for native FLAC,
- *           not Ogg FLAC streams.
- *
- * \param  decoder   A decoder instance to query.
- * \param  position  Address at which to return the desired position.
- * \assert
- *    \code decoder != NULL \endcode
- *    \code position != NULL \endcode
- * \retval FLAC__bool
- *    \c true if successful, \c false if the stream is not native FLAC,
- *    or there was an error from the 'tell' callback or it returned
- *    \c FLAC__STREAM_DECODER_TELL_STATUS_UNSUPPORTED.
- */
-FLAC_API FLAC__bool FLAC__stream_decoder_get_decode_position(const FLAC__StreamDecoder *decoder, FLAC__uint64 *position);
-
-/** Initialize the decoder instance to decode native FLAC streams.
- *
- *  This flavor of initialization sets up the decoder to decode from a
- *  native FLAC stream. I/O is performed via callbacks to the client.
- *  For decoding from a plain file via filename or open FILE*,
- *  FLAC__stream_decoder_init_file() and FLAC__stream_decoder_init_FILE()
- *  provide a simpler interface.
- *
- *  This function should be called after FLAC__stream_decoder_new() and
- *  FLAC__stream_decoder_set_*() but before any of the
- *  FLAC__stream_decoder_process_*() functions.  Will set and return the
- *  decoder state, which will be FLAC__STREAM_DECODER_SEARCH_FOR_METADATA
- *  if initialization succeeded.
- *
- * \param  decoder            An uninitialized decoder instance.
- * \param  read_callback      See FLAC__StreamDecoderReadCallback.  This
- *                            pointer must not be \c NULL.
- * \param  seek_callback      See FLAC__StreamDecoderSeekCallback.  This
- *                            pointer may be \c NULL if seeking is not
- *                            supported.  If \a seek_callback is not \c NULL then a
- *                            \a tell_callback, \a length_callback, and \a eof_callback must also be supplied.
- *                            Alternatively, a dummy seek callback that just
- *                            returns \c FLAC__STREAM_DECODER_SEEK_STATUS_UNSUPPORTED
- *                            may also be supplied, all though this is slightly
- *                            less efficient for the decoder.
- * \param  tell_callback      See FLAC__StreamDecoderTellCallback.  This
- *                            pointer may be \c NULL if not supported by the client.  If
- *                            \a seek_callback is not \c NULL then a
- *                            \a tell_callback must also be supplied.
- *                            Alternatively, a dummy tell callback that just
- *                            returns \c FLAC__STREAM_DECODER_TELL_STATUS_UNSUPPORTED
- *                            may also be supplied, all though this is slightly
- *                            less efficient for the decoder.
- * \param  length_callback    See FLAC__StreamDecoderLengthCallback.  This
- *                            pointer may be \c NULL if not supported by the client.  If
- *                            \a seek_callback is not \c NULL then a
- *                            \a length_callback must also be supplied.
- *                            Alternatively, a dummy length callback that just
- *                            returns \c FLAC__STREAM_DECODER_LENGTH_STATUS_UNSUPPORTED
- *                            may also be supplied, all though this is slightly
- *                            less efficient for the decoder.
- * \param  eof_callback       See FLAC__StreamDecoderEofCallback.  This
- *                            pointer may be \c NULL if not supported by the client.  If
- *                            \a seek_callback is not \c NULL then a
- *                            \a eof_callback must also be supplied.
- *                            Alternatively, a dummy length callback that just
- *                            returns \c false
- *                            may also be supplied, all though this is slightly
- *                            less efficient for the decoder.
- * \param  write_callback     See FLAC__StreamDecoderWriteCallback.  This
- *                            pointer must not be \c NULL.
- * \param  metadata_callback  See FLAC__StreamDecoderMetadataCallback.  This
- *                            pointer may be \c NULL if the callback is not
- *                            desired.
- * \param  error_callback     See FLAC__StreamDecoderErrorCallback.  This
- *                            pointer must not be \c NULL.
- * \param  client_data        This value will be supplied to callbacks in their
- *                            \a client_data argument.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval FLAC__StreamDecoderInitStatus
- *    \c FLAC__STREAM_DECODER_INIT_STATUS_OK if initialization was successful;
- *    see FLAC__StreamDecoderInitStatus for the meanings of other return values.
- */
-FLAC_API FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_stream(
-	FLAC__StreamDecoder *decoder,
-	FLAC__StreamDecoderReadCallback read_callback,
-	FLAC__StreamDecoderSeekCallback seek_callback,
-	FLAC__StreamDecoderTellCallback tell_callback,
-	FLAC__StreamDecoderLengthCallback length_callback,
-	FLAC__StreamDecoderEofCallback eof_callback,
-	FLAC__StreamDecoderWriteCallback write_callback,
-	FLAC__StreamDecoderMetadataCallback metadata_callback,
-	FLAC__StreamDecoderErrorCallback error_callback,
-	void *client_data
-);
-
-/** Initialize the decoder instance to decode Ogg FLAC streams.
- *
- *  This flavor of initialization sets up the decoder to decode from a
- *  FLAC stream in an Ogg container. I/O is performed via callbacks to the
- *  client.  For decoding from a plain file via filename or open FILE*,
- *  FLAC__stream_decoder_init_ogg_file() and FLAC__stream_decoder_init_ogg_FILE()
- *  provide a simpler interface.
- *
- *  This function should be called after FLAC__stream_decoder_new() and
- *  FLAC__stream_decoder_set_*() but before any of the
- *  FLAC__stream_decoder_process_*() functions.  Will set and return the
- *  decoder state, which will be FLAC__STREAM_DECODER_SEARCH_FOR_METADATA
- *  if initialization succeeded.
- *
- *  \note Support for Ogg FLAC in the library is optional.  If this
- *  library has been built without support for Ogg FLAC, this function
- *  will return \c FLAC__STREAM_DECODER_INIT_STATUS_UNSUPPORTED_CONTAINER.
- *
- * \param  decoder            An uninitialized decoder instance.
- * \param  read_callback      See FLAC__StreamDecoderReadCallback.  This
- *                            pointer must not be \c NULL.
- * \param  seek_callback      See FLAC__StreamDecoderSeekCallback.  This
- *                            pointer may be \c NULL if seeking is not
- *                            supported.  If \a seek_callback is not \c NULL then a
- *                            \a tell_callback, \a length_callback, and \a eof_callback must also be supplied.
- *                            Alternatively, a dummy seek callback that just
- *                            returns \c FLAC__STREAM_DECODER_SEEK_STATUS_UNSUPPORTED
- *                            may also be supplied, all though this is slightly
- *                            less efficient for the decoder.
- * \param  tell_callback      See FLAC__StreamDecoderTellCallback.  This
- *                            pointer may be \c NULL if not supported by the client.  If
- *                            \a seek_callback is not \c NULL then a
- *                            \a tell_callback must also be supplied.
- *                            Alternatively, a dummy tell callback that just
- *                            returns \c FLAC__STREAM_DECODER_TELL_STATUS_UNSUPPORTED
- *                            may also be supplied, all though this is slightly
- *                            less efficient for the decoder.
- * \param  length_callback    See FLAC__StreamDecoderLengthCallback.  This
- *                            pointer may be \c NULL if not supported by the client.  If
- *                            \a seek_callback is not \c NULL then a
- *                            \a length_callback must also be supplied.
- *                            Alternatively, a dummy length callback that just
- *                            returns \c FLAC__STREAM_DECODER_LENGTH_STATUS_UNSUPPORTED
- *                            may also be supplied, all though this is slightly
- *                            less efficient for the decoder.
- * \param  eof_callback       See FLAC__StreamDecoderEofCallback.  This
- *                            pointer may be \c NULL if not supported by the client.  If
- *                            \a seek_callback is not \c NULL then a
- *                            \a eof_callback must also be supplied.
- *                            Alternatively, a dummy length callback that just
- *                            returns \c false
- *                            may also be supplied, all though this is slightly
- *                            less efficient for the decoder.
- * \param  write_callback     See FLAC__StreamDecoderWriteCallback.  This
- *                            pointer must not be \c NULL.
- * \param  metadata_callback  See FLAC__StreamDecoderMetadataCallback.  This
- *                            pointer may be \c NULL if the callback is not
- *                            desired.
- * \param  error_callback     See FLAC__StreamDecoderErrorCallback.  This
- *                            pointer must not be \c NULL.
- * \param  client_data        This value will be supplied to callbacks in their
- *                            \a client_data argument.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval FLAC__StreamDecoderInitStatus
- *    \c FLAC__STREAM_DECODER_INIT_STATUS_OK if initialization was successful;
- *    see FLAC__StreamDecoderInitStatus for the meanings of other return values.
- */
-FLAC_API FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_ogg_stream(
-	FLAC__StreamDecoder *decoder,
-	FLAC__StreamDecoderReadCallback read_callback,
-	FLAC__StreamDecoderSeekCallback seek_callback,
-	FLAC__StreamDecoderTellCallback tell_callback,
-	FLAC__StreamDecoderLengthCallback length_callback,
-	FLAC__StreamDecoderEofCallback eof_callback,
-	FLAC__StreamDecoderWriteCallback write_callback,
-	FLAC__StreamDecoderMetadataCallback metadata_callback,
-	FLAC__StreamDecoderErrorCallback error_callback,
-	void *client_data
-);
-
-/** Initialize the decoder instance to decode native FLAC files.
- *
- *  This flavor of initialization sets up the decoder to decode from a
- *  plain native FLAC file.  For non-stdio streams, you must use
- *  FLAC__stream_decoder_init_stream() and provide callbacks for the I/O.
- *
- *  This function should be called after FLAC__stream_decoder_new() and
- *  FLAC__stream_decoder_set_*() but before any of the
- *  FLAC__stream_decoder_process_*() functions.  Will set and return the
- *  decoder state, which will be FLAC__STREAM_DECODER_SEARCH_FOR_METADATA
- *  if initialization succeeded.
- *
- * \param  decoder            An uninitialized decoder instance.
- * \param  file               An open FLAC file.  The file should have been
- *                            opened with mode \c "rb" and rewound.  The file
- *                            becomes owned by the decoder and should not be
- *                            manipulated by the client while decoding.
- *                            Unless \a file is \c stdin, it will be closed
- *                            when FLAC__stream_decoder_finish() is called.
- *                            Note however that seeking will not work when
- *                            decoding from \c stdout since it is not seekable.
- * \param  write_callback     See FLAC__StreamDecoderWriteCallback.  This
- *                            pointer must not be \c NULL.
- * \param  metadata_callback  See FLAC__StreamDecoderMetadataCallback.  This
- *                            pointer may be \c NULL if the callback is not
- *                            desired.
- * \param  error_callback     See FLAC__StreamDecoderErrorCallback.  This
- *                            pointer must not be \c NULL.
- * \param  client_data        This value will be supplied to callbacks in their
- *                            \a client_data argument.
- * \assert
- *    \code decoder != NULL \endcode
- *    \code file != NULL \endcode
- * \retval FLAC__StreamDecoderInitStatus
- *    \c FLAC__STREAM_DECODER_INIT_STATUS_OK if initialization was successful;
- *    see FLAC__StreamDecoderInitStatus for the meanings of other return values.
- */
-FLAC_API FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_FILE(
-	FLAC__StreamDecoder *decoder,
-	FILE *file,
-	FLAC__StreamDecoderWriteCallback write_callback,
-	FLAC__StreamDecoderMetadataCallback metadata_callback,
-	FLAC__StreamDecoderErrorCallback error_callback,
-	void *client_data
-);
-
-/** Initialize the decoder instance to decode Ogg FLAC files.
- *
- *  This flavor of initialization sets up the decoder to decode from a
- *  plain Ogg FLAC file.  For non-stdio streams, you must use
- *  FLAC__stream_decoder_init_ogg_stream() and provide callbacks for the I/O.
- *
- *  This function should be called after FLAC__stream_decoder_new() and
- *  FLAC__stream_decoder_set_*() but before any of the
- *  FLAC__stream_decoder_process_*() functions.  Will set and return the
- *  decoder state, which will be FLAC__STREAM_DECODER_SEARCH_FOR_METADATA
- *  if initialization succeeded.
- *
- *  \note Support for Ogg FLAC in the library is optional.  If this
- *  library has been built without support for Ogg FLAC, this function
- *  will return \c FLAC__STREAM_DECODER_INIT_STATUS_UNSUPPORTED_CONTAINER.
- *
- * \param  decoder            An uninitialized decoder instance.
- * \param  file               An open FLAC file.  The file should have been
- *                            opened with mode \c "rb" and rewound.  The file
- *                            becomes owned by the decoder and should not be
- *                            manipulated by the client while decoding.
- *                            Unless \a file is \c stdin, it will be closed
- *                            when FLAC__stream_decoder_finish() is called.
- *                            Note however that seeking will not work when
- *                            decoding from \c stdout since it is not seekable.
- * \param  write_callback     See FLAC__StreamDecoderWriteCallback.  This
- *                            pointer must not be \c NULL.
- * \param  metadata_callback  See FLAC__StreamDecoderMetadataCallback.  This
- *                            pointer may be \c NULL if the callback is not
- *                            desired.
- * \param  error_callback     See FLAC__StreamDecoderErrorCallback.  This
- *                            pointer must not be \c NULL.
- * \param  client_data        This value will be supplied to callbacks in their
- *                            \a client_data argument.
- * \assert
- *    \code decoder != NULL \endcode
- *    \code file != NULL \endcode
- * \retval FLAC__StreamDecoderInitStatus
- *    \c FLAC__STREAM_DECODER_INIT_STATUS_OK if initialization was successful;
- *    see FLAC__StreamDecoderInitStatus for the meanings of other return values.
- */
-FLAC_API FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_ogg_FILE(
-	FLAC__StreamDecoder *decoder,
-	FILE *file,
-	FLAC__StreamDecoderWriteCallback write_callback,
-	FLAC__StreamDecoderMetadataCallback metadata_callback,
-	FLAC__StreamDecoderErrorCallback error_callback,
-	void *client_data
-);
-
-/** Initialize the decoder instance to decode native FLAC files.
- *
- *  This flavor of initialization sets up the decoder to decode from a plain
- *  native FLAC file.  If POSIX fopen() semantics are not sufficient, (for
- *  example, with Unicode filenames on Windows), you must use
- *  FLAC__stream_decoder_init_FILE(), or FLAC__stream_decoder_init_stream()
- *  and provide callbacks for the I/O.
- *
- *  This function should be called after FLAC__stream_decoder_new() and
- *  FLAC__stream_decoder_set_*() but before any of the
- *  FLAC__stream_decoder_process_*() functions.  Will set and return the
- *  decoder state, which will be FLAC__STREAM_DECODER_SEARCH_FOR_METADATA
- *  if initialization succeeded.
- *
- * \param  decoder            An uninitialized decoder instance.
- * \param  filename           The name of the file to decode from.  The file will
- *                            be opened with fopen().  Use \c NULL to decode from
- *                            \c stdin.  Note that \c stdin is not seekable.
- * \param  write_callback     See FLAC__StreamDecoderWriteCallback.  This
- *                            pointer must not be \c NULL.
- * \param  metadata_callback  See FLAC__StreamDecoderMetadataCallback.  This
- *                            pointer may be \c NULL if the callback is not
- *                            desired.
- * \param  error_callback     See FLAC__StreamDecoderErrorCallback.  This
- *                            pointer must not be \c NULL.
- * \param  client_data        This value will be supplied to callbacks in their
- *                            \a client_data argument.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval FLAC__StreamDecoderInitStatus
- *    \c FLAC__STREAM_DECODER_INIT_STATUS_OK if initialization was successful;
- *    see FLAC__StreamDecoderInitStatus for the meanings of other return values.
- */
-FLAC_API FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_file(
-	FLAC__StreamDecoder *decoder,
-	const char *filename,
-	FLAC__StreamDecoderWriteCallback write_callback,
-	FLAC__StreamDecoderMetadataCallback metadata_callback,
-	FLAC__StreamDecoderErrorCallback error_callback,
-	void *client_data
-);
-
-/** Initialize the decoder instance to decode Ogg FLAC files.
- *
- *  This flavor of initialization sets up the decoder to decode from a plain
- *  Ogg FLAC file.  If POSIX fopen() semantics are not sufficient, (for
- *  example, with Unicode filenames on Windows), you must use
- *  FLAC__stream_decoder_init_ogg_FILE(), or FLAC__stream_decoder_init_ogg_stream()
- *  and provide callbacks for the I/O.
- *
- *  This function should be called after FLAC__stream_decoder_new() and
- *  FLAC__stream_decoder_set_*() but before any of the
- *  FLAC__stream_decoder_process_*() functions.  Will set and return the
- *  decoder state, which will be FLAC__STREAM_DECODER_SEARCH_FOR_METADATA
- *  if initialization succeeded.
- *
- *  \note Support for Ogg FLAC in the library is optional.  If this
- *  library has been built without support for Ogg FLAC, this function
- *  will return \c FLAC__STREAM_DECODER_INIT_STATUS_UNSUPPORTED_CONTAINER.
- *
- * \param  decoder            An uninitialized decoder instance.
- * \param  filename           The name of the file to decode from.  The file will
- *                            be opened with fopen().  Use \c NULL to decode from
- *                            \c stdin.  Note that \c stdin is not seekable.
- * \param  write_callback     See FLAC__StreamDecoderWriteCallback.  This
- *                            pointer must not be \c NULL.
- * \param  metadata_callback  See FLAC__StreamDecoderMetadataCallback.  This
- *                            pointer may be \c NULL if the callback is not
- *                            desired.
- * \param  error_callback     See FLAC__StreamDecoderErrorCallback.  This
- *                            pointer must not be \c NULL.
- * \param  client_data        This value will be supplied to callbacks in their
- *                            \a client_data argument.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval FLAC__StreamDecoderInitStatus
- *    \c FLAC__STREAM_DECODER_INIT_STATUS_OK if initialization was successful;
- *    see FLAC__StreamDecoderInitStatus for the meanings of other return values.
- */
-FLAC_API FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_ogg_file(
-	FLAC__StreamDecoder *decoder,
-	const char *filename,
-	FLAC__StreamDecoderWriteCallback write_callback,
-	FLAC__StreamDecoderMetadataCallback metadata_callback,
-	FLAC__StreamDecoderErrorCallback error_callback,
-	void *client_data
-);
-
-/** Finish the decoding process.
- *  Flushes the decoding buffer, releases resources, resets the decoder
- *  settings to their defaults, and returns the decoder state to
- *  FLAC__STREAM_DECODER_UNINITIALIZED.
- *
- *  In the event of a prematurely-terminated decode, it is not strictly
- *  necessary to call this immediately before FLAC__stream_decoder_delete()
- *  but it is good practice to match every FLAC__stream_decoder_init_*()
- *  with a FLAC__stream_decoder_finish().
- *
- * \param  decoder  An uninitialized decoder instance.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if MD5 checking is on AND a STREAMINFO block was available
- *    AND the MD5 signature in the STREAMINFO block was non-zero AND the
- *    signature does not match the one computed by the decoder; else
- *    \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_decoder_finish(FLAC__StreamDecoder *decoder);
-
-/** Flush the stream input.
- *  The decoder's input buffer will be cleared and the state set to
- *  \c FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC.  This will also turn
- *  off MD5 checking.
- *
- * \param  decoder  A decoder instance.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval FLAC__bool
- *    \c true if successful, else \c false if a memory allocation
- *    error occurs (in which case the state will be set to
- *    \c FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR).
- */
-FLAC_API FLAC__bool FLAC__stream_decoder_flush(FLAC__StreamDecoder *decoder);
-
-/** Reset the decoding process.
- *  The decoder's input buffer will be cleared and the state set to
- *  \c FLAC__STREAM_DECODER_SEARCH_FOR_METADATA.  This is similar to
- *  FLAC__stream_decoder_finish() except that the settings are
- *  preserved; there is no need to call FLAC__stream_decoder_init_*()
- *  before decoding again.  MD5 checking will be restored to its original
- *  setting.
- *
- *  If the decoder is seekable, or was initialized with
- *  FLAC__stream_decoder_init*_FILE() or FLAC__stream_decoder_init*_file(),
- *  the decoder will also attempt to seek to the beginning of the file.
- *  If this rewind fails, this function will return \c false.  It follows
- *  that FLAC__stream_decoder_reset() cannot be used when decoding from
- *  \c stdin.
- *
- *  If the decoder was initialized with FLAC__stream_encoder_init*_stream()
- *  and is not seekable (i.e. no seek callback was provided or the seek
- *  callback returns \c FLAC__STREAM_DECODER_SEEK_STATUS_UNSUPPORTED), it
- *  is the duty of the client to start feeding data from the beginning of
- *  the stream on the next FLAC__stream_decoder_process() or
- *  FLAC__stream_decoder_process_interleaved() call.
- *
- * \param  decoder  A decoder instance.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval FLAC__bool
- *    \c true if successful, else \c false if a memory allocation occurs
- *    (in which case the state will be set to
- *    \c FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR) or a seek error
- *    occurs (the state will be unchanged).
- */
-FLAC_API FLAC__bool FLAC__stream_decoder_reset(FLAC__StreamDecoder *decoder);
-
-/** Decode one metadata block or audio frame.
- *  This version instructs the decoder to decode a either a single metadata
- *  block or a single frame and stop, unless the callbacks return a fatal
- *  error or the read callback returns
- *  \c FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM.
- *
- *  As the decoder needs more input it will call the read callback.
- *  Depending on what was decoded, the metadata or write callback will be
- *  called with the decoded metadata block or audio frame.
- *
- *  Unless there is a fatal read error or end of stream, this function
- *  will return once one whole frame is decoded.  In other words, if the
- *  stream is not synchronized or points to a corrupt frame header, the
- *  decoder will continue to try and resync until it gets to a valid
- *  frame, then decode one frame, then return.  If the decoder points to
- *  a frame whose frame CRC in the frame footer does not match the
- *  computed frame CRC, this function will issue a
- *  FLAC__STREAM_DECODER_ERROR_STATUS_FRAME_CRC_MISMATCH error to the
- *  error callback, and return, having decoded one complete, although
- *  corrupt, frame.  (Such corrupted frames are sent as silence of the
- *  correct length to the write callback.)
- *
- * \param  decoder  An initialized decoder instance.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if any fatal read, write, or memory allocation error
- *    occurred (meaning decoding must stop), else \c true; for more
- *    information about the decoder, check the decoder state with
- *    FLAC__stream_decoder_get_state().
- */
-FLAC_API FLAC__bool FLAC__stream_decoder_process_single(FLAC__StreamDecoder *decoder);
-
-/** Decode until the end of the metadata.
- *  This version instructs the decoder to decode from the current position
- *  and continue until all the metadata has been read, or until the
- *  callbacks return a fatal error or the read callback returns
- *  \c FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM.
- *
- *  As the decoder needs more input it will call the read callback.
- *  As each metadata block is decoded, the metadata callback will be called
- *  with the decoded metadata.
- *
- * \param  decoder  An initialized decoder instance.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if any fatal read, write, or memory allocation error
- *    occurred (meaning decoding must stop), else \c true; for more
- *    information about the decoder, check the decoder state with
- *    FLAC__stream_decoder_get_state().
- */
-FLAC_API FLAC__bool FLAC__stream_decoder_process_until_end_of_metadata(FLAC__StreamDecoder *decoder);
-
-/** Decode until the end of the stream.
- *  This version instructs the decoder to decode from the current position
- *  and continue until the end of stream (the read callback returns
- *  \c FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM), or until the
- *  callbacks return a fatal error.
- *
- *  As the decoder needs more input it will call the read callback.
- *  As each metadata block and frame is decoded, the metadata or write
- *  callback will be called with the decoded metadata or frame.
- *
- * \param  decoder  An initialized decoder instance.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if any fatal read, write, or memory allocation error
- *    occurred (meaning decoding must stop), else \c true; for more
- *    information about the decoder, check the decoder state with
- *    FLAC__stream_decoder_get_state().
- */
-FLAC_API FLAC__bool FLAC__stream_decoder_process_until_end_of_stream(FLAC__StreamDecoder *decoder);
-
-/** Skip one audio frame.
- *  This version instructs the decoder to 'skip' a single frame and stop,
- *  unless the callbacks return a fatal error or the read callback returns
- *  \c FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM.
- *
- *  The decoding flow is the same as what occurs when
- *  FLAC__stream_decoder_process_single() is called to process an audio
- *  frame, except that this function does not decode the parsed data into
- *  PCM or call the write callback.  The integrity of the frame is still
- *  checked the same way as in the other process functions.
- *
- *  This function will return once one whole frame is skipped, in the
- *  same way that FLAC__stream_decoder_process_single() will return once
- *  one whole frame is decoded.
- *
- *  This function can be used in more quickly determining FLAC frame
- *  boundaries when decoding of the actual data is not needed, for
- *  example when an application is separating a FLAC stream into frames
- *  for editing or storing in a container.  To do this, the application
- *  can use FLAC__stream_decoder_skip_single_frame() to quickly advance
- *  to the next frame, then use
- *  FLAC__stream_decoder_get_decode_position() to find the new frame
- *  boundary.
- *
- *  This function should only be called when the stream has advanced
- *  past all the metadata, otherwise it will return \c false.
- *
- * \param  decoder  An initialized decoder instance not in a metadata
- *                  state.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if any fatal read, write, or memory allocation error
- *    occurred (meaning decoding must stop), or if the decoder
- *    is in the FLAC__STREAM_DECODER_SEARCH_FOR_METADATA or
- *    FLAC__STREAM_DECODER_READ_METADATA state, else \c true; for more
- *    information about the decoder, check the decoder state with
- *    FLAC__stream_decoder_get_state().
- */
-FLAC_API FLAC__bool FLAC__stream_decoder_skip_single_frame(FLAC__StreamDecoder *decoder);
-
-/** Flush the input and seek to an absolute sample.
- *  Decoding will resume at the given sample.  Note that because of
- *  this, the next write callback may contain a partial block.  The
- *  client must support seeking the input or this function will fail
- *  and return \c false.  Furthermore, if the decoder state is
- *  \c FLAC__STREAM_DECODER_SEEK_ERROR, then the decoder must be flushed
- *  with FLAC__stream_decoder_flush() or reset with
- *  FLAC__stream_decoder_reset() before decoding can continue.
- *
- * \param  decoder  A decoder instance.
- * \param  sample   The target sample number to seek to.
- * \assert
- *    \code decoder != NULL \endcode
- * \retval FLAC__bool
- *    \c true if successful, else \c false.
- */
-FLAC_API FLAC__bool FLAC__stream_decoder_seek_absolute(FLAC__StreamDecoder *decoder, FLAC__uint64 sample);
-
-/* \} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib-x86-64/include/FLAC/stream_encoder.h b/lib-x86-64/include/FLAC/stream_encoder.h
deleted file mode 100644
index dbbbb23e..00000000
--- a/lib-x86-64/include/FLAC/stream_encoder.h
+++ /dev/null
@@ -1,1768 +0,0 @@
-/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007  Josh Coalson
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - 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.
- *
- * - Neither the name of the Xiph.org Foundation nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * 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 FOUNDATION 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 FLAC__STREAM_ENCODER_H
-#define FLAC__STREAM_ENCODER_H
-
-#include <stdio.h> /* for FILE */
-#include "export.h"
-#include "format.h"
-#include "stream_decoder.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/** \file include/FLAC/stream_encoder.h
- *
- *  \brief
- *  This module contains the functions which implement the stream
- *  encoder.
- *
- *  See the detailed documentation in the
- *  \link flac_stream_encoder stream encoder \endlink module.
- */
-
-/** \defgroup flac_encoder FLAC/ \*_encoder.h: encoder interfaces
- *  \ingroup flac
- *
- *  \brief
- *  This module describes the encoder layers provided by libFLAC.
- *
- * The stream encoder can be used to encode complete streams either to the
- * client via callbacks, or directly to a file, depending on how it is
- * initialized.  When encoding via callbacks, the client provides a write
- * callback which will be called whenever FLAC data is ready to be written.
- * If the client also supplies a seek callback, the encoder will also
- * automatically handle the writing back of metadata discovered while
- * encoding, like stream info, seek points offsets, etc.  When encoding to
- * a file, the client needs only supply a filename or open \c FILE* and an
- * optional progress callback for periodic notification of progress; the
- * write and seek callbacks are supplied internally.  For more info see the
- * \link flac_stream_encoder stream encoder \endlink module.
- */
-
-/** \defgroup flac_stream_encoder FLAC/stream_encoder.h: stream encoder interface
- *  \ingroup flac_encoder
- *
- *  \brief
- *  This module contains the functions which implement the stream
- *  encoder.
- *
- * The stream encoder can encode to native FLAC, and optionally Ogg FLAC
- * (check FLAC_API_SUPPORTS_OGG_FLAC) streams and files.
- *
- * The basic usage of this encoder is as follows:
- * - The program creates an instance of an encoder using
- *   FLAC__stream_encoder_new().
- * - The program overrides the default settings using
- *   FLAC__stream_encoder_set_*() functions.  At a minimum, the following
- *   functions should be called:
- *   - FLAC__stream_encoder_set_channels()
- *   - FLAC__stream_encoder_set_bits_per_sample()
- *   - FLAC__stream_encoder_set_sample_rate()
- *   - FLAC__stream_encoder_set_ogg_serial_number() (if encoding to Ogg FLAC)
- *   - FLAC__stream_encoder_set_total_samples_estimate() (if known)
- * - If the application wants to control the compression level or set its own
- *   metadata, then the following should also be called:
- *   - FLAC__stream_encoder_set_compression_level()
- *   - FLAC__stream_encoder_set_verify()
- *   - FLAC__stream_encoder_set_metadata()
- * - The rest of the set functions should only be called if the client needs
- *   exact control over how the audio is compressed; thorough understanding
- *   of the FLAC format is necessary to achieve good results.
- * - The program initializes the instance to validate the settings and
- *   prepare for encoding using
- *   - FLAC__stream_encoder_init_stream() or FLAC__stream_encoder_init_FILE()
- *     or FLAC__stream_encoder_init_file() for native FLAC
- *   - FLAC__stream_encoder_init_ogg_stream() or FLAC__stream_encoder_init_ogg_FILE()
- *     or FLAC__stream_encoder_init_ogg_file() for Ogg FLAC
- * - The program calls FLAC__stream_encoder_process() or
- *   FLAC__stream_encoder_process_interleaved() to encode data, which
- *   subsequently calls the callbacks when there is encoder data ready
- *   to be written.
- * - The program finishes the encoding with FLAC__stream_encoder_finish(),
- *   which causes the encoder to encode any data still in its input pipe,
- *   update the metadata with the final encoding statistics if output
- *   seeking is possible, and finally reset the encoder to the
- *   uninitialized state.
- * - The instance may be used again or deleted with
- *   FLAC__stream_encoder_delete().
- *
- * In more detail, the stream encoder functions similarly to the
- * \link flac_stream_decoder stream decoder \endlink, but has fewer
- * callbacks and more options.  Typically the client will create a new
- * instance by calling FLAC__stream_encoder_new(), then set the necessary
- * parameters with FLAC__stream_encoder_set_*(), and initialize it by
- * calling one of the FLAC__stream_encoder_init_*() functions.
- *
- * Unlike the decoders, the stream encoder has many options that can
- * affect the speed and compression ratio.  When setting these parameters
- * you should have some basic knowledge of the format (see the
- * <A HREF="../documentation.html#format">user-level documentation</A>
- * or the <A HREF="../format.html">formal description</A>).  The
- * FLAC__stream_encoder_set_*() functions themselves do not validate the
- * values as many are interdependent.  The FLAC__stream_encoder_init_*()
- * functions will do this, so make sure to pay attention to the state
- * returned by FLAC__stream_encoder_init_*() to make sure that it is
- * FLAC__STREAM_ENCODER_INIT_STATUS_OK.  Any parameters that are not set
- * before FLAC__stream_encoder_init_*() will take on the defaults from
- * the constructor.
- *
- * There are three initialization functions for native FLAC, one for
- * setting up the encoder to encode FLAC data to the client via
- * callbacks, and two for encoding directly to a file.
- *
- * For encoding via callbacks, use FLAC__stream_encoder_init_stream().
- * You must also supply a write callback which will be called anytime
- * there is raw encoded data to write.  If the client can seek the output
- * it is best to also supply seek and tell callbacks, as this allows the
- * encoder to go back after encoding is finished to write back
- * information that was collected while encoding, like seek point offsets,
- * frame sizes, etc.
- *
- * For encoding directly to a file, use FLAC__stream_encoder_init_FILE()
- * or FLAC__stream_encoder_init_file().  Then you must only supply a
- * filename or open \c FILE*; the encoder will handle all the callbacks
- * internally.  You may also supply a progress callback for periodic
- * notification of the encoding progress.
- *
- * There are three similarly-named init functions for encoding to Ogg
- * FLAC streams.  Check \c FLAC_API_SUPPORTS_OGG_FLAC to find out if the
- * library has been built with Ogg support.
- *
- * The call to FLAC__stream_encoder_init_*() currently will also immediately
- * call the write callback several times, once with the \c fLaC signature,
- * and once for each encoded metadata block.  Note that for Ogg FLAC
- * encoding you will usually get at least twice the number of callbacks than
- * with native FLAC, one for the Ogg page header and one for the page body.
- *
- * After initializing the instance, the client may feed audio data to the
- * encoder in one of two ways:
- *
- * - Channel separate, through FLAC__stream_encoder_process() - The client
- *   will pass an array of pointers to buffers, one for each channel, to
- *   the encoder, each of the same length.  The samples need not be
- *   block-aligned, but each channel should have the same number of samples.
- * - Channel interleaved, through
- *   FLAC__stream_encoder_process_interleaved() - The client will pass a single
- *   pointer to data that is channel-interleaved (i.e. channel0_sample0,
- *   channel1_sample0, ... , channelN_sample0, channel0_sample1, ...).
- *   Again, the samples need not be block-aligned but they must be
- *   sample-aligned, i.e. the first value should be channel0_sample0 and
- *   the last value channelN_sampleM.
- *
- * Note that for either process call, each sample in the buffers should be a
- * signed integer, right-justified to the resolution set by
- * FLAC__stream_encoder_set_bits_per_sample().  For example, if the resolution
- * is 16 bits per sample, the samples should all be in the range [-32768,32767].
- *
- * When the client is finished encoding data, it calls
- * FLAC__stream_encoder_finish(), which causes the encoder to encode any
- * data still in its input pipe, and call the metadata callback with the
- * final encoding statistics.  Then the instance may be deleted with
- * FLAC__stream_encoder_delete() or initialized again to encode another
- * stream.
- *
- * For programs that write their own metadata, but that do not know the
- * actual metadata until after encoding, it is advantageous to instruct
- * the encoder to write a PADDING block of the correct size, so that
- * instead of rewriting the whole stream after encoding, the program can
- * just overwrite the PADDING block.  If only the maximum size of the
- * metadata is known, the program can write a slightly larger padding
- * block, then split it after encoding.
- *
- * Make sure you understand how lengths are calculated.  All FLAC metadata
- * blocks have a 4 byte header which contains the type and length.  This
- * length does not include the 4 bytes of the header.  See the format page
- * for the specification of metadata blocks and their lengths.
- *
- * \note
- * If you are writing the FLAC data to a file via callbacks, make sure it
- * is open for update (e.g. mode "w+" for stdio streams).  This is because
- * after the first encoding pass, the encoder will try to seek back to the
- * beginning of the stream, to the STREAMINFO block, to write some data
- * there.  (If using FLAC__stream_encoder_init*_file() or
- * FLAC__stream_encoder_init*_FILE(), the file is managed internally.)
- *
- * \note
- * The "set" functions may only be called when the encoder is in the
- * state FLAC__STREAM_ENCODER_UNINITIALIZED, i.e. after
- * FLAC__stream_encoder_new() or FLAC__stream_encoder_finish(), but
- * before FLAC__stream_encoder_init_*().  If this is the case they will
- * return \c true, otherwise \c false.
- *
- * \note
- * FLAC__stream_encoder_finish() resets all settings to the constructor
- * defaults.
- *
- * \{
- */
-
-
-/** State values for a FLAC__StreamEncoder.
- *
- * The encoder's state can be obtained by calling FLAC__stream_encoder_get_state().
- *
- * If the encoder gets into any other state besides \c FLAC__STREAM_ENCODER_OK
- * or \c FLAC__STREAM_ENCODER_UNINITIALIZED, it becomes invalid for encoding and
- * must be deleted with FLAC__stream_encoder_delete().
- */
-typedef enum {
-
-	FLAC__STREAM_ENCODER_OK = 0,
-	/**< The encoder is in the normal OK state and samples can be processed. */
-
-	FLAC__STREAM_ENCODER_UNINITIALIZED,
-	/**< The encoder is in the uninitialized state; one of the
-	 * FLAC__stream_encoder_init_*() functions must be called before samples
-	 * can be processed.
-	 */
-
-	FLAC__STREAM_ENCODER_OGG_ERROR,
-	/**< An error occurred in the underlying Ogg layer.  */
-
-	FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR,
-	/**< An error occurred in the underlying verify stream decoder;
-	 * check FLAC__stream_encoder_get_verify_decoder_state().
-	 */
-
-	FLAC__STREAM_ENCODER_VERIFY_MISMATCH_IN_AUDIO_DATA,
-	/**< The verify decoder detected a mismatch between the original
-	 * audio signal and the decoded audio signal.
-	 */
-
-	FLAC__STREAM_ENCODER_CLIENT_ERROR,
-	/**< One of the callbacks returned a fatal error. */
-
-	FLAC__STREAM_ENCODER_IO_ERROR,
-	/**< An I/O error occurred while opening/reading/writing a file.
-	 * Check \c errno.
-	 */
-
-	FLAC__STREAM_ENCODER_FRAMING_ERROR,
-	/**< An error occurred while writing the stream; usually, the
-	 * write_callback returned an error.
-	 */
-
-	FLAC__STREAM_ENCODER_MEMORY_ALLOCATION_ERROR
-	/**< Memory allocation failed. */
-
-} FLAC__StreamEncoderState;
-
-/** Maps a FLAC__StreamEncoderState to a C string.
- *
- *  Using a FLAC__StreamEncoderState as the index to this array
- *  will give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__StreamEncoderStateString[];
-
-
-/** Possible return values for the FLAC__stream_encoder_init_*() functions.
- */
-typedef enum {
-
-	FLAC__STREAM_ENCODER_INIT_STATUS_OK = 0,
-	/**< Initialization was successful. */
-
-	FLAC__STREAM_ENCODER_INIT_STATUS_ENCODER_ERROR,
-	/**< General failure to set up encoder; call FLAC__stream_encoder_get_state() for cause. */
-
-	FLAC__STREAM_ENCODER_INIT_STATUS_UNSUPPORTED_CONTAINER,
-	/**< The library was not compiled with support for the given container
-	 * format.
-	 */
-
-	FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_CALLBACKS,
-	/**< A required callback was not supplied. */
-
-	FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_NUMBER_OF_CHANNELS,
-	/**< The encoder has an invalid setting for number of channels. */
-
-	FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_BITS_PER_SAMPLE,
-	/**< The encoder has an invalid setting for bits-per-sample.
-	 * FLAC supports 4-32 bps but the reference encoder currently supports
-	 * only up to 24 bps.
-	 */
-
-	FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_SAMPLE_RATE,
-	/**< The encoder has an invalid setting for the input sample rate. */
-
-	FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_BLOCK_SIZE,
-	/**< The encoder has an invalid setting for the block size. */
-
-	FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_MAX_LPC_ORDER,
-	/**< The encoder has an invalid setting for the maximum LPC order. */
-
-	FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_QLP_COEFF_PRECISION,
-	/**< The encoder has an invalid setting for the precision of the quantized linear predictor coefficients. */
-
-	FLAC__STREAM_ENCODER_INIT_STATUS_BLOCK_SIZE_TOO_SMALL_FOR_LPC_ORDER,
-	/**< The specified block size is less than the maximum LPC order. */
-
-	FLAC__STREAM_ENCODER_INIT_STATUS_NOT_STREAMABLE,
-	/**< The encoder is bound to the <A HREF="../format.html#subset">Subset</A> but other settings violate it. */
-
-	FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_METADATA,
-	/**< The metadata input to the encoder is invalid, in one of the following ways:
-	 * - FLAC__stream_encoder_set_metadata() was called with a null pointer but a block count > 0
-	 * - One of the metadata blocks contains an undefined type
-	 * - It contains an illegal CUESHEET as checked by FLAC__format_cuesheet_is_legal()
-	 * - It contains an illegal SEEKTABLE as checked by FLAC__format_seektable_is_legal()
-	 * - It contains more than one SEEKTABLE block or more than one VORBIS_COMMENT block
-	 */
-
-	FLAC__STREAM_ENCODER_INIT_STATUS_ALREADY_INITIALIZED
-	/**< FLAC__stream_encoder_init_*() was called when the encoder was
-	 * already initialized, usually because
-	 * FLAC__stream_encoder_finish() was not called.
-	 */
-
-} FLAC__StreamEncoderInitStatus;
-
-/** Maps a FLAC__StreamEncoderInitStatus to a C string.
- *
- *  Using a FLAC__StreamEncoderInitStatus as the index to this array
- *  will give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__StreamEncoderInitStatusString[];
-
-
-/** Return values for the FLAC__StreamEncoder read callback.
- */
-typedef enum {
-
-	FLAC__STREAM_ENCODER_READ_STATUS_CONTINUE,
-	/**< The read was OK and decoding can continue. */
-
-	FLAC__STREAM_ENCODER_READ_STATUS_END_OF_STREAM,
-	/**< The read was attempted at the end of the stream. */
-
-	FLAC__STREAM_ENCODER_READ_STATUS_ABORT,
-	/**< An unrecoverable error occurred. */
-
-	FLAC__STREAM_ENCODER_READ_STATUS_UNSUPPORTED
-	/**< Client does not support reading back from the output. */
-
-} FLAC__StreamEncoderReadStatus;
-
-/** Maps a FLAC__StreamEncoderReadStatus to a C string.
- *
- *  Using a FLAC__StreamEncoderReadStatus as the index to this array
- *  will give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__StreamEncoderReadStatusString[];
-
-
-/** Return values for the FLAC__StreamEncoder write callback.
- */
-typedef enum {
-
-	FLAC__STREAM_ENCODER_WRITE_STATUS_OK = 0,
-	/**< The write was OK and encoding can continue. */
-
-	FLAC__STREAM_ENCODER_WRITE_STATUS_FATAL_ERROR
-	/**< An unrecoverable error occurred.  The encoder will return from the process call. */
-
-} FLAC__StreamEncoderWriteStatus;
-
-/** Maps a FLAC__StreamEncoderWriteStatus to a C string.
- *
- *  Using a FLAC__StreamEncoderWriteStatus as the index to this array
- *  will give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__StreamEncoderWriteStatusString[];
-
-
-/** Return values for the FLAC__StreamEncoder seek callback.
- */
-typedef enum {
-
-	FLAC__STREAM_ENCODER_SEEK_STATUS_OK,
-	/**< The seek was OK and encoding can continue. */
-
-	FLAC__STREAM_ENCODER_SEEK_STATUS_ERROR,
-	/**< An unrecoverable error occurred. */
-
-	FLAC__STREAM_ENCODER_SEEK_STATUS_UNSUPPORTED
-	/**< Client does not support seeking. */
-
-} FLAC__StreamEncoderSeekStatus;
-
-/** Maps a FLAC__StreamEncoderSeekStatus to a C string.
- *
- *  Using a FLAC__StreamEncoderSeekStatus as the index to this array
- *  will give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__StreamEncoderSeekStatusString[];
-
-
-/** Return values for the FLAC__StreamEncoder tell callback.
- */
-typedef enum {
-
-	FLAC__STREAM_ENCODER_TELL_STATUS_OK,
-	/**< The tell was OK and encoding can continue. */
-
-	FLAC__STREAM_ENCODER_TELL_STATUS_ERROR,
-	/**< An unrecoverable error occurred. */
-
-	FLAC__STREAM_ENCODER_TELL_STATUS_UNSUPPORTED
-	/**< Client does not support seeking. */
-
-} FLAC__StreamEncoderTellStatus;
-
-/** Maps a FLAC__StreamEncoderTellStatus to a C string.
- *
- *  Using a FLAC__StreamEncoderTellStatus as the index to this array
- *  will give the string equivalent.  The contents should not be modified.
- */
-extern FLAC_API const char * const FLAC__StreamEncoderTellStatusString[];
-
-
-/***********************************************************************
- *
- * class FLAC__StreamEncoder
- *
- ***********************************************************************/
-
-struct FLAC__StreamEncoderProtected;
-struct FLAC__StreamEncoderPrivate;
-/** The opaque structure definition for the stream encoder type.
- *  See the \link flac_stream_encoder stream encoder module \endlink
- *  for a detailed description.
- */
-typedef struct {
-	struct FLAC__StreamEncoderProtected *protected_; /* avoid the C++ keyword 'protected' */
-	struct FLAC__StreamEncoderPrivate *private_; /* avoid the C++ keyword 'private' */
-} FLAC__StreamEncoder;
-
-/** Signature for the read callback.
- *
- *  A function pointer matching this signature must be passed to
- *  FLAC__stream_encoder_init_ogg_stream() if seeking is supported.
- *  The supplied function will be called when the encoder needs to read back
- *  encoded data.  This happens during the metadata callback, when the encoder
- *  has to read, modify, and rewrite the metadata (e.g. seekpoints) gathered
- *  while encoding.  The address of the buffer to be filled is supplied, along
- *  with the number of bytes the buffer can hold.  The callback may choose to
- *  supply less data and modify the byte count but must be careful not to
- *  overflow the buffer.  The callback then returns a status code chosen from
- *  FLAC__StreamEncoderReadStatus.
- *
- * Here is an example of a read callback for stdio streams:
- * \code
- * FLAC__StreamEncoderReadStatus read_cb(const FLAC__StreamEncoder *encoder, FLAC__byte buffer[], size_t *bytes, void *client_data)
- * {
- *   FILE *file = ((MyClientData*)client_data)->file;
- *   if(*bytes > 0) {
- *     *bytes = fread(buffer, sizeof(FLAC__byte), *bytes, file);
- *     if(ferror(file))
- *       return FLAC__STREAM_ENCODER_READ_STATUS_ABORT;
- *     else if(*bytes == 0)
- *       return FLAC__STREAM_ENCODER_READ_STATUS_END_OF_STREAM;
- *     else
- *       return FLAC__STREAM_ENCODER_READ_STATUS_CONTINUE;
- *   }
- *   else
- *     return FLAC__STREAM_ENCODER_READ_STATUS_ABORT;
- * }
- * \endcode
- *
- * \note In general, FLAC__StreamEncoder functions which change the
- * state should not be called on the \a encoder while in the callback.
- *
- * \param  encoder  The encoder instance calling the callback.
- * \param  buffer   A pointer to a location for the callee to store
- *                  data to be encoded.
- * \param  bytes    A pointer to the size of the buffer.  On entry
- *                  to the callback, it contains the maximum number
- *                  of bytes that may be stored in \a buffer.  The
- *                  callee must set it to the actual number of bytes
- *                  stored (0 in case of error or end-of-stream) before
- *                  returning.
- * \param  client_data  The callee's client data set through
- *                      FLAC__stream_encoder_set_client_data().
- * \retval FLAC__StreamEncoderReadStatus
- *    The callee's return status.
- */
-typedef FLAC__StreamEncoderReadStatus (*FLAC__StreamEncoderReadCallback)(const FLAC__StreamEncoder *encoder, FLAC__byte buffer[], size_t *bytes, void *client_data);
-
-/** Signature for the write callback.
- *
- *  A function pointer matching this signature must be passed to
- *  FLAC__stream_encoder_init*_stream().  The supplied function will be called
- *  by the encoder anytime there is raw encoded data ready to write.  It may
- *  include metadata mixed with encoded audio frames and the data is not
- *  guaranteed to be aligned on frame or metadata block boundaries.
- *
- *  The only duty of the callback is to write out the \a bytes worth of data
- *  in \a buffer to the current position in the output stream.  The arguments
- *  \a samples and \a current_frame are purely informational.  If \a samples
- *  is greater than \c 0, then \a current_frame will hold the current frame
- *  number that is being written; otherwise it indicates that the write
- *  callback is being called to write metadata.
- *
- * \note
- * Unlike when writing to native FLAC, when writing to Ogg FLAC the
- * write callback will be called twice when writing each audio
- * frame; once for the page header, and once for the page body.
- * When writing the page header, the \a samples argument to the
- * write callback will be \c 0.
- *
- * \note In general, FLAC__StreamEncoder functions which change the
- * state should not be called on the \a encoder while in the callback.
- *
- * \param  encoder  The encoder instance calling the callback.
- * \param  buffer   An array of encoded data of length \a bytes.
- * \param  bytes    The byte length of \a buffer.
- * \param  samples  The number of samples encoded by \a buffer.
- *                  \c 0 has a special meaning; see above.
- * \param  current_frame  The number of the current frame being encoded.
- * \param  client_data  The callee's client data set through
- *                      FLAC__stream_encoder_init_*().
- * \retval FLAC__StreamEncoderWriteStatus
- *    The callee's return status.
- */
-typedef FLAC__StreamEncoderWriteStatus (*FLAC__StreamEncoderWriteCallback)(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data);
-
-/** Signature for the seek callback.
- *
- *  A function pointer matching this signature may be passed to
- *  FLAC__stream_encoder_init*_stream().  The supplied function will be called
- *  when the encoder needs to seek the output stream.  The encoder will pass
- *  the absolute byte offset to seek to, 0 meaning the beginning of the stream.
- *
- * Here is an example of a seek callback for stdio streams:
- * \code
- * FLAC__StreamEncoderSeekStatus seek_cb(const FLAC__StreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data)
- * {
- *   FILE *file = ((MyClientData*)client_data)->file;
- *   if(file == stdin)
- *     return FLAC__STREAM_ENCODER_SEEK_STATUS_UNSUPPORTED;
- *   else if(fseeko(file, (off_t)absolute_byte_offset, SEEK_SET) < 0)
- *     return FLAC__STREAM_ENCODER_SEEK_STATUS_ERROR;
- *   else
- *     return FLAC__STREAM_ENCODER_SEEK_STATUS_OK;
- * }
- * \endcode
- *
- * \note In general, FLAC__StreamEncoder functions which change the
- * state should not be called on the \a encoder while in the callback.
- *
- * \param  encoder  The encoder instance calling the callback.
- * \param  absolute_byte_offset  The offset from the beginning of the stream
- *                               to seek to.
- * \param  client_data  The callee's client data set through
- *                      FLAC__stream_encoder_init_*().
- * \retval FLAC__StreamEncoderSeekStatus
- *    The callee's return status.
- */
-typedef FLAC__StreamEncoderSeekStatus (*FLAC__StreamEncoderSeekCallback)(const FLAC__StreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data);
-
-/** Signature for the tell callback.
- *
- *  A function pointer matching this signature may be passed to
- *  FLAC__stream_encoder_init*_stream().  The supplied function will be called
- *  when the encoder needs to know the current position of the output stream.
- *
- * \warning
- * The callback must return the true current byte offset of the output to
- * which the encoder is writing.  If you are buffering the output, make
- * sure and take this into account.  If you are writing directly to a
- * FILE* from your write callback, ftell() is sufficient.  If you are
- * writing directly to a file descriptor from your write callback, you
- * can use lseek(fd, SEEK_CUR, 0).  The encoder may later seek back to
- * these points to rewrite metadata after encoding.
- *
- * Here is an example of a tell callback for stdio streams:
- * \code
- * FLAC__StreamEncoderTellStatus tell_cb(const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data)
- * {
- *   FILE *file = ((MyClientData*)client_data)->file;
- *   off_t pos;
- *   if(file == stdin)
- *     return FLAC__STREAM_ENCODER_TELL_STATUS_UNSUPPORTED;
- *   else if((pos = ftello(file)) < 0)
- *     return FLAC__STREAM_ENCODER_TELL_STATUS_ERROR;
- *   else {
- *     *absolute_byte_offset = (FLAC__uint64)pos;
- *     return FLAC__STREAM_ENCODER_TELL_STATUS_OK;
- *   }
- * }
- * \endcode
- *
- * \note In general, FLAC__StreamEncoder functions which change the
- * state should not be called on the \a encoder while in the callback.
- *
- * \param  encoder  The encoder instance calling the callback.
- * \param  absolute_byte_offset  The address at which to store the current
- *                               position of the output.
- * \param  client_data  The callee's client data set through
- *                      FLAC__stream_encoder_init_*().
- * \retval FLAC__StreamEncoderTellStatus
- *    The callee's return status.
- */
-typedef FLAC__StreamEncoderTellStatus (*FLAC__StreamEncoderTellCallback)(const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data);
-
-/** Signature for the metadata callback.
- *
- *  A function pointer matching this signature may be passed to
- *  FLAC__stream_encoder_init*_stream().  The supplied function will be called
- *  once at the end of encoding with the populated STREAMINFO structure.  This
- *  is so the client can seek back to the beginning of the file and write the
- *  STREAMINFO block with the correct statistics after encoding (like
- *  minimum/maximum frame size and total samples).
- *
- * \note In general, FLAC__StreamEncoder functions which change the
- * state should not be called on the \a encoder while in the callback.
- *
- * \param  encoder      The encoder instance calling the callback.
- * \param  metadata     The final populated STREAMINFO block.
- * \param  client_data  The callee's client data set through
- *                      FLAC__stream_encoder_init_*().
- */
-typedef void (*FLAC__StreamEncoderMetadataCallback)(const FLAC__StreamEncoder *encoder, const FLAC__StreamMetadata *metadata, void *client_data);
-
-/** Signature for the progress callback.
- *
- *  A function pointer matching this signature may be passed to
- *  FLAC__stream_encoder_init*_file() or FLAC__stream_encoder_init*_FILE().
- *  The supplied function will be called when the encoder has finished
- *  writing a frame.  The \c total_frames_estimate argument to the
- *  callback will be based on the value from
- *  FLAC__stream_encoder_set_total_samples_estimate().
- *
- * \note In general, FLAC__StreamEncoder functions which change the
- * state should not be called on the \a encoder while in the callback.
- *
- * \param  encoder          The encoder instance calling the callback.
- * \param  bytes_written    Bytes written so far.
- * \param  samples_written  Samples written so far.
- * \param  frames_written   Frames written so far.
- * \param  total_frames_estimate  The estimate of the total number of
- *                                frames to be written.
- * \param  client_data      The callee's client data set through
- *                          FLAC__stream_encoder_init_*().
- */
-typedef void (*FLAC__StreamEncoderProgressCallback)(const FLAC__StreamEncoder *encoder, FLAC__uint64 bytes_written, FLAC__uint64 samples_written, unsigned frames_written, unsigned total_frames_estimate, void *client_data);
-
-
-/***********************************************************************
- *
- * Class constructor/destructor
- *
- ***********************************************************************/
-
-/** Create a new stream encoder instance.  The instance is created with
- *  default settings; see the individual FLAC__stream_encoder_set_*()
- *  functions for each setting's default.
- *
- * \retval FLAC__StreamEncoder*
- *    \c NULL if there was an error allocating memory, else the new instance.
- */
-FLAC_API FLAC__StreamEncoder *FLAC__stream_encoder_new(void);
-
-/** Free an encoder instance.  Deletes the object pointed to by \a encoder.
- *
- * \param encoder  A pointer to an existing encoder.
- * \assert
- *    \code encoder != NULL \endcode
- */
-FLAC_API void FLAC__stream_encoder_delete(FLAC__StreamEncoder *encoder);
-
-
-/***********************************************************************
- *
- * Public class method prototypes
- *
- ***********************************************************************/
-
-/** Set the serial number for the FLAC stream to use in the Ogg container.
- *
- * \note
- * This does not need to be set for native FLAC encoding.
- *
- * \note
- * It is recommended to set a serial number explicitly as the default of '0'
- * may collide with other streams.
- *
- * \default \c 0
- * \param  encoder        An encoder instance to set.
- * \param  serial_number  See above.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_ogg_serial_number(FLAC__StreamEncoder *encoder, long serial_number);
-
-/** Set the "verify" flag.  If \c true, the encoder will verify it's own
- *  encoded output by feeding it through an internal decoder and comparing
- *  the original signal against the decoded signal.  If a mismatch occurs,
- *  the process call will return \c false.  Note that this will slow the
- *  encoding process by the extra time required for decoding and comparison.
- *
- * \default \c false
- * \param  encoder  An encoder instance to set.
- * \param  value    Flag value (see above).
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_verify(FLAC__StreamEncoder *encoder, FLAC__bool value);
-
-/** Set the <A HREF="../format.html#subset">Subset</A> flag.  If \c true,
- *  the encoder will comply with the Subset and will check the
- *  settings during FLAC__stream_encoder_init_*() to see if all settings
- *  comply.  If \c false, the settings may take advantage of the full
- *  range that the format allows.
- *
- *  Make sure you know what it entails before setting this to \c false.
- *
- * \default \c true
- * \param  encoder  An encoder instance to set.
- * \param  value    Flag value (see above).
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_streamable_subset(FLAC__StreamEncoder *encoder, FLAC__bool value);
-
-/** Set the number of channels to be encoded.
- *
- * \default \c 2
- * \param  encoder  An encoder instance to set.
- * \param  value    See above.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_channels(FLAC__StreamEncoder *encoder, unsigned value);
-
-/** Set the sample resolution of the input to be encoded.
- *
- * \warning
- * Do not feed the encoder data that is wider than the value you
- * set here or you will generate an invalid stream.
- *
- * \default \c 16
- * \param  encoder  An encoder instance to set.
- * \param  value    See above.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_bits_per_sample(FLAC__StreamEncoder *encoder, unsigned value);
-
-/** Set the sample rate (in Hz) of the input to be encoded.
- *
- * \default \c 44100
- * \param  encoder  An encoder instance to set.
- * \param  value    See above.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_sample_rate(FLAC__StreamEncoder *encoder, unsigned value);
-
-/** Set the compression level
- *
- * The compression level is roughly proportional to the amount of effort
- * the encoder expends to compress the file.  A higher level usually
- * means more computation but higher compression.  The default level is
- * suitable for most applications.
- *
- * Currently the levels range from \c 0 (fastest, least compression) to
- * \c 8 (slowest, most compression).  A value larger than \c 8 will be
- * treated as \c 8.
- *
- * This function automatically calls the following other \c _set_
- * functions with appropriate values, so the client does not need to
- * unless it specifically wants to override them:
- * - FLAC__stream_encoder_set_do_mid_side_stereo()
- * - FLAC__stream_encoder_set_loose_mid_side_stereo()
- * - FLAC__stream_encoder_set_apodization()
- * - FLAC__stream_encoder_set_max_lpc_order()
- * - FLAC__stream_encoder_set_qlp_coeff_precision()
- * - FLAC__stream_encoder_set_do_qlp_coeff_prec_search()
- * - FLAC__stream_encoder_set_do_escape_coding()
- * - FLAC__stream_encoder_set_do_exhaustive_model_search()
- * - FLAC__stream_encoder_set_min_residual_partition_order()
- * - FLAC__stream_encoder_set_max_residual_partition_order()
- * - FLAC__stream_encoder_set_rice_parameter_search_dist()
- *
- * The actual values set for each level are:
- * <table>
- * <tr>
- *  <td><b>level</b><td>
- *  <td>do mid-side stereo<td>
- *  <td>loose mid-side stereo<td>
- *  <td>apodization<td>
- *  <td>max lpc order<td>
- *  <td>qlp coeff precision<td>
- *  <td>qlp coeff prec search<td>
- *  <td>escape coding<td>
- *  <td>exhaustive model search<td>
- *  <td>min residual partition order<td>
- *  <td>max residual partition order<td>
- *  <td>rice parameter search dist<td>
- * </tr>
- * <tr>  <td><b>0</b><td>  <td>false<td>  <td>false<td>  <td>tukey(0.5)<td>  <td>0<td>   <td>0<td>  <td>false<td>  <td>false<td>  <td>false<td>  <td>0<td>  <td>3<td>  <td>0<td>  </tr>
- * <tr>  <td><b>1</b><td>  <td>true<td>   <td>true<td>   <td>tukey(0.5)<td>  <td>0<td>   <td>0<td>  <td>false<td>  <td>false<td>  <td>false<td>  <td>0<td>  <td>3<td>  <td>0<td>  </tr>
- * <tr>  <td><b>2</b><td>  <td>true<td>   <td>false<td>  <td>tukey(0.5)<td>  <td>0<td>   <td>0<td>  <td>false<td>  <td>false<td>  <td>false<td>  <td>0<td>  <td>3<td>  <td>0<td>  </tr>
- * <tr>  <td><b>3</b><td>  <td>false<td>  <td>false<td>  <td>tukey(0.5)<td>  <td>6<td>   <td>0<td>  <td>false<td>  <td>false<td>  <td>false<td>  <td>0<td>  <td>4<td>  <td>0<td>  </tr>
- * <tr>  <td><b>4</b><td>  <td>true<td>   <td>true<td>   <td>tukey(0.5)<td>  <td>8<td>   <td>0<td>  <td>false<td>  <td>false<td>  <td>false<td>  <td>0<td>  <td>4<td>  <td>0<td>  </tr>
- * <tr>  <td><b>5</b><td>  <td>true<td>   <td>false<td>  <td>tukey(0.5)<td>  <td>8<td>   <td>0<td>  <td>false<td>  <td>false<td>  <td>false<td>  <td>0<td>  <td>5<td>  <td>0<td>  </tr>
- * <tr>  <td><b>6</b><td>  <td>true<td>   <td>false<td>  <td>tukey(0.5)<td>  <td>8<td>   <td>0<td>  <td>false<td>  <td>false<td>  <td>false<td>  <td>0<td>  <td>6<td>  <td>0<td>  </tr>
- * <tr>  <td><b>7</b><td>  <td>true<td>   <td>false<td>  <td>tukey(0.5)<td>  <td>8<td>   <td>0<td>  <td>false<td>  <td>false<td>  <td>true<td>   <td>0<td>  <td>6<td>  <td>0<td>  </tr>
- * <tr>  <td><b>8</b><td>  <td>true<td>   <td>false<td>  <td>tukey(0.5)<td>  <td>12<td>  <td>0<td>  <td>false<td>  <td>false<td>  <td>true<td>   <td>0<td>  <td>6<td>  <td>0<td>  </tr>
- * </table>
- *
- * \default \c 5
- * \param  encoder  An encoder instance to set.
- * \param  value    See above.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_compression_level(FLAC__StreamEncoder *encoder, unsigned value);
-
-/** Set the blocksize to use while encoding.
- *
- * The number of samples to use per frame.  Use \c 0 to let the encoder
- * estimate a blocksize; this is usually best.
- *
- * \default \c 0
- * \param  encoder  An encoder instance to set.
- * \param  value    See above.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_blocksize(FLAC__StreamEncoder *encoder, unsigned value);
-
-/** Set to \c true to enable mid-side encoding on stereo input.  The
- *  number of channels must be 2 for this to have any effect.  Set to
- *  \c false to use only independent channel coding.
- *
- * \default \c false
- * \param  encoder  An encoder instance to set.
- * \param  value    Flag value (see above).
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_do_mid_side_stereo(FLAC__StreamEncoder *encoder, FLAC__bool value);
-
-/** Set to \c true to enable adaptive switching between mid-side and
- *  left-right encoding on stereo input.  Set to \c false to use
- *  exhaustive searching.  Setting this to \c true requires
- *  FLAC__stream_encoder_set_do_mid_side_stereo() to also be set to
- *  \c true in order to have any effect.
- *
- * \default \c false
- * \param  encoder  An encoder instance to set.
- * \param  value    Flag value (see above).
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_loose_mid_side_stereo(FLAC__StreamEncoder *encoder, FLAC__bool value);
-
-/** Sets the apodization function(s) the encoder will use when windowing
- *  audio data for LPC analysis.
- *
- * The \a specification is a plain ASCII string which specifies exactly
- * which functions to use.  There may be more than one (up to 32),
- * separated by \c ';' characters.  Some functions take one or more
- * comma-separated arguments in parentheses.
- *
- * The available functions are \c bartlett, \c bartlett_hann,
- * \c blackman, \c blackman_harris_4term_92db, \c connes, \c flattop,
- * \c gauss(STDDEV), \c hamming, \c hann, \c kaiser_bessel, \c nuttall,
- * \c rectangle, \c triangle, \c tukey(P), \c welch.
- *
- * For \c gauss(STDDEV), STDDEV specifies the standard deviation
- * (0<STDDEV<=0.5).
- *
- * For \c tukey(P), P specifies the fraction of the window that is
- * tapered (0<=P<=1).  P=0 corresponds to \c rectangle and P=1
- * corresponds to \c hann.
- *
- * Example specifications are \c "blackman" or
- * \c "hann;triangle;tukey(0.5);tukey(0.25);tukey(0.125)"
- *
- * Any function that is specified erroneously is silently dropped.  Up
- * to 32 functions are kept, the rest are dropped.  If the specification
- * is empty the encoder defaults to \c "tukey(0.5)".
- *
- * When more than one function is specified, then for every subframe the
- * encoder will try each of them separately and choose the window that
- * results in the smallest compressed subframe.
- *
- * Note that each function specified causes the encoder to occupy a
- * floating point array in which to store the window.
- *
- * \default \c "tukey(0.5)"
- * \param  encoder        An encoder instance to set.
- * \param  specification  See above.
- * \assert
- *    \code encoder != NULL \endcode
- *    \code specification != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_apodization(FLAC__StreamEncoder *encoder, const char *specification);
-
-/** Set the maximum LPC order, or \c 0 to use only the fixed predictors.
- *
- * \default \c 0
- * \param  encoder  An encoder instance to set.
- * \param  value    See above.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_max_lpc_order(FLAC__StreamEncoder *encoder, unsigned value);
-
-/** Set the precision, in bits, of the quantized linear predictor
- *  coefficients, or \c 0 to let the encoder select it based on the
- *  blocksize.
- *
- * \note
- * In the current implementation, qlp_coeff_precision + bits_per_sample must
- * be less than 32.
- *
- * \default \c 0
- * \param  encoder  An encoder instance to set.
- * \param  value    See above.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_qlp_coeff_precision(FLAC__StreamEncoder *encoder, unsigned value);
-
-/** Set to \c false to use only the specified quantized linear predictor
- *  coefficient precision, or \c true to search neighboring precision
- *  values and use the best one.
- *
- * \default \c false
- * \param  encoder  An encoder instance to set.
- * \param  value    See above.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_do_qlp_coeff_prec_search(FLAC__StreamEncoder *encoder, FLAC__bool value);
-
-/** Deprecated.  Setting this value has no effect.
- *
- * \default \c false
- * \param  encoder  An encoder instance to set.
- * \param  value    See above.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_do_escape_coding(FLAC__StreamEncoder *encoder, FLAC__bool value);
-
-/** Set to \c false to let the encoder estimate the best model order
- *  based on the residual signal energy, or \c true to force the
- *  encoder to evaluate all order models and select the best.
- *
- * \default \c false
- * \param  encoder  An encoder instance to set.
- * \param  value    See above.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_do_exhaustive_model_search(FLAC__StreamEncoder *encoder, FLAC__bool value);
-
-/** Set the minimum partition order to search when coding the residual.
- *  This is used in tandem with
- *  FLAC__stream_encoder_set_max_residual_partition_order().
- *
- *  The partition order determines the context size in the residual.
- *  The context size will be approximately <tt>blocksize / (2 ^ order)</tt>.
- *
- *  Set both min and max values to \c 0 to force a single context,
- *  whose Rice parameter is based on the residual signal variance.
- *  Otherwise, set a min and max order, and the encoder will search
- *  all orders, using the mean of each context for its Rice parameter,
- *  and use the best.
- *
- * \default \c 0
- * \param  encoder  An encoder instance to set.
- * \param  value    See above.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_min_residual_partition_order(FLAC__StreamEncoder *encoder, unsigned value);
-
-/** Set the maximum partition order to search when coding the residual.
- *  This is used in tandem with
- *  FLAC__stream_encoder_set_min_residual_partition_order().
- *
- *  The partition order determines the context size in the residual.
- *  The context size will be approximately <tt>blocksize / (2 ^ order)</tt>.
- *
- *  Set both min and max values to \c 0 to force a single context,
- *  whose Rice parameter is based on the residual signal variance.
- *  Otherwise, set a min and max order, and the encoder will search
- *  all orders, using the mean of each context for its Rice parameter,
- *  and use the best.
- *
- * \default \c 0
- * \param  encoder  An encoder instance to set.
- * \param  value    See above.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_max_residual_partition_order(FLAC__StreamEncoder *encoder, unsigned value);
-
-/** Deprecated.  Setting this value has no effect.
- *
- * \default \c 0
- * \param  encoder  An encoder instance to set.
- * \param  value    See above.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_rice_parameter_search_dist(FLAC__StreamEncoder *encoder, unsigned value);
-
-/** Set an estimate of the total samples that will be encoded.
- *  This is merely an estimate and may be set to \c 0 if unknown.
- *  This value will be written to the STREAMINFO block before encoding,
- *  and can remove the need for the caller to rewrite the value later
- *  if the value is known before encoding.
- *
- * \default \c 0
- * \param  encoder  An encoder instance to set.
- * \param  value    See above.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_total_samples_estimate(FLAC__StreamEncoder *encoder, FLAC__uint64 value);
-
-/** Set the metadata blocks to be emitted to the stream before encoding.
- *  A value of \c NULL, \c 0 implies no metadata; otherwise, supply an
- *  array of pointers to metadata blocks.  The array is non-const since
- *  the encoder may need to change the \a is_last flag inside them, and
- *  in some cases update seek point offsets.  Otherwise, the encoder will
- *  not modify or free the blocks.  It is up to the caller to free the
- *  metadata blocks after encoding finishes.
- *
- * \note
- * The encoder stores only copies of the pointers in the \a metadata array;
- * the metadata blocks themselves must survive at least until after
- * FLAC__stream_encoder_finish() returns.  Do not free the blocks until then.
- *
- * \note
- * The STREAMINFO block is always written and no STREAMINFO block may
- * occur in the supplied array.
- *
- * \note
- * By default the encoder does not create a SEEKTABLE.  If one is supplied
- * in the \a metadata array, but the client has specified that it does not
- * support seeking, then the SEEKTABLE will be written verbatim.  However
- * by itself this is not very useful as the client will not know the stream
- * offsets for the seekpoints ahead of time.  In order to get a proper
- * seektable the client must support seeking.  See next note.
- *
- * \note
- * SEEKTABLE blocks are handled specially.  Since you will not know
- * the values for the seek point stream offsets, you should pass in
- * a SEEKTABLE 'template', that is, a SEEKTABLE object with the
- * required sample numbers (or placeholder points), with \c 0 for the
- * \a frame_samples and \a stream_offset fields for each point.  If the
- * client has specified that it supports seeking by providing a seek
- * callback to FLAC__stream_encoder_init_stream() or both seek AND read
- * callback to FLAC__stream_encoder_init_ogg_stream() (or by using
- * FLAC__stream_encoder_init*_file() or FLAC__stream_encoder_init*_FILE()),
- * then while it is encoding the encoder will fill the stream offsets in
- * for you and when encoding is finished, it will seek back and write the
- * real values into the SEEKTABLE block in the stream.  There are helper
- * routines for manipulating seektable template blocks; see metadata.h:
- * FLAC__metadata_object_seektable_template_*().  If the client does
- * not support seeking, the SEEKTABLE will have inaccurate offsets which
- * will slow down or remove the ability to seek in the FLAC stream.
- *
- * \note
- * The encoder instance \b will modify the first \c SEEKTABLE block
- * as it transforms the template to a valid seektable while encoding,
- * but it is still up to the caller to free all metadata blocks after
- * encoding.
- *
- * \note
- * A VORBIS_COMMENT block may be supplied.  The vendor string in it
- * will be ignored.  libFLAC will use it's own vendor string. libFLAC
- * will not modify the passed-in VORBIS_COMMENT's vendor string, it
- * will simply write it's own into the stream.  If no VORBIS_COMMENT
- * block is present in the \a metadata array, libFLAC will write an
- * empty one, containing only the vendor string.
- *
- * \note The Ogg FLAC mapping requires that the VORBIS_COMMENT block be
- * the second metadata block of the stream.  The encoder already supplies
- * the STREAMINFO block automatically.  If \a metadata does not contain a
- * VORBIS_COMMENT block, the encoder will supply that too.  Otherwise, if
- * \a metadata does contain a VORBIS_COMMENT block and it is not the
- * first, the init function will reorder \a metadata by moving the
- * VORBIS_COMMENT block to the front; the relative ordering of the other
- * blocks will remain as they were.
- *
- * \note The Ogg FLAC mapping limits the number of metadata blocks per
- * stream to \c 65535.  If \a num_blocks exceeds this the function will
- * return \c false.
- *
- * \default \c NULL, 0
- * \param  encoder     An encoder instance to set.
- * \param  metadata    See above.
- * \param  num_blocks  See above.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if the encoder is already initialized, else \c true.
- *    \c false if the encoder is already initialized, or if
- *    \a num_blocks > 65535 if encoding to Ogg FLAC, else \c true.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_set_metadata(FLAC__StreamEncoder *encoder, FLAC__StreamMetadata **metadata, unsigned num_blocks);
-
-/** Get the current encoder state.
- *
- * \param  encoder  An encoder instance to query.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__StreamEncoderState
- *    The current encoder state.
- */
-FLAC_API FLAC__StreamEncoderState FLAC__stream_encoder_get_state(const FLAC__StreamEncoder *encoder);
-
-/** Get the state of the verify stream decoder.
- *  Useful when the stream encoder state is
- *  \c FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR.
- *
- * \param  encoder  An encoder instance to query.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__StreamDecoderState
- *    The verify stream decoder state.
- */
-FLAC_API FLAC__StreamDecoderState FLAC__stream_encoder_get_verify_decoder_state(const FLAC__StreamEncoder *encoder);
-
-/** Get the current encoder state as a C string.
- *  This version automatically resolves
- *  \c FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR by getting the
- *  verify decoder's state.
- *
- * \param  encoder  A encoder instance to query.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval const char *
- *    The encoder state as a C string.  Do not modify the contents.
- */
-FLAC_API const char *FLAC__stream_encoder_get_resolved_state_string(const FLAC__StreamEncoder *encoder);
-
-/** Get relevant values about the nature of a verify decoder error.
- *  Useful when the stream encoder state is
- *  \c FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR.  The arguments should
- *  be addresses in which the stats will be returned, or NULL if value
- *  is not desired.
- *
- * \param  encoder  An encoder instance to query.
- * \param  absolute_sample  The absolute sample number of the mismatch.
- * \param  frame_number  The number of the frame in which the mismatch occurred.
- * \param  channel       The channel in which the mismatch occurred.
- * \param  sample        The number of the sample (relative to the frame) in
- *                       which the mismatch occurred.
- * \param  expected      The expected value for the sample in question.
- * \param  got           The actual value returned by the decoder.
- * \assert
- *    \code encoder != NULL \endcode
- */
-FLAC_API void FLAC__stream_encoder_get_verify_decoder_error_stats(const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_sample, unsigned *frame_number, unsigned *channel, unsigned *sample, FLAC__int32 *expected, FLAC__int32 *got);
-
-/** Get the "verify" flag.
- *
- * \param  encoder  An encoder instance to query.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    See FLAC__stream_encoder_set_verify().
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_get_verify(const FLAC__StreamEncoder *encoder);
-
-/** Get the <A HREF="../format.html#subset>Subset</A> flag.
- *
- * \param  encoder  An encoder instance to query.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    See FLAC__stream_encoder_set_streamable_subset().
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_get_streamable_subset(const FLAC__StreamEncoder *encoder);
-
-/** Get the number of input channels being processed.
- *
- * \param  encoder  An encoder instance to query.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval unsigned
- *    See FLAC__stream_encoder_set_channels().
- */
-FLAC_API unsigned FLAC__stream_encoder_get_channels(const FLAC__StreamEncoder *encoder);
-
-/** Get the input sample resolution setting.
- *
- * \param  encoder  An encoder instance to query.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval unsigned
- *    See FLAC__stream_encoder_set_bits_per_sample().
- */
-FLAC_API unsigned FLAC__stream_encoder_get_bits_per_sample(const FLAC__StreamEncoder *encoder);
-
-/** Get the input sample rate setting.
- *
- * \param  encoder  An encoder instance to query.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval unsigned
- *    See FLAC__stream_encoder_set_sample_rate().
- */
-FLAC_API unsigned FLAC__stream_encoder_get_sample_rate(const FLAC__StreamEncoder *encoder);
-
-/** Get the blocksize setting.
- *
- * \param  encoder  An encoder instance to query.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval unsigned
- *    See FLAC__stream_encoder_set_blocksize().
- */
-FLAC_API unsigned FLAC__stream_encoder_get_blocksize(const FLAC__StreamEncoder *encoder);
-
-/** Get the "mid/side stereo coding" flag.
- *
- * \param  encoder  An encoder instance to query.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    See FLAC__stream_encoder_get_do_mid_side_stereo().
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_get_do_mid_side_stereo(const FLAC__StreamEncoder *encoder);
-
-/** Get the "adaptive mid/side switching" flag.
- *
- * \param  encoder  An encoder instance to query.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    See FLAC__stream_encoder_set_loose_mid_side_stereo().
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_get_loose_mid_side_stereo(const FLAC__StreamEncoder *encoder);
-
-/** Get the maximum LPC order setting.
- *
- * \param  encoder  An encoder instance to query.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval unsigned
- *    See FLAC__stream_encoder_set_max_lpc_order().
- */
-FLAC_API unsigned FLAC__stream_encoder_get_max_lpc_order(const FLAC__StreamEncoder *encoder);
-
-/** Get the quantized linear predictor coefficient precision setting.
- *
- * \param  encoder  An encoder instance to query.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval unsigned
- *    See FLAC__stream_encoder_set_qlp_coeff_precision().
- */
-FLAC_API unsigned FLAC__stream_encoder_get_qlp_coeff_precision(const FLAC__StreamEncoder *encoder);
-
-/** Get the qlp coefficient precision search flag.
- *
- * \param  encoder  An encoder instance to query.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    See FLAC__stream_encoder_set_do_qlp_coeff_prec_search().
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_get_do_qlp_coeff_prec_search(const FLAC__StreamEncoder *encoder);
-
-/** Get the "escape coding" flag.
- *
- * \param  encoder  An encoder instance to query.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    See FLAC__stream_encoder_set_do_escape_coding().
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_get_do_escape_coding(const FLAC__StreamEncoder *encoder);
-
-/** Get the exhaustive model search flag.
- *
- * \param  encoder  An encoder instance to query.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    See FLAC__stream_encoder_set_do_exhaustive_model_search().
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_get_do_exhaustive_model_search(const FLAC__StreamEncoder *encoder);
-
-/** Get the minimum residual partition order setting.
- *
- * \param  encoder  An encoder instance to query.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval unsigned
- *    See FLAC__stream_encoder_set_min_residual_partition_order().
- */
-FLAC_API unsigned FLAC__stream_encoder_get_min_residual_partition_order(const FLAC__StreamEncoder *encoder);
-
-/** Get maximum residual partition order setting.
- *
- * \param  encoder  An encoder instance to query.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval unsigned
- *    See FLAC__stream_encoder_set_max_residual_partition_order().
- */
-FLAC_API unsigned FLAC__stream_encoder_get_max_residual_partition_order(const FLAC__StreamEncoder *encoder);
-
-/** Get the Rice parameter search distance setting.
- *
- * \param  encoder  An encoder instance to query.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval unsigned
- *    See FLAC__stream_encoder_set_rice_parameter_search_dist().
- */
-FLAC_API unsigned FLAC__stream_encoder_get_rice_parameter_search_dist(const FLAC__StreamEncoder *encoder);
-
-/** Get the previously set estimate of the total samples to be encoded.
- *  The encoder merely mimics back the value given to
- *  FLAC__stream_encoder_set_total_samples_estimate() since it has no
- *  other way of knowing how many samples the client will encode.
- *
- * \param  encoder  An encoder instance to set.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__uint64
- *    See FLAC__stream_encoder_get_total_samples_estimate().
- */
-FLAC_API FLAC__uint64 FLAC__stream_encoder_get_total_samples_estimate(const FLAC__StreamEncoder *encoder);
-
-/** Initialize the encoder instance to encode native FLAC streams.
- *
- *  This flavor of initialization sets up the encoder to encode to a
- *  native FLAC stream. I/O is performed via callbacks to the client.
- *  For encoding to a plain file via filename or open \c FILE*,
- *  FLAC__stream_encoder_init_file() and FLAC__stream_encoder_init_FILE()
- *  provide a simpler interface.
- *
- *  This function should be called after FLAC__stream_encoder_new() and
- *  FLAC__stream_encoder_set_*() but before FLAC__stream_encoder_process()
- *  or FLAC__stream_encoder_process_interleaved().
- *  initialization succeeded.
- *
- *  The call to FLAC__stream_encoder_init_stream() currently will also
- *  immediately call the write callback several times, once with the \c fLaC
- *  signature, and once for each encoded metadata block.
- *
- * \param  encoder            An uninitialized encoder instance.
- * \param  write_callback     See FLAC__StreamEncoderWriteCallback.  This
- *                            pointer must not be \c NULL.
- * \param  seek_callback      See FLAC__StreamEncoderSeekCallback.  This
- *                            pointer may be \c NULL if seeking is not
- *                            supported.  The encoder uses seeking to go back
- *                            and write some some stream statistics to the
- *                            STREAMINFO block; this is recommended but not
- *                            necessary to create a valid FLAC stream.  If
- *                            \a seek_callback is not \c NULL then a
- *                            \a tell_callback must also be supplied.
- *                            Alternatively, a dummy seek callback that just
- *                            returns \c FLAC__STREAM_ENCODER_SEEK_STATUS_UNSUPPORTED
- *                            may also be supplied, all though this is slightly
- *                            less efficient for the encoder.
- * \param  tell_callback      See FLAC__StreamEncoderTellCallback.  This
- *                            pointer may be \c NULL if seeking is not
- *                            supported.  If \a seek_callback is \c NULL then
- *                            this argument will be ignored.  If
- *                            \a seek_callback is not \c NULL then a
- *                            \a tell_callback must also be supplied.
- *                            Alternatively, a dummy tell callback that just
- *                            returns \c FLAC__STREAM_ENCODER_TELL_STATUS_UNSUPPORTED
- *                            may also be supplied, all though this is slightly
- *                            less efficient for the encoder.
- * \param  metadata_callback  See FLAC__StreamEncoderMetadataCallback.  This
- *                            pointer may be \c NULL if the callback is not
- *                            desired.  If the client provides a seek callback,
- *                            this function is not necessary as the encoder
- *                            will automatically seek back and update the
- *                            STREAMINFO block.  It may also be \c NULL if the
- *                            client does not support seeking, since it will
- *                            have no way of going back to update the
- *                            STREAMINFO.  However the client can still supply
- *                            a callback if it would like to know the details
- *                            from the STREAMINFO.
- * \param  client_data        This value will be supplied to callbacks in their
- *                            \a client_data argument.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__StreamEncoderInitStatus
- *    \c FLAC__STREAM_ENCODER_INIT_STATUS_OK if initialization was successful;
- *    see FLAC__StreamEncoderInitStatus for the meanings of other return values.
- */
-FLAC_API FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_stream(FLAC__StreamEncoder *encoder, FLAC__StreamEncoderWriteCallback write_callback, FLAC__StreamEncoderSeekCallback seek_callback, FLAC__StreamEncoderTellCallback tell_callback, FLAC__StreamEncoderMetadataCallback metadata_callback, void *client_data);
-
-/** Initialize the encoder instance to encode Ogg FLAC streams.
- *
- *  This flavor of initialization sets up the encoder to encode to a FLAC
- *  stream in an Ogg container.  I/O is performed via callbacks to the
- *  client.  For encoding to a plain file via filename or open \c FILE*,
- *  FLAC__stream_encoder_init_ogg_file() and FLAC__stream_encoder_init_ogg_FILE()
- *  provide a simpler interface.
- *
- *  This function should be called after FLAC__stream_encoder_new() and
- *  FLAC__stream_encoder_set_*() but before FLAC__stream_encoder_process()
- *  or FLAC__stream_encoder_process_interleaved().
- *  initialization succeeded.
- *
- *  The call to FLAC__stream_encoder_init_ogg_stream() currently will also
- *  immediately call the write callback several times to write the metadata
- *  packets.
- *
- * \param  encoder            An uninitialized encoder instance.
- * \param  read_callback      See FLAC__StreamEncoderReadCallback.  This
- *                            pointer must not be \c NULL if \a seek_callback
- *                            is non-NULL since they are both needed to be
- *                            able to write data back to the Ogg FLAC stream
- *                            in the post-encode phase.
- * \param  write_callback     See FLAC__StreamEncoderWriteCallback.  This
- *                            pointer must not be \c NULL.
- * \param  seek_callback      See FLAC__StreamEncoderSeekCallback.  This
- *                            pointer may be \c NULL if seeking is not
- *                            supported.  The encoder uses seeking to go back
- *                            and write some some stream statistics to the
- *                            STREAMINFO block; this is recommended but not
- *                            necessary to create a valid FLAC stream.  If
- *                            \a seek_callback is not \c NULL then a
- *                            \a tell_callback must also be supplied.
- *                            Alternatively, a dummy seek callback that just
- *                            returns \c FLAC__STREAM_ENCODER_SEEK_STATUS_UNSUPPORTED
- *                            may also be supplied, all though this is slightly
- *                            less efficient for the encoder.
- * \param  tell_callback      See FLAC__StreamEncoderTellCallback.  This
- *                            pointer may be \c NULL if seeking is not
- *                            supported.  If \a seek_callback is \c NULL then
- *                            this argument will be ignored.  If
- *                            \a seek_callback is not \c NULL then a
- *                            \a tell_callback must also be supplied.
- *                            Alternatively, a dummy tell callback that just
- *                            returns \c FLAC__STREAM_ENCODER_TELL_STATUS_UNSUPPORTED
- *                            may also be supplied, all though this is slightly
- *                            less efficient for the encoder.
- * \param  metadata_callback  See FLAC__StreamEncoderMetadataCallback.  This
- *                            pointer may be \c NULL if the callback is not
- *                            desired.  If the client provides a seek callback,
- *                            this function is not necessary as the encoder
- *                            will automatically seek back and update the
- *                            STREAMINFO block.  It may also be \c NULL if the
- *                            client does not support seeking, since it will
- *                            have no way of going back to update the
- *                            STREAMINFO.  However the client can still supply
- *                            a callback if it would like to know the details
- *                            from the STREAMINFO.
- * \param  client_data        This value will be supplied to callbacks in their
- *                            \a client_data argument.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__StreamEncoderInitStatus
- *    \c FLAC__STREAM_ENCODER_INIT_STATUS_OK if initialization was successful;
- *    see FLAC__StreamEncoderInitStatus for the meanings of other return values.
- */
-FLAC_API FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_ogg_stream(FLAC__StreamEncoder *encoder, FLAC__StreamEncoderReadCallback read_callback, FLAC__StreamEncoderWriteCallback write_callback, FLAC__StreamEncoderSeekCallback seek_callback, FLAC__StreamEncoderTellCallback tell_callback, FLAC__StreamEncoderMetadataCallback metadata_callback, void *client_data);
-
-/** Initialize the encoder instance to encode native FLAC files.
- *
- *  This flavor of initialization sets up the encoder to encode to a
- *  plain native FLAC file.  For non-stdio streams, you must use
- *  FLAC__stream_encoder_init_stream() and provide callbacks for the I/O.
- *
- *  This function should be called after FLAC__stream_encoder_new() and
- *  FLAC__stream_encoder_set_*() but before FLAC__stream_encoder_process()
- *  or FLAC__stream_encoder_process_interleaved().
- *  initialization succeeded.
- *
- * \param  encoder            An uninitialized encoder instance.
- * \param  file               An open file.  The file should have been opened
- *                            with mode \c "w+b" and rewound.  The file
- *                            becomes owned by the encoder and should not be
- *                            manipulated by the client while encoding.
- *                            Unless \a file is \c stdout, it will be closed
- *                            when FLAC__stream_encoder_finish() is called.
- *                            Note however that a proper SEEKTABLE cannot be
- *                            created when encoding to \c stdout since it is
- *                            not seekable.
- * \param  progress_callback  See FLAC__StreamEncoderProgressCallback.  This
- *                            pointer may be \c NULL if the callback is not
- *                            desired.
- * \param  client_data        This value will be supplied to callbacks in their
- *                            \a client_data argument.
- * \assert
- *    \code encoder != NULL \endcode
- *    \code file != NULL \endcode
- * \retval FLAC__StreamEncoderInitStatus
- *    \c FLAC__STREAM_ENCODER_INIT_STATUS_OK if initialization was successful;
- *    see FLAC__StreamEncoderInitStatus for the meanings of other return values.
- */
-FLAC_API FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_FILE(FLAC__StreamEncoder *encoder, FILE *file, FLAC__StreamEncoderProgressCallback progress_callback, void *client_data);
-
-/** Initialize the encoder instance to encode Ogg FLAC files.
- *
- *  This flavor of initialization sets up the encoder to encode to a
- *  plain Ogg FLAC file.  For non-stdio streams, you must use
- *  FLAC__stream_encoder_init_ogg_stream() and provide callbacks for the I/O.
- *
- *  This function should be called after FLAC__stream_encoder_new() and
- *  FLAC__stream_encoder_set_*() but before FLAC__stream_encoder_process()
- *  or FLAC__stream_encoder_process_interleaved().
- *  initialization succeeded.
- *
- * \param  encoder            An uninitialized encoder instance.
- * \param  file               An open file.  The file should have been opened
- *                            with mode \c "w+b" and rewound.  The file
- *                            becomes owned by the encoder and should not be
- *                            manipulated by the client while encoding.
- *                            Unless \a file is \c stdout, it will be closed
- *                            when FLAC__stream_encoder_finish() is called.
- *                            Note however that a proper SEEKTABLE cannot be
- *                            created when encoding to \c stdout since it is
- *                            not seekable.
- * \param  progress_callback  See FLAC__StreamEncoderProgressCallback.  This
- *                            pointer may be \c NULL if the callback is not
- *                            desired.
- * \param  client_data        This value will be supplied to callbacks in their
- *                            \a client_data argument.
- * \assert
- *    \code encoder != NULL \endcode
- *    \code file != NULL \endcode
- * \retval FLAC__StreamEncoderInitStatus
- *    \c FLAC__STREAM_ENCODER_INIT_STATUS_OK if initialization was successful;
- *    see FLAC__StreamEncoderInitStatus for the meanings of other return values.
- */
-FLAC_API FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_ogg_FILE(FLAC__StreamEncoder *encoder, FILE *file, FLAC__StreamEncoderProgressCallback progress_callback, void *client_data);
-
-/** Initialize the encoder instance to encode native FLAC files.
- *
- *  This flavor of initialization sets up the encoder to encode to a plain
- *  FLAC file.  If POSIX fopen() semantics are not sufficient (for example,
- *  with Unicode filenames on Windows), you must use
- *  FLAC__stream_encoder_init_FILE(), or FLAC__stream_encoder_init_stream()
- *  and provide callbacks for the I/O.
- *
- *  This function should be called after FLAC__stream_encoder_new() and
- *  FLAC__stream_encoder_set_*() but before FLAC__stream_encoder_process()
- *  or FLAC__stream_encoder_process_interleaved().
- *  initialization succeeded.
- *
- * \param  encoder            An uninitialized encoder instance.
- * \param  filename           The name of the file to encode to.  The file will
- *                            be opened with fopen().  Use \c NULL to encode to
- *                            \c stdout.  Note however that a proper SEEKTABLE
- *                            cannot be created when encoding to \c stdout since
- *                            it is not seekable.
- * \param  progress_callback  See FLAC__StreamEncoderProgressCallback.  This
- *                            pointer may be \c NULL if the callback is not
- *                            desired.
- * \param  client_data        This value will be supplied to callbacks in their
- *                            \a client_data argument.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__StreamEncoderInitStatus
- *    \c FLAC__STREAM_ENCODER_INIT_STATUS_OK if initialization was successful;
- *    see FLAC__StreamEncoderInitStatus for the meanings of other return values.
- */
-FLAC_API FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_file(FLAC__StreamEncoder *encoder, const char *filename, FLAC__StreamEncoderProgressCallback progress_callback, void *client_data);
-
-/** Initialize the encoder instance to encode Ogg FLAC files.
- *
- *  This flavor of initialization sets up the encoder to encode to a plain
- *  Ogg FLAC file.  If POSIX fopen() semantics are not sufficient (for example,
- *  with Unicode filenames on Windows), you must use
- *  FLAC__stream_encoder_init_ogg_FILE(), or FLAC__stream_encoder_init_ogg_stream()
- *  and provide callbacks for the I/O.
- *
- *  This function should be called after FLAC__stream_encoder_new() and
- *  FLAC__stream_encoder_set_*() but before FLAC__stream_encoder_process()
- *  or FLAC__stream_encoder_process_interleaved().
- *  initialization succeeded.
- *
- * \param  encoder            An uninitialized encoder instance.
- * \param  filename           The name of the file to encode to.  The file will
- *                            be opened with fopen().  Use \c NULL to encode to
- *                            \c stdout.  Note however that a proper SEEKTABLE
- *                            cannot be created when encoding to \c stdout since
- *                            it is not seekable.
- * \param  progress_callback  See FLAC__StreamEncoderProgressCallback.  This
- *                            pointer may be \c NULL if the callback is not
- *                            desired.
- * \param  client_data        This value will be supplied to callbacks in their
- *                            \a client_data argument.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__StreamEncoderInitStatus
- *    \c FLAC__STREAM_ENCODER_INIT_STATUS_OK if initialization was successful;
- *    see FLAC__StreamEncoderInitStatus for the meanings of other return values.
- */
-FLAC_API FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_ogg_file(FLAC__StreamEncoder *encoder, const char *filename, FLAC__StreamEncoderProgressCallback progress_callback, void *client_data);
-
-/** Finish the encoding process.
- *  Flushes the encoding buffer, releases resources, resets the encoder
- *  settings to their defaults, and returns the encoder state to
- *  FLAC__STREAM_ENCODER_UNINITIALIZED.  Note that this can generate
- *  one or more write callbacks before returning, and will generate
- *  a metadata callback.
- *
- *  Note that in the course of processing the last frame, errors can
- *  occur, so the caller should be sure to check the return value to
- *  ensure the file was encoded properly.
- *
- *  In the event of a prematurely-terminated encode, it is not strictly
- *  necessary to call this immediately before FLAC__stream_encoder_delete()
- *  but it is good practice to match every FLAC__stream_encoder_init_*()
- *  with a FLAC__stream_encoder_finish().
- *
- * \param  encoder  An uninitialized encoder instance.
- * \assert
- *    \code encoder != NULL \endcode
- * \retval FLAC__bool
- *    \c false if an error occurred processing the last frame; or if verify
- *    mode is set (see FLAC__stream_encoder_set_verify()), there was a
- *    verify mismatch; else \c true.  If \c false, caller should check the
- *    state with FLAC__stream_encoder_get_state() for more information
- *    about the error.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_finish(FLAC__StreamEncoder *encoder);
-
-/** Submit data for encoding.
- *  This version allows you to supply the input data via an array of
- *  pointers, each pointer pointing to an array of \a samples samples
- *  representing one channel.  The samples need not be block-aligned,
- *  but each channel should have the same number of samples.  Each sample
- *  should be a signed integer, right-justified to the resolution set by
- *  FLAC__stream_encoder_set_bits_per_sample().  For example, if the
- *  resolution is 16 bits per sample, the samples should all be in the
- *  range [-32768,32767].
- *
- *  For applications where channel order is important, channels must
- *  follow the order as described in the
- *  <A HREF="../format.html#frame_header">frame header</A>.
- *
- * \param  encoder  An initialized encoder instance in the OK state.
- * \param  buffer   An array of pointers to each channel's signal.
- * \param  samples  The number of samples in one channel.
- * \assert
- *    \code encoder != NULL \endcode
- *    \code FLAC__stream_encoder_get_state(encoder) == FLAC__STREAM_ENCODER_OK \endcode
- * \retval FLAC__bool
- *    \c true if successful, else \c false; in this case, check the
- *    encoder state with FLAC__stream_encoder_get_state() to see what
- *    went wrong.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_process(FLAC__StreamEncoder *encoder, const FLAC__int32 * const buffer[], unsigned samples);
-
-/** Submit data for encoding.
- *  This version allows you to supply the input data where the channels
- *  are interleaved into a single array (i.e. channel0_sample0,
- *  channel1_sample0, ... , channelN_sample0, channel0_sample1, ...).
- *  The samples need not be block-aligned but they must be
- *  sample-aligned, i.e. the first value should be channel0_sample0
- *  and the last value channelN_sampleM.  Each sample should be a signed
- *  integer, right-justified to the resolution set by
- *  FLAC__stream_encoder_set_bits_per_sample().  For example, if the
- *  resolution is 16 bits per sample, the samples should all be in the
- *  range [-32768,32767].
- *
- *  For applications where channel order is important, channels must
- *  follow the order as described in the
- *  <A HREF="../format.html#frame_header">frame header</A>.
- *
- * \param  encoder  An initialized encoder instance in the OK state.
- * \param  buffer   An array of channel-interleaved data (see above).
- * \param  samples  The number of samples in one channel, the same as for
- *                  FLAC__stream_encoder_process().  For example, if
- *                  encoding two channels, \c 1000 \a samples corresponds
- *                  to a \a buffer of 2000 values.
- * \assert
- *    \code encoder != NULL \endcode
- *    \code FLAC__stream_encoder_get_state(encoder) == FLAC__STREAM_ENCODER_OK \endcode
- * \retval FLAC__bool
- *    \c true if successful, else \c false; in this case, check the
- *    encoder state with FLAC__stream_encoder_get_state() to see what
- *    went wrong.
- */
-FLAC_API FLAC__bool FLAC__stream_encoder_process_interleaved(FLAC__StreamEncoder *encoder, const FLAC__int32 buffer[], unsigned samples);
-
-/* \} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib-x86-64/include/cddb/cddb.h b/lib-x86-64/include/cddb/cddb.h
deleted file mode 100644
index c46700a6..00000000
--- a/lib-x86-64/include/cddb/cddb.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
-    $Id: cddb.h,v 1.14 2006/10/15 12:54:33 airborne Exp $
-
-    Copyright (C) 2003, 2004, 2005 Kris Verbeeck <airborne@advalvas.be>
-
-    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 CDDB_H
-#define CDDB_H 1
-
-#include <cddb/version.h>
-
-#ifdef __cplusplus
-    extern "C" {
-#endif
-
-
-#include <cddb/cddb_config.h>
-#include <cddb/cddb_error.h>
-#include <cddb/cddb_track.h>
-#include <cddb/cddb_disc.h>
-#include <cddb/cddb_site.h>
-#include <cddb/cddb_conn.h>
-#include <cddb/cddb_cmd.h>
-#include <cddb/cddb_log.h>
-
-
-/**
- * \mainpage libCDDB, a C API for CDDB server access
- */
-
-
-#define BIT(n) (1 << n)
-
-/**
- * An enumeration of flags that influence the behaviour of the
- * library.  You can set or reset these flags using the
- * #libcddb_set_flags and #libcddb_reset_flags functions.
- */
-typedef enum {
-    CDDB_F_EMPTY_STR = BIT(0),    /**< never return NULL pointer strings
-                                       (default), return an empty string
-                                       instead */
-    CDDB_F_NO_TRACK_ARTIST = BIT(1), /**< do not return the disc artist as the
-                                       track artist (default), return NULL
-                                       instead */
-} cddb_flag_t;
-
-/**
- * Initializes the library.  This is used to setup any globally used
- * variables.  The first time you create a new CDDB connection structure
- * the library will automatically initialize itself.  So, there is no
- * need to explicitly call this function.
- */
-void libcddb_init(void);
-
-/**
- * Frees up any global (cross connection) resources.  You should call
- * this function before terminating your program.  Using any library
- * calls after shutting down are bound to give problems.
- */
-void libcddb_shutdown(void);
-
-/**
- * Set one or more flags that influence the library behvaiour
- *
- * @param flags A bitwise ORed set of values from #cddb_flag_t.
- */
-void libcddb_set_flags(unsigned int flags);
-
-/**
- * Reset one or more flags that influence the library behvaiour
- *
- * @param flags A bitwise ORed set of values from #cddb_flag_t.
- */
-void libcddb_reset_flags(unsigned int flags);
-
-
-#ifdef __cplusplus
-    }
-#endif
-
-#endif /* CDDB_H */
diff --git a/lib-x86-64/include/cddb/cddb_cmd.h b/lib-x86-64/include/cddb/cddb_cmd.h
deleted file mode 100644
index c5a01fef..00000000
--- a/lib-x86-64/include/cddb/cddb_cmd.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
-    $Id: cddb_cmd.h,v 1.17 2006/10/15 08:58:51 airborne Exp $
-
-    Copyright (C) 2003, 2004, 2005 Kris Verbeeck <airborne@advalvas.be>
-
-    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 CDDB_CMD_H
-#define CDDB_CMD_H 1
-
-#ifdef __cplusplus
-    extern "C" {
-#endif
-
-
-/* --- accessing data on the CDDB server --- */
-
-
-/**
- * Retrieve a disc record from the CDDB server.  This function
- * requires that the category and disc ID of the provided disc
- * structure are valid.
- *
- * If nothing goes wrong, the function will return 1 and the error
- * code will be reset to:
- * - #CDDB_ERR_OK:
- *     If everything went as planned.
- *
- * If there is a problem with reading data from the CDDB server one of
- * the following error codes will be set:
- * - #CDDB_ERR_DATA_MISSING:
- *     If some required data is missing from the given disc
- *     structure to execute this command.
- * - #CDDB_ERR_DISC_NOT_FOUND:
- *     If the requested disc is not known by the CDDB server.
- * - #CDDB_ERR_SERVER_ERROR:
- *     If the server encountered an error while trying to process your
- *     request.
- * - #CDDB_ERR_UNKNOWN:
- *     If the server specified an unknown response code.  Please
- *     report this as a libcddb bug.
- *
- * When there are problems with the connection to the CDDB server one
- * of the following error codes will be set:
- * - #CDDB_ERR_UNKNOWN_HOST_NAME:
- *     If there was an error when resolving the host name of the CDDB
- *     server.
- * - #CDDB_ERR_CONNECT:
- *     If a connection to the CDDB server could not be established.
- *     This can be due to incorrect data about the location of the
- *     server (host name, port).
- * - #CDDB_ERR_NOT_CONNECTED:
- *     If something when wrong in the process and you got
- *     disconnected.  Retrying might succeed (but no guarantees).
- * - #CDDB_ERR_PERMISSION_DENIED:
- *     If the server is up and running but denied the connection.
- *     This can occur when the server is too highly loaded or the
- *     handshake information (user name, ...) is considered to be
- *     invalid.
- *
- * @param c    The CDDB connection structure.
- * @param disc A non-null CDDB disc structure.
- * @return 1 on succes, 0 on failure
- */
-int cddb_read(cddb_conn_t *c, cddb_disc_t *disc);
-
-/**
- * Query the CDDB database for a list of possible disc matches.  This
- * function requires that the disc ID and disc length of the provided
- * disc structure are valid.  The disc should also contain a number of
- * tracks and for each track its frame offset on the CD should be
- * valid.
- *
- * If there are multiple matches then only the first one will be
- * returned by this function.  For other matches you will have to use
- * the #cddb_query_next function.
- *
- * @param c    The CDDB connection structure.
- * @param disc A non-null CDDB disc structure.
- *
- * @return The number of matches found or -1 on error.
- */
-int cddb_query(cddb_conn_t *c, cddb_disc_t *disc);
-
-/**
- * Returns the next match in a CDDB query result set.  This function
- * should be used in conjunction with #cddb_query.
- *
- * @param c    The CDDB connection structure.
- * @param disc A non-null CDDB disc structure.
- */
-int cddb_query_next(cddb_conn_t *c, cddb_disc_t *disc);
-
-/**
- * Perform a text search in the CDDB database.  Instead of actually
- * needing information about a real disc like in #cddb_query this
- * function accept a string that is used for searching the database.
- *
- * If there are multiple matches then only the first one will be
- * returned by this function.  For other matches you will have to use
- * the #cddb_search_next function.
- *
- * @param c    The CDDB connection structure.
- * @param disc A non-null CDDB disc structure.
- * @param str  The search string
- *
- * @return The number of matches found or -1 on error.
- */
-int cddb_search(cddb_conn_t *c, cddb_disc_t *disc, const char *str);
-
-/**
- * Returns the next match in a CDDB search result set.  This function
- * should be used in conjunction with #cddb_search.
- *
- * @param c    The CDDB connection structure.
- * @param disc A non-null CDDB disc structure.
- */
-int cddb_search_next(cddb_conn_t *c, cddb_disc_t *disc);
-
-/**
- * Perform a text search in the CDDB database.  It uses the album
- * command implemented on the freedb2.org servers.  Either the album
- * title or artist's name should be filled in, in the disc structure.
- *
- * If there are multiple matches then only the first one will be
- * returned by this function.  For other matches you will have to use
- * the #cddb_album_next function.
- *
- * @param c The CDDB connection structure.
- * @param disc A non-null CDDB disc structure.
- *
- * @return The number of matches found or -1 on error.
- */
-int cddb_album(cddb_conn_t *c, cddb_disc_t *disc);
-
-/**
- * Returns the next match in a CDDB album result set.  This function
- * should be used in conjunction with #cddb_album.
- *
- * @param c    The CDDB connection structure.
- * @param disc A non-null CDDB disc structure.
- */
-int cddb_album_next(cddb_conn_t *c, cddb_disc_t *disc);
-
-/**
- * Submit a new or updated disc to the CDDB database.  This function
- * requires that the disc ID, length, category, artist and title of
- * the provided disc structure are valid.  The disc should also
- * contain a number of tracks and for each track its frame offset on
- * the CD and title should be valid.
- *
- * @param c    The CDDB connection structure.
- * @param disc A non-null CDDB disc structure.
- */
-int cddb_write(cddb_conn_t *c, cddb_disc_t *disc);
-
-/**
- * Query the currently configured server for a list of mirrors.
- * Accessing the list of mirror sites is done with the iterator
- * functions #cddb_first_site and #cddb_next_site.
- *
- * @param c The CDDB connection structure.
- */
-int cddb_sites(cddb_conn_t *c);
-
-
-#ifdef __cplusplus
-    }
-#endif
-
-#endif /* CDDB_CMD_H */
diff --git a/lib-x86-64/include/cddb/cddb_config.h b/lib-x86-64/include/cddb/cddb_config.h
deleted file mode 100644
index fd0d3769..00000000
--- a/lib-x86-64/include/cddb/cddb_config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-    $Id: cddb_config.h.in,v 1.3 2005/03/11 21:29:29 airborne Exp $
-
-    Copyright (C) 2004, 2005 Kris Verbeeck <airborne@advalvas.be>
-
-    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 CDDB_CONFIG_H
-#define CDDB_CONFIG_H 1
-
-/* Define if you have <unistd.h> and need it included. 
-   On MacOS, <regex.h> needs this but that header doesn't
-   include it.
-*/
-#undef CDDB_NEED_UNISTD_H
-
-/* Define if you have <sys/socket.h> and need it included. 
-   On MacOS, <cddb_net.h> needs this but that header doesn't
-   include it.
-*/
-#undef CDDB_NEED_SYS_SOCKET_H
-
-#endif /* CDDB_CONFIG_H */
diff --git a/lib-x86-64/include/cddb/cddb_conn.h b/lib-x86-64/include/cddb/cddb_conn.h
deleted file mode 100644
index ada3cdda..00000000
--- a/lib-x86-64/include/cddb/cddb_conn.h
+++ /dev/null
@@ -1,562 +0,0 @@
-/*
-    $Id: cddb_conn.h,v 1.31 2009/03/01 03:28:07 jcaratzas Exp $
-
-    Copyright (C) 2003, 2004, 2005 Kris Verbeeck <airborne@advalvas.be>
-
-    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 CDDB_CONN_H
-#define CDDB_CONN_H 1
-
-#ifdef __cplusplus
-    extern "C" {
-#endif
-
-
-#include <stdio.h>
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-
-#include "cddb/cddb_site.h"
-
-
-typedef enum {
-    CACHE_OFF = 0,              /**< do not use local CDDB cache, network
-                                     only */
-    CACHE_ON,                   /**< use local CDDB cache, if possible */
-    CACHE_ONLY                  /**< only use local CDDB cache, no network
-                                     access */
-} cddb_cache_mode_t;
-
-/**
- * Forward declaration of opaque structure used for character set
- * conversions.
- */
-typedef struct cddb_iconv_s *cddb_iconv_t;
-
-/**
- * An opaque structure for keeping state about the connection to a
- * CDDB server.
- */
-typedef struct cddb_conn_s cddb_conn_t;
-
-/**
- * Which fields to use for the full text search is defined by one or
- * more of the constants below.
- */
-typedef enum {
-    SEARCH_NONE = 0,            /**< no fields */
-    SEARCH_ARTIST = 1,          /**< artist name field */
-    SEARCH_TITLE = 2,           /**< disc title field */
-    SEARCH_TRACK = 4,           /**< track title field */
-    SEARCH_OTHER = 8,           /**< other fields */
-    SEARCH_ALL = ~0,            /**< all fields */
-} cddb_search_t;
-
-/**
- * Macro to be used for building the category search bit-string from
- * the values of #cddb_cat_t.
- */
-#define SEARCHCAT(c) (1 << (c))
-
-
-/* --- construction / destruction --- */
-
-
-/**
- * Creates a new CDDB connection structure.  This structure will have
- * to be passed to all libcddb functions.  Default values will be used
- * for the connection parameters allowing it to contact the CDDB
- * server at freedb.org.
- *
- * @return The CDDB connection structure or NULL if something went wrong.
- */
-cddb_conn_t *cddb_new(void);
-
-/**
- * Free all resources associated with the given CDDB connection
- * structure.
- */
-void cddb_destroy(cddb_conn_t *c);
-
-
-/* --- getters & setters --- */
-
-
-/**
- * Set the character set.  By default the FreeDB server uses UTF-8 when
- * providing CD data.  When a character set is defined with this function
- * any strings retrieved from or sent to the server will automatically be
- * converted.
- *
- * @param c The connection structure.
- * @param cs The character set that will be used.
- * @return False if the specified character set is unknown, or no conversion
- *         from/to UTF-8 is available.  True otherwise.
- */
-int cddb_set_charset(cddb_conn_t *c, const char *cs);
-
-/**
- * Change the size of the internal buffer.
- *
- * @param c The connection structure.
- * @param size The new buffer size.
- */
-void cddb_set_buf_size(cddb_conn_t *c, unsigned int size);
-
-/**
- * Set all server details in one go through the use of a site structure.  This
- * function initializzes the server address, port, protocol and query path in
- * case of HTTP.
- *
- * @see cddb_sites
- * @see cddb_first_site
- * @see cddb_next_site
- *
- * @param c The connection structure.
- * @param site The site to use.
- * @return Error code: CDDB_ERR_OK or CDDB_ERR_INVALID.
- */
-cddb_error_t cddb_set_site(cddb_conn_t *c, const cddb_site_t *site);
-
-/**
- * Get the host name of the CDDB server that is currently being used.
- *
- * @see cddb_set_server_name
- *
- * @param c The connection structure.
- * @return The server host name.
- */
-const char *cddb_get_server_name(const cddb_conn_t *c);
-
-/**
- * Set the host name of the CDDB server.  The default value for the
- * server is 'freedb.org'.
- *
- * @see cddb_get_server_name
- *
- * @param c      The connection structure.
- * @param server The server host name.
- */
-void cddb_set_server_name(cddb_conn_t *c, const char *server);
-
-/**
- * Get the port of the CDDB server that is currently being used.
- *
- * @see cddb_set_server_port
- *
- * @param c The connection structure.
- * @return The server port.
- */
-unsigned int cddb_get_server_port(const cddb_conn_t *c);
-
-/**
- * Set the port of the CDDB server.  The default value is 888.
- *
- * @see cddb_get_server_port
- *
- * @param c    The connection structure.
- * @param port The server port.
- */
-void cddb_set_server_port(cddb_conn_t *c, int port);
-
-/**
- * Get the network time out value (in seconds).
- *
- * @see cddb_set_timeout
- *
- * @param c The connection structure.
- * @return The current time out in seconds.
- */
-unsigned int cddb_get_timeout(const cddb_conn_t *c);
-
-/**
- * Set the network time out value (in seconds).  The default is 10
- * seconds.
- *
- * @see cddb_get_timeout
- *
- * @param c The connection structure.
- * @param t The new time out in seconds.
- */
-void cddb_set_timeout(cddb_conn_t *c, unsigned int t);
-
-/**
- * Get the URL path for querying a CDDB server through HTTP.
- *
- * @see cddb_set_http_path_query
- *
- * @param c The connection structure.
- * @return The URL path.
- */
-const char *cddb_get_http_path_query(const cddb_conn_t *c);
-
-/**
- * Set the URL path for querying a CDDB server through HTTP.  The
- * default value is '/~cddb/cddb.cgi'.
- *
- * @see cddb_get_http_path_query
- *
- * @param c    The connection structure.
- * @param path The URL path.
- */
-void cddb_set_http_path_query(cddb_conn_t *c, const char *path);
-
-/**
- * Get the URL path for submitting to a CDDB server through HTTP.
- *
- * @see cddb_set_http_path_submit
- *
- * @param c The connection structure.
- * @return The URL path.
- */
-const char *cddb_get_http_path_submit(const cddb_conn_t *c);
-
-/**
- * Set the URL path for submitting to a CDDB server through HTTP.  The
- * default value is '/~cddb/submit.cgi'.
- *
- * @see cddb_get_http_path_submit
- *
- * @param c The connection structure.
- * @param path The URL path.
- */
-void cddb_set_http_path_submit(cddb_conn_t *c, const char *path);
-
-/**
- * Returns true if the HTTP protocol is currently enabled and false if
- * CDDBP is enabled.
- *
- * @see cddb_http_enable
- * @see cddb_http_disable
- *
- * @param c The CDDB connection structure.
- * @return True or false.
- */
-unsigned int cddb_is_http_enabled(const cddb_conn_t *c);
-
-/**
- * Enable HTTP tunneling to connect to the CDDB server.  By default
- * this option is disabled.
- *
- * @see cddb_is_http_enabled
- * @see cddb_http_disable
- *
- * @param c The CDDB connection structure.
- */
-void cddb_http_enable(cddb_conn_t *c);
-
-/**
- * Disable HTTP tunneling to connect to the CDDB server.  By default this
- * option is disabled.
- *
- * @see cddb_is_http_enabled
- * @see cddb_http_enable
- *
- * @param c The CDDB connection structure.
- */
-void cddb_http_disable(cddb_conn_t *c);
-
-/**
- * Returns true if the proxy support is currently enabled and false if
- * it is not.  This fucntion does not check whether HTTP is enabled.
- * So it is possible that true will be returned while in reality the
- * CDDBP protocol is being used (no proxy support).
- *
- * @see cddb_http_proxy_enable
- * @see cddb_http_proxy_disable
- *
- * @param c The CDDB connection structure.
- * @return True or false.
- */
-unsigned int cddb_is_http_proxy_enabled(const cddb_conn_t *c);
-
-/**
- * Enable HTTP tunneling through an HTTP proxy server to connect to
- * the CDDB server.  The usage of an HTTP proxy implies normal HTTP
- * tunneling instead of connecting directly to the CDDB server.  By
- * default this option is disabled.
- *
- * @see cddb_is_http_proxy_enabled
- * @see cddb_http_proxy_disable
- *
- * @param c The CDDB connection structure.
- */
-void cddb_http_proxy_enable(cddb_conn_t *c);
-
-/**
- * Disable HTTP tunneling through an HTTP proxy server to connect to
- * the CDDB server.  By default this option is disabled.
- *
- * @see cddb_is_http_proxy_enabled
- * @see cddb_http_proxy_enable
- *
- * @param c The CDDB connection structure.
- */
-void cddb_http_proxy_disable(cddb_conn_t *c);
-
-/**
- * Get the host name of the HTTP proxy server.
- *
- * @see cddb_set_http_proxy_server_name
- *
- * @param c The connection structure.
- * @return The proxy server host name.
- */
-const char *cddb_get_http_proxy_server_name(const cddb_conn_t *c);
-
-/**
- * Set the host name of the HTTP proxy server.  There is no default
- * value.
- *
- * @see cddb_get_http_proxy_server_name
- *
- * @param c      The connection structure.
- * @param server The server host name.
- */
-void cddb_set_http_proxy_server_name(cddb_conn_t *c, const char *server);
-
-/**
- * Get the port of the HTTP proxy server.
- *
- * @see cddb_set_http_proxy_server_port
- *
- * @param c The connection structure.
- * @return The proxy server port.
- */
-unsigned int cddb_get_http_proxy_server_port(const cddb_conn_t *c);
-
-/**
- * Set the port of the HTTP proxy server.  The default value is 8080.
- *
- * @see cddb_get_http_proxy_server_port
- *
- * @param c    The connection structure.
- * @param port The server port.
- */
-void cddb_set_http_proxy_server_port(cddb_conn_t *c, int port);
-
-/**
- * Set the HTTP proxy user name which is used when Basic Authentication
- * is required.
- *
- * @param c        The connection structure.
- * @param username The user name.
- */
-void cddb_set_http_proxy_username(cddb_conn_t* c, const char* username);
-
-/**
- * Get the HTTP proxy user name.
- *
- * @param c The connection structure.
- * @return The user name.
- */
-const char *cddb_get_http_proxy_username(const cddb_conn_t *c);
-
-/**
- * Set the HTTP proxy password which is used when Basic Authentication
- * is required.
- *
- * @param c      The connection structure.
- * @param passwd The password.
- */
-void cddb_set_http_proxy_password(cddb_conn_t* c, const char* passwd);
-
-/**
- * Get the HTTP proxy password. 
- *
- * @param c The connection structure.
- * @return The password.
- */
-const char *cddb_get_http_proxy_password(const cddb_conn_t *c);
-
-/**
- * Set the HTTP proxy user name and password in one go.  These
- * credentials are used when Basic Authentication is required.  The
- * advantage of using this function over setting the user name and
- * password seperately is that the cleartext user name and password
- * are not kept in memory longer than needed.
- *
- * @param c        The connection structure.
- * @param username The user name.
- * @param passwd   The password.
- */
-void cddb_set_http_proxy_credentials(cddb_conn_t* c,
-                                     const char *username, const char* passwd);
-
-/**
- * Get the error number returned by the last libcddb command.
- *
- * @param c The CDDB connection structure.
- * @return The error number.
- */
-cddb_error_t cddb_errno(const cddb_conn_t *c);
-
-/**
- * Set the name and version of the client program overwriting the
- * previous values.  This function will make a copy of the provided
- * strings.  The defaults are 'libcddb' and the version number of the
- * libcddb library in use.  Both parameters must be valid strings.  If
- * any of teh strings is NULL, this fucntion will return without
- * changing anything.
- *
- * @param c        The connection structure.
- * @param cname    The name of the client program.
- * @param cversion The version number of the client program.
- */
-void cddb_set_client(cddb_conn_t *c, const char *cname, const char *cversion);
-
-/**
- * Sets the user name and host name of the local machine.  This
- * function will parse out the user name and host name from the e-mail
- * address.
- *
- * @param c     The connection structure.
- * @param email The e-mail address of the user.
- */
-int cddb_set_email_address(cddb_conn_t *c, const char *email);
-
-/**
- * Returns the current cache mode.  This can be either on, off or
- * cache only.
- *
- * @see CACHE_ON
- * @see CACHE_ONLY
- * @see CACHE_OFF
- * @see cddb_cache_enable
- * @see cddb_cache_only
- * @see cddb_cache_disable
- *
- * @param c The connection structure.
- */
-cddb_cache_mode_t cddb_cache_mode(const cddb_conn_t *c);
-
-/**
- * Enable caching of CDDB entries locally.  Caching is enabled by
- * default.  The cache directory can be changed with the
- * cddb_cache_set_dir function.
- *
- * @see cddb_cache_mode
- * @see cddb_cache_disable
- * @see cddb_cache_only
- *
- * @param c The connection structure.
- */
-void cddb_cache_enable(cddb_conn_t *c);
-
-/**
- * Only use the local CDDB cache.  Never contact a server to retrieve
- * any data.  The cache directory can be changed with the
- * cddb_cache_set_dir function.
- *
- * @see cddb_cache_mode
- * @see cddb_cache_enable
- * @see cddb_cache_disable
- *
- * @param c The connection structure.
- */
-void cddb_cache_only(cddb_conn_t *c);
-
-/**
- * Disable caching of CDDB entries locally.  All data will be fetched
- * from a CDDB server everytime and the retrieved data will not be
- * cached locally.
- *
- * @see cddb_cache_mode
- * @see cddb_cache_enable
- * @see cddb_cache_only
- *
- * @param c The connection structure.
- */
-void cddb_cache_disable(cddb_conn_t *c);
-
-/**
- * Return the directory currently being used for caching.
- *
- * @see cddb_cache_set_dir
- *
- * @param c The connection structure.
- * @return The directory being used for caching.
- */
-const char *cddb_cache_get_dir(const cddb_conn_t *c);
-
-/**
- * Change the directory used for caching CDDB entries locally.  The
- * default location of the cached entries is a subdirectory
- * (.cddbslave) of the user's home directory.  If the first character
- * of the directory is '~', then it will be expanded to the contents
- * of $HOME.
- *
- * @see cddb_cache_get_dir
- *
- * @param c   The connection structure.
- * @param dir The directory to use for caching.
- */
-int cddb_cache_set_dir(cddb_conn_t *c, const char *dir);
-
-/**
- * Retrieve the first CDDB mirror site.
- *
- * @param c The connection structure.
- * @return The first mirror site or NULL if not found.
- */
-const cddb_site_t *cddb_first_site(cddb_conn_t *c);
-
-/**
- * Retrieve the next CDDB mirror site.
- *
- * @param c The connection structure.
- * @return The next mirror site or NULL if not found.
- */
-const cddb_site_t *cddb_next_site(cddb_conn_t *c);
-
-/**
- * Set the bit-string specifying which fields to examine when
- * performing a text search.  By default only the artist and disc
- * title fields are searched.
- *
- * @param c The connection structure.
- * @param fields A bitwise ORed set of values from #cddb_search_t.
- */
-void cddb_search_set_fields(cddb_conn_t *c, unsigned int fields);
-
-/**
- * Set the bit-string specifying which categories to examine when
- * performing a text search.  The #SEARCHCAT macro needs to be used to
- * build the actual bit-string from individual categories.  The
- * #cddb_search_t values #SEARCH_NONE and #SEARCH_ALL are also valid.
- * The example below shows some possible combinations.  By default all
- * categories are searched.
- *
- * @code
- * unsigned int cats = SEARCHCAT(CDDB_CAT_ROCK) | SEARCHCAT(CDDB_CAT_MISC);
- * unsigned int cats = SEARCH_ALL;
- * unsigned int cats = SEARCH_NONE;
- * @endcode
- *
- * @param c The connection structure.
- * @param cats A bitwise ORed set of values from #SEARCHCAT(#cddb_cat_t).
- */
-void cddb_search_set_categories(cddb_conn_t *c, unsigned int cats);
-
-
-#ifdef __cplusplus
-    }
-#endif
-
-#endif /* CDDB_CONN_H */
diff --git a/lib-x86-64/include/cddb/cddb_disc.h b/lib-x86-64/include/cddb/cddb_disc.h
deleted file mode 100644
index 7951ae96..00000000
--- a/lib-x86-64/include/cddb/cddb_disc.h
+++ /dev/null
@@ -1,450 +0,0 @@
-/*
-    $Id: cddb_disc.h,v 1.22 2007/08/07 03:12:53 jcaratzas Exp $
-
-    Copyright (C) 2003, 2004, 2005 Kris Verbeeck <airborne@advalvas.be>
-
-    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 CDDB_DISC_H
-#define CDDB_DISC_H 1
-
-#ifdef __cplusplus
-    extern "C" {
-#endif
-
-
-#include <cddb/cddb_track.h>
-
-
-/**
- * The number of frames that fit into one second.
- */
-#define FRAMES_PER_SECOND 75
-
-/**
- * This macro converts an amount of frames into an amount of seconds.
- */
-#define FRAMES_TO_SECONDS(f) ((f) / FRAMES_PER_SECOND)
-
-/**
- * This macro converts an amount of seconds into an amount of frames.
- */
-#define SECONDS_TO_FRAMES(s) ((s) * FRAMES_PER_SECOND)
-
-/**
- * The different CDDB categories.
- */
-typedef enum {
-    CDDB_CAT_DATA = 0,          /**< data disc */
-    CDDB_CAT_FOLK,              /**< folk music */
-    CDDB_CAT_JAZZ,              /**< jazz music */
-    CDDB_CAT_MISC,              /**< miscellaneous, use if no other
-                                     category matches */
-    CDDB_CAT_ROCK,              /**< rock and pop music */
-    CDDB_CAT_COUNTRY,           /**< country music */
-    CDDB_CAT_BLUES,             /**< blues music */
-    CDDB_CAT_NEWAGE,            /**< new age music */
-    CDDB_CAT_REGGAE,            /**< reggae music */
-    CDDB_CAT_CLASSICAL,         /**< classical music */
-    CDDB_CAT_SOUNDTRACK,        /**< soundtracks */
-    CDDB_CAT_INVALID,           /**< (internal) invalid category */
-    CDDB_CAT_LAST               /**< (internal) category counter */
-} cddb_cat_t;
-
-/**
- * String values for the CDDB categories.
- */
-extern const char *CDDB_CATEGORY[CDDB_CAT_LAST];
-
-/**
- * The CDDB disc structure.  Contains all information associated with
- * a full CD.
- */
-typedef struct cddb_disc_s cddb_disc_t;
-
-
-/* --- construction / destruction */
-
-
-/**
- * Creates a new CDDB disc structure.
- *
- * @return The CDDB disc structure or NULL if memory allocation failed.
- */
-cddb_disc_t *cddb_disc_new(void);
-
-/**
- * Free all resources associated with the given CDDB disc structure.
- * The tracks will also be freed automatically.
- *
- * @param disc The CDDB disc structure.
- */
-void cddb_disc_destroy(cddb_disc_t *disc);
-
-/**
- * Creates a clone of the given disc.
- *
- * @param disc The CDDB disc structure.
- */
-cddb_disc_t *cddb_disc_clone(const cddb_disc_t *disc);
-
-
-/* --- track manipulation */
-
-
-/**
- * Add a new track to a disc.  The track is added to the end of the
- * existing list of tracks.
- *
- * @param disc The CDDB disc structure.
- * @param track The CDDB track structure.
- */
-void cddb_disc_add_track(cddb_disc_t *disc, cddb_track_t *track);
-
-/**
- * Retrieves a numbered track from the disc.  If there is no track
- * with the given number, then NULL will be returned.
- *
- * @param disc The CDDB disc structure.
- * @param track_no The track number; starting at 0.
- */
-cddb_track_t *cddb_disc_get_track(const cddb_disc_t *disc, int track_no);
-
-/**
- * Returns the first track of the disc.  If there is no such track
- * then NULL will be returned.  The internal track iterator will also
- * be reset.  This function should be called before the first call to
- * cddb_disc_get_track_next.
- *
- * @see cddb_disc_get_track_next
- *
- * @param disc The CDDB disc structure.
- */
-cddb_track_t *cddb_disc_get_track_first(cddb_disc_t *disc);
-
-/**
- * Returns the next track on the disc and advances the internal track
- * iterator.  If there is no such track then NULL will be returned.
- * This function should be called after calling
- * cddb_disc_get_track_first.
- *
- * @see cddb_disc_get_track_first
- *
- * @param disc The CDDB disc structure.
- */
-cddb_track_t *cddb_disc_get_track_next(cddb_disc_t *disc);
-
-
-/* --- setters / getters --- */
-
-
-/**
- * Get the ID of the disc.  If the disc is invalid or the disc ID is
- * not yet initialized 0 will be returned.
- *
- * @param disc The CDDB disc structure.
- */
-unsigned int cddb_disc_get_discid(const cddb_disc_t *disc);
-
-/**
- * Set the ID of the disc.  When the disc ID is not known yet, then it
- * can be calculated with the cddb_disc_calc_discid function (which
- * will automatically initialize the correct field in the disc
- * structure).
- *
- * @see cddb_disc_calc_discid
- *
- * @param disc The CDDB disc structure.
- * @param id The disc ID.
- */
-void cddb_disc_set_discid(cddb_disc_t *disc, unsigned int id);
-
-/**
- * Get the disc CDDB category ID.  If the disc is invalid or no
- * category is set then CDDB_CAT_INVALID will be returned.  If you
- * want a string representation of the category use the
- * cddb_disc_get_category_str function.
- *
- * @see cddb_disc_set_category
- * @see cddb_disc_get_category_str
- * @see cddb_disc_set_category_str
- * @see cddb_cat_t
- * @see CDDB_CATEGORY
- *
- * @param disc The CDDB disc structure.
- * @return The CDDB category ID.
- */
-cddb_cat_t cddb_disc_get_category(const cddb_disc_t *disc);
-
-/**
- * Set the disc CDDB category ID.
- *
- * @see cddb_disc_get_category
- * @see cddb_disc_get_category_str
- * @see cddb_disc_set_category_str
- * @see cddb_cat_t
- * @see CDDB_CATEGORY
- *
- * @param disc The CDDB disc structure.
- * @param cat  The CDDB category ID.
- */
-void cddb_disc_set_category(cddb_disc_t *disc, cddb_cat_t cat);
-
-/**
- * Get the disc CDDB category as a string.  If no category is set for
- * this disc then 'invalid' will be returned.  If the disc structure
- * is invalid NULL is returned.  If you only want the ID of the
- * category use the cddb_disc_get_category function.
- *
- * @see cddb_disc_get_category
- * @see cddb_disc_set_category
- * @see cddb_disc_set_category_str
- *
- * @param disc The CDDB disc structure.
- * @return The CDDB category ID.
- */
-const char *cddb_disc_get_category_str(cddb_disc_t *disc);
-
-/**
- * Sets the category of the disc.  If the specified category is
- * an invalid CDDB category, then CDDB_CAT_MISC will be used.
- *
- * @see cddb_disc_get_category
- * @see cddb_disc_set_category
- * @see cddb_disc_get_category_str
- * @see CDDB_CATEGORY
- *
- * @param disc The CDDB disc structure.
- * @param cat The category string.
- */
-void cddb_disc_set_category_str(cddb_disc_t *disc, const char *cat);
-
-/**
- * Get the disc genre.  If no genre is set for this disc then NULL
- * will be returned.  As opposed to the disc category, this field is
- * not limited to a predefined set.
- *
- * @param disc The CDDB disc structure.
- * @return The disc genre.
- */
-const char *cddb_disc_get_genre(const cddb_disc_t *disc);
-
-/**
- * Set the disc genre.  As opposed to the disc category, this field is
- * not limited to a predefined set.  If the disc already had a genre,
- * then the memory for that string will be freed.  The new genre will
- * be copied into a new chunk of memory.
- *
- * @see cddb_disc_get_category_str
- *
- * @param disc  The CDDB disc structure.
- * @param genre The disc genre.
- */
-void cddb_disc_set_genre(cddb_disc_t *disc, const char *genre);
-
-/**
- * Get the disc length.  If no length is set for this disc then 0 will
- * be returned.
- *
- * @param disc The CDDB disc structure.
- * @return The disc length in seconds.
- */
-unsigned int cddb_disc_get_length(const cddb_disc_t *disc);
-
-/**
- * Set the disc length.
- *
- * @param disc The CDDB disc structure.
- * @param l    The disc length in seconds.
- */
-void cddb_disc_set_length(cddb_disc_t *disc, unsigned int l);
-
-/**
- * Get the revision number of the disc.
- *
- * @param disc The CDDB disc structure.
- */
-unsigned int cddb_disc_get_revision(const cddb_disc_t *disc);
-
-/**
- * Set the revision number of the disc.
- *
- * @param disc The CDDB disc structure.
- * @param rev The revision number.
- */
-void cddb_disc_set_revision(cddb_disc_t *disc, unsigned int rev);
-
-/**
- * Get the year of publication for this disc.  If no year is defined 0
- * is returned.
- *
- * @param disc The CDDB disc structure.
- * @return The disc year.
- */
-unsigned int cddb_disc_get_year(const cddb_disc_t *disc);
-
-/**
- * Set the year of publication for this disc.
- *
- * @param disc The CDDB disc structure.
- * @param y    The disc year.
- */
-void cddb_disc_set_year(cddb_disc_t *disc, unsigned int y);
-
-/**
- * Get the number of tracks on the disc.  If the disc is invalid -1 is
- * returned.
- *
- * @param disc The CDDB disc structure.
- * @return The number of tracks.
- */
-int cddb_disc_get_track_count(const cddb_disc_t *disc);
-
-/**
- * Get the disc title.  If the disc is invalid or no title is set then
- * NULL will be returned.
- *
- * @param disc The CDDB disc structure.
- * @return The disc title.
- */
-const char *cddb_disc_get_title(const cddb_disc_t *disc);
-
-/**
- * Set the disc title.  If the disc already had a title, then the
- * memory for that string will be freed.  The new title will be copied
- * into a new chunk of memory.  If the given title is NULL, then the
- * title of the disc will be deleted.
- *
- * @param disc The CDDB disc structure.
- * @param title The new disc title.
- */
-void cddb_disc_set_title(cddb_disc_t *disc, const char *title);
-
-/**
- * Append to the disc title.  If the disc does not have a title yet,
- * then a new one will be created from the given string, otherwise
- * that string will be appended to the existing title.
- *
- * @param disc The CDDB disc structure.
- * @param title Part of the disc title.
- */
-void cddb_disc_append_title(cddb_disc_t *disc, const char *title);
-
-/**
- * Get the disc artist name.  If the disc is invalid or no artist is
- * set then NULL will be returned.
- *
- * @param disc The CDDB disc structure.
- * @return The disc artist name.
- */
-const char *cddb_disc_get_artist(const cddb_disc_t *disc);
-
-/**
- * Set the disc artist name.  If the disc already had an artist name,
- * then the memory for that string will be freed.  The new artist name
- * will be copied into a new chunk of memory.  If the given artist
- * name is NULL, then the artist name of the disc will be deleted.
- *
- * @param disc   The CDDB disc structure.
- * @param artist The new disc artist name.
- */
-void cddb_disc_set_artist(cddb_disc_t *disc, const char *artist);
-
-/**
- * Append to the disc artist.  If the disc does not have an artist
- * yet, then a new one will be created from the given string,
- * otherwise that string will be appended to the existing artist.
- *
- * @param disc  The CDDB disc structure.
- * @param artist Part of the artist name.
- */
-void cddb_disc_append_artist(cddb_disc_t *disc, const char *artist);
-
-/**
- * Get the extended disc data.  If the disc is invalid or no extended
- * data is set then NULL will be returned.
- *
- * @param disc The CDDB disc structure.
- * @return The extended data.
- */
-const char *cddb_disc_get_ext_data(const cddb_disc_t *disc);
-
-/**
- * Set the extended data for the disc.  If the disc already had
- * extended data, then the memory for that string will be freed.  The
- * new extended data will be copied into a new chunk of memory.  If
- * the given extended data is NULL, then the existing data will be
- * deleted.
- *
- * @param disc     The CDDB disc structure.
- * @param ext_data The new extended data.
- */
-void cddb_disc_set_ext_data(cddb_disc_t *disc, const char *ext_data);
-
-/**
- * Append to the extended disc data.  If the disc does not have an
- * extended data section yet, then a new one will be created from the
- * given string, otherwise that string will be appended to the
- * existing data.
- *
- * @param disc     The CDDB disc structure.
- * @param ext_data Part of the extended disc data.
- */
-void cddb_disc_append_ext_data(cddb_disc_t *disc, const char *ext_data);
-
-
-/* --- miscellaneous */
-
-
-/**
- * Copy all data from one disc to another.  Any fields that are
- * unavailable in the source disc structure will not result in a reset
- * of the same field in the destination disc structure; e.g. if there
- * is no title in the source disc, but there is one in the destination
- * disc, then the destination's title will remain unchanged.
- *
- * @param dst The destination CDDB disc structure.
- * @param src The source CDDB disc structure.
- */
-void cddb_disc_copy(cddb_disc_t *dst, cddb_disc_t *src);
-
-/**
- * Calculate the CDDB disc ID.  To calculate a disc ID the provided
- * disc needs to have its length set, and every track in the disc
- * structure needs to have its frame offset initialized.  The disc ID
- * field will be set in the disc structure.
- *
- * @param disc The CDDB disc structure.
- * @return A non-zero value if the calculation succeeded, zero
- *         otherwise.
- */
-int cddb_disc_calc_discid(cddb_disc_t *disc);
-
-/**
- * Prints information about the disc on stdout.  This is just a
- * debugging routine to display the structure's content.
- *
- * @param disc The CDDB disc structure.
- */
-void cddb_disc_print(cddb_disc_t *disc);
-
-
-#ifdef __cplusplus
-    }
-#endif
-
-#endif /* CDDB_DISC_H */
diff --git a/lib-x86-64/include/cddb/cddb_error.h b/lib-x86-64/include/cddb/cddb_error.h
deleted file mode 100644
index 6e779900..00000000
--- a/lib-x86-64/include/cddb/cddb_error.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
-    $Id: cddb_error.h,v 1.12 2005/05/29 08:11:04 airborne Exp $
-
-    Copyright (C) 2003, 2004, 2005 Kris Verbeeck <airborne@advalvas.be>
-
-    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 CDDB_ERROR_H
-#define CDDB_ERROR_H 1
-
-#ifdef __cplusplus
-    extern "C" {
-#endif
-
-
-#include <stdio.h>
-
-
-/**
- * A list of error codes returned by various libcddb functions.
- */
-typedef enum {
-
-    CDDB_ERR_OK = 0,            /**< no error occurred */
-
-    /* --- general errors --- */
-
-    CDDB_ERR_OUT_OF_MEMORY,     /**< out of memory */
-    CDDB_ERR_LINE_SIZE,         /**< internal buffer too small */
-    CDDB_ERR_NOT_IMPLEMENTED,   /**< feature not (yet) implemented */
-    CDDB_ERR_UNKNOWN,           /**< problem unknown */
-
-    /* --- connection errors --- */
-
-    CDDB_ERR_SERVER_ERROR,      /**< CDDB server error */
-    CDDB_ERR_UNKNOWN_HOST_NAME, /**< unknown host name */ 
-    CDDB_ERR_CONNECT,           /**< connection error */
-    CDDB_ERR_PERMISSION_DENIED, /**< permission denied */
-    CDDB_ERR_NOT_CONNECTED,     /**< not yet connected or connection
-                                     has been closed */
-
-    /* --- response parsing errors --- */
-
-    CDDB_ERR_UNEXPECTED_EOF,    /**< unexpected end-of-file encountered */
-    CDDB_ERR_INVALID_RESPONSE,  /**< invalid response data */
-    CDDB_ERR_DISC_NOT_FOUND,    /**< no results found */
-
-    /* --- library errors --- */
-
-    CDDB_ERR_DATA_MISSING,      /**< some data is missing for executing
-                                     a certain command */
-    CDDB_ERR_TRACK_NOT_FOUND,   /**< specified track is not present */
-    CDDB_ERR_REJECTED,          /**< posted data rejected */
-    CDDB_ERR_EMAIL_INVALID,     /**< the e-mail address used when
-                                     submitting is invalid */
-
-    CDDB_ERR_INVALID_CHARSET,   /**< invalid character set or unsupported
-                                     conversion */
-    CDDB_ERR_ICONV_FAIL,        /**< character set conversion failed */
-
-    /* --- new errors added to back of list for backward compatibility --- */
-
-    CDDB_ERR_PROXY_AUTH,        /**< proxy authentication failed */
-    CDDB_ERR_INVALID,           /**< invalid input parameter(s) */
-
-    /* --- terminator --- */
-
-    CDDB_ERR_LAST
-} cddb_error_t;
-
-
-/* --- error handling --- */
-
-
-/**
- * Returns a string representation of the CDDB error code.
- *
- * @return The error string
- */
-const char *cddb_error_str(cddb_error_t errnum);
-
-/**
- * Prints the error message associated with the current error number
- * on the given stream.
- *
- * @param stream The stream
- * @param errnum The error number
- */
-void cddb_error_stream_print(FILE *stream, cddb_error_t errnum);
-
-/**
- * Prints the error message associated with the current error number
- * to stderr.
- *
- * @param errnum The error number
- */
-void cddb_error_print(cddb_error_t errnum);
-
-
-#ifdef __cplusplus
-    }
-#endif
-
-#endif /* CDDB_ERROR_H */
diff --git a/lib-x86-64/include/cddb/cddb_log.h b/lib-x86-64/include/cddb/cddb_log.h
deleted file mode 100644
index 30fe7899..00000000
--- a/lib-x86-64/include/cddb/cddb_log.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-    $Id: cddb_log.h,v 1.4 2005/03/11 21:29:29 airborne Exp $
-
-    Copyright (C) 2003, 2004, 2005 Kris Verbeeck <airborne@advalvas.be>
-
-    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 CDDB_LOH_H
-#define CDDB_LOG_H
-
-#ifdef __cplusplus
-    extern "C" {
-#endif
-
-/**
- * The different log levels supported by libcddb.
- */
-typedef enum {
-    CDDB_LOG_DEBUG = 1,         /**< Debug-level messages. */
-    CDDB_LOG_INFO,              /**< Informational. */
-    CDDB_LOG_WARN,              /**< Warning conditions. */
-    CDDB_LOG_ERROR,             /**< Error conditions.  */
-    CDDB_LOG_CRITICAL,          /**< Critical conditions. */
-    CDDB_LOG_NONE = 99          /**< No log messages. */
-} cddb_log_level_t;
-
-
-/**
- * This type defines the signature of a libcddb log handler.  For
- * every message being logged by libcddb, the handler will receive the
- * log level and the message string.
- *
- * @see cddb_log_set_handler
- * @see cddb_log_level_t
- *
- * @param level   The log level.
- * @param message The log message.
- */
-typedef void (*cddb_log_handler_t)(cddb_log_level_t level, const char *message);
-
-/**
- * Set a custom log handler for libcddb.  The return value is the log
- * handler being replaced.  If the provided parameter is NULL, then
- * the handler will be reset to the default handler.
- *
- * @see cddb_log_handler_t
- *
- * @param new_handler The new log handler.
- * @return The previous log handler.
- */
-cddb_log_handler_t cddb_log_set_handler(cddb_log_handler_t new_handler);
-
-/**
- * Set the minimum log level.  This function is only useful in
- * conjunction with the default log handler.  The default log handler
- * will print any log messages that have a log level equal or higher
- * than this minimum log level to stderr.  By default the minimum log
- * level is set to CDDB_LOG_WARN.  This means that only warning, error
- * and critical messages will be printed.  You can silence the default
- * log handler by setting the minimum log level to CDDB_LOG_NONE.
- *
- * @see cddb_log_level_t
- *
- * @param level The minimum log level.
- */
-void cddb_log_set_level(cddb_log_level_t level);
-
-
-#ifdef __cplusplus
-    }
-#endif
-
-#endif /* CDDB_LOG_H */
diff --git a/lib-x86-64/include/cddb/cddb_site.h b/lib-x86-64/include/cddb/cddb_site.h
deleted file mode 100644
index 9c48ac6c..00000000
--- a/lib-x86-64/include/cddb/cddb_site.h
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
-    $Id: cddb_site.h,v 1.3 2005/06/15 16:08:28 airborne Exp $
-
-    Copyright (C) 2005 Kris Verbeeck <airborne@advalvas.be>
-
-    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 CDDB_SITE_H
-#define CDDB_SITE_H 1
-
-#ifdef __cplusplus
-    extern "C" {
-#endif
-
-
-#include "cddb/cddb_error.h"
-
-
-/* --- type and structure definitions */
-
-
-/**
- * Enumeration defining the CDDB protocol supported by a specific
- * site.
- */
-typedef enum {
-    PROTO_UNKNOWN = 0,          /**< Unknown protocol */
-    PROTO_CDDBP,                /**< FreeDB custom protocol */
-    PROTO_HTTP                  /**< Command tunneling over HTTP */
-} cddb_protocol_t;
-
-/**
- * The CDDB site structure.  Contains all information about one
- * particular CDDB server.
- */
-typedef struct cddb_site_s cddb_site_t;
-
-
-/* --- construction / destruction */
-
-
-/**
- * Creates a new CDDB site structure.
- *
- * @return The CDDB site structure or NULL if memory allocation failed.
- */
-cddb_site_t *cddb_site_new(void);
-
-/**
- * Free all resources associated with the given CDDB site structure.
- *
- * @param site The CDDB site structure.
- */
-cddb_error_t cddb_site_destroy(cddb_site_t *site);
-
-/**
- * Creates a clone of the given site.
- *
- * @param site The CDDB site structure.
- */
-cddb_site_t *cddb_site_clone(cddb_site_t *site);
-
-
-/* --- setters / getters --- */
-
-
-/**
- * Get the site's address.
- *
- * @param site The CDDB site structure.
- * @param address The address of the server upon returning.
- * @param port The port of the server upon returning.
- * @return Error code: CDDB_ERR_OK or CDDB_ERR_INVALID.
- */
-cddb_error_t cddb_site_get_address(const cddb_site_t *site,
-                                   const char **address, unsigned int *port);
-
-/**
- * Set the site's address.  A copy of the address string is made.  So the caller
- * should free any memory associated with the input parameter.
- *
- * @param site The CDDB site structure.
- * @param address The address of the server.
- * @param port The port of the server.
- * @return Error code: CDDB_ERR_OK, CDDB_ERR_INVALID or CDDB_ERR_OUT_OF_MEMORY.
- */
-cddb_error_t cddb_site_set_address(cddb_site_t *site,
-                                   const char *address, unsigned int port);
-
-/**
- * Get the protocol used by the site.
- *
- * @see cddb_protocol_t
- *
- * @param site The CDDB site structure.
- * @return The protocol.
- */
-cddb_protocol_t cddb_site_get_protocol(const cddb_site_t *site);
-
-/**
- * Set the protocol used by the site.
- *
- * @see cddb_protocol_t
- *
- * @param site The CDDB site structure.
- * @param proto The protocol.
- * @return Error code: CDDB_ERR_OK or CDDB_ERR_INVALID.
- */
-cddb_error_t cddb_site_set_protocol(cddb_site_t *site, cddb_protocol_t proto);
-
-/**
- * Get the query path in case the HTTP protocol is used.
- *
- * @param site The CDDB site structure.
- * @param path The query path upon returning.
- * @return Error code: CDDB_ERR_OK or CDDB_ERR_INVALID.
- */
-cddb_error_t cddb_site_get_query_path(const cddb_site_t *site,
-                                      const char **path);
-
-/**
- * Set the query path in case the HTTP protocol is used.  A copy of the path
- * string is made.  So the caller should free any memory associated with the
- * input parameter.
- *
- * @param site The CDDB site structure.
- * @param path The query path.  A value of NULL deletes the current path.
- * @return Error code: CDDB_ERR_OK, CDDB_ERR_INVALID or CDDB_ERR_OUT_OF_MEMORY.
- */
-cddb_error_t cddb_site_set_query_path(cddb_site_t *site, const char *path);
-
-/**
- * Get the submit path in case the HTTP protocol is used.
- *
- * @param site The CDDB site structure.
- * @param path The submit path upon returning.
- * @return Error code: CDDB_ERR_OK or CDDB_ERR_INVALID.
- */
-cddb_error_t cddb_site_get_submit_path(const cddb_site_t *site,
-                                       const char **path);
-
-/**
- * Set the submit path in case the HTTP protocol is used.  A copy of the path
- * string is made.  So the caller should free any memory associated with the
- * input parameter.
- *
- * @param site The CDDB site structure.
- * @param path The query path.  A value of NULL deletes the current path.
- * @return Error code: CDDB_ERR_OK, CDDB_ERR_INVALID or CDDB_ERR_OUT_OF_MEMORY.
- */
-cddb_error_t cddb_site_set_submit_path(cddb_site_t *site, const char *path);
-
-/**
- * Get the site's location.
- *
- * @param site The CDDB site structure.
- * @param latitude Will contain the server's latitude upon returning.
- *                 A positive number is used for the northern
- *                 hemisphere, a negative one for the southern
- *                 hemisphere.
- * @param longitude Will contain the server's longitude upon returning.
- *                  A positive number is used for the eastern
- *                  hemisphere, a negative one for the western
- *                  hemisphere.
- * @return Error code: CDDB_ERR_OK or CDDB_ERR_INVALID.
- */
-cddb_error_t cddb_site_get_location(const cddb_site_t *site,
-                                    float *latitude, float *longitude);
-
-/**
- * Set the site's location.
- *
- * @param site The CDDB site structure.
- * @param latitude The server's latitude.  Use a positive number for the
- *                 northern hemisphere, a negative one for the southern
- *                 hemisphere.
- * @param longitude The server's longitude.  Use a positive number for the
- *                  eastern hemisphere, a negative one for the western
- *                  hemisphere.
- * @return Error code: CDDB_ERR_OK or CDDB_ERR_INVALID.
- */
-cddb_error_t cddb_site_set_location(cddb_site_t *site,
-                                    float latitude, float longitude);
-
-/**
- * Get a description of the site.
- *
- * @param site The CDDB site structure.
- * @param desc The description upon returning.
- * @return Error code: CDDB_ERR_OK or CDDB_ERR_INVALID.
- */
-cddb_error_t cddb_site_get_description(const cddb_site_t *site,
-                                       const char **desc);
-
-/**
- * Set a description for the site.  A copy of the description string is made.
- * So the caller should free any memory associated with the input parameter.
- *
- * @param site The CDDB site structure.
- * @param desc The description.  A value of NULL deletes the current
- *             description.
- * @return Error code: CDDB_ERR_OK, CDDB_ERR_INVALID or CDDB_ERR_OUT_OF_MEMORY.
- */
-cddb_error_t cddb_site_set_description(cddb_site_t *site, const char *desc);
-
-
-/* --- miscellaneous */
-
-
-/**
- * Parses one line of data as returned by the sites command and
- * populates the given structure.
- *
- * @param site The CDDB site structure.
- * @param line The result line.
- * @return True in case of success or false on failure.
- */
-int cddb_site_parse(cddb_site_t *site, const char *line);
-
-/**
- * Prints information about the site on stdout.  This is just a
- * debugging routine to display the structure's content.
- *
- * @param site The CDDB site structure.
- * @return Error code: CDDB_ERR_OK or CDDB_ERR_INVALID.
- */
-cddb_error_t cddb_site_print(const cddb_site_t *site);
-
-
-#ifdef __cplusplus
-    }
-#endif
-
-#endif /* CDDB_SITE_H */
diff --git a/lib-x86-64/include/cddb/cddb_track.h b/lib-x86-64/include/cddb/cddb_track.h
deleted file mode 100644
index 0f6ee0f9..00000000
--- a/lib-x86-64/include/cddb/cddb_track.h
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
-    $Id: cddb_track.h,v 1.20 2006/10/15 06:51:11 airborne Exp $
-
-    Copyright (C) 2003, 2004, 2005 Kris Verbeeck <airborne@advalvas.be>
-
-    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 CDDB_TRACK_H
-#define CDDB_TRACK_H 1
-
-#ifdef __cplusplus
-    extern "C" {
-#endif
-
-
-/**
- * The CDDB track structure.  Contains all information associated with
- * a single CD track.  This structure will be used to populate the
- * tracks linked list of the cddb_disc_s structure.
- */
-typedef struct cddb_track_s cddb_track_t;
-
-
-/* --- construction / destruction */
-
-
-/**
- * Creates a new CDDB track structure.
- *
- * @return The CDDB track structure or NULL if memory allocation failed.
- */
-cddb_track_t *cddb_track_new(void);
-
-/**
- * Free all resources associated with the given CDDB track structure.
- * The linked list pointer (next) will not be touched.  So you have to
- * make sure that no other tracks are attached to this one before
- * calling this function.
- *
- * @param track The CDDB track structure.
- */
-void cddb_track_destroy(cddb_track_t *track);
-
-/**
- * Creates a clone of the given track.
- *
- * @param track The CDDB track structure.
- */
-cddb_track_t *cddb_track_clone(const cddb_track_t *track);
-
-
-/* --- getters & setters --- */
-
-
-/**
- * Get the number of this track.  This track number starts counting at
- * 1.  If the track is invalid or the track number is not defined -1
- * will be returned.
- *
- * @param track The CDDB track structure.
- * @return The track number.
- */
-int cddb_track_get_number(const cddb_track_t *track);
-
-/**
- * Get the frame offset of this track on the disc.  If the track is
- * invalid -1 will be returned.
- *
- * @param track The CDDB track structure.
- * @return The frame offset.
- */
-int cddb_track_get_frame_offset(const cddb_track_t *track);
-
-/**
- * Set the frame offset of this track on the disc.
- *
- * @param track The CDDB track structure.
- * @param offset The frame offset.
- * @return The frame offset.
- */
-void cddb_track_set_frame_offset(cddb_track_t *track, int offset);
-
-/**
- * Get the length of the track in seconds.  If the track length is not
- * defined this routine will try to calculate it using the frame
- * offsets of the tracks and the total disc length.  These
- * calculations will do no rounding to the nearest second.  So it is
- * possible that the sum off all track lengths does not add up to the
- * actual disc length.  If the length can not be calculated -1 will be
- * returned.
- *
- * @param track The CDDB track structure.
- * @return The track length.
- */
-int cddb_track_get_length(cddb_track_t *track);
-
-/**
- * Set the length of the track.  If no frame offset is yet known for
- * this track, and it is part of a disc, then the frame offset will be
- * calculated.
- *
- * @param track  The CDDB track structure.
- * @param length The track length in seconds.
- */
-void cddb_track_set_length(cddb_track_t *track, int length);
-
-/**
- * Get the track title.  If the track is invalid or no title is set
- * for this track then NULL will be returned.
- *
- * @param track The CDDB track structure.
- * @return The track title.
- */
-const char *cddb_track_get_title(const cddb_track_t *track);
-
-/**
- * Set the track title.  If the track already had a title, then the
- * memory for that string will be freed.  The new title will be copied
- * into a new chunk of memory.  If the given title is NULL, then the
- * title of the track will be deleted.
- *
- * @param track The CDDB track structure.
- * @param title The new track title.
- */
-void cddb_track_set_title(cddb_track_t *track, const char *title);
-
-/**
- * Append to the track title.  If the track does not have a title yet,
- * then a new one will be created from the given string, otherwise
- * that string will be appended to the existing title.
- *
- * @param track The CDDB track structure.
- * @param title Part of the track title.
- */
-void cddb_track_append_title(cddb_track_t *track, const char *title);
-
-/**
- * Get the track artist name.  If there is no track artist defined,
- * the disc artist will be returned.  NULL will be returned if neither
- * is defined.
- *
- * @param track  The CDDB track structure.
- */
-const char *cddb_track_get_artist(cddb_track_t *track);
-
-/**
- * Set the track artist name.  If the track already had an artist
- * name, then the memory for that string will be freed.  The new
- * artist name will be copied into a new chunk of memory.  If the given artist
- * name is NULL, then the artist name of the track will be deleted.
- *
- * @param track  The CDDB track structure.
- * @param artist The new track artist name.
- */
-void cddb_track_set_artist(cddb_track_t *track, const char *artist);
-
-/**
- * Append to the track artist.  If the track does not have an artist
- * yet, then a new one will be created from the given string,
- * otherwise that string will be appended to the existing artist.
- *
- * @param track  The CDDB track structure.
- * @param artist Part of the artist name.
- */
-void cddb_track_append_artist(cddb_track_t *track, const char *artist);
-
-/**
- * Get the extended track data.  If no extended data is set for this
- * track then NULL will be returned.
- *
- * @param track The CDDB track structure.
- * @return The extended data.
- */
-const char *cddb_track_get_ext_data(cddb_track_t *track);
-
-/**
- * Set the extended data for the track.  If the track already had
- * extended data, then the memory for that string will be freed.  The
- * new extended data will be copied into a new chunk of memory.  If
- * the given extended data is NULL, then the existing data will be
- * deleted.
- *
- * @param track    The CDDB track structure.
- * @param ext_data The new extended data.
- */
-void cddb_track_set_ext_data(cddb_track_t *track, const char *ext_data);
-
-/**
- * Append to the extended track data.  If the track does not have an
- * extended data section yet, then a new one will be created from the
- * given string, otherwise that string will be appended to the
- * existing data.
- *
- * @param track    The CDDB track structure.
- * @param ext_data Part of the extended track data.
- */
-void cddb_track_append_ext_data(cddb_track_t *track, const char *ext_data);
-
-
-/* --- miscellaneous */
-
-
-/**
- * Copy all data from one track to another.  Any fields that are
- * unavailable in the source track structure will not result in a
- * reset of the same field in the destination track structure; e.g. if
- * there is no title in the source track, but there is one in the
- * destination track, then the destination's title will remain
- * unchanged.
- *
- * @param dst The destination CDDB track structure.
- * @param src The source CDDB track structure.
- */
-void cddb_track_copy(cddb_track_t *dst, cddb_track_t *src);
-
-/**
- * Prints information about the track on stdout.  This is just a
- * debugging routine to display the structure's content.  It is used
- * by cddb_disc_print to print the contents of a complete disc.
- *
- * @param track The CDDB track structure.
- */
-void cddb_track_print(cddb_track_t *track);
-
-
-#ifdef __cplusplus
-    }
-#endif
-
-#endif /* CDDB_TRACK_H */
diff --git a/lib-x86-64/include/cddb/version.h b/lib-x86-64/include/cddb/version.h
deleted file mode 100644
index 0dae6812..00000000
--- a/lib-x86-64/include/cddb/version.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* $Id: version.h.in,v 1.1 2005/04/08 01:49:35 rockyb Exp $ */
-/** \file version.h 
- *
- *  \brief A file containing the libcdio package version
- *  number (131) and OS build name. 
- */
-
-/*! CDDB_VERSION can as a string in programs to show what version is used. */
-#define CDDB_VERSION "1.3.2 x86_64-unknown-linux-gnu"
-
-/*! LIBCDDB_VERSION_NUM  can be used for testing in the C preprocessor */
-#define LIBCDDB_VERSION_NUM 131
diff --git a/lib-x86-64/include/cdio/audio.h b/lib-x86-64/include/cdio/audio.h
deleted file mode 100644
index 880cd541..00000000
--- a/lib-x86-64/include/cdio/audio.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/* -*- c -*-
-    $Id: audio.h,v 1.12 2008/03/25 15:59:08 karl Exp $
-
-    Copyright (C) 2005, 2007, 2008 Rocky Bernstein <rocky@gnu.org>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-/** \file audio.h 
- *
- *  \brief The top-level header for CD audio-related libcdio
- *         calls.  These control playing of the CD-ROM through its 
- *         line-out jack.
- */
-#ifndef __CDIO_AUDIO_H__
-#define __CDIO_AUDIO_H__
-
-#include <cdio/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-  /*! This struct is used by the cdio_audio_read_subchannel */
-  typedef struct cdio_subchannel_s 
-  {
-    uint8_t format;
-    uint8_t audio_status;
-    uint8_t address:	4;
-    uint8_t control:	4;
-    uint8_t track;
-    uint8_t index;
-    msf_t   abs_addr;
-    msf_t   rel_addr;
-  } cdio_subchannel_t;
-  
-  /*! This struct is used by cdio_audio_get_volume and cdio_audio_set_volume */
-  typedef struct cdio_audio_volume_s
-  {
-    uint8_t level[4];
-  } cdio_audio_volume_t;
-  
-
-  /*! This struct is used by the CDROMPLAYTRKIND ioctl */
-  typedef struct cdio_track_index_s
-  {
-    uint8_t	i_start_track;	/**< start track */
-    uint8_t	i_start_index;	/**< start index */
-    uint8_t	i_end_track;	/**< end track */
-    uint8_t	i_end_index;	/**< end index */
-  } cdio_track_index_t;
-
-  /*!
-    Get volume of an audio CD.
-    
-    @param p_cdio the CD object to be acted upon.
-    @param p_volume place to put the list of volume outputs levels
-
-    p_volume can be NULL in which case we return only whether the driver
-    has the ability to get the volume or not.
-
-  */
-  driver_return_code_t cdio_audio_get_volume (CdIo_t *p_cdio,  /*out*/
-					      cdio_audio_volume_t *p_volume);
-
-  /*! 
-    Return the number of seconds (discarding frame portion) of an MSF 
-  */
-  uint32_t cdio_audio_get_msf_seconds(msf_t *p_msf);
-
-  /*!
-    Pause playing CD through analog output
-
-    @param p_cdio the CD object to be acted upon.
-  */
-  driver_return_code_t cdio_audio_pause (CdIo_t *p_cdio);
-
-  /*!
-    Playing CD through analog output at the given MSF.
-
-    @param p_cdio the CD object to be acted upon.
-    @param p_start_msf pointer to staring MSF
-    @param p_end_msf pointer to ending MSF
-  */
-  driver_return_code_t cdio_audio_play_msf (CdIo_t *p_cdio, 
-					    /*in*/msf_t *p_start_msf,
-					    /*in*/ msf_t *p_end_msf);
-
-  /*!
-    Playing CD through analog output at the desired track and index
-
-    @param p_cdio the CD object to be acted upon.
-    @param p_track_index location to start/end.
-  */
-  driver_return_code_t cdio_audio_play_track_index 
-  ( CdIo_t *p_cdio,  cdio_track_index_t *p_track_index);
-
-  /*!
-    Get subchannel information.
-
-    @param p_cdio the CD object to be acted upon.
-    @param p_subchannel place for returned subchannel information
-  */
-  driver_return_code_t cdio_audio_read_subchannel (CdIo_t *p_cdio, 
-						   /*out*/ cdio_subchannel_t *p_subchannel);
-
-  /*!
-    Resume playing an audio CD.
-    
-    @param p_cdio the CD object to be acted upon.
-
-  */
-  driver_return_code_t cdio_audio_resume (CdIo_t *p_cdio);
-
-  /*!
-    Set volume of an audio CD.
-    
-    @param p_cdio the CD object to be acted upon.
-    @param p_volume place for returned volume-level information
-
-  */
-  driver_return_code_t cdio_audio_set_volume (CdIo_t *p_cdio, /*out*/
-					      cdio_audio_volume_t *p_volume);
-
-  /*!
-    Stop playing an audio CD.
-    
-    @param p_cdio the CD object to be acted upon.
-
-  */
-  driver_return_code_t cdio_audio_stop (CdIo_t *p_cdio);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __CDIO_AUDIO_H__ */
diff --git a/lib-x86-64/include/cdio/bytesex.h b/lib-x86-64/include/cdio/bytesex.h
deleted file mode 100644
index e1be483e..00000000
--- a/lib-x86-64/include/cdio/bytesex.h
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
-    $Id: bytesex.h,v 1.5 2008/03/25 15:59:08 karl Exp $
-
-    Copyright (C) 2000, 2004 Herbert Valerio Riedel <hvr@gnu.org>
-    Copyright (C) 2005, 2008 Rocky Bernstein <rocky@gnu.org>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-/** \file bytesex.h 
- *  \brief  Generic Byte-swapping routines.
- *
- *   Note: this header will is slated to get removed and libcdio will
- *   use glib.h routines instead.
-*/
-
-#ifndef __CDIO_BYTESEX_H__
-#define __CDIO_BYTESEX_H__
-
-#include <cdio/types.h>
-#include <cdio/bytesex_asm.h>
-#include <cdio/logging.h>
-
-/** 16-bit big-endian to little-endian */
-#define UINT16_SWAP_LE_BE_C(val) ((uint16_t) ( \
-    (((uint16_t) (val) & (uint16_t) 0x00ffU) << 8) | \
-    (((uint16_t) (val) & (uint16_t) 0xff00U) >> 8)))
-
-/** 32-bit big-endian to little-endian */
-#define UINT32_SWAP_LE_BE_C(val) ((uint32_t) ( \
-    (((uint32_t) (val) & (uint32_t) 0x000000ffU) << 24) | \
-    (((uint32_t) (val) & (uint32_t) 0x0000ff00U) <<  8) | \
-    (((uint32_t) (val) & (uint32_t) 0x00ff0000U) >>  8) | \
-    (((uint32_t) (val) & (uint32_t) 0xff000000U) >> 24)))
-
-/** 64-bit big-endian to little-endian */
-#define UINT64_SWAP_LE_BE_C(val) ((uint64_t) ( \
-    (((uint64_t) (val) & (uint64_t) UINT64_C(0x00000000000000ff)) << 56) | \
-    (((uint64_t) (val) & (uint64_t) UINT64_C(0x000000000000ff00)) << 40) | \
-    (((uint64_t) (val) & (uint64_t) UINT64_C(0x0000000000ff0000)) << 24) | \
-    (((uint64_t) (val) & (uint64_t) UINT64_C(0x00000000ff000000)) <<  8) | \
-    (((uint64_t) (val) & (uint64_t) UINT64_C(0x000000ff00000000)) >>  8) | \
-    (((uint64_t) (val) & (uint64_t) UINT64_C(0x0000ff0000000000)) >> 24) | \
-    (((uint64_t) (val) & (uint64_t) UINT64_C(0x00ff000000000000)) >> 40) | \
-    (((uint64_t) (val) & (uint64_t) UINT64_C(0xff00000000000000)) >> 56)))
-
-#ifndef UINT16_SWAP_LE_BE
-# define UINT16_SWAP_LE_BE UINT16_SWAP_LE_BE_C
-#endif
-
-#ifndef UINT32_SWAP_LE_BE
-# define UINT32_SWAP_LE_BE UINT32_SWAP_LE_BE_C
-#endif
-
-#ifndef UINT64_SWAP_LE_BE
-# define UINT64_SWAP_LE_BE UINT64_SWAP_LE_BE_C
-#endif
-
-inline static 
-uint16_t uint16_swap_le_be (const uint16_t val)
-{
-  return UINT16_SWAP_LE_BE (val);
-}
-
-inline static 
-uint32_t uint32_swap_le_be (const uint32_t val)
-{
-  return UINT32_SWAP_LE_BE (val);
-}
-
-inline static 
-uint64_t uint64_swap_le_be (const uint64_t val)
-{
-  return UINT64_SWAP_LE_BE (val);
-}
-
-# define UINT8_TO_BE(val)      ((uint8_t) (val))
-# define UINT8_TO_LE(val)      ((uint8_t) (val))
-#ifdef WORDS_BIGENDIAN
-# define UINT16_TO_BE(val)     ((uint16_t) (val))
-# define UINT16_TO_LE(val)     ((uint16_t) UINT16_SWAP_LE_BE(val))
-
-# define UINT32_TO_BE(val)     ((uint32_t) (val))
-# define UINT32_TO_LE(val)     ((uint32_t) UINT32_SWAP_LE_BE(val))
-
-# define UINT64_TO_BE(val)     ((uint64_t) (val))
-# define UINT64_TO_LE(val)     ((uint64_t) UINT64_SWAP_LE_BE(val))
-#else
-# define UINT16_TO_BE(val)     ((uint16_t) UINT16_SWAP_LE_BE(val))
-# define UINT16_TO_LE(val)     ((uint16_t) (val))
-
-# define UINT32_TO_BE(val)     ((uint32_t) UINT32_SWAP_LE_BE(val))
-# define UINT32_TO_LE(val)     ((uint32_t) (val))
-
-# define UINT64_TO_BE(val)     ((uint64_t) UINT64_SWAP_LE_BE(val))
-# define UINT64_TO_LE(val)     ((uint64_t) (val))
-#endif
-
-/** symmetric conversions */
-#define UINT8_FROM_BE(val)     (UINT8_TO_BE (val))
-#define UINT8_FROM_LE(val)     (UINT8_TO_LE (val))
-#define UINT16_FROM_BE(val)    (UINT16_TO_BE (val))
-#define UINT16_FROM_LE(val)    (UINT16_TO_LE (val))
-#define UINT32_FROM_BE(val)    (UINT32_TO_BE (val))
-#define UINT32_FROM_LE(val)    (UINT32_TO_LE (val))
-#define UINT64_FROM_BE(val)    (UINT64_TO_BE (val))
-#define UINT64_FROM_LE(val)    (UINT64_TO_LE (val))
-
-/** converter function template */
-#define CVT_TO_FUNC(bits) \
- static inline uint ## bits ## _t \
- uint ## bits ## _to_be (uint ## bits ## _t val) \
- { return UINT ## bits ## _TO_BE (val); } \
- static inline uint ## bits ## _t \
- uint ## bits ## _to_le (uint ## bits ## _t val) \
- { return UINT ## bits ## _TO_LE (val); } \
-
-CVT_TO_FUNC(8)
-CVT_TO_FUNC(16)
-CVT_TO_FUNC(32)
-CVT_TO_FUNC(64)
-
-#undef CVT_TO_FUNC
-
-#define uint8_from_be(val)     (uint8_to_be (val))
-#define uint8_from_le(val)     (uint8_to_le (val))
-#define uint16_from_be(val)    (uint16_to_be (val))
-#define uint16_from_le(val)    (uint16_to_le (val))
-#define uint32_from_be(val)    (uint32_to_be (val))
-#define uint32_from_le(val)    (uint32_to_le (val))
-#define uint64_from_be(val)    (uint64_to_be (val))
-#define uint64_from_le(val)    (uint64_to_le (val))
-
-/** ISO9660-related field conversion routines */
-
-/** Convert from uint8_t to ISO 9660 7.1.1 format */
-#define to_711(i)   uint8_to_le(i)
-
-/** Convert from ISO 9660 7.1.1 format to uint8_t */
-#define from_711(i) uint8_from_le(i)
-
-/** Convert from uint16_t to ISO 9669 7.2.1 format */
-#define to_721(i)   uint16_to_le(i)
-
-/** Convert from ISO 9660 7.2.1 format to uint16_t */
-#define from_721(i) uint16_from_le(i)
-
-/** Convert from uint16_t to ISO 9669 7.2.2 format */
-#define to_722(i)   uint16_to_be(i)
-
-/** Convert from ISO 9660 7.2.2 format to uint16_t */
-#define from_722(i) uint16_from_be(i)
-
-/** Convert from uint16_t to ISO 9669 7.2.3 format */
-static inline uint32_t
-to_723(uint16_t i)
-{
-  return uint32_swap_le_be(i) | i;
-}
-
-/** Convert from ISO 9660 7.2.3 format to uint16_t */
-static inline uint16_t 
-from_723 (uint32_t p)
-{
-  if (uint32_swap_le_be (p) != p)
-    cdio_warn ("from_723: broken byte order");
-
-  return (0xFFFF & p);
-}
-
-/** Convert from uint16_t to ISO 9669 7.3.1 format */
-#define to_731(i)   uint32_to_le(i)
-
-/** Convert from ISO 9660 7.3.1 format to uint32_t */
-#define from_731(i) uint32_from_le(i)
-
-/** Convert from uint32_t to ISO 9669 7.3.2 format */
-#define to_732(i)   uint32_to_be(i)
-
-/** Convert from ISO 9660 7.3.2 format to uint32_t */
-#define from_732(i) uint32_from_be(i)
-
-/** Convert from uint16_t to ISO 9669 7.3.3 format */
-static inline uint64_t
-to_733(uint32_t i)
-{
-  return uint64_swap_le_be(i) | i;
-}
-
-/** Convert from ISO 9660 7.3.3 format to uint32_t */
-static inline uint32_t 
-from_733 (uint64_t p)
-{
-  if (uint64_swap_le_be (p) != p)
-    cdio_warn ("from_733: broken byte order");
-    
-  return (UINT32_C(0xFFFFFFFF) & p);
-}
-
-#endif /* __CDIO_BYTESEX_H__ */
-
-
-/* 
- * Local variables:
- *  c-file-style: "gnu"
- *  tab-width: 8
- *  indent-tabs-mode: nil
- * End:
- */
diff --git a/lib-x86-64/include/cdio/bytesex_asm.h b/lib-x86-64/include/cdio/bytesex_asm.h
deleted file mode 100644
index 7f1f131a..00000000
--- a/lib-x86-64/include/cdio/bytesex_asm.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-    $Id: bytesex_asm.h,v 1.3 2008/03/25 15:59:08 karl Exp $
-
-    Copyright (C) 2008 Rocky Bernstein <rocky@gnu.org>
-                  2001, 2004, 2005 Herbert Valerio Riedel <hvr@gnu.org>
-                  2001 Sven Ottemann <ac-logic@freenet.de>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-/** \file bytesex_asm.h 
- *  \brief  Assembly code to handle byte-swapping.
-
-    Note: this header will is slated to get removed and libcdio will use 
-    glib.h routines instead. 
-*/
-
-#ifndef __CDIO_BYTESEX_ASM_H__
-#define __CDIO_BYTESEX_ASM_H__
-#if !defined(DISABLE_ASM_OPTIMIZE)
-
-#include <cdio/types.h>
-
-#if defined(__powerpc__) && defined(__GNUC__)
-
-inline static
-uint32_t uint32_swap_le_be_asm(const uint32_t a)
-{
-  uint32_t b;
-
-  __asm__ ("lwbrx %0,0,%1"
-           :"=r"(b)
-           :"r"(&a), "m"(a));
-
-  return b;
-}
-
-inline static
-uint16_t uint16_swap_le_be_asm(const uint16_t a)
-{
-  uint32_t b;
-
-  __asm__ ("lhbrx %0,0,%1"
-           :"=r"(b)
-           :"r"(&a), "m"(a));
-
-  return b;
-}
-
-#define UINT16_SWAP_LE_BE uint16_swap_le_be_asm
-#define UINT32_SWAP_LE_BE uint32_swap_le_be_asm
-
-#elif defined(__mc68000__) &&  defined(__STORMGCC__)
-
-inline static 
-uint32_t uint32_swap_le_be_asm(uint32_t a __asm__("d0"))
-{
-  /* __asm__("rolw #8,%0; swap %0; rolw #8,%0" : "=d" (val) : "0" (val)); */
-
-  __asm__("move.l %1,d0;rol.w #8,d0;swap d0;rol.w #8,d0;move.l d0,%0"
-          :"=r"(a)
-          :"r"(a));
-
-  return(a);
-}
-
-inline static
-uint16_t uint16_swap_le_be_asm(uint16_t a __asm__("d0"))
-{
-  __asm__("move.l %1,d0;rol.w #8,d0;move.l d0,%0"
-          :"=r"(a)
-          :"r"(a));
-  
-  return(a);
-}
-
-#define UINT16_SWAP_LE_BE uint16_swap_le_be_asm
-#define UINT32_SWAP_LE_BE uint32_swap_le_be_asm
-
-#elif 0 && defined(__i386__) && defined(__GNUC__)
-
-inline static 
-uint32_t uint32_swap_le_be_asm(uint32_t a)
-{
-  __asm__("xchgb %b0,%h0\n\t"     /* swap lower bytes     */
-	  "rorl $16,%0\n\t"       /* swap words           */
-	  "xchgb %b0,%h0"         /* swap higher bytes    */
-	  :"=q" (a)
-	  : "0" (a));
-
-  return(a);
-}
-
-inline static
-uint16_t uint16_swap_le_be_asm(uint16_t a)
-{
-  __asm__("xchgb %b0,%h0"         /* swap bytes           */ 
-	  : "=q" (a) 
-	  :  "0" (a));
-  
-  return(a);
-}
-
-#define UINT16_SWAP_LE_BE uint16_swap_le_be_asm
-#define UINT32_SWAP_LE_BE uint32_swap_le_be_asm
-
-#endif
-
-#endif /* !defined(DISABLE_ASM_OPTIMIZE) */
-#endif /* __CDIO_BYTESEX_ASM_H__ */
-
-
-/* 
- * Local variables:
- *  c-file-style: "gnu"
- *  tab-width: 8
- *  indent-tabs-mode: nil
- * End:
- */
diff --git a/lib-x86-64/include/cdio/cd_types.h b/lib-x86-64/include/cdio/cd_types.h
deleted file mode 100644
index bc1f16c0..00000000
--- a/lib-x86-64/include/cdio/cd_types.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
-    $Id: cd_types.h,v 1.18 2008/03/25 15:59:08 karl Exp $
-
-    Copyright (C) 2003, 2006, 2008 Rocky Bernstein <rocky@cpan.org>
-    Copyright (C) 1996,1997,1998  Gerd Knorr <kraxel@bytesex.org>
-         and       Heiko Eißfeldt <heiko@hexco.de>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-/** \file cd_types.h 
- *  \brief Header for routines which automatically determine the Compact Disc
- *  format and possibly filesystem on the CD.
- *         
- */
-
-#ifndef __CDIO_CD_TYPES_H__
-#define __CDIO_CD_TYPES_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/**
- * Filesystem types we understand. The highest-numbered fs type should
- *  be less than CDIO_FS_MASK defined below.
- */
-  typedef enum {
-    CDIO_FS_AUDIO                = 1, /**< audio only - not really a 
-                                         filesystem */
-    CDIO_FS_HIGH_SIERRA	         = 2, /**< High-Sierra Filesystem */
-    CDIO_FS_ISO_9660	         = 3, /**< ISO 9660 filesystem */
-    CDIO_FS_INTERACTIVE	         = 4,
-    CDIO_FS_HFS		         = 5, /**< file system used on the Macintosh 
-                                         system in MacOS 6 through MacOS 9
-                                         and deprecated in OSX. */
-    CDIO_FS_UFS		         = 6, /**< Generic Unix file system derived
-                                         from the Berkeley fast file 
-                                         system. */
-    
-    /**<
-     * EXT2 was the GNU/Linux native filesystem for early kernels. Newer
-     * GNU/Linux OS's may use EXT3 which is EXT2 with a journal. 
-     */
-    CDIO_FS_EXT2		 = 7,
-
-    CDIO_FS_ISO_HFS              = 8,  /**< both HFS & ISO-9660 filesystem */
-    CDIO_FS_ISO_9660_INTERACTIVE = 9,  /**< both CD-RTOS and ISO filesystem */
-
-
-    /**<
-     * The 3DO is, technically, a set of specifications created by the 3DO
-     * company.  These specs are for making a 3DO Interactive Multiplayer
-     * which uses a CD-player. Panasonic in the early 90's was the first
-     * company to manufacture and market a 3DO player. 
-     */
-    CDIO_FS_3DO		        = 10,
-
-
-    /**<
-       Microsoft X-BOX CD.
-    */
-    CDIO_FS_XISO 		= 11,
-    CDIO_FS_UDFX 		= 12,
-    CDIO_FS_UDF 		= 13,
-    CDIO_FS_ISO_UDF             = 14
-  } cdio_fs_t;
-
-
-/** 
- * Macro to extract just the FS type portion defined above 
-*/
-#define CDIO_FSTYPE(fs) (fs & CDIO_FS_MASK)
-
-/**
- *  Bit masks for the classes of CD-images. These are generally
- *  higher-level than the fs-type information above and may be determined
- *  based of the fs type information. This 
- */
-  typedef enum {
-    CDIO_FS_MASK	      =	  0x000f, /**< Note: this should be 2**n-1 and
-                                               and greater than the highest 
-                                               CDIO_FS number above */
-    CDIO_FS_ANAL_XA           =	  0x00010, /**< eXtended Architecture format */
-    CDIO_FS_ANAL_MULTISESSION =   0x00020, /**< CD has multisesion */
-    CDIO_FS_ANAL_PHOTO_CD     =	  0x00040, /**< Is a Kodak Photo CD */
-    CDIO_FS_ANAL_HIDDEN_TRACK =   0x00080, /**< Hidden track at the 
-                                               beginning of the CD */
-    CDIO_FS_ANAL_CDTV         =	  0x00100,
-    CDIO_FS_ANAL_BOOTABLE     =   0x00200, /**< CD is bootable */
-    CDIO_FS_ANAL_VIDEOCD      =   0x00400, /**< VCD 1.1 */
-    CDIO_FS_ANAL_ROCKRIDGE    =   0x00800, /**< Has Rock Ridge Extensions to
-                                               ISO 9660, */
-    CDIO_FS_ANAL_JOLIET       =   0x01000, /**< Microsoft Joliet extensions 
-                                                to ISO 9660, */
-    CDIO_FS_ANAL_SVCD         =   0x02000, /**< Super VCD or Choiji Video CD */
-    CDIO_FS_ANAL_CVD          =   0x04000, /**< Choiji Video CD */
-    CDIO_FS_ANAL_XISO         =   0x08000, /**< XBOX CD */
-    CDIO_FS_ANAL_ISO9660_ANY  =   0x10000, /**< Any sort fo ISO9660 FS */
-    CDIO_FS_ANAL_VCD_ANY      =   (CDIO_FS_ANAL_VIDEOCD|CDIO_FS_ANAL_SVCD|
-                                   CDIO_FS_ANAL_CVD),
-    CDIO_FS_MATCH_ALL         =  ~CDIO_FS_MASK /**< bitmask which can
-                                                 be used by
-                                                 cdio_get_devices to
-                                                 specify matching any
-                                                 sort of CD. */
-  } cdio_fs_cap_t;
-    
-
-#define CDIO_FS_UNKNOWN	            CDIO_FS_MASK
-
-/**
- * 
- */
-#define CDIO_FS_MATCH_ALL            (cdio_fs_anal_t) (~CDIO_FS_MASK)
-
-
-/*!
-  \brief The type used to return analysis information from
-  cdio_guess_cd_type. 
-
-  These fields make sense only for when an ISO-9660 filesystem is used.
- */
-typedef struct 
-{
-  unsigned int  joliet_level;  /**< If has Joliet extensions, this is the
-                                  associated level number (i.e. 1, 2, or 3). */
-  char          iso_label[33]; /**< This is 32 + 1 for null byte at the end in 
-				    formatting the string */
-  unsigned int  isofs_size;
-  uint8_t       UDFVerMinor;   /**< For UDF filesystems only */
-  uint8_t       UDFVerMajor;   /**< For UDF filesystems only */
-} cdio_iso_analysis_t;
-
-/**
- *  Try to determine what kind of CD-image and/or filesystem we
- *  have at track track_num. Return information about the CD image
- *  is returned in iso_analysis and the return value.
- */
-cdio_fs_anal_t cdio_guess_cd_type(const CdIo_t *cdio, int start_session, 
-				  track_t track_num, 
-				  /*out*/ cdio_iso_analysis_t *iso_analysis);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-/** The below variables are trickery to force the above enum symbol
-    values to be recorded in debug symbol tables. They are used to
-    allow one to refer to the enumeration value names in the typedefs
-    above in a debugger and debugger expressions.
-*/
-extern cdio_fs_cap_t debug_cdio_fs_cap;
-extern cdio_fs_t     debug_cdio_fs;
-
-#endif /* __CDIO_CD_TYPES_H__ */
-
-/* 
- * Local variables:
- *  c-file-style: "gnu"
- *  tab-width: 8
- *  indent-tabs-mode: nil
- * End:
- */
diff --git a/lib-x86-64/include/cdio/cdio.h b/lib-x86-64/include/cdio/cdio.h
deleted file mode 100644
index 84e54b10..00000000
--- a/lib-x86-64/include/cdio/cdio.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- c -*-
-    $Id: cdio.h,v 1.82 2008/03/25 15:59:08 karl Exp $
-
-    Copyright (C) 2003, 2004, 2005, 2008 Rocky Bernstein <rocky@gnu.org>
-    Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-/** \file cdio.h 
- *
- *  \brief The top-level header for libcdio: the CD Input and Control
- *  library. Applications include this for anything regarding libcdio.
- */
-
-
-#ifndef __CDIO_H__
-#define __CDIO_H__
-
-/** Application Interface or Protocol version number. If the public
- *  interface changes, we increase this number.
- */
-#define CDIO_API_VERSION 5
-
-#include <cdio/version.h>
-
-#ifdef  HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef  HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include <cdio/types.h>
-#include <cdio/sector.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* For compatibility. */
-#define CdIo CdIo_t
-    
-  /** This is an opaque structure for the CD object. */
-  typedef struct _CdIo CdIo_t; 
-
-  /** This is an opaque structure for the CD-Text object. */
-  typedef struct cdtext cdtext_t;
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-/* Drive(r)/Device-related functions. Perhaps we should break out 
-   Driver from device?
-*/
-#include <cdio/device.h>
-
-/* Disc-related functions. */
-#include <cdio/disc.h>
-
-/* Sector (frame, or block)-related functions. Uses driver_return_code_t
-   from <cdio/device.h> so it should come after that. 
-*/
-#include <cdio/read.h>
-
-/* CD-Text-related functions. */
-#include <cdio/cdtext.h>
-
-/* Track-related functions. */
-#include <cdio/track.h>
-
-#endif /* __CDIO_H__ */
diff --git a/lib-x86-64/include/cdio/cdio_config.h b/lib-x86-64/include/cdio/cdio_config.h
deleted file mode 100644
index 2005b888..00000000
--- a/lib-x86-64/include/cdio/cdio_config.h
+++ /dev/null
@@ -1,258 +0,0 @@
-/** \file cdio_config.h
- *  \brief  configuration-time settings useful in compilation; a run-time
-    version of config.h
-*/
-/* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define if building universal (internal helper macro) */
-/* #undef AC_APPLE_UNIVERSAL_BUILD */
-
-/* Define 1 if you are compiling using cygwin */
-/* #undef CYGWIN */
-
-/* what to put between the brackets for empty arrays */
-#define EMPTY_ARRAY_SIZE 
-
-/* Define 1 if you have BSDI-type CD-ROM support */
-/* #undef HAVE_BSDI_CDROM */
-
-/* Define to 1 if you have the `bzero' function. */
-#define HAVE_BZERO 1
-
-/* Define this if you have libcddb installed */
-#define HAVE_CDDB /**/
-
-/* Define to 1 if you have the <CoreFoundation/CFBase.h> header file. */
-/* #undef HAVE_COREFOUNDATION_CFBASE_H */
-
-/* Define to 1 if you have the <curses.h> header file. */
-/* #undef HAVE_CURSES_H */
-
-/* Define 1 if you have Darwin OS X-type CD-ROM support */
-/* #undef HAVE_DARWIN_CDROM */
-
-/* Define if time.h defines extern long timezone and int daylight vars. */
-#define HAVE_DAYLIGHT 1
-
-/* Define to 1 if you have the Apple DiskArbitration framework */
-/* #undef HAVE_DISKARBITRATION */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define to 1 if you have the `drand48' function. */
-#define HAVE_DRAND48 1
-
-/* Define to 1 if you have the <dvd.h> header file. */
-/* #undef HAVE_DVD_H */
-
-/* Define to 1 if you have the <errno.h> header file. */
-#define HAVE_ERRNO_H 1
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define 1 if you have FreeBSD CD-ROM support */
-/* #undef HAVE_FREEBSD_CDROM */
-
-/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
-/* #undef HAVE_FSEEKO */
-
-/* Define to 1 if you have the `ftruncate' function. */
-#define HAVE_FTRUNCATE 1
-
-/* Define to 1 if you have the `geteuid' function. */
-#define HAVE_GETEUID 1
-
-/* Define to 1 if you have the `getgid' function. */
-#define HAVE_GETGID 1
-
-/* Define to 1 if you have the <getopt.h> header file. */
-#define HAVE_GETOPT_H 1
-
-/* Define to 1 if you have the `getpwuid' function. */
-#define HAVE_GETPWUID 1
-
-/* Define to 1 if you have the `gettimeofday' function. */
-#define HAVE_GETTIMEOFDAY 1
-
-/* Define to 1 if you have the `getuid' function. */
-#define HAVE_GETUID 1
-
-/* Define to 1 if you have the <glob.h> header file. */
-#define HAVE_GLOB_H 1
-
-/* Define to 1 if you have the `gmtime_r' function. */
-#define HAVE_GMTIME_R 1
-
-/* Define if you have the iconv() function and it works. */
-#define HAVE_ICONV 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the <IOKit/IOKitLib.h> header file. */
-/* #undef HAVE_IOKIT_IOKITLIB_H */
-
-/* Supports ISO _Pragma() macro */
-#define HAVE_ISOC99_PRAGMA /**/
-
-/* Define 1 if you want ISO-9660 Joliet extension support. You must have also
-   libiconv installed to get Joliet extension support. */
-#define HAVE_JOLIET 1
-
-/* Define this if your libcurses has keypad */
-#define HAVE_KEYPAD /**/
-
-/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
-#define HAVE_LANGINFO_CODESET 1
-
-/* Define to 1 if you have the `nsl' library (-lnsl). */
-/* #undef HAVE_LIBNSL */
-
-/* Define to 1 if you have the `socket' library (-lsocket). */
-/* #undef HAVE_LIBSOCKET */
-
-/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* Define 1 if you have Linux-type CD-ROM support */
-#define HAVE_LINUX_CDROM 1
-
-/* Define to 1 if you have the <linux/cdrom.h> header file. */
-#define HAVE_LINUX_CDROM_H 1
-
-/* Define 1 if timeout is in cdrom_generic_command struct */
-/* #undef HAVE_LINUX_CDROM_TIMEOUT */
-
-/* Define to 1 if you have the <linux/major.h> header file. */
-#define HAVE_LINUX_MAJOR_H 1
-
-/* Define to 1 if you have the <linux/version.h> header file. */
-#define HAVE_LINUX_VERSION_H 1
-
-/* Define to 1 if you have the `localtime_r' function. */
-#define HAVE_LOCALTIME_R 1
-
-/* Define to 1 if you have the `lstat' function. */
-#define HAVE_LSTAT 1
-
-/* Define to 1 if you have the `memcpy' function. */
-#define HAVE_MEMCPY 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `memset' function. */
-#define HAVE_MEMSET 1
-
-/* Define to 1 if you have the <ncurses.h> header file. */
-#define HAVE_NCURSES_H 1
-
-/* Define 1 if you have NetBSD CD-ROM support */
-/* #undef HAVE_NETBSD_CDROM */
-
-/* Define 1 if you have OS/2 CD-ROM support */
-/* #undef HAVE_OS2_CDROM */
-
-/* Define to 1 if you have the <pwd.h> header file. */
-#define HAVE_PWD_H 1
-
-/* Define to 1 if you have the `rand' function. */
-#define HAVE_RAND 1
-
-/* Define to 1 if you have the `readlink' function. */
-#define HAVE_READLINK 1
-
-/* Define 1 if you want ISO-9660 Rock-Ridge extension support. */
-#define HAVE_ROCK 1
-
-/* Define to 1 if you have the `setegid' function. */
-#define HAVE_SETEGID 1
-
-/* Define to 1 if you have the `setenv' function. */
-#define HAVE_SETENV 1
-
-/* Define to 1 if you have the `seteuid' function. */
-#define HAVE_SETEUID 1
-
-/* Define to 1 if you have the `sleep' function. */
-#define HAVE_SLEEP 1
-
-/* Define to 1 if you have the `snprintf' function. */
-#define HAVE_SNPRINTF 1
-
-/* Define 1 if you have Solaris CD-ROM support */
-/* #undef HAVE_SOLARIS_CDROM */
-
-/* Define to 1 if you have the <stdarg.h> header file. */
-#define HAVE_STDARG_H 1
-
-/* Define to 1 if you have the <stdbool.h> header file. */
-#define HAVE_STDBOOL_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdio.h> header file. */
-#define HAVE_STDIO_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define this if you have struct timespec */
-#define HAVE_STRUCT_TIMESPEC /**/
-
-/* Define to 1 if you have the <sys/cdio.h> header file. */
-/* #undef HAVE_SYS_CDIO_H */
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-#define HAVE_SYS_PARAM_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/timeb.h> header file. */
-#define HAVE_SYS_TIMEB_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <sys/utsname.h> header file. */
-#define HAVE_SYS_UTSNAME_H 1
-
-/* Define this <sys/stat.h> defines S_ISLNK() */
-#define HAVE_S_ISLNK /**/
-
-/* Define this <sys/stat.h> defines S_ISSOCK() */
-#define HAVE_S_ISSOCK /**/
-
-/* Define to 1 if timegm is available */
-#define HAVE_TIMEGM 1
-
-/* Define if you have an extern long timenzone variable. */
-#define HAVE_TIMEZONE_VAR 1
-
-/* Define if struct tm has the tm_gmtoff member. */
-#define HAVE_TM_GMTOFF 1
-
-/* Define if time.h defines extern extern char *tzname[2] variable */
-#define HAVE_TZNAME 1
-
-/* Define to 1 if you have the `tzset' function. */
-#define HAVE_TZSET 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the `unsetenv' function. */
diff --git a/lib-x86-64/include/cdio/device.h b/lib-x86-64/include/cdio/device.h
deleted file mode 100644
index cc84e79a..00000000
--- a/lib-x86-64/include/cdio/device.h
+++ /dev/null
@@ -1,995 +0,0 @@
-/* -*- c -*-
-    $Id: device.h,v 1.39 2008/03/28 01:28:50 rocky Exp $
-
-    Copyright (C) 2005, 2006, 2008, 2009 Rocky Bernstein <rocky@gnu.org>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-/** \file device.h 
- *
- *  \brief C header for driver- or device-related libcdio
- *          calls.  ("device" includes CD-image reading devices).
- */
-#ifndef __CDIO_DEVICE_H__
-#define __CDIO_DEVICE_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-  /*! The type of an drive capability bit mask. See below for values*/
-  typedef uint32_t cdio_drive_read_cap_t;
-  typedef uint32_t cdio_drive_write_cap_t;
-  typedef uint32_t cdio_drive_misc_cap_t;
-  
-  /*!
-    \brief Drive capability bits returned by cdio_get_drive_cap()
-    NOTE: Setting a bit here means the presence of a capability.
-  */ 
-
-  /** Miscellaneous capabilities. */
-  typedef enum {
-    CDIO_DRIVE_CAP_ERROR             = 0x40000, /**< Error */
-    CDIO_DRIVE_CAP_UNKNOWN           = 0x80000, /**< Dunno. It can be on if we
-					        have only partial information 
-                                                or are not completely certain
-						*/
-    CDIO_DRIVE_CAP_MISC_CLOSE_TRAY   = 0x00001, /**< caddy systems can't 
-                                                     close... */
-    CDIO_DRIVE_CAP_MISC_EJECT        = 0x00002, /**< but can eject.  */
-    CDIO_DRIVE_CAP_MISC_LOCK	     = 0x00004, /**< disable manual eject */
-    CDIO_DRIVE_CAP_MISC_SELECT_SPEED = 0x00008, /**< programmable speed */
-    CDIO_DRIVE_CAP_MISC_SELECT_DISC  = 0x00010, /**< select disc from 
-                                                      juke-box */
-    CDIO_DRIVE_CAP_MISC_MULTI_SESSION= 0x00020, /**< read sessions>1 */
-    CDIO_DRIVE_CAP_MISC_MEDIA_CHANGED= 0x00080, /**< media changed */
-    CDIO_DRIVE_CAP_MISC_RESET        = 0x00100, /**< hard reset device */
-    CDIO_DRIVE_CAP_MISC_FILE         = 0x20000 /**< drive is really a file,
-						  i.e a CD file image */
-  } cdio_drive_cap_misc_t;
-
-  /*! Reading masks.. */
-  typedef enum {
-    CDIO_DRIVE_CAP_READ_AUDIO        = 0x00001, /**< drive can play CD audio */
-    CDIO_DRIVE_CAP_READ_CD_DA        = 0x00002, /**< drive can read CD-DA */
-    CDIO_DRIVE_CAP_READ_CD_G         = 0x00004, /**< drive can read CD+G  */
-    CDIO_DRIVE_CAP_READ_CD_R         = 0x00008, /**< drive can read CD-R  */
-    CDIO_DRIVE_CAP_READ_CD_RW        = 0x00010, /**< drive can read CD-RW */
-    CDIO_DRIVE_CAP_READ_DVD_R        = 0x00020, /**< drive can read DVD-R */
-    CDIO_DRIVE_CAP_READ_DVD_PR       = 0x00040, /**< drive can read DVD+R */
-    CDIO_DRIVE_CAP_READ_DVD_RAM      = 0x00080, /**< drive can read DVD-RAM */
-    CDIO_DRIVE_CAP_READ_DVD_ROM      = 0x00100, /**< drive can read DVD-ROM */
-    CDIO_DRIVE_CAP_READ_DVD_RW       = 0x00200, /**< drive can read DVD-RW  */
-    CDIO_DRIVE_CAP_READ_DVD_RPW      = 0x00400, /**< drive can read DVD+RW  */
-    CDIO_DRIVE_CAP_READ_C2_ERRS      = 0x00800, /**< has C2 error correction */
-    CDIO_DRIVE_CAP_READ_MODE2_FORM1  = 0x01000, /**< can read mode 2 form 1 */
-    CDIO_DRIVE_CAP_READ_MODE2_FORM2  = 0x02000, /**< can read mode 2 form 2 */
-    CDIO_DRIVE_CAP_READ_MCN          = 0x04000, /**< can read MCN      */
-    CDIO_DRIVE_CAP_READ_ISRC         = 0x08000 /**< can read ISRC     */
-  } cdio_drive_cap_read_t;
-
-  /*! Writing masks.. */
-  typedef enum {
-    CDIO_DRIVE_CAP_WRITE_CD_R        = 0x00001, /**< drive can write CD-R */
-    CDIO_DRIVE_CAP_WRITE_CD_RW       = 0x00002, /**< drive can write CD-RW */
-    CDIO_DRIVE_CAP_WRITE_DVD_R       = 0x00004, /**< drive can write DVD-R */
-    CDIO_DRIVE_CAP_WRITE_DVD_PR      = 0x00008, /**< drive can write DVD+R */
-    CDIO_DRIVE_CAP_WRITE_DVD_RAM     = 0x00010, /**< drive can write DVD-RAM */
-    CDIO_DRIVE_CAP_WRITE_DVD_RW      = 0x00020, /**< drive can write DVD-RW */
-    CDIO_DRIVE_CAP_WRITE_DVD_RPW     = 0x00040, /**< drive can write DVD+RW */
-    CDIO_DRIVE_CAP_WRITE_MT_RAINIER  = 0x00080, /**< Mount Rainier           */
-    CDIO_DRIVE_CAP_WRITE_BURN_PROOF  = 0x00100, /**< burn proof */
-    CDIO_DRIVE_CAP_WRITE_CD =
-    (CDIO_DRIVE_CAP_WRITE_CD_R | CDIO_DRIVE_CAP_WRITE_CD_RW),
-    /**< Has some sort of CD writer ability */
-
-    CDIO_DRIVE_CAP_WRITE_DVD = 
-    (CDIO_DRIVE_CAP_WRITE_DVD_R | CDIO_DRIVE_CAP_WRITE_DVD_PR 
-     | CDIO_DRIVE_CAP_WRITE_DVD_RAM | CDIO_DRIVE_CAP_WRITE_DVD_RW 
-     | CDIO_DRIVE_CAP_WRITE_DVD_RPW ),
-    /**< Has some sort of DVD writer ability */
-
-    CDIO_DRIVE_CAP_WRITE = 
-    (CDIO_DRIVE_CAP_WRITE_CD | CDIO_DRIVE_CAP_WRITE_DVD)
-    /**< Has some sort of DVD or CD writing ability */
-  } cdio_drive_cap_write_t;
-    
-/*! Size of fields returned by an INQUIRY command */
-  typedef enum {
-    CDIO_MMC_HW_VENDOR_LEN   =  8, /**< length of vendor field */
-    CDIO_MMC_HW_MODEL_LEN    = 16, /**< length of model field */
-    CDIO_MMC_HW_REVISION_LEN =  4  /**< length of revision field */
-  } cdio_mmc_hw_len_t;
-    
-
-  /*! \brief Structure to return CD vendor, model, and revision-level
-      strings obtained via the INQUIRY command  */
-  typedef struct cdio_hwinfo 
-  {
-    char psz_vendor  [CDIO_MMC_HW_VENDOR_LEN+1];
-    char psz_model   [CDIO_MMC_HW_MODEL_LEN+1];
-    char psz_revision[CDIO_MMC_HW_REVISION_LEN+1];
-  } cdio_hwinfo_t;
-
-
-  /** Flags specifying the category of device to open or is opened. */
-  typedef enum {
-    CDIO_SRC_IS_DISK_IMAGE_MASK = 0x0001, /**< Read source is a CD image. */
-    CDIO_SRC_IS_DEVICE_MASK     = 0x0002, /**< Read source is a CD device. */
-    CDIO_SRC_IS_SCSI_MASK       = 0x0004, /**< Read source SCSI device. */
-    CDIO_SRC_IS_NATIVE_MASK     = 0x0008
-  } cdio_src_category_mask_t;
-    
-
-  /** The driver_id_t enumerations may be used to tag a specific driver
-   * that is opened or is desired to be opened. Note that this is
-   * different than what is available on a given host.
-   *
-   * Order should not be changed lightly because it breaks the ABI.
-   * One is not supposed to iterate over the values, but iterate over the
-   * cdio_drivers and cdio_device_drivers arrays.
-   *
-   * NOTE: IF YOU MODIFY ENUM MAKE SURE INITIALIZATION IN CDIO.C AGREES.
-   *     
-   */
-  typedef enum  {
-    DRIVER_UNKNOWN, /**< Used as input when we don't care what kind 
-		         of driver to use. */
-    DRIVER_AIX,     /**< AIX driver */
-    DRIVER_BSDI,    /**< BSDI driver */
-    DRIVER_FREEBSD, /**< FreeBSD driver - includes CAM and ioctl access */
-    DRIVER_NETBSD,  /**< NetBSD Driver. */
-    DRIVER_LINUX,   /**< GNU/Linux Driver */
-    DRIVER_SOLARIS, /**< Sun Solaris Driver */
-    DRIVER_OS2,     /**< IBM OS/2 Driver */
-    DRIVER_OSX,     /**< Apple OSX Driver */
-    DRIVER_WIN32,   /**< Microsoft Windows Driver. Includes ASPI and 
-		         ioctl access. */
-    DRIVER_CDRDAO,  /**< cdrdao format CD image. This is listed
-		         before BIN/CUE, to make the code prefer cdrdao
-		         over BIN/CUE when both exist. */
-    DRIVER_BINCUE,  /**< CDRWIN BIN/CUE format CD image. This is
-		         listed before NRG, to make the code prefer
-		         BIN/CUE over NRG when both exist. */
-    DRIVER_NRG,     /**< Nero NRG format CD image. */
-    DRIVER_DEVICE   /**< Is really a set of the above; should come last */
-  } driver_id_t;
-
-  /** A null-terminated (that is DRIVER_UNKNOWN-terminated) ordered (in
-     order of preference) array of drivers.
-  */
-  extern const driver_id_t cdio_drivers[];
-  /** A null-terminated (that is DRIVER_UNKNOWN-terminated) ordered (in
-     order of preference) array of device drivers.
-  */
-  extern const driver_id_t cdio_device_drivers[];
-
-  /** There will generally be only one hardware for a given
-     build/platform from the list above. You can use the variable
-     below to determine which you've got. If the build doesn't make an
-     hardware driver, then the value will be DRIVER_UNKNOWN.
-  */
-  extern const driver_id_t cdio_os_driver;
-  
-
-/** Those are deprecated; use cdio_drivers or cdio_device_drivers to
-    iterate over all drivers or only the device drivers.
-    Make sure what's listed for CDIO_MIN_DRIVER is the last
-    enumeration in driver_id_t. Since we have a bogus (but useful) 0th
-    entry above we don't have to add one.
-*/
-#define CDIO_MIN_DRIVER        DRIVER_AIX
-#define CDIO_MIN_DEVICE_DRIVER CDIO_MIN_DRIVER
-#define CDIO_MAX_DRIVER        DRIVER_NRG
-#define CDIO_MAX_DEVICE_DRIVER DRIVER_WIN32
-
-  /** The following are status codes for completion of a given cdio
-     operation. By design 0 is successful completion and -1 is error
-     completion. This is compatable with ioctl so those routines that
-     call ioctl can just pass the value the get back (cast as this
-     enum). Also, by using negative numbers for errors, the
-     enumeration values below can be used in places where a positive
-     value is expected when things complete successfully. For example,
-     get_blocksize returns the blocksize, but on error uses the error
-     codes below. So note that this enumeration is often cast to an
-     integer.  C seems to tolerate this.
-  */
-  typedef enum  {
-    DRIVER_OP_SUCCESS = 0,       /**< in cases where an int is returned,
-				    like cdio_set_speed, more the negative
-				    return codes are for errors and the 
-				    positive ones for success. */
-    DRIVER_OP_ERROR = -1,        /**< operation returned an error */
-    DRIVER_OP_UNSUPPORTED = -2,  /**< returned when a particular driver
-				    doesn't support a particular operation.
-				    For example an image driver which doesn't
-				    really "eject" a CD.
-				 */
-    DRIVER_OP_UNINIT = -3,       /**< returned when a particular driver
-				    hasn't been initialized or a null
-				    pointer has been passed.
-				 */
-    DRIVER_OP_NOT_PERMITTED = -4, /**< Operation not permitted.
-				    For example might be a permission
-				    problem.
-				 */
-    DRIVER_OP_BAD_PARAMETER = -5, /**< Bad parameter passed  */
-    DRIVER_OP_BAD_POINTER =   -6, /**< Bad pointer to memory area  */
-    DRIVER_OP_NO_DRIVER  =    -7, /**< Operaton called on a driver
-				     not available on this OS  */
-  } driver_return_code_t;
-
-  /*!
-    Close media tray in CD drive if there is a routine to do so. 
-    
-    @param psz_drive the name of CD-ROM to be closed. If NULL, we will
-    use the default device.
-    @param p_driver_id is the driver to be used or that got used if
-    it was DRIVER_UNKNOWN or DRIVER_DEVICE; If this is NULL, we won't
-    report back the driver used.
-  */
-  driver_return_code_t cdio_close_tray (const char *psz_drive, 
-					/*in/out*/ driver_id_t *p_driver_id);
-
-  /*!
-    @param drc the return code you want interpreted.
-    @return the string information about drc
-  */
-  const char *cdio_driver_errmsg(driver_return_code_t drc);
-  
-  /*!
-    Eject media in CD drive if there is a routine to do so. 
-
-    @param p_cdio the CD object to be acted upon.
-    If the CD is ejected *p_cdio is free'd and p_cdio set to NULL.
-  */
-  driver_return_code_t cdio_eject_media (CdIo_t **p_cdio);
-
-  /*!
-    Eject media in CD drive if there is a routine to do so. 
-
-    @param psz_drive the name of the device to be acted upon.
-    If NULL is given as the drive, we'll use the default driver device.
-  */
-  driver_return_code_t cdio_eject_media_drive (const char *psz_drive);
-
-  /*!
-    Free device list returned by cdio_get_devices or
-    cdio_get_devices_with_cap.
-    
-    @param device_list list returned by cdio_get_devices or
-    cdio_get_devices_with_cap
-
-    @see cdio_get_devices, cdio_get_devices_with_cap
-
-  */
-  void cdio_free_device_list (char * device_list[]);
-
-  /*!
-    Get the default CD device.
-    if p_cdio is NULL (we haven't initialized a specific device driver), 
-    then find a suitable one and return the default device for that.
-    
-    @param p_cdio the CD object queried
-    @return a string containing the default CD device or NULL is
-    if we couldn't get a default device.
-
-    In some situations of drivers or OS's we can't find a CD device if
-    there is no media in it and it is possible for this routine to return
-    NULL even though there may be a hardware CD-ROM.
-  */
-  char * cdio_get_default_device (const CdIo_t *p_cdio);
-
-  /*!
-    Return a string containing the default CD device if none is specified.
-    if p_driver_id is DRIVER_UNKNOWN or DRIVER_DEVICE
-    then find a suitable one set the default device for that.
-    
-    NULL is returned if we couldn't get a default device.
-  */
-  char * cdio_get_default_device_driver (/*in/out*/ driver_id_t *p_driver_id);
-
-  /*! Return an array of device names. If you want a specific
-    devices for a driver, give that device. If you want hardware
-    devices, give DRIVER_DEVICE and if you want all possible devices,
-    image drivers and hardware drivers give DRIVER_UNKNOWN.
-    
-    NULL is returned if we couldn't return a list of devices.
-
-    In some situations of drivers or OS's we can't find a CD device if
-    there is no media in it and it is possible for this routine to return
-    NULL even though there may be a hardware CD-ROM.
-  */
-  char ** cdio_get_devices (driver_id_t driver_id);
-
-  /*!
-    Get an array of device names in search_devices that have at least
-    the capabilities listed by the capabities parameter.  If
-    search_devices is NULL, then we'll search all possible CD drives.
-
-    Capabilities have two parts to them, a "filesystem" part and an
-    "analysis" part.
-
-    The filesystem part is mutually exclusive. For example either the
-    filesystem is at most one of the High-Sierra, UFS, or HFS, ISO9660,
-    fileystems. Valid combinations of say HFS and ISO9660 are
-    specified as a separate "filesystem".
-
-    Capabilities on the other hand are not mutually exclusive. For example
-    a filesystem may have none, either, or both of the XA or Rock-Ridge
-    extension properties.
-
-    If "b_any" is set false then every capability listed in the
-    analysis portion of capabilities (i.e. not the basic filesystem)
-    must be satisified. If no analysis capabilities are specified,
-    that's a match.
-
-    If "b_any" is set true, then if any of the analysis capabilities
-    matches, we call that a success. 
-
-    In either case, in the filesystem portion different filesystem
-    either specify 0 to match any filesystem or the specific
-    filesystem type.
-    
-    To find a CD-drive of any type, use the mask CDIO_FS_MATCH_ALL.
-
-    @return the array of device names or NULL if we couldn't get a
-    default device.  It is also possible to return a non NULL but
-    after dereferencing the the value is NULL. This also means nothing
-    was found.
-  */
-  char ** cdio_get_devices_with_cap (/*in*/ char *ppsz_search_devices[],
-				     cdio_fs_anal_t capabilities, bool b_any);
-
-  /*!
-    Like cdio_get_devices_with_cap but we return the driver we found
-    as well. This is because often one wants to search for kind of drive
-    and then *open* it afterwards. Giving the driver back facilitates this,
-    and speeds things up for libcdio as well.
-  */
-  char ** cdio_get_devices_with_cap_ret (/*in*/ char* ppsz_search_devices[],
-					 cdio_fs_anal_t capabilities, 
-					 bool b_any,
-					 /*out*/ driver_id_t *p_driver_id);
-
-  /*! Like cdio_get_devices, but we may change the p_driver_id if we
-      were given DRIVER_DEVICE or DRIVER_UNKNOWN. This is because
-      often one wants to get a drive name and then *open* it
-      afterwards. Giving the driver back facilitates this, and speeds
-      things up for libcdio as well.
-   */
-    
-  char ** cdio_get_devices_ret (/*in/out*/ driver_id_t *p_driver_id);
-
-  /*!
-    Get the what kind of device we've got.
-
-    @param p_cdio the CD object queried
-    @param p_read_cap pointer to return read capabilities
-    @param p_write_cap pointer to return write capabilities
-    @param p_misc_cap pointer to return miscellaneous other capabilities
-
-    In some situations of drivers or OS's we can't find a CD device if
-    there is no media in it. In this situation capabilities will show up as 
-    NULL even though there isa hardware CD-ROM.
-  */
-  void cdio_get_drive_cap (const CdIo_t *p_cdio,
-			   cdio_drive_read_cap_t  *p_read_cap,
-			   cdio_drive_write_cap_t *p_write_cap,
-			   cdio_drive_misc_cap_t  *p_misc_cap);
-  
-  /*!
-    Get the drive capabilities for a specified device.
-
-    Return a list of device capabilities.
-
-    In some situations of drivers or OS's we can't find a CD device if
-    there is no media in it. In this situation capabilities will show up as 
-    NULL even though there isa hardware CD-ROM.
-  */
-  void cdio_get_drive_cap_dev (const char *device,
-			       cdio_drive_read_cap_t  *p_read_cap,
-			       cdio_drive_write_cap_t *p_write_cap,
-			       cdio_drive_misc_cap_t  *p_misc_cap);
-
-  /*!
-    Get a string containing the name of the driver in use.
-
-    @return a string with driver name or NULL if CdIo_t is NULL (we
-    haven't initialized a specific device.
-  */
-  const char * cdio_get_driver_name (const CdIo_t *p_cdio);
-
-  /*!
-    Get the driver id. 
-    if CdIo_t is NULL (we haven't initialized a specific device driver), 
-    then return DRIVER_UNKNOWN.
-
-    @return the driver id..
-  */
-  driver_id_t cdio_get_driver_id (const CdIo_t *p_cdio);
-
-  /*! 
-    Get the CD-ROM hardware info via a SCSI MMC INQUIRY command.
-    False is returned if we had an error getting the information.
-  */
-  bool cdio_get_hwinfo ( const CdIo_t *p_cdio, 
-			 /*out*/ cdio_hwinfo_t *p_hw_info );
-
-
-  /*! Get the LSN of the first track of the last session of
-    on the CD.
-
-    @param p_cdio the CD object to be acted upon.
-    @param i_last_session pointer to the session number to be returned.
-  */
-  driver_return_code_t cdio_get_last_session (CdIo_t *p_cdio,
-					      /*out*/ lsn_t *i_last_session);
-
-  /*! 
-      Find out if media has changed since the last call.
-      @param p_cdio the CD object to be acted upon.
-      @return 1 if media has changed since last call, 0 if not. Error
-      return codes are the same as driver_return_code_t
-   */
-  int cdio_get_media_changed(CdIo_t *p_cdio);
-
-  /*! True if CD-ROM understand ATAPI commands. */
-  bool_3way_t cdio_have_atapi (CdIo_t *p_cdio);
-
-  /*! Like cdio_have_xxx but uses an enumeration instead. */
-  bool cdio_have_driver (driver_id_t driver_id);
-  
-  /*
-    Free any resources associated with p_cdio. Call this when done using p_cdio
-    and using CD reading/control operations.
-
-    @param p_cdio the CD object to eliminated.
-   */
-  void cdio_destroy (CdIo_t *p_cdio);
-
-  /*! 
-    Get a string decribing driver_id. 
-
-    @param driver_id the driver you want the description for
-    @return a string of driver description
-  */
-  const char *cdio_driver_describe (driver_id_t driver_id);
-  
-  /*! Sets up to read from place specified by psz_source and
-     driver_id. This or cdio_open_* should be called before using any
-     other routine, except cdio_init or any routine that accesses the
-     CD-ROM drive by name. cdio_open will call cdio_init, if that hasn't
-     been done previously.
-
-     @return the cdio object or NULL on error or no device.  If NULL
-     is given as the source, we'll use the default driver device.
-  */
-  CdIo_t * cdio_open (const char *psz_source, driver_id_t driver_id);
-
-  /*! Sets up to read from place specified by psz_source, driver_id
-     and access mode. This or cdio_open* should be called before using
-     any other routine, except cdio_init or any routine that accesses
-     the CD-ROM drive by name. This will call cdio_init, if that
-     hasn't been done previously.
-
-     If NULL is given as the source, we'll use the default driver device.
-
-     @return the cdio object or NULL on error or no device.
-  */
-  CdIo_t * cdio_open_am (const char *psz_source, 
-			 driver_id_t driver_id, const char *psz_access_mode);
-
-  /*! Set up BIN/CUE CD disk-image for reading. Source is the .bin or 
-      .cue file
-
-     @return the cdio object or NULL on error or no device.
-   */
-  CdIo_t * cdio_open_bincue (const char *psz_cue_name);
-  
-  /*! Set up BIN/CUE CD disk-image for reading. Source is the .bin or 
-      .cue file
-
-     @return the cdio object or NULL on error or no device..
-   */
-  CdIo_t * cdio_open_am_bincue (const char *psz_cue_name, 
-				const char *psz_access_mode);
-  
-  /*! Set up cdrdao CD disk-image for reading. Source is the .toc file
-
-     @return the cdio object or NULL on error or no device.
-   */
-  CdIo_t * cdio_open_cdrdao (const char *psz_toc_name);
-  
-  /*! Set up cdrdao CD disk-image for reading. Source is the .toc file
-
-     @return the cdio object or NULL on error or no device..
-   */
-  CdIo_t * cdio_open_am_cdrdao (const char *psz_toc_name, 
-				const char *psz_access_mode);
-  
-  /*! Return a string containing the default CUE file that would
-      be used when none is specified.
-
-     @return the cdio object or NULL on error or no device.
-   */
-  char * cdio_get_default_device_bincue(void);
-
-  char **cdio_get_devices_bincue(void);
-
-  /*! @return string containing the default CUE file that would be
-      used when none is specified. NULL is returned on error or there
-      is no device.
-   */
-  char * cdio_get_default_device_cdrdao(void);
-
-  char **cdio_get_devices_cdrdao(void);
-
-  /*! Set up CD-ROM for reading. The device_name is
-      the some sort of device name.
-
-     @return the cdio object for subsequent operations. 
-     NULL on error or there is no driver for a some sort of hardware CD-ROM.
-   */
-  CdIo_t * cdio_open_cd (const char *device_name);
-
-  /*! Set up CD-ROM for reading. The device_name is
-      the some sort of device name.
-
-     @return the cdio object for subsequent operations. 
-     NULL on error or there is no driver for a some sort of hardware CD-ROM.
-   */
-  CdIo_t * cdio_open_am_cd (const char *psz_device,
-			    const char *psz_access_mode);
-
-  /*! CDRWIN BIN/CUE CD disc-image routines. Source is the .cue file
-
-     @return the cdio object for subsequent operations. 
-     NULL on error.
-   */
-  CdIo_t * cdio_open_cue (const char *cue_name);
-
-  /*! Set up CD-ROM for reading using the AIX driver. The device_name is
-      the some sort of device name.
-
-     @return the cdio object for subsequent operations. 
-     NULL on error or there is no AIX driver.
-
-     @see cdio_open
-   */
-  CdIo_t * cdio_open_am_aix (const char *psz_source,
-			     const char *psz_access_mode);
-  
-  /*! Set up CD-ROM for reading using the AIX driver. The device_name is
-      the some sort of device name.
-
-     @return the cdio object for subsequent operations. 
-     NULL on error or there is no AIX driver.
-
-     @see cdio_open
-   */
-  CdIo_t * cdio_open_aix (const char *psz_source);
-  
-  /*! Return a string containing the default device name that the 
-      AIX driver would use when none is specified.
-
-     @return the cdio object for subsequent operations. 
-     NULL on error or there is no AIX driver.
-
-     @see cdio_open_cd, cdio_open
-   */
-  char * cdio_get_default_device_aix(void);
-
-  /*! Return a list of all of the CD-ROM devices that the AIX driver
-      can find.
-
-      In some situations of drivers or OS's we can't find a CD device if
-      there is no media in it and it is possible for this routine to return
-      NULL even though there may be a hardware CD-ROM.
-   */
-  char **cdio_get_devices_aix(void);
-  
-  /*! Set up CD-ROM for reading using the BSDI driver. The device_name is
-      the some sort of device name.
-
-     @param psz_source the name of the device to open
-     @return the cdio object for subsequent operations. 
-     NULL on error or there is no BSDI driver.
-
-     @see cdio_open
-   */
-  CdIo_t * cdio_open_bsdi (const char *psz_source);
-  
-  /*! Set up CD-ROM for reading using the BSDI driver. The device_name is
-      the some sort of device name.
-
-     @return the cdio object for subsequent operations. 
-     NULL on error or there is no BSDI driver.
-
-     @see cdio_open
-   */
-  CdIo_t * cdio_open_am_bsdi (const char *psz_source,
-			      const char *psz_access_mode);
-  
-  /*! Return a string containing the default device name that the 
-      BSDI driver would use when none is specified.
-
-     @return the cdio object for subsequent operations. 
-     NULL on error or there is no BSDI driver.
-
-     @see cdio_open_cd, cdio_open
-   */
-  char * cdio_get_default_device_bsdi(void);
-
-  /*! Return a list of all of the CD-ROM devices that the BSDI driver
-      can find.
-
-      In some situations of drivers or OS's we can't find a CD device if
-      there is no media in it and it is possible for this routine to return
-      NULL even though there may be a hardware CD-ROM.
-   */
-  char **cdio_get_devices_bsdi(void);
-  
-  /*! Set up CD-ROM for reading using the FreeBSD driver. The device_name is
-      the some sort of device name.
-
-     NULL is returned on error or there is no FreeBSD driver.
-
-     @see cdio_open_cd, cdio_open
-   */
-  CdIo_t * cdio_open_freebsd (const char *paz_psz_source);
-  
-  /*! Set up CD-ROM for reading using the FreeBSD driver. The device_name is
-      the some sort of device name.
-
-     NULL is returned on error or there is no FreeBSD driver.
-
-     @see cdio_open_cd, cdio_open
-   */
-  CdIo_t * cdio_open_am_freebsd (const char *psz_source,
-				 const char *psz_access_mode);
-  
-  /*! Return a string containing the default device name that the 
-      FreeBSD driver would use when none is specified.
-
-     NULL is returned on error or there is no CD-ROM device.
-   */
-  char * cdio_get_default_device_freebsd(void);
-
-  /*! Return a list of all of the CD-ROM devices that the FreeBSD driver
-      can find.
-   */
-  char **cdio_get_devices_freebsd(void);
-  
-  /*! Set up CD-ROM for reading using the GNU/Linux driver. The device_name is
-      the some sort of device name.
-
-     @return the cdio object for subsequent operations. 
-     NULL on error or there is no GNU/Linux driver.
-
-     In some situations of drivers or OS's we can't find a CD device if
-     there is no media in it and it is possible for this routine to return
-     NULL even though there may be a hardware CD-ROM.
-   */
-  CdIo_t * cdio_open_linux (const char *psz_source);
-
-  /*! Set up CD-ROM for reading using the GNU/Linux driver. The
-      device_name is the some sort of device name.
-
-     @return the cdio object for subsequent operations. 
-     NULL on error or there is no GNU/Linux driver.
-   */
-  CdIo_t * cdio_open_am_linux (const char *psz_source,
-			       const char *access_mode);
-
-  /*! Return a string containing the default device name that the 
-      GNU/Linux driver would use when none is specified. A scan is made
-      for CD-ROM drives with CDs in them.
-
-     NULL is returned on error or there is no CD-ROM device.
-
-     In some situations of drivers or OS's we can't find a CD device if
-     there is no media in it and it is possible for this routine to return
-     NULL even though there may be a hardware CD-ROM.
-
-     @see cdio_open_cd, cdio_open
-   */
-  char * cdio_get_default_device_linux(void);
-
-  /*! Return a list of all of the CD-ROM devices that the GNU/Linux driver
-      can find.
-   */
-  char **cdio_get_devices_linux(void);
-  
-  /*! Set up CD-ROM for reading using the Sun Solaris driver. The
-      device_name is the some sort of device name.
-
-     @return the cdio object for subsequent operations. 
-     NULL on error or there is no Solaris driver.
-   */
-  CdIo_t * cdio_open_solaris (const char *psz_source);
-  
-  /*! Set up CD-ROM for reading using the Sun Solaris driver. The
-      device_name is the some sort of device name.
-
-     @return the cdio object for subsequent operations. 
-     NULL on error or there is no Solaris driver.
-   */
-  CdIo_t * cdio_open_am_solaris (const char *psz_source, 
-				 const char *psz_access_mode);
-  
-  /*! Return a string containing the default device name that the 
-      Solaris driver would use when none is specified. A scan is made
-      for CD-ROM drives with CDs in them.
-
-     NULL is returned on error or there is no CD-ROM device.
-
-     In some situations of drivers or OS's we can't find a CD device if
-     there is no media in it and it is possible for this routine to return
-     NULL even though there may be a hardware CD-ROM.
-
-     @see cdio_open_cd, cdio_open
-   */
-  char * cdio_get_default_device_solaris(void);
-  
-  /*! Return a list of all of the CD-ROM devices that the Solaris driver
-      can find.
-   */
-  char **cdio_get_devices_solaris(void);
-  
-  /*! Set up CD-ROM for reading using the Apple OSX driver. The
-      device_name is the some sort of device name.
-
-     NULL is returned on error or there is no OSX driver.
-
-     In some situations of drivers or OS's we can't find a CD device if
-     there is no media in it and it is possible for this routine to return
-     NULL even though there may be a hardware CD-ROM.
-
-     @see cdio_open_cd, cdio_open
-   */
-  CdIo_t * cdio_open_osx (const char *psz_source);
-
-  /*! Set up CD-ROM for reading using the Apple OSX driver. The
-      device_name is the some sort of device name.
-
-     NULL is returned on error or there is no OSX driver.
-
-     @see cdio_open_cd, cdio_open
-   */
-  CdIo_t * cdio_open_am_osx (const char *psz_source,
-			     const char *psz_access_mode);
-
-  /*! Return a string containing the default device name that the 
-      OSX driver would use when none is specified. A scan is made
-      for CD-ROM drives with CDs in them.
-
-     In some situations of drivers or OS's we can't find a CD device if
-     there is no media in it and it is possible for this routine to return
-     NULL even though there may be a hardware CD-ROM.
-   */
-  char * cdio_get_default_device_osx(void);
-  
-  /*! Return a list of all of the CD-ROM devices that the OSX driver
-      can find.
-   */
-  char **cdio_get_devices_osx(void);
-  
-  /*! Set up CD-ROM for reading using the Microsoft Windows driver. The
-      device_name is the some sort of device name.
-
-     In some situations of drivers or OS's we can't find a CD device if
-     there is no media in it and it is possible for this routine to return
-     NULL even though there may be a hardware CD-ROM.
-   */
-  CdIo_t * cdio_open_win32 (const char *psz_source);
-  
-  /*! Set up CD-ROM for reading using the Microsoft Windows driver. The
-      device_name is the some sort of device name.
-
-     NULL is returned on error or there is no Microsof Windows driver.
-   */
-  CdIo_t * cdio_open_am_win32 (const char *psz_source,
-			       const char *psz_access_mode);
-  
-  /*! Return a string containing the default device name that the 
-      Win32 driver would use when none is specified. A scan is made
-      for CD-ROM drives with CDs in them.
-
-     In some situations of drivers or OS's we can't find a CD device if
-     there is no media in it and it is possible for this routine to return
-     NULL even though there may be a hardware CD-ROM.
-
-     @see cdio_open_cd, cdio_open
-   */
-  char * cdio_get_default_device_win32(void);
-
-  char **cdio_get_devices_win32(void);
-  
-  /*! Set up CD-ROM for reading using the IBM OS/2 driver. The
-      device_name is the some sort of device name.
-
-     NULL is returned on error or there is no OS/2 driver.
-
-     In some situations of drivers or OS's we can't find a CD device if
-     there is no media in it and it is possible for this routine to return
-     NULL even though there may be a hardware CD-ROM.
-
-     @see cdio_open_cd, cdio_open
-   */
-  CdIo_t * cdio_open_os2 (const char *psz_source);
-
-  /*! Set up CD-ROM for reading using the IBM OS/2 driver. The
-      device_name is the some sort of device name.
-
-     NULL is returned on error or there is no OS/2 driver.
-
-     @see cdio_open_cd, cdio_open
-   */
-  CdIo_t * cdio_open_am_os2 (const char *psz_source,
-                            const char *psz_access_mode);
-
-  /*! Return a string containing the default device name that the
-      OS/2 driver would use when none is specified. A scan is made
-      for CD-ROM drives with CDs in them.
-
-     In some situations of drivers or OS's we can't find a CD device if
-     there is no media in it and it is possible for this routine to return
-     NULL even though there may be a hardware CD-ROM.
-   */
-  char * cdio_get_default_device_os2(void);
-
-  /*! Return a list of all of the CD-ROM devices that the OS/2 driver
-      can find.
-   */
-  char **cdio_get_devices_os2(void);
-
-  /*! Set up CD-ROM for reading using the Nero driver. The
-      device_name is the some sort of device name.
-
-     @return true on success; NULL on error or there is no Nero driver. 
-   */
-  CdIo_t * cdio_open_nrg (const char *psz_source);
-  
-  /*! Set up CD-ROM for reading using the Nero driver. The
-      device_name is the some sort of device name.
-
-     @return true on success; NULL on error or there is no Nero driver. 
-   */
-  CdIo_t * cdio_open_am_nrg (const char *psz_source,
-			     const char *psz_access_mode);
-  
-  /*! Get a string containing the default device name that the NRG
-      driver would use when none is specified. A scan is made for NRG
-      disk images in the current directory.
-
-      @return string containing the default device. NULL on error or
-      there is no CD-ROM device.
-   */
-  char * cdio_get_default_device_nrg(void);
-
-  char **cdio_get_devices_nrg(void);
-
-  /*! 
-
-    Determine if bin_name is the bin file part of  a CDRWIN CD disk image.
-
-    @param bin_name location of presumed CDRWIN bin image file.
-    @return the corresponding CUE file if bin_name is a BIN file or
-    NULL if not a BIN file.
-  */
-  char *cdio_is_binfile(const char *bin_name);
-  
-  /*! 
-    Determine if cue_name is the cue sheet for a CDRWIN CD disk image.
-
-    @return corresponding BIN file if cue_name is a CDRWIN cue file or
-    NULL if not a CUE file.
-  */
-  char *cdio_is_cuefile(const char *cue_name);
-  
-  /*! 
-    Determine if psg_nrg is a Nero CD disc image.
-
-    @param psz_nrg location of presumed NRG image file.
-    @return true if psz_nrg is a Nero NRG image or false
-    if not a NRG image.
-  */
-  bool cdio_is_nrg(const char *psz_nrg);
-  
-  /*! 
-    Determine if psz_toc is a TOC file for a cdrdao CD disc image.
-
-    @param psz_toc location of presumed TOC image file.
-    @return true if toc_name is a cdrdao TOC file or false
-    if not a TOC file.
-  */
-  bool cdio_is_tocfile(const char *psz_toc);
-  
-  /*! 
-    Determine if psz_source refers to a real hardware CD-ROM.
-
-    @param psz_source location name of object
-    @param driver_id   driver for reading object. Use DRIVER_UNKNOWN if you
-    don't know what driver to use.
-    @return true if psz_source is a device; If false is returned we
-    could have a CD disk image. 
-  */
-  bool cdio_is_device(const char *psz_source, driver_id_t driver_id);
-
-  /*!
-    Set the blocksize for subsequent reads. 
-  */
-  driver_return_code_t cdio_set_blocksize ( const CdIo_t *p_cdio, 
-					    int i_blocksize );
-
-  /*!
-    Set the drive speed. 
-
-    @param p_cdio          CD structure set by cdio_open().
-    @param i_drive_speed   speed in CD-ROM speed units. Note this
-                           not Kbs as would be used in the MMC spec or
-		           in mmc_set_speed(). To convert CD-ROM speed units 
-			   to Kbs, multiply the number by 176 (for raw data)
-			   and by 150 (for filesystem data). On many CD-ROM 
-			   drives, specifying a value too large will result 
-			   in using the fastest speed.
-
-      @see mmc_set_speed and mmc_set_drive_speed
-  */
-  driver_return_code_t cdio_set_speed ( const CdIo_t *p_cdio, 
-					int i_drive_speed );
-
-  /*!
-    Get the value associatied with key. 
-
-    @param p_cdio the CD object queried
-    @param key the key to retrieve
-    @return the value associatd with "key" or NULL if p_cdio is NULL
-    or "key" does not exist.
-  */
-  const char * cdio_get_arg (const CdIo_t *p_cdio,  const char key[]);
-
-  /*!
-    Set the arg "key" with "value" in "p_cdio".
-
-    @param p_cdio the CD object to set
-    @param key the key to set
-    @param value the value to assocaiate with key
-  */
-  driver_return_code_t cdio_set_arg (CdIo_t *p_cdio, const char key[], 
-				     const char value[]);
-  
-  /*!
-    Initialize CD Reading and control routines. Should be called first.
-  */
-  bool cdio_init(void);
-  
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-/** The below variables are trickery to force the above enum symbol
-    values to be recorded in debug symbol tables. They are used to
-    allow one to refer to the enumeration value names in the typedefs
-    above in a debugger and debugger expressions.
-*/
-extern cdio_drive_cap_misc_t          debug_cdio_drive_cap_misc;
-extern cdio_drive_cap_read_t          debug_cdio_drive_cap_read_t;
-extern cdio_drive_cap_write_t         debug_drive_cap_write_t;
-extern cdio_mmc_hw_len_t              debug_cdio_mmc_hw_len;
-extern cdio_src_category_mask_t       debug_cdio_src_category_mask;
-
-#endif /* __CDIO_DEVICE_H__ */
diff --git a/lib-x86-64/include/cdio/disc.h b/lib-x86-64/include/cdio/disc.h
deleted file mode 100644
index b5ae3c49..00000000
--- a/lib-x86-64/include/cdio/disc.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* -*- c -*-
-    $Id: disc.h,v 1.9 2008/03/25 15:59:09 karl Exp $
-
-    Copyright (C) 2004, 2005, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-/** \file disc.h 
- *  \brief  The top-level header for disc-related libcdio calls.
- */
-#ifndef __CDIO_DISC_H__
-#define __CDIO_DISC_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-  /*! disc modes. The first combined from MMC-3 5.29.2.8 (Send CUESHEET)
-    and GNU/Linux /usr/include/linux/cdrom.h and we've added DVD.
-  */
-  typedef enum {
-    CDIO_DISC_MODE_CD_DA,	    /**< CD-DA */
-    CDIO_DISC_MODE_CD_DATA,	    /**< CD-ROM form 1 */
-    CDIO_DISC_MODE_CD_XA,	    /**< CD-ROM XA form2 */
-    CDIO_DISC_MODE_CD_MIXED,	    /**< Some combo of above. */
-    CDIO_DISC_MODE_DVD_ROM,         /**< DVD ROM (e.g. movies) */
-    CDIO_DISC_MODE_DVD_RAM,         /**< DVD-RAM */
-    CDIO_DISC_MODE_DVD_R,           /**< DVD-R */
-    CDIO_DISC_MODE_DVD_RW,          /**< DVD-RW */
-    CDIO_DISC_MODE_DVD_PR,          /**< DVD+R */
-    CDIO_DISC_MODE_DVD_PRW,         /**< DVD+RW */
-    CDIO_DISC_MODE_DVD_OTHER,       /**< Unknown/unclassified DVD type */
-    CDIO_DISC_MODE_NO_INFO,
-    CDIO_DISC_MODE_ERROR,
-    CDIO_DISC_MODE_CD_I	        /**< CD-i. */
-  } discmode_t;
-
-  extern const char *discmode2str[];
-  
-  /*! 
-    Get disc mode - the kind of CD (CD-DA, CD-ROM mode 1, CD-MIXED, etc.
-    that we've got. The notion of "CD" is extended a little to include
-    DVD's.
-  */
-  discmode_t cdio_get_discmode (CdIo_t *p_cdio);
-
-  /*!  
-    Get the lsn of the end of the CD
-
-    @return the lsn. On error 0 or CDIO_INVALD_LSN.
-  */
-  lsn_t cdio_get_disc_last_lsn(const CdIo_t *p_cdio);
-  
-  /*!  
-    Return the Joliet level recognized for p_cdio.
-  */
-  uint8_t cdio_get_joliet_level(const CdIo_t *p_cdio);
-
-  /*!
-    Get the media catalog number (MCN) from the CD.
-
-    @return the media catalog number or NULL if there is none or we
-    don't have the ability to get it.
-
-    Note: string is malloc'd so caller has to free() the returned
-    string when done with it.
-
-  */
-  char * cdio_get_mcn (const CdIo_t *p_cdio);
-
-  /*!
-    Get the number of tracks on the CD.
-
-    @return the number of tracks, or CDIO_INVALID_TRACK if there is
-    an error.
-  */
-  track_t cdio_get_num_tracks (const CdIo_t *p_cdio);
-  
-  /*! 
-    Return true if discmode is some sort of CD.
-  */
-  bool cdio_is_discmode_cdrom (discmode_t discmode);
-  
-  /*! 
-    Return true if discmode is some sort of DVD.
-  */
-  bool cdio_is_discmode_dvd (discmode_t discmode);
-  
-  /*! cdio_stat_size is deprecated. @see cdio_get_disc_last_lsn  */
-#define cdio_stat_size cdio_get_disc_last_lsn
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __CDIO_DISC_H__ */
diff --git a/lib-x86-64/include/cdio/ds.h b/lib-x86-64/include/cdio/ds.h
deleted file mode 100644
index 447e30df..00000000
--- a/lib-x86-64/include/cdio/ds.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-    $Id: ds.h,v 1.5 2008/03/25 15:59:09 karl Exp $
-
-    Copyright (C) 2005, 2008 Rocky Bernstein <rocky@gnu.org>
-    Copyright (C) 2000, 2004 Herbert Valerio Riedel <hvr@gnu.org>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-/** \file ds.h 
- *  \brief  The top-level header for list-related data structures.
-
-    Note: this header will is slated to get removed and libcdio will use 
-    glib.h routines instead. 
-*/
-
-
-#ifndef __CDIO_DS_H__
-#define __CDIO_DS_H__
-
-#include <cdio/types.h>
-
-/** opaque types... */
-typedef struct _CdioList CdioList_t;
-typedef struct _CdioListNode CdioListNode_t;
-
-typedef int (*_cdio_list_cmp_func_t) (void *p_data1, void *p_data2);
-typedef int (*_cdio_list_iterfunc_t) (void *p_data, void *p_user_data);
-
-/** The below are given compatibility with old code. Please use
-    the above type names, not these. */
-#define CdioList CdioList_t
-#define CdioListNode CdioListNode_t
-#define _cdio_list_cmp_func _cdio_list_cmp_func_t
-#define _cdio_list_iterfunc _cdio_list_iterfunc_t
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/** methods */
-CdioList_t *_cdio_list_new (void);
-
-void _cdio_list_free (CdioList_t *p_list, int free_data);
-
-unsigned _cdio_list_length (const CdioList_t *list);
-
-void _cdio_list_prepend (CdioList_t *p_list, void *p_data);
-
-void _cdio_list_append (CdioList_t *p_list, void *p_data);
-
-void _cdio_list_foreach (CdioList_t *p_list, _cdio_list_iterfunc_t func, 
-                         void *p_user_data);
-
-CdioListNode_t *_cdio_list_find (CdioList_t *p_list, 
-                                 _cdio_list_iterfunc_t cmp_func, 
-                                 void *p_user_data);
-
-#define _CDIO_LIST_FOREACH(node, list) \
- for (node = _cdio_list_begin (list); node; node = _cdio_list_node_next (node))
-
-/** node operations */
-
-CdioListNode_t *_cdio_list_begin (const CdioList_t *p_list);
-
-CdioListNode_t *_cdio_list_end (CdioList_t *p_list);
-
-CdioListNode_t *_cdio_list_node_next (CdioListNode_t *p_node);
-
-void _cdio_list_node_free (CdioListNode_t *p_node, int i_free_data);
-
-void *_cdio_list_node_data (CdioListNode_t *p_node);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __CDIO_DS_H__ */
-
-/* 
- * Local variables:
- *  c-file-style: "gnu"
- *  tab-width: 8
- *  indent-tabs-mode: nil
- * End:
- */
-
diff --git a/lib-x86-64/include/cdio/dvd.h b/lib-x86-64/include/cdio/dvd.h
deleted file mode 100644
index 8be8317b..00000000
--- a/lib-x86-64/include/cdio/dvd.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-    $Id: dvd.h,v 1.5 2008/03/25 15:59:09 karl Exp $
-
-    Copyright (C) 2004 Rocky Bernstein <rocky@gnu.org>
-    Modeled after GNU/Linux definitions in linux/cdrom.h
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-/*!
-   \file dvd.h 
-   \brief Definitions for DVD access.
-*/
-
-#ifndef __CDIO_DVD_H__
-#define __CDIO_DVD_H__
-
-#include <cdio/types.h>
-
-/*! Values used in a READ DVD STRUCTURE */
-
-#define CDIO_DVD_STRUCT_PHYSICAL	0x00
-#define CDIO_DVD_STRUCT_COPYRIGHT	0x01
-#define CDIO_DVD_STRUCT_DISCKEY	        0x02
-#define CDIO_DVD_STRUCT_BCA		0x03
-#define CDIO_DVD_STRUCT_MANUFACT	0x04
-
-/*! Media definitions for "Book Type" */
-#define CDIO_DVD_BOOK_DVD_ROM 0
-#define CDIO_DVD_BOOK_DVD_RAM 1
-#define CDIO_DVD_BOOK_DVD_R   2 /**< DVD-R  */
-#define CDIO_DVD_BOOK_DVD_RW  3 /**< DVD-RW */
-#define CDIO_DVD_BOOK_DVD_PR  8 /**< DVD+R  */
-#define CDIO_DVD_BOOK_DVD_PRW 9 /**< DVD+RW */
-
-typedef struct cdio_dvd_layer {
-  uint8_t book_version	: 4;
-  uint8_t book_type	: 4;
-  uint8_t min_rate	: 4;
-  uint8_t disc_size	: 4;
-  uint8_t layer_type	: 4;
-  uint8_t track_path	: 1;
-  uint8_t nlayers	: 2;
-  uint8_t track_density	: 4;
-  uint8_t linear_density: 4;
-  uint8_t bca		: 1;
-  uint32_t start_sector;
-  uint32_t end_sector;
-  uint32_t end_sector_l0;
-} cdio_dvd_layer_t;
-
-/*! Maximum number of layers in a DVD.  */
-#define CDIO_DVD_MAX_LAYERS	4
-
-typedef struct cdio_dvd_physical {
-  uint8_t type;
-  uint8_t layer_num;
-  cdio_dvd_layer_t layer[CDIO_DVD_MAX_LAYERS];
-} cdio_dvd_physical_t;
-
-typedef struct cdio_dvd_copyright {
-  uint8_t type;
-  
-  uint8_t layer_num;
-  uint8_t cpst;
-  uint8_t rmi;
-} cdio_dvd_copyright_t;
-
-typedef struct cdio_dvd_disckey {
-  uint8_t type;
-  
-  unsigned agid	: 2;
-  uint8_t value[2048];
-} cdio_dvd_disckey_t;
-
-typedef struct cdio_dvd_bca {
-  uint8_t type;
-  
-  int len;
-  uint8_t value[188];
-} cdio_dvd_bca_t;
-
-typedef struct cdio_dvd_manufact {
-  uint8_t type;
-  
-  uint8_t layer_num;
-  int len;
-  uint8_t value[2048];
-} cdio_dvd_manufact_t;
-
-typedef union {
-  uint8_t type;
-  
-  cdio_dvd_physical_t	physical;
-  cdio_dvd_copyright_t	copyright;
-  cdio_dvd_disckey_t	disckey;
-  cdio_dvd_bca_t	bca;
-  cdio_dvd_manufact_t	manufact;
-} cdio_dvd_struct_t;
-
-#endif /* __SCSI_MMC_H__ */
diff --git a/lib-x86-64/include/cdio/ecma_167.h b/lib-x86-64/include/cdio/ecma_167.h
deleted file mode 100644
index 78da7ae0..00000000
--- a/lib-x86-64/include/cdio/ecma_167.h
+++ /dev/null
@@ -1,1006 +0,0 @@
-/* 
-    Copyright (c) 2005, 2006, 2008 Rocky Bernstein <rocky@cpan.org>
-    Copyright (c) 2001-2002  Ben Fennema <bfennema@falcon.csc.calpoly.edu>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-/*
- * Some portions taken from FreeBSD ecma167-udf.h which states:
- * Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org>
- * All rights reserved.
- *
- * 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 AUTHOR 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 AUTHOR 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.
- */
-
-/*!
- * \file ecma_167.h
- *
- * \brief Definitions based on ECMA-167 3rd edition (June 1997)
- * See http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-167.pdf
-*/
-
-#ifndef _ECMA_167_H
-#define _ECMA_167_H 1
-
-#include <cdio/types.h>
-
-/**
-   Imagine the below enum values as \#define'd values rather than
-   distinct values of an enum.
-*/
-typedef enum {
-  VSD_STD_ID_SIZE    =	  5, /** Volume Structure Descriptor (ECMA 167r3 
-				2/9.1) */
-  UDF_REGID_ID_SIZE  =	 23, /**< See identifier (ECMA 167r3 1/7.4) */
-  UDF_VOLID_SIZE     =   32,
-  UDF_FID_SIZE	     =   38,
-  UDF_VOLSET_ID_SIZE =  128
-} ecma_167_enum1_t ;
-
-/** Tag Identifier (ECMA 167r3 3/7.2.1) */
-
-typedef enum {
-  TAGID_PRI_VOL          = 0x0001,
-  TAGID_ANCHOR           = 0x0002,
-  TAGID_VOL              = 0x0003,
-  TAGID_IMP_VOL          = 0x0004,
-  TAGID_PARTITION        = 0x0005,
-  TAGID_LOGVOL           = 0x0006,
-  TAGID_UNALLOC_SPACE    = 0x0007,
-  TAGID_TERM             = 0x0008,
-  TAGID_LOGVOL_INTEGRITY = 0x0009,
-  TAGID_FSD		 = 0x0100,
-  TAGID_FID		 = 0x0101,
-  TAGID_AED		 = 0x0102,
-  TAGID_IE		 = 0x0103,
-  TAGID_TE		 = 0x0104,
-  TAGID_FILE_ENTRY	 = 0x0105,
-  TAGID_EAHD		 = 0x0106,
-  TAGID_USE		 = 0x0107,
-  TAGID_SBD		 = 0x0108,
-  TAGID_PIE		 = 0x0109,
-  TAGID_EFE		 = 0x010A,
-} tag_id_t ;
-
-/** Character Set Type (ECMA 167r3 1/7.2.1.1) */
-typedef enum {
-  CHARSPEC_TYPE_CS0 = 0x00,	/**< Section 1/7.2.2 */
-  CHARSPEC_TYPE_CS1 = 0x01,	/**< Section 1/7.2.3 */
-  CHARSPEC_TYPE_CS2 = 0x02,	/**< Section 1/7.2.4 */
-  CHARSPEC_TYPE_CS3 = 0x03,	/**< Section 1/7.2.5 */
-  CHARSPEC_TYPE_CS4 = 0x04,	/**< Section 1/7.2.6 */
-  CHARSPEC_TYPE_CS5 = 0x05,	/**< Section 1/7.2.7 */
-  CHARSPEC_TYPE_CS6 = 0x06,	/**< Section 1/7.2.8 */
-  CHARSPEC_TYPE_CS7 = 0x07,	/**< Section 1/7.2.9 */
-
-  CHARSPEC_TYPE_CS8 = 0x08,	/**< Section 1/7.2.10 */
-} udf_charspec_enum_t;
-  
-typedef uint8_t  udf_Uint8_t;  /*! Section 1/7/1.1 */
-typedef uint16_t udf_Uint16_t; /*! Section 1/7.1.3 */
-typedef uint32_t udf_Uint32_t; /*! Section 1/7.1.5 */
-typedef uint64_t udf_Uint64_t; /*! Section 1/7.1.7 */
-typedef char	 udf_dstring;  /*! Section 1/7.1.12 */
-
-#define UDF_LENGTH_MASK 0x3fffffff
-
-PRAGMA_BEGIN_PACKED
-
-/** Character set specification (ECMA 167r3 1/7.2.1) */
-struct udf_charspec_s
-{
-  udf_Uint8_t	charset_type;
-  udf_Uint8_t	charset_info[63];
-} GNUC_PACKED;
-
-typedef struct udf_charspec_s udf_charspec_t;
-
-/** Timestamp (ECMA 167r3 1/7.3) */
-struct udf_timestamp_s
-{
-  udf_Uint16_t		type_tz;
-  udf_Uint16_t		year;
-  udf_Uint8_t		month;
-  udf_Uint8_t		day;
-  udf_Uint8_t		hour;
-  udf_Uint8_t		minute;
-  udf_Uint8_t		second;
-  udf_Uint8_t		centiseconds;
-  udf_Uint8_t		hundreds_of_microseconds;
-  udf_Uint8_t		microseconds;
-} GNUC_PACKED;
-
-typedef struct udf_timestamp_s udf_timestamp_t;
-
-/** Type and Time Zone (ECMA 167r3 1/7.3.1) 
-
-    Imagine the below enum values as \#define'd values rather than
-    distinct values of an enum.
-*/
-typedef enum { 
-  TIMESTAMP_TYPE_CUT        =	0x0000,
-  TIMESTAMP_TYPE_LOCAL      =	0x1000,
-  TIMESTAMP_TYPE_AGREEMENT  =	0x2000,
-  TIMESTAMP_TYPE_MASK       =   0xF000,
-  TIMESTAMP_TIMEZONE_MASK   =	0x0FFF,
-} ecma_167_timezone_enum_t ;
-
-
-#define TIMESTAMP_TYPE_MASK		0xF000
-#define TIMESTAMP_TYPE_CUT		0x0000
-#define TIMESTAMP_TYPE_LOCAL		0x1000
-#define TIMESTAMP_TYPE_AGREEMENT	0x2000
-#define TIMESTAMP_TIMEZONE_MASK		0x0FFF
-
-struct udf_id_suffix_s
-{
-  udf_Uint16_t  udf_revision;
-  udf_Uint8_t   os_class;
-  udf_Uint8_t   os_identifier;
-  udf_Uint8_t   reserved[4];
-} GNUC_PACKED;
-
-typedef struct udf_id_suffix_s udf_id_suffix_t;
-
-/** Entity identifier (ECMA 167r3 1/7.4) */
-struct udf_regid_s
-{
-  udf_Uint8_t		flags;
-  udf_Uint8_t		id[UDF_REGID_ID_SIZE];
-  udf_id_suffix_t	id_suffix;
-} GNUC_PACKED;
-
-typedef struct udf_regid_s udf_regid_t;
-
-/** Flags (ECMA 167r3 1/7.4.1) */
-#define ENTITYID_FLAGS_DIRTY		0x00
-#define ENTITYID_FLAGS_PROTECTED	0x01
-
-/** Volume Structure Descriptor (ECMA 167r3 2/9.1) */
-struct vol_struct_desc_s
-{
-  udf_Uint8_t		struct_type;
-  udf_Uint8_t		std_id[VSD_STD_ID_SIZE];
-  udf_Uint8_t		struct_version;
-  udf_Uint8_t		struct_data[2041];
-} GNUC_PACKED;
-
-/** Standard Identifier (EMCA 167r2 2/9.1.2) */
-#define VSD_STD_ID_NSR02		"NSR02"	/* (3/9.1) */
-
-/** Standard Identifier (ECMA 167r3 2/9.1.2) */
-
-/* The below const definitions are to faciltate debugging of the
-   values #define'd below. */
-extern const char VSD_STD_ID_BEA01[sizeof("BEA01")-1];
-extern const char VSD_STD_ID_BOOT2[sizeof("BOOT2")-1];
-extern const char VSD_STD_ID_CD001[sizeof("CD001")-1];
-extern const char VSD_STD_ID_CDW01[sizeof("CDW02")-1];
-extern const char VSD_STD_ID_NSR03[sizeof("NSR03")-1];
-extern const char VSD_STD_ID_TEA01[sizeof("TEA01")-1];
-
-#define VSD_STD_ID_BEA01		"BEA01"	/**< ECMA-167 2/9.2 */
-#define VSD_STD_ID_BOOT2		"BOOT2"	/**< ECMA-167 2/9.4 */
-#define VSD_STD_ID_CD001		"CD001"	/**< ECMA-119 */
-#define VSD_STD_ID_CDW02		"CDW02"	/**< ECMA-168 */
-#define VSD_STD_ID_NSR02                "NSR02" /**< ECMA-167, 3/9.1 
-					       NOTE: ECMA-167, 2nd edition */
-#define VSD_STD_ID_NSR03		"NSR03"	/**< ECMA-167 3/9.1 */
-#define VSD_STD_ID_TEA01		"TEA01"	/**< ECMA-168 2/9.3 */
-
-/** Beginning Extended Area Descriptor (ECMA 167r3 2/9.2) */
-struct beginning_extended_area_desc_s
-{
-  udf_Uint8_t		struct_type;
-  udf_Uint8_t		std_id[VSD_STD_ID_SIZE];
-  udf_Uint8_t		struct_version;
-  udf_Uint8_t		struct_data[2041];
-} GNUC_PACKED;
-
-/** Terminating Extended Area Descriptor (ECMA 167r3 2/9.3) */
-struct terminating_extended_area_desc_s
-{
-  udf_Uint8_t		struct_type;
-  udf_Uint8_t		std_id[VSD_STD_ID_SIZE];
-  udf_Uint8_t		struct_version;
-  udf_Uint8_t		struct_data[2041];
-} GNUC_PACKED;
-
-/** Boot Descriptor (ECMA 167r3 2/9.4) */
-struct boot_desc_s
-{
-  udf_Uint8_t		struct_type;
-  udf_Uint8_t		std_ident[VSD_STD_ID_SIZE];
-  udf_Uint8_t		struct_version;
-  udf_Uint8_t		reserved1;
-  udf_regid_t		arch_type;
-  udf_regid_t		boot_ident;
-  udf_Uint32_t		bool_ext_location;
-  udf_Uint32_t		bool_ext_length;
-  udf_Uint64_t		load_address;
-  udf_Uint64_t		start_address;
-  udf_timestamp_t	desc_creation_time;
-  udf_Uint16_t		flags;
-  udf_Uint8_t		reserved2[32];
-  udf_Uint8_t		boot_use[1906];
-} GNUC_PACKED;
-
-/** Flags (ECMA 167r3 2/9.4.12) */
-#define BOOT_FLAGS_ERASE		0x01
-
-/** Extent Descriptor (ECMA 167r3 3/7.1) */
-struct udf_extent_ad_s
-{
-  udf_Uint32_t		len;
-  udf_Uint32_t		loc;
-} GNUC_PACKED;
-
-typedef struct udf_extent_ad_s udf_extent_ad_t;
-
-/** Descriptor Tag (ECMA 167r3 3/7.2) */
-struct udf_tag_s
-{
-  udf_Uint16_t		id;
-  udf_Uint16_t		desc_version;
-  udf_Uint8_t		cksum;
-  udf_Uint8_t		reserved;
-  udf_Uint16_t		i_serial;
-  udf_Uint16_t		desc_CRC;
-  udf_Uint16_t		desc_CRC_len;
-  udf_Uint32_t		loc;
-} GNUC_PACKED;
-
-typedef struct udf_tag_s udf_tag_t;
-
-/** NSR Descriptor (ECMA 167r3 3/9.1) */
-struct NSR_desc_s
-{
-  udf_Uint8_t	struct_type;
-  udf_Uint8_t	std_id[VSD_STD_ID_SIZE];
-  udf_Uint8_t	struct_version;
-  udf_Uint8_t	reserved;
-  udf_Uint8_t	struct_data[2040];
-} GNUC_PACKED;
-
-/** Primary Volume Descriptor (ECMA 167r3 3/10.1) */
-struct udf_pvd_s
-{
-  udf_tag_t	  tag;
-  udf_Uint32_t	  vol_desc_seq_num;
-  udf_Uint32_t	  primary_vol_desc_num;
-  udf_dstring	  vol_ident[UDF_VOLID_SIZE];
-  udf_Uint16_t	  vol_seq_num;
-  udf_Uint16_t	  max_vol_seqnum;
-  udf_Uint16_t	  interchange_lvl;
-  udf_Uint16_t	  max_interchange_lvl;
-  udf_Uint32_t	  charset_list;
-  udf_Uint32_t	  max_charset_list;
-  udf_dstring	  volset_id[UDF_VOLSET_ID_SIZE];
-  udf_charspec_t  desc_charset;
-  udf_charspec_t  explanatory_charset;
-  udf_extent_ad_t vol_abstract;
-  udf_extent_ad_t vol_copyright;
-  udf_regid_t	  app_ident;
-  udf_timestamp_t recording_time;
-  udf_regid_t	  imp_ident;
-  udf_Uint8_t	  imp_use[64];
-  udf_Uint32_t	  predecessor_vol_desc_seq_location;
-  udf_Uint16_t	  flags;
-  udf_Uint8_t	  reserved[22];
-} GNUC_PACKED;
-
-typedef struct udf_pvd_s udf_pvd_t;
-
-/** Flags (ECMA 167r3 3/10.1.21) */
-#define PVD_FLAGS_VSID_COMMON		0x0001
-
-/** Anchor Volume Descriptor Pointer (ECMA 167r3 3/10.2) */
-struct anchor_vol_desc_ptr_s
-{
-  udf_tag_t	  tag;
-  udf_extent_ad_t main_vol_desc_seq_ext;
-  udf_extent_ad_t reserve_vol_desc_seq_ext;
-  udf_Uint8_t	  reserved[480];
-} GNUC_PACKED;
-
-typedef struct anchor_vol_desc_ptr_s anchor_vol_desc_ptr_t;
-
-/** Volume Descriptor Pointer (ECMA 167r3 3/10.3) */
-struct vol_desc_ptr_s
-{
-  udf_tag_t	  tag;
-  udf_Uint32_t	  vol_desc_seq_num;
-  udf_extent_ad_t next_vol_desc_set_ext;
-  udf_Uint8_t	  reserved[484];
-} GNUC_PACKED;
-
-/** Implementation Use Volume Descriptor (ECMA 167r3 3/10.4) */
-struct imp_use_vol_desc_s
-{
-  udf_tag_t    tag;
-  udf_Uint32_t vol_desc_seq_num;
-  udf_regid_t  imp_id;
-  udf_Uint8_t  imp_use[460];
-} GNUC_PACKED;
-
-/** Partition Descriptor (ECMA 167r3 3/10.5) */
-struct partition_desc_s
-{
-  udf_tag_t     tag;
-  udf_Uint32_t	vol_desc_seq_num;
-  udf_Uint16_t	flags;
-  udf_Uint16_t	number;             /**< Partition number */
-  udf_regid_t	contents;
-  udf_Uint8_t	contents_use[128];
-  udf_Uint32_t	access_type;
-  udf_Uint32_t	start_loc;
-  udf_Uint32_t	part_len;
-  udf_regid_t	imp_id;
-  udf_Uint8_t	imp_use[128];
-  udf_Uint8_t	reserved[156];
-} GNUC_PACKED;
-
-typedef struct partition_desc_s partition_desc_t;
-
-/** Partition Flags (ECMA 167r3 3/10.5.3) */
-#define PD_PARTITION_FLAGS_ALLOC	0x0001
-
-/** Partition Contents (ECMA 167r2 3/10.5.3) */
-#define PD_PARTITION_CONTENTS_NSR02	"+NSR02"
-
-/** Partition Contents (ECMA 167r3 3/10.5.5) */
-#define PD_PARTITION_CONTENTS_FDC01	"+FDC01"
-#define PD_PARTITION_CONTENTS_CD001	"+CD001"
-#define PD_PARTITION_CONTENTS_CDW02	"+CDW02"
-#define PD_PARTITION_CONTENTS_NSR03	"+NSR03"
-
-/** Access Type (ECMA 167r3 3/10.5.7) */
-#define PD_ACCESS_TYPE_NONE		0x00000000
-#define PD_ACCESS_TYPE_READ_ONLY	0x00000001
-#define PD_ACCESS_TYPE_WRITE_ONCE	0x00000002
-#define PD_ACCESS_TYPE_REWRITABLE	0x00000003
-#define PD_ACCESS_TYPE_OVERWRITABLE	0x00000004
-
-/** Recorded Address (ECMA 167r3 4/7.1) */
-struct udf_lb_addr_s
-{
-  udf_Uint32_t	lba;
-  udf_Uint16_t	partitionReferenceNum;
-} GNUC_PACKED;
-
-typedef struct udf_lb_addr_s udf_lb_addr_t;
-
-/** Short Allocation Descriptor (ECMA 167r3 4/14.14.1) */
-struct udf_short_ad_s
-{
-  udf_Uint32_t	len;
-  udf_Uint32_t	pos;
-} GNUC_PACKED;
-
-typedef struct udf_short_ad_s udf_short_ad_t;
-
-/** Long Allocation Descriptor (ECMA 167r3 4/14.14.2) */
-struct udf_long_ad_s
-{
-  udf_Uint32_t	len;
-  udf_lb_addr_t	loc;
-  udf_Uint8_t	imp_use[6];
-} GNUC_PACKED;
-
-typedef struct udf_long_ad_s udf_long_ad_t;
-
-/** Logical Volume Descriptor (ECMA 167r3 3/10.6) */
-struct logical_vol_desc_s
-{
-  udf_tag_t       tag;
-  udf_Uint32_t	  seq_num;
-  udf_charspec_t  desc_charset;
-  udf_dstring	  logvol_id[128];
-  udf_Uint32_t	  logical_blocksize;
-  udf_regid_t	  domain_id;
-  union {
-    udf_long_ad_t fsd_loc;
-    udf_Uint8_t	  logvol_content_use[16];
-  } lvd_use;
-  udf_Uint8_t	  logvol_contents_use[16];
-  udf_Uint32_t	  maptable_len;
-  udf_Uint32_t	  i_partition_maps;
-  udf_regid_t	  imp_id;
-  udf_Uint8_t	  imp_use[128];
-  udf_extent_ad_t integrity_seq_ext;
-  udf_Uint8_t	  partition_maps[0];
-} GNUC_PACKED;
-
-typedef struct logical_vol_desc_s logical_vol_desc_t;
-
-/** Generic Partition Map (ECMA 167r3 3/10.7.1) */
-struct generic_partition_map
-{
-  udf_Uint8_t	partition_map_type;
-  udf_Uint8_t	partition_map_length;
-  udf_Uint8_t	partition_mapping[0];
-} GNUC_PACKED;
-
-/** Partition Map Type (ECMA 167r3 3/10.7.1.1) */
-#define GP_PARTITION_MAP_TYPE_UNDEF	0x00
-#define GP_PARTIITON_MAP_TYPE_1		0x01
-#define GP_PARTITION_MAP_TYPE_2		0x02
-
-/** Type 1 Partition Map (ECMA 167r3 3/10.7.2) */
-struct generic_partition_map1
-{
-  udf_Uint8_t	partition_map_type;
-  udf_Uint8_t	partition_map_length;
-  udf_Uint16_t	vol_seq_num;
-  udf_Uint16_t	i_partition;
-} GNUC_PACKED;
-
-/** Type 2 Partition Map (ECMA 167r3 3/10.7.3) */
-struct generic_partition_map2
-{
-  udf_Uint8_t	partition_map_type;
-  udf_Uint8_t	partition_map_length; 
-  udf_Uint8_t	partition_id[62];
-} GNUC_PACKED;
-
-/** Unallocated Space Descriptor (ECMA 167r3 3/10.8) */
-struct unalloc_space_desc_s
-{
-  udf_tag_t       tag;
-  udf_Uint32_t	  vol_desc_seq_num;
-  udf_Uint32_t	  i_alloc_descs;
-  udf_extent_ad_t allocDescs[0];
-} GNUC_PACKED;
-
-/** Terminating Descriptor (ECMA 167r3 3/10.9) */
-struct terminating_desc_s
-{
-  udf_tag_t    tag;
-  udf_Uint8_t	reserved[496];
-} GNUC_PACKED;
-
-/** Logical Volume Integrity Descriptor (ECMA 167r3 3/10.10) */
-struct logvol_integrity_desc_s
-{
-  udf_tag_t       tag;
-  udf_timestamp_t recording_time;
-  udf_Uint32_t    integrity_type;
-  udf_extent_ad_t next_integrity_ext;
-  udf_Uint8_t     logvol_contents_use[32];
-  udf_Uint32_t    i_partitions;
-  udf_Uint32_t    imp_use_len;
-  udf_Uint32_t    freespace_table[0];
-  udf_Uint32_t    size_table[0];
-  udf_Uint8_t     imp_use[0];
-} GNUC_PACKED;
-
-/** Integrity Type (ECMA 167r3 3/10.10.3) */
-#define LVID_INTEGRITY_TYPE_OPEN	0x00000000
-#define LVID_INTEGRITY_TYPE_CLOSE	0x00000001
-
-/** Extended Allocation Descriptor (ECMA 167r3 4/14.14.3) */
-struct udf_ext_ad_s
-{
-  udf_Uint32_t	len;
-  udf_Uint32_t	recorded_len;
-  udf_Uint32_t	information_len;
-  udf_lb_addr_t	ext_loc;
-} GNUC_PACKED;
-
-typedef struct udf_ext_ad_s udf_ext_ad_t;
-
-/** Descriptor Tag (ECMA 167r3 4/7.2 - See 3/7.2) */
-
-/** Tag Identifier (ECMA 167r3 4/7.2.1) */
-
-/** File Set Descriptor (ECMA 167r3 4/14.1) */
-struct udf_fsd_s
-{
-  udf_tag_t       tag;
-  udf_timestamp_t recording_time;
-  udf_Uint16_t	  interchange_lvl;
-  udf_Uint16_t	  maxInterchange_lvl;
-  udf_Uint32_t	  charset_list;
-  udf_Uint32_t	  max_charset_list;
-  udf_Uint32_t	  fileset_num;
-  udf_Uint32_t	  udf_fsd_num;
-  udf_charspec_t  logical_vol_id_charset;
-  udf_dstring	  logical_vol_id[128];
-  udf_charspec_t  fileset_charset;
-  udf_dstring	  fileSet_id[32];
-  udf_dstring	  copyright_file_id[32];
-  udf_dstring	  abstract_file_id[32];
-  udf_long_ad_t	  root_icb;
-  udf_regid_t	  domain_id;
-  udf_long_ad_t	  next_ext;
-  udf_long_ad_t	  stream_directory_ICB;
-  udf_Uint8_t	  reserved[32];
-} GNUC_PACKED;
-
-typedef struct udf_fsd_s udf_fsd_t;
-
-/** Partition Header Descriptor (ECMA 167r3 4/14.3) */
-struct partition_header_desc_s
-{
-  udf_short_ad_t unalloc_space_table;
-  udf_short_ad_t unalloc_space_bitmap;
-  udf_short_ad_t partition_integrity_table;
-  udf_short_ad_t freed_space_table;
-  udf_short_ad_t freed_space_bitmap;
-  udf_Uint8_t	 reserved[88];
-} GNUC_PACKED;
-
-typedef struct partition_header_desc_s partition_header_desc_t;
-
-/** File Identifier Descriptor (ECMA 167r3 4/14.4) */
-struct udf_fileid_desc_s
-{
-  udf_tag_t     tag;
-  udf_Uint16_t	file_version_num;
-  udf_Uint8_t	file_characteristics;
-  udf_Uint8_t	i_file_id;
-  udf_long_ad_t	icb;
-  udf_Uint16_t	i_imp_use;
-  udf_Uint8_t	imp_use[0];
-  udf_Uint8_t	file_id[0];
-  udf_Uint8_t	padding[0];
-} GNUC_PACKED;
-
-typedef struct udf_fileid_desc_s udf_fileid_desc_t;
-
-/** File Characteristics (ECMA 167r3 4/14.4.3) 
-
-    Imagine the below enumeration values are \#defines to be used in a
-    bitmask rather than distinct values of an enum.
-*/
-typedef enum {
-  UDF_FILE_HIDDEN 	= (1 << 0),
-  UDF_FILE_DIRECTORY	= (1 << 1),
-  UDF_FILE_DELETED 	= (1 << 2),
-  UDF_FILE_PARENT 	= (1 << 3),
-  UDF_FILE_METADATA	= (1 << 4)
-} file_characteristics_t;
-
-/** Allocation Ext Descriptor (ECMA 167r3 4/14.5) */
-struct allocExtDesc
-{
-  udf_tag_t    tag;
-  udf_Uint32_t previous_alloc_ext_loc;
-  udf_Uint32_t i_alloc_descs;
-} GNUC_PACKED;
-
-/** ICB Tag (ECMA 167r3 4/14.6) */
-struct udf_icbtag_s
-{
-  udf_Uint32_t	prev_num_dirs;
-  udf_Uint16_t	strat_type;
-  udf_Uint16_t	strat_param;
-  udf_Uint16_t	max_num_entries;
-  udf_Uint8_t	reserved;
-  udf_Uint8_t	file_type;
-  udf_lb_addr_t	parent_ICB;
-  udf_Uint16_t	flags;
-} GNUC_PACKED;
-
-typedef struct udf_icbtag_s udf_icbtag_t;
-
-#define	UDF_ICB_TAG_FLAGS_SETUID	0x40
-#define	UDF_ICB_TAG_FLAGS_SETGID	0x80
-#define	UDF_ICB_TAG_FLAGS_STICKY	0x100
-
-/** Strategy Type (ECMA 167r3 4/14.6.2) which helpfully points
-    largely to 4/A.x */
-#define ICBTAG_STRATEGY_TYPE_UNDEF 0x0000 
-#define ICBTAG_STRATEGY_TYPE_1	   0x0001 /**< 4/A.2 Direct entries Uint16 */
-#define ICBTAG_STRATEGY_TYPE_2	   0x0002 /**< 4/A.3 List of ICB direct entries */
-#define ICBTAG_STRATEGY_TYPE_3	   0x0003 /**< 4/A.4 */
-#define ICBTAG_STRATEGY_TYPE_4	   0x0004 /**< 4/A.5 Hierarchy having one
-					   single ICB with one direct entry.
-					   This is what's most often used.
-					  */
-
-/** File Type (ECMA 167r3 4/14.6.6) 
-
-   Imagine the below enum values as \#define'd values rather than
-   distinct values of an enum.
-*/
-typedef enum {
-  ICBTAG_FILE_TYPE_UNDEF =	0x00,
-  ICBTAG_FILE_TYPE_USE =	0x01,
-  ICBTAG_FILE_TYPE_PIE =	0x02,
-  ICBTAG_FILE_TYPE_IE =		0x03,
-  ICBTAG_FILE_TYPE_DIRECTORY =	0x04,
-  ICBTAG_FILE_TYPE_REGULAR =	0x05,
-  ICBTAG_FILE_TYPE_BLOCK =	0x06,
-  ICBTAG_FILE_TYPE_CHAR =	0x07,
-  ICBTAG_FILE_TYPE_EA =		0x08,
-  ICBTAG_FILE_TYPE_FIFO =	0x09,
-  ICBTAG_FILE_TYPE_SOCKET =	0x0A,
-  ICBTAG_FILE_TYPE_TE =		0x0B,
-  ICBTAG_FILE_TYPE_SYMLINK =	0x0C,
-  ICBTAG_FILE_TYPE_STREAMDIR =	0x0D
-} icbtag_file_type_enum_t;
-
-/** Flags (ECMA 167r3 4/14.6.8) */
-typedef enum {
-  ICBTAG_FLAG_AD_MASK        =	0x0007, /**< "&" this to get below address
-					     flags */
-  ICBTAG_FLAG_AD_SHORT       =	0x0000, /**< The allocation descriptor
-					     field is filled with
-					     short_ad's.  If the
-					     offset is beyond the
-					     current extent, look for
-					     the next extent. */
-  ICBTAG_FLAG_AD_LONG        =	0x0001, /**< The allocation descriptor
-					     field is filled with
-					     long_ad's If the offset
-					     is beyond the current
-					     extent, look for the next
-					     extent. */
-  ICBTAG_FLAG_AD_EXTENDED    =	0x0002,
-  ICBTAG_FLAG_AD_IN_ICB      =	0x0003, /**< This type means that the
-					     file *data* is stored in
-					     the allocation descriptor
-					     field of the file entry. */
-  ICBTAG_FLAG_SORTED         =	0x0008,
-  ICBTAG_FLAG_NONRELOCATABLE =	0x0010,
-  ICBTAG_FLAG_ARCHIVE        =	0x0020,
-  ICBTAG_FLAG_SETUID         =	0x0040,
-  ICBTAG_FLAG_SETGID         =	0x0080,
-  ICBTAG_FLAG_STICKY         =	0x0100,
-  ICBTAG_FLAG_CONTIGUOUS     =	0x0200,
-  ICBTAG_FLAG_SYSTEM         =	0x0400,
-  ICBTAG_FLAG_TRANSFORMED    =	0x0800,
-  ICBTAG_FLAG_MULTIVERSIONS  =	0x1000,
-  ICBTAG_FLAG_STREAM =		0x2000
-} icbtag_flag_enum_t;
-  
-/** Indirect Entry (ECMA 167r3 4/14.7) */
-struct indirect_entry_s
-{
-  udf_tag_t       tag;
-  udf_icbtag_t	  icb_tag;
-  udf_long_ad_t	  indirect_ICB;
-} GNUC_PACKED;
-
-/** Terminal Entry (ECMA 167r3 4/14.8) */
-struct terminal_entry_s
-{
-  udf_tag_t       tag;
-  udf_icbtag_t	  icb_tag;
-} GNUC_PACKED;
-
-/** File Entry (ECMA 167r3 4/14.9) */
-struct udf_file_entry_s
-{
-  udf_tag_t       tag;                   
-  udf_icbtag_t	  icb_tag;                /**< 4/14.9.2 */
-  udf_Uint32_t	  uid;                    /**< 4/14.9.3 */
-  udf_Uint32_t	  gid;                    /**< 4/14.9.4 */
-  udf_Uint32_t	  permissions;            /**< 4/14.9.5 */
-  udf_Uint16_t	  link_count;             /**< 4/14.9.6 */
-  udf_Uint8_t	  rec_format;             /**< 4/14.9.7 */ 
-  udf_Uint8_t	  rec_disp_attr;          /**< 4/14.9.8 */
-  udf_Uint32_t	  rec_len;                /**< 4/14.9.9 */
-  udf_Uint64_t	  info_len;               /**< 4/14.9.10 */
-  udf_Uint64_t	  logblks_recorded;       /**< 4/14.9.11 */
-  udf_timestamp_t access_time;            /**< 4/14.9.12 - last access to 
-					   any stream of file prior to 
-					   recording file entry */
-  udf_timestamp_t modification_time;      /**< 4/14.9.13 - last access to 
-					     modification to any stream of 
-					     file */
-  udf_timestamp_t attribute_time;
-  udf_Uint32_t	  checkpoint;
-  udf_long_ad_t	  ext_attr_ICB;
-  udf_regid_t	  imp_id;
-  udf_Uint64_t	  unique_ID;
-  udf_Uint32_t	  i_extended_attr;
-  udf_Uint32_t	  i_alloc_descs;
-  udf_Uint8_t	  ext_attr[0];
-  udf_Uint8_t	  alloc_descs[0];
-} GNUC_PACKED;
-
-typedef struct udf_file_entry_s udf_file_entry_t;
-
-#define	UDF_FENTRY_SIZE	176
-#define	UDF_FENTRY_PERM_USER_MASK	0x07
-#define	UDF_FENTRY_PERM_GRP_MASK	0xE0
-#define	UDF_FENTRY_PERM_OWNER_MASK	0x1C00
-
-/** Permissions (ECMA 167r3 4/14.9.5) */
-#define FE_PERM_O_EXEC			0x00000001U
-#define FE_PERM_O_WRITE			0x00000002U
-#define FE_PERM_O_READ			0x00000004U
-#define FE_PERM_O_CHATTR		0x00000008U
-#define FE_PERM_O_DELETE		0x00000010U
-#define FE_PERM_G_EXEC			0x00000020U
-#define FE_PERM_G_WRITE			0x00000040U
-#define FE_PERM_G_READ			0x00000080U
-#define FE_PERM_G_CHATTR		0x00000100U
-#define FE_PERM_G_DELETE		0x00000200U
-#define FE_PERM_U_EXEC			0x00000400U
-#define FE_PERM_U_WRITE			0x00000800U
-#define FE_PERM_U_READ			0x00001000U
-#define FE_PERM_U_CHATTR		0x00002000U
-#define FE_PERM_U_DELETE		0x00004000U
-
-/** Record Format (ECMA 167r3 4/14.9.7) */
-#define FE_RECORD_FMT_UNDEF		0x00
-#define FE_RECORD_FMT_FIXED_PAD		0x01
-#define FE_RECORD_FMT_FIXED		0x02
-#define FE_RECORD_FMT_VARIABLE8		0x03
-#define FE_RECORD_FMT_VARIABLE16	0x04
-#define FE_RECORD_FMT_VARIABLE16_MSB	0x05
-#define FE_RECORD_FMT_VARIABLE32	0x06
-#define FE_RECORD_FMT_PRINT		0x07
-#define FE_RECORD_FMT_LF		0x08
-#define FE_RECORD_FMT_CR		0x09
-#define FE_RECORD_FMT_CRLF		0x0A
-#define FE_RECORD_FMT_LFCR		0x0B
-
-/** Record Display Attributes (ECMA 167r3 4/14.9.8) */
-#define FE_RECORD_DISPLAY_ATTR_UNDEF	0x00
-#define FE_RECORD_DISPLAY_ATTR_1	0x01
-#define FE_RECORD_DISPLAY_ATTR_2	0x02
-#define FE_RECORD_DISPLAY_ATTR_3	0x03
-
-/** Extended Attribute Header Descriptor (ECMA 167r3 4/14.10.1) */
-struct extended_attr_header_desc_s
-{
-  udf_tag_t       tag;
-  udf_Uint32_t	  imp_attr_location;
-  udf_Uint32_t	  app_attr_location;
-} GNUC_PACKED;
-
-/** Generic Format (ECMA 167r3 4/14.10.2) */
-struct generic_format_s
-{
-  udf_Uint32_t	attr_type;
-  udf_Uint8_t	attr_subtype;
-  udf_Uint8_t	reserved[3];
-  udf_Uint32_t	attrLength;
-  udf_Uint8_t	attrData[0];
-} GNUC_PACKED;
-
-/** Character Set Information (ECMA 167r3 4/14.10.3) */
-struct charSet_info_s
-{
-  udf_Uint32_t	attr_type;
-  udf_Uint8_t	attr_subtype;
-  udf_Uint8_t	reserved[3];
-  udf_Uint32_t	attrLength;
-  udf_Uint32_t	escapeSeqLength;
-  udf_Uint8_t	charSetType;
-  udf_Uint8_t	escapeSeq[0];
-} GNUC_PACKED;
-
-/* Alternate Permissions (ECMA 167r3 4/14.10.4) */
-struct alt_perms_s
-{
-  udf_Uint32_t	attr_type;
-  udf_Uint8_t	attr_subtype;
-  udf_Uint8_t	reserved[3];
-  udf_Uint32_t	attrLength;
-  udf_Uint16_t	owner_id;
-  udf_Uint16_t	group_id;
-  udf_Uint16_t	permission;
-} GNUC_PACKED;
-
-/** File Times Extended Attribute (ECMA 167r3 4/14.10.5) */
-struct filetimes_ext_attr_s
-{
-  udf_Uint32_t	attr_type;
-  udf_Uint8_t	attr_subtype;
-  udf_Uint8_t	reserved[3];
-  udf_Uint32_t	attrLength;
-  udf_Uint32_t	dataLength;
-  udf_Uint32_t	fileTimeExistence;
-  udf_Uint8_t	fileTimes;
-} GNUC_PACKED;
-
-/** FileTimeExistence (ECMA 167r3 4/14.10.5.6) */
-#define FTE_CREATION			0x00000001
-#define FTE_DELETION			0x00000004
-#define FTE_EFFECTIVE			0x00000008
-#define FTE_BACKUP			0x00000002
-
-/** Information Times Extended Attribute (ECMA 167r3 4/14.10.6) */
-struct infoTimesExtAttr
-{
-  udf_Uint32_t	attr_type;
-  udf_Uint8_t	attr_subtype;
-  udf_Uint8_t	reserved[3];
-  udf_Uint32_t	attrLength;
-  udf_Uint32_t	dataLength;
-  udf_Uint32_t	infoTimeExistence;
-  udf_Uint8_t	infoTimes[0];
-} GNUC_PACKED;
-
-/** Device Specification (ECMA 167r3 4/14.10.7) */
-struct deviceSpec
-{
-  udf_Uint32_t	attr_type;
-  udf_Uint8_t	attr_subtype;
-  udf_Uint8_t	reserved[3];
-  udf_Uint32_t	attrLength;
-  udf_Uint32_t	imp_useLength;
-  udf_Uint32_t	majorDevice_id;
-  udf_Uint32_t	minorDevice_id;
-  udf_Uint8_t	imp_use[0];
-} GNUC_PACKED;
-
-/** Implementation Use Extended Attr (ECMA 167r3 4/14.10.8) */
-struct impUseExtAttr
-{
-  udf_Uint32_t	attr_type;
-  udf_Uint8_t	attr_subtype;
-  udf_Uint8_t	reserved[3];
-  udf_Uint32_t	attrLength;
-  udf_Uint32_t	imp_useLength;
-  udf_regid_t	imp_id;
-  udf_Uint8_t	imp_use[0];
-} GNUC_PACKED;
-
-/** Application Use Extended Attribute (ECMA 167r3 4/14.10.9) */
-struct appUseExtAttr
-{
-  udf_Uint32_t	attr_type;
-  udf_Uint8_t	attr_subtype;
-  udf_Uint8_t	reserved[3];
-  udf_Uint32_t	attrLength;
-  udf_Uint32_t	appUseLength;
-  udf_regid_t	app_id;
-  udf_Uint8_t	appUse[0];
-} GNUC_PACKED;
-
-#define EXTATTR_CHAR_SET		1
-#define EXTATTR_ALT_PERMS		3
-#define EXTATTR_FILE_TIMES		5
-#define EXTATTR_INFO_TIMES		6
-#define EXTATTR_DEV_SPEC		12
-#define EXTATTR_IMP_USE			2048
-#define EXTATTR_APP_USE			65536
-
-
-/** Unallocated Space Entry (ECMA 167r3 4/14.11) */
-struct unallocSpaceEntry
-{
-  udf_tag_t     tag;
-  udf_icbtag_t	icb_tag;
-  udf_Uint32_t	lengthAllocDescs;
-  udf_Uint8_t	allocDescs[0];
-} GNUC_PACKED;
-
-/** Space Bitmap Descriptor (ECMA 167r3 4/14.12) */
-struct spaceBitmapDesc
-{
-  udf_tag_t     tag;
-  udf_Uint32_t	i_bits;
-  udf_Uint32_t	i_bytes;
-  udf_Uint8_t	bitmap[0];
-} GNUC_PACKED;
-
-/** Partition Integrity Entry (ECMA 167r3 4/14.13) */
-struct partitionIntegrityEntry
-{
-  udf_tag_t       tag;
-  udf_icbtag_t	  icb_tag;
-  udf_timestamp_t recording_time;
-  udf_Uint8_t	  integrityType;
-  udf_Uint8_t	  reserved[175];
-  udf_regid_t	  imp_id;
-  udf_Uint8_t	  imp_use[256];
-} GNUC_PACKED;
-
-/** Short Allocation Descriptor (ECMA 167r3 4/14.14.1) */
-
-/** Extent Length (ECMA 167r3 4/14.14.1.1) */
-#define EXT_RECORDED_ALLOCATED		0x00000000
-#define EXT_NOT_RECORDED_ALLOCATED	0x40000000
-#define EXT_NOT_RECORDED_NOT_ALLOCATED	0x80000000
-#define EXT_NEXT_EXTENT_ALLOCDECS	0xC0000000
-
-/** Long Allocation Descriptor (ECMA 167r3 4/14.14.2) */
-
-/** Extended Allocation Descriptor (ECMA 167r3 4/14.14.3) */
-
-/** Logical Volume Header Descriptor (ECMA 167r3 4/14.15) */
-struct logical_vol_header_desc_s 
-{
-  udf_Uint64_t	uniqueID;
-  udf_Uint8_t	reserved[24];
-} GNUC_PACKED;
-
-typedef struct logical_vol_header_desc_s logical_vol_header_desc_t;
-
-/** Path Component (ECMA 167r3 4/14.16.1) */
-struct pathComponent
-{
-  udf_Uint8_t	component_type;
-  udf_Uint8_t	lengthComponent_id;
-  udf_Uint16_t	componentFileVersionNum;
-  udf_dstring	component_id[0];
-} GNUC_PACKED;
-
-/** File Entry (ECMA 167r3 4/14.17) */
-struct extended_file_entry
-{
-  udf_tag_t 	  tag;                     /**< 4/14.17.1 - id = 266  */
-  udf_icbtag_t    icb_tag;                 /**< 4/14.17.2  & 4/14.9.2 */
-  udf_Uint32_t    uid;                     /**< 4/14.17.3  & 4/14.9.3 */
-  udf_Uint32_t    gid;                     /**< 4/14.17.4  & 4/14.9.4 */
-  udf_Uint32_t    permissions;             /**< 4/14.17.5  & 4/14.9.5 */
-  udf_Uint16_t    link_count;              /**< 4/14.17.6  & 4/14.9.6 */
-  udf_Uint8_t     rec_format;              /**< 4/14.17.7  & 4/14.9.7 */
-  udf_Uint8_t     rec_display_attr;        /**< 4/14.17.8  & 4/14.9.8 */
-  udf_Uint32_t    record_len;              /**< 4/14.17.9  & 4/14.9.9 */
-  udf_Uint64_t    info_len;                /**< 4/14.17.10 & 4/14.9.10 */
-  udf_Uint64_t    object_size;             /**< 4/14.17.11 */
-  udf_Uint64_t    logblks_recorded;        /**< 4/14.17.12 & 4/14.9.11 */
-  udf_timestamp_t access_time;             /**< 4/14.17.13 & 4/14.9.12 - last 
-					      access to any stream of file */
-  udf_timestamp_t modification_time;       /**< 4/14.17.14 & 4/14.9.13 - last
-					      modification to any stream of 
-					      file*/
-  udf_timestamp_t create_time;             /**< 4/14.17.15 */
-  udf_timestamp_t attribute_time;          /**< 4/14.17.16 & 4/14.9.14 - 
-					      most recent create or modify 
-					      time */
-  udf_Uint32_t    checkpoint;
-  udf_Uint32_t    reserved;                /**< #00 bytes */
-  udf_long_ad_t   ext_attr_ICB;
-  udf_long_ad_t   stream_directory_ICB;
-  udf_regid_t     imp_id;
-  udf_Uint64_t    unique_ID;
-  udf_Uint32_t    length_extended_attr;
-  udf_Uint32_t    length_alloc_descs;
-  udf_Uint8_t     ext_attr[0];
-  udf_Uint8_t     alloc_descs[0];
-} GNUC_PACKED;
-
-PRAGMA_END_PACKED
-
-/** The below variables are trickery to force the above enum symbol
-    values to be recorded in debug symbol tables. They are used to
-    allow one refer to the enumeration value names in the typedefs
-    above in a debugger and in debugger expressions.
-*/
-extern tag_id_t                 debug_tagid;
-extern file_characteristics_t   debug_file_characteristics;
-extern icbtag_file_type_enum_t  debug_icbtag_file_type_enum;
-extern icbtag_flag_enum_t       debug_flag_enum;
-extern ecma_167_enum1_t         debug_ecma_167_enum1;
-extern ecma_167_timezone_enum_t debug_ecma_167_timezone_enum;
-  
-#endif /* _ECMA_167_H */
diff --git a/lib-x86-64/include/cdio/iso9660.h b/lib-x86-64/include/cdio/iso9660.h
deleted file mode 100644
index a5311c8f..00000000
--- a/lib-x86-64/include/cdio/iso9660.h
+++ /dev/null
@@ -1,1116 +0,0 @@
-/*
-    $Id: iso9660.h,v 1.102 2008/07/16 00:28:54 rocky Exp $
-
-    Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008
-                  Rocky Bernstein <rocky@gnu.org>
-    Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
-
-    See also iso9660.h by Eric Youngdale (1993).
-
-    Copyright 1993 Yggdrasil Computing, Incorporated
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-/*!
- * \file iso9660.h 
- *
- * \brief The top-level interface header for libiso9660: the ISO-9660
- * filesystem library; applications include this.
- *
- * See also the ISO-9660 specification. The freely available European
- * equivalant standard is called ECMA-119.
-*/
-
-
-#ifndef __CDIO_ISO9660_H__
-#define __CDIO_ISO9660_H__
-
-#include <time.h>
-
-#include <cdio/cdio.h>
-#include <cdio/ds.h>
-#include <cdio/posix.h>
-
-/** \brief ISO 9660 Integer and Character types 
-
-These are described in the section 7 of the ISO 9660 (or ECMA 119)
-specification.
-*/
-
-typedef uint8_t  iso711_t; /*! See section 7.1.1 */
-typedef int8_t   iso712_t; /*! See section 7.1.2 */
-typedef uint16_t iso721_t; /*! See section 7.2.1 */
-typedef uint16_t iso722_t; /*! See section 7.2.2 */
-typedef uint32_t iso723_t; /*! See section 7.2.3 */
-typedef uint32_t iso731_t; /*! See section 7.3.1 */
-typedef uint32_t iso732_t; /*! See section 7.3.2 */
-typedef uint64_t iso733_t; /*! See section 7.3.3 */
-
-typedef char     achar_t;  /*! See section 7.4.1 */
-typedef char     dchar_t;  /*! See section 7.4.1 */
-
-#ifndef  EMPTY_ARRAY_SIZE
-#define EMPTY_ARRAY_SIZE 0
-#endif
-
-#include <cdio/types.h>
-#include <cdio/xa.h>
-
-#ifdef ISODCL
-#undef ISODCL
-#endif
-/* This part borrowed from the bsd386 isofs */
-#define	ISODCL(from, to)	((to) - (from) + 1)
-
-#define MIN_TRACK_SIZE 4*75
-#define MIN_ISO_SIZE MIN_TRACK_SIZE
-
-/*! The below isn't really an enumeration one would really use in a
-    program; things are done this way so that in a debugger one can to
-    refer to the enumeration value names such as in a debugger
-    expression and get something. With the more common a \#define
-    mechanism, the name/value assocation is lost at run time.
-  */
-extern enum iso_enum1_s {
-  ISO_PVD_SECTOR      =   16, /**< Sector of Primary Volume Descriptor. */
-  ISO_EVD_SECTOR      =   17, /**< Sector of End Volume Descriptor. */
-  LEN_ISONAME         =   31, /**< Size in bytes of the filename 
-                                 portion + null byte. */
-  ISO_MAX_SYSTEM_ID   =   32, /**< Maximum number of characters in a system 
-                                 id. */
-  MAX_ISONAME         =   37, /**< Size in bytes of the filename 
-                                 portion + null byte. */
-  ISO_MAX_PREPARER_ID =  128, /**< Maximum number of characters in a
-                                 preparer id. */
-  MAX_ISOPATHNAME     =  255, /**< Maximum number of characters in the
-                                 entire ISO 9660 filename. */
-  ISO_BLOCKSIZE       = 2048  /**< Number of bytes in an ISO 9660 block. */
-
-} iso_enums1;
-
-/*! An enumeration for some of the ISO_* \#defines below. This isn't
-    really an enumeration one would really use in a program it is here
-    to be helpful in debuggers where wants just to refer to the
-    ISO_*_ names and get something.
-  */
-
-/*! ISO 9660 directory flags. */
-extern enum iso_flag_enum_s {
-  ISO_FILE	      =   0,   /**<  Not really a flag...	         */
-  ISO_EXISTENCE	      =   1,   /**< Do not make existence known (hidden) */
-  ISO_DIRECTORY	      =   2,   /**< This file is a directory		 */
-  ISO_ASSOCIATED      =   4,   /**< This file is an associated file	 */
-  ISO_RECORD	      =   8,   /**< Record format in extended attr. != 0 */
-  ISO_PROTECTION      =  16,   /**< No read/execute perm. in ext. attr.  */
-  ISO_DRESERVED1      =  32,   /**<, Reserved bit 5			 */
-  ISO_DRESERVED2      =  64,   /**<, Reserved bit 6			 */
-  ISO_MULTIEXTENT     = 128,   /**< Not final entry of a mult. ext. file */
-} iso_flag_enums;
-
-/*! Volume descriptor types */
-extern enum iso_vd_enum_s {
-  ISO_VD_BOOT_RECORD   =  0,  /**< CD is bootable */
-  ISO_VD_PRIMARY       =  1,  /**< Is in any ISO-9660 */
-  ISO_VD_SUPPLEMENTARY =  2,  /**< Used by Joliet, for example */
-  ISO_VD_PARITION      =  3,  /**< Indicates a partition of a CD */
-  ISO_VD_END	       = 255
-} iso_vd_enums;
-
-  
-/*!
-   An ISO filename is: 
-   <em>abcd</em>.<em>eee</em> -> 
-   <em>filename</em>.<em>ext</em>;<em>version#</em>
-
-    For ISO-9660 Level 1, the maximum needed string length is:
-
-@code
-  	 30 chars (filename + ext)
-    +	  2 chars ('.' + ';')
-    +	  5 chars (strlen("32767"))
-    +	  1 null byte
-   ================================
-    =	 38 chars
-@endcode
-
-*/
-
-/*! \brief Maximum number of characters in a publisher id. */
-#define ISO_MAX_PUBLISHER_ID 128
-
-/*! \brief Maximum number of characters in an application id. */
-#define ISO_MAX_APPLICATION_ID 128
-
-/*! \brief Maximum number of characters in a volume id. */
-#define ISO_MAX_VOLUME_ID 32
-
-/*! \brief Maximum number of characters in a volume-set id. */
-#define ISO_MAX_VOLUMESET_ID 128
-
-/*! String inside frame which identifies an ISO 9660 filesystem. This
-    string is the "id" field of an iso9660_pvd_t or an iso9660_svd_t.
-*/
-extern const char ISO_STANDARD_ID[sizeof("CD001")-1];
-
-#define ISO_STANDARD_ID      "CD001" 
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-typedef enum strncpy_pad_check {
-  ISO9660_NOCHECK = 0,
-  ISO9660_7BIT,
-  ISO9660_ACHARS,
-  ISO9660_DCHARS
-} strncpy_pad_check_t;
-
-PRAGMA_BEGIN_PACKED
-
-/*! 
-  \brief ISO-9660 shorter-format time structure. See ECMA 9.1.5.
-  
-  @see iso9660_dtime
- */
-struct	iso9660_dtime_s {
-  iso711_t 	dt_year;   /**< Number of years since 1900 */
-  iso711_t 	dt_month;  /**< Has value in range 1..12. Note starts
-                              at 1, not 0 like a tm struct. */
-  iso711_t	dt_day;    /**< Day of the month from 1 to 31 */
-  iso711_t	dt_hour;   /**< Hour of the day from 0 to 23 */
-  iso711_t	dt_minute; /**< Minute of the hour from 0 to 59 */
-  iso711_t	dt_second; /**< Second of the minute from 0 to 59 */
-  iso712_t	dt_gmtoff; /**< GMT values -48 .. + 52 in 15 minute
-                              intervals */
-} GNUC_PACKED;
-
-typedef struct iso9660_dtime_s  iso9660_dtime_t;
-
-/*! 
-  \brief ISO-9660 longer-format time structure.
-
-  Section 8.4.26.1 of ECMA 119. All values are encoded as character
-  arrays, eg. '1', '9', '5', '5' for the year 1955 (no null terminated
-  byte).
-  
-  @see iso9660_ltime
- */
-struct	iso9660_ltime_s {
-  char	 lt_year	[ISODCL(   1,	4)];   /**< Add 1900 to value
-                                                    for the Julian
-                                                    year */
-  char	 lt_month	[ISODCL(   5,	6)];   /**< Has value in range
-                                                  1..12. Note starts
-                                                  at 1, not 0 like a
-                                                  tm struct. */
-  char	 lt_day		[ISODCL(   7,	8)];   /**< Day of month: 1..31 */
-  char	 lt_hour	[ISODCL(   9,	10)];  /**< hour: 0..23 */
-  char	 lt_minute	[ISODCL(  11,	12)];  /**< minute: 0..59 */
-  char	 lt_second	[ISODCL(  13,	14)];  /**< second: 0..59 */
-  char	 lt_hsecond	[ISODCL(  15,	16)];  /**< The value is in
-                                                  units of 1/100's of
-                                                  a second */
-  iso712_t lt_gmtoff;  /**< Offset from Greenwich Mean Time in number
-                          of 15 min intervals from -48 (West) to +52
-                          (East) recorded according to 7.1.2 numerical
-                          value */
-} GNUC_PACKED;
-
-typedef struct iso9660_ltime_s  iso9660_ltime_t;
-typedef struct iso9660_dir_s    iso9660_dir_t;
-typedef struct iso9660_stat_s   iso9660_stat_t;
-
-#include <cdio/rock.h>
-
-/*! \brief Format of an ISO-9660 directory record 
-
- Section 9.1 of ECMA 119.
-
- This structure may have an odd length depending on how many
- characters there are in the filename!  Some compilers (e.g. on
- Sun3/mc68020) pad the structures to an even length.  For this reason,
- we cannot use sizeof (struct iso_path_table) or sizeof (struct
- iso_directory_record) to compute on disk sizes.  Instead, we use
- offsetof(..., name) and add the name size.  See mkisofs.h of the 
- cdrtools package.
-
-  @see iso9660_stat
-*/
-struct iso9660_dir_s {
-  iso711_t         length;            /*! Length of Directory record (9.1.1) */
-  iso711_t         xa_length;         /*! XA length if XA is used. Otherwise
-                                          zero. (9.1.2)  */
-  iso733_t         extent;            /*! LBA of first local block allocated
-                                          to the extent */
-  iso733_t         size;              /*! data length of File Section. This 
-                                          does not include the length of 
-                                          any XA Records. (9.1.2) */
-  iso9660_dtime_t  recording_time;    /*! Recording date and time (9.1.3) */
-  uint8_t          file_flags;        /*! If no XA then zero. If a directory,
-                                        then bits 2,3 and 7 are zero. 
-                                        (9.1.6) */
-  iso711_t         file_unit_size;    /*! File Unit size for the File
-                                        Section if the File Section
-                                        is recorded in interleaved
-                                        mode. Otherwise zero. (9.1.7) */
-  iso711_t         interleave_gap;    /*! Interleave Gap size for the
-                                        File Section if the File
-                                        Section is interleaved. Otherwise
-                                        zero. (9.1.8) */
-  iso723_t volume_sequence_number;    /*! Ordinal number of the volume
-                                          in the Volume Set on which
-                                          the Extent described by this
-                                          Directory Record is
-                                          recorded. (9.1.9) */
-  iso711_t         filename_len;      /*! number of bytes in filename field */
-  char             filename[EMPTY_ARRAY_SIZE];
-} GNUC_PACKED;
-
-/*! 
-  \brief ISO-9660 Primary Volume Descriptor.
- */
-struct iso9660_pvd_s {
-  iso711_t         type;                         /**< ISO_VD_PRIMARY - 1 */
-  char             id[5];                        /**< ISO_STANDARD_ID "CD001"
-                                                  */
-  iso711_t         version;                      /**< value 1 for ECMA 119 */
-  char             unused1[1];                   /**< unused - value 0 */
-  achar_t          system_id[ISO_MAX_SYSTEM_ID]; /**< each char is an achar */
-  dchar_t          volume_id[ISO_MAX_VOLUME_ID]; /**< each char is a dchar */
-  uint8_t          unused2[8];                   /**< unused - value 0 */
-  iso733_t         volume_space_size;            /**< total number of 
-                                                    sectors */
-  uint8_t          unused3[32];                  /**< unused - value 0 */
-  iso723_t         volume_set_size;              /**< often 1 */
-  iso723_t         volume_sequence_number;       /**< often 1 */
-  iso723_t         logical_block_size;           /**< sector size, e.g. 2048 */
-  iso733_t         path_table_size;              /**< bytes in path table */
-  iso731_t         type_l_path_table;            /**< first sector of L Path
-                                                      Table */
-  iso731_t         opt_type_l_path_table;        /**< first sector of optional
-                                                    L Path Table */
-  iso732_t         type_m_path_table;            /**< first sector of M Path
-                                                    table */
-  iso732_t         opt_type_m_path_table;        /**< first sector of optional
-                                                    M Path table */
-  iso9660_dir_t    root_directory_record;        /**< See 8.4.18 and 
-                                                    section 9.1 of
-                                                    ISO 9660 spec. */
-  char             root_directory_filename;      /**< Is '\\0' or root
-                                                  directory. Also pads previous
-                                                  field to 34 bytes */
-  dchar_t          volume_set_id[ISO_MAX_VOLUMESET_ID]; /**< Volume Set of 
-                                                           which the volume is
-                                                           a member. See 
-                                                        section 8.4.19 */
-  achar_t          publisher_id[ISO_MAX_PUBLISHER_ID];  /**< Publisher of
-                                                         volume. If the first
-                                                         character is '_' 0x5F,
-                                                         the remaining bytes
-                                                         specify a file 
-                                                         containing the user.
-                                                         If all bytes are " "
-                                                         (0x20) no publisher 
-                                                         is specified. See 
-                                                         section 8.4.20 of
-                                                         ECMA 119 */
-  achar_t          preparer_id[ISO_MAX_PREPARER_ID]; /**< preparer of
-                                                         volume. If the first
-                                                         character is '_' 0x5F,
-                                                         the remaining bytes
-                                                         specify a file 
-                                                         containing the user.
-                                                         If all bytes are " "
-                                                         (0x20) no preparer 
-                                                         is specified. 
-                                                         See section 8.4.21 
-                                                         of ECMA 119 */
-  achar_t          application_id[ISO_MAX_APPLICATION_ID]; /**< application
-                                                         use to create the
-                                                         volume. If the first
-                                                         character is '_' 0x5F,
-                                                         the remaining bytes
-                                                         specify a file 
-                                                         containing the user.
-                                                         If all bytes are " "
-                                                         (0x20) no application 
-                                                         is specified.
-                                                         See section of 8.4.22 
-                                                         of ECMA 119 */
-  dchar_t          copyright_file_id[37];     /**< Name of file for
-                                                 copyright info. If
-                                                 all bytes are " "
-                                                 (0x20), then no file
-                                                 is identified.  See
-                                                 section 8.4.23 of ECMA 119
-                                                 9660 spec. */
-  dchar_t          abstract_file_id[37];      /**< See section 8.4.24 of 
-                                                 ECMA 119. */
-  dchar_t          bibliographic_file_id[37]; /**< See section 7.5 of 
-                                                 ISO 9660 spec. */
-  iso9660_ltime_t  creation_date;             /**< date and time of volume
-                                                 creation. See section 8.4.26.1
-                                                 of the ISO 9660 spec. */
-  iso9660_ltime_t  modification_date;         /**< date and time of the most
-                                                 recent modification.
-                                                 See section 8.4.27 of the
-                                                 ISO 9660 spec. */
-  iso9660_ltime_t  expiration_date;           /**< date and time when volume
-                                                 expires. See section 8.4.28
-                                                 of the ISO 9660 spec. */
-  iso9660_ltime_t  effective_date;            /**< date and time when volume
-                                                 is effective. See section 
-                                                 8.4.29 of the ISO 9660 
-                                                 spec. */
-  iso711_t         file_structure_version;    /**< value 1 for ECMA 119 */
-  uint8_t           unused4[1];                /**< unused - value 0 */
-  char             application_data[512];     /**< Application can put 
-                                                 whatever it wants here. */
-  uint8_t          unused5[653];              /**< Unused - value 0 */
-} GNUC_PACKED;
-
-typedef struct iso9660_pvd_s  iso9660_pvd_t;
-
-/*! 
-  \brief ISO-9660 Supplementary Volume Descriptor. 
-
-  This is used for Joliet Extentions and is almost the same as the
-  the primary descriptor but two unused fields, "unused1" and "unused3
-  become "flags and "escape_sequences" respectively.
-*/
-struct iso9660_svd_s {
-  iso711_t         type;                         /**< ISO_VD_SUPPLEMENTARY - 2 
-                                                  */
-  char             id[5];                        /**< ISO_STANDARD_ID "CD001" 
-                                                  */
-  iso711_t         version;                      /**< value 1 */
-  char             flags;			 /**< Section 8.5.3 */
-  achar_t          system_id[ISO_MAX_SYSTEM_ID]; /**< Section 8.5.4; each char 
-                                                    is an achar */
-  dchar_t          volume_id[ISO_MAX_VOLUME_ID]; /**< Section 8.5.5; each char
-                                                    is a dchar */
-  char             unused2[8];
-  iso733_t         volume_space_size;            /**< total number of 
-                                                    sectors */
-  char             escape_sequences[32];         /**< Section 8.5.6 */
-  iso723_t         volume_set_size;              /**< often 1 */
-  iso723_t         volume_sequence_number;       /**< often 1 */
-  iso723_t         logical_block_size;           /**< sector size, e.g. 2048 */
-  iso733_t         path_table_size;              /**< 8.5.7; bytes in path 
-                                                    table */
-  iso731_t         type_l_path_table;            /**< 8.5.8; first sector of 
-                                                    little-endian path table */
-  iso731_t         opt_type_l_path_table;        /**< 8.5.9; first sector of 
-                                                    optional little-endian 
-                                                    path table */
-  iso732_t         type_m_path_table;            /**< 8.5.10; first sector of 
-                                                    big-endian path table */
-  iso732_t         opt_type_m_path_table;        /**< 8.5.11; first sector of 
-                                                    optional big-endian path 
-                                                    table */
-  iso9660_dir_t    root_directory_record;        /**< See section 8.5.12 and
-                                                    9.1 of ISO 9660 spec. */
-  char             root_directory_filename;      /**< Is '\\0' or root
-                                                  directory. Also pads previous
-                                                  field to 34 bytes */
-  dchar_t          volume_set_id[ISO_MAX_VOLUMESET_ID];    /**< 8.5.13; 
-                                                              dchars */
-  achar_t          publisher_id[ISO_MAX_PUBLISHER_ID]; /**< 
-                                                          Publisher of volume.
-                                                          If the first char-
-                                                          aracter is '_' 0x5F,
-                                                          the remaining bytes
-                                                          specify a file 
-                                                          containing the user.
-                                                          If all bytes are " "
-                                                          (0x20) no publisher 
-                                                          is specified. See 
-                                                          section 8.5.14 of
-                                                          ECMA 119 */
-  achar_t          preparer_id[ISO_MAX_PREPARER_ID]; /**< 
-                                                        Data preparer of
-                                                        volume. If the first
-                                                        character is '_' 0x5F,
-                                                        the remaining bytes
-                                                        specify a file 
-                                                        containing the user.
-                                                        If all bytes are " "
-                                                        (0x20) no preparer 
-                                                        is specified. 
-                                                        See section 8.5.15
-                                                        of ECMA 119 */
-  achar_t          application_id[ISO_MAX_APPLICATION_ID]; /**< application
-                                                         use to create the
-                                                         volume. If the first
-                                                         character is '_' 0x5F,
-                                                         the remaining bytes
-                                                         specify a file 
-                                                         containing the user.
-                                                         If all bytes are " "
-                                                         (0x20) no application 
-                                                         is specified.
-                                                         See section of 8.5.16
-                                                         of ECMA 119 */
-  dchar_t          copyright_file_id[37];     /**< Name of file for
-                                                 copyright info. If
-                                                 all bytes are " "
-                                                 (0x20), then no file
-                                                 is identified.  See
-                                                 section 8.5.17 of ECMA 119
-                                                 9660 spec. */
-  dchar_t          abstract_file_id[37];      /**< See section 8.5.18 of 
-                                                 ECMA 119. */
-  dchar_t          bibliographic_file_id[37]; /**< See section 8.5.19 of 
-                                                 ECMA 119. */
-  iso9660_ltime_t  creation_date;             /**< date and time of volume
-                                                 creation. See section 8.4.26.1
-                                                 of the ECMA 119 spec. */
-  iso9660_ltime_t  modification_date;         /**< date and time of the most
-                                                 recent modification.
-                                                 See section 8.4.27 of the
-                                                 ECMA 119 spec. */
-  iso9660_ltime_t  expiration_date;           /**< date and time when volume
-                                                 expires. See section 8.4.28 
-                                                 of the ECMA 119 spec. */
-  iso9660_ltime_t  effective_date;            /**< date and time when volume
-                                                 is effective. See section 
-                                                 8.4.29 of the ECMA 119 
-                                                 spec. */
-  iso711_t         file_structure_version;    /**< value 1 for ECMA 119 */
-  uint8_t           unused4[1];                /**< unused - value 0 */
-  char             application_data[512];     /**< 8.5.20 Application can put 
-                                                 whatever it wants here. */
-  uint8_t          unused5[653];              /**< Unused - value 0 */
-} GNUC_PACKED;
-
-typedef struct iso9660_svd_s  iso9660_svd_t;
-
-PRAGMA_END_PACKED
-
-/*! \brief Unix stat-like version of iso9660_dir
-
-   The iso9660_stat structure is not part of the ISO-9660
-   specification. We use it for our to communicate information
-   in a C-library friendly way, e.g struct tm time structures and
-   a C-style filename string.
-
-   @see iso9660_dir
-*/
-struct iso9660_stat_s { /* big endian!! */
-
-  iso_rock_statbuf_t rr;              /**< Rock Ridge-specific fields  */
-
-  struct tm          tm;              /**< time on entry - FIXME merge with
-                                         one of entries above, like ctime? */
-  lsn_t              lsn;             /**< start logical sector number */
-  uint32_t           size;            /**< total size in bytes */
-  uint32_t           secsize;         /**< number of sectors allocated */
-  iso9660_xa_t       xa;              /**< XA attributes */
-  enum { _STAT_FILE = 1, _STAT_DIR = 2 } type;
-  bool               b_xa;
-  char         filename[EMPTY_ARRAY_SIZE]; /**< filename */
-};
-
-/** A mask used in iso9660_ifs_read_vd which allows what kinds 
-    of extensions we allow, eg. Joliet, Rock Ridge, etc. */
-typedef uint8_t iso_extension_mask_t;
-
-/*! An enumeration for some of the ISO_EXTENSION_* \#defines below. This isn't
-    really an enumeration one would really use in a program it is here
-    to be helpful in debuggers where wants just to refer to the
-    ISO_EXTENSION_*_ names and get something.
-  */
-extern enum iso_extension_enum_s {
-  ISO_EXTENSION_JOLIET_LEVEL1 = 0x01,
-  ISO_EXTENSION_JOLIET_LEVEL2 = 0x02,
-  ISO_EXTENSION_JOLIET_LEVEL3 = 0x04,
-  ISO_EXTENSION_ROCK_RIDGE    = 0x08,
-  ISO_EXTENSION_HIGH_SIERRA   = 0x10
-} iso_extension_enums;
-  
-
-#define ISO_EXTENSION_ALL           0xFF
-#define ISO_EXTENSION_NONE          0x00
-#define ISO_EXTENSION_JOLIET     \
-  (ISO_EXTENSION_JOLIET_LEVEL1 | \
-   ISO_EXTENSION_JOLIET_LEVEL2 | \
-   ISO_EXTENSION_JOLIET_LEVEL3 )
-  
-
-/** This is an opaque structure. */
-typedef struct _iso9660_s iso9660_t; 
-
-  /*! Close previously opened ISO 9660 image and free resources
-    associated with the image. Call this when done using using an ISO
-    9660 image.
-    
-    @return true is unconditionally returned. If there was an error
-    false would be returned.
-  */
-  bool iso9660_close (iso9660_t * p_iso);
-
-
-  /*!
-    Open an ISO 9660 image for reading. Maybe in the future we will have
-    a mode. NULL is returned on error.
-  */
-  iso9660_t *iso9660_open (const char *psz_path /*flags, mode */);
-  
-  /*!
-    Open an ISO 9660 image for reading allowing various ISO 9660
-    extensions.  Maybe in the future we will have a mode. NULL is
-    returned on error.
-
-    @see iso9660_open_fuzzy
-  */
-  iso9660_t *iso9660_open_ext (const char *psz_path, 
-                               iso_extension_mask_t iso_extension_mask);
-  
-  /*! Open an ISO 9660 image for "fuzzy" reading. This means that we
-    will try to guess various internal offset based on internal
-    checks. This may be useful when trying to read an ISO 9660 image
-    contained in a file format that libiso9660 doesn't know natively
-    (or knows imperfectly.)
-
-    Some tolerence allowed for positioning the ISO 9660 image. We scan
-    for STANDARD_ID and use that to set the eventual offset to adjust
-    by (as long as that is <= i_fuzz).
-
-    Maybe in the future we will have a mode. NULL is returned on error.
-    
-    @see iso9660_open, @see iso9660_fuzzy_ext
-  */
-  iso9660_t *iso9660_open_fuzzy (const char *psz_path /*flags, mode */,
-                                 uint16_t i_fuzz);
-
-  /*!
-    Open an ISO 9660 image for reading with some tolerence for positioning
-    of the ISO9660 image. We scan for ISO_STANDARD_ID and use that to set
-    the eventual offset to adjust by (as long as that is <= i_fuzz).
-    
-    Maybe in the future we will have a mode. NULL is returned on error.
-    
-    @see iso9660_open_ext @see iso9660_open_fuzzy
-  */
-  iso9660_t *iso9660_open_fuzzy_ext (const char *psz_path,
-                                     iso_extension_mask_t iso_extension_mask,
-                                     uint16_t i_fuzz
-                                     /*flags, mode */);
-
-  /*!
-    Read the Super block of an ISO 9660 image but determine framesize
-    and datastart and a possible additional offset. Generally here we are
-    not reading an ISO 9660 image but a CD-Image which contains an ISO 9660
-    filesystem.
-  */
-  bool iso9660_ifs_fuzzy_read_superblock (iso9660_t *p_iso, 
-                                          iso_extension_mask_t iso_extension_mask,
-                                          uint16_t i_fuzz);
-  
-  /*!
-    Seek to a position and then read i_size blocks. 
-
-    @param p_iso the ISO-9660 file image to get data from
-
-    @param ptr place to put returned data. It should be able to store
-    a least i_size bytes
-
-    @param start location to start reading from
-
-    @param i_size number of blocks to read. Each block is ISO_BLOCKSIZE bytes
-    long.
-
-    @return number of bytes (not blocks) read
-
-  */
-  long int iso9660_iso_seek_read (const iso9660_t *p_iso, /*out*/ void *ptr, 
-                                  lsn_t start, long int i_size);
-  
-  /*!
-    Read the Primary Volume Descriptor for a CD.
-    True is returned if read, and false if there was an error.
-  */
-  bool iso9660_fs_read_pvd ( const CdIo_t *p_cdio, 
-                             /*out*/ iso9660_pvd_t *p_pvd );
-  
-  /*!
-    Read the Primary Volume Descriptor for an ISO 9660 image.
-    True is returned if read, and false if there was an error.
-  */
-  bool iso9660_ifs_read_pvd (const iso9660_t *p_iso, 
-                             /*out*/ iso9660_pvd_t *p_pvd);
-  
-/*!
-  Read the Super block of an ISO 9660 image. This is the 
-  Primary Volume Descriptor (PVD) and perhaps a Supplemental Volume 
-  Descriptor if (Joliet) extensions are acceptable.
-*/
-  bool iso9660_fs_read_superblock (CdIo_t *p_cdio, 
-                                   iso_extension_mask_t iso_extension_mask);
-  
-  /*!
-    Read the Super block of an ISO 9660 image. This is the 
-    Primary Volume Descriptor (PVD) and perhaps a Supplemental Volume 
-    Descriptor if (Joliet) extensions are acceptable.
-  */
-  bool iso9660_ifs_read_superblock (iso9660_t *p_iso,
-                                    iso_extension_mask_t iso_extension_mask);
-
-
-/*====================================================
-  Time conversion 
- ====================================================*/
-/*!
-  Set time in format used in ISO 9660 directory index record
-  from a Unix time structure. */
-  void iso9660_set_dtime (const struct tm *tm, 
-                          /*out*/ iso9660_dtime_t *idr_date);
-
-
-  /*!
-    Set "long" time in format used in ISO 9660 primary volume descriptor
-    from a Unix time structure. */
-  void iso9660_set_ltime (const struct tm *_tm, 
-                          /*out*/ iso9660_ltime_t *p_pvd_date);
-  
-  /*!
-    Get Unix time structure from format use in an ISO 9660 directory index 
-    record. Even though tm_wday and tm_yday fields are not explicitly in
-    idr_date, they are calculated from the other fields.
-    
-    If tm is to reflect the localtime, set "b_localtime" true, otherwise
-    tm will reported in GMT.
-  */
-  bool iso9660_get_dtime (const iso9660_dtime_t *idr_date, bool b_localtime,
-                          /*out*/ struct tm *tm);
-  
-  
-  /*!
-    Get "long" time in format used in ISO 9660 primary volume descriptor
-    from a Unix time structure. 
-  */
-  bool iso9660_get_ltime (const iso9660_ltime_t *p_ldate, 
-                          /*out*/ struct tm *p_tm);
-  
-  /*====================================================
-    Character Classification and String Manipulation
-    ====================================================*/
-  /*!
-    Return true if c is a DCHAR - a character that can appear in an an
-    ISO-9600 level 1 directory name. These are the ASCII capital
-    letters A-Z, the digits 0-9 and an underscore.
-  */
-  bool iso9660_is_dchar (int c);
-  
-  /*!
-    Return true if c is an ACHAR - 
-    These are the DCHAR's plus some ASCII symbols including the space 
-    symbol.   
-  */
-  bool iso9660_is_achar (int c);
-  
-  /*!
-    Convert an ISO-9660 file name which is in the format usually stored
-    in a ISO 9660 directory entry into what's usually listed as the
-    file name in a listing.  Lowercase name, and remove trailing ;1's
-    or .;1's and turn the other ;'s into version numbers.
-    
-    @param psz_oldname the ISO-9660 filename to be translated.
-    @param psz_newname returned string. The caller allocates this and
-    it should be at least the size of psz_oldname.
-    @return length of the translated string is returned.
-  */
-  int iso9660_name_translate(const char *psz_oldname, 
-                             /*out*/ char *psz_newname);
-  
-  /*!
-    Convert an ISO-9660 file name which is in the format usually stored
-    in a ISO 9660 directory entry into what's usually listed as the
-    file name in a listing.  Lowercase name if no Joliet Extension
-    interpretation. Remove trailing ;1's or .;1's and turn the other
-    ;'s into version numbers.
-    
-    @param psz_oldname the ISO-9660 filename to be translated.
-    @param psz_newname returned string. The caller allocates this and
-    it should be at least the size of psz_oldname.
-    @param i_joliet_level 0 if not using Joliet Extension. Otherwise the
-    Joliet level.
-    @return length of the translated string is returned. It will be no greater
-    than the length of psz_oldname.
-  */
-  int iso9660_name_translate_ext(const char *psz_oldname, char *psz_newname, 
-                                 uint8_t i_joliet_level);
-  
-  /*!  
-    Pad string src with spaces to size len and copy this to dst. If
-    len is less than the length of src, dst will be truncated to the
-    first len characters of src.
-    
-    src can also be scanned to see if it contains only ACHARs, DCHARs, 
-    7-bit ASCII chars depending on the enumeration _check.
-    
-    In addition to getting changed, dst is the return value.
-    Note: this string might not be NULL terminated.
-  */
-  char *iso9660_strncpy_pad(char dst[], const char src[], size_t len, 
-                            enum strncpy_pad_check _check);
-  
-  /*=====================================================================
-    File and Directory Names 
-    ======================================================================*/
-  
-  /*!
-    Check that psz_path is a valid ISO-9660 directory name.
-    
-    A valid directory name should not start out with a slash (/), 
-    dot (.) or null byte, should be less than 37 characters long, 
-    have no more than 8 characters in a directory component 
-    which is separated by a /, and consist of only DCHARs. 
-    
-    True is returned if psz_path is valid.
-  */
-  bool iso9660_dirname_valid_p (const char psz_path[]);
-  
-  /*!  
-    Take psz_path and a version number and turn that into a ISO-9660
-    pathname.  (That's just the pathname followd by ";" and the version
-    number. For example, mydir/file.ext -> MYDIR/FILE.EXT;1 for version
-    1. The resulting ISO-9660 pathname is returned.
-  */
-  char *iso9660_pathname_isofy (const char psz_path[], uint16_t i_version);
-  
-  /*!
-    Check that psz_path is a valid ISO-9660 pathname.  
-    
-    A valid pathname contains a valid directory name, if one appears and
-    the filename portion should be no more than 8 characters for the
-    file prefix and 3 characters in the extension (or portion after a
-    dot). There should be exactly one dot somewhere in the filename
-    portion and the filename should be composed of only DCHARs.
-    
-    True is returned if psz_path is valid.
-  */
-  bool iso9660_pathname_valid_p (const char psz_path[]);
-
-/*=====================================================================
-  directory tree 
-======================================================================*/
-
-void
-iso9660_dir_init_new (void *dir, uint32_t self, uint32_t ssize, 
-                      uint32_t parent, uint32_t psize, 
-                      const time_t *dir_time);
-
-void
-iso9660_dir_init_new_su (void *dir, uint32_t self, uint32_t ssize, 
-                         const void *ssu_data, unsigned int ssu_size, 
-                         uint32_t parent, uint32_t psize, 
-                         const void *psu_data, unsigned int psu_size,
-                         const time_t *dir_time);
-
-void
-iso9660_dir_add_entry_su (void *dir, const char filename[], uint32_t extent,
-                          uint32_t size, uint8_t file_flags, 
-                          const void *su_data,
-                          unsigned int su_size, const time_t *entry_time);
-
-unsigned int 
-iso9660_dir_calc_record_size (unsigned int namelen, unsigned int su_len);
-
-/*!
-   Given a directory pointer, find the filesystem entry that contains
-   lsn and return information about it.
-
-   @return stat_t of entry if we found lsn, or NULL otherwise.
-   Caller must free return value.
- */
-#define iso9660_fs_find_lsn  iso9660_find_fs_lsn 
-iso9660_stat_t *iso9660_fs_find_lsn(CdIo_t *p_cdio, lsn_t i_lsn);
-
-
-/*!
-   Given a directory pointer, find the filesystem entry that contains
-   lsn and return information about it.
-
-   @return stat_t of entry if we found lsn, or NULL otherwise.
-   Caller must free return value.
- */
-iso9660_stat_t *iso9660_fs_find_lsn_with_path(CdIo_t *p_cdio, lsn_t i_lsn,
-                                              /*out*/ char **ppsz_path);
-
-/*!
-   Given a directory pointer, find the filesystem entry that contains
-   lsn and return information about it.
-
-   @return stat_t of entry if we found lsn, or NULL otherwise.
-   Caller must free return value.
- */
-iso9660_stat_t *iso9660_ifs_find_lsn(iso9660_t *p_iso, lsn_t i_lsn);
-
-
-/*!
-   Given a directory pointer, find the filesystem entry that contains
-   lsn and return information about it.
-
-   @param p_iso pointer to iso_t 
-   @param i_lsn LSN to find
-   @param ppsz_path  full path of lsn filename. On entry *ppsz_path should be
-   NULL. On return it will be allocated an point to the full path of the
-   file at lsn or NULL if the lsn is not found. You should deallocate
-   *ppsz_path when you are done using it.
-
-   @return stat_t of entry if we found lsn, or NULL otherwise.
-   Caller must free return value.
- */
-iso9660_stat_t *iso9660_ifs_find_lsn_with_path(iso9660_t *p_iso, 
-                                               lsn_t i_lsn,
-                                               /*out*/ char **ppsz_path);
-
-
-/*!
-  Return file status for psz_path. NULL is returned on error.
-
-  @param p_cdio the CD object to read from
-
-  @param psz_path filename path to look up and get information about
-
-  @return ISO 9660 file information
-
-  Important note:
-
-  You make get different results looking up "/" versus "/." and the
-  latter may give more complete information. "/" will take information
-  from the PVD only, whereas "/." will force a directory read of "/" and
-  find "." and in that Rock-Ridge information might be found which fills
-  in more stat information. Ideally iso9660_fs_stat should be fixed.
-  Patches anyone?
- */
-iso9660_stat_t *iso9660_fs_stat (CdIo_t *p_cdio, const char psz_path[]);
-  
-
-/*!  
-  Return file status for path name psz_path. NULL is returned on error.
-  pathname version numbers in the ISO 9660 name are dropped, i.e. ;1
-  is removed and if level 1 ISO-9660 names are lowercased.
-
-  b_mode2 is historical. It is not used.
- */
-iso9660_stat_t *iso9660_fs_stat_translate (CdIo_t *p_cdio, 
-                                           const char psz_path[], 
-                                           bool b_mode2);
-
-/*!  
-  Return file status for pathname. NULL is returned on error.
- */
-iso9660_stat_t *iso9660_ifs_stat (iso9660_t *p_iso, const char psz_path[]);
-
-
-/*!  Return file status for path name psz_path. NULL is returned on
-  error.  pathname version numbers in the ISO 9660 name are dropped,
-  i.e. ;1 is removed and if level 1 ISO-9660 names are lowercased.
- */
-iso9660_stat_t *iso9660_ifs_stat_translate (iso9660_t *p_iso, 
-                                            const char psz_path[]);
-
-/*!  Read psz_path (a directory) and return a list of iso9660_stat_t
-  pointers for the files inside that directory. The caller must free the
-  returned result.
-
-  b_mode2 is historical. It is not used.
-*/
-CdioList_t * iso9660_fs_readdir (CdIo_t *p_cdio, const char psz_path[], 
-                                 bool b_mode2);
-
-/*!  Read psz_path (a directory) and return a list of iso9660_stat_t
-  pointers for the files inside that directory. The caller must free
-  the returned result.
-*/
-CdioList_t * iso9660_ifs_readdir (iso9660_t *p_iso, const char psz_path[]);
-
-/*!
-  Return the PVD's application ID.
-  NULL is returned if there is some problem in getting this. 
-*/
-char * iso9660_get_application_id(iso9660_pvd_t *p_pvd);
-  
-/*!  
-  Get the application ID.  psz_app_id is set to NULL if there
-  is some problem in getting this and false is returned.
-*/
-bool iso9660_ifs_get_application_id(iso9660_t *p_iso,
-                                    /*out*/ cdio_utf8_t **p_psz_app_id);
-
-/*!  
-  Return the Joliet level recognized for p_iso.
-*/
-uint8_t iso9660_ifs_get_joliet_level(iso9660_t *p_iso);
-
-uint8_t iso9660_get_dir_len(const iso9660_dir_t *p_idr);
-
-#if FIXME
-uint8_t iso9660_get_dir_size(const iso9660_dir_t *p_idr);
-
-lsn_t iso9660_get_dir_extent(const iso9660_dir_t *p_idr);
-#endif
-
-  /*!
-    Return the directory name stored in the iso9660_dir_t
-    
-    A string is allocated: the caller must deallocate. This routine
-    can return NULL if memory allocation fails.
-  */
-  char * iso9660_dir_to_name (const iso9660_dir_t *p_iso9660_dir);
-  
-  /*!  
-    Returns a POSIX mode for a given p_iso_dirent.
-  */
-  mode_t iso9660_get_posix_filemode(const iso9660_stat_t *p_iso_dirent);
-
-  /*!
-    Return a string containing the preparer id with trailing
-    blanks removed.
-  */
-  char *iso9660_get_preparer_id(const iso9660_pvd_t *p_pvd);
-  
-  /*!  
-    Get the preparer ID.  psz_preparer_id is set to NULL if there
-    is some problem in getting this and false is returned.
-  */
-  bool iso9660_ifs_get_preparer_id(iso9660_t *p_iso,
-                                   /*out*/ cdio_utf8_t **p_psz_preparer_id);
-  
-  /*!
-    Return a string containing the PVD's publisher id with trailing
-    blanks removed.
-  */
-  char *iso9660_get_publisher_id(const iso9660_pvd_t *p_pvd);
-  
-  /*!  
-    Get the publisher ID.  psz_publisher_id is set to NULL if there
-    is some problem in getting this and false is returned.
-  */
-  bool iso9660_ifs_get_publisher_id(iso9660_t *p_iso,
-                                    /*out*/ cdio_utf8_t **p_psz_publisher_id);
-  
-  uint8_t iso9660_get_pvd_type(const iso9660_pvd_t *p_pvd);
-  
-  const char * iso9660_get_pvd_id(const iso9660_pvd_t *p_pvd);
-  
-  int iso9660_get_pvd_space_size(const iso9660_pvd_t *p_pvd);
-  
-  int iso9660_get_pvd_block_size(const iso9660_pvd_t *p_pvd) ;
-  
-  /*! Return the primary volume id version number (of pvd).
-    If there is an error 0 is returned. 
-  */
-  int iso9660_get_pvd_version(const iso9660_pvd_t *pvd) ;
-  
-  /*!
-    Return a string containing the PVD's system id with trailing
-    blanks removed.
-  */
-  char *iso9660_get_system_id(const iso9660_pvd_t *p_pvd);
-  
-  /*!  
-    Get the system ID.  psz_system_id is set to NULL if there
-    is some problem in getting this and false is returned.
-  */
-  bool iso9660_ifs_get_system_id(iso9660_t *p_iso,
-                                 /*out*/ cdio_utf8_t **p_psz_system_id);
-  
-  
-  /*! Return the LSN of the root directory for pvd.
-    If there is an error CDIO_INVALID_LSN is returned. 
-  */
-  lsn_t iso9660_get_root_lsn(const iso9660_pvd_t *p_pvd);
-  
-  /*!  
-    Get the volume ID in the PVD.  psz_volume_id is set to NULL if there
-    is some problem in getting this and false is returned.
-  */
-  char *iso9660_get_volume_id(const iso9660_pvd_t *p_pvd);
-  
-  /*!  
-    Get the volume ID in the PVD.  psz_volume_id is set to NULL if there
-    is some problem in getting this and false is returned.
-  */
-  bool iso9660_ifs_get_volume_id(iso9660_t *p_iso,
-                                 /*out*/ cdio_utf8_t **p_psz_volume_id);
-  
-  /*!
-    Return the volumeset ID in the PVD.
-    NULL is returned if there is some problem in getting this. 
-  */
-  char *iso9660_get_volumeset_id(const iso9660_pvd_t *p_pvd);
-  
-  /*!  
-    Get the volumeset ID.  psz_systemset_id is set to NULL if there
-    is some problem in getting this and false is returned.
-  */
-  bool iso9660_ifs_get_volumeset_id(iso9660_t *p_iso,
-                                    /*out*/ cdio_utf8_t **p_psz_volumeset_id);
-  
-  /* pathtable */
-  
-  /*! Zero's out pathable. Do this first. */
-  void iso9660_pathtable_init (void *pt);
-  
-  unsigned int iso9660_pathtable_get_size (const void *pt);
-  
-  uint16_t iso9660_pathtable_l_add_entry (void *pt, const char name[], 
-                                          uint32_t extent, uint16_t parent);
-  
-  uint16_t iso9660_pathtable_m_add_entry (void *pt, const char name[], 
-                                          uint32_t extent, uint16_t parent);
-  
-  /**=====================================================================
-     Volume Descriptors
-     ======================================================================*/
-
-  void iso9660_set_pvd (void *pd, const char volume_id[], 
-                        const char application_id[], 
-                        const char publisher_id[], const char preparer_id[],
-                        uint32_t iso_size, const void *root_dir, 
-                        uint32_t path_table_l_extent, 
-                        uint32_t path_table_m_extent,
-                        uint32_t path_table_size, const time_t *pvd_time);
-
-  void iso9660_set_evd (void *pd);
-
-  /*!
-    Return true if ISO 9660 image has extended attrributes (XA).
-  */
-  bool iso9660_ifs_is_xa (const iso9660_t * p_iso);
-
-
-#ifndef DO_NOT_WANT_COMPATIBILITY
-/** For compatibility with < 0.77 */
-#define iso9660_isdchar       iso9660_is_dchar
-#define iso9660_isachar       iso9660_is_achar
-#endif /*DO_NOT_WANT_COMPATIBILITY*/
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#undef ISODCL
-#endif /* __CDIO_ISO9660_H__ */
-
-/* 
- * Local variables:
- *  c-file-style: "gnu"
- *  tab-width: 8
- *  indent-tabs-mode: nil
- * End:
- */
diff --git a/lib-x86-64/include/cdio/logging.h b/lib-x86-64/include/cdio/logging.h
deleted file mode 100644
index 988d11c5..00000000
--- a/lib-x86-64/include/cdio/logging.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
-    $Id: logging.h,v 1.11 2008/03/25 15:59:09 karl Exp $
-
-    Copyright (C) 2003, 2004, 2008 Rocky Bernstein <rocky@gnu.org>
-    Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-/** \file logging.h 
- *  \brief Header to control logging and level of detail of output.
- *         
- */
-
-#ifndef __LOGGING_H__
-#define __LOGGING_H__
-
-#include <cdio/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * The different log levels supported.
- */
-typedef enum {
-  CDIO_LOG_DEBUG = 1, /**< Debug-level messages - helps debug what's up. */
-  CDIO_LOG_INFO,      /**< Informational - indicates perhaps something of 
-                           interest. */
-  CDIO_LOG_WARN,      /**< Warning conditions - something that looks funny. */
-  CDIO_LOG_ERROR,     /**< Error conditions - may terminate program.  */
-  CDIO_LOG_ASSERT     /**< Critical conditions - may abort program. */
-} cdio_log_level_t;
-
-/**
- * The place to save the preference concerning how much verbosity 
- * is desired. This is used by the internal default log handler, but
- * it could be use by applications which provide their own log handler.
- */
-extern cdio_log_level_t cdio_loglevel_default;
-
-/**
- * This type defines the signature of a log handler.  For every
- * message being logged, the handler will receive the log level and
- * the message string.
- *
- * @see cdio_log_set_handler
- * @see cdio_log_level_t
- *
- * @param level   The log level.
- * @param message The log message.
- */
-typedef void (*cdio_log_handler_t) (cdio_log_level_t level, 
-                                    const char message[]);
-
-/**
- * Set a custom log handler for libcdio.  The return value is the log
- * handler being replaced.  If the provided parameter is NULL, then
- * the handler will be reset to the default handler.
- *
- * @see cdio_log_handler_t
- *
- * @param new_handler The new log handler.
- * @return The previous log handler.
- */
-cdio_log_handler_t cdio_log_set_handler (cdio_log_handler_t new_handler);
-
-/**
- * Handle an message with the given log level.
- *
- * @see cdio_debug
- * @see cdio_info
- * @see cdio_warn
- * @see cdio_error
-
- * @param level   The log level.
- * @param format  printf-style format string
- * @param ...     remaining arguments needed by format string
- */
-void cdio_log (cdio_log_level_t level, 
-               const char format[], ...) GNUC_PRINTF(2, 3);
-    
-/**
- * Handle a debugging message.
- *
- * @see cdio_log for a more generic routine
- */
-void cdio_debug (const char format[], ...) GNUC_PRINTF(1,2);
-
-/**
- * Handle an informative message.
- *
- * @see cdio_log for a more generic routine
- */
-void cdio_info (const char format[], ...) GNUC_PRINTF(1,2);
-
-/**
- * Handle a warning message.
- *
- * @see cdio_log for a more generic routine
- */
-void cdio_warn (const char format[], ...) GNUC_PRINTF(1,2);
-
-/**
- * Handle an error message. Execution is terminated.
- *
- * @see cdio_log for a more generic routine.
- */
-void cdio_error (const char format[], ...) GNUC_PRINTF(1,2);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __LOGGING_H__ */
-
-
-/* 
- * Local variables:
- *  c-file-style: "gnu"
- *  tab-width: 8
- *  indent-tabs-mode: nil
- * End:
- */
diff --git a/lib-x86-64/include/cdio/mmc.h b/lib-x86-64/include/cdio/mmc.h
deleted file mode 100644
index c7a4eeaf..00000000
--- a/lib-x86-64/include/cdio/mmc.h
+++ /dev/null
@@ -1,907 +0,0 @@
-/*
-    $Id: mmc.h,v 1.32 2008/05/09 06:13:32 edsdead Exp $
-
-    Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008
-                  Rocky Bernstein <rocky@gnu.org>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-/**
- *  \file mmc.h 
- * 
- *  \brief Common definitions for MMC (Multimedia Commands). Applications
- *  include this for direct MMC access.
-*/
-
-#ifndef __CDIO_MMC_H__
-#define __CDIO_MMC_H__
-
-#include <cdio/cdio.h>
-#include <cdio/types.h>
-#include <cdio/dvd.h>
-#include <cdio/audio.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-  /** Set this to the maximum value in milliseconds that we will
-      wait on an MMC command.  */
-  extern uint32_t mmc_timeout_ms; 
-
-  /** The default timeout (non-read) is 6 seconds. */
-#define MMC_TIMEOUT_DEFAULT 6000
-
-  /** Set this to the maximum value in milliseconds that we will
-      wait on an MMC read command.  */
-  extern uint32_t mmc_read_timeout_ms;
-
-  /** The default read timeout is 3 minutes. */
-#define MMC_READ_TIMEOUT_DEFAULT 3*60*1000
-
-
-  /** \brief The opcode-portion (generic packet commands) of an MMC command.
-    
-  In general, those opcodes that end in 6 take a 6-byte command
-  descriptor, those that end in 10 take a 10-byte
-  descriptor and those that in in 12 take a 12-byte descriptor. 
-  
-  (Not that you need to know that, but it seems to be a
-  big deal in the MMC specification.)
-  
-  */
-  typedef enum {
-  CDIO_MMC_GPCMD_INQUIRY 	        = 0x12, /**< Request drive 
-						   information. */
-  CDIO_MMC_GPCMD_MODE_SELECT_6	        = 0x15, /**< Select medium 
-						   (6 bytes). */
-  CDIO_MMC_GPCMD_MODE_SENSE_6 	        = 0x1a, /**< Get medium or device
-						 information. Should be issued
-						 before MODE SELECT to get
-						 mode support or save current
-						 settings. (6 bytes). */
-  CDIO_MMC_GPCMD_START_STOP             = 0x1b, /**< Enable/disable Disc
-						     operations. (6 bytes). */
-  CDIO_MMC_GPCMD_ALLOW_MEDIUM_REMOVAL   = 0x1e, /**< Enable/disable Disc 
-						   removal. (6 bytes). */
-
-  /** Group 2 Commands (CDB's here are 10-bytes)   
-   */
-  CDIO_MMC_GPCMD_READ_10	        = 0x28, /**< Read data from drive 
-						   (10 bytes). */
-  CDIO_MMC_GPCMD_READ_SUBCHANNEL	= 0x42, /**< Read Sub-Channel data.
-						   (10 bytes). */
-  CDIO_MMC_GPCMD_READ_TOC               = 0x43, /**< READ TOC/PMA/ATIP. 
-						   (10 bytes). */
-  CDIO_MMC_GPCMD_READ_HEADER            = 0x44,
-  CDIO_MMC_GPCMD_PLAY_AUDIO_10	        = 0x45, /**< Begin audio playing at
-						   current position
-						   (10 bytes). */
-  CDIO_MMC_GPCMD_GET_CONFIGURATION      = 0x46, /**< Get drive Capabilities 
-						   (10 bytes) */
-  CDIO_MMC_GPCMD_PLAY_AUDIO_MSF	        = 0x47, /**< Begin audio playing at
-						   specified MSF (10
-						   bytes). */
-  CDIO_MMC_GPCMD_PLAY_AUDIO_TI          = 0x48,
-  CDIO_MMC_GPCMD_PLAY_TRACK_REL_10      = 0x49, /**< Play audio at the track
-						   relative LBA. (10 bytes).
-						   Doesn't seem to be part
-						   of MMC standards but is
-						   handled by Plextor drives.
-						*/
-						   
-  CDIO_MMC_GPCMD_GET_EVENT_STATUS       = 0x4a, /**< Report events and 
-						   Status. */
-  CDIO_MMC_GPCMD_PAUSE_RESUME           = 0x4b, /**< Stop or restart audio 
-						   playback. (10 bytes). 
-						   Used with a PLAY command. */
-
-  CDIO_MMC_GPCMD_READ_DISC_INFO	        = 0x51, /**< Get CD information.
-						   (10 bytes). */
-  CDIO_MMC_GPCMD_MODE_SELECT_10	        = 0x55, /**< Select medium 
-						   (10-bytes). */
-  CDIO_MMC_GPCMD_MODE_SENSE_10	        = 0x5a, /**< Get medium or device
-						 information. Should be issued
-						 before MODE SELECT to get
-						 mode support or save current
-						 settings. (6 bytes). */
-
-  /** Group 5 Commands (CDB's here are 12-bytes) 
-   */
-  CDIO_MMC_GPCMD_PLAY_AUDIO_12	        = 0xa5, /**< Begin audio playing at
-						   current position
-						 (12 bytes) */
-  CDIO_MMC_GPCMD_LOAD_UNLOAD	        = 0xa6, /**< Load/unload a Disc
-						 (12 bytes) */
-  CDIO_MMC_GPCMD_READ_12	        = 0xa8, /**< Read data from drive 
-						   (12 bytes). */
-  CDIO_MMC_GPCMD_PLAY_TRACK_REL_12      = 0xa9, /**< Play audio at the track
-						   relative LBA. (12 bytes).
-						   Doesn't seem to be part
-						   of MMC standards but is
-						   handled by Plextor drives.
-						*/
-  CDIO_MMC_GPCMD_READ_DVD_STRUCTURE     = 0xad, /**< Get DVD structure info
-						   from media (12 bytes). */
-  CDIO_MMC_GPCMD_READ_MSF	        = 0xb9, /**< Read almost any field 
-						   of a CD sector at specified
-						   MSF. (12 bytes). */
-  CDIO_MMC_GPCMD_SET_SPEED	        = 0xbb, /**< Set drive speed 
-						   (12 bytes). This is listed 
-						   as optional in ATAPI 2.6, 
-						   but is (curiously)
-						   missing from Mt. Fuji, 
-						   Table 57. It is mentioned
-						   in Mt. Fuji Table 377 as an 
-						   MMC command for SCSI
-						   devices though...  Most
-						   ATAPI drives support it. */
-  CDIO_MMC_GPCMD_READ_CD	        = 0xbe, /**< Read almost any field 
-						   of a CD sector at current
-						   location. (12 bytes). */
-  /** Vendor-unique Commands  
-   */
-  CDIO_MMC_GPCMD_CD_PLAYBACK_STATUS  = 0xc4 /**< SONY unique  = command */,
-  CDIO_MMC_GPCMD_PLAYBACK_CONTROL    = 0xc9 /**< SONY unique  = command */,
-  CDIO_MMC_GPCMD_READ_CDDA	     = 0xd8 /**< Vendor unique  = command */,
-  CDIO_MMC_GPCMD_READ_CDXA	     = 0xdb /**< Vendor unique  = command */,
-  CDIO_MMC_GPCMD_READ_ALL_SUBCODES   = 0xdf /**< Vendor unique  = command */
-  } cdio_mmc_gpcmd_t;
-
-
-  /** Read Subchannel states */
-  typedef enum {
-    CDIO_MMC_READ_SUB_ST_INVALID   = 0x00, /**< audio status not supported */
-    CDIO_MMC_READ_SUB_ST_PLAY      = 0x11, /**< audio play operation in 
-                                              progress */
-    CDIO_MMC_READ_SUB_ST_PAUSED    = 0x12, /**< audio play operation paused */
-    CDIO_MMC_READ_SUB_ST_COMPLETED = 0x13, /**< audio play successfully 
-                                              completed */
-    CDIO_MMC_READ_SUB_ST_ERROR     = 0x14, /**< audio play stopped due to 
-                                              error */
-    CDIO_MMC_READ_SUB_ST_NO_STATUS = 0x15, /**< no current audio status to
-                                              return */
-  } cdio_mmc_read_sub_state_t;
-
-  /** Level values that can go into READ_CD */
-  typedef enum {
-    CDIO_MMC_READ_TYPE_ANY  =  0,  /**< All types */
-    CDIO_MMC_READ_TYPE_CDDA =  1,  /**< Only CD-DA sectors */
-    CDIO_MMC_READ_TYPE_MODE1 = 2,  /**< mode1 sectors (user data = 2048) */
-    CDIO_MMC_READ_TYPE_MODE2 = 3,  /**< mode2 sectors form1 or form2 */
-    CDIO_MMC_READ_TYPE_M2F1 =  4,  /**< mode2 sectors form1 */
-    CDIO_MMC_READ_TYPE_M2F2 =  5   /**< mode2 sectors form2 */
-  } cdio_mmc_read_cd_type_t;
-
-  /** Format values for READ_TOC */
-  typedef enum {
-    CDIO_MMC_READTOC_FMT_TOC     =  0,
-    CDIO_MMC_READTOC_FMT_SESSION =  1,  
-    CDIO_MMC_READTOC_FMT_FULTOC  =  2,
-    CDIO_MMC_READTOC_FMT_PMA     =  3,  /**< Q subcode data */
-    CDIO_MMC_READTOC_FMT_ATIP    =  4,  /**< includes media type */
-    CDIO_MMC_READTOC_FMT_CDTEXT  =  5   /**< CD-TEXT info  */
-  } cdio_mmc_readtoc_t;
-    
-/** Page codes for MODE SENSE and MODE SET. */
-  typedef enum {
-    CDIO_MMC_R_W_ERROR_PAGE	= 0x01,
-    CDIO_MMC_WRITE_PARMS_PAGE	= 0x05,
-    CDIO_MMC_CDR_PARMS_PAGE	= 0x0d,
-    CDIO_MMC_AUDIO_CTL_PAGE	= 0x0e,
-    CDIO_MMC_POWER_PAGE		= 0x1a,
-    CDIO_MMC_FAULT_FAIL_PAGE	= 0x1c,
-    CDIO_MMC_TO_PROTECT_PAGE	= 0x1d,
-    CDIO_MMC_CAPABILITIES_PAGE	= 0x2a,
-    CDIO_MMC_ALL_PAGES		= 0x3f,
-  } cdio_mmc_mode_page_t;
-    
-
-PRAGMA_BEGIN_PACKED
-  struct mmc_audio_volume_entry_s 
-  {
-    uint8_t  selection; /* Only the lower 4 bits are used. */
-    uint8_t  volume;
-  } GNUC_PACKED;
-
-  typedef struct mmc_audio_volume_entry_s mmc_audio_volume_entry_t;
-  
-  /** This struct is used by cdio_audio_get_volume and cdio_audio_set_volume */
-  struct mmc_audio_volume_s
-  {
-    mmc_audio_volume_entry_t port[4];
-  } GNUC_PACKED;
-
-  typedef struct mmc_audio_volume_s mmc_audio_volume_t;
-  
-PRAGMA_END_PACKED
-  
-
-/** Return type codes for GET_CONFIGURATION. */
-typedef enum {
-  CDIO_MMC_GET_CONF_ALL_FEATURES     = 0,  /**< all features without regard
-                                              to currency. */
-  CDIO_MMC_GET_CONF_CURRENT_FEATURES = 1,  /**< features which are currently
-                                              in effect (e.g. based on
-                                              medium inserted). */
-  CDIO_MMC_GET_CONF_NAMED_FEATURE    = 2   /**< just the feature named in
-                                              the GET_CONFIGURATION cdb. */
-} cdio_mmc_get_conf_t;
-  
-
-/** FEATURE codes used in GET CONFIGURATION. */
-
-typedef enum {
-  CDIO_MMC_FEATURE_PROFILE_LIST     = 0x000, /**< Profile List Feature */
-  CDIO_MMC_FEATURE_CORE             = 0x001, 
-  CDIO_MMC_FEATURE_MORPHING         = 0x002, /**< Report/prevent operational
-                                                  changes  */
-  CDIO_MMC_FEATURE_REMOVABLE_MEDIUM = 0x003, /**< Removable Medium Feature */
-  CDIO_MMC_FEATURE_WRITE_PROTECT    = 0x004, /**< Write Protect Feature */
-  CDIO_MMC_FEATURE_RANDOM_READABLE  = 0x010, /**< Random Readable Feature */
-  CDIO_MMC_FEATURE_MULTI_READ       = 0x01D, /**< Multi-Read Feature */
-  CDIO_MMC_FEATURE_CD_READ          = 0x01E, /**< CD Read Feature */
-  CDIO_MMC_FEATURE_DVD_READ         = 0x01F, /**< DVD Read Feature */
-  CDIO_MMC_FEATURE_RANDOM_WRITABLE  = 0x020, /**< Random Writable Feature */
-  CDIO_MMC_FEATURE_INCR_WRITE       = 0x021, /**< Incremental Streaming 
-						Writable Feature */
-  CDIO_MMC_FEATURE_SECTOR_ERASE     = 0x022, /**< Sector Erasable Feature */
-  CDIO_MMC_FEATURE_FORMATABLE       = 0x023, /**< Formattable Feature */
-  CDIO_MMC_FEATURE_DEFECT_MGMT      = 0x024, /**< Management Ability of the 
-						Logical Unit/media system to
-						provide an apparently 
-						defect-free space.*/
-  CDIO_MMC_FEATURE_WRITE_ONCE       = 0x025, /**< Write Once
-						   Feature */
-  CDIO_MMC_FEATURE_RESTRICT_OVERW   = 0x026, /**< Restricted Overwrite
-						Feature */
-  CDIO_MMC_FEATURE_CD_RW_CAV        = 0x027, /**< CD-RW CAV Write Feature */
-  CDIO_MMC_FEATURE_MRW              = 0x028, /**< MRW Feature */
-  CDIO_MMC_FEATURE_ENHANCED_DEFECT  = 0x029, /**< Enhanced Defect Reporting */
-  CDIO_MMC_FEATURE_DVD_PRW          = 0x02A, /**< DVD+RW Feature */
-  CDIO_MMC_FEATURE_DVD_PR           = 0x02B, /**< DVD+R Feature */
-  CDIO_MMC_FEATURE_RIGID_RES_OVERW  = 0x02C, /**< Rigid Restricted Overwrite */
-  CDIO_MMC_FEATURE_CD_TAO           = 0x02D, /**< CD Track at Once */ 
-  CDIO_MMC_FEATURE_CD_SAO           = 0x02E, /**< CD Mastering (Session at 
-						Once) */
-  CDIO_MMC_FEATURE_DVD_R_RW_WRITE   = 0x02F, /**< DVD-R/RW Write */
-  CDIO_MMC_FEATURE_CD_RW_MEDIA_WRITE= 0x037, /**< CD-RW Media Write Support */
-  CDIO_MMC_FEATURE_DVD_PR_2_LAYER   = 0x03B, /**< DVD+R Double Layer */
-  CDIO_MMC_FEATURE_POWER_MGMT       = 0x100, /**< Initiator and device directed
-						power management */
-  CDIO_MMC_FEATURE_CDDA_EXT_PLAY    = 0x103, /**< Ability to play audio CDs 
-						via the Logical Unit's own
-						analog output */
-  CDIO_MMC_FEATURE_MCODE_UPGRADE    = 0x104, /* Ability for the device to 
-						accept  new microcode via
-						the interface */
-  CDIO_MMC_FEATURE_TIME_OUT         = 0x105, /**< Ability to respond to all
-						commands within a specific 
-						time */
-  CDIO_MMC_FEATURE_DVD_CSS          = 0x106, /**< Ability to perform DVD
-						CSS/CPPM authentication and
-						RPC */
-  CDIO_MMC_FEATURE_RT_STREAMING     = 0x107, /**< Ability to read and write 
-						using Initiator requested
-						performance parameters   */
-  CDIO_MMC_FEATURE_LU_SN            = 0x108, /**< The Logical Unit has a unique
-						identifier. */
-  CDIO_MMC_FEATURE_FIRMWARE_DATE    = 0x1FF, /**< Firmware creation date 
-						report */
-} cdio_mmc_feature_t;
-				
-/** Profile profile codes used in GET_CONFIGURATION - PROFILE LIST. */
-typedef enum {
-  CDIO_MMC_FEATURE_PROF_NON_REMOVABLE = 0x0001, /**< Re-writable disk, capable
-						   of changing behavior */
-  CDIO_MMC_FEATURE_PROF_REMOVABLE     = 0x0002, /**< disk Re-writable; with 
-						   removable  media */
-  CDIO_MMC_FEATURE_PROF_MO_ERASABLE   = 0x0003, /**< Erasable Magneto-Optical
-						   disk with sector erase
-						   capability */
-  CDIO_MMC_FEATURE_PROF_MO_WRITE_ONCE = 0x0004, /**< Write Once Magneto-Optical
-						   write once */
-  CDIO_MMC_FEATURE_PROF_AS_MO         = 0x0005, /**< Advance Storage
-						   Magneto-Optical */
-  CDIO_MMC_FEATURE_PROF_CD_ROM        = 0x0008, /**< Read only Compact Disc
-						   capable */
-  CDIO_MMC_FEATURE_PROF_CD_R          = 0x0009, /**< Write once Compact Disc
-						   capable */
-  CDIO_MMC_FEATURE_PROF_CD_RW         = 0x000A, /**< CD-RW Re-writable
-						   Compact Disc capable */
-  CDIO_MMC_FEATURE_PROF_DVD_ROM       = 0x0010, /**< Read only DVD */
-  CDIO_MMC_FEATURE_PROF_DVD_R_SEQ     = 0x0011, /**< Re-recordable DVD using
-						   Sequential recording */
-  CDIO_MMC_FEATURE_PROF_DVD_RAM       = 0x0012, /**< Re-writable DVD */
-  CDIO_MMC_FEATURE_PROF_DVD_RW_RO     = 0x0013, /**< Re-recordable DVD using
-						   Restricted Overwrite */
-  CDIO_MMC_FEATURE_PROF_DVD_RW_SEQ    = 0x0014, /**< Re-recordable DVD using
-						   Sequential recording */
-  CDIO_MMC_FEATURE_PROF_DVD_PRW       = 0x001A, /**< DVD+RW - DVD ReWritable */
-  CDIO_MMC_FEATURE_PROF_DVD_PR        = 0x001B, /**< DVD+R - DVD Recordable */
-  CDIO_MMC_FEATURE_PROF_DDCD_ROM      = 0x0020, /**< Read only  DDCD */
-  CDIO_MMC_FEATURE_PROF_DDCD_R        = 0x0021, /**< DDCD-R Write only DDCD */
-  CDIO_MMC_FEATURE_PROF_DDCD_RW       = 0x0022, /**< Re-Write only DDCD */
-  CDIO_MMC_FEATURE_PROF_DVD_PR2       = 0x002B, /**< DVD+R - DVD Recordable 
-                                                     double layer */
-  CDIO_MMC_FEATURE_PROF_NON_CONFORM   = 0xFFFF, /**< The Logical Unit does not
-						   conform to any Profile. */
-} cdio_mmc_feature_profile_t;
-  
-typedef enum {
-  CDIO_MMC_FEATURE_INTERFACE_UNSPECIFIED = 0,
-  CDIO_MMC_FEATURE_INTERFACE_SCSI        = 1,
-  CDIO_MMC_FEATURE_INTERFACE_ATAPI       = 2,
-  CDIO_MMC_FEATURE_INTERFACE_IEEE_1394   = 3,
-  CDIO_MMC_FEATURE_INTERFACE_IEEE_1394A  = 4,
-  CDIO_MMC_FEATURE_INTERFACE_FIBRE_CH    = 5
-} cdio_mmc_feature_interface_t;
-  
-
-/** The largest Command Descriptor Block (CDB) size.
-    The possible sizes are 6, 10, and 12 bytes.
- */
-#define MAX_CDB_LEN 12
-
-/** \brief A Command Descriptor Block (CDB) used in sending MMC 
-    commands.
- */
-typedef struct mmc_cdb_s {
-  uint8_t field[MAX_CDB_LEN];
-} mmc_cdb_t;
-  
-  /** \brief Format of header block in data returned from an MMC
-    GET_CONFIGURATION command.
-  */
-  typedef struct mmc_feature_list_header_s {
-    unsigned char length_msb;
-    unsigned char length_1sb;
-    unsigned char length_2sb;
-    unsigned char length_lsb;
-    unsigned char reserved1;
-    unsigned char reserved2;
-    unsigned char profile_msb;
-    unsigned char profile_lsb;
-  } cdio_mmc_feature_list_header_t;
-
-  /** An enumeration indicating whether an MMC command is sending
-    data or getting data.
-  */
-  typedef enum mmc_direction_s {
-    SCSI_MMC_DATA_READ,
-    SCSI_MMC_DATA_WRITE
-  } cdio_mmc_direction_t;
-  
-  typedef struct mmc_subchannel_s
-  {
-    uint8_t       reserved;
-    uint8_t       audio_status;
-    uint16_t      data_length; /**< Really ISO 9660 7.2.2 */
-    uint8_t	  format;
-    uint8_t	  address:	4;
-    uint8_t	  control:	4;
-    uint8_t	  track;
-    uint8_t	  index;
-    uint8_t       abs_addr[4];
-    uint8_t       rel_addr[4];
-  } cdio_mmc_subchannel_t;
-  
-#define CDIO_MMC_SET_COMMAND(cdb, command)      \
-  cdb[0] = command
-  
-#define CDIO_MMC_SET_READ_TYPE(cdb, sector_type) \
-  cdb[1] = (sector_type << 2)
-  
-#define CDIO_MMC_GETPOS_LEN16(p, pos)           \
-  (p[pos]<<8) + p[pos+1]
-  
-#define CDIO_MMC_GET_LEN16(p)                   \
-  (p[0]<<8) + p[1]
-  
-#define CDIO_MMC_GET_LEN32(p) \
-  (p[0] << 24) + (p[1] << 16) + (p[2] << 8) + p[3];
-  
-#define CDIO_MMC_SET_LEN16(cdb, pos, len)       \
-  cdb[pos  ] = (len >>  8) & 0xff;              \
-  cdb[pos+1] = (len      ) & 0xff
-
-#define CDIO_MMC_SET_READ_LBA(cdb, lba)         \
-  cdb[2] = (lba >> 24) & 0xff; \
-  cdb[3] = (lba >> 16) & 0xff; \
-  cdb[4] = (lba >>  8) & 0xff; \
-  cdb[5] = (lba      ) & 0xff
-
-#define CDIO_MMC_SET_START_TRACK(cdb, command) \
-  cdb[6] = command
-
-#define CDIO_MMC_SET_READ_LENGTH24(cdb, len) \
-  cdb[6] = (len >> 16) & 0xff; \
-  cdb[7] = (len >>  8) & 0xff; \
-  cdb[8] = (len      ) & 0xff
-
-#define CDIO_MMC_SET_READ_LENGTH16(cdb, len) \
-  CDIO_MMC_SET_LEN16(cdb, 7, len)
-
-#define CDIO_MMC_SET_READ_LENGTH8(cdb, len) \
-  cdb[8] = (len      ) & 0xff
-
-#define CDIO_MMC_MCSB_ALL_HEADERS 0xf
-
-#define CDIO_MMC_SET_MAIN_CHANNEL_SELECTION_BITS(cdb, val) \
-  cdb[9] = val << 3;
-
-/**
-  Read Audio Subchannel information
-  
-  @param p_cdio the CD object to be acted upon.
-  @param p_subchannel place for returned subchannel information
-*/
-driver_return_code_t
-mmc_audio_read_subchannel (CdIo_t *p_cdio, 
-                           /*out*/ cdio_subchannel_t *p_subchannel);
-  
-  /**
-    Return a string containing the name of the audio state as returned from
-    the Q_SUBCHANNEL.
-  */
-  const char *mmc_audio_state2str( uint8_t i_audio_state );
-  
-  /**
-    Eject using MMC commands. If CD-ROM is "locked" we'll unlock it.
-    Command is not "immediate" -- we'll wait for the command to complete.
-    For a more general (and lower-level) routine, @see mmc_start_stop_media.
-  */
-  driver_return_code_t mmc_eject_media( const CdIo_t *p_cdio );
-  
-  /**
-    Return a string containing the name of the given feature
-  */
-  const char *mmc_feature2str( int i_feature );
-  
-  /**
-    Return a string containing the name of the given feature
-  */
-  const char *mmc_feature_profile2str( int i_feature_profile );
-  
-  /**  
-    Return the length in bytes of the Command Descriptor
-    Buffer (CDB) for a given MMC command. The length will be 
-    either 6, 10, or 12. 
-  */
-  uint8_t mmc_get_cmd_len(uint8_t mmc_cmd);
-  
-  /**
-    Get the block size used in read requests, via MMC.
-    @return the blocksize if > 0; error if <= 0
-  */
-  int mmc_get_blocksize ( CdIo_t *p_cdio );
-  
-  /**
-   * Close tray using a MMC START STOP command.
-   */
-  driver_return_code_t mmc_close_tray( CdIo_t *p_cdio );
-  
-  /**  
-    Get the lsn of the end of the CD
-    
-    @return the lsn. On error return CDIO_INVALID_LSN.
-  */
-  lsn_t mmc_get_disc_last_lsn( const CdIo_t *p_cdio );
-  
-  /** 
-    Return the discmode as reported by the MMC Read (FULL) TOC
-    command.
-    
-    Information was obtained from Section 5.1.13 (Read TOC/PMA/ATIP)
-    pages 56-62 from the MMC draft specification, revision 10a
-    at http://www.t10.org/ftp/t10/drafts/mmc/mmc-r10a.pdf See
-    especially tables 72, 73 and 75.
-  */
-  discmode_t mmc_get_discmode( const CdIo_t *p_cdio );
-  
-  
-  /**
-    Get drive capabilities for a device.
-    @return the drive capabilities.
-  */
-  void mmc_get_drive_cap ( CdIo_t *p_cdio,
-                           /*out*/ cdio_drive_read_cap_t  *p_read_cap,
-                           /*out*/ cdio_drive_write_cap_t *p_write_cap,
-                           /*out*/ cdio_drive_misc_cap_t  *p_misc_cap);
-  
-  typedef enum {
-    CDIO_MMC_LEVEL_WEIRD,
-    CDIO_MMC_LEVEL_1,
-    CDIO_MMC_LEVEL_2,
-    CDIO_MMC_LEVEL_3,
-    CDIO_MMC_LEVEL_NONE
-  } cdio_mmc_level_t;
-  
-  /**
-    Get the MMC level supported by the device.
-  */
-  cdio_mmc_level_t mmc_get_drive_mmc_cap(CdIo_t *p_cdio);
-  
-
-  /** 
-    Get the DVD type associated with cd object.
-    
-    @return the DVD discmode.
-  */
-  discmode_t mmc_get_dvd_struct_physical ( const CdIo_t *p_cdio, 
-                                           cdio_dvd_struct_t *s);
-  
-  /*! 
-    Return results of media status
-    @param p_cdio the CD object to be acted upon.
-    @param out_buf media status code from operation
-    @return DRIVER_OP_SUCCESS (0) if we got the status.
-    return codes are the same as driver_return_code_t
-   */
-  int mmc_get_event_status(const CdIo_t *p_cdio, uint8_t out_buf[2]);
-
-  /*! 
-    Find out if media tray is open or closed.
-    @param p_cdio the CD object to be acted upon.
-    @return 1 if media is open, 0 if closed. Error
-    return codes are the same as driver_return_code_t
-  */
-  int mmc_get_tray_status ( const CdIo_t *p_cdio );
-
-  /** 
-    Get the CD-ROM hardware info via an MMC INQUIRY command.
-    
-    @return true if we were able to get hardware info, false if we had
-    an error.
-  */
-  bool mmc_get_hwinfo ( const CdIo_t *p_cdio, 
-                        /* out*/ cdio_hwinfo_t *p_hw_info );
-  
-  
-  /** 
-    Find out if media has changed since the last call.
-    @param p_cdio the CD object to be acted upon.
-    @return 1 if media has changed since last call, 0 if not. Error
-    return codes are the same as driver_return_code_t
-  */
-  int mmc_get_media_changed(const CdIo_t *p_cdio);
-  
-  /**
-    Get the media catalog number (MCN) from the CD via MMC.
-    
-    @return the media catalog number r NULL if there is none or we
-    don't have the ability to get it.
-    
-    Note: string is malloc'd so caller has to free() the returned
-    string when done with it.
-    
-  */
-  char * mmc_get_mcn ( const CdIo_t *p_cdio );
-  
-  /** Get the output port volumes and port selections used on AUDIO PLAY
-      commands via a MMC MODE SENSE command using the CD Audio Control
-      Page.
-  */
-  driver_return_code_t mmc_audio_get_volume (CdIo_t *p_cdio,  /*out*/
-                                             mmc_audio_volume_t *p_volume);
-  
-  /**
-    Report if CD-ROM has a praticular kind of interface (ATAPI, SCSCI, ...)
-    Is it possible for an interface to have serveral? If not this 
-    routine could probably return the single mmc_feature_interface_t.
-    @return true if we have the interface and false if not.
-  */
-  bool_3way_t mmc_have_interface( CdIo_t *p_cdio, 
-                                  cdio_mmc_feature_interface_t e_interface );
-  
-  /** Run a MODE_SENSE command (6- or 10-byte version) 
-    and put the results in p_buf 
-    @return DRIVER_OP_SUCCESS if we ran the command ok.
-  */
-  int mmc_mode_sense( CdIo_t *p_cdio, /*out*/ void *p_buf, int i_size, 
-                      int page);
-  
-  
-  /** Run a MODE_SENSE command (10-byte version) 
-    and put the results in p_buf 
-    @return DRIVER_OP_SUCCESS if we ran the command ok.
-  */
-  int  mmc_mode_sense_10( CdIo_t *p_cdio, /*out*/ void *p_buf, int i_size, 
-                          int page);
-  
-  /** Run a MODE_SENSE command (6-byte version) 
-    and put the results in p_buf 
-    @return DRIVER_OP_SUCCESS if we ran the command ok.
-  */
-  int  mmc_mode_sense_6( CdIo_t *p_cdio, /*out*/ void *p_buf, int i_size, 
-                         int page);
-  
-  /** Issue a MMC READ_CD command.
-    
-  @param p_cdio  object to read from 
-  
-  @param p_buf   Place to store data. The caller should ensure that 
-  p_buf can hold at least i_blocksize * i_blocks  bytes.
-  
-  @param i_lsn   sector to read 
-  
-  @param expected_sector_type restricts reading to a specific CD
-  sector type.  Only 3 bits with values 1-5 are used:
-    0 all sector types
-    1 CD-DA sectors only 
-    2 Mode 1 sectors only
-    3 Mode 2 formless sectors only. Note in contrast to all other
-      values an MMC CD-ROM is not required to support this mode.
-    4 Mode 2 Form 1 sectors only
-    5 Mode 2 Form 2 sectors only
-
-  @param b_digital_audio_play Control error concealment when the
-  data being read is CD-DA.  If the data being read is not CD-DA,
-  this parameter is ignored.  If the data being read is CD-DA and
-  DAP is false zero, then the user data returned should not be
-  modified by flaw obscuring mechanisms such as audio data mute and
-  interpolate.  If the data being read is CD-DA and DAP is true,
-  then the user data returned should be modified by flaw obscuring
-  mechanisms such as audio data mute and interpolate.  
-  
-  b_sync_header return the sync header (which will probably have
-  the same value as CDIO_SECTOR_SYNC_HEADER of size
-  CDIO_CD_SYNC_SIZE).
-  
-  @param header_codes Header Codes refer to the sector header and
-  the sub-header that is present in mode 2 formed sectors: 
-  
-   0 No header information is returned.  
-   1 The 4-byte sector header of data sectors is be returned, 
-   2 The 8-byte sector sub-header of mode 2 formed sectors is
-     returned.  
-   3 Both sector header and sub-header (12 bytes) is returned.  
-   The Header preceeds the rest of the bytes (e.g. user-data bytes) 
-   that might get returned.
-   
-   @param b_user_data  Return user data if true. 
-   
-   For CD-DA, the User Data is CDIO_CD_FRAMESIZE_RAW bytes.
-
-   For Mode 1, The User Data is ISO_BLOCKSIZE bytes beginning at
-   offset CDIO_CD_HEADER_SIZE+CDIO_CD_SUBHEADER_SIZE.
-   
-   For Mode 2 formless, The User Data is M2RAW_SECTOR_SIZE bytes
-   beginning at offset CDIO_CD_HEADER_SIZE+CDIO_CD_SUBHEADER_SIZE.
-   
-   For data Mode 2, form 1, User Data is ISO_BLOCKSIZE bytes beginning at
-   offset CDIO_CD_XA_SYNC_HEADER.
-   
-   For data Mode 2, form 2, User Data is 2 324 bytes beginning at
-   offset CDIO_CD_XA_SYNC_HEADER.
-   
-   @param b_sync 
-
-   @param b_edc_ecc true if we return EDC/ECC error detection/correction bits.
-   
-   The presence and size of EDC redundancy or ECC parity is defined
-   according to sector type: 
-   
-   CD-DA sectors have neither EDC redundancy nor ECC parity.  
-   
-   Data Mode 1 sectors have 288 bytes of EDC redundancy, Pad, and
-   ECC parity beginning at offset 2064.
-   
-   Data Mode 2 formless sectors have neither EDC redundancy nor ECC
-   parity
-   
-   Data Mode 2 form 1 sectors have 280 bytes of EDC redundancy and
-   ECC parity beginning at offset 2072
-   
-   Data Mode 2 form 2 sectors optionally have 4 bytes of EDC
-   redundancy beginning at offset 2348.
-   
-   
-   @param c2_error_information If true associate a bit with each
-   sector for C2 error The resulting bit field is ordered exactly as
-   the main channel bytes.  Each 8-bit boundary defines a byte of
-   flag bits.
-   
-   @param subchannel_selection subchannel-selection bits
-   
-     0  No Sub-channel data shall be returned.  (0 bytes)
-     1  RAW P-W Sub-channel data shall be returned.  (96 byte)
-     2  Formatted Q sub-channel data shall be transferred (16 bytes)
-     3  Reserved     
-     4  Corrected and de-interleaved R-W sub-channel (96 bytes)
-     5-7  Reserved
-
-   @param i_blocksize size of the a block expected to be returned
-     
-   @param i_blocks number of blocks expected to be returned.
-     
-  */
-  driver_return_code_t
-  mmc_read_cd ( const CdIo_t *p_cdio, void *p_buf, lsn_t i_lsn, 
-                int expected_sector_type, bool b_digital_audio_play,
-                bool b_sync, uint8_t header_codes, bool b_user_data, 
-                bool b_edc_ecc, uint8_t c2_error_information, 
-                uint8_t subchannel_selection, uint16_t i_blocksize, 
-                uint32_t i_blocks );
-  
-  /** Read just the user data part of some sort of data sector (via 
-    mmc_read_cd). 
-    
-    @param p_cdio object to read from
-
-    @param p_buf place to read data into.  The caller should make sure
-                 this location can store at least CDIO_CD_FRAMESIZE,
-                 M2RAW_SECTOR_SIZE, or M2F2_SECTOR_SIZE depending on
-                 the kind of sector getting read. If you don't know
-                 whether you have a Mode 1/2, Form 1/ Form 2/Formless
-                 sector best to reserve space for the maximum,
-                 M2RAW_SECTOR_SIZE.
-
-    @param i_lsn sector to read
-    @param i_blocksize size of each block
-    @param i_blocks number of blocks to read
-
-  */
-  driver_return_code_t mmc_read_data_sectors ( CdIo_t *p_cdio, void *p_buf, 
-                                               lsn_t i_lsn, 
-                                               uint16_t i_blocksize,
-                                               uint32_t i_blocks );
-  
-  /** Read sectors using SCSI-MMC GPCMD_READ_CD. 
-      Can read only up to 25 blocks.
-   */
-  driver_return_code_t mmc_read_sectors ( const CdIo_t *p_cdio, void *p_buf, 
-                                          lsn_t i_lsn,  int read_sector_type, 
-                                          uint32_t i_blocks);
-  
-  /**
-    Run a Multimedia command (MMC). 
-    
-    @param p_cdio	 CD structure set by cdio_open().
-    @param i_timeout_ms  time in milliseconds we will wait for the command
-                         to complete. 
-    @param p_cdb	 CDB bytes. All values that are needed should be set 
-                         on input. We'll figure out what the right CDB length 
-                         should be.
-    @param e_direction   direction the transfer is to go.
-    @param i_buf	 Size of buffer
-    @param p_buf	 Buffer for data, both sending and receiving.
-
-    @return 0 if command completed successfully.
-  */
-  driver_return_code_t
-  mmc_run_cmd( const CdIo_t *p_cdio, unsigned int i_timeout_ms,
-               const mmc_cdb_t *p_cdb,
-               cdio_mmc_direction_t e_direction, unsigned int i_buf, 
-               /*in/out*/ void *p_buf );
-
-  /**
-    Run a Multimedia command (MMC) specifying the CDB length.
-    The motivation here is for example ot use in is an undocumented 
-    debug command for LG drives (namely E7), whose length is being 
-    miscalculated by mmc_get_cmd_len(); it doesn't follow the usual 
-    code number to length conventions. Patch supplied by SukkoPera.
-
-    @param p_cdio	 CD structure set by cdio_open().
-    @param i_timeout_ms  time in milliseconds we will wait for the command
-                         to complete. 
-    @param p_cdb	 CDB bytes. All values that are needed should be set 
-                         on input. 
-    @param i_cdb	 number of CDB bytes. 
-    @param e_direction   direction the transfer is to go.
-    @param i_buf	 Size of buffer
-    @param p_buf	 Buffer for data, both sending and receiving.
-
-    @return 0 if command completed successfully.
-  */
-  driver_return_code_t
-  mmc_run_cmd_len( const CdIo_t *p_cdio, unsigned int i_timeout_ms,
-                   const mmc_cdb_t *p_cdb, unsigned int i_cdb,
-                   cdio_mmc_direction_t e_direction, unsigned int i_buf,
-                   /*in/out*/ void *p_buf );
-
-  /**
-    Set the block size for subsequest read requests, via MMC.
-  */
-  driver_return_code_t mmc_set_blocksize ( const CdIo_t *p_cdio, 
-                                           uint16_t i_blocksize);
-  
-  /**
-    Set the drive speed in CD-ROM speed units.
-
-    @param p_cdio	   CD structure set by cdio_open().
-    @param i_drive_speed   speed in CD-ROM speed units. Note this
-                           not Kbs as would be used in the MMC spec or
-		           in mmc_set_speed(). To convert CD-ROM speed units 
-			   to Kbs, multiply the number by 176 (for raw data)
-			   and by 150 (for filesystem data). On many CD-ROM 
-			   drives, specifying a value too large will result 
-			   in using the fastest speed.
-
-    @return the drive speed if greater than 0. -1 if we had an error. is -2
-    returned if this is not implemented for the current driver.
-
-     @see cdio_set_speed and mmc_set_speed
-  */
-  driver_return_code_t mmc_set_drive_speed( const CdIo_t *p_cdio, 
-                                            int i_drive_speed );
-  
-  /**
-    Set the drive speed in K bytes per second.
-
-    @param p_cdio	 CD structure set by cdio_open().
-    @param i_Kbs_speed   speed in K bytes per second. Note this is 
-                         not in standard CD-ROM speed units, e.g.
-                         1x, 4x, 16x as it is in cdio_set_speed.
-                         To convert CD-ROM speed units to Kbs,
-                         multiply the number by 176 (for raw data)
-                         and by 150 (for filesystem data). 
-                         Also note that ATAPI specs say that a value
-                         less than 176 will result in an error.
-                         On many CD-ROM drives,
-                         specifying a value too large will result in using
-                         the fastest speed.
-
-    @return the drive speed if greater than 0. -1 if we had an error. is -2
-    returned if this is not implemented for the current driver.
-
-    @see cdio_set_speed and mmc_set_drive_speed
-  */
-  driver_return_code_t mmc_set_speed( const CdIo_t *p_cdio, 
-                                      int i_Kbs_speed );
-  
-  /**
-    Load or Unload media using a MMC START STOP command. 
-    
-    @param p_cdio  the CD object to be acted upon.
-    @param b_eject eject if true and close tray if false
-    @param b_immediate wait or don't wait for operation to complete
-    @param power_condition Set CD-ROM to idle/standby/sleep. If nonzero
-    eject/load is ignored, so set to 0 if you want to eject or load.
-    
-    @see mmc_eject_media or mmc_close_tray
-  */
-  driver_return_code_t
-  mmc_start_stop_media(const CdIo_t *p_cdio, bool b_eject, bool b_immediate,
-                       uint8_t power_condition);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-/** The below variables are trickery to force the above enum symbol
-    values to be recorded in debug symbol tables. They are used to
-    allow one to refer to the enumeration value names in the typedefs
-    above in a debugger and debugger expressions
-*/
-extern cdio_mmc_feature_t           debug_cdio_mmc_feature;
-extern cdio_mmc_feature_interface_t debug_cdio_mmc_feature_interface;
-extern cdio_mmc_feature_profile_t   debug_cdio_mmc_feature_profile;
-extern cdio_mmc_get_conf_t          debug_cdio_mmc_get_conf;
-extern cdio_mmc_gpcmd_t             debug_cdio_mmc_gpcmd;
-extern cdio_mmc_read_sub_state_t    debug_cdio_mmc_read_sub_state;
-extern cdio_mmc_read_cd_type_t      debug_cdio_mmc_read_cd_type;
-extern cdio_mmc_readtoc_t           debug_cdio_mmc_readtoc;
-extern cdio_mmc_mode_page_t         debug_cdio_mmc_mode_page;
-  
-#endif /* __MMC_H__ */
-
-/* 
- * Local variables:
- *  c-file-style: "gnu"
- *  tab-width: 8
- *  indent-tabs-mode: nil
- * End:
- */
diff --git a/lib-x86-64/include/cdio/paranoia.h b/lib-x86-64/include/cdio/paranoia.h
deleted file mode 100644
index 02b50002..00000000
--- a/lib-x86-64/include/cdio/paranoia.h
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
-    $Id: paranoia.h,v 1.15 2008/03/25 15:59:09 karl Exp $
-
-    Copyright (C) 2004, 2005, 2006, 2007, 2008 Rocky Bernstein <rocky@gnu.org>
-    Copyright (C) 1998 Monty xiphmont@mit.edu
-  
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-/** \file paranoia.h 
- *
- *  \brief The top-level header for libcdda_paranoia: a device- and OS-
- *  independent library for reading CD-DA with error tolerance and
- *  repair. Applications include this for paranoia access.
- */
-
-#ifndef _CDIO_PARANOIA_H_
-#define _CDIO_PARANOIA_H_
-
-#include <cdio/cdda.h>
-
-/*! Paranoia likes to work with 16-bit numbers rather than
-    (possibly byte-swapped) bytes. So there are this many 
-    16-bit numbers block (frame, or sector) read.
-*/
-#define CD_FRAMEWORDS (CDIO_CD_FRAMESIZE_RAW/2)
-
-/**
-  Flags used in paranoia_modeset. 
-
-  The enumeration type one probably wouldn't really use in a program.
-  It is here instead of defines to give symbolic names that can be
-  helpful in debuggers where wants just to say refer to
-  PARANOIA_MODE_DISABLE and get the correct value.
-*/
-
-typedef enum  {
-  PARANOIA_MODE_DISABLE   =  0x00, /**< No fixups */
-  PARANOIA_MODE_VERIFY    =  0x01, /**< Verify data integrety in overlap area*/
-  PARANOIA_MODE_FRAGMENT  =  0x02, /**< unsupported */
-  PARANOIA_MODE_OVERLAP   =  0x04, /**< Perform overlapped reads */
-  PARANOIA_MODE_SCRATCH   =  0x08, /**< unsupported */
-  PARANOIA_MODE_REPAIR    =  0x10, /**< unsupported */
-  PARANOIA_MODE_NEVERSKIP =  0x20, /**< Do not skip failed reads (retry 
-				      maxretries) */
-  PARANOIA_MODE_FULL      =  0xff, /**< Maximum paranoia - all of the above 
-				        (except disable) */
-} paranoia_mode_t;
-  
-
-/**
-   Flags set in a callback.
-
-  The enumeration type one probably wouldn't really use in a program.
-  It is here instead of defines to give symbolic names that can be
-  helpful in debuggers where wants just to say refer to
-  PARANOIA_CB_READ and get the correct value.
-*/
-typedef enum  {
-  PARANOIA_CB_READ,           /**< Read off adjust ??? */
-  PARANOIA_CB_VERIFY,         /**< Verifying jitter */
-  PARANOIA_CB_FIXUP_EDGE,     /**< Fixed edge jitter */
-  PARANOIA_CB_FIXUP_ATOM,     /**< Fixed atom jitter */
-  PARANOIA_CB_SCRATCH,        /**< Unsupported */
-  PARANOIA_CB_REPAIR,         /**< Unsupported */
-  PARANOIA_CB_SKIP,           /**< Skip exhausted retry */
-  PARANOIA_CB_DRIFT,          /**< Skip exhausted retry */
-  PARANOIA_CB_BACKOFF,        /**< Unsupported */
-  PARANOIA_CB_OVERLAP,        /**< Dynamic overlap adjust */
-  PARANOIA_CB_FIXUP_DROPPED,  /**< Fixed dropped bytes */
-  PARANOIA_CB_FIXUP_DUPED,    /**< Fixed duplicate bytes */
-  PARANOIA_CB_READERR         /**< Hard read error */
-} paranoia_cb_mode_t;
-
-  extern const char *paranoia_cb_mode2str[];
-  
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-  /*! 
-    Get and initialize a new cdrom_paranoia object from cdrom_drive.
-    Run this before calling any of the other paranoia routines below.
-
-    @return new cdrom_paranoia object Call paranoia_free() when you are
-    done with it
-   */
-  extern cdrom_paranoia_t *cdio_paranoia_init(cdrom_drive_t *d);
-  
-  /*!
-    Free any resources associated with p.
-
-    @param p       paranoia object to for which resources are to be freed.
-
-    @see paranoia_init.
-   */
-  extern void cdio_paranoia_free(cdrom_paranoia_t *p);
-
-  /*! 
-    Set the kind of repair you want to on for reading. 
-    The modes are listed above
-
-    @param p             paranoia type
-    @param mode_flags    paranoia mode flags built from values in 
-                         paranoia_mode_t, e.g. 
-		         PARANOIA_MODE_FULL^PARANOIA_MODE_NEVERSKIP
-   */
-  extern void cdio_paranoia_modeset(cdrom_paranoia_t *p, int mode_flags);
-
-  /*!
-    reposition reading offset. 
-
-    @param p       paranoia type
-    @param seek    byte offset to seek to
-    @param whence  like corresponding parameter in libc's lseek, e.g. 
-                   SEEK_SET or SEEK_END.
-  */
-  extern lsn_t cdio_paranoia_seek(cdrom_paranoia_t *p, off_t seek, int whence);
-
-  /*!
-    Reads the next sector of audio data and returns a pointer to a full
-    sector of verified samples. 
-    
-    @param p paranoia object.
-
-    @param callback callback routine which gets called with the status
-    on each read.
-
-    @return the audio data read, CDIO_CD_FRAMESIZE_RAW (2352)
-    bytes. This data is not to be freed by the caller. It will persist
-    only until the next call to paranoia_read() for this p.
-  */
-  extern int16_t *cdio_paranoia_read(cdrom_paranoia_t *p,
-				     void(*callback)(long int, 
-						     paranoia_cb_mode_t));
-
-  /*! The same as cdio_paranoia_read but the number of retries is set.
-    @param p paranoia object.
-
-    @param callback callback routine which gets called with the status
-    on each read.
-
-    @param max_retries number of times to try re-reading a block before
-    failing.
-
-    @return the block of CDIO_FRAMEIZE_RAW bytes (or
-    CDIO_FRAMESIZE_RAW / 2 16-bit integers). Unless byte-swapping has
-    been turned off the 16-bit integers Endian independent order.
-
-    @see cdio_paranoia_read.
-    
-  */
-  extern int16_t *cdio_paranoia_read_limited(cdrom_paranoia_t *p,
-					     void(*callback)(long int, 
-							   paranoia_cb_mode_t),
-					     int max_retries);
-
-
-/*! a temporary hack */
-  extern void cdio_paranoia_overlapset(cdrom_paranoia_t *p,long overlap);
-
-  extern void cdio_paranoia_set_range(cdrom_paranoia_t *p, long int start, 
-				      long int end);
-
-#ifndef DO_NOT_WANT_PARANOIA_COMPATIBILITY
-/** For compatibility with good ol' paranoia */
-#define cdrom_paranoia        cdrom_paranoia_t
-#define paranoia_init         cdio_paranoia_init
-#define paranoia_free         cdio_paranoia_free
-#define paranoia_modeset      cdio_paranoia_modeset
-#define paranoia_seek         cdio_paranoia_seek
-#define paranoia_read         cdio_paranoia_read
-#define paranoia_read_limited cdio_paranoia_read_limited
-#define paranoia_overlapset   cdio_paranoia_overlapset
-#define paranoia_set_range    cdio_paranoia_set_range
-#endif /*DO_NOT_WANT_PARANOIA_COMPATIBILITY*/
-
-#ifdef __cplusplus
-}
-#endif
-
-/** The below variables are trickery to force the above enum symbol
-    values to be recorded in debug symbol tables. They are used to
-    allow one to refer to the enumeration value names in the typedefs
-    above in a debugger and debugger expressions
-*/
-
-extern paranoia_mode_t    debug_paranoia_mode;
-extern paranoia_cb_mode_t debug_paranoia_cb_mode;
-
-#endif /*_CDIO_PARANOIA_H_*/
diff --git a/lib-x86-64/include/cdio/posix.h b/lib-x86-64/include/cdio/posix.h
deleted file mode 100644
index 89e0ad37..00000000
--- a/lib-x86-64/include/cdio/posix.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-    $Id: posix.h,v 1.2 2008/03/25 15:59:09 karl Exp $
-
-    Copyright (C) 2005, 2008 Rocky Bernstein <rocky@gnu.org>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-/*!
- * \file posix.h 
- *
- * \brief various POSIX definitions.
-*/
-
-#ifndef __CDIO_POSIX_H__
-#define __CDIO_POSIX_H__
-
-typedef uint32_t posix_mode_t;
-typedef uint32_t posix_nlink_t;
-typedef uint32_t posix_uid_t;
-typedef uint32_t posix_gid_t;
-typedef uint16_t unicode16_t;
-
-#endif /* __CDIO_POSIX_H__ */
-
-
-/* 
- * Local variables:
- *  c-file-style: "gnu"
- *  tab-width: 8
- *  indent-tabs-mode: nil
- * End:
- */
diff --git a/lib-x86-64/include/cdio/read.h b/lib-x86-64/include/cdio/read.h
deleted file mode 100644
index 81e5148a..00000000
--- a/lib-x86-64/include/cdio/read.h
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
-    $Id: read.h,v 1.15 2008/03/25 15:59:09 karl Exp $
-
-    Copyright (C) 2005, 2006, 2007, 2008 Rocky Bernstein <rocky@gnu.org>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-/** \file read.h 
- *
- *  \brief The top-level header for sector (block, frame)-related
- *  libcdio calls. 
- */
-
-#ifndef __CDIO_READ_H__
-#define __CDIO_READ_H__
-
-#ifndef EXTERNAL_LIBCDIO_CONFIG_H
-#define EXTERNAL_LIBCDIO_CONFIG_H
-/* Need for HAVE_SYS_TYPES_H */
-#include <cdio/cdio_config.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-/* Some systems need this for off_t and ssize. */
-#include <sys/types.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-  /** All the different ways a block/sector can be read. */
-  typedef enum {
-    CDIO_READ_MODE_AUDIO,  /**< CD-DA, audio, Red Book */
-    CDIO_READ_MODE_M1F1,   /**< Mode 1 Form 1 */
-    CDIO_READ_MODE_M1F2,   /**< Mode 1 Form 2 */
-    CDIO_READ_MODE_M2F1,   /**< Mode 2 Form 1 */
-    CDIO_READ_MODE_M2F2    /**< Mode 2 Form 2 */
-  } cdio_read_mode_t;
-  
-  /*!
-    Reposition read offset
-    Similar to (if not the same as) libc's fseek()
-
-    @param p_cdio object which gets adjusted
-    @param offset amount to seek
-    @param whence  like corresponding parameter in libc's fseek, e.g. 
-                   SEEK_SET or SEEK_END.
-    @return (off_t) -1 on error. 
-  */
-
-  off_t cdio_lseek(const CdIo_t *p_cdio, off_t offset, int whence);
-    
-  /*!  Reads into buf the next size bytes.  Similar to (if not the
-    same as) libc's read(). This is a "cooked" read, or one handled by
-    the OS. It probably won't work on audio data. For that use
-    cdio_read_audio_sector(s).
-
-    @param p_cdio object to read from
-    @param p_buf place to read data into. The caller should make sure
-                 this location can store at least i_size bytes.
-    @param i_size number of bytes to read
-
-    @return (ssize_t) -1 on error. 
-  */
-  ssize_t cdio_read(const CdIo_t *p_cdio, void *p_buf, size_t i_size);
-    
-  /*!
-    Read an audio sector
-
-    @param p_cdio object to read from
-    @param p_buf place to read data into. The caller should make sure
-                 this location can store at least CDIO_FRAMESIZE_RAW
-		 bytes.
-    @param i_lsn sector to read
-  */
-  driver_return_code_t cdio_read_audio_sector (const CdIo_t *p_cdio, 
-					       void *p_buf, lsn_t i_lsn);
-
-  /*!
-    Reads audio sectors
-
-    @param p_cdio object to read from
-    @param p_buf place to read data into. The caller should make sure
-                 this location can store at least CDIO_FRAMESIZE_RAW
-		 * i_blocks bytes.
-    @param i_lsn sector to read
-    @param i_blocks number of sectors to read
-  */
-  driver_return_code_t cdio_read_audio_sectors (const CdIo_t *p_cdio, 
-						void *p_buf, lsn_t i_lsn,
-						uint32_t i_blocks);
-
-  /*!
-    Read data sectors
-
-    @param p_cdio object to read from
-    @param p_buf place to read data into.  The caller should make sure
-                 this location can store at least ISO_BLOCKSIZE, 
-		 M2RAW_SECTOR_SIZE, or M2F2_SECTOR_SIZE depending
-		 on the kind of sector getting read. If you don't 
-		 know whether you have a Mode 1/2, Form 1/ Form 2/Formless
-		 sector best to reserve space for the maximum, 
-		 M2RAW_SECTOR_SIZE.
-    @param i_lsn sector to read
-    @param i_blocksize size of block. Should be either CDIO_CD_FRAMESIZE, 
-    M2RAW_SECTOR_SIZE, or M2F2_SECTOR_SIZE. See comment above under p_buf.
-
-    @param i_blocks number of blocks to read
-  */
-  driver_return_code_t cdio_read_data_sectors ( const CdIo_t *p_cdio, 
-						void *p_buf, lsn_t i_lsn,
-						uint16_t i_blocksize,
-						uint32_t i_blocks );
-  /*!
-    Reads a mode 1 sector
-
-    @param p_cdio object to read from
-    @param p_buf place to read data into.
-    @param i_lsn sector to read
-    @param b_form2 true for reading mode 1 form 2 sectors or false for 
-    mode 1 form 1 sectors.
-  */
-  driver_return_code_t cdio_read_mode1_sector (const CdIo_t *p_cdio, 
-					       void *p_buf, lsn_t i_lsn, 
-					       bool b_form2);
-  /*!
-    Reads mode 1 sectors
-
-    @param p_cdio object to read from
-    @param p_buf place to read data into
-    @param i_lsn sector to read
-    @param b_form2 true for reading mode 1 form 2 sectors or false for 
-    mode 1 form 1 sectors.
-    @param i_blocks number of sectors to read
-  */
-  driver_return_code_t cdio_read_mode1_sectors (const CdIo_t *p_cdio, 
-						void *p_buf, lsn_t i_lsn, 
-						bool b_form2, 
-						uint32_t i_blocks);
-  /*!
-    Reads a mode 2 sector
-
-    @param p_cdio object to read from
-    @param p_buf place to read data into. The caller should make sure
-                 this location can store at least 
-		 M2RAW_SECTOR_SIZE (for form 1) or CDIO_CD_FRAMESIZE (for 
-		 form 2) bytes.
-    @param i_lsn sector to read
-    @param b_form2 true for reading mode 2 form 2 sectors or false for 
-    mode 2 form 1 sectors.
-
-    @return 0 if no error, nonzero otherwise.
-  */
-  driver_return_code_t cdio_read_mode2_sector (const CdIo_t *p_cdio, 
-					       void *p_buf, lsn_t i_lsn, 
-					       bool b_form2);
-  
-  /** The special case of reading a single block is a common one so we
-      provide a routine for that as a convenience.
-  */
-  driver_return_code_t cdio_read_sector(const CdIo_t *p_cdio, void *p_buf, 
-					lsn_t i_lsn, 
-					cdio_read_mode_t read_mode);
-  /*!
-    Reads mode 2 sectors
-
-    @param p_cdio object to read from
-    @param p_buf place to read data into. The caller should make sure
-                 this location can store at least 
-		 M2RAW_SECTOR_SIZE (for form 1) or CDIO_CD_FRAMESIZE (for 
-		 form 2) * i_blocks bytes.
-    @param i_lsn sector to read
-    @param b_form2 true for reading mode2 form 2 sectors or false for 
-           mode 2  form 1 sectors.
-    @param i_blocks number of sectors to read
-
-    @return 0 if no error, nonzero otherwise.
-  */
-  driver_return_code_t cdio_read_mode2_sectors (const CdIo_t *p_cdio, 
-						void *p_buf, lsn_t i_lsn, 
-						bool b_form2, 
-						uint32_t i_blocks);
-  
-  /*!
-    Reads a number of sectors (AKA blocks).
-
-    @param p_cdio cdio object
-    @param p_buf place to read data into. The caller should make sure
-    this location is large enough. See below for size information.
-    @param read_mode the kind of "mode" to use in reading.
-    @param i_lsn sector to read
-    @param i_blocks number of sectors to read
-    @return DRIVER_OP_SUCCESS (0) if no error, other (negative) enumerations
-    are returned on error.
-
-    If read_mode is CDIO_MODE_AUDIO,
-      *p_buf should hold at least CDIO_FRAMESIZE_RAW * i_blocks bytes.
-
-    If read_mode is CDIO_MODE_DATA,
-      *p_buf should hold at least i_blocks times either ISO_BLOCKSIZE, 
-      M1RAW_SECTOR_SIZE or M2F2_SECTOR_SIZE depending on the kind of 
-      sector getting read. If you don't know whether you have a Mode 1/2, 
-    Form 1/ Form 2/Formless sector best to reserve space for the maximum
-    which is M2RAW_SECTOR_SIZE.
-
-    If read_mode is CDIO_MODE_M2F1,
-    *p_buf should hold at least M2RAW_SECTOR_SIZE * i_blocks bytes.
-    
-    If read_mode is CDIO_MODE_M2F2,
-    *p_buf should hold at least CDIO_CD_FRAMESIZE * i_blocks bytes.
-    
-  */
-  driver_return_code_t cdio_read_sectors(const CdIo_t *p_cdio, void *p_buf, 
-					 lsn_t i_lsn, 
-					 cdio_read_mode_t read_mode,
-					 uint32_t i_blocks);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __CDIO_TRACK_H__ */
diff --git a/lib-x86-64/include/cdio/rock.h b/lib-x86-64/include/cdio/rock.h
deleted file mode 100644
index 57003276..00000000
--- a/lib-x86-64/include/cdio/rock.h
+++ /dev/null
@@ -1,396 +0,0 @@
-/*
-    $Id: rock.h,v 1.15 2008/03/25 15:59:09 karl Exp $
-
-    Copyright (C) 2005, 2006 2008 Rocky Bernstein <rocky@panix.com>
-
-    See also rock.c by Eric Youngdale (1993) from GNU/Linux 
-    This is Copyright 1993 Yggdrasil Computing, Incorporated
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-/*!
-   \file rock.h 
-   \brief Things related to the Rock Ridge Interchange Protocol (RRIP)
-
-   Applications will probably not include this directly but via 
-   the iso9660.h header.
-*/
-
-
-#ifndef __CDIO_ROCK_H__
-#define __CDIO_ROCK_H__
-
-#include <cdio/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* MSYS 1.0.10 with MinGW 3.4.2 (and perhaps others) don't have
-   S_ISSOCK() or S_ISLNK() macros, so we'll roll our own. */
-#if !defined(HAVE_S_ISSOCK) && !defined(S_ISSOCK)
-#define S_ISSOCK(st_mode) ((((st_mode)) & 0170000) == (0140000))
-#endif
-
-#if !defined(HAVE_S_ISLNK) && !defined(S_ISLNK)
-#define S_ISLNK(st_mode) ((((st_mode)) & 0170000) == (0010000))
-#endif
-
-/*! An enumeration for some of the ISO_ROCK_* \#defines below. This isn't
-  really an enumeration one would really use in a program it is to
-  be helpful in debuggers where wants just to refer to the ISO_ROCK_*
-  names and get something.
-*/
-extern enum iso_rock_enums {
-  ISO_ROCK_IRUSR  = 000400,   /**< read permission (owner) */
-  ISO_ROCK_IWUSR  = 000200,   /**< write permission (owner) */
-  ISO_ROCK_IXUSR  = 000100,   /**< execute permission (owner) */
-  ISO_ROCK_IRGRP  = 000040,   /**< read permission (group) */
-  ISO_ROCK_IWGRP  = 000020,   /**< write permission (group) */
-  ISO_ROCK_IXGRP  = 000010,   /**< execute permission (group) */
-  ISO_ROCK_IROTH  = 000004,   /**< read permission (other) */
-  ISO_ROCK_IWOTH  = 000002,   /**< write permission (other) */
-  ISO_ROCK_IXOTH  = 000001,   /**< execute permission (other) */
-
-  ISO_ROCK_ISUID  = 004000,   /**< set user ID on execution */
-  ISO_ROCK_ISGID  = 002000,   /**< set group ID on execution */
-  ISO_ROCK_ISVTX  = 001000,   /**< save swapped text even after use */
-
-  ISO_ROCK_ISSOCK = 0140000,  /**< socket */
-  ISO_ROCK_ISLNK  = 0120000,  /**< symbolic link */
-  ISO_ROCK_ISREG  = 0100000,  /**< regular */
-  ISO_ROCK_ISBLK  = 060000,   /**< block special */
-  ISO_ROCK_ISCHR  = 020000,   /**< character special */
-  ISO_ROCK_ISDIR  = 040000,   /**< directory */
-  ISO_ROCK_ISFIFO = 010000    /**< pipe or FIFO */
-} iso_rock_enums;
-
-#define ISO_ROCK_IRUSR    000400  /** read permission (owner) */
-#define ISO_ROCK_IWUSR    000200  /** write permission (owner) */
-#define ISO_ROCK_IXUSR    000100  /** execute permission (owner) */
-#define ISO_ROCK_IRGRP    000040  /** read permission (group) */
-#define ISO_ROCK_IWGRP    000020  /** write permission (group) */
-#define ISO_ROCK_IXGRP    000010  /** execute permission (group) */
-#define ISO_ROCK_IROTH    000004  /** read permission (other) */
-#define ISO_ROCK_IWOTH    000002  /** write permission (other) */
-#define ISO_ROCK_IXOTH    000001  /** execute permission (other) */
-
-#define ISO_ROCK_ISUID    004000  /** set user ID on execution */
-#define ISO_ROCK_ISGID    002000  /** set group ID on execution */
-#define ISO_ROCK_ISVTX    001000  /** save swapped text even after use */
-
-#define ISO_ROCK_ISSOCK  0140000  /** socket */
-#define ISO_ROCK_ISLNK   0120000  /** symbolic link */
-#define ISO_ROCK_ISREG   0100000  /** regular */
-#define ISO_ROCK_ISBLK    060000  /** block special */
-#define ISO_ROCK_ISCHR    020000  /** character special */
-#define ISO_ROCK_ISDIR    040000  /** directory */
-#define ISO_ROCK_ISFIFO   010000  /** pipe or FIFO */
-
-/** Enforced file locking (shared w/set group ID) */
-#define ISO_ROCK_ENFMT ISO_ROCK_ISGID
-
-PRAGMA_BEGIN_PACKED
-
-/*! The next two structs are used by the system-use-sharing protocol
-   (SUSP), in which the Rock Ridge extensions are embedded.  It is
-   quite possible that other extensions are present on the disk, and
-   this is fine as long as they all use SUSP. */
-
-/*! system-use-sharing protocol */
-typedef struct iso_su_sp_s{
-  unsigned char magic[2];
-  uint8_t       skip;
-} GNUC_PACKED iso_su_sp_t;
-
-/*! system-use extension record */
-typedef struct iso_su_er_s {
-  iso711_t      len_id;  /**< Identifier length. Value 10?. */
-  unsigned char len_des;
-  unsigned char len_src;
-  iso711_t      ext_ver; /**< Extension version. Value 1? */
-  char data[EMPTY_ARRAY_SIZE];
-} GNUC_PACKED iso_su_er_t;
-
-typedef struct iso_su_ce_s {
-  char extent[8];
-  char offset[8];
-  char size[8];
-} iso_su_ce_t;
-
-/*! POSIX file attributes, PX. See Rock Ridge Section 4.1.2 */
-typedef struct iso_rock_px_s {
-  iso733_t st_mode;       /*! file mode permissions; same as st_mode 
-                            of POSIX:5.6.1 */
-  iso733_t st_nlinks;     /*! number of links to file; same as st_nlinks
-                            of POSIX:5.6.1 */
-  iso733_t st_uid;        /*! user id owner of file; same as st_uid
-                            of POSIX:5.6.1 */
-  iso733_t st_gid;        /*! group id of file; same as st_gid of 
-                            of POSIX:5.6.1 */
-} GNUC_PACKED iso_rock_px_t ;
-
-/*! POSIX device number, PN. A PN is mandatory if the file type
-  recorded in the "PX" File Mode field for a Directory Record
-  indicates a character or block device (ISO_ROCK_ISCHR |
-  ISO_ROCK_ISBLK).  This entry is ignored for other (non-Direcotry)
-  file types. No more than one "PN" is recorded in the System Use Area
-  of a Directory Record.
-
-  See Rock Ridge Section 4.1.2 */
-typedef struct iso_rock_pn_s {
-  iso733_t dev_high;     /**< high-order 32 bits of the 64 bit device number.
-                            7.2.3 encoded */
-  iso733_t dev_low;      /**< low-order 32 bits of the 64 bit device number.
-                            7.2.3 encoded */
-} GNUC_PACKED iso_rock_pn_t ;
-
-/*! These are the bits and their meanings for flags in the SL structure. */
-typedef enum {
-  ISO_ROCK_SL_CONTINUE = 1,
-  ISO_ROCK_SL_CURRENT  = 2,
-  ISO_ROCK_SL_PARENT   = 4,
-  ISO_ROCK_SL_ROOT     = 8
-} iso_rock_sl_flag_t;
-
-#define	ISO_ROCK_SL_CONTINUE 1
-#define	ISO_ROCK_SL_CURRENT  2
-#define	ISO_ROCK_SL_PARENT   4
-#define	ISO_ROCK_SL_ROOT     8
-
-typedef struct iso_rock_sl_part_s {
-  uint8_t flags;
-  uint8_t len;
-  char text[EMPTY_ARRAY_SIZE];
-} GNUC_PACKED iso_rock_sl_part_t ;
-
-/*! Symbolic link. See Rock Ridge Section 4.1.3 */
-typedef struct iso_rock_sl_s {
-  unsigned char flags;
-  iso_rock_sl_part_t link;
-} GNUC_PACKED iso_rock_sl_t ;
-
-/*! Alternate name. See Rock Ridge Section 4.1.4 */
-
-/*! These are the bits and their meanings for flags in the NM structure. */
-typedef enum {
-  ISO_ROCK_NM_CONTINUE = 1,
-  ISO_ROCK_NM_CURRENT  = 2,
-  ISO_ROCK_NM_PARENT   = 4,
-} iso_rock_nm_flag_t;
-
-#define	ISO_ROCK_NM_CONTINUE 1
-#define	ISO_ROCK_NM_CURRENT  2
-#define	ISO_ROCK_NM_PARENT   4
-
-
-typedef struct iso_rock_nm_s {
-  unsigned char flags;
-  char name[EMPTY_ARRAY_SIZE];
-} GNUC_PACKED iso_rock_nm_t ;
-
-/*! Child link. See Section 4.1.5.1 */
-typedef struct iso_rock_cl_s {
-  char location[1];
-} GNUC_PACKED iso_rock_cl_t ;
-
-/*! Parent link. See Section 4.1.5.2 */
-typedef struct iso_rock_pl_s {
-  char location[1];
-} GNUC_PACKED iso_rock_pl_t ;
-
-/*! These are the bits and their meanings for flags in the TF structure. */
-typedef enum {
-  ISO_ROCK_TF_CREATE     =  1,
-  ISO_ROCK_TF_MODIFY     =  2,
-  ISO_ROCK_TF_ACCESS     =  4,
-  ISO_ROCK_TF_ATTRIBUTES =  8,
-  ISO_ROCK_TF_BACKUP     =  16,
-  ISO_ROCK_TF_EXPIRATION =  32,
-  ISO_ROCK_TF_EFFECTIVE  =  64,
-  ISO_ROCK_TF_LONG_FORM  = 128
-} iso_rock_tf_flag_t;
-
-/* These are the bits and their meanings for flags in the TF structure. */
-#define ISO_ROCK_TF_CREATE      1
-#define ISO_ROCK_TF_MODIFY      2
-#define ISO_ROCK_TF_ACCESS      4
-#define ISO_ROCK_TF_ATTRIBUTES  8
-#define ISO_ROCK_TF_BACKUP     16
-#define ISO_ROCK_TF_EXPIRATION 32
-#define ISO_ROCK_TF_EFFECTIVE  64
-#define ISO_ROCK_TF_LONG_FORM 128
-
-/*! Time stamp(s) for a file. See Rock Ridge Section 4.1.6 */
-typedef struct iso_rock_tf_s {
-  uint8_t flags; /**< See ISO_ROCK_TF_* bits above. */
-  uint8_t time_bytes[EMPTY_ARRAY_SIZE]; /**< A homogenious array of
-                                           iso9660_ltime_t or
-                                           iso9660_dtime_t entries
-                                           depending on flags &
-                                           ISO_ROCK_TF_LONG_FORM. Lacking
-                                           a better method, we store
-                                           this as an array of bytes
-                                           and a cast to the
-                                           appropriate type will have
-                                           to be made before
-                                           extraction.  */
-} GNUC_PACKED iso_rock_tf_t ;
-
-/*! File data in sparse format. See Rock Ridge Section 4.1.7 */
-typedef struct iso_rock_sf_s {
-  iso733_t virtual_size_high; /**< high-order 32 bits of virtual size */
-  iso733_t virtual_size_low;  /**< low-order 32 bits of virtual size */
-  uint8_t   table_depth;
-} GNUC_PACKED iso_rock_sf_t ;
-
-typedef struct iso_extension_record_s {
-  char signature[2];   /**< signature word; either 'SP', 'CE', 'ER', 'RR',
-                          'PX', 'PN', 'SL', 'NM', 'CL', 'PL', 'TF', or 
-                          'ZF' */
-  iso711_t len;        /**< length of system-user area - 44 for PX
-                          20 for PN, 5+strlen(text) for SL, 21 for 
-                          SF, etc. */
-  iso711_t version;    /**< version number - value 1 */
-  union {
-    iso_su_sp_t    SP;  /**< system-use-sharing protocol - not
-                          strictly part of Rock Ridge */
-    iso_su_er_t    ER;  /**< system-use extension packet - not
-                           strictly part of Rock Ridge */
-    iso_su_ce_t    CE;  /**< system-use -  strictly part of Rock Ridge */
-    iso_rock_px_t  PX;  /**< Rock Ridge POSIX file attributes */
-    iso_rock_pn_t  PN;  /**< Rock Ridge POSIX device number */
-    iso_rock_sl_t  SL;  /**< Rock Ridge symbolic link */
-    iso_rock_nm_t  NM;  /**< Rock Ridge alternate name */
-    iso_rock_cl_t  CL;  /**< Rock Ridge child link */
-    iso_rock_pl_t  PL;  /**< Rock Ridge parent link */
-    iso_rock_tf_t  TF;  /**< Rock Ridge timestamp(s) for a file */
-  } u;
-} GNUC_PACKED iso_extension_record_t;
-
-typedef struct iso_rock_time_s {
-  bool          b_used;     /**< If true, field has been set and  is valid. 
-                               Otherwise remaning fields are meaningless. */
-  bool          b_longdate;  /**< If true date format is a iso9660_ltime_t. 
-                               Otherwise date is iso9660_dtime_t */
-  union 
-  {
-    iso9660_ltime_t ltime;
-    iso9660_dtime_t dtime;
-  } t;
-} GNUC_PACKED iso_rock_time_t;
-
-typedef struct iso_rock_statbuf_s {
-  bool_3way_t   b3_rock;              /**< has Rock Ridge extension. 
-                                         If "yep", then the fields
-                                         are used.
-                                      */
-  posix_mode_t  st_mode;              /**< protection */
-  posix_nlink_t st_nlinks;            /**< number of hard links */
-  posix_uid_t   st_uid;               /**< user ID of owner */
-  posix_gid_t   st_gid;               /**< group ID of owner */
-  uint8_t       s_rock_offset;
-  int           i_symlink;            /**< size of psz_symlink */
-  int           i_symlink_max;        /**< max allocated to psz_symlink */
-  char         *psz_symlink;          /**< if symbolic link, name
-                                         of pointed to file.  */
-  iso_rock_time_t create;             /**< create time See ISO 9660:9.5.4. */
-  iso_rock_time_t modify;             /**< time of last modification
-                                         ISO 9660:9.5.5. st_mtime field of 
-                                         POSIX:5.6.1. */
-  iso_rock_time_t access;             /**< time of last file access st_atime 
-                                         field of POSIX:5.6.1. */
-  iso_rock_time_t attributes;         /**< time of last attribute change.
-                                         st_ctime field of POSIX:5.6.1. */
-  iso_rock_time_t backup;             /**< time of last backup. */
-  iso_rock_time_t expiration;         /**< time of expiration; See ISO 
-                                         9660:9.5.6. */
-  iso_rock_time_t effective;          /**< Effective time; See ISO 9660:9.5.7.
-                                       */
-  uint32_t i_rdev;                    /**< the upper 16-bits is major device 
-                                         number, the lower 16-bits is the
-                                         minor device number */
-
-} iso_rock_statbuf_t;
-  
-PRAGMA_END_PACKED
-
-/*! return length of name field; 0: not found, -1: to be ignored */
-int get_rock_ridge_filename(iso9660_dir_t * de, /*out*/ char * retname, 
-                            /*out*/ iso9660_stat_t *p_stat);
-
-  int parse_rock_ridge_stat(iso9660_dir_t *de, /*out*/ iso9660_stat_t *p_stat);
-
-  /*!
-    Returns POSIX mode bitstring for a given file.
-  */
-  mode_t 
-  iso9660_get_posix_filemode_from_rock(const iso_rock_statbuf_t *rr);
-
-/*!
-  Returns a string which interpreting the POSIX mode st_mode. 
-  For example:
-  \verbatim
-  drwxrws---
-  -rw---Sr--
-  lrwxrwxrwx
-  \endverbatim
-  
-  A description of the characters in the string follows
-  The 1st character is either "d" if the entry is a directory, "l" is
-  a symbolic link or "-" if neither.
-  
-  The 2nd to 4th characters refer to permissions for a user while the
-  the 5th to 7th characters refer to permissions for a group while, and 
-  the 8th to 10h characters refer to permissions for everyone. 
-  
-  In each of these triplets the first character (2, 5, 8) is "r" if
-  the entry is allowed to be read.
-
-  The second character of a triplet (3, 6, 9) is "w" if the entry is
-  allowed to be written.
-
-  The third character of a triplet (4, 7, 10) is "x" if the entry is
-  executable but not user (for character 4) or group (for characters
-  6) settable and "s" if the item has the corresponding user/group set.
-
-  For a directory having an executable property on ("x" or "s") means
-  the directory is allowed to be listed or "searched". If the execute
-  property is not allowed for a group or user but the corresponding
-  group/user is set "S" indicates this. If none of these properties
-  holds the "-" indicates this.
-*/
-const char *iso9660_get_rock_attr_str(posix_mode_t st_mode);
-
-/** These variables are not used, but are defined to facilatate debugging
-    by letting us use enumerations values (which also correspond to 
-    \#define's inside a debugged program.
- */
-extern iso_rock_nm_flag_t iso_rock_nm_flag;
-extern iso_rock_sl_flag_t iso_rock_sl_flag;
-extern iso_rock_tf_flag_t iso_rock_tf_flag;
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __ISO_ROCK_H__ */
-
-/* 
- * Local variables:
- *  c-file-style: "gnu"
- *  tab-width: 8
- *  indent-tabs-mode: nil
- * End:
- */
diff --git a/lib-x86-64/include/cdio/sector.h b/lib-x86-64/include/cdio/sector.h
deleted file mode 100644
index 6e308338..00000000
--- a/lib-x86-64/include/cdio/sector.h
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
-    $Id: sector.h,v 1.38 2008/03/25 15:59:09 karl Exp $
-
-    Copyright (C) 2003, 2004, 2005, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
-    Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-/*!
-   \file sector.h 
-   \brief Things related to CD-ROM layout: tracks, sector sizes, MSFs, LBAs.
-
-  A CD-ROM physical sector size is 2048, 2052, 2056, 2324, 2332, 2336,
-  2340, or 2352 bytes long.
-
-  Sector types of the standard CD-ROM data formats:
-
-\verbatim 
-  format   sector type               user data size (bytes)
-  -----------------------------------------------------------------------------
-    1     (Red Book)    CD-DA          2352    (CDIO_CD_FRAMESIZE_RAW)
-    2     (Yellow Book) Mode1 Form1    2048    (CDIO_CD_FRAMESIZE)
-    3     (Yellow Book) Mode1 Form2    2336    (M2RAW_SECTOR_SIZE)
-    4     (Green Book)  Mode2 Form1    2048    (CDIO_CD_FRAMESIZE)
-    5     (Green Book)  Mode2 Form2    2328    (2324+4 spare bytes)
- 
- 
-        The layout of the standard CD-ROM data formats:
-  -----------------------------------------------------------------------------
-  - audio (red):                  | audio_sample_bytes |
-                                  |        2352        |
- 
-  - data (yellow, mode1):         | sync - head - data - EDC - zero - ECC |
-                                  |  12  -   4  - 2048 -  4  -   8  - 276 |
- 
-  - data (yellow, mode2):         | sync - head - data |
-                                 |  12  -   4  - 2336 |
- 
-  - XA data (green, mode2 form1): | sync - head - sub - data - EDC - ECC |
-                                  |  12  -   4  -  8  - 2048 -  4  - 276 |
- 
-  - XA data (green, mode2 form2): | sync - head - sub - data - Spare |
-                                  |  12  -   4  -  8  - 2324 -  4    |
-\endverbatim
- 
-
-*/
-
-#ifndef _CDIO_SECTOR_H_
-#define _CDIO_SECTOR_H_
-
-#ifdef __cplusplus
-    extern "C" {
-#endif
-
-#include <cdio/types.h>
-
-      /*! Information that can be obtained through a Read Subchannel
-        command.
-      */
-#define CDIO_SUBCHANNEL_SUBQ_DATA		0
-#define CDIO_SUBCHANNEL_CURRENT_POSITION	1
-#define CDIO_SUBCHANNEL_MEDIA_CATALOG	        2
-#define CDIO_SUBCHANNEL_TRACK_ISRC		3
-      
-      /*! track flags
-       * Q Sub-channel Control Field (4.2.3.3)
-       */
-      typedef enum {
-	NONE = 			0x00,	/* no flags set */
-	PRE_EMPHASIS =		0x01,	/* audio track recorded with pre-emphasis */
-	COPY_PERMITTED =	0x02,	/* digital copy permitted */
-	DATA =			0x04,	/* data track */
-	FOUR_CHANNEL_AUDIO =	0x08,	/* 4 audio channels */
-	SCMS =			0x10	/* SCMS (5.29.2.7) */
-      } flag_t;
-      
-#define CDIO_PREGAP_SECTORS  150
-#define CDIO_POSTGAP_SECTORS 150
-      
-      /*! An enumeration for some of the CDIO_CD \#defines below. This isn't
-        really an enumeration one would really use in a program it is to
-        be helpful in debuggers where wants just to refer to the CDIO_CD_
-        names and get something.
-      */
-      extern enum cdio_cd_enums {
-        CDIO_CD_MINS =              74,   /**< max. minutes per CD, not really
-                                             a limit */
-        CDIO_CD_SECS_PER_MIN =      60,   /**< seconds per minute */
-        CDIO_CD_FRAMES_PER_SEC =    75,   /**< frames per second */
-        CDIO_CD_SYNC_SIZE =         12,   /**< 12 sync bytes per raw data 
-                                             frame */
-        CDIO_CD_CHUNK_SIZE =        24,   /**< lowest-level "data bytes 
-                                             piece" */
-        CDIO_CD_NUM_OF_CHUNKS =     98,   /**< chunks per frame */
-        CDIO_CD_FRAMESIZE_SUB =     96,   /**< subchannel data "frame" size */
-        CDIO_CD_HEADER_SIZE =        4,   /**< header (address) bytes per raw
-                                             frame */
-        CDIO_CD_SUBHEADER_SIZE =     8,   /**< subheader bytes per raw XA data 
-                                             frame */
-        CDIO_CD_ECC_SIZE =         276,   /**< bytes ECC per most raw data 
-                                             frame types */
-        CDIO_CD_FRAMESIZE =       2048,   /**< bytes per frame, "cooked" 
-                                             mode */
-        CDIO_CD_FRAMESIZE_RAW =   2352,   /**< bytes per frame, "raw" mode */
-        CDIO_CD_FRAMESIZE_RAWER = 2646,   /**< The maximum possible 
-                                             returned  */
-        CDIO_CD_FRAMESIZE_RAW1  = 2340,
-        CDIO_CD_FRAMESIZE_RAW0  = 2336,
-        CDIO_CD_MAX_SESSIONS =      99, 
-        CDIO_CD_MIN_SESSION_NO =     1,   /**<, Smallest CD session number */
-        CDIO_CD_MAX_LSN =       450150,   /**< Largest LSN in a CD */
-        CDIO_CD_MIN_LSN      = -450150,   /**< Smallest LSN in a CD */
-      } cdio_cd_enums;
-        
-      /*!
-        Some generally useful CD-ROM information -- mostly based on the above.
-        This is from linux.h - not to slight other OS's. This was the first
-        place I came across such useful stuff.
-      */
-#define CDIO_CD_MINS              74   /**< max. minutes per CD, not really
-                                          a limit */
-#define CDIO_CD_SECS_PER_MIN      60   /**< seconds per minute */
-#define CDIO_CD_FRAMES_PER_SEC    75   /**< frames per second */
-#define CDIO_CD_SYNC_SIZE         12   /**< 12 sync bytes per raw data frame */
-#define CDIO_CD_CHUNK_SIZE        24   /**< lowest-level "data bytes piece" */
-#define CDIO_CD_NUM_OF_CHUNKS     98   /**< chunks per frame */
-#define CDIO_CD_FRAMESIZE_SUB     96   /**< subchannel data "frame" size */
-#define CDIO_CD_HEADER_SIZE        4   /**< header (address) bytes per raw
-                                          data frame */
-#define CDIO_CD_SUBHEADER_SIZE     8   /**< subheader bytes per raw XA data 
-                                            frame */
-#define CDIO_CD_EDC_SIZE           4   /**< bytes EDC per most raw data
-                                          frame types */
-#define CDIO_CD_M1F1_ZERO_SIZE     8   /**< bytes zero per yellow book mode
-                                          1 frame */
-#define CDIO_CD_ECC_SIZE         276   /**< bytes ECC per most raw data frame 
-                                          types */
-#define CDIO_CD_FRAMESIZE       2048   /**< bytes per frame, "cooked" mode */
-#define CDIO_CD_FRAMESIZE_RAW   2352   /**< bytes per frame, "raw" mode */
-#define CDIO_CD_FRAMESIZE_RAWER 2646   /**< The maximum possible returned 
-                                          bytes */ 
-#define CDIO_CD_FRAMESIZE_RAW1 (CDIO_CD_CD_FRAMESIZE_RAW-CDIO_CD_SYNC_SIZE) /*2340*/
-#define CDIO_CD_FRAMESIZE_RAW0 (CDIO_CD_FRAMESIZE_RAW-CDIO_CD_SYNC_SIZE-CDIO_CD_HEADER_SIZE) /*2336*/
-      
-      /*! "before data" part of raw XA (green, mode2) frame */
-#define CDIO_CD_XA_HEADER (CDIO_CD_HEADER_SIZE+CDIO_CD_SUBHEADER_SIZE) 
-      
-      /*! "after data" part of raw XA (green, mode2 form1) frame */
-#define CDIO_CD_XA_TAIL   (CDIO_CD_EDC_SIZE+CDIO_CD_ECC_SIZE) 
-      
-      /*! "before data" sync bytes + header of XA (green, mode2) frame */
-#define CDIO_CD_XA_SYNC_HEADER   (CDIO_CD_SYNC_SIZE+CDIO_CD_XA_HEADER) 
-      
-      /*! String of bytes used to identify the beginning of a Mode 1 or
-          Mode 2 sector. */
-      extern const uint8_t CDIO_SECTOR_SYNC_HEADER[CDIO_CD_SYNC_SIZE];
-      /**<  
-        {0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0};
-      */
-      
-      /*! An enumeration for some of the M2*_SECTOR_SIZE \#defines
-        below. This isn't really an enumeration one would really use in a
-        program it is to be helpful in debuggers where wants just to refer
-        to the M2*_SECTOR_SIZE names and get something.
-      */
-      extern enum m2_sector_enums {
-        M2F2_SECTOR_SIZE  = 2324,
-        M2SUB_SECTOR_SIZE = 2332,
-        M2RAW_SECTOR_SIZE = 2336
-      } m2_sector_enums;
-      
-#define M2F2_SECTOR_SIZE    2324
-#define M2SUB_SECTOR_SIZE   2332
-#define M2RAW_SECTOR_SIZE   2336
-      
-      /*! Largest CD session number */
-#define CDIO_CD_MAX_SESSIONS    99 
-      /*! Smallest CD session number */
-#define CDIO_CD_MIN_SESSION_NO   1
-      
-      /*! Largest LSN in a CD */
-#define CDIO_CD_MAX_LSN   450150
-      /*! Smallest LSN in a CD */
-#define CDIO_CD_MIN_LSN  -450150
-      
-      
-#define CDIO_CD_FRAMES_PER_MIN                          \
-      (CDIO_CD_FRAMES_PER_SEC*CDIO_CD_SECS_PER_MIN)
-      
-#define CDIO_CD_74MIN_SECTORS (UINT32_C(74)*CDIO_CD_FRAMES_PER_MIN)
-#define CDIO_CD_80MIN_SECTORS (UINT32_C(80)*CDIO_CD_FRAMES_PER_MIN)
-#define CDIO_CD_90MIN_SECTORS (UINT32_C(90)*CDIO_CD_FRAMES_PER_MIN)
-      
-#define CDIO_CD_MAX_SECTORS                                     \
-      (UINT32_C(100)*CDIO_CD_FRAMES_PER_MIN-CDIO_PREGAP_SECTORS)
-      
-#define msf_t_SIZEOF 3
-      
-      /*! 
-        Convert an LBA into a string representation of the MSF.
-        \warning cdio_lba_to_msf_str returns new allocated string */
-      char *cdio_lba_to_msf_str (lba_t i_lba);
-      
-      /*! 
-        Convert an MSF into a string representation of the MSF.
-        \warning cdio_msf_to_msf_str returns new allocated string */
-      char *cdio_msf_to_str (const msf_t *p_msf);
-      
-      /*! 
-        Convert an LBA into the corresponding LSN.
-      */
-      lba_t cdio_lba_to_lsn (lba_t i_lba);
-      
-      /*! 
-        Convert an LBA into the corresponding MSF.
-      */
-      void  cdio_lba_to_msf(lba_t i_lba, msf_t *p_msf);
-      
-      /*! 
-        Convert an LSN into the corresponding LBA.
-        CDIO_INVALID_LBA is returned if there is an error.
-      */
-      lba_t cdio_lsn_to_lba (lsn_t i_lsn);
-      
-      /*! 
-        Convert an LSN into the corresponding MSF.
-      */
-      void  cdio_lsn_to_msf (lsn_t i_lsn, msf_t *p_msf);
-      
-      /*! 
-        Convert a MSF into the corresponding LBA.
-        CDIO_INVALID_LBA is returned if there is an error.
-      */
-      lba_t cdio_msf_to_lba (const msf_t *p_msf);
-      
-      /*! 
-        Convert a MSF into the corresponding LSN.
-        CDIO_INVALID_LSN is returned if there is an error.
-      */
-      lsn_t cdio_msf_to_lsn (const msf_t *p_msf);
-      
-      /*!  
-        Convert a MSF - broken out as 3 integer components into the
-        corresponding LBA.  
-        CDIO_INVALID_LBA is returned if there is an error.
-      */
-      lba_t cdio_msf3_to_lba (unsigned int minutes, unsigned int seconds, 
-                              unsigned int frames);
-      
-      /*! 
-        Convert a string of the form MM:SS:FF into the corresponding LBA.
-        CDIO_INVALID_LBA is returned if there is an error.
-      */
-      lba_t cdio_mmssff_to_lba (const char *psz_mmssff);
-      
-#ifdef __cplusplus
-    }
-#endif
-
-#ifndef DO_NOT_WANT_PARANOIA_COMPATIBILITY
-/** For compatibility with good ol' paranoia */
-#define CD_FRAMESIZE_RAW        CDIO_CD_FRAMESIZE_RAW
-#endif /*DO_NOT_WANT_PARANOIA_COMPATIBILITY*/
-
-#endif /* _CDIO_SECTOR_H_ */
-
-
-/* 
- * Local variables:
- *  c-file-style: "gnu"
- *  tab-width: 8
- *  indent-tabs-mode: nil
- * End:
- */
diff --git a/lib-x86-64/include/cdio/track.h b/lib-x86-64/include/cdio/track.h
deleted file mode 100644
index 9deb942b..00000000
--- a/lib-x86-64/include/cdio/track.h
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
-    $Id: track.h,v 1.14 2008/03/25 15:59:09 karl Exp $
-
-    Copyright (C) 2005, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-/** \file track.h 
- *  \brief  The top-level header for track-related libcdio calls.
- */
-#ifndef __CDIO_TRACK_H__
-#define __CDIO_TRACK_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-  /*! Printable tags for track_format_t enumeration.  */
-  extern const char *track_format2str[6];
-  
-  typedef enum  {
-    TRACK_FORMAT_AUDIO,   /**< Audio track, e.g. CD-DA */
-    TRACK_FORMAT_CDI,     /**< CD-i. How this is different from DATA below? */
-    TRACK_FORMAT_XA,      /**< Mode2 of some sort */
-    TRACK_FORMAT_DATA,    /**< Mode1 of some sort */
-    TRACK_FORMAT_PSX,     /**< Playstation CD. Like audio but only 2336 bytes
-			   *   of user data.
-			   */
-    TRACK_FORMAT_ERROR    /**< Dunno what is, or some other error. */
-  } track_format_t;
-
-  typedef enum {
-    CDIO_TRACK_FLAG_FALSE, 
-    CDIO_TRACK_FLAG_TRUE, 
-    CDIO_TRACK_FLAG_ERROR, 
-    CDIO_TRACK_FLAG_UNKNOWN
-  } track_flag_t;
-
-  /*! \brief Structure containing attributes associated with a track */
-  typedef struct {
-    track_flag_t preemphasis; /**< Linear preemphasis on an audio track */
-    track_flag_t copy_permit; /**< Whether copying is permitted */
-    int channels;             /**< Number of audio channels, 2, 4. -2 if not
-				   implemented or -1 for error.
-			      */
-  } track_flags_t;
-    
-  /*! The leadout track is always 0xAA, regardless of # of tracks on
-    disc, or what value may be used internally. For example although
-    OS X uses a different value for the lead-out track internally than
-    given below, programmers should use CDIO_CDROM_LEADOUT_TRACK and
-    not worry about this.
-  */
-
-  /*! An enumeration for some of the CDIO_CDROM_* \#defines below. This
-    isn't really an enumeration one would really use in a program; it
-    is to be helpful in debuggers where wants just to refer to the
-    CDIO_CDROM_* names and get something.
-  */
-  extern enum cdio_track_enums {
-    CDIO_CDROM_LBA           = 0x01, /**< "logical block": first frame is #0 */
-    CDIO_CDROM_MSF           = 0x02, /**< "minute-second-frame": binary, not
-					BCD here! */
-    CDIO_CDROM_DATA_TRACK    = 0x04, 
-    CDIO_CDROM_CDI_TRACK     = 0x10,
-    CDIO_CDROM_XA_TRACK      = 0x20,
-    CDIO_CD_MAX_TRACKS       =   99, /**< Largest CD track number */
-    CDIO_CDROM_LEADOUT_TRACK = 0xAA, /**< Lead-out track number */
-    CDIO_INVALID_TRACK       = 0xFF, /**<  Constant for invalid track number */
-
-   } cdio_track_enums;
-  
-#define CDIO_CD_MIN_TRACK_NO  1 /**< Smallest CD track number */
-  
-  /*! track modes (Table 350) 
-    reference: MMC-3 draft revsion - 10g
-  */
-  typedef enum {
-    AUDIO,			/**< 2352 byte block length */
-    MODE1,			/**< 2048 byte block length */
-    MODE1_RAW,			/**< 2352 byte block length */
-    MODE2,			/**< 2336 byte block length */
-    MODE2_FORM1,		/**< 2048 byte block length */
-    MODE2_FORM2,		/**< 2324 byte block length */
-    MODE2_FORM_MIX,		/**< 2336 byte block length */
-    MODE2_RAW			/**< 2352 byte block length */
-  } trackmode_t;
-  
-  /*! 
-    Get CD-Text information for a CdIo_t object.
-
-    @param p_cdio the CD object that may contain CD-Text information.
-    @param i_track track for which we are requesting CD-Text information.
-    @return the CD-Text object or NULL if obj is NULL
-    or CD-Text information does not exist.
-
-    If i_track is 0 or CDIO_CDROM_LEADOUT_TRACK the track returned
-    is the information assocated with the CD. 
-  */
-  cdtext_t *cdio_get_cdtext (CdIo_t *p_cdio, track_t i_track);
-
-  /*!
-    Get the number of the first track. 
-
-    @return the track number or CDIO_INVALID_TRACK 
-    on error.
-  */
-  track_t cdio_get_first_track_num(const CdIo_t *p_cdio);
-  
-  /*!
-    Return the last track number.
-    CDIO_INVALID_TRACK is returned on error.
-  */
-  track_t cdio_get_last_track_num (const CdIo_t *p_cdio);
-  
-
-  /*! Find the track which contains lsn.
-    CDIO_INVALID_TRACK is returned if the lsn outside of the CD or
-    if there was some error. 
-    
-    If the lsn is before the pregap of the first track 0 is returned.
-    Otherwise we return the track that spans the lsn.
-  */
-  track_t cdio_get_track(const CdIo_t *p_cdio, lsn_t lsn);
-
-  /*! Return number of channels in track: 2 or 4; -2 if not
-      implemented or -1 for error.
-      Not meaningful if track is not an audio track.
-  */
-  int cdio_get_track_channels(const CdIo_t *p_cdio, track_t i_track);
-  
-  /*! Return copy protection status on a track. Is this meaningful
-      if not an audio track?
-   */
-  track_flag_t cdio_get_track_copy_permit(const CdIo_t *p_cdio, 
-					  track_t i_track);
-  
-  /*!  
-    Get the format (audio, mode2, mode1) of track. 
-  */
-  track_format_t cdio_get_track_format(const CdIo_t *p_cdio, track_t i_track);
-  
-  /*!
-    Return true if we have XA data (green, mode2 form1) or
-    XA data (green, mode2 form2). That is track begins:
-    sync - header - subheader
-    12     4      -  8
-    
-    FIXME: there's gotta be a better design for this and get_track_format?
-  */
-  bool cdio_get_track_green(const CdIo_t *p_cdio, track_t i_track);
-    
-  /*!  
-    Return the ending LSN for track number
-    i_track in cdio.  CDIO_INVALID_LSN is returned on error.
-  */
-  lsn_t cdio_get_track_last_lsn(const CdIo_t *p_cdio, track_t i_track);
-
-  /*!  
-    Get the starting LBA for track number
-    i_track in p_cdio.  Track numbers usually start at something 
-    greater than 0, usually 1.
-
-    The "leadout" track is specified either by
-    using i_track CDIO_CDROM_LEADOUT_TRACK or the total tracks+1.
-
-    @param p_cdio object to get information from
-    @param i_track  the track number we want the LSN for
-    @return the starting LBA or CDIO_INVALID_LBA on error.
-  */
-  lba_t cdio_get_track_lba(const CdIo_t *p_cdio, track_t i_track);
-  
-  /*!  
-    Return the starting LSN for track number
-    i_track in p_cdio.  Track numbers usually start at something 
-    greater than 0, usually 1.
-
-    The "leadout" track is specified either by
-    using i_track CDIO_CDROM_LEADOUT_TRACK or the total tracks+1.
-
-    @param p_cdio object to get information from
-    @param i_track  the track number we want the LSN for
-    @return the starting LSN or CDIO_INVALID_LSN on error.
-  */
-  lsn_t cdio_get_track_lsn(const CdIo_t *p_cdio, track_t i_track);
-
-  /*!  
-    Return the starting LBA for the pregap for track number
-    i_track in p_cdio.  Track numbers usually start at something 
-    greater than 0, usually 1.
-
-    @param p_cdio object to get information from
-    @param i_track  the track number we want the LBA for
-    @return the starting LBA or CDIO_INVALID_LBA on error.
-  */
-  lba_t cdio_get_track_pregap_lba(const CdIo_t *p_cdio, track_t i_track);
-
-  /*!  
-    Return the starting LSN for the pregap for track number
-    i_track in p_cdio.  Track numbers usually start at something 
-    greater than 0, usually 1.
-
-    @param p_cdio object to get information from
-    @param i_track  the track number we want the LSN for
-    @return the starting LSN or CDIO_INVALID_LSN on error.
-  */
-  lsn_t cdio_get_track_pregap_lsn(const CdIo_t *p_cdio, track_t i_track);
-
-  /*!
-    Get the International Standard Recording Code (ISRC) for track number
-    i_track in p_cdio.  Track numbers usually start at something
-    greater than 0, usually 1.
-
-    @return the International Standard Recording Code (ISRC) or NULL
-    if there is none or we don't have the ability to get it.
-
-    Note: string is malloc'd so caller has to free() the returned
-    string when done with it.
-
-  */
-  char * cdio_get_track_isrc (const CdIo_t *p_cdio, track_t i_track);
-  
-  /*!  
-    Return the starting MSF (minutes/secs/frames) for track number
-    i_track in p_cdio.  Track numbers usually start at something 
-    greater than 0, usually 1.
-
-    The "leadout" track is specified either by
-    using i_track CDIO_CDROM_LEADOUT_TRACK or the total tracks+1.
-    
-    @return true if things worked or false if there is no track entry.
-  */
-  bool cdio_get_track_msf(const CdIo_t *p_cdio, track_t i_track, 
-			  /*out*/ msf_t *msf);
-  
-  /*! Get linear preemphasis status on an audio track 
-      This is not meaningful if not an audio track?
-   */
-  track_flag_t cdio_get_track_preemphasis(const CdIo_t *p_cdio,
-					  track_t i_track);
-  
-  /*!  
-    Get the number of sectors between this track an the next.  This
-    includes any pregap sectors before the start of the next track.
-    Track numbers usually start at something 
-    greater than 0, usually 1.
-
-    @return the number of sectors or 0 if there is an error.
-  */
-  unsigned int cdio_get_track_sec_count(const CdIo_t *p_cdio, track_t i_track);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __CDIO_TRACK_H__ */
-
diff --git a/lib-x86-64/include/cdio/types.h b/lib-x86-64/include/cdio/types.h
deleted file mode 100644
index 347bf5a7..00000000
--- a/lib-x86-64/include/cdio/types.h
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
-    $Id: types.h,v 1.37 2008/03/25 15:59:09 karl Exp $
-
-    Copyright (C) 2002, 2003, 2004, 2005, 2006, 2008
-                  Rocky Bernstein <rocky@gnu.org>
-    Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-/** \file types.h 
- *  \brief  Common type definitions used pervasively in libcdio.
- */
-
-
-#ifndef __CDIO_TYPES_H__
-#define __CDIO_TYPES_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#ifndef EXTERNAL_LIBCDIO_CONFIG_H
-#define EXTERNAL_LIBCDIO_CONFIG_H
-#include <cdio/cdio_config.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-  /* provide some C99 definitions */
-
-#if defined(HAVE_SYS_TYPES_H) 
-#include <sys/types.h>
-#endif 
-
-#if defined(HAVE_STDINT_H)
-# include <stdint.h>
-#elif defined(HAVE_INTTYPES_H)
-# include <inttypes.h>
-#elif defined(AMIGA) || defined(__linux__)
-  typedef u_int8_t uint8_t;
-  typedef u_int16_t uint16_t;
-  typedef u_int32_t uint32_t;
-  typedef u_int64_t uint64_t;
-#else
-  /* warning ISO/IEC 9899:1999 <stdint.h> was missing and even <inttypes.h> */
-  /* fixme */
-#endif /* HAVE_STDINT_H */
-  
-typedef uint8_t ubyte;
-
-  /* default HP/UX macros are broken */
-#if defined(__hpux__)
-# undef UINT16_C
-# undef UINT32_C
-# undef UINT64_C
-# undef INT64_C
-#endif
-
-  /* if it's still not defined, take a good guess... should work for
-     most 32bit and 64bit archs */
-  
-#ifndef UINT16_C
-# define UINT16_C(c) c ## U
-#endif
-  
-#ifndef UINT32_C
-# if defined (SIZEOF_INT) && SIZEOF_INT == 4
-#  define UINT32_C(c) c ## U
-# elif defined (SIZEOF_LONG) && SIZEOF_LONG == 4
-#  define UINT32_C(c) c ## UL
-# else
-#  define UINT32_C(c) c ## U
-# endif
-#endif
-  
-#ifndef UINT64_C
-# if defined (SIZEOF_LONG) && SIZEOF_LONG == 8
-#  define UINT64_C(c) c ## UL
-# elif defined (SIZEOF_INT) && SIZEOF_INT == 8
-#  define UINT64_C(c) c ## U
-# else
-#  define UINT64_C(c) c ## ULL
-# endif
-#endif
-  
-#ifndef INT64_C
-# if defined (SIZEOF_LONG) && SIZEOF_LONG == 8
-#  define INT64_C(c) c ## L
-# elif defined (SIZEOF_INT) && SIZEOF_INT == 8
-#  define INT64_C(c) c 
-# else
-#  define INT64_C(c) c ## LL
-# endif
-#endif
-  
-#ifndef __cplusplus
-# if defined(HAVE_STDBOOL_H)
-#  include <stdbool.h>
-# else
-   /* ISO/IEC 9899:1999 <stdbool.h> missing -- enabling workaround */
-  
-#   define false   0
-#   define true    1
-#   define bool uint8_t
-# endif /*HAVE_STDBOOL_H*/
-#endif /*C++*/
-  
-  /* some GCC optimizations -- gcc 2.5+ */
-  
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
-#define GNUC_PRINTF( format_idx, arg_idx )              \
-  __attribute__((format (printf, format_idx, arg_idx)))
-#define GNUC_SCANF( format_idx, arg_idx )               \
-  __attribute__((format (scanf, format_idx, arg_idx)))
-#define GNUC_FORMAT( arg_idx )                  \
-  __attribute__((format_arg (arg_idx)))
-#define GNUC_NORETURN                           \
-  __attribute__((noreturn))
-#define GNUC_CONST                              \
-  __attribute__((const))
-#define GNUC_UNUSED                             \
-  __attribute__((unused))
-#define GNUC_PACKED                             \
-  __attribute__((packed))
-#else   /* !__GNUC__ */
-#define GNUC_PRINTF( format_idx, arg_idx )
-#define GNUC_SCANF( format_idx, arg_idx )
-#define GNUC_FORMAT( arg_idx )
-#define GNUC_NORETURN
-#define GNUC_CONST
-#define GNUC_UNUSED
-#define GNUC_PACKED
-#endif  /* !__GNUC__ */
-  
-#if defined(__GNUC__)
-  /* for GCC we try to use GNUC_PACKED */
-# define PRAGMA_BEGIN_PACKED
-# define PRAGMA_END_PACKED
-#elif defined(HAVE_ISOC99_PRAGMA)
-  /* should work with most EDG-frontend based compilers */
-# define PRAGMA_BEGIN_PACKED _Pragma("pack(1)")
-# define PRAGMA_END_PACKED   _Pragma("pack()")
-#else /* neither gcc nor _Pragma() available... */
-  /* ...so let's be naive and hope the regression testsuite is run... */
-# define PRAGMA_BEGIN_PACKED
-# define PRAGMA_END_PACKED
-#endif
-  
-  /*
-   * user directed static branch prediction gcc 2.96+
-   */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 95)
-# define GNUC_LIKELY(x)   __builtin_expect((x),true)
-# define GNUC_UNLIKELY(x) __builtin_expect((x),false)
-#else 
-# define GNUC_LIKELY(x)   (x) 
-# define GNUC_UNLIKELY(x) (x)
-#endif
-  
-#ifndef NULL
-# define NULL ((void*) 0)
-#endif
-  
-  /* our own offsetof()-like macro */
-#define __cd_offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
-  
-  /*!
-    \brief MSF (minute/second/frame) structure 
-
-    One CD-ROMs addressing scheme especially used in audio formats
-    (Red Book) is an address by minute, sector and frame which
-    BCD-encoded in three bytes. An alternative format is an lba_t.
-
-    Note: the fields in this structure are BCD encoded. Use
-    cdio_to_bcd8() or cdio_from_bcd8() to convert an integer into or
-    out of this format. The format specifier %x (not %d) can be used
-    if you need to format or print values in this structure.
-    
-    @see lba_t
-  */
-  PRAGMA_BEGIN_PACKED
-  struct msf_s {
-    uint8_t m, s, f; /* BCD encoded! */
-  } GNUC_PACKED;
-  PRAGMA_END_PACKED
-  
-  typedef struct msf_s msf_t;
-
-#define msf_t_SIZEOF 3
-
-  /*!
-    \brief UTF-8 char definition 
-
-    Type to denote UTF-8 strings.
-  */
-
-  typedef char cdio_utf8_t;
-
-  typedef enum  {
-    nope  = 0,
-    yep   = 1,
-    dunno = 2
-  } bool_3way_t;
-  
-  /* type used for bit-fields in structs (1 <= bits <= 8) */
-#if defined(__GNUC__)
-  /* this is strict ISO C99 which allows only 'unsigned int', 'signed
-     int' and '_Bool' explicitly as bit-field type */
-  typedef unsigned int bitfield_t;
-#else
-  /* other compilers might increase alignment requirements to match the
-     'unsigned int' type -- fixme: find out how unalignment accesses can
-     be pragma'ed on non-gcc compilers */
-  typedef uint8_t bitfield_t;
-#endif
-  
-  /*! The type of a Logical Block Address. We allow for an lba to be 
-    negative to be consistent with an lba, although I'm not sure this
-    this is possible.
-      
-   */
-  typedef int32_t lba_t;
-  
-  /*! The type of a Logical Sector Number. Note that an lba can be negative
-    and the MMC3 specs allow for a conversion of a negative lba.
-
-    @see msf_t
-  */
-  typedef int32_t lsn_t;
-  
-  /* Address in either MSF or logical format */
-  union cdio_cdrom_addr		
-  {
-    msf_t	msf;
-    lba_t	lba;
-  };
-
-  /*! The type of a track number 0..99. */
-  typedef uint8_t track_t;
-  
-  /*! The type of a session number 0..99. */
-  typedef uint8_t session_t;
-  
-  /*! 
-    Constant for invalid session number
-  */
-#define CDIO_INVALID_SESSION   0xFF
-  
-  /*! 
-    Constant for invalid LBA. It is 151 less than the most negative
-    LBA -45150. This provide slack for the 150-frame offset in
-    LBA to LSN 150 conversions
-  */
-#define CDIO_INVALID_LBA    -45301
-  
-  /*! 
-    Constant for invalid LSN
-  */
-#define CDIO_INVALID_LSN    CDIO_INVALID_LBA
-
-  /*! 
-    Number of ASCII bytes in a media catalog number (MCN).
-  */
-#define CDIO_MCN_SIZE       13
-
-  /*! 
-    Type to hold ASCII bytes in a media catalog number (MCN).
-    We include an extra 0 byte so these can be used as C strings.
-  */
-  typedef char cdio_mcn_t[CDIO_MCN_SIZE+1];
-  
-
-  /*! 
-    Number of ASCII bytes in International Standard Recording Codes (ISRC)
-  */
-#define CDIO_ISRC_SIZE       12
-
-  /*! 
-    Type to hold ASCII bytes in a media catalog number (MCN).
-    We include an extra 0 byte so these can be used as C strings.
-  */
-  typedef char cdio_isrc_t[CDIO_ISRC_SIZE+1];
-
-  typedef int cdio_fs_anal_t;
-
-  /*! 
-    track flags
-    Q Sub-channel Control Field (4.2.3.3)
-  */
-  typedef enum {
-    CDIO_TRACK_FLAG_NONE = 		 0x00,	/**< no flags set */
-    CDIO_TRACK_FLAG_PRE_EMPHASIS =	 0x01,	/**< audio track recorded with
-                                                   pre-emphasis */
-    CDIO_TRACK_FLAG_COPY_PERMITTED =	 0x02,	/**< digital copy permitted */
-    CDIO_TRACK_FLAG_DATA =		 0x04,	/**< data track */
-    CDIO_TRACK_FLAG_FOUR_CHANNEL_AUDIO = 0x08,  /**< 4 audio channels */
-  CDIO_TRACK_FLAG_SCMS =		 0x10	/**< SCMS (5.29.2.7) */
-} cdio_track_flag;
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __CDIO_TYPES_H__ */
-
-
-/* 
- * Local variables:
- *  c-file-style: "gnu"
- *  tab-width: 8
- *  indent-tabs-mode: nil
- * End:
- */
diff --git a/lib-x86-64/include/cdio/udf.h b/lib-x86-64/include/cdio/udf.h
deleted file mode 100644
index e35d74d1..00000000
--- a/lib-x86-64/include/cdio/udf.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*  
-    $Id: udf.h,v 1.22 2008/03/25 15:59:09 karl Exp $
-
-    Copyright (C) 2005, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-/*!
- * \file udf.h 
- *
- * \brief The top-level interface header for libudf: UDF filesystem
- * library; applications include this.
- *
-*/
-
-#ifndef UDF_H
-#define UDF_H 
-
-#include <cdio/cdio.h>
-#include <cdio/ecma_167.h>
-#include <cdio/posix.h>
-
-typedef uint16_t partition_num_t;
-
-/** Opaque structures. */
-typedef struct udf_s udf_t; 
-typedef struct udf_file_s udf_file_t;
-typedef struct udf_dirent_s udf_dirent_t;
-
-/**
-   Imagine the below a \#define'd value rather than distinct values of
-   an enum.
-*/
-typedef enum {
-  UDF_BLOCKSIZE       = 2048
-} udf_enum1_t; 
-
-/** This variable is trickery to force the above enum symbol value to
-    be recorded in debug symbol tables. It is used to allow one refer
-    to above enumeration values in a debugger and debugger
-    expressions */
-extern udf_enum1_t debug_udf_enum1;
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-  /*!
-    Close UDF and free resources associated with p_udf.
-  */
-  bool udf_close (udf_t *p_udf);
-  
-  /*!  
-    Seek to a position i_start and then read i_blocks. Number of
-    blocks read is returned. One normally expects the return to be
-    equal to i_blocks.
-  */
-
-  driver_return_code_t udf_read_sectors (const udf_t *p_udf, void *ptr, 
-					 lsn_t i_start,  long int i_blocks);
-
-  /*!
-    Open an UDF for reading. Maybe in the future we will have
-    a mode. NULL is returned on error.
-    
-    Caller must free result - use udf_close for that.
-  */
-  udf_t *udf_open (const char *psz_path);
-  
-  /*!
-    Return the partition number of the the opened udf handle. -1 
-    Is returned if we have an error.
-  */
-  int16_t udf_get_part_number(const udf_t *p_udf);
-
-  /*!
-    Get the root in p_udf. If b_any_partition is false then
-    the root must be in the given partition.
-    NULL is returned if the partition is not found or a root is not found or
-    there is on error.
-
-    Caller must free result - use udf_file_free for that.
-  */
-  udf_dirent_t *udf_get_root (udf_t *p_udf, bool b_any_partition, 
-			      partition_num_t i_partition);
-  
-  /**
-   * Gets the Volume Identifier string, in 8bit unicode (latin-1)
-   * psz_volid, place to put the string
-   * i_volid_size, size of the buffer volid points to
-   * returns the size of buffer needed for all data
-   */
-  int udf_get_volume_id(udf_t *p_udf, /*out*/ char *psz_volid,  
-			unsigned int i_volid);
-  
-  /**
-   * Gets the Volume Set Identifier, as a 128-byte dstring (not decoded)
-   * WARNING This is not a null terminated string
-   * volsetid, place to put the data
-   * volsetid_size, size of the buffer volsetid points to 
-   * the buffer should be >=128 bytes to store the whole volumesetidentifier
-   * returns the size of the available volsetid information (128)
-   * or 0 on error
-   */
-  int udf_get_volumeset_id(udf_t *p_udf, /*out*/ uint8_t *volsetid,
-			   unsigned int i_volsetid);
-  
-  /*!
-    Return a file pointer matching pzz_name. 
-  */
-  udf_dirent_t *udf_fopen(udf_dirent_t *p_udf_root, const char *psz_name);
-  
-  /*! udf_mode_string - fill in string PSZ_STR with an ls-style ASCII
-    representation of the i_mode. PSZ_STR is returned.
-
-    10 characters are stored in PSZ_STR; a terminating null byte is added.
-    The characters stored in PSZ_STR are:
-    
-    0	File type.  'd' for directory, 'c' for character
-	special, 'b' for block special, 'm' for multiplex,
-	'l' for symbolic link, 's' for socket, 'p' for fifo,
-	'-' for regular, '?' for any other file type
-
-    1	'r' if the owner may read, '-' otherwise.
-
-    2	'w' if the owner may write, '-' otherwise.
-
-    3	'x' if the owner may execute, 's' if the file is
-	set-user-id, '-' otherwise.
-	'S' if the file is set-user-id, but the execute
-	bit isn't set.
-
-    4	'r' if group members may read, '-' otherwise.
-
-    5	'w' if group members may write, '-' otherwise.
-
-    6	'x' if group members may execute, 's' if the file is
-	set-group-id, '-' otherwise.
-	'S' if it is set-group-id but not executable.
-
-    7	'r' if any user may read, '-' otherwise.
-
-    8	'w' if any user may write, '-' otherwise.
-
-    9	'x' if any user may execute, 't' if the file is "sticky"
-	(will be retained in swap space after execution), '-'
-	otherwise.
-	'T' if the file is sticky but not executable.  */
-
-  char *udf_mode_string (mode_t i_mode, char *psz_str);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#include <cdio/udf_time.h>
-#include <cdio/udf_file.h>
-
-#endif /*UDF_H*/
diff --git a/lib-x86-64/include/cdio/udf_file.h b/lib-x86-64/include/cdio/udf_file.h
deleted file mode 100644
index 0b8fe99e..00000000
--- a/lib-x86-64/include/cdio/udf_file.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*  
-    $Id: udf_file.h,v 1.12 2008/03/25 15:59:09 karl Exp $
-
-    Copyright (C) 2005, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-/**
- * \file udf_file.h 
- *
- * \brief Routines involving UDF file operations
- *
-*/
-
-#ifndef UDF_FILE_H
-#define UDF_FILE_H 
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-  /**
-    Return the file id descriptor of the given file.
-  */
-  bool udf_get_fileid_descriptor(const udf_dirent_t *p_udf_dirent, 
-				 /*out*/ udf_fileid_desc_t *p_udf_fid);
-
-  /**
-    Return the name of the file
-  */
-  const char *udf_get_filename(const udf_dirent_t *p_udf_dirent);
-  
-  /**
-    Return the name of the file
-  */
-  bool udf_get_file_entry(const udf_dirent_t *p_udf_dirent, 
-			  /*out*/ udf_file_entry_t *p_udf_fe);
-
-  /**
-    Return the number of hard links of the file. Return 0 if error.
-  */
-  uint16_t udf_get_link_count(const udf_dirent_t *p_udf_dirent);
-
-  /**
-    Return the file length the file. Return 2147483647L if error.
-  */
-  uint64_t udf_get_file_length(const udf_dirent_t *p_udf_dirent);
-
-  /**  
-    Returns a POSIX mode for a given p_udf_dirent.
-  */
-  mode_t udf_get_posix_filemode(const udf_dirent_t *p_udf_dirent);
-
-  /**
-    Return the next subdirectory. 
-  */
-  udf_dirent_t *udf_opendir(const udf_dirent_t *p_udf_dirent);
-  
-  /**
-     Attempts to read up to count bytes from UDF directory entry
-     p_udf_dirent into the buffer starting at buf. buf should be a
-     multiple of UDF_BLOCKSIZE bytes. Reading continues after the
-     point at which we last read or from the beginning the first time.
-     
-     If count is zero, read() returns zero and has no other results. If
-     count is greater than SSIZE_MAX, the result is unspecified.
-     
-     If there is an error, cast the result to driver_return_code_t for 
-     the specific error code.
-  */
-  /**
-    Attempts to read up to count bytes from file descriptor fd into
-    the buffer starting at buf.
-    
-    If count is zero, read() returns zero and has no other results. If
-    count is greater than SSIZE_MAX, the result is unspecified.
-  */
-  ssize_t udf_read_block(const udf_dirent_t *p_udf_dirent, 
-			 void * buf, size_t count);
-
-  /**
-    Advances p_udf_direct to the the next directory entry in the
-    pointed to by p_udf_dir. It also returns this as the value.  NULL
-    is returned on reaching the end-of-file or if an error. Also
-    p_udf_dirent is free'd. If the end of is not reached the caller
-    must call udf_dirent_free() with p_udf_dirent when done with it to 
-    release resources.
-  */
-  udf_dirent_t *udf_readdir(udf_dirent_t *p_udf_dirent);
-  
-  /**
-    free free resources associated with p_udf_dirent.
-  */
-  bool udf_dirent_free(udf_dirent_t *p_udf_dirent);
-  
-  /**
-    Return true if the file is a directory.
-  */
-  bool udf_is_dir(const udf_dirent_t *p_udf_dirent);
-  
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /*UDF_FILE_H*/
diff --git a/lib-x86-64/include/cdio/udf_time.h b/lib-x86-64/include/cdio/udf_time.h
deleted file mode 100644
index 791fcdd9..00000000
--- a/lib-x86-64/include/cdio/udf_time.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*  
-    $Id: udf_time.h,v 1.5 2008/03/25 15:59:09 karl Exp $
-
-    Copyright (C) 2005, 2008 Rocky Bernstein <rocky@gnu.org>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-/*!
- * \file udf_time.h 
- *
- * \brief UDF time conversion and access files.
- *
-*/
-
-#ifndef UDF_TIME_H
-#define UDF_TIME_H 
-
-#include <time.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-  /*!
-    Return the access time of the file.
-  */
-  time_t udf_get_access_time(const udf_dirent_t *p_udf_dirent);
-
-  /*!
-    Return the attribute (most recent create or access) time of the file
-  */
-  time_t udf_get_attribute_time(const udf_dirent_t *p_udf_dirent);
-
-  /*!
-    Return the modification time of the file.
-  */
-  time_t udf_get_modification_time(const udf_dirent_t *p_udf_dirent);
-
-  /*!
-    Return the access timestamp of the file
-  */
-  udf_timestamp_t *udf_get_access_timestamp(const udf_dirent_t *p_udf_dirent);
-
-  /*!
-    Return the modification timestamp of the file
-  */
-  udf_timestamp_t *udf_get_modification_timestamp(const udf_dirent_t 
-						  *p_udf_dirent);
-
-  /*!
-    Return the attr timestamp of the file
-  */
-  udf_timestamp_t *udf_get_attr_timestamp(const udf_dirent_t *p_udf_dirent);
-
-  /*!
-    Convert a UDF timestamp to a time_t. If microseconds are desired,
-    use dest_usec. The return value is the same as dest. */
-  time_t *udf_stamp_to_time(time_t *dest, long int *dest_usec, 
-			  const udf_timestamp_t src);
-
-  udf_timestamp_t *udf_timespec_to_stamp(const struct timespec ts,
-					 udf_timestamp_t *dest);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /*UDF_TIME_H*/
diff --git a/lib-x86-64/include/cdio/utf8.h b/lib-x86-64/include/cdio/utf8.h
deleted file mode 100644
index 236105e9..00000000
--- a/lib-x86-64/include/cdio/utf8.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-    $Id: utf8.h,v 1.2 2008/03/25 15:59:09 karl Exp $
-    
-    Copyright (C) 2008 Rocky Bernstein <rocky@gnu.org>
-    Copyright (C) 2006 Burkhard Plaum <plaum@ipf.uni-stuttgart.de>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-/* UTF-8 support */
-
-
-#include <cdio/types.h>
-
-/** \brief Opaque characterset converter
- */
-
-typedef struct cdio_charset_coverter_s cdio_charset_coverter_t;
-
-/** \brief Create a charset converter
- *  \param src_charset Source charset
- *  \param dst_charset Destination charset
- *  \returns A newly allocated charset converter
- */
-
-cdio_charset_coverter_t *
-cdio_charset_converter_create(const char * src_charset,
-                              const char * dst_charset);
-
-/** \brief Destroy a characterset converter
- *  \param cnv A characterset converter
- */
-
-void cdio_charset_converter_destroy(cdio_charset_coverter_t*cnv);
-
-/** \brief Convert a string from one character set to another
- *  \param cnv A charset converter
- *  \param src Source string
- *  \param src_len Length of source string
- *  \param dst Returns destination string
- *  \param dst_len If non NULL, returns the length of the destination string
- *  \returns true if conversion was sucessful, false else.
- *
- *  The destination string must be freed by the caller with free().
- *  If you pass -1 for src_len, strlen() will be used.
- */
-
-bool cdio_charset_convert(cdio_charset_coverter_t*cnv,
-                          char * src, int src_len,
-                          char ** dst, int * dst_len);
-
-/** \brief Convert a string from UTF-8 to another charset
- *  \param src Source string (0 terminated)
- *  \param dst Returns destination string
- *  \param dst_len If non NULL, returns the length of the destination string
- *  \param dst_charset The characterset to convert to
- *  \returns true if conversion was sucessful, false else.
- *
- *  This is a convenience function, which creates a charset converter,
- *  converts one string and destroys the charset converter.
- */
-
-
-bool cdio_charset_from_utf8(cdio_utf8_t * src, char ** dst,
-                            int * dst_len, const char * dst_charset);
-
-/** \brief Convert a string from another charset to UTF-8 
- *  \param src Source string
- *  \param src_len Length of the source string
- *  \param dst Returns destination string (0 terminated)
- *  \param src_charset The characterset to convert from
- *  \returns true if conversion was sucessful, false else.
- *
- *  This is a convenience function, which creates a charset converter,
- *  converts one string and destroys the charset converter. If you pass -1
- *  for src_len, strlen() will be used.
- */
-
-
-bool cdio_charset_to_utf8(char *src, size_t src_len, cdio_utf8_t **dst,
-                          const char * src_charset);
-
diff --git a/lib-x86-64/include/cdio/util.h b/lib-x86-64/include/cdio/util.h
deleted file mode 100644
index 81557dc7..00000000
--- a/lib-x86-64/include/cdio/util.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-    $Id: util.h,v 1.12 2008/03/25 15:59:10 karl Exp $
-
-    Copyright (C) 2004, 2005, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
-    Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __CDIO_UTIL_H__
-#define __CDIO_UTIL_H__
-
-/*!
-   \file util.h 
-   \brief Miscellaneous utility functions. 
-
-   Warning: this will probably get removed/replaced by using glib.h
-*/
-#include <stdlib.h>
-
-#undef  MAX
-#define MAX(a, b)  (((a) > (b)) ? (a) : (b))
-
-#undef  MIN
-#define MIN(a, b)  (((a) < (b)) ? (a) : (b))
-
-#undef  IN
-#define IN(x, low, high) ((x) >= (low) && (x) <= (high))
-
-#undef  CLAMP
-#define CLAMP(x, low, high)  (((x) > (high)) ? (high) : (((x) < (low)) ? (low) : (x)))
-
-static inline uint32_t
-_cdio_len2blocks (uint32_t i_len, uint16_t i_blocksize)
-{
-  uint32_t i_blocks;
-
-  i_blocks = i_len / (uint32_t) i_blocksize;
-  if (i_len % i_blocksize)
-    i_blocks++;
-
-  return i_blocks;
-}
-
-/* round up to next block boundary */
-static inline unsigned 
-_cdio_ceil2block (unsigned offset, uint16_t i_blocksize)
-{
-  return _cdio_len2blocks (offset, i_blocksize) * i_blocksize;
-}
-
-static inline unsigned int
-_cdio_ofs_add (unsigned offset, unsigned length, uint16_t i_blocksize)
-{
-  if (i_blocksize - (offset % i_blocksize) < length)
-    offset = _cdio_ceil2block (offset, i_blocksize);
-
-  offset += length;
-
-  return offset;
-}
-
-static inline const char *
-_cdio_bool_str (bool b)
-{
-  return b ? "yes" : "no";
-}
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void *
-_cdio_memdup (const void *mem, size_t count);
-
-char *
-_cdio_strdup_upper (const char str[]);
-
-void
-_cdio_strfreev(char **strv);
-
-size_t
-_cdio_strlenv(char **str_array);
-
-char **
-_cdio_strsplit(const char str[], char delim);
-
-uint8_t cdio_to_bcd8(uint8_t n);
-uint8_t cdio_from_bcd8(uint8_t p);
-
-void cdio_follow_symlink (const char * src, char * dst);
-  
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __CDIO_UTIL_H__ */
-
-
-/* 
- * Local variables:
- *  c-file-style: "gnu"
- *  tab-width: 8
- *  indent-tabs-mode: nil
- * End:
- */
diff --git a/lib-x86-64/include/cdio/version.h b/lib-x86-64/include/cdio/version.h
deleted file mode 100644
index 77a39ad1..00000000
--- a/lib-x86-64/include/cdio/version.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* $Id: version.h.in,v 1.6 2005/01/29 20:54:20 rocky Exp $ */
-/** \file version.h 
- *
- *  \brief A file containing the libcdio package version
- *  number (82) and OS build name. 
- */
-
-/*! CDIO_VERSION can as a string in programs to show what version is used. */
-#define CDIO_VERSION "0.82 x86_64-unknown-linux-gnu"
-
-/*! LIBCDIO_VERSION_NUM  can be used for testing in the C preprocessor */
-#define LIBCDIO_VERSION_NUM 82
diff --git a/lib-x86-64/include/cdio/xa.h b/lib-x86-64/include/cdio/xa.h
deleted file mode 100644
index 13b21c8f..00000000
--- a/lib-x86-64/include/cdio/xa.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
-    $Id: xa.h,v 1.19 2008/03/25 15:59:10 karl Exp $
-
-    Copyright (C) 2003, 2004, 2005, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
-    Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
-
-    See also iso9660.h by Eric Youngdale (1993) and in cdrtools. These are 
-
-    Copyright 1993 Yggdrasil Computing, Incorporated
-    Copyright (c) 1999,2000 J. Schilling
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-*/
-/*!
-   \file xa.h 
-   \brief Things related to the ISO-9660 XA (Extended Attributes) format
-
-   Applications will probably not include this directly but via 
-   the iso9660.h header.
-*/
-
-
-#ifndef __CDIO_XA_H__
-#define __CDIO_XA_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-  /*! An enumeration for some of the XA_* \#defines below. This isn't
-    really an enumeration one would really use in a program it is to
-    be helpful in debuggers where wants just to refer to the XA_*
-    names and get something.
-  */
-  typedef enum {
-    ISO_XA_MARKER_OFFSET =   1024,
-    XA_PERM_RSYS =         0x0001,  /**< System Group Read */
-    XA_PERM_XSYS =         0x0004,  /**< System Group Execute */
-    
-    XA_PERM_RUSR =         0x0010,  /**< User (owner) Read */
-    XA_PERM_XUSR =         0x0040,  /**< User (owner) Execute */
-    
-    XA_PERM_RGRP =         0x0100,  /**< Group Read */
-    XA_PERM_XGRP =         0x0400,  /**< Group Execute */
-    
-    XA_PERM_ROTH =         0x1000,  /**< Other (world) Read */
-    XA_PERM_XOTH =         0x4000,  /**< Other (world) Execute */
-    
-    XA_ATTR_MODE2FORM1  =   (1 << 11),
-    XA_ATTR_MODE2FORM2  =   (1 << 12),
-    XA_ATTR_INTERLEAVED =   (1 << 13),
-    XA_ATTR_CDDA        =   (1 << 14),
-    XA_ATTR_DIRECTORY   =   (1 << 15),
-    
-    XA_PERM_ALL_READ    =   (XA_PERM_RUSR | XA_PERM_RSYS | XA_PERM_RGRP),
-    XA_PERM_ALL_EXEC    =   (XA_PERM_XUSR | XA_PERM_XSYS | XA_PERM_XGRP),
-    XA_PERM_ALL_ALL     =   (XA_PERM_ALL_READ | XA_PERM_ALL_EXEC),
-    
-    XA_FORM1_DIR  = (XA_ATTR_DIRECTORY | XA_ATTR_MODE2FORM1 | XA_PERM_ALL_ALL),
-    XA_FORM1_FILE =  (XA_ATTR_MODE2FORM1 | XA_PERM_ALL_ALL),
-    XA_FORM2_FILE =  (XA_ATTR_MODE2FORM2 | XA_PERM_ALL_ALL)
-  } xa_misc_enum_t;
-  
-extern const char ISO_XA_MARKER_STRING[sizeof("CD-XA001")-1];
-
-#define ISO_XA_MARKER_STRING    "CD-XA001"
-
-/*! \brief "Extended Architecture" according to the Philips Yellow Book.
- 
-CD-ROM EXtended Architecture is a modification to the CD-ROM
-specification that defines two new types of sectors.  CD-ROM XA was
-developed jointly by Sony, Philips, and Microsoft, and announced in
-August 1988. Its specifications were published in an extension to the
-Yellow Book.  CD-i, Photo CD, Video CD and CD-EXTRA have all
-subsequently been based on CD-ROM XA.
-
-CD-XA defines another way of formatting sectors on a CD-ROM, including
-headers in the sectors that describe the type (audio, video, data) and
-some additional info (markers, resolution in case of a video or audio
-sector, file numbers, etc).
-
-The data written on a CD-XA is consistent with and can be in ISO-9660
-file system format and therefore be readable by ISO-9660 file system
-translators. But also a CD-I player can also read CD-XA discs even if
-its own `Green Book' file system only resembles ISO 9660 and isn't
-fully compatible. 
-
- Note structure is big-endian.
-*/
-typedef struct iso9660_xa_s
-{
-  uint16_t group_id;      /**< 0 */
-  uint16_t user_id;       /**< 0 */
-  uint16_t attributes;    /**< XA_ATTR_ */ 
-  char     signature[2];  /**< { 'X', 'A' } */
-  uint8_t  filenum;       /**< file number, see also XA subheader */
-  uint8_t  reserved[5];   /**< zero */
-} GNUC_PACKED iso9660_xa_t;
-  
-  
-  /*!
-    Returns POSIX mode bitstring for a given file.
-  */
-  posix_mode_t iso9660_get_posix_filemode_from_xa(uint16_t i_perms);
-
-/*!
-  Returns a string interpreting the extended attribute xa_attr. 
-  For example:
-  \verbatim
-  d---1xrxrxr
-  ---2--r-r-r
-  -a--1xrxrxr
-  \endverbatim
-  
-  A description of the characters in the string follows.
-  The 1st character is either "d" if the entry is a directory, or "-" if not
-  The 2nd character is either "a" if the entry is CDDA (audio), or "-" if not
-  The 3rd character is either "i" if the entry is interleaved, or "-" if not
-  The 4th character is either "2" if the entry is mode2 form2 or "-" if not
-  The 5th character is either "1" if the entry is mode2 form1 or "-" if not
-  Note that an entry will either be in mode2 form1 or mode form2. That
-  is you will either see "2-" or "-1" in the 4th & 5th positions.
-  
-  The 6th and 7th characters refer to permissions for a user while the
-  the 8th and 9th characters refer to permissions for a group while, and 
-  the 10th and 11th characters refer to permissions for everyone. 
-  
-  In each of these pairs the first character (6, 8, 10) is "x" if the 
-  entry is executable. For a directory this means the directory is
-  allowed to be listed or "searched".
-  The second character of a pair (7, 9, 11) is "r" if the entry is allowed
-  to be read. 
-*/
-const char *
-iso9660_get_xa_attr_str (uint16_t xa_attr);
-  
-/*! 
-  Allocates and initalizes a new iso9600_xa_t variable and returns
-  it. The caller should free the returned result.
-
-  @see iso9660_xa
-*/
-iso9660_xa_t *
-iso9660_xa_init (iso9660_xa_t *_xa, uint16_t uid, uint16_t gid, uint16_t attr, 
-		 uint8_t filenum);
-
-#ifdef __cplusplus
-}
-
-/** The below variables are trickery to force the above enum symbol
-    values to be recorded in debug symbol tables. They are used to
-    allow one to refer to the enumeration value names in the typedefs
-    above in a debugger and debugger expressions.
-*/
-extern xa_misc_enum_t debugger_xa_misc_enum;
-
-  
-#endif /* __cplusplus */
-
-#endif /* __CDIO_XA_H__ */
-
-/* 
- * Local variables:
- *  c-file-style: "gnu"
- *  tab-width: 8
- *  indent-tabs-mode: nil
- * End:
- */
diff --git a/lib-x86-64/include/curl/curl.h b/lib-x86-64/include/curl/curl.h
deleted file mode 100644
index cb9d0fbf..00000000
--- a/lib-x86-64/include/curl/curl.h
+++ /dev/null
@@ -1,2119 +0,0 @@
-#ifndef __CURL_CURL_H
-#define __CURL_CURL_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-
-/*
- * If you have libcurl problems, all docs and details are found here:
- *   http://curl.haxx.se/libcurl/
- *
- * curl-library mailing list subscription and unsubscription web interface:
- *   http://cool.haxx.se/mailman/listinfo/curl-library/
- */
-
-#include "curlver.h"         /* libcurl version defines   */
-#include "curlbuild.h"       /* libcurl build definitions */
-#include "curlrules.h"       /* libcurl rules enforcement */
-
-/*
- * Define WIN32 when build target is Win32 API
- */
-
-#if (defined(_WIN32) || defined(__WIN32__)) && \
-     !defined(WIN32) && !defined(__SYMBIAN32__)
-#define WIN32
-#endif
-
-#include <stdio.h>
-#include <limits.h>
-
-#if defined(__FreeBSD__) && (__FreeBSD__ >= 2)
-/* Needed for __FreeBSD_version symbol definition */
-#include <osreldate.h>
-#endif
-
-/* The include stuff here below is mainly for time_t! */
-#include <sys/types.h>
-#include <time.h>
-
-#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__GNUC__) && \
-  !defined(__CYGWIN__) || defined(__MINGW32__)
-#if !(defined(_WINSOCKAPI_) || defined(_WINSOCK_H))
-/* The check above prevents the winsock2 inclusion if winsock.h already was
-   included, since they can't co-exist without problems */
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#endif
-#else
-
-/* HP-UX systems version 9, 10 and 11 lack sys/select.h and so does oldish
-   libc5-based Linux systems. Only include it on system that are known to
-   require it! */
-#if defined(_AIX) || defined(__NOVELL_LIBC__) || defined(__NetBSD__) || \
-    defined(__minix) || defined(__SYMBIAN32__) || defined(__INTEGRITY) || \
-    defined(ANDROID) || \
-   (defined(__FreeBSD_version) && (__FreeBSD_version < 800000))
-#include <sys/select.h>
-#endif
-
-#ifndef _WIN32_WCE
-#include <sys/socket.h>
-#endif
-#if !defined(WIN32) && !defined(__WATCOMC__) && !defined(__VXWORKS__)
-#include <sys/time.h>
-#endif
-#include <sys/types.h>
-#endif
-
-#ifdef __BEOS__
-#include <support/SupportDefs.h>
-#endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef void CURL;
-
-/*
- * Decorate exportable functions for Win32 and Symbian OS DLL linking.
- * This avoids using a .def file for building libcurl.dll.
- */
-#if (defined(WIN32) || defined(_WIN32) || defined(__SYMBIAN32__)) && \
-     !defined(CURL_STATICLIB)
-#if defined(BUILDING_LIBCURL)
-#define CURL_EXTERN  __declspec(dllexport)
-#else
-#define CURL_EXTERN  __declspec(dllimport)
-#endif
-#else
-
-#ifdef CURL_HIDDEN_SYMBOLS
-/*
- * This definition is used to make external definitions visible in the
- * shared library when symbols are hidden by default.  It makes no
- * difference when compiling applications whether this is set or not,
- * only when compiling the library.
- */
-#define CURL_EXTERN CURL_EXTERN_SYMBOL
-#else
-#define CURL_EXTERN
-#endif
-#endif
-
-#ifndef curl_socket_typedef
-/* socket typedef */
-#ifdef WIN32
-typedef SOCKET curl_socket_t;
-#define CURL_SOCKET_BAD INVALID_SOCKET
-#else
-typedef int curl_socket_t;
-#define CURL_SOCKET_BAD -1
-#endif
-#define curl_socket_typedef
-#endif /* curl_socket_typedef */
-
-struct curl_httppost {
-  struct curl_httppost *next;       /* next entry in the list */
-  char *name;                       /* pointer to allocated name */
-  long namelength;                  /* length of name length */
-  char *contents;                   /* pointer to allocated data contents */
-  long contentslength;              /* length of contents field */
-  char *buffer;                     /* pointer to allocated buffer contents */
-  long bufferlength;                /* length of buffer field */
-  char *contenttype;                /* Content-Type */
-  struct curl_slist* contentheader; /* list of extra headers for this form */
-  struct curl_httppost *more;       /* if one field name has more than one
-                                       file, this link should link to following
-                                       files */
-  long flags;                       /* as defined below */
-#define HTTPPOST_FILENAME (1<<0)    /* specified content is a file name */
-#define HTTPPOST_READFILE (1<<1)    /* specified content is a file name */
-#define HTTPPOST_PTRNAME (1<<2)     /* name is only stored pointer
-                                       do not free in formfree */
-#define HTTPPOST_PTRCONTENTS (1<<3) /* contents is only stored pointer
-                                       do not free in formfree */
-#define HTTPPOST_BUFFER (1<<4)      /* upload file from buffer */
-#define HTTPPOST_PTRBUFFER (1<<5)   /* upload file from pointer contents */
-#define HTTPPOST_CALLBACK (1<<6)    /* upload file contents by using the
-                                       regular read callback to get the data
-                                       and pass the given pointer as custom
-                                       pointer */
-
-  char *showfilename;               /* The file name to show. If not set, the
-                                       actual file name will be used (if this
-                                       is a file part) */
-  void *userp;                      /* custom pointer used for
-                                       HTTPPOST_CALLBACK posts */
-};
-
-typedef int (*curl_progress_callback)(void *clientp,
-                                      double dltotal,
-                                      double dlnow,
-                                      double ultotal,
-                                      double ulnow);
-
-#ifndef CURL_MAX_WRITE_SIZE
-  /* Tests have proven that 20K is a very bad buffer size for uploads on
-     Windows, while 16K for some odd reason performed a lot better.
-     We do the ifndef check to allow this value to easier be changed at build
-     time for those who feel adventurous. The practical minimum is about
-     400 bytes since libcurl uses a buffer of this size as a scratch area
-     (unrelated to network send operations). */
-#define CURL_MAX_WRITE_SIZE 16384
-#endif
-
-#ifndef CURL_MAX_HTTP_HEADER
-/* The only reason to have a max limit for this is to avoid the risk of a bad
-   server feeding libcurl with a never-ending header that will cause reallocs
-   infinitely */
-#define CURL_MAX_HTTP_HEADER (100*1024)
-#endif
-
-
-/* This is a magic return code for the write callback that, when returned,
-   will signal libcurl to pause receiving on the current transfer. */
-#define CURL_WRITEFUNC_PAUSE 0x10000001
-typedef size_t (*curl_write_callback)(char *buffer,
-                                      size_t size,
-                                      size_t nitems,
-                                      void *outstream);
-
-
-
-/* enumeration of file types */
-typedef enum {
-  CURLFILETYPE_FILE = 0,
-  CURLFILETYPE_DIRECTORY,
-  CURLFILETYPE_SYMLINK,
-  CURLFILETYPE_DEVICE_BLOCK,
-  CURLFILETYPE_DEVICE_CHAR,
-  CURLFILETYPE_NAMEDPIPE,
-  CURLFILETYPE_SOCKET,
-  CURLFILETYPE_DOOR, /* is possible only on Sun Solaris now */
-
-  CURLFILETYPE_UNKNOWN /* should never occur */
-} curlfiletype;
-
-#define CURLFINFOFLAG_KNOWN_FILENAME    (1<<0)
-#define CURLFINFOFLAG_KNOWN_FILETYPE    (1<<1)
-#define CURLFINFOFLAG_KNOWN_TIME        (1<<2)
-#define CURLFINFOFLAG_KNOWN_PERM        (1<<3)
-#define CURLFINFOFLAG_KNOWN_UID         (1<<4)
-#define CURLFINFOFLAG_KNOWN_GID         (1<<5)
-#define CURLFINFOFLAG_KNOWN_SIZE        (1<<6)
-#define CURLFINFOFLAG_KNOWN_HLINKCOUNT  (1<<7)
-
-/* Content of this structure depends on information which is known and is
-   achievable (e.g. by FTP LIST parsing). Please see the url_easy_setopt(3) man
-   page for callbacks returning this structure -- some fields are mandatory,
-   some others are optional. The FLAG field has special meaning. */
-struct curl_fileinfo {
-  char *filename;
-  curlfiletype filetype;
-  time_t time;
-  unsigned int perm;
-  int uid;
-  int gid;
-  curl_off_t size;
-  long int hardlinks;
-
-  struct {
-    /* If some of these fields is not NULL, it is a pointer to b_data. */
-    char *time;
-    char *perm;
-    char *user;
-    char *group;
-    char *target; /* pointer to the target filename of a symlink */
-  } strings;
-
-  unsigned int flags;
-
-  /* used internally */
-  char * b_data;
-  size_t b_size;
-  size_t b_used;
-};
-
-/* return codes for CURLOPT_CHUNK_BGN_FUNCTION */
-#define CURL_CHUNK_BGN_FUNC_OK      0
-#define CURL_CHUNK_BGN_FUNC_FAIL    1 /* tell the lib to end the task */
-#define CURL_CHUNK_BGN_FUNC_SKIP    2 /* skip this chunk over */
-
-/* if splitting of data transfer is enabled, this callback is called before
-   download of an individual chunk started. Note that parameter "remains" works
-   only for FTP wildcard downloading (for now), otherwise is not used */
-typedef long (*curl_chunk_bgn_callback)(const void *transfer_info,
-                                        void *ptr,
-                                        int remains);
-
-/* return codes for CURLOPT_CHUNK_END_FUNCTION */
-#define CURL_CHUNK_END_FUNC_OK      0
-#define CURL_CHUNK_END_FUNC_FAIL    1 /* tell the lib to end the task */
-
-/* If splitting of data transfer is enabled this callback is called after
-   download of an individual chunk finished.
-   Note! After this callback was set then it have to be called FOR ALL chunks.
-   Even if downloading of this chunk was skipped in CHUNK_BGN_FUNC.
-   This is the reason why we don't need "transfer_info" parameter in this
-   callback and we are not interested in "remains" parameter too. */
-typedef long (*curl_chunk_end_callback)(void *ptr);
-
-/* return codes for FNMATCHFUNCTION */
-#define CURL_FNMATCHFUNC_MATCH    0 /* string corresponds to the pattern */
-#define CURL_FNMATCHFUNC_NOMATCH  1 /* pattern doesn't match the string */
-#define CURL_FNMATCHFUNC_FAIL     2 /* an error occurred */
-
-/* callback type for wildcard downloading pattern matching. If the
-   string matches the pattern, return CURL_FNMATCHFUNC_MATCH value, etc. */
-typedef int (*curl_fnmatch_callback)(void *ptr,
-                                     const char *pattern,
-                                     const char *string);
-
-/* These are the return codes for the seek callbacks */
-#define CURL_SEEKFUNC_OK       0
-#define CURL_SEEKFUNC_FAIL     1 /* fail the entire transfer */
-#define CURL_SEEKFUNC_CANTSEEK 2 /* tell libcurl seeking can't be done, so
-                                    libcurl might try other means instead */
-typedef int (*curl_seek_callback)(void *instream,
-                                  curl_off_t offset,
-                                  int origin); /* 'whence' */
-
-/* This is a return code for the read callback that, when returned, will
-   signal libcurl to immediately abort the current transfer. */
-#define CURL_READFUNC_ABORT 0x10000000
-/* This is a return code for the read callback that, when returned, will
-   signal libcurl to pause sending data on the current transfer. */
-#define CURL_READFUNC_PAUSE 0x10000001
-
-typedef size_t (*curl_read_callback)(char *buffer,
-                                      size_t size,
-                                      size_t nitems,
-                                      void *instream);
-
-typedef enum  {
-  CURLSOCKTYPE_IPCXN, /* socket created for a specific IP connection */
-  CURLSOCKTYPE_LAST   /* never use */
-} curlsocktype;
-
-typedef int (*curl_sockopt_callback)(void *clientp,
-                                     curl_socket_t curlfd,
-                                     curlsocktype purpose);
-
-struct curl_sockaddr {
-  int family;
-  int socktype;
-  int protocol;
-  unsigned int addrlen; /* addrlen was a socklen_t type before 7.18.0 but it
-                           turned really ugly and painful on the systems that
-                           lack this type */
-  struct sockaddr addr;
-};
-
-typedef curl_socket_t
-(*curl_opensocket_callback)(void *clientp,
-                            curlsocktype purpose,
-                            struct curl_sockaddr *address);
-
-typedef enum {
-  CURLIOE_OK,            /* I/O operation successful */
-  CURLIOE_UNKNOWNCMD,    /* command was unknown to callback */
-  CURLIOE_FAILRESTART,   /* failed to restart the read */
-  CURLIOE_LAST           /* never use */
-} curlioerr;
-
-typedef enum  {
-  CURLIOCMD_NOP,         /* no operation */
-  CURLIOCMD_RESTARTREAD, /* restart the read stream from start */
-  CURLIOCMD_LAST         /* never use */
-} curliocmd;
-
-typedef curlioerr (*curl_ioctl_callback)(CURL *handle,
-                                         int cmd,
-                                         void *clientp);
-
-/*
- * The following typedef's are signatures of malloc, free, realloc, strdup and
- * calloc respectively.  Function pointers of these types can be passed to the
- * curl_global_init_mem() function to set user defined memory management
- * callback routines.
- */
-typedef void *(*curl_malloc_callback)(size_t size);
-typedef void (*curl_free_callback)(void *ptr);
-typedef void *(*curl_realloc_callback)(void *ptr, size_t size);
-typedef char *(*curl_strdup_callback)(const char *str);
-typedef void *(*curl_calloc_callback)(size_t nmemb, size_t size);
-
-/* the kind of data that is passed to information_callback*/
-typedef enum {
-  CURLINFO_TEXT = 0,
-  CURLINFO_HEADER_IN,    /* 1 */
-  CURLINFO_HEADER_OUT,   /* 2 */
-  CURLINFO_DATA_IN,      /* 3 */
-  CURLINFO_DATA_OUT,     /* 4 */
-  CURLINFO_SSL_DATA_IN,  /* 5 */
-  CURLINFO_SSL_DATA_OUT, /* 6 */
-  CURLINFO_END
-} curl_infotype;
-
-typedef int (*curl_debug_callback)
-       (CURL *handle,      /* the handle/transfer this concerns */
-        curl_infotype type, /* what kind of data */
-        char *data,        /* points to the data */
-        size_t size,       /* size of the data pointed to */
-        void *userptr);    /* whatever the user please */
-
-/* All possible error codes from all sorts of curl functions. Future versions
-   may return other values, stay prepared.
-
-   Always add new return codes last. Never *EVER* remove any. The return
-   codes must remain the same!
- */
-
-typedef enum {
-  CURLE_OK = 0,
-  CURLE_UNSUPPORTED_PROTOCOL,    /* 1 */
-  CURLE_FAILED_INIT,             /* 2 */
-  CURLE_URL_MALFORMAT,           /* 3 */
-  CURLE_OBSOLETE4,               /* 4 - NOT USED */
-  CURLE_COULDNT_RESOLVE_PROXY,   /* 5 */
-  CURLE_COULDNT_RESOLVE_HOST,    /* 6 */
-  CURLE_COULDNT_CONNECT,         /* 7 */
-  CURLE_FTP_WEIRD_SERVER_REPLY,  /* 8 */
-  CURLE_REMOTE_ACCESS_DENIED,    /* 9 a service was denied by the server
-                                    due to lack of access - when login fails
-                                    this is not returned. */
-  CURLE_OBSOLETE10,              /* 10 - NOT USED */
-  CURLE_FTP_WEIRD_PASS_REPLY,    /* 11 */
-  CURLE_OBSOLETE12,              /* 12 - NOT USED */
-  CURLE_FTP_WEIRD_PASV_REPLY,    /* 13 */
-  CURLE_FTP_WEIRD_227_FORMAT,    /* 14 */
-  CURLE_FTP_CANT_GET_HOST,       /* 15 */
-  CURLE_OBSOLETE16,              /* 16 - NOT USED */
-  CURLE_FTP_COULDNT_SET_TYPE,    /* 17 */
-  CURLE_PARTIAL_FILE,            /* 18 */
-  CURLE_FTP_COULDNT_RETR_FILE,   /* 19 */
-  CURLE_OBSOLETE20,              /* 20 - NOT USED */
-  CURLE_QUOTE_ERROR,             /* 21 - quote command failure */
-  CURLE_HTTP_RETURNED_ERROR,     /* 22 */
-  CURLE_WRITE_ERROR,             /* 23 */
-  CURLE_OBSOLETE24,              /* 24 - NOT USED */
-  CURLE_UPLOAD_FAILED,           /* 25 - failed upload "command" */
-  CURLE_READ_ERROR,              /* 26 - couldn't open/read from file */
-  CURLE_OUT_OF_MEMORY,           /* 27 */
-  /* Note: CURLE_OUT_OF_MEMORY may sometimes indicate a conversion error
-           instead of a memory allocation error if CURL_DOES_CONVERSIONS
-           is defined
-  */
-  CURLE_OPERATION_TIMEDOUT,      /* 28 - the timeout time was reached */
-  CURLE_OBSOLETE29,              /* 29 - NOT USED */
-  CURLE_FTP_PORT_FAILED,         /* 30 - FTP PORT operation failed */
-  CURLE_FTP_COULDNT_USE_REST,    /* 31 - the REST command failed */
-  CURLE_OBSOLETE32,              /* 32 - NOT USED */
-  CURLE_RANGE_ERROR,             /* 33 - RANGE "command" didn't work */
-  CURLE_HTTP_POST_ERROR,         /* 34 */
-  CURLE_SSL_CONNECT_ERROR,       /* 35 - wrong when connecting with SSL */
-  CURLE_BAD_DOWNLOAD_RESUME,     /* 36 - couldn't resume download */
-  CURLE_FILE_COULDNT_READ_FILE,  /* 37 */
-  CURLE_LDAP_CANNOT_BIND,        /* 38 */
-  CURLE_LDAP_SEARCH_FAILED,      /* 39 */
-  CURLE_OBSOLETE40,              /* 40 - NOT USED */
-  CURLE_FUNCTION_NOT_FOUND,      /* 41 */
-  CURLE_ABORTED_BY_CALLBACK,     /* 42 */
-  CURLE_BAD_FUNCTION_ARGUMENT,   /* 43 */
-  CURLE_OBSOLETE44,              /* 44 - NOT USED */
-  CURLE_INTERFACE_FAILED,        /* 45 - CURLOPT_INTERFACE failed */
-  CURLE_OBSOLETE46,              /* 46 - NOT USED */
-  CURLE_TOO_MANY_REDIRECTS ,     /* 47 - catch endless re-direct loops */
-  CURLE_UNKNOWN_TELNET_OPTION,   /* 48 - User specified an unknown option */
-  CURLE_TELNET_OPTION_SYNTAX ,   /* 49 - Malformed telnet option */
-  CURLE_OBSOLETE50,              /* 50 - NOT USED */
-  CURLE_PEER_FAILED_VERIFICATION, /* 51 - peer's certificate or fingerprint
-                                     wasn't verified fine */
-  CURLE_GOT_NOTHING,             /* 52 - when this is a specific error */
-  CURLE_SSL_ENGINE_NOTFOUND,     /* 53 - SSL crypto engine not found */
-  CURLE_SSL_ENGINE_SETFAILED,    /* 54 - can not set SSL crypto engine as
-                                    default */
-  CURLE_SEND_ERROR,              /* 55 - failed sending network data */
-  CURLE_RECV_ERROR,              /* 56 - failure in receiving network data */
-  CURLE_OBSOLETE57,              /* 57 - NOT IN USE */
-  CURLE_SSL_CERTPROBLEM,         /* 58 - problem with the local certificate */
-  CURLE_SSL_CIPHER,              /* 59 - couldn't use specified cipher */
-  CURLE_SSL_CACERT,              /* 60 - problem with the CA cert (path?) */
-  CURLE_BAD_CONTENT_ENCODING,    /* 61 - Unrecognized transfer encoding */
-  CURLE_LDAP_INVALID_URL,        /* 62 - Invalid LDAP URL */
-  CURLE_FILESIZE_EXCEEDED,       /* 63 - Maximum file size exceeded */
-  CURLE_USE_SSL_FAILED,          /* 64 - Requested FTP SSL level failed */
-  CURLE_SEND_FAIL_REWIND,        /* 65 - Sending the data requires a rewind
-                                    that failed */
-  CURLE_SSL_ENGINE_INITFAILED,   /* 66 - failed to initialise ENGINE */
-  CURLE_LOGIN_DENIED,            /* 67 - user, password or similar was not
-                                    accepted and we failed to login */
-  CURLE_TFTP_NOTFOUND,           /* 68 - file not found on server */
-  CURLE_TFTP_PERM,               /* 69 - permission problem on server */
-  CURLE_REMOTE_DISK_FULL,        /* 70 - out of disk space on server */
-  CURLE_TFTP_ILLEGAL,            /* 71 - Illegal TFTP operation */
-  CURLE_TFTP_UNKNOWNID,          /* 72 - Unknown transfer ID */
-  CURLE_REMOTE_FILE_EXISTS,      /* 73 - File already exists */
-  CURLE_TFTP_NOSUCHUSER,         /* 74 - No such user */
-  CURLE_CONV_FAILED,             /* 75 - conversion failed */
-  CURLE_CONV_REQD,               /* 76 - caller must register conversion
-                                    callbacks using curl_easy_setopt options
-                                    CURLOPT_CONV_FROM_NETWORK_FUNCTION,
-                                    CURLOPT_CONV_TO_NETWORK_FUNCTION, and
-                                    CURLOPT_CONV_FROM_UTF8_FUNCTION */
-  CURLE_SSL_CACERT_BADFILE,      /* 77 - could not load CACERT file, missing
-                                    or wrong format */
-  CURLE_REMOTE_FILE_NOT_FOUND,   /* 78 - remote file not found */
-  CURLE_SSH,                     /* 79 - error from the SSH layer, somewhat
-                                    generic so the error message will be of
-                                    interest when this has happened */
-
-  CURLE_SSL_SHUTDOWN_FAILED,     /* 80 - Failed to shut down the SSL
-                                    connection */
-  CURLE_AGAIN,                   /* 81 - socket is not ready for send/recv,
-                                    wait till it's ready and try again (Added
-                                    in 7.18.2) */
-  CURLE_SSL_CRL_BADFILE,         /* 82 - could not load CRL file, missing or
-                                    wrong format (Added in 7.19.0) */
-  CURLE_SSL_ISSUER_ERROR,        /* 83 - Issuer check failed.  (Added in
-                                    7.19.0) */
-  CURLE_FTP_PRET_FAILED,         /* 84 - a PRET command failed */
-  CURLE_RTSP_CSEQ_ERROR,         /* 85 - mismatch of RTSP CSeq numbers */
-  CURLE_RTSP_SESSION_ERROR,      /* 86 - mismatch of RTSP Session Identifiers */
-  CURLE_FTP_BAD_FILE_LIST,       /* 87 - unable to parse FTP file list */
-  CURLE_CHUNK_FAILED,            /* 88 - chunk callback reported error */
-
-  CURL_LAST /* never use! */
-} CURLcode;
-
-#ifndef CURL_NO_OLDIES /* define this to test if your app builds with all
-                          the obsolete stuff removed! */
-
-/* Backwards compatibility with older names */
-
-/* The following were added in 7.17.1 */
-/* These are scheduled to disappear by 2009 */
-#define CURLE_SSL_PEER_CERTIFICATE CURLE_PEER_FAILED_VERIFICATION
-
-/* The following were added in 7.17.0 */
-/* These are scheduled to disappear by 2009 */
-#define CURLE_OBSOLETE CURLE_OBSOLETE50 /* noone should be using this! */
-#define CURLE_BAD_PASSWORD_ENTERED CURLE_OBSOLETE46
-#define CURLE_BAD_CALLING_ORDER CURLE_OBSOLETE44
-#define CURLE_FTP_USER_PASSWORD_INCORRECT CURLE_OBSOLETE10
-#define CURLE_FTP_CANT_RECONNECT CURLE_OBSOLETE16
-#define CURLE_FTP_COULDNT_GET_SIZE CURLE_OBSOLETE32
-#define CURLE_FTP_COULDNT_SET_ASCII CURLE_OBSOLETE29
-#define CURLE_FTP_WEIRD_USER_REPLY CURLE_OBSOLETE12
-#define CURLE_FTP_WRITE_ERROR CURLE_OBSOLETE20
-#define CURLE_LIBRARY_NOT_FOUND CURLE_OBSOLETE40
-#define CURLE_MALFORMAT_USER CURLE_OBSOLETE24
-#define CURLE_SHARE_IN_USE CURLE_OBSOLETE57
-#define CURLE_URL_MALFORMAT_USER CURLE_OBSOLETE4
-
-#define CURLE_FTP_ACCESS_DENIED CURLE_REMOTE_ACCESS_DENIED
-#define CURLE_FTP_COULDNT_SET_BINARY CURLE_FTP_COULDNT_SET_TYPE
-#define CURLE_FTP_QUOTE_ERROR CURLE_QUOTE_ERROR
-#define CURLE_TFTP_DISKFULL CURLE_REMOTE_DISK_FULL
-#define CURLE_TFTP_EXISTS CURLE_REMOTE_FILE_EXISTS
-#define CURLE_HTTP_RANGE_ERROR CURLE_RANGE_ERROR
-#define CURLE_FTP_SSL_FAILED CURLE_USE_SSL_FAILED
-
-/* The following were added earlier */
-
-#define CURLE_OPERATION_TIMEOUTED CURLE_OPERATION_TIMEDOUT
-
-#define CURLE_HTTP_NOT_FOUND CURLE_HTTP_RETURNED_ERROR
-#define CURLE_HTTP_PORT_FAILED CURLE_INTERFACE_FAILED
-#define CURLE_FTP_COULDNT_STOR_FILE CURLE_UPLOAD_FAILED
-
-#define CURLE_FTP_PARTIAL_FILE CURLE_PARTIAL_FILE
-#define CURLE_FTP_BAD_DOWNLOAD_RESUME CURLE_BAD_DOWNLOAD_RESUME
-
-/* This was the error code 50 in 7.7.3 and a few earlier versions, this
-   is no longer used by libcurl but is instead #defined here only to not
-   make programs break */
-#define CURLE_ALREADY_COMPLETE 99999
-
-#endif /*!CURL_NO_OLDIES*/
-
-/* This prototype applies to all conversion callbacks */
-typedef CURLcode (*curl_conv_callback)(char *buffer, size_t length);
-
-typedef CURLcode (*curl_ssl_ctx_callback)(CURL *curl,    /* easy handle */
-                                          void *ssl_ctx, /* actually an
-                                                            OpenSSL SSL_CTX */
-                                          void *userptr);
-
-typedef enum {
-  CURLPROXY_HTTP = 0,   /* added in 7.10, new in 7.19.4 default is to use
-                           CONNECT HTTP/1.1 */
-  CURLPROXY_HTTP_1_0 = 1,   /* added in 7.19.4, force to use CONNECT
-                               HTTP/1.0  */
-  CURLPROXY_SOCKS4 = 4, /* support added in 7.15.2, enum existed already
-                           in 7.10 */
-  CURLPROXY_SOCKS5 = 5, /* added in 7.10 */
-  CURLPROXY_SOCKS4A = 6, /* added in 7.18.0 */
-  CURLPROXY_SOCKS5_HOSTNAME = 7 /* Use the SOCKS5 protocol but pass along the
-                                   host name rather than the IP address. added
-                                   in 7.18.0 */
-} curl_proxytype;  /* this enum was added in 7.10 */
-
-#define CURLAUTH_NONE         0       /* nothing */
-#define CURLAUTH_BASIC        (1<<0)  /* Basic (default) */
-#define CURLAUTH_DIGEST       (1<<1)  /* Digest */
-#define CURLAUTH_GSSNEGOTIATE (1<<2)  /* GSS-Negotiate */
-#define CURLAUTH_NTLM         (1<<3)  /* NTLM */
-#define CURLAUTH_DIGEST_IE    (1<<4)  /* Digest with IE flavour */
-#define CURLAUTH_ANY (~CURLAUTH_DIGEST_IE)  /* all fine types set */
-#define CURLAUTH_ANYSAFE (~(CURLAUTH_BASIC|CURLAUTH_DIGEST_IE))
-
-#define CURLSSH_AUTH_ANY       ~0     /* all types supported by the server */
-#define CURLSSH_AUTH_NONE      0      /* none allowed, silly but complete */
-#define CURLSSH_AUTH_PUBLICKEY (1<<0) /* public/private key files */
-#define CURLSSH_AUTH_PASSWORD  (1<<1) /* password */
-#define CURLSSH_AUTH_HOST      (1<<2) /* host key files */
-#define CURLSSH_AUTH_KEYBOARD  (1<<3) /* keyboard interactive */
-#define CURLSSH_AUTH_DEFAULT CURLSSH_AUTH_ANY
-
-#define CURL_ERROR_SIZE 256
-
-struct curl_khkey {
-  const char *key; /* points to a zero-terminated string encoded with base64
-                      if len is zero, otherwise to the "raw" data */
-  size_t len;
-  enum type {
-    CURLKHTYPE_UNKNOWN,
-    CURLKHTYPE_RSA1,
-    CURLKHTYPE_RSA,
-    CURLKHTYPE_DSS
-  } keytype;
-};
-
-/* this is the set of return values expected from the curl_sshkeycallback
-   callback */
-enum curl_khstat {
-  CURLKHSTAT_FINE_ADD_TO_FILE,
-  CURLKHSTAT_FINE,
-  CURLKHSTAT_REJECT, /* reject the connection, return an error */
-  CURLKHSTAT_DEFER,  /* do not accept it, but we can't answer right now so
-                        this causes a CURLE_DEFER error but otherwise the
-                        connection will be left intact etc */
-  CURLKHSTAT_LAST    /* not for use, only a marker for last-in-list */
-};
-
-/* this is the set of status codes pass in to the callback */
-enum curl_khmatch {
-  CURLKHMATCH_OK,       /* match */
-  CURLKHMATCH_MISMATCH, /* host found, key mismatch! */
-  CURLKHMATCH_MISSING,  /* no matching host/key found */
-  CURLKHMATCH_LAST      /* not for use, only a marker for last-in-list */
-};
-
-typedef int
-  (*curl_sshkeycallback) (CURL *easy,     /* easy handle */
-                          const struct curl_khkey *knownkey, /* known */
-                          const struct curl_khkey *foundkey, /* found */
-                          enum curl_khmatch, /* libcurl's view on the keys */
-                          void *clientp); /* custom pointer passed from app */
-
-/* parameter for the CURLOPT_USE_SSL option */
-typedef enum {
-  CURLUSESSL_NONE,    /* do not attempt to use SSL */
-  CURLUSESSL_TRY,     /* try using SSL, proceed anyway otherwise */
-  CURLUSESSL_CONTROL, /* SSL for the control connection or fail */
-  CURLUSESSL_ALL,     /* SSL for all communication or fail */
-  CURLUSESSL_LAST     /* not an option, never use */
-} curl_usessl;
-
-#ifndef CURL_NO_OLDIES /* define this to test if your app builds with all
-                          the obsolete stuff removed! */
-
-/* Backwards compatibility with older names */
-/* These are scheduled to disappear by 2009 */
-
-#define CURLFTPSSL_NONE CURLUSESSL_NONE
-#define CURLFTPSSL_TRY CURLUSESSL_TRY
-#define CURLFTPSSL_CONTROL CURLUSESSL_CONTROL
-#define CURLFTPSSL_ALL CURLUSESSL_ALL
-#define CURLFTPSSL_LAST CURLUSESSL_LAST
-#define curl_ftpssl curl_usessl
-#endif /*!CURL_NO_OLDIES*/
-
-/* parameter for the CURLOPT_FTP_SSL_CCC option */
-typedef enum {
-  CURLFTPSSL_CCC_NONE,    /* do not send CCC */
-  CURLFTPSSL_CCC_PASSIVE, /* Let the server initiate the shutdown */
-  CURLFTPSSL_CCC_ACTIVE,  /* Initiate the shutdown */
-  CURLFTPSSL_CCC_LAST     /* not an option, never use */
-} curl_ftpccc;
-
-/* parameter for the CURLOPT_FTPSSLAUTH option */
-typedef enum {
-  CURLFTPAUTH_DEFAULT, /* let libcurl decide */
-  CURLFTPAUTH_SSL,     /* use "AUTH SSL" */
-  CURLFTPAUTH_TLS,     /* use "AUTH TLS" */
-  CURLFTPAUTH_LAST /* not an option, never use */
-} curl_ftpauth;
-
-/* parameter for the CURLOPT_FTP_CREATE_MISSING_DIRS option */
-typedef enum {
-  CURLFTP_CREATE_DIR_NONE,  /* do NOT create missing dirs! */
-  CURLFTP_CREATE_DIR,       /* (FTP/SFTP) if CWD fails, try MKD and then CWD
-                               again if MKD succeeded, for SFTP this does
-                               similar magic */
-  CURLFTP_CREATE_DIR_RETRY, /* (FTP only) if CWD fails, try MKD and then CWD
-                               again even if MKD failed! */
-  CURLFTP_CREATE_DIR_LAST   /* not an option, never use */
-} curl_ftpcreatedir;
-
-/* parameter for the CURLOPT_FTP_FILEMETHOD option */
-typedef enum {
-  CURLFTPMETHOD_DEFAULT,   /* let libcurl pick */
-  CURLFTPMETHOD_MULTICWD,  /* single CWD operation for each path part */
-  CURLFTPMETHOD_NOCWD,     /* no CWD at all */
-  CURLFTPMETHOD_SINGLECWD, /* one CWD to full dir, then work on file */
-  CURLFTPMETHOD_LAST       /* not an option, never use */
-} curl_ftpmethod;
-
-/* CURLPROTO_ defines are for the CURLOPT_*PROTOCOLS options */
-#define CURLPROTO_HTTP   (1<<0)
-#define CURLPROTO_HTTPS  (1<<1)
-#define CURLPROTO_FTP    (1<<2)
-#define CURLPROTO_FTPS   (1<<3)
-#define CURLPROTO_SCP    (1<<4)
-#define CURLPROTO_SFTP   (1<<5)
-#define CURLPROTO_TELNET (1<<6)
-#define CURLPROTO_LDAP   (1<<7)
-#define CURLPROTO_LDAPS  (1<<8)
-#define CURLPROTO_DICT   (1<<9)
-#define CURLPROTO_FILE   (1<<10)
-#define CURLPROTO_TFTP   (1<<11)
-#define CURLPROTO_IMAP   (1<<12)
-#define CURLPROTO_IMAPS  (1<<13)
-#define CURLPROTO_POP3   (1<<14)
-#define CURLPROTO_POP3S  (1<<15)
-#define CURLPROTO_SMTP   (1<<16)
-#define CURLPROTO_SMTPS  (1<<17)
-#define CURLPROTO_RTSP   (1<<18)
-#define CURLPROTO_RTMP   (1<<19)
-#define CURLPROTO_RTMPT  (1<<20)
-#define CURLPROTO_RTMPE  (1<<21)
-#define CURLPROTO_RTMPTE (1<<22)
-#define CURLPROTO_RTMPS  (1<<23)
-#define CURLPROTO_RTMPTS (1<<24)
-#define CURLPROTO_GOPHER (1<<25)
-#define CURLPROTO_ALL    (~0) /* enable everything */
-
-/* long may be 32 or 64 bits, but we should never depend on anything else
-   but 32 */
-#define CURLOPTTYPE_LONG          0
-#define CURLOPTTYPE_OBJECTPOINT   10000
-#define CURLOPTTYPE_FUNCTIONPOINT 20000
-#define CURLOPTTYPE_OFF_T         30000
-
-/* name is uppercase CURLOPT_<name>,
-   type is one of the defined CURLOPTTYPE_<type>
-   number is unique identifier */
-#ifdef CINIT
-#undef CINIT
-#endif
-
-#ifdef CURL_ISOCPP
-#define CINIT(name,type,number) CURLOPT_ ## name = CURLOPTTYPE_ ## type + number
-#else
-/* The macro "##" is ISO C, we assume pre-ISO C doesn't support it. */
-#define LONG          CURLOPTTYPE_LONG
-#define OBJECTPOINT   CURLOPTTYPE_OBJECTPOINT
-#define FUNCTIONPOINT CURLOPTTYPE_FUNCTIONPOINT
-#define OFF_T         CURLOPTTYPE_OFF_T
-#define CINIT(name,type,number) CURLOPT_/**/name = type + number
-#endif
-
-/*
- * This macro-mania below setups the CURLOPT_[what] enum, to be used with
- * curl_easy_setopt(). The first argument in the CINIT() macro is the [what]
- * word.
- */
-
-typedef enum {
-  /* This is the FILE * or void * the regular output should be written to. */
-  CINIT(FILE, OBJECTPOINT, 1),
-
-  /* The full URL to get/put */
-  CINIT(URL,  OBJECTPOINT, 2),
-
-  /* Port number to connect to, if other than default. */
-  CINIT(PORT, LONG, 3),
-
-  /* Name of proxy to use. */
-  CINIT(PROXY, OBJECTPOINT, 4),
-
-  /* "name:password" to use when fetching. */
-  CINIT(USERPWD, OBJECTPOINT, 5),
-
-  /* "name:password" to use with proxy. */
-  CINIT(PROXYUSERPWD, OBJECTPOINT, 6),
-
-  /* Range to get, specified as an ASCII string. */
-  CINIT(RANGE, OBJECTPOINT, 7),
-
-  /* not used */
-
-  /* Specified file stream to upload from (use as input): */
-  CINIT(INFILE, OBJECTPOINT, 9),
-
-  /* Buffer to receive error messages in, must be at least CURL_ERROR_SIZE
-   * bytes big. If this is not used, error messages go to stderr instead: */
-  CINIT(ERRORBUFFER, OBJECTPOINT, 10),
-
-  /* Function that will be called to store the output (instead of fwrite). The
-   * parameters will use fwrite() syntax, make sure to follow them. */
-  CINIT(WRITEFUNCTION, FUNCTIONPOINT, 11),
-
-  /* Function that will be called to read the input (instead of fread). The
-   * parameters will use fread() syntax, make sure to follow them. */
-  CINIT(READFUNCTION, FUNCTIONPOINT, 12),
-
-  /* Time-out the read operation after this amount of seconds */
-  CINIT(TIMEOUT, LONG, 13),
-
-  /* If the CURLOPT_INFILE is used, this can be used to inform libcurl about
-   * how large the file being sent really is. That allows better error
-   * checking and better verifies that the upload was successful. -1 means
-   * unknown size.
-   *
-   * For large file support, there is also a _LARGE version of the key
-   * which takes an off_t type, allowing platforms with larger off_t
-   * sizes to handle larger files.  See below for INFILESIZE_LARGE.
-   */
-  CINIT(INFILESIZE, LONG, 14),
-
-  /* POST static input fields. */
-  CINIT(POSTFIELDS, OBJECTPOINT, 15),
-
-  /* Set the referrer page (needed by some CGIs) */
-  CINIT(REFERER, OBJECTPOINT, 16),
-
-  /* Set the FTP PORT string (interface name, named or numerical IP address)
-     Use i.e '-' to use default address. */
-  CINIT(FTPPORT, OBJECTPOINT, 17),
-
-  /* Set the User-Agent string (examined by some CGIs) */
-  CINIT(USERAGENT, OBJECTPOINT, 18),
-
-  /* If the download receives less than "low speed limit" bytes/second
-   * during "low speed time" seconds, the operations is aborted.
-   * You could i.e if you have a pretty high speed connection, abort if
-   * it is less than 2000 bytes/sec during 20 seconds.
-   */
-
-  /* Set the "low speed limit" */
-  CINIT(LOW_SPEED_LIMIT, LONG, 19),
-
-  /* Set the "low speed time" */
-  CINIT(LOW_SPEED_TIME, LONG, 20),
-
-  /* Set the continuation offset.
-   *
-   * Note there is also a _LARGE version of this key which uses
-   * off_t types, allowing for large file offsets on platforms which
-   * use larger-than-32-bit off_t's.  Look below for RESUME_FROM_LARGE.
-   */
-  CINIT(RESUME_FROM, LONG, 21),
-
-  /* Set cookie in request: */
-  CINIT(COOKIE, OBJECTPOINT, 22),
-
-  /* This points to a linked list of headers, struct curl_slist kind */
-  CINIT(HTTPHEADER, OBJECTPOINT, 23),
-
-  /* This points to a linked list of post entries, struct curl_httppost */
-  CINIT(HTTPPOST, OBJECTPOINT, 24),
-
-  /* name of the file keeping your private SSL-certificate */
-  CINIT(SSLCERT, OBJECTPOINT, 25),
-
-  /* password for the SSL or SSH private key */
-  CINIT(KEYPASSWD, OBJECTPOINT, 26),
-
-  /* send TYPE parameter? */
-  CINIT(CRLF, LONG, 27),
-
-  /* send linked-list of QUOTE commands */
-  CINIT(QUOTE, OBJECTPOINT, 28),
-
-  /* send FILE * or void * to store headers to, if you use a callback it
-     is simply passed to the callback unmodified */
-  CINIT(WRITEHEADER, OBJECTPOINT, 29),
-
-  /* point to a file to read the initial cookies from, also enables
-     "cookie awareness" */
-  CINIT(COOKIEFILE, OBJECTPOINT, 31),
-
-  /* What version to specifically try to use.
-     See CURL_SSLVERSION defines below. */
-  CINIT(SSLVERSION, LONG, 32),
-
-  /* What kind of HTTP time condition to use, see defines */
-  CINIT(TIMECONDITION, LONG, 33),
-
-  /* Time to use with the above condition. Specified in number of seconds
-     since 1 Jan 1970 */
-  CINIT(TIMEVALUE, LONG, 34),
-
-  /* 35 = OBSOLETE */
-
-  /* Custom request, for customizing the get command like
-     HTTP: DELETE, TRACE and others
-     FTP: to use a different list command
-     */
-  CINIT(CUSTOMREQUEST, OBJECTPOINT, 36),
-
-  /* HTTP request, for odd commands like DELETE, TRACE and others */
-  CINIT(STDERR, OBJECTPOINT, 37),
-
-  /* 38 is not used */
-
-  /* send linked-list of post-transfer QUOTE commands */
-  CINIT(POSTQUOTE, OBJECTPOINT, 39),
-
-  /* Pass a pointer to string of the output using full variable-replacement
-     as described elsewhere. */
-  CINIT(WRITEINFO, OBJECTPOINT, 40),
-
-  CINIT(VERBOSE, LONG, 41),      /* talk a lot */
-  CINIT(HEADER, LONG, 42),       /* throw the header out too */
-  CINIT(NOPROGRESS, LONG, 43),   /* shut off the progress meter */
-  CINIT(NOBODY, LONG, 44),       /* use HEAD to get http document */
-  CINIT(FAILONERROR, LONG, 45),  /* no output on http error codes >= 300 */
-  CINIT(UPLOAD, LONG, 46),       /* this is an upload */
-  CINIT(POST, LONG, 47),         /* HTTP POST method */
-  CINIT(DIRLISTONLY, LONG, 48),  /* return bare names when listing directories */
-
-  CINIT(APPEND, LONG, 50),       /* Append instead of overwrite on upload! */
-
-  /* Specify whether to read the user+password from the .netrc or the URL.
-   * This must be one of the CURL_NETRC_* enums below. */
-  CINIT(NETRC, LONG, 51),
-
-  CINIT(FOLLOWLOCATION, LONG, 52),  /* use Location: Luke! */
-
-  CINIT(TRANSFERTEXT, LONG, 53), /* transfer data in text/ASCII format */
-  CINIT(PUT, LONG, 54),          /* HTTP PUT */
-
-  /* 55 = OBSOLETE */
-
-  /* Function that will be called instead of the internal progress display
-   * function. This function should be defined as the curl_progress_callback
-   * prototype defines. */
-  CINIT(PROGRESSFUNCTION, FUNCTIONPOINT, 56),
-
-  /* Data passed to the progress callback */
-  CINIT(PROGRESSDATA, OBJECTPOINT, 57),
-
-  /* We want the referrer field set automatically when following locations */
-  CINIT(AUTOREFERER, LONG, 58),
-
-  /* Port of the proxy, can be set in the proxy string as well with:
-     "[host]:[port]" */
-  CINIT(PROXYPORT, LONG, 59),
-
-  /* size of the POST input data, if strlen() is not good to use */
-  CINIT(POSTFIELDSIZE, LONG, 60),
-
-  /* tunnel non-http operations through a HTTP proxy */
-  CINIT(HTTPPROXYTUNNEL, LONG, 61),
-
-  /* Set the interface string to use as outgoing network interface */
-  CINIT(INTERFACE, OBJECTPOINT, 62),
-
-  /* Set the krb4/5 security level, this also enables krb4/5 awareness.  This
-   * is a string, 'clear', 'safe', 'confidential' or 'private'.  If the string
-   * is set but doesn't match one of these, 'private' will be used.  */
-  CINIT(KRBLEVEL, OBJECTPOINT, 63),
-
-  /* Set if we should verify the peer in ssl handshake, set 1 to verify. */
-  CINIT(SSL_VERIFYPEER, LONG, 64),
-
-  /* The CApath or CAfile used to validate the peer certificate
-     this option is used only if SSL_VERIFYPEER is true */
-  CINIT(CAINFO, OBJECTPOINT, 65),
-
-  /* 66 = OBSOLETE */
-  /* 67 = OBSOLETE */
-
-  /* Maximum number of http redirects to follow */
-  CINIT(MAXREDIRS, LONG, 68),
-
-  /* Pass a long set to 1 to get the date of the requested document (if
-     possible)! Pass a zero to shut it off. */
-  CINIT(FILETIME, LONG, 69),
-
-  /* This points to a linked list of telnet options */
-  CINIT(TELNETOPTIONS, OBJECTPOINT, 70),
-
-  /* Max amount of cached alive connections */
-  CINIT(MAXCONNECTS, LONG, 71),
-
-  /* What policy to use when closing connections when the cache is filled
-     up */
-  CINIT(CLOSEPOLICY, LONG, 72),
-
-  /* 73 = OBSOLETE */
-
-  /* Set to explicitly use a new connection for the upcoming transfer.
-     Do not use this unless you're absolutely sure of this, as it makes the
-     operation slower and is less friendly for the network. */
-  CINIT(FRESH_CONNECT, LONG, 74),
-
-  /* Set to explicitly forbid the upcoming transfer's connection to be re-used
-     when done. Do not use this unless you're absolutely sure of this, as it
-     makes the operation slower and is less friendly for the network. */
-  CINIT(FORBID_REUSE, LONG, 75),
-
-  /* Set to a file name that contains random data for libcurl to use to
-     seed the random engine when doing SSL connects. */
-  CINIT(RANDOM_FILE, OBJECTPOINT, 76),
-
-  /* Set to the Entropy Gathering Daemon socket pathname */
-  CINIT(EGDSOCKET, OBJECTPOINT, 77),
-
-  /* Time-out connect operations after this amount of seconds, if connects
-     are OK within this time, then fine... This only aborts the connect
-     phase. [Only works on unix-style/SIGALRM operating systems] */
-  CINIT(CONNECTTIMEOUT, LONG, 78),
-
-  /* Function that will be called to store headers (instead of fwrite). The
-   * parameters will use fwrite() syntax, make sure to follow them. */
-  CINIT(HEADERFUNCTION, FUNCTIONPOINT, 79),
-
-  /* Set this to force the HTTP request to get back to GET. Only really usable
-     if POST, PUT or a custom request have been used first.
-   */
-  CINIT(HTTPGET, LONG, 80),
-
-  /* Set if we should verify the Common name from the peer certificate in ssl
-   * handshake, set 1 to check existence, 2 to ensure that it matches the
-   * provided hostname. */
-  CINIT(SSL_VERIFYHOST, LONG, 81),
-
-  /* Specify which file name to write all known cookies in after completed
-     operation. Set file name to "-" (dash) to make it go to stdout. */
-  CINIT(COOKIEJAR, OBJECTPOINT, 82),
-
-  /* Specify which SSL ciphers to use */
-  CINIT(SSL_CIPHER_LIST, OBJECTPOINT, 83),
-
-  /* Specify which HTTP version to use! This must be set to one of the
-     CURL_HTTP_VERSION* enums set below. */
-  CINIT(HTTP_VERSION, LONG, 84),
-
-  /* Specifically switch on or off the FTP engine's use of the EPSV command. By
-     default, that one will always be attempted before the more traditional
-     PASV command. */
-  CINIT(FTP_USE_EPSV, LONG, 85),
-
-  /* type of the file keeping your SSL-certificate ("DER", "PEM", "ENG") */
-  CINIT(SSLCERTTYPE, OBJECTPOINT, 86),
-
-  /* name of the file keeping your private SSL-key */
-  CINIT(SSLKEY, OBJECTPOINT, 87),
-
-  /* type of the file keeping your private SSL-key ("DER", "PEM", "ENG") */
-  CINIT(SSLKEYTYPE, OBJECTPOINT, 88),
-
-  /* crypto engine for the SSL-sub system */
-  CINIT(SSLENGINE, OBJECTPOINT, 89),
-
-  /* set the crypto engine for the SSL-sub system as default
-     the param has no meaning...
-   */
-  CINIT(SSLENGINE_DEFAULT, LONG, 90),
-
-  /* Non-zero value means to use the global dns cache */
-  CINIT(DNS_USE_GLOBAL_CACHE, LONG, 91), /* To become OBSOLETE soon */
-
-  /* DNS cache timeout */
-  CINIT(DNS_CACHE_TIMEOUT, LONG, 92),
-
-  /* send linked-list of pre-transfer QUOTE commands */
-  CINIT(PREQUOTE, OBJECTPOINT, 93),
-
-  /* set the debug function */
-  CINIT(DEBUGFUNCTION, FUNCTIONPOINT, 94),
-
-  /* set the data for the debug function */
-  CINIT(DEBUGDATA, OBJECTPOINT, 95),
-
-  /* mark this as start of a cookie session */
-  CINIT(COOKIESESSION, LONG, 96),
-
-  /* The CApath directory used to validate the peer certificate
-     this option is used only if SSL_VERIFYPEER is true */
-  CINIT(CAPATH, OBJECTPOINT, 97),
-
-  /* Instruct libcurl to use a smaller receive buffer */
-  CINIT(BUFFERSIZE, LONG, 98),
-
-  /* Instruct libcurl to not use any signal/alarm handlers, even when using
-     timeouts. This option is useful for multi-threaded applications.
-     See libcurl-the-guide for more background information. */
-  CINIT(NOSIGNAL, LONG, 99),
-
-  /* Provide a CURLShare for mutexing non-ts data */
-  CINIT(SHARE, OBJECTPOINT, 100),
-
-  /* indicates type of proxy. accepted values are CURLPROXY_HTTP (default),
-     CURLPROXY_SOCKS4, CURLPROXY_SOCKS4A and CURLPROXY_SOCKS5. */
-  CINIT(PROXYTYPE, LONG, 101),
-
-  /* Set the Accept-Encoding string. Use this to tell a server you would like
-     the response to be compressed. */
-  CINIT(ENCODING, OBJECTPOINT, 102),
-
-  /* Set pointer to private data */
-  CINIT(PRIVATE, OBJECTPOINT, 103),
-
-  /* Set aliases for HTTP 200 in the HTTP Response header */
-  CINIT(HTTP200ALIASES, OBJECTPOINT, 104),
-
-  /* Continue to send authentication (user+password) when following locations,
-     even when hostname changed. This can potentially send off the name
-     and password to whatever host the server decides. */
-  CINIT(UNRESTRICTED_AUTH, LONG, 105),
-
-  /* Specifically switch on or off the FTP engine's use of the EPRT command ( it
-     also disables the LPRT attempt). By default, those ones will always be
-     attempted before the good old traditional PORT command. */
-  CINIT(FTP_USE_EPRT, LONG, 106),
-
-  /* Set this to a bitmask value to enable the particular authentications
-     methods you like. Use this in combination with CURLOPT_USERPWD.
-     Note that setting multiple bits may cause extra network round-trips. */
-  CINIT(HTTPAUTH, LONG, 107),
-
-  /* Set the ssl context callback function, currently only for OpenSSL ssl_ctx
-     in second argument. The function must be matching the
-     curl_ssl_ctx_callback proto. */
-  CINIT(SSL_CTX_FUNCTION, FUNCTIONPOINT, 108),
-
-  /* Set the userdata for the ssl context callback function's third
-     argument */
-  CINIT(SSL_CTX_DATA, OBJECTPOINT, 109),
-
-  /* FTP Option that causes missing dirs to be created on the remote server.
-     In 7.19.4 we introduced the convenience enums for this option using the
-     CURLFTP_CREATE_DIR prefix.
-  */
-  CINIT(FTP_CREATE_MISSING_DIRS, LONG, 110),
-
-  /* Set this to a bitmask value to enable the particular authentications
-     methods you like. Use this in combination with CURLOPT_PROXYUSERPWD.
-     Note that setting multiple bits may cause extra network round-trips. */
-  CINIT(PROXYAUTH, LONG, 111),
-
-  /* FTP option that changes the timeout, in seconds, associated with
-     getting a response.  This is different from transfer timeout time and
-     essentially places a demand on the FTP server to acknowledge commands
-     in a timely manner. */
-  CINIT(FTP_RESPONSE_TIMEOUT, LONG, 112),
-#define CURLOPT_SERVER_RESPONSE_TIMEOUT CURLOPT_FTP_RESPONSE_TIMEOUT
-
-  /* Set this option to one of the CURL_IPRESOLVE_* defines (see below) to
-     tell libcurl to resolve names to those IP versions only. This only has
-     affect on systems with support for more than one, i.e IPv4 _and_ IPv6. */
-  CINIT(IPRESOLVE, LONG, 113),
-
-  /* Set this option to limit the size of a file that will be downloaded from
-     an HTTP or FTP server.
-
-     Note there is also _LARGE version which adds large file support for
-     platforms which have larger off_t sizes.  See MAXFILESIZE_LARGE below. */
-  CINIT(MAXFILESIZE, LONG, 114),
-
-  /* See the comment for INFILESIZE above, but in short, specifies
-   * the size of the file being uploaded.  -1 means unknown.
-   */
-  CINIT(INFILESIZE_LARGE, OFF_T, 115),
-
-  /* Sets the continuation offset.  There is also a LONG version of this;
-   * look above for RESUME_FROM.
-   */
-  CINIT(RESUME_FROM_LARGE, OFF_T, 116),
-
-  /* Sets the maximum size of data that will be downloaded from
-   * an HTTP or FTP server.  See MAXFILESIZE above for the LONG version.
-   */
-  CINIT(MAXFILESIZE_LARGE, OFF_T, 117),
-
-  /* Set this option to the file name of your .netrc file you want libcurl
-     to parse (using the CURLOPT_NETRC option). If not set, libcurl will do
-     a poor attempt to find the user's home directory and check for a .netrc
-     file in there. */
-  CINIT(NETRC_FILE, OBJECTPOINT, 118),
-
-  /* Enable SSL/TLS for FTP, pick one of:
-     CURLFTPSSL_TRY     - try using SSL, proceed anyway otherwise
-     CURLFTPSSL_CONTROL - SSL for the control connection or fail
-     CURLFTPSSL_ALL     - SSL for all communication or fail
-  */
-  CINIT(USE_SSL, LONG, 119),
-
-  /* The _LARGE version of the standard POSTFIELDSIZE option */
-  CINIT(POSTFIELDSIZE_LARGE, OFF_T, 120),
-
-  /* Enable/disable the TCP Nagle algorithm */
-  CINIT(TCP_NODELAY, LONG, 121),
-
-  /* 122 OBSOLETE, used in 7.12.3. Gone in 7.13.0 */
-  /* 123 OBSOLETE. Gone in 7.16.0 */
-  /* 124 OBSOLETE, used in 7.12.3. Gone in 7.13.0 */
-  /* 125 OBSOLETE, used in 7.12.3. Gone in 7.13.0 */
-  /* 126 OBSOLETE, used in 7.12.3. Gone in 7.13.0 */
-  /* 127 OBSOLETE. Gone in 7.16.0 */
-  /* 128 OBSOLETE. Gone in 7.16.0 */
-
-  /* When FTP over SSL/TLS is selected (with CURLOPT_USE_SSL), this option
-     can be used to change libcurl's default action which is to first try
-     "AUTH SSL" and then "AUTH TLS" in this order, and proceed when a OK
-     response has been received.
-
-     Available parameters are:
-     CURLFTPAUTH_DEFAULT - let libcurl decide
-     CURLFTPAUTH_SSL     - try "AUTH SSL" first, then TLS
-     CURLFTPAUTH_TLS     - try "AUTH TLS" first, then SSL
-  */
-  CINIT(FTPSSLAUTH, LONG, 129),
-
-  CINIT(IOCTLFUNCTION, FUNCTIONPOINT, 130),
-  CINIT(IOCTLDATA, OBJECTPOINT, 131),
-
-  /* 132 OBSOLETE. Gone in 7.16.0 */
-  /* 133 OBSOLETE. Gone in 7.16.0 */
-
-  /* zero terminated string for pass on to the FTP server when asked for
-     "account" info */
-  CINIT(FTP_ACCOUNT, OBJECTPOINT, 134),
-
-  /* feed cookies into cookie engine */
-  CINIT(COOKIELIST, OBJECTPOINT, 135),
-
-  /* ignore Content-Length */
-  CINIT(IGNORE_CONTENT_LENGTH, LONG, 136),
-
-  /* Set to non-zero to skip the IP address received in a 227 PASV FTP server
-     response. Typically used for FTP-SSL purposes but is not restricted to
-     that. libcurl will then instead use the same IP address it used for the
-     control connection. */
-  CINIT(FTP_SKIP_PASV_IP, LONG, 137),
-
-  /* Select "file method" to use when doing FTP, see the curl_ftpmethod
-     above. */
-  CINIT(FTP_FILEMETHOD, LONG, 138),
-
-  /* Local port number to bind the socket to */
-  CINIT(LOCALPORT, LONG, 139),
-
-  /* Number of ports to try, including the first one set with LOCALPORT.
-     Thus, setting it to 1 will make no additional attempts but the first.
-  */
-  CINIT(LOCALPORTRANGE, LONG, 140),
-
-  /* no transfer, set up connection and let application use the socket by
-     extracting it with CURLINFO_LASTSOCKET */
-  CINIT(CONNECT_ONLY, LONG, 141),
-
-  /* Function that will be called to convert from the
-     network encoding (instead of using the iconv calls in libcurl) */
-  CINIT(CONV_FROM_NETWORK_FUNCTION, FUNCTIONPOINT, 142),
-
-  /* Function that will be called to convert to the
-     network encoding (instead of using the iconv calls in libcurl) */
-  CINIT(CONV_TO_NETWORK_FUNCTION, FUNCTIONPOINT, 143),
-
-  /* Function that will be called to convert from UTF8
-     (instead of using the iconv calls in libcurl)
-     Note that this is used only for SSL certificate processing */
-  CINIT(CONV_FROM_UTF8_FUNCTION, FUNCTIONPOINT, 144),
-
-  /* if the connection proceeds too quickly then need to slow it down */
-  /* limit-rate: maximum number of bytes per second to send or receive */
-  CINIT(MAX_SEND_SPEED_LARGE, OFF_T, 145),
-  CINIT(MAX_RECV_SPEED_LARGE, OFF_T, 146),
-
-  /* Pointer to command string to send if USER/PASS fails. */
-  CINIT(FTP_ALTERNATIVE_TO_USER, OBJECTPOINT, 147),
-
-  /* callback function for setting socket options */
-  CINIT(SOCKOPTFUNCTION, FUNCTIONPOINT, 148),
-  CINIT(SOCKOPTDATA, OBJECTPOINT, 149),
-
-  /* set to 0 to disable session ID re-use for this transfer, default is
-     enabled (== 1) */
-  CINIT(SSL_SESSIONID_CACHE, LONG, 150),
-
-  /* allowed SSH authentication methods */
-  CINIT(SSH_AUTH_TYPES, LONG, 151),
-
-  /* Used by scp/sftp to do public/private key authentication */
-  CINIT(SSH_PUBLIC_KEYFILE, OBJECTPOINT, 152),
-  CINIT(SSH_PRIVATE_KEYFILE, OBJECTPOINT, 153),
-
-  /* Send CCC (Clear Command Channel) after authentication */
-  CINIT(FTP_SSL_CCC, LONG, 154),
-
-  /* Same as TIMEOUT and CONNECTTIMEOUT, but with ms resolution */
-  CINIT(TIMEOUT_MS, LONG, 155),
-  CINIT(CONNECTTIMEOUT_MS, LONG, 156),
-
-  /* set to zero to disable the libcurl's decoding and thus pass the raw body
-     data to the application even when it is encoded/compressed */
-  CINIT(HTTP_TRANSFER_DECODING, LONG, 157),
-  CINIT(HTTP_CONTENT_DECODING, LONG, 158),
-
-  /* Permission used when creating new files and directories on the remote
-     server for protocols that support it, SFTP/SCP/FILE */
-  CINIT(NEW_FILE_PERMS, LONG, 159),
-  CINIT(NEW_DIRECTORY_PERMS, LONG, 160),
-
-  /* Set the behaviour of POST when redirecting. Values must be set to one
-     of CURL_REDIR* defines below. This used to be called CURLOPT_POST301 */
-  CINIT(POSTREDIR, LONG, 161),
-
-  /* used by scp/sftp to verify the host's public key */
-  CINIT(SSH_HOST_PUBLIC_KEY_MD5, OBJECTPOINT, 162),
-
-  /* Callback function for opening socket (instead of socket(2)). Optionally,
-     callback is able change the address or refuse to connect returning
-     CURL_SOCKET_BAD.  The callback should have type
-     curl_opensocket_callback */
-  CINIT(OPENSOCKETFUNCTION, FUNCTIONPOINT, 163),
-  CINIT(OPENSOCKETDATA, OBJECTPOINT, 164),
-
-  /* POST volatile input fields. */
-  CINIT(COPYPOSTFIELDS, OBJECTPOINT, 165),
-
-  /* set transfer mode (;type=<a|i>) when doing FTP via an HTTP proxy */
-  CINIT(PROXY_TRANSFER_MODE, LONG, 166),
-
-  /* Callback function for seeking in the input stream */
-  CINIT(SEEKFUNCTION, FUNCTIONPOINT, 167),
-  CINIT(SEEKDATA, OBJECTPOINT, 168),
-
-  /* CRL file */
-  CINIT(CRLFILE, OBJECTPOINT, 169),
-
-  /* Issuer certificate */
-  CINIT(ISSUERCERT, OBJECTPOINT, 170),
-
-  /* (IPv6) Address scope */
-  CINIT(ADDRESS_SCOPE, LONG, 171),
-
-  /* Collect certificate chain info and allow it to get retrievable with
-     CURLINFO_CERTINFO after the transfer is complete. (Unfortunately) only
-     working with OpenSSL-powered builds. */
-  CINIT(CERTINFO, LONG, 172),
-
-  /* "name" and "pwd" to use when fetching. */
-  CINIT(USERNAME, OBJECTPOINT, 173),
-  CINIT(PASSWORD, OBJECTPOINT, 174),
-
-    /* "name" and "pwd" to use with Proxy when fetching. */
-  CINIT(PROXYUSERNAME, OBJECTPOINT, 175),
-  CINIT(PROXYPASSWORD, OBJECTPOINT, 176),
-
-  /* Comma separated list of hostnames defining no-proxy zones. These should
-     match both hostnames directly, and hostnames within a domain. For
-     example, local.com will match local.com and www.local.com, but NOT
-     notlocal.com or www.notlocal.com. For compatibility with other
-     implementations of this, .local.com will be considered to be the same as
-     local.com. A single * is the only valid wildcard, and effectively
-     disables the use of proxy. */
-  CINIT(NOPROXY, OBJECTPOINT, 177),
-
-  /* block size for TFTP transfers */
-  CINIT(TFTP_BLKSIZE, LONG, 178),
-
-  /* Socks Service */
-  CINIT(SOCKS5_GSSAPI_SERVICE, OBJECTPOINT, 179),
-
-  /* Socks Service */
-  CINIT(SOCKS5_GSSAPI_NEC, LONG, 180),
-
-  /* set the bitmask for the protocols that are allowed to be used for the
-     transfer, which thus helps the app which takes URLs from users or other
-     external inputs and want to restrict what protocol(s) to deal
-     with. Defaults to CURLPROTO_ALL. */
-  CINIT(PROTOCOLS, LONG, 181),
-
-  /* set the bitmask for the protocols that libcurl is allowed to follow to,
-     as a subset of the CURLOPT_PROTOCOLS ones. That means the protocol needs
-     to be set in both bitmasks to be allowed to get redirected to. Defaults
-     to all protocols except FILE and SCP. */
-  CINIT(REDIR_PROTOCOLS, LONG, 182),
-
-  /* set the SSH knownhost file name to use */
-  CINIT(SSH_KNOWNHOSTS, OBJECTPOINT, 183),
-
-  /* set the SSH host key callback, must point to a curl_sshkeycallback
-     function */
-  CINIT(SSH_KEYFUNCTION, FUNCTIONPOINT, 184),
-
-  /* set the SSH host key callback custom pointer */
-  CINIT(SSH_KEYDATA, OBJECTPOINT, 185),
-
-  /* set the SMTP mail originator */
-  CINIT(MAIL_FROM, OBJECTPOINT, 186),
-
-  /* set the SMTP mail receiver(s) */
-  CINIT(MAIL_RCPT, OBJECTPOINT, 187),
-
-  /* FTP: send PRET before PASV */
-  CINIT(FTP_USE_PRET, LONG, 188),
-
-  /* RTSP request method (OPTIONS, SETUP, PLAY, etc...) */
-  CINIT(RTSP_REQUEST, LONG, 189),
-
-  /* The RTSP session identifier */
-  CINIT(RTSP_SESSION_ID, OBJECTPOINT, 190),
-
-  /* The RTSP stream URI */
-  CINIT(RTSP_STREAM_URI, OBJECTPOINT, 191),
-
-  /* The Transport: header to use in RTSP requests */
-  CINIT(RTSP_TRANSPORT, OBJECTPOINT, 192),
-
-  /* Manually initialize the client RTSP CSeq for this handle */
-  CINIT(RTSP_CLIENT_CSEQ, LONG, 193),
-
-  /* Manually initialize the server RTSP CSeq for this handle */
-  CINIT(RTSP_SERVER_CSEQ, LONG, 194),
-
-  /* The stream to pass to INTERLEAVEFUNCTION. */
-  CINIT(INTERLEAVEDATA, OBJECTPOINT, 195),
-
-  /* Let the application define a custom write method for RTP data */
-  CINIT(INTERLEAVEFUNCTION, FUNCTIONPOINT, 196),
-
-  /* Turn on wildcard matching */
-  CINIT(WILDCARDMATCH, LONG, 197),
-
-  /* Directory matching callback called before downloading of an
-     individual file (chunk) started */
-  CINIT(CHUNK_BGN_FUNCTION, FUNCTIONPOINT, 198),
-
-  /* Directory matching callback called after the file (chunk)
-     was downloaded, or skipped */
-  CINIT(CHUNK_END_FUNCTION, FUNCTIONPOINT, 199),
-
-  /* Change match (fnmatch-like) callback for wildcard matching */
-  CINIT(FNMATCH_FUNCTION, FUNCTIONPOINT, 200),
-
-  /* Let the application define custom chunk data pointer */
-  CINIT(CHUNK_DATA, OBJECTPOINT, 201),
-
-  /* FNMATCH_FUNCTION user pointer */
-  CINIT(FNMATCH_DATA, OBJECTPOINT, 202),
-
-  CURLOPT_LASTENTRY /* the last unused */
-} CURLoption;
-
-#ifndef CURL_NO_OLDIES /* define this to test if your app builds with all
-                          the obsolete stuff removed! */
-
-/* Backwards compatibility with older names */
-/* These are scheduled to disappear by 2011 */
-
-/* This was added in version 7.19.1 */
-#define CURLOPT_POST301 CURLOPT_POSTREDIR
-
-/* These are scheduled to disappear by 2009 */
-
-/* The following were added in 7.17.0 */
-#define CURLOPT_SSLKEYPASSWD CURLOPT_KEYPASSWD
-#define CURLOPT_FTPAPPEND CURLOPT_APPEND
-#define CURLOPT_FTPLISTONLY CURLOPT_DIRLISTONLY
-#define CURLOPT_FTP_SSL CURLOPT_USE_SSL
-
-/* The following were added earlier */
-
-#define CURLOPT_SSLCERTPASSWD CURLOPT_KEYPASSWD
-#define CURLOPT_KRB4LEVEL CURLOPT_KRBLEVEL
-
-#else
-/* This is set if CURL_NO_OLDIES is defined at compile-time */
-#undef CURLOPT_DNS_USE_GLOBAL_CACHE /* soon obsolete */
-#endif
-
-
-  /* Below here follows defines for the CURLOPT_IPRESOLVE option. If a host
-     name resolves addresses using more than one IP protocol version, this
-     option might be handy to force libcurl to use a specific IP version. */
-#define CURL_IPRESOLVE_WHATEVER 0 /* default, resolves addresses to all IP
-                                     versions that your system allows */
-#define CURL_IPRESOLVE_V4       1 /* resolve to ipv4 addresses */
-#define CURL_IPRESOLVE_V6       2 /* resolve to ipv6 addresses */
-
-  /* three convenient "aliases" that follow the name scheme better */
-#define CURLOPT_WRITEDATA CURLOPT_FILE
-#define CURLOPT_READDATA  CURLOPT_INFILE
-#define CURLOPT_HEADERDATA CURLOPT_WRITEHEADER
-#define CURLOPT_RTSPHEADER CURLOPT_HTTPHEADER
-
-  /* These enums are for use with the CURLOPT_HTTP_VERSION option. */
-enum {
-  CURL_HTTP_VERSION_NONE, /* setting this means we don't care, and that we'd
-                             like the library to choose the best possible
-                             for us! */
-  CURL_HTTP_VERSION_1_0,  /* please use HTTP 1.0 in the request */
-  CURL_HTTP_VERSION_1_1,  /* please use HTTP 1.1 in the request */
-
-  CURL_HTTP_VERSION_LAST /* *ILLEGAL* http version */
-};
-
-/*
- * Public API enums for RTSP requests
- */
-enum {
-    CURL_RTSPREQ_NONE, /* first in list */
-    CURL_RTSPREQ_OPTIONS,
-    CURL_RTSPREQ_DESCRIBE,
-    CURL_RTSPREQ_ANNOUNCE,
-    CURL_RTSPREQ_SETUP,
-    CURL_RTSPREQ_PLAY,
-    CURL_RTSPREQ_PAUSE,
-    CURL_RTSPREQ_TEARDOWN,
-    CURL_RTSPREQ_GET_PARAMETER,
-    CURL_RTSPREQ_SET_PARAMETER,
-    CURL_RTSPREQ_RECORD,
-    CURL_RTSPREQ_RECEIVE,
-    CURL_RTSPREQ_LAST /* last in list */
-};
-
-  /* These enums are for use with the CURLOPT_NETRC option. */
-enum CURL_NETRC_OPTION {
-  CURL_NETRC_IGNORED,     /* The .netrc will never be read.
-                           * This is the default. */
-  CURL_NETRC_OPTIONAL,    /* A user:password in the URL will be preferred
-                           * to one in the .netrc. */
-  CURL_NETRC_REQUIRED,    /* A user:password in the URL will be ignored.
-                           * Unless one is set programmatically, the .netrc
-                           * will be queried. */
-  CURL_NETRC_LAST
-};
-
-enum {
-  CURL_SSLVERSION_DEFAULT,
-  CURL_SSLVERSION_TLSv1,
-  CURL_SSLVERSION_SSLv2,
-  CURL_SSLVERSION_SSLv3,
-
-  CURL_SSLVERSION_LAST /* never use, keep last */
-};
-
-/* symbols to use with CURLOPT_POSTREDIR.
-   CURL_REDIR_POST_301 and CURL_REDIR_POST_302 can be bitwise ORed so that
-   CURL_REDIR_POST_301 | CURL_REDIR_POST_302 == CURL_REDIR_POST_ALL */
-
-#define CURL_REDIR_GET_ALL  0
-#define CURL_REDIR_POST_301 1
-#define CURL_REDIR_POST_302 2
-#define CURL_REDIR_POST_ALL (CURL_REDIR_POST_301|CURL_REDIR_POST_302)
-
-typedef enum {
-  CURL_TIMECOND_NONE,
-
-  CURL_TIMECOND_IFMODSINCE,
-  CURL_TIMECOND_IFUNMODSINCE,
-  CURL_TIMECOND_LASTMOD,
-
-  CURL_TIMECOND_LAST
-} curl_TimeCond;
-
-
-/* curl_strequal() and curl_strnequal() are subject for removal in a future
-   libcurl, see lib/README.curlx for details */
-CURL_EXTERN int (curl_strequal)(const char *s1, const char *s2);
-CURL_EXTERN int (curl_strnequal)(const char *s1, const char *s2, size_t n);
-
-/* name is uppercase CURLFORM_<name> */
-#ifdef CFINIT
-#undef CFINIT
-#endif
-
-#ifdef CURL_ISOCPP
-#define CFINIT(name) CURLFORM_ ## name
-#else
-/* The macro "##" is ISO C, we assume pre-ISO C doesn't support it. */
-#define CFINIT(name) CURLFORM_/**/name
-#endif
-
-typedef enum {
-  CFINIT(NOTHING),        /********* the first one is unused ************/
-
-  /*  */
-  CFINIT(COPYNAME),
-  CFINIT(PTRNAME),
-  CFINIT(NAMELENGTH),
-  CFINIT(COPYCONTENTS),
-  CFINIT(PTRCONTENTS),
-  CFINIT(CONTENTSLENGTH),
-  CFINIT(FILECONTENT),
-  CFINIT(ARRAY),
-  CFINIT(OBSOLETE),
-  CFINIT(FILE),
-
-  CFINIT(BUFFER),
-  CFINIT(BUFFERPTR),
-  CFINIT(BUFFERLENGTH),
-
-  CFINIT(CONTENTTYPE),
-  CFINIT(CONTENTHEADER),
-  CFINIT(FILENAME),
-  CFINIT(END),
-  CFINIT(OBSOLETE2),
-
-  CFINIT(STREAM),
-
-  CURLFORM_LASTENTRY /* the last unused */
-} CURLformoption;
-
-#undef CFINIT /* done */
-
-/* structure to be used as parameter for CURLFORM_ARRAY */
-struct curl_forms {
-  CURLformoption option;
-  const char     *value;
-};
-
-/* use this for multipart formpost building */
-/* Returns code for curl_formadd()
- *
- * Returns:
- * CURL_FORMADD_OK             on success
- * CURL_FORMADD_MEMORY         if the FormInfo allocation fails
- * CURL_FORMADD_OPTION_TWICE   if one option is given twice for one Form
- * CURL_FORMADD_NULL           if a null pointer was given for a char
- * CURL_FORMADD_MEMORY         if the allocation of a FormInfo struct failed
- * CURL_FORMADD_UNKNOWN_OPTION if an unknown option was used
- * CURL_FORMADD_INCOMPLETE     if the some FormInfo is not complete (or error)
- * CURL_FORMADD_MEMORY         if a curl_httppost struct cannot be allocated
- * CURL_FORMADD_MEMORY         if some allocation for string copying failed.
- * CURL_FORMADD_ILLEGAL_ARRAY  if an illegal option is used in an array
- *
- ***************************************************************************/
-typedef enum {
-  CURL_FORMADD_OK, /* first, no error */
-
-  CURL_FORMADD_MEMORY,
-  CURL_FORMADD_OPTION_TWICE,
-  CURL_FORMADD_NULL,
-  CURL_FORMADD_UNKNOWN_OPTION,
-  CURL_FORMADD_INCOMPLETE,
-  CURL_FORMADD_ILLEGAL_ARRAY,
-  CURL_FORMADD_DISABLED, /* libcurl was built with this disabled */
-
-  CURL_FORMADD_LAST /* last */
-} CURLFORMcode;
-
-/*
- * NAME curl_formadd()
- *
- * DESCRIPTION
- *
- * Pretty advanced function for building multi-part formposts. Each invoke
- * adds one part that together construct a full post. Then use
- * CURLOPT_HTTPPOST to send it off to libcurl.
- */
-CURL_EXTERN CURLFORMcode curl_formadd(struct curl_httppost **httppost,
-                                      struct curl_httppost **last_post,
-                                      ...);
-
-/*
- * callback function for curl_formget()
- * The void *arg pointer will be the one passed as second argument to
- *   curl_formget().
- * The character buffer passed to it must not be freed.
- * Should return the buffer length passed to it as the argument "len" on
- *   success.
- */
-typedef size_t (*curl_formget_callback)(void *arg, const char *buf, size_t len);
-
-/*
- * NAME curl_formget()
- *
- * DESCRIPTION
- *
- * Serialize a curl_httppost struct built with curl_formadd().
- * Accepts a void pointer as second argument which will be passed to
- * the curl_formget_callback function.
- * Returns 0 on success.
- */
-CURL_EXTERN int curl_formget(struct curl_httppost *form, void *arg,
-                             curl_formget_callback append);
-/*
- * NAME curl_formfree()
- *
- * DESCRIPTION
- *
- * Free a multipart formpost previously built with curl_formadd().
- */
-CURL_EXTERN void curl_formfree(struct curl_httppost *form);
-
-/*
- * NAME curl_getenv()
- *
- * DESCRIPTION
- *
- * Returns a malloc()'ed string that MUST be curl_free()ed after usage is
- * complete. DEPRECATED - see lib/README.curlx
- */
-CURL_EXTERN char *curl_getenv(const char *variable);
-
-/*
- * NAME curl_version()
- *
- * DESCRIPTION
- *
- * Returns a static ascii string of the libcurl version.
- */
-CURL_EXTERN char *curl_version(void);
-
-/*
- * NAME curl_easy_escape()
- *
- * DESCRIPTION
- *
- * Escapes URL strings (converts all letters consider illegal in URLs to their
- * %XX versions). This function returns a new allocated string or NULL if an
- * error occurred.
- */
-CURL_EXTERN char *curl_easy_escape(CURL *handle,
-                                   const char *string,
-                                   int length);
-
-/* the previous version: */
-CURL_EXTERN char *curl_escape(const char *string,
-                              int length);
-
-
-/*
- * NAME curl_easy_unescape()
- *
- * DESCRIPTION
- *
- * Unescapes URL encoding in strings (converts all %XX codes to their 8bit
- * versions). This function returns a new allocated string or NULL if an error
- * occurred.
- * Conversion Note: On non-ASCII platforms the ASCII %XX codes are
- * converted into the host encoding.
- */
-CURL_EXTERN char *curl_easy_unescape(CURL *handle,
-                                     const char *string,
-                                     int length,
-                                     int *outlength);
-
-/* the previous version */
-CURL_EXTERN char *curl_unescape(const char *string,
-                                int length);
-
-/*
- * NAME curl_free()
- *
- * DESCRIPTION
- *
- * Provided for de-allocation in the same translation unit that did the
- * allocation. Added in libcurl 7.10
- */
-CURL_EXTERN void curl_free(void *p);
-
-/*
- * NAME curl_global_init()
- *
- * DESCRIPTION
- *
- * curl_global_init() should be invoked exactly once for each application that
- * uses libcurl and before any call of other libcurl functions.
- *
- * This function is not thread-safe!
- */
-CURL_EXTERN CURLcode curl_global_init(long flags);
-
-/*
- * NAME curl_global_init_mem()
- *
- * DESCRIPTION
- *
- * curl_global_init() or curl_global_init_mem() should be invoked exactly once
- * for each application that uses libcurl.  This function can be used to
- * initialize libcurl and set user defined memory management callback
- * functions.  Users can implement memory management routines to check for
- * memory leaks, check for mis-use of the curl library etc.  User registered
- * callback routines with be invoked by this library instead of the system
- * memory management routines like malloc, free etc.
- */
-CURL_EXTERN CURLcode curl_global_init_mem(long flags,
-                                          curl_malloc_callback m,
-                                          curl_free_callback f,
-                                          curl_realloc_callback r,
-                                          curl_strdup_callback s,
-                                          curl_calloc_callback c);
-
-/*
- * NAME curl_global_cleanup()
- *
- * DESCRIPTION
- *
- * curl_global_cleanup() should be invoked exactly once for each application
- * that uses libcurl
- */
-CURL_EXTERN void curl_global_cleanup(void);
-
-/* linked-list structure for the CURLOPT_QUOTE option (and other) */
-struct curl_slist {
-  char *data;
-  struct curl_slist *next;
-};
-
-/*
- * NAME curl_slist_append()
- *
- * DESCRIPTION
- *
- * Appends a string to a linked list. If no list exists, it will be created
- * first. Returns the new list, after appending.
- */
-CURL_EXTERN struct curl_slist *curl_slist_append(struct curl_slist *,
-                                                 const char *);
-
-/*
- * NAME curl_slist_free_all()
- *
- * DESCRIPTION
- *
- * free a previously built curl_slist.
- */
-CURL_EXTERN void curl_slist_free_all(struct curl_slist *);
-
-/*
- * NAME curl_getdate()
- *
- * DESCRIPTION
- *
- * Returns the time, in seconds since 1 Jan 1970 of the time string given in
- * the first argument. The time argument in the second parameter is unused
- * and should be set to NULL.
- */
-CURL_EXTERN time_t curl_getdate(const char *p, const time_t *unused);
-
-/* info about the certificate chain, only for OpenSSL builds. Asked
-   for with CURLOPT_CERTINFO / CURLINFO_CERTINFO */
-struct curl_certinfo {
-  int num_of_certs;             /* number of certificates with information */
-  struct curl_slist **certinfo; /* for each index in this array, there's a
-                                   linked list with textual information in the
-                                   format "name: value" */
-};
-
-#define CURLINFO_STRING   0x100000
-#define CURLINFO_LONG     0x200000
-#define CURLINFO_DOUBLE   0x300000
-#define CURLINFO_SLIST    0x400000
-#define CURLINFO_MASK     0x0fffff
-#define CURLINFO_TYPEMASK 0xf00000
-
-typedef enum {
-  CURLINFO_NONE, /* first, never use this */
-  CURLINFO_EFFECTIVE_URL    = CURLINFO_STRING + 1,
-  CURLINFO_RESPONSE_CODE    = CURLINFO_LONG   + 2,
-  CURLINFO_TOTAL_TIME       = CURLINFO_DOUBLE + 3,
-  CURLINFO_NAMELOOKUP_TIME  = CURLINFO_DOUBLE + 4,
-  CURLINFO_CONNECT_TIME     = CURLINFO_DOUBLE + 5,
-  CURLINFO_PRETRANSFER_TIME = CURLINFO_DOUBLE + 6,
-  CURLINFO_SIZE_UPLOAD      = CURLINFO_DOUBLE + 7,
-  CURLINFO_SIZE_DOWNLOAD    = CURLINFO_DOUBLE + 8,
-  CURLINFO_SPEED_DOWNLOAD   = CURLINFO_DOUBLE + 9,
-  CURLINFO_SPEED_UPLOAD     = CURLINFO_DOUBLE + 10,
-  CURLINFO_HEADER_SIZE      = CURLINFO_LONG   + 11,
-  CURLINFO_REQUEST_SIZE     = CURLINFO_LONG   + 12,
-  CURLINFO_SSL_VERIFYRESULT = CURLINFO_LONG   + 13,
-  CURLINFO_FILETIME         = CURLINFO_LONG   + 14,
-  CURLINFO_CONTENT_LENGTH_DOWNLOAD   = CURLINFO_DOUBLE + 15,
-  CURLINFO_CONTENT_LENGTH_UPLOAD     = CURLINFO_DOUBLE + 16,
-  CURLINFO_STARTTRANSFER_TIME = CURLINFO_DOUBLE + 17,
-  CURLINFO_CONTENT_TYPE     = CURLINFO_STRING + 18,
-  CURLINFO_REDIRECT_TIME    = CURLINFO_DOUBLE + 19,
-  CURLINFO_REDIRECT_COUNT   = CURLINFO_LONG   + 20,
-  CURLINFO_PRIVATE          = CURLINFO_STRING + 21,
-  CURLINFO_HTTP_CONNECTCODE = CURLINFO_LONG   + 22,
-  CURLINFO_HTTPAUTH_AVAIL   = CURLINFO_LONG   + 23,
-  CURLINFO_PROXYAUTH_AVAIL  = CURLINFO_LONG   + 24,
-  CURLINFO_OS_ERRNO         = CURLINFO_LONG   + 25,
-  CURLINFO_NUM_CONNECTS     = CURLINFO_LONG   + 26,
-  CURLINFO_SSL_ENGINES      = CURLINFO_SLIST  + 27,
-  CURLINFO_COOKIELIST       = CURLINFO_SLIST  + 28,
-  CURLINFO_LASTSOCKET       = CURLINFO_LONG   + 29,
-  CURLINFO_FTP_ENTRY_PATH   = CURLINFO_STRING + 30,
-  CURLINFO_REDIRECT_URL     = CURLINFO_STRING + 31,
-  CURLINFO_PRIMARY_IP       = CURLINFO_STRING + 32,
-  CURLINFO_APPCONNECT_TIME  = CURLINFO_DOUBLE + 33,
-  CURLINFO_CERTINFO         = CURLINFO_SLIST  + 34,
-  CURLINFO_CONDITION_UNMET  = CURLINFO_LONG   + 35,
-  CURLINFO_RTSP_SESSION_ID  = CURLINFO_STRING + 36,
-  CURLINFO_RTSP_CLIENT_CSEQ = CURLINFO_LONG   + 37,
-  CURLINFO_RTSP_SERVER_CSEQ = CURLINFO_LONG   + 38,
-  CURLINFO_RTSP_CSEQ_RECV   = CURLINFO_LONG   + 39,
-  CURLINFO_PRIMARY_PORT     = CURLINFO_LONG   + 40,
-  CURLINFO_LOCAL_IP         = CURLINFO_STRING + 41,
-  CURLINFO_LOCAL_PORT       = CURLINFO_LONG   + 42,
-  /* Fill in new entries below here! */
-
-  CURLINFO_LASTONE          = 42
-} CURLINFO;
-
-/* CURLINFO_RESPONSE_CODE is the new name for the option previously known as
-   CURLINFO_HTTP_CODE */
-#define CURLINFO_HTTP_CODE CURLINFO_RESPONSE_CODE
-
-typedef enum {
-  CURLCLOSEPOLICY_NONE, /* first, never use this */
-
-  CURLCLOSEPOLICY_OLDEST,
-  CURLCLOSEPOLICY_LEAST_RECENTLY_USED,
-  CURLCLOSEPOLICY_LEAST_TRAFFIC,
-  CURLCLOSEPOLICY_SLOWEST,
-  CURLCLOSEPOLICY_CALLBACK,
-
-  CURLCLOSEPOLICY_LAST /* last, never use this */
-} curl_closepolicy;
-
-#define CURL_GLOBAL_SSL (1<<0)
-#define CURL_GLOBAL_WIN32 (1<<1)
-#define CURL_GLOBAL_ALL (CURL_GLOBAL_SSL|CURL_GLOBAL_WIN32)
-#define CURL_GLOBAL_NOTHING 0
-#define CURL_GLOBAL_DEFAULT CURL_GLOBAL_ALL
-
-
-/*****************************************************************************
- * Setup defines, protos etc for the sharing stuff.
- */
-
-/* Different data locks for a single share */
-typedef enum {
-  CURL_LOCK_DATA_NONE = 0,
-  /*  CURL_LOCK_DATA_SHARE is used internally to say that
-   *  the locking is just made to change the internal state of the share
-   *  itself.
-   */
-  CURL_LOCK_DATA_SHARE,
-  CURL_LOCK_DATA_COOKIE,
-  CURL_LOCK_DATA_DNS,
-  CURL_LOCK_DATA_SSL_SESSION,
-  CURL_LOCK_DATA_CONNECT,
-  CURL_LOCK_DATA_LAST
-} curl_lock_data;
-
-/* Different lock access types */
-typedef enum {
-  CURL_LOCK_ACCESS_NONE = 0,   /* unspecified action */
-  CURL_LOCK_ACCESS_SHARED = 1, /* for read perhaps */
-  CURL_LOCK_ACCESS_SINGLE = 2, /* for write perhaps */
-  CURL_LOCK_ACCESS_LAST        /* never use */
-} curl_lock_access;
-
-typedef void (*curl_lock_function)(CURL *handle,
-                                   curl_lock_data data,
-                                   curl_lock_access locktype,
-                                   void *userptr);
-typedef void (*curl_unlock_function)(CURL *handle,
-                                     curl_lock_data data,
-                                     void *userptr);
-
-typedef void CURLSH;
-
-typedef enum {
-  CURLSHE_OK,  /* all is fine */
-  CURLSHE_BAD_OPTION, /* 1 */
-  CURLSHE_IN_USE,     /* 2 */
-  CURLSHE_INVALID,    /* 3 */
-  CURLSHE_NOMEM,      /* out of memory */
-  CURLSHE_LAST /* never use */
-} CURLSHcode;
-
-typedef enum {
-  CURLSHOPT_NONE,  /* don't use */
-  CURLSHOPT_SHARE,   /* specify a data type to share */
-  CURLSHOPT_UNSHARE, /* specify which data type to stop sharing */
-  CURLSHOPT_LOCKFUNC,   /* pass in a 'curl_lock_function' pointer */
-  CURLSHOPT_UNLOCKFUNC, /* pass in a 'curl_unlock_function' pointer */
-  CURLSHOPT_USERDATA,   /* pass in a user data pointer used in the lock/unlock
-                           callback functions */
-  CURLSHOPT_LAST  /* never use */
-} CURLSHoption;
-
-CURL_EXTERN CURLSH *curl_share_init(void);
-CURL_EXTERN CURLSHcode curl_share_setopt(CURLSH *, CURLSHoption option, ...);
-CURL_EXTERN CURLSHcode curl_share_cleanup(CURLSH *);
-
-/****************************************************************************
- * Structures for querying information about the curl library at runtime.
- */
-
-typedef enum {
-  CURLVERSION_FIRST,
-  CURLVERSION_SECOND,
-  CURLVERSION_THIRD,
-  CURLVERSION_FOURTH,
-  CURLVERSION_LAST /* never actually use this */
-} CURLversion;
-
-/* The 'CURLVERSION_NOW' is the symbolic name meant to be used by
-   basically all programs ever that want to get version information. It is
-   meant to be a built-in version number for what kind of struct the caller
-   expects. If the struct ever changes, we redefine the NOW to another enum
-   from above. */
-#define CURLVERSION_NOW CURLVERSION_FOURTH
-
-typedef struct {
-  CURLversion age;          /* age of the returned struct */
-  const char *version;      /* LIBCURL_VERSION */
-  unsigned int version_num; /* LIBCURL_VERSION_NUM */
-  const char *host;         /* OS/host/cpu/machine when configured */
-  int features;             /* bitmask, see defines below */
-  const char *ssl_version;  /* human readable string */
-  long ssl_version_num;     /* not used anymore, always 0 */
-  const char *libz_version; /* human readable string */
-  /* protocols is terminated by an entry with a NULL protoname */
-  const char * const *protocols;
-
-  /* The fields below this were added in CURLVERSION_SECOND */
-  const char *ares;
-  int ares_num;
-
-  /* This field was added in CURLVERSION_THIRD */
-  const char *libidn;
-
-  /* These field were added in CURLVERSION_FOURTH */
-
-  /* Same as '_libiconv_version' if built with HAVE_ICONV */
-  int iconv_ver_num;
-
-  const char *libssh_version; /* human readable string */
-
-} curl_version_info_data;
-
-#define CURL_VERSION_IPV6      (1<<0)  /* IPv6-enabled */
-#define CURL_VERSION_KERBEROS4 (1<<1)  /* kerberos auth is supported */
-#define CURL_VERSION_SSL       (1<<2)  /* SSL options are present */
-#define CURL_VERSION_LIBZ      (1<<3)  /* libz features are present */
-#define CURL_VERSION_NTLM      (1<<4)  /* NTLM auth is supported */
-#define CURL_VERSION_GSSNEGOTIATE (1<<5) /* Negotiate auth support */
-#define CURL_VERSION_DEBUG     (1<<6)  /* built with debug capabilities */
-#define CURL_VERSION_ASYNCHDNS (1<<7)  /* asynchronous dns resolves */
-#define CURL_VERSION_SPNEGO    (1<<8)  /* SPNEGO auth */
-#define CURL_VERSION_LARGEFILE (1<<9)  /* supports files bigger than 2GB */
-#define CURL_VERSION_IDN       (1<<10) /* International Domain Names support */
-#define CURL_VERSION_SSPI      (1<<11) /* SSPI is supported */
-#define CURL_VERSION_CONV      (1<<12) /* character conversions supported */
-#define CURL_VERSION_CURLDEBUG (1<<13) /* debug memory tracking supported */
-
-/*
- * NAME curl_version_info()
- *
- * DESCRIPTION
- *
- * This function returns a pointer to a static copy of the version info
- * struct. See above.
- */
-CURL_EXTERN curl_version_info_data *curl_version_info(CURLversion);
-
-/*
- * NAME curl_easy_strerror()
- *
- * DESCRIPTION
- *
- * The curl_easy_strerror function may be used to turn a CURLcode value
- * into the equivalent human readable error string.  This is useful
- * for printing meaningful error messages.
- */
-CURL_EXTERN const char *curl_easy_strerror(CURLcode);
-
-/*
- * NAME curl_share_strerror()
- *
- * DESCRIPTION
- *
- * The curl_share_strerror function may be used to turn a CURLSHcode value
- * into the equivalent human readable error string.  This is useful
- * for printing meaningful error messages.
- */
-CURL_EXTERN const char *curl_share_strerror(CURLSHcode);
-
-/*
- * NAME curl_easy_pause()
- *
- * DESCRIPTION
- *
- * The curl_easy_pause function pauses or unpauses transfers. Select the new
- * state by setting the bitmask, use the convenience defines below.
- *
- */
-CURL_EXTERN CURLcode curl_easy_pause(CURL *handle, int bitmask);
-
-#define CURLPAUSE_RECV      (1<<0)
-#define CURLPAUSE_RECV_CONT (0)
-
-#define CURLPAUSE_SEND      (1<<2)
-#define CURLPAUSE_SEND_CONT (0)
-
-#define CURLPAUSE_ALL       (CURLPAUSE_RECV|CURLPAUSE_SEND)
-#define CURLPAUSE_CONT      (CURLPAUSE_RECV_CONT|CURLPAUSE_SEND_CONT)
-
-#ifdef  __cplusplus
-}
-#endif
-
-/* unfortunately, the easy.h and multi.h include files need options and info
-  stuff before they can be included! */
-#include "easy.h" /* nothing in curl is fun without the easy stuff */
-#include "multi.h"
-
-/* the typechecker doesn't work in C++ (yet) */
-#if defined(__GNUC__) && defined(__GNUC_MINOR__) && \
-    ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) && \
-    !defined(__cplusplus) && !defined(CURL_DISABLE_TYPECHECK)
-#include "typecheck-gcc.h"
-#else
-#if defined(__STDC__) && (__STDC__ >= 1)
-/* This preprocessor magic that replaces a call with the exact same call is
-   only done to make sure application authors pass exactly three arguments
-   to these functions. */
-#define curl_easy_setopt(handle,opt,param) curl_easy_setopt(handle,opt,param)
-#define curl_easy_getinfo(handle,info,arg) curl_easy_getinfo(handle,info,arg)
-#define curl_share_setopt(share,opt,param) curl_share_setopt(share,opt,param)
-#define curl_multi_setopt(handle,opt,param) curl_multi_setopt(handle,opt,param)
-#endif /* __STDC__ >= 1 */
-#endif /* gcc >= 4.3 && !__cplusplus */
-
-#endif /* __CURL_CURL_H */
diff --git a/lib-x86-64/include/curl/curlbuild.h b/lib-x86-64/include/curl/curlbuild.h
deleted file mode 100644
index 379edf82..00000000
--- a/lib-x86-64/include/curl/curlbuild.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/* include/curl/curlbuild.h.  Generated from curlbuild.h.in by configure.  */
-#ifndef __CURL_CURLBUILD_H
-#define __CURL_CURLBUILD_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-
-/* ================================================================ */
-/*               NOTES FOR CONFIGURE CAPABLE SYSTEMS                */
-/* ================================================================ */
-
-/*
- * NOTE 1:
- * -------
- *
- * Nothing in this file is intended to be modified or adjusted by the
- * curl library user nor by the curl library builder.
- *
- * If you think that something actually needs to be changed, adjusted
- * or fixed in this file, then, report it on the libcurl development
- * mailing list: http://cool.haxx.se/mailman/listinfo/curl-library/
- *
- * This header file shall only export symbols which are 'curl' or 'CURL'
- * prefixed, otherwise public name space would be polluted.
- *
- * NOTE 2:
- * -------
- *
- * Right now you might be staring at file include/curl/curlbuild.h.in or
- * at file include/curl/curlbuild.h, this is due to the following reason:
- *
- * On systems capable of running the configure script, the configure process
- * will overwrite the distributed include/curl/curlbuild.h file with one that
- * is suitable and specific to the library being configured and built, which
- * is generated from the include/curl/curlbuild.h.in template file.
- *
- */
-
-/* ================================================================ */
-/*  DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE  */
-/* ================================================================ */
-
-#ifdef CURL_SIZEOF_LONG
-#  error "CURL_SIZEOF_LONG shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_SIZEOF_LONG_already_defined
-#endif
-
-#ifdef CURL_TYPEOF_CURL_SOCKLEN_T
-#  error "CURL_TYPEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_TYPEOF_CURL_SOCKLEN_T_already_defined
-#endif
-
-#ifdef CURL_SIZEOF_CURL_SOCKLEN_T
-#  error "CURL_SIZEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_SIZEOF_CURL_SOCKLEN_T_already_defined
-#endif
-
-#ifdef CURL_TYPEOF_CURL_OFF_T
-#  error "CURL_TYPEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_TYPEOF_CURL_OFF_T_already_defined
-#endif
-
-#ifdef CURL_FORMAT_CURL_OFF_T
-#  error "CURL_FORMAT_CURL_OFF_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_T_already_defined
-#endif
-
-#ifdef CURL_FORMAT_CURL_OFF_TU
-#  error "CURL_FORMAT_CURL_OFF_TU shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_TU_already_defined
-#endif
-
-#ifdef CURL_FORMAT_OFF_T
-#  error "CURL_FORMAT_OFF_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_FORMAT_OFF_T_already_defined
-#endif
-
-#ifdef CURL_SIZEOF_CURL_OFF_T
-#  error "CURL_SIZEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_SIZEOF_CURL_OFF_T_already_defined
-#endif
-
-#ifdef CURL_SUFFIX_CURL_OFF_T
-#  error "CURL_SUFFIX_CURL_OFF_T shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_T_already_defined
-#endif
-
-#ifdef CURL_SUFFIX_CURL_OFF_TU
-#  error "CURL_SUFFIX_CURL_OFF_TU shall not be defined except in curlbuild.h"
-   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_TU_already_defined
-#endif
-
-/* ================================================================ */
-/*  EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY  */
-/* ================================================================ */
-
-/* Configure process defines this to 1 when it finds out that system  */
-/* header file ws2tcpip.h must be included by the external interface. */
-/* #undef CURL_PULL_WS2TCPIP_H */
-#ifdef CURL_PULL_WS2TCPIP_H
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
-#  include <windows.h>
-#  include <winsock2.h>
-#  include <ws2tcpip.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system   */
-/* header file sys/types.h must be included by the external interface. */
-#define CURL_PULL_SYS_TYPES_H 1
-#ifdef CURL_PULL_SYS_TYPES_H
-#  include <sys/types.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system */
-/* header file stdint.h must be included by the external interface.  */
-/* #undef CURL_PULL_STDINT_H */
-#ifdef CURL_PULL_STDINT_H
-#  include <stdint.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system  */
-/* header file inttypes.h must be included by the external interface. */
-/* #undef CURL_PULL_INTTYPES_H */
-#ifdef CURL_PULL_INTTYPES_H
-#  include <inttypes.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system    */
-/* header file sys/socket.h must be included by the external interface. */
-#define CURL_PULL_SYS_SOCKET_H 1
-#ifdef CURL_PULL_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
-
-/* The size of `long', as computed by sizeof. */
-#define CURL_SIZEOF_LONG 8
-
-/* Integral data type used for curl_socklen_t. */
-#define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
-
-/* The size of `curl_socklen_t', as computed by sizeof. */
-#define CURL_SIZEOF_CURL_SOCKLEN_T 4
-
-/* Data type definition of curl_socklen_t. */
-typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t;
-
-/* Signed integral data type used for curl_off_t. */
-#define CURL_TYPEOF_CURL_OFF_T long
-
-/* Data type definition of curl_off_t. */
-typedef CURL_TYPEOF_CURL_OFF_T curl_off_t;
-
-/* curl_off_t formatting string directive without "%" conversion specifier. */
-#define CURL_FORMAT_CURL_OFF_T "ld"
-
-/* unsigned curl_off_t formatting string without "%" conversion specifier. */
-#define CURL_FORMAT_CURL_OFF_TU "lu"
-
-/* curl_off_t formatting string directive with "%" conversion specifier. */
-#define CURL_FORMAT_OFF_T "%ld"
-
-/* The size of `curl_off_t', as computed by sizeof. */
-#define CURL_SIZEOF_CURL_OFF_T 8
-
-/* curl_off_t constant suffix. */
-#define CURL_SUFFIX_CURL_OFF_T L
-
-/* unsigned curl_off_t constant suffix. */
-#define CURL_SUFFIX_CURL_OFF_TU UL
-
-#endif /* __CURL_CURLBUILD_H */
diff --git a/lib-x86-64/include/curl/curlrules.h b/lib-x86-64/include/curl/curlrules.h
deleted file mode 100644
index 8aad1df6..00000000
--- a/lib-x86-64/include/curl/curlrules.h
+++ /dev/null
@@ -1,252 +0,0 @@
-#ifndef __CURL_CURLRULES_H
-#define __CURL_CURLRULES_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-
-/* ================================================================ */
-/*                    COMPILE TIME SANITY CHECKS                    */
-/* ================================================================ */
-
-/*
- * NOTE 1:
- * -------
- *
- * All checks done in this file are intentionally placed in a public
- * header file which is pulled by curl/curl.h when an application is
- * being built using an already built libcurl library. Additionally
- * this file is also included and used when building the library.
- *
- * If compilation fails on this file it is certainly sure that the
- * problem is elsewhere. It could be a problem in the curlbuild.h
- * header file, or simply that you are using different compilation
- * settings than those used to build the library.
- *
- * Nothing in this file is intended to be modified or adjusted by the
- * curl library user nor by the curl library builder.
- *
- * Do not deactivate any check, these are done to make sure that the
- * library is properly built and used.
- *
- * You can find further help on the libcurl development mailing list:
- * http://cool.haxx.se/mailman/listinfo/curl-library/
- *
- * NOTE 2
- * ------
- *
- * Some of the following compile time checks are based on the fact
- * that the dimension of a constant array can not be a negative one.
- * In this way if the compile time verification fails, the compilation
- * will fail issuing an error. The error description wording is compiler
- * dependent but it will be quite similar to one of the following:
- *
- *   "negative subscript or subscript is too large"
- *   "array must have at least one element"
- *   "-1 is an illegal array size"
- *   "size of array is negative"
- *
- * If you are building an application which tries to use an already
- * built libcurl library and you are getting this kind of errors on
- * this file, it is a clear indication that there is a mismatch between
- * how the library was built and how you are trying to use it for your
- * application. Your already compiled or binary library provider is the
- * only one who can give you the details you need to properly use it.
- */
-
-/*
- * Verify that some macros are actually defined.
- */
-
-#ifndef CURL_SIZEOF_LONG
-#  error "CURL_SIZEOF_LONG definition is missing!"
-   Error Compilation_aborted_CURL_SIZEOF_LONG_is_missing
-#endif
-
-#ifndef CURL_TYPEOF_CURL_SOCKLEN_T
-#  error "CURL_TYPEOF_CURL_SOCKLEN_T definition is missing!"
-   Error Compilation_aborted_CURL_TYPEOF_CURL_SOCKLEN_T_is_missing
-#endif
-
-#ifndef CURL_SIZEOF_CURL_SOCKLEN_T
-#  error "CURL_SIZEOF_CURL_SOCKLEN_T definition is missing!"
-   Error Compilation_aborted_CURL_SIZEOF_CURL_SOCKLEN_T_is_missing
-#endif
-
-#ifndef CURL_TYPEOF_CURL_OFF_T
-#  error "CURL_TYPEOF_CURL_OFF_T definition is missing!"
-   Error Compilation_aborted_CURL_TYPEOF_CURL_OFF_T_is_missing
-#endif
-
-#ifndef CURL_FORMAT_CURL_OFF_T
-#  error "CURL_FORMAT_CURL_OFF_T definition is missing!"
-   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_T_is_missing
-#endif
-
-#ifndef CURL_FORMAT_CURL_OFF_TU
-#  error "CURL_FORMAT_CURL_OFF_TU definition is missing!"
-   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_TU_is_missing
-#endif
-
-#ifndef CURL_FORMAT_OFF_T
-#  error "CURL_FORMAT_OFF_T definition is missing!"
-   Error Compilation_aborted_CURL_FORMAT_OFF_T_is_missing
-#endif
-
-#ifndef CURL_SIZEOF_CURL_OFF_T
-#  error "CURL_SIZEOF_CURL_OFF_T definition is missing!"
-   Error Compilation_aborted_CURL_SIZEOF_CURL_OFF_T_is_missing
-#endif
-
-#ifndef CURL_SUFFIX_CURL_OFF_T
-#  error "CURL_SUFFIX_CURL_OFF_T definition is missing!"
-   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_T_is_missing
-#endif
-
-#ifndef CURL_SUFFIX_CURL_OFF_TU
-#  error "CURL_SUFFIX_CURL_OFF_TU definition is missing!"
-   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_TU_is_missing
-#endif
-
-/*
- * Macros private to this header file.
- */
-
-#define CurlchkszEQ(t, s) sizeof(t) == s ? 1 : -1
-
-#define CurlchkszGE(t1, t2) sizeof(t1) >= sizeof(t2) ? 1 : -1
-
-/*
- * Verify that the size previously defined and expected for long
- * is the same as the one reported by sizeof() at compile time.
- */
-
-typedef char
-  __curl_rule_01__
-    [CurlchkszEQ(long, CURL_SIZEOF_LONG)];
-
-/*
- * Verify that the size previously defined and expected for
- * curl_off_t is actually the the same as the one reported
- * by sizeof() at compile time.
- */
-
-typedef char
-  __curl_rule_02__
-    [CurlchkszEQ(curl_off_t, CURL_SIZEOF_CURL_OFF_T)];
-
-/*
- * Verify at compile time that the size of curl_off_t as reported
- * by sizeof() is greater or equal than the one reported for long
- * for the current compilation.
- */
-
-typedef char
-  __curl_rule_03__
-    [CurlchkszGE(curl_off_t, long)];
-
-/*
- * Verify that the size previously defined and expected for
- * curl_socklen_t is actually the the same as the one reported
- * by sizeof() at compile time.
- */
-
-typedef char
-  __curl_rule_04__
-    [CurlchkszEQ(curl_socklen_t, CURL_SIZEOF_CURL_SOCKLEN_T)];
-
-/*
- * Verify at compile time that the size of curl_socklen_t as reported
- * by sizeof() is greater or equal than the one reported for int for
- * the current compilation.
- */
-
-typedef char
-  __curl_rule_05__
-    [CurlchkszGE(curl_socklen_t, int)];
-
-/* ================================================================ */
-/*          EXTERNALLY AND INTERNALLY VISIBLE DEFINITIONS           */
-/* ================================================================ */
-
-/*
- * CURL_ISOCPP and CURL_OFF_T_C definitions are done here in order to allow
- * these to be visible and exported by the external libcurl interface API,
- * while also making them visible to the library internals, simply including
- * setup.h, without actually needing to include curl.h internally.
- * If some day this section would grow big enough, all this should be moved
- * to its own header file.
- */
-
-/*
- * Figure out if we can use the ## preprocessor operator, which is supported
- * by ISO/ANSI C and C++. Some compilers support it without setting __STDC__
- * or  __cplusplus so we need to carefully check for them too.
- */
-
-#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus) || \
-  defined(__HP_aCC) || defined(__BORLANDC__) || defined(__LCC__) || \
-  defined(__POCC__) || defined(__SALFORDC__) || defined(__HIGHC__) || \
-  defined(__ILEC400__)
-  /* This compiler is believed to have an ISO compatible preprocessor */
-#define CURL_ISOCPP
-#else
-  /* This compiler is believed NOT to have an ISO compatible preprocessor */
-#undef CURL_ISOCPP
-#endif
-
-/*
- * Macros for minimum-width signed and unsigned curl_off_t integer constants.
- */
-
-#ifdef CURL_ISOCPP
-#  define __CURL_OFF_T_C_HELPER2(Val,Suffix) Val ## Suffix
-#else
-#  define __CURL_OFF_T_C_HELPER2(Val,Suffix) Val/**/Suffix
-#endif
-#define __CURL_OFF_T_C_HELPER1(Val,Suffix) __CURL_OFF_T_C_HELPER2(Val,Suffix)
-#define CURL_OFF_T_C(Val)  __CURL_OFF_T_C_HELPER1(Val,CURL_SUFFIX_CURL_OFF_T)
-#define CURL_OFF_TU_C(Val) __CURL_OFF_T_C_HELPER1(Val,CURL_SUFFIX_CURL_OFF_TU)
-
-/*
- * Get rid of macros private to this header file.
- */
-
-#undef CurlchkszEQ
-#undef CurlchkszGE
-
-/*
- * Get rid of macros not intended to exist beyond this point.
- */
-
-#undef CURL_PULL_WS2TCPIP_H
-#undef CURL_PULL_SYS_TYPES_H
-#undef CURL_PULL_SYS_SOCKET_H
-#undef CURL_PULL_STDINT_H
-#undef CURL_PULL_INTTYPES_H
-
-#undef CURL_TYPEOF_CURL_SOCKLEN_T
-#undef CURL_TYPEOF_CURL_OFF_T
-
-#ifdef CURL_NO_OLDIES
-#undef CURL_FORMAT_OFF_T /* not required since 7.19.0 - obsoleted in 7.20.0 */
-#endif
-
-#endif /* __CURL_CURLRULES_H */
diff --git a/lib-x86-64/include/curl/curlver.h b/lib-x86-64/include/curl/curlver.h
deleted file mode 100644
index e345f56d..00000000
--- a/lib-x86-64/include/curl/curlver.h
+++ /dev/null
@@ -1,69 +0,0 @@
-#ifndef __CURL_CURLVER_H
-#define __CURL_CURLVER_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-
-/* This header file contains nothing but libcurl version info, generated by
-   a script at release-time. This was made its own header file in 7.11.2 */
-
-/* This is the global package copyright */
-#define LIBCURL_COPYRIGHT "1996 - 2010 Daniel Stenberg, <daniel@haxx.se>."
-
-/* This is the version number of the libcurl package from which this header
-   file origins: */
-#define LIBCURL_VERSION "7.21.2"
-
-/* The numeric version number is also available "in parts" by using these
-   defines: */
-#define LIBCURL_VERSION_MAJOR 7
-#define LIBCURL_VERSION_MINOR 21
-#define LIBCURL_VERSION_PATCH 2
-
-/* This is the numeric version of the libcurl version number, meant for easier
-   parsing and comparions by programs. The LIBCURL_VERSION_NUM define will
-   always follow this syntax:
-
-         0xXXYYZZ
-
-   Where XX, YY and ZZ are the main version, release and patch numbers in
-   hexadecimal (using 8 bits each). All three numbers are always represented
-   using two digits.  1.2 would appear as "0x010200" while version 9.11.7
-   appears as "0x090b07".
-
-   This 6-digit (24 bits) hexadecimal number does not show pre-release number,
-   and it is always a greater number in a more recent release. It makes
-   comparisons with greater than and less than work.
-*/
-#define LIBCURL_VERSION_NUM 0x071502
-
-/*
- * This is the date and time when the full source package was created. The
- * timestamp is not stored in git, as the timestamp is properly set in the
- * tarballs by the maketgz script.
- *
- * The format of the date should follow this template:
- *
- * "Mon Feb 12 11:35:33 UTC 2007"
- */
-#define LIBCURL_TIMESTAMP "Tue Oct 12 22:03:31 UTC 2010"
-
-#endif /* __CURL_CURLVER_H */
diff --git a/lib-x86-64/include/curl/easy.h b/lib-x86-64/include/curl/easy.h
deleted file mode 100644
index 1ddb4fe5..00000000
--- a/lib-x86-64/include/curl/easy.h
+++ /dev/null
@@ -1,102 +0,0 @@
-#ifndef __CURL_EASY_H
-#define __CURL_EASY_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-CURL_EXTERN CURL *curl_easy_init(void);
-CURL_EXTERN CURLcode curl_easy_setopt(CURL *curl, CURLoption option, ...);
-CURL_EXTERN CURLcode curl_easy_perform(CURL *curl);
-CURL_EXTERN void curl_easy_cleanup(CURL *curl);
-
-/*
- * NAME curl_easy_getinfo()
- *
- * DESCRIPTION
- *
- * Request internal information from the curl session with this function.  The
- * third argument MUST be a pointer to a long, a pointer to a char * or a
- * pointer to a double (as the documentation describes elsewhere).  The data
- * pointed to will be filled in accordingly and can be relied upon only if the
- * function returns CURLE_OK.  This function is intended to get used *AFTER* a
- * performed transfer, all results from this function are undefined until the
- * transfer is completed.
- */
-CURL_EXTERN CURLcode curl_easy_getinfo(CURL *curl, CURLINFO info, ...);
-
-
-/*
- * NAME curl_easy_duphandle()
- *
- * DESCRIPTION
- *
- * Creates a new curl session handle with the same options set for the handle
- * passed in. Duplicating a handle could only be a matter of cloning data and
- * options, internal state info and things like persistant connections cannot
- * be transfered. It is useful in multithreaded applications when you can run
- * curl_easy_duphandle() for each new thread to avoid a series of identical
- * curl_easy_setopt() invokes in every thread.
- */
-CURL_EXTERN CURL* curl_easy_duphandle(CURL *curl);
-
-/*
- * NAME curl_easy_reset()
- *
- * DESCRIPTION
- *
- * Re-initializes a CURL handle to the default values. This puts back the
- * handle to the same state as it was in when it was just created.
- *
- * It does keep: live connections, the Session ID cache, the DNS cache and the
- * cookies.
- */
-CURL_EXTERN void curl_easy_reset(CURL *curl);
-
-/*
- * NAME curl_easy_recv()
- *
- * DESCRIPTION
- *
- * Receives data from the connected socket. Use after successful
- * curl_easy_perform() with CURLOPT_CONNECT_ONLY option.
- */
-CURL_EXTERN CURLcode curl_easy_recv(CURL *curl, void *buffer, size_t buflen,
-                                    size_t *n);
-
-/*
- * NAME curl_easy_send()
- *
- * DESCRIPTION
- *
- * Sends data over the connected socket. Use after successful
- * curl_easy_perform() with CURLOPT_CONNECT_ONLY option.
- */
-CURL_EXTERN CURLcode curl_easy_send(CURL *curl, const void *buffer,
-                                    size_t buflen, size_t *n);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib-x86-64/include/curl/mprintf.h b/lib-x86-64/include/curl/mprintf.h
deleted file mode 100644
index de7dd2f3..00000000
--- a/lib-x86-64/include/curl/mprintf.h
+++ /dev/null
@@ -1,81 +0,0 @@
-#ifndef __CURL_MPRINTF_H
-#define __CURL_MPRINTF_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2006, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-
-#include <stdarg.h>
-#include <stdio.h> /* needed for FILE */
-
-#include "curl.h"
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-CURL_EXTERN int curl_mprintf(const char *format, ...);
-CURL_EXTERN int curl_mfprintf(FILE *fd, const char *format, ...);
-CURL_EXTERN int curl_msprintf(char *buffer, const char *format, ...);
-CURL_EXTERN int curl_msnprintf(char *buffer, size_t maxlength,
-                               const char *format, ...);
-CURL_EXTERN int curl_mvprintf(const char *format, va_list args);
-CURL_EXTERN int curl_mvfprintf(FILE *fd, const char *format, va_list args);
-CURL_EXTERN int curl_mvsprintf(char *buffer, const char *format, va_list args);
-CURL_EXTERN int curl_mvsnprintf(char *buffer, size_t maxlength,
-                                const char *format, va_list args);
-CURL_EXTERN char *curl_maprintf(const char *format, ...);
-CURL_EXTERN char *curl_mvaprintf(const char *format, va_list args);
-
-#ifdef _MPRINTF_REPLACE
-# undef printf
-# undef fprintf
-# undef sprintf
-# undef vsprintf
-# undef snprintf
-# undef vprintf
-# undef vfprintf
-# undef vsnprintf
-# undef aprintf
-# undef vaprintf
-# define printf curl_mprintf
-# define fprintf curl_mfprintf
-#ifdef CURLDEBUG
-/* When built with CURLDEBUG we define away the sprintf() functions since we
-   don't want internal code to be using them */
-# define sprintf sprintf_was_used
-# define vsprintf vsprintf_was_used
-#else
-# define sprintf curl_msprintf
-# define vsprintf curl_mvsprintf
-#endif
-# define snprintf curl_msnprintf
-# define vprintf curl_mvprintf
-# define vfprintf curl_mvfprintf
-# define vsnprintf curl_mvsnprintf
-# define aprintf curl_maprintf
-# define vaprintf curl_mvaprintf
-#endif
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif /* __CURL_MPRINTF_H */
diff --git a/lib-x86-64/include/curl/multi.h b/lib-x86-64/include/curl/multi.h
deleted file mode 100644
index f9656666..00000000
--- a/lib-x86-64/include/curl/multi.h
+++ /dev/null
@@ -1,345 +0,0 @@
-#ifndef __CURL_MULTI_H
-#define __CURL_MULTI_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-/*
-  This is an "external" header file. Don't give away any internals here!
-
-  GOALS
-
-  o Enable a "pull" interface. The application that uses libcurl decides where
-    and when to ask libcurl to get/send data.
-
-  o Enable multiple simultaneous transfers in the same thread without making it
-    complicated for the application.
-
-  o Enable the application to select() on its own file descriptors and curl's
-    file descriptors simultaneous easily.
-
-*/
-
-/*
- * This header file should not really need to include "curl.h" since curl.h
- * itself includes this file and we expect user applications to do #include
- * <curl/curl.h> without the need for especially including multi.h.
- *
- * For some reason we added this include here at one point, and rather than to
- * break existing (wrongly written) libcurl applications, we leave it as-is
- * but with this warning attached.
- */
-#include "curl.h"
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef void CURLM;
-
-typedef enum {
-  CURLM_CALL_MULTI_PERFORM = -1, /* please call curl_multi_perform() or
-                                    curl_multi_socket*() soon */
-  CURLM_OK,
-  CURLM_BAD_HANDLE,      /* the passed-in handle is not a valid CURLM handle */
-  CURLM_BAD_EASY_HANDLE, /* an easy handle was not good/valid */
-  CURLM_OUT_OF_MEMORY,   /* if you ever get this, you're in deep sh*t */
-  CURLM_INTERNAL_ERROR,  /* this is a libcurl bug */
-  CURLM_BAD_SOCKET,      /* the passed in socket argument did not match */
-  CURLM_UNKNOWN_OPTION,  /* curl_multi_setopt() with unsupported option */
-  CURLM_LAST
-} CURLMcode;
-
-/* just to make code nicer when using curl_multi_socket() you can now check
-   for CURLM_CALL_MULTI_SOCKET too in the same style it works for
-   curl_multi_perform() and CURLM_CALL_MULTI_PERFORM */
-#define CURLM_CALL_MULTI_SOCKET CURLM_CALL_MULTI_PERFORM
-
-typedef enum {
-  CURLMSG_NONE, /* first, not used */
-  CURLMSG_DONE, /* This easy handle has completed. 'result' contains
-                   the CURLcode of the transfer */
-  CURLMSG_LAST /* last, not used */
-} CURLMSG;
-
-struct CURLMsg {
-  CURLMSG msg;       /* what this message means */
-  CURL *easy_handle; /* the handle it concerns */
-  union {
-    void *whatever;    /* message-specific data */
-    CURLcode result;   /* return code for transfer */
-  } data;
-};
-typedef struct CURLMsg CURLMsg;
-
-/*
- * Name:    curl_multi_init()
- *
- * Desc:    inititalize multi-style curl usage
- *
- * Returns: a new CURLM handle to use in all 'curl_multi' functions.
- */
-CURL_EXTERN CURLM *curl_multi_init(void);
-
-/*
- * Name:    curl_multi_add_handle()
- *
- * Desc:    add a standard curl handle to the multi stack
- *
- * Returns: CURLMcode type, general multi error code.
- */
-CURL_EXTERN CURLMcode curl_multi_add_handle(CURLM *multi_handle,
-                                            CURL *curl_handle);
-
- /*
-  * Name:    curl_multi_remove_handle()
-  *
-  * Desc:    removes a curl handle from the multi stack again
-  *
-  * Returns: CURLMcode type, general multi error code.
-  */
-CURL_EXTERN CURLMcode curl_multi_remove_handle(CURLM *multi_handle,
-                                               CURL *curl_handle);
-
- /*
-  * Name:    curl_multi_fdset()
-  *
-  * Desc:    Ask curl for its fd_set sets. The app can use these to select() or
-  *          poll() on. We want curl_multi_perform() called as soon as one of
-  *          them are ready.
-  *
-  * Returns: CURLMcode type, general multi error code.
-  */
-CURL_EXTERN CURLMcode curl_multi_fdset(CURLM *multi_handle,
-                                       fd_set *read_fd_set,
-                                       fd_set *write_fd_set,
-                                       fd_set *exc_fd_set,
-                                       int *max_fd);
-
- /*
-  * Name:    curl_multi_perform()
-  *
-  * Desc:    When the app thinks there's data available for curl it calls this
-  *          function to read/write whatever there is right now. This returns
-  *          as soon as the reads and writes are done. This function does not
-  *          require that there actually is data available for reading or that
-  *          data can be written, it can be called just in case. It returns
-  *          the number of handles that still transfer data in the second
-  *          argument's integer-pointer.
-  *
-  * Returns: CURLMcode type, general multi error code. *NOTE* that this only
-  *          returns errors etc regarding the whole multi stack. There might
-  *          still have occurred problems on invidual transfers even when this
-  *          returns OK.
-  */
-CURL_EXTERN CURLMcode curl_multi_perform(CURLM *multi_handle,
-                                         int *running_handles);
-
- /*
-  * Name:    curl_multi_cleanup()
-  *
-  * Desc:    Cleans up and removes a whole multi stack. It does not free or
-  *          touch any individual easy handles in any way. We need to define
-  *          in what state those handles will be if this function is called
-  *          in the middle of a transfer.
-  *
-  * Returns: CURLMcode type, general multi error code.
-  */
-CURL_EXTERN CURLMcode curl_multi_cleanup(CURLM *multi_handle);
-
-/*
- * Name:    curl_multi_info_read()
- *
- * Desc:    Ask the multi handle if there's any messages/informationals from
- *          the individual transfers. Messages include informationals such as
- *          error code from the transfer or just the fact that a transfer is
- *          completed. More details on these should be written down as well.
- *
- *          Repeated calls to this function will return a new struct each
- *          time, until a special "end of msgs" struct is returned as a signal
- *          that there is no more to get at this point.
- *
- *          The data the returned pointer points to will not survive calling
- *          curl_multi_cleanup().
- *
- *          The 'CURLMsg' struct is meant to be very simple and only contain
- *          very basic informations. If more involved information is wanted,
- *          we will provide the particular "transfer handle" in that struct
- *          and that should/could/would be used in subsequent
- *          curl_easy_getinfo() calls (or similar). The point being that we
- *          must never expose complex structs to applications, as then we'll
- *          undoubtably get backwards compatibility problems in the future.
- *
- * Returns: A pointer to a filled-in struct, or NULL if it failed or ran out
- *          of structs. It also writes the number of messages left in the
- *          queue (after this read) in the integer the second argument points
- *          to.
- */
-CURL_EXTERN CURLMsg *curl_multi_info_read(CURLM *multi_handle,
-                                          int *msgs_in_queue);
-
-/*
- * Name:    curl_multi_strerror()
- *
- * Desc:    The curl_multi_strerror function may be used to turn a CURLMcode
- *          value into the equivalent human readable error string.  This is
- *          useful for printing meaningful error messages.
- *
- * Returns: A pointer to a zero-terminated error message.
- */
-CURL_EXTERN const char *curl_multi_strerror(CURLMcode);
-
-/*
- * Name:    curl_multi_socket() and
- *          curl_multi_socket_all()
- *
- * Desc:    An alternative version of curl_multi_perform() that allows the
- *          application to pass in one of the file descriptors that have been
- *          detected to have "action" on them and let libcurl perform.
- *          See man page for details.
- */
-#define CURL_POLL_NONE   0
-#define CURL_POLL_IN     1
-#define CURL_POLL_OUT    2
-#define CURL_POLL_INOUT  3
-#define CURL_POLL_REMOVE 4
-
-#define CURL_SOCKET_TIMEOUT CURL_SOCKET_BAD
-
-#define CURL_CSELECT_IN   0x01
-#define CURL_CSELECT_OUT  0x02
-#define CURL_CSELECT_ERR  0x04
-
-typedef int (*curl_socket_callback)(CURL *easy,      /* easy handle */
-                                    curl_socket_t s, /* socket */
-                                    int what,        /* see above */
-                                    void *userp,     /* private callback
-                                                        pointer */
-                                    void *socketp);  /* private socket
-                                                        pointer */
-/*
- * Name:    curl_multi_timer_callback
- *
- * Desc:    Called by libcurl whenever the library detects a change in the
- *          maximum number of milliseconds the app is allowed to wait before
- *          curl_multi_socket() or curl_multi_perform() must be called
- *          (to allow libcurl's timed events to take place).
- *
- * Returns: The callback should return zero.
- */
-typedef int (*curl_multi_timer_callback)(CURLM *multi,    /* multi handle */
-                                         long timeout_ms, /* see above */
-                                         void *userp);    /* private callback
-                                                             pointer */
-
-CURL_EXTERN CURLMcode curl_multi_socket(CURLM *multi_handle, curl_socket_t s,
-                                        int *running_handles);
-
-CURL_EXTERN CURLMcode curl_multi_socket_action(CURLM *multi_handle,
-                                               curl_socket_t s,
-                                               int ev_bitmask,
-                                               int *running_handles);
-
-CURL_EXTERN CURLMcode curl_multi_socket_all(CURLM *multi_handle,
-                                            int *running_handles);
-
-#ifndef CURL_ALLOW_OLD_MULTI_SOCKET
-/* This macro below was added in 7.16.3 to push users who recompile to use
-   the new curl_multi_socket_action() instead of the old curl_multi_socket()
-*/
-#define curl_multi_socket(x,y,z) curl_multi_socket_action(x,y,0,z)
-#endif
-
-/*
- * Name:    curl_multi_timeout()
- *
- * Desc:    Returns the maximum number of milliseconds the app is allowed to
- *          wait before curl_multi_socket() or curl_multi_perform() must be
- *          called (to allow libcurl's timed events to take place).
- *
- * Returns: CURLM error code.
- */
-CURL_EXTERN CURLMcode curl_multi_timeout(CURLM *multi_handle,
-                                         long *milliseconds);
-
-#undef CINIT /* re-using the same name as in curl.h */
-
-#ifdef CURL_ISOCPP
-#define CINIT(name,type,num) CURLMOPT_ ## name = CURLOPTTYPE_ ## type + num
-#else
-/* The macro "##" is ISO C, we assume pre-ISO C doesn't support it. */
-#define LONG          CURLOPTTYPE_LONG
-#define OBJECTPOINT   CURLOPTTYPE_OBJECTPOINT
-#define FUNCTIONPOINT CURLOPTTYPE_FUNCTIONPOINT
-#define OFF_T         CURLOPTTYPE_OFF_T
-#define CINIT(name,type,number) CURLMOPT_/**/name = type + number
-#endif
-
-typedef enum {
-  /* This is the socket callback function pointer */
-  CINIT(SOCKETFUNCTION, FUNCTIONPOINT, 1),
-
-  /* This is the argument passed to the socket callback */
-  CINIT(SOCKETDATA, OBJECTPOINT, 2),
-
-    /* set to 1 to enable pipelining for this multi handle */
-  CINIT(PIPELINING, LONG, 3),
-
-   /* This is the timer callback function pointer */
-  CINIT(TIMERFUNCTION, FUNCTIONPOINT, 4),
-
-  /* This is the argument passed to the timer callback */
-  CINIT(TIMERDATA, OBJECTPOINT, 5),
-
-  /* maximum number of entries in the connection cache */
-  CINIT(MAXCONNECTS, LONG, 6),
-
-  CURLMOPT_LASTENTRY /* the last unused */
-} CURLMoption;
-
-
-/*
- * Name:    curl_multi_setopt()
- *
- * Desc:    Sets options for the multi handle.
- *
- * Returns: CURLM error code.
- */
-CURL_EXTERN CURLMcode curl_multi_setopt(CURLM *multi_handle,
-                                        CURLMoption option, ...);
-
-
-/*
- * Name:    curl_multi_assign()
- *
- * Desc:    This function sets an association in the multi handle between the
- *          given socket and a private pointer of the application. This is
- *          (only) useful for curl_multi_socket uses.
- *
- * Returns: CURLM error code.
- */
-CURL_EXTERN CURLMcode curl_multi_assign(CURLM *multi_handle,
-                                        curl_socket_t sockfd, void *sockp);
-
-#ifdef __cplusplus
-} /* end of extern "C" */
-#endif
-
-#endif
diff --git a/lib-x86-64/include/curl/stdcheaders.h b/lib-x86-64/include/curl/stdcheaders.h
deleted file mode 100644
index ad82ef63..00000000
--- a/lib-x86-64/include/curl/stdcheaders.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef __STDC_HEADERS_H
-#define __STDC_HEADERS_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-
-#include <sys/types.h>
-
-size_t fread (void *, size_t, size_t, FILE *);
-size_t fwrite (const void *, size_t, size_t, FILE *);
-
-int strcasecmp(const char *, const char *);
-int strncasecmp(const char *, const char *, size_t);
-
-#endif /* __STDC_HEADERS_H */
diff --git a/lib-x86-64/include/curl/typecheck-gcc.h b/lib-x86-64/include/curl/typecheck-gcc.h
deleted file mode 100644
index e6f74a95..00000000
--- a/lib-x86-64/include/curl/typecheck-gcc.h
+++ /dev/null
@@ -1,584 +0,0 @@
-#ifndef __CURL_TYPECHECK_GCC_H
-#define __CURL_TYPECHECK_GCC_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-
-/* wraps curl_easy_setopt() with typechecking */
-
-/* To add a new kind of warning, add an
- *   if(_curl_is_sometype_option(_curl_opt))
- *     if(!_curl_is_sometype(value))
- *       _curl_easy_setopt_err_sometype();
- * block and define _curl_is_sometype_option, _curl_is_sometype and
- * _curl_easy_setopt_err_sometype below
- *
- * NOTE: We use two nested 'if' statements here instead of the && operator, in
- *       order to work around gcc bug #32061.  It affects only gcc 4.3.x/4.4.x
- *       when compiling with -Wlogical-op.
- *
- * To add an option that uses the same type as an existing option, you'll just
- * need to extend the appropriate _curl_*_option macro
- */
-#define curl_easy_setopt(handle, option, value)                               \
-__extension__ ({                                                              \
-  __typeof__ (option) _curl_opt = option;                                     \
-  if (__builtin_constant_p(_curl_opt)) {                                      \
-    if (_curl_is_long_option(_curl_opt))                                      \
-      if (!_curl_is_long(value))                                              \
-        _curl_easy_setopt_err_long();                                         \
-    if (_curl_is_off_t_option(_curl_opt))                                     \
-      if (!_curl_is_off_t(value))                                             \
-        _curl_easy_setopt_err_curl_off_t();                                   \
-    if (_curl_is_string_option(_curl_opt))                                    \
-      if (!_curl_is_string(value))                                            \
-        _curl_easy_setopt_err_string();                                       \
-    if (_curl_is_write_cb_option(_curl_opt))                                  \
-      if (!_curl_is_write_cb(value))                                          \
-        _curl_easy_setopt_err_write_callback();                               \
-    if ((_curl_opt) == CURLOPT_READFUNCTION)                                  \
-      if (!_curl_is_read_cb(value))                                           \
-        _curl_easy_setopt_err_read_cb();                                      \
-    if ((_curl_opt) == CURLOPT_IOCTLFUNCTION)                                 \
-      if (!_curl_is_ioctl_cb(value))                                          \
-        _curl_easy_setopt_err_ioctl_cb();                                     \
-    if ((_curl_opt) == CURLOPT_SOCKOPTFUNCTION)                               \
-      if (!_curl_is_sockopt_cb(value))                                        \
-        _curl_easy_setopt_err_sockopt_cb();                                   \
-    if ((_curl_opt) == CURLOPT_OPENSOCKETFUNCTION)                            \
-      if (!_curl_is_opensocket_cb(value))                                     \
-        _curl_easy_setopt_err_opensocket_cb();                                \
-    if ((_curl_opt) == CURLOPT_PROGRESSFUNCTION)                              \
-      if (!_curl_is_progress_cb(value))                                       \
-        _curl_easy_setopt_err_progress_cb();                                  \
-    if ((_curl_opt) == CURLOPT_DEBUGFUNCTION)                                 \
-      if (!_curl_is_debug_cb(value))                                          \
-        _curl_easy_setopt_err_debug_cb();                                     \
-    if ((_curl_opt) == CURLOPT_SSL_CTX_FUNCTION)                              \
-      if (!_curl_is_ssl_ctx_cb(value))                                        \
-        _curl_easy_setopt_err_ssl_ctx_cb();                                   \
-    if (_curl_is_conv_cb_option(_curl_opt))                                   \
-      if (!_curl_is_conv_cb(value))                                           \
-        _curl_easy_setopt_err_conv_cb();                                      \
-    if ((_curl_opt) == CURLOPT_SEEKFUNCTION)                                  \
-      if (!_curl_is_seek_cb(value))                                           \
-        _curl_easy_setopt_err_seek_cb();                                      \
-    if (_curl_is_cb_data_option(_curl_opt))                                   \
-      if (!_curl_is_cb_data(value))                                           \
-        _curl_easy_setopt_err_cb_data();                                      \
-    if ((_curl_opt) == CURLOPT_ERRORBUFFER)                                   \
-      if (!_curl_is_error_buffer(value))                                      \
-        _curl_easy_setopt_err_error_buffer();                                 \
-    if ((_curl_opt) == CURLOPT_STDERR)                                        \
-      if (!_curl_is_FILE(value))                                              \
-        _curl_easy_setopt_err_FILE();                                         \
-    if (_curl_is_postfields_option(_curl_opt))                                \
-      if (!_curl_is_postfields(value))                                        \
-        _curl_easy_setopt_err_postfields();                                   \
-    if ((_curl_opt) == CURLOPT_HTTPPOST)                                      \
-      if (!_curl_is_arr((value), struct curl_httppost))                       \
-        _curl_easy_setopt_err_curl_httpost();                                 \
-    if (_curl_is_slist_option(_curl_opt))                                     \
-      if (!_curl_is_arr((value), struct curl_slist))                          \
-        _curl_easy_setopt_err_curl_slist();                                   \
-    if ((_curl_opt) == CURLOPT_SHARE)                                         \
-      if (!_curl_is_ptr((value), CURLSH))                                     \
-        _curl_easy_setopt_err_CURLSH();                                       \
-  }                                                                           \
-  curl_easy_setopt(handle, _curl_opt, value);                                 \
-})
-
-/* wraps curl_easy_getinfo() with typechecking */
-/* FIXME: don't allow const pointers */
-#define curl_easy_getinfo(handle, info, arg)                                  \
-__extension__ ({                                                              \
-  __typeof__ (info) _curl_info = info;                                        \
-  if (__builtin_constant_p(_curl_info)) {                                     \
-    if (_curl_is_string_info(_curl_info))                                     \
-      if (!_curl_is_arr((arg), char *))                                       \
-        _curl_easy_getinfo_err_string();                                      \
-    if (_curl_is_long_info(_curl_info))                                       \
-      if (!_curl_is_arr((arg), long))                                         \
-        _curl_easy_getinfo_err_long();                                        \
-    if (_curl_is_double_info(_curl_info))                                     \
-      if (!_curl_is_arr((arg), double))                                       \
-        _curl_easy_getinfo_err_double();                                      \
-    if (_curl_is_slist_info(_curl_info))                                      \
-      if (!_curl_is_arr((arg), struct curl_slist *))                          \
-        _curl_easy_getinfo_err_curl_slist();                                  \
-  }                                                                           \
-  curl_easy_getinfo(handle, _curl_info, arg);                                 \
-})
-
-/* TODO: typechecking for curl_share_setopt() and curl_multi_setopt(),
- * for now just make sure that the functions are called with three
- * arguments
- */
-#define curl_share_setopt(share,opt,param) curl_share_setopt(share,opt,param)
-#define curl_multi_setopt(handle,opt,param) curl_multi_setopt(handle,opt,param)
-
-
-/* the actual warnings, triggered by calling the _curl_easy_setopt_err*
- * functions */
-
-/* To define a new warning, use _CURL_WARNING(identifier, "message") */
-#define _CURL_WARNING(id, message)                                            \
-  static void __attribute__((warning(message))) __attribute__((unused))       \
-  __attribute__((noinline)) id(void) { __asm__(""); }
-
-_CURL_WARNING(_curl_easy_setopt_err_long,
-  "curl_easy_setopt expects a long argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_curl_off_t,
-  "curl_easy_setopt expects a curl_off_t argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_string,
-  "curl_easy_setopt expects a string (char* or char[]) argument for this option"
-  )
-_CURL_WARNING(_curl_easy_setopt_err_write_callback,
-  "curl_easy_setopt expects a curl_write_callback argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_read_cb,
-  "curl_easy_setopt expects a curl_read_callback argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_ioctl_cb,
-  "curl_easy_setopt expects a curl_ioctl_callback argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_sockopt_cb,
-  "curl_easy_setopt expects a curl_sockopt_callback argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_opensocket_cb,
-  "curl_easy_setopt expects a curl_opensocket_callback argument for this option"
-  )
-_CURL_WARNING(_curl_easy_setopt_err_progress_cb,
-  "curl_easy_setopt expects a curl_progress_callback argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_debug_cb,
-  "curl_easy_setopt expects a curl_debug_callback argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_ssl_ctx_cb,
-  "curl_easy_setopt expects a curl_ssl_ctx_callback argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_conv_cb,
-  "curl_easy_setopt expects a curl_conv_callback argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_seek_cb,
-  "curl_easy_setopt expects a curl_seek_callback argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_cb_data,
-  "curl_easy_setopt expects a private data pointer as argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_error_buffer,
-  "curl_easy_setopt expects a char buffer of CURL_ERROR_SIZE as argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_FILE,
-  "curl_easy_setopt expects a FILE* argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_postfields,
-  "curl_easy_setopt expects a void* or char* argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_curl_httpost,
-  "curl_easy_setopt expects a struct curl_httppost* argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_curl_slist,
-  "curl_easy_setopt expects a struct curl_slist* argument for this option")
-_CURL_WARNING(_curl_easy_setopt_err_CURLSH,
-  "curl_easy_setopt expects a CURLSH* argument for this option")
-
-_CURL_WARNING(_curl_easy_getinfo_err_string,
-  "curl_easy_getinfo expects a pointer to char * for this info")
-_CURL_WARNING(_curl_easy_getinfo_err_long,
-  "curl_easy_getinfo expects a pointer to long for this info")
-_CURL_WARNING(_curl_easy_getinfo_err_double,
-  "curl_easy_getinfo expects a pointer to double for this info")
-_CURL_WARNING(_curl_easy_getinfo_err_curl_slist,
-  "curl_easy_getinfo expects a pointer to struct curl_slist * for this info")
-
-/* groups of curl_easy_setops options that take the same type of argument */
-
-/* To add a new option to one of the groups, just add
- *   (option) == CURLOPT_SOMETHING
- * to the or-expression. If the option takes a long or curl_off_t, you don't
- * have to do anything
- */
-
-/* evaluates to true if option takes a long argument */
-#define _curl_is_long_option(option)                                          \
-  (0 < (option) && (option) < CURLOPTTYPE_OBJECTPOINT)
-
-#define _curl_is_off_t_option(option)                                         \
-  ((option) > CURLOPTTYPE_OFF_T)
-
-/* evaluates to true if option takes a char* argument */
-#define _curl_is_string_option(option)                                        \
-  ((option) == CURLOPT_URL ||                                                 \
-   (option) == CURLOPT_PROXY ||                                               \
-   (option) == CURLOPT_INTERFACE ||                                           \
-   (option) == CURLOPT_NETRC_FILE ||                                          \
-   (option) == CURLOPT_USERPWD ||                                             \
-   (option) == CURLOPT_USERNAME ||                                            \
-   (option) == CURLOPT_PASSWORD ||                                            \
-   (option) == CURLOPT_PROXYUSERPWD ||                                        \
-   (option) == CURLOPT_PROXYUSERNAME ||                                       \
-   (option) == CURLOPT_PROXYPASSWORD ||                                       \
-   (option) == CURLOPT_NOPROXY ||                                             \
-   (option) == CURLOPT_ENCODING ||                                            \
-   (option) == CURLOPT_REFERER ||                                             \
-   (option) == CURLOPT_USERAGENT ||                                           \
-   (option) == CURLOPT_COOKIE ||                                              \
-   (option) == CURLOPT_COOKIEFILE ||                                          \
-   (option) == CURLOPT_COOKIEJAR ||                                           \
-   (option) == CURLOPT_COOKIELIST ||                                          \
-   (option) == CURLOPT_FTPPORT ||                                             \
-   (option) == CURLOPT_FTP_ALTERNATIVE_TO_USER ||                             \
-   (option) == CURLOPT_FTP_ACCOUNT ||                                         \
-   (option) == CURLOPT_RANGE ||                                               \
-   (option) == CURLOPT_CUSTOMREQUEST ||                                       \
-   (option) == CURLOPT_SSLCERT ||                                             \
-   (option) == CURLOPT_SSLCERTTYPE ||                                         \
-   (option) == CURLOPT_SSLKEY ||                                              \
-   (option) == CURLOPT_SSLKEYTYPE ||                                          \
-   (option) == CURLOPT_KEYPASSWD ||                                           \
-   (option) == CURLOPT_SSLENGINE ||                                           \
-   (option) == CURLOPT_CAINFO ||                                              \
-   (option) == CURLOPT_CAPATH ||                                              \
-   (option) == CURLOPT_RANDOM_FILE ||                                         \
-   (option) == CURLOPT_EGDSOCKET ||                                           \
-   (option) == CURLOPT_SSL_CIPHER_LIST ||                                     \
-   (option) == CURLOPT_KRBLEVEL ||                                            \
-   (option) == CURLOPT_SSH_HOST_PUBLIC_KEY_MD5 ||                             \
-   (option) == CURLOPT_SSH_PUBLIC_KEYFILE ||                                  \
-   (option) == CURLOPT_SSH_PRIVATE_KEYFILE ||                                 \
-   (option) == CURLOPT_CRLFILE ||                                             \
-   (option) == CURLOPT_ISSUERCERT ||                                          \
-   (option) == CURLOPT_SOCKS5_GSSAPI_SERVICE ||                               \
-   (option) == CURLOPT_SSH_KNOWNHOSTS ||                                      \
-   (option) == CURLOPT_MAIL_FROM ||                                           \
-   (option) == CURLOPT_RTSP_SESSION_ID ||                                     \
-   (option) == CURLOPT_RTSP_STREAM_URI ||                                     \
-   (option) == CURLOPT_RTSP_TRANSPORT ||                                      \
-   0)
-
-/* evaluates to true if option takes a curl_write_callback argument */
-#define _curl_is_write_cb_option(option)                                      \
-  ((option) == CURLOPT_HEADERFUNCTION ||                                      \
-   (option) == CURLOPT_WRITEFUNCTION)
-
-/* evaluates to true if option takes a curl_conv_callback argument */
-#define _curl_is_conv_cb_option(option)                                       \
-  ((option) == CURLOPT_CONV_TO_NETWORK_FUNCTION ||                            \
-   (option) == CURLOPT_CONV_FROM_NETWORK_FUNCTION ||                          \
-   (option) == CURLOPT_CONV_FROM_UTF8_FUNCTION)
-
-/* evaluates to true if option takes a data argument to pass to a callback */
-#define _curl_is_cb_data_option(option)                                       \
-  ((option) == CURLOPT_WRITEDATA ||                                           \
-   (option) == CURLOPT_READDATA ||                                            \
-   (option) == CURLOPT_IOCTLDATA ||                                           \
-   (option) == CURLOPT_SOCKOPTDATA ||                                         \
-   (option) == CURLOPT_OPENSOCKETDATA ||                                      \
-   (option) == CURLOPT_PROGRESSDATA ||                                        \
-   (option) == CURLOPT_WRITEHEADER ||                                         \
-   (option) == CURLOPT_DEBUGDATA ||                                           \
-   (option) == CURLOPT_SSL_CTX_DATA ||                                        \
-   (option) == CURLOPT_SEEKDATA ||                                            \
-   (option) == CURLOPT_PRIVATE ||                                             \
-   (option) == CURLOPT_SSH_KEYDATA ||                                         \
-   (option) == CURLOPT_INTERLEAVEDATA ||                                      \
-   (option) == CURLOPT_CHUNK_DATA ||                                          \
-   (option) == CURLOPT_FNMATCH_DATA ||                                        \
-   0)
-
-/* evaluates to true if option takes a POST data argument (void* or char*) */
-#define _curl_is_postfields_option(option)                                    \
-  ((option) == CURLOPT_POSTFIELDS ||                                          \
-   (option) == CURLOPT_COPYPOSTFIELDS ||                                      \
-   0)
-
-/* evaluates to true if option takes a struct curl_slist * argument */
-#define _curl_is_slist_option(option)                                         \
-  ((option) == CURLOPT_HTTPHEADER ||                                          \
-   (option) == CURLOPT_HTTP200ALIASES ||                                      \
-   (option) == CURLOPT_QUOTE ||                                               \
-   (option) == CURLOPT_POSTQUOTE ||                                           \
-   (option) == CURLOPT_PREQUOTE ||                                            \
-   (option) == CURLOPT_TELNETOPTIONS ||                                       \
-   (option) == CURLOPT_MAIL_RCPT ||                                           \
-   0)
-
-/* groups of curl_easy_getinfo infos that take the same type of argument */
-
-/* evaluates to true if info expects a pointer to char * argument */
-#define _curl_is_string_info(info)                                            \
-  (CURLINFO_STRING < (info) && (info) < CURLINFO_LONG)
-
-/* evaluates to true if info expects a pointer to long argument */
-#define _curl_is_long_info(info)                                              \
-  (CURLINFO_LONG < (info) && (info) < CURLINFO_DOUBLE)
-
-/* evaluates to true if info expects a pointer to double argument */
-#define _curl_is_double_info(info)                                            \
-  (CURLINFO_DOUBLE < (info) && (info) < CURLINFO_SLIST)
-
-/* true if info expects a pointer to struct curl_slist * argument */
-#define _curl_is_slist_info(info)                                             \
-  (CURLINFO_SLIST < (info))
-
-
-/* typecheck helpers -- check whether given expression has requested type*/
-
-/* For pointers, you can use the _curl_is_ptr/_curl_is_arr macros,
- * otherwise define a new macro. Search for __builtin_types_compatible_p
- * in the GCC manual.
- * NOTE: these macros MUST NOT EVALUATE their arguments! The argument is
- * the actual expression passed to the curl_easy_setopt macro. This
- * means that you can only apply the sizeof and __typeof__ operators, no
- * == or whatsoever.
- */
-
-/* XXX: should evaluate to true iff expr is a pointer */
-#define _curl_is_any_ptr(expr)                                                \
-  (sizeof(expr) == sizeof(void*))
-
-/* evaluates to true if expr is NULL */
-/* XXX: must not evaluate expr, so this check is not accurate */
-#define _curl_is_NULL(expr)                                                   \
-  (__builtin_types_compatible_p(__typeof__(expr), __typeof__(NULL)))
-
-/* evaluates to true if expr is type*, const type* or NULL */
-#define _curl_is_ptr(expr, type)                                              \
-  (_curl_is_NULL(expr) ||                                                     \
-   __builtin_types_compatible_p(__typeof__(expr), type *) ||                  \
-   __builtin_types_compatible_p(__typeof__(expr), const type *))
-
-/* evaluates to true if expr is one of type[], type*, NULL or const type* */
-#define _curl_is_arr(expr, type)                                              \
-  (_curl_is_ptr((expr), type) ||                                              \
-   __builtin_types_compatible_p(__typeof__(expr), type []))
-
-/* evaluates to true if expr is a string */
-#define _curl_is_string(expr)                                                 \
-  (_curl_is_arr((expr), char) ||                                              \
-   _curl_is_arr((expr), signed char) ||                                       \
-   _curl_is_arr((expr), unsigned char))
-
-/* evaluates to true if expr is a long (no matter the signedness)
- * XXX: for now, int is also accepted (and therefore short and char, which
- * are promoted to int when passed to a variadic function) */
-#define _curl_is_long(expr)                                                   \
-  (__builtin_types_compatible_p(__typeof__(expr), long) ||                    \
-   __builtin_types_compatible_p(__typeof__(expr), signed long) ||             \
-   __builtin_types_compatible_p(__typeof__(expr), unsigned long) ||           \
-   __builtin_types_compatible_p(__typeof__(expr), int) ||                     \
-   __builtin_types_compatible_p(__typeof__(expr), signed int) ||              \
-   __builtin_types_compatible_p(__typeof__(expr), unsigned int) ||            \
-   __builtin_types_compatible_p(__typeof__(expr), short) ||                   \
-   __builtin_types_compatible_p(__typeof__(expr), signed short) ||            \
-   __builtin_types_compatible_p(__typeof__(expr), unsigned short) ||          \
-   __builtin_types_compatible_p(__typeof__(expr), char) ||                    \
-   __builtin_types_compatible_p(__typeof__(expr), signed char) ||             \
-   __builtin_types_compatible_p(__typeof__(expr), unsigned char))
-
-/* evaluates to true if expr is of type curl_off_t */
-#define _curl_is_off_t(expr)                                                  \
-  (__builtin_types_compatible_p(__typeof__(expr), curl_off_t))
-
-/* evaluates to true if expr is abuffer suitable for CURLOPT_ERRORBUFFER */
-/* XXX: also check size of an char[] array? */
-#define _curl_is_error_buffer(expr)                                           \
-  (__builtin_types_compatible_p(__typeof__(expr), char *) ||                  \
-   __builtin_types_compatible_p(__typeof__(expr), char[]))
-
-/* evaluates to true if expr is of type (const) void* or (const) FILE* */
-#if 0
-#define _curl_is_cb_data(expr)                                                \
-  (_curl_is_ptr((expr), void) ||                                              \
-   _curl_is_ptr((expr), FILE))
-#else /* be less strict */
-#define _curl_is_cb_data(expr)                                                \
-  _curl_is_any_ptr(expr)
-#endif
-
-/* evaluates to true if expr is of type FILE* */
-#define _curl_is_FILE(expr)                                                   \
-  (__builtin_types_compatible_p(__typeof__(expr), FILE *))
-
-/* evaluates to true if expr can be passed as POST data (void* or char*) */
-#define _curl_is_postfields(expr)                                             \
-  (_curl_is_ptr((expr), void) ||                                              \
-   _curl_is_arr((expr), char))
-
-/* FIXME: the whole callback checking is messy...
- * The idea is to tolerate char vs. void and const vs. not const
- * pointers in arguments at least
- */
-/* helper: __builtin_types_compatible_p distinguishes between functions and
- * function pointers, hide it */
-#define _curl_callback_compatible(func, type)                                 \
-  (__builtin_types_compatible_p(__typeof__(func), type) ||                    \
-   __builtin_types_compatible_p(__typeof__(func), type*))
-
-/* evaluates to true if expr is of type curl_read_callback or "similar" */
-#define _curl_is_read_cb(expr)                                          \
-  (_curl_is_NULL(expr) ||                                                     \
-   __builtin_types_compatible_p(__typeof__(expr), __typeof__(fread)) ||       \
-   __builtin_types_compatible_p(__typeof__(expr), curl_read_callback) ||      \
-   _curl_callback_compatible((expr), _curl_read_callback1) ||                 \
-   _curl_callback_compatible((expr), _curl_read_callback2) ||                 \
-   _curl_callback_compatible((expr), _curl_read_callback3) ||                 \
-   _curl_callback_compatible((expr), _curl_read_callback4) ||                 \
-   _curl_callback_compatible((expr), _curl_read_callback5) ||                 \
-   _curl_callback_compatible((expr), _curl_read_callback6))
-typedef size_t (_curl_read_callback1)(char *, size_t, size_t, void*);
-typedef size_t (_curl_read_callback2)(char *, size_t, size_t, const void*);
-typedef size_t (_curl_read_callback3)(char *, size_t, size_t, FILE*);
-typedef size_t (_curl_read_callback4)(void *, size_t, size_t, void*);
-typedef size_t (_curl_read_callback5)(void *, size_t, size_t, const void*);
-typedef size_t (_curl_read_callback6)(void *, size_t, size_t, FILE*);
-
-/* evaluates to true if expr is of type curl_write_callback or "similar" */
-#define _curl_is_write_cb(expr)                                               \
-  (_curl_is_read_cb(expr) ||                                            \
-   __builtin_types_compatible_p(__typeof__(expr), __typeof__(fwrite)) ||      \
-   __builtin_types_compatible_p(__typeof__(expr), curl_write_callback) ||     \
-   _curl_callback_compatible((expr), _curl_write_callback1) ||                \
-   _curl_callback_compatible((expr), _curl_write_callback2) ||                \
-   _curl_callback_compatible((expr), _curl_write_callback3) ||                \
-   _curl_callback_compatible((expr), _curl_write_callback4) ||                \
-   _curl_callback_compatible((expr), _curl_write_callback5) ||                \
-   _curl_callback_compatible((expr), _curl_write_callback6))
-typedef size_t (_curl_write_callback1)(const char *, size_t, size_t, void*);
-typedef size_t (_curl_write_callback2)(const char *, size_t, size_t,
-                                       const void*);
-typedef size_t (_curl_write_callback3)(const char *, size_t, size_t, FILE*);
-typedef size_t (_curl_write_callback4)(const void *, size_t, size_t, void*);
-typedef size_t (_curl_write_callback5)(const void *, size_t, size_t,
-                                       const void*);
-typedef size_t (_curl_write_callback6)(const void *, size_t, size_t, FILE*);
-
-/* evaluates to true if expr is of type curl_ioctl_callback or "similar" */
-#define _curl_is_ioctl_cb(expr)                                         \
-  (_curl_is_NULL(expr) ||                                                     \
-   __builtin_types_compatible_p(__typeof__(expr), curl_ioctl_callback) ||     \
-   _curl_callback_compatible((expr), _curl_ioctl_callback1) ||                \
-   _curl_callback_compatible((expr), _curl_ioctl_callback2) ||                \
-   _curl_callback_compatible((expr), _curl_ioctl_callback3) ||                \
-   _curl_callback_compatible((expr), _curl_ioctl_callback4))
-typedef curlioerr (_curl_ioctl_callback1)(CURL *, int, void*);
-typedef curlioerr (_curl_ioctl_callback2)(CURL *, int, const void*);
-typedef curlioerr (_curl_ioctl_callback3)(CURL *, curliocmd, void*);
-typedef curlioerr (_curl_ioctl_callback4)(CURL *, curliocmd, const void*);
-
-/* evaluates to true if expr is of type curl_sockopt_callback or "similar" */
-#define _curl_is_sockopt_cb(expr)                                       \
-  (_curl_is_NULL(expr) ||                                                     \
-   __builtin_types_compatible_p(__typeof__(expr), curl_sockopt_callback) ||   \
-   _curl_callback_compatible((expr), _curl_sockopt_callback1) ||              \
-   _curl_callback_compatible((expr), _curl_sockopt_callback2))
-typedef int (_curl_sockopt_callback1)(void *, curl_socket_t, curlsocktype);
-typedef int (_curl_sockopt_callback2)(const void *, curl_socket_t,
-                                      curlsocktype);
-
-/* evaluates to true if expr is of type curl_opensocket_callback or "similar" */
-#define _curl_is_opensocket_cb(expr)                                    \
-  (_curl_is_NULL(expr) ||                                                     \
-   __builtin_types_compatible_p(__typeof__(expr), curl_opensocket_callback) ||\
-   _curl_callback_compatible((expr), _curl_opensocket_callback1) ||           \
-   _curl_callback_compatible((expr), _curl_opensocket_callback2) ||           \
-   _curl_callback_compatible((expr), _curl_opensocket_callback3) ||           \
-   _curl_callback_compatible((expr), _curl_opensocket_callback4))
-typedef curl_socket_t (_curl_opensocket_callback1)
-  (void *, curlsocktype, struct curl_sockaddr *);
-typedef curl_socket_t (_curl_opensocket_callback2)
-  (void *, curlsocktype, const struct curl_sockaddr *);
-typedef curl_socket_t (_curl_opensocket_callback3)
-  (const void *, curlsocktype, struct curl_sockaddr *);
-typedef curl_socket_t (_curl_opensocket_callback4)
-  (const void *, curlsocktype, const struct curl_sockaddr *);
-
-/* evaluates to true if expr is of type curl_progress_callback or "similar" */
-#define _curl_is_progress_cb(expr)                                      \
-  (_curl_is_NULL(expr) ||                                                     \
-   __builtin_types_compatible_p(__typeof__(expr), curl_progress_callback) ||  \
-   _curl_callback_compatible((expr), _curl_progress_callback1) ||             \
-   _curl_callback_compatible((expr), _curl_progress_callback2))
-typedef int (_curl_progress_callback1)(void *,
-    double, double, double, double);
-typedef int (_curl_progress_callback2)(const void *,
-    double, double, double, double);
-
-/* evaluates to true if expr is of type curl_debug_callback or "similar" */
-#define _curl_is_debug_cb(expr)                                         \
-  (_curl_is_NULL(expr) ||                                                     \
-   __builtin_types_compatible_p(__typeof__(expr), curl_debug_callback) ||     \
-   _curl_callback_compatible((expr), _curl_debug_callback1) ||                \
-   _curl_callback_compatible((expr), _curl_debug_callback2) ||                \
-   _curl_callback_compatible((expr), _curl_debug_callback3) ||                \
-   _curl_callback_compatible((expr), _curl_debug_callback4))
-typedef int (_curl_debug_callback1) (CURL *,
-    curl_infotype, char *, size_t, void *);
-typedef int (_curl_debug_callback2) (CURL *,
-    curl_infotype, char *, size_t, const void *);
-typedef int (_curl_debug_callback3) (CURL *,
-    curl_infotype, const char *, size_t, void *);
-typedef int (_curl_debug_callback4) (CURL *,
-    curl_infotype, const char *, size_t, const void *);
-
-/* evaluates to true if expr is of type curl_ssl_ctx_callback or "similar" */
-/* this is getting even messier... */
-#define _curl_is_ssl_ctx_cb(expr)                                       \
-  (_curl_is_NULL(expr) ||                                                     \
-   __builtin_types_compatible_p(__typeof__(expr), curl_ssl_ctx_callback) ||   \
-   _curl_callback_compatible((expr), _curl_ssl_ctx_callback1) ||              \
-   _curl_callback_compatible((expr), _curl_ssl_ctx_callback2) ||              \
-   _curl_callback_compatible((expr), _curl_ssl_ctx_callback3) ||              \
-   _curl_callback_compatible((expr), _curl_ssl_ctx_callback4) ||              \
-   _curl_callback_compatible((expr), _curl_ssl_ctx_callback5) ||              \
-   _curl_callback_compatible((expr), _curl_ssl_ctx_callback6) ||              \
-   _curl_callback_compatible((expr), _curl_ssl_ctx_callback7) ||              \
-   _curl_callback_compatible((expr), _curl_ssl_ctx_callback8))
-typedef CURLcode (_curl_ssl_ctx_callback1)(CURL *, void *, void *);
-typedef CURLcode (_curl_ssl_ctx_callback2)(CURL *, void *, const void *);
-typedef CURLcode (_curl_ssl_ctx_callback3)(CURL *, const void *, void *);
-typedef CURLcode (_curl_ssl_ctx_callback4)(CURL *, const void *, const void *);
-#ifdef HEADER_SSL_H
-/* hack: if we included OpenSSL's ssl.h, we know about SSL_CTX
- * this will of course break if we're included before OpenSSL headers...
- */
-typedef CURLcode (_curl_ssl_ctx_callback5)(CURL *, SSL_CTX, void *);
-typedef CURLcode (_curl_ssl_ctx_callback6)(CURL *, SSL_CTX, const void *);
-typedef CURLcode (_curl_ssl_ctx_callback7)(CURL *, const SSL_CTX, void *);
-typedef CURLcode (_curl_ssl_ctx_callback8)(CURL *, const SSL_CTX, const void *);
-#else
-typedef _curl_ssl_ctx_callback1 _curl_ssl_ctx_callback5;
-typedef _curl_ssl_ctx_callback1 _curl_ssl_ctx_callback6;
-typedef _curl_ssl_ctx_callback1 _curl_ssl_ctx_callback7;
-typedef _curl_ssl_ctx_callback1 _curl_ssl_ctx_callback8;
-#endif
-
-/* evaluates to true if expr is of type curl_conv_callback or "similar" */
-#define _curl_is_conv_cb(expr)                                          \
-  (_curl_is_NULL(expr) ||                                                     \
-   __builtin_types_compatible_p(__typeof__(expr), curl_conv_callback) ||      \
-   _curl_callback_compatible((expr), _curl_conv_callback1) ||                 \
-   _curl_callback_compatible((expr), _curl_conv_callback2) ||                 \
-   _curl_callback_compatible((expr), _curl_conv_callback3) ||                 \
-   _curl_callback_compatible((expr), _curl_conv_callback4))
-typedef CURLcode (*_curl_conv_callback1)(char *, size_t length);
-typedef CURLcode (*_curl_conv_callback2)(const char *, size_t length);
-typedef CURLcode (*_curl_conv_callback3)(void *, size_t length);
-typedef CURLcode (*_curl_conv_callback4)(const void *, size_t length);
-
-/* evaluates to true if expr is of type curl_seek_callback or "similar" */
-#define _curl_is_seek_cb(expr)                                          \
-  (_curl_is_NULL(expr) ||                                                     \
-   __builtin_types_compatible_p(__typeof__(expr), curl_seek_callback) ||      \
-   _curl_callback_compatible((expr), _curl_seek_callback1) ||                 \
-   _curl_callback_compatible((expr), _curl_seek_callback2))
-typedef CURLcode (*_curl_seek_callback1)(void *, curl_off_t, int);
-typedef CURLcode (*_curl_seek_callback2)(const void *, curl_off_t, int);
-
-
-#endif /* __CURL_TYPECHECK_GCC_H */
diff --git a/lib-x86-64/include/curl/types.h b/lib-x86-64/include/curl/types.h
deleted file mode 100644
index d37d6ae9..00000000
--- a/lib-x86-64/include/curl/types.h
+++ /dev/null
@@ -1 +0,0 @@
-/* not used */
diff --git a/lib-x86-64/include/dbus-1.0/dbus/dbus-address.h b/lib-x86-64/include/dbus-1.0/dbus/dbus-address.h
deleted file mode 100644
index e51ef0ae..00000000
--- a/lib-x86-64/include/dbus-1.0/dbus/dbus-address.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-address.h  Server address parser.
- *
- * Copyright (C) 2003  CodeFactory AB
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#if !defined (DBUS_INSIDE_DBUS_H) && !defined (DBUS_COMPILATION)
-#error "Only <dbus/dbus.h> can be included directly, this file may disappear or change contents."
-#endif
-
-#ifndef DBUS_ADDRESS_H
-#define DBUS_ADDRESS_H
-
-#include <dbus/dbus-types.h>
-#include <dbus/dbus-errors.h>
-
-DBUS_BEGIN_DECLS
-
-/**
- * @addtogroup DBusAddress
- * @{
- */
-
-/** Opaque type representing one of the semicolon-separated items in an address */
-typedef struct DBusAddressEntry DBusAddressEntry;
-
-DBUS_EXPORT
-dbus_bool_t dbus_parse_address            (const char         *address,
-					   DBusAddressEntry ***entry,
-					   int                *array_len,
-					   DBusError          *error);
-DBUS_EXPORT
-const char *dbus_address_entry_get_value  (DBusAddressEntry   *entry,
-					   const char         *key);
-DBUS_EXPORT
-const char *dbus_address_entry_get_method (DBusAddressEntry   *entry);
-DBUS_EXPORT
-void        dbus_address_entries_free     (DBusAddressEntry  **entries);
-
-DBUS_EXPORT
-char* dbus_address_escape_value   (const char *value);
-DBUS_EXPORT
-char* dbus_address_unescape_value (const char *value,
-                                   DBusError  *error);
-
-/** @} */
-
-DBUS_END_DECLS
-
-#endif /* DBUS_ADDRESS_H */
-
diff --git a/lib-x86-64/include/dbus-1.0/dbus/dbus-bus.h b/lib-x86-64/include/dbus-1.0/dbus/dbus-bus.h
deleted file mode 100644
index 02a95711..00000000
--- a/lib-x86-64/include/dbus-1.0/dbus/dbus-bus.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-bus.h  Convenience functions for communicating with the bus.
- *
- * Copyright (C) 2003  CodeFactory AB
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#if !defined (DBUS_INSIDE_DBUS_H) && !defined (DBUS_COMPILATION)
-#error "Only <dbus/dbus.h> can be included directly, this file may disappear or change contents."
-#endif
-
-#ifndef DBUS_BUS_H
-#define DBUS_BUS_H
-
-#include <dbus/dbus-connection.h>
-
-DBUS_BEGIN_DECLS
-
-/**
- * @addtogroup DBusBus
- * @{
- */
-
-DBUS_EXPORT
-DBusConnection *dbus_bus_get              (DBusBusType     type,
-					   DBusError      *error);
-DBUS_EXPORT
-DBusConnection *dbus_bus_get_private      (DBusBusType     type,
-					   DBusError      *error);
-
-DBUS_EXPORT
-dbus_bool_t     dbus_bus_register         (DBusConnection *connection,
-					   DBusError      *error);
-DBUS_EXPORT
-dbus_bool_t     dbus_bus_set_unique_name  (DBusConnection *connection,
-					   const char     *unique_name);
-DBUS_EXPORT
-const char*     dbus_bus_get_unique_name  (DBusConnection *connection);
-DBUS_EXPORT
-unsigned long   dbus_bus_get_unix_user    (DBusConnection *connection,
-			                   const char     *name,
-                                           DBusError      *error);
-DBUS_EXPORT
-char*           dbus_bus_get_id           (DBusConnection *connection,
-                                           DBusError      *error);
-DBUS_EXPORT
-int             dbus_bus_request_name     (DBusConnection *connection,
-					   const char     *name,
-					   unsigned int    flags,
-					   DBusError      *error);
-DBUS_EXPORT
-int             dbus_bus_release_name     (DBusConnection *connection,
-					   const char     *name,
-					   DBusError      *error);
-DBUS_EXPORT
-dbus_bool_t     dbus_bus_name_has_owner   (DBusConnection *connection,
-					   const char     *name,
-					   DBusError      *error);
-
-DBUS_EXPORT
-dbus_bool_t     dbus_bus_start_service_by_name (DBusConnection *connection,
-                                                const char     *name,
-                                                dbus_uint32_t   flags,
-                                                dbus_uint32_t  *reply,
-                                                DBusError      *error);
-
-DBUS_EXPORT
-void            dbus_bus_add_match        (DBusConnection *connection,
-                                           const char     *rule,
-                                           DBusError      *error);
-DBUS_EXPORT
-void            dbus_bus_remove_match     (DBusConnection *connection,
-                                           const char     *rule,
-                                           DBusError      *error);
-
-/** @} */
-
-DBUS_END_DECLS
-
-#endif /* DBUS_BUS_H */
diff --git a/lib-x86-64/include/dbus-1.0/dbus/dbus-connection.h b/lib-x86-64/include/dbus-1.0/dbus/dbus-connection.h
deleted file mode 100644
index 3e2a7d8d..00000000
--- a/lib-x86-64/include/dbus-1.0/dbus/dbus-connection.h
+++ /dev/null
@@ -1,495 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-connection.h DBusConnection object
- *
- * Copyright (C) 2002, 2003  Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#if !defined (DBUS_INSIDE_DBUS_H) && !defined (DBUS_COMPILATION)
-#error "Only <dbus/dbus.h> can be included directly, this file may disappear or change contents."
-#endif
-
-#ifndef DBUS_CONNECTION_H
-#define DBUS_CONNECTION_H
-
-#include <dbus/dbus-errors.h>
-#include <dbus/dbus-memory.h>
-#include <dbus/dbus-message.h>
-#include <dbus/dbus-shared.h>
-
-DBUS_BEGIN_DECLS
-
-/**
- * @addtogroup DBusConnection
- * @{
- */
-
-/* documented in dbus-watch.c */
-typedef struct DBusWatch DBusWatch;
-/* documented in dbus-timeout.c */
-typedef struct DBusTimeout DBusTimeout;
-/** Opaque type representing preallocated resources so a message can be sent without further memory allocation. */
-typedef struct DBusPreallocatedSend DBusPreallocatedSend;
-/** Opaque type representing a method call that has not yet received a reply. */
-typedef struct DBusPendingCall DBusPendingCall;
-/** Opaque type representing a connection to a remote application and associated incoming/outgoing message queues. */
-typedef struct DBusConnection DBusConnection;
-/** Set of functions that must be implemented to handle messages sent to a particular object path. */
-typedef struct DBusObjectPathVTable DBusObjectPathVTable;
-
-/**
- * Indicates the status of a #DBusWatch.
- */
-typedef enum
-{
-  DBUS_WATCH_READABLE = 1 << 0, /**< As in POLLIN */
-  DBUS_WATCH_WRITABLE = 1 << 1, /**< As in POLLOUT */
-  DBUS_WATCH_ERROR    = 1 << 2, /**< As in POLLERR (can't watch for
-                                 *   this, but can be present in
-                                 *   current state passed to
-                                 *   dbus_watch_handle()).
-                                 */
-  DBUS_WATCH_HANGUP   = 1 << 3  /**< As in POLLHUP (can't watch for
-                                 *   it, but can be present in current
-                                 *   state passed to
-                                 *   dbus_watch_handle()).
-                                 */
-} DBusWatchFlags;
-
-/**
- * Indicates the status of incoming data on a #DBusConnection. This determines whether
- * dbus_connection_dispatch() needs to be called.
- */
-typedef enum
-{
-  DBUS_DISPATCH_DATA_REMAINS,  /**< There is more data to potentially convert to messages. */
-  DBUS_DISPATCH_COMPLETE,      /**< All currently available data has been processed. */
-  DBUS_DISPATCH_NEED_MEMORY    /**< More memory is needed to continue. */
-} DBusDispatchStatus;
-
-/** Called when libdbus needs a new watch to be monitored by the main
- * loop. Returns #FALSE if it lacks enough memory to add the
- * watch. Set by dbus_connection_set_watch_functions() or
- * dbus_server_set_watch_functions().
- */
-typedef dbus_bool_t (* DBusAddWatchFunction)       (DBusWatch      *watch,
-                                                    void           *data);
-/** Called when dbus_watch_get_enabled() may return a different value
- *  than it did before.  Set by dbus_connection_set_watch_functions()
- *  or dbus_server_set_watch_functions().
- */
-typedef void        (* DBusWatchToggledFunction)   (DBusWatch      *watch,
-                                                    void           *data);
-/** Called when libdbus no longer needs a watch to be monitored by the
- * main loop. Set by dbus_connection_set_watch_functions() or
- * dbus_server_set_watch_functions().
- */
-typedef void        (* DBusRemoveWatchFunction)    (DBusWatch      *watch,
-                                                    void           *data);
-/** Called when libdbus needs a new timeout to be monitored by the main
- * loop. Returns #FALSE if it lacks enough memory to add the
- * watch. Set by dbus_connection_set_timeout_functions() or
- * dbus_server_set_timeout_functions().
- */
-typedef dbus_bool_t (* DBusAddTimeoutFunction)     (DBusTimeout    *timeout,
-                                                    void           *data);
-/** Called when dbus_timeout_get_enabled() may return a different
- * value than it did before.
- * Set by dbus_connection_set_timeout_functions() or
- * dbus_server_set_timeout_functions().
- */
-typedef void        (* DBusTimeoutToggledFunction) (DBusTimeout    *timeout,
-                                                    void           *data);
-/** Called when libdbus no longer needs a timeout to be monitored by the
- * main loop. Set by dbus_connection_set_timeout_functions() or
- * dbus_server_set_timeout_functions().
- */
-typedef void        (* DBusRemoveTimeoutFunction)  (DBusTimeout    *timeout,
-                                                    void           *data);
-/** Called when the return value of dbus_connection_get_dispatch_status()
- * may have changed. Set with dbus_connection_set_dispatch_status_function().
- */
-typedef void        (* DBusDispatchStatusFunction) (DBusConnection *connection,
-                                                    DBusDispatchStatus new_status,
-                                                    void           *data);
-/**
- * Called when the main loop's thread should be notified that there's now work
- * to do. Set with dbus_connection_set_wakeup_main_function().
- */
-typedef void        (* DBusWakeupMainFunction)     (void           *data);
-
-/**
- * Called during authentication to check whether the given UNIX user
- * ID is allowed to connect, if the client tried to auth as a UNIX
- * user ID. Normally on Windows this would never happen. Set with
- * dbus_connection_set_unix_user_function().
- */ 
-typedef dbus_bool_t (* DBusAllowUnixUserFunction)  (DBusConnection *connection,
-                                                    unsigned long   uid,
-                                                    void           *data);
-
-/**
- * Called during authentication to check whether the given Windows user
- * ID is allowed to connect, if the client tried to auth as a Windows
- * user ID. Normally on UNIX this would never happen. Set with
- * dbus_connection_set_windows_user_function().
- */ 
-typedef dbus_bool_t (* DBusAllowWindowsUserFunction)  (DBusConnection *connection,
-                                                       const char     *user_sid,
-                                                       void           *data);
-
-
-/**
- * Called when a pending call now has a reply available. Set with
- * dbus_pending_call_set_notify().
- */
-typedef void (* DBusPendingCallNotifyFunction) (DBusPendingCall *pending,
-                                                void            *user_data);
-
-/**
- * Called when a message needs to be handled. The result indicates whether or
- * not more handlers should be run. Set with dbus_connection_add_filter().
- */
-typedef DBusHandlerResult (* DBusHandleMessageFunction) (DBusConnection     *connection,
-                                                         DBusMessage        *message,
-                                                         void               *user_data);
-DBUS_EXPORT
-DBusConnection*    dbus_connection_open                         (const char                 *address,
-                                                                 DBusError                  *error);
-DBUS_EXPORT
-DBusConnection*    dbus_connection_open_private                 (const char                 *address,
-                                                                 DBusError                  *error);
-DBUS_EXPORT
-DBusConnection*    dbus_connection_ref                          (DBusConnection             *connection);
-DBUS_EXPORT
-void               dbus_connection_unref                        (DBusConnection             *connection);
-DBUS_EXPORT
-void               dbus_connection_close                        (DBusConnection             *connection);
-DBUS_EXPORT
-dbus_bool_t        dbus_connection_get_is_connected             (DBusConnection             *connection);
-DBUS_EXPORT
-dbus_bool_t        dbus_connection_get_is_authenticated         (DBusConnection             *connection);
-DBUS_EXPORT
-dbus_bool_t        dbus_connection_get_is_anonymous             (DBusConnection             *connection);
-DBUS_EXPORT
-char*              dbus_connection_get_server_id                (DBusConnection             *connection);
-DBUS_EXPORT
-dbus_bool_t        dbus_connection_can_send_type                (DBusConnection             *connection,
-                                                                 int                         type);
-
-DBUS_EXPORT
-void               dbus_connection_set_exit_on_disconnect       (DBusConnection             *connection,
-                                                                 dbus_bool_t                 exit_on_disconnect);
-DBUS_EXPORT
-void               dbus_connection_flush                        (DBusConnection             *connection);
-DBUS_EXPORT
-dbus_bool_t        dbus_connection_read_write_dispatch          (DBusConnection             *connection,
-                                                                 int                         timeout_milliseconds);
-DBUS_EXPORT
-dbus_bool_t        dbus_connection_read_write                   (DBusConnection             *connection,
-                                                                 int                         timeout_milliseconds);
-DBUS_EXPORT
-DBusMessage*       dbus_connection_borrow_message               (DBusConnection             *connection);
-DBUS_EXPORT
-void               dbus_connection_return_message               (DBusConnection             *connection,
-                                                                 DBusMessage                *message);
-DBUS_EXPORT
-void               dbus_connection_steal_borrowed_message       (DBusConnection             *connection,
-                                                                 DBusMessage                *message);
-DBUS_EXPORT
-DBusMessage*       dbus_connection_pop_message                  (DBusConnection             *connection);
-DBUS_EXPORT
-DBusDispatchStatus dbus_connection_get_dispatch_status          (DBusConnection             *connection);
-DBUS_EXPORT
-DBusDispatchStatus dbus_connection_dispatch                     (DBusConnection             *connection);
-DBUS_EXPORT
-dbus_bool_t        dbus_connection_has_messages_to_send         (DBusConnection *connection);
-DBUS_EXPORT
-dbus_bool_t        dbus_connection_send                         (DBusConnection             *connection,
-                                                                 DBusMessage                *message,
-                                                                 dbus_uint32_t              *client_serial);
-DBUS_EXPORT
-dbus_bool_t        dbus_connection_send_with_reply              (DBusConnection             *connection,
-                                                                 DBusMessage                *message,
-                                                                 DBusPendingCall           **pending_return,
-                                                                 int                         timeout_milliseconds);
-DBUS_EXPORT
-DBusMessage *      dbus_connection_send_with_reply_and_block    (DBusConnection             *connection,
-                                                                 DBusMessage                *message,
-                                                                 int                         timeout_milliseconds,
-                                                                 DBusError                  *error);
-DBUS_EXPORT
-dbus_bool_t        dbus_connection_set_watch_functions          (DBusConnection             *connection,
-                                                                 DBusAddWatchFunction        add_function,
-                                                                 DBusRemoveWatchFunction     remove_function,
-                                                                 DBusWatchToggledFunction    toggled_function,
-                                                                 void                       *data,
-                                                                 DBusFreeFunction            free_data_function);
-DBUS_EXPORT
-dbus_bool_t        dbus_connection_set_timeout_functions        (DBusConnection             *connection,
-                                                                 DBusAddTimeoutFunction      add_function,
-                                                                 DBusRemoveTimeoutFunction   remove_function,
-                                                                 DBusTimeoutToggledFunction  toggled_function,
-                                                                 void                       *data,
-                                                                 DBusFreeFunction            free_data_function);
-DBUS_EXPORT
-void               dbus_connection_set_wakeup_main_function     (DBusConnection             *connection,
-                                                                 DBusWakeupMainFunction      wakeup_main_function,
-                                                                 void                       *data,
-                                                                 DBusFreeFunction            free_data_function);
-DBUS_EXPORT
-void               dbus_connection_set_dispatch_status_function (DBusConnection             *connection,
-                                                                 DBusDispatchStatusFunction  function,
-                                                                 void                       *data,
-                                                                 DBusFreeFunction            free_data_function);
-DBUS_EXPORT
-dbus_bool_t        dbus_connection_get_unix_user                (DBusConnection             *connection,
-                                                                 unsigned long              *uid);
-DBUS_EXPORT
-dbus_bool_t        dbus_connection_get_unix_process_id          (DBusConnection             *connection,
-                                                                 unsigned long              *pid);
-DBUS_EXPORT
-dbus_bool_t        dbus_connection_get_adt_audit_session_data   (DBusConnection             *connection,
-                                                                 void                      **data,
-                                                                 dbus_int32_t               *data_size);
-DBUS_EXPORT
-void               dbus_connection_set_unix_user_function       (DBusConnection             *connection,
-                                                                 DBusAllowUnixUserFunction   function,
-                                                                 void                       *data,
-                                                                 DBusFreeFunction            free_data_function);
-DBUS_EXPORT
-dbus_bool_t        dbus_connection_get_windows_user             (DBusConnection             *connection,
-                                                                 char                      **windows_sid_p); 
-DBUS_EXPORT
-void               dbus_connection_set_windows_user_function    (DBusConnection             *connection,
-                                                                 DBusAllowWindowsUserFunction function,
-                                                                 void                       *data,
-                                                                 DBusFreeFunction            free_data_function);
-DBUS_EXPORT
-void               dbus_connection_set_allow_anonymous          (DBusConnection             *connection,
-                                                                 dbus_bool_t                 value);
-DBUS_EXPORT
-void               dbus_connection_set_route_peer_messages      (DBusConnection             *connection,
-                                                                 dbus_bool_t                 value);
-
-
-/* Filters */
-
-DBUS_EXPORT
-dbus_bool_t dbus_connection_add_filter    (DBusConnection            *connection,
-                                           DBusHandleMessageFunction  function,
-                                           void                      *user_data,
-                                           DBusFreeFunction           free_data_function);
-DBUS_EXPORT
-void        dbus_connection_remove_filter (DBusConnection            *connection,
-                                           DBusHandleMessageFunction  function,
-                                           void                      *user_data);
-
-
-/* Other */
-DBUS_EXPORT
-dbus_bool_t dbus_connection_allocate_data_slot (dbus_int32_t     *slot_p);
-DBUS_EXPORT
-void        dbus_connection_free_data_slot     (dbus_int32_t     *slot_p);
-DBUS_EXPORT
-dbus_bool_t dbus_connection_set_data           (DBusConnection   *connection,
-                                                dbus_int32_t      slot,
-                                                void             *data,
-                                                DBusFreeFunction  free_data_func);
-DBUS_EXPORT
-void*       dbus_connection_get_data           (DBusConnection   *connection,
-                                                dbus_int32_t      slot);
-
-DBUS_EXPORT
-void        dbus_connection_set_change_sigpipe (dbus_bool_t       will_modify_sigpipe); 
-
-DBUS_EXPORT
-void dbus_connection_set_max_message_size  (DBusConnection *connection,
-                                            long            size);
-DBUS_EXPORT
-long dbus_connection_get_max_message_size  (DBusConnection *connection);
-DBUS_EXPORT
-void dbus_connection_set_max_received_size (DBusConnection *connection,
-                                            long            size);
-DBUS_EXPORT
-long dbus_connection_get_max_received_size (DBusConnection *connection);
-
-DBUS_EXPORT
-void dbus_connection_set_max_message_unix_fds (DBusConnection *connection,
-                                               long            n);
-DBUS_EXPORT
-long dbus_connection_get_max_message_unix_fds (DBusConnection *connection);
-DBUS_EXPORT
-void dbus_connection_set_max_received_unix_fds(DBusConnection *connection,
-                                               long            n);
-DBUS_EXPORT
-long dbus_connection_get_max_received_unix_fds(DBusConnection *connection);
-
-DBUS_EXPORT
-long dbus_connection_get_outgoing_size     (DBusConnection *connection);
-DBUS_EXPORT
-long dbus_connection_get_outgoing_unix_fds (DBusConnection *connection);
-
-DBUS_EXPORT
-DBusPreallocatedSend* dbus_connection_preallocate_send       (DBusConnection       *connection);
-DBUS_EXPORT
-void                  dbus_connection_free_preallocated_send (DBusConnection       *connection,
-                                                              DBusPreallocatedSend *preallocated);
-DBUS_EXPORT
-void                  dbus_connection_send_preallocated      (DBusConnection       *connection,
-                                                              DBusPreallocatedSend *preallocated,
-                                                              DBusMessage          *message,
-                                                              dbus_uint32_t        *client_serial);
-
-
-/* Object tree functionality */
-
-/**
- * Called when a #DBusObjectPathVTable is unregistered (or its connection is freed).
- * Found in #DBusObjectPathVTable.
- */
-typedef void              (* DBusObjectPathUnregisterFunction) (DBusConnection  *connection,
-                                                                void            *user_data);
-/**
- * Called when a message is sent to a registered object path. Found in
- * #DBusObjectPathVTable which is registered with dbus_connection_register_object_path()
- * or dbus_connection_register_fallback().
- */
-typedef DBusHandlerResult (* DBusObjectPathMessageFunction)    (DBusConnection  *connection,
-                                                                DBusMessage     *message,
-                                                                void            *user_data);
-
-/**
- * Virtual table that must be implemented to handle a portion of the
- * object path hierarchy. Attach the vtable to a particular path using
- * dbus_connection_register_object_path() or
- * dbus_connection_register_fallback().
- */
-struct DBusObjectPathVTable
-{
-  DBusObjectPathUnregisterFunction   unregister_function; /**< Function to unregister this handler */
-  DBusObjectPathMessageFunction      message_function; /**< Function to handle messages */
-  
-  void (* dbus_internal_pad1) (void *); /**< Reserved for future expansion */
-  void (* dbus_internal_pad2) (void *); /**< Reserved for future expansion */
-  void (* dbus_internal_pad3) (void *); /**< Reserved for future expansion */
-  void (* dbus_internal_pad4) (void *); /**< Reserved for future expansion */
-};
-
-DBUS_EXPORT
-dbus_bool_t dbus_connection_try_register_object_path (DBusConnection              *connection,
-                                                      const char                  *path,
-                                                      const DBusObjectPathVTable  *vtable,
-                                                      void                        *user_data,
-                                                      DBusError                   *error);
-
-DBUS_EXPORT
-dbus_bool_t dbus_connection_register_object_path   (DBusConnection              *connection,
-                                                    const char                  *path,
-                                                    const DBusObjectPathVTable  *vtable,
-                                                    void                        *user_data);
-
-DBUS_EXPORT
-dbus_bool_t dbus_connection_try_register_fallback (DBusConnection              *connection,
-                                                   const char                  *path,
-                                                   const DBusObjectPathVTable  *vtable,
-                                                   void                        *user_data,
-                                                   DBusError                   *error);
-
-DBUS_EXPORT
-dbus_bool_t dbus_connection_register_fallback      (DBusConnection              *connection,
-                                                    const char                  *path,
-                                                    const DBusObjectPathVTable  *vtable,
-                                                    void                        *user_data);
-DBUS_EXPORT
-dbus_bool_t dbus_connection_unregister_object_path (DBusConnection              *connection,
-                                                    const char                  *path);
-
-DBUS_EXPORT
-dbus_bool_t dbus_connection_get_object_path_data   (DBusConnection              *connection,
-                                                    const char                  *path,
-                                                    void                       **data_p);
-
-DBUS_EXPORT
-dbus_bool_t dbus_connection_list_registered        (DBusConnection              *connection,
-                                                    const char                  *parent_path,
-                                                    char                      ***child_entries);
-
-DBUS_EXPORT
-dbus_bool_t dbus_connection_get_unix_fd            (DBusConnection              *connection,
-                                                    int                         *fd);
-DBUS_EXPORT
-dbus_bool_t dbus_connection_get_socket             (DBusConnection              *connection,
-                                                    int                         *fd);
-
-/** @} */
-
-
-/**
- * @addtogroup DBusWatch
- * @{
- */
-
-#ifndef DBUS_DISABLE_DEPRECATED
-DBUS_EXPORT
-DBUS_DEPRECATED int dbus_watch_get_fd      (DBusWatch        *watch);
-#endif
-
-DBUS_EXPORT
-int          dbus_watch_get_unix_fd (DBusWatch        *watch);
-DBUS_EXPORT
-int          dbus_watch_get_socket  (DBusWatch        *watch);
-DBUS_EXPORT
-unsigned int dbus_watch_get_flags   (DBusWatch        *watch);
-DBUS_EXPORT
-void*        dbus_watch_get_data    (DBusWatch        *watch);
-DBUS_EXPORT
-void         dbus_watch_set_data    (DBusWatch        *watch,
-                                     void             *data,
-                                     DBusFreeFunction  free_data_function);
-DBUS_EXPORT
-dbus_bool_t  dbus_watch_handle      (DBusWatch        *watch,
-                                     unsigned int      flags);
-DBUS_EXPORT
-dbus_bool_t  dbus_watch_get_enabled (DBusWatch        *watch);
-
-/** @} */
-
-/**
- * @addtogroup DBusTimeout
- * @{
- */
-
-DBUS_EXPORT
-int         dbus_timeout_get_interval (DBusTimeout      *timeout);
-DBUS_EXPORT
-void*       dbus_timeout_get_data     (DBusTimeout      *timeout);
-DBUS_EXPORT
-void        dbus_timeout_set_data     (DBusTimeout      *timeout,
-                                       void             *data,
-                                       DBusFreeFunction  free_data_function);
-DBUS_EXPORT
-dbus_bool_t dbus_timeout_handle       (DBusTimeout      *timeout);
-DBUS_EXPORT
-dbus_bool_t dbus_timeout_get_enabled  (DBusTimeout      *timeout);
-
-/** @} */
-
-DBUS_END_DECLS
-
-#endif /* DBUS_CONNECTION_H */
diff --git a/lib-x86-64/include/dbus-1.0/dbus/dbus-errors.h b/lib-x86-64/include/dbus-1.0/dbus/dbus-errors.h
deleted file mode 100644
index e63139a0..00000000
--- a/lib-x86-64/include/dbus-1.0/dbus/dbus-errors.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-errors.h Error reporting
- *
- * Copyright (C) 2002  Red Hat Inc.
- * Copyright (C) 2003  CodeFactory AB
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#if !defined (DBUS_INSIDE_DBUS_H) && !defined (DBUS_COMPILATION)
-#error "Only <dbus/dbus.h> can be included directly, this file may disappear or change contents."
-#endif
-
-#ifndef DBUS_ERROR_H
-#define DBUS_ERROR_H
-
-#include <dbus/dbus-macros.h>
-#include <dbus/dbus-types.h>
-#include <dbus/dbus-protocol.h>
-
-DBUS_BEGIN_DECLS
-
-/**
- * @addtogroup DBusErrors
- * @{
- */
-
-/** Mostly-opaque type representing an error that occurred */
-typedef struct DBusError DBusError;
-
-/**
- * Object representing an exception.
- */
-struct DBusError
-{
-  const char *name;    /**< public error name field */
-  const char *message; /**< public error message field */
-
-  unsigned int dummy1 : 1; /**< placeholder */
-  unsigned int dummy2 : 1; /**< placeholder */
-  unsigned int dummy3 : 1; /**< placeholder */
-  unsigned int dummy4 : 1; /**< placeholder */
-  unsigned int dummy5 : 1; /**< placeholder */
-
-  void *padding1; /**< placeholder */
-};
-
-#define DBUS_ERROR_INIT { NULL, NULL, TRUE, 0, 0, 0, 0, NULL }
-
-DBUS_EXPORT
-void        dbus_error_init      (DBusError       *error);
-DBUS_EXPORT
-void        dbus_error_free      (DBusError       *error);
-DBUS_EXPORT
-void        dbus_set_error       (DBusError       *error,
-                                  const char      *name,
-                                  const char      *message,
-                                  ...);
-DBUS_EXPORT
-void        dbus_set_error_const (DBusError       *error,
-                                  const char      *name,
-                                  const char      *message);
-DBUS_EXPORT
-void        dbus_move_error      (DBusError       *src,
-                                  DBusError       *dest);
-DBUS_EXPORT
-dbus_bool_t dbus_error_has_name  (const DBusError *error,
-                                  const char      *name);
-DBUS_EXPORT
-dbus_bool_t dbus_error_is_set    (const DBusError *error);
-
-/** @} */
-
-DBUS_END_DECLS
-
-#endif /* DBUS_ERROR_H */
diff --git a/lib-x86-64/include/dbus-1.0/dbus/dbus-macros.h b/lib-x86-64/include/dbus-1.0/dbus/dbus-macros.h
deleted file mode 100644
index d1e40ecb..00000000
--- a/lib-x86-64/include/dbus-1.0/dbus/dbus-macros.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-macros.h  generic macros
- *
- * Copyright (C) 2002  Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#if !defined (DBUS_INSIDE_DBUS_H) && !defined (DBUS_COMPILATION)
-#error "Only <dbus/dbus.h> can be included directly, this file may disappear or change contents."
-#endif
-
-#ifndef DBUS_MACROS_H
-#define DBUS_MACROS_H
-
-#ifdef  __cplusplus
-#  define DBUS_BEGIN_DECLS  extern "C" {
-#  define DBUS_END_DECLS    }
-#else
-#  define DBUS_BEGIN_DECLS
-#  define DBUS_END_DECLS
-#endif
-
-#ifndef TRUE
-#  define TRUE 1
-#endif
-#ifndef FALSE
-#  define FALSE 0
-#endif
-
-#ifndef NULL
-#  ifdef __cplusplus
-#    define NULL        (0L)
-#  else /* !__cplusplus */
-#    define NULL        ((void*) 0)
-#  endif /* !__cplusplus */
-#endif
-
-#if  __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
-#  define DBUS_DEPRECATED __attribute__ ((__deprecated__))
-#elif defined(_MSC_VER) && (_MSC_VER >= 1300)
-#  define DBUS_DEPRECATED __declspec(deprecated)
-#else
-#  define DBUS_DEPRECATED
-#endif
-
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)
-#  define _DBUS_GNUC_EXTENSION __extension__
-#else
-#  define _DBUS_GNUC_EXTENSION
-#endif
-
-#if     __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
-#define _DBUS_GNUC_PRINTF( format_idx, arg_idx )    \
-  __attribute__((__format__ (__printf__, format_idx, arg_idx)))
-#define _DBUS_GNUC_NORETURN                         \
-  __attribute__((__noreturn__))
-#else   /* !__GNUC__ */
-#define _DBUS_GNUC_PRINTF( format_idx, arg_idx )
-#define _DBUS_GNUC_NORETURN
-#endif  /* !__GNUC__ */
-
-/** @def _DBUS_GNUC_PRINTF
- * used to tell gcc about printf format strings
- */
-/** @def _DBUS_GNUC_NORETURN
- * used to tell gcc about functions that never return, such as _dbus_abort()
- */
-
-
-/* Normally docs are in .c files, but there isn't a .c file for this. */
-/**
- * @defgroup DBusMacros Utility macros
- * @ingroup  DBus
- * @brief #TRUE, #FALSE, #NULL, and so on
- *
- * Utility macros.
- *
- * @{
- */
-
-/**
- * @def DBUS_BEGIN_DECLS
- *
- * Macro used prior to declaring functions in the D-Bus header
- * files. Expands to "extern "C"" when using a C++ compiler,
- * and expands to nothing when using a C compiler.
- *
- * Please don't use this in your own code, consider it
- * D-Bus internal.
- */
-/**
- * @def DBUS_END_DECLS
- *
- * Macro used after declaring functions in the D-Bus header
- * files. Expands to "}" when using a C++ compiler,
- * and expands to nothing when using a C compiler.
- *
- * Please don't use this in your own code, consider it
- * D-Bus internal.
- */
-/**
- * @def TRUE
- *
- * Expands to "1"
- */
-/**
- * @def FALSE
- *
- * Expands to "0"
- */
-/**
- * @def NULL
- *
- * A null pointer, defined appropriately for C or C++.
- */
-/**
- * @def DBUS_DEPRECATED
- *
- * Tells the compiler to warn about a function or type if it's used.
- * Code marked in this way should also be enclosed in
- * @code
- * #ifndef DBUS_DISABLE_DEPRECATED
- *  deprecated stuff here
- * #endif
- * @endcode
- *
- * Please don't use this in your own code, consider it
- * D-Bus internal.
- */
-/**
- * @def _DBUS_GNUC_EXTENSION
- *
- * Tells gcc not to warn about extensions to the C standard in the
- * following expression, even if compiling with -pedantic. Do not use
- * this macro in your own code; please consider it to be internal to libdbus.
- */
-
-/*
- * @def DBUS_EXPORT
- *
- * Declare the following symbol as public.  This is currently a noop on
- * platforms other than Windows.
- */
-
-#if defined(_WIN32)
-#  if defined(DBUS_STATIC_BUILD)
-#  define DBUS_EXPORT
-#  elif defined(dbus_1_EXPORTS)
-#  define DBUS_EXPORT __declspec(dllexport)
-#  else
-#  define DBUS_EXPORT __declspec(dllimport)
-#  endif
-#else
-#define DBUS_EXPORT
-#endif
-
-/** @} */
-
-#endif /* DBUS_MACROS_H */
diff --git a/lib-x86-64/include/dbus-1.0/dbus/dbus-memory.h b/lib-x86-64/include/dbus-1.0/dbus/dbus-memory.h
deleted file mode 100644
index ea28423c..00000000
--- a/lib-x86-64/include/dbus-1.0/dbus/dbus-memory.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-memory.h  D-Bus memory handling
- *
- * Copyright (C) 2002  Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#if !defined (DBUS_INSIDE_DBUS_H) && !defined (DBUS_COMPILATION)
-#error "Only <dbus/dbus.h> can be included directly, this file may disappear or change contents."
-#endif
-
-#ifndef DBUS_MEMORY_H
-#define DBUS_MEMORY_H
-
-#include <dbus/dbus-macros.h>
-#include <stddef.h>
-
-DBUS_BEGIN_DECLS
-
-/**
- * @addtogroup DBusMemory
- * @{
- */
-
-DBUS_EXPORT
-void* dbus_malloc        (size_t bytes);
-DBUS_EXPORT
-void* dbus_malloc0       (size_t bytes);
-DBUS_EXPORT
-void* dbus_realloc       (void  *memory,
-                          size_t bytes);
-DBUS_EXPORT
-void  dbus_free          (void  *memory);
-
-#define dbus_new(type, count)  ((type*)dbus_malloc (sizeof (type) * (count)))
-#define dbus_new0(type, count) ((type*)dbus_malloc0 (sizeof (type) * (count)))
-
-DBUS_EXPORT
-void dbus_free_string_array (char **str_array);
-
-typedef void (* DBusFreeFunction) (void *memory);
-
-DBUS_EXPORT
-void dbus_shutdown (void);
-
-/** @} */
-
-DBUS_END_DECLS
-
-#endif /* DBUS_MEMORY_H */
diff --git a/lib-x86-64/include/dbus-1.0/dbus/dbus-message.h b/lib-x86-64/include/dbus-1.0/dbus/dbus-message.h
deleted file mode 100644
index 5500492d..00000000
--- a/lib-x86-64/include/dbus-1.0/dbus/dbus-message.h
+++ /dev/null
@@ -1,309 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-message.h DBusMessage object
- *
- * Copyright (C) 2002, 2003, 2005 Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#if !defined (DBUS_INSIDE_DBUS_H) && !defined (DBUS_COMPILATION)
-#error "Only <dbus/dbus.h> can be included directly, this file may disappear or change contents."
-#endif
-
-#ifndef DBUS_MESSAGE_H
-#define DBUS_MESSAGE_H
-
-#include <dbus/dbus-macros.h>
-#include <dbus/dbus-types.h>
-#include <dbus/dbus-arch-deps.h>
-#include <dbus/dbus-memory.h>
-#include <dbus/dbus-errors.h>
-#include <stdarg.h>
-
-DBUS_BEGIN_DECLS
-
-/**
- * @addtogroup DBusMessage
- * @{
- */
-
-typedef struct DBusMessage DBusMessage;
-/** Opaque type representing a message iterator. Can be copied by value, and contains no allocated memory so never needs to be freed and can be allocated on the stack. */
-typedef struct DBusMessageIter DBusMessageIter;
-
-/**
- * DBusMessageIter struct; contains no public fields. 
- */
-struct DBusMessageIter
-{ 
-  void *dummy1;         /**< Don't use this */
-  void *dummy2;         /**< Don't use this */
-  dbus_uint32_t dummy3; /**< Don't use this */
-  int dummy4;           /**< Don't use this */
-  int dummy5;           /**< Don't use this */
-  int dummy6;           /**< Don't use this */
-  int dummy7;           /**< Don't use this */
-  int dummy8;           /**< Don't use this */
-  int dummy9;           /**< Don't use this */
-  int dummy10;          /**< Don't use this */
-  int dummy11;          /**< Don't use this */
-  int pad1;             /**< Don't use this */
-  int pad2;             /**< Don't use this */
-  void *pad3;           /**< Don't use this */
-};
-
-DBUS_EXPORT
-DBusMessage* dbus_message_new               (int          message_type);
-DBUS_EXPORT
-DBusMessage* dbus_message_new_method_call   (const char  *bus_name,
-                                             const char  *path,
-                                             const char  *interface,
-                                             const char  *method);
-DBUS_EXPORT
-DBusMessage* dbus_message_new_method_return (DBusMessage *method_call);
-DBUS_EXPORT
-DBusMessage* dbus_message_new_signal        (const char  *path,
-                                             const char  *interface,
-                                             const char  *name);
-DBUS_EXPORT
-DBusMessage* dbus_message_new_error         (DBusMessage *reply_to,
-                                             const char  *error_name,
-                                             const char  *error_message);
-DBUS_EXPORT
-DBusMessage* dbus_message_new_error_printf  (DBusMessage *reply_to,
-                                             const char  *error_name,
-                                             const char  *error_format,
-					     ...);
-
-DBUS_EXPORT
-DBusMessage* dbus_message_copy              (const DBusMessage *message);
-
-DBUS_EXPORT
-DBusMessage*  dbus_message_ref              (DBusMessage   *message);
-DBUS_EXPORT
-void          dbus_message_unref            (DBusMessage   *message);
-DBUS_EXPORT
-int           dbus_message_get_type         (DBusMessage   *message);
-DBUS_EXPORT
-dbus_bool_t   dbus_message_set_path         (DBusMessage   *message,
-                                             const char    *object_path);
-DBUS_EXPORT
-const char*   dbus_message_get_path         (DBusMessage   *message);
-DBUS_EXPORT
-dbus_bool_t   dbus_message_has_path         (DBusMessage   *message, 
-                                             const char    *object_path);  
-DBUS_EXPORT
-dbus_bool_t   dbus_message_set_interface    (DBusMessage   *message,
-                                             const char    *interface);       
-DBUS_EXPORT
-const char*   dbus_message_get_interface    (DBusMessage   *message);
-DBUS_EXPORT
-dbus_bool_t   dbus_message_has_interface    (DBusMessage   *message, 
-                                             const char    *interface);
-DBUS_EXPORT
-dbus_bool_t   dbus_message_set_member       (DBusMessage   *message,
-                                             const char    *member);
-DBUS_EXPORT
-const char*   dbus_message_get_member       (DBusMessage   *message);
-DBUS_EXPORT
-dbus_bool_t   dbus_message_has_member       (DBusMessage   *message, 
-                                             const char    *member);
-DBUS_EXPORT
-dbus_bool_t   dbus_message_set_error_name   (DBusMessage   *message,
-                                             const char    *name);
-DBUS_EXPORT
-const char*   dbus_message_get_error_name   (DBusMessage   *message);
-DBUS_EXPORT
-dbus_bool_t   dbus_message_set_destination  (DBusMessage   *message,
-                                             const char    *destination);
-DBUS_EXPORT
-const char*   dbus_message_get_destination  (DBusMessage   *message);
-DBUS_EXPORT
-dbus_bool_t   dbus_message_set_sender       (DBusMessage   *message,
-                                             const char    *sender);
-DBUS_EXPORT
-const char*   dbus_message_get_sender       (DBusMessage   *message);
-DBUS_EXPORT
-const char*   dbus_message_get_signature    (DBusMessage   *message);
-DBUS_EXPORT
-void          dbus_message_set_no_reply     (DBusMessage   *message,
-                                             dbus_bool_t    no_reply);
-DBUS_EXPORT
-dbus_bool_t   dbus_message_get_no_reply     (DBusMessage   *message);
-DBUS_EXPORT
-dbus_bool_t   dbus_message_is_method_call   (DBusMessage   *message,
-                                             const char    *interface,
-                                             const char    *method);
-DBUS_EXPORT
-dbus_bool_t   dbus_message_is_signal        (DBusMessage   *message,
-                                             const char    *interface,
-                                             const char    *signal_name);
-DBUS_EXPORT
-dbus_bool_t   dbus_message_is_error         (DBusMessage   *message,
-                                             const char    *error_name);
-DBUS_EXPORT
-dbus_bool_t   dbus_message_has_destination  (DBusMessage   *message,
-                                             const char    *bus_name);
-DBUS_EXPORT
-dbus_bool_t   dbus_message_has_sender       (DBusMessage   *message,
-                                             const char    *unique_bus_name);
-DBUS_EXPORT
-dbus_bool_t   dbus_message_has_signature    (DBusMessage   *message,
-                                             const char    *signature);
-DBUS_EXPORT
-dbus_uint32_t dbus_message_get_serial       (DBusMessage   *message);
-DBUS_EXPORT
-void          dbus_message_set_serial       (DBusMessage   *message, 
-                                             dbus_uint32_t  serial);
-DBUS_EXPORT
-dbus_bool_t   dbus_message_set_reply_serial (DBusMessage   *message,
-                                             dbus_uint32_t  reply_serial);
-DBUS_EXPORT
-dbus_uint32_t dbus_message_get_reply_serial (DBusMessage   *message);
-
-DBUS_EXPORT
-void          dbus_message_set_auto_start   (DBusMessage   *message,
-                                             dbus_bool_t    auto_start);
-DBUS_EXPORT
-dbus_bool_t   dbus_message_get_auto_start   (DBusMessage   *message);
-
-DBUS_EXPORT
-dbus_bool_t   dbus_message_get_path_decomposed (DBusMessage   *message,
-                                                char        ***path);
-
-DBUS_EXPORT
-dbus_bool_t dbus_message_append_args          (DBusMessage     *message,
-					       int              first_arg_type,
-					       ...);
-DBUS_EXPORT
-dbus_bool_t dbus_message_append_args_valist   (DBusMessage     *message,
-					       int              first_arg_type,
-					       va_list          var_args);
-DBUS_EXPORT
-dbus_bool_t dbus_message_get_args             (DBusMessage     *message,
-					       DBusError       *error,
-					       int              first_arg_type,
-					       ...);
-DBUS_EXPORT
-dbus_bool_t dbus_message_get_args_valist      (DBusMessage     *message,
-					       DBusError       *error,
-					       int              first_arg_type,
-					       va_list          var_args);
-
-DBUS_EXPORT
-dbus_bool_t dbus_message_contains_unix_fds    (DBusMessage *message);
-
-DBUS_EXPORT
-dbus_bool_t dbus_message_iter_init             (DBusMessage     *message,
-                                                DBusMessageIter *iter);
-DBUS_EXPORT
-dbus_bool_t dbus_message_iter_has_next         (DBusMessageIter *iter);
-DBUS_EXPORT
-dbus_bool_t dbus_message_iter_next             (DBusMessageIter *iter);
-DBUS_EXPORT
-char*       dbus_message_iter_get_signature    (DBusMessageIter *iter);
-DBUS_EXPORT
-int         dbus_message_iter_get_arg_type     (DBusMessageIter *iter);
-DBUS_EXPORT
-int         dbus_message_iter_get_element_type (DBusMessageIter *iter);
-DBUS_EXPORT
-void        dbus_message_iter_recurse          (DBusMessageIter *iter,
-                                                DBusMessageIter *sub);
-DBUS_EXPORT
-void        dbus_message_iter_get_basic        (DBusMessageIter *iter,
-                                                void            *value);
-#ifndef DBUS_DISABLE_DEPRECATED
-/* This function returns the wire protocol size of the array in bytes,
- * you do not want to know that probably
- */
-DBUS_EXPORT
-DBUS_DEPRECATED int         dbus_message_iter_get_array_len    (DBusMessageIter *iter);
-#endif
-DBUS_EXPORT
-void        dbus_message_iter_get_fixed_array  (DBusMessageIter *iter,
-                                                void            *value,
-                                                int             *n_elements);
-
-
-DBUS_EXPORT
-void        dbus_message_iter_init_append        (DBusMessage     *message,
-                                                  DBusMessageIter *iter);
-DBUS_EXPORT
-dbus_bool_t dbus_message_iter_append_basic       (DBusMessageIter *iter,
-                                                  int              type,
-                                                  const void      *value);
-DBUS_EXPORT
-dbus_bool_t dbus_message_iter_append_fixed_array (DBusMessageIter *iter,
-                                                  int              element_type,
-                                                  const void      *value,
-                                                  int              n_elements);
-DBUS_EXPORT
-dbus_bool_t dbus_message_iter_open_container     (DBusMessageIter *iter,
-                                                  int              type,
-                                                  const char      *contained_signature,
-                                                  DBusMessageIter *sub);
-DBUS_EXPORT
-dbus_bool_t dbus_message_iter_close_container    (DBusMessageIter *iter,
-                                                  DBusMessageIter *sub);
-DBUS_EXPORT
-void        dbus_message_iter_abandon_container  (DBusMessageIter *iter,
-                                                  DBusMessageIter *sub);
-
-DBUS_EXPORT
-void dbus_message_lock    (DBusMessage  *message);
-
-DBUS_EXPORT
-dbus_bool_t  dbus_set_error_from_message  (DBusError    *error,
-                                           DBusMessage  *message);
-
-
-DBUS_EXPORT
-dbus_bool_t dbus_message_allocate_data_slot (dbus_int32_t     *slot_p);
-DBUS_EXPORT
-void        dbus_message_free_data_slot     (dbus_int32_t     *slot_p);
-DBUS_EXPORT
-dbus_bool_t dbus_message_set_data           (DBusMessage      *message,
-                                             dbus_int32_t      slot,
-                                             void             *data,
-                                             DBusFreeFunction  free_data_func);
-DBUS_EXPORT
-void*       dbus_message_get_data           (DBusMessage      *message,
-                                             dbus_int32_t      slot);
-
-DBUS_EXPORT
-int         dbus_message_type_from_string (const char *type_str);
-DBUS_EXPORT
-const char* dbus_message_type_to_string   (int type);
-
-DBUS_EXPORT
-dbus_bool_t  dbus_message_marshal   (DBusMessage  *msg,
-                                     char        **marshalled_data_p,
-                                     int          *len_p);
-DBUS_EXPORT
-DBusMessage* dbus_message_demarshal (const char *str,
-                                     int         len,
-                                     DBusError  *error);
-
-DBUS_EXPORT
-int          dbus_message_demarshal_bytes_needed (const char *str, 
-                                                  int len);
-
-/** @} */
-
-DBUS_END_DECLS
-
-#endif /* DBUS_MESSAGE_H */
diff --git a/lib-x86-64/include/dbus-1.0/dbus/dbus-misc.h b/lib-x86-64/include/dbus-1.0/dbus/dbus-misc.h
deleted file mode 100644
index 3504bcaa..00000000
--- a/lib-x86-64/include/dbus-1.0/dbus/dbus-misc.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-misc.h  A few assorted public functions that don't fit elsewhere
- *
- * Copyright (C) 2006 Red Hat, Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#if !defined (DBUS_INSIDE_DBUS_H) && !defined (DBUS_COMPILATION)
-#error "Only <dbus/dbus.h> can be included directly, this file may disappear or change contents."
-#endif
-
-#ifndef DBUS_MISC_H
-#define DBUS_MISC_H
-
-#include <dbus/dbus-types.h>
-#include <dbus/dbus-errors.h>
-
-DBUS_BEGIN_DECLS
-
-/**
- * @addtogroup DBusMisc
- * @{
- */
-DBUS_EXPORT
-char*       dbus_get_local_machine_id  (void);
-
-DBUS_EXPORT
-void        dbus_get_version           (int *major_version_p,
-                                        int *minor_version_p,
-                                        int *micro_version_p);
-
-/** @} */
-
-DBUS_END_DECLS
-
-#endif /* DBUS_MISC_H */
-
diff --git a/lib-x86-64/include/dbus-1.0/dbus/dbus-pending-call.h b/lib-x86-64/include/dbus-1.0/dbus/dbus-pending-call.h
deleted file mode 100644
index 8f64b8be..00000000
--- a/lib-x86-64/include/dbus-1.0/dbus/dbus-pending-call.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-pending-call.h Object representing a call in progress.
- *
- * Copyright (C) 2002, 2003 Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#if !defined (DBUS_INSIDE_DBUS_H) && !defined (DBUS_COMPILATION)
-#error "Only <dbus/dbus.h> can be included directly, this file may disappear or change contents."
-#endif
-
-#ifndef DBUS_PENDING_CALL_H
-#define DBUS_PENDING_CALL_H
-
-#include <dbus/dbus-macros.h>
-#include <dbus/dbus-types.h>
-#include <dbus/dbus-connection.h>
-
-DBUS_BEGIN_DECLS
-
-/**
- * @addtogroup DBusPendingCall
- * @{
- */
-
-DBUS_EXPORT
-DBusPendingCall* dbus_pending_call_ref       (DBusPendingCall               *pending);
-DBUS_EXPORT
-void         dbus_pending_call_unref         (DBusPendingCall               *pending);
-DBUS_EXPORT
-dbus_bool_t  dbus_pending_call_set_notify    (DBusPendingCall               *pending,
-                                              DBusPendingCallNotifyFunction  function,
-                                              void                          *user_data,
-                                              DBusFreeFunction               free_user_data);
-DBUS_EXPORT
-void         dbus_pending_call_cancel        (DBusPendingCall               *pending);
-DBUS_EXPORT
-dbus_bool_t  dbus_pending_call_get_completed (DBusPendingCall               *pending);
-DBUS_EXPORT
-DBusMessage* dbus_pending_call_steal_reply   (DBusPendingCall               *pending);
-DBUS_EXPORT
-void         dbus_pending_call_block         (DBusPendingCall               *pending);
-
-DBUS_EXPORT
-dbus_bool_t dbus_pending_call_allocate_data_slot (dbus_int32_t     *slot_p);
-DBUS_EXPORT
-void        dbus_pending_call_free_data_slot     (dbus_int32_t     *slot_p);
-DBUS_EXPORT
-dbus_bool_t dbus_pending_call_set_data           (DBusPendingCall  *pending,
-                                                  dbus_int32_t      slot,
-                                                  void             *data,
-                                                  DBusFreeFunction  free_data_func);
-DBUS_EXPORT
-void*       dbus_pending_call_get_data           (DBusPendingCall  *pending,
-                                                  dbus_int32_t      slot);
-
-/** @} */
-
-DBUS_END_DECLS
-
-#endif /* DBUS_PENDING_CALL_H */
diff --git a/lib-x86-64/include/dbus-1.0/dbus/dbus-protocol.h b/lib-x86-64/include/dbus-1.0/dbus/dbus-protocol.h
deleted file mode 100644
index 17798e94..00000000
--- a/lib-x86-64/include/dbus-1.0/dbus/dbus-protocol.h
+++ /dev/null
@@ -1,462 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-protocol.h  D-Bus protocol constants
- *
- * Copyright (C) 2002, 2003  CodeFactory AB
- * Copyright (C) 2004, 2005 Red Hat, Inc.
- *
- * Licensed under the Academic Free License version 2.1
- *
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef DBUS_PROTOCOL_H
-#define DBUS_PROTOCOL_H
-
-/* Don't include anything in here from anywhere else. It's
- * intended for use by any random library.
- */
-
-#ifdef  __cplusplus
-extern "C" {
-#if 0
-} /* avoids confusing emacs indentation */
-#endif
-#endif
-
-/* Normally docs are in .c files, but there isn't a .c file for this. */
-/**
- * @defgroup DBusProtocol Protocol constants
- * @ingroup  DBus
- *
- * @brief Defines constants which are part of the D-Bus protocol
- *
- * This header is intended for use by any library, not only libdbus.
- *
- * @{
- */
-
-
-/* Message byte order */
-#define DBUS_LITTLE_ENDIAN ('l')  /**< Code marking LSB-first byte order in the wire protocol. */
-#define DBUS_BIG_ENDIAN    ('B')  /**< Code marking MSB-first byte order in the wire protocol. */
-
-/** Protocol version. */
-#define DBUS_MAJOR_PROTOCOL_VERSION 1
-
-/** Type code that is never equal to a legitimate type code */
-#define DBUS_TYPE_INVALID       ((int) '\0')
-/** #DBUS_TYPE_INVALID as a string literal instead of a int literal */
-#define DBUS_TYPE_INVALID_AS_STRING        "\0"
-
-/* Primitive types */
-/** Type code marking an 8-bit unsigned integer */
-#define DBUS_TYPE_BYTE          ((int) 'y')
-/** #DBUS_TYPE_BYTE as a string literal instead of a int literal */
-#define DBUS_TYPE_BYTE_AS_STRING           "y"
-/** Type code marking a boolean */
-#define DBUS_TYPE_BOOLEAN       ((int) 'b')
-/** #DBUS_TYPE_BOOLEAN as a string literal instead of a int literal */
-#define DBUS_TYPE_BOOLEAN_AS_STRING        "b"
-/** Type code marking a 16-bit signed integer */
-#define DBUS_TYPE_INT16         ((int) 'n')
-/** #DBUS_TYPE_INT16 as a string literal instead of a int literal */
-#define DBUS_TYPE_INT16_AS_STRING          "n"
-/** Type code marking a 16-bit unsigned integer */
-#define DBUS_TYPE_UINT16        ((int) 'q')
-/** #DBUS_TYPE_UINT16 as a string literal instead of a int literal */
-#define DBUS_TYPE_UINT16_AS_STRING         "q"
-/** Type code marking a 32-bit signed integer */
-#define DBUS_TYPE_INT32         ((int) 'i')
-/** #DBUS_TYPE_INT32 as a string literal instead of a int literal */
-#define DBUS_TYPE_INT32_AS_STRING          "i"
-/** Type code marking a 32-bit unsigned integer */
-#define DBUS_TYPE_UINT32        ((int) 'u')
-/** #DBUS_TYPE_UINT32 as a string literal instead of a int literal */
-#define DBUS_TYPE_UINT32_AS_STRING         "u"
-/** Type code marking a 64-bit signed integer */
-#define DBUS_TYPE_INT64         ((int) 'x')
-/** #DBUS_TYPE_INT64 as a string literal instead of a int literal */
-#define DBUS_TYPE_INT64_AS_STRING          "x"
-/** Type code marking a 64-bit unsigned integer */
-#define DBUS_TYPE_UINT64        ((int) 't')
-/** #DBUS_TYPE_UINT64 as a string literal instead of a int literal */
-#define DBUS_TYPE_UINT64_AS_STRING         "t"
-/** Type code marking an 8-byte double in IEEE 754 format */
-#define DBUS_TYPE_DOUBLE        ((int) 'd')
-/** #DBUS_TYPE_DOUBLE as a string literal instead of a int literal */
-#define DBUS_TYPE_DOUBLE_AS_STRING         "d"
-/** Type code marking a UTF-8 encoded, nul-terminated Unicode string */
-#define DBUS_TYPE_STRING        ((int) 's')
-/** #DBUS_TYPE_STRING as a string literal instead of a int literal */
-#define DBUS_TYPE_STRING_AS_STRING         "s"
-/** Type code marking a D-Bus object path */
-#define DBUS_TYPE_OBJECT_PATH   ((int) 'o')
-/** #DBUS_TYPE_OBJECT_PATH as a string literal instead of a int literal */
-#define DBUS_TYPE_OBJECT_PATH_AS_STRING    "o"
-/** Type code marking a D-Bus type signature */
-#define DBUS_TYPE_SIGNATURE     ((int) 'g')
-/** #DBUS_TYPE_SIGNATURE as a string literal instead of a int literal */
-#define DBUS_TYPE_SIGNATURE_AS_STRING      "g"
-/** Type code marking a unix file descriptor */
-#define DBUS_TYPE_UNIX_FD      ((int) 'h')
-/** #DBUS_TYPE_UNIX_FD as a string literal instead of a int literal */
-#define DBUS_TYPE_UNIX_FD_AS_STRING        "h"
-
-/* Compound types */
-/** Type code marking a D-Bus array type */
-#define DBUS_TYPE_ARRAY         ((int) 'a')
-/** #DBUS_TYPE_ARRAY as a string literal instead of a int literal */
-#define DBUS_TYPE_ARRAY_AS_STRING          "a"
-/** Type code marking a D-Bus variant type */
-#define DBUS_TYPE_VARIANT       ((int) 'v')
-/** #DBUS_TYPE_VARIANT as a string literal instead of a int literal */
-#define DBUS_TYPE_VARIANT_AS_STRING        "v"
-
-/** STRUCT and DICT_ENTRY are sort of special since their codes can't
- * appear in a type string, instead
- * DBUS_STRUCT_BEGIN_CHAR/DBUS_DICT_ENTRY_BEGIN_CHAR have to appear
- */
-/** Type code used to represent a struct; however, this type code does not appear
- * in type signatures, instead #DBUS_STRUCT_BEGIN_CHAR and #DBUS_STRUCT_END_CHAR will
- * appear in a signature.
- */
-#define DBUS_TYPE_STRUCT        ((int) 'r')
-/** #DBUS_TYPE_STRUCT as a string literal instead of a int literal */
-#define DBUS_TYPE_STRUCT_AS_STRING         "r"
-/** Type code used to represent a dict entry; however, this type code does not appear
- * in type signatures, instead #DBUS_DICT_ENTRY_BEGIN_CHAR and #DBUS_DICT_ENTRY_END_CHAR will
- * appear in a signature.
- */
-#define DBUS_TYPE_DICT_ENTRY    ((int) 'e')
-/** #DBUS_TYPE_DICT_ENTRY as a string literal instead of a int literal */
-#define DBUS_TYPE_DICT_ENTRY_AS_STRING     "e"
-
-/** Does not include #DBUS_TYPE_INVALID, #DBUS_STRUCT_BEGIN_CHAR, #DBUS_STRUCT_END_CHAR,
- * #DBUS_DICT_ENTRY_BEGIN_CHAR, or #DBUS_DICT_ENTRY_END_CHAR - i.e. it is the number of
- * valid types, not the number of distinct characters that may appear in a type signature.
- */
-#define DBUS_NUMBER_OF_TYPES    (16)
-
-/* characters other than typecodes that appear in type signatures */
-
-/** Code marking the start of a struct type in a type signature */
-#define DBUS_STRUCT_BEGIN_CHAR   ((int) '(')
-/** #DBUS_STRUCT_BEGIN_CHAR as a string literal instead of a int literal */
-#define DBUS_STRUCT_BEGIN_CHAR_AS_STRING   "("
-/** Code marking the end of a struct type in a type signature */
-#define DBUS_STRUCT_END_CHAR     ((int) ')')
-/** #DBUS_STRUCT_END_CHAR a string literal instead of a int literal */
-#define DBUS_STRUCT_END_CHAR_AS_STRING     ")"
-/** Code marking the start of a dict entry type in a type signature */
-#define DBUS_DICT_ENTRY_BEGIN_CHAR   ((int) '{')
-/** #DBUS_DICT_ENTRY_BEGIN_CHAR as a string literal instead of a int literal */
-#define DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING   "{"
-/** Code marking the end of a dict entry type in a type signature */
-#define DBUS_DICT_ENTRY_END_CHAR     ((int) '}')
-/** #DBUS_DICT_ENTRY_END_CHAR as a string literal instead of a int literal */
-#define DBUS_DICT_ENTRY_END_CHAR_AS_STRING     "}"
-
-/** Max length in bytes of a bus name, interface, or member (not object
- * path, paths are unlimited). This is limited because lots of stuff
- * is O(n) in this number, plus it would be obnoxious to type in a
- * paragraph-long method name so most likely something like that would
- * be an exploit.
- */
-#define DBUS_MAXIMUM_NAME_LENGTH 255
-
-/** This one is 255 so it fits in a byte */
-#define DBUS_MAXIMUM_SIGNATURE_LENGTH 255
-
-/** Max length of a match rule string; to keep people from hosing the
- * daemon with some huge rule
- */
-#define DBUS_MAXIMUM_MATCH_RULE_LENGTH 1024
-
-/** Max arg number you can match on in a match rule, e.g.
- * arg0='hello' is OK, arg3489720987='hello' is not
- */
-#define DBUS_MAXIMUM_MATCH_RULE_ARG_NUMBER 63
-  
-/** Max length of a marshaled array in bytes (64M, 2^26) We use signed
- * int for lengths so must be INT_MAX or less.  We need something a
- * bit smaller than INT_MAX because the array is inside a message with
- * header info, etc.  so an INT_MAX array wouldn't allow the message
- * overhead.  The 64M number is an attempt at a larger number than
- * we'd reasonably ever use, but small enough that your bus would chew
- * through it fairly quickly without locking up forever. If you have
- * data that's likely to be larger than this, you should probably be
- * sending it in multiple incremental messages anyhow.
- */
-#define DBUS_MAXIMUM_ARRAY_LENGTH (67108864)
-/** Number of bits you need in an unsigned to store the max array size */
-#define DBUS_MAXIMUM_ARRAY_LENGTH_BITS 26
-
-/** The maximum total message size including header and body; similar
- * rationale to max array size.
- */
-#define DBUS_MAXIMUM_MESSAGE_LENGTH (DBUS_MAXIMUM_ARRAY_LENGTH * 2)
-/** Number of bits you need in an unsigned to store the max message size */
-#define DBUS_MAXIMUM_MESSAGE_LENGTH_BITS 27
-
-/** The maximum total number of unix fds in a message. Similar
- * rationale as DBUS_MAXIMUM_MESSAGE_LENGTH. However we divide by four
- * given that one fd is an int and hence at least 32 bits.
- */
-#define DBUS_MAXIMUM_MESSAGE_UNIX_FDS (DBUS_MAXIMUM_MESSAGE_LENGTH/4)
-/** Number of bits you need in an unsigned to store the max message unix fds */
-#define DBUS_MAXIMUM_MESSAGE_UNIX_FDS_BITS (DBUS_MAXIMUM_MESSAGE_LENGTH_BITS-2)
-
-/** Depth of recursion in the type tree. This is automatically limited
- * to DBUS_MAXIMUM_SIGNATURE_LENGTH since you could only have an array
- * of array of array of ... that fit in the max signature.  But that's
- * probably a bit too large.
- */
-#define DBUS_MAXIMUM_TYPE_RECURSION_DEPTH 32
-
-/* Types of message */
-
-/** This value is never a valid message type, see dbus_message_get_type() */
-#define DBUS_MESSAGE_TYPE_INVALID       0
-/** Message type of a method call message, see dbus_message_get_type() */
-#define DBUS_MESSAGE_TYPE_METHOD_CALL   1
-/** Message type of a method return message, see dbus_message_get_type() */
-#define DBUS_MESSAGE_TYPE_METHOD_RETURN 2
-/** Message type of an error reply message, see dbus_message_get_type() */
-#define DBUS_MESSAGE_TYPE_ERROR         3
-/** Message type of a signal message, see dbus_message_get_type() */
-#define DBUS_MESSAGE_TYPE_SIGNAL        4
-
-#define DBUS_NUM_MESSAGE_TYPES          5
-
-/* Header flags */
-
-/** If set, this flag means that the sender of a message does not care about getting
- * a reply, so the recipient need not send one. See dbus_message_set_no_reply().
- */
-#define DBUS_HEADER_FLAG_NO_REPLY_EXPECTED 0x1
-/**
- * If set, this flag means that even if the message bus knows how to start an owner for
- * the destination bus name (see dbus_message_set_destination()), it should not
- * do so. If this flag is not set, the bus may launch a program to process the
- * message.
- */
-#define DBUS_HEADER_FLAG_NO_AUTO_START     0x2
-
-/* Header fields */
-
-/** Not equal to any valid header field code */
-#define DBUS_HEADER_FIELD_INVALID        0
-/** Header field code for the path - the path is the object emitting a signal or the object receiving a method call.
- * See dbus_message_set_path().
- */
-#define DBUS_HEADER_FIELD_PATH           1
-/** Header field code for the interface containing a member (method or signal).
- * See dbus_message_set_interface().
- */
-#define DBUS_HEADER_FIELD_INTERFACE      2
-/** Header field code for a member (method or signal). See dbus_message_set_member(). */
-#define DBUS_HEADER_FIELD_MEMBER         3
-/** Header field code for an error name (found in #DBUS_MESSAGE_TYPE_ERROR messages).
- * See dbus_message_set_error_name().
- */
-#define DBUS_HEADER_FIELD_ERROR_NAME     4
-/** Header field code for a reply serial, used to match a #DBUS_MESSAGE_TYPE_METHOD_RETURN message with the
- * message that it's a reply to. See dbus_message_set_reply_serial().
- */
-#define DBUS_HEADER_FIELD_REPLY_SERIAL   5
-/**
- * Header field code for the destination bus name of a message. See dbus_message_set_destination().
- */
-#define DBUS_HEADER_FIELD_DESTINATION    6
-/**
- * Header field code for the sender of a message; usually initialized by the message bus.
- * See dbus_message_set_sender().
- */
-#define DBUS_HEADER_FIELD_SENDER         7
-/**
- * Header field code for the type signature of a message.
- */
-#define DBUS_HEADER_FIELD_SIGNATURE      8
-/**
- * Header field code for the number of unix file descriptors associated
- * with this message.
- */
-#define DBUS_HEADER_FIELD_UNIX_FDS       9
-
-
-/**
- * Value of the highest-numbered header field code, can be used to determine
- * the size of an array indexed by header field code. Remember though
- * that unknown codes must be ignored, so check for that before
- * indexing the array.
- */
-#define DBUS_HEADER_FIELD_LAST DBUS_HEADER_FIELD_UNIX_FDS
-
-/** Header format is defined as a signature:
- *   byte                            byte order
- *   byte                            message type ID
- *   byte                            flags
- *   byte                            protocol version
- *   uint32                          body length
- *   uint32                          serial
- *   array of struct (byte,variant)  (field name, value)
- *
- * The length of the header can be computed as the
- * fixed size of the initial data, plus the length of
- * the array at the end, plus padding to an 8-boundary.
- */
-#define DBUS_HEADER_SIGNATURE                   \
-     DBUS_TYPE_BYTE_AS_STRING                   \
-     DBUS_TYPE_BYTE_AS_STRING                   \
-     DBUS_TYPE_BYTE_AS_STRING                   \
-     DBUS_TYPE_BYTE_AS_STRING                   \
-     DBUS_TYPE_UINT32_AS_STRING                 \
-     DBUS_TYPE_UINT32_AS_STRING                 \
-     DBUS_TYPE_ARRAY_AS_STRING                  \
-     DBUS_STRUCT_BEGIN_CHAR_AS_STRING           \
-     DBUS_TYPE_BYTE_AS_STRING                   \
-     DBUS_TYPE_VARIANT_AS_STRING                \
-     DBUS_STRUCT_END_CHAR_AS_STRING
-
-
-/**
- * The smallest header size that can occur.  (It won't be valid due to
- * missing required header fields.) This is 4 bytes, two uint32, an
- * array length. This isn't any kind of resource limit, just the
- * necessary/logical outcome of the header signature.
- */
-#define DBUS_MINIMUM_HEADER_SIZE 16
-
-/* Errors */
-/* WARNING these get autoconverted to an enum in dbus-glib.h. Thus,
- * if you change the order it breaks the ABI. Keep them in order.
- * Also, don't change the formatting since that will break the sed
- * script.
- */
-/** A generic error; "something went wrong" - see the error message for more. */
-#define DBUS_ERROR_FAILED                     "org.freedesktop.DBus.Error.Failed"
-/** There was not enough memory to complete an operation. */
-#define DBUS_ERROR_NO_MEMORY                  "org.freedesktop.DBus.Error.NoMemory"
-/** The bus doesn't know how to launch a service to supply the bus name you wanted. */
-#define DBUS_ERROR_SERVICE_UNKNOWN            "org.freedesktop.DBus.Error.ServiceUnknown"
-/** The bus name you referenced doesn't exist (i.e. no application owns it). */
-#define DBUS_ERROR_NAME_HAS_NO_OWNER          "org.freedesktop.DBus.Error.NameHasNoOwner"
-/** No reply to a message expecting one, usually means a timeout occurred. */
-#define DBUS_ERROR_NO_REPLY                   "org.freedesktop.DBus.Error.NoReply"
-/** Something went wrong reading or writing to a socket, for example. */
-#define DBUS_ERROR_IO_ERROR                   "org.freedesktop.DBus.Error.IOError"
-/** A D-Bus bus address was malformed. */
-#define DBUS_ERROR_BAD_ADDRESS                "org.freedesktop.DBus.Error.BadAddress"
-/** Requested operation isn't supported (like ENOSYS on UNIX). */
-#define DBUS_ERROR_NOT_SUPPORTED              "org.freedesktop.DBus.Error.NotSupported"
-/** Some limited resource is exhausted. */
-#define DBUS_ERROR_LIMITS_EXCEEDED            "org.freedesktop.DBus.Error.LimitsExceeded"
-/** Security restrictions don't allow doing what you're trying to do. */
-#define DBUS_ERROR_ACCESS_DENIED              "org.freedesktop.DBus.Error.AccessDenied"
-/** Authentication didn't work. */
-#define DBUS_ERROR_AUTH_FAILED                "org.freedesktop.DBus.Error.AuthFailed"
-/** Unable to connect to server (probably caused by ECONNREFUSED on a socket). */
-#define DBUS_ERROR_NO_SERVER                  "org.freedesktop.DBus.Error.NoServer"
-/** Certain timeout errors, possibly ETIMEDOUT on a socket.
- * Note that #DBUS_ERROR_NO_REPLY is used for message reply timeouts.
- * @warning this is confusingly-named given that #DBUS_ERROR_TIMED_OUT also exists. We can't fix
- * it for compatibility reasons so just be careful.
- */
-#define DBUS_ERROR_TIMEOUT                    "org.freedesktop.DBus.Error.Timeout"
-/** No network access (probably ENETUNREACH on a socket). */
-#define DBUS_ERROR_NO_NETWORK                 "org.freedesktop.DBus.Error.NoNetwork"
-/** Can't bind a socket since its address is in use (i.e. EADDRINUSE). */
-#define DBUS_ERROR_ADDRESS_IN_USE             "org.freedesktop.DBus.Error.AddressInUse"
-/** The connection is disconnected and you're trying to use it. */
-#define DBUS_ERROR_DISCONNECTED               "org.freedesktop.DBus.Error.Disconnected"
-/** Invalid arguments passed to a method call. */
-#define DBUS_ERROR_INVALID_ARGS               "org.freedesktop.DBus.Error.InvalidArgs"
-/** Missing file. */
-#define DBUS_ERROR_FILE_NOT_FOUND             "org.freedesktop.DBus.Error.FileNotFound"
-/** Existing file and the operation you're using does not silently overwrite. */
-#define DBUS_ERROR_FILE_EXISTS                "org.freedesktop.DBus.Error.FileExists"
-/** Method name you invoked isn't known by the object you invoked it on. */
-#define DBUS_ERROR_UNKNOWN_METHOD             "org.freedesktop.DBus.Error.UnknownMethod"
-/** Certain timeout errors, e.g. while starting a service.
- * @warning this is confusingly-named given that #DBUS_ERROR_TIMEOUT also exists. We can't fix
- * it for compatibility reasons so just be careful.
- */
-#define DBUS_ERROR_TIMED_OUT                  "org.freedesktop.DBus.Error.TimedOut"
-/** Tried to remove or modify a match rule that didn't exist. */
-#define DBUS_ERROR_MATCH_RULE_NOT_FOUND       "org.freedesktop.DBus.Error.MatchRuleNotFound"
-/** The match rule isn't syntactically valid. */
-#define DBUS_ERROR_MATCH_RULE_INVALID         "org.freedesktop.DBus.Error.MatchRuleInvalid"
-/** While starting a new process, the exec() call failed. */
-#define DBUS_ERROR_SPAWN_EXEC_FAILED          "org.freedesktop.DBus.Error.Spawn.ExecFailed"
-/** While starting a new process, the fork() call failed. */
-#define DBUS_ERROR_SPAWN_FORK_FAILED          "org.freedesktop.DBus.Error.Spawn.ForkFailed"
-/** While starting a new process, the child exited with a status code. */
-#define DBUS_ERROR_SPAWN_CHILD_EXITED         "org.freedesktop.DBus.Error.Spawn.ChildExited"
-/** While starting a new process, the child exited on a signal. */
-#define DBUS_ERROR_SPAWN_CHILD_SIGNALED       "org.freedesktop.DBus.Error.Spawn.ChildSignaled"
-/** While starting a new process, something went wrong. */
-#define DBUS_ERROR_SPAWN_FAILED               "org.freedesktop.DBus.Error.Spawn.Failed"
-/** We failed to setup the environment correctly. */
-#define DBUS_ERROR_SPAWN_SETUP_FAILED         "org.freedesktop.DBus.Error.Spawn.FailedToSetup"
-/** We failed to setup the config parser correctly. */
-#define DBUS_ERROR_SPAWN_CONFIG_INVALID       "org.freedesktop.DBus.Error.Spawn.ConfigInvalid"
-/** Bus name was not valid. */
-#define DBUS_ERROR_SPAWN_SERVICE_INVALID      "org.freedesktop.DBus.Error.Spawn.ServiceNotValid"
-/** Service file not found in system-services directory. */
-#define DBUS_ERROR_SPAWN_SERVICE_NOT_FOUND    "org.freedesktop.DBus.Error.Spawn.ServiceNotFound"
-/** Permissions are incorrect on the setuid helper. */
-#define DBUS_ERROR_SPAWN_PERMISSIONS_INVALID  "org.freedesktop.DBus.Error.Spawn.PermissionsInvalid"
-/** Service file invalid (Name, User or Exec missing). */
-#define DBUS_ERROR_SPAWN_FILE_INVALID         "org.freedesktop.DBus.Error.Spawn.FileInvalid"
-/** Tried to get a UNIX process ID and it wasn't available. */
-#define DBUS_ERROR_SPAWN_NO_MEMORY            "org.freedesktop.DBus.Error.Spawn.NoMemory"
-/** Tried to get a UNIX process ID and it wasn't available. */
-#define DBUS_ERROR_UNIX_PROCESS_ID_UNKNOWN    "org.freedesktop.DBus.Error.UnixProcessIdUnknown"
-/** A type signature is not valid. */
-#define DBUS_ERROR_INVALID_SIGNATURE          "org.freedesktop.DBus.Error.InvalidSignature"
-/** A file contains invalid syntax or is otherwise broken. */
-#define DBUS_ERROR_INVALID_FILE_CONTENT       "org.freedesktop.DBus.Error.InvalidFileContent"
-/** Asked for SELinux security context and it wasn't available. */
-#define DBUS_ERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN    "org.freedesktop.DBus.Error.SELinuxSecurityContextUnknown"
-/** Asked for ADT audit data and it wasn't available. */
-#define DBUS_ERROR_ADT_AUDIT_DATA_UNKNOWN     "org.freedesktop.DBus.Error.AdtAuditDataUnknown"
-/** There's already an object with the requested object path. */
-#define DBUS_ERROR_OBJECT_PATH_IN_USE         "org.freedesktop.DBus.Error.ObjectPathInUse"
-/** The message meta data does not match the payload. e.g. expected
-    number of file descriptors were not sent over the socket this message was received on. */
-#define DBUS_ERROR_INCONSISTENT_MESSAGE       "org.freedesktop.DBus.Error.InconsistentMessage"
-
-/* XML introspection format */
-
-/** XML namespace of the introspection format version 1.0 */
-#define DBUS_INTROSPECT_1_0_XML_NAMESPACE         "http://www.freedesktop.org/standards/dbus"
-/** XML public identifier of the introspection format version 1.0 */
-#define DBUS_INTROSPECT_1_0_XML_PUBLIC_IDENTIFIER "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
-/** XML system identifier of the introspection format version 1.0 */
-#define DBUS_INTROSPECT_1_0_XML_SYSTEM_IDENTIFIER "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"
-/** XML document type declaration of the introspection format version 1.0 */
-#define DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE "<!DOCTYPE node PUBLIC \""DBUS_INTROSPECT_1_0_XML_PUBLIC_IDENTIFIER"\"\n\""DBUS_INTROSPECT_1_0_XML_SYSTEM_IDENTIFIER"\">\n"
-
-/** @} */
-
-#ifdef __cplusplus
-#if 0
-{ /* avoids confusing emacs indentation */
-#endif
-}
-#endif
-
-#endif /* DBUS_PROTOCOL_H */
diff --git a/lib-x86-64/include/dbus-1.0/dbus/dbus-server.h b/lib-x86-64/include/dbus-1.0/dbus/dbus-server.h
deleted file mode 100644
index bdbefa0f..00000000
--- a/lib-x86-64/include/dbus-1.0/dbus/dbus-server.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-server.h DBusServer object
- *
- * Copyright (C) 2002, 2003  Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#if !defined (DBUS_INSIDE_DBUS_H) && !defined (DBUS_COMPILATION)
-#error "Only <dbus/dbus.h> can be included directly, this file may disappear or change contents."
-#endif
-
-#ifndef DBUS_SERVER_H
-#define DBUS_SERVER_H
-
-#include <dbus/dbus-errors.h>
-#include <dbus/dbus-message.h>
-#include <dbus/dbus-connection.h>
-#include <dbus/dbus-protocol.h>
-
-DBUS_BEGIN_DECLS
-
-/**
- * @addtogroup DBusServer
- * @{
- */
-
-typedef struct DBusServer DBusServer;
-
-/** Called when a new connection to the server is available. Must reference and save the new
- * connection, or close the new connection. Set with dbus_server_set_new_connection_function().
- */
-typedef void (* DBusNewConnectionFunction) (DBusServer     *server,
-                                            DBusConnection *new_connection,
-                                            void           *data);
-
-DBUS_EXPORT
-DBusServer* dbus_server_listen           (const char     *address,
-                                          DBusError      *error);
-DBUS_EXPORT
-DBusServer* dbus_server_ref              (DBusServer     *server);
-DBUS_EXPORT
-void        dbus_server_unref            (DBusServer     *server);
-DBUS_EXPORT
-void        dbus_server_disconnect       (DBusServer     *server);
-DBUS_EXPORT
-dbus_bool_t dbus_server_get_is_connected (DBusServer     *server);
-DBUS_EXPORT
-char*       dbus_server_get_address      (DBusServer     *server);
-DBUS_EXPORT
-char*       dbus_server_get_id           (DBusServer     *server);
-DBUS_EXPORT
-void        dbus_server_set_new_connection_function (DBusServer                *server,
-                                                     DBusNewConnectionFunction  function,
-                                                     void                      *data,
-                                                     DBusFreeFunction           free_data_function);
-DBUS_EXPORT
-dbus_bool_t dbus_server_set_watch_functions         (DBusServer                *server,
-                                                     DBusAddWatchFunction       add_function,
-                                                     DBusRemoveWatchFunction    remove_function,
-                                                     DBusWatchToggledFunction   toggled_function,
-                                                     void                      *data,
-                                                     DBusFreeFunction           free_data_function);
-DBUS_EXPORT
-dbus_bool_t dbus_server_set_timeout_functions       (DBusServer                *server,
-                                                     DBusAddTimeoutFunction     add_function,
-                                                     DBusRemoveTimeoutFunction  remove_function,
-                                                     DBusTimeoutToggledFunction toggled_function,
-                                                     void                      *data,
-                                                     DBusFreeFunction           free_data_function);
-DBUS_EXPORT
-dbus_bool_t dbus_server_set_auth_mechanisms         (DBusServer                *server,
-                                                     const char               **mechanisms);
-
-DBUS_EXPORT
-dbus_bool_t dbus_server_allocate_data_slot (dbus_int32_t     *slot_p);
-DBUS_EXPORT
-void        dbus_server_free_data_slot     (dbus_int32_t     *slot_p);
-DBUS_EXPORT
-dbus_bool_t dbus_server_set_data           (DBusServer       *server,
-                                            int               slot,
-                                            void             *data,
-                                            DBusFreeFunction  free_data_func);
-DBUS_EXPORT
-void*       dbus_server_get_data           (DBusServer       *server,
-                                            int               slot);
-
-/** @} */
-
-DBUS_END_DECLS
-
-#endif /* DBUS_SERVER_H */
diff --git a/lib-x86-64/include/dbus-1.0/dbus/dbus-shared.h b/lib-x86-64/include/dbus-1.0/dbus/dbus-shared.h
deleted file mode 100644
index 6a576704..00000000
--- a/lib-x86-64/include/dbus-1.0/dbus/dbus-shared.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-shared.h  Stuff used by both dbus/dbus.h low-level and C/C++ binding APIs
- *
- * Copyright (C) 2004 Red Hat, Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef DBUS_SHARED_H
-#define DBUS_SHARED_H
-
-/* Don't include anything in here from anywhere else. It's
- * intended for use by any random library.
- */
-
-#ifdef  __cplusplus
-extern "C" {
-#if 0
-} /* avoids confusing emacs indentation */
-#endif
-#endif
-
-/* Normally docs are in .c files, but there isn't a .c file for this. */
-/**
- * @defgroup DBusShared Shared constants 
- * @ingroup  DBus
- *
- * @brief Shared header included by both libdbus and C/C++ bindings such as the GLib bindings.
- *
- * Usually a C/C++ binding such as the GLib or Qt binding won't want to include dbus.h in its
- * public headers. However, a few constants and macros may be useful to include; those are
- * found here and in dbus-protocol.h
- *
- * @{
- */
-
-
-/**
- * Well-known bus types. See dbus_bus_get().
- */
-typedef enum
-{
-  DBUS_BUS_SESSION,    /**< The login session bus */
-  DBUS_BUS_SYSTEM,     /**< The systemwide bus */
-  DBUS_BUS_STARTER     /**< The bus that started us, if any */
-} DBusBusType;
-
-/**
- * Results that a message handler can return.
- */
-typedef enum
-{
-  DBUS_HANDLER_RESULT_HANDLED,         /**< Message has had its effect - no need to run more handlers. */ 
-  DBUS_HANDLER_RESULT_NOT_YET_HANDLED, /**< Message has not had any effect - see if other handlers want it. */
-  DBUS_HANDLER_RESULT_NEED_MEMORY      /**< Need more memory in order to return #DBUS_HANDLER_RESULT_HANDLED or #DBUS_HANDLER_RESULT_NOT_YET_HANDLED. Please try again later with more memory. */
-} DBusHandlerResult;
-
-/* Bus names */
-
-/** The bus name used to talk to the bus itself. */
-#define DBUS_SERVICE_DBUS      "org.freedesktop.DBus"
-
-/* Paths */
-/** The object path used to talk to the bus itself. */
-#define DBUS_PATH_DBUS  "/org/freedesktop/DBus"
-/** The object path used in local/in-process-generated messages. */
-#define DBUS_PATH_LOCAL "/org/freedesktop/DBus/Local"
-
-/* Interfaces, these #define don't do much other than
- * catch typos at compile time
- */
-/** The interface exported by the object with #DBUS_SERVICE_DBUS and #DBUS_PATH_DBUS */
-#define DBUS_INTERFACE_DBUS           "org.freedesktop.DBus"
-/** The interface supported by introspectable objects */
-#define DBUS_INTERFACE_INTROSPECTABLE "org.freedesktop.DBus.Introspectable"
-/** The interface supported by objects with properties */
-#define DBUS_INTERFACE_PROPERTIES     "org.freedesktop.DBus.Properties"
-/** The interface supported by most dbus peers */
-#define DBUS_INTERFACE_PEER           "org.freedesktop.DBus.Peer"
-
-/** This is a special interface whose methods can only be invoked
- * by the local implementation (messages from remote apps aren't
- * allowed to specify this interface).
- */
-#define DBUS_INTERFACE_LOCAL "org.freedesktop.DBus.Local"
-
-/* Owner flags */
-#define DBUS_NAME_FLAG_ALLOW_REPLACEMENT 0x1 /**< Allow another service to become the primary owner if requested */
-#define DBUS_NAME_FLAG_REPLACE_EXISTING  0x2 /**< Request to replace the current primary owner */
-#define DBUS_NAME_FLAG_DO_NOT_QUEUE      0x4 /**< If we can not become the primary owner do not place us in the queue */
-
-/* Replies to request for a name */
-#define DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER  1 /**< Service has become the primary owner of the requested name */
-#define DBUS_REQUEST_NAME_REPLY_IN_QUEUE       2 /**< Service could not become the primary owner and has been placed in the queue */
-#define DBUS_REQUEST_NAME_REPLY_EXISTS         3 /**< Service is already in the queue */
-#define DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER  4 /**< Service is already the primary owner */
-
-/* Replies to releasing a name */
-#define DBUS_RELEASE_NAME_REPLY_RELEASED        1 /**< Service was released from the given name */
-#define DBUS_RELEASE_NAME_REPLY_NON_EXISTENT    2 /**< The given name does not exist on the bus */
-#define DBUS_RELEASE_NAME_REPLY_NOT_OWNER       3 /**< Service is not an owner of the given name */
-
-/* Replies to service starts */
-#define DBUS_START_REPLY_SUCCESS         1 /**< Service was auto started */
-#define DBUS_START_REPLY_ALREADY_RUNNING 2 /**< Service was already running */
-
-/** @} */
-
-#ifdef __cplusplus
-#if 0
-{ /* avoids confusing emacs indentation */
-#endif
-}
-#endif
-
-#endif /* DBUS_SHARED_H */
diff --git a/lib-x86-64/include/dbus-1.0/dbus/dbus-signature.h b/lib-x86-64/include/dbus-1.0/dbus/dbus-signature.h
deleted file mode 100644
index ebf00c1e..00000000
--- a/lib-x86-64/include/dbus-1.0/dbus/dbus-signature.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-signatures.h utility functions for D-Bus types
- *
- * Copyright (C) 2005 Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#if !defined (DBUS_INSIDE_DBUS_H) && !defined (DBUS_COMPILATION)
-#error "Only <dbus/dbus.h> can be included directly, this file may disappear or change contents."
-#endif
-
-#ifndef DBUS_SIGNATURES_H
-#define DBUS_SIGNATURES_H
-
-#include <dbus/dbus-macros.h>
-#include <dbus/dbus-types.h>
-#include <dbus/dbus-errors.h>
-
-DBUS_BEGIN_DECLS
-
-/**
- * @addtogroup DBusSignature
- * @{
- */
-
-/**
- * DBusSignatureIter struct; contains no public fields 
- */
-typedef struct
-{ 
-  void *dummy1;         /**< Don't use this */
-  void *dummy2;         /**< Don't use this */
-  dbus_uint32_t dummy8; /**< Don't use this */
-  int dummy12;           /**< Don't use this */
-  int dummy17;           /**< Don't use this */
-} DBusSignatureIter;
-
-DBUS_EXPORT
-void            dbus_signature_iter_init             (DBusSignatureIter       *iter,
-						      const char              *signature);
-
-DBUS_EXPORT
-int             dbus_signature_iter_get_current_type (const DBusSignatureIter *iter);
-
-DBUS_EXPORT
-char *          dbus_signature_iter_get_signature    (const DBusSignatureIter *iter);
-
-DBUS_EXPORT
-int             dbus_signature_iter_get_element_type (const DBusSignatureIter *iter);
-
-DBUS_EXPORT
-dbus_bool_t     dbus_signature_iter_next             (DBusSignatureIter       *iter);
-
-DBUS_EXPORT
-void            dbus_signature_iter_recurse          (const DBusSignatureIter *iter,
-						      DBusSignatureIter       *subiter);
-
-DBUS_EXPORT
-dbus_bool_t     dbus_signature_validate              (const char       *signature,
-						      DBusError        *error);
-
-DBUS_EXPORT
-dbus_bool_t     dbus_signature_validate_single       (const char       *signature,
-						      DBusError        *error);
-
-DBUS_EXPORT
-dbus_bool_t     dbus_type_is_basic                   (int            typecode);
-DBUS_EXPORT
-dbus_bool_t     dbus_type_is_container               (int            typecode);
-DBUS_EXPORT
-dbus_bool_t     dbus_type_is_fixed                   (int            typecode);
-
-/** @} */
-
-DBUS_END_DECLS
-
-#endif /* DBUS_SIGNATURE_H */
diff --git a/lib-x86-64/include/dbus-1.0/dbus/dbus-threads.h b/lib-x86-64/include/dbus-1.0/dbus/dbus-threads.h
deleted file mode 100644
index ba07ca57..00000000
--- a/lib-x86-64/include/dbus-1.0/dbus/dbus-threads.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-threads.h  D-Bus threads handling
- *
- * Copyright (C) 2002  Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#if !defined (DBUS_INSIDE_DBUS_H) && !defined (DBUS_COMPILATION)
-#error "Only <dbus/dbus.h> can be included directly, this file may disappear or change contents."
-#endif
-
-#ifndef DBUS_THREADS_H
-#define DBUS_THREADS_H
-
-#include <dbus/dbus-macros.h>
-#include <dbus/dbus-types.h>
-
-DBUS_BEGIN_DECLS
-
-/**
- * @addtogroup DBusThreads
- * @{
- */
-
-/** An opaque mutex type provided by the #DBusThreadFunctions implementation installed by dbus_threads_init(). */
-typedef struct DBusMutex DBusMutex;
-/** An opaque condition variable type provided by the #DBusThreadFunctions implementation installed by dbus_threads_init(). */
-typedef struct DBusCondVar DBusCondVar;
-
-/** Deprecated, provide DBusRecursiveMutexNewFunction instead. */
-typedef DBusMutex*  (* DBusMutexNewFunction)    (void);
-/** Deprecated, provide DBusRecursiveMutexFreeFunction instead. */
-typedef void        (* DBusMutexFreeFunction)   (DBusMutex *mutex);
-/** Deprecated, provide DBusRecursiveMutexLockFunction instead. Return value is lock success, but gets ignored in practice. */
-typedef dbus_bool_t (* DBusMutexLockFunction)   (DBusMutex *mutex);
-/** Deprecated, provide DBusRecursiveMutexUnlockFunction instead. Return value is unlock success, but gets ignored in practice. */
-typedef dbus_bool_t (* DBusMutexUnlockFunction) (DBusMutex *mutex);
-
-/** Creates a new recursively-lockable mutex, or returns #NULL if not
- * enough memory.  Can only fail due to lack of memory.  Found in
- * #DBusThreadFunctions. Do not just use PTHREAD_MUTEX_RECURSIVE for
- * this, because it does not save/restore the recursion count when
- * waiting on a condition. libdbus requires the Java-style behavior
- * where the mutex is fully unlocked to wait on a condition.
- */
-typedef DBusMutex*  (* DBusRecursiveMutexNewFunction)    (void);
-/** Frees a recursively-lockable mutex.  Found in #DBusThreadFunctions.
- */
-typedef void        (* DBusRecursiveMutexFreeFunction)   (DBusMutex *mutex);
-/** Locks a recursively-lockable mutex.  Found in #DBusThreadFunctions.
- * Can only fail due to lack of memory.
- */
-typedef void        (* DBusRecursiveMutexLockFunction)   (DBusMutex *mutex);
-/** Unlocks a recursively-lockable mutex.  Found in #DBusThreadFunctions.
- * Can only fail due to lack of memory.
- */
-typedef void        (* DBusRecursiveMutexUnlockFunction) (DBusMutex *mutex);
-
-/** Creates a new condition variable.  Found in #DBusThreadFunctions.
- * Can only fail (returning #NULL) due to lack of memory.
- */
-typedef DBusCondVar*  (* DBusCondVarNewFunction)         (void);
-/** Frees a condition variable.  Found in #DBusThreadFunctions.
- */
-typedef void          (* DBusCondVarFreeFunction)        (DBusCondVar *cond);
-
-/** Waits on a condition variable.  Found in
- * #DBusThreadFunctions. Must work with either a recursive or
- * nonrecursive mutex, whichever the thread implementation
- * provides. Note that PTHREAD_MUTEX_RECURSIVE does not work with
- * condition variables (does not save/restore the recursion count) so
- * don't try using simply pthread_cond_wait() and a
- * PTHREAD_MUTEX_RECURSIVE to implement this, it won't work right.
- *
- * Has no error conditions. Must succeed if it returns.
- */
-typedef void          (* DBusCondVarWaitFunction)        (DBusCondVar *cond,
-							  DBusMutex   *mutex);
-
-/** Waits on a condition variable with a timeout.  Found in
- *  #DBusThreadFunctions. Returns #TRUE if the wait did not
- *  time out, and #FALSE if it did.
- *
- * Has no error conditions. Must succeed if it returns. 
- */
-typedef dbus_bool_t   (* DBusCondVarWaitTimeoutFunction) (DBusCondVar *cond,
-							  DBusMutex   *mutex,
-							  int          timeout_milliseconds);
-/** Wakes one waiting thread on a condition variable.  Found in #DBusThreadFunctions.
- *
- * Has no error conditions. Must succeed if it returns.
- */
-typedef void          (* DBusCondVarWakeOneFunction) (DBusCondVar *cond);
-
-/** Wakes all waiting threads on a condition variable.  Found in #DBusThreadFunctions.
- *
- * Has no error conditions. Must succeed if it returns.
- */
-typedef void          (* DBusCondVarWakeAllFunction) (DBusCondVar *cond);
-
-/**
- * Flags indicating which functions are present in #DBusThreadFunctions. Used to allow
- * the library to detect older callers of dbus_threads_init() if new possible functions
- * are added to #DBusThreadFunctions.
- */
-typedef enum 
-{
-  DBUS_THREAD_FUNCTIONS_MUTEX_NEW_MASK      = 1 << 0,
-  DBUS_THREAD_FUNCTIONS_MUTEX_FREE_MASK     = 1 << 1,
-  DBUS_THREAD_FUNCTIONS_MUTEX_LOCK_MASK     = 1 << 2,
-  DBUS_THREAD_FUNCTIONS_MUTEX_UNLOCK_MASK   = 1 << 3,
-  DBUS_THREAD_FUNCTIONS_CONDVAR_NEW_MASK    = 1 << 4,
-  DBUS_THREAD_FUNCTIONS_CONDVAR_FREE_MASK   = 1 << 5,
-  DBUS_THREAD_FUNCTIONS_CONDVAR_WAIT_MASK   = 1 << 6,
-  DBUS_THREAD_FUNCTIONS_CONDVAR_WAIT_TIMEOUT_MASK   = 1 << 7,
-  DBUS_THREAD_FUNCTIONS_CONDVAR_WAKE_ONE_MASK = 1 << 8,
-  DBUS_THREAD_FUNCTIONS_CONDVAR_WAKE_ALL_MASK = 1 << 9,
-  DBUS_THREAD_FUNCTIONS_RECURSIVE_MUTEX_NEW_MASK    = 1 << 10,
-  DBUS_THREAD_FUNCTIONS_RECURSIVE_MUTEX_FREE_MASK   = 1 << 11,
-  DBUS_THREAD_FUNCTIONS_RECURSIVE_MUTEX_LOCK_MASK   = 1 << 12,
-  DBUS_THREAD_FUNCTIONS_RECURSIVE_MUTEX_UNLOCK_MASK = 1 << 13,
-  DBUS_THREAD_FUNCTIONS_ALL_MASK     = (1 << 14) - 1
-} DBusThreadFunctionsMask;
-
-/**
- * Functions that must be implemented to make the D-Bus library
- * thread-aware. The recursive mutex functions should be specified
- * rather than the old, deprecated nonrecursive ones.
- *
- * The condition variable functions have to work with recursive
- * mutexes if you provide those, or with nonrecursive mutexes if you
- * provide those.
- *
- * If implementing threads using pthreads, be aware that
- * PTHREAD_MUTEX_RECURSIVE is broken in combination with condition
- * variables. libdbus relies on the Java-style behavior that when
- * waiting on a condition, the recursion count is saved and restored,
- * and the mutex is completely unlocked, not just decremented one
- * level of recursion.
- *
- * Thus with pthreads you probably have to roll your own emulated
- * recursive mutexes, you can't use PTHREAD_MUTEX_RECURSIVE. This is
- * what dbus_threads_init_default() does on platforms that use
- * pthreads.
- */
-typedef struct
-{
-  unsigned int mask; /**< Mask indicating which functions are present. */
-
-  DBusMutexNewFunction mutex_new; /**< Function to create a mutex; optional and deprecated. */
-  DBusMutexFreeFunction mutex_free; /**< Function to free a mutex; optional and deprecated. */
-  DBusMutexLockFunction mutex_lock; /**< Function to lock a mutex; optional and deprecated. */
-  DBusMutexUnlockFunction mutex_unlock; /**< Function to unlock a mutex; optional and deprecated. */
-
-  DBusCondVarNewFunction condvar_new; /**< Function to create a condition variable */
-  DBusCondVarFreeFunction condvar_free; /**< Function to free a condition variable */
-  DBusCondVarWaitFunction condvar_wait; /**< Function to wait on a condition */
-  DBusCondVarWaitTimeoutFunction condvar_wait_timeout; /**< Function to wait on a condition with a timeout */
-  DBusCondVarWakeOneFunction condvar_wake_one; /**< Function to wake one thread waiting on the condition */
-  DBusCondVarWakeAllFunction condvar_wake_all; /**< Function to wake all threads waiting on the condition */
- 
-  DBusRecursiveMutexNewFunction recursive_mutex_new; /**< Function to create a recursive mutex */
-  DBusRecursiveMutexFreeFunction recursive_mutex_free; /**< Function to free a recursive mutex */
-  DBusRecursiveMutexLockFunction recursive_mutex_lock; /**< Function to lock a recursive mutex */
-  DBusRecursiveMutexUnlockFunction recursive_mutex_unlock; /**< Function to unlock a recursive mutex */
-
-  void (* padding1) (void); /**< Reserved for future expansion */
-  void (* padding2) (void); /**< Reserved for future expansion */
-  void (* padding3) (void); /**< Reserved for future expansion */
-  void (* padding4) (void); /**< Reserved for future expansion */
-  
-} DBusThreadFunctions;
-
-DBUS_EXPORT
-dbus_bool_t  dbus_threads_init         (const DBusThreadFunctions *functions);
-DBUS_EXPORT
-dbus_bool_t  dbus_threads_init_default (void);
-
-/** @} */
-
-DBUS_END_DECLS
-
-#endif /* DBUS_THREADS_H */
diff --git a/lib-x86-64/include/dbus-1.0/dbus/dbus-types.h b/lib-x86-64/include/dbus-1.0/dbus/dbus-types.h
deleted file mode 100644
index 54f348f3..00000000
--- a/lib-x86-64/include/dbus-1.0/dbus/dbus-types.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-types.h  types such as dbus_bool_t
- *
- * Copyright (C) 2002  Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#if !defined (DBUS_INSIDE_DBUS_H) && !defined (DBUS_COMPILATION)
-#error "Only <dbus/dbus.h> can be included directly, this file may disappear or change contents."
-#endif
-
-#ifndef DBUS_TYPES_H
-#define DBUS_TYPES_H
-
-#include <stddef.h>
-#include <dbus/dbus-arch-deps.h>
-
-typedef dbus_uint32_t  dbus_unichar_t;
-/* boolean size must be fixed at 4 bytes due to wire protocol! */
-typedef dbus_uint32_t  dbus_bool_t;
-
-/* Normally docs are in .c files, but there isn't a .c file for this. */
-/**
- * @defgroup DBusTypes Basic types
- * @ingroup  DBus
- * @brief dbus_bool_t, dbus_int32_t, etc.
- *
- * Typedefs for common primitive types.
- *
- * @{
- */
-
-/**
- * @typedef dbus_bool_t
- *
- * A boolean, valid values are #TRUE and #FALSE.
- */
-
-/**
- * @typedef dbus_uint32_t
- *
- * A 32-bit unsigned integer on all platforms.
- */
-
-/**
- * @typedef dbus_int32_t
- *
- * A 32-bit signed integer on all platforms.
- */
-
-/**
- * @typedef dbus_uint16_t
- *
- * A 16-bit unsigned integer on all platforms.
- */
-
-/**
- * @typedef dbus_int16_t
- *
- * A 16-bit signed integer on all platforms.
- */
-
-
-/**
- * @typedef dbus_uint64_t
- *
- * A 64-bit unsigned integer on all platforms that support it.
- * If supported, #DBUS_HAVE_INT64 will be defined.
- *
- * C99 requires a 64-bit type and most likely all interesting
- * compilers support one. GLib for example flat-out requires
- * a 64-bit type.
- *
- * You probably want to just assume #DBUS_HAVE_INT64 is always defined.
- */
-
-/**
- * @typedef dbus_int64_t
- *
- * A 64-bit signed integer on all platforms that support it.
- * If supported, #DBUS_HAVE_INT64 will be defined.
- *
- * C99 requires a 64-bit type and most likely all interesting
- * compilers support one. GLib for example flat-out requires
- * a 64-bit type.
- * 
- * You probably want to just assume #DBUS_HAVE_INT64 is always defined.
- */
-
-/**
- * @def DBUS_HAVE_INT64
- *
- * Defined if 64-bit integers are available. Will be defined
- * on any platform you care about, unless you care about
- * some truly ancient UNIX, or some bizarre embedded platform.
- *
- * C99 requires a 64-bit type and most likely all interesting
- * compilers support one. GLib for example flat-out requires
- * a 64-bit type.
- *
- * You should feel comfortable ignoring this macro and just using
- * int64 unconditionally.
- * 
- */
-
-/**
- * @def DBUS_INT64_CONSTANT
- *
- * Declare a 64-bit signed integer constant. The macro
- * adds the necessary "LL" or whatever after the integer,
- * giving a literal such as "325145246765LL"
- */
-
-/**
- * @def DBUS_UINT64_CONSTANT
- *
- * Declare a 64-bit unsigned integer constant. The macro
- * adds the necessary "ULL" or whatever after the integer,
- * giving a literal such as "325145246765ULL"
- */
-
-/** @} */
-
-#endif /* DBUS_TYPES_H */
diff --git a/lib-x86-64/include/dbus-1.0/dbus/dbus.h b/lib-x86-64/include/dbus-1.0/dbus/dbus.h
deleted file mode 100644
index 1f099508..00000000
--- a/lib-x86-64/include/dbus-1.0/dbus/dbus.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus.h  Convenience header including all other headers
- *
- * Copyright (C) 2002, 2003  Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef DBUS_H
-#define DBUS_H
-
-#define DBUS_INSIDE_DBUS_H 1
-
-#include <dbus/dbus-arch-deps.h>
-#include <dbus/dbus-address.h>
-#include <dbus/dbus-bus.h>
-#include <dbus/dbus-connection.h>
-#include <dbus/dbus-errors.h>
-#include <dbus/dbus-macros.h>
-#include <dbus/dbus-message.h>
-#include <dbus/dbus-misc.h>
-#include <dbus/dbus-pending-call.h>
-#include <dbus/dbus-protocol.h>
-#include <dbus/dbus-server.h>
-#include <dbus/dbus-shared.h>
-#include <dbus/dbus-signature.h>
-#include <dbus/dbus-threads.h>
-#include <dbus/dbus-types.h>
-
-#undef DBUS_INSIDE_DBUS_H
-
-/**
- * @defgroup DBus D-Bus low-level public API
- * @brief The low-level public API of the D-Bus library
- *
- * libdbus provides a low-level C API intended primarily for use by
- * bindings to specific object systems and languages.  D-Bus is most
- * convenient when used with the GLib bindings, Python bindings, Qt
- * bindings, Mono bindings, and so forth.  This low-level API has a
- * lot of complexity useful only for bindings.
- * 
- * @{
- */
-
-/** @} */
-
-/**
- * @mainpage
- *
- * This manual documents the <em>low-level</em> D-Bus C API. <b>If you use
- * this low-level API directly, you're signing up for some pain.</b>
- *
- * Caveats aside, you might get started learning the low-level API by reading
- * about @ref DBusConnection and @ref DBusMessage.
- * 
- * There are several other places to look for D-Bus information, such
- * as the tutorial and the specification; those can be found at <a
- * href="http://www.freedesktop.org/wiki/Software/dbus">the D-Bus
- * website</a>. If you're interested in a sysadmin or package
- * maintainer's perspective on the dbus-daemon itself and its
- * configuration, be sure to check out the man pages as well.
- *
- * The low-level API documented in this manual deliberately lacks
- * most convenience functions - those are left up to higher-level libraries
- * based on frameworks such as GLib, Qt, Python, Mono, Java,
- * etc. These higher-level libraries (often called "D-Bus bindings")
- * have features such as object systems and main loops that allow a
- * <em>much</em> more convenient API.
- * 
- * The low-level API also contains plenty of clutter to support
- * integration with arbitrary object systems, languages, main loops,
- * and so forth. These features add a lot of noise to the API that you
- * probably don't care about unless you're coding a binding.
- *
- * This manual also contains docs for @ref DBusInternals "D-Bus internals",
- * so you can use it to get oriented to the D-Bus source code if you're
- * interested in patching the code. You should also read the
- * file HACKING which comes with the source code if you plan to contribute to
- * D-Bus.
- *
- * As you read the code, you can identify internal D-Bus functions
- * because they start with an underscore ('_') character. Also, any
- * identifier or macro that lacks a DBus, dbus_, or DBUS_ namepace
- * prefix is internal, with a couple of exceptions such as #NULL,
- * #TRUE, and #FALSE.
- */
-
-#endif /* DBUS_H */
diff --git a/lib-x86-64/include/expat.h b/lib-x86-64/include/expat.h
deleted file mode 100644
index 20a8278f..00000000
--- a/lib-x86-64/include/expat.h
+++ /dev/null
@@ -1,1014 +0,0 @@
-/* Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
-   See the file COPYING for copying permission.
-*/
-
-#ifndef Expat_INCLUDED
-#define Expat_INCLUDED 1
-
-#ifdef __VMS
-/*      0        1         2         3      0        1         2         3
-        1234567890123456789012345678901     1234567890123456789012345678901 */
-#define XML_SetProcessingInstructionHandler XML_SetProcessingInstrHandler
-#define XML_SetUnparsedEntityDeclHandler    XML_SetUnparsedEntDeclHandler
-#define XML_SetStartNamespaceDeclHandler    XML_SetStartNamespcDeclHandler
-#define XML_SetExternalEntityRefHandlerArg  XML_SetExternalEntRefHandlerArg
-#endif
-
-#include <stdlib.h>
-#include "expat_external.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct XML_ParserStruct;
-typedef struct XML_ParserStruct *XML_Parser;
-
-/* Should this be defined using stdbool.h when C99 is available? */
-typedef unsigned char XML_Bool;
-#define XML_TRUE   ((XML_Bool) 1)
-#define XML_FALSE  ((XML_Bool) 0)
-
-/* The XML_Status enum gives the possible return values for several
-   API functions.  The preprocessor #defines are included so this
-   stanza can be added to code that still needs to support older
-   versions of Expat 1.95.x:
-
-   #ifndef XML_STATUS_OK
-   #define XML_STATUS_OK    1
-   #define XML_STATUS_ERROR 0
-   #endif
-
-   Otherwise, the #define hackery is quite ugly and would have been
-   dropped.
-*/
-enum XML_Status {
-  XML_STATUS_ERROR = 0,
-#define XML_STATUS_ERROR XML_STATUS_ERROR
-  XML_STATUS_OK = 1,
-#define XML_STATUS_OK XML_STATUS_OK
-  XML_STATUS_SUSPENDED = 2
-#define XML_STATUS_SUSPENDED XML_STATUS_SUSPENDED
-};
-
-enum XML_Error {
-  XML_ERROR_NONE,
-  XML_ERROR_NO_MEMORY,
-  XML_ERROR_SYNTAX,
-  XML_ERROR_NO_ELEMENTS,
-  XML_ERROR_INVALID_TOKEN,
-  XML_ERROR_UNCLOSED_TOKEN,
-  XML_ERROR_PARTIAL_CHAR,
-  XML_ERROR_TAG_MISMATCH,
-  XML_ERROR_DUPLICATE_ATTRIBUTE,
-  XML_ERROR_JUNK_AFTER_DOC_ELEMENT,
-  XML_ERROR_PARAM_ENTITY_REF,
-  XML_ERROR_UNDEFINED_ENTITY,
-  XML_ERROR_RECURSIVE_ENTITY_REF,
-  XML_ERROR_ASYNC_ENTITY,
-  XML_ERROR_BAD_CHAR_REF,
-  XML_ERROR_BINARY_ENTITY_REF,
-  XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF,
-  XML_ERROR_MISPLACED_XML_PI,
-  XML_ERROR_UNKNOWN_ENCODING,
-  XML_ERROR_INCORRECT_ENCODING,
-  XML_ERROR_UNCLOSED_CDATA_SECTION,
-  XML_ERROR_EXTERNAL_ENTITY_HANDLING,
-  XML_ERROR_NOT_STANDALONE,
-  XML_ERROR_UNEXPECTED_STATE,
-  XML_ERROR_ENTITY_DECLARED_IN_PE,
-  XML_ERROR_FEATURE_REQUIRES_XML_DTD,
-  XML_ERROR_CANT_CHANGE_FEATURE_ONCE_PARSING,
-  /* Added in 1.95.7. */
-  XML_ERROR_UNBOUND_PREFIX,
-  /* Added in 1.95.8. */
-  XML_ERROR_UNDECLARING_PREFIX,
-  XML_ERROR_INCOMPLETE_PE,
-  XML_ERROR_XML_DECL,
-  XML_ERROR_TEXT_DECL,
-  XML_ERROR_PUBLICID,
-  XML_ERROR_SUSPENDED,
-  XML_ERROR_NOT_SUSPENDED,
-  XML_ERROR_ABORTED,
-  XML_ERROR_FINISHED,
-  XML_ERROR_SUSPEND_PE,
-  /* Added in 2.0. */
-  XML_ERROR_RESERVED_PREFIX_XML,
-  XML_ERROR_RESERVED_PREFIX_XMLNS,
-  XML_ERROR_RESERVED_NAMESPACE_URI
-};
-
-enum XML_Content_Type {
-  XML_CTYPE_EMPTY = 1,
-  XML_CTYPE_ANY,
-  XML_CTYPE_MIXED,
-  XML_CTYPE_NAME,
-  XML_CTYPE_CHOICE,
-  XML_CTYPE_SEQ
-};
-
-enum XML_Content_Quant {
-  XML_CQUANT_NONE,
-  XML_CQUANT_OPT,
-  XML_CQUANT_REP,
-  XML_CQUANT_PLUS
-};
-
-/* If type == XML_CTYPE_EMPTY or XML_CTYPE_ANY, then quant will be
-   XML_CQUANT_NONE, and the other fields will be zero or NULL.
-   If type == XML_CTYPE_MIXED, then quant will be NONE or REP and
-   numchildren will contain number of elements that may be mixed in
-   and children point to an array of XML_Content cells that will be
-   all of XML_CTYPE_NAME type with no quantification.
-
-   If type == XML_CTYPE_NAME, then the name points to the name, and
-   the numchildren field will be zero and children will be NULL. The
-   quant fields indicates any quantifiers placed on the name.
-
-   CHOICE and SEQ will have name NULL, the number of children in
-   numchildren and children will point, recursively, to an array
-   of XML_Content cells.
-
-   The EMPTY, ANY, and MIXED types will only occur at top level.
-*/
-
-typedef struct XML_cp XML_Content;
-
-struct XML_cp {
-  enum XML_Content_Type         type;
-  enum XML_Content_Quant        quant;
-  XML_Char *                    name;
-  unsigned int                  numchildren;
-  XML_Content *                 children;
-};
-
-
-/* This is called for an element declaration. See above for
-   description of the model argument. It's the caller's responsibility
-   to free model when finished with it.
-*/
-typedef void (XMLCALL *XML_ElementDeclHandler) (void *userData,
-                                                const XML_Char *name,
-                                                XML_Content *model);
-
-XMLPARSEAPI(void)
-XML_SetElementDeclHandler(XML_Parser parser,
-                          XML_ElementDeclHandler eldecl);
-
-/* The Attlist declaration handler is called for *each* attribute. So
-   a single Attlist declaration with multiple attributes declared will
-   generate multiple calls to this handler. The "default" parameter
-   may be NULL in the case of the "#IMPLIED" or "#REQUIRED"
-   keyword. The "isrequired" parameter will be true and the default
-   value will be NULL in the case of "#REQUIRED". If "isrequired" is
-   true and default is non-NULL, then this is a "#FIXED" default.
-*/
-typedef void (XMLCALL *XML_AttlistDeclHandler) (
-                                    void            *userData,
-                                    const XML_Char  *elname,
-                                    const XML_Char  *attname,
-                                    const XML_Char  *att_type,
-                                    const XML_Char  *dflt,
-                                    int              isrequired);
-
-XMLPARSEAPI(void)
-XML_SetAttlistDeclHandler(XML_Parser parser,
-                          XML_AttlistDeclHandler attdecl);
-
-/* The XML declaration handler is called for *both* XML declarations
-   and text declarations. The way to distinguish is that the version
-   parameter will be NULL for text declarations. The encoding
-   parameter may be NULL for XML declarations. The standalone
-   parameter will be -1, 0, or 1 indicating respectively that there
-   was no standalone parameter in the declaration, that it was given
-   as no, or that it was given as yes.
-*/
-typedef void (XMLCALL *XML_XmlDeclHandler) (void           *userData,
-                                            const XML_Char *version,
-                                            const XML_Char *encoding,
-                                            int             standalone);
-
-XMLPARSEAPI(void)
-XML_SetXmlDeclHandler(XML_Parser parser,
-                      XML_XmlDeclHandler xmldecl);
-
-
-typedef struct {
-  void *(*malloc_fcn)(size_t size);
-  void *(*realloc_fcn)(void *ptr, size_t size);
-  void (*free_fcn)(void *ptr);
-} XML_Memory_Handling_Suite;
-
-/* Constructs a new parser; encoding is the encoding specified by the
-   external protocol or NULL if there is none specified.
-*/
-XMLPARSEAPI(XML_Parser)
-XML_ParserCreate(const XML_Char *encoding);
-
-/* Constructs a new parser and namespace processor.  Element type
-   names and attribute names that belong to a namespace will be
-   expanded; unprefixed attribute names are never expanded; unprefixed
-   element type names are expanded only if there is a default
-   namespace. The expanded name is the concatenation of the namespace
-   URI, the namespace separator character, and the local part of the
-   name.  If the namespace separator is '\0' then the namespace URI
-   and the local part will be concatenated without any separator.
-   It is a programming error to use the separator '\0' with namespace
-   triplets (see XML_SetReturnNSTriplet).
-*/
-XMLPARSEAPI(XML_Parser)
-XML_ParserCreateNS(const XML_Char *encoding, XML_Char namespaceSeparator);
-
-
-/* Constructs a new parser using the memory management suite referred to
-   by memsuite. If memsuite is NULL, then use the standard library memory
-   suite. If namespaceSeparator is non-NULL it creates a parser with
-   namespace processing as described above. The character pointed at
-   will serve as the namespace separator.
-
-   All further memory operations used for the created parser will come from
-   the given suite.
-*/
-XMLPARSEAPI(XML_Parser)
-XML_ParserCreate_MM(const XML_Char *encoding,
-                    const XML_Memory_Handling_Suite *memsuite,
-                    const XML_Char *namespaceSeparator);
-
-/* Prepare a parser object to be re-used.  This is particularly
-   valuable when memory allocation overhead is disproportionatly high,
-   such as when a large number of small documnents need to be parsed.
-   All handlers are cleared from the parser, except for the
-   unknownEncodingHandler. The parser's external state is re-initialized
-   except for the values of ns and ns_triplets.
-
-   Added in Expat 1.95.3.
-*/
-XMLPARSEAPI(XML_Bool)
-XML_ParserReset(XML_Parser parser, const XML_Char *encoding);
-
-/* atts is array of name/value pairs, terminated by 0;
-   names and values are 0 terminated.
-*/
-typedef void (XMLCALL *XML_StartElementHandler) (void *userData,
-                                                 const XML_Char *name,
-                                                 const XML_Char **atts);
-
-typedef void (XMLCALL *XML_EndElementHandler) (void *userData,
-                                               const XML_Char *name);
-
-
-/* s is not 0 terminated. */
-typedef void (XMLCALL *XML_CharacterDataHandler) (void *userData,
-                                                  const XML_Char *s,
-                                                  int len);
-
-/* target and data are 0 terminated */
-typedef void (XMLCALL *XML_ProcessingInstructionHandler) (
-                                                void *userData,
-                                                const XML_Char *target,
-                                                const XML_Char *data);
-
-/* data is 0 terminated */
-typedef void (XMLCALL *XML_CommentHandler) (void *userData,
-                                            const XML_Char *data);
-
-typedef void (XMLCALL *XML_StartCdataSectionHandler) (void *userData);
-typedef void (XMLCALL *XML_EndCdataSectionHandler) (void *userData);
-
-/* This is called for any characters in the XML document for which
-   there is no applicable handler.  This includes both characters that
-   are part of markup which is of a kind that is not reported
-   (comments, markup declarations), or characters that are part of a
-   construct which could be reported but for which no handler has been
-   supplied. The characters are passed exactly as they were in the XML
-   document except that they will be encoded in UTF-8 or UTF-16.
-   Line boundaries are not normalized. Note that a byte order mark
-   character is not passed to the default handler. There are no
-   guarantees about how characters are divided between calls to the
-   default handler: for example, a comment might be split between
-   multiple calls.
-*/
-typedef void (XMLCALL *XML_DefaultHandler) (void *userData,
-                                            const XML_Char *s,
-                                            int len);
-
-/* This is called for the start of the DOCTYPE declaration, before
-   any DTD or internal subset is parsed.
-*/
-typedef void (XMLCALL *XML_StartDoctypeDeclHandler) (
-                                            void *userData,
-                                            const XML_Char *doctypeName,
-                                            const XML_Char *sysid,
-                                            const XML_Char *pubid,
-                                            int has_internal_subset);
-
-/* This is called for the start of the DOCTYPE declaration when the
-   closing > is encountered, but after processing any external
-   subset.
-*/
-typedef void (XMLCALL *XML_EndDoctypeDeclHandler)(void *userData);
-
-/* This is called for entity declarations. The is_parameter_entity
-   argument will be non-zero if the entity is a parameter entity, zero
-   otherwise.
-
-   For internal entities (<!ENTITY foo "bar">), value will
-   be non-NULL and systemId, publicID, and notationName will be NULL.
-   The value string is NOT nul-terminated; the length is provided in
-   the value_length argument. Since it is legal to have zero-length
-   values, do not use this argument to test for internal entities.
-
-   For external entities, value will be NULL and systemId will be
-   non-NULL. The publicId argument will be NULL unless a public
-   identifier was provided. The notationName argument will have a
-   non-NULL value only for unparsed entity declarations.
-
-   Note that is_parameter_entity can't be changed to XML_Bool, since
-   that would break binary compatibility.
-*/
-typedef void (XMLCALL *XML_EntityDeclHandler) (
-                              void *userData,
-                              const XML_Char *entityName,
-                              int is_parameter_entity,
-                              const XML_Char *value,
-                              int value_length,
-                              const XML_Char *base,
-                              const XML_Char *systemId,
-                              const XML_Char *publicId,
-                              const XML_Char *notationName);
-
-XMLPARSEAPI(void)
-XML_SetEntityDeclHandler(XML_Parser parser,
-                         XML_EntityDeclHandler handler);
-
-/* OBSOLETE -- OBSOLETE -- OBSOLETE
-   This handler has been superceded by the EntityDeclHandler above.
-   It is provided here for backward compatibility.
-
-   This is called for a declaration of an unparsed (NDATA) entity.
-   The base argument is whatever was set by XML_SetBase. The
-   entityName, systemId and notationName arguments will never be
-   NULL. The other arguments may be.
-*/
-typedef void (XMLCALL *XML_UnparsedEntityDeclHandler) (
-                                    void *userData,
-                                    const XML_Char *entityName,
-                                    const XML_Char *base,
-                                    const XML_Char *systemId,
-                                    const XML_Char *publicId,
-                                    const XML_Char *notationName);
-
-/* This is called for a declaration of notation.  The base argument is
-   whatever was set by XML_SetBase. The notationName will never be
-   NULL.  The other arguments can be.
-*/
-typedef void (XMLCALL *XML_NotationDeclHandler) (
-                                    void *userData,
-                                    const XML_Char *notationName,
-                                    const XML_Char *base,
-                                    const XML_Char *systemId,
-                                    const XML_Char *publicId);
-
-/* When namespace processing is enabled, these are called once for
-   each namespace declaration. The call to the start and end element
-   handlers occur between the calls to the start and end namespace
-   declaration handlers. For an xmlns attribute, prefix will be
-   NULL.  For an xmlns="" attribute, uri will be NULL.
-*/
-typedef void (XMLCALL *XML_StartNamespaceDeclHandler) (
-                                    void *userData,
-                                    const XML_Char *prefix,
-                                    const XML_Char *uri);
-
-typedef void (XMLCALL *XML_EndNamespaceDeclHandler) (
-                                    void *userData,
-                                    const XML_Char *prefix);
-
-/* This is called if the document is not standalone, that is, it has an
-   external subset or a reference to a parameter entity, but does not
-   have standalone="yes". If this handler returns XML_STATUS_ERROR,
-   then processing will not continue, and the parser will return a
-   XML_ERROR_NOT_STANDALONE error.
-   If parameter entity parsing is enabled, then in addition to the
-   conditions above this handler will only be called if the referenced
-   entity was actually read.
-*/
-typedef int (XMLCALL *XML_NotStandaloneHandler) (void *userData);
-
-/* This is called for a reference to an external parsed general
-   entity.  The referenced entity is not automatically parsed.  The
-   application can parse it immediately or later using
-   XML_ExternalEntityParserCreate.
-
-   The parser argument is the parser parsing the entity containing the
-   reference; it can be passed as the parser argument to
-   XML_ExternalEntityParserCreate.  The systemId argument is the
-   system identifier as specified in the entity declaration; it will
-   not be NULL.
-
-   The base argument is the system identifier that should be used as
-   the base for resolving systemId if systemId was relative; this is
-   set by XML_SetBase; it may be NULL.
-
-   The publicId argument is the public identifier as specified in the
-   entity declaration, or NULL if none was specified; the whitespace
-   in the public identifier will have been normalized as required by
-   the XML spec.
-
-   The context argument specifies the parsing context in the format
-   expected by the context argument to XML_ExternalEntityParserCreate;
-   context is valid only until the handler returns, so if the
-   referenced entity is to be parsed later, it must be copied.
-   context is NULL only when the entity is a parameter entity.
-
-   The handler should return XML_STATUS_ERROR if processing should not
-   continue because of a fatal error in the handling of the external
-   entity.  In this case the calling parser will return an
-   XML_ERROR_EXTERNAL_ENTITY_HANDLING error.
-
-   Note that unlike other handlers the first argument is the parser,
-   not userData.
-*/
-typedef int (XMLCALL *XML_ExternalEntityRefHandler) (
-                                    XML_Parser parser,
-                                    const XML_Char *context,
-                                    const XML_Char *base,
-                                    const XML_Char *systemId,
-                                    const XML_Char *publicId);
-
-/* This is called in two situations:
-   1) An entity reference is encountered for which no declaration
-      has been read *and* this is not an error.
-   2) An internal entity reference is read, but not expanded, because
-      XML_SetDefaultHandler has been called.
-   Note: skipped parameter entities in declarations and skipped general
-         entities in attribute values cannot be reported, because
-         the event would be out of sync with the reporting of the
-         declarations or attribute values
-*/
-typedef void (XMLCALL *XML_SkippedEntityHandler) (
-                                    void *userData,
-                                    const XML_Char *entityName,
-                                    int is_parameter_entity);
-
-/* This structure is filled in by the XML_UnknownEncodingHandler to
-   provide information to the parser about encodings that are unknown
-   to the parser.
-
-   The map[b] member gives information about byte sequences whose
-   first byte is b.
-
-   If map[b] is c where c is >= 0, then b by itself encodes the
-   Unicode scalar value c.
-
-   If map[b] is -1, then the byte sequence is malformed.
-
-   If map[b] is -n, where n >= 2, then b is the first byte of an
-   n-byte sequence that encodes a single Unicode scalar value.
-
-   The data member will be passed as the first argument to the convert
-   function.
-
-   The convert function is used to convert multibyte sequences; s will
-   point to a n-byte sequence where map[(unsigned char)*s] == -n.  The
-   convert function must return the Unicode scalar value represented
-   by this byte sequence or -1 if the byte sequence is malformed.
-
-   The convert function may be NULL if the encoding is a single-byte
-   encoding, that is if map[b] >= -1 for all bytes b.
-
-   When the parser is finished with the encoding, then if release is
-   not NULL, it will call release passing it the data member; once
-   release has been called, the convert function will not be called
-   again.
-
-   Expat places certain restrictions on the encodings that are supported
-   using this mechanism.
-
-   1. Every ASCII character that can appear in a well-formed XML document,
-      other than the characters
-
-      $@\^`{}~
-
-      must be represented by a single byte, and that byte must be the
-      same byte that represents that character in ASCII.
-
-   2. No character may require more than 4 bytes to encode.
-
-   3. All characters encoded must have Unicode scalar values <=
-      0xFFFF, (i.e., characters that would be encoded by surrogates in
-      UTF-16 are  not allowed).  Note that this restriction doesn't
-      apply to the built-in support for UTF-8 and UTF-16.
-
-   4. No Unicode character may be encoded by more than one distinct
-      sequence of bytes.
-*/
-typedef struct {
-  int map[256];
-  void *data;
-  int (XMLCALL *convert)(void *data, const char *s);
-  void (XMLCALL *release)(void *data);
-} XML_Encoding;
-
-/* This is called for an encoding that is unknown to the parser.
-
-   The encodingHandlerData argument is that which was passed as the
-   second argument to XML_SetUnknownEncodingHandler.
-
-   The name argument gives the name of the encoding as specified in
-   the encoding declaration.
-
-   If the callback can provide information about the encoding, it must
-   fill in the XML_Encoding structure, and return XML_STATUS_OK.
-   Otherwise it must return XML_STATUS_ERROR.
-
-   If info does not describe a suitable encoding, then the parser will
-   return an XML_UNKNOWN_ENCODING error.
-*/
-typedef int (XMLCALL *XML_UnknownEncodingHandler) (
-                                    void *encodingHandlerData,
-                                    const XML_Char *name,
-                                    XML_Encoding *info);
-
-XMLPARSEAPI(void)
-XML_SetElementHandler(XML_Parser parser,
-                      XML_StartElementHandler start,
-                      XML_EndElementHandler end);
-
-XMLPARSEAPI(void)
-XML_SetStartElementHandler(XML_Parser parser,
-                           XML_StartElementHandler handler);
-
-XMLPARSEAPI(void)
-XML_SetEndElementHandler(XML_Parser parser,
-                         XML_EndElementHandler handler);
-
-XMLPARSEAPI(void)
-XML_SetCharacterDataHandler(XML_Parser parser,
-                            XML_CharacterDataHandler handler);
-
-XMLPARSEAPI(void)
-XML_SetProcessingInstructionHandler(XML_Parser parser,
-                                    XML_ProcessingInstructionHandler handler);
-XMLPARSEAPI(void)
-XML_SetCommentHandler(XML_Parser parser,
-                      XML_CommentHandler handler);
-
-XMLPARSEAPI(void)
-XML_SetCdataSectionHandler(XML_Parser parser,
-                           XML_StartCdataSectionHandler start,
-                           XML_EndCdataSectionHandler end);
-
-XMLPARSEAPI(void)
-XML_SetStartCdataSectionHandler(XML_Parser parser,
-                                XML_StartCdataSectionHandler start);
-
-XMLPARSEAPI(void)
-XML_SetEndCdataSectionHandler(XML_Parser parser,
-                              XML_EndCdataSectionHandler end);
-
-/* This sets the default handler and also inhibits expansion of
-   internal entities. These entity references will be passed to the
-   default handler, or to the skipped entity handler, if one is set.
-*/
-XMLPARSEAPI(void)
-XML_SetDefaultHandler(XML_Parser parser,
-                      XML_DefaultHandler handler);
-
-/* This sets the default handler but does not inhibit expansion of
-   internal entities.  The entity reference will not be passed to the
-   default handler.
-*/
-XMLPARSEAPI(void)
-XML_SetDefaultHandlerExpand(XML_Parser parser,
-                            XML_DefaultHandler handler);
-
-XMLPARSEAPI(void)
-XML_SetDoctypeDeclHandler(XML_Parser parser,
-                          XML_StartDoctypeDeclHandler start,
-                          XML_EndDoctypeDeclHandler end);
-
-XMLPARSEAPI(void)
-XML_SetStartDoctypeDeclHandler(XML_Parser parser,
-                               XML_StartDoctypeDeclHandler start);
-
-XMLPARSEAPI(void)
-XML_SetEndDoctypeDeclHandler(XML_Parser parser,
-                             XML_EndDoctypeDeclHandler end);
-
-XMLPARSEAPI(void)
-XML_SetUnparsedEntityDeclHandler(XML_Parser parser,
-                                 XML_UnparsedEntityDeclHandler handler);
-
-XMLPARSEAPI(void)
-XML_SetNotationDeclHandler(XML_Parser parser,
-                           XML_NotationDeclHandler handler);
-
-XMLPARSEAPI(void)
-XML_SetNamespaceDeclHandler(XML_Parser parser,
-                            XML_StartNamespaceDeclHandler start,
-                            XML_EndNamespaceDeclHandler end);
-
-XMLPARSEAPI(void)
-XML_SetStartNamespaceDeclHandler(XML_Parser parser,
-                                 XML_StartNamespaceDeclHandler start);
-
-XMLPARSEAPI(void)
-XML_SetEndNamespaceDeclHandler(XML_Parser parser,
-                               XML_EndNamespaceDeclHandler end);
-
-XMLPARSEAPI(void)
-XML_SetNotStandaloneHandler(XML_Parser parser,
-                            XML_NotStandaloneHandler handler);
-
-XMLPARSEAPI(void)
-XML_SetExternalEntityRefHandler(XML_Parser parser,
-                                XML_ExternalEntityRefHandler handler);
-
-/* If a non-NULL value for arg is specified here, then it will be
-   passed as the first argument to the external entity ref handler
-   instead of the parser object.
-*/
-XMLPARSEAPI(void)
-XML_SetExternalEntityRefHandlerArg(XML_Parser parser,
-                                   void *arg);
-
-XMLPARSEAPI(void)
-XML_SetSkippedEntityHandler(XML_Parser parser,
-                            XML_SkippedEntityHandler handler);
-
-XMLPARSEAPI(void)
-XML_SetUnknownEncodingHandler(XML_Parser parser,
-                              XML_UnknownEncodingHandler handler,
-                              void *encodingHandlerData);
-
-/* This can be called within a handler for a start element, end
-   element, processing instruction or character data.  It causes the
-   corresponding markup to be passed to the default handler.
-*/
-XMLPARSEAPI(void)
-XML_DefaultCurrent(XML_Parser parser);
-
-/* If do_nst is non-zero, and namespace processing is in effect, and
-   a name has a prefix (i.e. an explicit namespace qualifier) then
-   that name is returned as a triplet in a single string separated by
-   the separator character specified when the parser was created: URI
-   + sep + local_name + sep + prefix.
-
-   If do_nst is zero, then namespace information is returned in the
-   default manner (URI + sep + local_name) whether or not the name
-   has a prefix.
-
-   Note: Calling XML_SetReturnNSTriplet after XML_Parse or
-     XML_ParseBuffer has no effect.
-*/
-
-XMLPARSEAPI(void)
-XML_SetReturnNSTriplet(XML_Parser parser, int do_nst);
-
-/* This value is passed as the userData argument to callbacks. */
-XMLPARSEAPI(void)
-XML_SetUserData(XML_Parser parser, void *userData);
-
-/* Returns the last value set by XML_SetUserData or NULL. */
-#define XML_GetUserData(parser) (*(void **)(parser))
-
-/* This is equivalent to supplying an encoding argument to
-   XML_ParserCreate. On success XML_SetEncoding returns non-zero,
-   zero otherwise.
-   Note: Calling XML_SetEncoding after XML_Parse or XML_ParseBuffer
-     has no effect and returns XML_STATUS_ERROR.
-*/
-XMLPARSEAPI(enum XML_Status)
-XML_SetEncoding(XML_Parser parser, const XML_Char *encoding);
-
-/* If this function is called, then the parser will be passed as the
-   first argument to callbacks instead of userData.  The userData will
-   still be accessible using XML_GetUserData.
-*/
-XMLPARSEAPI(void)
-XML_UseParserAsHandlerArg(XML_Parser parser);
-
-/* If useDTD == XML_TRUE is passed to this function, then the parser
-   will assume that there is an external subset, even if none is
-   specified in the document. In such a case the parser will call the
-   externalEntityRefHandler with a value of NULL for the systemId
-   argument (the publicId and context arguments will be NULL as well).
-   Note: For the purpose of checking WFC: Entity Declared, passing
-     useDTD == XML_TRUE will make the parser behave as if the document
-     had a DTD with an external subset.
-   Note: If this function is called, then this must be done before
-     the first call to XML_Parse or XML_ParseBuffer, since it will
-     have no effect after that.  Returns
-     XML_ERROR_CANT_CHANGE_FEATURE_ONCE_PARSING.
-   Note: If the document does not have a DOCTYPE declaration at all,
-     then startDoctypeDeclHandler and endDoctypeDeclHandler will not
-     be called, despite an external subset being parsed.
-   Note: If XML_DTD is not defined when Expat is compiled, returns
-     XML_ERROR_FEATURE_REQUIRES_XML_DTD.
-*/
-XMLPARSEAPI(enum XML_Error)
-XML_UseForeignDTD(XML_Parser parser, XML_Bool useDTD);
-
-
-/* Sets the base to be used for resolving relative URIs in system
-   identifiers in declarations.  Resolving relative identifiers is
-   left to the application: this value will be passed through as the
-   base argument to the XML_ExternalEntityRefHandler,
-   XML_NotationDeclHandler and XML_UnparsedEntityDeclHandler. The base
-   argument will be copied.  Returns XML_STATUS_ERROR if out of memory,
-   XML_STATUS_OK otherwise.
-*/
-XMLPARSEAPI(enum XML_Status)
-XML_SetBase(XML_Parser parser, const XML_Char *base);
-
-XMLPARSEAPI(const XML_Char *)
-XML_GetBase(XML_Parser parser);
-
-/* Returns the number of the attribute/value pairs passed in last call
-   to the XML_StartElementHandler that were specified in the start-tag
-   rather than defaulted. Each attribute/value pair counts as 2; thus
-   this correspondds to an index into the atts array passed to the
-   XML_StartElementHandler.
-*/
-XMLPARSEAPI(int)
-XML_GetSpecifiedAttributeCount(XML_Parser parser);
-
-/* Returns the index of the ID attribute passed in the last call to
-   XML_StartElementHandler, or -1 if there is no ID attribute.  Each
-   attribute/value pair counts as 2; thus this correspondds to an
-   index into the atts array passed to the XML_StartElementHandler.
-*/
-XMLPARSEAPI(int)
-XML_GetIdAttributeIndex(XML_Parser parser);
-
-/* Parses some input. Returns XML_STATUS_ERROR if a fatal error is
-   detected.  The last call to XML_Parse must have isFinal true; len
-   may be zero for this call (or any other).
-
-   Though the return values for these functions has always been
-   described as a Boolean value, the implementation, at least for the
-   1.95.x series, has always returned exactly one of the XML_Status
-   values.
-*/
-XMLPARSEAPI(enum XML_Status)
-XML_Parse(XML_Parser parser, const char *s, int len, int isFinal);
-
-XMLPARSEAPI(void *)
-XML_GetBuffer(XML_Parser parser, int len);
-
-XMLPARSEAPI(enum XML_Status)
-XML_ParseBuffer(XML_Parser parser, int len, int isFinal);
-
-/* Stops parsing, causing XML_Parse() or XML_ParseBuffer() to return.
-   Must be called from within a call-back handler, except when aborting
-   (resumable = 0) an already suspended parser. Some call-backs may
-   still follow because they would otherwise get lost. Examples:
-   - endElementHandler() for empty elements when stopped in
-     startElementHandler(), 
-   - endNameSpaceDeclHandler() when stopped in endElementHandler(), 
-   and possibly others.
-
-   Can be called from most handlers, including DTD related call-backs,
-   except when parsing an external parameter entity and resumable != 0.
-   Returns XML_STATUS_OK when successful, XML_STATUS_ERROR otherwise.
-   Possible error codes: 
-   - XML_ERROR_SUSPENDED: when suspending an already suspended parser.
-   - XML_ERROR_FINISHED: when the parser has already finished.
-   - XML_ERROR_SUSPEND_PE: when suspending while parsing an external PE.
-
-   When resumable != 0 (true) then parsing is suspended, that is, 
-   XML_Parse() and XML_ParseBuffer() return XML_STATUS_SUSPENDED. 
-   Otherwise, parsing is aborted, that is, XML_Parse() and XML_ParseBuffer()
-   return XML_STATUS_ERROR with error code XML_ERROR_ABORTED.
-
-   *Note*:
-   This will be applied to the current parser instance only, that is, if
-   there is a parent parser then it will continue parsing when the
-   externalEntityRefHandler() returns. It is up to the implementation of
-   the externalEntityRefHandler() to call XML_StopParser() on the parent
-   parser (recursively), if one wants to stop parsing altogether.
-
-   When suspended, parsing can be resumed by calling XML_ResumeParser(). 
-*/
-XMLPARSEAPI(enum XML_Status)
-XML_StopParser(XML_Parser parser, XML_Bool resumable);
-
-/* Resumes parsing after it has been suspended with XML_StopParser().
-   Must not be called from within a handler call-back. Returns same
-   status codes as XML_Parse() or XML_ParseBuffer().
-   Additional error code XML_ERROR_NOT_SUSPENDED possible.   
-
-   *Note*:
-   This must be called on the most deeply nested child parser instance
-   first, and on its parent parser only after the child parser has finished,
-   to be applied recursively until the document entity's parser is restarted.
-   That is, the parent parser will not resume by itself and it is up to the
-   application to call XML_ResumeParser() on it at the appropriate moment.
-*/
-XMLPARSEAPI(enum XML_Status)
-XML_ResumeParser(XML_Parser parser);
-
-enum XML_Parsing {
-  XML_INITIALIZED,
-  XML_PARSING,
-  XML_FINISHED,
-  XML_SUSPENDED
-};
-
-typedef struct {
-  enum XML_Parsing parsing;
-  XML_Bool finalBuffer;
-} XML_ParsingStatus;
-
-/* Returns status of parser with respect to being initialized, parsing,
-   finished, or suspended and processing the final buffer.
-   XXX XML_Parse() and XML_ParseBuffer() should return XML_ParsingStatus,
-   XXX with XML_FINISHED_OK or XML_FINISHED_ERROR replacing XML_FINISHED
-*/
-XMLPARSEAPI(void)
-XML_GetParsingStatus(XML_Parser parser, XML_ParsingStatus *status);
-
-/* Creates an XML_Parser object that can parse an external general
-   entity; context is a '\0'-terminated string specifying the parse
-   context; encoding is a '\0'-terminated string giving the name of
-   the externally specified encoding, or NULL if there is no
-   externally specified encoding.  The context string consists of a
-   sequence of tokens separated by formfeeds (\f); a token consisting
-   of a name specifies that the general entity of the name is open; a
-   token of the form prefix=uri specifies the namespace for a
-   particular prefix; a token of the form =uri specifies the default
-   namespace.  This can be called at any point after the first call to
-   an ExternalEntityRefHandler so longer as the parser has not yet
-   been freed.  The new parser is completely independent and may
-   safely be used in a separate thread.  The handlers and userData are
-   initialized from the parser argument.  Returns NULL if out of memory.
-   Otherwise returns a new XML_Parser object.
-*/
-XMLPARSEAPI(XML_Parser)
-XML_ExternalEntityParserCreate(XML_Parser parser,
-                               const XML_Char *context,
-                               const XML_Char *encoding);
-
-enum XML_ParamEntityParsing {
-  XML_PARAM_ENTITY_PARSING_NEVER,
-  XML_PARAM_ENTITY_PARSING_UNLESS_STANDALONE,
-  XML_PARAM_ENTITY_PARSING_ALWAYS
-};
-
-/* Controls parsing of parameter entities (including the external DTD
-   subset). If parsing of parameter entities is enabled, then
-   references to external parameter entities (including the external
-   DTD subset) will be passed to the handler set with
-   XML_SetExternalEntityRefHandler.  The context passed will be 0.
-
-   Unlike external general entities, external parameter entities can
-   only be parsed synchronously.  If the external parameter entity is
-   to be parsed, it must be parsed during the call to the external
-   entity ref handler: the complete sequence of
-   XML_ExternalEntityParserCreate, XML_Parse/XML_ParseBuffer and
-   XML_ParserFree calls must be made during this call.  After
-   XML_ExternalEntityParserCreate has been called to create the parser
-   for the external parameter entity (context must be 0 for this
-   call), it is illegal to make any calls on the old parser until
-   XML_ParserFree has been called on the newly created parser.
-   If the library has been compiled without support for parameter
-   entity parsing (ie without XML_DTD being defined), then
-   XML_SetParamEntityParsing will return 0 if parsing of parameter
-   entities is requested; otherwise it will return non-zero.
-   Note: If XML_SetParamEntityParsing is called after XML_Parse or
-      XML_ParseBuffer, then it has no effect and will always return 0.
-*/
-XMLPARSEAPI(int)
-XML_SetParamEntityParsing(XML_Parser parser,
-                          enum XML_ParamEntityParsing parsing);
-
-/* If XML_Parse or XML_ParseBuffer have returned XML_STATUS_ERROR, then
-   XML_GetErrorCode returns information about the error.
-*/
-XMLPARSEAPI(enum XML_Error)
-XML_GetErrorCode(XML_Parser parser);
-
-/* These functions return information about the current parse
-   location.  They may be called from any callback called to report
-   some parse event; in this case the location is the location of the
-   first of the sequence of characters that generated the event.  When
-   called from callbacks generated by declarations in the document
-   prologue, the location identified isn't as neatly defined, but will
-   be within the relevant markup.  When called outside of the callback
-   functions, the position indicated will be just past the last parse
-   event (regardless of whether there was an associated callback).
-   
-   They may also be called after returning from a call to XML_Parse
-   or XML_ParseBuffer.  If the return value is XML_STATUS_ERROR then
-   the location is the location of the character at which the error
-   was detected; otherwise the location is the location of the last
-   parse event, as described above.
-*/
-XMLPARSEAPI(XML_Size) XML_GetCurrentLineNumber(XML_Parser parser);
-XMLPARSEAPI(XML_Size) XML_GetCurrentColumnNumber(XML_Parser parser);
-XMLPARSEAPI(XML_Index) XML_GetCurrentByteIndex(XML_Parser parser);
-
-/* Return the number of bytes in the current event.
-   Returns 0 if the event is in an internal entity.
-*/
-XMLPARSEAPI(int)
-XML_GetCurrentByteCount(XML_Parser parser);
-
-/* If XML_CONTEXT_BYTES is defined, returns the input buffer, sets
-   the integer pointed to by offset to the offset within this buffer
-   of the current parse position, and sets the integer pointed to by size
-   to the size of this buffer (the number of input bytes). Otherwise
-   returns a NULL pointer. Also returns a NULL pointer if a parse isn't
-   active.
-
-   NOTE: The character pointer returned should not be used outside
-   the handler that makes the call.
-*/
-XMLPARSEAPI(const char *)
-XML_GetInputContext(XML_Parser parser,
-                    int *offset,
-                    int *size);
-
-/* For backwards compatibility with previous versions. */
-#define XML_GetErrorLineNumber   XML_GetCurrentLineNumber
-#define XML_GetErrorColumnNumber XML_GetCurrentColumnNumber
-#define XML_GetErrorByteIndex    XML_GetCurrentByteIndex
-
-/* Frees the content model passed to the element declaration handler */
-XMLPARSEAPI(void)
-XML_FreeContentModel(XML_Parser parser, XML_Content *model);
-
-/* Exposing the memory handling functions used in Expat */
-XMLPARSEAPI(void *)
-XML_MemMalloc(XML_Parser parser, size_t size);
-
-XMLPARSEAPI(void *)
-XML_MemRealloc(XML_Parser parser, void *ptr, size_t size);
-
-XMLPARSEAPI(void)
-XML_MemFree(XML_Parser parser, void *ptr);
-
-/* Frees memory used by the parser. */
-XMLPARSEAPI(void)
-XML_ParserFree(XML_Parser parser);
-
-/* Returns a string describing the error. */
-XMLPARSEAPI(const XML_LChar *)
-XML_ErrorString(enum XML_Error code);
-
-/* Return a string containing the version number of this expat */
-XMLPARSEAPI(const XML_LChar *)
-XML_ExpatVersion(void);
-
-typedef struct {
-  int major;
-  int minor;
-  int micro;
-} XML_Expat_Version;
-
-/* Return an XML_Expat_Version structure containing numeric version
-   number information for this version of expat.
-*/
-XMLPARSEAPI(XML_Expat_Version)
-XML_ExpatVersionInfo(void);
-
-/* Added in Expat 1.95.5. */
-enum XML_FeatureEnum {
-  XML_FEATURE_END = 0,
-  XML_FEATURE_UNICODE,
-  XML_FEATURE_UNICODE_WCHAR_T,
-  XML_FEATURE_DTD,
-  XML_FEATURE_CONTEXT_BYTES,
-  XML_FEATURE_MIN_SIZE,
-  XML_FEATURE_SIZEOF_XML_CHAR,
-  XML_FEATURE_SIZEOF_XML_LCHAR,
-  XML_FEATURE_NS,
-  XML_FEATURE_LARGE_SIZE
-  /* Additional features must be added to the end of this enum. */
-};
-
-typedef struct {
-  enum XML_FeatureEnum  feature;
-  const XML_LChar       *name;
-  long int              value;
-} XML_Feature;
-
-XMLPARSEAPI(const XML_Feature *)
-XML_GetFeatureList(void);
-
-
-/* Expat follows the GNU/Linux convention of odd number minor version for
-   beta/development releases and even number minor version for stable
-   releases. Micro is bumped with each release, and set to 0 with each
-   change to major or minor version.
-*/
-#define XML_MAJOR_VERSION 2
-#define XML_MINOR_VERSION 0
-#define XML_MICRO_VERSION 1
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* not Expat_INCLUDED */
diff --git a/lib-x86-64/include/expat_external.h b/lib-x86-64/include/expat_external.h
deleted file mode 100644
index 2c03284e..00000000
--- a/lib-x86-64/include/expat_external.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
-   See the file COPYING for copying permission.
-*/
-
-#ifndef Expat_External_INCLUDED
-#define Expat_External_INCLUDED 1
-
-/* External API definitions */
-
-#if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__)
-#define XML_USE_MSC_EXTENSIONS 1
-#endif
-
-/* Expat tries very hard to make the API boundary very specifically
-   defined.  There are two macros defined to control this boundary;
-   each of these can be defined before including this header to
-   achieve some different behavior, but doing so it not recommended or
-   tested frequently.
-
-   XMLCALL    - The calling convention to use for all calls across the
-                "library boundary."  This will default to cdecl, and
-                try really hard to tell the compiler that's what we
-                want.
-
-   XMLIMPORT  - Whatever magic is needed to note that a function is
-                to be imported from a dynamically loaded library
-                (.dll, .so, or .sl, depending on your platform).
-
-   The XMLCALL macro was added in Expat 1.95.7.  The only one which is
-   expected to be directly useful in client code is XMLCALL.
-
-   Note that on at least some Unix versions, the Expat library must be
-   compiled with the cdecl calling convention as the default since
-   system headers may assume the cdecl convention.
-*/
-#ifndef XMLCALL
-#if defined(_MSC_VER)
-#define XMLCALL __cdecl
-#elif defined(__GNUC__) && defined(__i386) && !defined(__INTEL_COMPILER)
-#define XMLCALL __attribute__((cdecl))
-#else
-/* For any platform which uses this definition and supports more than
-   one calling convention, we need to extend this definition to
-   declare the convention used on that platform, if it's possible to
-   do so.
-
-   If this is the case for your platform, please file a bug report
-   with information on how to identify your platform via the C
-   pre-processor and how to specify the same calling convention as the
-   platform's malloc() implementation.
-*/
-#define XMLCALL
-#endif
-#endif  /* not defined XMLCALL */
-
-
-#if !defined(XML_STATIC) && !defined(XMLIMPORT)
-#ifndef XML_BUILDING_EXPAT
-/* using Expat from an application */
-
-#ifdef XML_USE_MSC_EXTENSIONS
-#define XMLIMPORT __declspec(dllimport)
-#endif
-
-#endif
-#endif  /* not defined XML_STATIC */
-
-
-/* If we didn't define it above, define it away: */
-#ifndef XMLIMPORT
-#define XMLIMPORT
-#endif
-
-
-#define XMLPARSEAPI(type) XMLIMPORT type XMLCALL
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef XML_UNICODE_WCHAR_T
-#define XML_UNICODE
-#endif
-
-#ifdef XML_UNICODE     /* Information is UTF-16 encoded. */
-#ifdef XML_UNICODE_WCHAR_T
-typedef wchar_t XML_Char;
-typedef wchar_t XML_LChar;
-#else
-typedef unsigned short XML_Char;
-typedef char XML_LChar;
-#endif /* XML_UNICODE_WCHAR_T */
-#else                  /* Information is UTF-8 encoded. */
-typedef char XML_Char;
-typedef char XML_LChar;
-#endif /* XML_UNICODE */
-
-#ifdef XML_LARGE_SIZE  /* Use large integers for file/stream positions. */
-#if defined(XML_USE_MSC_EXTENSIONS) && _MSC_VER < 1400
-typedef __int64 XML_Index; 
-typedef unsigned __int64 XML_Size;
-#else
-typedef long long XML_Index;
-typedef unsigned long long XML_Size;
-#endif
-#else
-typedef long XML_Index;
-typedef unsigned long XML_Size;
-#endif /* XML_LARGE_SIZE */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* not Expat_External_INCLUDED */
diff --git a/lib-x86-64/include/faad.h b/lib-x86-64/include/faad.h
deleted file mode 100644
index 72f40728..00000000
--- a/lib-x86-64/include/faad.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
-** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com
-**  
-** 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 of the License, 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.
-**
-** Any non-GPL usage of this software or parts of this software is strictly
-** forbidden.
-**
-** The "appropriate copyright message" mentioned in section 2c of the GPLv2
-** must read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
-**
-** Commercial non-GPL licensing of this software is possible.
-** For more info contact Nero AG through Mpeg4AAClicense@nero.com.
-**
-** $Id: faad.h,v 1.51 2007/11/01 12:33:29 menno Exp $
-**/
-
-/* warn people for update */
-#pragma message("please update faad2 include filename and function names!")
-
-/* Backwards compatible link */
-#include "neaacdec.h"
diff --git a/lib-x86-64/include/jconfig.h b/lib-x86-64/include/jconfig.h
deleted file mode 100644
index 966b1d51..00000000
--- a/lib-x86-64/include/jconfig.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* jconfig.h.  Generated from jconfig.cfg by configure.  */
-/* jconfig.cfg --- source file edited by configure script */
-/* see jconfig.txt for explanations */
-
-#define HAVE_PROTOTYPES 1
-#define HAVE_UNSIGNED_CHAR 1
-#define HAVE_UNSIGNED_SHORT 1
-/* #undef void */
-/* #undef const */
-/* #undef CHAR_IS_UNSIGNED */
-#define HAVE_STDDEF_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_LOCALE_H 1
-/* #undef NEED_BSD_STRINGS */
-/* #undef NEED_SYS_TYPES_H */
-/* #undef NEED_FAR_POINTERS */
-/* #undef NEED_SHORT_EXTERNAL_NAMES */
-/* Define this if you get warnings about undefined structures. */
-/* #undef INCOMPLETE_TYPES_BROKEN */
-
-/* Define "boolean" as unsigned char, not int, on Windows systems. */
-#ifdef _WIN32
-#ifndef __RPCNDR_H__		/* don't conflict if rpcndr.h already read */
-typedef unsigned char boolean;
-#endif
-#define HAVE_BOOLEAN		/* prevent jmorecfg.h from redefining it */
-#endif
-
-#ifdef JPEG_INTERNALS
-
-/* #undef RIGHT_SHIFT_IS_UNSIGNED */
-#define INLINE __inline__
-/* These are for configuring the JPEG memory manager. */
-/* #undef DEFAULT_MAX_MEM */
-/* #undef NO_MKTEMP */
-
-#endif /* JPEG_INTERNALS */
-
-#ifdef JPEG_CJPEG_DJPEG
-
-#define BMP_SUPPORTED		/* BMP image file format */
-#define GIF_SUPPORTED		/* GIF image file format */
-#define PPM_SUPPORTED		/* PBMPLUS PPM/PGM image file format */
-/* #undef RLE_SUPPORTED */
-#define TARGA_SUPPORTED		/* Targa image file format */
-
-/* #undef TWO_FILE_COMMANDLINE */
-/* #undef NEED_SIGNAL_CATCHER */
-/* #undef DONT_USE_B_MODE */
-
-/* Define this if you want percent-done progress reports from cjpeg/djpeg. */
-/* #undef PROGRESS_REPORT */
-
-#endif /* JPEG_CJPEG_DJPEG */
diff --git a/lib-x86-64/include/jerror.h b/lib-x86-64/include/jerror.h
deleted file mode 100644
index 1cfb2b19..00000000
--- a/lib-x86-64/include/jerror.h
+++ /dev/null
@@ -1,304 +0,0 @@
-/*
- * jerror.h
- *
- * Copyright (C) 1994-1997, Thomas G. Lane.
- * Modified 1997-2009 by Guido Vollbeding.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file defines the error and message codes for the JPEG library.
- * Edit this file to add new codes, or to translate the message strings to
- * some other language.
- * A set of error-reporting macros are defined too.  Some applications using
- * the JPEG library may wish to include this file to get the error codes
- * and/or the macros.
- */
-
-/*
- * To define the enum list of message codes, include this file without
- * defining macro JMESSAGE.  To create a message string table, include it
- * again with a suitable JMESSAGE definition (see jerror.c for an example).
- */
-#ifndef JMESSAGE
-#ifndef JERROR_H
-/* First time through, define the enum list */
-#define JMAKE_ENUM_LIST
-#else
-/* Repeated inclusions of this file are no-ops unless JMESSAGE is defined */
-#define JMESSAGE(code,string)
-#endif /* JERROR_H */
-#endif /* JMESSAGE */
-
-#ifdef JMAKE_ENUM_LIST
-
-typedef enum {
-
-#define JMESSAGE(code,string)	code ,
-
-#endif /* JMAKE_ENUM_LIST */
-
-JMESSAGE(JMSG_NOMESSAGE, "Bogus message code %d") /* Must be first entry! */
-
-/* For maintenance convenience, list is alphabetical by message code name */
-JMESSAGE(JERR_BAD_ALIGN_TYPE, "ALIGN_TYPE is wrong, please fix")
-JMESSAGE(JERR_BAD_ALLOC_CHUNK, "MAX_ALLOC_CHUNK is wrong, please fix")
-JMESSAGE(JERR_BAD_BUFFER_MODE, "Bogus buffer control mode")
-JMESSAGE(JERR_BAD_COMPONENT_ID, "Invalid component ID %d in SOS")
-JMESSAGE(JERR_BAD_CROP_SPEC, "Invalid crop request")
-JMESSAGE(JERR_BAD_DCT_COEF, "DCT coefficient out of range")
-JMESSAGE(JERR_BAD_DCTSIZE, "DCT scaled block size %dx%d not supported")
-JMESSAGE(JERR_BAD_DROP_SAMPLING,
-	 "Component index %d: mismatching sampling ratio %d:%d, %d:%d, %c")
-JMESSAGE(JERR_BAD_HUFF_TABLE, "Bogus Huffman table definition")
-JMESSAGE(JERR_BAD_IN_COLORSPACE, "Bogus input colorspace")
-JMESSAGE(JERR_BAD_J_COLORSPACE, "Bogus JPEG colorspace")
-JMESSAGE(JERR_BAD_LENGTH, "Bogus marker length")
-JMESSAGE(JERR_BAD_LIB_VERSION,
-	 "Wrong JPEG library version: library is %d, caller expects %d")
-JMESSAGE(JERR_BAD_MCU_SIZE, "Sampling factors too large for interleaved scan")
-JMESSAGE(JERR_BAD_POOL_ID, "Invalid memory pool code %d")
-JMESSAGE(JERR_BAD_PRECISION, "Unsupported JPEG data precision %d")
-JMESSAGE(JERR_BAD_PROGRESSION,
-	 "Invalid progressive parameters Ss=%d Se=%d Ah=%d Al=%d")
-JMESSAGE(JERR_BAD_PROG_SCRIPT,
-	 "Invalid progressive parameters at scan script entry %d")
-JMESSAGE(JERR_BAD_SAMPLING, "Bogus sampling factors")
-JMESSAGE(JERR_BAD_SCAN_SCRIPT, "Invalid scan script at entry %d")
-JMESSAGE(JERR_BAD_STATE, "Improper call to JPEG library in state %d")
-JMESSAGE(JERR_BAD_STRUCT_SIZE,
-	 "JPEG parameter struct mismatch: library thinks size is %u, caller expects %u")
-JMESSAGE(JERR_BAD_VIRTUAL_ACCESS, "Bogus virtual array access")
-JMESSAGE(JERR_BUFFER_SIZE, "Buffer passed to JPEG library is too small")
-JMESSAGE(JERR_CANT_SUSPEND, "Suspension not allowed here")
-JMESSAGE(JERR_CCIR601_NOTIMPL, "CCIR601 sampling not implemented yet")
-JMESSAGE(JERR_COMPONENT_COUNT, "Too many color components: %d, max %d")
-JMESSAGE(JERR_CONVERSION_NOTIMPL, "Unsupported color conversion request")
-JMESSAGE(JERR_DAC_INDEX, "Bogus DAC index %d")
-JMESSAGE(JERR_DAC_VALUE, "Bogus DAC value 0x%x")
-JMESSAGE(JERR_DHT_INDEX, "Bogus DHT index %d")
-JMESSAGE(JERR_DQT_INDEX, "Bogus DQT index %d")
-JMESSAGE(JERR_EMPTY_IMAGE, "Empty JPEG image (DNL not supported)")
-JMESSAGE(JERR_EMS_READ, "Read from EMS failed")
-JMESSAGE(JERR_EMS_WRITE, "Write to EMS failed")
-JMESSAGE(JERR_EOI_EXPECTED, "Didn't expect more than one scan")
-JMESSAGE(JERR_FILE_READ, "Input file read error")
-JMESSAGE(JERR_FILE_WRITE, "Output file write error --- out of disk space?")
-JMESSAGE(JERR_FRACT_SAMPLE_NOTIMPL, "Fractional sampling not implemented yet")
-JMESSAGE(JERR_HUFF_CLEN_OVERFLOW, "Huffman code size table overflow")
-JMESSAGE(JERR_HUFF_MISSING_CODE, "Missing Huffman code table entry")
-JMESSAGE(JERR_IMAGE_TOO_BIG, "Maximum supported image dimension is %u pixels")
-JMESSAGE(JERR_INPUT_EMPTY, "Empty input file")
-JMESSAGE(JERR_INPUT_EOF, "Premature end of input file")
-JMESSAGE(JERR_MISMATCHED_QUANT_TABLE,
-	 "Cannot transcode due to multiple use of quantization table %d")
-JMESSAGE(JERR_MISSING_DATA, "Scan script does not transmit all data")
-JMESSAGE(JERR_MODE_CHANGE, "Invalid color quantization mode change")
-JMESSAGE(JERR_NOTIMPL, "Not implemented yet")
-JMESSAGE(JERR_NOT_COMPILED, "Requested feature was omitted at compile time")
-JMESSAGE(JERR_NO_ARITH_TABLE, "Arithmetic table 0x%02x was not defined")
-JMESSAGE(JERR_NO_BACKING_STORE, "Backing store not supported")
-JMESSAGE(JERR_NO_HUFF_TABLE, "Huffman table 0x%02x was not defined")
-JMESSAGE(JERR_NO_IMAGE, "JPEG datastream contains no image")
-JMESSAGE(JERR_NO_QUANT_TABLE, "Quantization table 0x%02x was not defined")
-JMESSAGE(JERR_NO_SOI, "Not a JPEG file: starts with 0x%02x 0x%02x")
-JMESSAGE(JERR_OUT_OF_MEMORY, "Insufficient memory (case %d)")
-JMESSAGE(JERR_QUANT_COMPONENTS,
-	 "Cannot quantize more than %d color components")
-JMESSAGE(JERR_QUANT_FEW_COLORS, "Cannot quantize to fewer than %d colors")
-JMESSAGE(JERR_QUANT_MANY_COLORS, "Cannot quantize to more than %d colors")
-JMESSAGE(JERR_SOF_DUPLICATE, "Invalid JPEG file structure: two SOF markers")
-JMESSAGE(JERR_SOF_NO_SOS, "Invalid JPEG file structure: missing SOS marker")
-JMESSAGE(JERR_SOF_UNSUPPORTED, "Unsupported JPEG process: SOF type 0x%02x")
-JMESSAGE(JERR_SOI_DUPLICATE, "Invalid JPEG file structure: two SOI markers")
-JMESSAGE(JERR_SOS_NO_SOF, "Invalid JPEG file structure: SOS before SOF")
-JMESSAGE(JERR_TFILE_CREATE, "Failed to create temporary file %s")
-JMESSAGE(JERR_TFILE_READ, "Read failed on temporary file")
-JMESSAGE(JERR_TFILE_SEEK, "Seek failed on temporary file")
-JMESSAGE(JERR_TFILE_WRITE,
-	 "Write failed on temporary file --- out of disk space?")
-JMESSAGE(JERR_TOO_LITTLE_DATA, "Application transferred too few scanlines")
-JMESSAGE(JERR_UNKNOWN_MARKER, "Unsupported marker type 0x%02x")
-JMESSAGE(JERR_VIRTUAL_BUG, "Virtual array controller messed up")
-JMESSAGE(JERR_WIDTH_OVERFLOW, "Image too wide for this implementation")
-JMESSAGE(JERR_XMS_READ, "Read from XMS failed")
-JMESSAGE(JERR_XMS_WRITE, "Write to XMS failed")
-JMESSAGE(JMSG_COPYRIGHT, JCOPYRIGHT)
-JMESSAGE(JMSG_VERSION, JVERSION)
-JMESSAGE(JTRC_16BIT_TABLES,
-	 "Caution: quantization tables are too coarse for baseline JPEG")
-JMESSAGE(JTRC_ADOBE,
-	 "Adobe APP14 marker: version %d, flags 0x%04x 0x%04x, transform %d")
-JMESSAGE(JTRC_APP0, "Unknown APP0 marker (not JFIF), length %u")
-JMESSAGE(JTRC_APP14, "Unknown APP14 marker (not Adobe), length %u")
-JMESSAGE(JTRC_DAC, "Define Arithmetic Table 0x%02x: 0x%02x")
-JMESSAGE(JTRC_DHT, "Define Huffman Table 0x%02x")
-JMESSAGE(JTRC_DQT, "Define Quantization Table %d  precision %d")
-JMESSAGE(JTRC_DRI, "Define Restart Interval %u")
-JMESSAGE(JTRC_EMS_CLOSE, "Freed EMS handle %u")
-JMESSAGE(JTRC_EMS_OPEN, "Obtained EMS handle %u")
-JMESSAGE(JTRC_EOI, "End Of Image")
-JMESSAGE(JTRC_HUFFBITS, "        %3d %3d %3d %3d %3d %3d %3d %3d")
-JMESSAGE(JTRC_JFIF, "JFIF APP0 marker: version %d.%02d, density %dx%d  %d")
-JMESSAGE(JTRC_JFIF_BADTHUMBNAILSIZE,
-	 "Warning: thumbnail image size does not match data length %u")
-JMESSAGE(JTRC_JFIF_EXTENSION,
-	 "JFIF extension marker: type 0x%02x, length %u")
-JMESSAGE(JTRC_JFIF_THUMBNAIL, "    with %d x %d thumbnail image")
-JMESSAGE(JTRC_MISC_MARKER, "Miscellaneous marker 0x%02x, length %u")
-JMESSAGE(JTRC_PARMLESS_MARKER, "Unexpected marker 0x%02x")
-JMESSAGE(JTRC_QUANTVALS, "        %4u %4u %4u %4u %4u %4u %4u %4u")
-JMESSAGE(JTRC_QUANT_3_NCOLORS, "Quantizing to %d = %d*%d*%d colors")
-JMESSAGE(JTRC_QUANT_NCOLORS, "Quantizing to %d colors")
-JMESSAGE(JTRC_QUANT_SELECTED, "Selected %d colors for quantization")
-JMESSAGE(JTRC_RECOVERY_ACTION, "At marker 0x%02x, recovery action %d")
-JMESSAGE(JTRC_RST, "RST%d")
-JMESSAGE(JTRC_SMOOTH_NOTIMPL,
-	 "Smoothing not supported with nonstandard sampling ratios")
-JMESSAGE(JTRC_SOF, "Start Of Frame 0x%02x: width=%u, height=%u, components=%d")
-JMESSAGE(JTRC_SOF_COMPONENT, "    Component %d: %dhx%dv q=%d")
-JMESSAGE(JTRC_SOI, "Start of Image")
-JMESSAGE(JTRC_SOS, "Start Of Scan: %d components")
-JMESSAGE(JTRC_SOS_COMPONENT, "    Component %d: dc=%d ac=%d")
-JMESSAGE(JTRC_SOS_PARAMS, "  Ss=%d, Se=%d, Ah=%d, Al=%d")
-JMESSAGE(JTRC_TFILE_CLOSE, "Closed temporary file %s")
-JMESSAGE(JTRC_TFILE_OPEN, "Opened temporary file %s")
-JMESSAGE(JTRC_THUMB_JPEG,
-	 "JFIF extension marker: JPEG-compressed thumbnail image, length %u")
-JMESSAGE(JTRC_THUMB_PALETTE,
-	 "JFIF extension marker: palette thumbnail image, length %u")
-JMESSAGE(JTRC_THUMB_RGB,
-	 "JFIF extension marker: RGB thumbnail image, length %u")
-JMESSAGE(JTRC_UNKNOWN_IDS,
-	 "Unrecognized component IDs %d %d %d, assuming YCbCr")
-JMESSAGE(JTRC_XMS_CLOSE, "Freed XMS handle %u")
-JMESSAGE(JTRC_XMS_OPEN, "Obtained XMS handle %u")
-JMESSAGE(JWRN_ADOBE_XFORM, "Unknown Adobe color transform code %d")
-JMESSAGE(JWRN_ARITH_BAD_CODE, "Corrupt JPEG data: bad arithmetic code")
-JMESSAGE(JWRN_BOGUS_PROGRESSION,
-	 "Inconsistent progression sequence for component %d coefficient %d")
-JMESSAGE(JWRN_EXTRANEOUS_DATA,
-	 "Corrupt JPEG data: %u extraneous bytes before marker 0x%02x")
-JMESSAGE(JWRN_HIT_MARKER, "Corrupt JPEG data: premature end of data segment")
-JMESSAGE(JWRN_HUFF_BAD_CODE, "Corrupt JPEG data: bad Huffman code")
-JMESSAGE(JWRN_JFIF_MAJOR, "Warning: unknown JFIF revision number %d.%02d")
-JMESSAGE(JWRN_JPEG_EOF, "Premature end of JPEG file")
-JMESSAGE(JWRN_MUST_RESYNC,
-	 "Corrupt JPEG data: found marker 0x%02x instead of RST%d")
-JMESSAGE(JWRN_NOT_SEQUENTIAL, "Invalid SOS parameters for sequential JPEG")
-JMESSAGE(JWRN_TOO_MUCH_DATA, "Application transferred too many scanlines")
-
-#ifdef JMAKE_ENUM_LIST
-
-  JMSG_LASTMSGCODE
-} J_MESSAGE_CODE;
-
-#undef JMAKE_ENUM_LIST
-#endif /* JMAKE_ENUM_LIST */
-
-/* Zap JMESSAGE macro so that future re-inclusions do nothing by default */
-#undef JMESSAGE
-
-
-#ifndef JERROR_H
-#define JERROR_H
-
-/* Macros to simplify using the error and trace message stuff */
-/* The first parameter is either type of cinfo pointer */
-
-/* Fatal errors (print message and exit) */
-#define ERREXIT(cinfo,code)  \
-  ((cinfo)->err->msg_code = (code), \
-   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
-#define ERREXIT1(cinfo,code,p1)  \
-  ((cinfo)->err->msg_code = (code), \
-   (cinfo)->err->msg_parm.i[0] = (p1), \
-   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
-#define ERREXIT2(cinfo,code,p1,p2)  \
-  ((cinfo)->err->msg_code = (code), \
-   (cinfo)->err->msg_parm.i[0] = (p1), \
-   (cinfo)->err->msg_parm.i[1] = (p2), \
-   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
-#define ERREXIT3(cinfo,code,p1,p2,p3)  \
-  ((cinfo)->err->msg_code = (code), \
-   (cinfo)->err->msg_parm.i[0] = (p1), \
-   (cinfo)->err->msg_parm.i[1] = (p2), \
-   (cinfo)->err->msg_parm.i[2] = (p3), \
-   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
-#define ERREXIT4(cinfo,code,p1,p2,p3,p4)  \
-  ((cinfo)->err->msg_code = (code), \
-   (cinfo)->err->msg_parm.i[0] = (p1), \
-   (cinfo)->err->msg_parm.i[1] = (p2), \
-   (cinfo)->err->msg_parm.i[2] = (p3), \
-   (cinfo)->err->msg_parm.i[3] = (p4), \
-   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
-#define ERREXIT6(cinfo,code,p1,p2,p3,p4,p5,p6)  \
-  ((cinfo)->err->msg_code = (code), \
-   (cinfo)->err->msg_parm.i[0] = (p1), \
-   (cinfo)->err->msg_parm.i[1] = (p2), \
-   (cinfo)->err->msg_parm.i[2] = (p3), \
-   (cinfo)->err->msg_parm.i[3] = (p4), \
-   (cinfo)->err->msg_parm.i[4] = (p5), \
-   (cinfo)->err->msg_parm.i[5] = (p6), \
-   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
-#define ERREXITS(cinfo,code,str)  \
-  ((cinfo)->err->msg_code = (code), \
-   strncpy((cinfo)->err->msg_parm.s, (str), JMSG_STR_PARM_MAX), \
-   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
-
-#define MAKESTMT(stuff)		do { stuff } while (0)
-
-/* Nonfatal errors (we can keep going, but the data is probably corrupt) */
-#define WARNMS(cinfo,code)  \
-  ((cinfo)->err->msg_code = (code), \
-   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), -1))
-#define WARNMS1(cinfo,code,p1)  \
-  ((cinfo)->err->msg_code = (code), \
-   (cinfo)->err->msg_parm.i[0] = (p1), \
-   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), -1))
-#define WARNMS2(cinfo,code,p1,p2)  \
-  ((cinfo)->err->msg_code = (code), \
-   (cinfo)->err->msg_parm.i[0] = (p1), \
-   (cinfo)->err->msg_parm.i[1] = (p2), \
-   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), -1))
-
-/* Informational/debugging messages */
-#define TRACEMS(cinfo,lvl,code)  \
-  ((cinfo)->err->msg_code = (code), \
-   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)))
-#define TRACEMS1(cinfo,lvl,code,p1)  \
-  ((cinfo)->err->msg_code = (code), \
-   (cinfo)->err->msg_parm.i[0] = (p1), \
-   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)))
-#define TRACEMS2(cinfo,lvl,code,p1,p2)  \
-  ((cinfo)->err->msg_code = (code), \
-   (cinfo)->err->msg_parm.i[0] = (p1), \
-   (cinfo)->err->msg_parm.i[1] = (p2), \
-   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)))
-#define TRACEMS3(cinfo,lvl,code,p1,p2,p3)  \
-  MAKESTMT(int * _mp = (cinfo)->err->msg_parm.i; \
-	   _mp[0] = (p1); _mp[1] = (p2); _mp[2] = (p3); \
-	   (cinfo)->err->msg_code = (code); \
-	   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)); )
-#define TRACEMS4(cinfo,lvl,code,p1,p2,p3,p4)  \
-  MAKESTMT(int * _mp = (cinfo)->err->msg_parm.i; \
-	   _mp[0] = (p1); _mp[1] = (p2); _mp[2] = (p3); _mp[3] = (p4); \
-	   (cinfo)->err->msg_code = (code); \
-	   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)); )
-#define TRACEMS5(cinfo,lvl,code,p1,p2,p3,p4,p5)  \
-  MAKESTMT(int * _mp = (cinfo)->err->msg_parm.i; \
-	   _mp[0] = (p1); _mp[1] = (p2); _mp[2] = (p3); _mp[3] = (p4); \
-	   _mp[4] = (p5); \
-	   (cinfo)->err->msg_code = (code); \
-	   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)); )
-#define TRACEMS8(cinfo,lvl,code,p1,p2,p3,p4,p5,p6,p7,p8)  \
-  MAKESTMT(int * _mp = (cinfo)->err->msg_parm.i; \
-	   _mp[0] = (p1); _mp[1] = (p2); _mp[2] = (p3); _mp[3] = (p4); \
-	   _mp[4] = (p5); _mp[5] = (p6); _mp[6] = (p7); _mp[7] = (p8); \
-	   (cinfo)->err->msg_code = (code); \
-	   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)); )
-#define TRACEMSS(cinfo,lvl,code,str)  \
-  ((cinfo)->err->msg_code = (code), \
-   strncpy((cinfo)->err->msg_parm.s, (str), JMSG_STR_PARM_MAX), \
-   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)))
-
-#endif /* JERROR_H */
diff --git a/lib-x86-64/include/jmorecfg.h b/lib-x86-64/include/jmorecfg.h
deleted file mode 100644
index 928d052c..00000000
--- a/lib-x86-64/include/jmorecfg.h
+++ /dev/null
@@ -1,371 +0,0 @@
-/*
- * jmorecfg.h
- *
- * Copyright (C) 1991-1997, Thomas G. Lane.
- * Modified 1997-2009 by Guido Vollbeding.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains additional configuration options that customize the
- * JPEG software for special applications or support machine-dependent
- * optimizations.  Most users will not need to touch this file.
- */
-
-
-/*
- * Define BITS_IN_JSAMPLE as either
- *   8   for 8-bit sample values (the usual setting)
- *   12  for 12-bit sample values
- * Only 8 and 12 are legal data precisions for lossy JPEG according to the
- * JPEG standard, and the IJG code does not support anything else!
- * We do not support run-time selection of data precision, sorry.
- */
-
-#define BITS_IN_JSAMPLE  8	/* use 8 or 12 */
-
-
-/*
- * Maximum number of components (color channels) allowed in JPEG image.
- * To meet the letter of the JPEG spec, set this to 255.  However, darn
- * few applications need more than 4 channels (maybe 5 for CMYK + alpha
- * mask).  We recommend 10 as a reasonable compromise; use 4 if you are
- * really short on memory.  (Each allowed component costs a hundred or so
- * bytes of storage, whether actually used in an image or not.)
- */
-
-#define MAX_COMPONENTS  10	/* maximum number of image components */
-
-
-/*
- * Basic data types.
- * You may need to change these if you have a machine with unusual data
- * type sizes; for example, "char" not 8 bits, "short" not 16 bits,
- * or "long" not 32 bits.  We don't care whether "int" is 16 or 32 bits,
- * but it had better be at least 16.
- */
-
-/* Representation of a single sample (pixel element value).
- * We frequently allocate large arrays of these, so it's important to keep
- * them small.  But if you have memory to burn and access to char or short
- * arrays is very slow on your hardware, you might want to change these.
- */
-
-#if BITS_IN_JSAMPLE == 8
-/* JSAMPLE should be the smallest type that will hold the values 0..255.
- * You can use a signed char by having GETJSAMPLE mask it with 0xFF.
- */
-
-#ifdef HAVE_UNSIGNED_CHAR
-
-typedef unsigned char JSAMPLE;
-#define GETJSAMPLE(value)  ((int) (value))
-
-#else /* not HAVE_UNSIGNED_CHAR */
-
-typedef char JSAMPLE;
-#ifdef CHAR_IS_UNSIGNED
-#define GETJSAMPLE(value)  ((int) (value))
-#else
-#define GETJSAMPLE(value)  ((int) (value) & 0xFF)
-#endif /* CHAR_IS_UNSIGNED */
-
-#endif /* HAVE_UNSIGNED_CHAR */
-
-#define MAXJSAMPLE	255
-#define CENTERJSAMPLE	128
-
-#endif /* BITS_IN_JSAMPLE == 8 */
-
-
-#if BITS_IN_JSAMPLE == 12
-/* JSAMPLE should be the smallest type that will hold the values 0..4095.
- * On nearly all machines "short" will do nicely.
- */
-
-typedef short JSAMPLE;
-#define GETJSAMPLE(value)  ((int) (value))
-
-#define MAXJSAMPLE	4095
-#define CENTERJSAMPLE	2048
-
-#endif /* BITS_IN_JSAMPLE == 12 */
-
-
-/* Representation of a DCT frequency coefficient.
- * This should be a signed value of at least 16 bits; "short" is usually OK.
- * Again, we allocate large arrays of these, but you can change to int
- * if you have memory to burn and "short" is really slow.
- */
-
-typedef short JCOEF;
-
-
-/* Compressed datastreams are represented as arrays of JOCTET.
- * These must be EXACTLY 8 bits wide, at least once they are written to
- * external storage.  Note that when using the stdio data source/destination
- * managers, this is also the data type passed to fread/fwrite.
- */
-
-#ifdef HAVE_UNSIGNED_CHAR
-
-typedef unsigned char JOCTET;
-#define GETJOCTET(value)  (value)
-
-#else /* not HAVE_UNSIGNED_CHAR */
-
-typedef char JOCTET;
-#ifdef CHAR_IS_UNSIGNED
-#define GETJOCTET(value)  (value)
-#else
-#define GETJOCTET(value)  ((value) & 0xFF)
-#endif /* CHAR_IS_UNSIGNED */
-
-#endif /* HAVE_UNSIGNED_CHAR */
-
-
-/* These typedefs are used for various table entries and so forth.
- * They must be at least as wide as specified; but making them too big
- * won't cost a huge amount of memory, so we don't provide special
- * extraction code like we did for JSAMPLE.  (In other words, these
- * typedefs live at a different point on the speed/space tradeoff curve.)
- */
-
-/* UINT8 must hold at least the values 0..255. */
-
-#ifdef HAVE_UNSIGNED_CHAR
-typedef unsigned char UINT8;
-#else /* not HAVE_UNSIGNED_CHAR */
-#ifdef CHAR_IS_UNSIGNED
-typedef char UINT8;
-#else /* not CHAR_IS_UNSIGNED */
-typedef short UINT8;
-#endif /* CHAR_IS_UNSIGNED */
-#endif /* HAVE_UNSIGNED_CHAR */
-
-/* UINT16 must hold at least the values 0..65535. */
-
-#ifdef HAVE_UNSIGNED_SHORT
-typedef unsigned short UINT16;
-#else /* not HAVE_UNSIGNED_SHORT */
-typedef unsigned int UINT16;
-#endif /* HAVE_UNSIGNED_SHORT */
-
-/* INT16 must hold at least the values -32768..32767. */
-
-#ifndef XMD_H			/* X11/xmd.h correctly defines INT16 */
-typedef short INT16;
-#endif
-
-/* INT32 must hold at least signed 32-bit values. */
-
-#ifndef XMD_H			/* X11/xmd.h correctly defines INT32 */
-#ifndef _BASETSD_H_		/* Microsoft defines it in basetsd.h */
-#ifndef _BASETSD_H		/* MinGW is slightly different */
-#ifndef QGLOBAL_H		/* Qt defines it in qglobal.h */
-typedef long INT32;
-#endif
-#endif
-#endif
-#endif
-
-/* Datatype used for image dimensions.  The JPEG standard only supports
- * images up to 64K*64K due to 16-bit fields in SOF markers.  Therefore
- * "unsigned int" is sufficient on all machines.  However, if you need to
- * handle larger images and you don't mind deviating from the spec, you
- * can change this datatype.
- */
-
-typedef unsigned int JDIMENSION;
-
-#define JPEG_MAX_DIMENSION  65500L  /* a tad under 64K to prevent overflows */
-
-
-/* These macros are used in all function definitions and extern declarations.
- * You could modify them if you need to change function linkage conventions;
- * in particular, you'll need to do that to make the library a Windows DLL.
- * Another application is to make all functions global for use with debuggers
- * or code profilers that require it.
- */
-
-/* a function called through method pointers: */
-#define METHODDEF(type)		static type
-/* a function used only in its module: */
-#define LOCAL(type)		static type
-/* a function referenced thru EXTERNs: */
-#define GLOBAL(type)		type
-/* a reference to a GLOBAL function: */
-#define EXTERN(type)		extern type
-
-
-/* This macro is used to declare a "method", that is, a function pointer.
- * We want to supply prototype parameters if the compiler can cope.
- * Note that the arglist parameter must be parenthesized!
- * Again, you can customize this if you need special linkage keywords.
- */
-
-#ifdef HAVE_PROTOTYPES
-#define JMETHOD(type,methodname,arglist)  type (*methodname) arglist
-#else
-#define JMETHOD(type,methodname,arglist)  type (*methodname) ()
-#endif
-
-
-/* Here is the pseudo-keyword for declaring pointers that must be "far"
- * on 80x86 machines.  Most of the specialized coding for 80x86 is handled
- * by just saying "FAR *" where such a pointer is needed.  In a few places
- * explicit coding is needed; see uses of the NEED_FAR_POINTERS symbol.
- */
-
-#ifndef FAR
-#ifdef NEED_FAR_POINTERS
-#define FAR  far
-#else
-#define FAR
-#endif
-#endif
-
-
-/*
- * On a few systems, type boolean and/or its values FALSE, TRUE may appear
- * in standard header files.  Or you may have conflicts with application-
- * specific header files that you want to include together with these files.
- * Defining HAVE_BOOLEAN before including jpeglib.h should make it work.
- */
-
-#ifndef HAVE_BOOLEAN
-typedef int boolean;
-#endif
-#ifndef FALSE			/* in case these macros already exist */
-#define FALSE	0		/* values of boolean */
-#endif
-#ifndef TRUE
-#define TRUE	1
-#endif
-
-
-/*
- * The remaining options affect code selection within the JPEG library,
- * but they don't need to be visible to most applications using the library.
- * To minimize application namespace pollution, the symbols won't be
- * defined unless JPEG_INTERNALS or JPEG_INTERNAL_OPTIONS has been defined.
- */
-
-#ifdef JPEG_INTERNALS
-#define JPEG_INTERNAL_OPTIONS
-#endif
-
-#ifdef JPEG_INTERNAL_OPTIONS
-
-
-/*
- * These defines indicate whether to include various optional functions.
- * Undefining some of these symbols will produce a smaller but less capable
- * library.  Note that you can leave certain source files out of the
- * compilation/linking process if you've #undef'd the corresponding symbols.
- * (You may HAVE to do that if your compiler doesn't like null source files.)
- */
-
-/* Capability options common to encoder and decoder: */
-
-#define DCT_ISLOW_SUPPORTED	/* slow but accurate integer algorithm */
-#define DCT_IFAST_SUPPORTED	/* faster, less accurate integer method */
-#define DCT_FLOAT_SUPPORTED	/* floating-point: accurate, fast on fast HW */
-
-/* Encoder capability options: */
-
-#define C_ARITH_CODING_SUPPORTED    /* Arithmetic coding back end? */
-#define C_MULTISCAN_FILES_SUPPORTED /* Multiple-scan JPEG files? */
-#define C_PROGRESSIVE_SUPPORTED	    /* Progressive JPEG? (Requires MULTISCAN)*/
-#define DCT_SCALING_SUPPORTED	    /* Input rescaling via DCT? (Requires DCT_ISLOW)*/
-#define ENTROPY_OPT_SUPPORTED	    /* Optimization of entropy coding parms? */
-/* Note: if you selected 12-bit data precision, it is dangerous to turn off
- * ENTROPY_OPT_SUPPORTED.  The standard Huffman tables are only good for 8-bit
- * precision, so jchuff.c normally uses entropy optimization to compute
- * usable tables for higher precision.  If you don't want to do optimization,
- * you'll have to supply different default Huffman tables.
- * The exact same statements apply for progressive JPEG: the default tables
- * don't work for progressive mode.  (This may get fixed, however.)
- */
-#define INPUT_SMOOTHING_SUPPORTED   /* Input image smoothing option? */
-
-/* Decoder capability options: */
-
-#define D_ARITH_CODING_SUPPORTED    /* Arithmetic coding back end? */
-#define D_MULTISCAN_FILES_SUPPORTED /* Multiple-scan JPEG files? */
-#define D_PROGRESSIVE_SUPPORTED	    /* Progressive JPEG? (Requires MULTISCAN)*/
-#define IDCT_SCALING_SUPPORTED	    /* Output rescaling via IDCT? */
-#define SAVE_MARKERS_SUPPORTED	    /* jpeg_save_markers() needed? */
-#define BLOCK_SMOOTHING_SUPPORTED   /* Block smoothing? (Progressive only) */
-#undef  UPSAMPLE_SCALING_SUPPORTED  /* Output rescaling at upsample stage? */
-#define UPSAMPLE_MERGING_SUPPORTED  /* Fast path for sloppy upsampling? */
-#define QUANT_1PASS_SUPPORTED	    /* 1-pass color quantization? */
-#define QUANT_2PASS_SUPPORTED	    /* 2-pass color quantization? */
-
-/* more capability options later, no doubt */
-
-
-/*
- * Ordering of RGB data in scanlines passed to or from the application.
- * If your application wants to deal with data in the order B,G,R, just
- * change these macros.  You can also deal with formats such as R,G,B,X
- * (one extra byte per pixel) by changing RGB_PIXELSIZE.  Note that changing
- * the offsets will also change the order in which colormap data is organized.
- * RESTRICTIONS:
- * 1. The sample applications cjpeg,djpeg do NOT support modified RGB formats.
- * 2. These macros only affect RGB<=>YCbCr color conversion, so they are not
- *    useful if you are using JPEG color spaces other than YCbCr or grayscale.
- * 3. The color quantizer modules will not behave desirably if RGB_PIXELSIZE
- *    is not 3 (they don't understand about dummy color components!).  So you
- *    can't use color quantization if you change that value.
- */
-
-#define RGB_RED		0	/* Offset of Red in an RGB scanline element */
-#define RGB_GREEN	1	/* Offset of Green */
-#define RGB_BLUE	2	/* Offset of Blue */
-#define RGB_PIXELSIZE	3	/* JSAMPLEs per RGB scanline element */
-
-
-/* Definitions for speed-related optimizations. */
-
-
-/* If your compiler supports inline functions, define INLINE
- * as the inline keyword; otherwise define it as empty.
- */
-
-#ifndef INLINE
-#ifdef __GNUC__			/* for instance, GNU C knows about inline */
-#define INLINE __inline__
-#endif
-#ifndef INLINE
-#define INLINE			/* default is to define it as empty */
-#endif
-#endif
-
-
-/* On some machines (notably 68000 series) "int" is 32 bits, but multiplying
- * two 16-bit shorts is faster than multiplying two ints.  Define MULTIPLIER
- * as short on such a machine.  MULTIPLIER must be at least 16 bits wide.
- */
-
-#ifndef MULTIPLIER
-#define MULTIPLIER  int		/* type for fastest integer multiply */
-#endif
-
-
-/* FAST_FLOAT should be either float or double, whichever is done faster
- * by your compiler.  (Note that this type is only used in the floating point
- * DCT routines, so it only matters if you've defined DCT_FLOAT_SUPPORTED.)
- * Typically, float is faster in ANSI C compilers, while double is faster in
- * pre-ANSI compilers (because they insist on converting to double anyway).
- * The code below therefore chooses float if we have ANSI-style prototypes.
- */
-
-#ifndef FAST_FLOAT
-#ifdef HAVE_PROTOTYPES
-#define FAST_FLOAT  float
-#else
-#define FAST_FLOAT  double
-#endif
-#endif
-
-#endif /* JPEG_INTERNAL_OPTIONS */
diff --git a/lib-x86-64/include/jpeglib.h b/lib-x86-64/include/jpeglib.h
deleted file mode 100644
index 1eb1fac0..00000000
--- a/lib-x86-64/include/jpeglib.h
+++ /dev/null
@@ -1,1160 +0,0 @@
-/*
- * jpeglib.h
- *
- * Copyright (C) 1991-1998, Thomas G. Lane.
- * Modified 2002-2010 by Guido Vollbeding.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file defines the application interface for the JPEG library.
- * Most applications using the library need only include this file,
- * and perhaps jerror.h if they want to know the exact error codes.
- */
-
-#ifndef JPEGLIB_H
-#define JPEGLIB_H
-
-/*
- * First we include the configuration files that record how this
- * installation of the JPEG library is set up.  jconfig.h can be
- * generated automatically for many systems.  jmorecfg.h contains
- * manual configuration options that most people need not worry about.
- */
-
-#ifndef JCONFIG_INCLUDED	/* in case jinclude.h already did */
-#include "jconfig.h"		/* widely used configuration options */
-#endif
-#include "jmorecfg.h"		/* seldom changed options */
-
-
-#ifdef __cplusplus
-#ifndef DONT_USE_EXTERN_C
-extern "C" {
-#endif
-#endif
-
-/* Version IDs for the JPEG library.
- * Might be useful for tests like "#if JPEG_LIB_VERSION >= 80".
- */
-
-#define JPEG_LIB_VERSION        80	/* Compatibility version 8.0 */
-#define JPEG_LIB_VERSION_MAJOR  8
-#define JPEG_LIB_VERSION_MINOR  3
-
-
-/* Various constants determining the sizes of things.
- * All of these are specified by the JPEG standard, so don't change them
- * if you want to be compatible.
- */
-
-#define DCTSIZE		    8	/* The basic DCT block is 8x8 samples */
-#define DCTSIZE2	    64	/* DCTSIZE squared; # of elements in a block */
-#define NUM_QUANT_TBLS      4	/* Quantization tables are numbered 0..3 */
-#define NUM_HUFF_TBLS       4	/* Huffman tables are numbered 0..3 */
-#define NUM_ARITH_TBLS      16	/* Arith-coding tables are numbered 0..15 */
-#define MAX_COMPS_IN_SCAN   4	/* JPEG limit on # of components in one scan */
-#define MAX_SAMP_FACTOR     4	/* JPEG limit on sampling factors */
-/* Unfortunately, some bozo at Adobe saw no reason to be bound by the standard;
- * the PostScript DCT filter can emit files with many more than 10 blocks/MCU.
- * If you happen to run across such a file, you can up D_MAX_BLOCKS_IN_MCU
- * to handle it.  We even let you do this from the jconfig.h file.  However,
- * we strongly discourage changing C_MAX_BLOCKS_IN_MCU; just because Adobe
- * sometimes emits noncompliant files doesn't mean you should too.
- */
-#define C_MAX_BLOCKS_IN_MCU   10 /* compressor's limit on blocks per MCU */
-#ifndef D_MAX_BLOCKS_IN_MCU
-#define D_MAX_BLOCKS_IN_MCU   10 /* decompressor's limit on blocks per MCU */
-#endif
-
-
-/* Data structures for images (arrays of samples and of DCT coefficients).
- * On 80x86 machines, the image arrays are too big for near pointers,
- * but the pointer arrays can fit in near memory.
- */
-
-typedef JSAMPLE FAR *JSAMPROW;	/* ptr to one image row of pixel samples. */
-typedef JSAMPROW *JSAMPARRAY;	/* ptr to some rows (a 2-D sample array) */
-typedef JSAMPARRAY *JSAMPIMAGE;	/* a 3-D sample array: top index is color */
-
-typedef JCOEF JBLOCK[DCTSIZE2];	/* one block of coefficients */
-typedef JBLOCK FAR *JBLOCKROW;	/* pointer to one row of coefficient blocks */
-typedef JBLOCKROW *JBLOCKARRAY;		/* a 2-D array of coefficient blocks */
-typedef JBLOCKARRAY *JBLOCKIMAGE;	/* a 3-D array of coefficient blocks */
-
-typedef JCOEF FAR *JCOEFPTR;	/* useful in a couple of places */
-
-
-/* Types for JPEG compression parameters and working tables. */
-
-
-/* DCT coefficient quantization tables. */
-
-typedef struct {
-  /* This array gives the coefficient quantizers in natural array order
-   * (not the zigzag order in which they are stored in a JPEG DQT marker).
-   * CAUTION: IJG versions prior to v6a kept this array in zigzag order.
-   */
-  UINT16 quantval[DCTSIZE2];	/* quantization step for each coefficient */
-  /* This field is used only during compression.  It's initialized FALSE when
-   * the table is created, and set TRUE when it's been output to the file.
-   * You could suppress output of a table by setting this to TRUE.
-   * (See jpeg_suppress_tables for an example.)
-   */
-  boolean sent_table;		/* TRUE when table has been output */
-} JQUANT_TBL;
-
-
-/* Huffman coding tables. */
-
-typedef struct {
-  /* These two fields directly represent the contents of a JPEG DHT marker */
-  UINT8 bits[17];		/* bits[k] = # of symbols with codes of */
-				/* length k bits; bits[0] is unused */
-  UINT8 huffval[256];		/* The symbols, in order of incr code length */
-  /* This field is used only during compression.  It's initialized FALSE when
-   * the table is created, and set TRUE when it's been output to the file.
-   * You could suppress output of a table by setting this to TRUE.
-   * (See jpeg_suppress_tables for an example.)
-   */
-  boolean sent_table;		/* TRUE when table has been output */
-} JHUFF_TBL;
-
-
-/* Basic info about one component (color channel). */
-
-typedef struct {
-  /* These values are fixed over the whole image. */
-  /* For compression, they must be supplied by parameter setup; */
-  /* for decompression, they are read from the SOF marker. */
-  int component_id;		/* identifier for this component (0..255) */
-  int component_index;		/* its index in SOF or cinfo->comp_info[] */
-  int h_samp_factor;		/* horizontal sampling factor (1..4) */
-  int v_samp_factor;		/* vertical sampling factor (1..4) */
-  int quant_tbl_no;		/* quantization table selector (0..3) */
-  /* These values may vary between scans. */
-  /* For compression, they must be supplied by parameter setup; */
-  /* for decompression, they are read from the SOS marker. */
-  /* The decompressor output side may not use these variables. */
-  int dc_tbl_no;		/* DC entropy table selector (0..3) */
-  int ac_tbl_no;		/* AC entropy table selector (0..3) */
-  
-  /* Remaining fields should be treated as private by applications. */
-  
-  /* These values are computed during compression or decompression startup: */
-  /* Component's size in DCT blocks.
-   * Any dummy blocks added to complete an MCU are not counted; therefore
-   * these values do not depend on whether a scan is interleaved or not.
-   */
-  JDIMENSION width_in_blocks;
-  JDIMENSION height_in_blocks;
-  /* Size of a DCT block in samples,
-   * reflecting any scaling we choose to apply during the DCT step.
-   * Values from 1 to 16 are supported.
-   * Note that different components may receive different DCT scalings.
-   */
-  int DCT_h_scaled_size;
-  int DCT_v_scaled_size;
-  /* The downsampled dimensions are the component's actual, unpadded number
-   * of samples at the main buffer (preprocessing/compression interface);
-   * DCT scaling is included, so
-   * downsampled_width = ceil(image_width * Hi/Hmax * DCT_h_scaled_size/DCTSIZE)
-   * and similarly for height.
-   */
-  JDIMENSION downsampled_width;	 /* actual width in samples */
-  JDIMENSION downsampled_height; /* actual height in samples */
-  /* This flag is used only for decompression.  In cases where some of the
-   * components will be ignored (eg grayscale output from YCbCr image),
-   * we can skip most computations for the unused components.
-   */
-  boolean component_needed;	/* do we need the value of this component? */
-
-  /* These values are computed before starting a scan of the component. */
-  /* The decompressor output side may not use these variables. */
-  int MCU_width;		/* number of blocks per MCU, horizontally */
-  int MCU_height;		/* number of blocks per MCU, vertically */
-  int MCU_blocks;		/* MCU_width * MCU_height */
-  int MCU_sample_width;	/* MCU width in samples: MCU_width * DCT_h_scaled_size */
-  int last_col_width;		/* # of non-dummy blocks across in last MCU */
-  int last_row_height;		/* # of non-dummy blocks down in last MCU */
-
-  /* Saved quantization table for component; NULL if none yet saved.
-   * See jdinput.c comments about the need for this information.
-   * This field is currently used only for decompression.
-   */
-  JQUANT_TBL * quant_table;
-
-  /* Private per-component storage for DCT or IDCT subsystem. */
-  void * dct_table;
-} jpeg_component_info;
-
-
-/* The script for encoding a multiple-scan file is an array of these: */
-
-typedef struct {
-  int comps_in_scan;		/* number of components encoded in this scan */
-  int component_index[MAX_COMPS_IN_SCAN]; /* their SOF/comp_info[] indexes */
-  int Ss, Se;			/* progressive JPEG spectral selection parms */
-  int Ah, Al;			/* progressive JPEG successive approx. parms */
-} jpeg_scan_info;
-
-/* The decompressor can save APPn and COM markers in a list of these: */
-
-typedef struct jpeg_marker_struct FAR * jpeg_saved_marker_ptr;
-
-struct jpeg_marker_struct {
-  jpeg_saved_marker_ptr next;	/* next in list, or NULL */
-  UINT8 marker;			/* marker code: JPEG_COM, or JPEG_APP0+n */
-  unsigned int original_length;	/* # bytes of data in the file */
-  unsigned int data_length;	/* # bytes of data saved at data[] */
-  JOCTET FAR * data;		/* the data contained in the marker */
-  /* the marker length word is not counted in data_length or original_length */
-};
-
-/* Known color spaces. */
-
-typedef enum {
-	JCS_UNKNOWN,		/* error/unspecified */
-	JCS_GRAYSCALE,		/* monochrome */
-	JCS_RGB,		/* red/green/blue */
-	JCS_YCbCr,		/* Y/Cb/Cr (also known as YUV) */
-	JCS_CMYK,		/* C/M/Y/K */
-	JCS_YCCK		/* Y/Cb/Cr/K */
-} J_COLOR_SPACE;
-
-/* DCT/IDCT algorithm options. */
-
-typedef enum {
-	JDCT_ISLOW,		/* slow but accurate integer algorithm */
-	JDCT_IFAST,		/* faster, less accurate integer method */
-	JDCT_FLOAT		/* floating-point: accurate, fast on fast HW */
-} J_DCT_METHOD;
-
-#ifndef JDCT_DEFAULT		/* may be overridden in jconfig.h */
-#define JDCT_DEFAULT  JDCT_ISLOW
-#endif
-#ifndef JDCT_FASTEST		/* may be overridden in jconfig.h */
-#define JDCT_FASTEST  JDCT_IFAST
-#endif
-
-/* Dithering options for decompression. */
-
-typedef enum {
-	JDITHER_NONE,		/* no dithering */
-	JDITHER_ORDERED,	/* simple ordered dither */
-	JDITHER_FS		/* Floyd-Steinberg error diffusion dither */
-} J_DITHER_MODE;
-
-
-/* Common fields between JPEG compression and decompression master structs. */
-
-#define jpeg_common_fields \
-  struct jpeg_error_mgr * err;	/* Error handler module */\
-  struct jpeg_memory_mgr * mem;	/* Memory manager module */\
-  struct jpeg_progress_mgr * progress; /* Progress monitor, or NULL if none */\
-  void * client_data;		/* Available for use by application */\
-  boolean is_decompressor;	/* So common code can tell which is which */\
-  int global_state		/* For checking call sequence validity */
-
-/* Routines that are to be used by both halves of the library are declared
- * to receive a pointer to this structure.  There are no actual instances of
- * jpeg_common_struct, only of jpeg_compress_struct and jpeg_decompress_struct.
- */
-struct jpeg_common_struct {
-  jpeg_common_fields;		/* Fields common to both master struct types */
-  /* Additional fields follow in an actual jpeg_compress_struct or
-   * jpeg_decompress_struct.  All three structs must agree on these
-   * initial fields!  (This would be a lot cleaner in C++.)
-   */
-};
-
-typedef struct jpeg_common_struct * j_common_ptr;
-typedef struct jpeg_compress_struct * j_compress_ptr;
-typedef struct jpeg_decompress_struct * j_decompress_ptr;
-
-
-/* Master record for a compression instance */
-
-struct jpeg_compress_struct {
-  jpeg_common_fields;		/* Fields shared with jpeg_decompress_struct */
-
-  /* Destination for compressed data */
-  struct jpeg_destination_mgr * dest;
-
-  /* Description of source image --- these fields must be filled in by
-   * outer application before starting compression.  in_color_space must
-   * be correct before you can even call jpeg_set_defaults().
-   */
-
-  JDIMENSION image_width;	/* input image width */
-  JDIMENSION image_height;	/* input image height */
-  int input_components;		/* # of color components in input image */
-  J_COLOR_SPACE in_color_space;	/* colorspace of input image */
-
-  double input_gamma;		/* image gamma of input image */
-
-  /* Compression parameters --- these fields must be set before calling
-   * jpeg_start_compress().  We recommend calling jpeg_set_defaults() to
-   * initialize everything to reasonable defaults, then changing anything
-   * the application specifically wants to change.  That way you won't get
-   * burnt when new parameters are added.  Also note that there are several
-   * helper routines to simplify changing parameters.
-   */
-
-  unsigned int scale_num, scale_denom; /* fraction by which to scale image */
-
-  JDIMENSION jpeg_width;	/* scaled JPEG image width */
-  JDIMENSION jpeg_height;	/* scaled JPEG image height */
-  /* Dimensions of actual JPEG image that will be written to file,
-   * derived from input dimensions by scaling factors above.
-   * These fields are computed by jpeg_start_compress().
-   * You can also use jpeg_calc_jpeg_dimensions() to determine these values
-   * in advance of calling jpeg_start_compress().
-   */
-
-  int data_precision;		/* bits of precision in image data */
-
-  int num_components;		/* # of color components in JPEG image */
-  J_COLOR_SPACE jpeg_color_space; /* colorspace of JPEG image */
-
-  jpeg_component_info * comp_info;
-  /* comp_info[i] describes component that appears i'th in SOF */
-
-  JQUANT_TBL * quant_tbl_ptrs[NUM_QUANT_TBLS];
-  int q_scale_factor[NUM_QUANT_TBLS];
-  /* ptrs to coefficient quantization tables, or NULL if not defined,
-   * and corresponding scale factors (percentage, initialized 100).
-   */
-
-  JHUFF_TBL * dc_huff_tbl_ptrs[NUM_HUFF_TBLS];
-  JHUFF_TBL * ac_huff_tbl_ptrs[NUM_HUFF_TBLS];
-  /* ptrs to Huffman coding tables, or NULL if not defined */
-
-  UINT8 arith_dc_L[NUM_ARITH_TBLS]; /* L values for DC arith-coding tables */
-  UINT8 arith_dc_U[NUM_ARITH_TBLS]; /* U values for DC arith-coding tables */
-  UINT8 arith_ac_K[NUM_ARITH_TBLS]; /* Kx values for AC arith-coding tables */
-
-  int num_scans;		/* # of entries in scan_info array */
-  const jpeg_scan_info * scan_info; /* script for multi-scan file, or NULL */
-  /* The default value of scan_info is NULL, which causes a single-scan
-   * sequential JPEG file to be emitted.  To create a multi-scan file,
-   * set num_scans and scan_info to point to an array of scan definitions.
-   */
-
-  boolean raw_data_in;		/* TRUE=caller supplies downsampled data */
-  boolean arith_code;		/* TRUE=arithmetic coding, FALSE=Huffman */
-  boolean optimize_coding;	/* TRUE=optimize entropy encoding parms */
-  boolean CCIR601_sampling;	/* TRUE=first samples are cosited */
-  boolean do_fancy_downsampling; /* TRUE=apply fancy downsampling */
-  int smoothing_factor;		/* 1..100, or 0 for no input smoothing */
-  J_DCT_METHOD dct_method;	/* DCT algorithm selector */
-
-  /* The restart interval can be specified in absolute MCUs by setting
-   * restart_interval, or in MCU rows by setting restart_in_rows
-   * (in which case the correct restart_interval will be figured
-   * for each scan).
-   */
-  unsigned int restart_interval; /* MCUs per restart, or 0 for no restart */
-  int restart_in_rows;		/* if > 0, MCU rows per restart interval */
-
-  /* Parameters controlling emission of special markers. */
-
-  boolean write_JFIF_header;	/* should a JFIF marker be written? */
-  UINT8 JFIF_major_version;	/* What to write for the JFIF version number */
-  UINT8 JFIF_minor_version;
-  /* These three values are not used by the JPEG code, merely copied */
-  /* into the JFIF APP0 marker.  density_unit can be 0 for unknown, */
-  /* 1 for dots/inch, or 2 for dots/cm.  Note that the pixel aspect */
-  /* ratio is defined by X_density/Y_density even when density_unit=0. */
-  UINT8 density_unit;		/* JFIF code for pixel size units */
-  UINT16 X_density;		/* Horizontal pixel density */
-  UINT16 Y_density;		/* Vertical pixel density */
-  boolean write_Adobe_marker;	/* should an Adobe marker be written? */
-  
-  /* State variable: index of next scanline to be written to
-   * jpeg_write_scanlines().  Application may use this to control its
-   * processing loop, e.g., "while (next_scanline < image_height)".
-   */
-
-  JDIMENSION next_scanline;	/* 0 .. image_height-1  */
-
-  /* Remaining fields are known throughout compressor, but generally
-   * should not be touched by a surrounding application.
-   */
-
-  /*
-   * These fields are computed during compression startup
-   */
-  boolean progressive_mode;	/* TRUE if scan script uses progressive mode */
-  int max_h_samp_factor;	/* largest h_samp_factor */
-  int max_v_samp_factor;	/* largest v_samp_factor */
-
-  int min_DCT_h_scaled_size;	/* smallest DCT_h_scaled_size of any component */
-  int min_DCT_v_scaled_size;	/* smallest DCT_v_scaled_size of any component */
-
-  JDIMENSION total_iMCU_rows;	/* # of iMCU rows to be input to coef ctlr */
-  /* The coefficient controller receives data in units of MCU rows as defined
-   * for fully interleaved scans (whether the JPEG file is interleaved or not).
-   * There are v_samp_factor * DCTSIZE sample rows of each component in an
-   * "iMCU" (interleaved MCU) row.
-   */
-  
-  /*
-   * These fields are valid during any one scan.
-   * They describe the components and MCUs actually appearing in the scan.
-   */
-  int comps_in_scan;		/* # of JPEG components in this scan */
-  jpeg_component_info * cur_comp_info[MAX_COMPS_IN_SCAN];
-  /* *cur_comp_info[i] describes component that appears i'th in SOS */
-  
-  JDIMENSION MCUs_per_row;	/* # of MCUs across the image */
-  JDIMENSION MCU_rows_in_scan;	/* # of MCU rows in the image */
-  
-  int blocks_in_MCU;		/* # of DCT blocks per MCU */
-  int MCU_membership[C_MAX_BLOCKS_IN_MCU];
-  /* MCU_membership[i] is index in cur_comp_info of component owning */
-  /* i'th block in an MCU */
-
-  int Ss, Se, Ah, Al;		/* progressive JPEG parameters for scan */
-
-  int block_size;		/* the basic DCT block size: 1..16 */
-  const int * natural_order;	/* natural-order position array */
-  int lim_Se;			/* min( Se, DCTSIZE2-1 ) */
-
-  /*
-   * Links to compression subobjects (methods and private variables of modules)
-   */
-  struct jpeg_comp_master * master;
-  struct jpeg_c_main_controller * main;
-  struct jpeg_c_prep_controller * prep;
-  struct jpeg_c_coef_controller * coef;
-  struct jpeg_marker_writer * marker;
-  struct jpeg_color_converter * cconvert;
-  struct jpeg_downsampler * downsample;
-  struct jpeg_forward_dct * fdct;
-  struct jpeg_entropy_encoder * entropy;
-  jpeg_scan_info * script_space; /* workspace for jpeg_simple_progression */
-  int script_space_size;
-};
-
-
-/* Master record for a decompression instance */
-
-struct jpeg_decompress_struct {
-  jpeg_common_fields;		/* Fields shared with jpeg_compress_struct */
-
-  /* Source of compressed data */
-  struct jpeg_source_mgr * src;
-
-  /* Basic description of image --- filled in by jpeg_read_header(). */
-  /* Application may inspect these values to decide how to process image. */
-
-  JDIMENSION image_width;	/* nominal image width (from SOF marker) */
-  JDIMENSION image_height;	/* nominal image height */
-  int num_components;		/* # of color components in JPEG image */
-  J_COLOR_SPACE jpeg_color_space; /* colorspace of JPEG image */
-
-  /* Decompression processing parameters --- these fields must be set before
-   * calling jpeg_start_decompress().  Note that jpeg_read_header() initializes
-   * them to default values.
-   */
-
-  J_COLOR_SPACE out_color_space; /* colorspace for output */
-
-  unsigned int scale_num, scale_denom; /* fraction by which to scale image */
-
-  double output_gamma;		/* image gamma wanted in output */
-
-  boolean buffered_image;	/* TRUE=multiple output passes */
-  boolean raw_data_out;		/* TRUE=downsampled data wanted */
-
-  J_DCT_METHOD dct_method;	/* IDCT algorithm selector */
-  boolean do_fancy_upsampling;	/* TRUE=apply fancy upsampling */
-  boolean do_block_smoothing;	/* TRUE=apply interblock smoothing */
-
-  boolean quantize_colors;	/* TRUE=colormapped output wanted */
-  /* the following are ignored if not quantize_colors: */
-  J_DITHER_MODE dither_mode;	/* type of color dithering to use */
-  boolean two_pass_quantize;	/* TRUE=use two-pass color quantization */
-  int desired_number_of_colors;	/* max # colors to use in created colormap */
-  /* these are significant only in buffered-image mode: */
-  boolean enable_1pass_quant;	/* enable future use of 1-pass quantizer */
-  boolean enable_external_quant;/* enable future use of external colormap */
-  boolean enable_2pass_quant;	/* enable future use of 2-pass quantizer */
-
-  /* Description of actual output image that will be returned to application.
-   * These fields are computed by jpeg_start_decompress().
-   * You can also use jpeg_calc_output_dimensions() to determine these values
-   * in advance of calling jpeg_start_decompress().
-   */
-
-  JDIMENSION output_width;	/* scaled image width */
-  JDIMENSION output_height;	/* scaled image height */
-  int out_color_components;	/* # of color components in out_color_space */
-  int output_components;	/* # of color components returned */
-  /* output_components is 1 (a colormap index) when quantizing colors;
-   * otherwise it equals out_color_components.
-   */
-  int rec_outbuf_height;	/* min recommended height of scanline buffer */
-  /* If the buffer passed to jpeg_read_scanlines() is less than this many rows
-   * high, space and time will be wasted due to unnecessary data copying.
-   * Usually rec_outbuf_height will be 1 or 2, at most 4.
-   */
-
-  /* When quantizing colors, the output colormap is described by these fields.
-   * The application can supply a colormap by setting colormap non-NULL before
-   * calling jpeg_start_decompress; otherwise a colormap is created during
-   * jpeg_start_decompress or jpeg_start_output.
-   * The map has out_color_components rows and actual_number_of_colors columns.
-   */
-  int actual_number_of_colors;	/* number of entries in use */
-  JSAMPARRAY colormap;		/* The color map as a 2-D pixel array */
-
-  /* State variables: these variables indicate the progress of decompression.
-   * The application may examine these but must not modify them.
-   */
-
-  /* Row index of next scanline to be read from jpeg_read_scanlines().
-   * Application may use this to control its processing loop, e.g.,
-   * "while (output_scanline < output_height)".
-   */
-  JDIMENSION output_scanline;	/* 0 .. output_height-1  */
-
-  /* Current input scan number and number of iMCU rows completed in scan.
-   * These indicate the progress of the decompressor input side.
-   */
-  int input_scan_number;	/* Number of SOS markers seen so far */
-  JDIMENSION input_iMCU_row;	/* Number of iMCU rows completed */
-
-  /* The "output scan number" is the notional scan being displayed by the
-   * output side.  The decompressor will not allow output scan/row number
-   * to get ahead of input scan/row, but it can fall arbitrarily far behind.
-   */
-  int output_scan_number;	/* Nominal scan number being displayed */
-  JDIMENSION output_iMCU_row;	/* Number of iMCU rows read */
-
-  /* Current progression status.  coef_bits[c][i] indicates the precision
-   * with which component c's DCT coefficient i (in zigzag order) is known.
-   * It is -1 when no data has yet been received, otherwise it is the point
-   * transform (shift) value for the most recent scan of the coefficient
-   * (thus, 0 at completion of the progression).
-   * This pointer is NULL when reading a non-progressive file.
-   */
-  int (*coef_bits)[DCTSIZE2];	/* -1 or current Al value for each coef */
-
-  /* Internal JPEG parameters --- the application usually need not look at
-   * these fields.  Note that the decompressor output side may not use
-   * any parameters that can change between scans.
-   */
-
-  /* Quantization and Huffman tables are carried forward across input
-   * datastreams when processing abbreviated JPEG datastreams.
-   */
-
-  JQUANT_TBL * quant_tbl_ptrs[NUM_QUANT_TBLS];
-  /* ptrs to coefficient quantization tables, or NULL if not defined */
-
-  JHUFF_TBL * dc_huff_tbl_ptrs[NUM_HUFF_TBLS];
-  JHUFF_TBL * ac_huff_tbl_ptrs[NUM_HUFF_TBLS];
-  /* ptrs to Huffman coding tables, or NULL if not defined */
-
-  /* These parameters are never carried across datastreams, since they
-   * are given in SOF/SOS markers or defined to be reset by SOI.
-   */
-
-  int data_precision;		/* bits of precision in image data */
-
-  jpeg_component_info * comp_info;
-  /* comp_info[i] describes component that appears i'th in SOF */
-
-  boolean is_baseline;		/* TRUE if Baseline SOF0 encountered */
-  boolean progressive_mode;	/* TRUE if SOFn specifies progressive mode */
-  boolean arith_code;		/* TRUE=arithmetic coding, FALSE=Huffman */
-
-  UINT8 arith_dc_L[NUM_ARITH_TBLS]; /* L values for DC arith-coding tables */
-  UINT8 arith_dc_U[NUM_ARITH_TBLS]; /* U values for DC arith-coding tables */
-  UINT8 arith_ac_K[NUM_ARITH_TBLS]; /* Kx values for AC arith-coding tables */
-
-  unsigned int restart_interval; /* MCUs per restart interval, or 0 for no restart */
-
-  /* These fields record data obtained from optional markers recognized by
-   * the JPEG library.
-   */
-  boolean saw_JFIF_marker;	/* TRUE iff a JFIF APP0 marker was found */
-  /* Data copied from JFIF marker; only valid if saw_JFIF_marker is TRUE: */
-  UINT8 JFIF_major_version;	/* JFIF version number */
-  UINT8 JFIF_minor_version;
-  UINT8 density_unit;		/* JFIF code for pixel size units */
-  UINT16 X_density;		/* Horizontal pixel density */
-  UINT16 Y_density;		/* Vertical pixel density */
-  boolean saw_Adobe_marker;	/* TRUE iff an Adobe APP14 marker was found */
-  UINT8 Adobe_transform;	/* Color transform code from Adobe marker */
-
-  boolean CCIR601_sampling;	/* TRUE=first samples are cosited */
-
-  /* Aside from the specific data retained from APPn markers known to the
-   * library, the uninterpreted contents of any or all APPn and COM markers
-   * can be saved in a list for examination by the application.
-   */
-  jpeg_saved_marker_ptr marker_list; /* Head of list of saved markers */
-
-  /* Remaining fields are known throughout decompressor, but generally
-   * should not be touched by a surrounding application.
-   */
-
-  /*
-   * These fields are computed during decompression startup
-   */
-  int max_h_samp_factor;	/* largest h_samp_factor */
-  int max_v_samp_factor;	/* largest v_samp_factor */
-
-  int min_DCT_h_scaled_size;	/* smallest DCT_h_scaled_size of any component */
-  int min_DCT_v_scaled_size;	/* smallest DCT_v_scaled_size of any component */
-
-  JDIMENSION total_iMCU_rows;	/* # of iMCU rows in image */
-  /* The coefficient controller's input and output progress is measured in
-   * units of "iMCU" (interleaved MCU) rows.  These are the same as MCU rows
-   * in fully interleaved JPEG scans, but are used whether the scan is
-   * interleaved or not.  We define an iMCU row as v_samp_factor DCT block
-   * rows of each component.  Therefore, the IDCT output contains
-   * v_samp_factor*DCT_v_scaled_size sample rows of a component per iMCU row.
-   */
-
-  JSAMPLE * sample_range_limit; /* table for fast range-limiting */
-
-  /*
-   * These fields are valid during any one scan.
-   * They describe the components and MCUs actually appearing in the scan.
-   * Note that the decompressor output side must not use these fields.
-   */
-  int comps_in_scan;		/* # of JPEG components in this scan */
-  jpeg_component_info * cur_comp_info[MAX_COMPS_IN_SCAN];
-  /* *cur_comp_info[i] describes component that appears i'th in SOS */
-
-  JDIMENSION MCUs_per_row;	/* # of MCUs across the image */
-  JDIMENSION MCU_rows_in_scan;	/* # of MCU rows in the image */
-
-  int blocks_in_MCU;		/* # of DCT blocks per MCU */
-  int MCU_membership[D_MAX_BLOCKS_IN_MCU];
-  /* MCU_membership[i] is index in cur_comp_info of component owning */
-  /* i'th block in an MCU */
-
-  int Ss, Se, Ah, Al;		/* progressive JPEG parameters for scan */
-
-  /* These fields are derived from Se of first SOS marker.
-   */
-  int block_size;		/* the basic DCT block size: 1..16 */
-  const int * natural_order; /* natural-order position array for entropy decode */
-  int lim_Se;			/* min( Se, DCTSIZE2-1 ) for entropy decode */
-
-  /* This field is shared between entropy decoder and marker parser.
-   * It is either zero or the code of a JPEG marker that has been
-   * read from the data source, but has not yet been processed.
-   */
-  int unread_marker;
-
-  /*
-   * Links to decompression subobjects (methods, private variables of modules)
-   */
-  struct jpeg_decomp_master * master;
-  struct jpeg_d_main_controller * main;
-  struct jpeg_d_coef_controller * coef;
-  struct jpeg_d_post_controller * post;
-  struct jpeg_input_controller * inputctl;
-  struct jpeg_marker_reader * marker;
-  struct jpeg_entropy_decoder * entropy;
-  struct jpeg_inverse_dct * idct;
-  struct jpeg_upsampler * upsample;
-  struct jpeg_color_deconverter * cconvert;
-  struct jpeg_color_quantizer * cquantize;
-};
-
-
-/* "Object" declarations for JPEG modules that may be supplied or called
- * directly by the surrounding application.
- * As with all objects in the JPEG library, these structs only define the
- * publicly visible methods and state variables of a module.  Additional
- * private fields may exist after the public ones.
- */
-
-
-/* Error handler object */
-
-struct jpeg_error_mgr {
-  /* Error exit handler: does not return to caller */
-  JMETHOD(void, error_exit, (j_common_ptr cinfo));
-  /* Conditionally emit a trace or warning message */
-  JMETHOD(void, emit_message, (j_common_ptr cinfo, int msg_level));
-  /* Routine that actually outputs a trace or error message */
-  JMETHOD(void, output_message, (j_common_ptr cinfo));
-  /* Format a message string for the most recent JPEG error or message */
-  JMETHOD(void, format_message, (j_common_ptr cinfo, char * buffer));
-#define JMSG_LENGTH_MAX  200	/* recommended size of format_message buffer */
-  /* Reset error state variables at start of a new image */
-  JMETHOD(void, reset_error_mgr, (j_common_ptr cinfo));
-  
-  /* The message ID code and any parameters are saved here.
-   * A message can have one string parameter or up to 8 int parameters.
-   */
-  int msg_code;
-#define JMSG_STR_PARM_MAX  80
-  union {
-    int i[8];
-    char s[JMSG_STR_PARM_MAX];
-  } msg_parm;
-  
-  /* Standard state variables for error facility */
-  
-  int trace_level;		/* max msg_level that will be displayed */
-  
-  /* For recoverable corrupt-data errors, we emit a warning message,
-   * but keep going unless emit_message chooses to abort.  emit_message
-   * should count warnings in num_warnings.  The surrounding application
-   * can check for bad data by seeing if num_warnings is nonzero at the
-   * end of processing.
-   */
-  long num_warnings;		/* number of corrupt-data warnings */
-
-  /* These fields point to the table(s) of error message strings.
-   * An application can change the table pointer to switch to a different
-   * message list (typically, to change the language in which errors are
-   * reported).  Some applications may wish to add additional error codes
-   * that will be handled by the JPEG library error mechanism; the second
-   * table pointer is used for this purpose.
-   *
-   * First table includes all errors generated by JPEG library itself.
-   * Error code 0 is reserved for a "no such error string" message.
-   */
-  const char * const * jpeg_message_table; /* Library errors */
-  int last_jpeg_message;    /* Table contains strings 0..last_jpeg_message */
-  /* Second table can be added by application (see cjpeg/djpeg for example).
-   * It contains strings numbered first_addon_message..last_addon_message.
-   */
-  const char * const * addon_message_table; /* Non-library errors */
-  int first_addon_message;	/* code for first string in addon table */
-  int last_addon_message;	/* code for last string in addon table */
-};
-
-
-/* Progress monitor object */
-
-struct jpeg_progress_mgr {
-  JMETHOD(void, progress_monitor, (j_common_ptr cinfo));
-
-  long pass_counter;		/* work units completed in this pass */
-  long pass_limit;		/* total number of work units in this pass */
-  int completed_passes;		/* passes completed so far */
-  int total_passes;		/* total number of passes expected */
-};
-
-
-/* Data destination object for compression */
-
-struct jpeg_destination_mgr {
-  JOCTET * next_output_byte;	/* => next byte to write in buffer */
-  size_t free_in_buffer;	/* # of byte spaces remaining in buffer */
-
-  JMETHOD(void, init_destination, (j_compress_ptr cinfo));
-  JMETHOD(boolean, empty_output_buffer, (j_compress_ptr cinfo));
-  JMETHOD(void, term_destination, (j_compress_ptr cinfo));
-};
-
-
-/* Data source object for decompression */
-
-struct jpeg_source_mgr {
-  const JOCTET * next_input_byte; /* => next byte to read from buffer */
-  size_t bytes_in_buffer;	/* # of bytes remaining in buffer */
-
-  JMETHOD(void, init_source, (j_decompress_ptr cinfo));
-  JMETHOD(boolean, fill_input_buffer, (j_decompress_ptr cinfo));
-  JMETHOD(void, skip_input_data, (j_decompress_ptr cinfo, long num_bytes));
-  JMETHOD(boolean, resync_to_restart, (j_decompress_ptr cinfo, int desired));
-  JMETHOD(void, term_source, (j_decompress_ptr cinfo));
-};
-
-
-/* Memory manager object.
- * Allocates "small" objects (a few K total), "large" objects (tens of K),
- * and "really big" objects (virtual arrays with backing store if needed).
- * The memory manager does not allow individual objects to be freed; rather,
- * each created object is assigned to a pool, and whole pools can be freed
- * at once.  This is faster and more convenient than remembering exactly what
- * to free, especially where malloc()/free() are not too speedy.
- * NB: alloc routines never return NULL.  They exit to error_exit if not
- * successful.
- */
-
-#define JPOOL_PERMANENT	0	/* lasts until master record is destroyed */
-#define JPOOL_IMAGE	1	/* lasts until done with image/datastream */
-#define JPOOL_NUMPOOLS	2
-
-typedef struct jvirt_sarray_control * jvirt_sarray_ptr;
-typedef struct jvirt_barray_control * jvirt_barray_ptr;
-
-
-struct jpeg_memory_mgr {
-  /* Method pointers */
-  JMETHOD(void *, alloc_small, (j_common_ptr cinfo, int pool_id,
-				size_t sizeofobject));
-  JMETHOD(void FAR *, alloc_large, (j_common_ptr cinfo, int pool_id,
-				     size_t sizeofobject));
-  JMETHOD(JSAMPARRAY, alloc_sarray, (j_common_ptr cinfo, int pool_id,
-				     JDIMENSION samplesperrow,
-				     JDIMENSION numrows));
-  JMETHOD(JBLOCKARRAY, alloc_barray, (j_common_ptr cinfo, int pool_id,
-				      JDIMENSION blocksperrow,
-				      JDIMENSION numrows));
-  JMETHOD(jvirt_sarray_ptr, request_virt_sarray, (j_common_ptr cinfo,
-						  int pool_id,
-						  boolean pre_zero,
-						  JDIMENSION samplesperrow,
-						  JDIMENSION numrows,
-						  JDIMENSION maxaccess));
-  JMETHOD(jvirt_barray_ptr, request_virt_barray, (j_common_ptr cinfo,
-						  int pool_id,
-						  boolean pre_zero,
-						  JDIMENSION blocksperrow,
-						  JDIMENSION numrows,
-						  JDIMENSION maxaccess));
-  JMETHOD(void, realize_virt_arrays, (j_common_ptr cinfo));
-  JMETHOD(JSAMPARRAY, access_virt_sarray, (j_common_ptr cinfo,
-					   jvirt_sarray_ptr ptr,
-					   JDIMENSION start_row,
-					   JDIMENSION num_rows,
-					   boolean writable));
-  JMETHOD(JBLOCKARRAY, access_virt_barray, (j_common_ptr cinfo,
-					    jvirt_barray_ptr ptr,
-					    JDIMENSION start_row,
-					    JDIMENSION num_rows,
-					    boolean writable));
-  JMETHOD(void, free_pool, (j_common_ptr cinfo, int pool_id));
-  JMETHOD(void, self_destruct, (j_common_ptr cinfo));
-
-  /* Limit on memory allocation for this JPEG object.  (Note that this is
-   * merely advisory, not a guaranteed maximum; it only affects the space
-   * used for virtual-array buffers.)  May be changed by outer application
-   * after creating the JPEG object.
-   */
-  long max_memory_to_use;
-
-  /* Maximum allocation request accepted by alloc_large. */
-  long max_alloc_chunk;
-};
-
-
-/* Routine signature for application-supplied marker processing methods.
- * Need not pass marker code since it is stored in cinfo->unread_marker.
- */
-typedef JMETHOD(boolean, jpeg_marker_parser_method, (j_decompress_ptr cinfo));
-
-
-/* Declarations for routines called by application.
- * The JPP macro hides prototype parameters from compilers that can't cope.
- * Note JPP requires double parentheses.
- */
-
-#ifdef HAVE_PROTOTYPES
-#define JPP(arglist)	arglist
-#else
-#define JPP(arglist)	()
-#endif
-
-
-/* Short forms of external names for systems with brain-damaged linkers.
- * We shorten external names to be unique in the first six letters, which
- * is good enough for all known systems.
- * (If your compiler itself needs names to be unique in less than 15 
- * characters, you are out of luck.  Get a better compiler.)
- */
-
-#ifdef NEED_SHORT_EXTERNAL_NAMES
-#define jpeg_std_error		jStdError
-#define jpeg_CreateCompress	jCreaCompress
-#define jpeg_CreateDecompress	jCreaDecompress
-#define jpeg_destroy_compress	jDestCompress
-#define jpeg_destroy_decompress	jDestDecompress
-#define jpeg_stdio_dest		jStdDest
-#define jpeg_stdio_src		jStdSrc
-#define jpeg_mem_dest		jMemDest
-#define jpeg_mem_src		jMemSrc
-#define jpeg_set_defaults	jSetDefaults
-#define jpeg_set_colorspace	jSetColorspace
-#define jpeg_default_colorspace	jDefColorspace
-#define jpeg_set_quality	jSetQuality
-#define jpeg_set_linear_quality	jSetLQuality
-#define jpeg_default_qtables	jDefQTables
-#define jpeg_add_quant_table	jAddQuantTable
-#define jpeg_quality_scaling	jQualityScaling
-#define jpeg_simple_progression	jSimProgress
-#define jpeg_suppress_tables	jSuppressTables
-#define jpeg_alloc_quant_table	jAlcQTable
-#define jpeg_alloc_huff_table	jAlcHTable
-#define jpeg_start_compress	jStrtCompress
-#define jpeg_write_scanlines	jWrtScanlines
-#define jpeg_finish_compress	jFinCompress
-#define jpeg_calc_jpeg_dimensions	jCjpegDimensions
-#define jpeg_write_raw_data	jWrtRawData
-#define jpeg_write_marker	jWrtMarker
-#define jpeg_write_m_header	jWrtMHeader
-#define jpeg_write_m_byte	jWrtMByte
-#define jpeg_write_tables	jWrtTables
-#define jpeg_read_header	jReadHeader
-#define jpeg_start_decompress	jStrtDecompress
-#define jpeg_read_scanlines	jReadScanlines
-#define jpeg_finish_decompress	jFinDecompress
-#define jpeg_read_raw_data	jReadRawData
-#define jpeg_has_multiple_scans	jHasMultScn
-#define jpeg_start_output	jStrtOutput
-#define jpeg_finish_output	jFinOutput
-#define jpeg_input_complete	jInComplete
-#define jpeg_new_colormap	jNewCMap
-#define jpeg_consume_input	jConsumeInput
-#define jpeg_core_output_dimensions	jCoreDimensions
-#define jpeg_calc_output_dimensions	jCalcDimensions
-#define jpeg_save_markers	jSaveMarkers
-#define jpeg_set_marker_processor	jSetMarker
-#define jpeg_read_coefficients	jReadCoefs
-#define jpeg_write_coefficients	jWrtCoefs
-#define jpeg_copy_critical_parameters	jCopyCrit
-#define jpeg_abort_compress	jAbrtCompress
-#define jpeg_abort_decompress	jAbrtDecompress
-#define jpeg_abort		jAbort
-#define jpeg_destroy		jDestroy
-#define jpeg_resync_to_restart	jResyncRestart
-#endif /* NEED_SHORT_EXTERNAL_NAMES */
-
-
-/* Default error-management setup */
-EXTERN(struct jpeg_error_mgr *) jpeg_std_error
-	JPP((struct jpeg_error_mgr * err));
-
-/* Initialization of JPEG compression objects.
- * jpeg_create_compress() and jpeg_create_decompress() are the exported
- * names that applications should call.  These expand to calls on
- * jpeg_CreateCompress and jpeg_CreateDecompress with additional information
- * passed for version mismatch checking.
- * NB: you must set up the error-manager BEFORE calling jpeg_create_xxx.
- */
-#define jpeg_create_compress(cinfo) \
-    jpeg_CreateCompress((cinfo), JPEG_LIB_VERSION, \
-			(size_t) sizeof(struct jpeg_compress_struct))
-#define jpeg_create_decompress(cinfo) \
-    jpeg_CreateDecompress((cinfo), JPEG_LIB_VERSION, \
-			  (size_t) sizeof(struct jpeg_decompress_struct))
-EXTERN(void) jpeg_CreateCompress JPP((j_compress_ptr cinfo,
-				      int version, size_t structsize));
-EXTERN(void) jpeg_CreateDecompress JPP((j_decompress_ptr cinfo,
-					int version, size_t structsize));
-/* Destruction of JPEG compression objects */
-EXTERN(void) jpeg_destroy_compress JPP((j_compress_ptr cinfo));
-EXTERN(void) jpeg_destroy_decompress JPP((j_decompress_ptr cinfo));
-
-/* Standard data source and destination managers: stdio streams. */
-/* Caller is responsible for opening the file before and closing after. */
-EXTERN(void) jpeg_stdio_dest JPP((j_compress_ptr cinfo, FILE * outfile));
-EXTERN(void) jpeg_stdio_src JPP((j_decompress_ptr cinfo, FILE * infile));
-
-/* Data source and destination managers: memory buffers. */
-EXTERN(void) jpeg_mem_dest JPP((j_compress_ptr cinfo,
-			       unsigned char ** outbuffer,
-			       unsigned long * outsize));
-EXTERN(void) jpeg_mem_src JPP((j_decompress_ptr cinfo,
-			      unsigned char * inbuffer,
-			      unsigned long insize));
-
-/* Default parameter setup for compression */
-EXTERN(void) jpeg_set_defaults JPP((j_compress_ptr cinfo));
-/* Compression parameter setup aids */
-EXTERN(void) jpeg_set_colorspace JPP((j_compress_ptr cinfo,
-				      J_COLOR_SPACE colorspace));
-EXTERN(void) jpeg_default_colorspace JPP((j_compress_ptr cinfo));
-EXTERN(void) jpeg_set_quality JPP((j_compress_ptr cinfo, int quality,
-				   boolean force_baseline));
-EXTERN(void) jpeg_set_linear_quality JPP((j_compress_ptr cinfo,
-					  int scale_factor,
-					  boolean force_baseline));
-EXTERN(void) jpeg_default_qtables JPP((j_compress_ptr cinfo,
-				       boolean force_baseline));
-EXTERN(void) jpeg_add_quant_table JPP((j_compress_ptr cinfo, int which_tbl,
-				       const unsigned int *basic_table,
-				       int scale_factor,
-				       boolean force_baseline));
-EXTERN(int) jpeg_quality_scaling JPP((int quality));
-EXTERN(void) jpeg_simple_progression JPP((j_compress_ptr cinfo));
-EXTERN(void) jpeg_suppress_tables JPP((j_compress_ptr cinfo,
-				       boolean suppress));
-EXTERN(JQUANT_TBL *) jpeg_alloc_quant_table JPP((j_common_ptr cinfo));
-EXTERN(JHUFF_TBL *) jpeg_alloc_huff_table JPP((j_common_ptr cinfo));
-
-/* Main entry points for compression */
-EXTERN(void) jpeg_start_compress JPP((j_compress_ptr cinfo,
-				      boolean write_all_tables));
-EXTERN(JDIMENSION) jpeg_write_scanlines JPP((j_compress_ptr cinfo,
-					     JSAMPARRAY scanlines,
-					     JDIMENSION num_lines));
-EXTERN(void) jpeg_finish_compress JPP((j_compress_ptr cinfo));
-
-/* Precalculate JPEG dimensions for current compression parameters. */
-EXTERN(void) jpeg_calc_jpeg_dimensions JPP((j_compress_ptr cinfo));
-
-/* Replaces jpeg_write_scanlines when writing raw downsampled data. */
-EXTERN(JDIMENSION) jpeg_write_raw_data JPP((j_compress_ptr cinfo,
-					    JSAMPIMAGE data,
-					    JDIMENSION num_lines));
-
-/* Write a special marker.  See libjpeg.txt concerning safe usage. */
-EXTERN(void) jpeg_write_marker
-	JPP((j_compress_ptr cinfo, int marker,
-	     const JOCTET * dataptr, unsigned int datalen));
-/* Same, but piecemeal. */
-EXTERN(void) jpeg_write_m_header
-	JPP((j_compress_ptr cinfo, int marker, unsigned int datalen));
-EXTERN(void) jpeg_write_m_byte
-	JPP((j_compress_ptr cinfo, int val));
-
-/* Alternate compression function: just write an abbreviated table file */
-EXTERN(void) jpeg_write_tables JPP((j_compress_ptr cinfo));
-
-/* Decompression startup: read start of JPEG datastream to see what's there */
-EXTERN(int) jpeg_read_header JPP((j_decompress_ptr cinfo,
-				  boolean require_image));
-/* Return value is one of: */
-#define JPEG_SUSPENDED		0 /* Suspended due to lack of input data */
-#define JPEG_HEADER_OK		1 /* Found valid image datastream */
-#define JPEG_HEADER_TABLES_ONLY	2 /* Found valid table-specs-only datastream */
-/* If you pass require_image = TRUE (normal case), you need not check for
- * a TABLES_ONLY return code; an abbreviated file will cause an error exit.
- * JPEG_SUSPENDED is only possible if you use a data source module that can
- * give a suspension return (the stdio source module doesn't).
- */
-
-/* Main entry points for decompression */
-EXTERN(boolean) jpeg_start_decompress JPP((j_decompress_ptr cinfo));
-EXTERN(JDIMENSION) jpeg_read_scanlines JPP((j_decompress_ptr cinfo,
-					    JSAMPARRAY scanlines,
-					    JDIMENSION max_lines));
-EXTERN(boolean) jpeg_finish_decompress JPP((j_decompress_ptr cinfo));
-
-/* Replaces jpeg_read_scanlines when reading raw downsampled data. */
-EXTERN(JDIMENSION) jpeg_read_raw_data JPP((j_decompress_ptr cinfo,
-					   JSAMPIMAGE data,
-					   JDIMENSION max_lines));
-
-/* Additional entry points for buffered-image mode. */
-EXTERN(boolean) jpeg_has_multiple_scans JPP((j_decompress_ptr cinfo));
-EXTERN(boolean) jpeg_start_output JPP((j_decompress_ptr cinfo,
-				       int scan_number));
-EXTERN(boolean) jpeg_finish_output JPP((j_decompress_ptr cinfo));
-EXTERN(boolean) jpeg_input_complete JPP((j_decompress_ptr cinfo));
-EXTERN(void) jpeg_new_colormap JPP((j_decompress_ptr cinfo));
-EXTERN(int) jpeg_consume_input JPP((j_decompress_ptr cinfo));
-/* Return value is one of: */
-/* #define JPEG_SUSPENDED	0    Suspended due to lack of input data */
-#define JPEG_REACHED_SOS	1 /* Reached start of new scan */
-#define JPEG_REACHED_EOI	2 /* Reached end of image */
-#define JPEG_ROW_COMPLETED	3 /* Completed one iMCU row */
-#define JPEG_SCAN_COMPLETED	4 /* Completed last iMCU row of a scan */
-
-/* Precalculate output dimensions for current decompression parameters. */
-EXTERN(void) jpeg_core_output_dimensions JPP((j_decompress_ptr cinfo));
-EXTERN(void) jpeg_calc_output_dimensions JPP((j_decompress_ptr cinfo));
-
-/* Control saving of COM and APPn markers into marker_list. */
-EXTERN(void) jpeg_save_markers
-	JPP((j_decompress_ptr cinfo, int marker_code,
-	     unsigned int length_limit));
-
-/* Install a special processing method for COM or APPn markers. */
-EXTERN(void) jpeg_set_marker_processor
-	JPP((j_decompress_ptr cinfo, int marker_code,
-	     jpeg_marker_parser_method routine));
-
-/* Read or write raw DCT coefficients --- useful for lossless transcoding. */
-EXTERN(jvirt_barray_ptr *) jpeg_read_coefficients JPP((j_decompress_ptr cinfo));
-EXTERN(void) jpeg_write_coefficients JPP((j_compress_ptr cinfo,
-					  jvirt_barray_ptr * coef_arrays));
-EXTERN(void) jpeg_copy_critical_parameters JPP((j_decompress_ptr srcinfo,
-						j_compress_ptr dstinfo));
-
-/* If you choose to abort compression or decompression before completing
- * jpeg_finish_(de)compress, then you need to clean up to release memory,
- * temporary files, etc.  You can just call jpeg_destroy_(de)compress
- * if you're done with the JPEG object, but if you want to clean it up and
- * reuse it, call this:
- */
-EXTERN(void) jpeg_abort_compress JPP((j_compress_ptr cinfo));
-EXTERN(void) jpeg_abort_decompress JPP((j_decompress_ptr cinfo));
-
-/* Generic versions of jpeg_abort and jpeg_destroy that work on either
- * flavor of JPEG object.  These may be more convenient in some places.
- */
-EXTERN(void) jpeg_abort JPP((j_common_ptr cinfo));
-EXTERN(void) jpeg_destroy JPP((j_common_ptr cinfo));
-
-/* Default restart-marker-resync procedure for use by data source modules */
-EXTERN(boolean) jpeg_resync_to_restart JPP((j_decompress_ptr cinfo,
-					    int desired));
-
-
-/* These marker codes are exported since applications and data source modules
- * are likely to want to use them.
- */
-
-#define JPEG_RST0	0xD0	/* RST0 marker code */
-#define JPEG_EOI	0xD9	/* EOI marker code */
-#define JPEG_APP0	0xE0	/* APP0 marker code */
-#define JPEG_COM	0xFE	/* COM marker code */
-
-
-/* If we have a brain-damaged compiler that emits warnings (or worse, errors)
- * for structure definitions that are never filled in, keep it quiet by
- * supplying dummy definitions for the various substructures.
- */
-
-#ifdef INCOMPLETE_TYPES_BROKEN
-#ifndef JPEG_INTERNALS		/* will be defined in jpegint.h */
-struct jvirt_sarray_control { long dummy; };
-struct jvirt_barray_control { long dummy; };
-struct jpeg_comp_master { long dummy; };
-struct jpeg_c_main_controller { long dummy; };
-struct jpeg_c_prep_controller { long dummy; };
-struct jpeg_c_coef_controller { long dummy; };
-struct jpeg_marker_writer { long dummy; };
-struct jpeg_color_converter { long dummy; };
-struct jpeg_downsampler { long dummy; };
-struct jpeg_forward_dct { long dummy; };
-struct jpeg_entropy_encoder { long dummy; };
-struct jpeg_decomp_master { long dummy; };
-struct jpeg_d_main_controller { long dummy; };
-struct jpeg_d_coef_controller { long dummy; };
-struct jpeg_d_post_controller { long dummy; };
-struct jpeg_input_controller { long dummy; };
-struct jpeg_marker_reader { long dummy; };
-struct jpeg_entropy_decoder { long dummy; };
-struct jpeg_inverse_dct { long dummy; };
-struct jpeg_upsampler { long dummy; };
-struct jpeg_color_deconverter { long dummy; };
-struct jpeg_color_quantizer { long dummy; };
-#endif /* JPEG_INTERNALS */
-#endif /* INCOMPLETE_TYPES_BROKEN */
-
-
-/*
- * The JPEG library modules define JPEG_INTERNALS before including this file.
- * The internal structure declarations are read only when that is true.
- * Applications using the library should not include jpegint.h, but may wish
- * to include jerror.h.
- */
-
-#ifdef JPEG_INTERNALS
-#include "jpegint.h"		/* fetch private declarations */
-#include "jerror.h"		/* fetch error codes too */
-#endif
-
-#ifdef __cplusplus
-#ifndef DONT_USE_EXTERN_C
-}
-#endif
-#endif
-
-#endif /* JPEGLIB_H */
diff --git a/lib-x86-64/include/libavcodec/avcodec.h b/lib-x86-64/include/libavcodec/avcodec.h
deleted file mode 100644
index 4bddbaa4..00000000
--- a/lib-x86-64/include/libavcodec/avcodec.h
+++ /dev/null
@@ -1,4102 +0,0 @@
-/*
- * copyright (c) 2001 Fabrice Bellard
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_AVCODEC_H
-#define AVCODEC_AVCODEC_H
-
-/**
- * @file
- * external API header
- */
-
-#include <errno.h>
-#include "libavutil/avutil.h"
-#include "libavutil/cpu.h"
-
-#define LIBAVCODEC_VERSION_MAJOR 52
-#define LIBAVCODEC_VERSION_MINOR 92
-#define LIBAVCODEC_VERSION_MICRO  0
-
-#define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
-                                               LIBAVCODEC_VERSION_MINOR, \
-                                               LIBAVCODEC_VERSION_MICRO)
-#define LIBAVCODEC_VERSION      AV_VERSION(LIBAVCODEC_VERSION_MAJOR,    \
-                                           LIBAVCODEC_VERSION_MINOR,    \
-                                           LIBAVCODEC_VERSION_MICRO)
-#define LIBAVCODEC_BUILD        LIBAVCODEC_VERSION_INT
-
-#define LIBAVCODEC_IDENT        "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
-
-/**
- * Those FF_API_* defines are not part of public API.
- * They may change, break or disappear at any time.
- */
-#ifndef FF_API_PALETTE_CONTROL
-#define FF_API_PALETTE_CONTROL  (LIBAVCODEC_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_MM_FLAGS
-#define FF_API_MM_FLAGS         (LIBAVCODEC_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_OPT_SHOW
-#define FF_API_OPT_SHOW         (LIBAVCODEC_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_AUDIO_OLD
-#define FF_API_AUDIO_OLD        (LIBAVCODEC_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_VIDEO_OLD
-#define FF_API_VIDEO_OLD        (LIBAVCODEC_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_SUBTITLE_OLD
-#define FF_API_SUBTITLE_OLD     (LIBAVCODEC_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_USE_LPC
-#define FF_API_USE_LPC          (LIBAVCODEC_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_SET_STRING_OLD
-#define FF_API_SET_STRING_OLD   (LIBAVCODEC_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_INOFFICIAL
-#define FF_API_INOFFICIAL       (LIBAVCODEC_VERSION_MAJOR < 53)
-#endif
-
-#define AV_NOPTS_VALUE          INT64_C(0x8000000000000000)
-#define AV_TIME_BASE            1000000
-#define AV_TIME_BASE_Q          (AVRational){1, AV_TIME_BASE}
-
-/**
- * Identify the syntax and semantics of the bitstream.
- * The principle is roughly:
- * Two decoders with the same ID can decode the same streams.
- * Two encoders with the same ID can encode compatible streams.
- * There may be slight deviations from the principle due to implementation
- * details.
- *
- * If you add a codec ID to this list, add it so that
- * 1. no value of a existing codec ID changes (that would break ABI),
- * 2. it is as close as possible to similar codecs.
- */
-enum CodecID {
-    CODEC_ID_NONE,
-
-    /* video codecs */
-    CODEC_ID_MPEG1VIDEO,
-    CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
-    CODEC_ID_MPEG2VIDEO_XVMC,
-    CODEC_ID_H261,
-    CODEC_ID_H263,
-    CODEC_ID_RV10,
-    CODEC_ID_RV20,
-    CODEC_ID_MJPEG,
-    CODEC_ID_MJPEGB,
-    CODEC_ID_LJPEG,
-    CODEC_ID_SP5X,
-    CODEC_ID_JPEGLS,
-    CODEC_ID_MPEG4,
-    CODEC_ID_RAWVIDEO,
-    CODEC_ID_MSMPEG4V1,
-    CODEC_ID_MSMPEG4V2,
-    CODEC_ID_MSMPEG4V3,
-    CODEC_ID_WMV1,
-    CODEC_ID_WMV2,
-    CODEC_ID_H263P,
-    CODEC_ID_H263I,
-    CODEC_ID_FLV1,
-    CODEC_ID_SVQ1,
-    CODEC_ID_SVQ3,
-    CODEC_ID_DVVIDEO,
-    CODEC_ID_HUFFYUV,
-    CODEC_ID_CYUV,
-    CODEC_ID_H264,
-    CODEC_ID_INDEO3,
-    CODEC_ID_VP3,
-    CODEC_ID_THEORA,
-    CODEC_ID_ASV1,
-    CODEC_ID_ASV2,
-    CODEC_ID_FFV1,
-    CODEC_ID_4XM,
-    CODEC_ID_VCR1,
-    CODEC_ID_CLJR,
-    CODEC_ID_MDEC,
-    CODEC_ID_ROQ,
-    CODEC_ID_INTERPLAY_VIDEO,
-    CODEC_ID_XAN_WC3,
-    CODEC_ID_XAN_WC4,
-    CODEC_ID_RPZA,
-    CODEC_ID_CINEPAK,
-    CODEC_ID_WS_VQA,
-    CODEC_ID_MSRLE,
-    CODEC_ID_MSVIDEO1,
-    CODEC_ID_IDCIN,
-    CODEC_ID_8BPS,
-    CODEC_ID_SMC,
-    CODEC_ID_FLIC,
-    CODEC_ID_TRUEMOTION1,
-    CODEC_ID_VMDVIDEO,
-    CODEC_ID_MSZH,
-    CODEC_ID_ZLIB,
-    CODEC_ID_QTRLE,
-    CODEC_ID_SNOW,
-    CODEC_ID_TSCC,
-    CODEC_ID_ULTI,
-    CODEC_ID_QDRAW,
-    CODEC_ID_VIXL,
-    CODEC_ID_QPEG,
-#if LIBAVCODEC_VERSION_MAJOR < 53
-    CODEC_ID_XVID,
-#endif
-    CODEC_ID_PNG,
-    CODEC_ID_PPM,
-    CODEC_ID_PBM,
-    CODEC_ID_PGM,
-    CODEC_ID_PGMYUV,
-    CODEC_ID_PAM,
-    CODEC_ID_FFVHUFF,
-    CODEC_ID_RV30,
-    CODEC_ID_RV40,
-    CODEC_ID_VC1,
-    CODEC_ID_WMV3,
-    CODEC_ID_LOCO,
-    CODEC_ID_WNV1,
-    CODEC_ID_AASC,
-    CODEC_ID_INDEO2,
-    CODEC_ID_FRAPS,
-    CODEC_ID_TRUEMOTION2,
-    CODEC_ID_BMP,
-    CODEC_ID_CSCD,
-    CODEC_ID_MMVIDEO,
-    CODEC_ID_ZMBV,
-    CODEC_ID_AVS,
-    CODEC_ID_SMACKVIDEO,
-    CODEC_ID_NUV,
-    CODEC_ID_KMVC,
-    CODEC_ID_FLASHSV,
-    CODEC_ID_CAVS,
-    CODEC_ID_JPEG2000,
-    CODEC_ID_VMNC,
-    CODEC_ID_VP5,
-    CODEC_ID_VP6,
-    CODEC_ID_VP6F,
-    CODEC_ID_TARGA,
-    CODEC_ID_DSICINVIDEO,
-    CODEC_ID_TIERTEXSEQVIDEO,
-    CODEC_ID_TIFF,
-    CODEC_ID_GIF,
-    CODEC_ID_FFH264,
-    CODEC_ID_DXA,
-    CODEC_ID_DNXHD,
-    CODEC_ID_THP,
-    CODEC_ID_SGI,
-    CODEC_ID_C93,
-    CODEC_ID_BETHSOFTVID,
-    CODEC_ID_PTX,
-    CODEC_ID_TXD,
-    CODEC_ID_VP6A,
-    CODEC_ID_AMV,
-    CODEC_ID_VB,
-    CODEC_ID_PCX,
-    CODEC_ID_SUNRAST,
-    CODEC_ID_INDEO4,
-    CODEC_ID_INDEO5,
-    CODEC_ID_MIMIC,
-    CODEC_ID_RL2,
-    CODEC_ID_8SVX_EXP,
-    CODEC_ID_8SVX_FIB,
-    CODEC_ID_ESCAPE124,
-    CODEC_ID_DIRAC,
-    CODEC_ID_BFI,
-    CODEC_ID_CMV,
-    CODEC_ID_MOTIONPIXELS,
-    CODEC_ID_TGV,
-    CODEC_ID_TGQ,
-    CODEC_ID_TQI,
-    CODEC_ID_AURA,
-    CODEC_ID_AURA2,
-    CODEC_ID_V210X,
-    CODEC_ID_TMV,
-    CODEC_ID_V210,
-    CODEC_ID_DPX,
-    CODEC_ID_MAD,
-    CODEC_ID_FRWU,
-    CODEC_ID_FLASHSV2,
-    CODEC_ID_CDGRAPHICS,
-    CODEC_ID_R210,
-    CODEC_ID_ANM,
-    CODEC_ID_BINKVIDEO,
-    CODEC_ID_IFF_ILBM,
-    CODEC_ID_IFF_BYTERUN1,
-    CODEC_ID_KGV1,
-    CODEC_ID_YOP,
-    CODEC_ID_VP8,
-    CODEC_ID_PICTOR,
-    CODEC_ID_ANSI,
-    CODEC_ID_A64_MULTI,
-    CODEC_ID_A64_MULTI5,
-    CODEC_ID_R10K,
-
-    /* various PCM "codecs" */
-    CODEC_ID_PCM_S16LE= 0x10000,
-    CODEC_ID_PCM_S16BE,
-    CODEC_ID_PCM_U16LE,
-    CODEC_ID_PCM_U16BE,
-    CODEC_ID_PCM_S8,
-    CODEC_ID_PCM_U8,
-    CODEC_ID_PCM_MULAW,
-    CODEC_ID_PCM_ALAW,
-    CODEC_ID_PCM_S32LE,
-    CODEC_ID_PCM_S32BE,
-    CODEC_ID_PCM_U32LE,
-    CODEC_ID_PCM_U32BE,
-    CODEC_ID_PCM_S24LE,
-    CODEC_ID_PCM_S24BE,
-    CODEC_ID_PCM_U24LE,
-    CODEC_ID_PCM_U24BE,
-    CODEC_ID_PCM_S24DAUD,
-    CODEC_ID_PCM_ZORK,
-    CODEC_ID_PCM_S16LE_PLANAR,
-    CODEC_ID_PCM_DVD,
-    CODEC_ID_PCM_F32BE,
-    CODEC_ID_PCM_F32LE,
-    CODEC_ID_PCM_F64BE,
-    CODEC_ID_PCM_F64LE,
-    CODEC_ID_PCM_BLURAY,
-    CODEC_ID_PCM_LXF,
-
-    /* various ADPCM codecs */
-    CODEC_ID_ADPCM_IMA_QT= 0x11000,
-    CODEC_ID_ADPCM_IMA_WAV,
-    CODEC_ID_ADPCM_IMA_DK3,
-    CODEC_ID_ADPCM_IMA_DK4,
-    CODEC_ID_ADPCM_IMA_WS,
-    CODEC_ID_ADPCM_IMA_SMJPEG,
-    CODEC_ID_ADPCM_MS,
-    CODEC_ID_ADPCM_4XM,
-    CODEC_ID_ADPCM_XA,
-    CODEC_ID_ADPCM_ADX,
-    CODEC_ID_ADPCM_EA,
-    CODEC_ID_ADPCM_G726,
-    CODEC_ID_ADPCM_CT,
-    CODEC_ID_ADPCM_SWF,
-    CODEC_ID_ADPCM_YAMAHA,
-    CODEC_ID_ADPCM_SBPRO_4,
-    CODEC_ID_ADPCM_SBPRO_3,
-    CODEC_ID_ADPCM_SBPRO_2,
-    CODEC_ID_ADPCM_THP,
-    CODEC_ID_ADPCM_IMA_AMV,
-    CODEC_ID_ADPCM_EA_R1,
-    CODEC_ID_ADPCM_EA_R3,
-    CODEC_ID_ADPCM_EA_R2,
-    CODEC_ID_ADPCM_IMA_EA_SEAD,
-    CODEC_ID_ADPCM_IMA_EA_EACS,
-    CODEC_ID_ADPCM_EA_XAS,
-    CODEC_ID_ADPCM_EA_MAXIS_XA,
-    CODEC_ID_ADPCM_IMA_ISS,
-    CODEC_ID_ADPCM_G722,
-
-    /* AMR */
-    CODEC_ID_AMR_NB= 0x12000,
-    CODEC_ID_AMR_WB,
-
-    /* RealAudio codecs*/
-    CODEC_ID_RA_144= 0x13000,
-    CODEC_ID_RA_288,
-
-    /* various DPCM codecs */
-    CODEC_ID_ROQ_DPCM= 0x14000,
-    CODEC_ID_INTERPLAY_DPCM,
-    CODEC_ID_XAN_DPCM,
-    CODEC_ID_SOL_DPCM,
-
-    /* audio codecs */
-    CODEC_ID_MP2= 0x15000,
-    CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3
-    CODEC_ID_AAC,
-    CODEC_ID_AC3,
-    CODEC_ID_DTS,
-    CODEC_ID_VORBIS,
-    CODEC_ID_DVAUDIO,
-    CODEC_ID_WMAV1,
-    CODEC_ID_WMAV2,
-    CODEC_ID_MACE3,
-    CODEC_ID_MACE6,
-    CODEC_ID_VMDAUDIO,
-    CODEC_ID_SONIC,
-    CODEC_ID_SONIC_LS,
-    CODEC_ID_FLAC,
-    CODEC_ID_MP3ADU,
-    CODEC_ID_MP3ON4,
-    CODEC_ID_SHORTEN,
-    CODEC_ID_ALAC,
-    CODEC_ID_WESTWOOD_SND1,
-    CODEC_ID_GSM, ///< as in Berlin toast format
-    CODEC_ID_QDM2,
-    CODEC_ID_COOK,
-    CODEC_ID_TRUESPEECH,
-    CODEC_ID_TTA,
-    CODEC_ID_SMACKAUDIO,
-    CODEC_ID_QCELP,
-    CODEC_ID_WAVPACK,
-    CODEC_ID_DSICINAUDIO,
-    CODEC_ID_IMC,
-    CODEC_ID_MUSEPACK7,
-    CODEC_ID_MLP,
-    CODEC_ID_GSM_MS, /* as found in WAV */
-    CODEC_ID_ATRAC3,
-    CODEC_ID_VOXWARE,
-    CODEC_ID_APE,
-    CODEC_ID_NELLYMOSER,
-    CODEC_ID_MUSEPACK8,
-    CODEC_ID_SPEEX,
-    CODEC_ID_WMAVOICE,
-    CODEC_ID_WMAPRO,
-    CODEC_ID_WMALOSSLESS,
-    CODEC_ID_ATRAC3P,
-    CODEC_ID_EAC3,
-    CODEC_ID_SIPR,
-    CODEC_ID_MP1,
-    CODEC_ID_TWINVQ,
-    CODEC_ID_TRUEHD,
-    CODEC_ID_MP4ALS,
-    CODEC_ID_ATRAC1,
-    CODEC_ID_BINKAUDIO_RDFT,
-    CODEC_ID_BINKAUDIO_DCT,
-
-    /* subtitle codecs */
-    CODEC_ID_DVD_SUBTITLE= 0x17000,
-    CODEC_ID_DVB_SUBTITLE,
-    CODEC_ID_TEXT,  ///< raw UTF-8 text
-    CODEC_ID_XSUB,
-    CODEC_ID_SSA,
-    CODEC_ID_MOV_TEXT,
-    CODEC_ID_HDMV_PGS_SUBTITLE,
-    CODEC_ID_DVB_TELETEXT,
-    CODEC_ID_SRT,
-
-    /* other specific kind of codecs (generally used for attachments) */
-    CODEC_ID_TTF= 0x18000,
-
-    CODEC_ID_PROBE= 0x19000, ///< codec_id is not known (like CODEC_ID_NONE) but lavf should attempt to identify it
-
-    CODEC_ID_MPEG2TS= 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS
-                                * stream (only used by libavformat) */
-};
-
-#if LIBAVCODEC_VERSION_MAJOR < 53
-#define CodecType AVMediaType
-
-#define CODEC_TYPE_UNKNOWN    AVMEDIA_TYPE_UNKNOWN
-#define CODEC_TYPE_VIDEO      AVMEDIA_TYPE_VIDEO
-#define CODEC_TYPE_AUDIO      AVMEDIA_TYPE_AUDIO
-#define CODEC_TYPE_DATA       AVMEDIA_TYPE_DATA
-#define CODEC_TYPE_SUBTITLE   AVMEDIA_TYPE_SUBTITLE
-#define CODEC_TYPE_ATTACHMENT AVMEDIA_TYPE_ATTACHMENT
-#define CODEC_TYPE_NB         AVMEDIA_TYPE_NB
-#endif
-
-/**
- * all in native-endian format
- */
-enum SampleFormat {
-    SAMPLE_FMT_NONE = -1,
-    SAMPLE_FMT_U8,              ///< unsigned 8 bits
-    SAMPLE_FMT_S16,             ///< signed 16 bits
-    SAMPLE_FMT_S32,             ///< signed 32 bits
-    SAMPLE_FMT_FLT,             ///< float
-    SAMPLE_FMT_DBL,             ///< double
-    SAMPLE_FMT_NB               ///< Number of sample formats. DO NOT USE if dynamically linking to libavcodec
-};
-
-/* Audio channel masks */
-#define CH_FRONT_LEFT             0x00000001
-#define CH_FRONT_RIGHT            0x00000002
-#define CH_FRONT_CENTER           0x00000004
-#define CH_LOW_FREQUENCY          0x00000008
-#define CH_BACK_LEFT              0x00000010
-#define CH_BACK_RIGHT             0x00000020
-#define CH_FRONT_LEFT_OF_CENTER   0x00000040
-#define CH_FRONT_RIGHT_OF_CENTER  0x00000080
-#define CH_BACK_CENTER            0x00000100
-#define CH_SIDE_LEFT              0x00000200
-#define CH_SIDE_RIGHT             0x00000400
-#define CH_TOP_CENTER             0x00000800
-#define CH_TOP_FRONT_LEFT         0x00001000
-#define CH_TOP_FRONT_CENTER       0x00002000
-#define CH_TOP_FRONT_RIGHT        0x00004000
-#define CH_TOP_BACK_LEFT          0x00008000
-#define CH_TOP_BACK_CENTER        0x00010000
-#define CH_TOP_BACK_RIGHT         0x00020000
-#define CH_STEREO_LEFT            0x20000000  ///< Stereo downmix.
-#define CH_STEREO_RIGHT           0x40000000  ///< See CH_STEREO_LEFT.
-
-/** Channel mask value used for AVCodecContext.request_channel_layout
-    to indicate that the user requests the channel order of the decoder output
-    to be the native codec channel order. */
-#define CH_LAYOUT_NATIVE          0x8000000000000000LL
-
-/* Audio channel convenience macros */
-#define CH_LAYOUT_MONO              (CH_FRONT_CENTER)
-#define CH_LAYOUT_STEREO            (CH_FRONT_LEFT|CH_FRONT_RIGHT)
-#define CH_LAYOUT_2_1               (CH_LAYOUT_STEREO|CH_BACK_CENTER)
-#define CH_LAYOUT_SURROUND          (CH_LAYOUT_STEREO|CH_FRONT_CENTER)
-#define CH_LAYOUT_4POINT0           (CH_LAYOUT_SURROUND|CH_BACK_CENTER)
-#define CH_LAYOUT_2_2               (CH_LAYOUT_STEREO|CH_SIDE_LEFT|CH_SIDE_RIGHT)
-#define CH_LAYOUT_QUAD              (CH_LAYOUT_STEREO|CH_BACK_LEFT|CH_BACK_RIGHT)
-#define CH_LAYOUT_5POINT0           (CH_LAYOUT_SURROUND|CH_SIDE_LEFT|CH_SIDE_RIGHT)
-#define CH_LAYOUT_5POINT1           (CH_LAYOUT_5POINT0|CH_LOW_FREQUENCY)
-#define CH_LAYOUT_5POINT0_BACK      (CH_LAYOUT_SURROUND|CH_BACK_LEFT|CH_BACK_RIGHT)
-#define CH_LAYOUT_5POINT1_BACK      (CH_LAYOUT_5POINT0_BACK|CH_LOW_FREQUENCY)
-#define CH_LAYOUT_7POINT0           (CH_LAYOUT_5POINT0|CH_BACK_LEFT|CH_BACK_RIGHT)
-#define CH_LAYOUT_7POINT1           (CH_LAYOUT_5POINT1|CH_BACK_LEFT|CH_BACK_RIGHT)
-#define CH_LAYOUT_7POINT1_WIDE      (CH_LAYOUT_5POINT1_BACK|\
-                                          CH_FRONT_LEFT_OF_CENTER|CH_FRONT_RIGHT_OF_CENTER)
-#define CH_LAYOUT_STEREO_DOWNMIX    (CH_STEREO_LEFT|CH_STEREO_RIGHT)
-
-/* in bytes */
-#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
-
-/**
- * Required number of additionally allocated bytes at the end of the input bitstream for decoding.
- * This is mainly needed because some optimized bitstream readers read
- * 32 or 64 bit at once and could read over the end.<br>
- * Note: If the first 23 bits of the additional bytes are not 0, then damaged
- * MPEG bitstreams could cause overread and segfault.
- */
-#define FF_INPUT_BUFFER_PADDING_SIZE 8
-
-/**
- * minimum encoding buffer size
- * Used to avoid some checks during header writing.
- */
-#define FF_MIN_BUFFER_SIZE 16384
-
-
-/**
- * motion estimation type.
- */
-enum Motion_Est_ID {
-    ME_ZERO = 1,    ///< no search, that is use 0,0 vector whenever one is needed
-    ME_FULL,
-    ME_LOG,
-    ME_PHODS,
-    ME_EPZS,        ///< enhanced predictive zonal search
-    ME_X1,          ///< reserved for experiments
-    ME_HEX,         ///< hexagon based search
-    ME_UMH,         ///< uneven multi-hexagon search
-    ME_ITER,        ///< iterative search
-    ME_TESA,        ///< transformed exhaustive search algorithm
-};
-
-enum AVDiscard{
-    /* We leave some space between them for extensions (drop some
-     * keyframes for intra-only or drop just some bidir frames). */
-    AVDISCARD_NONE   =-16, ///< discard nothing
-    AVDISCARD_DEFAULT=  0, ///< discard useless packets like 0 size packets in avi
-    AVDISCARD_NONREF =  8, ///< discard all non reference
-    AVDISCARD_BIDIR  = 16, ///< discard all bidirectional frames
-    AVDISCARD_NONKEY = 32, ///< discard all frames except keyframes
-    AVDISCARD_ALL    = 48, ///< discard all
-};
-
-enum AVColorPrimaries{
-    AVCOL_PRI_BT709      =1, ///< also ITU-R BT1361 / IEC 61966-2-4 / SMPTE RP177 Annex B
-    AVCOL_PRI_UNSPECIFIED=2,
-    AVCOL_PRI_BT470M     =4,
-    AVCOL_PRI_BT470BG    =5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM
-    AVCOL_PRI_SMPTE170M  =6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC
-    AVCOL_PRI_SMPTE240M  =7, ///< functionally identical to above
-    AVCOL_PRI_FILM       =8,
-    AVCOL_PRI_NB           , ///< Not part of ABI
-};
-
-enum AVColorTransferCharacteristic{
-    AVCOL_TRC_BT709      =1, ///< also ITU-R BT1361
-    AVCOL_TRC_UNSPECIFIED=2,
-    AVCOL_TRC_GAMMA22    =4, ///< also ITU-R BT470M / ITU-R BT1700 625 PAL & SECAM
-    AVCOL_TRC_GAMMA28    =5, ///< also ITU-R BT470BG
-    AVCOL_TRC_NB           , ///< Not part of ABI
-};
-
-enum AVColorSpace{
-    AVCOL_SPC_RGB        =0,
-    AVCOL_SPC_BT709      =1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B
-    AVCOL_SPC_UNSPECIFIED=2,
-    AVCOL_SPC_FCC        =4,
-    AVCOL_SPC_BT470BG    =5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM / IEC 61966-2-4 xvYCC601
-    AVCOL_SPC_SMPTE170M  =6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC / functionally identical to above
-    AVCOL_SPC_SMPTE240M  =7,
-    AVCOL_SPC_NB           , ///< Not part of ABI
-};
-
-enum AVColorRange{
-    AVCOL_RANGE_UNSPECIFIED=0,
-    AVCOL_RANGE_MPEG       =1, ///< the normal 219*2^(n-8) "MPEG" YUV ranges
-    AVCOL_RANGE_JPEG       =2, ///< the normal     2^n-1   "JPEG" YUV ranges
-    AVCOL_RANGE_NB           , ///< Not part of ABI
-};
-
-/**
- *  X   X      3 4 X      X are luma samples,
- *             1 2        1-6 are possible chroma positions
- *  X   X      5 6 X      0 is undefined/unknown position
- */
-enum AVChromaLocation{
-    AVCHROMA_LOC_UNSPECIFIED=0,
-    AVCHROMA_LOC_LEFT       =1, ///< mpeg2/4, h264 default
-    AVCHROMA_LOC_CENTER     =2, ///< mpeg1, jpeg, h263
-    AVCHROMA_LOC_TOPLEFT    =3, ///< DV
-    AVCHROMA_LOC_TOP        =4,
-    AVCHROMA_LOC_BOTTOMLEFT =5,
-    AVCHROMA_LOC_BOTTOM     =6,
-    AVCHROMA_LOC_NB           , ///< Not part of ABI
-};
-
-/**
- * LPC analysis type
- */
-enum AVLPCType {
-    AV_LPC_TYPE_DEFAULT     = -1, ///< use the codec default LPC type
-    AV_LPC_TYPE_NONE        =  0, ///< do not use LPC prediction or use all zero coefficients
-    AV_LPC_TYPE_FIXED       =  1, ///< fixed LPC coefficients
-    AV_LPC_TYPE_LEVINSON    =  2, ///< Levinson-Durbin recursion
-    AV_LPC_TYPE_CHOLESKY    =  3, ///< Cholesky factorization
-    AV_LPC_TYPE_NB              , ///< Not part of ABI
-};
-
-typedef struct RcOverride{
-    int start_frame;
-    int end_frame;
-    int qscale; // If this is 0 then quality_factor will be used instead.
-    float quality_factor;
-} RcOverride;
-
-#define FF_MAX_B_FRAMES 16
-
-/* encoding support
-   These flags can be passed in AVCodecContext.flags before initialization.
-   Note: Not everything is supported yet.
-*/
-
-#define CODEC_FLAG_QSCALE 0x0002  ///< Use fixed qscale.
-#define CODEC_FLAG_4MV    0x0004  ///< 4 MV per MB allowed / advanced prediction for H.263.
-#define CODEC_FLAG_QPEL   0x0010  ///< Use qpel MC.
-#define CODEC_FLAG_GMC    0x0020  ///< Use GMC.
-#define CODEC_FLAG_MV0    0x0040  ///< Always try a MB with MV=<0,0>.
-#define CODEC_FLAG_PART   0x0080  ///< Use data partitioning.
-/**
- * The parent program guarantees that the input for B-frames containing
- * streams is not written to for at least s->max_b_frames+1 frames, if
- * this is not set the input will be copied.
- */
-#define CODEC_FLAG_INPUT_PRESERVED 0x0100
-#define CODEC_FLAG_PASS1           0x0200   ///< Use internal 2pass ratecontrol in first pass mode.
-#define CODEC_FLAG_PASS2           0x0400   ///< Use internal 2pass ratecontrol in second pass mode.
-#define CODEC_FLAG_EXTERN_HUFF     0x1000   ///< Use external Huffman table (for MJPEG).
-#define CODEC_FLAG_GRAY            0x2000   ///< Only decode/encode grayscale.
-#define CODEC_FLAG_EMU_EDGE        0x4000   ///< Don't draw edges.
-#define CODEC_FLAG_PSNR            0x8000   ///< error[?] variables will be set during encoding.
-#define CODEC_FLAG_TRUNCATED       0x00010000 /** Input bitstream might be truncated at a random
-                                                  location instead of only at frame boundaries. */
-#define CODEC_FLAG_NORMALIZE_AQP  0x00020000 ///< Normalize adaptive quantization.
-#define CODEC_FLAG_INTERLACED_DCT 0x00040000 ///< Use interlaced DCT.
-#define CODEC_FLAG_LOW_DELAY      0x00080000 ///< Force low delay.
-#define CODEC_FLAG_ALT_SCAN       0x00100000 ///< Use alternate scan.
-#define CODEC_FLAG_GLOBAL_HEADER  0x00400000 ///< Place global headers in extradata instead of every keyframe.
-#define CODEC_FLAG_BITEXACT       0x00800000 ///< Use only bitexact stuff (except (I)DCT).
-/* Fx : Flag for h263+ extra options */
-#define CODEC_FLAG_AC_PRED        0x01000000 ///< H.263 advanced intra coding / MPEG-4 AC prediction
-#define CODEC_FLAG_H263P_UMV      0x02000000 ///< unlimited motion vector
-#define CODEC_FLAG_CBP_RD         0x04000000 ///< Use rate distortion optimization for cbp.
-#define CODEC_FLAG_QP_RD          0x08000000 ///< Use rate distortion optimization for qp selectioon.
-#define CODEC_FLAG_H263P_AIV      0x00000008 ///< H.263 alternative inter VLC
-#define CODEC_FLAG_OBMC           0x00000001 ///< OBMC
-#define CODEC_FLAG_LOOP_FILTER    0x00000800 ///< loop filter
-#define CODEC_FLAG_H263P_SLICE_STRUCT 0x10000000
-#define CODEC_FLAG_INTERLACED_ME  0x20000000 ///< interlaced motion estimation
-#define CODEC_FLAG_SVCD_SCAN_OFFSET 0x40000000 ///< Will reserve space for SVCD scan offset user data.
-#define CODEC_FLAG_CLOSED_GOP     0x80000000
-#define CODEC_FLAG2_FAST          0x00000001 ///< Allow non spec compliant speedup tricks.
-#define CODEC_FLAG2_STRICT_GOP    0x00000002 ///< Strictly enforce GOP size.
-#define CODEC_FLAG2_NO_OUTPUT     0x00000004 ///< Skip bitstream encoding.
-#define CODEC_FLAG2_LOCAL_HEADER  0x00000008 ///< Place global headers at every keyframe instead of in extradata.
-#define CODEC_FLAG2_BPYRAMID      0x00000010 ///< H.264 allow B-frames to be used as references.
-#define CODEC_FLAG2_WPRED         0x00000020 ///< H.264 weighted biprediction for B-frames
-#define CODEC_FLAG2_MIXED_REFS    0x00000040 ///< H.264 one reference per partition, as opposed to one reference per macroblock
-#define CODEC_FLAG2_8X8DCT        0x00000080 ///< H.264 high profile 8x8 transform
-#define CODEC_FLAG2_FASTPSKIP     0x00000100 ///< H.264 fast pskip
-#define CODEC_FLAG2_AUD           0x00000200 ///< H.264 access unit delimiters
-#define CODEC_FLAG2_BRDO          0x00000400 ///< B-frame rate-distortion optimization
-#define CODEC_FLAG2_INTRA_VLC     0x00000800 ///< Use MPEG-2 intra VLC table.
-#define CODEC_FLAG2_MEMC_ONLY     0x00001000 ///< Only do ME/MC (I frames -> ref, P frame -> ME+MC).
-#define CODEC_FLAG2_DROP_FRAME_TIMECODE 0x00002000 ///< timecode is in drop frame format.
-#define CODEC_FLAG2_SKIP_RD       0x00004000 ///< RD optimal MB level residual skipping
-#define CODEC_FLAG2_CHUNKS        0x00008000 ///< Input bitstream might be truncated at a packet boundaries instead of only at frame boundaries.
-#define CODEC_FLAG2_NON_LINEAR_QUANT 0x00010000 ///< Use MPEG-2 nonlinear quantizer.
-#define CODEC_FLAG2_BIT_RESERVOIR 0x00020000 ///< Use a bit reservoir when encoding if possible
-#define CODEC_FLAG2_MBTREE        0x00040000 ///< Use macroblock tree ratecontrol (x264 only)
-#define CODEC_FLAG2_PSY           0x00080000 ///< Use psycho visual optimizations.
-#define CODEC_FLAG2_SSIM          0x00100000 ///< Compute SSIM during encoding, error[] values are undefined.
-#define CODEC_FLAG2_INTRA_REFRESH 0x00200000 ///< Use periodic insertion of intra blocks instead of keyframes.
-
-/* Unsupported options :
- *              Syntax Arithmetic coding (SAC)
- *              Reference Picture Selection
- *              Independent Segment Decoding */
-/* /Fx */
-/* codec capabilities */
-
-#define CODEC_CAP_DRAW_HORIZ_BAND 0x0001 ///< Decoder can use draw_horiz_band callback.
-/**
- * Codec uses get_buffer() for allocating buffers and supports custom allocators.
- * If not set, it might not use get_buffer() at all or use operations that
- * assume the buffer was allocated by avcodec_default_get_buffer.
- */
-#define CODEC_CAP_DR1             0x0002
-/* If 'parse_only' field is true, then avcodec_parse_frame() can be used. */
-#define CODEC_CAP_PARSE_ONLY      0x0004
-#define CODEC_CAP_TRUNCATED       0x0008
-/* Codec can export data for HW decoding (XvMC). */
-#define CODEC_CAP_HWACCEL         0x0010
-/**
- * Codec has a nonzero delay and needs to be fed with NULL at the end to get the delayed data.
- * If this is not set, the codec is guaranteed to never be fed with NULL data.
- */
-#define CODEC_CAP_DELAY           0x0020
-/**
- * Codec can be fed a final frame with a smaller size.
- * This can be used to prevent truncation of the last audio samples.
- */
-#define CODEC_CAP_SMALL_LAST_FRAME 0x0040
-/**
- * Codec can export data for HW decoding (VDPAU).
- */
-#define CODEC_CAP_HWACCEL_VDPAU    0x0080
-/**
- * Codec can output multiple frames per AVPacket
- * Normally demuxers return one frame at a time, demuxers which do not do
- * are connected to a parser to split what they return into proper frames.
- * This flag is reserved to the very rare category of codecs which have a
- * bitstream that cannot be split into frames without timeconsuming
- * operations like full decoding. Demuxers carring such bitstreams thus
- * may return multiple frames in a packet. This has many disadvantages like
- * prohibiting stream copy in many cases thus it should only be considered
- * as a last resort.
- */
-#define CODEC_CAP_SUBFRAMES        0x0100
-/**
- * Codec is experimental and is thus avoided in favor of non experimental
- * encoders
- */
-#define CODEC_CAP_EXPERIMENTAL     0x0200
-/**
- * Codec should fill in channel configuration and samplerate instead of container
- */
-#define CODEC_CAP_CHANNEL_CONF     0x0400
-
-
-//The following defines may change, don't expect compatibility if you use them.
-#define MB_TYPE_INTRA4x4   0x0001
-#define MB_TYPE_INTRA16x16 0x0002 //FIXME H.264-specific
-#define MB_TYPE_INTRA_PCM  0x0004 //FIXME H.264-specific
-#define MB_TYPE_16x16      0x0008
-#define MB_TYPE_16x8       0x0010
-#define MB_TYPE_8x16       0x0020
-#define MB_TYPE_8x8        0x0040
-#define MB_TYPE_INTERLACED 0x0080
-#define MB_TYPE_DIRECT2    0x0100 //FIXME
-#define MB_TYPE_ACPRED     0x0200
-#define MB_TYPE_GMC        0x0400
-#define MB_TYPE_SKIP       0x0800
-#define MB_TYPE_P0L0       0x1000
-#define MB_TYPE_P1L0       0x2000
-#define MB_TYPE_P0L1       0x4000
-#define MB_TYPE_P1L1       0x8000
-#define MB_TYPE_L0         (MB_TYPE_P0L0 | MB_TYPE_P1L0)
-#define MB_TYPE_L1         (MB_TYPE_P0L1 | MB_TYPE_P1L1)
-#define MB_TYPE_L0L1       (MB_TYPE_L0   | MB_TYPE_L1)
-#define MB_TYPE_QUANT      0x00010000
-#define MB_TYPE_CBP        0x00020000
-//Note bits 24-31 are reserved for codec specific use (h264 ref0, mpeg1 0mv, ...)
-
-/**
- * Pan Scan area.
- * This specifies the area which should be displayed.
- * Note there may be multiple such areas for one frame.
- */
-typedef struct AVPanScan{
-    /**
-     * id
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    int id;
-
-    /**
-     * width and height in 1/16 pel
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    int width;
-    int height;
-
-    /**
-     * position of the top left corner in 1/16 pel for up to 3 fields/frames
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    int16_t position[3][2];
-}AVPanScan;
-
-#define FF_COMMON_FRAME \
-    /**\
-     * pointer to the picture planes.\
-     * This might be different from the first allocated byte\
-     * - encoding: \
-     * - decoding: \
-     */\
-    uint8_t *data[4];\
-    int linesize[4];\
-    /**\
-     * pointer to the first allocated byte of the picture. Can be used in get_buffer/release_buffer.\
-     * This isn't used by libavcodec unless the default get/release_buffer() is used.\
-     * - encoding: \
-     * - decoding: \
-     */\
-    uint8_t *base[4];\
-    /**\
-     * 1 -> keyframe, 0-> not\
-     * - encoding: Set by libavcodec.\
-     * - decoding: Set by libavcodec.\
-     */\
-    int key_frame;\
-\
-    /**\
-     * Picture type of the frame, see ?_TYPE below.\
-     * - encoding: Set by libavcodec. for coded_picture (and set by user for input).\
-     * - decoding: Set by libavcodec.\
-     */\
-    int pict_type;\
-\
-    /**\
-     * presentation timestamp in time_base units (time when frame should be shown to user)\
-     * If AV_NOPTS_VALUE then frame_rate = 1/time_base will be assumed.\
-     * - encoding: MUST be set by user.\
-     * - decoding: Set by libavcodec.\
-     */\
-    int64_t pts;\
-\
-    /**\
-     * picture number in bitstream order\
-     * - encoding: set by\
-     * - decoding: Set by libavcodec.\
-     */\
-    int coded_picture_number;\
-    /**\
-     * picture number in display order\
-     * - encoding: set by\
-     * - decoding: Set by libavcodec.\
-     */\
-    int display_picture_number;\
-\
-    /**\
-     * quality (between 1 (good) and FF_LAMBDA_MAX (bad)) \
-     * - encoding: Set by libavcodec. for coded_picture (and set by user for input).\
-     * - decoding: Set by libavcodec.\
-     */\
-    int quality; \
-\
-    /**\
-     * buffer age (1->was last buffer and dint change, 2->..., ...).\
-     * Set to INT_MAX if the buffer has not been used yet.\
-     * - encoding: unused\
-     * - decoding: MUST be set by get_buffer().\
-     */\
-    int age;\
-\
-    /**\
-     * is this picture used as reference\
-     * The values for this are the same as the MpegEncContext.picture_structure\
-     * variable, that is 1->top field, 2->bottom field, 3->frame/both fields.\
-     * Set to 4 for delayed, non-reference frames.\
-     * - encoding: unused\
-     * - decoding: Set by libavcodec. (before get_buffer() call)).\
-     */\
-    int reference;\
-\
-    /**\
-     * QP table\
-     * - encoding: unused\
-     * - decoding: Set by libavcodec.\
-     */\
-    int8_t *qscale_table;\
-    /**\
-     * QP store stride\
-     * - encoding: unused\
-     * - decoding: Set by libavcodec.\
-     */\
-    int qstride;\
-\
-    /**\
-     * mbskip_table[mb]>=1 if MB didn't change\
-     * stride= mb_width = (width+15)>>4\
-     * - encoding: unused\
-     * - decoding: Set by libavcodec.\
-     */\
-    uint8_t *mbskip_table;\
-\
-    /**\
-     * motion vector table\
-     * @code\
-     * example:\
-     * int mv_sample_log2= 4 - motion_subsample_log2;\
-     * int mb_width= (width+15)>>4;\
-     * int mv_stride= (mb_width << mv_sample_log2) + 1;\
-     * motion_val[direction][x + y*mv_stride][0->mv_x, 1->mv_y];\
-     * @endcode\
-     * - encoding: Set by user.\
-     * - decoding: Set by libavcodec.\
-     */\
-    int16_t (*motion_val[2])[2];\
-\
-    /**\
-     * macroblock type table\
-     * mb_type_base + mb_width + 2\
-     * - encoding: Set by user.\
-     * - decoding: Set by libavcodec.\
-     */\
-    uint32_t *mb_type;\
-\
-    /**\
-     * log2 of the size of the block which a single vector in motion_val represents: \
-     * (4->16x16, 3->8x8, 2-> 4x4, 1-> 2x2)\
-     * - encoding: unused\
-     * - decoding: Set by libavcodec.\
-     */\
-    uint8_t motion_subsample_log2;\
-\
-    /**\
-     * for some private data of the user\
-     * - encoding: unused\
-     * - decoding: Set by user.\
-     */\
-    void *opaque;\
-\
-    /**\
-     * error\
-     * - encoding: Set by libavcodec. if flags&CODEC_FLAG_PSNR.\
-     * - decoding: unused\
-     */\
-    uint64_t error[4];\
-\
-    /**\
-     * type of the buffer (to keep track of who has to deallocate data[*])\
-     * - encoding: Set by the one who allocates it.\
-     * - decoding: Set by the one who allocates it.\
-     * Note: User allocated (direct rendering) & internal buffers cannot coexist currently.\
-     */\
-    int type;\
-    \
-    /**\
-     * When decoding, this signals how much the picture must be delayed.\
-     * extra_delay = repeat_pict / (2*fps)\
-     * - encoding: unused\
-     * - decoding: Set by libavcodec.\
-     */\
-    int repeat_pict;\
-    \
-    /**\
-     * \
-     */\
-    int qscale_type;\
-    \
-    /**\
-     * The content of the picture is interlaced.\
-     * - encoding: Set by user.\
-     * - decoding: Set by libavcodec. (default 0)\
-     */\
-    int interlaced_frame;\
-    \
-    /**\
-     * If the content is interlaced, is top field displayed first.\
-     * - encoding: Set by user.\
-     * - decoding: Set by libavcodec.\
-     */\
-    int top_field_first;\
-    \
-    /**\
-     * Pan scan.\
-     * - encoding: Set by user.\
-     * - decoding: Set by libavcodec.\
-     */\
-    AVPanScan *pan_scan;\
-    \
-    /**\
-     * Tell user application that palette has changed from previous frame.\
-     * - encoding: ??? (no palette-enabled encoder yet)\
-     * - decoding: Set by libavcodec. (default 0).\
-     */\
-    int palette_has_changed;\
-    \
-    /**\
-     * codec suggestion on buffer type if != 0\
-     * - encoding: unused\
-     * - decoding: Set by libavcodec. (before get_buffer() call)).\
-     */\
-    int buffer_hints;\
-\
-    /**\
-     * DCT coefficients\
-     * - encoding: unused\
-     * - decoding: Set by libavcodec.\
-     */\
-    short *dct_coeff;\
-\
-    /**\
-     * motion reference frame index\
-     * the order in which these are stored can depend on the codec.\
-     * - encoding: Set by user.\
-     * - decoding: Set by libavcodec.\
-     */\
-    int8_t *ref_index[2];\
-\
-    /**\
-     * reordered opaque 64bit number (generally a PTS) from AVCodecContext.reordered_opaque\
-     * output in AVFrame.reordered_opaque\
-     * - encoding: unused\
-     * - decoding: Read by user.\
-     */\
-    int64_t reordered_opaque;\
-\
-    /**\
-     * hardware accelerator private data (FFmpeg allocated)\
-     * - encoding: unused\
-     * - decoding: Set by libavcodec\
-     */\
-    void *hwaccel_picture_private;\
-
-
-#define FF_QSCALE_TYPE_MPEG1 0
-#define FF_QSCALE_TYPE_MPEG2 1
-#define FF_QSCALE_TYPE_H264  2
-#define FF_QSCALE_TYPE_VP56  3
-
-#define FF_BUFFER_TYPE_INTERNAL 1
-#define FF_BUFFER_TYPE_USER     2 ///< direct rendering buffers (image is (de)allocated by user)
-#define FF_BUFFER_TYPE_SHARED   4 ///< Buffer from somewhere else; don't deallocate image (data/base), all other tables are not shared.
-#define FF_BUFFER_TYPE_COPY     8 ///< Just a (modified) copy of some other buffer, don't deallocate anything.
-
-
-#define FF_I_TYPE  1 ///< Intra
-#define FF_P_TYPE  2 ///< Predicted
-#define FF_B_TYPE  3 ///< Bi-dir predicted
-#define FF_S_TYPE  4 ///< S(GMC)-VOP MPEG4
-#define FF_SI_TYPE 5 ///< Switching Intra
-#define FF_SP_TYPE 6 ///< Switching Predicted
-#define FF_BI_TYPE 7
-
-#define FF_BUFFER_HINTS_VALID    0x01 // Buffer hints value is meaningful (if 0 ignore).
-#define FF_BUFFER_HINTS_READABLE 0x02 // Codec will read from buffer.
-#define FF_BUFFER_HINTS_PRESERVE 0x04 // User must not alter buffer content.
-#define FF_BUFFER_HINTS_REUSABLE 0x08 // Codec will reuse the buffer (update).
-
-typedef struct AVPacket {
-    /**
-     * Presentation timestamp in AVStream->time_base units; the time at which
-     * the decompressed packet will be presented to the user.
-     * Can be AV_NOPTS_VALUE if it is not stored in the file.
-     * pts MUST be larger or equal to dts as presentation cannot happen before
-     * decompression, unless one wants to view hex dumps. Some formats misuse
-     * the terms dts and pts/cts to mean something different. Such timestamps
-     * must be converted to true pts/dts before they are stored in AVPacket.
-     */
-    int64_t pts;
-    /**
-     * Decompression timestamp in AVStream->time_base units; the time at which
-     * the packet is decompressed.
-     * Can be AV_NOPTS_VALUE if it is not stored in the file.
-     */
-    int64_t dts;
-    uint8_t *data;
-    int   size;
-    int   stream_index;
-    int   flags;
-    /**
-     * Duration of this packet in AVStream->time_base units, 0 if unknown.
-     * Equals next_pts - this_pts in presentation order.
-     */
-    int   duration;
-    void  (*destruct)(struct AVPacket *);
-    void  *priv;
-    int64_t pos;                            ///< byte position in stream, -1 if unknown
-
-    /**
-     * Time difference in AVStream->time_base units from the pts of this
-     * packet to the point at which the output from the decoder has converged
-     * independent from the availability of previous frames. That is, the
-     * frames are virtually identical no matter if decoding started from
-     * the very first frame or from this keyframe.
-     * Is AV_NOPTS_VALUE if unknown.
-     * This field is not the display duration of the current packet.
-     * This field has no meaning if the packet does not have AV_PKT_FLAG_KEY
-     * set.
-     *
-     * The purpose of this field is to allow seeking in streams that have no
-     * keyframes in the conventional sense. It corresponds to the
-     * recovery point SEI in H.264 and match_time_delta in NUT. It is also
-     * essential for some types of subtitle streams to ensure that all
-     * subtitles are correctly displayed after seeking.
-     */
-    int64_t convergence_duration;
-} AVPacket;
-#define AV_PKT_FLAG_KEY   0x0001
-#if LIBAVCODEC_VERSION_MAJOR < 53
-#define PKT_FLAG_KEY AV_PKT_FLAG_KEY
-#endif
-
-/**
- * Audio Video Frame.
- * New fields can be added to the end of FF_COMMON_FRAME with minor version
- * bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump. No fields should be added into AVFrame before or after
- * FF_COMMON_FRAME!
- * sizeof(AVFrame) must not be used outside libav*.
- */
-typedef struct AVFrame {
-    FF_COMMON_FRAME
-} AVFrame;
-
-/**
- * main external API structure.
- * New fields can be added to the end with minor version bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump.
- * sizeof(AVCodecContext) must not be used outside libav*.
- */
-typedef struct AVCodecContext {
-    /**
-     * information on struct for av_log
-     * - set by avcodec_alloc_context
-     */
-    const AVClass *av_class;
-    /**
-     * the average bitrate
-     * - encoding: Set by user; unused for constant quantizer encoding.
-     * - decoding: Set by libavcodec. 0 or some bitrate if this info is available in the stream.
-     */
-    int bit_rate;
-
-    /**
-     * number of bits the bitstream is allowed to diverge from the reference.
-     *           the reference can be CBR (for CBR pass1) or VBR (for pass2)
-     * - encoding: Set by user; unused for constant quantizer encoding.
-     * - decoding: unused
-     */
-    int bit_rate_tolerance;
-
-    /**
-     * CODEC_FLAG_*.
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int flags;
-
-    /**
-     * Some codecs need additional format info. It is stored here.
-     * If any muxer uses this then ALL demuxers/parsers AND encoders for the
-     * specific codec MUST set it correctly otherwise stream copy breaks.
-     * In general use of this field by muxers is not recommanded.
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by libavcodec. (FIXME: Is this OK?)
-     */
-    int sub_id;
-
-    /**
-     * Motion estimation algorithm used for video coding.
-     * 1 (zero), 2 (full), 3 (log), 4 (phods), 5 (epzs), 6 (x1), 7 (hex),
-     * 8 (umh), 9 (iter), 10 (tesa) [7, 8, 10 are x264 specific, 9 is snow specific]
-     * - encoding: MUST be set by user.
-     * - decoding: unused
-     */
-    int me_method;
-
-    /**
-     * some codecs need / can use extradata like Huffman tables.
-     * mjpeg: Huffman tables
-     * rv10: additional flags
-     * mpeg4: global headers (they can be in the bitstream or here)
-     * The allocated memory should be FF_INPUT_BUFFER_PADDING_SIZE bytes larger
-     * than extradata_size to avoid prolems if it is read with the bitstream reader.
-     * The bytewise contents of extradata must not depend on the architecture or CPU endianness.
-     * - encoding: Set/allocated/freed by libavcodec.
-     * - decoding: Set/allocated/freed by user.
-     */
-    uint8_t *extradata;
-    int extradata_size;
-
-    /**
-     * This is the fundamental unit of time (in seconds) in terms
-     * of which frame timestamps are represented. For fixed-fps content,
-     * timebase should be 1/framerate and timestamp increments should be
-     * identically 1.
-     * - encoding: MUST be set by user.
-     * - decoding: Set by libavcodec.
-     */
-    AVRational time_base;
-
-    /* video only */
-    /**
-     * picture width / height.
-     * - encoding: MUST be set by user.
-     * - decoding: Set by libavcodec.
-     * Note: For compatibility it is possible to set this instead of
-     * coded_width/height before decoding.
-     */
-    int width, height;
-
-#define FF_ASPECT_EXTENDED 15
-
-    /**
-     * the number of pictures in a group of pictures, or 0 for intra_only
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int gop_size;
-
-    /**
-     * Pixel format, see PIX_FMT_xxx.
-     * May be set by the demuxer if known from headers.
-     * May be overriden by the decoder if it knows better.
-     * - encoding: Set by user.
-     * - decoding: Set by user if known, overridden by libavcodec if known
-     */
-    enum PixelFormat pix_fmt;
-
-    /**
-     * Frame rate emulation. If not zero, the lower layer (i.e. format handler)
-     * has to read frames at native frame rate.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int rate_emu;
-
-    /**
-     * If non NULL, 'draw_horiz_band' is called by the libavcodec
-     * decoder to draw a horizontal band. It improves cache usage. Not
-     * all codecs can do that. You must check the codec capabilities
-     * beforehand.
-     * The function is also used by hardware acceleration APIs.
-     * It is called at least once during frame decoding to pass
-     * the data needed for hardware render.
-     * In that mode instead of pixel data, AVFrame points to
-     * a structure specific to the acceleration API. The application
-     * reads the structure and can change some fields to indicate progress
-     * or mark state.
-     * - encoding: unused
-     * - decoding: Set by user.
-     * @param height the height of the slice
-     * @param y the y position of the slice
-     * @param type 1->top field, 2->bottom field, 3->frame
-     * @param offset offset into the AVFrame.data from which the slice should be read
-     */
-    void (*draw_horiz_band)(struct AVCodecContext *s,
-                            const AVFrame *src, int offset[4],
-                            int y, int type, int height);
-
-    /* audio only */
-    int sample_rate; ///< samples per second
-    int channels;    ///< number of audio channels
-
-    /**
-     * audio sample format
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    enum SampleFormat sample_fmt;  ///< sample format
-
-    /* The following data should not be initialized. */
-    /**
-     * Samples per packet, initialized when calling 'init'.
-     */
-    int frame_size;
-    int frame_number;   ///< audio or video frame number
-#if LIBAVCODEC_VERSION_MAJOR < 53
-    int real_pict_num;  ///< Returns the real picture number of previous encoded frame.
-#endif
-
-    /**
-     * Number of frames the decoded output will be delayed relative to
-     * the encoded input.
-     * - encoding: Set by libavcodec.
-     * - decoding: unused
-     */
-    int delay;
-
-    /* - encoding parameters */
-    float qcompress;  ///< amount of qscale change between easy & hard scenes (0.0-1.0)
-    float qblur;      ///< amount of qscale smoothing over time (0.0-1.0)
-
-    /**
-     * minimum quantizer
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int qmin;
-
-    /**
-     * maximum quantizer
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int qmax;
-
-    /**
-     * maximum quantizer difference between frames
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int max_qdiff;
-
-    /**
-     * maximum number of B-frames between non-B-frames
-     * Note: The output will be delayed by max_b_frames+1 relative to the input.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int max_b_frames;
-
-    /**
-     * qscale factor between IP and B-frames
-     * If > 0 then the last P-frame quantizer will be used (q= lastp_q*factor+offset).
-     * If < 0 then normal ratecontrol will be done (q= -normal_q*factor+offset).
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float b_quant_factor;
-
-    /** obsolete FIXME remove */
-    int rc_strategy;
-#define FF_RC_STRATEGY_XVID 1
-
-    int b_frame_strategy;
-
-    /**
-     * hurry up amount
-     * - encoding: unused
-     * - decoding: Set by user. 1-> Skip B-frames, 2-> Skip IDCT/dequant too, 5-> Skip everything except header
-     * @deprecated Deprecated in favor of skip_idct and skip_frame.
-     */
-    int hurry_up;
-
-    struct AVCodec *codec;
-
-    void *priv_data;
-
-    int rtp_payload_size;   /* The size of the RTP payload: the coder will  */
-                            /* do its best to deliver a chunk with size     */
-                            /* below rtp_payload_size, the chunk will start */
-                            /* with a start code on some codecs like H.263. */
-                            /* This doesn't take account of any particular  */
-                            /* headers inside the transmitted RTP payload.  */
-
-
-    /* The RTP callback: This function is called    */
-    /* every time the encoder has a packet to send. */
-    /* It depends on the encoder if the data starts */
-    /* with a Start Code (it should). H.263 does.   */
-    /* mb_nb contains the number of macroblocks     */
-    /* encoded in the RTP payload.                  */
-    void (*rtp_callback)(struct AVCodecContext *avctx, void *data, int size, int mb_nb);
-
-    /* statistics, used for 2-pass encoding */
-    int mv_bits;
-    int header_bits;
-    int i_tex_bits;
-    int p_tex_bits;
-    int i_count;
-    int p_count;
-    int skip_count;
-    int misc_bits;
-
-    /**
-     * number of bits used for the previously encoded frame
-     * - encoding: Set by libavcodec.
-     * - decoding: unused
-     */
-    int frame_bits;
-
-    /**
-     * Private data of the user, can be used to carry app specific stuff.
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    void *opaque;
-
-    char codec_name[32];
-    enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */
-    enum CodecID codec_id; /* see CODEC_ID_xxx */
-
-    /**
-     * fourcc (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').
-     * This is used to work around some encoder bugs.
-     * A demuxer should set this to what is stored in the field used to identify the codec.
-     * If there are multiple such fields in a container then the demuxer should choose the one
-     * which maximizes the information about the used codec.
-     * If the codec tag field in a container is larger then 32 bits then the demuxer should
-     * remap the longer ID to 32 bits with a table or other structure. Alternatively a new
-     * extra_codec_tag + size could be added but for this a clear advantage must be demonstrated
-     * first.
-     * - encoding: Set by user, if not then the default based on codec_id will be used.
-     * - decoding: Set by user, will be converted to uppercase by libavcodec during init.
-     */
-    unsigned int codec_tag;
-
-    /**
-     * Work around bugs in encoders which sometimes cannot be detected automatically.
-     * - encoding: Set by user
-     * - decoding: Set by user
-     */
-    int workaround_bugs;
-#define FF_BUG_AUTODETECT       1  ///< autodetection
-#define FF_BUG_OLD_MSMPEG4      2
-#define FF_BUG_XVID_ILACE       4
-#define FF_BUG_UMP4             8
-#define FF_BUG_NO_PADDING       16
-#define FF_BUG_AMV              32
-#define FF_BUG_AC_VLC           0  ///< Will be removed, libavcodec can now handle these non-compliant files by default.
-#define FF_BUG_QPEL_CHROMA      64
-#define FF_BUG_STD_QPEL         128
-#define FF_BUG_QPEL_CHROMA2     256
-#define FF_BUG_DIRECT_BLOCKSIZE 512
-#define FF_BUG_EDGE             1024
-#define FF_BUG_HPEL_CHROMA      2048
-#define FF_BUG_DC_CLIP          4096
-#define FF_BUG_MS               8192 ///< Work around various bugs in Microsoft's broken decoders.
-#define FF_BUG_TRUNCATED       16384
-//#define FF_BUG_FAKE_SCALABILITY 16 //Autodetection should work 100%.
-
-    /**
-     * luma single coefficient elimination threshold
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int luma_elim_threshold;
-
-    /**
-     * chroma single coeff elimination threshold
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int chroma_elim_threshold;
-
-    /**
-     * strictly follow the standard (MPEG4, ...).
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     * Setting this to STRICT or higher means the encoder and decoder will
-     * generally do stupid things, whereas setting it to unofficial or lower
-     * will mean the encoder might produce output that is not supported by all
-     * spec-compliant decoders. Decoders don't differentiate between normal,
-     * unofficial and experimental (that is, they always try to decode things
-     * when they can) unless they are explicitly asked to behave stupidly
-     * (=strictly conform to the specs)
-     */
-    int strict_std_compliance;
-#define FF_COMPLIANCE_VERY_STRICT   2 ///< Strictly conform to an older more strict version of the spec or reference software.
-#define FF_COMPLIANCE_STRICT        1 ///< Strictly conform to all the things in the spec no matter what consequences.
-#define FF_COMPLIANCE_NORMAL        0
-#if FF_API_INOFFICIAL
-#define FF_COMPLIANCE_INOFFICIAL   -1 ///< Allow inofficial extensions (deprecated - use FF_COMPLIANCE_UNOFFICIAL instead).
-#endif
-#define FF_COMPLIANCE_UNOFFICIAL   -1 ///< Allow unofficial extensions
-#define FF_COMPLIANCE_EXPERIMENTAL -2 ///< Allow nonstandardized experimental things.
-
-    /**
-     * qscale offset between IP and B-frames
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float b_quant_offset;
-
-    /**
-     * Error recognization; higher values will detect more errors but may
-     * misdetect some more or less valid parts as errors.
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int error_recognition;
-#define FF_ER_CAREFUL         1
-#define FF_ER_COMPLIANT       2
-#define FF_ER_AGGRESSIVE      3
-#define FF_ER_VERY_AGGRESSIVE 4
-
-    /**
-     * Called at the beginning of each frame to get a buffer for it.
-     * If pic.reference is set then the frame will be read later by libavcodec.
-     * avcodec_align_dimensions2() should be used to find the required width and
-     * height, as they normally need to be rounded up to the next multiple of 16.
-     * if CODEC_CAP_DR1 is not set then get_buffer() must call
-     * avcodec_default_get_buffer() instead of providing buffers allocated by
-     * some other means.
-     * - encoding: unused
-     * - decoding: Set by libavcodec, user can override.
-     */
-    int (*get_buffer)(struct AVCodecContext *c, AVFrame *pic);
-
-    /**
-     * Called to release buffers which were allocated with get_buffer.
-     * A released buffer can be reused in get_buffer().
-     * pic.data[*] must be set to NULL.
-     * - encoding: unused
-     * - decoding: Set by libavcodec, user can override.
-     */
-    void (*release_buffer)(struct AVCodecContext *c, AVFrame *pic);
-
-    /**
-     * Size of the frame reordering buffer in the decoder.
-     * For MPEG-2 it is 1 IPB or 0 low delay IP.
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by libavcodec.
-     */
-    int has_b_frames;
-
-    /**
-     * number of bytes per packet if constant and known or 0
-     * Used by some WAV based audio codecs.
-     */
-    int block_align;
-
-    int parse_only; /* - decoding only: If true, only parsing is done
-                       (function avcodec_parse_frame()). The frame
-                       data is returned. Only MPEG codecs support this now. */
-
-    /**
-     * 0-> h263 quant 1-> mpeg quant
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mpeg_quant;
-
-    /**
-     * pass1 encoding statistics output buffer
-     * - encoding: Set by libavcodec.
-     * - decoding: unused
-     */
-    char *stats_out;
-
-    /**
-     * pass2 encoding statistics input buffer
-     * Concatenated stuff from stats_out of pass1 should be placed here.
-     * - encoding: Allocated/set/freed by user.
-     * - decoding: unused
-     */
-    char *stats_in;
-
-    /**
-     * ratecontrol qmin qmax limiting method
-     * 0-> clipping, 1-> use a nice continous function to limit qscale wthin qmin/qmax.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float rc_qsquish;
-
-    float rc_qmod_amp;
-    int rc_qmod_freq;
-
-    /**
-     * ratecontrol override, see RcOverride
-     * - encoding: Allocated/set/freed by user.
-     * - decoding: unused
-     */
-    RcOverride *rc_override;
-    int rc_override_count;
-
-    /**
-     * rate control equation
-     * - encoding: Set by user
-     * - decoding: unused
-     */
-    const char *rc_eq;
-
-    /**
-     * maximum bitrate
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int rc_max_rate;
-
-    /**
-     * minimum bitrate
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int rc_min_rate;
-
-    /**
-     * decoder bitstream buffer size
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int rc_buffer_size;
-    float rc_buffer_aggressivity;
-
-    /**
-     * qscale factor between P and I-frames
-     * If > 0 then the last p frame quantizer will be used (q= lastp_q*factor+offset).
-     * If < 0 then normal ratecontrol will be done (q= -normal_q*factor+offset).
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float i_quant_factor;
-
-    /**
-     * qscale offset between P and I-frames
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float i_quant_offset;
-
-    /**
-     * initial complexity for pass1 ratecontrol
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float rc_initial_cplx;
-
-    /**
-     * DCT algorithm, see FF_DCT_* below
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int dct_algo;
-#define FF_DCT_AUTO    0
-#define FF_DCT_FASTINT 1
-#define FF_DCT_INT     2
-#define FF_DCT_MMX     3
-#define FF_DCT_MLIB    4
-#define FF_DCT_ALTIVEC 5
-#define FF_DCT_FAAN    6
-
-    /**
-     * luminance masking (0-> disabled)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float lumi_masking;
-
-    /**
-     * temporary complexity masking (0-> disabled)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float temporal_cplx_masking;
-
-    /**
-     * spatial complexity masking (0-> disabled)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float spatial_cplx_masking;
-
-    /**
-     * p block masking (0-> disabled)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float p_masking;
-
-    /**
-     * darkness masking (0-> disabled)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float dark_masking;
-
-    /**
-     * IDCT algorithm, see FF_IDCT_* below.
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int idct_algo;
-#define FF_IDCT_AUTO          0
-#define FF_IDCT_INT           1
-#define FF_IDCT_SIMPLE        2
-#define FF_IDCT_SIMPLEMMX     3
-#define FF_IDCT_LIBMPEG2MMX   4
-#define FF_IDCT_PS2           5
-#define FF_IDCT_MLIB          6
-#define FF_IDCT_ARM           7
-#define FF_IDCT_ALTIVEC       8
-#define FF_IDCT_SH4           9
-#define FF_IDCT_SIMPLEARM     10
-#define FF_IDCT_H264          11
-#define FF_IDCT_VP3           12
-#define FF_IDCT_IPP           13
-#define FF_IDCT_XVIDMMX       14
-#define FF_IDCT_CAVS          15
-#define FF_IDCT_SIMPLEARMV5TE 16
-#define FF_IDCT_SIMPLEARMV6   17
-#define FF_IDCT_SIMPLEVIS     18
-#define FF_IDCT_WMV2          19
-#define FF_IDCT_FAAN          20
-#define FF_IDCT_EA            21
-#define FF_IDCT_SIMPLENEON    22
-#define FF_IDCT_SIMPLEALPHA   23
-#define FF_IDCT_BINK          24
-
-    /**
-     * slice count
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by user (or 0).
-     */
-    int slice_count;
-    /**
-     * slice offsets in the frame in bytes
-     * - encoding: Set/allocated by libavcodec.
-     * - decoding: Set/allocated by user (or NULL).
-     */
-    int *slice_offset;
-
-    /**
-     * error concealment flags
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int error_concealment;
-#define FF_EC_GUESS_MVS   1
-#define FF_EC_DEBLOCK     2
-
-    /**
-     * dsp_mask could be add used to disable unwanted CPU features
-     * CPU features (i.e. MMX, SSE. ...)
-     *
-     * With the FORCE flag you may instead enable given CPU features.
-     * (Dangerous: Usable in case of misdetection, improper usage however will
-     * result into program crash.)
-     */
-    unsigned dsp_mask;
-
-#if FF_API_MM_FLAGS
-#define FF_MM_FORCE      AV_CPU_FLAG_FORCE
-#define FF_MM_MMX        AV_CPU_FLAG_MMX
-#define FF_MM_3DNOW      AV_CPU_FLAG_3DNOW
-#define FF_MM_MMXEXT     AV_CPU_FLAG_MMX2
-#define FF_MM_MMX2       AV_CPU_FLAG_MMX2
-#define FF_MM_SSE        AV_CPU_FLAG_SSE
-#define FF_MM_SSE2       AV_CPU_FLAG_SSE2
-#define FF_MM_SSE2SLOW   AV_CPU_FLAG_SSE2SLOW
-#define FF_MM_3DNOWEXT   AV_CPU_FLAG_3DNOWEXT
-#define FF_MM_SSE3       AV_CPU_FLAG_SSE3
-#define FF_MM_SSE3SLOW   AV_CPU_FLAG_SSE3SLOW
-#define FF_MM_SSSE3      AV_CPU_FLAG_SSSE3
-#define FF_MM_SSE4       AV_CPU_FLAG_SSE4
-#define FF_MM_SSE42      AV_CPU_FLAG_SSE42
-#define FF_MM_IWMMXT     AV_CPU_FLAG_IWMMXT
-#define FF_MM_ALTIVEC    AV_CPU_FLAG_ALTIVEC
-#endif
-
-    /**
-     * bits per sample/pixel from the demuxer (needed for huffyuv).
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by user.
-     */
-     int bits_per_coded_sample;
-
-    /**
-     * prediction method (needed for huffyuv)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-     int prediction_method;
-#define FF_PRED_LEFT   0
-#define FF_PRED_PLANE  1
-#define FF_PRED_MEDIAN 2
-
-    /**
-     * sample aspect ratio (0 if unknown)
-     * That is the width of a pixel divided by the height of the pixel.
-     * Numerator and denominator must be relatively prime and smaller than 256 for some video standards.
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    AVRational sample_aspect_ratio;
-
-    /**
-     * the picture in the bitstream
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by libavcodec.
-     */
-    AVFrame *coded_frame;
-
-    /**
-     * debug
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int debug;
-#define FF_DEBUG_PICT_INFO   1
-#define FF_DEBUG_RC          2
-#define FF_DEBUG_BITSTREAM   4
-#define FF_DEBUG_MB_TYPE     8
-#define FF_DEBUG_QP          16
-#define FF_DEBUG_MV          32
-#define FF_DEBUG_DCT_COEFF   0x00000040
-#define FF_DEBUG_SKIP        0x00000080
-#define FF_DEBUG_STARTCODE   0x00000100
-#define FF_DEBUG_PTS         0x00000200
-#define FF_DEBUG_ER          0x00000400
-#define FF_DEBUG_MMCO        0x00000800
-#define FF_DEBUG_BUGS        0x00001000
-#define FF_DEBUG_VIS_QP      0x00002000
-#define FF_DEBUG_VIS_MB_TYPE 0x00004000
-#define FF_DEBUG_BUFFERS     0x00008000
-
-    /**
-     * debug
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int debug_mv;
-#define FF_DEBUG_VIS_MV_P_FOR  0x00000001 //visualize forward predicted MVs of P frames
-#define FF_DEBUG_VIS_MV_B_FOR  0x00000002 //visualize forward predicted MVs of B frames
-#define FF_DEBUG_VIS_MV_B_BACK 0x00000004 //visualize backward predicted MVs of B frames
-
-    /**
-     * error
-     * - encoding: Set by libavcodec if flags&CODEC_FLAG_PSNR.
-     * - decoding: unused
-     */
-    uint64_t error[4];
-
-    /**
-     * minimum MB quantizer
-     * - encoding: unused
-     * - decoding: unused
-     */
-    int mb_qmin;
-
-    /**
-     * maximum MB quantizer
-     * - encoding: unused
-     * - decoding: unused
-     */
-    int mb_qmax;
-
-    /**
-     * motion estimation comparison function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_cmp;
-    /**
-     * subpixel motion estimation comparison function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_sub_cmp;
-    /**
-     * macroblock comparison function (not supported yet)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mb_cmp;
-    /**
-     * interlaced DCT comparison function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int ildct_cmp;
-#define FF_CMP_SAD    0
-#define FF_CMP_SSE    1
-#define FF_CMP_SATD   2
-#define FF_CMP_DCT    3
-#define FF_CMP_PSNR   4
-#define FF_CMP_BIT    5
-#define FF_CMP_RD     6
-#define FF_CMP_ZERO   7
-#define FF_CMP_VSAD   8
-#define FF_CMP_VSSE   9
-#define FF_CMP_NSSE   10
-#define FF_CMP_W53    11
-#define FF_CMP_W97    12
-#define FF_CMP_DCTMAX 13
-#define FF_CMP_DCT264 14
-#define FF_CMP_CHROMA 256
-
-    /**
-     * ME diamond size & shape
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int dia_size;
-
-    /**
-     * amount of previous MV predictors (2a+1 x 2a+1 square)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int last_predictor_count;
-
-    /**
-     * prepass for motion estimation
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int pre_me;
-
-    /**
-     * motion estimation prepass comparison function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_pre_cmp;
-
-    /**
-     * ME prepass diamond size & shape
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int pre_dia_size;
-
-    /**
-     * subpel ME quality
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_subpel_quality;
-
-    /**
-     * callback to negotiate the pixelFormat
-     * @param fmt is the list of formats which are supported by the codec,
-     * it is terminated by -1 as 0 is a valid format, the formats are ordered by quality.
-     * The first is always the native one.
-     * @return the chosen format
-     * - encoding: unused
-     * - decoding: Set by user, if not set the native format will be chosen.
-     */
-    enum PixelFormat (*get_format)(struct AVCodecContext *s, const enum PixelFormat * fmt);
-
-    /**
-     * DTG active format information (additional aspect ratio
-     * information only used in DVB MPEG-2 transport streams)
-     * 0 if not set.
-     *
-     * - encoding: unused
-     * - decoding: Set by decoder.
-     */
-    int dtg_active_format;
-#define FF_DTG_AFD_SAME         8
-#define FF_DTG_AFD_4_3          9
-#define FF_DTG_AFD_16_9         10
-#define FF_DTG_AFD_14_9         11
-#define FF_DTG_AFD_4_3_SP_14_9  13
-#define FF_DTG_AFD_16_9_SP_14_9 14
-#define FF_DTG_AFD_SP_4_3       15
-
-    /**
-     * maximum motion estimation search range in subpel units
-     * If 0 then no limit.
-     *
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_range;
-
-    /**
-     * intra quantizer bias
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int intra_quant_bias;
-#define FF_DEFAULT_QUANT_BIAS 999999
-
-    /**
-     * inter quantizer bias
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int inter_quant_bias;
-
-    /**
-     * color table ID
-     * - encoding: unused
-     * - decoding: Which clrtable should be used for 8bit RGB images.
-     *             Tables have to be stored somewhere. FIXME
-     */
-    int color_table_id;
-
-    /**
-     * internal_buffer count
-     * Don't touch, used by libavcodec default_get_buffer().
-     */
-    int internal_buffer_count;
-
-    /**
-     * internal_buffers
-     * Don't touch, used by libavcodec default_get_buffer().
-     */
-    void *internal_buffer;
-
-    /**
-     * Global quality for codecs which cannot change it per frame.
-     * This should be proportional to MPEG-1/2/4 qscale.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int global_quality;
-
-#define FF_CODER_TYPE_VLC       0
-#define FF_CODER_TYPE_AC        1
-#define FF_CODER_TYPE_RAW       2
-#define FF_CODER_TYPE_RLE       3
-#define FF_CODER_TYPE_DEFLATE   4
-    /**
-     * coder type
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int coder_type;
-
-    /**
-     * context model
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int context_model;
-#if 0
-    /**
-     *
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    uint8_t * (*realloc)(struct AVCodecContext *s, uint8_t *buf, int buf_size);
-#endif
-
-    /**
-     * slice flags
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int slice_flags;
-#define SLICE_FLAG_CODED_ORDER    0x0001 ///< draw_horiz_band() is called in coded order instead of display
-#define SLICE_FLAG_ALLOW_FIELD    0x0002 ///< allow draw_horiz_band() with field slices (MPEG2 field pics)
-#define SLICE_FLAG_ALLOW_PLANE    0x0004 ///< allow draw_horiz_band() with 1 component at a time (SVQ1)
-
-    /**
-     * XVideo Motion Acceleration
-     * - encoding: forbidden
-     * - decoding: set by decoder
-     */
-    int xvmc_acceleration;
-
-    /**
-     * macroblock decision mode
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mb_decision;
-#define FF_MB_DECISION_SIMPLE 0        ///< uses mb_cmp
-#define FF_MB_DECISION_BITS   1        ///< chooses the one which needs the fewest bits
-#define FF_MB_DECISION_RD     2        ///< rate distortion
-
-    /**
-     * custom intra quantization matrix
-     * - encoding: Set by user, can be NULL.
-     * - decoding: Set by libavcodec.
-     */
-    uint16_t *intra_matrix;
-
-    /**
-     * custom inter quantization matrix
-     * - encoding: Set by user, can be NULL.
-     * - decoding: Set by libavcodec.
-     */
-    uint16_t *inter_matrix;
-
-    /**
-     * fourcc from the AVI stream header (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').
-     * This is used to work around some encoder bugs.
-     * - encoding: unused
-     * - decoding: Set by user, will be converted to uppercase by libavcodec during init.
-     */
-    unsigned int stream_codec_tag;
-
-    /**
-     * scene change detection threshold
-     * 0 is default, larger means fewer detected scene changes.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int scenechange_threshold;
-
-    /**
-     * minimum Lagrange multipler
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int lmin;
-
-    /**
-     * maximum Lagrange multipler
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int lmax;
-
-#if FF_API_PALETTE_CONTROL
-    /**
-     * palette control structure
-     * - encoding: ??? (no palette-enabled encoder yet)
-     * - decoding: Set by user.
-     */
-    struct AVPaletteControl *palctrl;
-#endif
-
-    /**
-     * noise reduction strength
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int noise_reduction;
-
-    /**
-     * Called at the beginning of a frame to get cr buffer for it.
-     * Buffer type (size, hints) must be the same. libavcodec won't check it.
-     * libavcodec will pass previous buffer in pic, function should return
-     * same buffer or new buffer with old frame "painted" into it.
-     * If pic.data[0] == NULL must behave like get_buffer().
-     * if CODEC_CAP_DR1 is not set then reget_buffer() must call
-     * avcodec_default_reget_buffer() instead of providing buffers allocated by
-     * some other means.
-     * - encoding: unused
-     * - decoding: Set by libavcodec, user can override.
-     */
-    int (*reget_buffer)(struct AVCodecContext *c, AVFrame *pic);
-
-    /**
-     * Number of bits which should be loaded into the rc buffer before decoding starts.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int rc_initial_buffer_occupancy;
-
-    /**
-     *
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int inter_threshold;
-
-    /**
-     * CODEC_FLAG2_*
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int flags2;
-
-    /**
-     * Simulates errors in the bitstream to test error concealment.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int error_rate;
-
-    /**
-     * MP3 antialias algorithm, see FF_AA_* below.
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int antialias_algo;
-#define FF_AA_AUTO    0
-#define FF_AA_FASTINT 1 //not implemented yet
-#define FF_AA_INT     2
-#define FF_AA_FLOAT   3
-    /**
-     * quantizer noise shaping
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int quantizer_noise_shaping;
-
-    /**
-     * thread count
-     * is used to decide how many independent tasks should be passed to execute()
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int thread_count;
-
-    /**
-     * The codec may call this to execute several independent things.
-     * It will return only after finishing all tasks.
-     * The user may replace this with some multithreaded implementation,
-     * the default implementation will execute the parts serially.
-     * @param count the number of things to execute
-     * - encoding: Set by libavcodec, user can override.
-     * - decoding: Set by libavcodec, user can override.
-     */
-    int (*execute)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg), void *arg2, int *ret, int count, int size);
-
-    /**
-     * thread opaque
-     * Can be used by execute() to store some per AVCodecContext stuff.
-     * - encoding: set by execute()
-     * - decoding: set by execute()
-     */
-    void *thread_opaque;
-
-    /**
-     * Motion estimation threshold below which no motion estimation is
-     * performed, but instead the user specified motion vectors are used.
-     *
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-     int me_threshold;
-
-    /**
-     * Macroblock threshold below which the user specified macroblock types will be used.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-     int mb_threshold;
-
-    /**
-     * precision of the intra DC coefficient - 8
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-     int intra_dc_precision;
-
-    /**
-     * noise vs. sse weight for the nsse comparsion function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-     int nsse_weight;
-
-    /**
-     * Number of macroblock rows at the top which are skipped.
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-     int skip_top;
-
-    /**
-     * Number of macroblock rows at the bottom which are skipped.
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-     int skip_bottom;
-
-    /**
-     * profile
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-     int profile;
-#define FF_PROFILE_UNKNOWN -99
-
-#define FF_PROFILE_AAC_MAIN 0
-#define FF_PROFILE_AAC_LOW  1
-#define FF_PROFILE_AAC_SSR  2
-#define FF_PROFILE_AAC_LTP  3
-
-#define FF_PROFILE_H264_BASELINE    66
-#define FF_PROFILE_H264_MAIN        77
-#define FF_PROFILE_H264_EXTENDED    88
-#define FF_PROFILE_H264_HIGH        100
-#define FF_PROFILE_H264_HIGH_10     110
-#define FF_PROFILE_H264_HIGH_422    122
-#define FF_PROFILE_H264_HIGH_444    244
-#define FF_PROFILE_H264_CAVLC_444   44
-
-    /**
-     * level
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-     int level;
-#define FF_LEVEL_UNKNOWN -99
-
-    /**
-     * low resolution decoding, 1-> 1/2 size, 2->1/4 size
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-     int lowres;
-
-    /**
-     * Bitstream width / height, may be different from width/height if lowres
-     * or other things are used.
-     * - encoding: unused
-     * - decoding: Set by user before init if known. Codec should override / dynamically change if needed.
-     */
-    int coded_width, coded_height;
-
-    /**
-     * frame skip threshold
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int frame_skip_threshold;
-
-    /**
-     * frame skip factor
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int frame_skip_factor;
-
-    /**
-     * frame skip exponent
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int frame_skip_exp;
-
-    /**
-     * frame skip comparison function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int frame_skip_cmp;
-
-    /**
-     * Border processing masking, raises the quantizer for mbs on the borders
-     * of the picture.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float border_masking;
-
-    /**
-     * minimum MB lagrange multipler
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mb_lmin;
-
-    /**
-     * maximum MB lagrange multipler
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mb_lmax;
-
-    /**
-     *
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_penalty_compensation;
-
-    /**
-     *
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    enum AVDiscard skip_loop_filter;
-
-    /**
-     *
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    enum AVDiscard skip_idct;
-
-    /**
-     *
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    enum AVDiscard skip_frame;
-
-    /**
-     *
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int bidir_refine;
-
-    /**
-     *
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int brd_scale;
-
-    /**
-     * constant rate factor - quality-based VBR - values ~correspond to qps
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float crf;
-
-    /**
-     * constant quantization parameter rate control method
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int cqp;
-
-    /**
-     * minimum GOP size
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int keyint_min;
-
-    /**
-     * number of reference frames
-     * - encoding: Set by user.
-     * - decoding: Set by lavc.
-     */
-    int refs;
-
-    /**
-     * chroma qp offset from luma
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int chromaoffset;
-
-    /**
-     * Influences how often B-frames are used.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int bframebias;
-
-    /**
-     * trellis RD quantization
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int trellis;
-
-    /**
-     * Reduce fluctuations in qp (before curve compression).
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float complexityblur;
-
-    /**
-     * in-loop deblocking filter alphac0 parameter
-     * alpha is in the range -6...6
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int deblockalpha;
-
-    /**
-     * in-loop deblocking filter beta parameter
-     * beta is in the range -6...6
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int deblockbeta;
-
-    /**
-     * macroblock subpartition sizes to consider - p8x8, p4x4, b8x8, i8x8, i4x4
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int partitions;
-#define X264_PART_I4X4 0x001  /* Analyze i4x4 */
-#define X264_PART_I8X8 0x002  /* Analyze i8x8 (requires 8x8 transform) */
-#define X264_PART_P8X8 0x010  /* Analyze p16x8, p8x16 and p8x8 */
-#define X264_PART_P4X4 0x020  /* Analyze p8x4, p4x8, p4x4 */
-#define X264_PART_B8X8 0x100  /* Analyze b16x8, b8x16 and b8x8 */
-
-    /**
-     * direct MV prediction mode - 0 (none), 1 (spatial), 2 (temporal), 3 (auto)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int directpred;
-
-    /**
-     * Audio cutoff bandwidth (0 means "automatic")
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int cutoff;
-
-    /**
-     * Multiplied by qscale for each frame and added to scene_change_score.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int scenechange_factor;
-
-    /**
-     *
-     * Note: Value depends upon the compare function used for fullpel ME.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mv0_threshold;
-
-    /**
-     * Adjusts sensitivity of b_frame_strategy 1.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int b_sensitivity;
-
-    /**
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int compression_level;
-#define FF_COMPRESSION_DEFAULT -1
-
-#if FF_API_USE_LPC
-    /**
-     * Sets whether to use LPC mode - used by FLAC encoder.
-     * - encoding: Set by user.
-     * - decoding: unused
-     * @deprecated Deprecated in favor of lpc_type and lpc_passes.
-     */
-    int use_lpc;
-#endif
-
-    /**
-     * LPC coefficient precision - used by FLAC encoder
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int lpc_coeff_precision;
-
-    /**
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int min_prediction_order;
-
-    /**
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int max_prediction_order;
-
-    /**
-     * search method for selecting prediction order
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int prediction_order_method;
-
-    /**
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int min_partition_order;
-
-    /**
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int max_partition_order;
-
-    /**
-     * GOP timecode frame start number, in non drop frame format
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int64_t timecode_frame_start;
-
-#if LIBAVCODEC_VERSION_MAJOR < 53
-    /**
-     * Decoder should decode to this many channels if it can (0 for default)
-     * - encoding: unused
-     * - decoding: Set by user.
-     * @deprecated Deprecated in favor of request_channel_layout.
-     */
-    int request_channels;
-#endif
-
-    /**
-     * Percentage of dynamic range compression to be applied by the decoder.
-     * The default value is 1.0, corresponding to full compression.
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    float drc_scale;
-
-    /**
-     * opaque 64bit number (generally a PTS) that will be reordered and
-     * output in AVFrame.reordered_opaque
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int64_t reordered_opaque;
-
-    /**
-     * Bits per sample/pixel of internal libavcodec pixel/sample format.
-     * This field is applicable only when sample_fmt is SAMPLE_FMT_S32.
-     * - encoding: set by user.
-     * - decoding: set by libavcodec.
-     */
-    int bits_per_raw_sample;
-
-    /**
-     * Audio channel layout.
-     * - encoding: set by user.
-     * - decoding: set by libavcodec.
-     */
-    int64_t channel_layout;
-
-    /**
-     * Request decoder to use this channel layout if it can (0 for default)
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int64_t request_channel_layout;
-
-    /**
-     * Ratecontrol attempt to use, at maximum, <value> of what can be used without an underflow.
-     * - encoding: Set by user.
-     * - decoding: unused.
-     */
-    float rc_max_available_vbv_use;
-
-    /**
-     * Ratecontrol attempt to use, at least, <value> times the amount needed to prevent a vbv overflow.
-     * - encoding: Set by user.
-     * - decoding: unused.
-     */
-    float rc_min_vbv_overflow_use;
-
-    /**
-     * Hardware accelerator in use
-     * - encoding: unused.
-     * - decoding: Set by libavcodec
-     */
-    struct AVHWAccel *hwaccel;
-
-    /**
-     * For some codecs, the time base is closer to the field rate than the frame rate.
-     * Most notably, H.264 and MPEG-2 specify time_base as half of frame duration
-     * if no telecine is used ...
-     *
-     * Set to time_base ticks per frame. Default 1, e.g., H.264/MPEG-2 set it to 2.
-     */
-    int ticks_per_frame;
-
-    /**
-     * Hardware accelerator context.
-     * For some hardware accelerators, a global context needs to be
-     * provided by the user. In that case, this holds display-dependent
-     * data FFmpeg cannot instantiate itself. Please refer to the
-     * FFmpeg HW accelerator documentation to know how to fill this
-     * is. e.g. for VA API, this is a struct vaapi_context.
-     * - encoding: unused
-     * - decoding: Set by user
-     */
-    void *hwaccel_context;
-
-    /**
-     * Chromaticity coordinates of the source primaries.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
-     */
-    enum AVColorPrimaries color_primaries;
-
-    /**
-     * Color Transfer Characteristic.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
-     */
-    enum AVColorTransferCharacteristic color_trc;
-
-    /**
-     * YUV colorspace type.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
-     */
-    enum AVColorSpace colorspace;
-
-    /**
-     * MPEG vs JPEG YUV range.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
-     */
-    enum AVColorRange color_range;
-
-    /**
-     * This defines the location of chroma samples.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
-     */
-    enum AVChromaLocation chroma_sample_location;
-
-    /**
-     * The codec may call this to execute several independent things.
-     * It will return only after finishing all tasks.
-     * The user may replace this with some multithreaded implementation,
-     * the default implementation will execute the parts serially.
-     * Also see avcodec_thread_init and e.g. the --enable-pthread configure option.
-     * @param c context passed also to func
-     * @param count the number of things to execute
-     * @param arg2 argument passed unchanged to func
-     * @param ret return values of executed functions, must have space for "count" values. May be NULL.
-     * @param func function that will be called count times, with jobnr from 0 to count-1.
-     *             threadnr will be in the range 0 to c->thread_count-1 < MAX_THREADS and so that no
-     *             two instances of func executing at the same time will have the same threadnr.
-     * @return always 0 currently, but code should handle a future improvement where when any call to func
-     *         returns < 0 no further calls to func may be done and < 0 is returned.
-     * - encoding: Set by libavcodec, user can override.
-     * - decoding: Set by libavcodec, user can override.
-     */
-    int (*execute2)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg, int jobnr, int threadnr), void *arg2, int *ret, int count);
-
-    /**
-     * explicit P-frame weighted prediction analysis method
-     * 0: off
-     * 1: fast blind weighting (one reference duplicate with -1 offset)
-     * 2: smart weighting (full fade detection analysis)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int weighted_p_pred;
-
-    /**
-     * AQ mode
-     * 0: Disabled
-     * 1: Variance AQ (complexity mask)
-     * 2: Auto-variance AQ (experimental)
-     * - encoding: Set by user
-     * - decoding: unused
-     */
-    int aq_mode;
-
-    /**
-     * AQ strength
-     * Reduces blocking and blurring in flat and textured areas.
-     * - encoding: Set by user
-     * - decoding: unused
-     */
-    float aq_strength;
-
-    /**
-     * PSY RD
-     * Strength of psychovisual optimization
-     * - encoding: Set by user
-     * - decoding: unused
-     */
-    float psy_rd;
-
-    /**
-     * PSY trellis
-     * Strength of psychovisual optimization
-     * - encoding: Set by user
-     * - decoding: unused
-     */
-    float psy_trellis;
-
-    /**
-     * RC lookahead
-     * Number of frames for frametype and ratecontrol lookahead
-     * - encoding: Set by user
-     * - decoding: unused
-     */
-    int rc_lookahead;
-
-    /**
-     * Constant rate factor maximum
-     * With CRF encoding mode and VBV restrictions enabled, prevents quality from being worse
-     * than crf_max, even if doing so would violate VBV restrictions.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float crf_max;
-
-    int log_level_offset;
-
-    /**
-     * Determines which LPC analysis algorithm to use.
-     * - encoding: Set by user
-     * - decoding: unused
-     */
-    enum AVLPCType lpc_type;
-
-    /**
-     * Number of passes to use for Cholesky factorization during LPC analysis
-     * - encoding: Set by user
-     * - decoding: unused
-     */
-    int lpc_passes;
-} AVCodecContext;
-
-/**
- * AVCodec.
- */
-typedef struct AVCodec {
-    /**
-     * Name of the codec implementation.
-     * The name is globally unique among encoders and among decoders (but an
-     * encoder and a decoder can share the same name).
-     * This is the primary way to find a codec from the user perspective.
-     */
-    const char *name;
-    enum AVMediaType type;
-    enum CodecID id;
-    int priv_data_size;
-    int (*init)(AVCodecContext *);
-    int (*encode)(AVCodecContext *, uint8_t *buf, int buf_size, void *data);
-    int (*close)(AVCodecContext *);
-    int (*decode)(AVCodecContext *, void *outdata, int *outdata_size, AVPacket *avpkt);
-    /**
-     * Codec capabilities.
-     * see CODEC_CAP_*
-     */
-    int capabilities;
-    struct AVCodec *next;
-    /**
-     * Flush buffers.
-     * Will be called when seeking
-     */
-    void (*flush)(AVCodecContext *);
-    const AVRational *supported_framerates; ///< array of supported framerates, or NULL if any, array is terminated by {0,0}
-    const enum PixelFormat *pix_fmts;       ///< array of supported pixel formats, or NULL if unknown, array is terminated by -1
-    /**
-     * Descriptive name for the codec, meant to be more human readable than name.
-     * You should use the NULL_IF_CONFIG_SMALL() macro to define it.
-     */
-    const char *long_name;
-    const int *supported_samplerates;       ///< array of supported audio samplerates, or NULL if unknown, array is terminated by 0
-    const enum SampleFormat *sample_fmts;   ///< array of supported sample formats, or NULL if unknown, array is terminated by -1
-    const int64_t *channel_layouts;         ///< array of support channel layouts, or NULL if unknown. array is terminated by 0
-    uint8_t max_lowres;                     ///< maximum value for lowres supported by the decoder
-    AVClass *priv_class;                    ///< AVClass for the private context
-} AVCodec;
-
-/**
- * AVHWAccel.
- */
-typedef struct AVHWAccel {
-    /**
-     * Name of the hardware accelerated codec.
-     * The name is globally unique among encoders and among decoders (but an
-     * encoder and a decoder can share the same name).
-     */
-    const char *name;
-
-    /**
-     * Type of codec implemented by the hardware accelerator.
-     *
-     * See AVMEDIA_TYPE_xxx
-     */
-    enum AVMediaType type;
-
-    /**
-     * Codec implemented by the hardware accelerator.
-     *
-     * See CODEC_ID_xxx
-     */
-    enum CodecID id;
-
-    /**
-     * Supported pixel format.
-     *
-     * Only hardware accelerated formats are supported here.
-     */
-    enum PixelFormat pix_fmt;
-
-    /**
-     * Hardware accelerated codec capabilities.
-     * see FF_HWACCEL_CODEC_CAP_*
-     */
-    int capabilities;
-
-    struct AVHWAccel *next;
-
-    /**
-     * Called at the beginning of each frame or field picture.
-     *
-     * Meaningful frame information (codec specific) is guaranteed to
-     * be parsed at this point. This function is mandatory.
-     *
-     * Note that buf can be NULL along with buf_size set to 0.
-     * Otherwise, this means the whole frame is available at this point.
-     *
-     * @param avctx the codec context
-     * @param buf the frame data buffer base
-     * @param buf_size the size of the frame in bytes
-     * @return zero if successful, a negative value otherwise
-     */
-    int (*start_frame)(AVCodecContext *avctx, const uint8_t *buf, uint32_t buf_size);
-
-    /**
-     * Callback for each slice.
-     *
-     * Meaningful slice information (codec specific) is guaranteed to
-     * be parsed at this point. This function is mandatory.
-     *
-     * @param avctx the codec context
-     * @param buf the slice data buffer base
-     * @param buf_size the size of the slice in bytes
-     * @return zero if successful, a negative value otherwise
-     */
-    int (*decode_slice)(AVCodecContext *avctx, const uint8_t *buf, uint32_t buf_size);
-
-    /**
-     * Called at the end of each frame or field picture.
-     *
-     * The whole picture is parsed at this point and can now be sent
-     * to the hardware accelerator. This function is mandatory.
-     *
-     * @param avctx the codec context
-     * @return zero if successful, a negative value otherwise
-     */
-    int (*end_frame)(AVCodecContext *avctx);
-
-    /**
-     * Size of HW accelerator private data.
-     *
-     * Private data is allocated with av_mallocz() before
-     * AVCodecContext.get_buffer() and deallocated after
-     * AVCodecContext.release_buffer().
-     */
-    int priv_data_size;
-} AVHWAccel;
-
-/**
- * four components are given, that's all.
- * the last component is alpha
- */
-typedef struct AVPicture {
-    uint8_t *data[4];
-    int linesize[4];       ///< number of bytes per line
-} AVPicture;
-
-#if FF_API_PALETTE_CONTROL
-/**
- * AVPaletteControl
- * This structure defines a method for communicating palette changes
- * between and demuxer and a decoder.
- *
- * @deprecated Use AVPacket to send palette changes instead.
- * This is totally broken.
- */
-#define AVPALETTE_SIZE 1024
-#define AVPALETTE_COUNT 256
-typedef struct AVPaletteControl {
-
-    /* Demuxer sets this to 1 to indicate the palette has changed;
-     * decoder resets to 0. */
-    int palette_changed;
-
-    /* 4-byte ARGB palette entries, stored in native byte order; note that
-     * the individual palette components should be on a 8-bit scale; if
-     * the palette data comes from an IBM VGA native format, the component
-     * data is probably 6 bits in size and needs to be scaled. */
-    unsigned int palette[AVPALETTE_COUNT];
-
-} AVPaletteControl attribute_deprecated;
-#endif
-
-enum AVSubtitleType {
-    SUBTITLE_NONE,
-
-    SUBTITLE_BITMAP,                ///< A bitmap, pict will be set
-
-    /**
-     * Plain text, the text field must be set by the decoder and is
-     * authoritative. ass and pict fields may contain approximations.
-     */
-    SUBTITLE_TEXT,
-
-    /**
-     * Formatted text, the ass field must be set by the decoder and is
-     * authoritative. pict and text fields may contain approximations.
-     */
-    SUBTITLE_ASS,
-};
-
-typedef struct AVSubtitleRect {
-    int x;         ///< top left corner  of pict, undefined when pict is not set
-    int y;         ///< top left corner  of pict, undefined when pict is not set
-    int w;         ///< width            of pict, undefined when pict is not set
-    int h;         ///< height           of pict, undefined when pict is not set
-    int nb_colors; ///< number of colors in pict, undefined when pict is not set
-
-    /**
-     * data+linesize for the bitmap of this subtitle.
-     * can be set for text/ass as well once they where rendered
-     */
-    AVPicture pict;
-    enum AVSubtitleType type;
-
-    char *text;                     ///< 0 terminated plain UTF-8 text
-
-    /**
-     * 0 terminated ASS/SSA compatible event line.
-     * The pressentation of this is unaffected by the other values in this
-     * struct.
-     */
-    char *ass;
-} AVSubtitleRect;
-
-typedef struct AVSubtitle {
-    uint16_t format; /* 0 = graphics */
-    uint32_t start_display_time; /* relative to packet pts, in ms */
-    uint32_t end_display_time; /* relative to packet pts, in ms */
-    unsigned num_rects;
-    AVSubtitleRect **rects;
-    int64_t pts;    ///< Same as packet pts, in AV_TIME_BASE
-} AVSubtitle;
-
-/* packet functions */
-
-/**
- * @deprecated use NULL instead
- */
-attribute_deprecated void av_destruct_packet_nofree(AVPacket *pkt);
-
-/**
- * Default packet destructor.
- */
-void av_destruct_packet(AVPacket *pkt);
-
-/**
- * Initialize optional fields of a packet with default values.
- *
- * @param pkt packet
- */
-void av_init_packet(AVPacket *pkt);
-
-/**
- * Allocate the payload of a packet and initialize its fields with
- * default values.
- *
- * @param pkt packet
- * @param size wanted payload size
- * @return 0 if OK, AVERROR_xxx otherwise
- */
-int av_new_packet(AVPacket *pkt, int size);
-
-/**
- * Reduce packet size, correctly zeroing padding
- *
- * @param pkt packet
- * @param size new size
- */
-void av_shrink_packet(AVPacket *pkt, int size);
-
-/**
- * @warning This is a hack - the packet memory allocation stuff is broken. The
- * packet is allocated if it was not really allocated.
- */
-int av_dup_packet(AVPacket *pkt);
-
-/**
- * Free a packet.
- *
- * @param pkt packet to free
- */
-void av_free_packet(AVPacket *pkt);
-
-/* resample.c */
-
-struct ReSampleContext;
-struct AVResampleContext;
-
-typedef struct ReSampleContext ReSampleContext;
-
-#if FF_API_AUDIO_OLD
-/**
- * @deprecated Use av_audio_resample_init() instead.
- */
-attribute_deprecated ReSampleContext *audio_resample_init(int output_channels, int input_channels,
-                                                          int output_rate, int input_rate);
-#endif
-/**
- *  Initialize audio resampling context
- *
- * @param output_channels  number of output channels
- * @param input_channels   number of input channels
- * @param output_rate      output sample rate
- * @param input_rate       input sample rate
- * @param sample_fmt_out   requested output sample format
- * @param sample_fmt_in    input sample format
- * @param filter_length    length of each FIR filter in the filterbank relative to the cutoff freq
- * @param log2_phase_count log2 of the number of entries in the polyphase filterbank
- * @param linear           If 1 then the used FIR filter will be linearly interpolated
-                           between the 2 closest, if 0 the closest will be used
- * @param cutoff           cutoff frequency, 1.0 corresponds to half the output sampling rate
- * @return allocated ReSampleContext, NULL if error occured
- */
-ReSampleContext *av_audio_resample_init(int output_channels, int input_channels,
-                                        int output_rate, int input_rate,
-                                        enum SampleFormat sample_fmt_out,
-                                        enum SampleFormat sample_fmt_in,
-                                        int filter_length, int log2_phase_count,
-                                        int linear, double cutoff);
-
-int audio_resample(ReSampleContext *s, short *output, short *input, int nb_samples);
-void audio_resample_close(ReSampleContext *s);
-
-
-/**
- * Initialize an audio resampler.
- * Note, if either rate is not an integer then simply scale both rates up so they are.
- * @param filter_length length of each FIR filter in the filterbank relative to the cutoff freq
- * @param log2_phase_count log2 of the number of entries in the polyphase filterbank
- * @param linear If 1 then the used FIR filter will be linearly interpolated
-                 between the 2 closest, if 0 the closest will be used
- * @param cutoff cutoff frequency, 1.0 corresponds to half the output sampling rate
- */
-struct AVResampleContext *av_resample_init(int out_rate, int in_rate, int filter_length, int log2_phase_count, int linear, double cutoff);
-
-/**
- * Resample an array of samples using a previously configured context.
- * @param src an array of unconsumed samples
- * @param consumed the number of samples of src which have been consumed are returned here
- * @param src_size the number of unconsumed samples available
- * @param dst_size the amount of space in samples available in dst
- * @param update_ctx If this is 0 then the context will not be modified, that way several channels can be resampled with the same context.
- * @return the number of samples written in dst or -1 if an error occurred
- */
-int av_resample(struct AVResampleContext *c, short *dst, short *src, int *consumed, int src_size, int dst_size, int update_ctx);
-
-
-/**
- * Compensate samplerate/timestamp drift. The compensation is done by changing
- * the resampler parameters, so no audible clicks or similar distortions occur
- * @param compensation_distance distance in output samples over which the compensation should be performed
- * @param sample_delta number of output samples which should be output less
- *
- * example: av_resample_compensate(c, 10, 500)
- * here instead of 510 samples only 500 samples would be output
- *
- * note, due to rounding the actual compensation might be slightly different,
- * especially if the compensation_distance is large and the in_rate used during init is small
- */
-void av_resample_compensate(struct AVResampleContext *c, int sample_delta, int compensation_distance);
-void av_resample_close(struct AVResampleContext *c);
-
-/**
- * Allocate memory for a picture.  Call avpicture_free to free it.
- *
- * @param picture the picture to be filled in
- * @param pix_fmt the format of the picture
- * @param width the width of the picture
- * @param height the height of the picture
- * @return zero if successful, a negative value if not
- */
-int avpicture_alloc(AVPicture *picture, enum PixelFormat pix_fmt, int width, int height);
-
-/**
- * Free a picture previously allocated by avpicture_alloc().
- *
- * @param picture the AVPicture to be freed
- */
-void avpicture_free(AVPicture *picture);
-
-/**
- * Fill in the AVPicture fields.
- * The fields of the given AVPicture are filled in by using the 'ptr' address
- * which points to the image data buffer. Depending on the specified picture
- * format, one or multiple image data pointers and line sizes will be set.
- * If a planar format is specified, several pointers will be set pointing to
- * the different picture planes and the line sizes of the different planes
- * will be stored in the lines_sizes array.
- * Call with ptr == NULL to get the required size for the ptr buffer.
- *
- * @param picture AVPicture whose fields are to be filled in
- * @param ptr Buffer which will contain or contains the actual image data
- * @param pix_fmt The format in which the picture data is stored.
- * @param width the width of the image in pixels
- * @param height the height of the image in pixels
- * @return size of the image data in bytes
- */
-int avpicture_fill(AVPicture *picture, uint8_t *ptr,
-                   enum PixelFormat pix_fmt, int width, int height);
-int avpicture_layout(const AVPicture* src, enum PixelFormat pix_fmt, int width, int height,
-                     unsigned char *dest, int dest_size);
-
-/**
- * Calculate the size in bytes that a picture of the given width and height
- * would occupy if stored in the given picture format.
- * Note that this returns the size of a compact representation as generated
- * by avpicture_layout, which can be smaller than the size required for e.g.
- * avpicture_fill.
- *
- * @param pix_fmt the given picture format
- * @param width the width of the image
- * @param height the height of the image
- * @return Image data size in bytes or -1 on error (e.g. too large dimensions).
- */
-int avpicture_get_size(enum PixelFormat pix_fmt, int width, int height);
-void avcodec_get_chroma_sub_sample(enum PixelFormat pix_fmt, int *h_shift, int *v_shift);
-const char *avcodec_get_pix_fmt_name(enum PixelFormat pix_fmt);
-void avcodec_set_dimensions(AVCodecContext *s, int width, int height);
-
-#if LIBAVCODEC_VERSION_MAJOR < 53
-/**
- * Return the pixel format corresponding to the name name.
- *
- * If there is no pixel format with name name, then look for a
- * pixel format with the name corresponding to the native endian
- * format of name.
- * For example in a little-endian system, first look for "gray16",
- * then for "gray16le".
- *
- * Finally if no pixel format has been found, return PIX_FMT_NONE.
- *
- * @deprecated Deprecated in favor of av_get_pix_fmt().
- */
-attribute_deprecated enum PixelFormat avcodec_get_pix_fmt(const char* name);
-#endif
-
-/**
- * Return a value representing the fourCC code associated to the
- * pixel format pix_fmt, or 0 if no associated fourCC code can be
- * found.
- */
-unsigned int avcodec_pix_fmt_to_codec_tag(enum PixelFormat pix_fmt);
-
-/**
- * Put a string representing the codec tag codec_tag in buf.
- *
- * @param buf_size size in bytes of buf
- * @return the length of the string that would have been generated if
- * enough space had been available, excluding the trailing null
- */
-size_t av_get_codec_tag_string(char *buf, size_t buf_size, unsigned int codec_tag);
-
-#define FF_LOSS_RESOLUTION  0x0001 /**< loss due to resolution change */
-#define FF_LOSS_DEPTH       0x0002 /**< loss due to color depth change */
-#define FF_LOSS_COLORSPACE  0x0004 /**< loss due to color space conversion */
-#define FF_LOSS_ALPHA       0x0008 /**< loss of alpha bits */
-#define FF_LOSS_COLORQUANT  0x0010 /**< loss due to color quantization */
-#define FF_LOSS_CHROMA      0x0020 /**< loss of chroma (e.g. RGB to gray conversion) */
-
-/**
- * Compute what kind of losses will occur when converting from one specific
- * pixel format to another.
- * When converting from one pixel format to another, information loss may occur.
- * For example, when converting from RGB24 to GRAY, the color information will
- * be lost. Similarly, other losses occur when converting from some formats to
- * other formats. These losses can involve loss of chroma, but also loss of
- * resolution, loss of color depth, loss due to the color space conversion, loss
- * of the alpha bits or loss due to color quantization.
- * avcodec_get_fix_fmt_loss() informs you about the various types of losses
- * which will occur when converting from one pixel format to another.
- *
- * @param[in] dst_pix_fmt destination pixel format
- * @param[in] src_pix_fmt source pixel format
- * @param[in] has_alpha Whether the source pixel format alpha channel is used.
- * @return Combination of flags informing you what kind of losses will occur.
- */
-int avcodec_get_pix_fmt_loss(enum PixelFormat dst_pix_fmt, enum PixelFormat src_pix_fmt,
-                             int has_alpha);
-
-/**
- * Find the best pixel format to convert to given a certain source pixel
- * format.  When converting from one pixel format to another, information loss
- * may occur.  For example, when converting from RGB24 to GRAY, the color
- * information will be lost. Similarly, other losses occur when converting from
- * some formats to other formats. avcodec_find_best_pix_fmt() searches which of
- * the given pixel formats should be used to suffer the least amount of loss.
- * The pixel formats from which it chooses one, are determined by the
- * pix_fmt_mask parameter.
- *
- * @code
- * src_pix_fmt = PIX_FMT_YUV420P;
- * pix_fmt_mask = (1 << PIX_FMT_YUV422P) || (1 << PIX_FMT_RGB24);
- * dst_pix_fmt = avcodec_find_best_pix_fmt(pix_fmt_mask, src_pix_fmt, alpha, &loss);
- * @endcode
- *
- * @param[in] pix_fmt_mask bitmask determining which pixel format to choose from
- * @param[in] src_pix_fmt source pixel format
- * @param[in] has_alpha Whether the source pixel format alpha channel is used.
- * @param[out] loss_ptr Combination of flags informing you what kind of losses will occur.
- * @return The best pixel format to convert to or -1 if none was found.
- */
-enum PixelFormat avcodec_find_best_pix_fmt(int64_t pix_fmt_mask, enum PixelFormat src_pix_fmt,
-                              int has_alpha, int *loss_ptr);
-
-
-/**
- * Print in buf the string corresponding to the pixel format with
- * number pix_fmt, or an header if pix_fmt is negative.
- *
- * @param[in] buf the buffer where to write the string
- * @param[in] buf_size the size of buf
- * @param[in] pix_fmt the number of the pixel format to print the corresponding info string, or
- * a negative value to print the corresponding header.
- * Meaningful values for obtaining a pixel format info vary from 0 to PIX_FMT_NB -1.
- */
-void avcodec_pix_fmt_string (char *buf, int buf_size, enum PixelFormat pix_fmt);
-
-#define FF_ALPHA_TRANSP       0x0001 /* image has some totally transparent pixels */
-#define FF_ALPHA_SEMI_TRANSP  0x0002 /* image has some transparent pixels */
-
-/**
- * Tell if an image really has transparent alpha values.
- * @return ored mask of FF_ALPHA_xxx constants
- */
-int img_get_alpha_info(const AVPicture *src,
-                       enum PixelFormat pix_fmt, int width, int height);
-
-/* deinterlace a picture */
-/* deinterlace - if not supported return -1 */
-int avpicture_deinterlace(AVPicture *dst, const AVPicture *src,
-                          enum PixelFormat pix_fmt, int width, int height);
-
-/* external high level API */
-
-/**
- * If c is NULL, returns the first registered codec,
- * if c is non-NULL, returns the next registered codec after c,
- * or NULL if c is the last one.
- */
-AVCodec *av_codec_next(AVCodec *c);
-
-/**
- * Return the LIBAVCODEC_VERSION_INT constant.
- */
-unsigned avcodec_version(void);
-
-/**
- * Return the libavcodec build-time configuration.
- */
-const char *avcodec_configuration(void);
-
-/**
- * Return the libavcodec license.
- */
-const char *avcodec_license(void);
-
-/**
- * Initialize libavcodec.
- *
- * @warning This function must be called before any other libavcodec
- * function.
- */
-void avcodec_init(void);
-
-#if LIBAVCODEC_VERSION_MAJOR < 53
-/**
- * @deprecated Deprecated in favor of avcodec_register().
- */
-attribute_deprecated void register_avcodec(AVCodec *codec);
-#endif
-
-/**
- * Register the codec codec and initialize libavcodec.
- *
- * @see avcodec_init()
- */
-void avcodec_register(AVCodec *codec);
-
-/**
- * Find a registered encoder with a matching codec ID.
- *
- * @param id CodecID of the requested encoder
- * @return An encoder if one was found, NULL otherwise.
- */
-AVCodec *avcodec_find_encoder(enum CodecID id);
-
-/**
- * Find a registered encoder with the specified name.
- *
- * @param name name of the requested encoder
- * @return An encoder if one was found, NULL otherwise.
- */
-AVCodec *avcodec_find_encoder_by_name(const char *name);
-
-/**
- * Find a registered decoder with a matching codec ID.
- *
- * @param id CodecID of the requested decoder
- * @return A decoder if one was found, NULL otherwise.
- */
-AVCodec *avcodec_find_decoder(enum CodecID id);
-
-/**
- * Find a registered decoder with the specified name.
- *
- * @param name name of the requested decoder
- * @return A decoder if one was found, NULL otherwise.
- */
-AVCodec *avcodec_find_decoder_by_name(const char *name);
-void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode);
-
-/**
- * Set the fields of the given AVCodecContext to default values.
- *
- * @param s The AVCodecContext of which the fields should be set to default values.
- */
-void avcodec_get_context_defaults(AVCodecContext *s);
-
-/** THIS FUNCTION IS NOT YET PART OF THE PUBLIC API!
- *  we WILL change its arguments and name a few times! */
-void avcodec_get_context_defaults2(AVCodecContext *s, enum AVMediaType);
-
-/** THIS FUNCTION IS NOT YET PART OF THE PUBLIC API!
- *  we WILL change its arguments and name a few times! */
-int avcodec_get_context_defaults3(AVCodecContext *s, AVCodec *codec);
-
-/**
- * Allocate an AVCodecContext and set its fields to default values.  The
- * resulting struct can be deallocated by simply calling av_free().
- *
- * @return An AVCodecContext filled with default values or NULL on failure.
- * @see avcodec_get_context_defaults
- */
-AVCodecContext *avcodec_alloc_context(void);
-
-/** THIS FUNCTION IS NOT YET PART OF THE PUBLIC API!
- *  we WILL change its arguments and name a few times! */
-AVCodecContext *avcodec_alloc_context2(enum AVMediaType);
-
-/** THIS FUNCTION IS NOT YET PART OF THE PUBLIC API!
- *  we WILL change its arguments and name a few times! */
-AVCodecContext *avcodec_alloc_context3(AVCodec *codec);
-
-/**
- * Copy the settings of the source AVCodecContext into the destination
- * AVCodecContext. The resulting destination codec context will be
- * unopened, i.e. you are required to call avcodec_open() before you
- * can use this AVCodecContext to decode/encode video/audio data.
- *
- * @param dest target codec context, should be initialized with
- *             avcodec_alloc_context(), but otherwise uninitialized
- * @param src source codec context
- * @return AVERROR() on error (e.g. memory allocation error), 0 on success
- */
-int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src);
-
-/**
- * Set the fields of the given AVFrame to default values.
- *
- * @param pic The AVFrame of which the fields should be set to default values.
- */
-void avcodec_get_frame_defaults(AVFrame *pic);
-
-/**
- * Allocate an AVFrame and set its fields to default values.  The resulting
- * struct can be deallocated by simply calling av_free().
- *
- * @return An AVFrame filled with default values or NULL on failure.
- * @see avcodec_get_frame_defaults
- */
-AVFrame *avcodec_alloc_frame(void);
-
-int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic);
-void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic);
-int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic);
-
-/**
- * Return the amount of padding in pixels which the get_buffer callback must
- * provide around the edge of the image for codecs which do not have the
- * CODEC_FLAG_EMU_EDGE flag.
- *
- * @return Required padding in pixels.
- */
-unsigned avcodec_get_edge_width(void);
-/**
- * Modify width and height values so that they will result in a memory
- * buffer that is acceptable for the codec if you do not use any horizontal
- * padding.
- *
- * May only be used if a codec with CODEC_CAP_DR1 has been opened.
- * If CODEC_FLAG_EMU_EDGE is not set, the dimensions must have been increased
- * according to avcodec_get_edge_width() before.
- */
-void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height);
-/**
- * Modify width and height values so that they will result in a memory
- * buffer that is acceptable for the codec if you also ensure that all
- * line sizes are a multiple of the respective linesize_align[i].
- *
- * May only be used if a codec with CODEC_CAP_DR1 has been opened.
- * If CODEC_FLAG_EMU_EDGE is not set, the dimensions must have been increased
- * according to avcodec_get_edge_width() before.
- */
-void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
-                               int linesize_align[4]);
-
-#if LIBAVCODEC_VERSION_MAJOR < 53
-/**
- * @deprecated Deprecated in favor of av_check_image_size().
- */
-attribute_deprecated
-int avcodec_check_dimensions(void *av_log_ctx, unsigned int w, unsigned int h);
-#endif
-
-enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum PixelFormat * fmt);
-
-int avcodec_thread_init(AVCodecContext *s, int thread_count);
-void avcodec_thread_free(AVCodecContext *s);
-int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size);
-int avcodec_default_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2, int, int),void *arg, int *ret, int count);
-//FIXME func typedef
-
-/**
- * Initialize the AVCodecContext to use the given AVCodec. Prior to using this
- * function the context has to be allocated.
- *
- * The functions avcodec_find_decoder_by_name(), avcodec_find_encoder_by_name(),
- * avcodec_find_decoder() and avcodec_find_encoder() provide an easy way for
- * retrieving a codec.
- *
- * @warning This function is not thread safe!
- *
- * @code
- * avcodec_register_all();
- * codec = avcodec_find_decoder(CODEC_ID_H264);
- * if (!codec)
- *     exit(1);
- *
- * context = avcodec_alloc_context();
- *
- * if (avcodec_open(context, codec) < 0)
- *     exit(1);
- * @endcode
- *
- * @param avctx The context which will be set up to use the given codec.
- * @param codec The codec to use within the context.
- * @return zero on success, a negative value on error
- * @see avcodec_alloc_context, avcodec_find_decoder, avcodec_find_encoder
- */
-int avcodec_open(AVCodecContext *avctx, AVCodec *codec);
-
-#if FF_API_AUDIO_OLD
-/**
- * Decode an audio frame from buf into samples.
- * Wrapper function which calls avcodec_decode_audio3.
- *
- * @deprecated Use avcodec_decode_audio3 instead.
- * @param avctx the codec context
- * @param[out] samples the output buffer
- * @param[in,out] frame_size_ptr the output buffer size in bytes
- * @param[in] buf the input buffer
- * @param[in] buf_size the input buffer size in bytes
- * @return On error a negative value is returned, otherwise the number of bytes
- * used or zero if no frame could be decompressed.
- */
-attribute_deprecated int avcodec_decode_audio2(AVCodecContext *avctx, int16_t *samples,
-                         int *frame_size_ptr,
-                         const uint8_t *buf, int buf_size);
-#endif
-
-/**
- * Decode the audio frame of size avpkt->size from avpkt->data into samples.
- * Some decoders may support multiple frames in a single AVPacket, such
- * decoders would then just decode the first frame. In this case,
- * avcodec_decode_audio3 has to be called again with an AVPacket that contains
- * the remaining data in order to decode the second frame etc.
- * If no frame
- * could be outputted, frame_size_ptr is zero. Otherwise, it is the
- * decompressed frame size in bytes.
- *
- * @warning You must set frame_size_ptr to the allocated size of the
- * output buffer before calling avcodec_decode_audio3().
- *
- * @warning The input buffer must be FF_INPUT_BUFFER_PADDING_SIZE larger than
- * the actual read bytes because some optimized bitstream readers read 32 or 64
- * bits at once and could read over the end.
- *
- * @warning The end of the input buffer avpkt->data should be set to 0 to ensure that
- * no overreading happens for damaged MPEG streams.
- *
- * @note You might have to align the input buffer avpkt->data and output buffer
- * samples. The alignment requirements depend on the CPU: On some CPUs it isn't
- * necessary at all, on others it won't work at all if not aligned and on others
- * it will work but it will have an impact on performance.
- *
- * In practice, avpkt->data should have 4 byte alignment at minimum and
- * samples should be 16 byte aligned unless the CPU doesn't need it
- * (AltiVec and SSE do).
- *
- * @param avctx the codec context
- * @param[out] samples the output buffer, sample type in avctx->sample_fmt
- * @param[in,out] frame_size_ptr the output buffer size in bytes
- * @param[in] avpkt The input AVPacket containing the input buffer.
- *            You can create such packet with av_init_packet() and by then setting
- *            data and size, some decoders might in addition need other fields.
- *            All decoders are designed to use the least fields possible though.
- * @return On error a negative value is returned, otherwise the number of bytes
- * used or zero if no frame data was decompressed (used) from the input AVPacket.
- */
-int avcodec_decode_audio3(AVCodecContext *avctx, int16_t *samples,
-                         int *frame_size_ptr,
-                         AVPacket *avpkt);
-
-#if FF_API_VIDEO_OLD
-/**
- * Decode a video frame from buf into picture.
- * Wrapper function which calls avcodec_decode_video2.
- *
- * @deprecated Use avcodec_decode_video2 instead.
- * @param avctx the codec context
- * @param[out] picture The AVFrame in which the decoded video frame will be stored.
- * @param[in] buf the input buffer
- * @param[in] buf_size the size of the input buffer in bytes
- * @param[in,out] got_picture_ptr Zero if no frame could be decompressed, otherwise, it is nonzero.
- * @return On error a negative value is returned, otherwise the number of bytes
- * used or zero if no frame could be decompressed.
- */
-attribute_deprecated int avcodec_decode_video(AVCodecContext *avctx, AVFrame *picture,
-                         int *got_picture_ptr,
-                         const uint8_t *buf, int buf_size);
-#endif
-
-/**
- * Decode the video frame of size avpkt->size from avpkt->data into picture.
- * Some decoders may support multiple frames in a single AVPacket, such
- * decoders would then just decode the first frame.
- *
- * @warning The input buffer must be FF_INPUT_BUFFER_PADDING_SIZE larger than
- * the actual read bytes because some optimized bitstream readers read 32 or 64
- * bits at once and could read over the end.
- *
- * @warning The end of the input buffer buf should be set to 0 to ensure that
- * no overreading happens for damaged MPEG streams.
- *
- * @note You might have to align the input buffer avpkt->data.
- * The alignment requirements depend on the CPU: on some CPUs it isn't
- * necessary at all, on others it won't work at all if not aligned and on others
- * it will work but it will have an impact on performance.
- *
- * In practice, avpkt->data should have 4 byte alignment at minimum.
- *
- * @note Some codecs have a delay between input and output, these need to be
- * fed with avpkt->data=NULL, avpkt->size=0 at the end to return the remaining frames.
- *
- * @param avctx the codec context
- * @param[out] picture The AVFrame in which the decoded video frame will be stored.
- *             Use avcodec_alloc_frame to get an AVFrame, the codec will
- *             allocate memory for the actual bitmap.
- *             with default get/release_buffer(), the decoder frees/reuses the bitmap as it sees fit.
- *             with overridden get/release_buffer() (needs CODEC_CAP_DR1) the user decides into what buffer the decoder
- *                   decodes and the decoder tells the user once it does not need the data anymore,
- *                   the user app can at this point free/reuse/keep the memory as it sees fit.
- *
- * @param[in] avpkt The input AVpacket containing the input buffer.
- *            You can create such packet with av_init_packet() and by then setting
- *            data and size, some decoders might in addition need other fields like
- *            flags&AV_PKT_FLAG_KEY. All decoders are designed to use the least
- *            fields possible.
- * @param[in,out] got_picture_ptr Zero if no frame could be decompressed, otherwise, it is nonzero.
- * @return On error a negative value is returned, otherwise the number of bytes
- * used or zero if no frame could be decompressed.
- */
-int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture,
-                         int *got_picture_ptr,
-                         AVPacket *avpkt);
-
-#if FF_API_SUBTITLE_OLD
-/* Decode a subtitle message. Return -1 if error, otherwise return the
- * number of bytes used. If no subtitle could be decompressed,
- * got_sub_ptr is zero. Otherwise, the subtitle is stored in *sub. */
-attribute_deprecated int avcodec_decode_subtitle(AVCodecContext *avctx, AVSubtitle *sub,
-                            int *got_sub_ptr,
-                            const uint8_t *buf, int buf_size);
-#endif
-
-/**
- * Decode a subtitle message.
- * Return a negative value on error, otherwise return the number of bytes used.
- * If no subtitle could be decompressed, got_sub_ptr is zero.
- * Otherwise, the subtitle is stored in *sub.
- * Note that CODEC_CAP_DR1 is not available for subtitle codecs. This is for
- * simplicity, because the performance difference is expect to be negligible
- * and reusing a get_buffer written for video codecs would probably perform badly
- * due to a potentially very different allocation pattern.
- *
- * @param avctx the codec context
- * @param[out] sub The AVSubtitle in which the decoded subtitle will be stored, must be
-                   freed with avsubtitle_free if *got_sub_ptr is set.
- * @param[in,out] got_sub_ptr Zero if no subtitle could be decompressed, otherwise, it is nonzero.
- * @param[in] avpkt The input AVPacket containing the input buffer.
- */
-int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub,
-                            int *got_sub_ptr,
-                            AVPacket *avpkt);
-
-/**
- * Frees all allocated data in the given subtitle struct.
- *
- * @param sub AVSubtitle to free.
- */
-void avsubtitle_free(AVSubtitle *sub);
-
-int avcodec_parse_frame(AVCodecContext *avctx, uint8_t **pdata,
-                        int *data_size_ptr,
-                        uint8_t *buf, int buf_size);
-
-/**
- * Encode an audio frame from samples into buf.
- *
- * @note The output buffer should be at least FF_MIN_BUFFER_SIZE bytes large.
- * However, for PCM audio the user will know how much space is needed
- * because it depends on the value passed in buf_size as described
- * below. In that case a lower value can be used.
- *
- * @param avctx the codec context
- * @param[out] buf the output buffer
- * @param[in] buf_size the output buffer size
- * @param[in] samples the input buffer containing the samples
- * The number of samples read from this buffer is frame_size*channels,
- * both of which are defined in avctx.
- * For PCM audio the number of samples read from samples is equal to
- * buf_size * input_sample_size / output_sample_size.
- * @return On error a negative value is returned, on success zero or the number
- * of bytes used to encode the data read from the input buffer.
- */
-int avcodec_encode_audio(AVCodecContext *avctx, uint8_t *buf, int buf_size,
-                         const short *samples);
-
-/**
- * Encode a video frame from pict into buf.
- * The input picture should be
- * stored using a specific format, namely avctx.pix_fmt.
- *
- * @param avctx the codec context
- * @param[out] buf the output buffer for the bitstream of encoded frame
- * @param[in] buf_size the size of the output buffer in bytes
- * @param[in] pict the input picture to encode
- * @return On error a negative value is returned, on success zero or the number
- * of bytes used from the output buffer.
- */
-int avcodec_encode_video(AVCodecContext *avctx, uint8_t *buf, int buf_size,
-                         const AVFrame *pict);
-int avcodec_encode_subtitle(AVCodecContext *avctx, uint8_t *buf, int buf_size,
-                            const AVSubtitle *sub);
-
-int avcodec_close(AVCodecContext *avctx);
-
-/**
- * Register all the codecs, parsers and bitstream filters which were enabled at
- * configuration time. If you do not call this function you can select exactly
- * which formats you want to support, by using the individual registration
- * functions.
- *
- * @see avcodec_register
- * @see av_register_codec_parser
- * @see av_register_bitstream_filter
- */
-void avcodec_register_all(void);
-
-/**
- * Flush buffers, should be called when seeking or when switching to a different stream.
- */
-void avcodec_flush_buffers(AVCodecContext *avctx);
-
-void avcodec_default_free_buffers(AVCodecContext *s);
-
-/* misc useful functions */
-
-/**
- * Return a single letter to describe the given picture type pict_type.
- *
- * @param[in] pict_type the picture type
- * @return A single character representing the picture type.
- */
-char av_get_pict_type_char(int pict_type);
-
-/**
- * Return codec bits per sample.
- *
- * @param[in] codec_id the codec
- * @return Number of bits per sample or zero if unknown for the given codec.
- */
-int av_get_bits_per_sample(enum CodecID codec_id);
-
-/**
- * Return sample format bits per sample.
- *
- * @param[in] sample_fmt the sample format
- * @return Number of bits per sample or zero if unknown for the given sample format.
- */
-int av_get_bits_per_sample_format(enum SampleFormat sample_fmt);
-
-/* frame parsing */
-typedef struct AVCodecParserContext {
-    void *priv_data;
-    struct AVCodecParser *parser;
-    int64_t frame_offset; /* offset of the current frame */
-    int64_t cur_offset; /* current offset
-                           (incremented by each av_parser_parse()) */
-    int64_t next_frame_offset; /* offset of the next frame */
-    /* video info */
-    int pict_type; /* XXX: Put it back in AVCodecContext. */
-    /**
-     * This field is used for proper frame duration computation in lavf.
-     * It signals, how much longer the frame duration of the current frame
-     * is compared to normal frame duration.
-     *
-     * frame_duration = (1 + repeat_pict) * time_base
-     *
-     * It is used by codecs like H.264 to display telecined material.
-     */
-    int repeat_pict; /* XXX: Put it back in AVCodecContext. */
-    int64_t pts;     /* pts of the current frame */
-    int64_t dts;     /* dts of the current frame */
-
-    /* private data */
-    int64_t last_pts;
-    int64_t last_dts;
-    int fetch_timestamp;
-
-#define AV_PARSER_PTS_NB 4
-    int cur_frame_start_index;
-    int64_t cur_frame_offset[AV_PARSER_PTS_NB];
-    int64_t cur_frame_pts[AV_PARSER_PTS_NB];
-    int64_t cur_frame_dts[AV_PARSER_PTS_NB];
-
-    int flags;
-#define PARSER_FLAG_COMPLETE_FRAMES           0x0001
-#define PARSER_FLAG_ONCE                      0x0002
-/// Set if the parser has a valid file offset
-#define PARSER_FLAG_FETCHED_OFFSET            0x0004
-
-    int64_t offset;      ///< byte offset from starting packet start
-    int64_t cur_frame_end[AV_PARSER_PTS_NB];
-
-    /*!
-     * Set by parser to 1 for key frames and 0 for non-key frames.
-     * It is initialized to -1, so if the parser doesn't set this flag,
-     * old-style fallback using FF_I_TYPE picture type as key frames
-     * will be used.
-     */
-    int key_frame;
-
-    /**
-     * Time difference in stream time base units from the pts of this
-     * packet to the point at which the output from the decoder has converged
-     * independent from the availability of previous frames. That is, the
-     * frames are virtually identical no matter if decoding started from
-     * the very first frame or from this keyframe.
-     * Is AV_NOPTS_VALUE if unknown.
-     * This field is not the display duration of the current frame.
-     * This field has no meaning if the packet does not have AV_PKT_FLAG_KEY
-     * set.
-     *
-     * The purpose of this field is to allow seeking in streams that have no
-     * keyframes in the conventional sense. It corresponds to the
-     * recovery point SEI in H.264 and match_time_delta in NUT. It is also
-     * essential for some types of subtitle streams to ensure that all
-     * subtitles are correctly displayed after seeking.
-     */
-    int64_t convergence_duration;
-
-    // Timestamp generation support:
-    /**
-     * Synchronization point for start of timestamp generation.
-     *
-     * Set to >0 for sync point, 0 for no sync point and <0 for undefined
-     * (default).
-     *
-     * For example, this corresponds to presence of H.264 buffering period
-     * SEI message.
-     */
-    int dts_sync_point;
-
-    /**
-     * Offset of the current timestamp against last timestamp sync point in
-     * units of AVCodecContext.time_base.
-     *
-     * Set to INT_MIN when dts_sync_point unused. Otherwise, it must
-     * contain a valid timestamp offset.
-     *
-     * Note that the timestamp of sync point has usually a nonzero
-     * dts_ref_dts_delta, which refers to the previous sync point. Offset of
-     * the next frame after timestamp sync point will be usually 1.
-     *
-     * For example, this corresponds to H.264 cpb_removal_delay.
-     */
-    int dts_ref_dts_delta;
-
-    /**
-     * Presentation delay of current frame in units of AVCodecContext.time_base.
-     *
-     * Set to INT_MIN when dts_sync_point unused. Otherwise, it must
-     * contain valid non-negative timestamp delta (presentation time of a frame
-     * must not lie in the past).
-     *
-     * This delay represents the difference between decoding and presentation
-     * time of the frame.
-     *
-     * For example, this corresponds to H.264 dpb_output_delay.
-     */
-    int pts_dts_delta;
-
-    /**
-     * Position of the packet in file.
-     *
-     * Analogous to cur_frame_pts/dts
-     */
-    int64_t cur_frame_pos[AV_PARSER_PTS_NB];
-
-    /**
-     * Byte position of currently parsed frame in stream.
-     */
-    int64_t pos;
-
-    /**
-     * Previous frame byte position.
-     */
-    int64_t last_pos;
-} AVCodecParserContext;
-
-typedef struct AVCodecParser {
-    int codec_ids[5]; /* several codec IDs are permitted */
-    int priv_data_size;
-    int (*parser_init)(AVCodecParserContext *s);
-    int (*parser_parse)(AVCodecParserContext *s,
-                        AVCodecContext *avctx,
-                        const uint8_t **poutbuf, int *poutbuf_size,
-                        const uint8_t *buf, int buf_size);
-    void (*parser_close)(AVCodecParserContext *s);
-    int (*split)(AVCodecContext *avctx, const uint8_t *buf, int buf_size);
-    struct AVCodecParser *next;
-} AVCodecParser;
-
-AVCodecParser *av_parser_next(AVCodecParser *c);
-
-void av_register_codec_parser(AVCodecParser *parser);
-AVCodecParserContext *av_parser_init(int codec_id);
-
-#if LIBAVCODEC_VERSION_MAJOR < 53
-attribute_deprecated
-int av_parser_parse(AVCodecParserContext *s,
-                    AVCodecContext *avctx,
-                    uint8_t **poutbuf, int *poutbuf_size,
-                    const uint8_t *buf, int buf_size,
-                    int64_t pts, int64_t dts);
-#endif
-
-/**
- * Parse a packet.
- *
- * @param s             parser context.
- * @param avctx         codec context.
- * @param poutbuf       set to pointer to parsed buffer or NULL if not yet finished.
- * @param poutbuf_size  set to size of parsed buffer or zero if not yet finished.
- * @param buf           input buffer.
- * @param buf_size      input length, to signal EOF, this should be 0 (so that the last frame can be output).
- * @param pts           input presentation timestamp.
- * @param dts           input decoding timestamp.
- * @param pos           input byte position in stream.
- * @return the number of bytes of the input bitstream used.
- *
- * Example:
- * @code
- *   while(in_len){
- *       len = av_parser_parse2(myparser, AVCodecContext, &data, &size,
- *                                        in_data, in_len,
- *                                        pts, dts, pos);
- *       in_data += len;
- *       in_len  -= len;
- *
- *       if(size)
- *          decode_frame(data, size);
- *   }
- * @endcode
- */
-int av_parser_parse2(AVCodecParserContext *s,
-                     AVCodecContext *avctx,
-                     uint8_t **poutbuf, int *poutbuf_size,
-                     const uint8_t *buf, int buf_size,
-                     int64_t pts, int64_t dts,
-                     int64_t pos);
-
-int av_parser_change(AVCodecParserContext *s,
-                     AVCodecContext *avctx,
-                     uint8_t **poutbuf, int *poutbuf_size,
-                     const uint8_t *buf, int buf_size, int keyframe);
-void av_parser_close(AVCodecParserContext *s);
-
-
-typedef struct AVBitStreamFilterContext {
-    void *priv_data;
-    struct AVBitStreamFilter *filter;
-    AVCodecParserContext *parser;
-    struct AVBitStreamFilterContext *next;
-} AVBitStreamFilterContext;
-
-
-typedef struct AVBitStreamFilter {
-    const char *name;
-    int priv_data_size;
-    int (*filter)(AVBitStreamFilterContext *bsfc,
-                  AVCodecContext *avctx, const char *args,
-                  uint8_t **poutbuf, int *poutbuf_size,
-                  const uint8_t *buf, int buf_size, int keyframe);
-    void (*close)(AVBitStreamFilterContext *bsfc);
-    struct AVBitStreamFilter *next;
-} AVBitStreamFilter;
-
-void av_register_bitstream_filter(AVBitStreamFilter *bsf);
-AVBitStreamFilterContext *av_bitstream_filter_init(const char *name);
-int av_bitstream_filter_filter(AVBitStreamFilterContext *bsfc,
-                               AVCodecContext *avctx, const char *args,
-                               uint8_t **poutbuf, int *poutbuf_size,
-                               const uint8_t *buf, int buf_size, int keyframe);
-void av_bitstream_filter_close(AVBitStreamFilterContext *bsf);
-
-AVBitStreamFilter *av_bitstream_filter_next(AVBitStreamFilter *f);
-
-/* memory */
-
-/**
- * Reallocate the given block if it is not large enough, otherwise do nothing.
- *
- * @see av_realloc
- */
-void *av_fast_realloc(void *ptr, unsigned int *size, unsigned int min_size);
-
-/**
- * Allocate a buffer, reusing the given one if large enough.
- *
- * Contrary to av_fast_realloc the current buffer contents might not be
- * preserved and on error the old buffer is freed, thus no special
- * handling to avoid memleaks is necessary.
- *
- * @param ptr pointer to pointer to already allocated buffer, overwritten with pointer to new buffer
- * @param size size of the buffer *ptr points to
- * @param min_size minimum size of *ptr buffer after returning, *ptr will be NULL and
- *                 *size 0 if an error occurred.
- */
-void av_fast_malloc(void *ptr, unsigned int *size, unsigned int min_size);
-
-#if LIBAVCODEC_VERSION_MAJOR < 53
-/**
- * @deprecated Deprecated in favor of av_image_copy().
- */
-attribute_deprecated
-void av_picture_data_copy(uint8_t *dst_data[4], int dst_linesize[4],
-                          uint8_t *src_data[4], int src_linesize[4],
-                          enum PixelFormat pix_fmt, int width, int height);
-#endif
-
-/**
- * Copy image src to dst. Wraps av_picture_data_copy() above.
- */
-void av_picture_copy(AVPicture *dst, const AVPicture *src,
-                     enum PixelFormat pix_fmt, int width, int height);
-
-/**
- * Crop image top and left side.
- */
-int av_picture_crop(AVPicture *dst, const AVPicture *src,
-                    enum PixelFormat pix_fmt, int top_band, int left_band);
-
-/**
- * Pad image.
- */
-int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, enum PixelFormat pix_fmt,
-            int padtop, int padbottom, int padleft, int padright, int *color);
-
-/**
- * Encode extradata length to a buffer. Used by xiph codecs.
- *
- * @param s buffer to write to; must be at least (v/255+1) bytes long
- * @param v size of extradata in bytes
- * @return number of bytes written to the buffer.
- */
-unsigned int av_xiphlacing(unsigned char *s, unsigned int v);
-
-#if LIBAVCODEC_VERSION_MAJOR < 53
-/**
- * Parse str and put in width_ptr and height_ptr the detected values.
- *
- * @deprecated Deprecated in favor of av_parse_video_size().
- */
-attribute_deprecated int av_parse_video_frame_size(int *width_ptr, int *height_ptr, const char *str);
-
-/**
- * Parse str and store the detected values in *frame_rate.
- *
- * @deprecated Deprecated in favor of av_parse_video_rate().
- */
-attribute_deprecated int av_parse_video_frame_rate(AVRational *frame_rate, const char *str);
-#endif
-
-/**
- * Logs a generic warning message about a missing feature. This function is
- * intended to be used internally by FFmpeg (libavcodec, libavformat, etc.)
- * only, and would normally not be used by applications.
- * @param[in] avc a pointer to an arbitrary struct of which the first field is
- * a pointer to an AVClass struct
- * @param[in] feature string containing the name of the missing feature
- * @param[in] want_sample indicates if samples are wanted which exhibit this feature.
- * If want_sample is non-zero, additional verbage will be added to the log
- * message which tells the user how to report samples to the development
- * mailing list.
- */
-void av_log_missing_feature(void *avc, const char *feature, int want_sample);
-
-/**
- * Log a generic warning message asking for a sample. This function is
- * intended to be used internally by FFmpeg (libavcodec, libavformat, etc.)
- * only, and would normally not be used by applications.
- * @param[in] avc a pointer to an arbitrary struct of which the first field is
- * a pointer to an AVClass struct
- * @param[in] msg string containing an optional message, or NULL if no message
- */
-void av_log_ask_for_sample(void *avc, const char *msg);
-
-/**
- * Register the hardware accelerator hwaccel.
- */
-void av_register_hwaccel(AVHWAccel *hwaccel);
-
-/**
- * If hwaccel is NULL, returns the first registered hardware accelerator,
- * if hwaccel is non-NULL, returns the next registered hardware accelerator
- * after hwaccel, or NULL if hwaccel is the last one.
- */
-AVHWAccel *av_hwaccel_next(AVHWAccel *hwaccel);
-
-
-/**
- * Lock operation used by lockmgr
- */
-enum AVLockOp {
-  AV_LOCK_CREATE,  ///< Create a mutex
-  AV_LOCK_OBTAIN,  ///< Lock the mutex
-  AV_LOCK_RELEASE, ///< Unlock the mutex
-  AV_LOCK_DESTROY, ///< Free mutex resources
-};
-
-/**
- * Register a user provided lock manager supporting the operations
- * specified by AVLockOp. mutex points to a (void *) where the
- * lockmgr should store/get a pointer to a user allocated mutex. It's
- * NULL upon AV_LOCK_CREATE and != NULL for all other ops.
- *
- * @param cb User defined callback. Note: FFmpeg may invoke calls to this
- *           callback during the call to av_lockmgr_register().
- *           Thus, the application must be prepared to handle that.
- *           If cb is set to NULL the lockmgr will be unregistered.
- *           Also note that during unregistration the previously registered
- *           lockmgr callback may also be invoked.
- */
-int av_lockmgr_register(int (*cb)(void **mutex, enum AVLockOp op));
-
-#endif /* AVCODEC_AVCODEC_H */
diff --git a/lib-x86-64/include/libavcodec/avfft.h b/lib-x86-64/include/libavcodec/avfft.h
deleted file mode 100644
index be2d9c7e..00000000
--- a/lib-x86-64/include/libavcodec/avfft.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_AVFFT_H
-#define AVCODEC_AVFFT_H
-
-typedef float FFTSample;
-
-typedef struct FFTComplex {
-    FFTSample re, im;
-} FFTComplex;
-
-typedef struct FFTContext FFTContext;
-
-/**
- * Set up a complex FFT.
- * @param nbits           log2 of the length of the input array
- * @param inverse         if 0 perform the forward transform, if 1 perform the inverse
- */
-FFTContext *av_fft_init(int nbits, int inverse);
-
-/**
- * Do the permutation needed BEFORE calling ff_fft_calc().
- */
-void av_fft_permute(FFTContext *s, FFTComplex *z);
-
-/**
- * Do a complex FFT with the parameters defined in av_fft_init(). The
- * input data must be permuted before. No 1.0/sqrt(n) normalization is done.
- */
-void av_fft_calc(FFTContext *s, FFTComplex *z);
-
-void av_fft_end(FFTContext *s);
-
-FFTContext *av_mdct_init(int nbits, int inverse, double scale);
-void av_imdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input);
-void av_imdct_half(FFTContext *s, FFTSample *output, const FFTSample *input);
-void av_mdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input);
-void av_mdct_end(FFTContext *s);
-
-/* Real Discrete Fourier Transform */
-
-enum RDFTransformType {
-    DFT_R2C,
-    IDFT_C2R,
-    IDFT_R2C,
-    DFT_C2R,
-};
-
-typedef struct RDFTContext RDFTContext;
-
-/**
- * Set up a real FFT.
- * @param nbits           log2 of the length of the input array
- * @param trans           the type of transform
- */
-RDFTContext *av_rdft_init(int nbits, enum RDFTransformType trans);
-void av_rdft_calc(RDFTContext *s, FFTSample *data);
-void av_rdft_end(RDFTContext *s);
-
-/* Discrete Cosine Transform */
-
-typedef struct DCTContext DCTContext;
-
-enum DCTTransformType {
-    DCT_II = 0,
-    DCT_III,
-    DCT_I,
-    DST_I,
-};
-
-/**
- * Set up DCT.
- * @param nbits           size of the input array:
- *                        (1 << nbits)     for DCT-II, DCT-III and DST-I
- *                        (1 << nbits) + 1 for DCT-I
- *
- * @note the first element of the input of DST-I is ignored
- */
-DCTContext *av_dct_init(int nbits, enum DCTTransformType type);
-void av_dct_calc(DCTContext *s, FFTSample *data);
-void av_dct_end (DCTContext *s);
-
-#endif /* AVCODEC_AVFFT_H */
diff --git a/lib-x86-64/include/libavcodec/dxva2.h b/lib-x86-64/include/libavcodec/dxva2.h
deleted file mode 100644
index 5c5fe21e..00000000
--- a/lib-x86-64/include/libavcodec/dxva2.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * DXVA2 HW acceleration
- *
- * copyright (c) 2009 Laurent Aimar
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_DXVA_H
-#define AVCODEC_DXVA_H
-
-#include <stdint.h>
-
-#include <dxva2api.h>
-
-/**
- * This structure is used to provides the necessary configurations and data
- * to the DXVA2 FFmpeg HWAccel implementation.
- *
- * The application must make it available as AVCodecContext.hwaccel_context.
- */
-struct dxva_context {
-    /**
-     * DXVA2 decoder object
-     */
-    IDirectXVideoDecoder *decoder;
-
-    /**
-     * DXVA2 configuration used to create the decoder
-     */
-    const DXVA2_ConfigPictureDecode *cfg;
-
-    /**
-     * The number of surface in the surface array
-     */
-    unsigned surface_count;
-
-    /**
-     * The array of Direct3D surfaces used to create the decoder
-     */
-    LPDIRECT3DSURFACE9 *surface;
-
-    /**
-     * A bit field configuring the workarounds needed for using the decoder
-     */
-    uint64_t workaround;
-
-    /**
-     * Private to the FFmpeg AVHWAccel implementation
-     */
-    unsigned report_id;
-};
-
-#endif /* AVCODEC_DXVA_H */
diff --git a/lib-x86-64/include/libavcodec/opt.h b/lib-x86-64/include/libavcodec/opt.h
deleted file mode 100644
index 95147595..00000000
--- a/lib-x86-64/include/libavcodec/opt.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * AVOptions
- * copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_OPT_H
-#define AVCODEC_OPT_H
-
-/**
- * @file
- * AVOptions
- */
-
-#include "libavutil/rational.h"
-#include "avcodec.h"
-#include "libavutil/opt.h"
-
-#if FF_API_SET_STRING_OLD
-/**
- * @see av_set_string2()
- */
-attribute_deprecated const AVOption *av_set_string(void *obj, const char *name, const char *val);
-
-/**
- * @return a pointer to the AVOption corresponding to the field set or
- * NULL if no matching AVOption exists, or if the value val is not
- * valid
- * @see av_set_string3()
- */
-attribute_deprecated const AVOption *av_set_string2(void *obj, const char *name, const char *val, int alloc);
-#endif
-#if FF_API_OPT_SHOW
-/**
- * @deprecated Use av_opt_show2() instead.
- */
-attribute_deprecated int av_opt_show(void *obj, void *av_log_obj);
-#endif
-
-#endif /* AVCODEC_OPT_H */
diff --git a/lib-x86-64/include/libavcodec/vaapi.h b/lib-x86-64/include/libavcodec/vaapi.h
deleted file mode 100644
index 07568a47..00000000
--- a/lib-x86-64/include/libavcodec/vaapi.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Video Acceleration API (shared data between FFmpeg and the video player)
- * HW decode acceleration for MPEG-2, MPEG-4, H.264 and VC-1
- *
- * Copyright (C) 2008-2009 Splitted-Desktop Systems
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_VAAPI_H
-#define AVCODEC_VAAPI_H
-
-#include <stdint.h>
-
-/**
- * \defgroup VAAPI_Decoding VA API Decoding
- * \ingroup Decoder
- * @{
- */
-
-/**
- * This structure is used to share data between the FFmpeg library and
- * the client video application.
- * This shall be zero-allocated and available as
- * AVCodecContext.hwaccel_context. All user members can be set once
- * during initialization or through each AVCodecContext.get_buffer()
- * function call. In any case, they must be valid prior to calling
- * decoding functions.
- */
-struct vaapi_context {
-    /**
-     * Window system dependent data
-     *
-     * - encoding: unused
-     * - decoding: Set by user
-     */
-    void *display;
-
-    /**
-     * Configuration ID
-     *
-     * - encoding: unused
-     * - decoding: Set by user
-     */
-    uint32_t config_id;
-
-    /**
-     * Context ID (video decode pipeline)
-     *
-     * - encoding: unused
-     * - decoding: Set by user
-     */
-    uint32_t context_id;
-
-    /**
-     * VAPictureParameterBuffer ID
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    uint32_t pic_param_buf_id;
-
-    /**
-     * VAIQMatrixBuffer ID
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    uint32_t iq_matrix_buf_id;
-
-    /**
-     * VABitPlaneBuffer ID (for VC-1 decoding)
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    uint32_t bitplane_buf_id;
-
-    /**
-     * Slice parameter/data buffer IDs
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    uint32_t *slice_buf_ids;
-
-    /**
-     * Number of effective slice buffer IDs to send to the HW
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    unsigned int n_slice_buf_ids;
-
-    /**
-     * Size of pre-allocated slice_buf_ids
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    unsigned int slice_buf_ids_alloc;
-
-    /**
-     * Pointer to VASliceParameterBuffers
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    void *slice_params;
-
-    /**
-     * Size of a VASliceParameterBuffer element
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    unsigned int slice_param_size;
-
-    /**
-     * Size of pre-allocated slice_params
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    unsigned int slice_params_alloc;
-
-    /**
-     * Number of slices currently filled in
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    unsigned int slice_count;
-
-    /**
-     * Pointer to slice data buffer base
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    const uint8_t *slice_data;
-
-    /**
-     * Current size of slice data
-     *
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    uint32_t slice_data_size;
-};
-
-/* @} */
-
-#endif /* AVCODEC_VAAPI_H */
diff --git a/lib-x86-64/include/libavcodec/vdpau.h b/lib-x86-64/include/libavcodec/vdpau.h
deleted file mode 100644
index ab5f682c..00000000
--- a/lib-x86-64/include/libavcodec/vdpau.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * The Video Decode and Presentation API for UNIX (VDPAU) is used for
- * hardware-accelerated decoding of MPEG-1/2, H.264 and VC-1.
- *
- * Copyright (C) 2008 NVIDIA
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_VDPAU_H
-#define AVCODEC_VDPAU_H
-
-/**
- * \defgroup Decoder VDPAU Decoder and Renderer
- *
- * VDPAU hardware acceleration has two modules
- * - VDPAU decoding
- * - VDPAU presentation
- *
- * The VDPAU decoding module parses all headers using FFmpeg
- * parsing mechanisms and uses VDPAU for the actual decoding.
- *
- * As per the current implementation, the actual decoding
- * and rendering (API calls) are done as part of the VDPAU
- * presentation (vo_vdpau.c) module.
- *
- * \defgroup  VDPAU_Decoding VDPAU Decoding
- * \ingroup Decoder
- * @{
- */
-
-#include <vdpau/vdpau.h>
-#include <vdpau/vdpau_x11.h>
-
-/** \brief The videoSurface is used for rendering. */
-#define FF_VDPAU_STATE_USED_FOR_RENDER 1
-
-/**
- * \brief The videoSurface is needed for reference/prediction.
- * The codec manipulates this.
- */
-#define FF_VDPAU_STATE_USED_FOR_REFERENCE 2
-
-/**
- * \brief This structure is used as a callback between the FFmpeg
- * decoder (vd_) and presentation (vo_) module.
- * This is used for defining a video frame containing surface,
- * picture parameter, bitstream information etc which are passed
- * between the FFmpeg decoder and its clients.
- */
-struct vdpau_render_state {
-    VdpVideoSurface surface; ///< Used as rendered surface, never changed.
-
-    int state; ///< Holds FF_VDPAU_STATE_* values.
-
-    /** picture parameter information for all supported codecs */
-    union VdpPictureInfo {
-        VdpPictureInfoH264        h264;
-        VdpPictureInfoMPEG1Or2    mpeg;
-        VdpPictureInfoVC1          vc1;
-        VdpPictureInfoMPEG4Part2 mpeg4;
-    } info;
-
-    /** Describe size/location of the compressed video data.
-        Set to 0 when freeing bitstream_buffers. */
-    int bitstream_buffers_allocated;
-    int bitstream_buffers_used;
-    /** The user is responsible for freeing this buffer using av_freep(). */
-    VdpBitstreamBuffer *bitstream_buffers;
-};
-
-/* @}*/
-
-#endif /* AVCODEC_VDPAU_H */
diff --git a/lib-x86-64/include/libavcodec/xvmc.h b/lib-x86-64/include/libavcodec/xvmc.h
deleted file mode 100644
index 29c010bf..00000000
--- a/lib-x86-64/include/libavcodec/xvmc.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright (C) 2003 Ivan Kalvachev
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_XVMC_H
-#define AVCODEC_XVMC_H
-
-#include <X11/extensions/XvMC.h>
-
-#include "avcodec.h"
-
-#if LIBAVCODEC_VERSION_MAJOR < 53
-#define AV_XVMC_STATE_DISPLAY_PENDING          1  /**  the surface should be shown, the video driver manipulates this */
-#define AV_XVMC_STATE_PREDICTION               2  /**  the surface is needed for prediction, the codec manipulates this */
-#define AV_XVMC_STATE_OSD_SOURCE               4  /**  the surface is needed for subpicture rendering */
-#endif
-#define AV_XVMC_ID                    0x1DC711C0  /**< special value to ensure that regular pixel routines haven't corrupted the struct
-                                                       the number is 1337 speak for the letters IDCT MCo (motion compensation) */
-
-struct xvmc_pix_fmt {
-    /** The field contains the special constant value AV_XVMC_ID.
-        It is used as a test that the application correctly uses the API,
-        and that there is no corruption caused by pixel routines.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             xvmc_id;
-
-    /** Pointer to the block array allocated by XvMCCreateBlocks().
-        The array has to be freed by XvMCDestroyBlocks().
-        Each group of 64 values represents one data block of differential
-        pixel information (in MoCo mode) or coefficients for IDCT.
-        - application - set the pointer during initialization
-        - libavcodec  - fills coefficients/pixel data into the array
-    */
-    short*          data_blocks;
-
-    /** Pointer to the macroblock description array allocated by
-        XvMCCreateMacroBlocks() and freed by XvMCDestroyMacroBlocks().
-        - application - set the pointer during initialization
-        - libavcodec  - fills description data into the array
-    */
-    XvMCMacroBlock* mv_blocks;
-
-    /** Number of macroblock descriptions that can be stored in the mv_blocks
-        array.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             allocated_mv_blocks;
-
-    /** Number of blocks that can be stored at once in the data_blocks array.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             allocated_data_blocks;
-
-    /** Indicate that the hardware would interpret data_blocks as IDCT
-        coefficients and perform IDCT on them.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             idct;
-
-    /** In MoCo mode it indicates that intra macroblocks are assumed to be in
-        unsigned format; same as the XVMC_INTRA_UNSIGNED flag.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             unsigned_intra;
-
-    /** Pointer to the surface allocated by XvMCCreateSurface().
-        It has to be freed by XvMCDestroySurface() on application exit.
-        It identifies the frame and its state on the video hardware.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    XvMCSurface*    p_surface;
-
-/** Set by the decoder before calling ff_draw_horiz_band(),
-    needed by the XvMCRenderSurface function. */
-//@{
-    /** Pointer to the surface used as past reference
-        - application - unchanged
-        - libavcodec  - set
-    */
-    XvMCSurface*    p_past_surface;
-
-    /** Pointer to the surface used as future reference
-        - application - unchanged
-        - libavcodec  - set
-    */
-    XvMCSurface*    p_future_surface;
-
-    /** top/bottom field or frame
-        - application - unchanged
-        - libavcodec  - set
-    */
-    unsigned int    picture_structure;
-
-    /** XVMC_SECOND_FIELD - 1st or 2nd field in the sequence
-        - application - unchanged
-        - libavcodec  - set
-    */
-    unsigned int    flags;
-//}@
-
-    /** Number of macroblock descriptions in the mv_blocks array
-        that have already been passed to the hardware.
-        - application - zeroes it on get_buffer().
-                        A successful ff_draw_horiz_band() may increment it
-                        with filled_mb_block_num or zero both.
-        - libavcodec  - unchanged
-    */
-    int             start_mv_blocks_num;
-
-    /** Number of new macroblock descriptions in the mv_blocks array (after
-        start_mv_blocks_num) that are filled by libavcodec and have to be
-        passed to the hardware.
-        - application - zeroes it on get_buffer() or after successful
-                        ff_draw_horiz_band().
-        - libavcodec  - increment with one of each stored MB
-    */
-    int             filled_mv_blocks_num;
-
-    /** Number of the the next free data block; one data block consists of
-        64 short values in the data_blocks array.
-        All blocks before this one have already been claimed by placing their
-        position into the corresponding block description structure field,
-        that are part of the mv_blocks array.
-        - application - zeroes it on get_buffer().
-                        A successful ff_draw_horiz_band() may zero it together
-                        with start_mb_blocks_num.
-        - libavcodec  - each decoded macroblock increases it by the number
-                        of coded blocks it contains.
-    */
-    int             next_free_data_block_num;
-
-/** extensions may be placed here */
-#if LIBAVCODEC_VERSION_MAJOR < 53
-//@{
-    /** State flags used to work around limitations in the MPlayer video system.
-        0   - Surface is not used.
-        1   - Surface is still held in application to be displayed or is
-              still visible.
-        2   - Surface is still held in libavcodec buffer for prediction.
-    */
-    int             state;
-
-    /** pointer to the surface where the subpicture is rendered */
-    void*           p_osd_target_surface_render;
-//}@
-#endif
-};
-
-#endif /* AVCODEC_XVMC_H */
diff --git a/lib-x86-64/include/libavcore/avcore.h b/lib-x86-64/include/libavcore/avcore.h
deleted file mode 100644
index a77bab84..00000000
--- a/lib-x86-64/include/libavcore/avcore.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCORE_AVCORE_H
-#define AVCORE_AVCORE_H
-
-/**
- * @file
- * shared media utilities for the libav* libraries
- */
-
-#include "libavutil/avutil.h"
-
-#define LIBAVCORE_VERSION_MAJOR  0
-#define LIBAVCORE_VERSION_MINOR  9
-#define LIBAVCORE_VERSION_MICRO  1
-
-#define LIBAVCORE_VERSION_INT   AV_VERSION_INT(LIBAVCORE_VERSION_MAJOR, \
-                                               LIBAVCORE_VERSION_MINOR, \
-                                               LIBAVCORE_VERSION_MICRO)
-#define LIBAVCORE_VERSION       AV_VERSION(LIBAVCORE_VERSION_MAJOR,     \
-                                           LIBAVCORE_VERSION_MINOR,     \
-                                           LIBAVCORE_VERSION_MICRO)
-#define LIBAVCORE_BUILD         LIBAVCORE_VERSION_INT
-
-#define LIBAVCORE_IDENT         "Lavcore" AV_STRINGIFY(LIBAVCORE_VERSION)
-
-/**
- * Return the LIBAVCORE_VERSION_INT constant.
- */
-unsigned avcore_version(void);
-
-/**
- * Return the libavcore build-time configuration.
- */
-const char *avcore_configuration(void);
-
-/**
- * Return the libavcore license.
- */
-const char *avcore_license(void);
-
-/**
- * Those FF_API_* defines are not part of public API.
- * They may change, break or disappear at any time.
- */
-#ifndef FF_API_OLD_IMAGE_NAMES
-#define FF_API_OLD_IMAGE_NAMES (LIBAVCORE_VERSION_MAJOR < 1)
-#endif
-
-#endif /* AVCORE_AVCORE_H */
diff --git a/lib-x86-64/include/libavcore/imgutils.h b/lib-x86-64/include/libavcore/imgutils.h
deleted file mode 100644
index 8458fc6b..00000000
--- a/lib-x86-64/include/libavcore/imgutils.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCORE_IMGUTILS_H
-#define AVCORE_IMGUTILS_H
-
-/**
- * @file
- * misc image utilities
- */
-
-#include "libavutil/pixdesc.h"
-#include "avcore.h"
-
-/**
- * Compute the max pixel step for each plane of an image with a
- * format described by pixdesc.
- *
- * The pixel step is the distance in bytes between the first byte of
- * the group of bytes which describe a pixel component and the first
- * byte of the successive group in the same plane for the same
- * component.
- *
- * @param max_pixsteps an array which is filled with the max pixel step
- * for each plane. Since a plane may contain different pixel
- * components, the computed max_pixsteps[plane] is relative to the
- * component in the plane with the max pixel step.
- * @param max_pixstep_comps an array which is filled with the component
- * for each plane which has the max pixel step. May be NULL.
- */
-void av_image_fill_max_pixsteps(int max_pixsteps[4], int max_pixstep_comps[4],
-                                const AVPixFmtDescriptor *pixdesc);
-
-/**
- * Compute the size of an image line with format pix_fmt and width
- * width for the plane plane.
- *
- * @return the computed size in bytes
- */
-int av_image_get_linesize(enum PixelFormat pix_fmt, int width, int plane);
-
-/**
- * Fill plane linesizes for an image with pixel format pix_fmt and
- * width width.
- *
- * @param linesizes array to be filled with the linesize for each plane
- * @return >= 0 in case of success, a negative error code otherwise
- */
-int av_image_fill_linesizes(int linesizes[4], enum PixelFormat pix_fmt, int width);
-
-/**
- * Fill plane data pointers for an image with pixel format pix_fmt and
- * height height.
- *
- * @param data pointers array to be filled with the pointer for each image plane
- * @param ptr the pointer to a buffer which will contain the image
- * @param linesizes[4] the array containing the linesize for each
- * plane, should be filled by av_image_fill_linesizes()
- * @return the size in bytes required for the image buffer, a negative
- * error code in case of failure
- */
-int av_image_fill_pointers(uint8_t *data[4], enum PixelFormat pix_fmt, int height,
-                           uint8_t *ptr, const int linesizes[4]);
-
-/**
- * Copy image plane from src to dst.
- * That is, copy "height" number of lines of "bytewidth" bytes each.
- * The first byte of each successive line is separated by *_linesize
- * bytes.
- *
- * @param dst_linesize linesize for the image plane in dst
- * @param src_linesize linesize for the image plane in src
- */
-void av_image_copy_plane(uint8_t       *dst, int dst_linesize,
-                         const uint8_t *src, int src_linesize,
-                         int bytewidth, int height);
-
-/**
- * Copy image in src_data to dst_data.
- *
- * @param dst_linesize linesizes for the image in dst_data
- * @param src_linesize linesizes for the image in src_data
- */
-void av_image_copy(uint8_t *dst_data[4], int dst_linesizes[4],
-                   const uint8_t *src_data[4], const int src_linesizes[4],
-                   enum PixelFormat pix_fmt, int width, int height);
-
-/**
- * Check if the given dimension of an image is valid, meaning that all
- * bytes of the image can be addressed with a signed int.
- *
- * @param w the width of the picture
- * @param h the height of the picture
- * @param log_offset the offset to sum to the log level for logging with log_ctx
- * @param log_ctx the parent logging context, it may be NULL
- * @return >= 0 if valid, a negative error code otherwise
- */
-int av_image_check_size(unsigned int w, unsigned int h, int log_offset, void *log_ctx);
-
-#if FF_API_OLD_IMAGE_NAMES
-attribute_deprecated
-void av_fill_image_max_pixsteps(int max_pixsteps[4], int max_pixstep_comps[4],
-                                const AVPixFmtDescriptor *pixdesc);
-
-attribute_deprecated
-int av_get_image_linesize(enum PixelFormat pix_fmt, int width, int plane);
-
-attribute_deprecated
-int av_fill_image_linesizes(int linesizes[4], enum PixelFormat pix_fmt, int width);
-
-attribute_deprecated
-int av_fill_image_pointers(uint8_t *data[4], enum PixelFormat pix_fmt, int height,
-                           uint8_t *ptr, const int linesizes[4]);
-
-attribute_deprecated
-int av_check_image_size(unsigned int w, unsigned int h, int log_offset, void *log_ctx);
-#endif
-
-#endif /* AVCORE_IMGUTILS_H */
diff --git a/lib-x86-64/include/libavcore/parseutils.h b/lib-x86-64/include/libavcore/parseutils.h
deleted file mode 100644
index ad31ef29..00000000
--- a/lib-x86-64/include/libavcore/parseutils.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCORE_PARSEUTILS_H
-#define AVCORE_PARSEUTILS_H
-
-#include "libavutil/rational.h"
-
-/**
- * @file
- * misc parsing utilities for libavcore
- */
-
-/**
- * Parse str and put in width_ptr and height_ptr the detected values.
- *
- * @param[in,out] width_ptr pointer to the variable which will contain the detected
- * width value
- * @param[in,out] height_ptr pointer to the variable which will contain the detected
- * height value
- * @param[in] str the string to parse: it has to be a string in the format
- * width x height or a valid video size abbreviation.
- * @return >= 0 on success, a negative error code otherwise
- */
-int av_parse_video_size(int *width_ptr, int *height_ptr, const char *str);
-
-/**
- * Parse str and store the detected values in *rate.
- *
- * @param[in,out] rate pointer to the AVRational which will contain the detected
- * frame rate
- * @param[in] str the string to parse: it has to be a string in the format
- * rate_num / rate_den, a float number or a valid video rate abbreviation
- * @return >= 0 on success, a negative error code otherwise
- */
-int av_parse_video_rate(AVRational *rate, const char *str);
-
-#endif /* AVCORE_PARSEUTILS_H */
diff --git a/lib-x86-64/include/libavfilter/avfilter.h b/lib-x86-64/include/libavfilter/avfilter.h
deleted file mode 100644
index f29ebe7f..00000000
--- a/lib-x86-64/include/libavfilter/avfilter.h
+++ /dev/null
@@ -1,840 +0,0 @@
-/*
- * filter layer
- * copyright (c) 2007 Bobby Bingham
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVFILTER_AVFILTER_H
-#define AVFILTER_AVFILTER_H
-
-#include "libavutil/avutil.h"
-
-#define LIBAVFILTER_VERSION_MAJOR  1
-#define LIBAVFILTER_VERSION_MINOR 51
-#define LIBAVFILTER_VERSION_MICRO  1
-
-#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
-                                               LIBAVFILTER_VERSION_MINOR, \
-                                               LIBAVFILTER_VERSION_MICRO)
-#define LIBAVFILTER_VERSION     AV_VERSION(LIBAVFILTER_VERSION_MAJOR,   \
-                                           LIBAVFILTER_VERSION_MINOR,   \
-                                           LIBAVFILTER_VERSION_MICRO)
-#define LIBAVFILTER_BUILD       LIBAVFILTER_VERSION_INT
-
-#include <stddef.h>
-#include "libavcodec/avcodec.h"
-
-/**
- * Return the LIBAVFILTER_VERSION_INT constant.
- */
-unsigned avfilter_version(void);
-
-/**
- * Return the libavfilter build-time configuration.
- */
-const char *avfilter_configuration(void);
-
-/**
- * Return the libavfilter license.
- */
-const char *avfilter_license(void);
-
-
-typedef struct AVFilterContext AVFilterContext;
-typedef struct AVFilterLink    AVFilterLink;
-typedef struct AVFilterPad     AVFilterPad;
-
-/**
- * A reference-counted buffer data type used by the filter system. Filters
- * should not store pointers to this structure directly, but instead use the
- * AVFilterBufferRef structure below.
- */
-typedef struct AVFilterBuffer {
-    uint8_t *data[8];           ///< buffer data for each plane/channel
-    int linesize[8];            ///< number of bytes per line
-
-    unsigned refcount;          ///< number of references to this buffer
-
-    /** private data to be used by a custom free function */
-    void *priv;
-    /**
-     * A pointer to the function to deallocate this buffer if the default
-     * function is not sufficient. This could, for example, add the memory
-     * back into a memory pool to be reused later without the overhead of
-     * reallocating it from scratch.
-     */
-    void (*free)(struct AVFilterBuffer *buf);
-} AVFilterBuffer;
-
-#define AV_PERM_READ     0x01   ///< can read from the buffer
-#define AV_PERM_WRITE    0x02   ///< can write to the buffer
-#define AV_PERM_PRESERVE 0x04   ///< nobody else can overwrite the buffer
-#define AV_PERM_REUSE    0x08   ///< can output the buffer multiple times, with the same contents each time
-#define AV_PERM_REUSE2   0x10   ///< can output the buffer multiple times, modified each time
-
-/**
- * Audio specific properties in a reference to an AVFilterBuffer. Since
- * AVFilterBufferRef is common to different media formats, audio specific
- * per reference properties must be separated out.
- */
-typedef struct AVFilterBufferRefAudioProps {
-    int64_t channel_layout;     ///< channel layout of audio buffer
-    int samples_nb;             ///< number of audio samples
-    int size;                   ///< audio buffer size
-    uint32_t sample_rate;       ///< audio buffer sample rate
-    int planar;                 ///< audio buffer - planar or packed
-} AVFilterBufferRefAudioProps;
-
-/**
- * Video specific properties in a reference to an AVFilterBuffer. Since
- * AVFilterBufferRef is common to different media formats, video specific
- * per reference properties must be separated out.
- */
-typedef struct AVFilterBufferRefVideoProps {
-    int w;                      ///< image width
-    int h;                      ///< image height
-    AVRational pixel_aspect;    ///< pixel aspect ratio
-    int interlaced;             ///< is frame interlaced
-    int top_field_first;        ///< field order
-} AVFilterBufferRefVideoProps;
-
-/**
- * A reference to an AVFilterBuffer. Since filters can manipulate the origin of
- * a buffer to, for example, crop image without any memcpy, the buffer origin
- * and dimensions are per-reference properties. Linesize is also useful for
- * image flipping, frame to field filters, etc, and so is also per-reference.
- *
- * TODO: add anything necessary for frame reordering
- */
-typedef struct AVFilterBufferRef {
-    AVFilterBuffer *buf;        ///< the buffer that this is a reference to
-    uint8_t *data[8];           ///< picture/audio data for each plane
-    int linesize[8];            ///< number of bytes per line
-    int format;                 ///< media format
-
-    /**
-     * presentation timestamp. The time unit may change during
-     * filtering, as it is specified in the link and the filter code
-     * may need to rescale the PTS accordingly.
-     */
-    int64_t pts;
-    int64_t pos;                ///< byte position in stream, -1 if unknown
-
-    int perms;                  ///< permissions, see the AV_PERM_* flags
-
-    enum AVMediaType type;      ///< media type of buffer data
-    AVFilterBufferRefVideoProps *video; ///< video buffer specific properties
-    AVFilterBufferRefAudioProps *audio; ///< audio buffer specific properties
-} AVFilterBufferRef;
-
-/**
- * Copy properties of src to dst, without copying the actual data
- */
-static inline void avfilter_copy_buffer_ref_props(AVFilterBufferRef *dst, AVFilterBufferRef *src)
-{
-    // copy common properties
-    dst->pts             = src->pts;
-    dst->pos             = src->pos;
-
-    switch (src->type) {
-    case AVMEDIA_TYPE_VIDEO: *dst->video = *src->video; break;
-    case AVMEDIA_TYPE_AUDIO: *dst->audio = *src->audio; break;
-    }
-}
-
-/**
- * Add a new reference to a buffer.
- *
- * @param ref   an existing reference to the buffer
- * @param pmask a bitmask containing the allowable permissions in the new
- *              reference
- * @return      a new reference to the buffer with the same properties as the
- *              old, excluding any permissions denied by pmask
- */
-AVFilterBufferRef *avfilter_ref_buffer(AVFilterBufferRef *ref, int pmask);
-
-/**
- * Remove a reference to a buffer. If this is the last reference to the
- * buffer, the buffer itself is also automatically freed.
- *
- * @param ref reference to the buffer
- */
-void avfilter_unref_buffer(AVFilterBufferRef *ref);
-
-/**
- * A list of supported formats for one end of a filter link. This is used
- * during the format negotiation process to try to pick the best format to
- * use to minimize the number of necessary conversions. Each filter gives a
- * list of the formats supported by each input and output pad. The list
- * given for each pad need not be distinct - they may be references to the
- * same list of formats, as is often the case when a filter supports multiple
- * formats, but will always output the same format as it is given in input.
- *
- * In this way, a list of possible input formats and a list of possible
- * output formats are associated with each link. When a set of formats is
- * negotiated over a link, the input and output lists are merged to form a
- * new list containing only the common elements of each list. In the case
- * that there were no common elements, a format conversion is necessary.
- * Otherwise, the lists are merged, and all other links which reference
- * either of the format lists involved in the merge are also affected.
- *
- * For example, consider the filter chain:
- * filter (a) --> (b) filter (b) --> (c) filter
- *
- * where the letters in parenthesis indicate a list of formats supported on
- * the input or output of the link. Suppose the lists are as follows:
- * (a) = {A, B}
- * (b) = {A, B, C}
- * (c) = {B, C}
- *
- * First, the first link's lists are merged, yielding:
- * filter (a) --> (a) filter (a) --> (c) filter
- *
- * Notice that format list (b) now refers to the same list as filter list (a).
- * Next, the lists for the second link are merged, yielding:
- * filter (a) --> (a) filter (a) --> (a) filter
- *
- * where (a) = {B}.
- *
- * Unfortunately, when the format lists at the two ends of a link are merged,
- * we must ensure that all links which reference either pre-merge format list
- * get updated as well. Therefore, we have the format list structure store a
- * pointer to each of the pointers to itself.
- */
-typedef struct AVFilterFormats {
-    unsigned format_count;      ///< number of formats
-    int *formats;               ///< list of media formats
-
-    unsigned refcount;          ///< number of references to this list
-    struct AVFilterFormats ***refs; ///< references to this list
-}  AVFilterFormats;;
-
-/**
- * Create a list of supported formats. This is intended for use in
- * AVFilter->query_formats().
- *
- * @param fmts list of media formats, terminated by -1
- * @return the format list, with no existing references
- */
-AVFilterFormats *avfilter_make_format_list(const int *fmts);
-
-/**
- * Add fmt to the list of media formats contained in *avff.
- * If *avff is NULL the function allocates the filter formats struct
- * and puts its pointer in *avff.
- *
- * @return a non negative value in case of success, or a negative
- * value corresponding to an AVERROR code in case of error
- */
-int avfilter_add_format(AVFilterFormats **avff, int fmt);
-
-/**
- * Return a list of all formats supported by FFmpeg for the given media type.
- */
-AVFilterFormats *avfilter_all_formats(enum AVMediaType type);
-
-/**
- * Return a format list which contains the intersection of the formats of
- * a and b. Also, all the references of a, all the references of b, and
- * a and b themselves will be deallocated.
- *
- * If a and b do not share any common formats, neither is modified, and NULL
- * is returned.
- */
-AVFilterFormats *avfilter_merge_formats(AVFilterFormats *a, AVFilterFormats *b);
-
-/**
- * Add *ref as a new reference to formats.
- * That is the pointers will point like in the ascii art below:
- *   ________
- *  |formats |<--------.
- *  |  ____  |     ____|___________________
- *  | |refs| |    |  __|_
- *  | |* * | |    | |  | |  AVFilterLink
- *  | |* *--------->|*ref|
- *  | |____| |    | |____|
- *  |________|    |________________________
- */
-void avfilter_formats_ref(AVFilterFormats *formats, AVFilterFormats **ref);
-
-/**
- * If *ref is non-NULL, remove *ref as a reference to the format list
- * it currently points to, deallocates that list if this was the last
- * reference, and sets *ref to NULL.
- *
- *         Before                                 After
- *   ________                               ________         NULL
- *  |formats |<--------.                   |formats |         ^
- *  |  ____  |     ____|________________   |  ____  |     ____|________________
- *  | |refs| |    |  __|_                  | |refs| |    |  __|_
- *  | |* * | |    | |  | |  AVFilterLink   | |* * | |    | |  | |  AVFilterLink
- *  | |* *--------->|*ref|                 | |*   | |    | |*ref|
- *  | |____| |    | |____|                 | |____| |    | |____|
- *  |________|    |_____________________   |________|    |_____________________
- */
-void avfilter_formats_unref(AVFilterFormats **ref);
-
-/**
- *
- *         Before                                 After
- *   ________                         ________
- *  |formats |<---------.            |formats |<---------.
- *  |  ____  |       ___|___         |  ____  |       ___|___
- *  | |refs| |      |   |   |        | |refs| |      |   |   |   NULL
- *  | |* *--------->|*oldref|        | |* *--------->|*newref|     ^
- *  | |* * | |      |_______|        | |* * | |      |_______|  ___|___
- *  | |____| |                       | |____| |                |   |   |
- *  |________|                       |________|                |*oldref|
- *                                                             |_______|
- */
-void avfilter_formats_changeref(AVFilterFormats **oldref,
-                                AVFilterFormats **newref);
-
-/**
- * A filter pad used for either input or output.
- */
-struct AVFilterPad {
-    /**
-     * Pad name. The name is unique among inputs and among outputs, but an
-     * input may have the same name as an output. This may be NULL if this
-     * pad has no need to ever be referenced by name.
-     */
-    const char *name;
-
-    /**
-     * AVFilterPad type. Only video supported now, hopefully someone will
-     * add audio in the future.
-     */
-    enum AVMediaType type;
-
-    /**
-     * Minimum required permissions on incoming buffers. Any buffer with
-     * insufficient permissions will be automatically copied by the filter
-     * system to a new buffer which provides the needed access permissions.
-     *
-     * Input pads only.
-     */
-    int min_perms;
-
-    /**
-     * Permissions which are not accepted on incoming buffers. Any buffer
-     * which has any of these permissions set will be automatically copied
-     * by the filter system to a new buffer which does not have those
-     * permissions. This can be used to easily disallow buffers with
-     * AV_PERM_REUSE.
-     *
-     * Input pads only.
-     */
-    int rej_perms;
-
-    /**
-     * Callback called before passing the first slice of a new frame. If
-     * NULL, the filter layer will default to storing a reference to the
-     * picture inside the link structure.
-     *
-     * Input video pads only.
-     */
-    void (*start_frame)(AVFilterLink *link, AVFilterBufferRef *picref);
-
-    /**
-     * Callback function to get a video buffer. If NULL, the filter system will
-     * use avfilter_default_get_video_buffer().
-     *
-     * Input video pads only.
-     */
-    AVFilterBufferRef *(*get_video_buffer)(AVFilterLink *link, int perms, int w, int h);
-
-    /**
-     * Callback function to get an audio buffer. If NULL, the filter system will
-     * use avfilter_default_get_audio_buffer().
-     *
-     * Input audio pads only.
-     */
-    AVFilterBufferRef *(*get_audio_buffer)(AVFilterLink *link, int perms,
-                                           enum SampleFormat sample_fmt, int size,
-                                           int64_t channel_layout, int planar);
-
-    /**
-     * Callback called after the slices of a frame are completely sent. If
-     * NULL, the filter layer will default to releasing the reference stored
-     * in the link structure during start_frame().
-     *
-     * Input video pads only.
-     */
-    void (*end_frame)(AVFilterLink *link);
-
-    /**
-     * Slice drawing callback. This is where a filter receives video data
-     * and should do its processing.
-     *
-     * Input video pads only.
-     */
-    void (*draw_slice)(AVFilterLink *link, int y, int height, int slice_dir);
-
-    /**
-     * Samples filtering callback. This is where a filter receives audio data
-     * and should do its processing.
-     *
-     * Input audio pads only.
-     */
-    void (*filter_samples)(AVFilterLink *link, AVFilterBufferRef *samplesref);
-
-    /**
-     * Frame poll callback. This returns the number of immediately available
-     * samples. It should return a positive value if the next request_frame()
-     * is guaranteed to return one frame (with no delay).
-     *
-     * Defaults to just calling the source poll_frame() method.
-     *
-     * Output video pads only.
-     */
-    int (*poll_frame)(AVFilterLink *link);
-
-    /**
-     * Frame request callback. A call to this should result in at least one
-     * frame being output over the given link. This should return zero on
-     * success, and another value on error.
-     *
-     * Output video pads only.
-     */
-    int (*request_frame)(AVFilterLink *link);
-
-    /**
-     * Link configuration callback.
-     *
-     * For output pads, this should set the link properties such as
-     * width/height. This should NOT set the format property - that is
-     * negotiated between filters by the filter system using the
-     * query_formats() callback before this function is called.
-     *
-     * For input pads, this should check the properties of the link, and update
-     * the filter's internal state as necessary.
-     *
-     * For both input and output filters, this should return zero on success,
-     * and another value on error.
-     */
-    int (*config_props)(AVFilterLink *link);
-};
-
-/** default handler for start_frame() for video inputs */
-void avfilter_default_start_frame(AVFilterLink *link, AVFilterBufferRef *picref);
-
-/** default handler for draw_slice() for video inputs */
-void avfilter_default_draw_slice(AVFilterLink *link, int y, int h, int slice_dir);
-
-/** default handler for end_frame() for video inputs */
-void avfilter_default_end_frame(AVFilterLink *link);
-
-/** default handler for filter_samples() for audio inputs */
-void avfilter_default_filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref);
-
-/** default handler for config_props() for audio/video outputs */
-int avfilter_default_config_output_link(AVFilterLink *link);
-
-/** default handler for config_props() for audio/video inputs */
-int avfilter_default_config_input_link (AVFilterLink *link);
-
-/** default handler for get_video_buffer() for video inputs */
-AVFilterBufferRef *avfilter_default_get_video_buffer(AVFilterLink *link,
-                                                     int perms, int w, int h);
-
-/** default handler for get_audio_buffer() for audio inputs */
-AVFilterBufferRef *avfilter_default_get_audio_buffer(AVFilterLink *link, int perms,
-                                                     enum SampleFormat sample_fmt, int size,
-                                                     int64_t channel_layout, int planar);
-
-/**
- * A helper for query_formats() which sets all links to the same list of
- * formats. If there are no links hooked to this filter, the list of formats is
- * freed.
- */
-void avfilter_set_common_formats(AVFilterContext *ctx, AVFilterFormats *formats);
-
-/** Default handler for query_formats() */
-int avfilter_default_query_formats(AVFilterContext *ctx);
-
-/** start_frame() handler for filters which simply pass video along */
-void avfilter_null_start_frame(AVFilterLink *link, AVFilterBufferRef *picref);
-
-/** draw_slice() handler for filters which simply pass video along */
-void avfilter_null_draw_slice(AVFilterLink *link, int y, int h, int slice_dir);
-
-/** end_frame() handler for filters which simply pass video along */
-void avfilter_null_end_frame(AVFilterLink *link);
-
-/** filter_samples() handler for filters which simply pass audio along */
-void avfilter_null_filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref);
-
-/** get_video_buffer() handler for filters which simply pass video along */
-AVFilterBufferRef *avfilter_null_get_video_buffer(AVFilterLink *link,
-                                                  int perms, int w, int h);
-
-/** get_audio_buffer() handler for filters which simply pass audio along */
-AVFilterBufferRef *avfilter_null_get_audio_buffer(AVFilterLink *link, int perms,
-                                                  enum SampleFormat sample_fmt, int size,
-                                                  int64_t channel_layout, int planar);
-
-/**
- * Filter definition. This defines the pads a filter contains, and all the
- * callback functions used to interact with the filter.
- */
-typedef struct AVFilter {
-    const char *name;         ///< filter name
-
-    int priv_size;      ///< size of private data to allocate for the filter
-
-    /**
-     * Filter initialization function. Args contains the user-supplied
-     * parameters. FIXME: maybe an AVOption-based system would be better?
-     * opaque is data provided by the code requesting creation of the filter,
-     * and is used to pass data to the filter.
-     */
-    int (*init)(AVFilterContext *ctx, const char *args, void *opaque);
-
-    /**
-     * Filter uninitialization function. Should deallocate any memory held
-     * by the filter, release any buffer references, etc. This does not need
-     * to deallocate the AVFilterContext->priv memory itself.
-     */
-    void (*uninit)(AVFilterContext *ctx);
-
-    /**
-     * Queries formats supported by the filter and its pads, and sets the
-     * in_formats for links connected to its output pads, and out_formats
-     * for links connected to its input pads.
-     *
-     * @return zero on success, a negative value corresponding to an
-     * AVERROR code otherwise
-     */
-    int (*query_formats)(AVFilterContext *);
-
-    const AVFilterPad *inputs;  ///< NULL terminated list of inputs. NULL if none
-    const AVFilterPad *outputs; ///< NULL terminated list of outputs. NULL if none
-
-    /**
-     * A description for the filter. You should use the
-     * NULL_IF_CONFIG_SMALL() macro to define it.
-     */
-    const char *description;
-} AVFilter;
-
-/** An instance of a filter */
-struct AVFilterContext {
-    const AVClass *av_class;              ///< needed for av_log()
-
-    AVFilter *filter;               ///< the AVFilter of which this is an instance
-
-    char *name;                     ///< name of this filter instance
-
-    unsigned input_count;           ///< number of input pads
-    AVFilterPad   *input_pads;      ///< array of input pads
-    AVFilterLink **inputs;          ///< array of pointers to input links
-
-    unsigned output_count;          ///< number of output pads
-    AVFilterPad   *output_pads;     ///< array of output pads
-    AVFilterLink **outputs;         ///< array of pointers to output links
-
-    void *priv;                     ///< private data for use by the filter
-};
-
-/**
- * A link between two filters. This contains pointers to the source and
- * destination filters between which this link exists, and the indexes of
- * the pads involved. In addition, this link also contains the parameters
- * which have been negotiated and agreed upon between the filter, such as
- * image dimensions, format, etc.
- */
-struct AVFilterLink {
-    AVFilterContext *src;       ///< source filter
-    AVFilterPad *srcpad;        ///< output pad on the source filter
-
-    AVFilterContext *dst;       ///< dest filter
-    AVFilterPad *dstpad;        ///< input pad on the dest filter
-
-    /** stage of the initialization of the link properties (dimensions, etc) */
-    enum {
-        AVLINK_UNINIT = 0,      ///< not started
-        AVLINK_STARTINIT,       ///< started, but incomplete
-        AVLINK_INIT             ///< complete
-    } init_state;
-
-    enum AVMediaType type;      ///< filter media type
-
-    /* These two parameters apply only to video */
-    int w;                      ///< agreed upon image width
-    int h;                      ///< agreed upon image height
-    /* These two parameters apply only to audio */
-    int64_t channel_layout;     ///< channel layout of current buffer (see avcodec.h)
-    int64_t sample_rate;        ///< samples per second
-
-    int format;                 ///< agreed upon media format
-
-    /**
-     * Lists of formats supported by the input and output filters respectively.
-     * These lists are used for negotiating the format to actually be used,
-     * which will be loaded into the format member, above, when chosen.
-     */
-    AVFilterFormats *in_formats;
-    AVFilterFormats *out_formats;
-
-    /**
-     * The buffer reference currently being sent across the link by the source
-     * filter. This is used internally by the filter system to allow
-     * automatic copying of buffers which do not have sufficient permissions
-     * for the destination. This should not be accessed directly by the
-     * filters.
-     */
-    AVFilterBufferRef *src_buf;
-
-    AVFilterBufferRef *cur_buf;
-    AVFilterBufferRef *out_buf;
-
-    /**
-     * Define the time base used by the PTS of the frames/samples
-     * which will pass through this link.
-     * During the configuration stage, each filter is supposed to
-     * change only the output timebase, while the timebase of the
-     * input link is assumed to be an unchangeable property.
-     */
-    AVRational time_base;
-};
-
-/**
- * Link two filters together.
- *
- * @param src    the source filter
- * @param srcpad index of the output pad on the source filter
- * @param dst    the destination filter
- * @param dstpad index of the input pad on the destination filter
- * @return       zero on success
- */
-int avfilter_link(AVFilterContext *src, unsigned srcpad,
-                  AVFilterContext *dst, unsigned dstpad);
-
-/**
- * Negotiate the media format, dimensions, etc of all inputs to a filter.
- *
- * @param filter the filter to negotiate the properties for its inputs
- * @return       zero on successful negotiation
- */
-int avfilter_config_links(AVFilterContext *filter);
-
-/**
- * Request a picture buffer with a specific set of permissions.
- *
- * @param link  the output link to the filter from which the buffer will
- *              be requested
- * @param perms the required access permissions
- * @param w     the minimum width of the buffer to allocate
- * @param h     the minimum height of the buffer to allocate
- * @return      A reference to the buffer. This must be unreferenced with
- *              avfilter_unref_buffer when you are finished with it.
- */
-AVFilterBufferRef *avfilter_get_video_buffer(AVFilterLink *link, int perms,
-                                          int w, int h);
-
-/**
- * Request an audio samples buffer with a specific set of permissions.
- *
- * @param link           the output link to the filter from which the buffer will
- *                       be requested
- * @param perms          the required access permissions
- * @param sample_fmt     the format of each sample in the buffer to allocate
- * @param size           the buffer size in bytes
- * @param channel_layout the number and type of channels per sample in the buffer to allocate
- * @param planar         audio data layout - planar or packed
- * @return               A reference to the samples. This must be unreferenced with
- *                       avfilter_unref_buffer when you are finished with it.
- */
-AVFilterBufferRef *avfilter_get_audio_buffer(AVFilterLink *link, int perms,
-                                             enum SampleFormat sample_fmt, int size,
-                                             int64_t channel_layout, int planar);
-
-/**
- * Request an input frame from the filter at the other end of the link.
- *
- * @param link the input link
- * @return     zero on success
- */
-int avfilter_request_frame(AVFilterLink *link);
-
-/**
- * Poll a frame from the filter chain.
- *
- * @param  link the input link
- * @return the number of immediately available frames, a negative
- * number in case of error
- */
-int avfilter_poll_frame(AVFilterLink *link);
-
-/**
- * Notifie the next filter of the start of a frame.
- *
- * @param link   the output link the frame will be sent over
- * @param picref A reference to the frame about to be sent. The data for this
- *               frame need only be valid once draw_slice() is called for that
- *               portion. The receiving filter will free this reference when
- *               it no longer needs it.
- */
-void avfilter_start_frame(AVFilterLink *link, AVFilterBufferRef *picref);
-
-/**
- * Notifie the next filter that the current frame has finished.
- *
- * @param link the output link the frame was sent over
- */
-void avfilter_end_frame(AVFilterLink *link);
-
-/**
- * Send a slice to the next filter.
- *
- * Slices have to be provided in sequential order, either in
- * top-bottom or bottom-top order. If slices are provided in
- * non-sequential order the behavior of the function is undefined.
- *
- * @param link the output link over which the frame is being sent
- * @param y    offset in pixels from the top of the image for this slice
- * @param h    height of this slice in pixels
- * @param slice_dir the assumed direction for sending slices,
- *             from the top slice to the bottom slice if the value is 1,
- *             from the bottom slice to the top slice if the value is -1,
- *             for other values the behavior of the function is undefined.
- */
-void avfilter_draw_slice(AVFilterLink *link, int y, int h, int slice_dir);
-
-/**
- * Send a buffer of audio samples to the next filter.
- *
- * @param link       the output link over which the audio samples are being sent
- * @param samplesref a reference to the buffer of audio samples being sent. The
- *                   receiving filter will free this reference when it no longer
- *                   needs it or pass it on to the next filter.
- */
-void avfilter_filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref);
-
-/** Initialize the filter system. Register all builtin filters. */
-void avfilter_register_all(void);
-
-/** Uninitialize the filter system. Unregister all filters. */
-void avfilter_uninit(void);
-
-/**
- * Register a filter. This is only needed if you plan to use
- * avfilter_get_by_name later to lookup the AVFilter structure by name. A
- * filter can still by instantiated with avfilter_open even if it is not
- * registered.
- *
- * @param filter the filter to register
- * @return 0 if the registration was succesfull, a negative value
- * otherwise
- */
-int avfilter_register(AVFilter *filter);
-
-/**
- * Get a filter definition matching the given name.
- *
- * @param name the filter name to find
- * @return     the filter definition, if any matching one is registered.
- *             NULL if none found.
- */
-AVFilter *avfilter_get_by_name(const char *name);
-
-/**
- * If filter is NULL, returns a pointer to the first registered filter pointer,
- * if filter is non-NULL, returns the next pointer after filter.
- * If the returned pointer points to NULL, the last registered filter
- * was already reached.
- */
-AVFilter **av_filter_next(AVFilter **filter);
-
-/**
- * Create a filter instance.
- *
- * @param filter_ctx put here a pointer to the created filter context
- * on success, NULL on failure
- * @param filter    the filter to create an instance of
- * @param inst_name Name to give to the new instance. Can be NULL for none.
- * @return >= 0 in case of success, a negative error code otherwise
- */
-int avfilter_open(AVFilterContext **filter_ctx, AVFilter *filter, const char *inst_name);
-
-/**
- * Initialize a filter.
- *
- * @param filter the filter to initialize
- * @param args   A string of parameters to use when initializing the filter.
- *               The format and meaning of this string varies by filter.
- * @param opaque Any extra non-string data needed by the filter. The meaning
- *               of this parameter varies by filter.
- * @return       zero on success
- */
-int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque);
-
-/**
- * Destroy a filter.
- *
- * @param filter the filter to destroy
- */
-void avfilter_destroy(AVFilterContext *filter);
-
-/**
- * Insert a filter in the middle of an existing link.
- *
- * @param link the link into which the filter should be inserted
- * @param filt the filter to be inserted
- * @param filt_srcpad_idx the input pad on the filter to connect
- * @param filt_dstpad_idx the output pad on the filter to connect
- * @return     zero on success
- */
-int avfilter_insert_filter(AVFilterLink *link, AVFilterContext *filt,
-                           unsigned filt_srcpad_idx, unsigned filt_dstpad_idx);
-
-/**
- * Insert a new pad.
- *
- * @param idx Insertion point. Pad is inserted at the end if this point
- *            is beyond the end of the list of pads.
- * @param count Pointer to the number of pads in the list
- * @param padidx_off Offset within an AVFilterLink structure to the element
- *                   to increment when inserting a new pad causes link
- *                   numbering to change
- * @param pads Pointer to the pointer to the beginning of the list of pads
- * @param links Pointer to the pointer to the beginning of the list of links
- * @param newpad The new pad to add. A copy is made when adding.
- */
-void avfilter_insert_pad(unsigned idx, unsigned *count, size_t padidx_off,
-                         AVFilterPad **pads, AVFilterLink ***links,
-                         AVFilterPad *newpad);
-
-/** Insert a new input pad for the filter. */
-static inline void avfilter_insert_inpad(AVFilterContext *f, unsigned index,
-                                         AVFilterPad *p)
-{
-    avfilter_insert_pad(index, &f->input_count, offsetof(AVFilterLink, dstpad),
-                        &f->input_pads, &f->inputs, p);
-}
-
-/** Insert a new output pad for the filter. */
-static inline void avfilter_insert_outpad(AVFilterContext *f, unsigned index,
-                                          AVFilterPad *p)
-{
-    avfilter_insert_pad(index, &f->output_count, offsetof(AVFilterLink, srcpad),
-                        &f->output_pads, &f->outputs, p);
-}
-
-#endif  /* AVFILTER_AVFILTER_H */
diff --git a/lib-x86-64/include/libavformat/avformat.h b/lib-x86-64/include/libavformat/avformat.h
deleted file mode 100644
index 849db4ca..00000000
--- a/lib-x86-64/include/libavformat/avformat.h
+++ /dev/null
@@ -1,1527 +0,0 @@
-/*
- * copyright (c) 2001 Fabrice Bellard
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVFORMAT_AVFORMAT_H
-#define AVFORMAT_AVFORMAT_H
-
-#define LIBAVFORMAT_VERSION_MAJOR 52
-#define LIBAVFORMAT_VERSION_MINOR 82
-#define LIBAVFORMAT_VERSION_MICRO  0
-
-#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
-                                               LIBAVFORMAT_VERSION_MINOR, \
-                                               LIBAVFORMAT_VERSION_MICRO)
-#define LIBAVFORMAT_VERSION     AV_VERSION(LIBAVFORMAT_VERSION_MAJOR,   \
-                                           LIBAVFORMAT_VERSION_MINOR,   \
-                                           LIBAVFORMAT_VERSION_MICRO)
-#define LIBAVFORMAT_BUILD       LIBAVFORMAT_VERSION_INT
-
-#define LIBAVFORMAT_IDENT       "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
-
-/**
- * Those FF_API_* defines are not part of public API.
- * They may change, break or disappear at any time.
- */
-#ifndef FF_API_MAX_STREAMS
-#define FF_API_MAX_STREAMS   (LIBAVFORMAT_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_OLD_METADATA
-#define FF_API_OLD_METADATA  (LIBAVFORMAT_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_URL_CLASS
-#define FF_API_URL_CLASS     (LIBAVFORMAT_VERSION_MAJOR >= 53)
-#endif
-#ifndef FF_API_URL_RESETBUF
-#define FF_API_URL_RESETBUF       (LIBAVFORMAT_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_REGISTER_PROTOCOL
-#define FF_API_REGISTER_PROTOCOL  (LIBAVFORMAT_VERSION_MAJOR < 53)
-#endif
-
-/**
- * I return the LIBAVFORMAT_VERSION_INT constant.  You got
- * a fucking problem with that, douchebag?
- */
-unsigned avformat_version(void);
-
-/**
- * Return the libavformat build-time configuration.
- */
-const char *avformat_configuration(void);
-
-/**
- * Return the libavformat license.
- */
-const char *avformat_license(void);
-
-#include <time.h>
-#include <stdio.h>  /* FILE */
-#include "libavcodec/avcodec.h"
-
-#include "avio.h"
-
-struct AVFormatContext;
-
-
-/*
- * Public Metadata API.
- * The metadata API allows libavformat to export metadata tags to a client
- * application using a sequence of key/value pairs. Like all strings in FFmpeg,
- * metadata must be stored as UTF-8 encoded Unicode. Note that metadata
- * exported by demuxers isn't checked to be valid UTF-8 in most cases.
- * Important concepts to keep in mind:
- * 1. Keys are unique; there can never be 2 tags with the same key. This is
- *    also meant semantically, i.e., a demuxer should not knowingly produce
- *    several keys that are literally different but semantically identical.
- *    E.g., key=Author5, key=Author6. In this example, all authors must be
- *    placed in the same tag.
- * 2. Metadata is flat, not hierarchical; there are no subtags. If you
- *    want to store, e.g., the email address of the child of producer Alice
- *    and actor Bob, that could have key=alice_and_bobs_childs_email_address.
- * 3. Several modifiers can be applied to the tag name. This is done by
- *    appending a dash character ('-') and the modifier name in the order
- *    they appear in the list below -- e.g. foo-eng-sort, not foo-sort-eng.
- *    a) language -- a tag whose value is localized for a particular language
- *       is appended with the ISO 639-2/B 3-letter language code.
- *       For example: Author-ger=Michael, Author-eng=Mike
- *       The original/default language is in the unqualified "Author" tag.
- *       A demuxer should set a default if it sets any translated tag.
- *    b) sorting  -- a modified version of a tag that should be used for
- *       sorting will have '-sort' appended. E.g. artist="The Beatles",
- *       artist-sort="Beatles, The".
- *
- * 4. Tag names are normally exported exactly as stored in the container to
- *    allow lossless remuxing to the same format. For container-independent
- *    handling of metadata, av_metadata_conv() can convert it to ffmpeg generic
- *    format. Follows a list of generic tag names:
- *
- * album        -- name of the set this work belongs to
- * album_artist -- main creator of the set/album, if different from artist.
- *                 e.g. "Various Artists" for compilation albums.
- * artist       -- main creator of the work
- * comment      -- any additional description of the file.
- * composer     -- who composed the work, if different from artist.
- * copyright    -- name of copyright holder.
- * date         -- date when the work was created, preferably in ISO 8601.
- * disc         -- number of a subset, e.g. disc in a multi-disc collection.
- * encoder      -- name/settings of the software/hardware that produced the file.
- * encoded_by   -- person/group who created the file.
- * filename     -- original name of the file.
- * genre        -- <self-evident>.
- * language     -- main language in which the work is performed, preferably
- *                 in ISO 639-2 format.
- * performer    -- artist who performed the work, if different from artist.
- *                 E.g for "Also sprach Zarathustra", artist would be "Richard
- *                 Strauss" and performer "London Philharmonic Orchestra".
- * publisher    -- name of the label/publisher.
- * title        -- name of the work.
- * track        -- number of this work in the set, can be in form current/total.
- */
-
-#define AV_METADATA_MATCH_CASE      1
-#define AV_METADATA_IGNORE_SUFFIX   2
-#define AV_METADATA_DONT_STRDUP_KEY 4
-#define AV_METADATA_DONT_STRDUP_VAL 8
-#define AV_METADATA_DONT_OVERWRITE 16   ///< Don't overwrite existing tags.
-
-typedef struct {
-    char *key;
-    char *value;
-}AVMetadataTag;
-
-typedef struct AVMetadata AVMetadata;
-typedef struct AVMetadataConv AVMetadataConv;
-
-/**
- * Get a metadata element with matching key.
- *
- * @param prev Set to the previous matching element to find the next.
- *             If set to NULL the first matching element is returned.
- * @param flags Allows case as well as suffix-insensitive comparisons.
- * @return Found tag or NULL, changing key or value leads to undefined behavior.
- */
-AVMetadataTag *
-av_metadata_get(AVMetadata *m, const char *key, const AVMetadataTag *prev, int flags);
-
-#if FF_API_OLD_METADATA
-/**
- * Set the given tag in *pm, overwriting an existing tag.
- *
- * @param pm pointer to a pointer to a metadata struct. If *pm is NULL
- * a metadata struct is allocated and put in *pm.
- * @param key tag key to add to *pm (will be av_strduped)
- * @param value tag value to add to *pm (will be av_strduped)
- * @return >= 0 on success otherwise an error code <0
- * @deprecated Use av_metadata_set2() instead.
- */
-attribute_deprecated int av_metadata_set(AVMetadata **pm, const char *key, const char *value);
-#endif
-
-/**
- * Set the given tag in *pm, overwriting an existing tag.
- *
- * @param pm pointer to a pointer to a metadata struct. If *pm is NULL
- * a metadata struct is allocated and put in *pm.
- * @param key tag key to add to *pm (will be av_strduped depending on flags)
- * @param value tag value to add to *pm (will be av_strduped depending on flags).
- *        Passing a NULL value will cause an existing tag to be deleted.
- * @return >= 0 on success otherwise an error code <0
- */
-int av_metadata_set2(AVMetadata **pm, const char *key, const char *value, int flags);
-
-/**
- * Convert all the metadata sets from ctx according to the source and
- * destination conversion tables. If one of the tables is NULL, then
- * tags are converted to/from ffmpeg generic tag names.
- *
- * @param d_conv destination tags format conversion table
- * @param s_conv source tags format conversion table
- */
-void av_metadata_conv(struct AVFormatContext *ctx, const AVMetadataConv *d_conv,
-                                                   const AVMetadataConv *s_conv);
-
-/**
- * Free all the memory allocated for an AVMetadata struct.
- */
-void av_metadata_free(AVMetadata **m);
-
-
-/* packet functions */
-
-
-/**
- * Allocate and read the payload of a packet and initialize its
- * fields with default values.
- *
- * @param pkt packet
- * @param size desired payload size
- * @return >0 (read size) if OK, AVERROR_xxx otherwise
- */
-int av_get_packet(ByteIOContext *s, AVPacket *pkt, int size);
-
-
-/*************************************************/
-/* fractional numbers for exact pts handling */
-
-/**
- * The exact value of the fractional number is: 'val + num / den'.
- * num is assumed to be 0 <= num < den.
- */
-typedef struct AVFrac {
-    int64_t val, num, den;
-} AVFrac;
-
-/*************************************************/
-/* input/output formats */
-
-struct AVCodecTag;
-
-/**
- * This structure contains the data a format has to probe a file.
- */
-typedef struct AVProbeData {
-    const char *filename;
-    unsigned char *buf; /**< Buffer must have AVPROBE_PADDING_SIZE of extra allocated bytes filled with zero. */
-    int buf_size;       /**< Size of buf except extra allocated bytes */
-} AVProbeData;
-
-#define AVPROBE_SCORE_MAX 100               ///< maximum score, half of that is used for file-extension-based detection
-#define AVPROBE_PADDING_SIZE 32             ///< extra allocated bytes at the end of the probe buffer
-
-typedef struct AVFormatParameters {
-    AVRational time_base;
-    int sample_rate;
-    int channels;
-    int width;
-    int height;
-    enum PixelFormat pix_fmt;
-    int channel; /**< Used to select DV channel. */
-    const char *standard; /**< TV standard, NTSC, PAL, SECAM */
-    unsigned int mpeg2ts_raw:1;  /**< Force raw MPEG-2 transport stream output, if possible. */
-    unsigned int mpeg2ts_compute_pcr:1; /**< Compute exact PCR for each transport
-                                            stream packet (only meaningful if
-                                            mpeg2ts_raw is TRUE). */
-    unsigned int initial_pause:1;       /**< Do not begin to play the stream
-                                            immediately (RTSP only). */
-    unsigned int prealloced_context:1;
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
-    enum CodecID video_codec_id;
-    enum CodecID audio_codec_id;
-#endif
-} AVFormatParameters;
-
-//! Demuxer will use url_fopen, no opened file should be provided by the caller.
-#define AVFMT_NOFILE        0x0001
-#define AVFMT_NEEDNUMBER    0x0002 /**< Needs '%d' in filename. */
-#define AVFMT_SHOW_IDS      0x0008 /**< Show format stream IDs numbers. */
-#define AVFMT_RAWPICTURE    0x0020 /**< Format wants AVPicture structure for
-                                      raw picture data. */
-#define AVFMT_GLOBALHEADER  0x0040 /**< Format wants global header. */
-#define AVFMT_NOTIMESTAMPS  0x0080 /**< Format does not need / have any timestamps. */
-#define AVFMT_GENERIC_INDEX 0x0100 /**< Use generic index building code. */
-#define AVFMT_TS_DISCONT    0x0200 /**< Format allows timestamp discontinuities. */
-#define AVFMT_VARIABLE_FPS  0x0400 /**< Format allows variable fps. */
-#define AVFMT_NODIMENSIONS  0x0800 /**< Format does not need width/height */
-
-typedef struct AVOutputFormat {
-    const char *name;
-    /**
-     * Descriptive name for the format, meant to be more human-readable
-     * than name. You should use the NULL_IF_CONFIG_SMALL() macro
-     * to define it.
-     */
-    const char *long_name;
-    const char *mime_type;
-    const char *extensions; /**< comma-separated filename extensions */
-    /**
-     * size of private data so that it can be allocated in the wrapper
-     */
-    int priv_data_size;
-    /* output support */
-    enum CodecID audio_codec; /**< default audio codec */
-    enum CodecID video_codec; /**< default video codec */
-    int (*write_header)(struct AVFormatContext *);
-    int (*write_packet)(struct AVFormatContext *, AVPacket *pkt);
-    int (*write_trailer)(struct AVFormatContext *);
-    /**
-     * can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_GLOBALHEADER
-     */
-    int flags;
-    /**
-     * Currently only used to set pixel format if not YUV420P.
-     */
-    int (*set_parameters)(struct AVFormatContext *, AVFormatParameters *);
-    int (*interleave_packet)(struct AVFormatContext *, AVPacket *out,
-                             AVPacket *in, int flush);
-
-    /**
-     * List of supported codec_id-codec_tag pairs, ordered by "better
-     * choice first". The arrays are all terminated by CODEC_ID_NONE.
-     */
-    const struct AVCodecTag * const *codec_tag;
-
-    enum CodecID subtitle_codec; /**< default subtitle codec */
-
-    const AVMetadataConv *metadata_conv;
-
-    /* private fields */
-    struct AVOutputFormat *next;
-} AVOutputFormat;
-
-typedef struct AVInputFormat {
-    /**
-     * A comma separated list of short names for the format. New names
-     * may be appended with a minor bump.
-     */
-    const char *name;
-
-    /**
-     * Descriptive name for the format, meant to be more human-readable
-     * than name. You should use the NULL_IF_CONFIG_SMALL() macro
-     * to define it.
-     */
-    const char *long_name;
-
-    /**
-     * Size of private data so that it can be allocated in the wrapper.
-     */
-    int priv_data_size;
-
-    /**
-     * Tell if a given file has a chance of being parsed as this format.
-     * The buffer provided is guaranteed to be AVPROBE_PADDING_SIZE bytes
-     * big so you do not have to check for that unless you need more.
-     */
-    int (*read_probe)(AVProbeData *);
-
-    /**
-     * Read the format header and initialize the AVFormatContext
-     * structure. Return 0 if OK. 'ap' if non-NULL contains
-     * additional parameters. Only used in raw format right
-     * now. 'av_new_stream' should be called to create new streams.
-     */
-    int (*read_header)(struct AVFormatContext *,
-                       AVFormatParameters *ap);
-
-    /**
-     * Read one packet and put it in 'pkt'. pts and flags are also
-     * set. 'av_new_stream' can be called only if the flag
-     * AVFMTCTX_NOHEADER is used and only in the calling thread (not in a
-     * background thread).
-     * @return 0 on success, < 0 on error.
-     *         When returning an error, pkt must not have been allocated
-     *         or must be freed before returning
-     */
-    int (*read_packet)(struct AVFormatContext *, AVPacket *pkt);
-
-    /**
-     * Close the stream. The AVFormatContext and AVStreams are not
-     * freed by this function
-     */
-    int (*read_close)(struct AVFormatContext *);
-
-#if LIBAVFORMAT_VERSION_MAJOR < 53
-    /**
-     * Seek to a given timestamp relative to the frames in
-     * stream component stream_index.
-     * @param stream_index Must not be -1.
-     * @param flags Selects which direction should be preferred if no exact
-     *              match is available.
-     * @return >= 0 on success (but not necessarily the new offset)
-     */
-    int (*read_seek)(struct AVFormatContext *,
-                     int stream_index, int64_t timestamp, int flags);
-#endif
-    /**
-     * Gets the next timestamp in stream[stream_index].time_base units.
-     * @return the timestamp or AV_NOPTS_VALUE if an error occurred
-     */
-    int64_t (*read_timestamp)(struct AVFormatContext *s, int stream_index,
-                              int64_t *pos, int64_t pos_limit);
-
-    /**
-     * Can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER.
-     */
-    int flags;
-
-    /**
-     * If extensions are defined, then no probe is done. You should
-     * usually not use extension format guessing because it is not
-     * reliable enough
-     */
-    const char *extensions;
-
-    /**
-     * General purpose read-only value that the format can use.
-     */
-    int value;
-
-    /**
-     * Start/resume playing - only meaningful if using a network-based format
-     * (RTSP).
-     */
-    int (*read_play)(struct AVFormatContext *);
-
-    /**
-     * Pause playing - only meaningful if using a network-based format
-     * (RTSP).
-     */
-    int (*read_pause)(struct AVFormatContext *);
-
-    const struct AVCodecTag * const *codec_tag;
-
-    /**
-     * Seek to timestamp ts.
-     * Seeking will be done so that the point from which all active streams
-     * can be presented successfully will be closest to ts and within min/max_ts.
-     * Active streams are all streams that have AVStream.discard < AVDISCARD_ALL.
-     */
-    int (*read_seek2)(struct AVFormatContext *s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags);
-
-    const AVMetadataConv *metadata_conv;
-
-    /* private fields */
-    struct AVInputFormat *next;
-} AVInputFormat;
-
-enum AVStreamParseType {
-    AVSTREAM_PARSE_NONE,
-    AVSTREAM_PARSE_FULL,       /**< full parsing and repack */
-    AVSTREAM_PARSE_HEADERS,    /**< Only parse headers, do not repack. */
-    AVSTREAM_PARSE_TIMESTAMPS, /**< full parsing and interpolation of timestamps for frames not starting on a packet boundary */
-    AVSTREAM_PARSE_FULL_ONCE,  /**< full parsing and repack of the first frame only, only implemented for H.264 currently */
-};
-
-typedef struct AVIndexEntry {
-    int64_t pos;
-    int64_t timestamp;
-#define AVINDEX_KEYFRAME 0x0001
-    int flags:2;
-    int size:30; //Yeah, trying to keep the size of this small to reduce memory requirements (it is 24 vs. 32 bytes due to possible 8-byte alignment).
-    int min_distance;         /**< Minimum distance between this and the previous keyframe, used to avoid unneeded searching. */
-} AVIndexEntry;
-
-#define AV_DISPOSITION_DEFAULT   0x0001
-#define AV_DISPOSITION_DUB       0x0002
-#define AV_DISPOSITION_ORIGINAL  0x0004
-#define AV_DISPOSITION_COMMENT   0x0008
-#define AV_DISPOSITION_LYRICS    0x0010
-#define AV_DISPOSITION_KARAOKE   0x0020
-
-/**
- * Track should be used during playback by default.
- * Useful for subtitle track that should be displayed
- * even when user did not explicitly ask for subtitles.
- */
-#define AV_DISPOSITION_FORCED    0x0040
-
-/**
- * Stream structure.
- * New fields can be added to the end with minor version bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump.
- * sizeof(AVStream) must not be used outside libav*.
- */
-typedef struct AVStream {
-    int index;    /**< stream index in AVFormatContext */
-    int id;       /**< format-specific stream ID */
-    AVCodecContext *codec; /**< codec context */
-    /**
-     * Real base framerate of the stream.
-     * This is the lowest framerate with which all timestamps can be
-     * represented accurately (it is the least common multiple of all
-     * framerates in the stream). Note, this value is just a guess!
-     * For example, if the time base is 1/90000 and all frames have either
-     * approximately 3600 or 1800 timer ticks, then r_frame_rate will be 50/1.
-     */
-    AVRational r_frame_rate;
-    void *priv_data;
-
-    /* internal data used in av_find_stream_info() */
-    int64_t first_dts;
-
-    /**
-     * encoding: pts generation when outputting stream
-     */
-    struct AVFrac pts;
-
-    /**
-     * This is the fundamental unit of time (in seconds) in terms
-     * of which frame timestamps are represented. For fixed-fps content,
-     * time base should be 1/framerate and timestamp increments should be 1.
-     */
-    AVRational time_base;
-    int pts_wrap_bits; /**< number of bits in pts (used for wrapping control) */
-    /* ffmpeg.c private use */
-    int stream_copy; /**< If set, just copy stream. */
-    enum AVDiscard discard; ///< Selects which packets can be discarded at will and do not need to be demuxed.
-
-    //FIXME move stuff to a flags field?
-    /**
-     * Quality, as it has been removed from AVCodecContext and put in AVVideoFrame.
-     * MN: dunno if that is the right place for it
-     */
-    float quality;
-
-    /**
-     * Decoding: pts of the first frame of the stream, in stream time base.
-     * Only set this if you are absolutely 100% sure that the value you set
-     * it to really is the pts of the first frame.
-     * This may be undefined (AV_NOPTS_VALUE).
-     * @note The ASF header does NOT contain a correct start_time the ASF
-     * demuxer must NOT set this.
-     */
-    int64_t start_time;
-
-    /**
-     * Decoding: duration of the stream, in stream time base.
-     * If a source file does not specify a duration, but does specify
-     * a bitrate, this value will be estimated from bitrate and file size.
-     */
-    int64_t duration;
-
-#if FF_API_OLD_METADATA
-    char language[4]; /**< ISO 639-2/B 3-letter language code (empty string if undefined) */
-#endif
-
-    /* av_read_frame() support */
-    enum AVStreamParseType need_parsing;
-    struct AVCodecParserContext *parser;
-
-    int64_t cur_dts;
-    int last_IP_duration;
-    int64_t last_IP_pts;
-    /* av_seek_frame() support */
-    AVIndexEntry *index_entries; /**< Only used if the format does not
-                                    support seeking natively. */
-    int nb_index_entries;
-    unsigned int index_entries_allocated_size;
-
-    int64_t nb_frames;                 ///< number of frames in this stream if known or 0
-
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
-    int64_t unused[4+1];
-#endif
-
-#if FF_API_OLD_METADATA
-    char *filename; /**< source filename of the stream */
-#endif
-
-    int disposition; /**< AV_DISPOSITION_* bit field */
-
-    AVProbeData probe_data;
-#define MAX_REORDER_DELAY 16
-    int64_t pts_buffer[MAX_REORDER_DELAY+1];
-
-    /**
-     * sample aspect ratio (0 if unknown)
-     * - encoding: Set by user.
-     * - decoding: Set by libavformat.
-     */
-    AVRational sample_aspect_ratio;
-
-    AVMetadata *metadata;
-
-    /* Intended mostly for av_read_frame() support. Not supposed to be used by */
-    /* external applications; try to use something else if at all possible.    */
-    const uint8_t *cur_ptr;
-    int cur_len;
-    AVPacket cur_pkt;
-
-    // Timestamp generation support:
-    /**
-     * Timestamp corresponding to the last dts sync point.
-     *
-     * Initialized when AVCodecParserContext.dts_sync_point >= 0 and
-     * a DTS is received from the underlying container. Otherwise set to
-     * AV_NOPTS_VALUE by default.
-     */
-    int64_t reference_dts;
-
-    /**
-     * Number of packets to buffer for codec probing
-     * NOT PART OF PUBLIC API
-     */
-#define MAX_PROBE_PACKETS 2500
-    int probe_packets;
-
-    /**
-     * last packet in packet_buffer for this stream when muxing.
-     * used internally, NOT PART OF PUBLIC API, dont read or write from outside of libav*
-     */
-    struct AVPacketList *last_in_packet_buffer;
-
-    /**
-     * Average framerate
-     */
-    AVRational avg_frame_rate;
-
-    /**
-     * Number of frames that have been demuxed during av_find_stream_info()
-     */
-    int codec_info_nb_frames;
-
-    /**
-     * Stream informations used internally by av_find_stream_info()
-     */
-#define MAX_STD_TIMEBASES (60*12+5)
-    struct {
-        int64_t last_dts;
-        int64_t duration_gcd;
-        int duration_count;
-        double duration_error[MAX_STD_TIMEBASES];
-        int64_t codec_info_duration;
-    } *info;
-} AVStream;
-
-#define AV_PROGRAM_RUNNING 1
-
-/**
- * New fields can be added to the end with minor version bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump.
- * sizeof(AVProgram) must not be used outside libav*.
- */
-typedef struct AVProgram {
-    int            id;
-#if FF_API_OLD_METADATA
-    char           *provider_name; ///< network name for DVB streams
-    char           *name;          ///< service name for DVB streams
-#endif
-    int            flags;
-    enum AVDiscard discard;        ///< selects which program to discard and which to feed to the caller
-    unsigned int   *stream_index;
-    unsigned int   nb_stream_indexes;
-    AVMetadata *metadata;
-} AVProgram;
-
-#define AVFMTCTX_NOHEADER      0x0001 /**< signal that no header is present
-                                         (streams are added dynamically) */
-
-typedef struct AVChapter {
-    int id;                 ///< unique ID to identify the chapter
-    AVRational time_base;   ///< time base in which the start/end timestamps are specified
-    int64_t start, end;     ///< chapter start/end time in time_base units
-#if FF_API_OLD_METADATA
-    char *title;            ///< chapter title
-#endif
-    AVMetadata *metadata;
-} AVChapter;
-
-#if FF_API_MAX_STREAMS
-#define MAX_STREAMS 20
-#endif
-
-/**
- * Format I/O context.
- * New fields can be added to the end with minor version bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump.
- * sizeof(AVFormatContext) must not be used outside libav*.
- */
-typedef struct AVFormatContext {
-    const AVClass *av_class; /**< Set by avformat_alloc_context. */
-    /* Can only be iformat or oformat, not both at the same time. */
-    struct AVInputFormat *iformat;
-    struct AVOutputFormat *oformat;
-    void *priv_data;
-    ByteIOContext *pb;
-    unsigned int nb_streams;
-#if FF_API_MAX_STREAMS
-    AVStream *streams[MAX_STREAMS];
-#else
-    AVStream **streams;
-#endif
-    char filename[1024]; /**< input or output filename */
-    /* stream info */
-    int64_t timestamp;
-#if FF_API_OLD_METADATA
-    char title[512];
-    char author[512];
-    char copyright[512];
-    char comment[512];
-    char album[512];
-    int year;  /**< ID3 year, 0 if none */
-    int track; /**< track number, 0 if none */
-    char genre[32]; /**< ID3 genre */
-#endif
-
-    int ctx_flags; /**< Format-specific flags, see AVFMTCTX_xx */
-    /* private data for pts handling (do not modify directly). */
-    /**
-     * This buffer is only needed when packets were already buffered but
-     * not decoded, for example to get the codec parameters in MPEG
-     * streams.
-     */
-    struct AVPacketList *packet_buffer;
-
-    /**
-     * Decoding: position of the first frame of the component, in
-     * AV_TIME_BASE fractional seconds. NEVER set this value directly:
-     * It is deduced from the AVStream values.
-     */
-    int64_t start_time;
-
-    /**
-     * Decoding: duration of the stream, in AV_TIME_BASE fractional
-     * seconds. Only set this value if you know none of the individual stream
-     * durations and also dont set any of them. This is deduced from the
-     * AVStream values if not set.
-     */
-    int64_t duration;
-
-    /**
-     * decoding: total file size, 0 if unknown
-     */
-    int64_t file_size;
-
-    /**
-     * Decoding: total stream bitrate in bit/s, 0 if not
-     * available. Never set it directly if the file_size and the
-     * duration are known as FFmpeg can compute it automatically.
-     */
-    int bit_rate;
-
-    /* av_read_frame() support */
-    AVStream *cur_st;
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
-    const uint8_t *cur_ptr_deprecated;
-    int cur_len_deprecated;
-    AVPacket cur_pkt_deprecated;
-#endif
-
-    /* av_seek_frame() support */
-    int64_t data_offset; /**< offset of the first packet */
-    int index_built;
-
-    int mux_rate;
-    unsigned int packet_size;
-    int preload;
-    int max_delay;
-
-#define AVFMT_NOOUTPUTLOOP -1
-#define AVFMT_INFINITEOUTPUTLOOP 0
-    /**
-     * number of times to loop output in formats that support it
-     */
-    int loop_output;
-
-    int flags;
-#define AVFMT_FLAG_GENPTS       0x0001 ///< Generate missing pts even if it requires parsing future frames.
-#define AVFMT_FLAG_IGNIDX       0x0002 ///< Ignore index.
-#define AVFMT_FLAG_NONBLOCK     0x0004 ///< Do not block when reading packets from input.
-#define AVFMT_FLAG_IGNDTS       0x0008 ///< Ignore DTS on frames that contain both DTS & PTS
-#define AVFMT_FLAG_NOFILLIN     0x0010 ///< Do not infer any values from other values, just return what is stored in the container
-#define AVFMT_FLAG_NOPARSE      0x0020 ///< Do not use AVParsers, you also must set AVFMT_FLAG_NOFILLIN as the fillin code works on frames and no parsing -> no frames. Also seeking to frames can not work if parsing to find frame boundaries has been disabled
-#define AVFMT_FLAG_RTP_HINT     0x0040 ///< Add RTP hinting to the output file
-
-    int loop_input;
-
-    /**
-     * decoding: size of data to probe; encoding: unused.
-     */
-    unsigned int probesize;
-
-    /**
-     * Maximum time (in AV_TIME_BASE units) during which the input should
-     * be analyzed in av_find_stream_info().
-     */
-    int max_analyze_duration;
-
-    const uint8_t *key;
-    int keylen;
-
-    unsigned int nb_programs;
-    AVProgram **programs;
-
-    /**
-     * Forced video codec_id.
-     * Demuxing: Set by user.
-     */
-    enum CodecID video_codec_id;
-
-    /**
-     * Forced audio codec_id.
-     * Demuxing: Set by user.
-     */
-    enum CodecID audio_codec_id;
-
-    /**
-     * Forced subtitle codec_id.
-     * Demuxing: Set by user.
-     */
-    enum CodecID subtitle_codec_id;
-
-    /**
-     * Maximum amount of memory in bytes to use for the index of each stream.
-     * If the index exceeds this size, entries will be discarded as
-     * needed to maintain a smaller size. This can lead to slower or less
-     * accurate seeking (depends on demuxer).
-     * Demuxers for which a full in-memory index is mandatory will ignore
-     * this.
-     * muxing  : unused
-     * demuxing: set by user
-     */
-    unsigned int max_index_size;
-
-    /**
-     * Maximum amount of memory in bytes to use for buffering frames
-     * obtained from realtime capture devices.
-     */
-    unsigned int max_picture_buffer;
-
-    unsigned int nb_chapters;
-    AVChapter **chapters;
-
-    /**
-     * Flags to enable debugging.
-     */
-    int debug;
-#define FF_FDEBUG_TS        0x0001
-
-    /**
-     * Raw packets from the demuxer, prior to parsing and decoding.
-     * This buffer is used for buffering packets until the codec can
-     * be identified, as parsing cannot be done without knowing the
-     * codec.
-     */
-    struct AVPacketList *raw_packet_buffer;
-    struct AVPacketList *raw_packet_buffer_end;
-
-    struct AVPacketList *packet_buffer_end;
-
-    AVMetadata *metadata;
-
-    /**
-     * Remaining size available for raw_packet_buffer, in bytes.
-     * NOT PART OF PUBLIC API
-     */
-#define RAW_PACKET_BUFFER_SIZE 2500000
-    int raw_packet_buffer_remaining_size;
-
-    /**
-     * Start time of the stream in real world time, in microseconds
-     * since the unix epoch (00:00 1st January 1970). That is, pts=0
-     * in the stream was captured at this real world time.
-     * - encoding: Set by user.
-     * - decoding: Unused.
-     */
-    int64_t start_time_realtime;
-} AVFormatContext;
-
-typedef struct AVPacketList {
-    AVPacket pkt;
-    struct AVPacketList *next;
-} AVPacketList;
-
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
-extern AVInputFormat *first_iformat;
-extern AVOutputFormat *first_oformat;
-#endif
-
-/**
- * If f is NULL, returns the first registered input format,
- * if f is non-NULL, returns the next registered input format after f
- * or NULL if f is the last one.
- */
-AVInputFormat  *av_iformat_next(AVInputFormat  *f);
-
-/**
- * If f is NULL, returns the first registered output format,
- * if f is non-NULL, returns the next registered output format after f
- * or NULL if f is the last one.
- */
-AVOutputFormat *av_oformat_next(AVOutputFormat *f);
-
-enum CodecID av_guess_image2_codec(const char *filename);
-
-/* XXX: Use automatic init with either ELF sections or C file parser */
-/* modules. */
-
-/* utils.c */
-void av_register_input_format(AVInputFormat *format);
-void av_register_output_format(AVOutputFormat *format);
-#if LIBAVFORMAT_VERSION_MAJOR < 53
-attribute_deprecated AVOutputFormat *guess_stream_format(const char *short_name,
-                                    const char *filename,
-                                    const char *mime_type);
-
-/**
- * @deprecated Use av_guess_format() instead.
- */
-attribute_deprecated AVOutputFormat *guess_format(const char *short_name,
-                                                  const char *filename,
-                                                  const char *mime_type);
-#endif
-
-/**
- * Return the output format in the list of registered output formats
- * which best matches the provided parameters, or return NULL if
- * there is no match.
- *
- * @param short_name if non-NULL checks if short_name matches with the
- * names of the registered formats
- * @param filename if non-NULL checks if filename terminates with the
- * extensions of the registered formats
- * @param mime_type if non-NULL checks if mime_type matches with the
- * MIME type of the registered formats
- */
-AVOutputFormat *av_guess_format(const char *short_name,
-                                const char *filename,
-                                const char *mime_type);
-
-/**
- * Guess the codec ID based upon muxer and filename.
- */
-enum CodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name,
-                            const char *filename, const char *mime_type,
-                            enum AVMediaType type);
-
-/**
- * Send a nice hexadecimal dump of a buffer to the specified file stream.
- *
- * @param f The file stream pointer where the dump should be sent to.
- * @param buf buffer
- * @param size buffer size
- *
- * @see av_hex_dump_log, av_pkt_dump, av_pkt_dump_log
- */
-void av_hex_dump(FILE *f, uint8_t *buf, int size);
-
-/**
- * Send a nice hexadecimal dump of a buffer to the log.
- *
- * @param avcl A pointer to an arbitrary struct of which the first field is a
- * pointer to an AVClass struct.
- * @param level The importance level of the message, lower values signifying
- * higher importance.
- * @param buf buffer
- * @param size buffer size
- *
- * @see av_hex_dump, av_pkt_dump, av_pkt_dump_log
- */
-void av_hex_dump_log(void *avcl, int level, uint8_t *buf, int size);
-
-/**
- * Send a nice dump of a packet to the specified file stream.
- *
- * @param f The file stream pointer where the dump should be sent to.
- * @param pkt packet to dump
- * @param dump_payload True if the payload must be displayed, too.
- */
-void av_pkt_dump(FILE *f, AVPacket *pkt, int dump_payload);
-
-/**
- * Send a nice dump of a packet to the log.
- *
- * @param avcl A pointer to an arbitrary struct of which the first field is a
- * pointer to an AVClass struct.
- * @param level The importance level of the message, lower values signifying
- * higher importance.
- * @param pkt packet to dump
- * @param dump_payload True if the payload must be displayed, too.
- */
-void av_pkt_dump_log(void *avcl, int level, AVPacket *pkt, int dump_payload);
-
-/**
- * Initialize libavformat and register all the muxers, demuxers and
- * protocols. If you do not call this function, then you can select
- * exactly which formats you want to support.
- *
- * @see av_register_input_format()
- * @see av_register_output_format()
- * @see av_register_protocol()
- */
-void av_register_all(void);
-
-/**
- * Get the CodecID for the given codec tag tag.
- * If no codec id is found returns CODEC_ID_NONE.
- *
- * @param tags list of supported codec_id-codec_tag pairs, as stored
- * in AVInputFormat.codec_tag and AVOutputFormat.codec_tag
- */
-enum CodecID av_codec_get_id(const struct AVCodecTag * const *tags, unsigned int tag);
-
-/**
- * Get the codec tag for the given codec id id.
- * If no codec tag is found returns 0.
- *
- * @param tags list of supported codec_id-codec_tag pairs, as stored
- * in AVInputFormat.codec_tag and AVOutputFormat.codec_tag
- */
-unsigned int av_codec_get_tag(const struct AVCodecTag * const *tags, enum CodecID id);
-
-/* media file input */
-
-/**
- * Find AVInputFormat based on the short name of the input format.
- */
-AVInputFormat *av_find_input_format(const char *short_name);
-
-/**
- * Guess the file format.
- *
- * @param is_opened Whether the file is already opened; determines whether
- *                  demuxers with or without AVFMT_NOFILE are probed.
- */
-AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened);
-
-/**
- * Guess the file format.
- *
- * @param is_opened Whether the file is already opened; determines whether
- *                  demuxers with or without AVFMT_NOFILE are probed.
- * @param score_max A probe score larger that this is required to accept a
- *                  detection, the variable is set to the actual detection
- *                  score afterwards.
- *                  If the score is <= AVPROBE_SCORE_MAX / 4 it is recommended
- *                  to retry with a larger probe buffer.
- */
-AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int *score_max);
-
-/**
- * Allocate all the structures needed to read an input stream.
- *        This does not open the needed codecs for decoding the stream[s].
- */
-int av_open_input_stream(AVFormatContext **ic_ptr,
-                         ByteIOContext *pb, const char *filename,
-                         AVInputFormat *fmt, AVFormatParameters *ap);
-
-/**
- * Open a media file as input. The codecs are not opened. Only the file
- * header (if present) is read.
- *
- * @param ic_ptr The opened media file handle is put here.
- * @param filename filename to open
- * @param fmt If non-NULL, force the file format to use.
- * @param buf_size optional buffer size (zero if default is OK)
- * @param ap Additional parameters needed when opening the file
- *           (NULL if default).
- * @return 0 if OK, AVERROR_xxx otherwise
- */
-int av_open_input_file(AVFormatContext **ic_ptr, const char *filename,
-                       AVInputFormat *fmt,
-                       int buf_size,
-                       AVFormatParameters *ap);
-
-#if LIBAVFORMAT_VERSION_MAJOR < 53
-/**
- * @deprecated Use avformat_alloc_context() instead.
- */
-attribute_deprecated AVFormatContext *av_alloc_format_context(void);
-#endif
-
-/**
- * Allocate an AVFormatContext.
- * Can be freed with av_free() but do not forget to free everything you
- * explicitly allocated as well!
- */
-AVFormatContext *avformat_alloc_context(void);
-
-/**
- * Read packets of a media file to get stream information. This
- * is useful for file formats with no headers such as MPEG. This
- * function also computes the real framerate in case of MPEG-2 repeat
- * frame mode.
- * The logical file position is not changed by this function;
- * examined packets may be buffered for later processing.
- *
- * @param ic media file handle
- * @return >=0 if OK, AVERROR_xxx on error
- * @todo Let the user decide somehow what information is needed so that
- *       we do not waste time getting stuff the user does not need.
- */
-int av_find_stream_info(AVFormatContext *ic);
-
-/**
- * Read a transport packet from a media file.
- *
- * This function is obsolete and should never be used.
- * Use av_read_frame() instead.
- *
- * @param s media file handle
- * @param pkt is filled
- * @return 0 if OK, AVERROR_xxx on error
- */
-int av_read_packet(AVFormatContext *s, AVPacket *pkt);
-
-/**
- * Return the next frame of a stream.
- * This function returns what is stored in the file, and does not validate
- * that what is there are valid frames for the decoder. It will split what is
- * stored in the file into frames and return one for each call. It will not
- * omit invalid data between valid frames so as to give the decoder the maximum
- * information possible for decoding.
- *
- * The returned packet is valid
- * until the next av_read_frame() or until av_close_input_file() and
- * must be freed with av_free_packet. For video, the packet contains
- * exactly one frame. For audio, it contains an integer number of
- * frames if each frame has a known fixed size (e.g. PCM or ADPCM
- * data). If the audio frames have a variable size (e.g. MPEG audio),
- * then it contains one frame.
- *
- * pkt->pts, pkt->dts and pkt->duration are always set to correct
- * values in AVStream.time_base units (and guessed if the format cannot
- * provide them). pkt->pts can be AV_NOPTS_VALUE if the video format
- * has B-frames, so it is better to rely on pkt->dts if you do not
- * decompress the payload.
- *
- * @return 0 if OK, < 0 on error or end of file
- */
-int av_read_frame(AVFormatContext *s, AVPacket *pkt);
-
-/**
- * Seek to the keyframe at timestamp.
- * 'timestamp' in 'stream_index'.
- * @param stream_index If stream_index is (-1), a default
- * stream is selected, and timestamp is automatically converted
- * from AV_TIME_BASE units to the stream specific time_base.
- * @param timestamp Timestamp in AVStream.time_base units
- *        or, if no stream is specified, in AV_TIME_BASE units.
- * @param flags flags which select direction and seeking mode
- * @return >= 0 on success
- */
-int av_seek_frame(AVFormatContext *s, int stream_index, int64_t timestamp,
-                  int flags);
-
-/**
- * Seek to timestamp ts.
- * Seeking will be done so that the point from which all active streams
- * can be presented successfully will be closest to ts and within min/max_ts.
- * Active streams are all streams that have AVStream.discard < AVDISCARD_ALL.
- *
- * If flags contain AVSEEK_FLAG_BYTE, then all timestamps are in bytes and
- * are the file position (this may not be supported by all demuxers).
- * If flags contain AVSEEK_FLAG_FRAME, then all timestamps are in frames
- * in the stream with stream_index (this may not be supported by all demuxers).
- * Otherwise all timestamps are in units of the stream selected by stream_index
- * or if stream_index is -1, in AV_TIME_BASE units.
- * If flags contain AVSEEK_FLAG_ANY, then non-keyframes are treated as
- * keyframes (this may not be supported by all demuxers).
- *
- * @param stream_index index of the stream which is used as time base reference
- * @param min_ts smallest acceptable timestamp
- * @param ts target timestamp
- * @param max_ts largest acceptable timestamp
- * @param flags flags
- * @return >=0 on success, error code otherwise
- *
- * @note This is part of the new seek API which is still under construction.
- *       Thus do not use this yet. It may change at any time, do not expect
- *       ABI compatibility yet!
- */
-int avformat_seek_file(AVFormatContext *s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags);
-
-/**
- * Start playing a network-based stream (e.g. RTSP stream) at the
- * current position.
- */
-int av_read_play(AVFormatContext *s);
-
-/**
- * Pause a network-based stream (e.g. RTSP stream).
- *
- * Use av_read_play() to resume it.
- */
-int av_read_pause(AVFormatContext *s);
-
-/**
- * Free a AVFormatContext allocated by av_open_input_stream.
- * @param s context to free
- */
-void av_close_input_stream(AVFormatContext *s);
-
-/**
- * Close a media file (but not its codecs).
- *
- * @param s media file handle
- */
-void av_close_input_file(AVFormatContext *s);
-
-/**
- * Add a new stream to a media file.
- *
- * Can only be called in the read_header() function. If the flag
- * AVFMTCTX_NOHEADER is in the format context, then new streams
- * can be added in read_packet too.
- *
- * @param s media file handle
- * @param id file-format-dependent stream ID
- */
-AVStream *av_new_stream(AVFormatContext *s, int id);
-AVProgram *av_new_program(AVFormatContext *s, int id);
-
-/**
- * Add a new chapter.
- * This function is NOT part of the public API
- * and should ONLY be used by demuxers.
- *
- * @param s media file handle
- * @param id unique ID for this chapter
- * @param start chapter start time in time_base units
- * @param end chapter end time in time_base units
- * @param title chapter title
- *
- * @return AVChapter or NULL on error
- */
-AVChapter *ff_new_chapter(AVFormatContext *s, int id, AVRational time_base,
-                          int64_t start, int64_t end, const char *title);
-
-/**
- * Set the pts for a given stream.
- *
- * @param s stream
- * @param pts_wrap_bits number of bits effectively used by the pts
- *        (used for wrap control, 33 is the value for MPEG)
- * @param pts_num numerator to convert to seconds (MPEG: 1)
- * @param pts_den denominator to convert to seconds (MPEG: 90000)
- */
-void av_set_pts_info(AVStream *s, int pts_wrap_bits,
-                     unsigned int pts_num, unsigned int pts_den);
-
-#define AVSEEK_FLAG_BACKWARD 1 ///< seek backward
-#define AVSEEK_FLAG_BYTE     2 ///< seeking based on position in bytes
-#define AVSEEK_FLAG_ANY      4 ///< seek to any frame, even non-keyframes
-#define AVSEEK_FLAG_FRAME    8 ///< seeking based on frame number
-
-int av_find_default_stream_index(AVFormatContext *s);
-
-/**
- * Get the index for a specific timestamp.
- * @param flags if AVSEEK_FLAG_BACKWARD then the returned index will correspond
- *                 to the timestamp which is <= the requested one, if backward
- *                 is 0, then it will be >=
- *              if AVSEEK_FLAG_ANY seek to any frame, only keyframes otherwise
- * @return < 0 if no such timestamp could be found
- */
-int av_index_search_timestamp(AVStream *st, int64_t timestamp, int flags);
-
-/**
- * Ensure the index uses less memory than the maximum specified in
- * AVFormatContext.max_index_size by discarding entries if it grows
- * too large.
- * This function is not part of the public API and should only be called
- * by demuxers.
- */
-void ff_reduce_index(AVFormatContext *s, int stream_index);
-
-/**
- * Add an index entry into a sorted list. Update the entry if the list
- * already contains it.
- *
- * @param timestamp timestamp in the time base of the given stream
- */
-int av_add_index_entry(AVStream *st, int64_t pos, int64_t timestamp,
-                       int size, int distance, int flags);
-
-/**
- * Perform a binary search using av_index_search_timestamp() and
- * AVInputFormat.read_timestamp().
- * This is not supposed to be called directly by a user application,
- * but by demuxers.
- * @param target_ts target timestamp in the time base of the given stream
- * @param stream_index stream number
- */
-int av_seek_frame_binary(AVFormatContext *s, int stream_index,
-                         int64_t target_ts, int flags);
-
-/**
- * Update cur_dts of all streams based on the given timestamp and AVStream.
- *
- * Stream ref_st unchanged, others set cur_dts in their native time base.
- * Only needed for timestamp wrapping or if (dts not set and pts!=dts).
- * @param timestamp new dts expressed in time_base of param ref_st
- * @param ref_st reference stream giving time_base of param timestamp
- */
-void av_update_cur_dts(AVFormatContext *s, AVStream *ref_st, int64_t timestamp);
-
-/**
- * Perform a binary search using read_timestamp().
- * This is not supposed to be called directly by a user application,
- * but by demuxers.
- * @param target_ts target timestamp in the time base of the given stream
- * @param stream_index stream number
- */
-int64_t av_gen_search(AVFormatContext *s, int stream_index,
-                      int64_t target_ts, int64_t pos_min,
-                      int64_t pos_max, int64_t pos_limit,
-                      int64_t ts_min, int64_t ts_max,
-                      int flags, int64_t *ts_ret,
-                      int64_t (*read_timestamp)(struct AVFormatContext *, int , int64_t *, int64_t ));
-
-/**
- * media file output
- */
-int av_set_parameters(AVFormatContext *s, AVFormatParameters *ap);
-
-/**
- * Split a URL string into components.
- *
- * The pointers to buffers for storing individual components may be null,
- * in order to ignore that component. Buffers for components not found are
- * set to empty strings. If the port is not found, it is set to a negative
- * value.
- *
- * @param proto the buffer for the protocol
- * @param proto_size the size of the proto buffer
- * @param authorization the buffer for the authorization
- * @param authorization_size the size of the authorization buffer
- * @param hostname the buffer for the host name
- * @param hostname_size the size of the hostname buffer
- * @param port_ptr a pointer to store the port number in
- * @param path the buffer for the path
- * @param path_size the size of the path buffer
- * @param url the URL to split
- */
-void av_url_split(char *proto,         int proto_size,
-                  char *authorization, int authorization_size,
-                  char *hostname,      int hostname_size,
-                  int *port_ptr,
-                  char *path,          int path_size,
-                  const char *url);
-
-/**
- * Allocate the stream private data and write the stream header to an
- * output media file.
- *
- * @param s media file handle
- * @return 0 if OK, AVERROR_xxx on error
- */
-int av_write_header(AVFormatContext *s);
-
-/**
- * Write a packet to an output media file.
- *
- * The packet shall contain one audio or video frame.
- * The packet must be correctly interleaved according to the container
- * specification, if not then av_interleaved_write_frame must be used.
- *
- * @param s media file handle
- * @param pkt The packet, which contains the stream_index, buf/buf_size,
-              dts/pts, ...
- * @return < 0 on error, = 0 if OK, 1 if end of stream wanted
- */
-int av_write_frame(AVFormatContext *s, AVPacket *pkt);
-
-/**
- * Write a packet to an output media file ensuring correct interleaving.
- *
- * The packet must contain one audio or video frame.
- * If the packets are already correctly interleaved, the application should
- * call av_write_frame() instead as it is slightly faster. It is also important
- * to keep in mind that completely non-interleaved input will need huge amounts
- * of memory to interleave with this, so it is preferable to interleave at the
- * demuxer level.
- *
- * @param s media file handle
- * @param pkt The packet, which contains the stream_index, buf/buf_size,
-              dts/pts, ...
- * @return < 0 on error, = 0 if OK, 1 if end of stream wanted
- */
-int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt);
-
-/**
- * Interleave a packet per dts in an output media file.
- *
- * Packets with pkt->destruct == av_destruct_packet will be freed inside this
- * function, so they cannot be used after it. Note that calling av_free_packet()
- * on them is still safe.
- *
- * @param s media file handle
- * @param out the interleaved packet will be output here
- * @param pkt the input packet
- * @param flush 1 if no further packets are available as input and all
- *              remaining packets should be output
- * @return 1 if a packet was output, 0 if no packet could be output,
- *         < 0 if an error occurred
- */
-int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out,
-                                 AVPacket *pkt, int flush);
-
-/**
- * Write the stream trailer to an output media file and free the
- * file private data.
- *
- * May only be called after a successful call to av_write_header.
- *
- * @param s media file handle
- * @return 0 if OK, AVERROR_xxx on error
- */
-int av_write_trailer(AVFormatContext *s);
-
-void dump_format(AVFormatContext *ic,
-                 int index,
-                 const char *url,
-                 int is_output);
-
-#if LIBAVFORMAT_VERSION_MAJOR < 53
-/**
- * Parse width and height out of string str.
- * @deprecated Use av_parse_video_frame_size instead.
- */
-attribute_deprecated int parse_image_size(int *width_ptr, int *height_ptr,
-                                          const char *str);
-
-/**
- * Convert framerate from a string to a fraction.
- * @deprecated Use av_parse_video_frame_rate instead.
- */
-attribute_deprecated int parse_frame_rate(int *frame_rate, int *frame_rate_base,
-                                          const char *arg);
-#endif
-
-/**
- * Parse datestr and return a corresponding number of microseconds.
- * @param datestr String representing a date or a duration.
- * - If a date the syntax is:
- * @code
- *  now|{[{YYYY-MM-DD|YYYYMMDD}[T|t| ]]{{HH[:MM[:SS[.m...]]]}|{HH[MM[SS[.m...]]]}}[Z|z]}
- * @endcode
- * If the value is "now" it takes the current time.
- * Time is local time unless Z is appended, in which case it is
- * interpreted as UTC.
- * If the year-month-day part is not specified it takes the current
- * year-month-day.
- * @return the number of microseconds since 1st of January, 1970 up to
- * the time of the parsed date or INT64_MIN if datestr cannot be
- * successfully parsed.
- * - If a duration the syntax is:
- * @code
- *  [-]HH[:MM[:SS[.m...]]]
- *  [-]S+[.m...]
- * @endcode
- * @return the number of microseconds contained in a time interval
- * with the specified duration or INT64_MIN if datestr cannot be
- * successfully parsed.
- * @param duration Flag which tells how to interpret datestr, if
- * not zero datestr is interpreted as a duration, otherwise as a
- * date.
- */
-int64_t parse_date(const char *datestr, int duration);
-
-/**
- * Get the current time in microseconds.
- */
-int64_t av_gettime(void);
-
-/* ffm-specific for ffserver */
-#define FFM_PACKET_SIZE 4096
-int64_t ffm_read_write_index(int fd);
-int ffm_write_write_index(int fd, int64_t pos);
-void ffm_set_write_index(AVFormatContext *s, int64_t pos, int64_t file_size);
-
-/**
- * Attempt to find a specific tag in a URL.
- *
- * syntax: '?tag1=val1&tag2=val2...'. Little URL decoding is done.
- * Return 1 if found.
- */
-int find_info_tag(char *arg, int arg_size, const char *tag1, const char *info);
-
-/**
- * Return in 'buf' the path with '%d' replaced by a number.
- *
- * Also handles the '%0nd' format where 'n' is the total number
- * of digits and '%%'.
- *
- * @param buf destination buffer
- * @param buf_size destination buffer size
- * @param path numbered sequence string
- * @param number frame number
- * @return 0 if OK, -1 on format error
- */
-int av_get_frame_filename(char *buf, int buf_size,
-                          const char *path, int number);
-
-/**
- * Check whether filename actually is a numbered sequence generator.
- *
- * @param filename possible numbered sequence string
- * @return 1 if a valid numbered sequence string, 0 otherwise
- */
-int av_filename_number_test(const char *filename);
-
-/**
- * Generate an SDP for an RTP session.
- *
- * @param ac array of AVFormatContexts describing the RTP streams. If the
- *           array is composed by only one context, such context can contain
- *           multiple AVStreams (one AVStream per RTP stream). Otherwise,
- *           all the contexts in the array (an AVCodecContext per RTP stream)
- *           must contain only one AVStream.
- * @param n_files number of AVCodecContexts contained in ac
- * @param buff buffer where the SDP will be stored (must be allocated by
- *             the caller)
- * @param size the size of the buffer
- * @return 0 if OK, AVERROR_xxx on error
- */
-int avf_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size);
-
-/**
- * Return a positive value if the given filename has one of the given
- * extensions, 0 otherwise.
- *
- * @param extensions a comma-separated list of filename extensions
- */
-int av_match_ext(const char *filename, const char *extensions);
-
-#endif /* AVFORMAT_AVFORMAT_H */
diff --git a/lib-x86-64/include/libavformat/avio.h b/lib-x86-64/include/libavformat/avio.h
deleted file mode 100644
index 118b7f27..00000000
--- a/lib-x86-64/include/libavformat/avio.h
+++ /dev/null
@@ -1,569 +0,0 @@
-/*
- * copyright (c) 2001 Fabrice Bellard
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-#ifndef AVFORMAT_AVIO_H
-#define AVFORMAT_AVIO_H
-
-/**
- * @file
- * unbuffered I/O operations
- *
- * @warning This file has to be considered an internal but installed
- * header, so it should not be directly included in your projects.
- */
-
-#include <stdint.h>
-
-#include "libavutil/common.h"
-#include "libavutil/log.h"
-
-/* unbuffered I/O */
-
-/**
- * URL Context.
- * New fields can be added to the end with minor version bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump.
- * sizeof(URLContext) must not be used outside libav*.
- */
-typedef struct URLContext {
-#if FF_API_URL_CLASS
-    const AVClass *av_class; ///< information for av_log(). Set by url_open().
-#endif
-    struct URLProtocol *prot;
-    int flags;
-    int is_streamed;  /**< true if streamed (no seek possible), default = false */
-    int max_packet_size;  /**< if non zero, the stream is packetized with this max packet size */
-    void *priv_data;
-    char *filename; /**< specified URL */
-    int is_connected;
-} URLContext;
-
-typedef struct URLPollEntry {
-    URLContext *handle;
-    int events;
-    int revents;
-} URLPollEntry;
-
-#define URL_RDONLY 0
-#define URL_WRONLY 1
-#define URL_RDWR   2
-
-typedef int URLInterruptCB(void);
-
-/**
- * Create a URLContext for accessing to the resource indicated by
- * url, and open it using the URLProtocol up.
- *
- * @param puc pointer to the location where, in case of success, the
- * function puts the pointer to the created URLContext
- * @param flags flags which control how the resource indicated by url
- * is to be opened
- * @return 0 in case of success, a negative value corresponding to an
- * AVERROR code in case of failure
- */
-int url_open_protocol (URLContext **puc, struct URLProtocol *up,
-                       const char *url, int flags);
-
-/**
- * Create a URLContext for accessing to the resource indicated by
- * url, but do not initiate the connection yet.
- *
- * @param puc pointer to the location where, in case of success, the
- * function puts the pointer to the created URLContext
- * @param flags flags which control how the resource indicated by url
- * is to be opened
- * @return 0 in case of success, a negative value corresponding to an
- * AVERROR code in case of failure
- */
-int url_alloc(URLContext **h, const char *url, int flags);
-
-/**
- * Connect an URLContext that has been allocated by url_alloc
- */
-int url_connect(URLContext *h);
-
-/**
- * Create an URLContext for accessing to the resource indicated by
- * url, and open it.
- *
- * @param puc pointer to the location where, in case of success, the
- * function puts the pointer to the created URLContext
- * @param flags flags which control how the resource indicated by url
- * is to be opened
- * @return 0 in case of success, a negative value corresponding to an
- * AVERROR code in case of failure
- */
-int url_open(URLContext **h, const char *url, int flags);
-
-/**
- * Read up to size bytes from the resource accessed by h, and store
- * the read bytes in buf.
- *
- * @return The number of bytes actually read, or a negative value
- * corresponding to an AVERROR code in case of error. A value of zero
- * indicates that it is not possible to read more from the accessed
- * resource (except if the value of the size argument is also zero).
- */
-int url_read(URLContext *h, unsigned char *buf, int size);
-
-/**
- * Read as many bytes as possible (up to size), calling the
- * read function multiple times if necessary.
- * Will also retry if the read function returns AVERROR(EAGAIN).
- * This makes special short-read handling in applications
- * unnecessary, if the return value is < size then it is
- * certain there was either an error or the end of file was reached.
- */
-int url_read_complete(URLContext *h, unsigned char *buf, int size);
-int url_write(URLContext *h, const unsigned char *buf, int size);
-
-/**
- * Passing this as the "whence" parameter to a seek function causes it to
- * return the filesize without seeking anywhere. Supporting this is optional.
- * If it is not supported then the seek function will return <0.
- */
-#define AVSEEK_SIZE 0x10000
-
-/**
- * Change the position that will be used by the next read/write
- * operation on the resource accessed by h.
- *
- * @param pos specifies the new position to set
- * @param whence specifies how pos should be interpreted, it must be
- * one of SEEK_SET (seek from the beginning), SEEK_CUR (seek from the
- * current position), SEEK_END (seek from the end), or AVSEEK_SIZE
- * (return the filesize of the requested resource, pos is ignored).
- * @return a negative value corresponding to an AVERROR code in case
- * of failure, or the resulting file position, measured in bytes from
- * the beginning of the file. You can use this feature together with
- * SEEK_CUR to read the current file position.
- */
-int64_t url_seek(URLContext *h, int64_t pos, int whence);
-
-/**
- * Close the resource accessed by the URLContext h, and free the
- * memory used by it.
- *
- * @return a negative value if an error condition occurred, 0
- * otherwise
- */
-int url_close(URLContext *h);
-
-/**
- * Return a non-zero value if the resource indicated by url
- * exists, 0 otherwise.
- */
-int url_exist(const char *url);
-
-/**
- * Return the filesize of the resource accessed by h, AVERROR(ENOSYS)
- * if the operation is not supported by h, or another negative value
- * corresponding to an AVERROR error code in case of failure.
- */
-int64_t url_filesize(URLContext *h);
-
-/**
- * Return the file descriptor associated with this URL. For RTP, this
- * will return only the RTP file descriptor, not the RTCP file descriptor.
- * To get both, use rtp_get_file_handles().
- *
- * @return the file descriptor associated with this URL, or <0 on error.
- */
-int url_get_file_handle(URLContext *h);
-
-/**
- * Return the maximum packet size associated to packetized file
- * handle. If the file is not packetized (stream like HTTP or file on
- * disk), then 0 is returned.
- *
- * @param h file handle
- * @return maximum packet size in bytes
- */
-int url_get_max_packet_size(URLContext *h);
-
-/**
- * Copy the filename of the resource accessed by h to buf.
- *
- * @param buf_size size in bytes of buf
- */
-void url_get_filename(URLContext *h, char *buf, int buf_size);
-
-/**
- * The callback is called in blocking functions to test regulary if
- * asynchronous interruption is needed. AVERROR(EINTR) is returned
- * in this case by the interrupted function. 'NULL' means no interrupt
- * callback is given.
- */
-void url_set_interrupt_cb(URLInterruptCB *interrupt_cb);
-
-/* not implemented */
-int url_poll(URLPollEntry *poll_table, int n, int timeout);
-
-/**
- * Pause and resume playing - only meaningful if using a network streaming
- * protocol (e.g. MMS).
- * @param pause 1 for pause, 0 for resume
- */
-int av_url_read_pause(URLContext *h, int pause);
-
-/**
- * Seek to a given timestamp relative to some component stream.
- * Only meaningful if using a network streaming protocol (e.g. MMS.).
- * @param stream_index The stream index that the timestamp is relative to.
- *        If stream_index is (-1) the timestamp should be in AV_TIME_BASE
- *        units from the beginning of the presentation.
- *        If a stream_index >= 0 is used and the protocol does not support
- *        seeking based on component streams, the call will fail with ENOTSUP.
- * @param timestamp timestamp in AVStream.time_base units
- *        or if there is no stream specified then in AV_TIME_BASE units.
- * @param flags Optional combination of AVSEEK_FLAG_BACKWARD, AVSEEK_FLAG_BYTE
- *        and AVSEEK_FLAG_ANY. The protocol may silently ignore
- *        AVSEEK_FLAG_BACKWARD and AVSEEK_FLAG_ANY, but AVSEEK_FLAG_BYTE will
- *        fail with ENOTSUP if used and not supported.
- * @return >= 0 on success
- * @see AVInputFormat::read_seek
- */
-int64_t av_url_read_seek(URLContext *h, int stream_index,
-                         int64_t timestamp, int flags);
-
-/**
- * Oring this flag as into the "whence" parameter to a seek function causes it to
- * seek by any means (like reopening and linear reading) or other normally unreasonble
- * means that can be extreemly slow.
- * This may be ignored by the seek code.
- */
-#define AVSEEK_FORCE 0x20000
-
-typedef struct URLProtocol {
-    const char *name;
-    int (*url_open)(URLContext *h, const char *url, int flags);
-    int (*url_read)(URLContext *h, unsigned char *buf, int size);
-    int (*url_write)(URLContext *h, const unsigned char *buf, int size);
-    int64_t (*url_seek)(URLContext *h, int64_t pos, int whence);
-    int (*url_close)(URLContext *h);
-    struct URLProtocol *next;
-    int (*url_read_pause)(URLContext *h, int pause);
-    int64_t (*url_read_seek)(URLContext *h, int stream_index,
-                             int64_t timestamp, int flags);
-    int (*url_get_file_handle)(URLContext *h);
-    int priv_data_size;
-    const AVClass *priv_data_class;
-} URLProtocol;
-
-#if FF_API_REGISTER_PROTOCOL
-extern URLProtocol *first_protocol;
-#endif
-
-extern URLInterruptCB *url_interrupt_cb;
-
-/**
- * If protocol is NULL, returns the first registered protocol,
- * if protocol is non-NULL, returns the next registered protocol after protocol,
- * or NULL if protocol is the last one.
- */
-URLProtocol *av_protocol_next(URLProtocol *p);
-
-#if FF_API_REGISTER_PROTOCOL
-/**
- * @deprecated Use av_register_protocol() instead.
- */
-attribute_deprecated int register_protocol(URLProtocol *protocol);
-
-/**
- * @deprecated Use av_register_protocol2() instead.
- */
-attribute_deprecated int av_register_protocol(URLProtocol *protocol);
-#endif
-
-/**
- * Register the URLProtocol protocol.
- *
- * @param size the size of the URLProtocol struct referenced
- */
-int av_register_protocol2(URLProtocol *protocol, int size);
-
-/**
- * Bytestream IO Context.
- * New fields can be added to the end with minor version bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump.
- * sizeof(ByteIOContext) must not be used outside libav*.
- */
-typedef struct {
-    unsigned char *buffer;
-    int buffer_size;
-    unsigned char *buf_ptr, *buf_end;
-    void *opaque;
-    int (*read_packet)(void *opaque, uint8_t *buf, int buf_size);
-    int (*write_packet)(void *opaque, uint8_t *buf, int buf_size);
-    int64_t (*seek)(void *opaque, int64_t offset, int whence);
-    int64_t pos; /**< position in the file of the current buffer */
-    int must_flush; /**< true if the next seek should flush */
-    int eof_reached; /**< true if eof reached */
-    int write_flag;  /**< true if open for writing */
-    int is_streamed;
-    int max_packet_size;
-    unsigned long checksum;
-    unsigned char *checksum_ptr;
-    unsigned long (*update_checksum)(unsigned long checksum, const uint8_t *buf, unsigned int size);
-    int error;         ///< contains the error code or 0 if no error happened
-    int (*read_pause)(void *opaque, int pause);
-    int64_t (*read_seek)(void *opaque, int stream_index,
-                         int64_t timestamp, int flags);
-} ByteIOContext;
-
-int init_put_byte(ByteIOContext *s,
-                  unsigned char *buffer,
-                  int buffer_size,
-                  int write_flag,
-                  void *opaque,
-                  int (*read_packet)(void *opaque, uint8_t *buf, int buf_size),
-                  int (*write_packet)(void *opaque, uint8_t *buf, int buf_size),
-                  int64_t (*seek)(void *opaque, int64_t offset, int whence));
-ByteIOContext *av_alloc_put_byte(
-                  unsigned char *buffer,
-                  int buffer_size,
-                  int write_flag,
-                  void *opaque,
-                  int (*read_packet)(void *opaque, uint8_t *buf, int buf_size),
-                  int (*write_packet)(void *opaque, uint8_t *buf, int buf_size),
-                  int64_t (*seek)(void *opaque, int64_t offset, int whence));
-
-void put_byte(ByteIOContext *s, int b);
-void put_buffer(ByteIOContext *s, const unsigned char *buf, int size);
-void put_le64(ByteIOContext *s, uint64_t val);
-void put_be64(ByteIOContext *s, uint64_t val);
-void put_le32(ByteIOContext *s, unsigned int val);
-void put_be32(ByteIOContext *s, unsigned int val);
-void put_le24(ByteIOContext *s, unsigned int val);
-void put_be24(ByteIOContext *s, unsigned int val);
-void put_le16(ByteIOContext *s, unsigned int val);
-void put_be16(ByteIOContext *s, unsigned int val);
-void put_tag(ByteIOContext *s, const char *tag);
-
-void put_strz(ByteIOContext *s, const char *buf);
-
-/**
- * fseek() equivalent for ByteIOContext.
- * @return new position or AVERROR.
- */
-int64_t url_fseek(ByteIOContext *s, int64_t offset, int whence);
-
-/**
- * Skip given number of bytes forward.
- * @param offset number of bytes
- * @return 0 on success, <0 on error
- */
-int url_fskip(ByteIOContext *s, int64_t offset);
-
-/**
- * ftell() equivalent for ByteIOContext.
- * @return position or AVERROR.
- */
-int64_t url_ftell(ByteIOContext *s);
-
-/**
- * Get the filesize.
- * @return filesize or AVERROR
- */
-int64_t url_fsize(ByteIOContext *s);
-
-/**
- * feof() equivalent for ByteIOContext.
- * @return non zero if and only if end of file
- */
-int url_feof(ByteIOContext *s);
-
-int url_ferror(ByteIOContext *s);
-
-int av_url_read_fpause(ByteIOContext *h, int pause);
-int64_t av_url_read_fseek(ByteIOContext *h, int stream_index,
-                          int64_t timestamp, int flags);
-
-#define URL_EOF (-1)
-/** @note return URL_EOF (-1) if EOF */
-int url_fgetc(ByteIOContext *s);
-
-/** @warning currently size is limited */
-#ifdef __GNUC__
-int url_fprintf(ByteIOContext *s, const char *fmt, ...) __attribute__ ((__format__ (__printf__, 2, 3)));
-#else
-int url_fprintf(ByteIOContext *s, const char *fmt, ...);
-#endif
-
-/** @note unlike fgets, the EOL character is not returned and a whole
-    line is parsed. return NULL if first char read was EOF */
-char *url_fgets(ByteIOContext *s, char *buf, int buf_size);
-
-void put_flush_packet(ByteIOContext *s);
-
-
-/**
- * Read size bytes from ByteIOContext into buf.
- * @return number of bytes read or AVERROR
- */
-int get_buffer(ByteIOContext *s, unsigned char *buf, int size);
-
-/**
- * Read size bytes from ByteIOContext into buf.
- * This reads at most 1 packet. If that is not enough fewer bytes will be
- * returned.
- * @return number of bytes read or AVERROR
- */
-int get_partial_buffer(ByteIOContext *s, unsigned char *buf, int size);
-
-/** @note return 0 if EOF, so you cannot use it if EOF handling is
-    necessary */
-int get_byte(ByteIOContext *s);
-unsigned int get_le24(ByteIOContext *s);
-unsigned int get_le32(ByteIOContext *s);
-uint64_t get_le64(ByteIOContext *s);
-unsigned int get_le16(ByteIOContext *s);
-
-char *get_strz(ByteIOContext *s, char *buf, int maxlen);
-unsigned int get_be16(ByteIOContext *s);
-unsigned int get_be24(ByteIOContext *s);
-unsigned int get_be32(ByteIOContext *s);
-uint64_t get_be64(ByteIOContext *s);
-
-uint64_t ff_get_v(ByteIOContext *bc);
-
-static inline int url_is_streamed(ByteIOContext *s)
-{
-    return s->is_streamed;
-}
-
-/**
- * Create and initialize a ByteIOContext for accessing the
- * resource referenced by the URLContext h.
- * @note When the URLContext h has been opened in read+write mode, the
- * ByteIOContext can be used only for writing.
- *
- * @param s Used to return the pointer to the created ByteIOContext.
- * In case of failure the pointed to value is set to NULL.
- * @return 0 in case of success, a negative value corresponding to an
- * AVERROR code in case of failure
- */
-int url_fdopen(ByteIOContext **s, URLContext *h);
-
-/** @warning must be called before any I/O */
-int url_setbufsize(ByteIOContext *s, int buf_size);
-#if FF_API_URL_RESETBUF
-/** Reset the buffer for reading or writing.
- * @note Will drop any data currently in the buffer without transmitting it.
- * @param flags URL_RDONLY to set up the buffer for reading, or URL_WRONLY
- *        to set up the buffer for writing. */
-int url_resetbuf(ByteIOContext *s, int flags);
-#endif
-
-/**
- * Rewind the ByteIOContext using the specified buffer containing the first buf_size bytes of the file.
- * Used after probing to avoid seeking.
- * Joins buf and s->buffer, taking any overlap into consideration.
- * @note s->buffer must overlap with buf or they can't be joined and the function fails
- * @note This function is NOT part of the public API
- *
- * @param s The read-only ByteIOContext to rewind
- * @param buf The probe buffer containing the first buf_size bytes of the file
- * @param buf_size The size of buf
- * @return 0 in case of success, a negative value corresponding to an
- * AVERROR code in case of failure
- */
-int ff_rewind_with_probe_data(ByteIOContext *s, unsigned char *buf, int buf_size);
-
-/**
- * Create and initialize a ByteIOContext for accessing the
- * resource indicated by url.
- * @note When the resource indicated by url has been opened in
- * read+write mode, the ByteIOContext can be used only for writing.
- *
- * @param s Used to return the pointer to the created ByteIOContext.
- * In case of failure the pointed to value is set to NULL.
- * @param flags flags which control how the resource indicated by url
- * is to be opened
- * @return 0 in case of success, a negative value corresponding to an
- * AVERROR code in case of failure
- */
-int url_fopen(ByteIOContext **s, const char *url, int flags);
-
-int url_fclose(ByteIOContext *s);
-URLContext *url_fileno(ByteIOContext *s);
-
-/**
- * Return the maximum packet size associated to packetized buffered file
- * handle. If the file is not packetized (stream like http or file on
- * disk), then 0 is returned.
- *
- * @param s buffered file handle
- * @return maximum packet size in bytes
- */
-int url_fget_max_packet_size(ByteIOContext *s);
-
-int url_open_buf(ByteIOContext **s, uint8_t *buf, int buf_size, int flags);
-
-/** return the written or read size */
-int url_close_buf(ByteIOContext *s);
-
-/**
- * Open a write only memory stream.
- *
- * @param s new IO context
- * @return zero if no error.
- */
-int url_open_dyn_buf(ByteIOContext **s);
-
-/**
- * Open a write only packetized memory stream with a maximum packet
- * size of 'max_packet_size'.  The stream is stored in a memory buffer
- * with a big endian 4 byte header giving the packet size in bytes.
- *
- * @param s new IO context
- * @param max_packet_size maximum packet size (must be > 0)
- * @return zero if no error.
- */
-int url_open_dyn_packet_buf(ByteIOContext **s, int max_packet_size);
-
-/**
- * Return the written size and a pointer to the buffer. The buffer
- * must be freed with av_free(). If the buffer is opened with
- * url_open_dyn_buf, then padding of FF_INPUT_BUFFER_PADDING_SIZE is
- * added; if opened with url_open_dyn_packet_buf, no padding is added.
- *
- * @param s IO context
- * @param pbuffer pointer to a byte buffer
- * @return the length of the byte buffer
- */
-int url_close_dyn_buf(ByteIOContext *s, uint8_t **pbuffer);
-
-unsigned long ff_crc04C11DB7_update(unsigned long checksum, const uint8_t *buf,
-                                    unsigned int len);
-unsigned long get_checksum(ByteIOContext *s);
-void init_checksum(ByteIOContext *s,
-                   unsigned long (*update_checksum)(unsigned long c, const uint8_t *p, unsigned int len),
-                   unsigned long checksum);
-
-/* udp.c */
-int udp_set_remote_url(URLContext *h, const char *uri);
-int udp_get_local_port(URLContext *h);
-#if (LIBAVFORMAT_VERSION_MAJOR <= 52)
-int udp_get_file_handle(URLContext *h);
-#endif
-
-#endif /* AVFORMAT_AVIO_H */
diff --git a/lib-x86-64/include/libavutil/adler32.h b/lib-x86-64/include/libavutil/adler32.h
deleted file mode 100644
index 0b890bcc..00000000
--- a/lib-x86-64/include/libavutil/adler32.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * copyright (c) 2006 Mans Rullgard
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_ADLER32_H
-#define AVUTIL_ADLER32_H
-
-#include <stdint.h>
-#include "attributes.h"
-
-/**
- * Calculate the Adler32 checksum of a buffer.
- *
- * Passing the return value to a subsequent av_adler32_update() call
- * allows the checksum of multiple buffers to be calculated as though
- * they were concatenated.
- *
- * @param adler initial checksum value
- * @param buf   pointer to input buffer
- * @param len   size of input buffer
- * @return      updated checksum
- */
-unsigned long av_adler32_update(unsigned long adler, const uint8_t *buf,
-                                unsigned int len) av_pure;
-
-#endif /* AVUTIL_ADLER32_H */
diff --git a/lib-x86-64/include/libavutil/attributes.h b/lib-x86-64/include/libavutil/attributes.h
deleted file mode 100644
index a95bb02e..00000000
--- a/lib-x86-64/include/libavutil/attributes.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * Macro definitions for various function/variable attributes
- */
-
-#ifndef AVUTIL_ATTRIBUTES_H
-#define AVUTIL_ATTRIBUTES_H
-
-#ifdef __GNUC__
-#    define AV_GCC_VERSION_AT_LEAST(x,y) (__GNUC__ > x || __GNUC__ == x && __GNUC_MINOR__ >= y)
-#else
-#    define AV_GCC_VERSION_AT_LEAST(x,y) 0
-#endif
-
-#ifndef av_always_inline
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-#    define av_always_inline __attribute__((always_inline)) inline
-#else
-#    define av_always_inline inline
-#endif
-#endif
-
-#ifndef av_noinline
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-#    define av_noinline __attribute__((noinline))
-#else
-#    define av_noinline
-#endif
-#endif
-
-#ifndef av_pure
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-#    define av_pure __attribute__((pure))
-#else
-#    define av_pure
-#endif
-#endif
-
-#ifndef av_const
-#if AV_GCC_VERSION_AT_LEAST(2,6)
-#    define av_const __attribute__((const))
-#else
-#    define av_const
-#endif
-#endif
-
-#ifndef av_cold
-#if (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(4,3)
-#    define av_cold __attribute__((cold))
-#else
-#    define av_cold
-#endif
-#endif
-
-#ifndef av_flatten
-#if (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(4,1)
-#    define av_flatten __attribute__((flatten))
-#else
-#    define av_flatten
-#endif
-#endif
-
-#ifndef attribute_deprecated
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-#    define attribute_deprecated __attribute__((deprecated))
-#else
-#    define attribute_deprecated
-#endif
-#endif
-
-#ifndef av_unused
-#if defined(__GNUC__)
-#    define av_unused __attribute__((unused))
-#else
-#    define av_unused
-#endif
-#endif
-
-#ifndef av_alias
-#if (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(3,3)
-#   define av_alias __attribute__((may_alias))
-#else
-#   define av_alias
-#endif
-#endif
-
-#ifndef av_uninit
-#if defined(__GNUC__) && !defined(__ICC)
-#    define av_uninit(x) x=x
-#else
-#    define av_uninit(x) x
-#endif
-#endif
-
-#ifdef __GNUC__
-#    define av_builtin_constant_p __builtin_constant_p
-#else
-#    define av_builtin_constant_p(x) 0
-#endif
-
-#endif /* AVUTIL_ATTRIBUTES_H */
diff --git a/lib-x86-64/include/libavutil/avassert.h b/lib-x86-64/include/libavutil/avassert.h
deleted file mode 100644
index 8dd4878c..00000000
--- a/lib-x86-64/include/libavutil/avassert.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * copyright (c) 2010 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * simple assert() macros that are a bit more flexible than ISO C assert().
- * @author Michael Niedermayer <michaelni@gmx.at>
- */
-
-#ifndef AVUTIL_AVASSERT_H
-#define AVUTIL_AVASSERT_H
-
-#include <stdlib.h>
-#include "avutil.h"
-#include "log.h"
-
-/**
- * assert() equivalent, that is always enabled.
- */
-#define av_assert0(cond) do {                                           \
-    if (!(cond)) {                                                      \
-        av_log(NULL, AV_LOG_FATAL, "Assertion %s failed at %s:%d\n",    \
-               AV_STRINGIFY(cond), __FILE__, __LINE__);                 \
-        abort();                                                        \
-    }                                                                   \
-} while (0)
-
-
-/**
- * assert() equivalent, that does not lie in speed critical code.
- * These asserts() thus can be enabled without fearing speedloss.
- */
-#if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 0
-#define av_assert1(cond) av_assert0(cond)
-#else
-#define av_assert1(cond) ((void)0)
-#endif
-
-
-/**
- * assert() equivalent, that does lie in speed critical code.
- */
-#if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 1
-#define av_assert2(cond) av_assert0(cond)
-#else
-#define av_assert2(cond) ((void)0)
-#endif
-
-#endif
diff --git a/lib-x86-64/include/libavutil/avconfig.h b/lib-x86-64/include/libavutil/avconfig.h
deleted file mode 100644
index f10aa618..00000000
--- a/lib-x86-64/include/libavutil/avconfig.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Generated by ffconf */
-#ifndef AVUTIL_AVCONFIG_H
-#define AVUTIL_AVCONFIG_H
-#define AV_HAVE_BIGENDIAN 0
-#define AV_HAVE_FAST_UNALIGNED 1
-#endif /* AVUTIL_AVCONFIG_H */
diff --git a/lib-x86-64/include/libavutil/avstring.h b/lib-x86-64/include/libavutil/avstring.h
deleted file mode 100644
index 04d11973..00000000
--- a/lib-x86-64/include/libavutil/avstring.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) 2007 Mans Rullgard
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_AVSTRING_H
-#define AVUTIL_AVSTRING_H
-
-#include <stddef.h>
-
-/**
- * Return non-zero if pfx is a prefix of str. If it is, *ptr is set to
- * the address of the first character in str after the prefix.
- *
- * @param str input string
- * @param pfx prefix to test
- * @param ptr updated if the prefix is matched inside str
- * @return non-zero if the prefix matches, zero otherwise
- */
-int av_strstart(const char *str, const char *pfx, const char **ptr);
-
-/**
- * Return non-zero if pfx is a prefix of str independent of case. If
- * it is, *ptr is set to the address of the first character in str
- * after the prefix.
- *
- * @param str input string
- * @param pfx prefix to test
- * @param ptr updated if the prefix is matched inside str
- * @return non-zero if the prefix matches, zero otherwise
- */
-int av_stristart(const char *str, const char *pfx, const char **ptr);
-
-/**
- * Locate the first case-independent occurrence in the string haystack
- * of the string needle.  A zero-length string needle is considered to
- * match at the start of haystack.
- *
- * This function is a case-insensitive version of the standard strstr().
- *
- * @param haystack string to search in
- * @param needle   string to search for
- * @return         pointer to the located match within haystack
- *                 or a null pointer if no match
- */
-char *av_stristr(const char *haystack, const char *needle);
-
-/**
- * Copy the string src to dst, but no more than size - 1 bytes, and
- * null-terminate dst.
- *
- * This function is the same as BSD strlcpy().
- *
- * @param dst destination buffer
- * @param src source string
- * @param size size of destination buffer
- * @return the length of src
- *
- * WARNING: since the return value is the length of src, src absolutely
- * _must_ be a properly 0-terminated string, otherwise this will read beyond
- * the end of the buffer and possibly crash.
- */
-size_t av_strlcpy(char *dst, const char *src, size_t size);
-
-/**
- * Append the string src to the string dst, but to a total length of
- * no more than size - 1 bytes, and null-terminate dst.
- *
- * This function is similar to BSD strlcat(), but differs when
- * size <= strlen(dst).
- *
- * @param dst destination buffer
- * @param src source string
- * @param size size of destination buffer
- * @return the total length of src and dst
- *
- * WARNING: since the return value use the length of src and dst, these absolutely
- * _must_ be a properly 0-terminated strings, otherwise this will read beyond
- * the end of the buffer and possibly crash.
- */
-size_t av_strlcat(char *dst, const char *src, size_t size);
-
-/**
- * Append output to a string, according to a format. Never write out of
- * the destination buffer, and always put a terminating 0 within
- * the buffer.
- * @param dst destination buffer (string to which the output is
- *  appended)
- * @param size total size of the destination buffer
- * @param fmt printf-compatible format string, specifying how the
- *  following parameters are used
- * @return the length of the string that would have been generated
- *  if enough space had been available
- */
-size_t av_strlcatf(char *dst, size_t size, const char *fmt, ...);
-
-/**
- * Convert a number to a av_malloced string.
- */
-char *av_d2str(double d);
-
-/**
- * Unescape the given string until a non escaped terminating char,
- * and return the token corresponding to the unescaped string.
- *
- * The normal \ and ' escaping is supported. Leading and trailing
- * whitespaces are removed, unless they are escaped with '\' or are
- * enclosed between ''.
- *
- * @param buf the buffer to parse, buf will be updated to point to the
- * terminating char
- * @param term a 0-terminated list of terminating chars
- * @return the malloced unescaped string, which must be av_freed by
- * the user, NULL in case of allocation failure
- */
-char *av_get_token(const char **buf, const char *term);
-
-#endif /* AVUTIL_AVSTRING_H */
diff --git a/lib-x86-64/include/libavutil/avutil.h b/lib-x86-64/include/libavutil/avutil.h
deleted file mode 100644
index 74247d3a..00000000
--- a/lib-x86-64/include/libavutil/avutil.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_AVUTIL_H
-#define AVUTIL_AVUTIL_H
-
-/**
- * @file
- * external API header
- */
-
-
-#define AV_STRINGIFY(s)         AV_TOSTRING(s)
-#define AV_TOSTRING(s) #s
-
-#define AV_GLUE(a, b) a ## b
-#define AV_JOIN(a, b) AV_GLUE(a, b)
-
-#define AV_PRAGMA(s) _Pragma(#s)
-
-#define AV_VERSION_INT(a, b, c) (a<<16 | b<<8 | c)
-#define AV_VERSION_DOT(a, b, c) a ##.## b ##.## c
-#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
-
-#define LIBAVUTIL_VERSION_MAJOR 50
-#define LIBAVUTIL_VERSION_MINOR 32
-#define LIBAVUTIL_VERSION_MICRO  3
-
-#define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
-                                               LIBAVUTIL_VERSION_MINOR, \
-                                               LIBAVUTIL_VERSION_MICRO)
-#define LIBAVUTIL_VERSION       AV_VERSION(LIBAVUTIL_VERSION_MAJOR,     \
-                                           LIBAVUTIL_VERSION_MINOR,     \
-                                           LIBAVUTIL_VERSION_MICRO)
-#define LIBAVUTIL_BUILD         LIBAVUTIL_VERSION_INT
-
-#define LIBAVUTIL_IDENT         "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
-
-/**
- * Return the LIBAVUTIL_VERSION_INT constant.
- */
-unsigned avutil_version(void);
-
-/**
- * Return the libavutil build-time configuration.
- */
-const char *avutil_configuration(void);
-
-/**
- * Return the libavutil license.
- */
-const char *avutil_license(void);
-
-enum AVMediaType {
-    AVMEDIA_TYPE_UNKNOWN = -1,
-    AVMEDIA_TYPE_VIDEO,
-    AVMEDIA_TYPE_AUDIO,
-    AVMEDIA_TYPE_DATA,
-    AVMEDIA_TYPE_SUBTITLE,
-    AVMEDIA_TYPE_ATTACHMENT,
-    AVMEDIA_TYPE_NB
-};
-
-#define FF_LAMBDA_SHIFT 7
-#define FF_LAMBDA_SCALE (1<<FF_LAMBDA_SHIFT)
-#define FF_QP2LAMBDA 118 ///< factor to convert from H.263 QP to lambda
-#define FF_LAMBDA_MAX (256*128-1)
-
-#define FF_QUALITY_SCALE FF_LAMBDA_SCALE //FIXME maybe remove
-
-#include "common.h"
-#include "error.h"
-#include "mathematics.h"
-#include "rational.h"
-#include "intfloat_readwrite.h"
-#include "log.h"
-#include "pixfmt.h"
-
-#endif /* AVUTIL_AVUTIL_H */
diff --git a/lib-x86-64/include/libavutil/base64.h b/lib-x86-64/include/libavutil/base64.h
deleted file mode 100644
index 092980b0..00000000
--- a/lib-x86-64/include/libavutil/base64.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2006 Ryan Martell. (rdm4@martellventures.com)
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_BASE64_H
-#define AVUTIL_BASE64_H
-
-#include <stdint.h>
-
-/**
- * Decode a base64-encoded string.
- *
- * @param out      buffer for decoded data
- * @param in       null-terminated input string
- * @param out_size size in bytes of the out buffer, must be at
- *                 least 3/4 of the length of in
- * @return         number of bytes written, or a negative value in case of
- *                 invalid input
- */
-int av_base64_decode(uint8_t *out, const char *in, int out_size);
-
-/**
- * Encode data to base64 and null-terminate.
- *
- * @param out      buffer for encoded data
- * @param out_size size in bytes of the output buffer, must be at
- *                 least AV_BASE64_SIZE(in_size)
- * @param in_size  size in bytes of the 'in' buffer
- * @return         'out' or NULL in case of error
- */
-char *av_base64_encode(char *out, int out_size, const uint8_t *in, int in_size);
-
-/**
- * Calculate the output size needed to base64-encode x bytes.
- */
-#define AV_BASE64_SIZE(x)  (((x)+2) / 3 * 4 + 1)
-
-#endif /* AVUTIL_BASE64_H */
diff --git a/lib-x86-64/include/libavutil/bswap.h b/lib-x86-64/include/libavutil/bswap.h
deleted file mode 100644
index 303bcf35..00000000
--- a/lib-x86-64/include/libavutil/bswap.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * byte swapping routines
- */
-
-#ifndef AVUTIL_BSWAP_H
-#define AVUTIL_BSWAP_H
-
-#include <stdint.h>
-#include "libavutil/avconfig.h"
-#include "attributes.h"
-
-#ifdef HAVE_AV_CONFIG_H
-
-#include "config.h"
-
-#if   ARCH_ARM
-#   include "arm/bswap.h"
-#elif ARCH_AVR32
-#   include "avr32/bswap.h"
-#elif ARCH_BFIN
-#   include "bfin/bswap.h"
-#elif ARCH_SH4
-#   include "sh4/bswap.h"
-#elif ARCH_X86
-#   include "x86/bswap.h"
-#endif
-
-#endif /* HAVE_AV_CONFIG_H */
-
-#define AV_BSWAP16C(x) (((x) << 8 & 0xff00)  | ((x) >> 8 & 0x00ff))
-#define AV_BSWAP32C(x) (AV_BSWAP16C(x) << 16 | AV_BSWAP16C((x) >> 16))
-#define AV_BSWAP64C(x) (AV_BSWAP32C(x) << 32 | AV_BSWAP32C((x) >> 32))
-
-#define AV_BSWAPC(s, x) AV_BSWAP##s##C(x)
-
-#ifndef av_bswap16
-static av_always_inline av_const uint16_t av_bswap16(uint16_t x)
-{
-    x= (x>>8) | (x<<8);
-    return x;
-}
-#endif
-
-#ifndef av_bswap32
-static av_always_inline av_const uint32_t av_bswap32(uint32_t x)
-{
-    x= ((x<<8)&0xFF00FF00) | ((x>>8)&0x00FF00FF);
-    x= (x>>16) | (x<<16);
-    return x;
-}
-#endif
-
-#ifndef av_bswap64
-static inline uint64_t av_const av_bswap64(uint64_t x)
-{
-#if 0
-    x= ((x<< 8)&0xFF00FF00FF00FF00ULL) | ((x>> 8)&0x00FF00FF00FF00FFULL);
-    x= ((x<<16)&0xFFFF0000FFFF0000ULL) | ((x>>16)&0x0000FFFF0000FFFFULL);
-    return (x>>32) | (x<<32);
-#else
-    union {
-        uint64_t ll;
-        uint32_t l[2];
-    } w, r;
-    w.ll = x;
-    r.l[0] = av_bswap32 (w.l[1]);
-    r.l[1] = av_bswap32 (w.l[0]);
-    return r.ll;
-#endif
-}
-#endif
-
-// be2ne ... big-endian to native-endian
-// le2ne ... little-endian to native-endian
-
-#if AV_HAVE_BIGENDIAN
-#define av_be2ne16(x) (x)
-#define av_be2ne32(x) (x)
-#define av_be2ne64(x) (x)
-#define av_le2ne16(x) av_bswap16(x)
-#define av_le2ne32(x) av_bswap32(x)
-#define av_le2ne64(x) av_bswap64(x)
-#define AV_BE2NEC(s, x) (x)
-#define AV_LE2NEC(s, x) AV_BSWAPC(s, x)
-#else
-#define av_be2ne16(x) av_bswap16(x)
-#define av_be2ne32(x) av_bswap32(x)
-#define av_be2ne64(x) av_bswap64(x)
-#define av_le2ne16(x) (x)
-#define av_le2ne32(x) (x)
-#define av_le2ne64(x) (x)
-#define AV_BE2NEC(s, x) AV_BSWAPC(s, x)
-#define AV_LE2NEC(s, x) (x)
-#endif
-
-#define AV_BE2NE16C(x) AV_BE2NEC(16, x)
-#define AV_BE2NE32C(x) AV_BE2NEC(32, x)
-#define AV_BE2NE64C(x) AV_BE2NEC(64, x)
-#define AV_LE2NE16C(x) AV_LE2NEC(16, x)
-#define AV_LE2NE32C(x) AV_LE2NEC(32, x)
-#define AV_LE2NE64C(x) AV_LE2NEC(64, x)
-
-#endif /* AVUTIL_BSWAP_H */
diff --git a/lib-x86-64/include/libavutil/common.h b/lib-x86-64/include/libavutil/common.h
deleted file mode 100644
index 6404076a..00000000
--- a/lib-x86-64/include/libavutil/common.h
+++ /dev/null
@@ -1,370 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * common internal and external API header
- */
-
-#ifndef AVUTIL_COMMON_H
-#define AVUTIL_COMMON_H
-
-#include <ctype.h>
-#include <errno.h>
-#include <inttypes.h>
-#include <limits.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "attributes.h"
-#include "libavutil/avconfig.h"
-
-#if AV_HAVE_BIGENDIAN
-#   define AV_NE(be, le) (be)
-#else
-#   define AV_NE(be, le) (le)
-#endif
-
-//rounded division & shift
-#define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b))
-/* assume b>0 */
-#define ROUNDED_DIV(a,b) (((a)>0 ? (a) + ((b)>>1) : (a) - ((b)>>1))/(b))
-#define FFABS(a) ((a) >= 0 ? (a) : (-(a)))
-#define FFSIGN(a) ((a) > 0 ? 1 : -1)
-
-#define FFMAX(a,b) ((a) > (b) ? (a) : (b))
-#define FFMAX3(a,b,c) FFMAX(FFMAX(a,b),c)
-#define FFMIN(a,b) ((a) > (b) ? (b) : (a))
-#define FFMIN3(a,b,c) FFMIN(FFMIN(a,b),c)
-
-#define FFSWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0)
-#define FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0]))
-#define FFALIGN(x, a) (((x)+(a)-1)&~((a)-1))
-
-/* misc math functions */
-extern const uint8_t ff_log2_tab[256];
-
-extern const uint8_t av_reverse[256];
-
-static inline av_const int av_log2_c(unsigned int v)
-{
-    int n = 0;
-    if (v & 0xffff0000) {
-        v >>= 16;
-        n += 16;
-    }
-    if (v & 0xff00) {
-        v >>= 8;
-        n += 8;
-    }
-    n += ff_log2_tab[v];
-
-    return n;
-}
-
-static inline av_const int av_log2_16bit_c(unsigned int v)
-{
-    int n = 0;
-    if (v & 0xff00) {
-        v >>= 8;
-        n += 8;
-    }
-    n += ff_log2_tab[v];
-
-    return n;
-}
-
-#ifdef HAVE_AV_CONFIG_H
-#   include "config.h"
-#   include "intmath.h"
-#endif
-
-/* Pull in unguarded fallback defines at the end of this file. */
-#include "common.h"
-
-/**
- * Clip a signed integer value into the amin-amax range.
- * @param a value to clip
- * @param amin minimum value of the clip range
- * @param amax maximum value of the clip range
- * @return clipped value
- */
-static inline av_const int av_clip_c(int a, int amin, int amax)
-{
-    if      (a < amin) return amin;
-    else if (a > amax) return amax;
-    else               return a;
-}
-
-/**
- * Clip a signed integer value into the 0-255 range.
- * @param a value to clip
- * @return clipped value
- */
-static inline av_const uint8_t av_clip_uint8_c(int a)
-{
-    if (a&(~0xFF)) return (-a)>>31;
-    else           return a;
-}
-
-/**
- * Clip a signed integer value into the -128,127 range.
- * @param a value to clip
- * @return clipped value
- */
-static inline av_const int8_t av_clip_int8_c(int a)
-{
-    if ((a+0x80) & ~0xFF) return (a>>31) ^ 0x7F;
-    else                  return a;
-}
-
-/**
- * Clip a signed integer value into the 0-65535 range.
- * @param a value to clip
- * @return clipped value
- */
-static inline av_const uint16_t av_clip_uint16_c(int a)
-{
-    if (a&(~0xFFFF)) return (-a)>>31;
-    else             return a;
-}
-
-/**
- * Clip a signed integer value into the -32768,32767 range.
- * @param a value to clip
- * @return clipped value
- */
-static inline av_const int16_t av_clip_int16_c(int a)
-{
-    if ((a+0x8000) & ~0xFFFF) return (a>>31) ^ 0x7FFF;
-    else                      return a;
-}
-
-/**
- * Clip a signed 64-bit integer value into the -2147483648,2147483647 range.
- * @param a value to clip
- * @return clipped value
- */
-static inline av_const int32_t av_clipl_int32_c(int64_t a)
-{
-    if ((a+0x80000000u) & ~UINT64_C(0xFFFFFFFF)) return (a>>63) ^ 0x7FFFFFFF;
-    else                                         return a;
-}
-
-/**
- * Clip a float value into the amin-amax range.
- * @param a value to clip
- * @param amin minimum value of the clip range
- * @param amax maximum value of the clip range
- * @return clipped value
- */
-static inline av_const float av_clipf_c(float a, float amin, float amax)
-{
-    if      (a < amin) return amin;
-    else if (a > amax) return amax;
-    else               return a;
-}
-
-/** Compute ceil(log2(x)).
- * @param x value used to compute ceil(log2(x))
- * @return computed ceiling of log2(x)
- */
-static inline av_const int av_ceil_log2_c(int x)
-{
-    return av_log2((x - 1) << 1);
-}
-
-/**
- * Count number of bits set to one in x
- * @param x value to count bits of
- * @return the number of bits set to one in x
- */
-static inline av_const int av_popcount_c(uint32_t x)
-{
-    x -= (x >> 1) & 0x55555555;
-    x = (x & 0x33333333) + ((x >> 2) & 0x33333333);
-    x = (x + (x >> 4)) & 0x0F0F0F0F;
-    x += x >> 8;
-    return (x + (x >> 16)) & 0x3F;
-}
-
-#define MKTAG(a,b,c,d) ((a) | ((b) << 8) | ((c) << 16) | ((d) << 24))
-#define MKBETAG(a,b,c,d) ((d) | ((c) << 8) | ((b) << 16) | ((a) << 24))
-
-/**
- * Convert a UTF-8 character (up to 4 bytes) to its 32-bit UCS-4 encoded form.
- *
- * @param val      Output value, must be an lvalue of type uint32_t.
- * @param GET_BYTE Expression reading one byte from the input.
- *                 Evaluated up to 7 times (4 for the currently
- *                 assigned Unicode range).  With a memory buffer
- *                 input, this could be *ptr++.
- * @param ERROR    Expression to be evaluated on invalid input,
- *                 typically a goto statement.
- */
-#define GET_UTF8(val, GET_BYTE, ERROR)\
-    val= GET_BYTE;\
-    {\
-        int ones= 7 - av_log2(val ^ 255);\
-        if(ones==1)\
-            ERROR\
-        val&= 127>>ones;\
-        while(--ones > 0){\
-            int tmp= GET_BYTE - 128;\
-            if(tmp>>6)\
-                ERROR\
-            val= (val<<6) + tmp;\
-        }\
-    }
-
-/**
- * Convert a UTF-16 character (2 or 4 bytes) to its 32-bit UCS-4 encoded form.
- *
- * @param val       Output value, must be an lvalue of type uint32_t.
- * @param GET_16BIT Expression returning two bytes of UTF-16 data converted
- *                  to native byte order.  Evaluated one or two times.
- * @param ERROR     Expression to be evaluated on invalid input,
- *                  typically a goto statement.
- */
-#define GET_UTF16(val, GET_16BIT, ERROR)\
-    val = GET_16BIT;\
-    {\
-        unsigned int hi = val - 0xD800;\
-        if (hi < 0x800) {\
-            val = GET_16BIT - 0xDC00;\
-            if (val > 0x3FFU || hi > 0x3FFU)\
-                ERROR\
-            val += (hi<<10) + 0x10000;\
-        }\
-    }\
-
-/*!
- * \def PUT_UTF8(val, tmp, PUT_BYTE)
- * Convert a 32-bit Unicode character to its UTF-8 encoded form (up to 4 bytes long).
- * \param val is an input-only argument and should be of type uint32_t. It holds
- * a UCS-4 encoded Unicode character that is to be converted to UTF-8. If
- * val is given as a function it is executed only once.
- * \param tmp is a temporary variable and should be of type uint8_t. It
- * represents an intermediate value during conversion that is to be
- * output by PUT_BYTE.
- * \param PUT_BYTE writes the converted UTF-8 bytes to any proper destination.
- * It could be a function or a statement, and uses tmp as the input byte.
- * For example, PUT_BYTE could be "*output++ = tmp;" PUT_BYTE will be
- * executed up to 4 times for values in the valid UTF-8 range and up to
- * 7 times in the general case, depending on the length of the converted
- * Unicode character.
- */
-#define PUT_UTF8(val, tmp, PUT_BYTE)\
-    {\
-        int bytes, shift;\
-        uint32_t in = val;\
-        if (in < 0x80) {\
-            tmp = in;\
-            PUT_BYTE\
-        } else {\
-            bytes = (av_log2(in) + 4) / 5;\
-            shift = (bytes - 1) * 6;\
-            tmp = (256 - (256 >> bytes)) | (in >> shift);\
-            PUT_BYTE\
-            while (shift >= 6) {\
-                shift -= 6;\
-                tmp = 0x80 | ((in >> shift) & 0x3f);\
-                PUT_BYTE\
-            }\
-        }\
-    }
-
-/*!
- * \def PUT_UTF16(val, tmp, PUT_16BIT)
- * Convert a 32-bit Unicode character to its UTF-16 encoded form (2 or 4 bytes).
- * \param val is an input-only argument and should be of type uint32_t. It holds
- * a UCS-4 encoded Unicode character that is to be converted to UTF-16. If
- * val is given as a function it is executed only once.
- * \param tmp is a temporary variable and should be of type uint16_t. It
- * represents an intermediate value during conversion that is to be
- * output by PUT_16BIT.
- * \param PUT_16BIT writes the converted UTF-16 data to any proper destination
- * in desired endianness. It could be a function or a statement, and uses tmp
- * as the input byte.  For example, PUT_BYTE could be "*output++ = tmp;"
- * PUT_BYTE will be executed 1 or 2 times depending on input character.
- */
-#define PUT_UTF16(val, tmp, PUT_16BIT)\
-    {\
-        uint32_t in = val;\
-        if (in < 0x10000) {\
-            tmp = in;\
-            PUT_16BIT\
-        } else {\
-            tmp = 0xD800 | ((in - 0x10000) >> 10);\
-            PUT_16BIT\
-            tmp = 0xDC00 | ((in - 0x10000) & 0x3FF);\
-            PUT_16BIT\
-        }\
-    }\
-
-
-
-#include "mem.h"
-
-#ifdef HAVE_AV_CONFIG_H
-#    include "internal.h"
-#endif /* HAVE_AV_CONFIG_H */
-
-#endif /* AVUTIL_COMMON_H */
-
-/*
- * The following definitions are outside the multiple inclusion guard
- * to ensure they are immediately available in intmath.h.
- */
-
-#ifndef av_log2
-#   define av_log2       av_log2_c
-#endif
-#ifndef av_log2_16bit
-#   define av_log2_16bit av_log2_16bit_c
-#endif
-#ifndef av_ceil_log2
-#   define av_ceil_log2     av_ceil_log2_c
-#endif
-#ifndef av_clip
-#   define av_clip          av_clip_c
-#endif
-#ifndef av_clip_uint8
-#   define av_clip_uint8    av_clip_uint8_c
-#endif
-#ifndef av_clip_int8
-#   define av_clip_int8     av_clip_int8_c
-#endif
-#ifndef av_clip_uint16
-#   define av_clip_uint16   av_clip_uint16_c
-#endif
-#ifndef av_clip_int16
-#   define av_clip_int16    av_clip_int16_c
-#endif
-#ifndef av_clipl_int32
-#   define av_clipl_int32   av_clipl_int32_c
-#endif
-#ifndef av_clipf
-#   define av_clipf         av_clipf_c
-#endif
-#ifndef av_popcount
-#   define av_popcount      av_popcount_c
-#endif
diff --git a/lib-x86-64/include/libavutil/cpu.h b/lib-x86-64/include/libavutil/cpu.h
deleted file mode 100644
index 71cc2652..00000000
--- a/lib-x86-64/include/libavutil/cpu.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2000, 2001, 2002 Fabrice Bellard
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_CPU_H
-#define AVUTIL_CPU_H
-
-#define AV_CPU_FLAG_FORCE    0x80000000 /* force usage of selected flags (OR) */
-
-    /* lower 16 bits - CPU features */
-#define AV_CPU_FLAG_MMX          0x0001 ///< standard MMX
-#define AV_CPU_FLAG_MMX2         0x0002 ///< SSE integer functions or AMD MMX ext
-#define AV_CPU_FLAG_3DNOW        0x0004 ///< AMD 3DNOW
-#define AV_CPU_FLAG_SSE          0x0008 ///< SSE functions
-#define AV_CPU_FLAG_SSE2         0x0010 ///< PIV SSE2 functions
-#define AV_CPU_FLAG_SSE2SLOW 0x40000000 ///< SSE2 supported, but usually not faster
-#define AV_CPU_FLAG_3DNOWEXT     0x0020 ///< AMD 3DNowExt
-#define AV_CPU_FLAG_SSE3         0x0040 ///< Prescott SSE3 functions
-#define AV_CPU_FLAG_SSE3SLOW 0x20000000 ///< SSE3 supported, but usually not faster
-#define AV_CPU_FLAG_SSSE3        0x0080 ///< Conroe SSSE3 functions
-#define AV_CPU_FLAG_SSE4         0x0100 ///< Penryn SSE4.1 functions
-#define AV_CPU_FLAG_SSE42        0x0200 ///< Nehalem SSE4.2 functions
-#define AV_CPU_FLAG_IWMMXT       0x0100 ///< XScale IWMMXT
-#define AV_CPU_FLAG_ALTIVEC      0x0001 ///< standard
-
-/**
- * Return the flags which specify extensions supported by the CPU.
- */
-int av_get_cpu_flags(void);
-
-/* The following CPU-specific functions shall not be called directly. */
-int ff_get_cpu_flags_arm(void);
-int ff_get_cpu_flags_ppc(void);
-int ff_get_cpu_flags_x86(void);
-
-#endif  /* AVUTIL_CPU_H */
diff --git a/lib-x86-64/include/libavutil/crc.h b/lib-x86-64/include/libavutil/crc.h
deleted file mode 100644
index 6c0baab5..00000000
--- a/lib-x86-64/include/libavutil/crc.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_CRC_H
-#define AVUTIL_CRC_H
-
-#include <stdint.h>
-#include <stddef.h>
-#include "attributes.h"
-
-typedef uint32_t AVCRC;
-
-typedef enum {
-    AV_CRC_8_ATM,
-    AV_CRC_16_ANSI,
-    AV_CRC_16_CCITT,
-    AV_CRC_32_IEEE,
-    AV_CRC_32_IEEE_LE,  /*< reversed bitorder version of AV_CRC_32_IEEE */
-    AV_CRC_MAX,         /*< Not part of public API! Do not use outside libavutil. */
-}AVCRCId;
-
-int av_crc_init(AVCRC *ctx, int le, int bits, uint32_t poly, int ctx_size);
-const AVCRC *av_crc_get_table(AVCRCId crc_id);
-uint32_t av_crc(const AVCRC *ctx, uint32_t start_crc, const uint8_t *buffer, size_t length) av_pure;
-
-#endif /* AVUTIL_CRC_H */
-
diff --git a/lib-x86-64/include/libavutil/error.h b/lib-x86-64/include/libavutil/error.h
deleted file mode 100644
index 28fa9257..00000000
--- a/lib-x86-64/include/libavutil/error.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * error code definitions
- */
-
-#ifndef AVUTIL_ERROR_H
-#define AVUTIL_ERROR_H
-
-#include <errno.h>
-#include "avutil.h"
-
-/* error handling */
-#if EDOM > 0
-#define AVERROR(e) (-(e))   ///< Returns a negative error code from a POSIX error code, to return from library functions.
-#define AVUNERROR(e) (-(e)) ///< Returns a POSIX error code from a library function error return value.
-#else
-/* Some platforms have E* and errno already negated. */
-#define AVERROR(e) (e)
-#define AVUNERROR(e) (e)
-#endif
-
-#if LIBAVUTIL_VERSION_MAJOR < 51
-#define AVERROR_INVALIDDATA AVERROR(EINVAL)  ///< Invalid data found when processing input
-#define AVERROR_IO          AVERROR(EIO)     ///< I/O error
-#define AVERROR_NOENT       AVERROR(ENOENT)  ///< No such file or directory
-#define AVERROR_NOFMT       AVERROR(EILSEQ)  ///< Unknown format
-#define AVERROR_NOMEM       AVERROR(ENOMEM)  ///< Not enough memory
-#define AVERROR_NOTSUPP     AVERROR(ENOSYS)  ///< Operation not supported
-#define AVERROR_NUMEXPECTED AVERROR(EDOM)    ///< Number syntax expected in filename
-#define AVERROR_UNKNOWN     AVERROR(EINVAL)  ///< Unknown error
-#endif
-
-#define AVERROR_EOF         AVERROR(EPIPE)   ///< End of file
-
-#define AVERROR_PATCHWELCOME    (-MKTAG('P','A','W','E')) ///< Not yet implemented in FFmpeg, patches welcome
-
-#if LIBAVUTIL_VERSION_MAJOR > 50
-#define AVERROR_INVALIDDATA     (-MKTAG('I','N','D','A')) ///< Invalid data found when processing input
-#define AVERROR_NUMEXPECTED     (-MKTAG('N','U','E','X')) ///< Number syntax expected in filename
-#endif
-
-/**
- * Put a description of the AVERROR code errnum in errbuf.
- * In case of failure the global variable errno is set to indicate the
- * error. Even in case of failure av_strerror() will print a generic
- * error message indicating the errnum provided to errbuf.
- *
- * @param errnum      error code to describe
- * @param errbuf      buffer to which description is written
- * @param errbuf_size the size in bytes of errbuf
- * @return 0 on success, a negative value if a description for errnum
- * cannot be found
- */
-int av_strerror(int errnum, char *errbuf, size_t errbuf_size);
-
-#endif /* AVUTIL_ERROR_H */
diff --git a/lib-x86-64/include/libavutil/eval.h b/lib-x86-64/include/libavutil/eval.h
deleted file mode 100644
index 7a4f5f0c..00000000
--- a/lib-x86-64/include/libavutil/eval.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2002 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * simple arithmetic expression evaluator
- */
-
-#ifndef AVUTIL_EVAL_H
-#define AVUTIL_EVAL_H
-
-typedef struct AVExpr AVExpr;
-
-/**
- * Parse and evaluate an expression.
- * Note, this is significantly slower than av_eval_expr().
- *
- * @param res a pointer to a double where is put the result value of
- * the expression, or NAN in case of error
- * @param s expression as a zero terminated string, for example "1+2^3+5*5+sin(2/3)"
- * @param const_names NULL terminated array of zero terminated strings of constant identifiers, for example {"PI", "E", 0}
- * @param const_values a zero terminated array of values for the identifiers from const_names
- * @param func1_names NULL terminated array of zero terminated strings of funcs1 identifiers
- * @param funcs1 NULL terminated array of function pointers for functions which take 1 argument
- * @param func2_names NULL terminated array of zero terminated strings of funcs2 identifiers
- * @param funcs2 NULL terminated array of function pointers for functions which take 2 arguments
- * @param opaque a pointer which will be passed to all functions from funcs1 and funcs2
- * @param log_ctx parent logging context
- * @return 0 in case of success, a negative value corresponding to an
- * AVERROR code otherwise
- */
-int av_parse_and_eval_expr(double *res, const char *s,
-                           const char * const *const_names, const double *const_values,
-                           const char * const *func1_names, double (* const *funcs1)(void *, double),
-                           const char * const *func2_names, double (* const *funcs2)(void *, double, double),
-                           void *opaque, int log_offset, void *log_ctx);
-
-/**
- * Parse an expression.
- *
- * @param expr a pointer where is put an AVExpr containing the parsed
- * value in case of successfull parsing, or NULL otherwise.
- * The pointed to AVExpr must be freed with av_free_expr() by the user
- * when it is not needed anymore.
- * @param s expression as a zero terminated string, for example "1+2^3+5*5+sin(2/3)"
- * @param const_names NULL terminated array of zero terminated strings of constant identifiers, for example {"PI", "E", 0}
- * @param func1_names NULL terminated array of zero terminated strings of funcs1 identifiers
- * @param funcs1 NULL terminated array of function pointers for functions which take 1 argument
- * @param func2_names NULL terminated array of zero terminated strings of funcs2 identifiers
- * @param funcs2 NULL terminated array of function pointers for functions which take 2 arguments
- * @param log_ctx parent logging context
- * @return 0 in case of success, a negative value corresponding to an
- * AVERROR code otherwise
- */
-int av_parse_expr(AVExpr **expr, const char *s,
-                  const char * const *const_names,
-                  const char * const *func1_names, double (* const *funcs1)(void *, double),
-                  const char * const *func2_names, double (* const *funcs2)(void *, double, double),
-                  int log_offset, void *log_ctx);
-
-/**
- * Evaluate a previously parsed expression.
- *
- * @param const_values a zero terminated array of values for the identifiers from av_parse_expr() const_names
- * @param opaque a pointer which will be passed to all functions from funcs1 and funcs2
- * @return the value of the expression
- */
-double av_eval_expr(AVExpr *e, const double *const_values, void *opaque);
-
-/**
- * Free a parsed expression previously created with av_parse_expr().
- */
-void av_free_expr(AVExpr *e);
-
-/**
- * Parse the string in numstr and return its value as a double. If
- * the string is empty, contains only whitespaces, or does not contain
- * an initial substring that has the expected syntax for a
- * floating-point number, no conversion is performed. In this case,
- * returns a value of zero and the value returned in tail is the value
- * of numstr.
- *
- * @param numstr a string representing a number, may contain one of
- * the International System number postfixes, for example 'K', 'M',
- * 'G'. If 'i' is appended after the postfix, powers of 2 are used
- * instead of powers of 10. The 'B' postfix multiplies the value for
- * 8, and can be appended after another postfix or used alone. This
- * allows using for example 'KB', 'MiB', 'G' and 'B' as postfix.
- * @param tail if non-NULL puts here the pointer to the char next
- * after the last parsed character
- */
-double av_strtod(const char *numstr, char **tail);
-
-#endif /* AVUTIL_EVAL_H */
diff --git a/lib-x86-64/include/libavutil/fifo.h b/lib-x86-64/include/libavutil/fifo.h
deleted file mode 100644
index 999d0bf8..00000000
--- a/lib-x86-64/include/libavutil/fifo.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * a very simple circular buffer FIFO implementation
- */
-
-#ifndef AVUTIL_FIFO_H
-#define AVUTIL_FIFO_H
-
-#include <stdint.h>
-
-typedef struct AVFifoBuffer {
-    uint8_t *buffer;
-    uint8_t *rptr, *wptr, *end;
-    uint32_t rndx, wndx;
-} AVFifoBuffer;
-
-/**
- * Initialize an AVFifoBuffer.
- * @param size of FIFO
- * @return AVFifoBuffer or NULL in case of memory allocation failure
- */
-AVFifoBuffer *av_fifo_alloc(unsigned int size);
-
-/**
- * Free an AVFifoBuffer.
- * @param *f AVFifoBuffer to free
- */
-void av_fifo_free(AVFifoBuffer *f);
-
-/**
- * Reset the AVFifoBuffer to the state right after av_fifo_alloc, in particular it is emptied.
- * @param *f AVFifoBuffer to reset
- */
-void av_fifo_reset(AVFifoBuffer *f);
-
-/**
- * Return the amount of data in bytes in the AVFifoBuffer, that is the
- * amount of data you can read from it.
- * @param *f AVFifoBuffer to read from
- * @return size
- */
-int av_fifo_size(AVFifoBuffer *f);
-
-/**
- * Return the amount of space in bytes in the AVFifoBuffer, that is the
- * amount of data you can write into it.
- * @param *f AVFifoBuffer to write into
- * @return size
- */
-int av_fifo_space(AVFifoBuffer *f);
-
-/**
- * Feed data from an AVFifoBuffer to a user-supplied callback.
- * @param *f AVFifoBuffer to read from
- * @param buf_size number of bytes to read
- * @param *func generic read function
- * @param *dest data destination
- */
-int av_fifo_generic_read(AVFifoBuffer *f, void *dest, int buf_size, void (*func)(void*, void*, int));
-
-/**
- * Feed data from a user-supplied callback to an AVFifoBuffer.
- * @param *f AVFifoBuffer to write to
- * @param *src data source; non-const since it may be used as a
- * modifiable context by the function defined in func
- * @param size number of bytes to write
- * @param *func generic write function; the first parameter is src,
- * the second is dest_buf, the third is dest_buf_size.
- * func must return the number of bytes written to dest_buf, or <= 0 to
- * indicate no more data available to write.
- * If func is NULL, src is interpreted as a simple byte array for source data.
- * @return the number of bytes written to the FIFO
- */
-int av_fifo_generic_write(AVFifoBuffer *f, void *src, int size, int (*func)(void*, void*, int));
-
-/**
- * Resize an AVFifoBuffer.
- * @param *f AVFifoBuffer to resize
- * @param size new AVFifoBuffer size in bytes
- * @return <0 for failure, >=0 otherwise
- */
-int av_fifo_realloc2(AVFifoBuffer *f, unsigned int size);
-
-/**
- * Read and discard the specified amount of data from an AVFifoBuffer.
- * @param *f AVFifoBuffer to read from
- * @param size amount of data to read in bytes
- */
-void av_fifo_drain(AVFifoBuffer *f, int size);
-
-static inline uint8_t av_fifo_peek(AVFifoBuffer *f, int offs)
-{
-    uint8_t *ptr = f->rptr + offs;
-    if (ptr >= f->end)
-        ptr -= f->end - f->buffer;
-    return *ptr;
-}
-#endif /* AVUTIL_FIFO_H */
diff --git a/lib-x86-64/include/libavutil/intfloat_readwrite.h b/lib-x86-64/include/libavutil/intfloat_readwrite.h
deleted file mode 100644
index 1b80fc6e..00000000
--- a/lib-x86-64/include/libavutil/intfloat_readwrite.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_INTFLOAT_READWRITE_H
-#define AVUTIL_INTFLOAT_READWRITE_H
-
-#include <stdint.h>
-#include "attributes.h"
-
-/* IEEE 80 bits extended float */
-typedef struct AVExtFloat  {
-    uint8_t exponent[2];
-    uint8_t mantissa[8];
-} AVExtFloat;
-
-double av_int2dbl(int64_t v) av_const;
-float av_int2flt(int32_t v) av_const;
-double av_ext2dbl(const AVExtFloat ext) av_const;
-int64_t av_dbl2int(double d) av_const;
-int32_t av_flt2int(float d) av_const;
-AVExtFloat av_dbl2ext(double d) av_const;
-
-#endif /* AVUTIL_INTFLOAT_READWRITE_H */
diff --git a/lib-x86-64/include/libavutil/intreadwrite.h b/lib-x86-64/include/libavutil/intreadwrite.h
deleted file mode 100644
index 1849a646..00000000
--- a/lib-x86-64/include/libavutil/intreadwrite.h
+++ /dev/null
@@ -1,522 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_INTREADWRITE_H
-#define AVUTIL_INTREADWRITE_H
-
-#include <stdint.h>
-#include "libavutil/avconfig.h"
-#include "attributes.h"
-#include "bswap.h"
-
-typedef union {
-    uint64_t u64;
-    uint32_t u32[2];
-    uint16_t u16[4];
-    uint8_t  u8 [8];
-    double   f64;
-    float    f32[2];
-} av_alias av_alias64;
-
-typedef union {
-    uint32_t u32;
-    uint16_t u16[2];
-    uint8_t  u8 [4];
-    float    f32;
-} av_alias av_alias32;
-
-typedef union {
-    uint16_t u16;
-    uint8_t  u8 [2];
-} av_alias av_alias16;
-
-/*
- * Arch-specific headers can provide any combination of
- * AV_[RW][BLN](16|24|32|64) and AV_(COPY|SWAP|ZERO)(64|128) macros.
- * Preprocessor symbols must be defined, even if these are implemented
- * as inline functions.
- */
-
-#ifdef HAVE_AV_CONFIG_H
-
-#include "config.h"
-
-#if   ARCH_ARM
-#   include "arm/intreadwrite.h"
-#elif ARCH_AVR32
-#   include "avr32/intreadwrite.h"
-#elif ARCH_MIPS
-#   include "mips/intreadwrite.h"
-#elif ARCH_PPC
-#   include "ppc/intreadwrite.h"
-#elif ARCH_TOMI
-#   include "tomi/intreadwrite.h"
-#elif ARCH_X86
-#   include "x86/intreadwrite.h"
-#endif
-
-#endif /* HAVE_AV_CONFIG_H */
-
-/*
- * Map AV_RNXX <-> AV_R[BL]XX for all variants provided by per-arch headers.
- */
-
-#if AV_HAVE_BIGENDIAN
-
-#   if    defined(AV_RN16) && !defined(AV_RB16)
-#       define AV_RB16(p) AV_RN16(p)
-#   elif !defined(AV_RN16) &&  defined(AV_RB16)
-#       define AV_RN16(p) AV_RB16(p)
-#   endif
-
-#   if    defined(AV_WN16) && !defined(AV_WB16)
-#       define AV_WB16(p, v) AV_WN16(p, v)
-#   elif !defined(AV_WN16) &&  defined(AV_WB16)
-#       define AV_WN16(p, v) AV_WB16(p, v)
-#   endif
-
-#   if    defined(AV_RN24) && !defined(AV_RB24)
-#       define AV_RB24(p) AV_RN24(p)
-#   elif !defined(AV_RN24) &&  defined(AV_RB24)
-#       define AV_RN24(p) AV_RB24(p)
-#   endif
-
-#   if    defined(AV_WN24) && !defined(AV_WB24)
-#       define AV_WB24(p, v) AV_WN24(p, v)
-#   elif !defined(AV_WN24) &&  defined(AV_WB24)
-#       define AV_WN24(p, v) AV_WB24(p, v)
-#   endif
-
-#   if    defined(AV_RN32) && !defined(AV_RB32)
-#       define AV_RB32(p) AV_RN32(p)
-#   elif !defined(AV_RN32) &&  defined(AV_RB32)
-#       define AV_RN32(p) AV_RB32(p)
-#   endif
-
-#   if    defined(AV_WN32) && !defined(AV_WB32)
-#       define AV_WB32(p, v) AV_WN32(p, v)
-#   elif !defined(AV_WN32) &&  defined(AV_WB32)
-#       define AV_WN32(p, v) AV_WB32(p, v)
-#   endif
-
-#   if    defined(AV_RN64) && !defined(AV_RB64)
-#       define AV_RB64(p) AV_RN64(p)
-#   elif !defined(AV_RN64) &&  defined(AV_RB64)
-#       define AV_RN64(p) AV_RB64(p)
-#   endif
-
-#   if    defined(AV_WN64) && !defined(AV_WB64)
-#       define AV_WB64(p, v) AV_WN64(p, v)
-#   elif !defined(AV_WN64) &&  defined(AV_WB64)
-#       define AV_WN64(p, v) AV_WB64(p, v)
-#   endif
-
-#else /* AV_HAVE_BIGENDIAN */
-
-#   if    defined(AV_RN16) && !defined(AV_RL16)
-#       define AV_RL16(p) AV_RN16(p)
-#   elif !defined(AV_RN16) &&  defined(AV_RL16)
-#       define AV_RN16(p) AV_RL16(p)
-#   endif
-
-#   if    defined(AV_WN16) && !defined(AV_WL16)
-#       define AV_WL16(p, v) AV_WN16(p, v)
-#   elif !defined(AV_WN16) &&  defined(AV_WL16)
-#       define AV_WN16(p, v) AV_WL16(p, v)
-#   endif
-
-#   if    defined(AV_RN24) && !defined(AV_RL24)
-#       define AV_RL24(p) AV_RN24(p)
-#   elif !defined(AV_RN24) &&  defined(AV_RL24)
-#       define AV_RN24(p) AV_RL24(p)
-#   endif
-
-#   if    defined(AV_WN24) && !defined(AV_WL24)
-#       define AV_WL24(p, v) AV_WN24(p, v)
-#   elif !defined(AV_WN24) &&  defined(AV_WL24)
-#       define AV_WN24(p, v) AV_WL24(p, v)
-#   endif
-
-#   if    defined(AV_RN32) && !defined(AV_RL32)
-#       define AV_RL32(p) AV_RN32(p)
-#   elif !defined(AV_RN32) &&  defined(AV_RL32)
-#       define AV_RN32(p) AV_RL32(p)
-#   endif
-
-#   if    defined(AV_WN32) && !defined(AV_WL32)
-#       define AV_WL32(p, v) AV_WN32(p, v)
-#   elif !defined(AV_WN32) &&  defined(AV_WL32)
-#       define AV_WN32(p, v) AV_WL32(p, v)
-#   endif
-
-#   if    defined(AV_RN64) && !defined(AV_RL64)
-#       define AV_RL64(p) AV_RN64(p)
-#   elif !defined(AV_RN64) &&  defined(AV_RL64)
-#       define AV_RN64(p) AV_RL64(p)
-#   endif
-
-#   if    defined(AV_WN64) && !defined(AV_WL64)
-#       define AV_WL64(p, v) AV_WN64(p, v)
-#   elif !defined(AV_WN64) &&  defined(AV_WL64)
-#       define AV_WN64(p, v) AV_WL64(p, v)
-#   endif
-
-#endif /* !AV_HAVE_BIGENDIAN */
-
-/*
- * Define AV_[RW]N helper macros to simplify definitions not provided
- * by per-arch headers.
- */
-
-#if defined(__GNUC__) && !defined(__TI_COMPILER_VERSION__)
-
-union unaligned_64 { uint64_t l; } __attribute__((packed)) av_alias;
-union unaligned_32 { uint32_t l; } __attribute__((packed)) av_alias;
-union unaligned_16 { uint16_t l; } __attribute__((packed)) av_alias;
-
-#   define AV_RN(s, p) (((const union unaligned_##s *) (p))->l)
-#   define AV_WN(s, p, v) ((((union unaligned_##s *) (p))->l) = (v))
-
-#elif defined(__DECC)
-
-#   define AV_RN(s, p) (*((const __unaligned uint##s##_t*)(p)))
-#   define AV_WN(s, p, v) (*((__unaligned uint##s##_t*)(p)) = (v))
-
-#elif AV_HAVE_FAST_UNALIGNED
-
-#   define AV_RN(s, p) (((const av_alias##s*)(p))->u##s)
-#   define AV_WN(s, p, v) (((av_alias##s*)(p))->u##s = (v))
-
-#else
-
-#ifndef AV_RB16
-#   define AV_RB16(x)                           \
-    ((((const uint8_t*)(x))[0] << 8) |          \
-      ((const uint8_t*)(x))[1])
-#endif
-#ifndef AV_WB16
-#   define AV_WB16(p, d) do {                   \
-        ((uint8_t*)(p))[1] = (d);               \
-        ((uint8_t*)(p))[0] = (d)>>8;            \
-    } while(0)
-#endif
-
-#ifndef AV_RL16
-#   define AV_RL16(x)                           \
-    ((((const uint8_t*)(x))[1] << 8) |          \
-      ((const uint8_t*)(x))[0])
-#endif
-#ifndef AV_WL16
-#   define AV_WL16(p, d) do {                   \
-        ((uint8_t*)(p))[0] = (d);               \
-        ((uint8_t*)(p))[1] = (d)>>8;            \
-    } while(0)
-#endif
-
-#ifndef AV_RB32
-#   define AV_RB32(x)                           \
-    ((((const uint8_t*)(x))[0] << 24) |         \
-     (((const uint8_t*)(x))[1] << 16) |         \
-     (((const uint8_t*)(x))[2] <<  8) |         \
-      ((const uint8_t*)(x))[3])
-#endif
-#ifndef AV_WB32
-#   define AV_WB32(p, d) do {                   \
-        ((uint8_t*)(p))[3] = (d);               \
-        ((uint8_t*)(p))[2] = (d)>>8;            \
-        ((uint8_t*)(p))[1] = (d)>>16;           \
-        ((uint8_t*)(p))[0] = (d)>>24;           \
-    } while(0)
-#endif
-
-#ifndef AV_RL32
-#   define AV_RL32(x)                           \
-    ((((const uint8_t*)(x))[3] << 24) |         \
-     (((const uint8_t*)(x))[2] << 16) |         \
-     (((const uint8_t*)(x))[1] <<  8) |         \
-      ((const uint8_t*)(x))[0])
-#endif
-#ifndef AV_WL32
-#   define AV_WL32(p, d) do {                   \
-        ((uint8_t*)(p))[0] = (d);               \
-        ((uint8_t*)(p))[1] = (d)>>8;            \
-        ((uint8_t*)(p))[2] = (d)>>16;           \
-        ((uint8_t*)(p))[3] = (d)>>24;           \
-    } while(0)
-#endif
-
-#ifndef AV_RB64
-#   define AV_RB64(x)                                   \
-    (((uint64_t)((const uint8_t*)(x))[0] << 56) |       \
-     ((uint64_t)((const uint8_t*)(x))[1] << 48) |       \
-     ((uint64_t)((const uint8_t*)(x))[2] << 40) |       \
-     ((uint64_t)((const uint8_t*)(x))[3] << 32) |       \
-     ((uint64_t)((const uint8_t*)(x))[4] << 24) |       \
-     ((uint64_t)((const uint8_t*)(x))[5] << 16) |       \
-     ((uint64_t)((const uint8_t*)(x))[6] <<  8) |       \
-      (uint64_t)((const uint8_t*)(x))[7])
-#endif
-#ifndef AV_WB64
-#   define AV_WB64(p, d) do {                   \
-        ((uint8_t*)(p))[7] = (d);               \
-        ((uint8_t*)(p))[6] = (d)>>8;            \
-        ((uint8_t*)(p))[5] = (d)>>16;           \
-        ((uint8_t*)(p))[4] = (d)>>24;           \
-        ((uint8_t*)(p))[3] = (d)>>32;           \
-        ((uint8_t*)(p))[2] = (d)>>40;           \
-        ((uint8_t*)(p))[1] = (d)>>48;           \
-        ((uint8_t*)(p))[0] = (d)>>56;           \
-    } while(0)
-#endif
-
-#ifndef AV_RL64
-#   define AV_RL64(x)                                   \
-    (((uint64_t)((const uint8_t*)(x))[7] << 56) |       \
-     ((uint64_t)((const uint8_t*)(x))[6] << 48) |       \
-     ((uint64_t)((const uint8_t*)(x))[5] << 40) |       \
-     ((uint64_t)((const uint8_t*)(x))[4] << 32) |       \
-     ((uint64_t)((const uint8_t*)(x))[3] << 24) |       \
-     ((uint64_t)((const uint8_t*)(x))[2] << 16) |       \
-     ((uint64_t)((const uint8_t*)(x))[1] <<  8) |       \
-      (uint64_t)((const uint8_t*)(x))[0])
-#endif
-#ifndef AV_WL64
-#   define AV_WL64(p, d) do {                   \
-        ((uint8_t*)(p))[0] = (d);               \
-        ((uint8_t*)(p))[1] = (d)>>8;            \
-        ((uint8_t*)(p))[2] = (d)>>16;           \
-        ((uint8_t*)(p))[3] = (d)>>24;           \
-        ((uint8_t*)(p))[4] = (d)>>32;           \
-        ((uint8_t*)(p))[5] = (d)>>40;           \
-        ((uint8_t*)(p))[6] = (d)>>48;           \
-        ((uint8_t*)(p))[7] = (d)>>56;           \
-    } while(0)
-#endif
-
-#if AV_HAVE_BIGENDIAN
-#   define AV_RN(s, p)    AV_RB##s(p)
-#   define AV_WN(s, p, v) AV_WB##s(p, v)
-#else
-#   define AV_RN(s, p)    AV_RL##s(p)
-#   define AV_WN(s, p, v) AV_WL##s(p, v)
-#endif
-
-#endif /* HAVE_FAST_UNALIGNED */
-
-#ifndef AV_RN16
-#   define AV_RN16(p) AV_RN(16, p)
-#endif
-
-#ifndef AV_RN32
-#   define AV_RN32(p) AV_RN(32, p)
-#endif
-
-#ifndef AV_RN64
-#   define AV_RN64(p) AV_RN(64, p)
-#endif
-
-#ifndef AV_WN16
-#   define AV_WN16(p, v) AV_WN(16, p, v)
-#endif
-
-#ifndef AV_WN32
-#   define AV_WN32(p, v) AV_WN(32, p, v)
-#endif
-
-#ifndef AV_WN64
-#   define AV_WN64(p, v) AV_WN(64, p, v)
-#endif
-
-#if AV_HAVE_BIGENDIAN
-#   define AV_RB(s, p)    AV_RN##s(p)
-#   define AV_WB(s, p, v) AV_WN##s(p, v)
-#   define AV_RL(s, p)    av_bswap##s(AV_RN##s(p))
-#   define AV_WL(s, p, v) AV_WN##s(p, av_bswap##s(v))
-#else
-#   define AV_RB(s, p)    av_bswap##s(AV_RN##s(p))
-#   define AV_WB(s, p, v) AV_WN##s(p, av_bswap##s(v))
-#   define AV_RL(s, p)    AV_RN##s(p)
-#   define AV_WL(s, p, v) AV_WN##s(p, v)
-#endif
-
-#define AV_RB8(x)     (((const uint8_t*)(x))[0])
-#define AV_WB8(p, d)  do { ((uint8_t*)(p))[0] = (d); } while(0)
-
-#define AV_RL8(x)     AV_RB8(x)
-#define AV_WL8(p, d)  AV_WB8(p, d)
-
-#ifndef AV_RB16
-#   define AV_RB16(p)    AV_RB(16, p)
-#endif
-#ifndef AV_WB16
-#   define AV_WB16(p, v) AV_WB(16, p, v)
-#endif
-
-#ifndef AV_RL16
-#   define AV_RL16(p)    AV_RL(16, p)
-#endif
-#ifndef AV_WL16
-#   define AV_WL16(p, v) AV_WL(16, p, v)
-#endif
-
-#ifndef AV_RB32
-#   define AV_RB32(p)    AV_RB(32, p)
-#endif
-#ifndef AV_WB32
-#   define AV_WB32(p, v) AV_WB(32, p, v)
-#endif
-
-#ifndef AV_RL32
-#   define AV_RL32(p)    AV_RL(32, p)
-#endif
-#ifndef AV_WL32
-#   define AV_WL32(p, v) AV_WL(32, p, v)
-#endif
-
-#ifndef AV_RB64
-#   define AV_RB64(p)    AV_RB(64, p)
-#endif
-#ifndef AV_WB64
-#   define AV_WB64(p, v) AV_WB(64, p, v)
-#endif
-
-#ifndef AV_RL64
-#   define AV_RL64(p)    AV_RL(64, p)
-#endif
-#ifndef AV_WL64
-#   define AV_WL64(p, v) AV_WL(64, p, v)
-#endif
-
-#ifndef AV_RB24
-#   define AV_RB24(x)                           \
-    ((((const uint8_t*)(x))[0] << 16) |         \
-     (((const uint8_t*)(x))[1] <<  8) |         \
-      ((const uint8_t*)(x))[2])
-#endif
-#ifndef AV_WB24
-#   define AV_WB24(p, d) do {                   \
-        ((uint8_t*)(p))[2] = (d);               \
-        ((uint8_t*)(p))[1] = (d)>>8;            \
-        ((uint8_t*)(p))[0] = (d)>>16;           \
-    } while(0)
-#endif
-
-#ifndef AV_RL24
-#   define AV_RL24(x)                           \
-    ((((const uint8_t*)(x))[2] << 16) |         \
-     (((const uint8_t*)(x))[1] <<  8) |         \
-      ((const uint8_t*)(x))[0])
-#endif
-#ifndef AV_WL24
-#   define AV_WL24(p, d) do {                   \
-        ((uint8_t*)(p))[0] = (d);               \
-        ((uint8_t*)(p))[1] = (d)>>8;            \
-        ((uint8_t*)(p))[2] = (d)>>16;           \
-    } while(0)
-#endif
-
-/*
- * The AV_[RW]NA macros access naturally aligned data
- * in a type-safe way.
- */
-
-#define AV_RNA(s, p)    (((const av_alias##s*)(p))->u##s)
-#define AV_WNA(s, p, v) (((av_alias##s*)(p))->u##s = (v))
-
-#ifndef AV_RN16A
-#   define AV_RN16A(p) AV_RNA(16, p)
-#endif
-
-#ifndef AV_RN32A
-#   define AV_RN32A(p) AV_RNA(32, p)
-#endif
-
-#ifndef AV_RN64A
-#   define AV_RN64A(p) AV_RNA(64, p)
-#endif
-
-#ifndef AV_WN16A
-#   define AV_WN16A(p, v) AV_WNA(16, p, v)
-#endif
-
-#ifndef AV_WN32A
-#   define AV_WN32A(p, v) AV_WNA(32, p, v)
-#endif
-
-#ifndef AV_WN64A
-#   define AV_WN64A(p, v) AV_WNA(64, p, v)
-#endif
-
-/* Parameters for AV_COPY*, AV_SWAP*, AV_ZERO* must be
- * naturally aligned. They may be implemented using MMX,
- * so emms_c() must be called before using any float code
- * afterwards.
- */
-
-#define AV_COPY(n, d, s) \
-    (((av_alias##n*)(d))->u##n = ((const av_alias##n*)(s))->u##n)
-
-#ifndef AV_COPY16
-#   define AV_COPY16(d, s) AV_COPY(16, d, s)
-#endif
-
-#ifndef AV_COPY32
-#   define AV_COPY32(d, s) AV_COPY(32, d, s)
-#endif
-
-#ifndef AV_COPY64
-#   define AV_COPY64(d, s) AV_COPY(64, d, s)
-#endif
-
-#ifndef AV_COPY128
-#   define AV_COPY128(d, s)                    \
-    do {                                       \
-        AV_COPY64(d, s);                       \
-        AV_COPY64((char*)(d)+8, (char*)(s)+8); \
-    } while(0)
-#endif
-
-#define AV_SWAP(n, a, b) FFSWAP(av_alias##n, *(av_alias##n*)(a), *(av_alias##n*)(b))
-
-#ifndef AV_SWAP64
-#   define AV_SWAP64(a, b) AV_SWAP(64, a, b)
-#endif
-
-#define AV_ZERO(n, d) (((av_alias##n*)(d))->u##n = 0)
-
-#ifndef AV_ZERO16
-#   define AV_ZERO16(d) AV_ZERO(16, d)
-#endif
-
-#ifndef AV_ZERO32
-#   define AV_ZERO32(d) AV_ZERO(32, d)
-#endif
-
-#ifndef AV_ZERO64
-#   define AV_ZERO64(d) AV_ZERO(64, d)
-#endif
-
-#ifndef AV_ZERO128
-#   define AV_ZERO128(d)         \
-    do {                         \
-        AV_ZERO64(d);            \
-        AV_ZERO64((char*)(d)+8); \
-    } while(0)
-#endif
-
-#endif /* AVUTIL_INTREADWRITE_H */
diff --git a/lib-x86-64/include/libavutil/lfg.h b/lib-x86-64/include/libavutil/lfg.h
deleted file mode 100644
index 0e89ea30..00000000
--- a/lib-x86-64/include/libavutil/lfg.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Lagged Fibonacci PRNG
- * Copyright (c) 2008 Michael Niedermayer
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_LFG_H
-#define AVUTIL_LFG_H
-
-typedef struct {
-    unsigned int state[64];
-    int index;
-} AVLFG;
-
-void av_lfg_init(AVLFG *c, unsigned int seed);
-
-/**
- * Get the next random unsigned 32-bit number using an ALFG.
- *
- * Please also consider a simple LCG like state= state*1664525+1013904223,
- * it may be good enough and faster for your specific use case.
- */
-static inline unsigned int av_lfg_get(AVLFG *c){
-    c->state[c->index & 63] = c->state[(c->index-24) & 63] + c->state[(c->index-55) & 63];
-    return c->state[c->index++ & 63];
-}
-
-/**
- * Get the next random unsigned 32-bit number using a MLFG.
- *
- * Please also consider av_lfg_get() above, it is faster.
- */
-static inline unsigned int av_mlfg_get(AVLFG *c){
-    unsigned int a= c->state[(c->index-55) & 63];
-    unsigned int b= c->state[(c->index-24) & 63];
-    return c->state[c->index++ & 63] = 2*a*b+a+b;
-}
-
-/**
- * Get the next two numbers generated by a Box-Muller Gaussian
- * generator using the random numbers issued by lfg.
- *
- * @param out[2] array where the two generated numbers are placed
- */
-void av_bmg_get(AVLFG *lfg, double out[2]);
-
-#endif /* AVUTIL_LFG_H */
diff --git a/lib-x86-64/include/libavutil/log.h b/lib-x86-64/include/libavutil/log.h
deleted file mode 100644
index 3b364bed..00000000
--- a/lib-x86-64/include/libavutil/log.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_LOG_H
-#define AVUTIL_LOG_H
-
-#include <stdarg.h>
-#include "avutil.h"
-
-/**
- * Describe the class of an AVClass context structure. That is an
- * arbitrary struct of which the first field is a pointer to an
- * AVClass struct (e.g. AVCodecContext, AVFormatContext etc.).
- */
-typedef struct {
-    /**
-     * The name of the class; usually it is the same name as the
-     * context structure type to which the AVClass is associated.
-     */
-    const char* class_name;
-
-    /**
-     * A pointer to a function which returns the name of a context
-     * instance ctx associated with the class.
-     */
-    const char* (*item_name)(void* ctx);
-
-    /**
-     * a pointer to the first option specified in the class if any or NULL
-     *
-     * @see av_set_default_options()
-     */
-    const struct AVOption *option;
-
-    /**
-     * LIBAVUTIL_VERSION with which this structure was created.
-     * This is used to allow fields to be added without requiring major
-     * version bumps everywhere.
-     */
-
-    int version;
-
-    /**
-     * Offset in the structure where log_level_offset is stored.
-     * 0 means there is no such variable
-     */
-    int log_level_offset_offset;
-
-    /**
-     * Offset in the structure where a pointer to the parent context for loging is stored.
-     * for example a decoder that uses eval.c could pass its AVCodecContext to eval as such
-     * parent context. And a av_log() implementation could then display the parent context
-     * can be NULL of course
-     */
-    int parent_log_context_offset;
-} AVClass;
-
-/* av_log API */
-
-#define AV_LOG_QUIET    -8
-
-/**
- * Something went really wrong and we will crash now.
- */
-#define AV_LOG_PANIC     0
-
-/**
- * Something went wrong and recovery is not possible.
- * For example, no header was found for a format which depends
- * on headers or an illegal combination of parameters is used.
- */
-#define AV_LOG_FATAL     8
-
-/**
- * Something went wrong and cannot losslessly be recovered.
- * However, not all future data is affected.
- */
-#define AV_LOG_ERROR    16
-
-/**
- * Something somehow does not look correct. This may or may not
- * lead to problems. An example would be the use of '-vstrict -2'.
- */
-#define AV_LOG_WARNING  24
-
-#define AV_LOG_INFO     32
-#define AV_LOG_VERBOSE  40
-
-/**
- * Stuff which is only useful for libav* developers.
- */
-#define AV_LOG_DEBUG    48
-
-/**
- * Send the specified message to the log if the level is less than or equal
- * to the current av_log_level. By default, all logging messages are sent to
- * stderr. This behavior can be altered by setting a different av_vlog callback
- * function.
- *
- * @param avcl A pointer to an arbitrary struct of which the first field is a
- * pointer to an AVClass struct.
- * @param level The importance level of the message, lower values signifying
- * higher importance.
- * @param fmt The format string (printf-compatible) that specifies how
- * subsequent arguments are converted to output.
- * @see av_vlog
- */
-#ifdef __GNUC__
-void av_log(void *avcl, int level, const char *fmt, ...) __attribute__ ((__format__ (__printf__, 3, 4)));
-#else
-void av_log(void *avcl, int level, const char *fmt, ...);
-#endif
-
-void av_vlog(void *avcl, int level, const char *fmt, va_list);
-int av_log_get_level(void);
-void av_log_set_level(int);
-void av_log_set_callback(void (*)(void*, int, const char*, va_list));
-void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl);
-const char* av_default_item_name(void* ctx);
-
-/**
- * Skip repeated messages, this requires the user app to use av_log() instead of
- * (f)printf as the 2 would otherwise interfere and lead to
- * "Last message repeated x times" messages below (f)printf messages with some
- * bad luck.
- * Also to receive the last, "last repeated" line if any, the user app must
- * call av_log(NULL, AV_LOG_QUIET, ""); at the end
- */
-#define AV_LOG_SKIP_REPEATED 1
-void av_log_set_flags(int arg);
-
-#endif /* AVUTIL_LOG_H */
diff --git a/lib-x86-64/include/libavutil/lzo.h b/lib-x86-64/include/libavutil/lzo.h
deleted file mode 100644
index 6788054b..00000000
--- a/lib-x86-64/include/libavutil/lzo.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * LZO 1x decompression
- * copyright (c) 2006 Reimar Doeffinger
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_LZO_H
-#define AVUTIL_LZO_H
-
-#include <stdint.h>
-
-/** \defgroup errflags Error flags returned by av_lzo1x_decode
-  * \{ */
-//! end of the input buffer reached before decoding finished
-#define AV_LZO_INPUT_DEPLETED 1
-//! decoded data did not fit into output buffer
-#define AV_LZO_OUTPUT_FULL 2
-//! a reference to previously decoded data was wrong
-#define AV_LZO_INVALID_BACKPTR 4
-//! a non-specific error in the compressed bitstream
-#define AV_LZO_ERROR 8
-/** \} */
-
-#define AV_LZO_INPUT_PADDING 8
-#define AV_LZO_OUTPUT_PADDING 12
-
-/**
- * \brief Decodes LZO 1x compressed data.
- * \param out output buffer
- * \param outlen size of output buffer, number of bytes left are returned here
- * \param in input buffer
- * \param inlen size of input buffer, number of bytes left are returned here
- * \return 0 on success, otherwise a combination of the error flags above
- *
- * Make sure all buffers are appropriately padded, in must provide
- * AV_LZO_INPUT_PADDING, out must provide AV_LZO_OUTPUT_PADDING additional bytes.
- */
-int av_lzo1x_decode(void *out, int *outlen, const void *in, int *inlen);
-
-/**
- * \brief deliberately overlapping memcpy implementation
- * \param dst destination buffer; must be padded with 12 additional bytes
- * \param back how many bytes back we start (the initial size of the overlapping window)
- * \param cnt number of bytes to copy, must be >= 0
- *
- * cnt > back is valid, this will copy the bytes we just copied,
- * thus creating a repeating pattern with a period length of back.
- */
-void av_memcpy_backptr(uint8_t *dst, int back, int cnt);
-
-#endif /* AVUTIL_LZO_H */
diff --git a/lib-x86-64/include/libavutil/mathematics.h b/lib-x86-64/include/libavutil/mathematics.h
deleted file mode 100644
index 882a5163..00000000
--- a/lib-x86-64/include/libavutil/mathematics.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_MATHEMATICS_H
-#define AVUTIL_MATHEMATICS_H
-
-#include <stdint.h>
-#include <math.h>
-#include "attributes.h"
-#include "rational.h"
-
-#ifndef M_E
-#define M_E            2.7182818284590452354   /* e */
-#endif
-#ifndef M_LN2
-#define M_LN2          0.69314718055994530942  /* log_e 2 */
-#endif
-#ifndef M_LN10
-#define M_LN10         2.30258509299404568402  /* log_e 10 */
-#endif
-#ifndef M_LOG2_10
-#define M_LOG2_10      3.32192809488736234787  /* log_2 10 */
-#endif
-#ifndef M_PHI
-#define M_PHI          1.61803398874989484820   /* phi / golden ratio */
-#endif
-#ifndef M_PI
-#define M_PI           3.14159265358979323846  /* pi */
-#endif
-#ifndef M_SQRT1_2
-#define M_SQRT1_2      0.70710678118654752440  /* 1/sqrt(2) */
-#endif
-#ifndef M_SQRT2
-#define M_SQRT2        1.41421356237309504880  /* sqrt(2) */
-#endif
-#ifndef NAN
-#define NAN            (0.0/0.0)
-#endif
-#ifndef INFINITY
-#define INFINITY       (1.0/0.0)
-#endif
-
-enum AVRounding {
-    AV_ROUND_ZERO     = 0, ///< Round toward zero.
-    AV_ROUND_INF      = 1, ///< Round away from zero.
-    AV_ROUND_DOWN     = 2, ///< Round toward -infinity.
-    AV_ROUND_UP       = 3, ///< Round toward +infinity.
-    AV_ROUND_NEAR_INF = 5, ///< Round to nearest and halfway cases away from zero.
-};
-
-/**
- * Return the greatest common divisor of a and b.
- * If both a and b are 0 or either or both are <0 then behavior is
- * undefined.
- */
-int64_t av_const av_gcd(int64_t a, int64_t b);
-
-/**
- * Rescale a 64-bit integer with rounding to nearest.
- * A simple a*b/c isn't possible as it can overflow.
- */
-int64_t av_rescale(int64_t a, int64_t b, int64_t c) av_const;
-
-/**
- * Rescale a 64-bit integer with specified rounding.
- * A simple a*b/c isn't possible as it can overflow.
- */
-int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum AVRounding) av_const;
-
-/**
- * Rescale a 64-bit integer by 2 rational numbers.
- */
-int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq) av_const;
-
-/**
- * Compare 2 timestamps each in its own timebases.
- * The result of the function is undefined if one of the timestamps
- * is outside the int64_t range when represented in the others timebase.
- * @return -1 if ts_a is before ts_b, 1 if ts_a is after ts_b or 0 if they represent the same position
- */
-int av_compare_ts(int64_t ts_a, AVRational tb_a, int64_t ts_b, AVRational tb_b);
-
-/**
- * Compare 2 integers modulo mod.
- * That is we compare integers a and b for which only the least
- * significant log2(mod) bits are known.
- *
- * @param mod must be a power of 2
- * @return a negative value if a is smaller than b
- *         a positive value if a is greater than b
- *         0                if a equals          b
- */
-int64_t av_compare_mod(uint64_t a, uint64_t b, uint64_t mod);
-
-#endif /* AVUTIL_MATHEMATICS_H */
diff --git a/lib-x86-64/include/libavutil/md5.h b/lib-x86-64/include/libavutil/md5.h
deleted file mode 100644
index 969202a8..00000000
--- a/lib-x86-64/include/libavutil/md5.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_MD5_H
-#define AVUTIL_MD5_H
-
-#include <stdint.h>
-
-extern const int av_md5_size;
-
-struct AVMD5;
-
-void av_md5_init(struct AVMD5 *ctx);
-void av_md5_update(struct AVMD5 *ctx, const uint8_t *src, const int len);
-void av_md5_final(struct AVMD5 *ctx, uint8_t *dst);
-void av_md5_sum(uint8_t *dst, const uint8_t *src, const int len);
-
-#endif /* AVUTIL_MD5_H */
-
diff --git a/lib-x86-64/include/libavutil/mem.h b/lib-x86-64/include/libavutil/mem.h
deleted file mode 100644
index c5ec2ab3..00000000
--- a/lib-x86-64/include/libavutil/mem.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * memory handling functions
- */
-
-#ifndef AVUTIL_MEM_H
-#define AVUTIL_MEM_H
-
-#include "attributes.h"
-#include "avutil.h"
-
-#if defined(__ICC) && _ICC < 1200 || defined(__SUNPRO_C)
-    #define DECLARE_ALIGNED(n,t,v)      t __attribute__ ((aligned (n))) v
-    #define DECLARE_ASM_CONST(n,t,v)    const t __attribute__ ((aligned (n))) v
-#elif defined(__TI_COMPILER_VERSION__)
-    #define DECLARE_ALIGNED(n,t,v)                      \
-        AV_PRAGMA(DATA_ALIGN(v,n))                      \
-        t __attribute__((aligned(n))) v
-    #define DECLARE_ASM_CONST(n,t,v)                    \
-        AV_PRAGMA(DATA_ALIGN(v,n))                      \
-        static const t __attribute__((aligned(n))) v
-#elif defined(__GNUC__)
-    #define DECLARE_ALIGNED(n,t,v)      t __attribute__ ((aligned (n))) v
-    #define DECLARE_ASM_CONST(n,t,v)    static const t attribute_used __attribute__ ((aligned (n))) v
-#elif defined(_MSC_VER)
-    #define DECLARE_ALIGNED(n,t,v)      __declspec(align(n)) t v
-    #define DECLARE_ASM_CONST(n,t,v)    __declspec(align(n)) static const t v
-#else
-    #define DECLARE_ALIGNED(n,t,v)      t v
-    #define DECLARE_ASM_CONST(n,t,v)    static const t v
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-    #define av_malloc_attrib __attribute__((__malloc__))
-#else
-    #define av_malloc_attrib
-#endif
-
-#if (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(4,3)
-    #define av_alloc_size(n) __attribute__((alloc_size(n)))
-#else
-    #define av_alloc_size(n)
-#endif
-
-/**
- * Allocate a block of size bytes with alignment suitable for all
- * memory accesses (including vectors if available on the CPU).
- * @param size Size in bytes for the memory block to be allocated.
- * @return Pointer to the allocated block, NULL if the block cannot
- * be allocated.
- * @see av_mallocz()
- */
-void *av_malloc(unsigned int size) av_malloc_attrib av_alloc_size(1);
-
-/**
- * Allocate or reallocate a block of memory.
- * If ptr is NULL and size > 0, allocate a new block. If
- * size is zero, free the memory block pointed to by ptr.
- * @param size Size in bytes for the memory block to be allocated or
- * reallocated.
- * @param ptr Pointer to a memory block already allocated with
- * av_malloc(z)() or av_realloc() or NULL.
- * @return Pointer to a newly reallocated block or NULL if the block
- * cannot be reallocated or the function is used to free the memory block.
- * @see av_fast_realloc()
- */
-void *av_realloc(void *ptr, unsigned int size) av_alloc_size(2);
-
-/**
- * Free a memory block which has been allocated with av_malloc(z)() or
- * av_realloc().
- * @param ptr Pointer to the memory block which should be freed.
- * @note ptr = NULL is explicitly allowed.
- * @note It is recommended that you use av_freep() instead.
- * @see av_freep()
- */
-void av_free(void *ptr);
-
-/**
- * Allocate a block of size bytes with alignment suitable for all
- * memory accesses (including vectors if available on the CPU) and
- * zero all the bytes of the block.
- * @param size Size in bytes for the memory block to be allocated.
- * @return Pointer to the allocated block, NULL if it cannot be allocated.
- * @see av_malloc()
- */
-void *av_mallocz(unsigned int size) av_malloc_attrib av_alloc_size(1);
-
-/**
- * Duplicate the string s.
- * @param s string to be duplicated
- * @return Pointer to a newly allocated string containing a
- * copy of s or NULL if the string cannot be allocated.
- */
-char *av_strdup(const char *s) av_malloc_attrib;
-
-/**
- * Free a memory block which has been allocated with av_malloc(z)() or
- * av_realloc() and set the pointer pointing to it to NULL.
- * @param ptr Pointer to the pointer to the memory block which should
- * be freed.
- * @see av_free()
- */
-void av_freep(void *ptr);
-
-#endif /* AVUTIL_MEM_H */
diff --git a/lib-x86-64/include/libavutil/opt.h b/lib-x86-64/include/libavutil/opt.h
deleted file mode 100644
index 67c2dd7c..00000000
--- a/lib-x86-64/include/libavutil/opt.h
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * AVOptions
- * copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_OPT_H
-#define AVUTIL_OPT_H
-
-/**
- * @file
- * AVOptions
- */
-
-#include "rational.h"
-#include "avutil.h"
-
-enum AVOptionType{
-    FF_OPT_TYPE_FLAGS,
-    FF_OPT_TYPE_INT,
-    FF_OPT_TYPE_INT64,
-    FF_OPT_TYPE_DOUBLE,
-    FF_OPT_TYPE_FLOAT,
-    FF_OPT_TYPE_STRING,
-    FF_OPT_TYPE_RATIONAL,
-    FF_OPT_TYPE_BINARY,  ///< offset must point to a pointer immediately followed by an int for the length
-    FF_OPT_TYPE_CONST=128,
-};
-
-/**
- * AVOption
- */
-typedef struct AVOption {
-    const char *name;
-
-    /**
-     * short English help text
-     * @todo What about other languages?
-     */
-    const char *help;
-
-    /**
-     * The offset relative to the context structure where the option
-     * value is stored. It should be 0 for named constants.
-     */
-    int offset;
-    enum AVOptionType type;
-
-    /**
-     * the default value for scalar options
-     */
-    double default_val;
-    double min;                 ///< minimum valid value for the option
-    double max;                 ///< maximum valid value for the option
-
-    int flags;
-#define AV_OPT_FLAG_ENCODING_PARAM  1   ///< a generic parameter which can be set by the user for muxing or encoding
-#define AV_OPT_FLAG_DECODING_PARAM  2   ///< a generic parameter which can be set by the user for demuxing or decoding
-#define AV_OPT_FLAG_METADATA        4   ///< some data extracted or inserted into the file like title, comment, ...
-#define AV_OPT_FLAG_AUDIO_PARAM     8
-#define AV_OPT_FLAG_VIDEO_PARAM     16
-#define AV_OPT_FLAG_SUBTITLE_PARAM  32
-//FIXME think about enc-audio, ... style flags
-
-    /**
-     * The logical unit to which the option belongs. Non-constant
-     * options and corresponding named constants share the same
-     * unit. May be NULL.
-     */
-    const char *unit;
-} AVOption;
-
-/**
- * AVOption2.
- * THIS IS NOT PART OF THE API/ABI YET!
- * This is identical to AVOption except that default_val was replaced by
- * an union, it should be compatible with AVOption on normal platforms.
- */
-typedef struct AVOption2 {
-    const char *name;
-
-    /**
-     * short English help text
-     * @todo What about other languages?
-     */
-    const char *help;
-
-    /**
-     * The offset relative to the context structure where the option
-     * value is stored. It should be 0 for named constants.
-     */
-    int offset;
-    enum AVOptionType type;
-
-    /**
-     * the default value for scalar options
-     */
-    union {
-        double dbl;
-        const char *str;
-    } default_val;
-
-    double min;                 ///< minimum valid value for the option
-    double max;                 ///< maximum valid value for the option
-
-    int flags;
-/*
-#define AV_OPT_FLAG_ENCODING_PARAM  1   ///< a generic parameter which can be set by the user for muxing or encoding
-#define AV_OPT_FLAG_DECODING_PARAM  2   ///< a generic parameter which can be set by the user for demuxing or decoding
-#define AV_OPT_FLAG_METADATA        4   ///< some data extracted or inserted into the file like title, comment, ...
-#define AV_OPT_FLAG_AUDIO_PARAM     8
-#define AV_OPT_FLAG_VIDEO_PARAM     16
-#define AV_OPT_FLAG_SUBTITLE_PARAM  32
-*/
-//FIXME think about enc-audio, ... style flags
-
-    /**
-     * The logical unit to which the option belongs. Non-constant
-     * options and corresponding named constants share the same
-     * unit. May be NULL.
-     */
-    const char *unit;
-} AVOption2;
-
-
-/**
- * Look for an option in obj. Look only for the options which
- * have the flags set as specified in mask and flags (that is,
- * for which it is the case that opt->flags & mask == flags).
- *
- * @param[in] obj a pointer to a struct whose first element is a
- * pointer to an AVClass
- * @param[in] name the name of the option to look for
- * @param[in] unit the unit of the option to look for, or any if NULL
- * @return a pointer to the option found, or NULL if no option
- * has been found
- */
-const AVOption *av_find_opt(void *obj, const char *name, const char *unit, int mask, int flags);
-
-/**
- * Set the field of obj with the given name to value.
- *
- * @param[in] obj A struct whose first element is a pointer to an
- * AVClass.
- * @param[in] name the name of the field to set
- * @param[in] val The value to set. If the field is not of a string
- * type, then the given string is parsed.
- * SI postfixes and some named scalars are supported.
- * If the field is of a numeric type, it has to be a numeric or named
- * scalar. Behavior with more than one scalar and +- infix operators
- * is undefined.
- * If the field is of a flags type, it has to be a sequence of numeric
- * scalars or named flags separated by '+' or '-'. Prefixing a flag
- * with '+' causes it to be set without affecting the other flags;
- * similarly, '-' unsets a flag.
- * @param[out] o_out if non-NULL put here a pointer to the AVOption
- * found
- * @param alloc when 1 then the old value will be av_freed() and the
- *                     new av_strduped()
- *              when 0 then no av_free() nor av_strdup() will be used
- * @return 0 if the value has been set, or an AVERROR code in case of
- * error:
- * AVERROR(ENOENT) if no matching option exists
- * AVERROR(ERANGE) if the value is out of range
- * AVERROR(EINVAL) if the value is not valid
- */
-int av_set_string3(void *obj, const char *name, const char *val, int alloc, const AVOption **o_out);
-
-const AVOption *av_set_double(void *obj, const char *name, double n);
-const AVOption *av_set_q(void *obj, const char *name, AVRational n);
-const AVOption *av_set_int(void *obj, const char *name, int64_t n);
-double av_get_double(void *obj, const char *name, const AVOption **o_out);
-AVRational av_get_q(void *obj, const char *name, const AVOption **o_out);
-int64_t av_get_int(void *obj, const char *name, const AVOption **o_out);
-const char *av_get_string(void *obj, const char *name, const AVOption **o_out, char *buf, int buf_len);
-const AVOption *av_next_option(void *obj, const AVOption *last);
-
-/**
- * Show the obj options.
- *
- * @param req_flags requested flags for the options to show. Show only the
- * options for which it is opt->flags & req_flags.
- * @param rej_flags rejected flags for the options to show. Show only the
- * options for which it is !(opt->flags & req_flags).
- * @param av_log_obj log context to use for showing the options
- */
-int av_opt_show2(void *obj, void *av_log_obj, int req_flags, int rej_flags);
-
-void av_opt_set_defaults(void *s);
-void av_opt_set_defaults2(void *s, int mask, int flags);
-
-/**
- * Parse the key/value pairs list in opts. For each key/value pair
- * found, stores the value in the field in ctx that is named like the
- * key. ctx must be an AVClass context, storing is done using
- * AVOptions.
- *
- * @param key_val_sep a 0-terminated list of characters used to
- * separate key from value
- * @param pairs_sep a 0-terminated list of characters used to separate
- * two pairs from each other
- * @return the number of successfully set key/value pairs, or a negative
- * value corresponding to an AVERROR code in case of error:
- * AVERROR(EINVAL) if opts cannot be parsed,
- * the error code issued by av_set_string3() if a key/value pair
- * cannot be set
- */
-int av_set_options_string(void *ctx, const char *opts,
-                          const char *key_val_sep, const char *pairs_sep);
-
-#endif /* AVUTIL_OPT_H */
diff --git a/lib-x86-64/include/libavutil/pixdesc.h b/lib-x86-64/include/libavutil/pixdesc.h
deleted file mode 100644
index 8d131beb..00000000
--- a/lib-x86-64/include/libavutil/pixdesc.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * pixel format descriptor
- * Copyright (c) 2009 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_PIXDESC_H
-#define AVUTIL_PIXDESC_H
-
-#include <inttypes.h>
-
-typedef struct AVComponentDescriptor{
-    uint16_t plane        :2;            ///< which of the 4 planes contains the component
-
-    /**
-     * Number of elements between 2 horizontally consecutive pixels minus 1.
-     * Elements are bits for bitstream formats, bytes otherwise.
-     */
-    uint16_t step_minus1  :3;
-
-    /**
-     * Number of elements before the component of the first pixel plus 1.
-     * Elements are bits for bitstream formats, bytes otherwise.
-     */
-    uint16_t offset_plus1 :3;
-    uint16_t shift        :3;            ///< number of least significant bits that must be shifted away to get the value
-    uint16_t depth_minus1 :4;            ///< number of bits in the component minus 1
-}AVComponentDescriptor;
-
-/**
- * Descriptor that unambiguously describes how the bits of a pixel are
- * stored in the up to 4 data planes of an image. It also stores the
- * subsampling factors and number of components.
- *
- * @note This is separate of the colorspace (RGB, YCbCr, YPbPr, JPEG-style YUV
- *       and all the YUV variants) AVPixFmtDescriptor just stores how values
- *       are stored not what these values represent.
- */
-typedef struct AVPixFmtDescriptor{
-    const char *name;
-    uint8_t nb_components;      ///< The number of components each pixel has, (1-4)
-
-    /**
-     * Amount to shift the luma width right to find the chroma width.
-     * For YV12 this is 1 for example.
-     * chroma_width = -((-luma_width) >> log2_chroma_w)
-     * The note above is needed to ensure rounding up.
-     * This value only refers to the chroma components.
-     */
-    uint8_t log2_chroma_w;      ///< chroma_width = -((-luma_width )>>log2_chroma_w)
-
-    /**
-     * Amount to shift the luma height right to find the chroma height.
-     * For YV12 this is 1 for example.
-     * chroma_height= -((-luma_height) >> log2_chroma_h)
-     * The note above is needed to ensure rounding up.
-     * This value only refers to the chroma components.
-     */
-    uint8_t log2_chroma_h;
-    uint8_t flags;
-
-    /**
-     * Parameters that describe how pixels are packed. If the format
-     * has chroma components, they must be stored in comp[1] and
-     * comp[2].
-     */
-    AVComponentDescriptor comp[4];
-}AVPixFmtDescriptor;
-
-#define PIX_FMT_BE        1 ///< Pixel format is big-endian.
-#define PIX_FMT_PAL       2 ///< Pixel format has a palette in data[1], values are indexes in this palette.
-#define PIX_FMT_BITSTREAM 4 ///< All values of a component are bit-wise packed end to end.
-#define PIX_FMT_HWACCEL   8 ///< Pixel format is an HW accelerated format.
-
-/**
- * The array of all the pixel format descriptors.
- */
-extern const AVPixFmtDescriptor av_pix_fmt_descriptors[];
-
-/**
- * Read a line from an image, and write the values of the
- * pixel format component c to dst.
- *
- * @param data the array containing the pointers to the planes of the image
- * @param linesize the array containing the linesizes of the image
- * @param desc the pixel format descriptor for the image
- * @param x the horizontal coordinate of the first pixel to read
- * @param y the vertical coordinate of the first pixel to read
- * @param w the width of the line to read, that is the number of
- * values to write to dst
- * @param read_pal_component if not zero and the format is a paletted
- * format writes the values corresponding to the palette
- * component c in data[1] to dst, rather than the palette indexes in
- * data[0]. The behavior is undefined if the format is not paletted.
- */
-void av_read_image_line(uint16_t *dst, const uint8_t *data[4], const int linesize[4],
-                        const AVPixFmtDescriptor *desc, int x, int y, int c, int w, int read_pal_component);
-
-/**
- * Write the values from src to the pixel format component c of an
- * image line.
- *
- * @param src array containing the values to write
- * @param data the array containing the pointers to the planes of the
- * image to write into. It is supposed to be zeroed.
- * @param linesize the array containing the linesizes of the image
- * @param desc the pixel format descriptor for the image
- * @param x the horizontal coordinate of the first pixel to write
- * @param y the vertical coordinate of the first pixel to write
- * @param w the width of the line to write, that is the number of
- * values to write to the image line
- */
-void av_write_image_line(const uint16_t *src, uint8_t *data[4], const int linesize[4],
-                         const AVPixFmtDescriptor *desc, int x, int y, int c, int w);
-
-/**
- * Return the pixel format corresponding to name.
- *
- * If there is no pixel format with name name, then looks for a
- * pixel format with the name corresponding to the native endian
- * format of name.
- * For example in a little-endian system, first looks for "gray16",
- * then for "gray16le".
- *
- * Finally if no pixel format has been found, returns PIX_FMT_NONE.
- */
-enum PixelFormat av_get_pix_fmt(const char *name);
-
-/**
- * Return the number of bits per pixel used by the pixel format
- * described by pixdesc.
- *
- * The returned number of bits refers to the number of bits actually
- * used for storing the pixel information, that is padding bits are
- * not counted.
- */
-int av_get_bits_per_pixel(const AVPixFmtDescriptor *pixdesc);
-
-#endif /* AVUTIL_PIXDESC_H */
diff --git a/lib-x86-64/include/libavutil/pixfmt.h b/lib-x86-64/include/libavutil/pixfmt.h
deleted file mode 100644
index 8ec91c81..00000000
--- a/lib-x86-64/include/libavutil/pixfmt.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_PIXFMT_H
-#define AVUTIL_PIXFMT_H
-
-/**
- * @file
- * pixel format definitions
- *
- * @warning This file has to be considered an internal but installed
- * header, so it should not be directly included in your projects.
- */
-
-#include "libavutil/avconfig.h"
-
-/**
- * Pixel format. Notes:
- *
- * PIX_FMT_RGB32 is handled in an endian-specific manner. An RGBA
- * color is put together as:
- *  (A << 24) | (R << 16) | (G << 8) | B
- * This is stored as BGRA on little-endian CPU architectures and ARGB on
- * big-endian CPUs.
- *
- * When the pixel format is palettized RGB (PIX_FMT_PAL8), the palettized
- * image data is stored in AVFrame.data[0]. The palette is transported in
- * AVFrame.data[1], is 1024 bytes long (256 4-byte entries) and is
- * formatted the same as in PIX_FMT_RGB32 described above (i.e., it is
- * also endian-specific). Note also that the individual RGB palette
- * components stored in AVFrame.data[1] should be in the range 0..255.
- * This is important as many custom PAL8 video codecs that were designed
- * to run on the IBM VGA graphics adapter use 6-bit palette components.
- *
- * For all the 8bit per pixel formats, an RGB32 palette is in data[1] like
- * for pal8. This palette is filled in automatically by the function
- * allocating the picture.
- *
- * Note, make sure that all newly added big endian formats have pix_fmt&1==1
- *       and that all newly added little endian formats have pix_fmt&1==0
- *       this allows simpler detection of big vs little endian.
- */
-enum PixelFormat {
-    PIX_FMT_NONE= -1,
-    PIX_FMT_YUV420P,   ///< planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y samples)
-    PIX_FMT_YUYV422,   ///< packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr
-    PIX_FMT_RGB24,     ///< packed RGB 8:8:8, 24bpp, RGBRGB...
-    PIX_FMT_BGR24,     ///< packed RGB 8:8:8, 24bpp, BGRBGR...
-    PIX_FMT_YUV422P,   ///< planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
-    PIX_FMT_YUV444P,   ///< planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y samples)
-    PIX_FMT_YUV410P,   ///< planar YUV 4:1:0,  9bpp, (1 Cr & Cb sample per 4x4 Y samples)
-    PIX_FMT_YUV411P,   ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples)
-    PIX_FMT_GRAY8,     ///<        Y        ,  8bpp
-    PIX_FMT_MONOWHITE, ///<        Y        ,  1bpp, 0 is white, 1 is black, in each byte pixels are ordered from the msb to the lsb
-    PIX_FMT_MONOBLACK, ///<        Y        ,  1bpp, 0 is black, 1 is white, in each byte pixels are ordered from the msb to the lsb
-    PIX_FMT_PAL8,      ///< 8 bit with PIX_FMT_RGB32 palette
-    PIX_FMT_YUVJ420P,  ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV420P and setting color_range
-    PIX_FMT_YUVJ422P,  ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV422P and setting color_range
-    PIX_FMT_YUVJ444P,  ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV444P and setting color_range
-    PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing
-    PIX_FMT_XVMC_MPEG2_IDCT,
-    PIX_FMT_UYVY422,   ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
-    PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
-    PIX_FMT_BGR8,      ///< packed RGB 3:3:2,  8bpp, (msb)2B 3G 3R(lsb)
-    PIX_FMT_BGR4,      ///< packed RGB 1:2:1 bitstream,  4bpp, (msb)1B 2G 1R(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
-    PIX_FMT_BGR4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1B 2G 1R(lsb)
-    PIX_FMT_RGB8,      ///< packed RGB 3:3:2,  8bpp, (msb)2R 3G 3B(lsb)
-    PIX_FMT_RGB4,      ///< packed RGB 1:2:1 bitstream,  4bpp, (msb)1R 2G 1B(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
-    PIX_FMT_RGB4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1R 2G 1B(lsb)
-    PIX_FMT_NV12,      ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 plane for the UV components, which are interleaved (first byte U and the following byte V)
-    PIX_FMT_NV21,      ///< as above, but U and V bytes are swapped
-
-    PIX_FMT_ARGB,      ///< packed ARGB 8:8:8:8, 32bpp, ARGBARGB...
-    PIX_FMT_RGBA,      ///< packed RGBA 8:8:8:8, 32bpp, RGBARGBA...
-    PIX_FMT_ABGR,      ///< packed ABGR 8:8:8:8, 32bpp, ABGRABGR...
-    PIX_FMT_BGRA,      ///< packed BGRA 8:8:8:8, 32bpp, BGRABGRA...
-
-    PIX_FMT_GRAY16BE,  ///<        Y        , 16bpp, big-endian
-    PIX_FMT_GRAY16LE,  ///<        Y        , 16bpp, little-endian
-    PIX_FMT_YUV440P,   ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
-    PIX_FMT_YUVJ440P,  ///< planar YUV 4:4:0 full scale (JPEG), deprecated in favor of PIX_FMT_YUV440P and setting color_range
-    PIX_FMT_YUVA420P,  ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples)
-    PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_RGB48BE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian
-    PIX_FMT_RGB48LE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian
-
-    PIX_FMT_RGB565BE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), big-endian
-    PIX_FMT_RGB565LE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), little-endian
-    PIX_FMT_RGB555BE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), big-endian, most significant bit to 0
-    PIX_FMT_RGB555LE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), little-endian, most significant bit to 0
-
-    PIX_FMT_BGR565BE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), big-endian
-    PIX_FMT_BGR565LE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), little-endian
-    PIX_FMT_BGR555BE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), big-endian, most significant bit to 1
-    PIX_FMT_BGR555LE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), little-endian, most significant bit to 1
-
-    PIX_FMT_VAAPI_MOCO, ///< HW acceleration through VA API at motion compensation entry-point, Picture.data[3] contains a vaapi_render_state struct which contains macroblocks as well as various fields extracted from headers
-    PIX_FMT_VAAPI_IDCT, ///< HW acceleration through VA API at IDCT entry-point, Picture.data[3] contains a vaapi_render_state struct which contains fields extracted from headers
-    PIX_FMT_VAAPI_VLD,  ///< HW decoding through VA API, Picture.data[3] contains a vaapi_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-
-    PIX_FMT_YUV420P16LE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    PIX_FMT_YUV420P16BE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    PIX_FMT_YUV422P16LE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    PIX_FMT_YUV422P16BE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    PIX_FMT_YUV444P16LE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    PIX_FMT_YUV444P16BE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-    PIX_FMT_VDPAU_MPEG4,  ///< MPEG4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_DXVA2_VLD,    ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer
-
-    PIX_FMT_RGB444BE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), big-endian, most significant bits to 0
-    PIX_FMT_RGB444LE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), little-endian, most significant bits to 0
-    PIX_FMT_BGR444BE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), big-endian, most significant bits to 1
-    PIX_FMT_BGR444LE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), little-endian, most significant bits to 1
-    PIX_FMT_Y400A,     ///< 8bit gray, 8bit alpha
-    PIX_FMT_NB,        ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
-};
-
-#if AV_HAVE_BIGENDIAN
-#   define PIX_FMT_NE(be, le) PIX_FMT_##be
-#else
-#   define PIX_FMT_NE(be, le) PIX_FMT_##le
-#endif
-
-#define PIX_FMT_RGB32   PIX_FMT_NE(ARGB, BGRA)
-#define PIX_FMT_RGB32_1 PIX_FMT_NE(RGBA, ABGR)
-#define PIX_FMT_BGR32   PIX_FMT_NE(ABGR, RGBA)
-#define PIX_FMT_BGR32_1 PIX_FMT_NE(BGRA, ARGB)
-
-#define PIX_FMT_GRAY16 PIX_FMT_NE(GRAY16BE, GRAY16LE)
-#define PIX_FMT_RGB48  PIX_FMT_NE(RGB48BE,  RGB48LE)
-#define PIX_FMT_RGB565 PIX_FMT_NE(RGB565BE, RGB565LE)
-#define PIX_FMT_RGB555 PIX_FMT_NE(RGB555BE, RGB555LE)
-#define PIX_FMT_RGB444 PIX_FMT_NE(RGB444BE, RGB444LE)
-#define PIX_FMT_BGR565 PIX_FMT_NE(BGR565BE, BGR565LE)
-#define PIX_FMT_BGR555 PIX_FMT_NE(BGR555BE, BGR555LE)
-#define PIX_FMT_BGR444 PIX_FMT_NE(BGR444BE, BGR444LE)
-
-#define PIX_FMT_YUV420P16 PIX_FMT_NE(YUV420P16BE, YUV420P16LE)
-#define PIX_FMT_YUV422P16 PIX_FMT_NE(YUV422P16BE, YUV422P16LE)
-#define PIX_FMT_YUV444P16 PIX_FMT_NE(YUV444P16BE, YUV444P16LE)
-
-#endif /* AVUTIL_PIXFMT_H */
diff --git a/lib-x86-64/include/libavutil/random_seed.h b/lib-x86-64/include/libavutil/random_seed.h
deleted file mode 100644
index 7f750632..00000000
--- a/lib-x86-64/include/libavutil/random_seed.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2009 Baptiste Coudurier <baptiste.coudurier@gmail.com>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_RANDOM_SEED_H
-#define AVUTIL_RANDOM_SEED_H
-
-#include <stdint.h>
-
-/**
- * Get a seed to use in conjunction with random functions.
- */
-uint32_t av_get_random_seed(void);
-
-#endif /* AVUTIL_RANDOM_SEED_H */
diff --git a/lib-x86-64/include/libavutil/rational.h b/lib-x86-64/include/libavutil/rational.h
deleted file mode 100644
index 789e4aca..00000000
--- a/lib-x86-64/include/libavutil/rational.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * rational numbers
- * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * rational numbers
- * @author Michael Niedermayer <michaelni@gmx.at>
- */
-
-#ifndef AVUTIL_RATIONAL_H
-#define AVUTIL_RATIONAL_H
-
-#include <stdint.h>
-#include <limits.h>
-#include "attributes.h"
-
-/**
- * rational number numerator/denominator
- */
-typedef struct AVRational{
-    int num; ///< numerator
-    int den; ///< denominator
-} AVRational;
-
-/**
- * Compare two rationals.
- * @param a first rational
- * @param b second rational
- * @return 0 if a==b, 1 if a>b, -1 if a<b, and INT_MIN if one of the
- * values is of the form 0/0
- */
-static inline int av_cmp_q(AVRational a, AVRational b){
-    const int64_t tmp= a.num * (int64_t)b.den - b.num * (int64_t)a.den;
-
-    if(tmp) return ((tmp ^ a.den ^ b.den)>>63)|1;
-    else if(b.den && a.den) return 0;
-    else if(a.num && b.num) return (a.num>>31) - (b.num>>31);
-    else                    return INT_MIN;
-}
-
-/**
- * Convert rational to double.
- * @param a rational to convert
- * @return (double) a
- */
-static inline double av_q2d(AVRational a){
-    return a.num / (double) a.den;
-}
-
-/**
- * Reduce a fraction.
- * This is useful for framerate calculations.
- * @param dst_num destination numerator
- * @param dst_den destination denominator
- * @param num source numerator
- * @param den source denominator
- * @param max the maximum allowed for dst_num & dst_den
- * @return 1 if exact, 0 otherwise
- */
-int av_reduce(int *dst_num, int *dst_den, int64_t num, int64_t den, int64_t max);
-
-/**
- * Multiply two rationals.
- * @param b first rational
- * @param c second rational
- * @return b*c
- */
-AVRational av_mul_q(AVRational b, AVRational c) av_const;
-
-/**
- * Divide one rational by another.
- * @param b first rational
- * @param c second rational
- * @return b/c
- */
-AVRational av_div_q(AVRational b, AVRational c) av_const;
-
-/**
- * Add two rationals.
- * @param b first rational
- * @param c second rational
- * @return b+c
- */
-AVRational av_add_q(AVRational b, AVRational c) av_const;
-
-/**
- * Subtract one rational from another.
- * @param b first rational
- * @param c second rational
- * @return b-c
- */
-AVRational av_sub_q(AVRational b, AVRational c) av_const;
-
-/**
- * Convert a double precision floating point number to a rational.
- * inf is expressed as {1,0} or {-1,0} depending on the sign.
- *
- * @param d double to convert
- * @param max the maximum allowed numerator and denominator
- * @return (AVRational) d
- */
-AVRational av_d2q(double d, int max) av_const;
-
-/**
- * @return 1 if q1 is nearer to q than q2, -1 if q2 is nearer
- * than q1, 0 if they have the same distance.
- */
-int av_nearer_q(AVRational q, AVRational q1, AVRational q2);
-
-/**
- * Find the nearest value in q_list to q.
- * @param q_list an array of rationals terminated by {0, 0}
- * @return the index of the nearest value found in the array
- */
-int av_find_nearest_q_idx(AVRational q, const AVRational* q_list);
-
-#endif /* AVUTIL_RATIONAL_H */
diff --git a/lib-x86-64/include/libavutil/sha1.h b/lib-x86-64/include/libavutil/sha1.h
deleted file mode 100644
index 3ff58043..00000000
--- a/lib-x86-64/include/libavutil/sha1.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2007 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_SHA1_H
-#define AVUTIL_SHA1_H
-
-#include <stdint.h>
-
-extern const int av_sha1_size;
-
-struct AVSHA1;
-
-/**
- * Initialize SHA-1 hashing.
- *
- * @param context pointer to the function context (of size av_sha_size)
- * @deprecated use av_sha_init() instead
- */
-void av_sha1_init(struct AVSHA1* context);
-
-/**
- * Update hash value.
- *
- * @param context hash function context
- * @param data    input data to update hash with
- * @param len     input data length
- * @deprecated use av_sha_update() instead
- */
-void av_sha1_update(struct AVSHA1* context, const uint8_t* data, unsigned int len);
-
-/**
- * Finish hashing and output digest value.
- *
- * @param context hash function context
- * @param digest  buffer where output digest value is stored
- * @deprecated use av_sha_final() instead
- */
-void av_sha1_final(struct AVSHA1* context, uint8_t digest[20]);
-
-#endif /* AVUTIL_SHA1_H */
diff --git a/lib-x86-64/include/libpng15/png.h b/lib-x86-64/include/libpng15/png.h
deleted file mode 100644
index 0af42b17..00000000
--- a/lib-x86-64/include/libpng15/png.h
+++ /dev/null
@@ -1,2309 +0,0 @@
-
-/* png.h - header file for PNG reference library
- *
- * libpng version 1.5.2 - March 31, 2011
- * Copyright (c) 1998-2011 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.5.2 - March 31, 2011: 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]
- *
- *   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 "rcN".
- *
- *   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.5.2, March 31, 2011, are
- * Copyright (c) 2004, 2006-2011 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:
- * =========================
- *
- *    March 31, 2011
- *
- *    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.5.2 are Y2K compliant.  It is my belief that
- *    earlier versions were also Y2K compliant.
- *
- *    Libpng only has three year fields.  One is a 2-byte unsigned integer
- *    that will hold years up to 65535.  The other two hold the date in text
- *    format, and will hold years up to 9999.
- *
- *    The integer is
- *        "png_uint_16 year" in png_time_struct.
- *
- *    The strings are
- *        "png_charp time_buffer" in png_struct and
- *        "near_time_buffer", which is a local character string in png.c.
- *
- *    There are seven time-related functions:
- *        png.c: png_convert_to_rfc_1123() in png.c
- *          (formerly png_convert_to_rfc_1152() in error)
- *        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 applications using
- *    libpng are not passing 4-digit years into the png_convert_to_rfc_1123()
- *    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.
- */
-
-/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.5.2"
-#define PNG_HEADER_VERSION_STRING \
-     " libpng version 1.5.2 - March 31, 2011\n"
-
-#define PNG_LIBPNG_VER_SONUM   15
-#define PNG_LIBPNG_VER_DLLNUM  15
-
-/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
-#define PNG_LIBPNG_VER_MAJOR   1
-#define PNG_LIBPNG_VER_MINOR   5
-#define PNG_LIBPNG_VER_RELEASE 2
-/* 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_BETA
-
-/* 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 10502 /* 1.5.2 */
-
-/* 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
-#  ifndef PNG_BUILDING_SYMBOL_TABLE
-  /*
-   *   Standard header files (not needed for the version info or while
-   *   building symbol table -- see scripts/pnglibconf.dfa)
-   */
-#    ifdef PNG_SETJMP_SUPPORTED
-#      include <setjmp.h>
-#    endif
-
-    /* Need the time information for converting tIME chunks, it
-     * defines struct tm:
-     */
-#    ifdef PNG_CONVERT_tIME_SUPPORTED
-       /* "time.h" functions are not supported on all operating systems */
-#      include <time.h>
-#    endif
-#  endif
-
-/* 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.
- *
- * 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_5_2;
-
-/* 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 FAR * png_colorp;
-typedef PNG_CONST png_color FAR * png_const_colorp;
-typedef png_color FAR * FAR * 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 FAR * png_color_16p;
-typedef PNG_CONST png_color_16 FAR * png_const_color_16p;
-typedef png_color_16 FAR * FAR * 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 FAR * png_color_8p;
-typedef PNG_CONST png_color_8 FAR * png_const_color_8p;
-typedef png_color_8 FAR * FAR * 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 FAR * png_sPLT_entryp;
-typedef PNG_CONST png_sPLT_entry FAR * png_const_sPLT_entryp;
-typedef png_sPLT_entry FAR * FAR * 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 FAR * png_sPLT_tp;
-typedef PNG_CONST png_sPLT_t FAR * png_const_sPLT_tp;
-typedef png_sPLT_t FAR * FAR * 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", "lang", and
- * "lang_key" fields can be regular C strings, empty strings, or NULL pointers.
- * However, the * structure returned by png_get_text() will always contain
- * regular zero-terminated C strings (possibly empty), never NULL pointers,
- * so they can be safely used in printf() and other string-handling functions.
- */
-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 FAR * png_textp;
-typedef PNG_CONST png_text FAR * png_const_textp;
-typedef png_text FAR * FAR * 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 FAR * png_timep;
-typedef PNG_CONST png_time FAR * png_const_timep;
-typedef png_time FAR * FAR * png_timepp;
-
-#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED) || \
-    defined(PNG_HANDLE_AS_UNKNOWN_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.
- */
-typedef struct png_unknown_chunk_t
-{
-    png_byte name[5];
-    png_byte *data;
-    png_size_t size;
-
-    /* libpng-using applications should NOT directly modify this byte. */
-    png_byte location; /* mode of operation at read time */
-}
-png_unknown_chunk;
-typedef png_unknown_chunk FAR * png_unknown_chunkp;
-typedef PNG_CONST png_unknown_chunk FAR * png_const_unknown_chunkp;
-typedef png_unknown_chunk FAR * FAR * png_unknown_chunkpp;
-#endif
-
-typedef struct png_info_def png_info;
-typedef png_info FAR * png_infop;
-typedef PNG_CONST png_info FAR * png_const_infop;
-typedef png_info FAR * FAR * png_infopp;
-
-/* 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
-
-/* 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 0x8000L  /* 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 FAR * png_row_infop;
-typedef png_row_info FAR * FAR * 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 struct png_struct_def png_struct;
-typedef PNG_CONST png_struct FAR * png_const_structp;
-typedef png_struct FAR * png_structp;
-
-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
-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.  (Note that
- * PNG_PTR_NORETURN is used here because current versions of the Microsoft
- * C compiler do not support the PNG_NORETURN attribute on a pointer.)
- *
- * If you get a type warning from the compiler when linking against this line
- * then your compiler has 'longjmp' that does not match the requirements of the
- * compiler that built libpng.  You will have to write a wrapper function for
- * your compiler's longjmp and call png_set_longjmp_fn directly (not via the
- * png_jmpbuf macro.)
- *
- * If you get a warning here while building the library you will 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!
- */
-typedef PNG_FUNCTION(void, (PNGCAPI *png_longjmp_ptr), PNGARG((jmp_buf, int)),
-   PNG_PTR_NORETURN);
-#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 */
-
-/* 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));
-
-typedef png_struct FAR * FAR * png_structpp;
-
-/* 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_structp 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_structp png_ptr));
-
-PNG_EXPORT(7, void, png_set_compression_buffer_size, (png_structp 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_structp 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_structp png_ptr, int val),
-    PNG_NORETURN);
-
-#ifdef PNG_READ_SUPPORTED
-/* Reset the compression stream */
-PNG_EXPORT(10, int, png_reset_zstream, (png_structp png_ptr));
-#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_structp png_ptr));
-
-/* Write a PNG chunk - size, type, (optional) data, CRC. */
-PNG_EXPORT(14, void, png_write_chunk, (png_structp 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_structp 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_structp 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_structp png_ptr));
-
-/* Allocate and initialize the info structure */
-PNG_EXPORTA(18, png_infop, png_create_info_struct, (png_structp png_ptr),
-    PNG_ALLOCATED);
-
-PNG_EXPORT(19, void, png_info_init_3, (png_infopp info_ptr,
-    png_size_t png_info_struct_size));
-
-/* Writes all the PNG information before the image. */
-PNG_EXPORT(20, void, png_write_info_before_PLTE,
-    (png_structp png_ptr, png_infop info_ptr));
-PNG_EXPORT(21, void, png_write_info,
-    (png_structp png_ptr, png_infop info_ptr));
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read the information before the actual image data. */
-PNG_EXPORT(22, void, png_read_info,
-    (png_structp png_ptr, png_infop info_ptr));
-#endif
-
-#ifdef PNG_TIME_RFC1123_SUPPORTED
-PNG_EXPORT(23, png_const_charp, png_convert_to_rfc1123,
-    (png_structp png_ptr,
-    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,
-    PNG_CONST struct tm FAR * 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 /* PNG_CONVERT_tIME_SUPPORTED */
-
-#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_structp png_ptr));
-PNG_EXPORT(27, void, png_set_expand_gray_1_2_4_to_8, (png_structp png_ptr));
-PNG_EXPORT(28, void, png_set_palette_to_rgb, (png_structp png_ptr));
-PNG_EXPORT(29, void, png_set_tRNS_to_alpha, (png_structp 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_structp 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_structp 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_structp png_ptr));
-#endif
-
-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-/* Reduce RGB to grayscale. */
-PNG_FP_EXPORT(32, void, png_set_rgb_to_gray, (png_structp png_ptr,
-    int error_action, double red, double green));
-PNG_FIXED_EXPORT(33, void, png_set_rgb_to_gray_fixed, (png_structp 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_structp
-    png_ptr));
-#endif
-
-PNG_EXPORT(35, void, png_build_grayscale_palette, (int bit_depth,
-    png_colorp palette));
-
-#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
-PNG_EXPORT(36, void, png_set_strip_alpha, (png_structp 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_structp 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_structp 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_structp 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_structp png_ptr, png_uint_32 filler,
-    int flags));
-#endif /* PNG_READ_FILLER_SUPPORTED || PNG_WRITE_FILLER_SUPPORTED */
-
-#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_structp 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_structp 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_structp 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_structp 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_structp 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_structp png_ptr));
-#endif
-
-#ifdef PNG_READ_BACKGROUND_SUPPORTED
-/* Handle alpha and tRNS by replacing with a background color. */
-PNG_FP_EXPORT(47, void, png_set_background, (png_structp 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_structp 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_16_TO_8_SUPPORTED
-/* Strip the second byte of information from a 16-bit depth file. */
-PNG_EXPORT(48, void, png_set_strip_16, (png_structp 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_structp 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) */
-PNG_FP_EXPORT(50, void, png_set_gamma,
-    (png_structp png_ptr, double screen_gamma,
-    double default_file_gamma));
-PNG_FIXED_EXPORT(208, void, png_set_gamma_fixed, (png_structp png_ptr,
-    png_fixed_point screen_gamma, png_fixed_point default_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_structp png_ptr, int nrows));
-/* Flush the current PNG output buffer */
-PNG_EXPORT(52, void, png_write_flush, (png_structp png_ptr));
-#endif
-
-/* Optional update palette with requested transformations */
-PNG_EXPORT(53, void, png_start_read_image, (png_structp png_ptr));
-
-/* Optional call to update the users info structure */
-PNG_EXPORT(54, void, png_read_update_info,
-    (png_structp png_ptr, png_infop info_ptr));
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read one or more rows of image data. */
-PNG_EXPORT(55, void, png_read_rows, (png_structp 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_structp 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_structp png_ptr, png_bytepp image));
-#endif
-
-/* Write a row of image data */
-PNG_EXPORT(58, void, png_write_row,
-    (png_structp 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_structp png_ptr, png_bytepp row,
-    png_uint_32 num_rows));
-
-/* Write the image data */
-PNG_EXPORT(60, void, png_write_image,
-    (png_structp png_ptr, png_bytepp image));
-
-/* Write the end of the PNG file. */
-PNG_EXPORT(61, void, png_write_end,
-    (png_structp png_ptr, png_infop info_ptr));
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read the end of the PNG file. */
-PNG_EXPORT(62, void, png_read_end, (png_structp png_ptr, png_infop info_ptr));
-#endif
-
-/* Free any memory associated with the png_info_struct */
-PNG_EXPORT(63, void, png_destroy_info_struct, (png_structp 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_structp 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_structp 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_structp 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_structp png_ptr,
-    int heuristic_method, int num_weights, png_const_fixed_point_p
-    filter_weights, png_const_fixed_point_p filter_costs));
-#endif /*  PNG_WRITE_WEIGHTED_FILTER_SUPPORTED */
-
-/* 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 */
-
-/* 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_structp png_ptr, int level));
-
-PNG_EXPORT(70, void, png_set_compression_mem_level, (png_structp png_ptr,
-    int mem_level));
-
-PNG_EXPORT(71, void, png_set_compression_strategy, (png_structp png_ptr,
-    int strategy));
-
-PNG_EXPORT(72, void, png_set_compression_window_bits, (png_structp png_ptr,
-    int window_bits));
-
-PNG_EXPORT(73, void, png_set_compression_method, (png_structp png_ptr,
-    int method));
-
-/* 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_structp 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_structp 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_structp 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_structp 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_structp 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_structp png_ptr));
-
-PNG_EXPORT(80, void, png_set_read_status_fn, (png_structp png_ptr,
-    png_read_status_ptr read_row_fn));
-
-PNG_EXPORT(81, void, png_set_write_status_fn, (png_structp 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_structp 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_structp png_ptr));
-#endif
-
-#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
-PNG_EXPORT(84, void, png_set_read_user_transform_fn, (png_structp 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_structp 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_structp 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_structp 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_structp));
-PNG_EXPORT(218, png_byte, png_get_current_pass_number, (png_const_structp));
-#endif
-
-#ifdef PNG_USER_CHUNKS_SUPPORTED
-PNG_EXPORT(88, void, png_set_read_user_chunk_fn, (png_structp png_ptr,
-    png_voidp user_chunk_ptr, png_user_chunk_ptr read_user_chunk_fn));
-PNG_EXPORT(89, png_voidp, png_get_user_chunk_ptr, (png_const_structp 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_structp 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_structp png_ptr));
-
-/* Function to be called when data becomes available */
-PNG_EXPORT(92, void, png_process_data,
-    (png_structp png_ptr, png_infop 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_structp, 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_structp));
-
-/* 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_structp png_ptr,
-    png_bytep old_row, png_const_bytep new_row));
-#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
-
-PNG_EXPORTA(94, png_voidp, png_malloc,
-    (png_structp png_ptr, png_alloc_size_t size),
-    PNG_ALLOCATED);
-/* Added at libpng version 1.4.0 */
-PNG_EXPORTA(95, png_voidp, png_calloc,
-    (png_structp 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_structp png_ptr,
-    png_alloc_size_t size), PNG_ALLOCATED);
-
-/* Frees a pointer allocated by png_malloc() */
-PNG_EXPORT(97, void, png_free, (png_structp png_ptr, png_voidp ptr));
-
-/* Free data that was allocated internally */
-PNG_EXPORT(98, void, png_free_data,
-    (png_structp png_ptr, png_infop info_ptr, png_uint_32 free_me, int num));
-
-/* Reassign responsibility for freeing existing data, whether allocated
- * by libpng or by the application */
-PNG_EXPORT(99, void, png_data_freer,
-    (png_structp png_ptr, png_infop 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
-#define PNG_FREE_UNKN 0x0200
-#define PNG_FREE_LIST 0x0400
-#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_structp png_ptr,
-    png_alloc_size_t size), PNG_ALLOCATED);
-PNG_EXPORT(101, void, png_free_default, (png_structp png_ptr, png_voidp ptr));
-#endif
-
-#ifdef PNG_ERROR_TEXT_SUPPORTED
-/* Fatal error in PNG image of libpng - can't continue */
-PNG_EXPORTA(102, void, png_error,
-    (png_structp 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_structp 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_structp png_ptr), PNG_NORETURN);
-#endif
-
-/* Non-fatal error in libpng.  Can continue, but may have a problem. */
-PNG_EXPORT(105, void, png_warning, (png_structp 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_structp png_ptr,
-    png_const_charp warning_message));
-
-#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. */
-#  undef png_benign_error
-PNG_EXPORT(107, void, png_benign_error, (png_structp png_ptr,
-    png_const_charp warning_message));
-
-/* Same, chunk name is prepended to message. */
-#  undef png_chunk_benign_error
-PNG_EXPORT(108, void, png_chunk_benign_error, (png_structp png_ptr,
-    png_const_charp warning_message));
-
-PNG_EXPORT(109, void, png_set_benign_errors,
-    (png_structp 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_structp png_ptr, png_const_infop 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_structp png_ptr,
-    png_const_infop 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_structp png_ptr, png_const_infop 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_structp png_ptr,
-    png_infop info_ptr, png_bytepp row_pointers));
-#endif
-
-/* Returns number of color channels in image. */
-PNG_EXPORT(114, png_byte, png_get_channels,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-
-#ifdef PNG_EASY_ACCESS_SUPPORTED
-/* Returns image width in pixels. */
-PNG_EXPORT(115, png_uint_32, png_get_image_width, (png_const_structp png_ptr,
-    png_const_infop info_ptr));
-
-/* Returns image height in pixels. */
-PNG_EXPORT(116, png_uint_32, png_get_image_height, (png_const_structp png_ptr,
-    png_const_infop info_ptr));
-
-/* Returns image bit_depth. */
-PNG_EXPORT(117, png_byte, png_get_bit_depth,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-
-/* Returns image color_type. */
-PNG_EXPORT(118, png_byte, png_get_color_type, (png_const_structp png_ptr,
-    png_const_infop info_ptr));
-
-/* Returns image filter_type. */
-PNG_EXPORT(119, png_byte, png_get_filter_type, (png_const_structp png_ptr,
-    png_const_infop info_ptr));
-
-/* Returns image interlace_type. */
-PNG_EXPORT(120, png_byte, png_get_interlace_type, (png_const_structp png_ptr,
-    png_const_infop info_ptr));
-
-/* Returns image compression_type. */
-PNG_EXPORT(121, png_byte, png_get_compression_type, (png_const_structp png_ptr,
-    png_const_infop 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_structp png_ptr, png_const_infop info_ptr));
-PNG_EXPORT(123, png_uint_32, png_get_x_pixels_per_meter,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-PNG_EXPORT(124, png_uint_32, png_get_y_pixels_per_meter,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-
-/* Returns pixel aspect ratio, computed from pHYs chunk data.  */
-PNG_FP_EXPORT(125, float, png_get_pixel_aspect_ratio,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-PNG_FIXED_EXPORT(210, png_fixed_point, png_get_pixel_aspect_ratio_fixed,
-    (png_const_structp png_ptr, png_const_infop 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_structp png_ptr, png_const_infop info_ptr));
-PNG_EXPORT(127, png_int_32, png_get_y_offset_pixels,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-PNG_EXPORT(128, png_int_32, png_get_x_offset_microns,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-PNG_EXPORT(129, png_int_32, png_get_y_offset_microns,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-
-#endif /* PNG_EASY_ACCESS_SUPPORTED */
-
-/* Returns pointer to signature string read from PNG header */
-PNG_EXPORT(130, png_const_bytep, png_get_signature,
-    (png_const_structp png_ptr, png_infop info_ptr));
-
-#ifdef PNG_bKGD_SUPPORTED
-PNG_EXPORT(131, png_uint_32, png_get_bKGD,
-    (png_const_structp png_ptr, png_infop info_ptr,
-    png_color_16p *background));
-#endif
-
-#ifdef PNG_bKGD_SUPPORTED
-PNG_EXPORT(132, void, png_set_bKGD, (png_structp png_ptr, png_infop info_ptr,
-    png_const_color_16p background));
-#endif
-
-#ifdef PNG_cHRM_SUPPORTED
-PNG_FP_EXPORT(133, png_uint_32, png_get_cHRM, (png_const_structp png_ptr,
-   png_const_infop 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));
-#ifdef PNG_FIXED_POINT_SUPPORTED /* Otherwise not implemented */
-PNG_FIXED_EXPORT(134, png_uint_32, png_get_cHRM_fixed,
-    (png_const_structp png_ptr,
-    png_const_infop 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));
-#endif
-#endif
-
-#ifdef PNG_cHRM_SUPPORTED
-PNG_FP_EXPORT(135, void, png_set_cHRM,
-    (png_structp png_ptr, png_infop 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_FIXED_EXPORT(136, void, png_set_cHRM_fixed, (png_structp png_ptr,
-    png_infop 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));
-#endif
-
-#ifdef PNG_gAMA_SUPPORTED
-PNG_FP_EXPORT(137, png_uint_32, png_get_gAMA,
-    (png_const_structp png_ptr, png_const_infop info_ptr,
-    double *file_gamma));
-PNG_FIXED_EXPORT(138, png_uint_32, png_get_gAMA_fixed,
-    (png_const_structp png_ptr, png_const_infop info_ptr,
-    png_fixed_point *int_file_gamma));
-#endif
-
-#ifdef PNG_gAMA_SUPPORTED
-PNG_FP_EXPORT(139, void, png_set_gAMA, (png_structp png_ptr,
-    png_infop info_ptr, double file_gamma));
-PNG_FIXED_EXPORT(140, void, png_set_gAMA_fixed, (png_structp png_ptr,
-    png_infop info_ptr, png_fixed_point int_file_gamma));
-#endif
-
-#ifdef PNG_hIST_SUPPORTED
-PNG_EXPORT(141, png_uint_32, png_get_hIST,
-    (png_const_structp png_ptr, png_const_infop info_ptr,
-    png_uint_16p *hist));
-#endif
-
-#ifdef PNG_hIST_SUPPORTED
-PNG_EXPORT(142, void, png_set_hIST, (png_structp png_ptr,
-    png_infop info_ptr, png_const_uint_16p hist));
-#endif
-
-PNG_EXPORT(143, png_uint_32, png_get_IHDR,
-    (png_structp png_ptr, png_infop 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_structp png_ptr, png_infop 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_structp png_ptr, png_const_infop 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_structp png_ptr, png_infop 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_structp png_ptr, png_const_infop 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_structp png_ptr,
-    png_infop 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_structp png_ptr, png_const_infop 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_structp png_ptr, png_infop 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_structp png_ptr, png_const_infop info_ptr,
-    png_colorp *palette, int *num_palette));
-
-PNG_EXPORT(152, void, png_set_PLTE,
-    (png_structp png_ptr, png_infop info_ptr,
-    png_const_colorp palette, int num_palette));
-
-#ifdef PNG_sBIT_SUPPORTED
-PNG_EXPORT(153, png_uint_32, png_get_sBIT,
-    (png_const_structp png_ptr, png_infop info_ptr,
-    png_color_8p *sig_bit));
-#endif
-
-#ifdef PNG_sBIT_SUPPORTED
-PNG_EXPORT(154, void, png_set_sBIT,
-    (png_structp png_ptr, png_infop info_ptr, png_const_color_8p sig_bit));
-#endif
-
-#ifdef PNG_sRGB_SUPPORTED
-PNG_EXPORT(155, png_uint_32, png_get_sRGB, (png_const_structp png_ptr,
-    png_const_infop info_ptr, int *file_srgb_intent));
-#endif
-
-#ifdef PNG_sRGB_SUPPORTED
-PNG_EXPORT(156, void, png_set_sRGB,
-    (png_structp png_ptr, png_infop info_ptr, int srgb_intent));
-PNG_EXPORT(157, void, png_set_sRGB_gAMA_and_cHRM, (png_structp png_ptr,
-    png_infop info_ptr, int srgb_intent));
-#endif
-
-#ifdef PNG_iCCP_SUPPORTED
-PNG_EXPORT(158, png_uint_32, png_get_iCCP,
-    (png_const_structp png_ptr, png_const_infop 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_structp png_ptr, png_infop 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, png_uint_32, png_get_sPLT,
-    (png_const_structp png_ptr, png_const_infop info_ptr,
-    png_sPLT_tpp entries));
-#endif
-
-#ifdef PNG_sPLT_SUPPORTED
-PNG_EXPORT(161, void, png_set_sPLT,
-    (png_structp png_ptr, png_infop 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, png_uint_32, png_get_text,
-    (png_const_structp png_ptr, png_const_infop 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_structp png_ptr, png_infop 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_structp png_ptr, png_infop info_ptr, png_timep *mod_time));
-#endif
-
-#ifdef PNG_tIME_SUPPORTED
-PNG_EXPORT(165, void, png_set_tIME,
-    (png_structp png_ptr, png_infop info_ptr, png_const_timep mod_time));
-#endif
-
-#ifdef PNG_tRNS_SUPPORTED
-PNG_EXPORT(166, png_uint_32, png_get_tRNS,
-    (png_const_structp png_ptr, png_infop 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_structp png_ptr, png_infop 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_structp png_ptr, png_const_infop info_ptr,
-    int *unit, double *width, double *height));
-#ifdef PNG_FLOATING_ARITHMETIC_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_structp png_ptr, png_const_infop 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_structp png_ptr, png_const_infop info_ptr,
-    int *unit, png_charpp swidth, png_charpp sheight));
-
-PNG_FP_EXPORT(170, void, png_set_sCAL,
-    (png_structp png_ptr, png_infop info_ptr,
-    int unit, double width, double height));
-PNG_FIXED_EXPORT(213, void, png_set_sCAL_fixed, (png_structp png_ptr,
-   png_infop info_ptr, int unit, png_fixed_point width,
-   png_fixed_point height));
-PNG_EXPORT(171, void, png_set_sCAL_s,
-    (png_structp png_ptr, png_infop info_ptr,
-    int unit, png_const_charp swidth, png_const_charp sheight));
-#endif /* PNG_sCAL_SUPPORTED */
-
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-/* Provide a list of chunks and how they are to be handled, if the built-in
-   handling or default unknown chunk handling is not desired.  Any chunks not
-   listed will be handled in the default manner.  The IHDR and IEND chunks
-   must not be listed.
-      keep = 0: follow default behaviour
-           = 1: do not keep
-           = 2: keep only if safe-to-copy
-           = 3: keep even if unsafe-to-copy
-*/
-PNG_EXPORT(172, void, png_set_keep_unknown_chunks,
-    (png_structp png_ptr, int keep,
-    png_const_bytep chunk_list, int num_chunks));
-PNG_EXPORT(173, int, png_handle_as_unknown, (png_structp png_ptr,
-    png_const_bytep chunk_name));
-#endif
-#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
-PNG_EXPORT(174, void, png_set_unknown_chunks, (png_structp png_ptr,
-    png_infop info_ptr, png_const_unknown_chunkp unknowns,
-    int num_unknowns));
-PNG_EXPORT(175, void, png_set_unknown_chunk_location,
-    (png_structp png_ptr, png_infop info_ptr, int chunk, int location));
-PNG_EXPORT(176, int, png_get_unknown_chunks, (png_const_structp png_ptr,
-    png_const_infop 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_structp png_ptr, png_infop info_ptr, int mask));
-
-#ifdef PNG_INFO_IMAGE_SUPPORTED
-/* The "params" pointer is currently not used and is for future expansion. */
-PNG_EXPORT(178, void, png_read_png, (png_structp png_ptr, png_infop info_ptr,
-    int transforms, png_voidp params));
-PNG_EXPORT(179, void, png_write_png, (png_structp png_ptr, png_infop info_ptr,
-    int transforms, png_voidp params));
-#endif
-
-PNG_EXPORT(180, png_const_charp, png_get_copyright,
-    (png_const_structp png_ptr));
-PNG_EXPORT(181, png_const_charp, png_get_header_ver,
-    (png_const_structp png_ptr));
-PNG_EXPORT(182, png_const_charp, png_get_header_version,
-    (png_const_structp png_ptr));
-PNG_EXPORT(183, png_const_charp, png_get_libpng_ver,
-    (png_const_structp png_ptr));
-
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-PNG_EXPORT(184, png_uint_32, png_permit_mng_features, (png_structp 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
-
-/* 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_structp 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_structp 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_structp png_ptr));
-PNG_EXPORT(188, png_uint_32, png_get_user_height_max,
-    (png_const_structp png_ptr));
-/* Added in libpng-1.4.0 */
-PNG_EXPORT(189, void, png_set_chunk_cache_max, (png_structp png_ptr,
-    png_uint_32 user_chunk_cache_max));
-PNG_EXPORT(190, png_uint_32, png_get_chunk_cache_max,
-    (png_const_structp png_ptr));
-/* Added in libpng-1.4.1 */
-PNG_EXPORT(191, void, png_set_chunk_malloc_max, (png_structp png_ptr,
-    png_alloc_size_t user_chunk_cache_max));
-PNG_EXPORT(192, png_alloc_size_t, png_get_chunk_malloc_max,
-    (png_const_structp png_ptr));
-#endif
-
-#if defined(PNG_INCH_CONVERSIONS_SUPPORTED)
-PNG_EXPORT(193, png_uint_32, png_get_pixels_per_inch,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-
-PNG_EXPORT(194, png_uint_32, png_get_x_pixels_per_inch,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-
-PNG_EXPORT(195, png_uint_32, png_get_y_pixels_per_inch,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-
-PNG_FP_EXPORT(196, float, png_get_x_offset_inches,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-#ifdef PNG_FIXED_POINT_SUPPORTED /* otherwise not implemented. */
-PNG_FIXED_EXPORT(211, png_fixed_point, png_get_x_offset_inches_fixed,
-    (png_structp png_ptr, png_const_infop info_ptr));
-#endif
-
-PNG_FP_EXPORT(197, float, png_get_y_offset_inches, (png_const_structp png_ptr,
-    png_const_infop info_ptr));
-#ifdef PNG_FIXED_POINT_SUPPORTED /* otherwise not implemented. */
-PNG_FIXED_EXPORT(212, png_fixed_point, png_get_y_offset_inches_fixed,
-    (png_structp png_ptr, png_const_infop info_ptr));
-#endif
-
-#  ifdef PNG_pHYs_SUPPORTED
-PNG_EXPORT(198, png_uint_32, png_get_pHYs_dpi, (png_const_structp png_ptr,
-    png_const_infop info_ptr, png_uint_32 *res_x, png_uint_32 *res_y,
-    int *unit_type));
-#  endif /* PNG_pHYs_SUPPORTED */
-#endif  /* PNG_INCH_CONVERSIONS_SUPPORTED */
-
-/* Added in libpng-1.4.0 */
-#ifdef PNG_IO_STATE_SUPPORTED
-PNG_EXPORT(199, png_uint_32, png_get_io_state, (png_structp png_ptr));
-
-PNG_EXPORTA(200, png_const_bytep, png_get_io_chunk_name,
-    (png_structp png_ptr), PNG_DEPRECATED);
-PNG_EXPORT(216, png_uint_32, png_get_io_chunk_type,
-    (png_const_structp 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 /* ?PNG_IO_STATE_SUPPORTED */
-
-/* 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) (((1U&~(pass))<<(3-((pass)>>1)))&7)
-#define PNG_PASS_START_COL(pass) (((1U& (pass))<<(3-(((pass)+1)>>1)))&7)
-
-/* 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(yIn, pass) \
-   (((yIn)<<PNG_PASS_ROW_SHIFT(pass))+PNG_PASS_START_ROW(pass))
-#define PNG_COL_FROM_PASS_COL(xIn, pass) \
-   (((xIn)<<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) ( \
-   ((0x110145AFU>>(((7-(off))-(pass))<<2)) & 0xFU) | \
-   ((0x01145AF0U>>(((7-(off))-(pass))<<2)) & 0xF0U))
-
-#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)) + (png_uint_16)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)*(png_uint_32)(65535L        \
-           - (png_uint_32)(alpha)) + (png_uint_32)32768L); \
-       (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)) +       \
-     (png_uint_16)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)(65535L - (png_uint_32)(alpha)) +        \
-     (png_uint_32)32767) / (png_uint_32)65535L)
-#endif /* PNG_READ_COMPOSITE_NODIV_SUPPORTED */
-
-#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_structp 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)))
-#endif
-
-/* Maintainer: Put new public prototypes here ^, in libpng.3, and project
- * defs
- */
-
-/* The last ordinal number (this is the *last* one already used; the next
- * one to use is one more than this.)  Maintainer, remember to add an entry to
- * scripts/symbols.def as well.
- */
-#ifdef PNG_EXPORT_LAST_ORDINAL
-  PNG_EXPORT_LAST_ORDINAL(221);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* PNG_VERSION_INFO_ONLY */
-/* Do not put anything past this line */
-#endif /* PNG_H */
diff --git a/lib-x86-64/include/libpng15/pngconf.h b/lib-x86-64/include/libpng15/pngconf.h
deleted file mode 100644
index c82fa586..00000000
--- a/lib-x86-64/include/libpng15/pngconf.h
+++ /dev/null
@@ -1,649 +0,0 @@
-
-/* pngconf.h - machine configurable file for libpng
- *
- * libpng version 1.5.2 - March 31, 2011
- *
- * Copyright (c) 1998-2011 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
-
-#ifndef PNG_BUILDING_SYMBOL_TABLE
-/* PNG_NO_LIMITS_H may be used to turn off the use of the standard C
- * definition file for  machine specific limits, this may impact the
- * correctness of the definitons below (see uses of INT_MAX).
- */
-#  ifndef PNG_NO_LIMITS_H
-#    include <limits.h>
-#  endif
-
-/* For the memory copy APIs (i.e. the standard definitions of these),
- * because this file defines png_memcpy and so on the base APIs must
- * be defined here.
- */
-#  ifdef BSD
-#    include <strings.h>
-#  else
-#    include <string.h>
-#  endif
-
-/* For png_FILE_p - this provides the standard definition of a
- * FILE
- */
-#  ifdef PNG_STDIO_SUPPORTED
-#    include <stdio.h>
-#  endif
-#endif
-
-/* 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 to 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 protects us against machines that don't have function
- * prototypes (ie K&R style headers).  If your compiler does not handle
- * function prototypes, define this macro and use the included ansi2knr.
- * I've always been able to use _NO_PROTO as the indicator, but you may
- * need to drag the empty declaration out in front of here, or change the
- * ifdef to suit your own needs.
- */
-#ifndef PNGARG
-
-#  ifdef OF /* zlib prototype munger */
-#    define PNGARG(arglist) OF(arglist)
-#  else
-
-#    ifdef _NO_PROTO
-#      define PNGARG(arglist) ()
-#    else
-#      define PNGARG(arglist) arglist
-#    endif /* _NO_PROTO */
-
-#  endif /* OF */
-
-#endif /* PNGARG */
-
-/* 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.
- *
- * 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/x86 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__) ) &&\
-    ( defined(_X86_) || defined(_X64_) || defined(_M_IX86) ||\
-      defined(_M_X64) || defined(_M_IA64) )
-  /* Windows system (DOS doesn't support DLLs) running on x86/x64.  Includes
-   * builds under Cygwin or MinGW.  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
-#      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/x86 */
-#  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
-
-/* The default for PNG_IMPEXP depends on whether the library is
- * being built or used.
- */
-#ifndef PNG_IMPEXP
-#  ifdef PNGLIB_BUILD
-    /* Building the library */
-#    if (defined(DLL_EXPORT)/*from libtool*/ ||\
-        defined(_WINDLL) || defined(_DLL) || defined(__DLL__) ||\
-        defined(_USRDLL) ||\
-        defined(PNG_BUILD_DLL)) && defined(PNG_DLL_EXPORT)
-      /* Building a DLL. */
-#      define PNG_IMPEXP PNG_DLL_EXPORT
-#    endif /* DLL */
-#  else
-    /* Using the library */
-#    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
-#  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.
-   */
-#  if defined(__GNUC__)
-#    ifndef PNG_USE_RESULT
-#      define PNG_USE_RESULT __attribute__((__warn_unused_result__))
-#    endif
-#    ifndef PNG_NORETURN
-#      define PNG_NORETURN   __attribute__((__noreturn__))
-#    endif
-#    ifndef PNG_PTR_NORETURN
-       /* It's not enough to have the compiler be the correct compiler at
-        * this point - it's necessary for the library (which defines
-        * the type of the library longjmp) to also be the GNU library.
-        * This is because many systems use the GNU compiler with a
-        * non-GNU libc implementation.  Min/GW headers are also compatible
-        * with GCC as well as uclibc, so it seems best to exclude known
-        * problem libcs here rather than just including known libcs.
-        *
-        * NOTE: this relies on the only use of PNG_PTR_NORETURN being with
-        * the system longjmp.  If the same type is used elsewhere then this
-        * will need to be changed.
-        */
-#      if !defined(__CYGWIN__)
-#         define PNG_PTR_NORETURN   __attribute__((__noreturn__))
-#      endif
-#    endif
-#    ifndef PNG_ALLOCATED
-#      define PNG_ALLOCATED  __attribute__((__malloc__))
-#    endif
-
-    /* This specifically protects structure members that should only be
-     * accessed from within the library, therefore should be empty during
-     * a library build.
-     */
-#    ifndef PNGLIB_BUILD
-#      ifndef PNG_DEPRECATED
-#        define PNG_DEPRECATED __attribute__((__deprecated__))
-#      endif
-#      ifndef PNG_DEPSTRUCT
-#        define PNG_DEPSTRUCT  __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
-#    endif /* PNGLIB_BUILD */
-#  endif /* __GNUC__ */
-
-#  if 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_PTR_NORETURN
-#      define PNG_PTR_NORETURN /* not supported */
-#    endif
-#    ifndef PNG_ALLOCATED
-#      define PNG_ALLOCATED __declspec(restrict)
-#    endif
-
-    /* This specifically protects structure members that should only be
-     * accessed from within the library, therefore should be empty during
-     * a library build.
-     */
-#    ifndef PNGLIB_BUILD
-#      ifndef PNG_DEPRECATED
-#        define PNG_DEPRECATED __declspec(deprecated)
-#      endif
-#      ifndef PNG_DEPSTRUCT
-#        define PNG_DEPSTRUCT  __declspec(deprecated)
-#      endif
-#      ifndef PNG_PRIVATE
-#        define PNG_PRIVATE __declspec(deprecated)
-#      endif
-#    endif /* PNGLIB_BUILD */
-#  endif /* _MSC_VER */
-#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_PTR_NORETURN
-#  define PNG_PTR_NORETURN /* This function does not return */
-#endif
-#ifndef PNG_ALLOCATED
-#  define PNG_ALLOCATED   /* The result of the function is new memory */
-#endif
-#ifndef PNG_DEPSTRUCT
-#  define PNG_DEPSTRUCT   /* Access to this struct member is deprecated */
-#endif
-#ifndef PNG_PRIVATE
-#  define PNG_PRIVATE     /* This is a private libpng function */
-#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
-
-/* The following uses const char * instead of char * for error
- * and warning message functions, so some compilers won't complain.
- * If you do not want to use const, define PNG_NO_CONST here.
- *
- * This should not change how the APIs are called, so it can be done
- * on a per-file basis in the application.
- */
-#ifndef PNG_CONST
-#  ifndef PNG_NO_CONST
-#    define PNG_CONST const
-#  else
-#    define PNG_CONST
-#  endif
-#endif
-
-/* Some typedefs to get us started.  These should be safe on most of the
- * common platforms.  The typedefs should be at least as large as the
- * numbers suggest (a png_uint_32 must be at least 32 bits long), but they
- * don't have to be exactly that size.  Some compilers dislike passing
- * unsigned shorts as function parameters, so you may be better off using
- * unsigned int for png_uint_16.
- */
-
-#if defined(INT_MAX) && (INT_MAX > 0x7ffffffeL)
-typedef unsigned int png_uint_32;
-typedef int png_int_32;
-#else
-typedef unsigned long png_uint_32;
-typedef long png_int_32;
-#endif
-typedef unsigned short png_uint_16;
-typedef short png_int_16;
-typedef unsigned char png_byte;
-
-#ifdef PNG_NO_SIZE_T
-typedef unsigned int png_size_t;
-#else
-typedef size_t png_size_t;
-#endif
-#define png_sizeof(x) (sizeof (x))
-
-/* The following is needed for medium model support.  It cannot be in the
- * pngpriv.h header.  Needs modification for other compilers besides
- * MSC.  Model independent support declares all arrays and pointers to be
- * large using the far keyword.  The zlib version used must also support
- * model independent data.  As of version zlib 1.0.4, the necessary changes
- * have been made in zlib.  The USE_FAR_KEYWORD define triggers other
- * changes that are needed. (Tim Wegner)
- */
-
-/* Separate compiler dependencies (problem here is that zlib.h always
- * defines FAR. (SJT)
- */
-#ifdef __BORLANDC__
-#  if defined(__LARGE__) || defined(__HUGE__) || defined(__COMPACT__)
-#    define LDATA 1
-#  else
-#    define LDATA 0
-#  endif
-  /* GRR:  why is Cygwin in here?  Cygwin is not Borland C... */
-#  if !defined(__WIN32__) && !defined(__FLAT__) && !defined(__CYGWIN__)
-#    define PNG_MAX_MALLOC_64K /* only used in build */
-#    if (LDATA != 1)
-#      ifndef FAR
-#        define FAR __far
-#      endif
-#      define USE_FAR_KEYWORD
-#    endif   /* LDATA != 1 */
-         /* Possibly useful for moving data out of default segment.
-          * Uncomment it if you want. Could also define FARDATA as
-          * const if your compiler supports it. (SJT)
-#        define FARDATA FAR
-          */
-#  endif  /* __WIN32__, __FLAT__, __CYGWIN__ */
-#endif   /* __BORLANDC__ */
-
-
-/* Suggest testing for specific compiler first before testing for
- * FAR.  The Watcom compiler defines both __MEDIUM__ and M_I86MM,
- * making reliance oncertain keywords suspect. (SJT)
- */
-
-/* MSC Medium model */
-#ifdef FAR
-#  ifdef M_I86MM
-#    define USE_FAR_KEYWORD
-#    define FARDATA FAR
-#    include <dos.h>
-#  endif
-#endif
-
-/* SJT: default case */
-#ifndef FAR
-#  define FAR
-#endif
-
-/* At this point FAR is always defined */
-#ifndef FARDATA
-#  define FARDATA
-#endif
-
-/* 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                      FAR * png_voidp;
-typedef PNG_CONST void            FAR * png_const_voidp;
-typedef png_byte                  FAR * png_bytep;
-typedef PNG_CONST png_byte        FAR * png_const_bytep;
-typedef png_uint_32               FAR * png_uint_32p;
-typedef PNG_CONST png_uint_32     FAR * png_const_uint_32p;
-typedef png_int_32                FAR * png_int_32p;
-typedef PNG_CONST png_int_32      FAR * png_const_int_32p;
-typedef png_uint_16               FAR * png_uint_16p;
-typedef PNG_CONST png_uint_16     FAR * png_const_uint_16p;
-typedef png_int_16                FAR * png_int_16p;
-typedef PNG_CONST png_int_16      FAR * png_const_int_16p;
-typedef char                      FAR * png_charp;
-typedef PNG_CONST char            FAR * png_const_charp;
-typedef png_fixed_point           FAR * png_fixed_point_p;
-typedef PNG_CONST png_fixed_point FAR * png_const_fixed_point_p;
-typedef png_size_t                FAR * png_size_tp;
-typedef PNG_CONST png_size_t      FAR * png_const_size_tp;
-
-#ifdef PNG_STDIO_SUPPORTED
-typedef FILE            * png_FILE_p;
-#endif
-
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-typedef double           FAR * png_doublep;
-typedef PNG_CONST double FAR * png_const_doublep;
-#endif
-
-/* Pointers to pointers; i.e. arrays */
-typedef png_byte        FAR * FAR * png_bytepp;
-typedef png_uint_32     FAR * FAR * png_uint_32pp;
-typedef png_int_32      FAR * FAR * png_int_32pp;
-typedef png_uint_16     FAR * FAR * png_uint_16pp;
-typedef png_int_16      FAR * FAR * png_int_16pp;
-typedef PNG_CONST char  FAR * FAR * png_const_charpp;
-typedef char            FAR * FAR * png_charpp;
-typedef png_fixed_point FAR * FAR * png_fixed_point_pp;
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-typedef double          FAR * FAR * png_doublepp;
-#endif
-
-/* Pointers to pointers to pointers; i.e., pointer to array */
-typedef char            FAR * FAR * FAR * png_charppp;
-
-/* 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.
- */
-#if defined(__TURBOC__) && !defined(__FLAT__)
-   typedef unsigned long png_alloc_size_t;
-#else
-#  if defined(_MSC_VER) && defined(MAXSEG_64K)
-     typedef unsigned long    png_alloc_size_t;
-#  else
-     /* This is an attempt to detect an old Windows system where (int) is
-      * actually 16 bits, in that case png_malloc must have an argument with a
-      * bigger size to accomodate the requirements of the library.
-      */
-#    if (defined(_Windows) || defined(_WINDOWS) || defined(_WINDOWS_)) && \
-        (!defined(INT_MAX) || INT_MAX <= 0x7ffffffeL)
-       typedef DWORD         png_alloc_size_t;
-#    else
-       typedef png_size_t    png_alloc_size_t;
-#    endif
-#  endif
-#endif
-
-#endif /* PNGCONF_H */
diff --git a/lib-x86-64/include/libpng15/pnglibconf.h b/lib-x86-64/include/libpng15/pnglibconf.h
deleted file mode 100644
index cd203f88..00000000
--- a/lib-x86-64/include/libpng15/pnglibconf.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/* pnglibconf.h - library build configuration */
-
-/* libpng version 1.5.0 - January 6, 2011 */
-
-/* Copyright (c) 1998-2011 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
-/* settings */
-#define PNG_MAX_GAMMA_8 11
-#define PNG_CALLOC_SUPPORTED
-#define PNG_QUANTIZE_RED_BITS 5
-#define PNG_USER_WIDTH_MAX 1000000L
-#define PNG_QUANTIZE_GREEN_BITS 5
-#define PNG_API_RULE 0
-#define PNG_QUANTIZE_BLUE_BITS 5
-#define PNG_USER_CHUNK_CACHE_MAX 0
-#define PNG_USER_HEIGHT_MAX 1000000L
-#define PNG_sCAL_PRECISION 5
-#define PNG_COST_SHIFT 3
-#define PNG_WEIGHT_SHIFT 8
-#define PNG_USER_CHUNK_MALLOC_MAX 0
-#define PNG_DEFAULT_READ_MACROS 1
-#define PNG_ZBUF_SIZE 8192
-#define PNG_GAMMA_THRESHOLD_FIXED 5000
-/* end of settings */
-/* options */
-#define PNG_INFO_IMAGE_SUPPORTED
-#define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-#define PNG_POINTER_INDEXING_SUPPORTED
-#define PNG_WARNINGS_SUPPORTED
-#define PNG_FLOATING_ARITHMETIC_SUPPORTED
-#define PNG_WRITE_SUPPORTED
-#define PNG_WRITE_INTERLACING_SUPPORTED
-#define PNG_WRITE_16BIT_SUPPORTED
-#define PNG_EASY_ACCESS_SUPPORTED
-#define PNG_ALIGN_MEMORY_SUPPORTED
-#define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-#define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_USER_LIMITS_SUPPORTED
-#define PNG_FIXED_POINT_SUPPORTED
-/*#undef PNG_ERROR_NUMBERS_SUPPORTED*/
-#define PNG_ERROR_TEXT_SUPPORTED
-#define PNG_READ_SUPPORTED
-/*#undef PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED*/
-#define PNG_BENIGN_ERRORS_SUPPORTED
-#define PNG_SETJMP_SUPPORTED
-#define PNG_WRITE_FLUSH_SUPPORTED
-#define PNG_MNG_FEATURES_SUPPORTED
-#define PNG_FLOATING_POINT_SUPPORTED
-#define PNG_INCH_CONVERSIONS_SUPPORTED
-#define PNG_STDIO_SUPPORTED
-#define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_USER_MEM_SUPPORTED
-#define PNG_IO_STATE_SUPPORTED
-#define PNG_SET_USER_LIMITS_SUPPORTED
-#define PNG_READ_ANCILLARY_CHUNKS_SUPPORTED
-#define PNG_WRITE_INT_FUNCTIONS_SUPPORTED
-#define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED
-#define PNG_WRITE_FILTER_SUPPORTED
-#define PNG_SET_CHUNK_CACHE_LIMIT_SUPPORTED
-#define PNG_WRITE_iCCP_SUPPORTED
-#define PNG_READ_TRANSFORMS_SUPPORTED
-#define PNG_READ_GAMMA_SUPPORTED
-#define PNG_READ_bKGD_SUPPORTED
-#define PNG_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_READ_sCAL_SUPPORTED
-#define PNG_WRITE_hIST_SUPPORTED
-#define PNG_READ_OPT_PLTE_SUPPORTED
-#define PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED
-#define PNG_WRITE_gAMA_SUPPORTED
-#define PNG_READ_GRAY_TO_RGB_SUPPORTED
-#define PNG_WRITE_pCAL_SUPPORTED
-#define PNG_READ_INVERT_ALPHA_SUPPORTED
-#define PNG_WRITE_TRANSFORMS_SUPPORTED
-#define PNG_READ_sBIT_SUPPORTED
-#define PNG_READ_PACK_SUPPORTED
-#define PNG_WRITE_SWAP_SUPPORTED
-#define PNG_READ_cHRM_SUPPORTED
-#define PNG_WRITE_tIME_SUPPORTED
-#define PNG_READ_INTERLACING_SUPPORTED
-#define PNG_READ_tRNS_SUPPORTED
-#define PNG_WRITE_pHYs_SUPPORTED
-#define PNG_WRITE_INVERT_SUPPORTED
-#define PNG_READ_RGB_TO_GRAY_SUPPORTED
-#define PNG_WRITE_sRGB_SUPPORTED
-#define PNG_READ_oFFs_SUPPORTED
-#define PNG_WRITE_FILLER_SUPPORTED
-#define PNG_WRITE_TEXT_SUPPORTED
-#define PNG_WRITE_SHIFT_SUPPORTED
-#define PNG_PROGRESSIVE_READ_SUPPORTED
-#define PNG_READ_SHIFT_SUPPORTED
-#define PNG_CONVERT_tIME_SUPPORTED
-#define PNG_READ_USER_TRANSFORM_SUPPORTED
-#define PNG_READ_INT_FUNCTIONS_SUPPORTED
-#define PNG_READ_USER_CHUNKS_SUPPORTED
-#define PNG_READ_hIST_SUPPORTED
-#define PNG_READ_16BIT_SUPPORTED
-#define PNG_READ_SWAP_ALPHA_SUPPORTED
-#define PNG_READ_COMPOSITE_NODIV_SUPPORTED
-#define PNG_SEQUENTIAL_READ_SUPPORTED
-#define PNG_READ_BACKGROUND_SUPPORTED
-#define PNG_READ_QUANTIZE_SUPPORTED
-#define PNG_READ_iCCP_SUPPORTED
-#define PNG_READ_STRIP_ALPHA_SUPPORTED
-#define PNG_READ_PACKSWAP_SUPPORTED
-#define PNG_READ_sRGB_SUPPORTED
-#define PNG_WRITE_tEXt_SUPPORTED
-#define PNG_READ_gAMA_SUPPORTED
-#define PNG_READ_pCAL_SUPPORTED
-#define PNG_WRITE_sPLT_SUPPORTED
-#define PNG_READ_SWAP_SUPPORTED
-#define PNG_READ_tIME_SUPPORTED
-#define PNG_READ_pHYs_SUPPORTED
-#define PNG_WRITE_SWAP_ALPHA_SUPPORTED
-#define PNG_TIME_RFC1123_SUPPORTED
-#define PNG_READ_TEXT_SUPPORTED
-#define PNG_WRITE_BGR_SUPPORTED
-#define PNG_USER_CHUNKS_SUPPORTED
-#define PNG_CONSOLE_IO_SUPPORTED
-#define PNG_WRITE_PACK_SUPPORTED
-#define PNG_READ_FILLER_SUPPORTED
-#define PNG_WRITE_bKGD_SUPPORTED
-#define PNG_WRITE_tRNS_SUPPORTED
-#define PNG_READ_sPLT_SUPPORTED
-#define PNG_WRITE_sCAL_SUPPORTED
-#define PNG_WRITE_oFFs_SUPPORTED
-#define PNG_READ_tEXt_SUPPORTED
-#define PNG_WRITE_sBIT_SUPPORTED
-#define PNG_READ_INVERT_SUPPORTED
-#define PNG_READ_16_TO_8_SUPPORTED
-#define PNG_WRITE_cHRM_SUPPORTED
-#define PNG_16BIT_SUPPORTED
-#define PNG_WRITE_USER_TRANSFORM_SUPPORTED
-#define PNG_READ_BGR_SUPPORTED
-#define PNG_WRITE_PACKSWAP_SUPPORTED
-#define PNG_WRITE_INVERT_ALPHA_SUPPORTED
-#define PNG_sCAL_SUPPORTED
-#define PNG_WRITE_zTXt_SUPPORTED
-#define PNG_USER_TRANSFORM_INFO_SUPPORTED
-#define PNG_sBIT_SUPPORTED
-#define PNG_cHRM_SUPPORTED
-#define PNG_bKGD_SUPPORTED
-#define PNG_tRNS_SUPPORTED
-#define PNG_WRITE_iTXt_SUPPORTED
-#define PNG_oFFs_SUPPORTED
-#define PNG_READ_EXPAND_16_SUPPORTED
-#define PNG_USER_TRANSFORM_PTR_SUPPORTED
-#define PNG_hIST_SUPPORTED
-#define PNG_iCCP_SUPPORTED
-#define PNG_sRGB_SUPPORTED
-#define PNG_READ_zTXt_SUPPORTED
-#define PNG_gAMA_SUPPORTED
-#define PNG_pCAL_SUPPORTED
-#define PNG_CHECK_cHRM_SUPPORTED
-#define PNG_tIME_SUPPORTED
-#define PNG_READ_EXPAND_SUPPORTED
-#define PNG_pHYs_SUPPORTED
-#define PNG_READ_iTXt_SUPPORTED
-#define PNG_TEXT_SUPPORTED
-#define PNG_SAVE_INT_32_SUPPORTED
-#define PNG_sPLT_SUPPORTED
-#define PNG_tEXt_SUPPORTED
-#define PNG_zTXt_SUPPORTED
-#define PNG_iTXt_SUPPORTED
-/* end of options */
-#endif /* PNGLCONF_H */
diff --git a/lib-x86-64/include/mad.h b/lib-x86-64/include/mad.h
deleted file mode 100644
index 5695aa00..00000000
--- a/lib-x86-64/include/mad.h
+++ /dev/null
@@ -1,965 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, 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 of the License, 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
- *
- * If you would like to negotiate alternate licensing terms, you may do
- * so by contacting: Underbit Technologies, Inc. <info@underbit.com>
- */
-
-# ifdef __cplusplus
-extern "C" {
-# endif
-
-# define FPM_DEFAULT
-
-
-# define OPT_ACCURACY
-
-# define SIZEOF_INT 4
-# define SIZEOF_LONG 8
-# define SIZEOF_LONG_LONG 8
-
-
-/* Id: version.h,v 1.26 2004/01/23 09:41:33 rob Exp */
-
-# ifndef LIBMAD_VERSION_H
-# define LIBMAD_VERSION_H
-
-# define MAD_VERSION_MAJOR	0
-# define MAD_VERSION_MINOR	15
-# define MAD_VERSION_PATCH	1
-# define MAD_VERSION_EXTRA	" (beta)"
-
-# define MAD_VERSION_STRINGIZE(str)	#str
-# define MAD_VERSION_STRING(num)	MAD_VERSION_STRINGIZE(num)
-
-# define MAD_VERSION		MAD_VERSION_STRING(MAD_VERSION_MAJOR) "."  \
-				MAD_VERSION_STRING(MAD_VERSION_MINOR) "."  \
-				MAD_VERSION_STRING(MAD_VERSION_PATCH)  \
-				MAD_VERSION_EXTRA
-
-# define MAD_PUBLISHYEAR	"2000-2004"
-# define MAD_AUTHOR		"Underbit Technologies, Inc."
-# define MAD_EMAIL		"info@underbit.com"
-
-extern char const mad_version[];
-extern char const mad_copyright[];
-extern char const mad_author[];
-extern char const mad_build[];
-
-# endif
-
-/* Id: fixed.h,v 1.38 2004/02/17 02:02:03 rob Exp */
-
-# ifndef LIBMAD_FIXED_H
-# define LIBMAD_FIXED_H
-
-# if SIZEOF_INT >= 4
-typedef   signed int mad_fixed_t;
-
-typedef   signed int mad_fixed64hi_t;
-typedef unsigned int mad_fixed64lo_t;
-# else
-typedef   signed long mad_fixed_t;
-
-typedef   signed long mad_fixed64hi_t;
-typedef unsigned long mad_fixed64lo_t;
-# endif
-
-# if defined(_MSC_VER)
-#  define mad_fixed64_t  signed __int64
-# elif 1 || defined(__GNUC__)
-#  define mad_fixed64_t  signed long long
-# endif
-
-# if defined(FPM_FLOAT)
-typedef double mad_sample_t;
-# else
-typedef mad_fixed_t mad_sample_t;
-# endif
-
-/*
- * Fixed-point format: 0xABBBBBBB
- * A == whole part      (sign + 3 bits)
- * B == fractional part (28 bits)
- *
- * Values are signed two's complement, so the effective range is:
- * 0x80000000 to 0x7fffffff
- *       -8.0 to +7.9999999962747097015380859375
- *
- * The smallest representable value is:
- * 0x00000001 == 0.0000000037252902984619140625 (i.e. about 3.725e-9)
- *
- * 28 bits of fractional accuracy represent about
- * 8.6 digits of decimal accuracy.
- *
- * Fixed-point numbers can be added or subtracted as normal
- * integers, but multiplication requires shifting the 64-bit result
- * from 56 fractional bits back to 28 (and rounding.)
- *
- * Changing the definition of MAD_F_FRACBITS is only partially
- * supported, and must be done with care.
- */
-
-# define MAD_F_FRACBITS		28
-
-# if MAD_F_FRACBITS == 28
-#  define MAD_F(x)		((mad_fixed_t) (x##L))
-# else
-#  if MAD_F_FRACBITS < 28
-#   warning "MAD_F_FRACBITS < 28"
-#   define MAD_F(x)		((mad_fixed_t)  \
-				 (((x##L) +  \
-				   (1L << (28 - MAD_F_FRACBITS - 1))) >>  \
-				  (28 - MAD_F_FRACBITS)))
-#  elif MAD_F_FRACBITS > 28
-#   error "MAD_F_FRACBITS > 28 not currently supported"
-#   define MAD_F(x)		((mad_fixed_t)  \
-				 ((x##L) << (MAD_F_FRACBITS - 28)))
-#  endif
-# endif
-
-# define MAD_F_MIN		((mad_fixed_t) -0x80000000L)
-# define MAD_F_MAX		((mad_fixed_t) +0x7fffffffL)
-
-# define MAD_F_ONE		MAD_F(0x10000000)
-
-# define mad_f_tofixed(x)	((mad_fixed_t)  \
-				 ((x) * (double) (1L << MAD_F_FRACBITS) + 0.5))
-# define mad_f_todouble(x)	((double)  \
-				 ((x) / (double) (1L << MAD_F_FRACBITS)))
-
-# define mad_f_intpart(x)	((x) >> MAD_F_FRACBITS)
-# define mad_f_fracpart(x)	((x) & ((1L << MAD_F_FRACBITS) - 1))
-				/* (x should be positive) */
-
-# define mad_f_fromint(x)	((x) << MAD_F_FRACBITS)
-
-# define mad_f_add(x, y)	((x) + (y))
-# define mad_f_sub(x, y)	((x) - (y))
-
-# if defined(FPM_FLOAT)
-#  error "FPM_FLOAT not yet supported"
-
-#  undef MAD_F
-#  define MAD_F(x)		mad_f_todouble(x)
-
-#  define mad_f_mul(x, y)	((x) * (y))
-#  define mad_f_scale64
-
-#  undef ASO_ZEROCHECK
-
-# elif defined(FPM_64BIT)
-
-/*
- * This version should be the most accurate if 64-bit types are supported by
- * the compiler, although it may not be the most efficient.
- */
-#  if defined(OPT_ACCURACY)
-#   define mad_f_mul(x, y)  \
-    ((mad_fixed_t)  \
-     ((((mad_fixed64_t) (x) * (y)) +  \
-       (1L << (MAD_F_SCALEBITS - 1))) >> MAD_F_SCALEBITS))
-#  else
-#   define mad_f_mul(x, y)  \
-    ((mad_fixed_t) (((mad_fixed64_t) (x) * (y)) >> MAD_F_SCALEBITS))
-#  endif
-
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-
-/* --- Intel --------------------------------------------------------------- */
-
-# elif defined(FPM_INTEL)
-
-#  if defined(_MSC_VER)
-#   pragma warning(push)
-#   pragma warning(disable: 4035)  /* no return value */
-static __forceinline
-mad_fixed_t mad_f_mul_inline(mad_fixed_t x, mad_fixed_t y)
-{
-  enum {
-    fracbits = MAD_F_FRACBITS
-  };
-
-  __asm {
-    mov eax, x
-    imul y
-    shrd eax, edx, fracbits
-  }
-
-  /* implicit return of eax */
-}
-#   pragma warning(pop)
-
-#   define mad_f_mul		mad_f_mul_inline
-#   define mad_f_scale64
-#  else
-/*
- * This Intel version is fast and accurate; the disposition of the least
- * significant bit depends on OPT_ACCURACY via mad_f_scale64().
- */
-#   define MAD_F_MLX(hi, lo, x, y)  \
-    asm ("imull %3"  \
-	 : "=a" (lo), "=d" (hi)  \
-	 : "%a" (x), "rm" (y)  \
-	 : "cc")
-
-#   if defined(OPT_ACCURACY)
-/*
- * This gives best accuracy but is not very fast.
- */
-#    define MAD_F_MLA(hi, lo, x, y)  \
-    ({ mad_fixed64hi_t __hi;  \
-       mad_fixed64lo_t __lo;  \
-       MAD_F_MLX(__hi, __lo, (x), (y));  \
-       asm ("addl %2,%0\n\t"  \
-	    "adcl %3,%1"  \
-	    : "=rm" (lo), "=rm" (hi)  \
-	    : "r" (__lo), "r" (__hi), "0" (lo), "1" (hi)  \
-	    : "cc");  \
-    })
-#   endif  /* OPT_ACCURACY */
-
-#   if defined(OPT_ACCURACY)
-/*
- * Surprisingly, this is faster than SHRD followed by ADC.
- */
-#    define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed64hi_t __hi_;  \
-       mad_fixed64lo_t __lo_;  \
-       mad_fixed_t __result;  \
-       asm ("addl %4,%2\n\t"  \
-	    "adcl %5,%3"  \
-	    : "=rm" (__lo_), "=rm" (__hi_)  \
-	    : "0" (lo), "1" (hi),  \
-	      "ir" (1L << (MAD_F_SCALEBITS - 1)), "ir" (0)  \
-	    : "cc");  \
-       asm ("shrdl %3,%2,%1"  \
-	    : "=rm" (__result)  \
-	    : "0" (__lo_), "r" (__hi_), "I" (MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       __result;  \
-    })
-#   elif defined(OPT_INTEL)
-/*
- * Alternate Intel scaling that may or may not perform better.
- */
-#    define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result;  \
-       asm ("shrl %3,%1\n\t"  \
-	    "shll %4,%2\n\t"  \
-	    "orl %2,%1"  \
-	    : "=rm" (__result)  \
-	    : "0" (lo), "r" (hi),  \
-	      "I" (MAD_F_SCALEBITS), "I" (32 - MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       __result;  \
-    })
-#   else
-#    define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result;  \
-       asm ("shrdl %3,%2,%1"  \
-	    : "=rm" (__result)  \
-	    : "0" (lo), "r" (hi), "I" (MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       __result;  \
-    })
-#   endif  /* OPT_ACCURACY */
-
-#   define MAD_F_SCALEBITS  MAD_F_FRACBITS
-#  endif
-
-/* --- ARM ----------------------------------------------------------------- */
-
-# elif defined(FPM_ARM)
-
-/* 
- * This ARM V4 version is as accurate as FPM_64BIT but much faster. The
- * least significant bit is properly rounded at no CPU cycle cost!
- */
-# if 1
-/*
- * This is faster than the default implementation via MAD_F_MLX() and
- * mad_f_scale64().
- */
-#  define mad_f_mul(x, y)  \
-    ({ mad_fixed64hi_t __hi;  \
-       mad_fixed64lo_t __lo;  \
-       mad_fixed_t __result;  \
-       asm ("smull	%0, %1, %3, %4\n\t"  \
-	    "movs	%0, %0, lsr %5\n\t"  \
-	    "adc	%2, %0, %1, lsl %6"  \
-	    : "=&r" (__lo), "=&r" (__hi), "=r" (__result)  \
-	    : "%r" (x), "r" (y),  \
-	      "M" (MAD_F_SCALEBITS), "M" (32 - MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       __result;  \
-    })
-# endif
-
-#  define MAD_F_MLX(hi, lo, x, y)  \
-    asm ("smull	%0, %1, %2, %3"  \
-	 : "=&r" (lo), "=&r" (hi)  \
-	 : "%r" (x), "r" (y))
-
-#  define MAD_F_MLA(hi, lo, x, y)  \
-    asm ("smlal	%0, %1, %2, %3"  \
-	 : "+r" (lo), "+r" (hi)  \
-	 : "%r" (x), "r" (y))
-
-#  define MAD_F_MLN(hi, lo)  \
-    asm ("rsbs	%0, %2, #0\n\t"  \
-	 "rsc	%1, %3, #0"  \
-	 : "=r" (lo), "=r" (hi)  \
-	 : "0" (lo), "1" (hi)  \
-	 : "cc")
-
-#  define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result;  \
-       asm ("movs	%0, %1, lsr %3\n\t"  \
-	    "adc	%0, %0, %2, lsl %4"  \
-	    : "=&r" (__result)  \
-	    : "r" (lo), "r" (hi),  \
-	      "M" (MAD_F_SCALEBITS), "M" (32 - MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       __result;  \
-    })
-
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-
-/* --- MIPS ---------------------------------------------------------------- */
-
-# elif defined(FPM_MIPS)
-
-/*
- * This MIPS version is fast and accurate; the disposition of the least
- * significant bit depends on OPT_ACCURACY via mad_f_scale64().
- */
-#  define MAD_F_MLX(hi, lo, x, y)  \
-    asm ("mult	%2,%3"  \
-	 : "=l" (lo), "=h" (hi)  \
-	 : "%r" (x), "r" (y))
-
-# if defined(HAVE_MADD_ASM)
-#  define MAD_F_MLA(hi, lo, x, y)  \
-    asm ("madd	%2,%3"  \
-	 : "+l" (lo), "+h" (hi)  \
-	 : "%r" (x), "r" (y))
-# elif defined(HAVE_MADD16_ASM)
-/*
- * This loses significant accuracy due to the 16-bit integer limit in the
- * multiply/accumulate instruction.
- */
-#  define MAD_F_ML0(hi, lo, x, y)  \
-    asm ("mult	%2,%3"  \
-	 : "=l" (lo), "=h" (hi)  \
-	 : "%r" ((x) >> 12), "r" ((y) >> 16))
-#  define MAD_F_MLA(hi, lo, x, y)  \
-    asm ("madd16	%2,%3"  \
-	 : "+l" (lo), "+h" (hi)  \
-	 : "%r" ((x) >> 12), "r" ((y) >> 16))
-#  define MAD_F_MLZ(hi, lo)  ((mad_fixed_t) (lo))
-# endif
-
-# if defined(OPT_SPEED)
-#  define mad_f_scale64(hi, lo)  \
-    ((mad_fixed_t) ((hi) << (32 - MAD_F_SCALEBITS)))
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-# endif
-
-/* --- SPARC --------------------------------------------------------------- */
-
-# elif defined(FPM_SPARC)
-
-/*
- * This SPARC V8 version is fast and accurate; the disposition of the least
- * significant bit depends on OPT_ACCURACY via mad_f_scale64().
- */
-#  define MAD_F_MLX(hi, lo, x, y)  \
-    asm ("smul %2, %3, %0\n\t"  \
-	 "rd %%y, %1"  \
-	 : "=r" (lo), "=r" (hi)  \
-	 : "%r" (x), "rI" (y))
-
-/* --- PowerPC ------------------------------------------------------------- */
-
-# elif defined(FPM_PPC)
-
-/*
- * This PowerPC version is fast and accurate; the disposition of the least
- * significant bit depends on OPT_ACCURACY via mad_f_scale64().
- */
-#  define MAD_F_MLX(hi, lo, x, y)  \
-    do {  \
-      asm ("mullw %0,%1,%2"  \
-	   : "=r" (lo)  \
-	   : "%r" (x), "r" (y));  \
-      asm ("mulhw %0,%1,%2"  \
-	   : "=r" (hi)  \
-	   : "%r" (x), "r" (y));  \
-    }  \
-    while (0)
-
-#  if defined(OPT_ACCURACY)
-/*
- * This gives best accuracy but is not very fast.
- */
-#   define MAD_F_MLA(hi, lo, x, y)  \
-    ({ mad_fixed64hi_t __hi;  \
-       mad_fixed64lo_t __lo;  \
-       MAD_F_MLX(__hi, __lo, (x), (y));  \
-       asm ("addc %0,%2,%3\n\t"  \
-	    "adde %1,%4,%5"  \
-	    : "=r" (lo), "=r" (hi)  \
-	    : "%r" (lo), "r" (__lo),  \
-	      "%r" (hi), "r" (__hi)  \
-	    : "xer");  \
-    })
-#  endif
-
-#  if defined(OPT_ACCURACY)
-/*
- * This is slower than the truncating version below it.
- */
-#   define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result, __round;  \
-       asm ("rotrwi %0,%1,%2"  \
-	    : "=r" (__result)  \
-	    : "r" (lo), "i" (MAD_F_SCALEBITS));  \
-       asm ("extrwi %0,%1,1,0"  \
-	    : "=r" (__round)  \
-	    : "r" (__result));  \
-       asm ("insrwi %0,%1,%2,0"  \
-	    : "+r" (__result)  \
-	    : "r" (hi), "i" (MAD_F_SCALEBITS));  \
-       asm ("add %0,%1,%2"  \
-	    : "=r" (__result)  \
-	    : "%r" (__result), "r" (__round));  \
-       __result;  \
-    })
-#  else
-#   define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result;  \
-       asm ("rotrwi %0,%1,%2"  \
-	    : "=r" (__result)  \
-	    : "r" (lo), "i" (MAD_F_SCALEBITS));  \
-       asm ("insrwi %0,%1,%2,0"  \
-	    : "+r" (__result)  \
-	    : "r" (hi), "i" (MAD_F_SCALEBITS));  \
-       __result;  \
-    })
-#  endif
-
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-
-/* --- Default ------------------------------------------------------------- */
-
-# elif defined(FPM_DEFAULT)
-
-/*
- * This version is the most portable but it loses significant accuracy.
- * Furthermore, accuracy is biased against the second argument, so care
- * should be taken when ordering operands.
- *
- * The scale factors are constant as this is not used with SSO.
- *
- * Pre-rounding is required to stay within the limits of compliance.
- */
-#  if defined(OPT_SPEED)
-#   define mad_f_mul(x, y)	(((x) >> 12) * ((y) >> 16))
-#  else
-#   define mad_f_mul(x, y)	((((x) + (1L << 11)) >> 12) *  \
-				 (((y) + (1L << 15)) >> 16))
-#  endif
-
-/* ------------------------------------------------------------------------- */
-
-# else
-#  error "no FPM selected"
-# endif
-
-/* default implementations */
-
-# if !defined(mad_f_mul)
-#  define mad_f_mul(x, y)  \
-    ({ register mad_fixed64hi_t __hi;  \
-       register mad_fixed64lo_t __lo;  \
-       MAD_F_MLX(__hi, __lo, (x), (y));  \
-       mad_f_scale64(__hi, __lo);  \
-    })
-# endif
-
-# if !defined(MAD_F_MLA)
-#  define MAD_F_ML0(hi, lo, x, y)	((lo)  = mad_f_mul((x), (y)))
-#  define MAD_F_MLA(hi, lo, x, y)	((lo) += mad_f_mul((x), (y)))
-#  define MAD_F_MLN(hi, lo)		((lo)  = -(lo))
-#  define MAD_F_MLZ(hi, lo)		((void) (hi), (mad_fixed_t) (lo))
-# endif
-
-# if !defined(MAD_F_ML0)
-#  define MAD_F_ML0(hi, lo, x, y)	MAD_F_MLX((hi), (lo), (x), (y))
-# endif
-
-# if !defined(MAD_F_MLN)
-#  define MAD_F_MLN(hi, lo)		((hi) = ((lo) = -(lo)) ? ~(hi) : -(hi))
-# endif
-
-# if !defined(MAD_F_MLZ)
-#  define MAD_F_MLZ(hi, lo)		mad_f_scale64((hi), (lo))
-# endif
-
-# if !defined(mad_f_scale64)
-#  if defined(OPT_ACCURACY)
-#   define mad_f_scale64(hi, lo)  \
-    ((((mad_fixed_t)  \
-       (((hi) << (32 - (MAD_F_SCALEBITS - 1))) |  \
-	((lo) >> (MAD_F_SCALEBITS - 1)))) + 1) >> 1)
-#  else
-#   define mad_f_scale64(hi, lo)  \
-    ((mad_fixed_t)  \
-     (((hi) << (32 - MAD_F_SCALEBITS)) |  \
-      ((lo) >> MAD_F_SCALEBITS)))
-#  endif
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-# endif
-
-/* C routines */
-
-mad_fixed_t mad_f_abs(mad_fixed_t);
-mad_fixed_t mad_f_div(mad_fixed_t, mad_fixed_t);
-
-# endif
-
-/* Id: bit.h,v 1.12 2004/01/23 09:41:32 rob Exp */
-
-# ifndef LIBMAD_BIT_H
-# define LIBMAD_BIT_H
-
-struct mad_bitptr {
-  unsigned char const *byte;
-  unsigned short cache;
-  unsigned short left;
-};
-
-void mad_bit_init(struct mad_bitptr *, unsigned char const *);
-
-# define mad_bit_finish(bitptr)		/* nothing */
-
-unsigned int mad_bit_length(struct mad_bitptr const *,
-			    struct mad_bitptr const *);
-
-# define mad_bit_bitsleft(bitptr)  ((bitptr)->left)
-unsigned char const *mad_bit_nextbyte(struct mad_bitptr const *);
-
-void mad_bit_skip(struct mad_bitptr *, unsigned int);
-unsigned long mad_bit_read(struct mad_bitptr *, unsigned int);
-void mad_bit_write(struct mad_bitptr *, unsigned int, unsigned long);
-
-unsigned short mad_bit_crc(struct mad_bitptr, unsigned int, unsigned short);
-
-# endif
-
-/* Id: timer.h,v 1.16 2004/01/23 09:41:33 rob Exp */
-
-# ifndef LIBMAD_TIMER_H
-# define LIBMAD_TIMER_H
-
-typedef struct {
-  signed long seconds;		/* whole seconds */
-  unsigned long fraction;	/* 1/MAD_TIMER_RESOLUTION seconds */
-} mad_timer_t;
-
-extern mad_timer_t const mad_timer_zero;
-
-# define MAD_TIMER_RESOLUTION	352800000UL
-
-enum mad_units {
-  MAD_UNITS_HOURS	 =    -2,
-  MAD_UNITS_MINUTES	 =    -1,
-  MAD_UNITS_SECONDS	 =     0,
-
-  /* metric units */
-
-  MAD_UNITS_DECISECONDS	 =    10,
-  MAD_UNITS_CENTISECONDS =   100,
-  MAD_UNITS_MILLISECONDS =  1000,
-
-  /* audio sample units */
-
-  MAD_UNITS_8000_HZ	 =  8000,
-  MAD_UNITS_11025_HZ	 = 11025,
-  MAD_UNITS_12000_HZ	 = 12000,
-
-  MAD_UNITS_16000_HZ	 = 16000,
-  MAD_UNITS_22050_HZ	 = 22050,
-  MAD_UNITS_24000_HZ	 = 24000,
-
-  MAD_UNITS_32000_HZ	 = 32000,
-  MAD_UNITS_44100_HZ	 = 44100,
-  MAD_UNITS_48000_HZ	 = 48000,
-
-  /* video frame/field units */
-
-  MAD_UNITS_24_FPS	 =    24,
-  MAD_UNITS_25_FPS	 =    25,
-  MAD_UNITS_30_FPS	 =    30,
-  MAD_UNITS_48_FPS	 =    48,
-  MAD_UNITS_50_FPS	 =    50,
-  MAD_UNITS_60_FPS	 =    60,
-
-  /* CD audio frames */
-
-  MAD_UNITS_75_FPS	 =    75,
-
-  /* video drop-frame units */
-
-  MAD_UNITS_23_976_FPS	 =   -24,
-  MAD_UNITS_24_975_FPS	 =   -25,
-  MAD_UNITS_29_97_FPS	 =   -30,
-  MAD_UNITS_47_952_FPS	 =   -48,
-  MAD_UNITS_49_95_FPS	 =   -50,
-  MAD_UNITS_59_94_FPS	 =   -60
-};
-
-# define mad_timer_reset(timer)	((void) (*(timer) = mad_timer_zero))
-
-int mad_timer_compare(mad_timer_t, mad_timer_t);
-
-# define mad_timer_sign(timer)	mad_timer_compare((timer), mad_timer_zero)
-
-void mad_timer_negate(mad_timer_t *);
-mad_timer_t mad_timer_abs(mad_timer_t);
-
-void mad_timer_set(mad_timer_t *, unsigned long, unsigned long, unsigned long);
-void mad_timer_add(mad_timer_t *, mad_timer_t);
-void mad_timer_multiply(mad_timer_t *, signed long);
-
-signed long mad_timer_count(mad_timer_t, enum mad_units);
-unsigned long mad_timer_fraction(mad_timer_t, unsigned long);
-void mad_timer_string(mad_timer_t, char *, char const *,
-		      enum mad_units, enum mad_units, unsigned long);
-
-# endif
-
-/* Id: stream.h,v 1.20 2004/02/05 09:02:39 rob Exp */
-
-# ifndef LIBMAD_STREAM_H
-# define LIBMAD_STREAM_H
-
-
-# define MAD_BUFFER_GUARD	8
-# define MAD_BUFFER_MDLEN	(511 + 2048 + MAD_BUFFER_GUARD)
-
-enum mad_error {
-  MAD_ERROR_NONE	   = 0x0000,	/* no error */
-
-  MAD_ERROR_BUFLEN	   = 0x0001,	/* input buffer too small (or EOF) */
-  MAD_ERROR_BUFPTR	   = 0x0002,	/* invalid (null) buffer pointer */
-
-  MAD_ERROR_NOMEM	   = 0x0031,	/* not enough memory */
-
-  MAD_ERROR_LOSTSYNC	   = 0x0101,	/* lost synchronization */
-  MAD_ERROR_BADLAYER	   = 0x0102,	/* reserved header layer value */
-  MAD_ERROR_BADBITRATE	   = 0x0103,	/* forbidden bitrate value */
-  MAD_ERROR_BADSAMPLERATE  = 0x0104,	/* reserved sample frequency value */
-  MAD_ERROR_BADEMPHASIS	   = 0x0105,	/* reserved emphasis value */
-
-  MAD_ERROR_BADCRC	   = 0x0201,	/* CRC check failed */
-  MAD_ERROR_BADBITALLOC	   = 0x0211,	/* forbidden bit allocation value */
-  MAD_ERROR_BADSCALEFACTOR = 0x0221,	/* bad scalefactor index */
-  MAD_ERROR_BADMODE        = 0x0222,	/* bad bitrate/mode combination */
-  MAD_ERROR_BADFRAMELEN	   = 0x0231,	/* bad frame length */
-  MAD_ERROR_BADBIGVALUES   = 0x0232,	/* bad big_values count */
-  MAD_ERROR_BADBLOCKTYPE   = 0x0233,	/* reserved block_type */
-  MAD_ERROR_BADSCFSI	   = 0x0234,	/* bad scalefactor selection info */
-  MAD_ERROR_BADDATAPTR	   = 0x0235,	/* bad main_data_begin pointer */
-  MAD_ERROR_BADPART3LEN	   = 0x0236,	/* bad audio data length */
-  MAD_ERROR_BADHUFFTABLE   = 0x0237,	/* bad Huffman table select */
-  MAD_ERROR_BADHUFFDATA	   = 0x0238,	/* Huffman data overrun */
-  MAD_ERROR_BADSTEREO	   = 0x0239	/* incompatible block_type for JS */
-};
-
-# define MAD_RECOVERABLE(error)	((error) & 0xff00)
-
-struct mad_stream {
-  unsigned char const *buffer;		/* input bitstream buffer */
-  unsigned char const *bufend;		/* end of buffer */
-  unsigned long skiplen;		/* bytes to skip before next frame */
-
-  int sync;				/* stream sync found */
-  unsigned long freerate;		/* free bitrate (fixed) */
-
-  unsigned char const *this_frame;	/* start of current frame */
-  unsigned char const *next_frame;	/* start of next frame */
-  struct mad_bitptr ptr;		/* current processing bit pointer */
-
-  struct mad_bitptr anc_ptr;		/* ancillary bits pointer */
-  unsigned int anc_bitlen;		/* number of ancillary bits */
-
-  unsigned char (*main_data)[MAD_BUFFER_MDLEN];
-					/* Layer III main_data() */
-  unsigned int md_len;			/* bytes in main_data */
-
-  int options;				/* decoding options (see below) */
-  enum mad_error error;			/* error code (see above) */
-};
-
-enum {
-  MAD_OPTION_IGNORECRC      = 0x0001,	/* ignore CRC errors */
-  MAD_OPTION_HALFSAMPLERATE = 0x0002	/* generate PCM at 1/2 sample rate */
-# if 0  /* not yet implemented */
-  MAD_OPTION_LEFTCHANNEL    = 0x0010,	/* decode left channel only */
-  MAD_OPTION_RIGHTCHANNEL   = 0x0020,	/* decode right channel only */
-  MAD_OPTION_SINGLECHANNEL  = 0x0030	/* combine channels */
-# endif
-};
-
-void mad_stream_init(struct mad_stream *);
-void mad_stream_finish(struct mad_stream *);
-
-# define mad_stream_options(stream, opts)  \
-    ((void) ((stream)->options = (opts)))
-
-void mad_stream_buffer(struct mad_stream *,
-		       unsigned char const *, unsigned long);
-void mad_stream_skip(struct mad_stream *, unsigned long);
-
-int mad_stream_sync(struct mad_stream *);
-
-char const *mad_stream_errorstr(struct mad_stream const *);
-
-# endif
-
-/* Id: frame.h,v 1.20 2004/01/23 09:41:32 rob Exp */
-
-# ifndef LIBMAD_FRAME_H
-# define LIBMAD_FRAME_H
-
-
-enum mad_layer {
-  MAD_LAYER_I   = 1,			/* Layer I */
-  MAD_LAYER_II  = 2,			/* Layer II */
-  MAD_LAYER_III = 3			/* Layer III */
-};
-
-enum mad_mode {
-  MAD_MODE_SINGLE_CHANNEL = 0,		/* single channel */
-  MAD_MODE_DUAL_CHANNEL	  = 1,		/* dual channel */
-  MAD_MODE_JOINT_STEREO	  = 2,		/* joint (MS/intensity) stereo */
-  MAD_MODE_STEREO	  = 3		/* normal LR stereo */
-};
-
-enum mad_emphasis {
-  MAD_EMPHASIS_NONE	  = 0,		/* no emphasis */
-  MAD_EMPHASIS_50_15_US	  = 1,		/* 50/15 microseconds emphasis */
-  MAD_EMPHASIS_CCITT_J_17 = 3,		/* CCITT J.17 emphasis */
-  MAD_EMPHASIS_RESERVED   = 2		/* unknown emphasis */
-};
-
-struct mad_header {
-  enum mad_layer layer;			/* audio layer (1, 2, or 3) */
-  enum mad_mode mode;			/* channel mode (see above) */
-  int mode_extension;			/* additional mode info */
-  enum mad_emphasis emphasis;		/* de-emphasis to use (see above) */
-
-  unsigned long bitrate;		/* stream bitrate (bps) */
-  unsigned int samplerate;		/* sampling frequency (Hz) */
-
-  unsigned short crc_check;		/* frame CRC accumulator */
-  unsigned short crc_target;		/* final target CRC checksum */
-
-  int flags;				/* flags (see below) */
-  int private_bits;			/* private bits (see below) */
-
-  mad_timer_t duration;			/* audio playing time of frame */
-};
-
-struct mad_frame {
-  struct mad_header header;		/* MPEG audio header */
-
-  int options;				/* decoding options (from stream) */
-
-  mad_fixed_t sbsample[2][36][32];	/* synthesis subband filter samples */
-  mad_fixed_t (*overlap)[2][32][18];	/* Layer III block overlap data */
-};
-
-# define MAD_NCHANNELS(header)		((header)->mode ? 2 : 1)
-# define MAD_NSBSAMPLES(header)  \
-  ((header)->layer == MAD_LAYER_I ? 12 :  \
-   (((header)->layer == MAD_LAYER_III &&  \
-     ((header)->flags & MAD_FLAG_LSF_EXT)) ? 18 : 36))
-
-enum {
-  MAD_FLAG_NPRIVATE_III	= 0x0007,	/* number of Layer III private bits */
-  MAD_FLAG_INCOMPLETE	= 0x0008,	/* header but not data is decoded */
-
-  MAD_FLAG_PROTECTION	= 0x0010,	/* frame has CRC protection */
-  MAD_FLAG_COPYRIGHT	= 0x0020,	/* frame is copyright */
-  MAD_FLAG_ORIGINAL	= 0x0040,	/* frame is original (else copy) */
-  MAD_FLAG_PADDING	= 0x0080,	/* frame has additional slot */
-
-  MAD_FLAG_I_STEREO	= 0x0100,	/* uses intensity joint stereo */
-  MAD_FLAG_MS_STEREO	= 0x0200,	/* uses middle/side joint stereo */
-  MAD_FLAG_FREEFORMAT	= 0x0400,	/* uses free format bitrate */
-
-  MAD_FLAG_LSF_EXT	= 0x1000,	/* lower sampling freq. extension */
-  MAD_FLAG_MC_EXT	= 0x2000,	/* multichannel audio extension */
-  MAD_FLAG_MPEG_2_5_EXT	= 0x4000	/* MPEG 2.5 (unofficial) extension */
-};
-
-enum {
-  MAD_PRIVATE_HEADER	= 0x0100,	/* header private bit */
-  MAD_PRIVATE_III	= 0x001f	/* Layer III private bits (up to 5) */
-};
-
-void mad_header_init(struct mad_header *);
-
-# define mad_header_finish(header)  /* nothing */
-
-int mad_header_decode(struct mad_header *, struct mad_stream *);
-
-void mad_frame_init(struct mad_frame *);
-void mad_frame_finish(struct mad_frame *);
-
-int mad_frame_decode(struct mad_frame *, struct mad_stream *);
-
-void mad_frame_mute(struct mad_frame *);
-
-# endif
-
-/* Id: synth.h,v 1.15 2004/01/23 09:41:33 rob Exp */
-
-# ifndef LIBMAD_SYNTH_H
-# define LIBMAD_SYNTH_H
-
-
-struct mad_pcm {
-  unsigned int samplerate;		/* sampling frequency (Hz) */
-  unsigned short channels;		/* number of channels */
-  unsigned short length;		/* number of samples per channel */
-  mad_fixed_t samples[2][1152];		/* PCM output samples [ch][sample] */
-};
-
-struct mad_synth {
-  mad_fixed_t filter[2][2][2][16][8];	/* polyphase filterbank outputs */
-  					/* [ch][eo][peo][s][v] */
-
-  unsigned int phase;			/* current processing phase */
-
-  struct mad_pcm pcm;			/* PCM output */
-};
-
-/* single channel PCM selector */
-enum {
-  MAD_PCM_CHANNEL_SINGLE = 0
-};
-
-/* dual channel PCM selector */
-enum {
-  MAD_PCM_CHANNEL_DUAL_1 = 0,
-  MAD_PCM_CHANNEL_DUAL_2 = 1
-};
-
-/* stereo PCM selector */
-enum {
-  MAD_PCM_CHANNEL_STEREO_LEFT  = 0,
-  MAD_PCM_CHANNEL_STEREO_RIGHT = 1
-};
-
-void mad_synth_init(struct mad_synth *);
-
-# define mad_synth_finish(synth)  /* nothing */
-
-void mad_synth_mute(struct mad_synth *);
-
-void mad_synth_frame(struct mad_synth *, struct mad_frame const *);
-
-# endif
-
-/* Id: decoder.h,v 1.17 2004/01/23 09:41:32 rob Exp */
-
-# ifndef LIBMAD_DECODER_H
-# define LIBMAD_DECODER_H
-
-
-enum mad_decoder_mode {
-  MAD_DECODER_MODE_SYNC  = 0,
-  MAD_DECODER_MODE_ASYNC
-};
-
-enum mad_flow {
-  MAD_FLOW_CONTINUE = 0x0000,	/* continue normally */
-  MAD_FLOW_STOP     = 0x0010,	/* stop decoding normally */
-  MAD_FLOW_BREAK    = 0x0011,	/* stop decoding and signal an error */
-  MAD_FLOW_IGNORE   = 0x0020	/* ignore the current frame */
-};
-
-struct mad_decoder {
-  enum mad_decoder_mode mode;
-
-  int options;
-
-  struct {
-    long pid;
-    int in;
-    int out;
-  } async;
-
-  struct {
-    struct mad_stream stream;
-    struct mad_frame frame;
-    struct mad_synth synth;
-  } *sync;
-
-  void *cb_data;
-
-  enum mad_flow (*input_func)(void *, struct mad_stream *);
-  enum mad_flow (*header_func)(void *, struct mad_header const *);
-  enum mad_flow (*filter_func)(void *,
-			       struct mad_stream const *, struct mad_frame *);
-  enum mad_flow (*output_func)(void *,
-			       struct mad_header const *, struct mad_pcm *);
-  enum mad_flow (*error_func)(void *, struct mad_stream *, struct mad_frame *);
-  enum mad_flow (*message_func)(void *, void *, unsigned int *);
-};
-
-void mad_decoder_init(struct mad_decoder *, void *,
-		      enum mad_flow (*)(void *, struct mad_stream *),
-		      enum mad_flow (*)(void *, struct mad_header const *),
-		      enum mad_flow (*)(void *,
-					struct mad_stream const *,
-					struct mad_frame *),
-		      enum mad_flow (*)(void *,
-					struct mad_header const *,
-					struct mad_pcm *),
-		      enum mad_flow (*)(void *,
-					struct mad_stream *,
-					struct mad_frame *),
-		      enum mad_flow (*)(void *, void *, unsigned int *));
-int mad_decoder_finish(struct mad_decoder *);
-
-# define mad_decoder_options(decoder, opts)  \
-    ((void) ((decoder)->options = (opts)))
-
-int mad_decoder_run(struct mad_decoder *, enum mad_decoder_mode);
-int mad_decoder_message(struct mad_decoder *, void *, unsigned int *);
-
-# endif
-
-# ifdef __cplusplus
-}
-# endif
diff --git a/lib-x86-64/include/mp4ff.h b/lib-x86-64/include/mp4ff.h
deleted file mode 100644
index 17b7fe76..00000000
--- a/lib-x86-64/include/mp4ff.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
-** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
-** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com
-**  
-** 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 of the License, 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.
-**
-** Any non-GPL usage of this software or parts of this software is strictly
-** forbidden.
-**
-** The "appropriate copyright message" mentioned in section 2c of the GPLv2
-** must read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
-**
-** Commercial non-GPL licensing of this software is possible.
-** For more info contact Nero AG through Mpeg4AAClicense@nero.com.
-**
-** $Id: mp4ff.h,v 1.27 2009/01/29 00:41:08 menno Exp $
-**/
-
-#ifndef MP4FF_H
-#define MP4FF_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#else
-#include "mp4ff_int_types.h"
-#endif
-
-/* file callback structure */
-typedef struct
-{
-    uint32_t (*read)(void *user_data, void *buffer, uint32_t length);
-    uint32_t (*write)(void *udata, void *buffer, uint32_t length);
-    uint32_t (*seek)(void *user_data, uint64_t position);
-	uint32_t (*truncate)(void *user_data);
-    void *user_data;
-} mp4ff_callback_t;
-
-/* mp4 main file structure */
-typedef void* mp4ff_t;
-
-
-/* API */
-
-mp4ff_t *mp4ff_open_read(mp4ff_callback_t *f);
-mp4ff_t *mp4ff_open_read_metaonly(mp4ff_callback_t *f);
-void mp4ff_close(mp4ff_t *f);
-int32_t mp4ff_get_sample_duration(const mp4ff_t *f, const int32_t track, const int32_t sample);
-int32_t mp4ff_get_sample_duration_use_offsets(const mp4ff_t *f, const int32_t track, const int32_t sample);
-int64_t mp4ff_get_sample_position(const mp4ff_t *f, const int32_t track, const int32_t sample);
-int32_t mp4ff_get_sample_offset(const mp4ff_t *f, const int32_t track, const int32_t sample);
-int32_t mp4ff_find_sample(const mp4ff_t *f, const int32_t track, const int64_t offset,int32_t * toskip);
-int32_t mp4ff_find_sample_use_offsets(const mp4ff_t *f, const int32_t track, const int64_t offset,int32_t * toskip);
-
-int32_t mp4ff_read_sample(mp4ff_t *f, const int track, const int sample,
-                          unsigned char **audio_buffer,  unsigned int *bytes);
-
-int32_t mp4ff_read_sample_v2(mp4ff_t *f, const int track, const int sample,unsigned char *buffer);//returns 0 on error, number of bytes read on success, use mp4ff_read_sample_getsize() to check buffer size needed
-int32_t mp4ff_read_sample_getsize(mp4ff_t *f, const int track, const int sample);//returns 0 on error, buffer size needed for mp4ff_read_sample_v2() on success
-
-
-
-int32_t mp4ff_get_decoder_config(const mp4ff_t *f, const int track,
-                             unsigned char** ppBuf, unsigned int* pBufSize);
-int32_t mp4ff_get_track_type(const mp4ff_t *f, const int track);
-int32_t mp4ff_total_tracks(const mp4ff_t *f);
-int32_t mp4ff_num_samples(const mp4ff_t *f, const int track);
-int32_t mp4ff_time_scale(const mp4ff_t *f, const int track);
-
-uint32_t mp4ff_get_avg_bitrate(const mp4ff_t *f, const int32_t track);
-uint32_t mp4ff_get_max_bitrate(const mp4ff_t *f, const int32_t track);
-int64_t mp4ff_get_track_duration(const mp4ff_t *f, const int32_t track); //returns (-1) if unknown
-int64_t mp4ff_get_track_duration_use_offsets(const mp4ff_t *f, const int32_t track); //returns (-1) if unknown
-uint32_t mp4ff_get_sample_rate(const mp4ff_t *f, const int32_t track);
-uint32_t mp4ff_get_channel_count(const mp4ff_t * f,const int32_t track);
-uint32_t mp4ff_get_audio_type(const mp4ff_t * f,const int32_t track);
-
-
-/* metadata */
-int mp4ff_meta_get_num_items(const mp4ff_t *f);
-int mp4ff_meta_get_by_index(const mp4ff_t *f, unsigned int index,
-                            char **item, char **value);
-int mp4ff_meta_get_title(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_artist(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_writer(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_album(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_date(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_tool(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_comment(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_genre(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_track(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_disc(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_totaltracks(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_totaldiscs(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_compilation(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_tempo(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_coverart(const mp4ff_t *f, char **value);
-#ifdef USE_TAGGING
-
-/* metadata tag structure */
-typedef struct
-{
-    char *item;
-    char *value;
-} mp4ff_tag_t;
-
-/* metadata list structure */
-typedef struct
-{
-    mp4ff_tag_t *tags;
-    uint32_t count;
-} mp4ff_metadata_t;
-
-int32_t mp4ff_meta_update(mp4ff_callback_t *f,const mp4ff_metadata_t * data);
-
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
diff --git a/lib-x86-64/include/mp4ffint.h b/lib-x86-64/include/mp4ffint.h
deleted file mode 100644
index c92b5886..00000000
--- a/lib-x86-64/include/mp4ffint.h
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
-** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
-** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com
-**  
-** 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 of the License, 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.
-**
-** Any non-GPL usage of this software or parts of this software is strictly
-** forbidden.
-**
-** The "appropriate copyright message" mentioned in section 2c of the GPLv2
-** must read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
-**
-** Commercial non-GPL licensing of this software is possible.
-** For more info contact Nero AG through Mpeg4AAClicense@nero.com.
-**
-** $Id: mp4ffint.h,v 1.26 2009/01/25 20:14:34 menno Exp $
-**/
-
-#ifndef MP4FF_INTERNAL_H
-#define MP4FF_INTERNAL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include "mp4ff_int_types.h"
-#include <stdlib.h>
-
-#define MAX_TRACKS 1024
-#define TRACK_UNKNOWN 0
-#define TRACK_AUDIO   1
-#define TRACK_VIDEO   2
-#define TRACK_SYSTEM  3
-
-
-#define SUBATOMIC 128
-
-/* atoms without subatoms */
-#define ATOM_FTYP 129
-#define ATOM_MDAT 130
-#define ATOM_MVHD 131
-#define ATOM_TKHD 132
-#define ATOM_TREF 133
-#define ATOM_MDHD 134
-#define ATOM_VMHD 135
-#define ATOM_SMHD 136
-#define ATOM_HMHD 137
-#define ATOM_STSD 138
-#define ATOM_STTS 139
-#define ATOM_STSZ 140
-#define ATOM_STZ2 141
-#define ATOM_STCO 142
-#define ATOM_STSC 143
-#define ATOM_MP4A 144
-#define ATOM_MP4V 145
-#define ATOM_MP4S 146
-#define ATOM_ESDS 147
-#define ATOM_META 148 /* iTunes Metadata box */
-#define ATOM_NAME 149 /* iTunes Metadata name box */
-#define ATOM_DATA 150 /* iTunes Metadata data box */
-#define ATOM_CTTS 151
-#define ATOM_FRMA 152
-#define ATOM_IVIV 153
-#define ATOM_PRIV 154
-#define ATOM_USER 155
-#define ATOM_KEY  156
-
-#define ATOM_ALBUM_ARTIST	157
-#define ATOM_CONTENTGROUP   158
-#define ATOM_LYRICS         159
-#define ATOM_DESCRIPTION    160
-#define ATOM_NETWORK        161
-#define ATOM_SHOW           162
-#define ATOM_EPISODENAME    163
-#define ATOM_SORTTITLE      164
-#define ATOM_SORTALBUM      165
-#define ATOM_SORTARTIST     166
-#define ATOM_SORTALBUMARTIST    167
-#define ATOM_SORTWRITER     168
-#define ATOM_SORTSHOW       169
-#define ATOM_SEASON         170
-#define ATOM_EPISODE        171
-#define ATOM_PODCAST        172
-
-#define ATOM_UNKNOWN 255
-#define ATOM_FREE ATOM_UNKNOWN
-#define ATOM_SKIP ATOM_UNKNOWN
-
-/* atoms with subatoms */
-#define ATOM_MOOV 1
-#define ATOM_TRAK 2
-#define ATOM_EDTS 3
-#define ATOM_MDIA 4
-#define ATOM_MINF 5
-#define ATOM_STBL 6
-#define ATOM_UDTA 7
-#define ATOM_ILST 8 /* iTunes Metadata list */
-#define ATOM_TITLE 9
-#define ATOM_ARTIST 10
-#define ATOM_WRITER 11
-#define ATOM_ALBUM 12
-#define ATOM_DATE 13
-#define ATOM_TOOL 14
-#define ATOM_COMMENT 15
-#define ATOM_GENRE1 16
-#define ATOM_TRACK 17
-#define ATOM_DISC 18
-#define ATOM_COMPILATION 19
-#define ATOM_GENRE2 20
-#define ATOM_TEMPO 21
-#define ATOM_COVER 22
-#define ATOM_DRMS 23
-#define ATOM_SINF 24
-#define ATOM_SCHI 25
-
-#ifdef HAVE_CONFIG_H
-#include "../../config.h"   
-#endif
-
-#if !(defined(_WIN32) || defined(_WIN32_WCE))
-#define stricmp strcasecmp
-#else
-#define stricmp _stricmp
-#define strdup _strdup
-#endif
-
-/* file callback structure */
-typedef struct
-{
-    uint32_t (*read)(void *user_data, void *buffer, uint32_t length);
-    uint32_t (*write)(void *udata, void *buffer, uint32_t length);
-    uint32_t (*seek)(void *user_data, uint64_t position);
-    uint32_t (*truncate)(void *user_data);
-    void *user_data;
-} mp4ff_callback_t;
-
-
-/* metadata tag structure */
-typedef struct
-{
-    char *item;
-    char *value;
-} mp4ff_tag_t;
-
-/* metadata list structure */
-typedef struct
-{
-    mp4ff_tag_t *tags;
-    uint32_t count;
-} mp4ff_metadata_t;
-
-
-typedef struct
-{
-    int32_t type;
-    int32_t channelCount;
-    int32_t sampleSize;
-    uint16_t sampleRate;
-    int32_t audioType;
-
-    /* stsd */
-    int32_t stsd_entry_count;
-
-    /* stsz */
-    int32_t stsz_sample_size;
-    int32_t stsz_sample_count;
-    int32_t *stsz_table;
-
-    /* stts */
-    int32_t stts_entry_count;
-    int32_t *stts_sample_count;
-    int32_t *stts_sample_delta;
-
-    /* stsc */
-    int32_t stsc_entry_count;
-    int32_t *stsc_first_chunk;
-    int32_t *stsc_samples_per_chunk;
-    int32_t *stsc_sample_desc_index;
-
-    /* stsc */
-    int32_t stco_entry_count;
-    int32_t *stco_chunk_offset;
-
-    /* ctts */
-    int32_t ctts_entry_count;
-    int32_t *ctts_sample_count;
-    int32_t *ctts_sample_offset;
-
-    /* esde */
-    uint8_t *decoderConfig;
-    int32_t decoderConfigLen;
-
-    uint32_t maxBitrate;
-    uint32_t avgBitrate;
-
-    uint32_t timeScale;
-    uint64_t duration;
-
-} mp4ff_track_t;
-
-/* mp4 main file structure */
-typedef struct
-{
-    /* stream to read from */
-    mp4ff_callback_t *stream;
-    int64_t current_position;
-
-    int32_t moov_read;
-    uint64_t moov_offset;
-    uint64_t moov_size;
-    uint8_t last_atom;
-    uint64_t file_size;
-
-    /* mvhd */
-    int32_t time_scale;
-    int32_t duration;
-
-    /* incremental track index while reading the file */
-    int32_t total_tracks;
-
-    /* track data */
-    mp4ff_track_t *track[MAX_TRACKS];
-
-    /* metadata */
-    mp4ff_metadata_t tags;
-} mp4ff_t;
-
-
-
-
-/* mp4util.c */
-int32_t mp4ff_read_data(mp4ff_t *f, int8_t *data, uint32_t size);
-int32_t mp4ff_write_data(mp4ff_t *f, int8_t *data, uint32_t size);
-uint64_t mp4ff_read_int64(mp4ff_t *f);
-uint32_t mp4ff_read_int32(mp4ff_t *f);
-uint32_t mp4ff_read_int24(mp4ff_t *f);
-uint16_t mp4ff_read_int16(mp4ff_t *f);
-uint8_t mp4ff_read_char(mp4ff_t *f);
-int32_t mp4ff_write_int32(mp4ff_t *f,const uint32_t data);
-uint32_t mp4ff_read_mp4_descr_length(mp4ff_t *f);
-int64_t mp4ff_position(const mp4ff_t *f);
-int32_t mp4ff_set_position(mp4ff_t *f, const int64_t position);
-int32_t mp4ff_truncate(mp4ff_t * f);
-char * mp4ff_read_string(mp4ff_t * f,uint32_t length);
-
-/* mp4atom.c */
-static int32_t mp4ff_atom_get_size(const int8_t *data);
-static int32_t mp4ff_atom_compare(const int8_t a1, const int8_t b1, const int8_t c1, const int8_t d1,
-                                  const int8_t a2, const int8_t b2, const int8_t c2, const int8_t d2);
-static uint8_t mp4ff_atom_name_to_type(const int8_t a, const int8_t b, const int8_t c, const int8_t d);
-uint64_t mp4ff_atom_read_header(mp4ff_t *f, uint8_t *atom_type, uint8_t *header_size);
-static int32_t mp4ff_read_stsz(mp4ff_t *f);
-static int32_t mp4ff_read_esds(mp4ff_t *f);
-static int32_t mp4ff_read_mp4a(mp4ff_t *f);
-static int32_t mp4ff_read_stsd(mp4ff_t *f);
-static int32_t mp4ff_read_stsc(mp4ff_t *f);
-static int32_t mp4ff_read_stco(mp4ff_t *f);
-static int32_t mp4ff_read_stts(mp4ff_t *f);
-#ifdef USE_TAGGING
-static int32_t mp4ff_read_meta(mp4ff_t *f, const uint64_t size);
-#endif
-int32_t mp4ff_atom_read(mp4ff_t *f, const int32_t size, const uint8_t atom_type);
-
-/* mp4sample.c */
-static int32_t mp4ff_chunk_of_sample(const mp4ff_t *f, const int32_t track, const int32_t sample,
-                                     int32_t *chunk_sample, int32_t *chunk);
-static int32_t mp4ff_chunk_to_offset(const mp4ff_t *f, const int32_t track, const int32_t chunk);
-static int32_t mp4ff_sample_range_size(const mp4ff_t *f, const int32_t track,
-                                       const int32_t chunk_sample, const int32_t sample);
-static int32_t mp4ff_sample_to_offset(const mp4ff_t *f, const int32_t track, const int32_t sample);
-int32_t mp4ff_audio_frame_size(const mp4ff_t *f, const int32_t track, const int32_t sample);
-int32_t mp4ff_set_sample_position(mp4ff_t *f, const int32_t track, const int32_t sample);
-
-#ifdef USE_TAGGING
-/* mp4meta.c */
-static int32_t mp4ff_tag_add_field(mp4ff_metadata_t *tags, const char *item, const char *value);
-static int32_t mp4ff_tag_set_field(mp4ff_metadata_t *tags, const char *item, const char *value);
-static int32_t mp4ff_set_metadata_name(mp4ff_t *f, const uint8_t atom_type, char **name);
-static int32_t mp4ff_parse_tag(mp4ff_t *f, const uint8_t parent_atom_type, const int32_t size);
-static int32_t mp4ff_meta_find_by_name(const mp4ff_t *f, const char *item, char **value);
-int32_t mp4ff_parse_metadata(mp4ff_t *f, const int32_t size);
-int32_t mp4ff_tag_delete(mp4ff_metadata_t *tags);
-int32_t mp4ff_meta_get_num_items(const mp4ff_t *f);
-int32_t mp4ff_meta_get_by_index(const mp4ff_t *f, uint32_t index,
-                            char **item, char **value);
-int32_t mp4ff_meta_get_title(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_artist(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_writer(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_album(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_date(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_tool(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_comment(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_genre(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_track(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_disc(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_compilation(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_tempo(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_coverart(const mp4ff_t *f, char **value);
-#endif
-
-/* mp4ff.c */
-mp4ff_t *mp4ff_open_read(mp4ff_callback_t *f);
-#ifdef USE_TAGGING
-mp4ff_t *mp4ff_open_edit(mp4ff_callback_t *f);
-#endif
-void mp4ff_close(mp4ff_t *ff);
-//void mp4ff_track_add(mp4ff_t *f);
-int32_t parse_sub_atoms(mp4ff_t *f, const uint64_t total_size,int meta_only);
-int32_t parse_atoms(mp4ff_t *f,int meta_only);
-
-int32_t mp4ff_get_sample_duration(const mp4ff_t *f, const int32_t track, const int32_t sample);
-int64_t mp4ff_get_sample_position(const mp4ff_t *f, const int32_t track, const int32_t sample);
-int32_t mp4ff_get_sample_offset(const mp4ff_t *f, const int32_t track, const int32_t sample);
-int32_t mp4ff_find_sample(const mp4ff_t *f, const int32_t track, const int64_t offset,int32_t * toskip);
-
-int32_t mp4ff_read_sample(mp4ff_t *f, const int32_t track, const int32_t sample,
-                          uint8_t **audio_buffer,  uint32_t *bytes);
-int32_t mp4ff_get_decoder_config(const mp4ff_t *f, const int32_t track,
-                                 uint8_t** ppBuf, uint32_t* pBufSize);
-int32_t mp4ff_total_tracks(const mp4ff_t *f);
-int32_t mp4ff_time_scale(const mp4ff_t *f, const int32_t track);
-int32_t mp4ff_num_samples(const mp4ff_t *f, const int32_t track);
-
-uint32_t mp4ff_meta_genre_to_index(const char * genrestr);//returns 1-based index, 0 if not found
-const char * mp4ff_meta_index_to_genre(uint32_t idx);//returns pointer to static string
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
diff --git a/lib-x86-64/include/neaacdec.h b/lib-x86-64/include/neaacdec.h
deleted file mode 100644
index a45f1d09..00000000
--- a/lib-x86-64/include/neaacdec.h
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
-** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
-** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com
-**  
-** 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 of the License, 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.
-**
-** Any non-GPL usage of this software or parts of this software is strictly
-** forbidden.
-**
-** The "appropriate copyright message" mentioned in section 2c of the GPLv2
-** must read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
-**
-** Commercial non-GPL licensing of this software is possible.
-** For more info contact Nero AG through Mpeg4AAClicense@nero.com.
-**
-** $Id: neaacdec.h,v 1.13 2009/01/26 23:51:15 menno Exp $
-**/
-
-#ifndef __NEAACDEC_H__
-#define __NEAACDEC_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-#if 1
-/* MACROS FOR BACKWARDS COMPATIBILITY */
-/* structs */
-#define faacDecHandle                  NeAACDecHandle
-#define faacDecConfiguration           NeAACDecConfiguration
-#define faacDecConfigurationPtr        NeAACDecConfigurationPtr
-#define faacDecFrameInfo               NeAACDecFrameInfo
-/* functions */
-#define faacDecGetErrorMessage         NeAACDecGetErrorMessage
-#define faacDecSetConfiguration        NeAACDecSetConfiguration
-#define faacDecGetCurrentConfiguration NeAACDecGetCurrentConfiguration
-#define faacDecInit                    NeAACDecInit
-#define faacDecInit2                   NeAACDecInit2
-#define faacDecInitDRM                 NeAACDecInitDRM
-#define faacDecPostSeekReset           NeAACDecPostSeekReset
-#define faacDecOpen                    NeAACDecOpen
-#define faacDecClose                   NeAACDecClose
-#define faacDecDecode                  NeAACDecDecode
-#define AudioSpecificConfig            NeAACDecAudioSpecificConfig
-#endif
-
-
-#ifdef _WIN32
-  #pragma pack(push, 8)
-  #ifndef NEAACDECAPI
-    #define NEAACDECAPI __cdecl
-  #endif
-#else
-  #ifndef NEAACDECAPI
-    #define NEAACDECAPI
-  #endif
-#endif
-
-#define FAAD2_VERSION "2.7"
-
-/* object types for AAC */
-#define MAIN       1
-#define LC         2
-#define SSR        3
-#define LTP        4
-#define HE_AAC     5
-#define ER_LC     17
-#define ER_LTP    19
-#define LD        23
-#define DRM_ER_LC 27 /* special object type for DRM */
-
-/* header types */
-#define RAW        0
-#define ADIF       1
-#define ADTS       2
-#define LATM       3
-
-/* SBR signalling */
-#define NO_SBR           0
-#define SBR_UPSAMPLED    1
-#define SBR_DOWNSAMPLED  2
-#define NO_SBR_UPSAMPLED 3
-
-/* library output formats */
-#define FAAD_FMT_16BIT  1
-#define FAAD_FMT_24BIT  2
-#define FAAD_FMT_32BIT  3
-#define FAAD_FMT_FLOAT  4
-#define FAAD_FMT_FIXED  FAAD_FMT_FLOAT
-#define FAAD_FMT_DOUBLE 5
-
-/* Capabilities */
-#define LC_DEC_CAP           (1<<0) /* Can decode LC */
-#define MAIN_DEC_CAP         (1<<1) /* Can decode MAIN */
-#define LTP_DEC_CAP          (1<<2) /* Can decode LTP */
-#define LD_DEC_CAP           (1<<3) /* Can decode LD */
-#define ERROR_RESILIENCE_CAP (1<<4) /* Can decode ER */
-#define FIXED_POINT_CAP      (1<<5) /* Fixed point */
-
-/* Channel definitions */
-#define FRONT_CHANNEL_CENTER (1)
-#define FRONT_CHANNEL_LEFT   (2)
-#define FRONT_CHANNEL_RIGHT  (3)
-#define SIDE_CHANNEL_LEFT    (4)
-#define SIDE_CHANNEL_RIGHT   (5)
-#define BACK_CHANNEL_LEFT    (6)
-#define BACK_CHANNEL_RIGHT   (7)
-#define BACK_CHANNEL_CENTER  (8)
-#define LFE_CHANNEL          (9)
-#define UNKNOWN_CHANNEL      (0)
-
-/* DRM channel definitions */
-#define DRMCH_MONO          1
-#define DRMCH_STEREO        2
-#define DRMCH_SBR_MONO      3
-#define DRMCH_SBR_STEREO    4
-#define DRMCH_SBR_PS_STEREO 5
-
-
-/* A decode call can eat up to FAAD_MIN_STREAMSIZE bytes per decoded channel,
-   so at least so much bytes per channel should be available in this stream */
-#define FAAD_MIN_STREAMSIZE 768 /* 6144 bits/channel */
-
-
-typedef void *NeAACDecHandle;
-
-typedef struct mp4AudioSpecificConfig
-{
-    /* Audio Specific Info */
-    unsigned char objectTypeIndex;
-    unsigned char samplingFrequencyIndex;
-    unsigned long samplingFrequency;
-    unsigned char channelsConfiguration;
-
-    /* GA Specific Info */
-    unsigned char frameLengthFlag;
-    unsigned char dependsOnCoreCoder;
-    unsigned short coreCoderDelay;
-    unsigned char extensionFlag;
-    unsigned char aacSectionDataResilienceFlag;
-    unsigned char aacScalefactorDataResilienceFlag;
-    unsigned char aacSpectralDataResilienceFlag;
-    unsigned char epConfig;
-
-    char sbr_present_flag;
-    char forceUpSampling;
-    char downSampledSBR;
-} mp4AudioSpecificConfig;
-
-typedef struct NeAACDecConfiguration
-{
-    unsigned char defObjectType;
-    unsigned long defSampleRate;
-    unsigned char outputFormat;
-    unsigned char downMatrix;
-    unsigned char useOldADTSFormat;
-    unsigned char dontUpSampleImplicitSBR;
-} NeAACDecConfiguration, *NeAACDecConfigurationPtr;
-
-typedef struct NeAACDecFrameInfo
-{
-    unsigned long bytesconsumed;
-    unsigned long samples;
-    unsigned char channels;
-    unsigned char error;
-    unsigned long samplerate;
-
-    /* SBR: 0: off, 1: on; upsample, 2: on; downsampled, 3: off; upsampled */
-    unsigned char sbr;
-
-    /* MPEG-4 ObjectType */
-    unsigned char object_type;
-
-    /* AAC header type; MP4 will be signalled as RAW also */
-    unsigned char header_type;
-
-    /* multichannel configuration */
-    unsigned char num_front_channels;
-    unsigned char num_side_channels;
-    unsigned char num_back_channels;
-    unsigned char num_lfe_channels;
-    unsigned char channel_position[64];
-
-    /* PS: 0: off, 1: on */
-    unsigned char ps;
-} NeAACDecFrameInfo;
-
-char* NEAACDECAPI NeAACDecGetErrorMessage(unsigned char errcode);
-
-unsigned long NEAACDECAPI NeAACDecGetCapabilities(void);
-
-NeAACDecHandle NEAACDECAPI NeAACDecOpen(void);
-
-NeAACDecConfigurationPtr NEAACDECAPI NeAACDecGetCurrentConfiguration(NeAACDecHandle hDecoder);
-
-unsigned char NEAACDECAPI NeAACDecSetConfiguration(NeAACDecHandle hDecoder,
-                                                   NeAACDecConfigurationPtr config);
-
-/* Init the library based on info from the AAC file (ADTS/ADIF) */
-long NEAACDECAPI NeAACDecInit(NeAACDecHandle hDecoder,
-                              unsigned char *buffer,
-                              unsigned long buffer_size,
-                              unsigned long *samplerate,
-                              unsigned char *channels);
-
-/* Init the library using a DecoderSpecificInfo */
-char NEAACDECAPI NeAACDecInit2(NeAACDecHandle hDecoder,
-                               unsigned char *pBuffer,
-                               unsigned long SizeOfDecoderSpecificInfo,
-                               unsigned long *samplerate,
-                               unsigned char *channels);
-
-/* Init the library for DRM */
-char NEAACDECAPI NeAACDecInitDRM(NeAACDecHandle *hDecoder, unsigned long samplerate,
-                                 unsigned char channels);
-
-void NEAACDECAPI NeAACDecPostSeekReset(NeAACDecHandle hDecoder, long frame);
-
-void NEAACDECAPI NeAACDecClose(NeAACDecHandle hDecoder);
-
-void* NEAACDECAPI NeAACDecDecode(NeAACDecHandle hDecoder,
-                                 NeAACDecFrameInfo *hInfo,
-                                 unsigned char *buffer,
-                                 unsigned long buffer_size);
-
-void* NEAACDECAPI NeAACDecDecode2(NeAACDecHandle hDecoder,
-                                  NeAACDecFrameInfo *hInfo,
-                                  unsigned char *buffer,
-                                  unsigned long buffer_size,
-                                  void **sample_buffer,
-                                  unsigned long sample_buffer_size);
-
-char NEAACDECAPI NeAACDecAudioSpecificConfig(unsigned char *pBuffer,
-                                             unsigned long buffer_size,
-                                             mp4AudioSpecificConfig *mp4ASC);
-
-#ifdef _WIN32
-  #pragma pack(pop)
-#endif
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
diff --git a/lib-x86-64/include/ogg/config_types.h b/lib-x86-64/include/ogg/config_types.h
deleted file mode 100644
index 496e900f..00000000
--- a/lib-x86-64/include/ogg/config_types.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef __CONFIG_TYPES_H__
-#define __CONFIG_TYPES_H__
-
-/* these are filled in by configure */
-typedef int16_t ogg_int16_t;
-typedef u_int16_t ogg_uint16_t;
-typedef int32_t ogg_int32_t;
-typedef u_int32_t ogg_uint32_t;
-typedef int64_t ogg_int64_t;
-
-#endif
diff --git a/lib-x86-64/include/ogg/ogg.h b/lib-x86-64/include/ogg/ogg.h
deleted file mode 100644
index ae0cfd53..00000000
--- a/lib-x86-64/include/ogg/ogg.h
+++ /dev/null
@@ -1,208 +0,0 @@
-/********************************************************************
- *                                                                  *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
- *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
- *                                                                  *
- ********************************************************************
-
- function: toplevel libogg include
- last mod: $Id: ogg.h 16051 2009-05-27 05:00:06Z xiphmont $
-
- ********************************************************************/
-#ifndef _OGG_H
-#define _OGG_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stddef.h>
-#include <ogg/os_types.h>
-
-typedef struct {
-  void *iov_base;
-  size_t iov_len;
-} ogg_iovec_t;
-
-typedef struct {
-  long endbyte;
-  int  endbit;
-
-  unsigned char *buffer;
-  unsigned char *ptr;
-  long storage;
-} oggpack_buffer;
-
-/* ogg_page is used to encapsulate the data in one Ogg bitstream page *****/
-
-typedef struct {
-  unsigned char *header;
-  long header_len;
-  unsigned char *body;
-  long body_len;
-} ogg_page;
-
-/* ogg_stream_state contains the current encode/decode state of a logical
-   Ogg bitstream **********************************************************/
-
-typedef struct {
-  unsigned char   *body_data;    /* bytes from packet bodies */
-  long    body_storage;          /* storage elements allocated */
-  long    body_fill;             /* elements stored; fill mark */
-  long    body_returned;         /* elements of fill returned */
-
-
-  int     *lacing_vals;      /* The values that will go to the segment table */
-  ogg_int64_t *granule_vals; /* granulepos values for headers. Not compact
-                                this way, but it is simple coupled to the
-                                lacing fifo */
-  long    lacing_storage;
-  long    lacing_fill;
-  long    lacing_packet;
-  long    lacing_returned;
-
-  unsigned char    header[282];      /* working space for header encode */
-  int              header_fill;
-
-  int     e_o_s;          /* set when we have buffered the last packet in the
-                             logical bitstream */
-  int     b_o_s;          /* set after we've written the initial page
-                             of a logical bitstream */
-  long    serialno;
-  long    pageno;
-  ogg_int64_t  packetno;  /* sequence number for decode; the framing
-                             knows where there's a hole in the data,
-                             but we need coupling so that the codec
-                             (which is in a seperate abstraction
-                             layer) also knows about the gap */
-  ogg_int64_t   granulepos;
-
-} ogg_stream_state;
-
-/* ogg_packet is used to encapsulate the data and metadata belonging
-   to a single raw Ogg/Vorbis packet *************************************/
-
-typedef struct {
-  unsigned char *packet;
-  long  bytes;
-  long  b_o_s;
-  long  e_o_s;
-
-  ogg_int64_t  granulepos;
-
-  ogg_int64_t  packetno;     /* sequence number for decode; the framing
-                                knows where there's a hole in the data,
-                                but we need coupling so that the codec
-                                (which is in a seperate abstraction
-                                layer) also knows about the gap */
-} ogg_packet;
-
-typedef struct {
-  unsigned char *data;
-  int storage;
-  int fill;
-  int returned;
-
-  int unsynced;
-  int headerbytes;
-  int bodybytes;
-} ogg_sync_state;
-
-/* Ogg BITSTREAM PRIMITIVES: bitstream ************************/
-
-extern void  oggpack_writeinit(oggpack_buffer *b);
-extern int   oggpack_writecheck(oggpack_buffer *b);
-extern void  oggpack_writetrunc(oggpack_buffer *b,long bits);
-extern void  oggpack_writealign(oggpack_buffer *b);
-extern void  oggpack_writecopy(oggpack_buffer *b,void *source,long bits);
-extern void  oggpack_reset(oggpack_buffer *b);
-extern void  oggpack_writeclear(oggpack_buffer *b);
-extern void  oggpack_readinit(oggpack_buffer *b,unsigned char *buf,int bytes);
-extern void  oggpack_write(oggpack_buffer *b,unsigned long value,int bits);
-extern long  oggpack_look(oggpack_buffer *b,int bits);
-extern long  oggpack_look1(oggpack_buffer *b);
-extern void  oggpack_adv(oggpack_buffer *b,int bits);
-extern void  oggpack_adv1(oggpack_buffer *b);
-extern long  oggpack_read(oggpack_buffer *b,int bits);
-extern long  oggpack_read1(oggpack_buffer *b);
-extern long  oggpack_bytes(oggpack_buffer *b);
-extern long  oggpack_bits(oggpack_buffer *b);
-extern unsigned char *oggpack_get_buffer(oggpack_buffer *b);
-
-extern void  oggpackB_writeinit(oggpack_buffer *b);
-extern int   oggpackB_writecheck(oggpack_buffer *b);
-extern void  oggpackB_writetrunc(oggpack_buffer *b,long bits);
-extern void  oggpackB_writealign(oggpack_buffer *b);
-extern void  oggpackB_writecopy(oggpack_buffer *b,void *source,long bits);
-extern void  oggpackB_reset(oggpack_buffer *b);
-extern void  oggpackB_writeclear(oggpack_buffer *b);
-extern void  oggpackB_readinit(oggpack_buffer *b,unsigned char *buf,int bytes);
-extern void  oggpackB_write(oggpack_buffer *b,unsigned long value,int bits);
-extern long  oggpackB_look(oggpack_buffer *b,int bits);
-extern long  oggpackB_look1(oggpack_buffer *b);
-extern void  oggpackB_adv(oggpack_buffer *b,int bits);
-extern void  oggpackB_adv1(oggpack_buffer *b);
-extern long  oggpackB_read(oggpack_buffer *b,int bits);
-extern long  oggpackB_read1(oggpack_buffer *b);
-extern long  oggpackB_bytes(oggpack_buffer *b);
-extern long  oggpackB_bits(oggpack_buffer *b);
-extern unsigned char *oggpackB_get_buffer(oggpack_buffer *b);
-
-/* Ogg BITSTREAM PRIMITIVES: encoding **************************/
-
-extern int      ogg_stream_packetin(ogg_stream_state *os, ogg_packet *op);
-extern int      ogg_stream_iovecin(ogg_stream_state *os, ogg_iovec_t *iov,
-                                   int count, long e_o_s, ogg_int64_t granulepos);
-extern int      ogg_stream_pageout(ogg_stream_state *os, ogg_page *og);
-extern int      ogg_stream_flush(ogg_stream_state *os, ogg_page *og);
-
-/* Ogg BITSTREAM PRIMITIVES: decoding **************************/
-
-extern int      ogg_sync_init(ogg_sync_state *oy);
-extern int      ogg_sync_clear(ogg_sync_state *oy);
-extern int      ogg_sync_reset(ogg_sync_state *oy);
-extern int      ogg_sync_destroy(ogg_sync_state *oy);
-extern int      ogg_sync_check(ogg_sync_state *oy);
-
-extern char    *ogg_sync_buffer(ogg_sync_state *oy, long size);
-extern int      ogg_sync_wrote(ogg_sync_state *oy, long bytes);
-extern long     ogg_sync_pageseek(ogg_sync_state *oy,ogg_page *og);
-extern int      ogg_sync_pageout(ogg_sync_state *oy, ogg_page *og);
-extern int      ogg_stream_pagein(ogg_stream_state *os, ogg_page *og);
-extern int      ogg_stream_packetout(ogg_stream_state *os,ogg_packet *op);
-extern int      ogg_stream_packetpeek(ogg_stream_state *os,ogg_packet *op);
-
-/* Ogg BITSTREAM PRIMITIVES: general ***************************/
-
-extern int      ogg_stream_init(ogg_stream_state *os,int serialno);
-extern int      ogg_stream_clear(ogg_stream_state *os);
-extern int      ogg_stream_reset(ogg_stream_state *os);
-extern int      ogg_stream_reset_serialno(ogg_stream_state *os,int serialno);
-extern int      ogg_stream_destroy(ogg_stream_state *os);
-extern int      ogg_stream_check(ogg_stream_state *os);
-extern int      ogg_stream_eos(ogg_stream_state *os);
-
-extern void     ogg_page_checksum_set(ogg_page *og);
-
-extern int      ogg_page_version(const ogg_page *og);
-extern int      ogg_page_continued(const ogg_page *og);
-extern int      ogg_page_bos(const ogg_page *og);
-extern int      ogg_page_eos(const ogg_page *og);
-extern ogg_int64_t  ogg_page_granulepos(const ogg_page *og);
-extern int      ogg_page_serialno(const ogg_page *og);
-extern long     ogg_page_pageno(const ogg_page *og);
-extern int      ogg_page_packets(const ogg_page *og);
-
-extern void     ogg_packet_clear(ogg_packet *op);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* _OGG_H */
diff --git a/lib-x86-64/include/ogg/os_types.h b/lib-x86-64/include/ogg/os_types.h
deleted file mode 100644
index f6f8b381..00000000
--- a/lib-x86-64/include/ogg/os_types.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/********************************************************************
- *                                                                  *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
- *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2002             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
- *                                                                  *
- ********************************************************************
-
- function: #ifdef jail to whip a few platforms into the UNIX ideal.
- last mod: $Id: os_types.h 16649 2009-10-25 00:49:58Z ds $
-
- ********************************************************************/
-#ifndef _OS_TYPES_H
-#define _OS_TYPES_H
-
-/* make it easy on the folks that want to compile the libs with a
-   different malloc than stdlib */
-#define _ogg_malloc  malloc
-#define _ogg_calloc  calloc
-#define _ogg_realloc realloc
-#define _ogg_free    free
-
-#if defined(_WIN32) 
-
-#  if defined(__CYGWIN__)
-#    include <stdint.h>
-     typedef int16_t ogg_int16_t;
-     typedef uint16_t ogg_uint16_t;
-     typedef int32_t ogg_int32_t;
-     typedef uint32_t ogg_uint32_t;
-     typedef int64_t ogg_int64_t;
-     typedef uint64_t ogg_uint64_t;
-#  elif defined(__MINGW32__)
-#    include <sys/types.h>
-     typedef short ogg_int16_t;
-     typedef unsigned short ogg_uint16_t;
-     typedef int ogg_int32_t;
-     typedef unsigned int ogg_uint32_t;
-     typedef long long ogg_int64_t;
-     typedef unsigned long long ogg_uint64_t;
-#  elif defined(__MWERKS__)
-     typedef long long ogg_int64_t;
-     typedef int ogg_int32_t;
-     typedef unsigned int ogg_uint32_t;
-     typedef short ogg_int16_t;
-     typedef unsigned short ogg_uint16_t;
-#  else
-     /* MSVC/Borland */
-     typedef __int64 ogg_int64_t;
-     typedef __int32 ogg_int32_t;
-     typedef unsigned __int32 ogg_uint32_t;
-     typedef __int16 ogg_int16_t;
-     typedef unsigned __int16 ogg_uint16_t;
-#  endif
-
-#elif defined(__MACOS__)
-
-#  include <sys/types.h>
-   typedef SInt16 ogg_int16_t;
-   typedef UInt16 ogg_uint16_t;
-   typedef SInt32 ogg_int32_t;
-   typedef UInt32 ogg_uint32_t;
-   typedef SInt64 ogg_int64_t;
-
-#elif (defined(__APPLE__) && defined(__MACH__)) /* MacOS X Framework build */
-
-#  include <sys/types.h>
-   typedef int16_t ogg_int16_t;
-   typedef u_int16_t ogg_uint16_t;
-   typedef int32_t ogg_int32_t;
-   typedef u_int32_t ogg_uint32_t;
-   typedef int64_t ogg_int64_t;
-
-#elif defined(__HAIKU__)
-
-  /* Haiku */
-#  include <sys/types.h>
-   typedef short ogg_int16_t;
-   typedef unsigned short ogg_uint16_t;
-   typedef int ogg_int32_t;
-   typedef unsigned int ogg_uint32_t;
-   typedef long long ogg_int64_t;
-
-#elif defined(__BEOS__)
-
-   /* Be */
-#  include <inttypes.h>
-   typedef int16_t ogg_int16_t;
-   typedef u_int16_t ogg_uint16_t;
-   typedef int32_t ogg_int32_t;
-   typedef u_int32_t ogg_uint32_t;
-   typedef int64_t ogg_int64_t;
-
-#elif defined (__EMX__)
-
-   /* OS/2 GCC */
-   typedef short ogg_int16_t;
-   typedef unsigned short ogg_uint16_t;
-   typedef int ogg_int32_t;
-   typedef unsigned int ogg_uint32_t;
-   typedef long long ogg_int64_t;
-
-#elif defined (DJGPP)
-
-   /* DJGPP */
-   typedef short ogg_int16_t;
-   typedef int ogg_int32_t;
-   typedef unsigned int ogg_uint32_t;
-   typedef long long ogg_int64_t;
-
-#elif defined(R5900)
-
-   /* PS2 EE */
-   typedef long ogg_int64_t;
-   typedef int ogg_int32_t;
-   typedef unsigned ogg_uint32_t;
-   typedef short ogg_int16_t;
-
-#elif defined(__SYMBIAN32__)
-
-   /* Symbian GCC */
-   typedef signed short ogg_int16_t;
-   typedef unsigned short ogg_uint16_t;
-   typedef signed int ogg_int32_t;
-   typedef unsigned int ogg_uint32_t;
-   typedef long long int ogg_int64_t;
-
-#elif defined(__TMS320C6X__)
-
-   /* TI C64x compiler */
-   typedef signed short ogg_int16_t;
-   typedef unsigned short ogg_uint16_t;
-   typedef signed int ogg_int32_t;
-   typedef unsigned int ogg_uint32_t;
-   typedef long long int ogg_int64_t;
-
-#else
-
-#  include <sys/types.h>
-#  include <ogg/config_types.h>
-
-#endif
-
-#endif  /* _OS_TYPES_H */
diff --git a/lib-x86-64/include/opencore-amrnb/interf_dec.h b/lib-x86-64/include/opencore-amrnb/interf_dec.h
deleted file mode 100644
index 98051f40..00000000
--- a/lib-x86-64/include/opencore-amrnb/interf_dec.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* ------------------------------------------------------------------
- * Copyright (C) 2009 Martin Storsjo
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- * -------------------------------------------------------------------
- */
-
-#ifndef OPENCORE_AMRNB_INTERF_DEC_H
-#define OPENCORE_AMRNB_INTERF_DEC_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void* Decoder_Interface_init(void);
-void Decoder_Interface_exit(void* state);
-void Decoder_Interface_Decode(void* state, const unsigned char* in, short* out, int bfi);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib-x86-64/include/opencore-amrnb/interf_enc.h b/lib-x86-64/include/opencore-amrnb/interf_enc.h
deleted file mode 100644
index b89b0c7c..00000000
--- a/lib-x86-64/include/opencore-amrnb/interf_enc.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* ------------------------------------------------------------------
- * Copyright (C) 2009 Martin Storsjo
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- * -------------------------------------------------------------------
- */
-
-#ifndef OPENCORE_AMRNB_INTERF_ENC_H
-#define OPENCORE_AMRNB_INTERF_ENC_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef AMRNB_WRAPPER_INTERNAL
-/* Copied from enc/src/gsmamr_enc.h */
-enum Mode {
-	MR475 = 0,/* 4.75 kbps */
-	MR515,    /* 5.15 kbps */
-	MR59,     /* 5.90 kbps */
-	MR67,     /* 6.70 kbps */
-	MR74,     /* 7.40 kbps */
-	MR795,    /* 7.95 kbps */
-	MR102,    /* 10.2 kbps */
-	MR122,    /* 12.2 kbps */
-	MRDTX,    /* DTX       */
-	N_MODES   /* Not Used  */
-};
-#endif
-
-void* Encoder_Interface_init(int dtx);
-void Encoder_Interface_exit(void* state);
-int Encoder_Interface_Encode(void* state, enum Mode mode, const short* speech, unsigned char* out, int forceSpeech);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib-x86-64/include/opencore-amrwb/dec_if.h b/lib-x86-64/include/opencore-amrwb/dec_if.h
deleted file mode 100644
index 56acdaaf..00000000
--- a/lib-x86-64/include/opencore-amrwb/dec_if.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* ------------------------------------------------------------------
- * Copyright (C) 2009 Martin Storsjo
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- * -------------------------------------------------------------------
- */
-
-#ifndef OPENCORE_AMRWB_DEC_IF_H
-#define OPENCORE_AMRWB_DEC_IF_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define _good_frame 0
-
-void* D_IF_init(void);
-void D_IF_decode(void* state, const unsigned char* bits, short* synth, int bfi);
-void D_IF_exit(void* state);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib-x86-64/include/opencore-amrwb/if_rom.h b/lib-x86-64/include/opencore-amrwb/if_rom.h
deleted file mode 100644
index 8977e03a..00000000
--- a/lib-x86-64/include/opencore-amrwb/if_rom.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* ------------------------------------------------------------------
- * Copyright (C) 2009 Martin Storsjo
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- * -------------------------------------------------------------------
- */
-
-#ifndef OPENCORE_AMRWB_IF_ROM_H
-#define OPENCORE_AMRWB_IF_ROM_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-typedef int16_t Word16;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib-x86-64/include/png.h b/lib-x86-64/include/png.h
deleted file mode 120000
index 3cb4fc96..00000000
--- a/lib-x86-64/include/png.h
+++ /dev/null
@@ -1 +0,0 @@
-libpng15/png.h
\ No newline at end of file
diff --git a/lib-x86-64/include/pngconf.h b/lib-x86-64/include/pngconf.h
deleted file mode 120000
index 09bc4a09..00000000
--- a/lib-x86-64/include/pngconf.h
+++ /dev/null
@@ -1 +0,0 @@
-libpng15/pngconf.h
\ No newline at end of file
diff --git a/lib-x86-64/include/pnglibconf.h b/lib-x86-64/include/pnglibconf.h
deleted file mode 120000
index 547f001f..00000000
--- a/lib-x86-64/include/pnglibconf.h
+++ /dev/null
@@ -1 +0,0 @@
-libpng15/pnglibconf.h
\ No newline at end of file
diff --git a/lib-x86-64/include/samplerate.h b/lib-x86-64/include/samplerate.h
deleted file mode 100644
index 9651e635..00000000
--- a/lib-x86-64/include/samplerate.h
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
-** Copyright (C) 2002-2008 Erik de Castro Lopo <erikd@mega-nerd.com>
-**
-** 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 of the License, 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.
-*/
-
-/*
-** This code is part of Secret Rabibt Code aka libsamplerate. A commercial
-** use license for this code is available, please see:
-**		http://www.mega-nerd.com/SRC/procedure.html
-*/
-
-/*
-** API documentation is available here:
-**     http://www.mega-nerd.com/SRC/api.html
-*/
-
-#ifndef SAMPLERATE_H
-#define SAMPLERATE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif	/* __cplusplus */
-
-
-/* Opaque data type SRC_STATE. */
-typedef struct SRC_STATE_tag SRC_STATE ;
-
-/* SRC_DATA is used to pass data to src_simple() and src_process(). */
-typedef struct
-{	float	*data_in, *data_out ;
-
-	long	input_frames, output_frames ;
-	long	input_frames_used, output_frames_gen ;
-
-	int		end_of_input ;
-
-	double	src_ratio ;
-} SRC_DATA ;
-
-/* SRC_CB_DATA is used with callback based API. */
-typedef struct
-{	long	frames ;
-	float	*data_in ;
-} SRC_CB_DATA ;
-
-/*
-** User supplied callback function type for use with src_callback_new()
-** and src_callback_read(). First parameter is the same pointer that was
-** passed into src_callback_new(). Second parameter is pointer to a
-** pointer. The user supplied callback function must modify *data to
-** point to the start of the user supplied float array. The user supplied
-** function must return the number of frames that **data points to.
-*/
-
-typedef long (*src_callback_t) (void *cb_data, float **data) ;
-
-/*
-**	Standard initialisation function : return an anonymous pointer to the
-**	internal state of the converter. Choose a converter from the enums below.
-**	Error returned in *error.
-*/
-
-SRC_STATE* src_new (int converter_type, int channels, int *error) ;
-
-/*
-**	Initilisation for callback based API : return an anonymous pointer to the
-**	internal state of the converter. Choose a converter from the enums below.
-**	The cb_data pointer can point to any data or be set to NULL. Whatever the
-**	value, when processing, user supplied function "func" gets called with
-**	cb_data as first parameter.
-*/
-
-SRC_STATE* src_callback_new (src_callback_t func, int converter_type, int channels,
-				int *error, void* cb_data) ;
-
-/*
-**	Cleanup all internal allocations.
-**	Always returns NULL.
-*/
-
-SRC_STATE* src_delete (SRC_STATE *state) ;
-
-/*
-**	Standard processing function.
-**	Returns non zero on error.
-*/
-
-int src_process (SRC_STATE *state, SRC_DATA *data) ;
-
-/*
-**	Callback based processing function. Read up to frames worth of data from
-**	the converter int *data and return frames read or -1 on error.
-*/
-long src_callback_read (SRC_STATE *state, double src_ratio, long frames, float *data) ;
-
-/*
-**	Simple interface for performing a single conversion from input buffer to
-**	output buffer at a fixed conversion ratio.
-**	Simple interface does not require initialisation as it can only operate on
-**	a single buffer worth of audio.
-*/
-
-int src_simple (SRC_DATA *data, int converter_type, int channels) ;
-
-/*
-** This library contains a number of different sample rate converters,
-** numbered 0 through N.
-**
-** Return a string giving either a name or a more full description of each
-** sample rate converter or NULL if no sample rate converter exists for
-** the given value. The converters are sequentially numbered from 0 to N.
-*/
-
-const char *src_get_name (int converter_type) ;
-const char *src_get_description (int converter_type) ;
-const char *src_get_version (void) ;
-
-/*
-**	Set a new SRC ratio. This allows step responses
-**	in the conversion ratio.
-**	Returns non zero on error.
-*/
-
-int src_set_ratio (SRC_STATE *state, double new_ratio) ;
-
-/*
-**	Reset the internal SRC state.
-**	Does not modify the quality settings.
-**	Does not free any memory allocations.
-**	Returns non zero on error.
-*/
-
-int src_reset (SRC_STATE *state) ;
-
-/*
-** Return TRUE if ratio is a valid conversion ratio, FALSE
-** otherwise.
-*/
-
-int src_is_valid_ratio (double ratio) ;
-
-/*
-**	Return an error number.
-*/
-
-int src_error (SRC_STATE *state) ;
-
-/*
-**	Convert the error number into a string.
-*/
-const char* src_strerror (int error) ;
-
-/*
-** The following enums can be used to set the interpolator type
-** using the function src_set_converter().
-*/
-
-enum
-{
-	SRC_SINC_BEST_QUALITY		= 0,
-	SRC_SINC_MEDIUM_QUALITY		= 1,
-	SRC_SINC_FASTEST			= 2,
-	SRC_ZERO_ORDER_HOLD			= 3,
-	SRC_LINEAR					= 4,
-} ;
-
-/*
-** Extra helper functions for converting from short to float and
-** back again.
-*/
-
-void src_short_to_float_array (const short *in, float *out, int len) ;
-void src_float_to_short_array (const float *in, short *out, int len) ;
-
-void src_int_to_float_array (const int *in, float *out, int len) ;
-void src_float_to_int_array (const float *in, int *out, int len) ;
-
-
-#ifdef __cplusplus
-}		/* extern "C" */
-#endif	/* __cplusplus */
-
-#endif	/* SAMPLERATE_H */
-
diff --git a/lib-x86-64/include/sndfile.h b/lib-x86-64/include/sndfile.h
deleted file mode 100644
index 943d5099..00000000
--- a/lib-x86-64/include/sndfile.h
+++ /dev/null
@@ -1,665 +0,0 @@
-/*
-** Copyright (C) 1999-2010 Erik de Castro Lopo <erikd@mega-nerd.com>
-**
-** 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.1 of the License, 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 Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser 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.
-*/
-
-/*
-** sndfile.h -- system-wide definitions
-**
-** API documentation is in the doc/ directory of the source code tarball
-** and at http://www.mega-nerd.com/libsndfile/api.html.
-*/
-
-#ifndef SNDFILE_H
-#define SNDFILE_H
-
-/* This is the version 1.0.X header file. */
-#define	SNDFILE_1
-
-#include <stdio.h>
-#include <sys/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif	/* __cplusplus */
-
-/* The following file types can be read and written.
-** A file type would consist of a major type (ie SF_FORMAT_WAV) bitwise
-** ORed with a minor type (ie SF_FORMAT_PCM). SF_FORMAT_TYPEMASK and
-** SF_FORMAT_SUBMASK can be used to separate the major and minor file
-** types.
-*/
-
-enum
-{	/* Major formats. */
-	SF_FORMAT_WAV			= 0x010000,		/* Microsoft WAV format (little endian default). */
-	SF_FORMAT_AIFF			= 0x020000,		/* Apple/SGI AIFF format (big endian). */
-	SF_FORMAT_AU			= 0x030000,		/* Sun/NeXT AU format (big endian). */
-	SF_FORMAT_RAW			= 0x040000,		/* RAW PCM data. */
-	SF_FORMAT_PAF			= 0x050000,		/* Ensoniq PARIS file format. */
-	SF_FORMAT_SVX			= 0x060000,		/* Amiga IFF / SVX8 / SV16 format. */
-	SF_FORMAT_NIST			= 0x070000,		/* Sphere NIST format. */
-	SF_FORMAT_VOC			= 0x080000,		/* VOC files. */
-	SF_FORMAT_IRCAM			= 0x0A0000,		/* Berkeley/IRCAM/CARL */
-	SF_FORMAT_W64			= 0x0B0000,		/* Sonic Foundry's 64 bit RIFF/WAV */
-	SF_FORMAT_MAT4			= 0x0C0000,		/* Matlab (tm) V4.2 / GNU Octave 2.0 */
-	SF_FORMAT_MAT5			= 0x0D0000,		/* Matlab (tm) V5.0 / GNU Octave 2.1 */
-	SF_FORMAT_PVF			= 0x0E0000,		/* Portable Voice Format */
-	SF_FORMAT_XI			= 0x0F0000,		/* Fasttracker 2 Extended Instrument */
-	SF_FORMAT_HTK			= 0x100000,		/* HMM Tool Kit format */
-	SF_FORMAT_SDS			= 0x110000,		/* Midi Sample Dump Standard */
-	SF_FORMAT_AVR			= 0x120000,		/* Audio Visual Research */
-	SF_FORMAT_WAVEX			= 0x130000,		/* MS WAVE with WAVEFORMATEX */
-	SF_FORMAT_SD2			= 0x160000,		/* Sound Designer 2 */
-	SF_FORMAT_FLAC			= 0x170000,		/* FLAC lossless file format */
-	SF_FORMAT_CAF			= 0x180000,		/* Core Audio File format */
-	SF_FORMAT_WVE			= 0x190000,		/* Psion WVE format */
-	SF_FORMAT_OGG			= 0x200000,		/* Xiph OGG container */
-	SF_FORMAT_MPC2K			= 0x210000,		/* Akai MPC 2000 sampler */
-	SF_FORMAT_RF64			= 0x220000,		/* RF64 WAV file */
-
-	/* Subtypes from here on. */
-
-	SF_FORMAT_PCM_S8		= 0x0001,		/* Signed 8 bit data */
-	SF_FORMAT_PCM_16		= 0x0002,		/* Signed 16 bit data */
-	SF_FORMAT_PCM_24		= 0x0003,		/* Signed 24 bit data */
-	SF_FORMAT_PCM_32		= 0x0004,		/* Signed 32 bit data */
-
-	SF_FORMAT_PCM_U8		= 0x0005,		/* Unsigned 8 bit data (WAV and RAW only) */
-
-	SF_FORMAT_FLOAT			= 0x0006,		/* 32 bit float data */
-	SF_FORMAT_DOUBLE		= 0x0007,		/* 64 bit float data */
-
-	SF_FORMAT_ULAW			= 0x0010,		/* U-Law encoded. */
-	SF_FORMAT_ALAW			= 0x0011,		/* A-Law encoded. */
-	SF_FORMAT_IMA_ADPCM		= 0x0012,		/* IMA ADPCM. */
-	SF_FORMAT_MS_ADPCM		= 0x0013,		/* Microsoft ADPCM. */
-
-	SF_FORMAT_GSM610		= 0x0020,		/* GSM 6.10 encoding. */
-	SF_FORMAT_VOX_ADPCM		= 0x0021,		/* OKI / Dialogix ADPCM */
-
-	SF_FORMAT_G721_32		= 0x0030,		/* 32kbs G721 ADPCM encoding. */
-	SF_FORMAT_G723_24		= 0x0031,		/* 24kbs G723 ADPCM encoding. */
-	SF_FORMAT_G723_40		= 0x0032,		/* 40kbs G723 ADPCM encoding. */
-
-	SF_FORMAT_DWVW_12		= 0x0040, 		/* 12 bit Delta Width Variable Word encoding. */
-	SF_FORMAT_DWVW_16		= 0x0041, 		/* 16 bit Delta Width Variable Word encoding. */
-	SF_FORMAT_DWVW_24		= 0x0042, 		/* 24 bit Delta Width Variable Word encoding. */
-	SF_FORMAT_DWVW_N		= 0x0043, 		/* N bit Delta Width Variable Word encoding. */
-
-	SF_FORMAT_DPCM_8		= 0x0050,		/* 8 bit differential PCM (XI only) */
-	SF_FORMAT_DPCM_16		= 0x0051,		/* 16 bit differential PCM (XI only) */
-
-	SF_FORMAT_VORBIS		= 0x0060,		/* Xiph Vorbis encoding. */
-
-	/* Endian-ness options. */
-
-	SF_ENDIAN_FILE			= 0x00000000,	/* Default file endian-ness. */
-	SF_ENDIAN_LITTLE		= 0x10000000,	/* Force little endian-ness. */
-	SF_ENDIAN_BIG			= 0x20000000,	/* Force big endian-ness. */
-	SF_ENDIAN_CPU			= 0x30000000,	/* Force CPU endian-ness. */
-
-	SF_FORMAT_SUBMASK		= 0x0000FFFF,
-	SF_FORMAT_TYPEMASK		= 0x0FFF0000,
-	SF_FORMAT_ENDMASK		= 0x30000000
-} ;
-
-/*
-** The following are the valid command numbers for the sf_command()
-** interface.  The use of these commands is documented in the file
-** command.html in the doc directory of the source code distribution.
-*/
-
-enum
-{	SFC_GET_LIB_VERSION				= 0x1000,
-	SFC_GET_LOG_INFO				= 0x1001,
-	SFC_GET_CURRENT_SF_INFO			= 0x1002,
-
-
-	SFC_GET_NORM_DOUBLE				= 0x1010,
-	SFC_GET_NORM_FLOAT				= 0x1011,
-	SFC_SET_NORM_DOUBLE				= 0x1012,
-	SFC_SET_NORM_FLOAT				= 0x1013,
-	SFC_SET_SCALE_FLOAT_INT_READ	= 0x1014,
-	SFC_SET_SCALE_INT_FLOAT_WRITE	= 0x1015,
-
-	SFC_GET_SIMPLE_FORMAT_COUNT		= 0x1020,
-	SFC_GET_SIMPLE_FORMAT			= 0x1021,
-
-	SFC_GET_FORMAT_INFO				= 0x1028,
-
-	SFC_GET_FORMAT_MAJOR_COUNT		= 0x1030,
-	SFC_GET_FORMAT_MAJOR			= 0x1031,
-	SFC_GET_FORMAT_SUBTYPE_COUNT	= 0x1032,
-	SFC_GET_FORMAT_SUBTYPE			= 0x1033,
-
-	SFC_CALC_SIGNAL_MAX				= 0x1040,
-	SFC_CALC_NORM_SIGNAL_MAX		= 0x1041,
-	SFC_CALC_MAX_ALL_CHANNELS		= 0x1042,
-	SFC_CALC_NORM_MAX_ALL_CHANNELS	= 0x1043,
-	SFC_GET_SIGNAL_MAX				= 0x1044,
-	SFC_GET_MAX_ALL_CHANNELS		= 0x1045,
-
-	SFC_SET_ADD_PEAK_CHUNK			= 0x1050,
-	SFC_SET_ADD_HEADER_PAD_CHUNK	= 0x1051,
-
-	SFC_UPDATE_HEADER_NOW			= 0x1060,
-	SFC_SET_UPDATE_HEADER_AUTO		= 0x1061,
-
-	SFC_FILE_TRUNCATE				= 0x1080,
-
-	SFC_SET_RAW_START_OFFSET		= 0x1090,
-
-	SFC_SET_DITHER_ON_WRITE			= 0x10A0,
-	SFC_SET_DITHER_ON_READ			= 0x10A1,
-
-	SFC_GET_DITHER_INFO_COUNT		= 0x10A2,
-	SFC_GET_DITHER_INFO				= 0x10A3,
-
-	SFC_GET_EMBED_FILE_INFO			= 0x10B0,
-
-	SFC_SET_CLIPPING				= 0x10C0,
-	SFC_GET_CLIPPING				= 0x10C1,
-
-	SFC_GET_INSTRUMENT				= 0x10D0,
-	SFC_SET_INSTRUMENT				= 0x10D1,
-
-	SFC_GET_LOOP_INFO				= 0x10E0,
-
-	SFC_GET_BROADCAST_INFO			= 0x10F0,
-	SFC_SET_BROADCAST_INFO			= 0x10F1,
-
-	SFC_GET_CHANNEL_MAP_INFO		= 0x1100,
-	SFC_SET_CHANNEL_MAP_INFO		= 0x1101,
-
-	SFC_RAW_DATA_NEEDS_ENDSWAP		= 0x1110,
-
-	/* Support for Wavex Ambisonics Format */
-	SFC_WAVEX_SET_AMBISONIC			= 0x1200,
-	SFC_WAVEX_GET_AMBISONIC			= 0x1201,
-
-	SFC_SET_VBR_ENCODING_QUALITY	= 0x1300,
-
-	/* Following commands for testing only. */
-	SFC_TEST_IEEE_FLOAT_REPLACE		= 0x6001,
-
-	/*
-	** SFC_SET_ADD_* values are deprecated and will disappear at some
-	** time in the future. They are guaranteed to be here up to and
-	** including version 1.0.8 to avoid breakage of existng software.
-	** They currently do nothing and will continue to do nothing.
-	*/
-	SFC_SET_ADD_DITHER_ON_WRITE		= 0x1070,
-	SFC_SET_ADD_DITHER_ON_READ		= 0x1071
-} ;
-
-
-/*
-** String types that can be set and read from files. Not all file types
-** support this and even the file types which support one, may not support
-** all string types.
-*/
-
-enum
-{	SF_STR_TITLE					= 0x01,
-	SF_STR_COPYRIGHT				= 0x02,
-	SF_STR_SOFTWARE					= 0x03,
-	SF_STR_ARTIST					= 0x04,
-	SF_STR_COMMENT					= 0x05,
-	SF_STR_DATE						= 0x06,
-	SF_STR_ALBUM					= 0x07,
-	SF_STR_LICENSE					= 0x08,
-	SF_STR_TRACKNUMBER				= 0x09,
-	SF_STR_GENRE					= 0x10
-} ;
-
-/*
-** Use the following as the start and end index when doing metadata
-** transcoding.
-*/
-
-#define	SF_STR_FIRST	SF_STR_TITLE
-#define	SF_STR_LAST		SF_STR_LICENSE
-
-enum
-{	/* True and false */
-	SF_FALSE	= 0,
-	SF_TRUE		= 1,
-
-	/* Modes for opening files. */
-	SFM_READ	= 0x10,
-	SFM_WRITE	= 0x20,
-	SFM_RDWR	= 0x30,
-
-	SF_AMBISONIC_NONE		= 0x40,
-	SF_AMBISONIC_B_FORMAT	= 0x41
-} ;
-
-/* Public error values. These are guaranteed to remain unchanged for the duration
-** of the library major version number.
-** There are also a large number of private error numbers which are internal to
-** the library which can change at any time.
-*/
-
-enum
-{	SF_ERR_NO_ERROR				= 0,
-	SF_ERR_UNRECOGNISED_FORMAT	= 1,
-	SF_ERR_SYSTEM				= 2,
-	SF_ERR_MALFORMED_FILE		= 3,
-	SF_ERR_UNSUPPORTED_ENCODING	= 4
-} ;
-
-
-/* Channel map values (used with SFC_SET/GET_CHANNEL_MAP).
-*/
-
-enum
-{	SF_CHANNEL_MAP_INVALID = 0,
-	SF_CHANNEL_MAP_MONO = 1,
-	SF_CHANNEL_MAP_LEFT,					/* Apple calls this 'Left' */
-	SF_CHANNEL_MAP_RIGHT,					/* Apple calls this 'Right' */
-	SF_CHANNEL_MAP_CENTER,					/* Apple calls this 'Center' */
-	SF_CHANNEL_MAP_FRONT_LEFT,
-	SF_CHANNEL_MAP_FRONT_RIGHT,
-	SF_CHANNEL_MAP_FRONT_CENTER,
-	SF_CHANNEL_MAP_REAR_CENTER,				/* Apple calls this 'Center Surround', Msft calls this 'Back Center' */
-	SF_CHANNEL_MAP_REAR_LEFT,				/* Apple calls this 'Left Surround', Msft calls this 'Back Left' */
-	SF_CHANNEL_MAP_REAR_RIGHT,				/* Apple calls this 'Right Surround', Msft calls this 'Back Right' */
-	SF_CHANNEL_MAP_LFE,						/* Apple calls this 'LFEScreen', Msft calls this 'Low Frequency'  */
-	SF_CHANNEL_MAP_FRONT_LEFT_OF_CENTER,	/* Apple calls this 'Left Center' */
-	SF_CHANNEL_MAP_FRONT_RIGHT_OF_CENTER,	/* Apple calls this 'Right Center */
-	SF_CHANNEL_MAP_SIDE_LEFT,				/* Apple calls this 'Left Surround Direct' */
-	SF_CHANNEL_MAP_SIDE_RIGHT,				/* Apple calls this 'Right Surround Direct' */
-	SF_CHANNEL_MAP_TOP_CENTER,				/* Apple calls this 'Top Center Surround' */
-	SF_CHANNEL_MAP_TOP_FRONT_LEFT,			/* Apple calls this 'Vertical Height Left' */
-	SF_CHANNEL_MAP_TOP_FRONT_RIGHT,			/* Apple calls this 'Vertical Height Right' */
-	SF_CHANNEL_MAP_TOP_FRONT_CENTER,		/* Apple calls this 'Vertical Height Center' */
-	SF_CHANNEL_MAP_TOP_REAR_LEFT,			/* Apple and MS call this 'Top Back Left' */
-	SF_CHANNEL_MAP_TOP_REAR_RIGHT,			/* Apple and MS call this 'Top Back Right' */
-	SF_CHANNEL_MAP_TOP_REAR_CENTER,			/* Apple and MS call this 'Top Back Center' */
-
-	SF_CHANNEL_MAP_AMBISONIC_B_W,
-	SF_CHANNEL_MAP_AMBISONIC_B_X,
-	SF_CHANNEL_MAP_AMBISONIC_B_Y,
-	SF_CHANNEL_MAP_AMBISONIC_B_Z,
-
-	SF_CHANNEL_MAP_MAX
-} ;
-
-
-/* A SNDFILE* pointer can be passed around much like stdio.h's FILE* pointer. */
-
-typedef	struct SNDFILE_tag	SNDFILE ;
-
-/* The following typedef is system specific and is defined when libsndfile is
-** compiled. sf_count_t can be one of loff_t (Linux), off_t (*BSD), off64_t
-** (Solaris), __int64 (Win32) etc. On windows, we need to allow the same
-** header file to be compiler by both GCC and the microsoft compiler.
-*/
-
-#if (defined (_MSCVER) || defined (_MSC_VER))
-typedef __int64		sf_count_t ;
-#define SF_COUNT_MAX		0x7fffffffffffffffi64
-#else
-typedef off_t	sf_count_t ;
-#define SF_COUNT_MAX		0x7FFFFFFFFFFFFFFFLL
-#endif
-
-
-/* A pointer to a SF_INFO structure is passed to sf_open () and filled in.
-** On write, the SF_INFO structure is filled in by the user and passed into
-** sf_open ().
-*/
-
-struct SF_INFO
-{	sf_count_t	frames ;		/* Used to be called samples.  Changed to avoid confusion. */
-	int			samplerate ;
-	int			channels ;
-	int			format ;
-	int			sections ;
-	int			seekable ;
-} ;
-
-typedef	struct SF_INFO SF_INFO ;
-
-/* The SF_FORMAT_INFO struct is used to retrieve information about the sound
-** file formats libsndfile supports using the sf_command () interface.
-**
-** Using this interface will allow applications to support new file formats
-** and encoding types when libsndfile is upgraded, without requiring
-** re-compilation of the application.
-**
-** Please consult the libsndfile documentation (particularly the information
-** on the sf_command () interface) for examples of its use.
-*/
-
-typedef struct
-{	int			format ;
-	const char	*name ;
-	const char	*extension ;
-} SF_FORMAT_INFO ;
-
-/*
-** Enums and typedefs for adding dither on read and write.
-** See the html documentation for sf_command(), SFC_SET_DITHER_ON_WRITE
-** and SFC_SET_DITHER_ON_READ.
-*/
-
-enum
-{	SFD_DEFAULT_LEVEL	= 0,
-	SFD_CUSTOM_LEVEL	= 0x40000000,
-
-	SFD_NO_DITHER		= 500,
-	SFD_WHITE			= 501,
-	SFD_TRIANGULAR_PDF	= 502
-} ;
-
-typedef struct
-{	int			type ;
-	double		level ;
-	const char	*name ;
-} SF_DITHER_INFO ;
-
-/* Struct used to retrieve information about a file embedded within a
-** larger file. See SFC_GET_EMBED_FILE_INFO.
-*/
-
-typedef struct
-{	sf_count_t	offset ;
-	sf_count_t	length ;
-} SF_EMBED_FILE_INFO ;
-
-/*
-**	Structs used to retrieve music sample information from a file.
-*/
-
-enum
-{	/*
-	**	The loop mode field in SF_INSTRUMENT will be one of the following.
-	*/
-	SF_LOOP_NONE = 800,
-	SF_LOOP_FORWARD,
-	SF_LOOP_BACKWARD,
-	SF_LOOP_ALTERNATING
-} ;
-
-typedef struct
-{	int gain ;
-	char basenote, detune ;
-	char velocity_lo, velocity_hi ;
-	char key_lo, key_hi ;
-	int loop_count ;
-
-	struct
-	{	int mode ;
-		unsigned int start ;
-		unsigned int end ;
-		unsigned int count ;
-	} loops [16] ; /* make variable in a sensible way */
-} SF_INSTRUMENT ;
-
-
-
-/* Struct used to retrieve loop information from a file.*/
-typedef struct
-{
-	short	time_sig_num ;	/* any positive integer    > 0  */
-	short	time_sig_den ;	/* any positive power of 2 > 0  */
-	int		loop_mode ;		/* see SF_LOOP enum             */
-
-	int		num_beats ;		/* this is NOT the amount of quarter notes !!!*/
-							/* a full bar of 4/4 is 4 beats */
-							/* a full bar of 7/8 is 7 beats */
-
-	float	bpm ;			/* suggestion, as it can be calculated using other fields:*/
-							/* file's lenght, file's sampleRate and our time_sig_den*/
-							/* -> bpms are always the amount of _quarter notes_ per minute */
-
-	int	root_key ;			/* MIDI note, or -1 for None */
-	int future [6] ;
-} SF_LOOP_INFO ;
-
-
-/*	Struct used to retrieve broadcast (EBU) information from a file.
-**	Strongly (!) based on EBU "bext" chunk format used in Broadcast WAVE.
-*/
-#define	SF_BROADCAST_INFO_VAR(coding_hist_size) \
-			struct \
-			{	char			description [256] ; \
-				char			originator [32] ; \
-				char			originator_reference [32] ; \
-				char			origination_date [10] ; \
-				char			origination_time [8] ; \
-				unsigned int	time_reference_low ; \
-				unsigned int	time_reference_high ; \
-				short			version ; \
-				char			umid [64] ; \
-				char			reserved [190] ; \
-				unsigned int	coding_history_size ; \
-				char			coding_history [coding_hist_size] ; \
-			}
-
-/* SF_BROADCAST_INFO is the above struct with coding_history field of 256 bytes. */
-typedef SF_BROADCAST_INFO_VAR (256) SF_BROADCAST_INFO ;
-
-
-/*	Virtual I/O functionality. */
-
-typedef sf_count_t		(*sf_vio_get_filelen)	(void *user_data) ;
-typedef sf_count_t		(*sf_vio_seek)		(sf_count_t offset, int whence, void *user_data) ;
-typedef sf_count_t		(*sf_vio_read)		(void *ptr, sf_count_t count, void *user_data) ;
-typedef sf_count_t		(*sf_vio_write)		(const void *ptr, sf_count_t count, void *user_data) ;
-typedef sf_count_t		(*sf_vio_tell)		(void *user_data) ;
-
-struct SF_VIRTUAL_IO
-{	sf_vio_get_filelen	get_filelen ;
-	sf_vio_seek			seek ;
-	sf_vio_read			read ;
-	sf_vio_write		write ;
-	sf_vio_tell			tell ;
-} ;
-
-typedef	struct SF_VIRTUAL_IO SF_VIRTUAL_IO ;
-
-
-/* Open the specified file for read, write or both. On error, this will
-** return a NULL pointer. To find the error number, pass a NULL SNDFILE
-** to sf_strerror ().
-** All calls to sf_open() should be matched with a call to sf_close().
-*/
-
-SNDFILE* 	sf_open		(const char *path, int mode, SF_INFO *sfinfo) ;
-
-
-/* Use the existing file descriptor to create a SNDFILE object. If close_desc
-** is TRUE, the file descriptor will be closed when sf_close() is called. If
-** it is FALSE, the descritor will not be closed.
-** When passed a descriptor like this, the library will assume that the start
-** of file header is at the current file offset. This allows sound files within
-** larger container files to be read and/or written.
-** On error, this will return a NULL pointer. To find the error number, pass a
-** NULL SNDFILE to sf_strerror ().
-** All calls to sf_open_fd() should be matched with a call to sf_close().
-
-*/
-
-SNDFILE* 	sf_open_fd	(int fd, int mode, SF_INFO *sfinfo, int close_desc) ;
-
-SNDFILE* 	sf_open_virtual	(SF_VIRTUAL_IO *sfvirtual, int mode, SF_INFO *sfinfo, void *user_data) ;
-
-
-/* sf_error () returns a error number which can be translated to a text
-** string using sf_error_number().
-*/
-
-int		sf_error		(SNDFILE *sndfile) ;
-
-
-/* sf_strerror () returns to the caller a pointer to the current error message for
-** the given SNDFILE.
-*/
-
-const char* sf_strerror (SNDFILE *sndfile) ;
-
-
-/* sf_error_number () allows the retrieval of the error string for each internal
-** error number.
-**
-*/
-
-const char*	sf_error_number	(int errnum) ;
-
-
-/* The following two error functions are deprecated but they will remain in the
-** library for the forseeable future. The function sf_strerror() should be used
-** in their place.
-*/
-
-int		sf_perror		(SNDFILE *sndfile) ;
-int		sf_error_str	(SNDFILE *sndfile, char* str, size_t len) ;
-
-
-/* Return TRUE if fields of the SF_INFO struct are a valid combination of values. */
-
-int		sf_command	(SNDFILE *sndfile, int command, void *data, int datasize) ;
-
-
-/* Return TRUE if fields of the SF_INFO struct are a valid combination of values. */
-
-int		sf_format_check	(const SF_INFO *info) ;
-
-
-/* Seek within the waveform data chunk of the SNDFILE. sf_seek () uses
-** the same values for whence (SEEK_SET, SEEK_CUR and SEEK_END) as
-** stdio.h function fseek ().
-** An offset of zero with whence set to SEEK_SET will position the
-** read / write pointer to the first data sample.
-** On success sf_seek returns the current position in (multi-channel)
-** samples from the start of the file.
-** Please see the libsndfile documentation for moving the read pointer
-** separately from the write pointer on files open in mode SFM_RDWR.
-** On error all of these functions return -1.
-*/
-
-sf_count_t	sf_seek 		(SNDFILE *sndfile, sf_count_t frames, int whence) ;
-
-
-/* Functions for retrieving and setting string data within sound files.
-** Not all file types support this features; AIFF and WAV do. For both
-** functions, the str_type parameter must be one of the SF_STR_* values
-** defined above.
-** On error, sf_set_string() returns non-zero while sf_get_string()
-** returns NULL.
-*/
-
-int sf_set_string (SNDFILE *sndfile, int str_type, const char* str) ;
-
-const char* sf_get_string (SNDFILE *sndfile, int str_type) ;
-
-
-/* Return the library version string. */
-
-const char * sf_version_string (void) ;
-
-
-/* Functions for reading/writing the waveform data of a sound file.
-*/
-
-sf_count_t	sf_read_raw		(SNDFILE *sndfile, void *ptr, sf_count_t bytes) ;
-sf_count_t	sf_write_raw 	(SNDFILE *sndfile, const void *ptr, sf_count_t bytes) ;
-
-
-/* Functions for reading and writing the data chunk in terms of frames.
-** The number of items actually read/written = frames * number of channels.
-**     sf_xxxx_raw		read/writes the raw data bytes from/to the file
-**     sf_xxxx_short	passes data in the native short format
-**     sf_xxxx_int		passes data in the native int format
-**     sf_xxxx_float	passes data in the native float format
-**     sf_xxxx_double	passes data in the native double format
-** All of these read/write function return number of frames read/written.
-*/
-
-sf_count_t	sf_readf_short	(SNDFILE *sndfile, short *ptr, sf_count_t frames) ;
-sf_count_t	sf_writef_short	(SNDFILE *sndfile, const short *ptr, sf_count_t frames) ;
-
-sf_count_t	sf_readf_int	(SNDFILE *sndfile, int *ptr, sf_count_t frames) ;
-sf_count_t	sf_writef_int 	(SNDFILE *sndfile, const int *ptr, sf_count_t frames) ;
-
-sf_count_t	sf_readf_float	(SNDFILE *sndfile, float *ptr, sf_count_t frames) ;
-sf_count_t	sf_writef_float	(SNDFILE *sndfile, const float *ptr, sf_count_t frames) ;
-
-sf_count_t	sf_readf_double		(SNDFILE *sndfile, double *ptr, sf_count_t frames) ;
-sf_count_t	sf_writef_double	(SNDFILE *sndfile, const double *ptr, sf_count_t frames) ;
-
-
-/* Functions for reading and writing the data chunk in terms of items.
-** Otherwise similar to above.
-** All of these read/write function return number of items read/written.
-*/
-
-sf_count_t	sf_read_short	(SNDFILE *sndfile, short *ptr, sf_count_t items) ;
-sf_count_t	sf_write_short	(SNDFILE *sndfile, const short *ptr, sf_count_t items) ;
-
-sf_count_t	sf_read_int		(SNDFILE *sndfile, int *ptr, sf_count_t items) ;
-sf_count_t	sf_write_int 	(SNDFILE *sndfile, const int *ptr, sf_count_t items) ;
-
-sf_count_t	sf_read_float	(SNDFILE *sndfile, float *ptr, sf_count_t items) ;
-sf_count_t	sf_write_float	(SNDFILE *sndfile, const float *ptr, sf_count_t items) ;
-
-sf_count_t	sf_read_double	(SNDFILE *sndfile, double *ptr, sf_count_t items) ;
-sf_count_t	sf_write_double	(SNDFILE *sndfile, const double *ptr, sf_count_t items) ;
-
-
-/* Close the SNDFILE and clean up all memory allocations associated with this
-** file.
-** Returns 0 on success, or an error number.
-*/
-
-int		sf_close		(SNDFILE *sndfile) ;
-
-
-/* If the file is opened SFM_WRITE or SFM_RDWR, call fsync() on the file
-** to force the writing of data to disk. If the file is opened SFM_READ
-** no action is taken.
-*/
-
-void	sf_write_sync	(SNDFILE *sndfile) ;
-
-
-
-/* The function sf_wchar_open() is Windows Only!
-** Open a file passing in a Windows Unicode filename. Otherwise, this is
-** the same as sf_open().
-**
-** In order for this to work, you need to do the following:
-**
-**		#include <windows.h>
-**		#define ENABLE_SNDFILE_WINDOWS_PROTOTYPES 1
-**		#including <sndfile.h>
-*/
-
-#if ENABLE_SNDFILE_WINDOWS_PROTOTYPES
-SNDFILE* sf_wchar_open (LPCWSTR wpath, int mode, SF_INFO *sfinfo) ;
-#endif
-
-
-
-#ifdef __cplusplus
-}		/* extern "C" */
-#endif	/* __cplusplus */
-
-#endif	/* SNDFILE_H */
-
diff --git a/lib-x86-64/include/sndfile.hh b/lib-x86-64/include/sndfile.hh
deleted file mode 100644
index 674d4b53..00000000
--- a/lib-x86-64/include/sndfile.hh
+++ /dev/null
@@ -1,395 +0,0 @@
-/*
-** Copyright (C) 2005-2010 Erik de Castro Lopo <erikd@mega-nerd.com>
-**
-** All rights reserved.
-**
-** Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**
-**     * Redistributions of source code must retain the above copyright
-**       notice, this list of conditions and the following disclaimer.
-**     * 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.
-**     * Neither the author nor the names of any contributors may be used
-**       to endorse or promote products derived from this software without
-**       specific prior written permission.
-**
-** 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.
-*/
-
-/*
-** The above modified BSD style license (GPL and LGPL compatible) applies to
-** this file. It does not apply to libsndfile itself which is released under
-** the GNU LGPL or the libsndfile test suite which is released under the GNU
-** GPL.
-** This means that this header file can be used under this modified BSD style
-** license, but the LGPL still holds for the libsndfile library itself.
-*/
-
-/*
-** sndfile.hh -- A lightweight C++ wrapper for the libsndfile API.
-**
-** All the methods are inlines and all functionality is contained in this
-** file. There is no separate implementation file.
-**
-** API documentation is in the doc/ directory of the source code tarball
-** and at http://www.mega-nerd.com/libsndfile/api.html.
-*/
-
-#ifndef SNDFILE_HH
-#define SNDFILE_HH
-
-#include <sndfile.h>
-
-#include <string>
-#include <new> // for std::nothrow
-
-class SndfileHandle
-{	private :
-		struct SNDFILE_ref
-		{	SNDFILE_ref (void) ;
-			~SNDFILE_ref (void) ;
-
-			SNDFILE *sf ;
-			SF_INFO sfinfo ;
-			int ref ;
-			} ;
-
-		SNDFILE_ref *p ;
-
-	public :
-			/* Default constructor */
-			SndfileHandle (void) : p (NULL) {} ;
-			SndfileHandle (const char *path, int mode = SFM_READ,
-							int format = 0, int channels = 0, int samplerate = 0) ;
-			SndfileHandle (std::string const & path, int mode = SFM_READ,
-							int format = 0, int channels = 0, int samplerate = 0) ;
-			SndfileHandle (int fd, bool close_desc, int mode = SFM_READ,
-							int format = 0, int channels = 0, int samplerate = 0) ;
-			~SndfileHandle (void) ;
-
-			SndfileHandle (const SndfileHandle &orig) ;
-			SndfileHandle & operator = (const SndfileHandle &rhs) ;
-
-		/* Mainly for debugging/testing. */
-		int refCount (void) const { return (p == NULL) ? 0 : p->ref ; }
-
-		operator bool () const { return (p != NULL) ; }
-
-		bool operator == (const SndfileHandle &rhs) const { return (p == rhs.p) ; }
-
-		sf_count_t	frames (void) const		{ return p ? p->sfinfo.frames : 0 ; }
-		int			format (void) const		{ return p ? p->sfinfo.format : 0 ; }
-		int			channels (void) const	{ return p ? p->sfinfo.channels : 0 ; }
-		int			samplerate (void) const { return p ? p->sfinfo.samplerate : 0 ; }
-
-		int error (void) const ;
-		const char * strError (void) const ;
-
-		int command (int cmd, void *data, int datasize) ;
-
-		sf_count_t	seek (sf_count_t frames, int whence) ;
-
-		void writeSync (void) ;
-
-		int setString (int str_type, const char* str) ;
-
-		const char* getString (int str_type) const ;
-
-		static int formatCheck (int format, int channels, int samplerate) ;
-
-		sf_count_t read (short *ptr, sf_count_t items) ;
-		sf_count_t read (int *ptr, sf_count_t items) ;
-		sf_count_t read (float *ptr, sf_count_t items) ;
-		sf_count_t read (double *ptr, sf_count_t items) ;
-
-		sf_count_t write (const short *ptr, sf_count_t items) ;
-		sf_count_t write (const int *ptr, sf_count_t items) ;
-		sf_count_t write (const float *ptr, sf_count_t items) ;
-		sf_count_t write (const double *ptr, sf_count_t items) ;
-
-		sf_count_t readf (short *ptr, sf_count_t frames) ;
-		sf_count_t readf (int *ptr, sf_count_t frames) ;
-		sf_count_t readf (float *ptr, sf_count_t frames) ;
-		sf_count_t readf (double *ptr, sf_count_t frames) ;
-
-		sf_count_t writef (const short *ptr, sf_count_t frames) ;
-		sf_count_t writef (const int *ptr, sf_count_t frames) ;
-		sf_count_t writef (const float *ptr, sf_count_t frames) ;
-		sf_count_t writef (const double *ptr, sf_count_t frames) ;
-
-		sf_count_t	readRaw		(void *ptr, sf_count_t bytes) ;
-		sf_count_t	writeRaw	(const void *ptr, sf_count_t bytes) ;
-
-} ;
-
-/*==============================================================================
-**	Nothing but implementation below.
-*/
-
-inline
-SndfileHandle::SNDFILE_ref::SNDFILE_ref (void)
-: ref (1)
-{}
-
-inline
-SndfileHandle::SNDFILE_ref::~SNDFILE_ref (void)
-{	if (sf != NULL) sf_close (sf) ; }
-
-inline
-SndfileHandle::SndfileHandle (const char *path, int mode, int fmt, int chans, int srate)
-: p (NULL)
-{
-	p = new (std::nothrow) SNDFILE_ref () ;
-
-	if (p != NULL)
-	{	p->ref = 1 ;
-
-		p->sfinfo.frames = 0 ;
-		p->sfinfo.channels = chans ;
-		p->sfinfo.format = fmt ;
-		p->sfinfo.samplerate = srate ;
-		p->sfinfo.sections = 0 ;
-		p->sfinfo.seekable = 0 ;
-
-		p->sf = sf_open (path, mode, &p->sfinfo) ;
-		} ;
-
-	return ;
-} /* SndfileHandle const char * constructor */
-
-inline
-SndfileHandle::SndfileHandle (std::string const & path, int mode, int fmt, int chans, int srate)
-: p (NULL)
-{
-	p = new (std::nothrow) SNDFILE_ref () ;
-
-	if (p != NULL)
-	{	p->ref = 1 ;
-
-		p->sfinfo.frames = 0 ;
-		p->sfinfo.channels = chans ;
-		p->sfinfo.format = fmt ;
-		p->sfinfo.samplerate = srate ;
-		p->sfinfo.sections = 0 ;
-		p->sfinfo.seekable = 0 ;
-
-		p->sf = sf_open (path.c_str (), mode, &p->sfinfo) ;
-		} ;
-
-	return ;
-} /* SndfileHandle std::string constructor */
-
-inline
-SndfileHandle::SndfileHandle (int fd, bool close_desc, int mode, int fmt, int chans, int srate)
-: p (NULL)
-{
-	if (fd < 0)
-		return ;
-
-	p = new (std::nothrow) SNDFILE_ref () ;
-
-	if (p != NULL)
-	{	p->ref = 1 ;
-
-		p->sfinfo.frames = 0 ;
-		p->sfinfo.channels = chans ;
-		p->sfinfo.format = fmt ;
-		p->sfinfo.samplerate = srate ;
-		p->sfinfo.sections = 0 ;
-		p->sfinfo.seekable = 0 ;
-
-		p->sf = sf_open_fd (fd, mode, &p->sfinfo, close_desc) ;
-		} ;
-
-	return ;
-} /* SndfileHandle fd constructor */
-
-inline
-SndfileHandle::~SndfileHandle (void)
-{	if (p != NULL && --p->ref == 0)
-		delete p ;
-} /* SndfileHandle destructor */
-
-
-inline
-SndfileHandle::SndfileHandle (const SndfileHandle &orig)
-: p (orig.p)
-{	if (p != NULL)
-		++p->ref ;
-} /* SndfileHandle copy constructor */
-
-inline SndfileHandle &
-SndfileHandle::operator = (const SndfileHandle &rhs)
-{
-	if (&rhs == this)
-		return *this ;
-	if (p != NULL && --p->ref == 0)
-		delete p ;
-
-	p = rhs.p ;
-	if (p != NULL)
-		++p->ref ;
-
-	return *this ;
-} /* SndfileHandle assignment operator */
-
-inline int
-SndfileHandle::error (void) const
-{	return sf_error (p->sf) ; }
-
-inline const char *
-SndfileHandle::strError (void) const
-{	return sf_strerror (p->sf) ; }
-
-inline int
-SndfileHandle::command (int cmd, void *data, int datasize)
-{	return sf_command (p->sf, cmd, data, datasize) ; }
-
-inline sf_count_t
-SndfileHandle::seek (sf_count_t frame_count, int whence)
-{	return sf_seek (p->sf, frame_count, whence) ; }
-
-inline void
-SndfileHandle::writeSync (void)
-{	sf_write_sync (p->sf) ; }
-
-inline int
-SndfileHandle::setString (int str_type, const char* str)
-{	return sf_set_string (p->sf, str_type, str) ; }
-
-inline const char*
-SndfileHandle::getString (int str_type) const
-{	return sf_get_string (p->sf, str_type) ; }
-
-inline int
-SndfileHandle::formatCheck (int fmt, int chans, int srate)
-{
-	SF_INFO sfinfo ;
-
-	sfinfo.frames = 0 ;
-	sfinfo.channels = chans ;
-	sfinfo.format = fmt ;
-	sfinfo.samplerate = srate ;
-	sfinfo.sections = 0 ;
-	sfinfo.seekable = 0 ;
-
-	return sf_format_check (&sfinfo) ;
-}
-
-/*---------------------------------------------------------------------*/
-
-inline sf_count_t
-SndfileHandle::read (short *ptr, sf_count_t items)
-{	return sf_read_short (p->sf, ptr, items) ; }
-
-inline sf_count_t
-SndfileHandle::read (int *ptr, sf_count_t items)
-{	return sf_read_int (p->sf, ptr, items) ; }
-
-inline sf_count_t
-SndfileHandle::read (float *ptr, sf_count_t items)
-{	return sf_read_float (p->sf, ptr, items) ; }
-
-inline sf_count_t
-SndfileHandle::read (double *ptr, sf_count_t items)
-{	return sf_read_double (p->sf, ptr, items) ; }
-
-inline sf_count_t
-SndfileHandle::write (const short *ptr, sf_count_t items)
-{	return sf_write_short (p->sf, ptr, items) ; }
-
-inline sf_count_t
-SndfileHandle::write (const int *ptr, sf_count_t items)
-{	return sf_write_int (p->sf, ptr, items) ; }
-
-inline sf_count_t
-SndfileHandle::write (const float *ptr, sf_count_t items)
-{	return sf_write_float (p->sf, ptr, items) ; }
-
-inline sf_count_t
-SndfileHandle::write (const double *ptr, sf_count_t items)
-{	return sf_write_double (p->sf, ptr, items) ; }
-
-inline sf_count_t
-SndfileHandle::readf (short *ptr, sf_count_t frame_count)
-{	return sf_readf_short (p->sf, ptr, frame_count) ; }
-
-inline sf_count_t
-SndfileHandle::readf (int *ptr, sf_count_t frame_count)
-{	return sf_readf_int (p->sf, ptr, frame_count) ; }
-
-inline sf_count_t
-SndfileHandle::readf (float *ptr, sf_count_t frame_count)
-{	return sf_readf_float (p->sf, ptr, frame_count) ; }
-
-inline sf_count_t
-SndfileHandle::readf (double *ptr, sf_count_t frame_count)
-{	return sf_readf_double (p->sf, ptr, frame_count) ; }
-
-inline sf_count_t
-SndfileHandle::writef (const short *ptr, sf_count_t frame_count)
-{	return sf_writef_short (p->sf, ptr, frame_count) ; }
-
-inline sf_count_t
-SndfileHandle::writef (const int *ptr, sf_count_t frame_count)
-{	return sf_writef_int (p->sf, ptr, frame_count) ; }
-
-inline sf_count_t
-SndfileHandle::writef (const float *ptr, sf_count_t frame_count)
-{	return sf_writef_float (p->sf, ptr, frame_count) ; }
-
-inline sf_count_t
-SndfileHandle::writef (const double *ptr, sf_count_t frame_count)
-{	return sf_writef_double (p->sf, ptr, frame_count) ; }
-
-inline sf_count_t
-SndfileHandle::readRaw (void *ptr, sf_count_t bytes)
-{	return sf_read_raw (p->sf, ptr, bytes) ; }
-
-inline sf_count_t
-SndfileHandle::writeRaw (const void *ptr, sf_count_t bytes)
-{	return sf_write_raw (p->sf, ptr, bytes) ; }
-
-
-#ifdef ENABLE_SNDFILE_WINDOWS_PROTOTYPES
-
-inline
-SndfileHandle::SndfileHandle (LPCWSTR wpath, int mode, int fmt, int chans, int srate)
-: p (NULL)
-{
-	p = new (std::nothrow) SNDFILE_ref () ;
-
-	if (p != NULL)
-	{	p->ref = 1 ;
-
-		p->sfinfo.frames = 0 ;
-		p->sfinfo.channels = chans ;
-		p->sfinfo.format = fmt ;
-		p->sfinfo.samplerate = srate ;
-		p->sfinfo.sections = 0 ;
-		p->sfinfo.seekable = 0 ;
-
-		p->sf = sf_wchar_open (wpath, mode, &p->sfinfo) ;
-		} ;
-
-	return ;
-} /* SndfileHandle const wchar_t * constructor */
-
-#endif
-
-#endif	/* SNDFILE_HH */
-
diff --git a/lib-x86-64/include/vorbis/codec.h b/lib-x86-64/include/vorbis/codec.h
deleted file mode 100644
index 999aa335..00000000
--- a/lib-x86-64/include/vorbis/codec.h
+++ /dev/null
@@ -1,243 +0,0 @@
-/********************************************************************
- *                                                                  *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
- *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
-
- ********************************************************************
-
- function: libvorbis codec headers
- last mod: $Id: codec.h 17021 2010-03-24 09:29:41Z xiphmont $
-
- ********************************************************************/
-
-#ifndef _vorbis_codec_h_
-#define _vorbis_codec_h_
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#include <ogg/ogg.h>
-
-typedef struct vorbis_info{
-  int version;
-  int channels;
-  long rate;
-
-  /* The below bitrate declarations are *hints*.
-     Combinations of the three values carry the following implications:
-
-     all three set to the same value:
-       implies a fixed rate bitstream
-     only nominal set:
-       implies a VBR stream that averages the nominal bitrate.  No hard
-       upper/lower limit
-     upper and or lower set:
-       implies a VBR bitstream that obeys the bitrate limits. nominal
-       may also be set to give a nominal rate.
-     none set:
-       the coder does not care to speculate.
-  */
-
-  long bitrate_upper;
-  long bitrate_nominal;
-  long bitrate_lower;
-  long bitrate_window;
-
-  void *codec_setup;
-} vorbis_info;
-
-/* vorbis_dsp_state buffers the current vorbis audio
-   analysis/synthesis state.  The DSP state belongs to a specific
-   logical bitstream ****************************************************/
-typedef struct vorbis_dsp_state{
-  int analysisp;
-  vorbis_info *vi;
-
-  float **pcm;
-  float **pcmret;
-  int      pcm_storage;
-  int      pcm_current;
-  int      pcm_returned;
-
-  int  preextrapolate;
-  int  eofflag;
-
-  long lW;
-  long W;
-  long nW;
-  long centerW;
-
-  ogg_int64_t granulepos;
-  ogg_int64_t sequence;
-
-  ogg_int64_t glue_bits;
-  ogg_int64_t time_bits;
-  ogg_int64_t floor_bits;
-  ogg_int64_t res_bits;
-
-  void       *backend_state;
-} vorbis_dsp_state;
-
-typedef struct vorbis_block{
-  /* necessary stream state for linking to the framing abstraction */
-  float  **pcm;       /* this is a pointer into local storage */
-  oggpack_buffer opb;
-
-  long  lW;
-  long  W;
-  long  nW;
-  int   pcmend;
-  int   mode;
-
-  int         eofflag;
-  ogg_int64_t granulepos;
-  ogg_int64_t sequence;
-  vorbis_dsp_state *vd; /* For read-only access of configuration */
-
-  /* local storage to avoid remallocing; it's up to the mapping to
-     structure it */
-  void               *localstore;
-  long                localtop;
-  long                localalloc;
-  long                totaluse;
-  struct alloc_chain *reap;
-
-  /* bitmetrics for the frame */
-  long glue_bits;
-  long time_bits;
-  long floor_bits;
-  long res_bits;
-
-  void *internal;
-
-} vorbis_block;
-
-/* vorbis_block is a single block of data to be processed as part of
-the analysis/synthesis stream; it belongs to a specific logical
-bitstream, but is independent from other vorbis_blocks belonging to
-that logical bitstream. *************************************************/
-
-struct alloc_chain{
-  void *ptr;
-  struct alloc_chain *next;
-};
-
-/* vorbis_info contains all the setup information specific to the
-   specific compression/decompression mode in progress (eg,
-   psychoacoustic settings, channel setup, options, codebook
-   etc). vorbis_info and substructures are in backends.h.
-*********************************************************************/
-
-/* the comments are not part of vorbis_info so that vorbis_info can be
-   static storage */
-typedef struct vorbis_comment{
-  /* unlimited user comment fields.  libvorbis writes 'libvorbis'
-     whatever vendor is set to in encode */
-  char **user_comments;
-  int   *comment_lengths;
-  int    comments;
-  char  *vendor;
-
-} vorbis_comment;
-
-
-/* libvorbis encodes in two abstraction layers; first we perform DSP
-   and produce a packet (see docs/analysis.txt).  The packet is then
-   coded into a framed OggSquish bitstream by the second layer (see
-   docs/framing.txt).  Decode is the reverse process; we sync/frame
-   the bitstream and extract individual packets, then decode the
-   packet back into PCM audio.
-
-   The extra framing/packetizing is used in streaming formats, such as
-   files.  Over the net (such as with UDP), the framing and
-   packetization aren't necessary as they're provided by the transport
-   and the streaming layer is not used */
-
-/* Vorbis PRIMITIVES: general ***************************************/
-
-extern void     vorbis_info_init(vorbis_info *vi);
-extern void     vorbis_info_clear(vorbis_info *vi);
-extern int      vorbis_info_blocksize(vorbis_info *vi,int zo);
-extern void     vorbis_comment_init(vorbis_comment *vc);
-extern void     vorbis_comment_add(vorbis_comment *vc, const char *comment);
-extern void     vorbis_comment_add_tag(vorbis_comment *vc,
-                                       const char *tag, const char *contents);
-extern char    *vorbis_comment_query(vorbis_comment *vc, const char *tag, int count);
-extern int      vorbis_comment_query_count(vorbis_comment *vc, const char *tag);
-extern void     vorbis_comment_clear(vorbis_comment *vc);
-
-extern int      vorbis_block_init(vorbis_dsp_state *v, vorbis_block *vb);
-extern int      vorbis_block_clear(vorbis_block *vb);
-extern void     vorbis_dsp_clear(vorbis_dsp_state *v);
-extern double   vorbis_granule_time(vorbis_dsp_state *v,
-                                    ogg_int64_t granulepos);
-
-extern const char *vorbis_version_string(void);
-
-/* Vorbis PRIMITIVES: analysis/DSP layer ****************************/
-
-extern int      vorbis_analysis_init(vorbis_dsp_state *v,vorbis_info *vi);
-extern int      vorbis_commentheader_out(vorbis_comment *vc, ogg_packet *op);
-extern int      vorbis_analysis_headerout(vorbis_dsp_state *v,
-                                          vorbis_comment *vc,
-                                          ogg_packet *op,
-                                          ogg_packet *op_comm,
-                                          ogg_packet *op_code);
-extern float  **vorbis_analysis_buffer(vorbis_dsp_state *v,int vals);
-extern int      vorbis_analysis_wrote(vorbis_dsp_state *v,int vals);
-extern int      vorbis_analysis_blockout(vorbis_dsp_state *v,vorbis_block *vb);
-extern int      vorbis_analysis(vorbis_block *vb,ogg_packet *op);
-
-extern int      vorbis_bitrate_addblock(vorbis_block *vb);
-extern int      vorbis_bitrate_flushpacket(vorbis_dsp_state *vd,
-                                           ogg_packet *op);
-
-/* Vorbis PRIMITIVES: synthesis layer *******************************/
-extern int      vorbis_synthesis_idheader(ogg_packet *op);
-extern int      vorbis_synthesis_headerin(vorbis_info *vi,vorbis_comment *vc,
-                                          ogg_packet *op);
-
-extern int      vorbis_synthesis_init(vorbis_dsp_state *v,vorbis_info *vi);
-extern int      vorbis_synthesis_restart(vorbis_dsp_state *v);
-extern int      vorbis_synthesis(vorbis_block *vb,ogg_packet *op);
-extern int      vorbis_synthesis_trackonly(vorbis_block *vb,ogg_packet *op);
-extern int      vorbis_synthesis_blockin(vorbis_dsp_state *v,vorbis_block *vb);
-extern int      vorbis_synthesis_pcmout(vorbis_dsp_state *v,float ***pcm);
-extern int      vorbis_synthesis_lapout(vorbis_dsp_state *v,float ***pcm);
-extern int      vorbis_synthesis_read(vorbis_dsp_state *v,int samples);
-extern long     vorbis_packet_blocksize(vorbis_info *vi,ogg_packet *op);
-
-extern int      vorbis_synthesis_halfrate(vorbis_info *v,int flag);
-extern int      vorbis_synthesis_halfrate_p(vorbis_info *v);
-
-/* Vorbis ERRORS and return codes ***********************************/
-
-#define OV_FALSE      -1
-#define OV_EOF        -2
-#define OV_HOLE       -3
-
-#define OV_EREAD      -128
-#define OV_EFAULT     -129
-#define OV_EIMPL      -130
-#define OV_EINVAL     -131
-#define OV_ENOTVORBIS -132
-#define OV_EBADHEADER -133
-#define OV_EVERSION   -134
-#define OV_ENOTAUDIO  -135
-#define OV_EBADPACKET -136
-#define OV_EBADLINK   -137
-#define OV_ENOSEEK    -138
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
-
diff --git a/lib-x86-64/include/vorbis/vorbisenc.h b/lib-x86-64/include/vorbis/vorbisenc.h
deleted file mode 100644
index 02332b50..00000000
--- a/lib-x86-64/include/vorbis/vorbisenc.h
+++ /dev/null
@@ -1,436 +0,0 @@
-/********************************************************************
- *                                                                  *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
- *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
- *                                                                  *
- ********************************************************************
-
- function: vorbis encode-engine setup
- last mod: $Id: vorbisenc.h 17021 2010-03-24 09:29:41Z xiphmont $
-
- ********************************************************************/
-
-/** \file
- * Libvorbisenc is a convenient API for setting up an encoding
- * environment using libvorbis. Libvorbisenc encapsulates the
- * actions needed to set up the encoder properly.
- */
-
-#ifndef _OV_ENC_H_
-#define _OV_ENC_H_
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#include "codec.h"
-
-/**
- * This is the primary function within libvorbisenc for setting up managed
- * bitrate modes.
- *
- * Before this function is called, the \ref vorbis_info
- * struct should be initialized by using vorbis_info_init() from the libvorbis
- * API.  After encoding, vorbis_info_clear() should be called.
- *
- * The max_bitrate, nominal_bitrate, and min_bitrate settings are used to set
- * constraints for the encoded file.  This function uses these settings to
- * select the appropriate encoding mode and set it up.
- *
- * \param vi               Pointer to an initialized \ref vorbis_info struct.
- * \param channels         The number of channels to be encoded.
- * \param rate             The sampling rate of the source audio.
- * \param max_bitrate      Desired maximum bitrate (limit). -1 indicates unset.
- * \param nominal_bitrate  Desired average, or central, bitrate. -1 indicates unset.
- * \param min_bitrate      Desired minimum bitrate. -1 indicates unset.
- *
- * \return Zero for success, and negative values for failure.
- *
- * \retval 0          Success.
- * \retval OV_EFAULT  Internal logic fault; indicates a bug or heap/stack corruption.
- * \retval OV_EINVAL  Invalid setup request, eg, out of range argument.
- * \retval OV_EIMPL   Unimplemented mode; unable to comply with bitrate request.
- */
-extern int vorbis_encode_init(vorbis_info *vi,
-                              long channels,
-                              long rate,
-
-                              long max_bitrate,
-                              long nominal_bitrate,
-                              long min_bitrate);
-
-/**
- * This function performs step-one of a three-step bitrate-managed encode
- * setup.  It functions similarly to the one-step setup performed by \ref
- * vorbis_encode_init but allows an application to make further encode setup
- * tweaks using \ref vorbis_encode_ctl before finally calling \ref
- * vorbis_encode_setup_init to complete the setup process.
- *
- * Before this function is called, the \ref vorbis_info struct should be
- * initialized by using vorbis_info_init() from the libvorbis API.  After
- * encoding, vorbis_info_clear() should be called.
- *
- * The max_bitrate, nominal_bitrate, and min_bitrate settings are used to set
- * constraints for the encoded file.  This function uses these settings to
- * select the appropriate encoding mode and set it up.
- *
- * \param vi                Pointer to an initialized vorbis_info struct.
- * \param channels          The number of channels to be encoded.
- * \param rate              The sampling rate of the source audio.
- * \param max_bitrate       Desired maximum bitrate (limit). -1 indicates unset.
- * \param nominal_bitrate   Desired average, or central, bitrate. -1 indicates unset.
- * \param min_bitrate       Desired minimum bitrate. -1 indicates unset.
- *
- * \return Zero for success, and negative for failure.
- *
- * \retval 0           Success
- * \retval OV_EFAULT   Internal logic fault; indicates a bug or heap/stack corruption.
- * \retval OV_EINVAL   Invalid setup request, eg, out of range argument.
- * \retval OV_EIMPL    Unimplemented mode; unable to comply with bitrate request.
- */
-extern int vorbis_encode_setup_managed(vorbis_info *vi,
-                                       long channels,
-                                       long rate,
-
-                                       long max_bitrate,
-                                       long nominal_bitrate,
-                                       long min_bitrate);
-
-/**
- * This function performs step-one of a three-step variable bitrate
- * (quality-based) encode setup.  It functions similarly to the one-step setup
- * performed by \ref vorbis_encode_init_vbr() but allows an application to
- * make further encode setup tweaks using \ref vorbis_encode_ctl() before
- * finally calling \ref vorbis_encode_setup_init to complete the setup
- * process.
- *
- * Before this function is called, the \ref vorbis_info struct should be
- * initialized by using \ref vorbis_info_init() from the libvorbis API.  After
- * encoding, vorbis_info_clear() should be called.
- *
- * \param vi        Pointer to an initialized vorbis_info struct.
- * \param channels  The number of channels to be encoded.
- * \param rate      The sampling rate of the source audio.
- * \param quality   Desired quality level, currently from -0.1 to 1.0 (lo to hi).
- *
- * \return Zero for success, and negative values for failure.
- *
- * \retval  0          Success
- * \retval  OV_EFAULT  Internal logic fault; indicates a bug or heap/stack corruption.
- * \retval  OV_EINVAL  Invalid setup request, eg, out of range argument.
- * \retval  OV_EIMPL   Unimplemented mode; unable to comply with quality level request.
- */
-extern int vorbis_encode_setup_vbr(vorbis_info *vi,
-                                  long channels,
-                                  long rate,
-
-                                  float quality
-                                  );
-
-/**
- * This is the primary function within libvorbisenc for setting up variable
- * bitrate ("quality" based) modes.
- *
- *
- * Before this function is called, the vorbis_info struct should be
- * initialized by using vorbis_info_init() from the libvorbis API. After
- * encoding, vorbis_info_clear() should be called.
- *
- * \param vi           Pointer to an initialized vorbis_info struct.
- * \param channels     The number of channels to be encoded.
- * \param rate         The sampling rate of the source audio.
- * \param base_quality Desired quality level, currently from -0.1 to 1.0 (lo to hi).
- *
- *
- * \return Zero for success, or a negative number for failure.
- *
- * \retval 0           Success
- * \retval OV_EFAULT   Internal logic fault; indicates a bug or heap/stack corruption.
- * \retval OV_EINVAL   Invalid setup request, eg, out of range argument.
- * \retval OV_EIMPL    Unimplemented mode; unable to comply with quality level request.
- */
-extern int vorbis_encode_init_vbr(vorbis_info *vi,
-                                  long channels,
-                                  long rate,
-
-                                  float base_quality
-                                  );
-
-/**
- * This function performs the last stage of three-step encoding setup, as
- * described in the API overview under managed bitrate modes.
- *
- * Before this function is called, the \ref vorbis_info struct should be
- * initialized by using vorbis_info_init() from the libvorbis API, one of
- * \ref vorbis_encode_setup_managed() or \ref vorbis_encode_setup_vbr() called to
- * initialize the high-level encoding setup, and \ref vorbis_encode_ctl()
- * called if necessary to make encoding setup changes.
- * vorbis_encode_setup_init() finalizes the highlevel encoding structure into
- * a complete encoding setup after which the application may make no further
- * setup changes.
- *
- * After encoding, vorbis_info_clear() should be called.
- *
- * \param vi Pointer to an initialized \ref vorbis_info struct.
- *
- * \return Zero for success, and negative values for failure.
- *
- * \retval  0           Success.
- * \retval  OV_EFAULT  Internal logic fault; indicates a bug or heap/stack corruption.
- *
- * \retval OV_EINVAL   Attempt to use vorbis_encode_setup_init() without first
- * calling one of vorbis_encode_setup_managed() or vorbis_encode_setup_vbr() to
- * initialize the high-level encoding setup
- *
- */
-extern int vorbis_encode_setup_init(vorbis_info *vi);
-
-/**
- * This function implements a generic interface to miscellaneous encoder
- * settings similar to the classic UNIX 'ioctl()' system call.  Applications
- * may use vorbis_encode_ctl() to query or set bitrate management or quality
- * mode details by using one of several \e request arguments detailed below.
- * vorbis_encode_ctl() must be called after one of
- * vorbis_encode_setup_managed() or vorbis_encode_setup_vbr().  When used
- * to modify settings, \ref vorbis_encode_ctl() must be called before \ref
- * vorbis_encode_setup_init().
- *
- * \param vi      Pointer to an initialized vorbis_info struct.
- *
- * \param number Specifies the desired action; See \ref encctlcodes "the list
- * of available requests".
- *
- * \param arg void * pointing to a data structure matching the request
- * argument.
- *
- * \retval 0          Success. Any further return information (such as the result of a
- * query) is placed into the storage pointed to by *arg.
- *
- * \retval OV_EINVAL  Invalid argument, or an attempt to modify a setting after
- * calling vorbis_encode_setup_init().
- *
- * \retval OV_EIMPL   Unimplemented or unknown request
- */
-extern int vorbis_encode_ctl(vorbis_info *vi,int number,void *arg);
-
-/**
- * \deprecated This is a deprecated interface. Please use vorbis_encode_ctl()
- * with the \ref ovectl_ratemanage2_arg struct and \ref
- * OV_ECTL_RATEMANAGE2_GET and \ref OV_ECTL_RATEMANAGE2_SET calls in new code.
- *
- * The \ref ovectl_ratemanage_arg structure is used with vorbis_encode_ctl()
- * and the \ref OV_ECTL_RATEMANAGE_GET, \ref OV_ECTL_RATEMANAGE_SET, \ref
- * OV_ECTL_RATEMANAGE_AVG, \ref OV_ECTL_RATEMANAGE_HARD calls in order to
- * query and modify specifics of the encoder's bitrate management
- * configuration.
-*/
-struct ovectl_ratemanage_arg {
-  int    management_active; /**< nonzero if bitrate management is active*/
-/** hard lower limit (in kilobits per second) below which the stream bitrate
-    will never be allowed for any given bitrate_hard_window seconds of time.*/
-  long   bitrate_hard_min;
-/** hard upper limit (in kilobits per second) above which the stream bitrate
-    will never be allowed for any given bitrate_hard_window seconds of time.*/
-  long   bitrate_hard_max;
-/** the window period (in seconds) used to regulate the hard bitrate minimum
-    and maximum*/
-  double bitrate_hard_window;
-/** soft lower limit (in kilobits per second) below which the average bitrate
-    tracker will start nudging the bitrate higher.*/
-  long   bitrate_av_lo;
-/** soft upper limit (in kilobits per second) above which the average bitrate
-    tracker will start nudging the bitrate lower.*/
-  long   bitrate_av_hi;
-/** the window period (in seconds) used to regulate the average bitrate
-    minimum and maximum.*/
-  double bitrate_av_window;
-/** Regulates the relative centering of the average and hard windows; in
-    libvorbis 1.0 and 1.0.1, the hard window regulation overlapped but
-    followed the average window regulation. In libvorbis 1.1 a bit-reservoir
-    interface replaces the old windowing interface; the older windowing
-    interface is simulated and this field has no effect.*/
-  double bitrate_av_window_center;
-};
-
-/**
- * \name struct ovectl_ratemanage2_arg
- *
- * The ovectl_ratemanage2_arg structure is used with vorbis_encode_ctl() and
- * the OV_ECTL_RATEMANAGE2_GET and OV_ECTL_RATEMANAGE2_SET calls in order to
- * query and modify specifics of the encoder's bitrate management
- * configuration.
- *
-*/
-struct ovectl_ratemanage2_arg {
-  int    management_active; /**< nonzero if bitrate management is active */
-/** Lower allowed bitrate limit in kilobits per second */
-  long   bitrate_limit_min_kbps;
-/** Upper allowed bitrate limit in kilobits per second */
-  long   bitrate_limit_max_kbps;
-  long   bitrate_limit_reservoir_bits; /**<Size of the bitrate reservoir in bits */
-/** Regulates the bitrate reservoir's preferred fill level in a range from 0.0
- * to 1.0; 0.0 tries to bank bits to buffer against future bitrate spikes, 1.0
- * buffers against future sudden drops in instantaneous bitrate. Default is
- * 0.1
- */
-  double bitrate_limit_reservoir_bias;
-/** Average bitrate setting in kilobits per second */
-  long   bitrate_average_kbps;
-/** Slew rate limit setting for average bitrate adjustment; sets the minimum
- *  time in seconds the bitrate tracker may swing from one extreme to the
- *  other when boosting or damping average bitrate.
- */
-  double bitrate_average_damping;
-};
-
-
-/**
- * \name vorbis_encode_ctl() codes
- *
- * \anchor encctlcodes
- *
- * These values are passed as the \c number parameter of vorbis_encode_ctl().
- * The type of the referent of that function's \c arg pointer depends on these
- * codes.
- */
-/*@{*/
-
-/**
- * Query the current encoder bitrate management setting.
- *
- *Argument: <tt>struct ovectl_ratemanage2_arg *</tt>
- *
- * Used to query the current encoder bitrate management setting. Also used to
- * initialize fields of an ovectl_ratemanage2_arg structure for use with
- * \ref OV_ECTL_RATEMANAGE2_SET.
- */
-#define OV_ECTL_RATEMANAGE2_GET      0x14
-
-/**
- * Set the current encoder bitrate management settings.
- *
- * Argument: <tt>struct ovectl_ratemanage2_arg *</tt>
- *
- * Used to set the current encoder bitrate management settings to the values
- * listed in the ovectl_ratemanage2_arg. Passing a NULL pointer will disable
- * bitrate management.
-*/
-#define OV_ECTL_RATEMANAGE2_SET      0x15
-
-/**
- * Returns the current encoder hard-lowpass setting (kHz) in the double
- * pointed to by arg.
- *
- * Argument: <tt>double *</tt>
-*/
-#define OV_ECTL_LOWPASS_GET          0x20
-
-/**
- *  Sets the encoder hard-lowpass to the value (kHz) pointed to by arg. Valid
- *  lowpass settings range from 2 to 99.
- *
- * Argument: <tt>double *</tt>
-*/
-#define OV_ECTL_LOWPASS_SET          0x21
-
-/**
- *  Returns the current encoder impulse block setting in the double pointed
- *  to by arg.
- *
- * Argument: <tt>double *</tt>
-*/
-#define OV_ECTL_IBLOCK_GET           0x30
-
-/**
- *  Sets the impulse block bias to the the value pointed to by arg.
- *
- * Argument: <tt>double *</tt>
- *
- *  Valid range is -15.0 to 0.0 [default]. A negative impulse block bias will
- *  direct to encoder to use more bits when incoding short blocks that contain
- *  strong impulses, thus improving the accuracy of impulse encoding.
- */
-#define OV_ECTL_IBLOCK_SET           0x31
-
-/**
- *  Returns the current encoder coupling setting in the int pointed
- *  to by arg.
- *
- * Argument: <tt>int *</tt>
-*/
-#define OV_ECTL_COUPLING_GET         0x40
-
-/**
- *  Enables/disables channel coupling in multichannel encoding according to arg.
- *
- * Argument: <tt>int *</tt>
- *
- *  Zero disables channel coupling for multichannel inputs, nonzer enables
- *  channel coupling.  Setting has no effect on monophonic encoding or
- *  multichannel counts that do not offer coupling.  At present, coupling is
- *  available for stereo and 5.1 encoding.
- */
-#define OV_ECTL_COUPLING_SET         0x41
-
-  /* deprecated rate management supported only for compatibility */
-
-/**
- * Old interface to querying bitrate management settings.
- *
- * Deprecated after move to bit-reservoir style management in 1.1 rendered
- * this interface partially obsolete.
-
- * \deprecated Please use \ref OV_ECTL_RATEMANAGE2_GET instead.
- *
- * Argument: <tt>struct ovectl_ratemanage_arg *</tt>
- */
-#define OV_ECTL_RATEMANAGE_GET       0x10
-/**
- * Old interface to modifying bitrate management settings.
- *
- *  deprecated after move to bit-reservoir style management in 1.1 rendered
- *  this interface partially obsolete.
- *
- * \deprecated Please use \ref OV_ECTL_RATEMANAGE2_SET instead.
- *
- * Argument: <tt>struct ovectl_ratemanage_arg *</tt>
- */
-#define OV_ECTL_RATEMANAGE_SET       0x11
-/**
- * Old interface to setting average-bitrate encoding mode.
- *
- * Deprecated after move to bit-reservoir style management in 1.1 rendered
- * this interface partially obsolete.
- *
- *  \deprecated Please use \ref OV_ECTL_RATEMANAGE2_SET instead.
- *
- * Argument: <tt>struct ovectl_ratemanage_arg *</tt>
- */
-#define OV_ECTL_RATEMANAGE_AVG       0x12
-/**
- * Old interface to setting bounded-bitrate encoding modes.
- *
- * deprecated after move to bit-reservoir style management in 1.1 rendered
- * this interface partially obsolete.
- *
- *  \deprecated Please use \ref OV_ECTL_RATEMANAGE2_SET instead.
- *
- * Argument: <tt>struct ovectl_ratemanage_arg *</tt>
- */
-#define OV_ECTL_RATEMANAGE_HARD      0x13
-
-/*@}*/
-
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
diff --git a/lib-x86-64/include/vorbis/vorbisfile.h b/lib-x86-64/include/vorbis/vorbisfile.h
deleted file mode 100644
index a865cd09..00000000
--- a/lib-x86-64/include/vorbis/vorbisfile.h
+++ /dev/null
@@ -1,206 +0,0 @@
-/********************************************************************
- *                                                                  *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
- *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
- *                                                                  *
- ********************************************************************
-
- function: stdio-based convenience library for opening/seeking/decoding
- last mod: $Id: vorbisfile.h 17021 2010-03-24 09:29:41Z xiphmont $
-
- ********************************************************************/
-
-#ifndef _OV_FILE_H_
-#define _OV_FILE_H_
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#include <stdio.h>
-#include "codec.h"
-
-/* The function prototypes for the callbacks are basically the same as for
- * the stdio functions fread, fseek, fclose, ftell.
- * The one difference is that the FILE * arguments have been replaced with
- * a void * - this is to be used as a pointer to whatever internal data these
- * functions might need. In the stdio case, it's just a FILE * cast to a void *
- *
- * If you use other functions, check the docs for these functions and return
- * the right values. For seek_func(), you *MUST* return -1 if the stream is
- * unseekable
- */
-typedef struct {
-  size_t (*read_func)  (void *ptr, size_t size, size_t nmemb, void *datasource);
-  int    (*seek_func)  (void *datasource, ogg_int64_t offset, int whence);
-  int    (*close_func) (void *datasource);
-  long   (*tell_func)  (void *datasource);
-} ov_callbacks;
-
-#ifndef OV_EXCLUDE_STATIC_CALLBACKS
-
-/* a few sets of convenient callbacks, especially for use under
- * Windows where ov_open_callbacks() should always be used instead of
- * ov_open() to avoid problems with incompatible crt.o version linking
- * issues. */
-
-static int _ov_header_fseek_wrap(FILE *f,ogg_int64_t off,int whence){
-  if(f==NULL)return(-1);
-
-#ifdef __MINGW32__
-  return fseeko64(f,off,whence);
-#elif defined (_WIN32)
-  return _fseeki64(f,off,whence);
-#else
-  return fseek(f,off,whence);
-#endif
-}
-
-/* These structs below (OV_CALLBACKS_DEFAULT etc) are defined here as
- * static data. That means that every file which includes this header
- * will get its own copy of these structs whether it uses them or
- * not unless it #defines OV_EXCLUDE_STATIC_CALLBACKS.
- * These static symbols are essential on platforms such as Windows on
- * which several different versions of stdio support may be linked to
- * by different DLLs, and we need to be certain we know which one
- * we're using (the same one as the main application).
- */
-
-static ov_callbacks OV_CALLBACKS_DEFAULT = {
-  (size_t (*)(void *, size_t, size_t, void *))  fread,
-  (int (*)(void *, ogg_int64_t, int))           _ov_header_fseek_wrap,
-  (int (*)(void *))                             fclose,
-  (long (*)(void *))                            ftell
-};
-
-static ov_callbacks OV_CALLBACKS_NOCLOSE = {
-  (size_t (*)(void *, size_t, size_t, void *))  fread,
-  (int (*)(void *, ogg_int64_t, int))           _ov_header_fseek_wrap,
-  (int (*)(void *))                             NULL,
-  (long (*)(void *))                            ftell
-};
-
-static ov_callbacks OV_CALLBACKS_STREAMONLY = {
-  (size_t (*)(void *, size_t, size_t, void *))  fread,
-  (int (*)(void *, ogg_int64_t, int))           NULL,
-  (int (*)(void *))                             fclose,
-  (long (*)(void *))                            NULL
-};
-
-static ov_callbacks OV_CALLBACKS_STREAMONLY_NOCLOSE = {
-  (size_t (*)(void *, size_t, size_t, void *))  fread,
-  (int (*)(void *, ogg_int64_t, int))           NULL,
-  (int (*)(void *))                             NULL,
-  (long (*)(void *))                            NULL
-};
-
-#endif
-
-#define  NOTOPEN   0
-#define  PARTOPEN  1
-#define  OPENED    2
-#define  STREAMSET 3
-#define  INITSET   4
-
-typedef struct OggVorbis_File {
-  void            *datasource; /* Pointer to a FILE *, etc. */
-  int              seekable;
-  ogg_int64_t      offset;
-  ogg_int64_t      end;
-  ogg_sync_state   oy;
-
-  /* If the FILE handle isn't seekable (eg, a pipe), only the current
-     stream appears */
-  int              links;
-  ogg_int64_t     *offsets;
-  ogg_int64_t     *dataoffsets;
-  long            *serialnos;
-  ogg_int64_t     *pcmlengths; /* overloaded to maintain binary
-                                  compatibility; x2 size, stores both
-                                  beginning and end values */
-  vorbis_info     *vi;
-  vorbis_comment  *vc;
-
-  /* Decoding working state local storage */
-  ogg_int64_t      pcm_offset;
-  int              ready_state;
-  long             current_serialno;
-  int              current_link;
-
-  double           bittrack;
-  double           samptrack;
-
-  ogg_stream_state os; /* take physical pages, weld into a logical
-                          stream of packets */
-  vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */
-  vorbis_block     vb; /* local working space for packet->PCM decode */
-
-  ov_callbacks callbacks;
-
-} OggVorbis_File;
-
-
-extern int ov_clear(OggVorbis_File *vf);
-extern int ov_fopen(char *path,OggVorbis_File *vf);
-extern int ov_open(FILE *f,OggVorbis_File *vf,char *initial,long ibytes);
-extern int ov_open_callbacks(void *datasource, OggVorbis_File *vf,
-                char *initial, long ibytes, ov_callbacks callbacks);
-
-extern int ov_test(FILE *f,OggVorbis_File *vf,char *initial,long ibytes);
-extern int ov_test_callbacks(void *datasource, OggVorbis_File *vf,
-                char *initial, long ibytes, ov_callbacks callbacks);
-extern int ov_test_open(OggVorbis_File *vf);
-
-extern long ov_bitrate(OggVorbis_File *vf,int i);
-extern long ov_bitrate_instant(OggVorbis_File *vf);
-extern long ov_streams(OggVorbis_File *vf);
-extern long ov_seekable(OggVorbis_File *vf);
-extern long ov_serialnumber(OggVorbis_File *vf,int i);
-
-extern ogg_int64_t ov_raw_total(OggVorbis_File *vf,int i);
-extern ogg_int64_t ov_pcm_total(OggVorbis_File *vf,int i);
-extern double ov_time_total(OggVorbis_File *vf,int i);
-
-extern int ov_raw_seek(OggVorbis_File *vf,ogg_int64_t pos);
-extern int ov_pcm_seek(OggVorbis_File *vf,ogg_int64_t pos);
-extern int ov_pcm_seek_page(OggVorbis_File *vf,ogg_int64_t pos);
-extern int ov_time_seek(OggVorbis_File *vf,double pos);
-extern int ov_time_seek_page(OggVorbis_File *vf,double pos);
-
-extern int ov_raw_seek_lap(OggVorbis_File *vf,ogg_int64_t pos);
-extern int ov_pcm_seek_lap(OggVorbis_File *vf,ogg_int64_t pos);
-extern int ov_pcm_seek_page_lap(OggVorbis_File *vf,ogg_int64_t pos);
-extern int ov_time_seek_lap(OggVorbis_File *vf,double pos);
-extern int ov_time_seek_page_lap(OggVorbis_File *vf,double pos);
-
-extern ogg_int64_t ov_raw_tell(OggVorbis_File *vf);
-extern ogg_int64_t ov_pcm_tell(OggVorbis_File *vf);
-extern double ov_time_tell(OggVorbis_File *vf);
-
-extern vorbis_info *ov_info(OggVorbis_File *vf,int link);
-extern vorbis_comment *ov_comment(OggVorbis_File *vf,int link);
-
-extern long ov_read_float(OggVorbis_File *vf,float ***pcm_channels,int samples,
-                          int *bitstream);
-extern long ov_read_filter(OggVorbis_File *vf,char *buffer,int length,
-                          int bigendianp,int word,int sgned,int *bitstream,
-                          void (*filter)(float **pcm,long channels,long samples,void *filter_param),void *filter_param);
-extern long ov_read(OggVorbis_File *vf,char *buffer,int length,
-                    int bigendianp,int word,int sgned,int *bitstream);
-extern int ov_crosslap(OggVorbis_File *vf1,OggVorbis_File *vf2);
-
-extern int ov_halfrate(OggVorbis_File *vf,int flag);
-extern int ov_halfrate_p(OggVorbis_File *vf);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
-
diff --git a/lib-x86-64/include/wavpack/wavpack.h b/lib-x86-64/include/wavpack/wavpack.h
deleted file mode 100644
index fe66dcbc..00000000
--- a/lib-x86-64/include/wavpack/wavpack.h
+++ /dev/null
@@ -1,302 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-//                           **** WAVPACK ****                            //
-//                  Hybrid Lossless Wavefile Compressor                   //
-//              Copyright (c) 1998 - 2006 Conifer Software.               //
-//                          All Rights Reserved.                          //
-//      Distributed under the BSD Software License (see license.txt)      //
-////////////////////////////////////////////////////////////////////////////
-
-// wavpack.h
-
-#ifndef WAVPACK_H
-#define WAVPACK_H
-
-// This header file contains all the definitions required to use the
-// functions in "wputils.c" to read and write WavPack files and streams.
-
-#include <sys/types.h>
-
-#if defined(_WIN32) && !defined(__MINGW32__)
-#include <stdlib.h>
-typedef unsigned __int64 uint64_t;
-typedef unsigned __int32 uint32_t;
-typedef unsigned __int16 uint16_t;
-typedef unsigned __int8 uint8_t;
-typedef __int64 int64_t;
-typedef __int32 int32_t;
-typedef __int16 int16_t;
-typedef __int8  int8_t;
-typedef float float32_t;
-#else
-#include <inttypes.h>
-#endif
-
-// RIFF / wav header formats (these occur at the beginning of both wav files
-// and pre-4.0 WavPack files that are not in the "raw" mode). Generally, an
-// application using the library to read or write WavPack files will not be
-// concerned with any of these.
-
-typedef struct {
-    char ckID [4];
-    uint32_t ckSize;
-    char formType [4];
-} RiffChunkHeader;
-
-typedef struct {
-    char ckID [4];
-    uint32_t ckSize;
-} ChunkHeader;
-
-#define ChunkHeaderFormat "4L"
-
-typedef struct {
-    unsigned short FormatTag, NumChannels;
-    uint32_t SampleRate, BytesPerSecond;
-    unsigned short BlockAlign, BitsPerSample;
-    unsigned short cbSize, ValidBitsPerSample;
-    int32_t ChannelMask;
-    unsigned short SubFormat;
-    char GUID [14];
-} WaveHeader;
-
-#define WaveHeaderFormat "SSLLSSSSLS"
-
-// This is the ONLY structure that occurs in WavPack files (as of version
-// 4.0), and is the preamble to every block in both the .wv and .wvc
-// files (in little-endian format). Normally, this structure has no use
-// to an application using the library to read or write WavPack files,
-// but if an application needs to manually parse WavPack files then this
-// would be used (with appropriate endian correction).
-
-typedef struct {
-    char ckID [4];
-    uint32_t ckSize;
-    short version;
-    unsigned char track_no, index_no;
-    uint32_t total_samples, block_index, block_samples, flags, crc;
-} WavpackHeader;
-
-#define WavpackHeaderFormat "4LS2LLLLL"
-
-// or-values for WavpackHeader.flags
-#define BYTES_STORED    3       // 1-4 bytes/sample
-#define MONO_FLAG       4       // not stereo
-#define HYBRID_FLAG     8       // hybrid mode
-#define JOINT_STEREO    0x10    // joint stereo
-#define CROSS_DECORR    0x20    // no-delay cross decorrelation
-#define HYBRID_SHAPE    0x40    // noise shape (hybrid mode only)
-#define FLOAT_DATA      0x80    // ieee 32-bit floating point data
-
-#define INT32_DATA      0x100   // special extended int handling
-#define HYBRID_BITRATE  0x200   // bitrate noise (hybrid mode only)
-#define HYBRID_BALANCE  0x400   // balance noise (hybrid stereo mode only)
-
-#define INITIAL_BLOCK   0x800   // initial block of multichannel segment
-#define FINAL_BLOCK     0x1000  // final block of multichannel segment
-
-#define SHIFT_LSB       13
-#define SHIFT_MASK      (0x1fL << SHIFT_LSB)
-
-#define MAG_LSB         18
-#define MAG_MASK        (0x1fL << MAG_LSB)
-
-#define SRATE_LSB       23
-#define SRATE_MASK      (0xfL << SRATE_LSB)
-
-#define FALSE_STEREO    0x40000000      // block is stereo, but data is mono
-
-#define IGNORED_FLAGS   0x18000000      // reserved, but ignore if encountered
-#define NEW_SHAPING     0x20000000      // use IIR filter for negative shaping
-#define UNKNOWN_FLAGS   0x80000000      // also reserved, but refuse decode if
-                                        //  encountered
-
-#define MONO_DATA (MONO_FLAG | FALSE_STEREO)
-
-#define MIN_STREAM_VERS     0x402       // lowest stream version we'll decode
-#define MAX_STREAM_VERS     0x410       // highest stream version we'll decode or encode
-#define CUR_STREAM_VERS     0x407       // stream version we are writing now
-
-// These are the mask bit definitions for the metadata chunk id byte (see format.txt)
-
-#define ID_UNIQUE               0x3f
-#define ID_OPTIONAL_DATA        0x20
-#define ID_ODD_SIZE             0x40
-#define ID_LARGE                0x80
-
-#define ID_DUMMY                0x0
-#define ID_ENCODER_INFO         0x1
-#define ID_DECORR_TERMS         0x2
-#define ID_DECORR_WEIGHTS       0x3
-#define ID_DECORR_SAMPLES       0x4
-#define ID_ENTROPY_VARS         0x5
-#define ID_HYBRID_PROFILE       0x6
-#define ID_SHAPING_WEIGHTS      0x7
-#define ID_FLOAT_INFO           0x8
-#define ID_INT32_INFO           0x9
-#define ID_WV_BITSTREAM         0xa
-#define ID_WVC_BITSTREAM        0xb
-#define ID_WVX_BITSTREAM        0xc
-#define ID_CHANNEL_INFO         0xd
-
-#define ID_RIFF_HEADER          (ID_OPTIONAL_DATA | 0x1)
-#define ID_RIFF_TRAILER         (ID_OPTIONAL_DATA | 0x2)
-#define ID_REPLAY_GAIN          (ID_OPTIONAL_DATA | 0x3)    // never used (APEv2)
-#define ID_CUESHEET             (ID_OPTIONAL_DATA | 0x4)    // never used (APEv2)
-#define ID_CONFIG_BLOCK         (ID_OPTIONAL_DATA | 0x5)
-#define ID_MD5_CHECKSUM         (ID_OPTIONAL_DATA | 0x6)
-#define ID_SAMPLE_RATE          (ID_OPTIONAL_DATA | 0x7)
-
-///////////////////////// WavPack Configuration ///////////////////////////////
-
-// This external structure is used during encode to provide configuration to
-// the encoding engine and during decoding to provide fle information back to
-// the higher level functions. Not all fields are used in both modes.
-
-typedef struct {
-    float bitrate, shaping_weight;
-    int bits_per_sample, bytes_per_sample;
-    int qmode, flags, xmode, num_channels, float_norm_exp;
-    int32_t block_samples, extra_flags, sample_rate, channel_mask;
-    unsigned char md5_checksum [16], md5_read;
-    int num_tag_strings;
-    char **tag_strings;
-} WavpackConfig;
-
-#define CONFIG_HYBRID_FLAG      8       // hybrid mode
-#define CONFIG_JOINT_STEREO     0x10    // joint stereo
-#define CONFIG_HYBRID_SHAPE     0x40    // noise shape (hybrid mode only)
-#define CONFIG_FAST_FLAG        0x200   // fast mode
-#define CONFIG_HIGH_FLAG        0x800   // high quality mode
-#define CONFIG_VERY_HIGH_FLAG   0x1000  // very high
-#define CONFIG_BITRATE_KBPS     0x2000  // bitrate is kbps, not bits / sample
-#define CONFIG_SHAPE_OVERRIDE   0x8000  // shaping mode specified
-#define CONFIG_JOINT_OVERRIDE   0x10000 // joint-stereo mode specified
-#define CONFIG_DYNAMIC_SHAPING  0x20000 // dynamic noise shaping
-#define CONFIG_CREATE_EXE       0x40000 // create executable
-#define CONFIG_CREATE_WVC       0x80000 // create correction file
-#define CONFIG_OPTIMIZE_WVC     0x100000 // maximize bybrid compression
-#define CONFIG_CALC_NOISE       0x800000 // calc noise in hybrid mode
-#define CONFIG_EXTRA_MODE       0x2000000 // extra processing mode
-#define CONFIG_SKIP_WVX         0x4000000 // no wvx stream w/ floats & big ints
-#define CONFIG_MD5_CHECKSUM     0x8000000 // store MD5 signature
-#define CONFIG_MERGE_BLOCKS     0x10000000 // merge blocks of equal redundancy (for lossyWAV)
-#define CONFIG_PAIR_UNDEF_CHANS 0x20000000 // encode undefined channels in stereo pairs
-#define CONFIG_OPTIMIZE_MONO    0x80000000 // optimize for mono streams posing as stereo
-
-////////////// Callbacks used for reading & writing WavPack streams //////////
-
-typedef struct {
-    int32_t (*read_bytes)(void *id, void *data, int32_t bcount);
-    uint32_t (*get_pos)(void *id);
-    int (*set_pos_abs)(void *id, uint32_t pos);
-    int (*set_pos_rel)(void *id, int32_t delta, int mode);
-    int (*push_back_byte)(void *id, int c);
-    uint32_t (*get_length)(void *id);
-    int (*can_seek)(void *id);
-
-    // this callback is for writing edited tags only
-    int32_t (*write_bytes)(void *id, void *data, int32_t bcount);
-} WavpackStreamReader;
-
-typedef int (*WavpackBlockOutput)(void *id, void *data, int32_t bcount);
-
-//////////////////////////// function prototypes /////////////////////////////
-
-// Note: See wputils.c sourcecode for descriptions for using these functions.
-
-typedef void WavpackContext;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-WavpackContext *WavpackOpenFileInputEx (WavpackStreamReader *reader, void *wv_id, void *wvc_id, char *error, int flags, int norm_offset);
-WavpackContext *WavpackOpenFileInput (const char *infilename, char *error, int flags, int norm_offset);
-
-#define OPEN_WVC        0x1     // open/read "correction" file
-#define OPEN_TAGS       0x2     // read ID3v1 / APEv2 tags (seekable file)
-#define OPEN_WRAPPER    0x4     // make audio wrapper available (i.e. RIFF)
-#define OPEN_2CH_MAX    0x8     // open multichannel as stereo (no downmix)
-#define OPEN_NORMALIZE  0x10    // normalize floating point data to +/- 1.0
-#define OPEN_STREAMING  0x20    // "streaming" mode blindly unpacks blocks
-                                // w/o regard to header file position info
-#define OPEN_EDIT_TAGS  0x40    // allow editing of tags
-
-int WavpackGetMode (WavpackContext *wpc);
-
-#define MODE_WVC        0x1
-#define MODE_LOSSLESS   0x2
-#define MODE_HYBRID     0x4
-#define MODE_FLOAT      0x8
-#define MODE_VALID_TAG  0x10
-#define MODE_HIGH       0x20
-#define MODE_FAST       0x40
-#define MODE_EXTRA      0x80    // extra mode used, see MODE_XMODE for possible level
-#define MODE_APETAG     0x100
-#define MODE_SFX        0x200
-#define MODE_VERY_HIGH  0x400
-#define MODE_MD5        0x800
-#define MODE_XMODE      0x7000  // mask for extra level (1-6, 0=unknown)
-#define MODE_DNS        0x8000
-
-char *WavpackGetErrorMessage (WavpackContext *wpc);
-int WavpackGetVersion (WavpackContext *wpc);
-uint32_t WavpackUnpackSamples (WavpackContext *wpc, int32_t *buffer, uint32_t samples);
-uint32_t WavpackGetNumSamples (WavpackContext *wpc);
-uint32_t WavpackGetSampleIndex (WavpackContext *wpc);
-int WavpackGetNumErrors (WavpackContext *wpc);
-int WavpackLossyBlocks (WavpackContext *wpc);
-int WavpackSeekSample (WavpackContext *wpc, uint32_t sample);
-WavpackContext *WavpackCloseFile (WavpackContext *wpc);
-uint32_t WavpackGetSampleRate (WavpackContext *wpc);
-int WavpackGetBitsPerSample (WavpackContext *wpc);
-int WavpackGetBytesPerSample (WavpackContext *wpc);
-int WavpackGetNumChannels (WavpackContext *wpc);
-int WavpackGetChannelMask (WavpackContext *wpc);
-int WavpackGetReducedChannels (WavpackContext *wpc);
-int WavpackGetFloatNormExp (WavpackContext *wpc);
-int WavpackGetMD5Sum (WavpackContext *wpc, unsigned char data [16]);
-uint32_t WavpackGetWrapperBytes (WavpackContext *wpc);
-unsigned char *WavpackGetWrapperData (WavpackContext *wpc);
-void WavpackFreeWrapper (WavpackContext *wpc);
-void WavpackSeekTrailingWrapper (WavpackContext *wpc);
-double WavpackGetProgress (WavpackContext *wpc);
-uint32_t WavpackGetFileSize (WavpackContext *wpc);
-double WavpackGetRatio (WavpackContext *wpc);
-double WavpackGetAverageBitrate (WavpackContext *wpc, int count_wvc);
-double WavpackGetInstantBitrate (WavpackContext *wpc);
-int WavpackGetNumTagItems (WavpackContext *wpc);
-int WavpackGetTagItem (WavpackContext *wpc, const char *item, char *value, int size);
-int WavpackGetTagItemIndexed (WavpackContext *wpc, int index, char *item, int size);
-int WavpackGetNumBinaryTagItems (WavpackContext *wpc);
-int WavpackGetBinaryTagItem (WavpackContext *wpc, const char *item, char *value, int size);
-int WavpackGetBinaryTagItemIndexed (WavpackContext *wpc, int index, char *item, int size);
-int WavpackAppendTagItem (WavpackContext *wpc, const char *item, const char *value, int vsize);
-int WavpackAppendBinaryTagItem (WavpackContext *wpc, const char *item, const char *value, int vsize);
-int WavpackDeleteTagItem (WavpackContext *wpc, const char *item);
-int WavpackWriteTag (WavpackContext *wpc);
-
-WavpackContext *WavpackOpenFileOutput (WavpackBlockOutput blockout, void *wv_id, void *wvc_id);
-int WavpackSetConfiguration (WavpackContext *wpc, WavpackConfig *config, uint32_t total_samples);
-int WavpackAddWrapper (WavpackContext *wpc, void *data, uint32_t bcount);
-int WavpackStoreMD5Sum (WavpackContext *wpc, unsigned char data [16]);
-int WavpackPackInit (WavpackContext *wpc);
-int WavpackPackSamples (WavpackContext *wpc, int32_t *sample_buffer, uint32_t sample_count);
-int WavpackFlushSamples (WavpackContext *wpc);
-void WavpackUpdateNumSamples (WavpackContext *wpc, void *first_block);
-void *WavpackGetWrapperLocation (void *first_block, uint32_t *size);
-double WavpackGetEncodedNoise (WavpackContext *wpc, double *peak);
-
-void WavpackFloatNormalize (int32_t *values, int32_t num_values, int delta_exp);
-
-void WavpackLittleEndianToNative (void *data, char *format);
-void WavpackNativeToLittleEndian (void *data, char *format);
-
-uint32_t WavpackGetLibraryVersion (void);
-const char *WavpackGetLibraryVersionString (void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib-x86-64/include/zconf.h b/lib-x86-64/include/zconf.h
deleted file mode 100644
index b2343874..00000000
--- a/lib-x86-64/include/zconf.h
+++ /dev/null
@@ -1,428 +0,0 @@
-/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2010 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 */
-
-/* all linked symbols */
-#  define _dist_code            z__dist_code
-#  define _length_code          z__length_code
-#  define _tr_align             z__tr_align
-#  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
-#  define compress              z_compress
-#  define compress2             z_compress2
-#  define compressBound         z_compressBound
-#  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 deflatePrime          z_deflatePrime
-#  define deflateReset          z_deflateReset
-#  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
-#  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 gzgets                z_gzgets
-#  define gzoffset              z_gzoffset
-#  define gzoffset64            z_gzoffset64
-#  define gzopen                z_gzopen
-#  define gzopen64              z_gzopen64
-#  define gzprintf              z_gzprintf
-#  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
-#  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 inflateSync           z_inflateSync
-#  define inflateSyncPoint      z_inflateSyncPoint
-#  define inflateUndermine      z_inflateUndermine
-#  define inflate_copyright     z_inflate_copyright
-#  define inflate_fast          z_inflate_fast
-#  define inflate_table         z_inflate_table
-#  define uncompress            z_uncompress
-#  define zError                z_zError
-#  define zcalloc               z_zcalloc
-#  define zcfree                z_zcfree
-#  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
-#  define gzFile                z_gzFile
-#  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
-
-/* 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
-
-/* 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 1    /* was set to #if 1 by ./configure */
-#  define Z_HAVE_UNISTD_H
-#endif
-
-#ifdef STDC
-#  include <sys/types.h>    /* for off_t */
-#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 -_LARGEFILE64_SOURCE - -1 == 1
-#  undef _LARGEFILE64_SOURCE
-#endif
-
-#if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
-#  include <unistd.h>       /* for SEEK_* and off_t */
-#  ifdef VMS
-#    include <unixio.h>     /* for off_t */
-#  endif
-#  ifndef z_off_t
-#    define z_off_t off_t
-#  endif
-#endif
-
-#ifndef SEEK_SET
-#  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(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
-#  define z_off64_t off64_t
-#else
-#  define z_off64_t z_off_t
-#endif
-
-#if defined(__OS400__)
-#  define NO_vsnprintf
-#endif
-
-#if defined(__MVS__)
-#  define NO_vsnprintf
-#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/lib-x86-64/include/zip.h b/lib-x86-64/include/zip.h
deleted file mode 100644
index f8b55ac0..00000000
--- a/lib-x86-64/include/zip.h
+++ /dev/null
@@ -1,274 +0,0 @@
-#ifndef _HAD_ZIP_H
-#define _HAD_ZIP_H
-
-/*
-  zip.h -- exported declarations.
-  Copyright (C) 1999-2011 Dieter Baron and Thomas Klausner
-
-  This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <libzip@nih.at>
-
-  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.
-  3. The names of the authors may not be used to endorse or promote
-     products derived from this software without specific prior
-     written permission.
- 
-  THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``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 AUTHORS 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 ZIP_EXTERN
-#ifdef _WIN32
-#define ZIP_EXTERN __declspec(dllimport)
-#else
-#define ZIP_EXTERN
-#endif
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <zipconf.h>
-
-#include <sys/types.h>
-#include <stdio.h>
-#include <time.h>
-
-/* flags for zip_open */
-
-#define ZIP_CREATE           1
-#define ZIP_EXCL             2
-#define ZIP_CHECKCONS        4
-
-
-/* flags for zip_name_locate, zip_fopen, zip_stat, ... */
-
-#define ZIP_FL_NOCASE		1 /* ignore case on name lookup */
-#define ZIP_FL_NODIR		2 /* ignore directory component */
-#define ZIP_FL_COMPRESSED	4 /* read compressed data */
-#define ZIP_FL_UNCHANGED	8 /* use original data, ignoring changes */
-#define ZIP_FL_RECOMPRESS      16 /* force recompression of data */
-#define ZIP_FL_ENCRYPTED       32 /* read encrypted data
-				     (implies ZIP_FL_COMPRESSED) */
-
-/* archive global flags flags */
-
-#define ZIP_AFL_TORRENT		1 /* torrent zipped */
-#define ZIP_AFL_RDONLY		2 /* read only -- cannot be cleared */
-
-
-/* flags for compression and encryption sources */
-
-#define ZIP_CODEC_ENCODE	1 /* compress/encrypt */
-
-
-/* libzip error codes */
-
-#define ZIP_ER_OK             0  /* N No error */
-#define ZIP_ER_MULTIDISK      1  /* N Multi-disk zip archives not supported */
-#define ZIP_ER_RENAME         2  /* S Renaming temporary file failed */
-#define ZIP_ER_CLOSE          3  /* S Closing zip archive failed */
-#define ZIP_ER_SEEK           4  /* S Seek error */
-#define ZIP_ER_READ           5  /* S Read error */
-#define ZIP_ER_WRITE          6  /* S Write error */
-#define ZIP_ER_CRC            7  /* N CRC error */
-#define ZIP_ER_ZIPCLOSED      8  /* N Containing zip archive was closed */
-#define ZIP_ER_NOENT          9  /* N No such file */
-#define ZIP_ER_EXISTS        10  /* N File already exists */
-#define ZIP_ER_OPEN          11  /* S Can't open file */
-#define ZIP_ER_TMPOPEN       12  /* S Failure to create temporary file */
-#define ZIP_ER_ZLIB          13  /* Z Zlib error */
-#define ZIP_ER_MEMORY        14  /* N Malloc failure */
-#define ZIP_ER_CHANGED       15  /* N Entry has been changed */
-#define ZIP_ER_COMPNOTSUPP   16  /* N Compression method not supported */
-#define ZIP_ER_EOF           17  /* N Premature EOF */
-#define ZIP_ER_INVAL         18  /* N Invalid argument */
-#define ZIP_ER_NOZIP         19  /* N Not a zip archive */
-#define ZIP_ER_INTERNAL      20  /* N Internal error */
-#define ZIP_ER_INCONS        21  /* N Zip archive inconsistent */
-#define ZIP_ER_REMOVE        22  /* S Can't remove file */
-#define ZIP_ER_DELETED       23  /* N Entry has been deleted */
-#define ZIP_ER_ENCRNOTSUPP   24  /* N Encryption method not supported */
-#define ZIP_ER_RDONLY        25  /* N Read-only archive */ 
-#define ZIP_ER_NOPASSWD      26  /* N No password provided */
-#define ZIP_ER_WRONGPASSWD   27  /* N Wrong password provided */
-
-/* type of system error value */
-
-#define ZIP_ET_NONE	      0  /* sys_err unused */
-#define ZIP_ET_SYS	      1  /* sys_err is errno */
-#define ZIP_ET_ZLIB	      2  /* sys_err is zlib error code */
-
-/* compression methods */
-
-#define ZIP_CM_DEFAULT	      -1  /* better of deflate or store */
-#define ZIP_CM_STORE	       0  /* stored (uncompressed) */
-#define ZIP_CM_SHRINK	       1  /* shrunk */
-#define ZIP_CM_REDUCE_1	       2  /* reduced with factor 1 */
-#define ZIP_CM_REDUCE_2	       3  /* reduced with factor 2 */
-#define ZIP_CM_REDUCE_3	       4  /* reduced with factor 3 */
-#define ZIP_CM_REDUCE_4	       5  /* reduced with factor 4 */
-#define ZIP_CM_IMPLODE	       6  /* imploded */
-/* 7 - Reserved for Tokenizing compression algorithm */
-#define ZIP_CM_DEFLATE	       8  /* deflated */
-#define ZIP_CM_DEFLATE64       9  /* deflate64 */
-#define ZIP_CM_PKWARE_IMPLODE 10  /* PKWARE imploding */
-/* 11 - Reserved by PKWARE */
-#define ZIP_CM_BZIP2          12  /* compressed using BZIP2 algorithm */
-/* 13 - Reserved by PKWARE */
-#define ZIP_CM_LZMA	      14  /* LZMA (EFS) */
-/* 15-17 - Reserved by PKWARE */
-#define ZIP_CM_TERSE	      18  /* compressed using IBM TERSE (new) */
-#define ZIP_CM_LZ77           19  /* IBM LZ77 z Architecture (PFS) */
-#define ZIP_CM_WAVPACK	      97  /* WavPack compressed data */
-#define ZIP_CM_PPMD	      98  /* PPMd version I, Rev 1 */
-
-/* encryption methods */
-
-#define ZIP_EM_NONE	       0  /* not encrypted */
-#define ZIP_EM_TRAD_PKWARE     1  /* traditional PKWARE encryption */
-#if 0 /* Strong Encryption Header not parsed yet */
-#define ZIP_EM_DES        0x6601  /* strong encryption: DES */
-#define ZIP_EM_RC2_OLD    0x6602  /* strong encryption: RC2, version < 5.2 */
-#define ZIP_EM_3DES_168   0x6603
-#define ZIP_EM_3DES_112   0x6609
-#define ZIP_EM_AES_128    0x660e
-#define ZIP_EM_AES_192    0x660f
-#define ZIP_EM_AES_256    0x6610
-#define ZIP_EM_RC2        0x6702  /* strong encryption: RC2, version >= 5.2 */
-#define ZIP_EM_RC4        0x6801
-#endif
-#define ZIP_EM_UNKNOWN    0xffff  /* unknown algorithm */
-
-
-
-enum zip_source_cmd {
-    ZIP_SOURCE_OPEN,	/* prepare for reading */
-    ZIP_SOURCE_READ, 	/* read data */
-    ZIP_SOURCE_CLOSE,	/* reading is done */
-    ZIP_SOURCE_STAT,	/* get meta information */
-    ZIP_SOURCE_ERROR,	/* get error information */
-    ZIP_SOURCE_FREE	/* cleanup and free resources */
-};
-
-#define ZIP_SOURCE_ERR_LOWER	-2
-
-#define ZIP_STAT_NAME			0x0001
-#define ZIP_STAT_INDEX			0x0002
-#define ZIP_STAT_SIZE			0x0004
-#define ZIP_STAT_COMP_SIZE		0x0008
-#define ZIP_STAT_MTIME			0x0010
-#define ZIP_STAT_CRC			0x0020
-#define ZIP_STAT_COMP_METHOD		0x0040
-#define ZIP_STAT_ENCRYPTION_METHOD	0x0080
-#define ZIP_STAT_FLAGS			0x0100
-
-struct zip_stat {
-    zip_uint64_t valid;			/* which fields have valid values */
-    const char *name;			/* name of the file */
-    zip_uint64_t index;			/* index within archive */
-    zip_uint64_t size;			/* size of file (uncompressed) */
-    zip_uint64_t comp_size;		/* size of file (compressed) */
-    time_t mtime;			/* modification time */
-    zip_uint32_t crc;			/* crc of file data */
-    zip_uint16_t comp_method;		/* compression method used */
-    zip_uint16_t encryption_method;	/* encryption method used */
-    zip_uint32_t flags;			/* reserved for future use */
-};
-
-struct zip;
-struct zip_file;
-struct zip_source;
-
-typedef zip_int64_t (*zip_source_callback)(void *, void *, zip_uint64_t,
-					   enum zip_source_cmd);
-
-
-
-ZIP_EXTERN zip_int64_t zip_add(struct zip *, const char *, struct zip_source *);
-ZIP_EXTERN zip_int64_t zip_add_dir(struct zip *, const char *);
-ZIP_EXTERN int zip_close(struct zip *);
-ZIP_EXTERN int zip_delete(struct zip *, zip_uint64_t);
-ZIP_EXTERN void zip_error_clear(struct zip *);
-ZIP_EXTERN void zip_error_get(struct zip *, int *, int *);
-ZIP_EXTERN int zip_error_get_sys_type(int);
-ZIP_EXTERN int zip_error_to_str(char *, zip_uint64_t, int, int);
-ZIP_EXTERN int zip_fclose(struct zip_file *);
-ZIP_EXTERN struct zip *zip_fdopen(int, int, int *);
-ZIP_EXTERN void zip_file_error_clear(struct zip_file *);
-ZIP_EXTERN void zip_file_error_get(struct zip_file *, int *, int *);
-ZIP_EXTERN const char *zip_file_strerror(struct zip_file *);
-ZIP_EXTERN struct zip_file *zip_fopen(struct zip *, const char *, int);
-ZIP_EXTERN struct zip_file *zip_fopen_encrypted(struct zip *, const char *,
-						int, const char *);
-ZIP_EXTERN struct zip_file *zip_fopen_index(struct zip *, zip_uint64_t, int);
-ZIP_EXTERN struct zip_file *zip_fopen_index_encrypted(struct zip *,
-						      zip_uint64_t, int,
-						      const char *);
-ZIP_EXTERN zip_int64_t zip_fread(struct zip_file *, void *, zip_uint64_t);
-ZIP_EXTERN const char *zip_get_archive_comment(struct zip *, int *, int);
-ZIP_EXTERN int zip_get_archive_flag(struct zip *, int, int);
-ZIP_EXTERN const char *zip_get_file_comment(struct zip *, zip_uint64_t,
-					    int *, int);
-ZIP_EXTERN const char *zip_get_file_extra(struct zip *, zip_uint64_t,
-					  int *, int);
-ZIP_EXTERN const char *zip_get_name(struct zip *, zip_uint64_t, int);
-ZIP_EXTERN zip_uint64_t zip_get_num_entries(struct zip *, int);
-ZIP_EXTERN int zip_get_num_files(struct zip *);  /* deprecated, use zip_get_num_entries instead */
-ZIP_EXTERN int zip_name_locate(struct zip *, const char *, int);
-ZIP_EXTERN struct zip *zip_open(const char *, int, int *);
-ZIP_EXTERN int zip_rename(struct zip *, zip_uint64_t, const char *);
-ZIP_EXTERN int zip_replace(struct zip *, zip_uint64_t, struct zip_source *);
-ZIP_EXTERN int zip_set_archive_comment(struct zip *, const char *, int);
-ZIP_EXTERN int zip_set_archive_flag(struct zip *, int, int);
-ZIP_EXTERN int zip_set_default_password(struct zip *, const char *);
-ZIP_EXTERN int zip_set_file_comment(struct zip *, zip_uint64_t,
-				    const char *, int);
-ZIP_EXTERN int zip_set_file_extra(struct zip *, zip_uint64_t,
-				  const char *, int);
-ZIP_EXTERN struct zip_source *zip_source_buffer(struct zip *, const void *,
-						zip_uint64_t, int);
-ZIP_EXTERN struct zip_source *zip_source_file(struct zip *, const char *,
-					      zip_uint64_t, zip_int64_t);
-ZIP_EXTERN struct zip_source *zip_source_filep(struct zip *, FILE *,
-					       zip_uint64_t, zip_int64_t);
-ZIP_EXTERN void zip_source_free(struct zip_source *);
-ZIP_EXTERN struct zip_source *zip_source_function(struct zip *,
-						  zip_source_callback, void *);
-ZIP_EXTERN struct zip_source *zip_source_zip(struct zip *, struct zip *,
-					     zip_uint64_t, int,
-					     zip_uint64_t, zip_int64_t);
-ZIP_EXTERN int zip_stat(struct zip *, const char *, int, struct zip_stat *);
-ZIP_EXTERN int zip_stat_index(struct zip *, zip_uint64_t, int,
-			      struct zip_stat *);
-ZIP_EXTERN void zip_stat_init(struct zip_stat *);
-ZIP_EXTERN const char *zip_strerror(struct zip *);
-ZIP_EXTERN int zip_unchange(struct zip *, zip_uint64_t);
-ZIP_EXTERN int zip_unchange_all(struct zip *);
-ZIP_EXTERN int zip_unchange_archive(struct zip *);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _HAD_ZIP_H */
diff --git a/lib-x86-64/include/zipconf.h b/lib-x86-64/include/zipconf.h
deleted file mode 100644
index 95960941..00000000
--- a/lib-x86-64/include/zipconf.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef _HAD_ZIPCONF_H
-#define _HAD_ZIPCONF_H
-
-/*
-   zipconf.h -- platform specific include file
-
-   This file was generated automatically by ./make_zipconf.sh
-   based on ../config.h.
- */
-
-#define LIBZIP_VERSION "0.10"
-#define LIBZIP_VERSION_MAJOR 0
-#define LIBZIP_VERSION_MINOR 10
-#define LIBZIP_VERSION_MICRO 0
-
-#include <inttypes.h>
-
-typedef int8_t zip_int8_t;
-#define ZIP_INT8_MIN INT8_MIN
-#define ZIP_INT8_MAX INT8_MAX
-
-typedef uint8_t zip_uint8_t;
-#define ZIP_UINT8_MAX UINT8_MAX
-
-typedef int16_t zip_int16_t;
-#define ZIP_INT16_MIN INT16_MIN
-#define ZIP_INT16_MAX INT16_MAX
-
-typedef uint16_t zip_uint16_t;
-#define ZIP_UINT16_MAX UINT16_MAX
-
-typedef int32_t zip_int32_t;
-#define ZIP_INT32_MIN INT32_MIN
-#define ZIP_INT32_MAX INT32_MAX
-
-typedef uint32_t zip_uint32_t;
-#define ZIP_UINT32_MAX UINT32_MAX
-
-typedef int64_t zip_int64_t;
-#define ZIP_INT64_MIN INT64_MIN
-#define ZIP_INT64_MAX INT64_MAX
-
-typedef uint64_t zip_uint64_t;
-#define ZIP_UINT64_MAX UINT64_MAX
-
-
-#endif /* zipconf.h */
diff --git a/lib-x86-64/include/zlib.h b/lib-x86-64/include/zlib.h
deleted file mode 100644
index bfbba83e..00000000
--- a/lib-x86-64/include/zlib.h
+++ /dev/null
@@ -1,1613 +0,0 @@
-/* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.5, April 19th, 2010
-
-  Copyright (C) 1995-2010 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://www.ietf.org/rfc/rfc1950.txt
-  (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
-*/
-
-#ifndef ZLIB_H
-#define ZLIB_H
-
-#include "zconf.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define ZLIB_VERSION "1.2.5"
-#define ZLIB_VERNUM 0x1250
-#define ZLIB_VER_MAJOR 1
-#define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 5
-#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 {
-    Bytef    *next_in;  /* next input byte */
-    uInt     avail_in;  /* number of bytes available at next_in */
-    uLong    total_in;  /* total nb 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 nb of bytes output so far */
-
-    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).  If deflate does not return
-  Z_STREAM_END, then 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 the uncompressed data.  (The size
-  of the uncompressed data may have been saved by the compressor for this
-  purpose.) The next operation on this stream must be inflateEnd to deallocate
-  the decompression state.  The use of Z_FINISH is never required, but can be
-  used to inform inflate that a faster approach may be used for the single
-  inflate() call.
-
-     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 only effect of the flush parameter in this implementation
-  is on the return value of inflate(), as noted below, or when it returns early
-  because Z_BLOCK or Z_TREES is used.
-
-     If a preset dictionary is needed after this call (see inflateSetDictionary
-  below), inflate sets strm->adler to the adler32 checksum of the dictionary
-  chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
-  strm->adler to the adler32 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.
-
-    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.  This function must be called
-   immediately after deflateInit, deflateInit2 or deflateReset, before any call
-   of deflate.  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 the compression method is bsort).  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().
-*/
-
-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, 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
-   immediately after inflateInit2() or inflateReset() and before any call of
-   inflate() to set the dictionary.  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 inflateSync OF((z_streamp strm));
-/*
-     Skips invalid compressed data until a full flush point (see above the
-   description of deflate with Z_FULL_FLUSH) can be found, or until all
-   available input is skipped.  No output is provided.
-
-     inflateSync returns Z_OK if a 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 paramaters 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 *, 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 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.  This
-   function 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)
- */
-
-
-                        /* 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.
-*/
-
-
-                        /* 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 voidp gzFile;       /* 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.) Also "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.
-
-     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.
-
-     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.
-
-     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 was not in gzip format, gzread copies the given number of
-   bytes into the buffer.
-
-     After reaching the end of a gzip stream in the input, gzread will continue
-   to read, looking for another gzip stream, or failing that, reading the rest
-   of the input file directly without decompression.  The entire input file
-   will be read if gzread is called until it returns less than the requested
-   len.
-
-     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 OF((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.
-*/
-
-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.  This state can change from
-   false to true while reading the input file if the end of a gzip stream is
-   reached, but is followed by data that is not another gzip stream.
-
-     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().
-*/
-
-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, 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.
-*/
-
-
-                        /* 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.
-*/
-
-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 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, sizeof(z_stream))
-#define inflateInit(strm) \
-        inflateInit_((strm),                ZLIB_VERSION, sizeof(z_stream))
-#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
-        deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-                      (strategy),           ZLIB_VERSION, sizeof(z_stream))
-#define inflateInit2(strm, windowBits) \
-        inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
-#define inflateBackInit(strm, windowBits, window) \
-        inflateBackInit_((strm), (windowBits), (window), \
-                                            ZLIB_VERSION, sizeof(z_stream))
-
-/* 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
- */
-#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
-   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) && _FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0
-#  define gzopen gzopen64
-#  define gzseek gzseek64
-#  define gztell gztell64
-#  define gzoffset gzoffset64
-#  define adler32_combine adler32_combine64
-#  define crc32_combine crc32_combine64
-#  ifdef _LARGEFILE64_SOURCE
-     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
-
-/* 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 uLongf * ZEXPORT get_crc_table    OF((void));
-ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ZLIB_H */
diff --git a/lib-x86-64/lib/dbus-1.0/include/dbus/dbus-arch-deps.h b/lib-x86-64/lib/dbus-1.0/include/dbus/dbus-arch-deps.h
deleted file mode 100644
index ac4bdf39..00000000
--- a/lib-x86-64/lib/dbus-1.0/include/dbus/dbus-arch-deps.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu" -*- */
-/* dbus-arch-deps.h Header with architecture/compiler specific information, installed to libdir
- *
- * Copyright (C) 2003 Red Hat, Inc.
- *
- * Licensed under the Academic Free License version 2.0
- * 
- * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#if !defined (DBUS_INSIDE_DBUS_H) && !defined (DBUS_COMPILATION)
-#error "Only <dbus/dbus.h> can be included directly, this file may disappear or change contents."
-#endif
-
-#ifndef DBUS_ARCH_DEPS_H
-#define DBUS_ARCH_DEPS_H
-
-#include <dbus/dbus-macros.h>
-
-DBUS_BEGIN_DECLS
-
-#if 1
-#define DBUS_HAVE_INT64 1
-_DBUS_GNUC_EXTENSION typedef long dbus_int64_t;
-_DBUS_GNUC_EXTENSION typedef unsigned long dbus_uint64_t;
-
-#define DBUS_INT64_CONSTANT(val)  (_DBUS_GNUC_EXTENSION (val##L))
-#define DBUS_UINT64_CONSTANT(val) (_DBUS_GNUC_EXTENSION (val##UL))
-
-#else
-#undef DBUS_HAVE_INT64
-#undef DBUS_INT64_CONSTANT
-#undef DBUS_UINT64_CONSTANT
-#endif
-
-typedef int dbus_int32_t;
-typedef unsigned int dbus_uint32_t;
-
-typedef short dbus_int16_t;
-typedef unsigned short dbus_uint16_t;
-
-/* This is not really arch-dependent, but it's not worth
- * creating an additional generated header just for this
- */
-#define DBUS_MAJOR_VERSION 1
-#define DBUS_MINOR_VERSION 4
-#define DBUS_MICRO_VERSION 0
-
-#define DBUS_VERSION_STRING "1.4.0"
-
-#define DBUS_VERSION ((1 << 16) | (4 << 8) | (0)) 
-
-DBUS_END_DECLS
-
-#endif /* DBUS_ARCH_DEPS_H */
diff --git a/lib-x86-64/lib/libFLAC.a b/lib-x86-64/lib/libFLAC.a
deleted file mode 100644
index a23bef27..00000000
--- a/lib-x86-64/lib/libFLAC.a
+++ /dev/null
diff --git a/lib-x86-64/lib/libavcodec.a b/lib-x86-64/lib/libavcodec.a
deleted file mode 100644
index 5ada6a80..00000000
--- a/lib-x86-64/lib/libavcodec.a
+++ /dev/null
diff --git a/lib-x86-64/lib/libavcore.a b/lib-x86-64/lib/libavcore.a
deleted file mode 100644
index 24a0f6cb..00000000
--- a/lib-x86-64/lib/libavcore.a
+++ /dev/null
diff --git a/lib-x86-64/lib/libavfilter.a b/lib-x86-64/lib/libavfilter.a
deleted file mode 100644
index 2097ecfa..00000000
--- a/lib-x86-64/lib/libavfilter.a
+++ /dev/null
diff --git a/lib-x86-64/lib/libavformat.a b/lib-x86-64/lib/libavformat.a
deleted file mode 100644
index 6bbbae98..00000000
--- a/lib-x86-64/lib/libavformat.a
+++ /dev/null
diff --git a/lib-x86-64/lib/libavutil.a b/lib-x86-64/lib/libavutil.a
deleted file mode 100644
index 97892692..00000000
--- a/lib-x86-64/lib/libavutil.a
+++ /dev/null
diff --git a/lib-x86-64/lib/libcddb.a b/lib-x86-64/lib/libcddb.a
deleted file mode 100644
index 740a8a98..00000000
--- a/lib-x86-64/lib/libcddb.a
+++ /dev/null
diff --git a/lib-x86-64/lib/libcdio.a b/lib-x86-64/lib/libcdio.a
deleted file mode 100644
index 365d59a4..00000000
--- a/lib-x86-64/lib/libcdio.a
+++ /dev/null
diff --git a/lib-x86-64/lib/libcurl.a b/lib-x86-64/lib/libcurl.a
deleted file mode 100644
index f3f9b1a0..00000000
--- a/lib-x86-64/lib/libcurl.a
+++ /dev/null
diff --git a/lib-x86-64/lib/libdbus-1.a b/lib-x86-64/lib/libdbus-1.a
deleted file mode 100644
index 53594ffb..00000000
--- a/lib-x86-64/lib/libdbus-1.a
+++ /dev/null
diff --git a/lib-x86-64/lib/libexpat.a b/lib-x86-64/lib/libexpat.a
deleted file mode 100644
index 918f08a8..00000000
--- a/lib-x86-64/lib/libexpat.a
+++ /dev/null
diff --git a/lib-x86-64/lib/libfaad.a b/lib-x86-64/lib/libfaad.a
deleted file mode 100644
index d9f525c6..00000000
--- a/lib-x86-64/lib/libfaad.a
+++ /dev/null
diff --git a/lib-x86-64/lib/libiso9660.a b/lib-x86-64/lib/libiso9660.a
deleted file mode 100644
index 177895e5..00000000
--- a/lib-x86-64/lib/libiso9660.a
+++ /dev/null
diff --git a/lib-x86-64/lib/libjpeg.a b/lib-x86-64/lib/libjpeg.a
deleted file mode 100644
index 696510c2..00000000
--- a/lib-x86-64/lib/libjpeg.a
+++ /dev/null
diff --git a/lib-x86-64/lib/libmad.a b/lib-x86-64/lib/libmad.a
deleted file mode 100644
index 7fad3234..00000000
--- a/lib-x86-64/lib/libmad.a
+++ /dev/null
diff --git a/lib-x86-64/lib/libmp4ff.a b/lib-x86-64/lib/libmp4ff.a
deleted file mode 100644
index d5c379aa..00000000
--- a/lib-x86-64/lib/libmp4ff.a
+++ /dev/null
diff --git a/lib-x86-64/lib/libogg.a b/lib-x86-64/lib/libogg.a
deleted file mode 100644
index 0e37488f..00000000
--- a/lib-x86-64/lib/libogg.a
+++ /dev/null
diff --git a/lib-x86-64/lib/libopencore-amrnb.a b/lib-x86-64/lib/libopencore-amrnb.a
deleted file mode 100644
index 3e7e0a46..00000000
--- a/lib-x86-64/lib/libopencore-amrnb.a
+++ /dev/null
diff --git a/lib-x86-64/lib/libopencore-amrwb.a b/lib-x86-64/lib/libopencore-amrwb.a
deleted file mode 100644
index c1ec70db..00000000
--- a/lib-x86-64/lib/libopencore-amrwb.a
+++ /dev/null
diff --git a/lib-x86-64/lib/libpng.a b/lib-x86-64/lib/libpng.a
deleted file mode 120000
index da6de64b..00000000
--- a/lib-x86-64/lib/libpng.a
+++ /dev/null
@@ -1 +0,0 @@
-libpng15.a
\ No newline at end of file
diff --git a/lib-x86-64/lib/libpng15.a b/lib-x86-64/lib/libpng15.a
deleted file mode 100644
index 2e464207..00000000
--- a/lib-x86-64/lib/libpng15.a
+++ /dev/null
diff --git a/lib-x86-64/lib/libsamplerate.a b/lib-x86-64/lib/libsamplerate.a
deleted file mode 100644
index 1a62ec38..00000000
--- a/lib-x86-64/lib/libsamplerate.a
+++ /dev/null
diff --git a/lib-x86-64/lib/libsndfile.a b/lib-x86-64/lib/libsndfile.a
deleted file mode 100644
index 49e1b19d..00000000
--- a/lib-x86-64/lib/libsndfile.a
+++ /dev/null
diff --git a/lib-x86-64/lib/libudf.a b/lib-x86-64/lib/libudf.a
deleted file mode 100644
index 9a5e4e83..00000000
--- a/lib-x86-64/lib/libudf.a
+++ /dev/null
diff --git a/lib-x86-64/lib/libvorbis.a b/lib-x86-64/lib/libvorbis.a
deleted file mode 100644
index 88db54bf..00000000
--- a/lib-x86-64/lib/libvorbis.a
+++ /dev/null
diff --git a/lib-x86-64/lib/libvorbisenc.a b/lib-x86-64/lib/libvorbisenc.a
deleted file mode 100644
index a03a0059..00000000
--- a/lib-x86-64/lib/libvorbisenc.a
+++ /dev/null
diff --git a/lib-x86-64/lib/libvorbisfile.a b/lib-x86-64/lib/libvorbisfile.a
deleted file mode 100644
index 98d8bcf4..00000000
--- a/lib-x86-64/lib/libvorbisfile.a
+++ /dev/null
diff --git a/lib-x86-64/lib/libwavpack.a b/lib-x86-64/lib/libwavpack.a
deleted file mode 100644
index cf99b632..00000000
--- a/lib-x86-64/lib/libwavpack.a
+++ /dev/null
diff --git a/lib-x86-64/lib/libz.a b/lib-x86-64/lib/libz.a
deleted file mode 100644
index 9267fde3..00000000
--- a/lib-x86-64/lib/libz.a
+++ /dev/null
diff --git a/lib-x86-64/lib/libzip.a b/lib-x86-64/lib/libzip.a
deleted file mode 100644
index f5201de5..00000000
--- a/lib-x86-64/lib/libzip.a
+++ /dev/null
diff --git a/scripts/portable_extraplugs.sh b/scripts/portable_extraplugs.sh
index 2c6868a6..982ec15d 100755
--- a/scripts/portable_extraplugs.sh
+++ b/scripts/portable_extraplugs.sh
@@ -6,8 +6,8 @@ export CC=$AP/apbuild/apgcc
 export CXX=$AP/apbuild/apgcc 
 export APBUILD_STATIC_LIBGCC=1
 
-ZLIB_LIBS="$ORIGIN/lib-x86-32/lib/libz.a"
-CFLAGS="-I$ORIGIN/lib-x86-32/include"
+ZLIB_LIBS="$ORIGIN/../deadbeef-deps/lib-x86-32/lib/libz.a"
+CFLAGS="-I$ORIGIN/../deadbeef-deps/lib-x86-32/include"
 
 for i in shn dumb ao ; do
     echo cd